diff options
11153 files changed, 54246 insertions, 38934 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d84c6a59538..c9abac5851b 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -82,8 +82,8 @@ /pkgs/development/r-modules @peti # Ruby -/pkgs/development/interpreters/ruby @alyssais @zimbatm -/pkgs/development/ruby-modules @alyssais @zimbatm +/pkgs/development/interpreters/ruby @alyssais +/pkgs/development/ruby-modules @alyssais # Rust /pkgs/development/compilers/rust @Mic92 @LnL7 @@ -178,6 +178,7 @@ /nixos/tests/prometheus-exporters.nix @WilliButz # PHP -/pkgs/development/interpreters/php @etu -/pkgs/top-level/php-packages.nix @etu -/pkgs/build-support/build-pecl.nix @etu +/doc/languages-frameworks/php.section.md @etu +/pkgs/development/interpreters/php @etu +/pkgs/top-level/php-packages.nix @etu +/pkgs/build-support/build-pecl.nix @etu diff --git a/.gitignore b/.gitignore index b3ae9e6ea86..ca00bc4df57 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ result-* .version-suffix .DS_Store +.mypy_cache /pkgs/development/libraries/qt-5/*/tmp/ /pkgs/desktops/kde-5/*/tmp/ diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index d76b590ede3..6ee450eeb59 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -186,7 +186,7 @@ with import <nixpkgs> {}; androidenv.emulateApp { name = "emulate-MyAndroidApp"; platformVersion = "28"; - abiVersion = "x86_64"; # armeabi-v7a, mips, x86 + abiVersion = "x86"; # armeabi-v7a, mips, x86_64 systemImageType = "google_apis_playstore"; } ``` diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md new file mode 100644 index 00000000000..a302a9a7f87 --- /dev/null +++ b/doc/languages-frameworks/php.section.md @@ -0,0 +1,112 @@ +# PHP + +## User Guide + +### Using PHP + +#### Overview + +Several versions of PHP are available on Nix, each of which having a +wide variety of extensions and libraries available. + +The attribute `php` refers to the version of PHP considered most +stable and thoroughly tested in nixpkgs for any given release of +NixOS. Note that while this version of PHP may not be the latest major +release from upstream, any version of PHP supported in nixpkgs may be +utilized by specifying the desired attribute by version, such as +`php74`. + +Only versions of PHP that are supported by upstream for the entirety +of a given NixOS release will be included in that release of +NixOS. See [PHP Supported +Versions](https://www.php.net/supported-versions.php). + +Interactive tools built on PHP are put in `php.packages`; composer is +for example available at `php.packages.composer`. + +Most extensions that come with PHP, as well as some popular +third-party ones, are available in `php.extensions`; for example, the +opcache extension shipped with PHP is available at +`php.extensions.opcache` and the third-party ImageMagick extension at +`php.extensions.imagick`. + +The different versions of PHP that nixpkgs provides is located under +attributes named based on major and minor version number; e.g., +`php74` is PHP 7.4 with commonly used extensions installed, +`php74base` is the same PHP runtime without extensions. + +#### Installing PHP with packages + +A PHP package with specific extensions enabled can be built using +`php.withExtensions`. This is a function which accepts an anonymous +function as its only argument; the function should take one argument, +the set of all extensions, and return a list of wanted extensions. For +example, a PHP package with the opcache and ImageMagick extensions +enabled: + +```nix +php.withExtensions (e: with e; [ imagick opcache ]) +``` + +Note that this will give you a package with _only_ opcache and +ImageMagick, none of the other extensions which are enabled by default +in the `php` package will be available. + +To enable building on a previous PHP package, the currently enabled +extensions are made available in its `enabledExtensions` +attribute. For example, to generate a package with all default +extensions enabled, except opcache, but with ImageMagick: + +```nix +php.withExtensions (e: + (lib.filter (e: e != php.extensions.opcache) php.enabledExtensions) + ++ [ e.imagick ]) +``` + +If you want a PHP build with extra configuration in the `php.ini` +file, you can use `php.buildEnv`. This function takes two named and +optional parameters: `extensions` and `extraConfig`. `extensions` +takes an extension specification equivalent to that of +`php.withExtensions`, `extraConfig` a string of additional `php.ini` +configuration parameters. For example, a PHP package with the opcache +and ImageMagick extensions enabled, and `memory_limit` set to `256M`: + +```nix +php.buildEnv { + extensions = e: with e; [ imagick opcache ]; + extraConfig = "memory_limit=256M"; +} +``` + +##### Example setup for `phpfpm` + +You can use the previous examples in a `phpfpm` pool called `foo` as +follows: + +```nix +let + myPhp = php.withExtensions (e: with e; [ imagick opcache ]); +in { + services.phpfpm.pools."foo".phpPackage = myPhp; +}; +``` + +```nix +let + myPhp = php.buildEnv { + extensions = e: with e; [ imagick opcache ]; + extraConfig = "memory_limit=256M"; + }; +in { + services.phpfpm.pools."foo".phpPackage = myPhp; +}; +``` + +##### Example usage with `nix-shell` + +This brings up a temporary environment that contains a PHP interpreter +with the extensions `imagick` and `opcache` enabled. + +```sh +nix-shell -p 'php.buildEnv { extensions = e: with e; [ imagick opcache ]; }' +``` diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 05a23d26cf2..4911509212e 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -261,12 +261,7 @@ deoplete-fish = super.deoplete-fish.overrideAttrs(old: { Sometimes plugins require an override that must be changed when the plugin is updated. This can cause issues when Vim plugins are auto-updated but the associated override isn't updated. For these plugins, the override should be written so that it specifies all information required to install the plugin, and running `./update.py` doesn't change the derivation for the plugin. Manually updating the override is required to update these types of plugins. An example of such a plugin is `LanguageClient-neovim`. -To add a new plugin: - - 1. run `./update.py` and create a commit named "vimPlugins: Update", - 2. add the new plugin to [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names) and add overrides if required to [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix), - 3. run `./update.py` again and create a commit named "vimPlugins.[name]: init at [version]" (where `name` and `version` can be found in [generated.nix](/pkgs/misc/vim-plugins/generated.nix)), and - 4. create a pull request. +To add a new plugin, run `./update.py --add "[owner]/[name]"`. **NOTE**: This script automatically commits to your git repository. Be sure to check out a fresh branch before running. ## Important repositories diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 88ca5e2e3ce..7fa65ab1102 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -37,7 +37,7 @@ security updates. More up to date packages and modules are available via the Both `nixos-unstable` and `nixpkgs` follow the `master` branch of the Nixpkgs repository, although both do lag the `master` branch by generally -[a couple of days](https://howoldis.herokuapp.com/). Updates to a channel are +[a couple of days](https://status.nixos.org/). Updates to a channel are distributed as soon as all tests for that channel pass, e.g. [this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) shows the status of tests for the `nixpkgs` channel. diff --git a/doc/stdenv/multiple-output.xml b/doc/stdenv/multiple-output.xml index 83275bb2fbd..51e1cc2e024 100644 --- a/doc/stdenv/multiple-output.xml +++ b/doc/stdenv/multiple-output.xml @@ -106,7 +106,7 @@ </para> <para> - The reason for why <literal>glibc</literal> deviates from the convention is because referencing a library provided by <literal>glibc</literal> is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of <literal>glibc</literal> libraries from Nix packages (please see the documentation on <link xlink:href="https://nixos.org/patchelf.html">patchelf</link> for more details). + The reason for why <literal>glibc</literal> deviates from the convention is because referencing a library provided by <literal>glibc</literal> is a very common operation among Nix packages. For instance, third-party executables packaged by Nix are typically patched and relinked with the relevant version of <literal>glibc</literal> libraries from Nix packages (please see the documentation on <link xlink:href="https://github.com/NixOS/patchelf/blob/master/README">patchelf</link> for more details). </para> </section> diff --git a/flake.nix b/flake.nix index a6828c98fb5..52fd2f82a37 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ import ./nixos/lib/eval-config.nix (args // { modules = modules ++ [ { system.nixos.versionSuffix = - ".${lib.substring 0 8 self.lastModified}.${self.shortRev or "dirty"}"; + ".${lib.substring 0 8 (self.lastModifiedDate or self.lastModified)}.${self.shortRev or "dirty"}"; system.nixos.revision = lib.mkIf (self ? rev) self.rev; } ]; diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 72430522f7d..7d84c25de77 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -4,7 +4,7 @@ let inherit (builtins) head tail length; inherit (lib.trivial) and; - inherit (lib.strings) concatStringsSep; + inherit (lib.strings) concatStringsSep sanitizeDerivationName; inherit (lib.lists) fold concatMap concatLists; in @@ -310,7 +310,7 @@ rec { path' = builtins.storePath path; res = { type = "derivation"; - name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path')); + name = sanitizeDerivationName (builtins.substring 33 (-1) (baseNameOf path')); outPath = path'; outputs = [ "out" ]; out = res; diff --git a/lib/default.nix b/lib/default.nix index a909cefd60f..d00c4abec0a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -141,7 +141,7 @@ let mergeAttrsWithFunc mergeAttrsConcatenateValues mergeAttrsNoOverride mergeAttrByFunc mergeAttrsByFuncDefaults mergeAttrsByFuncDefaultsClean mergeAttrBy - fakeSha256 fakeSha512 + fakeSri fakeSha256 fakeSha512 nixType imap; inherit (versions) splitVersion; diff --git a/lib/deprecated.nix b/lib/deprecated.nix index 155d6f0c361..8c4fe9c390c 100644 --- a/lib/deprecated.nix +++ b/lib/deprecated.nix @@ -272,6 +272,7 @@ rec { imap = imap1; # Fake hashes. Can be used as hash placeholders, when computing hash ahead isn't trivial + fakeSri = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; fakeSha256 = "0000000000000000000000000000000000000000000000000000000000000000"; fakeSha512 = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"; } diff --git a/lib/licenses.nix b/lib/licenses.nix index e37eb57cff9..81976a769c0 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -40,13 +40,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { amazonsl = { fullName = "Amazon Software License"; - url = http://aws.amazon.com/asl/; + url = "http://aws.amazon.com/asl/"; free = false; }; amd = { fullName = "AMD License Agreement"; - url = http://developer.amd.com/amd-license-agreement/; + url = "http://developer.amd.com/amd-license-agreement/"; free = false; }; @@ -57,7 +57,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { arphicpl = { fullName = "Arphic Public License"; - url = https://www.freedesktop.org/wiki/Arphic_Public_License/; + url = "https://www.freedesktop.org/wiki/Arphic_Public_License/"; }; artistic1 = spdx { @@ -107,7 +107,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { bsl11 = { fullName = "Business Source License 1.1"; - url = https://mariadb.com/bsl11; + url = "https://mariadb.com/bsl11"; free = false; }; @@ -230,7 +230,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { eapl = { fullName = "EPSON AVASYS PUBLIC LICENSE"; - url = http://avasys.jp/hp/menu000000700/hpg000000603.htm; + url = "http://avasys.jp/hp/menu000000700/hpg000000603.htm"; free = false; }; @@ -246,7 +246,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { elastic = { fullName = "ELASTIC LICENSE"; - url = https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt; + url = "https://github.com/elastic/elasticsearch/blob/master/licenses/ELASTIC-LICENSE.txt"; free = false; }; @@ -262,7 +262,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { epson = { fullName = "Seiko Epson Corporation Software License Agreement for Linux"; - url = https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html; + url = "https://download.ebz.epson.net/dsc/du/02/eula/global/LINUX_EN.html"; free = false; }; @@ -293,7 +293,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { ffsl = { fullName = "Floodgap Free Software License"; - url = http://www.floodgap.com/software/ffsl/license.html; + url = "http://www.floodgap.com/software/ffsl/license.html"; free = false; }; @@ -303,12 +303,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { g4sl = { fullName = "Geant4 Software License"; - url = https://geant4.web.cern.ch/geant4/license/LICENSE.html; + url = "https://geant4.web.cern.ch/geant4/license/LICENSE.html"; }; geogebra = { fullName = "GeoGebra Non-Commercial License Agreement"; - url = https://www.geogebra.org/license; + url = "https://www.geogebra.org/license"; free = false; }; @@ -334,12 +334,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { gpl2ClasspathPlus = { fullName = "GNU General Public License v2.0 or later (with Classpath exception)"; - url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; + url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception"; }; gpl2Oss = { fullName = "GNU General Public License version 2 only (with OSI approved licenses linking exception)"; - url = https://www.mysql.com/about/legal/licensing/foss-exception; + url = "https://www.mysql.com/about/legal/licensing/foss-exception"; }; gpl2Plus = spdx { @@ -359,7 +359,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { gpl3ClasspathPlus = { fullName = "GNU General Public License v3.0 or later (with Classpath exception)"; - url = https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception; + url = "https://fedoraproject.org/wiki/Licensing/GPL_Classpath_Exception"; }; hpnd = spdx { @@ -370,7 +370,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { # Intel's license, seems free iasl = { fullName = "iASL"; - url = http://www.calculate-linux.org/packages/licenses/iASL; + url = "http://www.calculate-linux.org/packages/licenses/iASL"; }; ijg = spdx { @@ -413,7 +413,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { # Proprietary binaries; free to redistribute without modification. issl = { fullName = "Intel Simplified Software License"; - url = https://software.intel.com/en-us/license/intel-simplified-software-license; + url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; free = false; }; @@ -469,7 +469,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { llgpl21 = { fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp"; - url = http://opensource.franz.com/preamble.html; + url = "http://opensource.franz.com/preamble.html"; }; lppl12 = spdx { @@ -489,7 +489,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { miros = { fullName = "MirOS License"; - url = https://opensource.org/licenses/MirOS; + url = "https://opensource.org/licenses/MirOS"; }; # spdx.org does not (yet) differentiate between the X11 and Expat versions @@ -589,7 +589,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { postman = { fullName = "Postman EULA"; - url = https://www.getpostman.com/licenses/postman_base_app; + url = "https://www.getpostman.com/licenses/postman_base_app"; free = false; }; @@ -605,7 +605,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { purdueBsd = { fullName = " Purdue BSD-Style License"; # also know as lsof license - url = https://enterprise.dejacode.com/licenses/public/purdue-bsd; + url = "https://enterprise.dejacode.com/licenses/public/purdue-bsd"; }; qhull = spdx { @@ -620,7 +620,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { qwt = { fullName = "Qwt License, Version 1.0"; - url = http://qwt.sourceforge.net/qwtlicense.html; + url = "http://qwt.sourceforge.net/qwtlicense.html"; }; ruby = spdx { @@ -646,13 +646,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { smail = { shortName = "smail"; fullName = "SMAIL General Public License"; - url = http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright; + url = "http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright"; }; sspl = { shortName = "SSPL"; fullName = "Server Side Public License"; - url = https://www.mongodb.com/licensing/server-side-public-license; + url = "https://www.mongodb.com/licensing/server-side-public-license"; free = false; }; @@ -663,7 +663,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { ufl = { fullName = "Ubuntu Font License 1.0"; - url = http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt; + url = "http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt"; }; unfree = { @@ -682,6 +682,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { # channel and NixOS images. }; + unicode-dfs-2016 = spdx { + spdxId = "Unicode-DFS-2016"; + fullName = "Unicode License Agreement - Data Files and Software (2016)"; + }; + unlicense = spdx { spdxId = "Unlicense"; fullName = "The Unlicense"; @@ -720,7 +725,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { wadalab = { fullName = "Wadalab Font License"; - url = https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab; + url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab"; }; wtfpl = spdx { diff --git a/lib/strings.nix b/lib/strings.nix index 4f9509ffe7c..7ecd6b143ee 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -678,4 +678,36 @@ rec { => "1.0" */ fileContents = file: removeSuffix "\n" (builtins.readFile file); + + + /* Creates a valid derivation name from a potentially invalid one. + + Type: sanitizeDerivationName :: String -> String + + Example: + sanitizeDerivationName "../hello.bar # foo" + => "-hello.bar-foo" + sanitizeDerivationName "" + => "unknown" + sanitizeDerivationName pkgs.hello + => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10" + */ + sanitizeDerivationName = string: lib.pipe string [ + # Get rid of string context. This is safe under the assumption that the + # resulting string is only used as a derivation name + builtins.unsafeDiscardStringContext + # Strip all leading "." + (x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) + # Split out all invalid characters + # https://github.com/NixOS/nix/blob/2.3.2/src/libstore/store-api.cc#L85-L112 + # https://github.com/NixOS/nix/blob/2242be83c61788b9c0736a92bb0b5c7bbfc40803/nix-rust/src/store/path.rs#L100-L125 + (builtins.split "[^[:alnum:]+._?=-]+") + # Replace invalid character ranges with a "-" + (concatMapStrings (s: if lib.isList s then "-" else s)) + # Limit to 211 characters (minus 4 chars for ".drv") + (x: substring (lib.max (stringLength x - 207) 0) (-1) x) + # If the result is empty, replace it with "unknown" + (x: if stringLength x == 0 then "unknown" else x) + ]; + } diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 739c5d5fe15..36ddd186d7b 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -3,6 +3,23 @@ # if the resulting list is empty, all tests passed with import ../default.nix; +let + + testSanitizeDerivationName = { name, expected }: + let + drv = derivation { + name = strings.sanitizeDerivationName name; + builder = "x"; + system = "x"; + }; + in { + # Evaluate the derivation so an invalid name would be caught + expr = builtins.seq drv.drvPath drv.name; + inherit expected; + }; + +in + runTests { @@ -490,4 +507,29 @@ runTests { expected = "'-X' 'PUT' '--data' '{\"id\":0}' '--retry' '3' '--url' 'https://example.com/foo' '--url' 'https://example.com/bar' '--verbose'"; }; + + testSanitizeDerivationNameLeadingDots = testSanitizeDerivationName { + name = "..foo"; + expected = "foo"; + }; + + testSanitizeDerivationNameAscii = testSanitizeDerivationName { + name = " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"; + expected = "-+--.-0123456789-=-?-ABCDEFGHIJKLMNOPQRSTUVWXYZ-_-abcdefghijklmnopqrstuvwxyz-"; + }; + + testSanitizeDerivationNameTooLong = testSanitizeDerivationName { + name = "This string is loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"; + expected = "loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong"; + }; + + testSanitizeDerivationNameTooLongWithInvalid = testSanitizeDerivationName { + name = "Hello there aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa &&&&&&&&"; + expected = "there-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-"; + }; + + testSanitizeDerivationNameEmpty = testSanitizeDerivationName { + name = ""; + expected = "unknown"; + }; } diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 916df3b9534..a8b4cc85282 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -302,6 +302,12 @@ githubId = 786394; name = "Alexander Krupenkin "; }; + albakham = { + email = "dev@geber.ga"; + github = "albakham"; + githubId = 43479487; + name = "Titouan Biteau"; + }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; @@ -412,10 +418,15 @@ githubId = 20530052; name = "Andrew Miloradovsky"; }; - aminb = { - email = "amin@aminb.org"; - github = "aminb"; + notbandali = { name = "Amin Bandali"; + email = "bandali@gnu.org"; + github = "notbandali"; + githubId = 1254858; + keys = [{ + longkeyid = "rsa4096/0xA21A020248816103"; + fingerprint = "BE62 7373 8E61 6D6D 1B3A 08E8 A21A 0202 4881 6103"; + }]; }; aminechikhaoui = { email = "amine.chikhaoui91@gmail.com"; @@ -645,6 +656,12 @@ githubId = 10285250; name = "Artur E. Ruuge"; }; + asbachb = { + email = "asbachb-nixpkgs-5c2a@impl.it"; + github = "asbachb"; + githubId = 1482768; + name = "Benjamin Asbach"; + }; ashalkhakov = { email = "artyom.shalkhakov@gmail.com"; github = "ashalkhakov"; @@ -964,6 +981,12 @@ githubId = 2071583; name = "Benjamin Hipple"; }; + bhougland = { + email = "benjamin.hougland@gmail.com"; + github = "bhougland18"; + githubId = 28444296; + name = "Benjamin Hougland"; + }; binarin = { email = "binarin@binarin.ru"; github = "binarin"; @@ -1257,6 +1280,20 @@ githubId = 5949913; name = "Carlos Fernandez Sanz"; }; + cge = { + email = "cevans@evanslabs.org"; + github = "cgevans"; + githubId = 2054509; + name = "Constantine Evans"; + keys = [ + { longkeyid = "rsa4096/0xB67DB1D20A93A9F9"; + fingerprint = "32B1 6EE7 DBA5 16DE 526E 4C5A B67D B1D2 0A93 A9F9"; + } + { longkeyid = "rsa4096/0x1A1D58B86AE2AABD"; + fingerprint = "669C 1D24 5A87 DB34 6BE4 3216 1A1D 58B8 6AE2 AABD"; + } + ]; + }; chaduffy = { email = "charles@dyfis.net"; github = "charles-dyfis-net"; @@ -2367,6 +2404,12 @@ fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; }]; }; + euank = { + email = "euank-nixpkg@euank.com"; + github = "euank"; + githubId = 2147649; + name = "Euan Kemp"; + }; evanjs = { email = "evanjsx@gmail.com"; github = "evanjs"; @@ -2808,6 +2851,12 @@ githubId = 12064730; name = "Alex Ivanov"; }; + gnxlxnxx = { + email = "gnxlxnxx@web.de"; + github = "gnxlxnxx"; + githubId = 25820499; + name = "Roman Kretschmer"; + }; goibhniu = { email = "cillian.deroiste@gmail.com"; github = "cillianderoiste"; @@ -3190,6 +3239,12 @@ githubId = 4458; name = "Ivan Kozik"; }; + ivan-timokhin = { + email = "nixpkgs@ivan.timokhin.name"; + name = "Ivan Timokhin"; + github = "ivan-timokhin"; + githubId = 9802104; + }; ivan-tkatchev = { email = "tkatchev@gmail.com"; name = "Ivan Tkatchev"; @@ -3204,6 +3259,12 @@ fingerprint = "7311 2700 AB4F 4CDF C68C F6A5 79C3 C47D C652 EA54"; }]; }; + ivar = { + email = "ivar.scholten@protonmail.com"; + github = "IvarWithoutBones"; + githubId = 41924494; + Name = "Ivar"; + }; ivegotasthma = { email = "ivegotasthma@protonmail.com"; github = "ivegotasthma"; @@ -4373,6 +4434,12 @@ github = "ltavard"; name = "Laure Tavard"; }; + luc65r = { + email = "lucas@ransan.tk"; + github = "luc65r"; + githubId = 59375051; + name = "Lucas Ransan"; + }; lucus16 = { email = "lars.jellema@gmail.com"; github = "Lucus16"; @@ -4864,6 +4931,12 @@ githubId = 19479662; name = "Kajetan Champlewski"; }; + millerjason = { + email = "mailings-github@millerjason.com"; + github = "millerjason"; + githubId = 7610974; + name = "Jason Miller"; + }; miltador = { email = "miltador@yandex.ua"; name = "Vasiliy Solovey"; @@ -4877,7 +4950,12 @@ minijackson = { email = "minijackson@riseup.net"; github = "minijackson"; + githubId = 1200507; name = "Rémi Nicole"; + keys = [{ + longkeyid = "rsa2048/0xFEA888C9F5D64F62"; + fingerprint = "3196 83D3 9A1B 4DE1 3DC2 51FD FEA8 88C9 F5D6 4F62"; + }]; }; mirdhyn = { email = "mirdhyn@gmail.com"; @@ -5528,6 +5606,12 @@ githubId = 101514; name = "Orivej Desh"; }; + oro = { + email = "marco@orovecchia.at"; + github = "oro"; + githubId = 357005; + name = "Marco Orovecchia"; + }; osener = { email = "ozan@ozansener.com"; github = "osener"; @@ -6016,6 +6100,11 @@ fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; }]; }; + raboof = { + email = "arnout@bzzt.net"; + github = "raboof"; + name = "Arnout Engelen"; + }; rafaelgg = { email = "rafael.garcia.gallego@gmail.com"; github = "rafaelgg"; @@ -6444,6 +6533,12 @@ githubId = 766350; name = "Richard Zetterberg"; }; + s1341 = { + email = "s1341@shmarya.net"; + name = "Shmarya Rubenstein"; + github = "s1341"; + githubId = 5682183; + }; samdoshi = { email = "sam@metal-fish.co.uk"; github = "samdoshi"; @@ -6706,6 +6801,11 @@ github = "shmish111"; name = "David Smith"; }; + shnarazk = { + email = "shujinarazaki@protonmail.com"; + github = "shnarazk"; + name = "Narazaki Shuji"; + }; shou = { email = "x+g@shou.io"; github = "Shou"; @@ -7283,6 +7383,12 @@ githubId = 378734; name = "TG ⊗ Θ"; }; + th0rgal = { + email = "thomas.marchand@tuta.io"; + github = "Th0rgal"; + githubId = 41830259; + name = "Thomas Marchand"; + }; thall = { email = "niclas.thall@gmail.com"; github = "thall"; @@ -7969,6 +8075,12 @@ githubId = 13489144; name = "Calle Rosenquist"; }; + xe = { + email = "me@christine.website"; + github = "Xe"; + githubId = 529003; + name = "Christine Dodrill"; + }; xeji = { email = "xeji@cat3.de"; github = "xeji"; @@ -8103,6 +8215,11 @@ fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; }]; }; + yvesf = { + email = "yvesf+nix@xapek.org"; + github = "yvesf"; + name = "Yves Fischer"; + }; yvt = { email = "i@yvt.jp"; github = "yvt"; @@ -8297,6 +8414,16 @@ githubId = 474343; name = "Xavier Zwirtz"; }; + ymeister = { + name = "Yuri Meister"; + email = "47071325+ymeister@users.noreply.github.com"; + github = "ymeister"; + githubId = 47071325; + }; + cpcloud = { + name = "Phillip Cloud"; + email = "417981+cpcloud@users.noreply.github.com"; + github = "cpcloud"; + githubId = 417981; + }; } - - diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1d8b291978b..7efff7f45ec 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -30,4 +30,13 @@ with lib.maintainers; { ]; scope = "Maintain GNOME desktop environment and platform."; }; + + podman = { + members = [ + saschagrunert + vdemeester + zowoq + ]; + scope = "Maintain podman related packages."; + }; } diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 7674b0a5c0d..f09fb3255d8 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -75,6 +75,24 @@ services.xserver.displayManager.defaultSession = "xfce+icewm"; </programlisting> </para> </listitem> + <listitem> + <para> + The testing driver implementation in NixOS is now in Python <filename>make-test-python.nix</filename>. + This was done by Jacek Galowicz (<link xlink:href="https://github.com/tfc">@tfc</link>), and with the + collaboration of Julian Stecklina (<link xlink:href="https://github.com/blitz">@blitz</link>) and + Jana Traue (<link xlink:href="https://github.com/jtraue">@jtraue</link>). All documentation has been updated to use this + testing driver, and a vast majority of the 286 tests in NixOS were ported to python driver. In 20.09 the Perl driver implementation, + <filename>make-test.nix</filename>, is slated for removal. This should give users of the NixOS integration framework + a transitory period to rewrite their tests to use the Python implementation. Users of the Perl driver will see + this warning everytime they use it: +<screen> +<prompt>$ </prompt>warning: Perl VM tests are deprecated and will be removed for 20.09. +Please update your tests to use the python test driver. +See https://github.com/NixOS/nixpkgs/pull/71684 for details. +</screen> + API compatibility is planned to be kept for at least the next release with the perl driver. + </para> + </listitem> </itemizedlist> </section> @@ -129,6 +147,17 @@ services.xserver.displayManager.defaultSession = "xfce+icewm"; <itemizedlist> <listitem> <para> + The <package>dhcpcd</package> package <link xlink:href="https://roy.marples.name/archives/dhcpcd-discuss/0002621.html"> + does not request IPv4 addresses for tap and bridge interfaces anymore by default</link>. + In order to still get an address on a bridge interface, one has to disable + <literal>networking.useDHCP</literal> and explicitly enable + <literal>networking.interfaces.<name>.useDHCP</literal> on + every interface, that should get an address via DHCP. This way, dhcpcd + is configured in an explicit way about which interface to run on. + </para> + </listitem> + <listitem> + <para> GnuPG is now built without support for a graphical passphrase entry by default. Please enable the <literal>gpg-agent</literal> user service via the NixOS option <literal>programs.gnupg.agent.enable</literal>. @@ -697,6 +726,72 @@ auth required pam_succeed_if.so uid >= 1000 quiet </para> </warning> </listitem> + <listitem> + <para> + <package>Hydra</package> has gained a massive performance improvement due to + <link xlink:href="https://github.com/NixOS/hydra/pull/710">some database schema + changes</link> by adding several IDs and better indexing. However, it's necessary + to upgrade Hydra in multiple steps: + <itemizedlist> + <listitem> + <para> + At first, an older version of Hydra needs to be deployed which adds those + (nullable) columns. When having set <link linkend="opt-system.stateVersion">stateVersion + </link> to a value older than <literal>20.03</literal>, this package will be selected + by default from the module when upgrading. Otherwise, the package can be deployed using + the following config: +<programlisting>{ pkgs, ... }: { + <link linkend="opt-services.hydra.package">services.hydra.package</link> = pkgs.hydra-migration; +}</programlisting> + </para> + </listitem> + <listitem> + <para> + Automatically fill the newly added ID columns on the server by running the following + command: +<screen> +<prompt>$ </prompt>hydra-backfill-ids +</screen> + <warning> + <para>Please note that this process can take a while depending on your database-size!</para> + </warning> + </para> + </listitem> + <listitem> + <para> + Deploy a newer version of Hydra to activate the DB optimizations. This can be done by + using <package>hydra-unstable</package>. This package already includes + <link xlink:href="https://github.com/nixos/rfcs/pull/49">flake-support</link> and is + therefore compiled against <package>pkgs.nixFlakes</package>. + <warning> + <para> + If your <link linkend="opt-system.stateVersion">stateVersion</link> is set to + <literal>20.03</literal> or greater, <package>hydra-unstable</package> will be used + automatically! This will break your setup if you didn't run the migration. + </para> + </warning> + Please note that Hydra is currently not available with <package>nixStable</package> + as this doesn't compile anymore. + </para> + </listitem> + </itemizedlist> + <warning> + <para> + <package>pkgs.hydra</package> has been removed to ensure a graceful database-migration + using the dedicated package-attributes. If you still have <package>pkgs.hydra</package> + defined in e.g. an overlay, an assertion error will be thrown. To circumvent this, + you need to set <xref linkend="opt-services.hydra.package" /> to <package>pkgs.hydra</package> + explicitly and make sure you know what you're doing! + </para> + </warning> + </para> + </listitem> + <listitem> + <para> + The TokuDB storage engine will be disabled in <package>mariadb</package> 10.5. It is recommended to switch + to RocksDB. See also <link xlink:href="https://mariadb.com/kb/en/tokudb/">TokuDB</link>. + </para> + </listitem> </itemizedlist> </section> @@ -761,8 +856,8 @@ auth required pam_succeed_if.so uid >= 1000 quiet </listitem> <listitem> <para> - Predicatbly named network-interfaces get renamed in stage-1. This means that it's possible - to use the proper interface name for e.g. dropbear-setups. + Predictably named network interfaces get renamed in stage-1. This means that it is possible + to use the proper interface name for e.g. Dropbear setups. </para> <para> For further reference, please read <link xlink:href="https://github.com/NixOS/nixpkgs/pull/68953">#68953</link> or the corresponding <link xlink:href="https://discourse.nixos.org/t/predictable-network-interface-names-in-initrd/4055">discourse thread</link>. @@ -828,6 +923,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet <listitem> <para> <package>mongodb</package> has been updated to version <literal>3.4.24</literal>. + <warning> + <para> + Please note that <package>mongodb</package> has been relicensed under their own + <link xlink:href="https://www.mongodb.com/licensing/server-side-public-license/faq"><literal> + sspl</literal></link>-license. Since it's not entirely free and not OSI-approved, + it's listed as non-free. This means that Hydra doesn't provide prebuilt + <package>mongodb</package>-packages and needs to be built locally. + </para> + </warning> </para> </listitem> </itemizedlist> diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index a9a6003d1e8..cf7946ffb80 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -24,6 +24,9 @@ </para> </listitem> <listitem> + <para>GNOME desktop environment was upgraded to 3.36, see its <link xlink:href="https://help.gnome.org/misc/release-notes/3.36/">release notes</link>.</para> + </listitem> + <listitem> <para> PHP now defaults to PHP 7.4, updated from 7.3. </para> @@ -108,6 +111,98 @@ <link linkend="opt-security.duosec.integrationKey">security.duosec.integrationKey</link>. </para> </listitem> + <listitem> + <para> + The initrd SSH support now uses OpenSSH rather than Dropbear to + allow the use of Ed25519 keys and other OpenSSH-specific + functionality. Host keys must now be in the OpenSSH format, and at + least one pre-generated key must be specified. + </para> + <para> + If you used the <option>boot.initrd.network.ssh.host*Key</option> + options, you'll get an error explaining how to convert your host + keys and migrate to the new + <option>boot.initrd.network.ssh.hostKeys</option> option. + Otherwise, if you don't have any host keys set, you'll need to + generate some; see the <option>hostKeys</option> option + documentation for instructions. + </para> + </listitem> + <listitem> + <para> + Since this release there's an easy way to customize your PHP install to get a much smaller + base PHP with only wanted extensions enabled. See the following snippet installing a smaller PHP + with the extensions <literal>imagick</literal>, <literal>opcache</literal> and + <literal>pdo_mysql</literal> loaded: + + <programlisting> +environment.systemPackages = [ +(pkgs.php.buildEnv { extensions = pp: with pp; [ + imagick + opcache + pdo_mysql + ]; }) +];</programlisting> + + The default <literal>php</literal> attribute hasn't lost any extensions - + the <literal>opcache</literal> extension was added there. + + All upstream PHP extensions are available under <package><![CDATA[php.extensions.<name?>]]></package>. + </para> + <para> + The updated <literal>php</literal> attribute is now easily customizable to your liking + by using extensions instead of writing config files or changing configure flags. + + Therefore we have removed the following configure flags: + + <itemizedlist> + <title>PHP <literal>config</literal> flags that we don't read anymore:</title> + <listitem><para><literal>config.php.argon2</literal></para></listitem> + <listitem><para><literal>config.php.bcmath</literal></para></listitem> + <listitem><para><literal>config.php.bz2</literal></para></listitem> + <listitem><para><literal>config.php.calendar</literal></para></listitem> + <listitem><para><literal>config.php.curl</literal></para></listitem> + <listitem><para><literal>config.php.exif</literal></para></listitem> + <listitem><para><literal>config.php.ftp</literal></para></listitem> + <listitem><para><literal>config.php.gd</literal></para></listitem> + <listitem><para><literal>config.php.gettext</literal></para></listitem> + <listitem><para><literal>config.php.gmp</literal></para></listitem> + <listitem><para><literal>config.php.imap</literal></para></listitem> + <listitem><para><literal>config.php.intl</literal></para></listitem> + <listitem><para><literal>config.php.ldap</literal></para></listitem> + <listitem><para><literal>config.php.libxml2</literal></para></listitem> + <listitem><para><literal>config.php.libzip</literal></para></listitem> + <listitem><para><literal>config.php.mbstring</literal></para></listitem> + <listitem><para><literal>config.php.mysqli</literal></para></listitem> + <listitem><para><literal>config.php.mysqlnd</literal></para></listitem> + <listitem><para><literal>config.php.openssl</literal></para></listitem> + <listitem><para><literal>config.php.pcntl</literal></para></listitem> + <listitem><para><literal>config.php.pdo_mysql</literal></para></listitem> + <listitem><para><literal>config.php.pdo_odbc</literal></para></listitem> + <listitem><para><literal>config.php.pdo_pgsql</literal></para></listitem> + <listitem><para><literal>config.php.phpdbg</literal></para></listitem> + <listitem><para><literal>config.php.postgresql</literal></para></listitem> + <listitem><para><literal>config.php.readline</literal></para></listitem> + <listitem><para><literal>config.php.soap</literal></para></listitem> + <listitem><para><literal>config.php.sockets</literal></para></listitem> + <listitem><para><literal>config.php.sodium</literal></para></listitem> + <listitem><para><literal>config.php.sqlite</literal></para></listitem> + <listitem><para><literal>config.php.tidy</literal></para></listitem> + <listitem><para><literal>config.php.xmlrpc</literal></para></listitem> + <listitem><para><literal>config.php.xsl</literal></para></listitem> + <listitem><para><literal>config.php.zip</literal></para></listitem> + <listitem><para><literal>config.php.zlib</literal></para></listitem> + </itemizedlist> + </para> + </listitem> + <listitem> + <para> + Gollum received a major update to version 5.x and you may have to change + some links in your wiki when migrating from gollum 4.x. More information + can be found + <link xlink:href="https://github.com/gollum/gollum/wiki/5.0-release-notes#migrating-your-wiki">here</link>. + </para> + </listitem> </itemizedlist> </section> @@ -120,7 +215,13 @@ <itemizedlist> <listitem> - <para /> + <para> + The <package>notmuch</package> package move its emacs-related binaries and + emacs lisp files to a separate output. They're not part + of the default <literal>out</literal> output anymore - if you relied on the + <literal>notmuch-emacs-mua</literal> binary or the emacs lisp files, access them via + the <literal>notmuch.emacs</literal> output. + </para> </listitem> </itemizedlist> </section> diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index b7b1ab52a63..d4633d2c8d1 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -107,6 +107,7 @@ xorriso="xorriso -publisher nixos -graft-points -full-iso9660-filenames + -joliet ${isoBootFlags} ${usbBootFlags} ${efiBootFlags} diff --git a/nixos/lib/make-options-doc/default.nix b/nixos/lib/make-options-doc/default.nix index e5813d9a3ef..772b7d3add9 100644 --- a/nixos/lib/make-options-doc/default.nix +++ b/nixos/lib/make-options-doc/default.nix @@ -86,7 +86,7 @@ let optionsList = lib.sort optionLess optionsListDesc; # Convert the list of options into an XML file. - optionsXML = pkgs.writeText "options.xml" (builtins.toXML optionsList); + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList); optionsNix = builtins.listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList); diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index c27947bc610..07f27515990 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -6,6 +6,7 @@ from xml.sax.saxutils import XMLGenerator import _thread import atexit import base64 +import codecs import os import pathlib import ptpython.repl @@ -101,10 +102,12 @@ def make_command(args: list) -> str: def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]: global log log.log("starting VDE switch for network {}".format(vlan_nr)) - vde_socket = os.path.abspath("./vde{}.ctl".format(vlan_nr)) + vde_socket = tempfile.mkdtemp( + prefix="nixos-test-vde-", suffix="-vde{}.ctl".format(vlan_nr) + ) pty_master, pty_slave = pty.openpty() vde_process = subprocess.Popen( - ["vde_switch", "-s", vde_socket, "--dirmode", "0777"], + ["vde_switch", "-s", vde_socket, "--dirmode", "0700"], bufsize=1, stdin=pty_slave, stdout=subprocess.PIPE, @@ -115,6 +118,7 @@ def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any] fd.write("version\n") # TODO: perl version checks if this can be read from # an if not, dies. we could hang here forever. Fix it. + assert vde_process.stdout is not None vde_process.stdout.readline() if not os.path.exists(os.path.join(vde_socket, "ctl")): raise Exception("cannot start vde_switch") @@ -139,7 +143,7 @@ def retry(fn: Callable) -> None: class Logger: def __init__(self) -> None: self.logfile = os.environ.get("LOGFILE", "/dev/null") - self.logfile_handle = open(self.logfile, "wb") + self.logfile_handle = codecs.open(self.logfile, "wb") self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") self.queue: "Queue[Dict[str, str]]" = Queue(1000) @@ -383,7 +387,7 @@ class Machine: if state != require_state: raise Exception( "Expected unit ‘{}’ to to be in state ".format(unit) - + "'active' but it is in state ‘{}’".format(state) + + "'{}' but it is in state ‘{}’".format(require_state, state) ) def execute(self, command: str) -> Tuple[int, str]: @@ -739,6 +743,7 @@ class Machine: self.shell, _ = self.shell_socket.accept() def process_serial_output() -> None: + assert self.process.stdout is not None for _line in self.process.stdout: # Ignore undecodable bytes that may occur in boot menus line = _line.decode(errors="ignore").replace("\r", "").rstrip() @@ -936,7 +941,7 @@ if __name__ == "__main__": machine.process.kill() for _, _, process, _ in vde_sockets: - process.kill() + process.terminate() log.close() tic = time.time() diff --git a/nixos/lib/testing/jquery-ui.nix b/nixos/lib/testing/jquery-ui.nix index abd59da2d28..05bd8dc2f94 100644 --- a/nixos/lib/testing/jquery-ui.nix +++ b/nixos/lib/testing/jquery-ui.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://jqueryui.com/; + homepage = "https://jqueryui.com/"; description = "A library of JavaScript widgets and effects"; platforms = stdenv.lib.platforms.all; }; diff --git a/nixos/lib/testing/jquery.nix b/nixos/lib/testing/jquery.nix index e272f66a576..732fdb3ba87 100644 --- a/nixos/lib/testing/jquery.nix +++ b/nixos/lib/testing/jquery.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JavaScript library designed to simplify the client-side scripting of HTML"; - homepage = http://jquery.com/; + homepage = "http://jquery.com/"; license = licenses.mit; platforms = platforms.all; }; diff --git a/nixos/maintainers/scripts/azure-new/.gitignore b/nixos/maintainers/scripts/azure-new/.gitignore new file mode 100644 index 00000000000..26905a86234 --- /dev/null +++ b/nixos/maintainers/scripts/azure-new/.gitignore @@ -0,0 +1 @@ +azure \ No newline at end of file diff --git a/nixos/maintainers/scripts/azure-new/README.md b/nixos/maintainers/scripts/azure-new/README.md new file mode 100644 index 00000000000..20e81c44ce5 --- /dev/null +++ b/nixos/maintainers/scripts/azure-new/README.md @@ -0,0 +1,42 @@ +# azure + +## Demo + +Here's a demo of this being used: https://asciinema.org/a/euXb9dIeUybE3VkstLWLbvhmp + +## Usage + +This is meant to be an example image that you can copy into your own +project and modify to your own needs. Notice that the example image +includes a built-in test user account, which by default uses your +`~/.ssh/id_ed25519.pub` as an `authorized_key`. + +Build and upload the image +```shell +$ ./upload-image.sh ./examples/basic/image.nix + +... ++ attr=azbasic ++ nix-build ./examples/basic/image.nix --out-link azure +/nix/store/qdpzknpskzw30vba92mb24xzll1dqsmd-azure-image +... +95.5 %, 0 Done, 0 Failed, 1 Pending, 0 Skipped, 1 Total, 2-sec Throughput (Mb/s): 932.9565 +... +/subscriptions/aff271ee-e9be-4441-b9bb-42f5af4cbaeb/resourceGroups/nixos-images/providers/Microsoft.Compute/images/azure-image-todo-makethisbetter +``` + +Take the output, boot an Azure VM: + +``` +img="/subscriptions/.../..." # use output from last command +./boot-vm.sh "${img}" +... +=> booted +``` + +## Future Work + +1. If the user specifies a hard-coded user, then the agent could be removed. + Probably has security benefits; definitely has closure-size benefits. + (It's likely the VM will need to be booted with a special flag. See: + https://github.com/Azure/azure-cli/issues/12775 for details.) diff --git a/nixos/maintainers/scripts/azure-new/boot-vm.sh b/nixos/maintainers/scripts/azure-new/boot-vm.sh new file mode 100755 index 00000000000..1ce3a5f9db1 --- /dev/null +++ b/nixos/maintainers/scripts/azure-new/boot-vm.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +set -euo pipefail +set -x + +image="${1}" +location="westus2" +group="nixos-test-vm" +vm_size="Standard_D2s_v3"; os_size=42; + +# ensure group +az group create --location "westus2" --name "${group}" +group_id="$(az group show --name "${group}" -o tsv --query "[id]")" + +# (optional) identity +if ! az identity show -n "${group}-identity" -g "${group}" &>/dev/stderr; then + az identity create --name "${group}-identity" --resource-group "${group}" +fi + +# (optional) role assignment, to the resource group, bad but not really great alternatives +identity_id="$(az identity show --name "${group}-identity" --resource-group "${group}" -o tsv --query "[id]")" +principal_id="$(az identity show --name "${group}-identity" --resource-group "${group}" -o tsv --query "[principalId]")" +until az role assignment create --assignee "${principal_id}" --role "Owner" --scope "${group_id}"; do sleep 1; done + +# boot vm +az vm create \ + --name "${group}-vm" \ + --resource-group "${group}" \ + --assign-identity "${identity_id}" \ + --size "${vm_size}" \ + --os-disk-size-gb "${os_size}" \ + --image "${image}" \ + --admin-username "${USER}" \ + --location "westus2" \ + --storage-sku "Premium_LRS" \ + --ssh-key-values "$(ssh-add -L)" + diff --git a/nixos/maintainers/scripts/azure-new/common.sh b/nixos/maintainers/scripts/azure-new/common.sh new file mode 100644 index 00000000000..eb87c3e0650 --- /dev/null +++ b/nixos/maintainers/scripts/azure-new/common.sh @@ -0,0 +1,7 @@ +export group="${AZURE_RESOURCE_GROUP:-"azure"}" +export location="${AZURE_LOCATION:-"westus2"}" + +img_file=$(echo azure/*.vhd) +img_name="$(basename "${img_file}")" +img_name="${img_name%".vhd"}" +export img_name="${img_name//[._]/-}" diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix new file mode 100644 index 00000000000..74b12815158 --- /dev/null +++ b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix @@ -0,0 +1,10 @@ +let + pkgs = (import <nixpkgs> {}); + machine = import "${pkgs.path}/nixos/lib/eval-config.nix" { + system = "x86_64-linux"; + modules = [ + ({config, ...}: { imports = [ ./system.nix ]; }) + ]; + }; +in + machine.config.system.build.azureImage diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/system.nix b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix new file mode 100644 index 00000000000..855bd3bab71 --- /dev/null +++ b/nixos/maintainers/scripts/azure-new/examples/basic/system.nix @@ -0,0 +1,34 @@ +{ pkgs, modulesPath, ... }: + +let username = "azurenixosuser"; +in +{ + imports = [ + "${modulesPath}/virtualisation/azure-common.nix" + "${modulesPath}/virtualisation/azure-image.nix" + ]; + + ## NOTE: This is just an example of how to hard-code a user. + ## The normal Azure agent IS included and DOES provision a user based + ## on the information passed at VM creation time. + users.users."${username}" = { + isNormalUser = true; + home = "/home/${username}"; + description = "Azure NixOS Test User"; + openssh.authorizedKeys.keys = [ (builtins.readFile ~/.ssh/id_ed25519.pub) ]; + }; + nix.trustedUsers = [ username ]; + + virtualisation.azureImage.diskSize = 2500; + + system.stateVersion = "20.03"; + boot.kernelPackages = pkgs.linuxPackages_latest; + + # test user doesn't have a password + services.openssh.passwordAuthentication = false; + security.sudo.wheelNeedsPassword = false; + + environment.systemPackages = with pkgs; [ + git file htop wget curl + ]; +} diff --git a/nixos/maintainers/scripts/azure-new/shell.nix b/nixos/maintainers/scripts/azure-new/shell.nix new file mode 100644 index 00000000000..592f1bf9056 --- /dev/null +++ b/nixos/maintainers/scripts/azure-new/shell.nix @@ -0,0 +1,13 @@ +with (import ../../../../default.nix {}); +stdenv.mkDerivation { + name = "nixcfg-azure-devenv"; + + nativeBuildInputs = [ + azure-cli + bash + cacert + azure-storage-azcopy + ]; + + AZURE_CONFIG_DIR="/tmp/azure-cli/.azure"; +} diff --git a/nixos/maintainers/scripts/azure-new/upload-image.sh b/nixos/maintainers/scripts/azure-new/upload-image.sh new file mode 100755 index 00000000000..1466dcd1f0a --- /dev/null +++ b/nixos/maintainers/scripts/azure-new/upload-image.sh @@ -0,0 +1,58 @@ +#!/usr/bin/env bash +set -euo pipefail +set -x + +image_nix="${1:-"./examples/basic/image.nix"}" + +nix-build "${image_nix}" --out-link "azure" + +group="nixos-images" +location="westus2" +img_name="nixos-image" +img_file="$(readlink -f ./azure/disk.vhd)" + +if ! az group show -n "${group}" &>/dev/null; then + az group create --name "${group}" --location "${location}" +fi + +# note: the disk access token song/dance is tedious +# but allows us to upload direct to a disk image +# thereby avoid storage accounts (and naming them) entirely! +if ! az disk show -g "${group}" -n "${img_name}" &>/dev/null; then + bytes="$(stat -c %s ${img_file})" + size="30" + az disk create \ + --resource-group "${group}" \ + --name "${img_name}" \ + --for-upload true --upload-size-bytes "${bytes}" + + timeout=$(( 60 * 60 )) # disk access token timeout + sasurl="$(\ + az disk grant-access \ + --access-level Write \ + --resource-group "${group}" \ + --name "${img_name}" \ + --duration-in-seconds ${timeout} \ + | jq -r '.accessSas' + )" + + azcopy copy "${img_file}" "${sasurl}" \ + --blob-type PageBlob + + az disk revoke-access \ + --resource-group "${group}" \ + --name "${img_name}" +fi + +if ! az image show -g "${group}" -n "${img_name}" &>/dev/null; then + diskid="$(az disk show -g "${group}" -n "${img_name}" -o json | jq -r .id)" + + az image create \ + --resource-group "${group}" \ + --name "${img_name}" \ + --source "${diskid}" \ + --os-type "linux" >/dev/null +fi + +imageid="$(az image show -g "${group}" -n "${img_name}" -o json | jq -r .id)" +echo "${imageid}" diff --git a/nixos/modules/config/gtk/gtk-icon-cache.nix b/nixos/modules/config/gtk/gtk-icon-cache.nix index 86a6bfb5af4..7441f4de40e 100644 --- a/nixos/modules/config/gtk/gtk-icon-cache.nix +++ b/nixos/modules/config/gtk/gtk-icon-cache.nix @@ -77,7 +77,7 @@ with lib; if [ -w "$themedir" ]; then rm -f "$themedir"/icon-theme.cache - ${pkgs.gtk3.out}/bin/gtk-update-icon-cache --ignore-theme-index "$themedir" + ${pkgs.buildPackages.gtk3.out}/bin/gtk-update-icon-cache --ignore-theme-index "$themedir" fi done ''; diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix index d4a8c926fef..24d32a00fd4 100644 --- a/nixos/modules/config/vte.nix +++ b/nixos/modules/config/vte.nix @@ -16,6 +16,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + options = { programs.bash.vteIntegration = mkOption { diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index 0ee94fed818..40984cb5ec5 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -2,19 +2,23 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.autostart.enable = mkOption { type = types.bool; default = true; description = '' - Whether to install files to support the + Whether to install files to support the <link xlink:href="https://specifications.freedesktop.org/autostart-spec/autostart-spec-latest.html">XDG Autostart specification</link>. ''; }; }; config = mkIf config.xdg.autostart.enable { - environment.pathsToLink = [ + environment.pathsToLink = [ "/etc/xdg/autostart" ]; }; diff --git a/nixos/modules/config/xdg/icons.nix b/nixos/modules/config/xdg/icons.nix index 4677ce090b0..c83fdc251ef 100644 --- a/nixos/modules/config/xdg/icons.nix +++ b/nixos/modules/config/xdg/icons.nix @@ -2,6 +2,10 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.icons.enable = mkOption { type = types.bool; diff --git a/nixos/modules/config/xdg/menus.nix b/nixos/modules/config/xdg/menus.nix index c172692df5d..6735a7a5c43 100644 --- a/nixos/modules/config/xdg/menus.nix +++ b/nixos/modules/config/xdg/menus.nix @@ -2,19 +2,23 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.menus.enable = mkOption { type = types.bool; default = true; description = '' - Whether to install files to support the + Whether to install files to support the <link xlink:href="https://specifications.freedesktop.org/menu-spec/menu-spec-latest.html">XDG Desktop Menu specification</link>. ''; }; }; config = mkIf config.xdg.menus.enable { - environment.pathsToLink = [ + environment.pathsToLink = [ "/share/applications" "/share/desktop-directories" "/etc/xdg/menus" diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix index a5374c2b468..4cdb3f30994 100644 --- a/nixos/modules/config/xdg/mime.nix +++ b/nixos/modules/config/xdg/mime.nix @@ -2,6 +2,10 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.mime.enable = mkOption { type = types.bool; diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 1330a08070c..3c7cd729c60 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -7,6 +7,10 @@ with lib; (mkRenamedOptionModule [ "services" "flatpak" "extraPortals" ] [ "xdg" "portal" "extraPortals" ]) ]; + meta = { + maintainers = teams.freedesktop.members; + }; + options.xdg.portal = { enable = mkEnableOption "<link xlink:href='https://github.com/flatpak/xdg-desktop-portal'>xdg desktop integration</link>"//{ diff --git a/nixos/modules/config/xdg/sounds.nix b/nixos/modules/config/xdg/sounds.nix index 14d6340fc33..0b94f550929 100644 --- a/nixos/modules/config/xdg/sounds.nix +++ b/nixos/modules/config/xdg/sounds.nix @@ -2,6 +2,10 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + options = { xdg.sounds.enable = mkOption { type = types.bool; diff --git a/nixos/modules/hardware/raid/hpsa.nix b/nixos/modules/hardware/raid/hpsa.nix index 4d7af138292..c4977e3fd70 100644 --- a/nixos/modules/hardware/raid/hpsa.nix +++ b/nixos/modules/hardware/raid/hpsa.nix @@ -34,7 +34,7 @@ let meta = with lib; { description = "HP Smart Array CLI"; - homepage = https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/; + homepage = "https://downloads.linux.hpe.com/SDR/downloads/MCP/Ubuntu/pool/non-free/"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ volth ]; diff --git a/nixos/modules/hardware/sensor/iio.nix b/nixos/modules/hardware/sensor/iio.nix index a8bc1880002..4c359c3b172 100644 --- a/nixos/modules/hardware/sensor/iio.nix +++ b/nixos/modules/hardware/sensor/iio.nix @@ -8,7 +8,12 @@ with lib; options = { hardware.sensor.iio = { enable = mkOption { - description = "Enable this option to support IIO sensors."; + description = '' + Enable this option to support IIO sensors. + + IIO sensors are used for orientation and ambient light + sensors on some mobile devices. + ''; type = types.bool; default = false; }; diff --git a/nixos/modules/hardware/uinput.nix b/nixos/modules/hardware/uinput.nix new file mode 100644 index 00000000000..55e86bfa6bd --- /dev/null +++ b/nixos/modules/hardware/uinput.nix @@ -0,0 +1,19 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.hardware.uinput; +in { + options.hardware.uinput = { + enable = lib.mkEnableOption "uinput support"; + }; + + config = lib.mkIf cfg.enable { + boot.kernelModules = [ "uinput" ]; + + users.groups.uinput = {}; + + services.udev.extraRules = '' + SUBSYSTEM=="misc", KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput" + ''; + }; +} diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index a3d97619fc4..b4746b21b65 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -75,5 +75,9 @@ in QT_IM_MODULE = "ibus"; XMODIFIERS = "@im=ibus"; }; + + xdg.portal.extraPortals = mkIf config.xdg.portal.enable [ + ibusPackage + ]; }; } diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 24070a78694..9303e8fde13 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -18,8 +18,6 @@ with lib; # ISO naming. isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso"; - isoImage.volumeID = substring 0 11 "NIXOS_ISO"; - # EFI booting isoImage.makeEfiBootable = true; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 62cbdbcfd17..84394a1ecae 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -7,6 +7,8 @@ with lib; { imports = [ ./installation-cd-graphical-base.nix ]; + isoImage.edition = "gnome"; + services.xserver.desktopManager.gnome3.enable = true; # Wayland can be problematic for some hardware like Nvidia graphics cards. diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix index e00d3f7535b..e76e06654ac 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-plasma5.nix @@ -8,6 +8,8 @@ with lib; { imports = [ ./installation-cd-graphical-base.nix ]; + isoImage.edition = "plasma5"; + services.xserver = { desktopManager.plasma5 = { enable = true; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix index bcdbffdc20b..97506045e0e 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix @@ -8,5 +8,7 @@ [ ./installation-cd-base.nix ]; + isoImage.edition = "minimal"; + fonts.fontconfig.enable = false; } diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 4558b4dc955..cce7cc235ec 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -417,8 +417,17 @@ in ''; }; + isoImage.edition = mkOption { + default = ""; + description = '' + Specifies which edition string to use in the volume ID of the generated + ISO image. + ''; + }; + isoImage.volumeID = mkOption { - default = "NIXOS_BOOT_CD"; + # nixos-$EDITION-$RELEASE-$ARCH + default = "nixos${optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}"}-${config.system.nixos.release}-${pkgs.stdenv.hostPlatform.uname.processor}"; description = '' Specifies the label or volume ID of the generated ISO image. Note that the label is used by stage 1 of the boot process to @@ -474,7 +483,7 @@ in isoImage.efiSplashImage = mkOption { default = pkgs.fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/efi-background.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/efi-background.png"; sha256 = "18lfwmp8yq923322nlb9gxrh5qikj1wsk6g5qvdh31c4h5b1538x"; }; description = '' @@ -484,7 +493,7 @@ in isoImage.splashImage = mkOption { default = pkgs.fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/isolinux/bios-boot.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/a9e05d7deb38a8e005a2b52575a3f59a63a4dba0/bootloader/isolinux/bios-boot.png"; sha256 = "1wp822zrhbg4fgfbwkr7cbkr4labx477209agzc0hr6k62fr6rxd"; }; description = '' @@ -515,6 +524,19 @@ in }; config = { + assertions = [ + { + assertion = !(stringLength config.isoImage.volumeID > 32); + # https://wiki.osdev.org/ISO_9660#The_Primary_Volume_Descriptor + # Volume Identifier can only be 32 bytes + message = let + length = stringLength config.isoImage.volumeID; + howmany = toString length; + toomany = toString (length - 32); + in + "isoImage.volumeID ${config.isoImage.volumeID} is ${howmany} characters. That is ${toomany} characters longer than the limit of 32."; + } + ]; boot.loader.grub.version = 2; diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 2068f27f1c9..9038bfbe3bd 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/ddmmzn4ggz1f66lwxjy64n89864yj9w9-nix-2.3.3"; - i686-linux = "/nix/store/5axys7hsggb4282dsbps5k5p0v59yv13-nix-2.3.3"; - aarch64-linux = "/nix/store/k80nwvi19hxwbz3c9cxgp24f1jjxwmcc-nix-2.3.3"; - x86_64-darwin = "/nix/store/lrnvapsqmf0ja6zfyx4cpxr7ahdr7f9b-nix-2.3.3"; + x86_64-linux = "/nix/store/3swr40kk8ll7pi9dd7b4npr25hyn5qhv-nix-2.3.4-debug"; + i686-linux = "/nix/store/b5cx3nmba9ahx3wk5ybxa67k40pdpdxn-nix-2.3.4"; + aarch64-linux = "/nix/store/lz9s7vi1kvgqzvrcjwwdszx8an61n266-nix-2.3.4-debug"; + x86_64-darwin = "/nix/store/aizhr07dljmlbf17wfrj40x3s0b5iv3d-nix-2.3.4"; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 629c56814a1..a32c19a4eba 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -91,9 +91,6 @@ sub hasCPUFeature { } -# Detect the number of CPU cores. -my $cpus = scalar (grep {/^processor\s*:/} (split '\n', $cpuinfo)); - # Determine CPU governor to use if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") { @@ -562,7 +559,6 @@ my $hwConfig = <<EOF; boot.kernelModules = [$kernelModules ]; boot.extraModulePackages = [$modulePackages ]; $fsAndSwap - nix.maxJobs = lib.mkDefault $cpus; ${\join "", (map { " $_\n" } (uniq @attrs))}} EOF diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index 9557def622d..ae98fba1580 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -76,7 +76,7 @@ in defaultChannel = mkOption { internal = true; type = types.str; - default = https://nixos.org/channels/nixos-unstable; + default = "https://nixos.org/channels/nixos-unstable"; description = "Default NixOS channel to which the root user is subscribed."; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index fb8021e848e..c3d2bb85809 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -65,6 +65,7 @@ ./hardware/usb-wwan.nix ./hardware/onlykey.nix ./hardware/wooting.nix + ./hardware/uinput.nix ./hardware/video/amdgpu.nix ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix @@ -294,7 +295,6 @@ ./services/desktops/deepin/deepin.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix - ./services/desktops/pantheon/contractor.nix ./services/desktops/pantheon/files.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix @@ -368,6 +368,7 @@ ./services/hardware/thermald.nix ./services/hardware/undervolt.nix ./services/hardware/vdr.nix + ./services/hardware/xow.nix ./services/logging/SystemdJournal2Gelf.nix ./services/logging/awstats.nix ./services/logging/fluentd.nix @@ -642,6 +643,7 @@ ./services/networking/lldpd.nix ./services/networking/logmein-hamachi.nix ./services/networking/mailpile.nix + ./services/networking/magic-wormhole-mailbox-server.nix ./services/networking/matterbridge.nix ./services/networking/mjpg-streamer.nix ./services/networking/minidlna.nix @@ -652,6 +654,7 @@ ./services/networking/miredo.nix ./services/networking/mstpd.nix ./services/networking/mtprotoproxy.nix + ./services/networking/mullvad-vpn.nix ./services/networking/murmur.nix ./services/networking/mxisd.nix ./services/networking/namecoind.nix @@ -680,6 +683,7 @@ ./services/networking/ostinato.nix ./services/networking/owamp.nix ./services/networking/pdnsd.nix + ./services/networking/pixiecore.nix ./services/networking/polipo.nix ./services/networking/powerdns.nix ./services/networking/pdns-recursor.nix @@ -690,6 +694,7 @@ ./services/networking/prosody.nix ./services/networking/quagga.nix ./services/networking/quassel.nix + ./services/networking/quorum.nix ./services/networking/quicktun.nix ./services/networking/racoon.nix ./services/networking/radicale.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index f7b2f5c7fc1..35743d83134 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -14,6 +14,9 @@ with lib; nix.allowedUsers = mkDefault [ "@users" ]; + environment.memoryAllocator.provider = mkDefault "scudo"; + environment.variables.SCUDO_OPTIONS = mkDefault "ZeroContents=1"; + security.hideProcessInformation = mkDefault true; security.lockKernelModules = mkDefault true; diff --git a/nixos/modules/programs/geary.nix b/nixos/modules/programs/geary.nix index 01803bc411e..5e441a75cb6 100644 --- a/nixos/modules/programs/geary.nix +++ b/nixos/modules/programs/geary.nix @@ -6,6 +6,10 @@ let cfg = config.programs.geary; in { + meta = { + maintainers = teams.gnome.members; + }; + options = { programs.geary.enable = mkEnableOption "Geary, a Mail client for GNOME 3"; }; diff --git a/nixos/modules/programs/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix index 1cf839a6ddb..80dc2983ea5 100644 --- a/nixos/modules/programs/gnome-disks.nix +++ b/nixos/modules/programs/gnome-disks.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + # Added 2019-08-09 imports = [ (mkRenamedOptionModule diff --git a/nixos/modules/programs/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix index bfa3d409ee3..9dd53483055 100644 --- a/nixos/modules/programs/gnome-documents.nix +++ b/nixos/modules/programs/gnome-documents.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + # Added 2019-08-09 imports = [ (mkRenamedOptionModule diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix index 0036677a157..f2617e5bc03 100644 --- a/nixos/modules/programs/gnome-terminal.nix +++ b/nixos/modules/programs/gnome-terminal.nix @@ -12,6 +12,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + # Added 2019-08-19 imports = [ (mkRenamedOptionModule @@ -20,9 +24,7 @@ in ]; options = { - programs.gnome-terminal.enable = mkEnableOption "GNOME Terminal"; - }; config = mkIf cfg.enable { diff --git a/nixos/modules/programs/nm-applet.nix b/nixos/modules/programs/nm-applet.nix index 1b806071c43..273a6dec59a 100644 --- a/nixos/modules/programs/nm-applet.nix +++ b/nixos/modules/programs/nm-applet.nix @@ -1,6 +1,10 @@ { config, lib, pkgs, ... }: { + meta = { + maintainers = lib.teams.freedesktop.members; + }; + options.programs.nm-applet.enable = lib.mkEnableOption "nm-applet"; config = lib.mkIf config.programs.nm-applet.enable { diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index 80198990ed1..44e65ee8a9a 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -61,12 +61,9 @@ in ''; }; - # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.) pubkeyAcceptedKeyTypes = mkOption { type = types.listOf types.str; - default = [ - "+ssh-dss" - ]; + default = []; example = [ "ssh-ed25519" "ssh-rsa" ]; description = '' Specifies the key types that will be used for public key authentication. @@ -75,9 +72,7 @@ in hostKeyAlgorithms = mkOption { type = types.listOf types.str; - default = [ - "+ssh-dss" - ]; + default = []; example = [ "ssh-ed25519" "ssh-rsa" ]; description = '' Specifies the host key algorithms that the client wants to use in order of preference. diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index b787a767539..df5f33c9461 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -301,7 +301,7 @@ in # StateDirectory must be relative, and will be created under /var/lib by systemd lpath = "acme/${cert}"; apath = "/var/lib/${lpath}"; - spath = "/var/lib/acme/.lego"; + spath = "/var/lib/acme/.lego/${cert}"; fileMode = if data.allowKeysForGroup then "640" else "600"; globalOpts = [ "-d" data.domain "--email" data.email "--path" "." "--key-type" data.keyType ] ++ optionals (cfg.acceptTerms) [ "--accept-tos" ] @@ -318,7 +318,7 @@ in description = "Renew ACME Certificate for ${cert}"; after = [ "network.target" "network-online.target" ]; wants = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; + wantedBy = mkIf (!config.boot.isContainer) [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; # With RemainAfterExit the service is considered active even @@ -330,7 +330,7 @@ in User = data.user; Group = data.group; PrivateTmp = true; - StateDirectory = "acme/.lego ${lpath}"; + StateDirectory = "acme/.lego/${cert} ${lpath}"; StateDirectoryMode = if data.allowKeysForGroup then "750" else "700"; WorkingDirectory = spath; # Only try loading the credentialsFile if the dns challenge is enabled diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 7729da27304..160dbddcd48 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -63,9 +63,11 @@ in { javaProperties = mkOption { type = types.attrs; default = { }; - example = { - "java.net.preferIPv4Stack" = "true"; - }; + example = literalExample '' + { + "java.net.preferIPv4Stack" = "true"; + } + ''; apply = attrs: { "activemq.base" = "${cfg.baseDir}"; "activemq.data" = "${cfg.baseDir}/data"; diff --git a/nixos/modules/services/backup/borgbackup.nix b/nixos/modules/services/backup/borgbackup.nix index a2eb80c55a8..be661b201f0 100644 --- a/nixos/modules/services/backup/borgbackup.nix +++ b/nixos/modules/services/backup/borgbackup.nix @@ -189,6 +189,7 @@ let in { meta.maintainers = with maintainers; [ dotlambda ]; + meta.doc = ./borgbackup.xml; ###### interface @@ -197,10 +198,11 @@ in { Deduplicating backups using BorgBackup. Adding a job will cause a borg-job-NAME wrapper to be added to your system path, so that you can perform maintenance easily. + See also the chapter about BorgBackup in the NixOS manual. ''; default = { }; example = literalExample '' - { + { # for a local backup rootBackup = { paths = "/"; exclude = [ "/nix" ]; @@ -213,6 +215,23 @@ in { startAt = "weekly"; }; } + { # Root backing each day up to a remote backup server. We assume that you have + # * created a password less key: ssh-keygen -N "" -t ed25519 -f /path/to/ssh_key + # best practices are: use -t ed25519, /path/to = /run/keys + # * the passphrase is in the file /run/keys/borgbackup_passphrase + # * you have initialized the repository manually + paths = [ "/etc" "/home" ]; + exclude = [ "/nix" "'**/.cache'" ]; + doInit = false; + repo = "user3@arep.repo.borgbase.com:repo"; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /path/to/passphrase"; + }; + environment = { BORG_RSH = "ssh -i /path/to/ssh_key"; }; + compression = "auto,lzma"; + startAt = "daily"; + }; ''; type = types.attrsOf (types.submodule (let globalConfig = config; in { name, config, ... }: { @@ -268,6 +287,8 @@ in { <manvolnum>7</manvolnum></citerefentry>. If you do not want the backup to start automatically, use <literal>[ ]</literal>. + It will generate a systemd service borgbackup-job-NAME. + You may trigger it manually via systemctl restart borgbackup-job-NAME. ''; }; @@ -303,6 +324,10 @@ in { you to specify a <option>passCommand</option> or a <option>passphrase</option>. ''; + example = '' + encryption.mode = "repokey-blake2" ; + encryption.passphrase = "mySecretPassphrase" ; + ''; }; encryption.passCommand = mkOption { @@ -538,6 +563,7 @@ in { description = '' Serve BorgBackup repositories to given public SSH keys, restricting their access to the repository only. + See also the chapter about BorgBackup in the NixOS manual. Also, clients do not need to specify the absolute path when accessing the repository, i.e. <literal>user@machine:.</literal> is enough. (Note colon and dot.) ''; diff --git a/nixos/modules/services/backup/borgbackup.xml b/nixos/modules/services/backup/borgbackup.xml new file mode 100644 index 00000000000..bef7db608f8 --- /dev/null +++ b/nixos/modules/services/backup/borgbackup.xml @@ -0,0 +1,227 @@ +<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-borgbase"> + <title>BorgBackup</title> + <para> + <emphasis>Source:</emphasis> + <filename>modules/services/backup/borgbackup.nix</filename> + </para> + <para> + <emphasis>Upstream documentation:</emphasis> + <link xlink:href="https://borgbackup.readthedocs.io/"/> + </para> + <para> + <link xlink:href="https://www.borgbackup.org/">BorgBackup</link> (short: Borg) + is a deduplicating backup program. Optionally, it supports compression and + authenticated encryption. + </para> + <para> + The main goal of Borg is to provide an efficient and secure way to backup + data. The data deduplication technique used makes Borg suitable for daily + backups since only changes are stored. The authenticated encryption technique + makes it suitable for backups to not fully trusted targets. + </para> + <section xml:id="module-services-backup-borgbackup-configuring"> + <title>Configuring</title> + <para> + A complete list of options for the Borgbase module may be found + <link linkend="opt-services.borgbackup.jobs">here</link>. + </para> +</section> + <section xml:id="opt-services-backup-borgbackup-local-directory"> + <title>Basic usage for a local backup</title> + + <para> + A very basic configuration for backing up to a locally accessible directory + is: +<programlisting> +{ + opt.services.borgbackup.jobs = { + { rootBackup = { + paths = "/"; + exclude = [ "/nix" "/path/to/local/repo" ]; + repo = "/path/to/local/repo"; + doInit = true; + encryption = { + mode = "repokey"; + passphrase = "secret"; + }; + compression = "auto,lzma"; + startAt = "weekly"; + }; + } + }; +}</programlisting> + </para> + <warning> + <para> + If you do not want the passphrase to be stored in the world-readable + Nix store, use passCommand. You find an example below. + </para> + </warning> + </section> +<section xml:id="opt-services-backup-create-server"> + <title>Create a borg backup server</title> + <para>You should use a different SSH key for each repository you write to, + because the specified keys are restricted to running borg serve and can only + access this single repository. You need the output of the generate pub file. + </para> + <para> + <programlisting> +# sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_my_borg_repo +# cat /run/keys/id_ed25519_my_borg_repo +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos</programlisting> + </para> + <para> + Add the following snippet to your NixOS configuration: + <programlisting> +{ + services.borgbackup.repos = { + my_borg_repo = { + authorizedKeys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAID78zmOyA+5uPG4Ot0hfAy+sLDPU1L4AiIoRYEIVbbQ/ root@nixos" + ] ; + path = "/var/lib/my_borg_repo" ; + }; + }; +}</programlisting> + </para> +</section> + + <section xml:id="opt-services-backup-borgbackup-remote-server"> + <title>Backup to the borg repository server</title> + <para>The following NixOS snippet creates an hourly backup to the service + (on the host nixos) as created in the section above. We assume + that you have stored a secret passphrasse in the file + <code>/run/keys/borgbackup_passphrase</code>, which should be only + accessible by root + </para> + <para> + <programlisting> +{ + services.borgbackup.jobs = { + backupToLocalServer = { + paths = [ "/etc/nixos" ]; + doInit = true; + repo = "borg@nixos:." ; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /run/keys/borgbackup_passphrase"; + }; + environment = { BORG_RSH = "ssh -i /run/keys/id_ed25519_my_borg_repo"; }; + compression = "auto,lzma"; + startAt = "hourly"; + }; + }; +};</programlisting> + </para> + <para>The following few commands (run as root) let you test your backup. + <programlisting> +> nixos-rebuild switch +...restarting the following units: polkit.service +> systemctl restart borgbackup-job-backupToLocalServer +> sleep 10 +> systemctl restart borgbackup-job-backupToLocalServer +> export BORG_PASSPHRASE=topSecrect +> borg list --rsh='ssh -i /run/keys/id_ed25519_my_borg_repo' borg@nixos:. +nixos-backupToLocalServer-2020-03-30T21:46:17 Mon, 2020-03-30 21:46:19 [84feb97710954931ca384182f5f3cb90665f35cef214760abd7350fb064786ac] +nixos-backupToLocalServer-2020-03-30T21:46:30 Mon, 2020-03-30 21:46:32 [e77321694ecd160ca2228611747c6ad1be177d6e0d894538898de7a2621b6e68]</programlisting> + </para> +</section> + + <section xml:id="opt-services-backup-borgbackup-borgbase"> + <title>Backup to a hosting service</title> + + <para> + Several companies offer <link + xlink:href="https://www.borgbackup.org/support/commercial.html">(paid) + hosting services</link> for Borg repositories. + </para> + <para> + To backup your home directory to borgbase you have to: + </para> + <itemizedlist> + <listitem> + <para> + Generate a SSH key without a password, to access the remote server. E.g. + </para> + <para> + <programlisting>sudo ssh-keygen -N '' -t ed25519 -f /run/keys/id_ed25519_borgbase</programlisting> + </para> + </listitem> + <listitem> + <para> + Create the repository on the server by following the instructions for your + hosting server. + </para> + </listitem> + <listitem> + <para> + Initialize the repository on the server. Eg. + <programlisting> +sudo borg init --encryption=repokey-blake2 \ + -rsh "ssh -i /run/keys/id_ed25519_borgbase" \ + zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo</programlisting> + </para> + </listitem> + <listitem> +<para>Add it to your NixOS configuration, e.g. +<programlisting> +{ + services.borgbackup.jobs = { + my_Remote_Backup = { + paths = [ "/" ]; + exclude = [ "/nix" "'**/.cache'" ]; + repo = "zzz2aaaaa@zzz2aaaaa.repo.borgbase.com:repo"; + encryption = { + mode = "repokey-blake2"; + passCommand = "cat /run/keys/borgbackup_passphrase"; + }; + BORG_RSH = "ssh -i /run/keys/id_ed25519_borgbase"; + compression = "auto,lzma"; + startAt = "daily"; + }; + }; +}}</programlisting> + </para> + </listitem> +</itemizedlist> + </section> + <section xml:id="opt-services-backup-borgbackup-vorta"> + <title>Vorta backup client for the desktop</title> + <para> + Vorta is a backup client for macOS and Linux desktops. It integrates the + mighty BorgBackup with your desktop environment to protect your data from + disk failure, ransomware and theft. + </para> + <para> + It is available as a flatpak package. To enable it you must set the + following two configuration items. + </para> + <para> + <programlisting> +services.flatpak.enable = true ; +# next line is needed to avoid the Error +# Error deploying: GDBus.Error:org.freedesktop.DBus.Error.ServiceUnknown: +services.accounts-daemon.enable = true; + </programlisting> + </para> + <para>As a normal user you must first install, then run vorta using the + following commands: + <programlisting> +flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +flatpak install flathub com.borgbase.Vorta +flatpak run --branch=stable --arch=x86_64 --command=vorta com.borgbase.Vorta +</programlisting> + After running <code>flatpak install</code> you can start Vorta also via + the KDE application menu. + </para> + <para> + Details about using Vorta can be found under <link + xlink:href="https://vorta.borgbase.com/usage">https://vorta.borgbase.com + </link>. + </para> + </section> +</chapter> diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 53787a0182a..fff119c2cf0 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -138,7 +138,11 @@ in { }; })); default = {}; - example."pool/test".target = "root@target:pool/test"; + example = literalExample '' + { + "pool/test".target = "root@target:pool/test"; + } + ''; description = "Syncoid commands to run."; }; }; diff --git a/nixos/modules/services/cluster/hadoop/default.nix b/nixos/modules/services/cluster/hadoop/default.nix index f0f5a6ecbfc..bfb73f68371 100644 --- a/nixos/modules/services/cluster/hadoop/default.nix +++ b/nixos/modules/services/cluster/hadoop/default.nix @@ -7,33 +7,41 @@ with lib; options.services.hadoop = { coreSite = mkOption { default = {}; - example = { - "fs.defaultFS" = "hdfs://localhost"; - }; + example = literalExample '' + { + "fs.defaultFS" = "hdfs://localhost"; + } + ''; description = "Hadoop core-site.xml definition"; }; hdfsSite = mkOption { default = {}; - example = { - "dfs.nameservices" = "namenode1"; - }; + example = literalExample '' + { + "dfs.nameservices" = "namenode1"; + } + ''; description = "Hadoop hdfs-site.xml definition"; }; mapredSite = mkOption { default = {}; - example = { - "mapreduce.map.cpu.vcores" = "1"; - }; + example = literalExample '' + { + "mapreduce.map.cpu.vcores" = "1"; + } + ''; description = "Hadoop mapred-site.xml definition"; }; yarnSite = mkOption { default = {}; - example = { - "yarn.resourcemanager.ha.id" = "resourcemanager1"; - }; + example = literalExample '' + { + "yarn.resourcemanager.ha.id" = "resourcemanager1"; + } + ''; description = "Hadoop yarn-site.xml definition"; }; diff --git a/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/nixos/modules/services/cluster/kubernetes/addon-manager.nix index 17f2dde31a7..f55079300b1 100644 --- a/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -88,7 +88,7 @@ in services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled (let - name = system:kube-addon-manager; + name = "system:kube-addon-manager"; namespace = "kube-system"; in { diff --git a/nixos/modules/services/continuous-integration/buildkite-agents.nix b/nixos/modules/services/continuous-integration/buildkite-agents.nix index c17d89c387a..b0045409ae6 100644 --- a/nixos/modules/services/continuous-integration/buildkite-agents.nix +++ b/nixos/modules/services/continuous-integration/buildkite-agents.nix @@ -208,8 +208,12 @@ in description = "Buildkite agent user"; extraGroups = [ "keys" ]; isSystemUser = true; + group = "buildkite-agent-${name}"; }; }); + config.users.groups = mapAgents (name: cfg: { + "buildkite-agent-${name}" = {}; + }); config.systemd.services = mapAgents (name: cfg: { "buildkite-agent-${name}" = diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 3d307b1abcf..bd4cf6a37ba 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -120,10 +120,16 @@ in ++ optional hasDocker "docker.service"; requires = optional hasDocker "docker.service"; wantedBy = [ "multi-user.target" ]; + reloadIfChanged = true; + restartTriggers = [ + config.environment.etc."gitlab-runner/config.toml".source + ]; serviceConfig = { + StateDirectory = "gitlab-runner"; + ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \ --working-directory ${cfg.workDir} \ - --config ${configFile} \ + --config /etc/gitlab-runner/config.toml \ --service gitlab-runner \ --user gitlab-runner \ ''; @@ -138,6 +144,9 @@ in # Make the gitlab-runner command availabe so users can query the runner environment.systemPackages = [ cfg.package ]; + # Make sure the config can be reloaded on change + environment.etc."gitlab-runner/config.toml".source = configFile; + users.users.gitlab-runner = { group = "gitlab-runner"; extraGroups = optional hasDocker "docker"; diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 8b56207590a..52e4a3aed33 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -37,6 +37,8 @@ let haveLocalDB = cfg.dbi == localDB; + inherit (config.system) stateVersion; + in { @@ -63,8 +65,7 @@ in }; package = mkOption { - type = types.path; - default = pkgs.hydra; + type = types.package; defaultText = "pkgs.hydra"; description = "The Hydra package."; }; @@ -194,6 +195,34 @@ in config = mkIf cfg.enable { + warnings = optional (cfg.package.migration or false) '' + You're currently deploying an older version of Hydra which is needed to + make some required database changes[1]. As soon as this is done, it's recommended + to run `hydra-backfill-ids` and set `services.hydra.package` to `pkgs.hydra-unstable` + after that. + + [1] https://github.com/NixOS/hydra/pull/711 + ''; + + services.hydra.package = with pkgs; + mkDefault ( + if pkgs ? hydra + then throw '' + The Hydra package doesn't exist anymore in `nixpkgs`! It probably exists + due to an overlay. To upgrade Hydra, you need to take two steps as some + bigger changes in the database schema were implemented recently[1]. You first + need to deploy `pkgs.hydra-migration`, run `hydra-backfill-ids` on the server + and then deploy `pkgs.hydra-unstable`. + + If you want to use `pkgs.hydra` from your overlay, please set `services.hydra.package` + explicitly to `pkgs.hydra` and make sure you know what you're doing. + + [1] https://github.com/NixOS/hydra/pull/711 + '' + else if versionOlder stateVersion "20.03" then hydra-migration + else hydra-unstable + ); + users.groups.hydra = { gid = config.ids.gids.hydra; }; diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml index 72d4a8249a3..07af4c937f0 100644 --- a/nixos/modules/services/databases/postgresql.xml +++ b/nixos/modules/services/databases/postgresql.xml @@ -7,12 +7,10 @@ <!-- FIXME: render nicely --> <!-- FIXME: source can be added automatically --> <para> - <emphasis>Source:</emphasis> - <filename>modules/services/databases/postgresql.nix</filename> + <emphasis>Source:</emphasis> <filename>modules/services/databases/postgresql.nix</filename> </para> <para> - <emphasis>Upstream documentation:</emphasis> - <link xlink:href="http://www.postgresql.org/docs/"/> + <emphasis>Upstream documentation:</emphasis> <link xlink:href="http://www.postgresql.org/docs/"/> </para> <!-- FIXME: more stuff, like maintainer? --> <para> @@ -23,18 +21,12 @@ <title>Configuring</title> <para> - To enable PostgreSQL, add the following to your - <filename>configuration.nix</filename>: + To enable PostgreSQL, add the following to your <filename>configuration.nix</filename>: <programlisting> <xref linkend="opt-services.postgresql.enable"/> = true; <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11; </programlisting> - Note that you are required to specify the desired version of PostgreSQL - (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your - PostgreSQL version requires a database dump and reload (see below), NixOS - cannot provide a default value for - <xref linkend="opt-services.postgresql.package"/> such as the most recent - release of PostgreSQL. + Note that you are required to specify the desired version of PostgreSQL (e.g. <literal>pkgs.postgresql_11</literal>). Since upgrading your PostgreSQL version requires a database dump and reload (see below), NixOS cannot provide a default value for <xref linkend="opt-services.postgresql.package"/> such as the most recent release of PostgreSQL. </para> <!-- @@ -51,9 +43,7 @@ Type "help" for help. --> <para> - By default, PostgreSQL stores its databases in - <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using - <xref linkend="opt-services.postgresql.dataDir"/>, e.g. + By default, PostgreSQL stores its databases in <filename>/var/lib/postgresql/$psqlSchema</filename>. You can override this using <xref linkend="opt-services.postgresql.dataDir"/>, e.g. <programlisting> <xref linkend="opt-services.postgresql.dataDir"/> = "/data/postgresql"; </programlisting> @@ -63,25 +53,83 @@ Type "help" for help. <title>Upgrading</title> <para> - FIXME: document dump/upgrade/load cycle. + Major PostgreSQL upgrade requires PostgreSQL downtime and a few imperative steps to be called. To simplify this process, use the following NixOS module: +<programlisting> + containers.temp-pg.config.services.postgresql = { + enable = true; + package = pkgs.postgresql_12; + ## set a custom new dataDir + # dataDir = "/some/data/dir"; + }; + environment.systemPackages = + let newpg = config.containers.temp-pg.config.services.postgresql; + in [ + (pkgs.writeScriptBin "upgrade-pg-cluster" '' + set -x + export OLDDATA="${config.services.postgresql.dataDir}" + export NEWDATA="${newpg.dataDir}" + export OLDBIN="${config.services.postgresql.package}/bin" + export NEWBIN="${newpg.package}/bin" + + install -d -m 0700 -o postgres -g postgres "$NEWDATA" + cd "$NEWDATA" + sudo -u postgres $NEWBIN/initdb -D "$NEWDATA" + + systemctl stop postgresql # old one + + sudo -u postgres $NEWBIN/pg_upgrade \ + --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \ + --old-bindir $OLDBIN --new-bindir $NEWBIN \ + "$@" + '') + ]; +</programlisting> </para> + + <para> + The upgrade process is: + </para> + + <orderedlist> + <listitem> + <para> + Rebuild nixos configuration with the configuration above added to your <filename>configuration.nix</filename>. Alternatively, add that into separate file and reference it in <literal>imports</literal> list. + </para> + </listitem> + <listitem> + <para> + Login as root (<literal>sudo su -</literal>) + </para> + </listitem> + <listitem> + <para> + Run <literal>upgrade-pg-cluster</literal>. It will stop old postgresql, initialize new one and migrate old one to new one. You may supply arguments like <literal>--jobs 4</literal> and <literal>--link</literal> to speedup migration process. See <link xlink:href="https://www.postgresql.org/docs/current/pgupgrade.html" /> for details. + </para> + </listitem> + <listitem> + <para> + Change postgresql package in NixOS configuration to the one you were upgrading to, and change <literal>dataDir</literal> to the one you have migrated to. Rebuild NixOS. This should start new postgres using upgraded data directory. + </para> + </listitem> + <listitem> + <para> + After upgrade you may want to <literal>ANALYZE</literal> new db. + </para> + </listitem> + </orderedlist> </section> <section xml:id="module-services-postgres-options"> <title>Options</title> <para> - A complete list of options for the PostgreSQL module may be found - <link linkend="opt-services.postgresql.enable">here</link>. + A complete list of options for the PostgreSQL module may be found <link linkend="opt-services.postgresql.enable">here</link>. </para> </section> <section xml:id="module-services-postgres-plugins"> <title>Plugins</title> <para> - Plugins collection for each PostgreSQL version can be accessed with - <literal>.pkgs</literal>. For example, for - <literal>pkgs.postgresql_11</literal> package, its plugin collection is - accessed by <literal>pkgs.postgresql_11.pkgs</literal>: + Plugins collection for each PostgreSQL version can be accessed with <literal>.pkgs</literal>. For example, for <literal>pkgs.postgresql_11</literal> package, its plugin collection is accessed by <literal>pkgs.postgresql_11.pkgs</literal>: <screen> <prompt>$ </prompt>nix repl '<nixpkgs>' @@ -98,8 +146,9 @@ postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga ... </screen> </para> + <para> - To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>: + To add plugins via NixOS configuration, set <literal>services.postgresql.extraPlugins</literal>: <programlisting> <xref linkend="opt-services.postgresql.package"/> = pkgs.postgresql_11; <xref linkend="opt-services.postgresql.extraPlugins"/> = with pkgs.postgresql_11.pkgs; [ @@ -108,10 +157,9 @@ postgresql_11.pkgs.pg_partman postgresql_11.pkgs.pgroonga ]; </programlisting> </para> + <para> - You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using - function <literal>.withPackages</literal>. For example, creating a custom - PostgreSQL package in an overlay can look like: + You can build custom PostgreSQL-with-plugins (to be used outside of NixOS) using function <literal>.withPackages</literal>. For example, creating a custom PostgreSQL package in an overlay can look like: <programlisting> self: super: { postgresql_custom = self.postgresql_11.withPackages (ps: [ @@ -121,8 +169,9 @@ self: super: { } </programlisting> </para> + <para> - Here's a recipe on how to override a particular plugin through an overlay: + Here's a recipe on how to override a particular plugin through an overlay: <programlisting> self: super: { postgresql_11 = super.postgresql_11.override { this = self.postgresql_11; } // { diff --git a/nixos/modules/services/desktops/accountsservice.nix b/nixos/modules/services/desktops/accountsservice.nix index c48036a99e8..ae2ecb5ffeb 100644 --- a/nixos/modules/services/desktops/accountsservice.nix +++ b/nixos/modules/services/desktops/accountsservice.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.freedesktop.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/bamf.nix b/nixos/modules/services/desktops/bamf.nix index 0928ee81a64..4b35146d084 100644 --- a/nixos/modules/services/desktops/bamf.nix +++ b/nixos/modules/services/desktops/bamf.nix @@ -5,6 +5,10 @@ with lib; { + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix index 8fa108c4f9d..492242e3296 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome3/at-spi2-core.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix index 3d2b3ed85e3..3c7f217b18d 100644 --- a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix +++ b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix @@ -4,6 +4,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { services.gnome3.chrome-gnome-shell.enable = mkEnableOption '' diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix index 7e312a1b81e..bd62d16f61c 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome3/evolution-data-server.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { @@ -16,7 +20,7 @@ with lib; type = types.bool; default = false; description = '' - Whether to enable Evolution Data Server, a collection of services for + Whether to enable Evolution Data Server, a collection of services for storing addressbooks and calendars. ''; }; diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixos/modules/services/desktops/gnome3/glib-networking.nix index fcd58509d6f..7e667b6b1f0 100644 --- a/nixos/modules/services/desktops/gnome3/glib-networking.nix +++ b/nixos/modules/services/desktops/gnome3/glib-networking.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix index d715d52c2d0..c391ad9694c 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix @@ -44,6 +44,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix index db60445ef77..2916a3c82b3 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-keyring.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { @@ -35,6 +39,8 @@ with lib; services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ]; + xdg.portal.extraPortals = [ pkgs.gnome3.gnome-keyring ]; + security.pam.services.login.enableGnomeKeyring = true; security.wrappers.gnome-keyring-daemon = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix index 748a025414a..3f9ced5e86b 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix index d406bf6f5e3..39d669e8b30 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix index 021f4f9534b..164a0a44f8c 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix @@ -4,6 +4,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { services.gnome3.gnome-remote-desktop = { @@ -13,6 +17,8 @@ with lib; ###### implementation config = mkIf config.services.gnome3.gnome-remote-desktop.enable { + services.pipewire.enable = true; + systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ]; }; } diff --git a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix index 2f83fd653bd..1c33ed064a1 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix @@ -12,6 +12,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + imports = [ (mkRemovedOptionModule ["services" "gnome3" "gnome-settings-daemon" "package"] diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix index f8396287770..f2fe8b41a9e 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome3/gnome-user-share.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome3/rygel.nix index b6c44590a2e..917a1d6541e 100644 --- a/nixos/modules/services/desktops/gnome3/rygel.nix +++ b/nixos/modules/services/desktops/gnome3/rygel.nix @@ -4,6 +4,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { services.gnome3.rygel = { @@ -27,6 +31,6 @@ with lib; systemd.packages = [ pkgs.gnome3.rygel ]; - environment.etc."rygel.conf" = "${pkgs.gnome3.rygel}/etc/rygel.conf"; + environment.etc."rygel.conf".source = "${pkgs.gnome3.rygel}/etc/rygel.conf"; }; } diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome3/sushi.nix index 7a4389038b2..83b17365d5d 100644 --- a/nixos/modules/services/desktops/gnome3/sushi.nix +++ b/nixos/modules/services/desktops/gnome3/sushi.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/nixos/modules/services/desktops/gnome3/tracker-miners.nix index b390d8368c6..f2af4024927 100644 --- a/nixos/modules/services/desktops/gnome3/tracker-miners.nix +++ b/nixos/modules/services/desktops/gnome3/tracker-miners.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { @@ -25,7 +29,6 @@ with lib; }; - ###### implementation config = mkIf config.services.gnome3.tracker-miners.enable { diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome3/tracker.nix index 2e829274226..cd196e38553 100644 --- a/nixos/modules/services/desktops/gnome3/tracker.nix +++ b/nixos/modules/services/desktops/gnome3/tracker.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix index 1d002eac41d..250ea6d4575 100644 --- a/nixos/modules/services/desktops/gvfs.nix +++ b/nixos/modules/services/desktops/gvfs.nix @@ -12,6 +12,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + # Added 2019-08-19 imports = [ (mkRenamedOptionModule diff --git a/nixos/modules/services/desktops/malcontent.nix b/nixos/modules/services/desktops/malcontent.nix index 416464cbe08..5d6912595b5 100644 --- a/nixos/modules/services/desktops/malcontent.nix +++ b/nixos/modules/services/desktops/malcontent.nix @@ -12,7 +12,7 @@ with lib; services.malcontent = { - enable = mkEnableOption "Malcontent"; + enable = mkEnableOption "Malcontent, parental control support for applications"; }; @@ -23,10 +23,15 @@ with lib; config = mkIf config.services.malcontent.enable { - environment.systemPackages = [ pkgs.malcontent ]; + environment.systemPackages = with pkgs; [ + malcontent + malcontent-ui + ]; services.dbus.packages = [ pkgs.malcontent ]; + services.accounts-daemon.enable = true; + }; } diff --git a/nixos/modules/services/desktops/pantheon/contractor.nix b/nixos/modules/services/desktops/pantheon/contractor.nix deleted file mode 100644 index c76145191a7..00000000000 --- a/nixos/modules/services/desktops/pantheon/contractor.nix +++ /dev/null @@ -1,18 +0,0 @@ -# Contractor - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - - ###### implementation - - config = mkIf config.services.pantheon.contractor.enable { - - - - }; - -} diff --git a/nixos/modules/services/desktops/pipewire.nix b/nixos/modules/services/desktops/pipewire.nix index 13f3d61e84c..5aee59cfdcc 100644 --- a/nixos/modules/services/desktops/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire.nix @@ -8,6 +8,11 @@ let packages = with pkgs; [ pipewire ]; in { + + meta = { + maintainers = teams.freedesktop.members; + }; + ###### interface options = { services.pipewire = { @@ -33,5 +38,4 @@ in { systemd.user.sockets.pipewire.wantedBy = lib.mkIf cfg.socketActivation [ "sockets.target" ]; }; - meta.maintainers = with lib.maintainers; [ jtojnar ]; } diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix index f5401c18098..34596bf7818 100644 --- a/nixos/modules/services/desktops/telepathy.nix +++ b/nixos/modules/services/desktops/telepathy.nix @@ -6,6 +6,10 @@ with lib; { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix index a833e99ff8c..a09079517f0 100644 --- a/nixos/modules/services/desktops/tumbler.nix +++ b/nixos/modules/services/desktops/tumbler.nix @@ -18,6 +18,10 @@ in "") ]; + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + ###### interface options = { diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix index 20c82ccdd56..cf7dd5fe3a1 100644 --- a/nixos/modules/services/desktops/zeitgeist.nix +++ b/nixos/modules/services/desktops/zeitgeist.nix @@ -5,6 +5,11 @@ with lib; { + + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + ###### interface options = { diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index f3831156f45..4b2e1a3c07f 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -4,14 +4,13 @@ with lib; let cfg = config.services.factorio; - factorio = pkgs.factorio-headless; name = "Factorio"; stateDir = "/var/lib/${cfg.stateDirName}"; mkSavePath = name: "${stateDir}/saves/${name}.zip"; configFile = pkgs.writeText "factorio.conf" '' use-system-read-write-data-directories=true [path] - read-data=${factorio}/share/factorio/data + read-data=${cfg.package}/share/factorio/data write-data=${stateDir} ''; serverSettings = { @@ -37,7 +36,7 @@ let only_admins_can_pause_the_game = true; autosave_only_on_server = true; admins = []; - }; + } // cfg.extraSettings; serverSettingsFile = pkgs.writeText "server-settings.json" (builtins.toJSON (filterAttrsRecursive (n: v: v != null) serverSettings)); modDir = pkgs.factorio-utils.mkModDirDrv cfg.mods; in @@ -115,6 +114,14 @@ in Description of the game that will appear in the listing. ''; }; + extraSettings = mkOption { + type = types.attrs; + default = {}; + example = { admins = [ "username" ];}; + description = '' + Extra game configuration that will go into server-settings.json + ''; + }; public = mkOption { type = types.bool; default = false; @@ -136,6 +143,15 @@ in Your factorio.com login credentials. Required for games with visibility public. ''; }; + package = mkOption { + type = types.package; + default = pkgs.factorio-headless; + defaultText = "pkgs.factorio-headless"; + example = "pkgs.factorio-headless-experimental"; + description = '' + Factorio version to use. This defaults to the stable channel. + ''; + }; password = mkOption { type = types.nullOr types.str; default = null; @@ -184,7 +200,7 @@ in preStart = toString [ "test -e ${stateDir}/saves/${cfg.saveName}.zip" "||" - "${factorio}/bin/factorio" + "${cfg.package}/bin/factorio" "--config=${cfg.configFile}" "--create=${mkSavePath cfg.saveName}" (optionalString (cfg.mods != []) "--mod-directory=${modDir}") @@ -197,7 +213,7 @@ in StateDirectory = cfg.stateDirName; UMask = "0007"; ExecStart = toString [ - "${factorio}/bin/factorio" + "${cfg.package}/bin/factorio" "--config=${cfg.configFile}" "--port=${toString cfg.port}" "--start-server=${mkSavePath cfg.saveName}" 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 6bf31982b71..ec0457bbd58 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 @@ -63,7 +63,7 @@ stdenv.mkDerivation { meta = { description = "Brother brscan4 sane backend driver etc files"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/nixos/modules/services/hardware/xow.nix b/nixos/modules/services/hardware/xow.nix new file mode 100644 index 00000000000..a18d60ad83b --- /dev/null +++ b/nixos/modules/services/hardware/xow.nix @@ -0,0 +1,17 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.services.hardware.xow; +in { + options.services.hardware.xow = { + enable = lib.mkEnableOption "xow as a systemd service"; + }; + + config = lib.mkIf cfg.enable { + hardware.uinput.enable = true; + + systemd.packages = [ pkgs.xow ]; + + services.udev.packages = [ pkgs.xow ]; + }; +} diff --git a/nixos/modules/services/mail/sympa.nix b/nixos/modules/services/mail/sympa.nix index c3ae9d4255b..0cad09927b2 100644 --- a/nixos/modules/services/mail/sympa.nix +++ b/nixos/modules/services/mail/sympa.nix @@ -25,8 +25,6 @@ let StateDirectory = "sympa"; ProtectHome = true; ProtectSystem = "full"; - ProtectKernelTunables = true; - ProtectKernelModules = true; ProtectControlGroups = true; }; @@ -415,7 +413,7 @@ in # force-copy static_content so it's up to date with package # set permissions for wwsympa which needs write access (...) "R ${dataDir}/static_content - - - - -" - "C ${dataDir}/static_content 0711 ${user} ${group} - ${pkg}/static_content" + "C ${dataDir}/static_content 0711 ${user} ${group} - ${pkg}/var/lib/sympa/static_content" "e ${dataDir}/static_content/* 0711 ${user} ${group} - -" "d /run/sympa 0755 ${user} ${group} - -" @@ -497,7 +495,7 @@ in -F ${toString cfg.web.fcgiProcs} \ -P /run/sympa/wwsympa.pid \ -s /run/sympa/wwsympa.socket \ - -- ${pkg}/bin/wwsympa.fcgi + -- ${pkg}/lib/sympa/cgi/wwsympa.fcgi ''; } // commonServiceConfig; @@ -518,7 +516,7 @@ in fastcgi_split_path_info ^(${loc})(.*)$; fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SCRIPT_FILENAME ${pkg}/bin/wwsympa.fcgi; + fastcgi_param SCRIPT_FILENAME ${pkg}/lib/sympa/cgi/wwsympa.fcgi; ''; }) // { "/static-sympa/".alias = "${dataDir}/static_content/"; @@ -550,7 +548,7 @@ in args = [ "flags=hqRu" "user=${user}" - "argv=${pkg}/bin/queue" + "argv=${pkg}/libexec/queue" "\${nexthop}" ]; }; @@ -562,7 +560,7 @@ in args = [ "flags=hqRu" "user=${user}" - "argv=${pkg}/bin/bouncequeue" + "argv=${pkg}/libexec/bouncequeue" "\${nexthop}" ]; }; diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index d02fa13bb99..703bc9416f8 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -31,7 +31,6 @@ bind_host: "${cfg.bind_host}" ''} server_name: "${cfg.server_name}" pid_file: "/run/matrix-synapse.pid" -web_client: ${boolToString cfg.web_client} ${optionalString (cfg.public_baseurl != null) '' public_baseurl: "${cfg.public_baseurl}" ''} @@ -202,13 +201,6 @@ in { This is also the last part of your UserID. ''; }; - web_client = mkOption { - type = types.bool; - default = false; - description = '' - Whether to serve a web client from the HTTP/HTTPS root resource. - ''; - }; public_baseurl = mkOption { type = types.nullOr types.str; default = null; @@ -719,6 +711,7 @@ in { Database configuration must be done manually. An exemplary setup is demonstrated in <nixpkgs/nixos/tests/matrix-synapse.nix> '') + (mkRemovedOptionModule [ "services" "matrix-synapse" "web_client" ] "") ]; meta.doc = ./matrix-synapse.xml; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 17c3582db0f..0c2407e1dd2 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -92,13 +92,14 @@ in maxJobs = mkOption { type = types.either types.int (types.enum ["auto"]); - default = 1; + default = "auto"; example = 64; description = '' - This option defines the maximum number of jobs that Nix will try - to build in parallel. The default is 1. You should generally - set it to the total number of logical cores in your system (e.g., 16 - for two CPUs with 4 cores each and hyper-threading). + This option defines the maximum number of jobs that Nix will try to + build in parallel. The default is auto, which means it will use all + available logical cores. It is recommend to set it to the total + number of logical cores in your system (e.g., 16 for two CPUs with 4 + cores each and hyper-threading). ''; }; @@ -282,7 +283,7 @@ in trustedBinaryCaches = mkOption { type = types.listOf types.str; default = [ ]; - example = [ http://hydra.nixos.org/ ]; + example = [ "http://hydra.nixos.org/" ]; description = '' List of binary cache URLs that non-root users can use (in addition to those specified using @@ -376,6 +377,59 @@ in If enabled (the default), checks that Nix can parse the generated nix.conf. ''; }; + + registry = mkOption { + type = types.attrsOf (types.submodule ( + let + inputAttrs = types.attrsOf (types.oneOf [types.str types.int types.bool types.package]); + in + { config, name, ... }: + { options = { + from = mkOption { + type = inputAttrs; + example = { type = "indirect"; id = "nixpkgs"; }; + description = "The flake reference to be rewritten."; + }; + to = mkOption { + type = inputAttrs; + example = { type = "github"; owner = "my-org"; repo = "my-nixpkgs"; }; + description = "The flake reference to which <option>from></option> is to be rewritten."; + }; + flake = mkOption { + type = types.unspecified; + default = null; + example = literalExample "nixpkgs"; + description = '' + The flake input to which <option>from></option> is to be rewritten. + ''; + }; + exact = mkOption { + type = types.bool; + default = true; + description = '' + Whether the <option>from</option> reference needs to match exactly. If set, + a <option>from</option> reference like <literal>nixpkgs</literal> does not + match with a reference like <literal>nixpkgs/nixos-20.03</literal>. + ''; + }; + }; + config = { + from = mkDefault { type = "indirect"; id = name; }; + to = mkIf (config.flake != null) + ({ type = "path"; + path = config.flake.outPath; + } // lib.filterAttrs + (n: v: n == "lastModified" || n == "rev" || n == "revCount" || n == "narHash") + config.flake); + }; + } + )); + default = {}; + description = '' + A system-wide flake registry. + ''; + }; + }; }; @@ -390,6 +444,11 @@ in environment.etc."nix/nix.conf".source = nixConf; + environment.etc."nix/registry.json".text = builtins.toJSON { + version = 2; + flakes = mapAttrsToList (n: v: { inherit (v) from to exact; }) cfg.registry; + }; + # List of machines for distributed Nix builds in the format # expected by build-remote.pl. environment.etc."nix/machines" = diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index e43241eea89..a5233a46e34 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -154,6 +154,7 @@ in { ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c ${configFile}"; ExecReload = "${pkgs.utillinux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; TimeoutStopSec = 60; + Restart = "on-failure"; # User and group User = cfg.user; Group = cfg.group; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix index 4534d150885..69e3dcf1408 100644 --- a/nixos/modules/services/monitoring/prometheus/alertmanager.nix +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -155,7 +155,7 @@ in { systemd.services.alertmanager = { wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network-online.target" ]; preStart = '' ${lib.getBin pkgs.envsubst}/bin/envsubst -o "/tmp/alert-manager-substituted.yaml" \ -i "${alertmanagerYml}" diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index 1dd869043f0..5422d4dd4e2 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -98,13 +98,14 @@ in Set of AFP volumes to export. See <literal>man apf.conf</literal> for more information. ''; - example = + example = literalExample '' { srv = { path = "/srv"; "read only" = true; "hosts allow" = "10.1.0.0/16 10.2.1.100 2001:0db8:1234::/48"; }; - }; + } + ''; }; extmap = mkOption { diff --git a/nixos/modules/services/network-filesystems/openafs/client.nix b/nixos/modules/services/network-filesystems/openafs/client.nix index 79c4b7aee06..677111814a0 100644 --- a/nixos/modules/services/network-filesystems/openafs/client.nix +++ b/nixos/modules/services/network-filesystems/openafs/client.nix @@ -9,7 +9,7 @@ let cfg = config.services.openafsClient; cellServDB = pkgs.fetchurl { - url = http://dl.central.org/dl/cellservdb/CellServDB.2018-05-14; + url = "http://dl.central.org/dl/cellservdb/CellServDB.2018-05-14"; sha256 = "1wmjn6mmyy2r8p10nlbdzs4nrqxy8a9pjyrdciy5nmppg4053rk2"; }; diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index b17ec3aa930..ccad64cfdb2 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -74,13 +74,14 @@ in See <command>man rsyncd.conf</command> for options. ''; type = types.attrsOf (types.attrsOf types.str); - example = + example = literalExample '' { srv = { path = "/srv"; "read only" = "yes"; comment = "Public rsync share."; }; - }; + } + ''; }; user = mkOption { diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index a3c22ce6948..a115590ccaa 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -189,7 +189,7 @@ in See <command>man smb.conf</command> for options. ''; type = types.attrsOf (types.attrsOf types.unspecified); - example = + example = literalExample '' { public = { path = "/srv/public"; "read only" = true; @@ -197,7 +197,8 @@ in "guest ok" = "yes"; comment = "Public samba share."; }; - }; + } + ''; }; }; diff --git a/nixos/modules/services/networking/3proxy.nix b/nixos/modules/services/networking/3proxy.nix index 26aa1667946..ae8a4958ca9 100644 --- a/nixos/modules/services/networking/3proxy.nix +++ b/nixos/modules/services/networking/3proxy.nix @@ -334,10 +334,12 @@ in { nsrecord = mkOption { type = types.attrsOf types.str; default = { }; - example = { - "files.local" = "192.168.1.12"; - "site.local" = "192.168.1.43"; - }; + example = literalExample '' + { + "files.local" = "192.168.1.12"; + "site.local" = "192.168.1.43"; + } + ''; description = "Adds static nsrecords."; }; }; diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index e8eadc4e187..6ccc2dffb26 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -77,6 +77,13 @@ in { ''; }; + package = mkOption { + type = types.path; + description = "The connman package / build flavor"; + default = connman; + example = literalExample "pkgs.connmanFull"; + }; + }; }; @@ -89,11 +96,13 @@ in { assertion = !config.networking.useDHCP; message = "You can not use services.connman with networking.useDHCP"; }{ + # TODO: connman seemingly can be used along network manager and + # connmanFull supports this - so this should be worked out somehow assertion = !config.networking.networkmanager.enable; message = "You can not use services.connman with networking.networkmanager"; }]; - environment.systemPackages = [ connman ]; + environment.systemPackages = [ cfg.package ]; systemd.services.connman = { description = "Connection service"; @@ -105,7 +114,7 @@ in { BusName = "net.connman"; Restart = "on-failure"; ExecStart = toString ([ - "${pkgs.connman}/sbin/connmand" + "${cfg.package}/sbin/connmand" "--config=${configFile}" "--nodaemon" ] ++ optional enableIwd "--wifi=iwd_agent" @@ -122,7 +131,7 @@ in { serviceConfig = { Type = "dbus"; BusName = "net.connman.vpn"; - ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n"; + ExecStart = "${cfg.package}/sbin/connman-vpnd -n"; StandardOutput = "null"; }; }; @@ -132,7 +141,7 @@ in { serviceConfig = { Name = "net.connman.vpn"; before = [ "connman" ]; - ExecStart = "${pkgs.connman}/sbin/connman-vpnd -n"; + ExecStart = "${cfg.package}/sbin/connman-vpnd -n"; User = "root"; SystemdService = "connman-vpn.service"; }; diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix index d123bca9321..d06032daecc 100644 --- a/nixos/modules/services/networking/dnscache.nix +++ b/nixos/modules/services/networking/dnscache.nix @@ -61,10 +61,12 @@ in { Table of {hostname: server} pairs to use as authoritative servers for hosts (and subhosts). If entry for @ is not specified predefined list of root servers is used. ''; - example = { - "@" = ["8.8.8.8" "8.8.4.4"]; - "example.com" = ["192.168.100.100"]; - }; + example = literalExample '' + { + "@" = ["8.8.8.8" "8.8.4.4"]; + "example.com" = ["192.168.100.100"]; + } + ''; }; forwardOnly = mkOption { diff --git a/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix new file mode 100644 index 00000000000..09d357cd2b6 --- /dev/null +++ b/nixos/modules/services/networking/magic-wormhole-mailbox-server.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.magic-wormhole-mailbox-server; + dataDir = "/var/lib/magic-wormhole-mailbox-server;"; + python = pkgs.python3.withPackages (py: [ py.magic-wormhole-mailbox-server py.twisted ]); +in +{ + options.services.magic-wormhole-mailbox-server = { + enable = mkEnableOption "Enable Magic Wormhole Mailbox Server"; + }; + + config = mkIf cfg.enable { + systemd.services.magic-wormhole-mailbox-server = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + ExecStart = "${python}/bin/twistd --nodaemon wormhole-mailbox"; + WorkingDirectory = dataDir; + StateDirectory = baseNameOf dataDir; + }; + }; + + }; +} diff --git a/nixos/modules/services/networking/mullvad-vpn.nix b/nixos/modules/services/networking/mullvad-vpn.nix new file mode 100644 index 00000000000..cc98414257c --- /dev/null +++ b/nixos/modules/services/networking/mullvad-vpn.nix @@ -0,0 +1,43 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.services.mullvad-vpn; +in +with lib; +{ + options.services.mullvad-vpn.enable = mkOption { + type = types.bool; + default = false; + description = '' + This option enables Mullvad VPN daemon. + ''; + }; + + config = mkIf cfg.enable { + boot.kernelModules = [ "tun" ]; + + systemd.services.mullvad-daemon = { + description = "Mullvad VPN daemon"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ + "network-online.target" + "NetworkManager.service" + "systemd-resolved.service" + ]; + path = [ + pkgs.iproute + # Needed for ping + "/run/wrappers" + ]; + serviceConfig = { + StartLimitBurst = 5; + StartLimitIntervalSec = 20; + ExecStart = "${pkgs.mullvad-vpn}/bin/mullvad-daemon -v --disable-stdout-timestamps"; + Restart = "always"; + RestartSec = 1; + }; + }; + }; + + meta.maintainers = [ maintainers.xfix ]; +} diff --git a/nixos/modules/services/networking/ndppd.nix b/nixos/modules/services/networking/ndppd.nix index e015f76f622..77e979a8a42 100644 --- a/nixos/modules/services/networking/ndppd.nix +++ b/nixos/modules/services/networking/ndppd.nix @@ -43,7 +43,7 @@ let timeout = mkOption { type = types.int; description = '' - Controls how long to wait for a Neighbor Advertisment Message before + Controls how long to wait for a Neighbor Advertisment Message before invalidating the entry, in milliseconds. ''; default = 500; @@ -51,7 +51,7 @@ let ttl = mkOption { type = types.int; description = '' - Controls how long a valid or invalid entry remains in the cache, in + Controls how long a valid or invalid entry remains in the cache, in milliseconds. ''; default = 30000; @@ -142,7 +142,11 @@ in { messages, and respond to them according to a set of rules. ''; default = {}; - example = { eth0.rules."1111::/64" = {}; }; + example = literalExample '' + { + eth0.rules."1111::/64" = {}; + } + ''; }; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index e817f295a44..6f24141b33c 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -131,6 +131,10 @@ let in { + meta = { + maintainers = teams.freedesktop.members; + }; + ###### interface options = { diff --git a/nixos/modules/services/networking/pixiecore.nix b/nixos/modules/services/networking/pixiecore.nix new file mode 100644 index 00000000000..0e32f182e2a --- /dev/null +++ b/nixos/modules/services/networking/pixiecore.nix @@ -0,0 +1,134 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.pixiecore; +in +{ + meta.maintainers = with maintainers; [ bbigras danderson ]; + + options = { + services.pixiecore = { + enable = mkEnableOption "Pixiecore"; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open ports (67, 69 UDP and 4011, 'port', 'statusPort' TCP) in the firewall for Pixiecore. + ''; + }; + + mode = mkOption { + description = "Which mode to use"; + default = "boot"; + type = types.enum [ "api" "boot" ]; + }; + + debug = mkOption { + type = types.bool; + default = false; + description = "Log more things that aren't directly related to booting a recognized client"; + }; + + dhcpNoBind = mkOption { + type = types.bool; + default = false; + description = "Handle DHCP traffic without binding to the DHCP server port"; + }; + + kernel = mkOption { + type = types.str or types.path; + default = ""; + description = "Kernel path. Ignored unless mode is set to 'boot'"; + }; + + initrd = mkOption { + type = types.str or types.path; + default = ""; + description = "Initrd path. Ignored unless mode is set to 'boot'"; + }; + + cmdLine = mkOption { + type = types.str; + default = ""; + description = "Kernel commandline arguments. Ignored unless mode is set to 'boot'"; + }; + + listen = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "IPv4 address to listen on"; + }; + + port = mkOption { + type = types.port; + default = 80; + description = "Port to listen on for HTTP"; + }; + + statusPort = mkOption { + type = types.port; + default = 80; + description = "HTTP port for status information (can be the same as --port)"; + }; + + apiServer = mkOption { + type = types.str; + example = "localhost:8080"; + description = "host:port to connect to the API. Ignored unless mode is set to 'api'"; + }; + + extraArguments = mkOption { + type = types.listOf types.str; + default = []; + description = "Additional command line arguments to pass to Pixiecore"; + }; + }; + }; + + config = mkIf cfg.enable { + users.groups.pixiecore = {}; + users.users.pixiecore = { + description = "Pixiecore daemon user"; + group = "pixiecore"; + }; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ 4011 cfg.port cfg.statusPort ]; + allowedUDPPorts = [ 67 69 ]; + }; + + systemd.services.pixiecore = { + description = "Pixiecore server"; + after = [ "network.target"]; + wants = [ "network.target"]; + wantedBy = [ "multi-user.target"]; + serviceConfig = { + User = "pixiecore"; + Restart = "always"; + AmbientCapabilities = [ "cap_net_bind_service" ] ++ optional cfg.dhcpNoBind "cap_net_raw"; + ExecStart = + let + argString = + if cfg.mode == "boot" + then [ "boot" cfg.kernel ] + ++ optional (cfg.initrd != "") cfg.initrd + ++ optional (cfg.cmdLine != "") "--cmdline=${lib.escapeShellArg cfg.cmdLine}" + else [ "api" cfg.apiServer ]; + in + '' + ${pkgs.pixiecore}/bin/pixiecore \ + ${lib.escapeShellArgs argString} \ + ${optionalString cfg.debug "--debug"} \ + ${optionalString cfg.dhcpNoBind "--dhcp-no-bind"} \ + --listen-addr ${lib.escapeShellArg cfg.listen} \ + --port ${toString cfg.port} \ + --status-port ${toString cfg.statusPort} \ + ${escapeShellArgs cfg.extraArguments} + ''; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/quorum.nix b/nixos/modules/services/networking/quorum.nix new file mode 100644 index 00000000000..2f612c9db68 --- /dev/null +++ b/nixos/modules/services/networking/quorum.nix @@ -0,0 +1,229 @@ +{ config, pkgs, lib, ... }: +let + + inherit (lib) mkEnableOption mkIf mkOption literalExample types optionalString; + + cfg = config.services.quorum; + dataDir = "/var/lib/quorum"; + genesisFile = pkgs.writeText "genesis.json" (builtins.toJSON cfg.genesis); + staticNodesFile = pkgs.writeText "static-nodes.json" (builtins.toJSON cfg.staticNodes); + +in { + options = { + + services.quorum = { + enable = mkEnableOption "Quorum blockchain daemon"; + + user = mkOption { + type = types.str; + default = "quorum"; + description = "The user as which to run quorum."; + }; + + group = mkOption { + type = types.str; + default = cfg.user; + description = "The group as which to run quorum."; + }; + + port = mkOption { + type = types.port; + default = 21000; + description = "Override the default port on which to listen for connections."; + }; + + nodekeyFile = mkOption { + type = types.path; + default = "${dataDir}/nodekey"; + description = "Path to the nodekey."; + }; + + staticNodes = mkOption { + type = types.listOf types.str; + default = []; + example = [ "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0" ]; + description = "List of validator nodes."; + }; + + privateconfig = mkOption { + type = types.str; + default = "ignore"; + description = "Configuration of privacy transaction manager."; + }; + + syncmode = mkOption { + type = types.enum [ "fast" "full" "light" ]; + default = "full"; + description = "Blockchain sync mode."; + }; + + blockperiod = mkOption { + type = types.int; + default = 5; + description = "Default minimum difference between two consecutive block's timestamps in seconds."; + }; + + permissioned = mkOption { + type = types.bool; + default = true; + description = "Allow only a defined list of nodes to connect."; + }; + + rpc = { + enable = mkOption { + type = types.bool; + default = true; + description = "Enable RPC interface."; + }; + + address = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "Listening address for RPC connections."; + }; + + port = mkOption { + type = types.port; + default = 22004; + description = "Override the default port on which to listen for RPC connections."; + }; + + api = mkOption { + type = types.str; + default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul"; + description = "API's offered over the HTTP-RPC interface."; + }; + }; + + ws = { + enable = mkOption { + type = types.bool; + default = true; + description = "Enable WS-RPC interface."; + }; + + address = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "Listening address for WS-RPC connections."; + }; + + port = mkOption { + type = types.port; + default = 8546; + description = "Override the default port on which to listen for WS-RPC connections."; + }; + + api = mkOption { + type = types.str; + default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul"; + description = "API's offered over the WS-RPC interface."; + }; + + origins = mkOption { + type = types.str; + default = "*"; + description = "Origins from which to accept websockets requests"; + }; + }; + + genesis = mkOption { + type = types.nullOr types.attrs; + default = null; + example = literalExample '' { + alloc = { + a47385db68718bdcbddc2d2bb7c54018066ec111 = { + balance = "1000000000000000000000000000"; + }; + }; + coinbase = "0x0000000000000000000000000000000000000000"; + config = { + byzantiumBlock = 4; + chainId = 494702925; + eip150Block = 2; + eip155Block = 3; + eip158Block = 3; + homesteadBlock = 1; + isQuorum = true; + istanbul = { + epoch = 30000; + policy = 0; + }; + }; + difficulty = "0x1"; + extraData = "0x0000000000000000000000000000000000000000000000000000000000000000f85ad59438f0508111273d8e482f49410ca4078afc86a961b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0"; + gasLimit = "0x2FEFD800"; + mixHash = "0x63746963616c2062797a616e74696e65201111756c7420746f6c6572616e6365"; + nonce = "0x0"; + parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000"; + timestamp = "0x00"; + }''; + description = "Blockchain genesis settings."; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.quorum ]; + systemd.tmpfiles.rules = [ + "d '${dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -" + ]; + systemd.services.quorum = { + description = "Quorum daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = { + PRIVATE_CONFIG = "${cfg.privateconfig}"; + }; + preStart = '' + if [ ! -d ${dataDir}/geth ]; then + if [ ! -d ${dataDir}/keystore ]; then + echo ERROR: You need to create a wallet before initializing your genesis file, run: + echo # su -s /bin/sh - quorum + echo $ geth --datadir ${dataDir} account new + echo and configure your genesis file accordingly. + exit 1; + fi + ln -s ${staticNodesFile} ${dataDir}/static-nodes.json + ${pkgs.quorum}/bin/geth --datadir ${dataDir} init ${genesisFile} + fi + ''; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = ''${pkgs.quorum}/bin/geth \ + --nodiscover \ + --verbosity 5 \ + --nodekey ${cfg.nodekeyFile} \ + --istanbul.blockperiod ${toString cfg.blockperiod} \ + --syncmode ${cfg.syncmode} \ + ${optionalString (cfg.permissioned) + "--permissioned"} \ + --mine --minerthreads 1 \ + ${optionalString (cfg.rpc.enable) + "--rpc --rpcaddr ${cfg.rpc.address} --rpcport ${toString cfg.rpc.port} --rpcapi ${cfg.rpc.api}"} \ + ${optionalString (cfg.ws.enable) + "--ws --wsaddr ${cfg.ws.address} --wsport ${toString cfg.ws.port} --wsapi ${cfg.ws.api} --wsorigins ${cfg.ws.origins}"} \ + --emitcheckpoints \ + --datadir ${dataDir} \ + --port ${toString cfg.port}''; + Restart = "on-failure"; + + # Hardening measures + PrivateTmp = "true"; + ProtectSystem = "full"; + NoNewPrivileges = "true"; + PrivateDevices = "true"; + MemoryDenyWriteExecute = "true"; + }; + }; + users.users.${cfg.user} = { + name = cfg.user; + group = cfg.group; + description = "Quorum daemon user"; + home = dataDir; + isSystemUser = true; + }; + users.groups.${cfg.group} = {}; + }; +} diff --git a/nixos/modules/services/networking/rxe.nix b/nixos/modules/services/networking/rxe.nix index a6a069ec50c..c7d174a00de 100644 --- a/nixos/modules/services/networking/rxe.nix +++ b/nixos/modules/services/networking/rxe.nix @@ -5,20 +5,6 @@ with lib; let cfg = config.networking.rxe; - runRxeCmd = cmd: ifcs: - concatStrings ( map (x: "${pkgs.rdma-core}/bin/rxe_cfg -n ${cmd} ${x};") ifcs); - - startScript = pkgs.writeShellScriptBin "rxe-start" '' - ${pkgs.rdma-core}/bin/rxe_cfg -n start - ${runRxeCmd "add" cfg.interfaces} - ${pkgs.rdma-core}/bin/rxe_cfg - ''; - - stopScript = pkgs.writeShellScriptBin "rxe-stop" '' - ${runRxeCmd "remove" cfg.interfaces } - ${pkgs.rdma-core}/bin/rxe_cfg -n stop - ''; - in { ###### interface @@ -31,9 +17,8 @@ in { example = [ "eth0" ]; description = '' Enable RDMA on the listed interfaces. The corresponding virtual - RDMA interfaces will be named rxe0 ... rxeN where the ordering - will be as they are named in the list. UDP port 4791 must be - open on the respective ethernet interfaces. + RDMA interfaces will be named rxe_<interface>. + UDP port 4791 must be open on the respective ethernet interfaces. ''; }; }; @@ -44,7 +29,6 @@ in { config = mkIf cfg.enable { systemd.services.rxe = { - path = with pkgs; [ kmod rdma-core ]; description = "RoCE interfaces"; wantedBy = [ "multi-user.target" ]; @@ -54,8 +38,13 @@ in { serviceConfig = { Type = "oneshot"; RemainAfterExit = true; - ExecStart = "${startScript}/bin/rxe-start"; - ExecStop = "${stopScript}/bin/rxe-stop"; + ExecStart = map ( x: + "${pkgs.iproute}/bin/rdma link add rxe_${x} type rxe netdev ${x}" + ) cfg.interfaces; + + ExecStop = map ( x: + "${pkgs.iproute}/bin/rdma link delete rxe_${x}" + ) cfg.interfaces; }; }; }; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 464e9ed38c4..17f31e3a488 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -9,8 +9,8 @@ let # This middle-ground solution ensures *an* sshd can do their basic validation # on the configuration. validationPackage = if pkgs.stdenv.buildPlatform == pkgs.stdenv.hostPlatform - then [ cfgc.package ] - else [ pkgs.buildPackages.openssh ]; + then cfgc.package + else pkgs.buildPackages.openssh; sshconf = pkgs.runCommand "sshd.conf-validated" { nativeBuildInputs = [ validationPackage ]; } '' cat >$out <<EOL diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 4ff9c486059..13a1a897c5e 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -4,7 +4,7 @@ let inherit (builtins) toFile; inherit (lib) concatMapStringsSep concatStringsSep mapAttrsToList - mkIf mkEnableOption mkOption types; + mkIf mkEnableOption mkOption types literalExample; cfg = config.services.strongswan; @@ -79,19 +79,21 @@ in connections = mkOption { type = types.attrsOf (types.attrsOf types.str); default = {}; - example = { - "%default" = { - keyexchange = "ikev2"; - keyingtries = "1"; - }; - roadwarrior = { - auto = "add"; - leftcert = "/run/keys/moonCert.pem"; - leftid = "@moon.strongswan.org"; - leftsubnet = "10.1.0.0/16"; - right = "%any"; - }; - }; + example = literalExample '' + { + "%default" = { + keyexchange = "ikev2"; + keyingtries = "1"; + }; + roadwarrior = { + auto = "add"; + leftcert = "/run/keys/moonCert.pem"; + leftid = "@moon.strongswan.org"; + leftsubnet = "10.1.0.0/16"; + right = "%any"; + }; + } + ''; description = '' A set of connections and their options for the ‘conn xxx’ sections of the <filename>ipsec.conf</filename> file. diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 5b3eb6f04b4..e717d78feed 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -169,12 +169,14 @@ in { description = '' folders which should be shared by syncthing. ''; - example = { - "/home/user/sync" = { - id = "syncme"; - devices = [ "bigbox" ]; - }; - }; + example = literalExample '' + { + "/home/user/sync" = { + id = "syncme"; + devices = [ "bigbox" ]; + }; + } + ''; type = types.attrsOf (types.submodule ({ name, ... }: { options = { diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index b770d47d269..ff1bdeed9f4 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/nixos/modules/services/networking/wg-quick.nix @@ -302,7 +302,7 @@ in { ###### implementation config = mkIf (cfg.interfaces != {}) { - boot.extraModulePackages = [ kernel.wireguard ]; + boot.extraModulePackages = optional (versionOlder kernel.kernel.version "5.6") kernel.wireguard; environment.systemPackages = [ pkgs.wireguard-tools ]; # This is forced to false for now because the default "--validmark" rpfilter we apply on reverse path filtering # breaks the wg-quick routing because wireguard packets leave with a fwmark from wireguard. diff --git a/nixos/modules/services/scheduling/atd.nix b/nixos/modules/services/scheduling/atd.nix index 93ed9231d3c..cefe72b0e99 100644 --- a/nixos/modules/services/scheduling/atd.nix +++ b/nixos/modules/services/scheduling/atd.nix @@ -67,8 +67,6 @@ in systemd.services.atd = { description = "Job Execution Daemon (atd)"; - after = [ "systemd-udev-settle.service" ]; - wants = [ "systemd-udev-settle.service" ]; wantedBy = [ "multi-user.target" ]; path = [ at ]; diff --git a/nixos/modules/services/web-apps/documize.nix b/nixos/modules/services/web-apps/documize.nix index 1b90299aa23..a5f48e744fd 100644 --- a/nixos/modules/services/web-apps/documize.nix +++ b/nixos/modules/services/web-apps/documize.nix @@ -130,7 +130,7 @@ in { config = mkIf cfg.enable { systemd.services.documize-server = { description = "Documize Wiki"; - documentation = [ https://documize.com/ ]; + documentation = [ "https://documize.com/" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { diff --git a/nixos/modules/services/web-apps/moinmoin.nix b/nixos/modules/services/web-apps/moinmoin.nix index 0fee64be0bb..dc7abce2a5c 100644 --- a/nixos/modules/services/web-apps/moinmoin.nix +++ b/nixos/modules/services/web-apps/moinmoin.nix @@ -299,5 +299,5 @@ in ]))); }; - meta.maintainers = with lib.maintainers; [ b42 ]; + meta.maintainers = with lib.maintainers; [ mmilata ]; } diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 087bd0e5df3..9de2fbc0732 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -6,30 +6,31 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; - phpPackage = pkgs.php73; - phpPackages = pkgs.php73Packages; + phpPackage = + let + base = pkgs.php74; + in + base.buildEnv { + extensions = e: with e; + base.enabledExtensions ++ [ + apcu redis memcached imagick + ]; + extraConfig = phpOptionsStr; + }; toKeyValue = generators.toKeyValue { mkKeyValue = generators.mkKeyValueDefault {} " = "; }; - phpOptionsExtensions = '' - ${optionalString cfg.caching.apcu "extension=${phpPackages.apcu}/lib/php/extensions/apcu.so"} - ${optionalString cfg.caching.redis "extension=${phpPackages.redis}/lib/php/extensions/redis.so"} - ${optionalString cfg.caching.memcached "extension=${phpPackages.memcached}/lib/php/extensions/memcached.so"} - extension=${phpPackages.imagick}/lib/php/extensions/imagick.so - zend_extension = opcache.so - opcache.enable = 1 - ''; phpOptions = { upload_max_filesize = cfg.maxUploadSize; post_max_size = cfg.maxUploadSize; memory_limit = cfg.maxUploadSize; } // cfg.phpOptions; - phpOptionsStr = phpOptionsExtensions + (toKeyValue phpOptions); + phpOptionsStr = toKeyValue phpOptions; occ = pkgs.writeScriptBin "nextcloud-occ" '' - #! ${pkgs.stdenv.shell} + #! ${pkgs.runtimeShell} cd ${cfg.package} sudo=exec if [[ "$USER" != nextcloud ]]; then @@ -38,7 +39,6 @@ let export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" $sudo \ ${phpPackage}/bin/php \ - -c ${pkgs.writeText "php.ini" phpOptionsStr}\ occ $* ''; @@ -565,7 +565,7 @@ in { add_header Referrer-Policy no-referrer; access_log off; ''; - "~ \\.(?:png|html|ttf|ico|jpg|jpeg)$".extraConfig = '' + "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' try_files $uri /index.php$request_uri; access_log off; ''; diff --git a/nixos/modules/services/web-apps/youtrack.nix b/nixos/modules/services/web-apps/youtrack.nix index 830edac20ba..b4d653d2d77 100644 --- a/nixos/modules/services/web-apps/youtrack.nix +++ b/nixos/modules/services/web-apps/youtrack.nix @@ -46,9 +46,11 @@ in https://www.jetbrains.com/help/youtrack/standalone/YouTrack-Java-Start-Parameters.html for more information. ''; - example = { - "jetbrains.youtrack.overrideRootPassword" = "tortuga"; - }; + example = literalExample '' + { + "jetbrains.youtrack.overrideRootPassword" = "tortuga"; + } + ''; type = types.attrsOf types.str; }; 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 263980add8b..2e806afb42c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -220,7 +220,7 @@ in globalRedirect = mkOption { type = types.nullOr types.str; default = null; - example = http://newserver.example.org/; + example = "http://newserver.example.org/"; description = '' If set, all requests for this host are redirected permanently to the given URL. diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 28b433104a1..8d49dc66eb1 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -46,6 +46,15 @@ let } '')); + commonHttpConfig = '' + # The mime type definitions included with nginx are very incomplete, so + # we use a list of mime types from the mailcap package, which is also + # used by most other Linux distributions by default. + include ${pkgs.mailcap}/etc/nginx/mime.types; + include ${cfg.package}/conf/fastcgi.conf; + include ${cfg.package}/conf/uwsgi_params; + ''; + configFile = pkgs.writers.writeNginxConfig "nginx.conf" '' pid /run/nginx/nginx.pid; error_log ${cfg.logError}; @@ -61,12 +70,7 @@ let ${optionalString (cfg.httpConfig == "" && cfg.config == "") '' http { - # The mime type definitions included with nginx are very incomplete, so - # we use a list of mime types from the mailcap package, which is also - # used by most other Linux distributions by default. - include ${pkgs.mailcap}/etc/nginx/mime.types; - include ${cfg.package}/conf/fastcgi.conf; - include ${cfg.package}/conf/uwsgi_params; + ${commonHttpConfig} ${optionalString (cfg.resolver.addresses != []) '' resolver ${toString cfg.resolver.addresses} ${optionalString (cfg.resolver.valid != "") "valid=${cfg.resolver.valid}"} ${optionalString (!cfg.resolver.ipv6) "ipv6=off"}; @@ -79,7 +83,7 @@ let tcp_nopush on; tcp_nodelay on; keepalive_timeout 65; - types_hash_max_size 2048; + types_hash_max_size 4096; ''} ssl_protocols ${cfg.sslProtocols}; @@ -172,9 +176,7 @@ let ${optionalString (cfg.httpConfig != "") '' http { - include ${cfg.package}/conf/mime.types; - include ${cfg.package}/conf/fastcgi.conf; - include ${cfg.package}/conf/uwsgi_params; + ${commonHttpConfig} ${cfg.httpConfig} }''} diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 2c73da10394..3db19c781d0 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -47,6 +47,7 @@ let Path to the unix socket file on which to accept FastCGI requests. <note><para>This option is read-only and managed by NixOS.</para></note> ''; + example = "${runtimeDir}/<name>.sock"; }; listen = mkOption { diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 26b662a2a64..32c9a40e535 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -38,7 +38,7 @@ in pkgs.gtk2 # To get GTK's themes. pkgs.tango-icon-theme - pkgs.gnome2.gnome_icon_theme + pkgs.gnome-icon-theme pkgs.xorg.xcursorthemes ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 5756cf14ed9..ac8e70c52bc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -57,6 +57,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + options = { services.gnome3 = { @@ -180,7 +184,7 @@ in wmCommand = "${pkgs.gnome3.metacity}/bin/metacity"; } ++ cfg.flashback.customSessions); - security.pam.services.gnome-screensaver = { + security.pam.services.gnome-flashback = { enableGnomeKeyring = true; }; @@ -191,9 +195,10 @@ in inherit (wm) wmName; }) cfg.flashback.customSessions); - services.dbus.packages = [ - pkgs.gnome3.gnome-screensaver - ]; + # gnome-panel needs these for menu applet + environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gnome-flashback}/share" ]; + # TODO: switch to sessionVariables (resolve conflict) + environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome3.gnome-flashback}/etc/xdg" ]; }) (mkIf serviceCfg.core-os-services.enable { @@ -252,7 +257,6 @@ in systemd.packages = with pkgs.gnome3; [ gnome-session gnome-shell - vino ]; services.avahi.enable = mkDefault true; @@ -304,7 +308,7 @@ in environment = mkForce {}; }; - # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst + # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-shell.bst environment.systemPackages = with pkgs.gnome3; [ adwaita-icon-theme gnome-backgrounds @@ -323,11 +327,10 @@ in pkgs.hicolor-icon-theme pkgs.shared-mime-info # for update-mime-database pkgs.xdg-user-dirs # Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/ - vino ]; }) - # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-utilities.bst + # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-36/elements/core/meta-gnome-core-utilities.bst (mkIf serviceCfg.core-utilities.enable { environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ baobab diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 869c6694489..01fe230b8a4 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -181,7 +181,6 @@ in hicolor-icon-theme lightlocker onboard - plank qgnomeplatform shared-mime-info sound-theme-freedesktop @@ -195,6 +194,7 @@ in # Desktop elementary-default-settings + elementary-dock elementary-session-settings elementary-shortcut-overlay gala @@ -206,9 +206,9 @@ in }) # Services - cerbere elementary-capnet-assist elementary-dpms-helper + elementary-notifications elementary-settings-daemon pantheon-agent-geoclue2 pantheon-agent-polkit diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index 4d92a7446c0..9541f2cfd4e 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -89,22 +89,6 @@ switchboard-with-plugs.override { </para> </listitem> </varlistentry> - <varlistentry xml:id="sec-pantheon-faq-slow-shutdown"> - <term> - Using Pantheon sometimes makes my shutdown take a long time. - </term> - <listitem> - <para> - We have not yet determined what processes fight with systemd during shutdown, there are many reports. In elementary OS the default system timeout is lowered to lessen the impact of the issue. If you'd like to do this in NixOS, set -<programlisting> - <xref linkend="opt-systemd.extraConfig"/> = '' - DefaultTimeoutStopSec=10s - DefaultTimeoutStartSec=10s -''; -</programlisting> - </para> - </listitem> - </varlistentry> <varlistentry xml:id="sec-pantheon-faq-gnome3-and-pantheon"> <term> I cannot enable both GNOME 3 and Pantheon. diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index a08b1947f65..d39b4d64904 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -8,6 +8,10 @@ in { + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + imports = [ # added 2019-08-18 # needed to preserve some semblance of UI familarity @@ -129,6 +133,7 @@ in services.xserver.desktopManager.session = [{ name = "xfce"; + desktopNames = [ "XFCE" ]; bgSupport = true; start = '' ${pkgs.runtimeShell} ${pkgs.xfce.xfce4-session.xinitrc} & diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix index 1dbe703b566..2b08c62d0ad 100644 --- a/nixos/modules/services/x11/display-managers/account-service-util.nix +++ b/nixos/modules/services/x11/display-managers/account-service-util.nix @@ -3,6 +3,7 @@ , gobject-introspection , python3 , wrapGAppsHook +, lib }: python3.pkgs.buildPythonApplication { @@ -36,4 +37,8 @@ python3.pkgs.buildPythonApplication { cp $src $out/bin/set-session chmod +x $out/bin/set-session ''; + + meta = with lib; { + maintainers = with maintainers; [ worldofpeace ]; + }; } diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 5d49ca94387..2a7a19e7695 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -54,14 +54,6 @@ let exec &> >(tee ~/.xsession-errors) ''} - # Start PulseAudio if enabled. - ${optionalString (config.hardware.pulseaudio.enable) '' - # Publish access credentials in the root window. - if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then - ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" - fi - ''} - # Tell systemd about our $DISPLAY and $XAUTHORITY. # This is needed by the ssh-agent unit. # @@ -412,6 +404,9 @@ in (dm: wm: let sessionName = "${dm.name}${optionalString (wm.name != "none") ("+" + wm.name)}"; script = xsession dm wm; + desktopNames = if dm ? desktopNames + then concatStringsSep ";" dm.desktopNames + else sessionName; in optional (dm.name != "none" || wm.name != "none") (pkgs.writeTextFile { @@ -427,7 +422,7 @@ in TryExec=${script} Exec=${script} Name=${sessionName} - DesktopNames=${sessionName} + DesktopNames=${desktopNames} ''; } // { providedSessions = [ sessionName ]; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index e0ac47bb766..d7bef68e5bc 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -38,6 +38,10 @@ in { + meta = { + maintainers = teams.gnome.members; + }; + ###### interface options = { @@ -184,6 +188,9 @@ in "systemd-machined.service" # setSessionScript wants AccountsService "accounts-daemon.service" + # Failed to open gpu '/dev/dri/card0': GDBus.Error:org.freedesktop.DBus.Error.AccessDenied: Operation not permitted + # https://github.com/NixOS/nixpkgs/pull/25311#issuecomment-609417621 + "systemd-udev-settle.service" ]; systemd.services.display-manager.after = [ @@ -193,6 +200,7 @@ in "getty@tty${gdm.initialVT}.service" "plymouth-quit.service" "plymouth-start.service" + "systemd-udev-settle.service" ]; systemd.services.display-manager.conflicts = [ "getty@tty${gdm.initialVT}.service" diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 77c94114e6d..087c6b9c38a 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -10,6 +10,10 @@ let in { + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + options = { services.xserver.displayManager.lightdm.greeters.pantheon = { diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index cb7b5f95958..479548863b4 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -69,6 +69,10 @@ let in { + meta = { + maintainers = with maintainers; [ worldofpeace ]; + }; + # Note: the order in which lightdm greeter modules are imported # here determines the default: later modules (if enable) are # preferred. diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 74d702ea1c3..6aec1c0753a 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -651,8 +651,7 @@ in systemd.services.display-manager = { description = "X11 Server"; - after = [ "systemd-udev-settle.service" "acpid.service" "systemd-logind.service" ]; - wants = [ "systemd-udev-settle.service" ]; + after = [ "acpid.service" "systemd-logind.service" ]; restartIfChanged = false; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 2d3e3b05c98..5a334e69056 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -10,19 +10,21 @@ in { - options = { - - boot.initrd.network.ssh.enable = mkOption { + options.boot.initrd.network.ssh = { + enable = mkOption { type = types.bool; default = false; description = '' Start SSH service during initrd boot. It can be used to debug failing boot on a remote server, enter pasphrase for an encrypted partition etc. Service is killed when stage-1 boot is finished. + + The sshd configuration is largely inherited from + <option>services.openssh</option>. ''; }; - boot.initrd.network.ssh.port = mkOption { + port = mkOption { type = types.int; default = 22; description = '' @@ -30,7 +32,7 @@ in ''; }; - boot.initrd.network.ssh.shell = mkOption { + shell = mkOption { type = types.str; default = "/bin/ash"; description = '' @@ -38,95 +40,163 @@ in ''; }; - boot.initrd.network.ssh.hostRSAKey = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - RSA SSH private key file in the Dropbear format. - - WARNING: Unless your bootloader supports initrd secrets, this key is - contained insecurely in the global Nix store. Do NOT use your regular - SSH host private keys for this purpose or you'll expose them to - regular users! - ''; - }; - - boot.initrd.network.ssh.hostDSSKey = mkOption { - type = types.nullOr types.path; - default = null; + hostKeys = mkOption { + type = types.listOf (types.either types.str types.path); + default = []; + example = [ + "/etc/secrets/initrd/ssh_host_rsa_key" + "/etc/secrets/initrd/ssh_host_ed25519_key" + ]; description = '' - DSS SSH private key file in the Dropbear format. - - WARNING: Unless your bootloader supports initrd secrets, this key is - contained insecurely in the global Nix store. Do NOT use your regular - SSH host private keys for this purpose or you'll expose them to - regular users! + Specify SSH host keys to import into the initrd. + + To generate keys, use + <citerefentry><refentrytitle>ssh-keygen</refentrytitle><manvolnum>1</manvolnum></citerefentry>: + + <screen> + <prompt># </prompt>ssh-keygen -t rsa -N "" -f /etc/secrets/initrd/ssh_host_rsa_key + <prompt># </prompt>ssh-keygen -t ed25519 -N "" -f /etc/secrets/initrd/ssh_host_ed_25519_key + </screen> + + <warning> + <para> + Unless your bootloader supports initrd secrets, these keys + are stored insecurely in the global Nix store. Do NOT use + your regular SSH host private keys for this purpose or + you'll expose them to regular users! + </para> + <para> + Additionally, even if your initrd supports secrets, if + you're using initrd SSH to unlock an encrypted disk then + using your regular host keys exposes the private keys on + your unencrypted boot partition. + </para> + </warning> ''; }; - boot.initrd.network.ssh.hostECDSAKey = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - ECDSA SSH private key file in the Dropbear format. - - WARNING: Unless your bootloader supports initrd secrets, this key is - contained insecurely in the global Nix store. Do NOT use your regular - SSH host private keys for this purpose or you'll expose them to - regular users! - ''; - }; - - boot.initrd.network.ssh.authorizedKeys = mkOption { + authorizedKeys = mkOption { type = types.listOf types.str; default = config.users.users.root.openssh.authorizedKeys.keys; + defaultText = "config.users.users.root.openssh.authorizedKeys.keys"; description = '' Authorized keys for the root user on initrd. - Note that Dropbear doesn't support OpenSSH's Ed25519 key type. ''; }; - }; - config = mkIf (config.boot.initrd.network.enable && cfg.enable) { + imports = + map (opt: mkRemovedOptionModule ([ "boot" "initrd" "network" "ssh" ] ++ [ opt ]) '' + The initrd SSH functionality now uses OpenSSH rather than Dropbear. + + If you want to keep your existing initrd SSH host keys, convert them with + $ dropbearconvert dropbear openssh dropbear_host_$type_key ssh_host_$type_key + and then set options.boot.initrd.network.ssh.hostKeys. + '') [ "hostRSAKey" "hostDSSKey" "hostECDSAKey" ]; + + config = let + # Nix complains if you include a store hash in initrd path names, so + # as an awful hack we drop the first character of the hash. + initrdKeyPath = path: if isString path + then path + else let name = builtins.baseNameOf path; in + builtins.unsafeDiscardStringContext ("/etc/ssh/" + + substring 1 (stringLength name) name); + + sshdCfg = config.services.openssh; + + sshdConfig = '' + Port ${toString cfg.port} + + PasswordAuthentication no + ChallengeResponseAuthentication no + + ${flip concatMapStrings cfg.hostKeys (path: '' + HostKey ${initrdKeyPath path} + '')} + + KexAlgorithms ${concatStringsSep "," sshdCfg.kexAlgorithms} + Ciphers ${concatStringsSep "," sshdCfg.ciphers} + MACs ${concatStringsSep "," sshdCfg.macs} + + LogLevel ${sshdCfg.logLevel} + + ${if sshdCfg.useDns then '' + UseDNS yes + '' else '' + UseDNS no + ''} + ''; + in mkIf (config.boot.initrd.network.enable && cfg.enable) { assertions = [ - { assertion = cfg.authorizedKeys != []; + { + assertion = cfg.authorizedKeys != []; message = "You should specify at least one authorized key for initrd SSH"; } + + { + assertion = cfg.hostKeys != []; + message = '' + You must now pre-generate the host keys for initrd SSH. + See the boot.initrd.network.ssh.hostKeys documentation + for instructions. + ''; + } ]; boot.initrd.extraUtilsCommands = '' - copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear + copy_bin_and_libs ${pkgs.openssh}/bin/sshd cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib ''; boot.initrd.extraUtilsCommandsTest = '' - $out/bin/dropbear -V + # sshd requires a host key to check config, so we pass in the test's + echo -n ${escapeShellArg sshdConfig} | + $out/bin/sshd -t -f /dev/stdin \ + -h ${../../../tests/initrd-network-ssh/ssh_host_ed25519_key} ''; boot.initrd.network.postCommands = '' echo '${cfg.shell}' > /etc/shells echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd + echo 'sshd:x:1:1:sshd:/var/empty:/bin/nologin' >> /etc/passwd echo 'passwd: files' > /etc/nsswitch.conf - mkdir -p /var/log + mkdir -p /var/log /var/empty touch /var/log/lastlog - mkdir -p /etc/dropbear + mkdir -p /etc/ssh + echo -n ${escapeShellArg sshdConfig} > /etc/ssh/sshd_config + + echo "export PATH=$PATH" >> /etc/profile + echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> /etc/profile mkdir -p /root/.ssh ${concatStrings (map (key: '' echo ${escapeShellArg key} >> /root/.ssh/authorized_keys '') cfg.authorizedKeys)} - dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} + ${flip concatMapStrings cfg.hostKeys (path: '' + # keys from Nix store are world-readable, which sshd doesn't like + chmod 0600 "${initrdKeyPath path}" + '')} + + /bin/sshd -e ''; - boot.initrd.secrets = - (optionalAttrs (cfg.hostRSAKey != null) { "/etc/dropbear/dropbear_rsa_host_key" = cfg.hostRSAKey; }) // - (optionalAttrs (cfg.hostDSSKey != null) { "/etc/dropbear/dropbear_dss_host_key" = cfg.hostDSSKey; }) // - (optionalAttrs (cfg.hostECDSAKey != null) { "/etc/dropbear/dropbear_ecdsa_host_key" = cfg.hostECDSAKey; }); + boot.initrd.postMountCommands = '' + # Stop sshd cleanly before stage 2. + # + # If you want to keep it around to debug post-mount SSH issues, + # run `touch /.keep_sshd` (either from an SSH session or in + # another initrd hook like preDeviceCommands). + if ! [ -e /.keep_sshd ]; then + pkill -x sshd + fi + ''; + boot.initrd.secrets = listToAttrs + (map (path: nameValuePair (initrdKeyPath path) path) cfg.hostKeys); }; } diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index b97ef88a7ca..c775632a4aa 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -588,7 +588,7 @@ in { boot.loader.grub.splashImage = mkDefault ( if cfg.version == 1 then pkgs.fetchurl { - url = http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz; + url = "http://www.gnome-look.org/CONTENT/content-files/36909-soft-tux.xpm.gz"; sha256 = "14kqdx2lfqvh40h6fjjzqgff1mwk74dmbjvmqphi6azzra7z8d59"; } # GRUB 1.97 doesn't support gzipped XPMs. diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 93cd801ef80..9e3ee5cf0a3 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -142,7 +142,10 @@ let let source' = if source == null then dest else source; in '' mkdir -p $(dirname "$out/secrets/${dest}") - cp -a ${source'} "$out/secrets/${dest}" + # Some programs (e.g. ssh) doesn't like secrets to be + # symlinks, so we use `cp -L` here to match the + # behaviour when secrets are natively supported. + cp -Lr ${source'} "$out/secrets/${dest}" '' ) config.boot.initrd.secrets)) } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index cdc9d237939..7f207e6c7ef 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -842,7 +842,6 @@ in [Manager] ${optionalString config.systemd.enableCgroupAccounting '' DefaultCPUAccounting=yes - DefaultBlockIOAccounting=yes DefaultIOAccounting=yes DefaultBlockIOAccounting=yes DefaultIPAccounting=yes diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index bfc1e301efa..e70004e643e 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -24,7 +24,7 @@ let cfg = config.system.autoUpgrade; in channel = mkOption { type = types.nullOr types.str; default = null; - example = https://nixos.org/channels/nixos-14.12-small; + example = "https://nixos.org/channels/nixos-14.12-small"; description = '' The URI of the NixOS channel to use for automatic upgrades. By default, this is the channel set using diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 09c7e074e12..43347161a84 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -433,6 +433,7 @@ in services.zfs.zed.settings = { ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail"; + PATH = lib.makeBinPath [ packages.zfsUser pkgs.utillinux pkgs.gawk pkgs.gnused pkgs.gnugrep pkgs.coreutils pkgs.curl ]; }; environment.etc = genAttrs @@ -478,6 +479,7 @@ in createImportService = pool: nameValuePair "zfs-import-${pool}" { description = "Import ZFS pool \"${pool}\""; + # we need systemd-udev-settle until https://github.com/zfsonlinux/zfs/pull/4943 is merged requires = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" "systemd-modules-load.service" ]; wantedBy = (getPoolMounts pool) ++ [ "local-fs.target" ]; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 4d25137c5df..98bae444df0 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -291,13 +291,19 @@ let ${optionalString config.virtualisation.libvirtd.enable '' # Enslave dynamically added interfaces which may be lost on nixos-rebuild - for uri in qemu:///system lxc:///; do - for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do - ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \ - ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \ - ${pkgs.bash}/bin/bash + # + # if `libvirtd.service` is not running, do not use `virsh` which would try activate it via 'libvirtd.socket' and thus start it out-of-order. + # `libvirtd.service` will set up bridge interfaces when it will start normally. + # + if ${pkgs.systemd}/bin/systemctl --quiet is-active 'libvirtd.service'; then + for uri in qemu:///system lxc:///; do + for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do + ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \ + ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \ + ${pkgs.bash}/bin/bash + done done - done + fi ''} # Enable stp on the interface diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 9542a60beee..63a79abd4eb 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -634,19 +634,23 @@ in networking.bonds = let - driverOptionsExample = { - miimon = "100"; - mode = "active-backup"; - }; + driverOptionsExample = '' + { + miimon = "100"; + mode = "active-backup"; + } + ''; in mkOption { default = { }; - example = literalExample { - bond0 = { - interfaces = [ "eth0" "wlan0" ]; - driverOptions = driverOptionsExample; - }; - anotherBond.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ]; - }; + example = literalExample '' + { + bond0 = { + interfaces = [ "eth0" "wlan0" ]; + driverOptions = ${driverOptionsExample}; + }; + anotherBond.interfaces = [ "enp4s0f0" "enp4s0f1" "enp5s0f0" "enp5s0f1" ]; + } + ''; description = '' This option allows you to define bond devices that aggregate multiple, underlying networking interfaces together. The value of this option is @@ -731,12 +735,14 @@ in networking.macvlans = mkOption { default = { }; - example = literalExample { - wan = { - interface = "enp2s0"; - mode = "vepa"; - }; - }; + example = literalExample '' + { + wan = { + interface = "enp2s0"; + mode = "vepa"; + }; + } + ''; description = '' This option allows you to define macvlan interfaces which should be automatically created. @@ -764,18 +770,20 @@ in networking.sits = mkOption { default = { }; - example = literalExample { - hurricane = { - remote = "10.0.0.1"; - local = "10.0.0.22"; - ttl = 255; - }; - msipv6 = { - remote = "192.168.0.1"; - dev = "enp3s0"; - ttl = 127; - }; - }; + example = literalExample '' + { + hurricane = { + remote = "10.0.0.1"; + local = "10.0.0.22"; + ttl = 255; + }; + msipv6 = { + remote = "192.168.0.1"; + dev = "enp3s0"; + ttl = 127; + }; + } + ''; description = '' This option allows you to define 6-to-4 interfaces which should be automatically created. ''; @@ -826,16 +834,18 @@ in networking.vlans = mkOption { default = { }; - example = literalExample { - vlan0 = { - id = 3; - interface = "enp3s0"; - }; - vlan1 = { - id = 1; - interface = "wlan0"; - }; - }; + example = literalExample '' + { + vlan0 = { + id = 3; + interface = "enp3s0"; + }; + vlan1 = { + id = 1; + interface = "wlan0"; + }; + } + ''; description = '' This option allows you to define vlan devices that tag packets @@ -868,24 +878,26 @@ in networking.wlanInterfaces = mkOption { default = { }; - example = literalExample { - wlan-station0 = { - device = "wlp6s0"; - }; - wlan-adhoc0 = { - type = "ibss"; - device = "wlp6s0"; - mac = "02:00:00:00:00:01"; - }; - wlan-p2p0 = { - device = "wlp6s0"; - mac = "02:00:00:00:00:02"; - }; - wlan-ap0 = { - device = "wlp6s0"; - mac = "02:00:00:00:00:03"; - }; - }; + example = literalExample '' + { + wlan-station0 = { + device = "wlp6s0"; + }; + wlan-adhoc0 = { + type = "ibss"; + device = "wlp6s0"; + mac = "02:00:00:00:00:01"; + }; + wlan-p2p0 = { + device = "wlp6s0"; + mac = "02:00:00:00:00:02"; + }; + wlan-ap0 = { + device = "wlp6s0"; + mac = "02:00:00:00:00:03"; + }; + } + ''; description = '' Creating multiple WLAN interfaces on top of one physical WLAN device (NIC). diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 03239991b95..8efa177e30d 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -15,6 +15,8 @@ with lib; boot.loader.grub.version = 2; boot.loader.timeout = 0; + boot.growPartition = true; + # Don't put old configurations in the GRUB menu. The user has no # way to select them anyway. boot.loader.grub.configurationLimit = 0; diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index e91dd72ff5d..21fd58e5c90 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -2,27 +2,38 @@ with lib; let - diskSize = 2048; + cfg = config.virtualisation.azureImage; in { - system.build.azureImage = import ../../lib/make-disk-image.nix { - name = "azure-image"; - postVM = '' - ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd - ''; - configFile = ./azure-config-user.nix; - format = "raw"; - inherit diskSize; - inherit config lib pkgs; - }; - imports = [ ./azure-common.nix ]; + + options = { + virtualisation.azureImage.diskSize = mkOption { + type = with types; int; + default = 2048; + description = '' + Size of disk image. Unit is MB. + ''; + }; + }; + config = { + system.build.azureImage = import ../../lib/make-disk-image.nix { + name = "azure-image"; + postVM = '' + ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -o subformat=fixed,force_size -O vpc $diskImage $out/disk.vhd + rm $diskImage + ''; + configFile = ./azure-config-user.nix; + format = "raw"; + inherit (cfg) diskSize; + inherit config lib pkgs; + }; - # Azure metadata is available as a CD-ROM drive. - fileSystems."/metadata".device = "/dev/sr0"; + # Azure metadata is available as a CD-ROM drive. + fileSystems."/metadata".device = "/dev/sr0"; - systemd.services.fetch-ssh-keys = - { description = "Fetch host keys and authorized_keys for root user"; + systemd.services.fetch-ssh-keys = { + description = "Fetch host keys and authorized_keys for root user"; wantedBy = [ "sshd.service" "waagent.service" ]; before = [ "sshd.service" "waagent.service" ]; @@ -54,6 +65,6 @@ in serviceConfig.RemainAfterExit = true; serviceConfig.StandardError = "journal+console"; serviceConfig.StandardOutput = "journal+console"; - }; - + }; + }; } diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 02de5801da2..dad211ef55b 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -609,9 +609,11 @@ in bindMounts = mkOption { type = with types; loaOf (submodule bindMountOpts); default = {}; - example = { "/home" = { hostPath = "/home/alice"; - isReadOnly = false; }; - }; + example = literalExample '' + { "/home" = { hostPath = "/home/alice"; + isReadOnly = false; }; + } + ''; description = '' diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 9f7bac480e3..4f22099443f 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -214,14 +214,14 @@ in { }; systemd.services.libvirtd = { - description = "Libvirt Virtual Machine Management Daemon"; - - wantedBy = [ "multi-user.target" ]; requires = [ "libvirtd-config.service" ]; after = [ "systemd-udev-settle.service" "libvirtd-config.service" ] ++ optional vswitch.enable "ovs-vswitchd.service"; - environment.LIBVIRTD_ARGS = ''--config "${configFile}" ${concatStringsSep " " cfg.extraOptions}''; + environment.LIBVIRTD_ARGS = escapeShellArgs ( + [ "--config" configFile + "--timeout" "120" # from ${libvirt}/var/lib/sysconfig/libvirtd + ] ++ cfg.extraOptions); path = [ cfg.qemuPackage ] # libvirtd requires qemu-img to manage disk images ++ optional vswitch.enable vswitch.package; @@ -266,5 +266,8 @@ in { serviceConfig.ExecStart = "@${pkgs.libvirt}/sbin/virtlockd virtlockd"; restartIfChanged = false; }; + + systemd.sockets.libvirtd .wantedBy = [ "sockets.target" ]; + systemd.sockets.libvirtd-tcp.wantedBy = [ "sockets.target" ]; }; } diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 9377a931a75..02f19610f8a 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -38,98 +38,102 @@ in rec { nixpkgs = nixpkgsSrc; })) [ "unstable" ]; - tested = pkgs.releaseTools.aggregate { - name = "nixos-${nixos.channel.version}"; - meta = { - description = "Release-critical builds for the NixOS channel"; - maintainers = with pkgs.lib.maintainers; [ eelco fpletz ]; + tested = + let + onFullSupported = x: map (system: "${x}.${system}") supportedSystems; + onAllSupported = x: map (system: "${x}.${system}") (supportedSystems ++ limitedSupportedSystems); + onSystems = systems: x: map (system: "${x}.${system}") + (pkgs.lib.intersectLists systems (supportedSystems ++ limitedSupportedSystems)); + in pkgs.releaseTools.aggregate { + name = "nixos-${nixos.channel.version}"; + meta = { + description = "Release-critical builds for the NixOS channel"; + maintainers = with pkgs.lib.maintainers; [ eelco fpletz ]; + }; + constituents = pkgs.lib.concatLists [ + [ "nixos.channel" ] + (onFullSupported "nixos.dummy") + (onAllSupported "nixos.iso_minimal") + (onSystems ["x86_64-linux"] "nixos.iso_plasma5") + (onFullSupported "nixos.manual") + (onSystems ["x86_64-linux"] "nixos.ova") + (onSystems ["aarch64-linux"] "nixos.sd_image") + (onSystems ["x86_64-linux"] "nixos.tests.boot.biosCdrom") + (onSystems ["x86_64-linux"] "nixos.tests.boot.biosUsb") + (onFullSupported "nixos.tests.boot-stage1") + (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiCdrom") + (onSystems ["x86_64-linux"] "nixos.tests.boot.uefiUsb") + (onSystems ["x86_64-linux"] "nixos.tests.chromium") + (onFullSupported "nixos.tests.containers-imperative") + (onFullSupported "nixos.tests.containers-ip") + (onSystems ["x86_64-linux"] "nixos.tests.docker") + (onFullSupported "nixos.tests.ecryptfs") + (onFullSupported "nixos.tests.env") + (onFullSupported "nixos.tests.firefox-esr") + (onFullSupported "nixos.tests.firefox") + (onFullSupported "nixos.tests.firewall") + (onFullSupported "nixos.tests.fontconfig-default-fonts") + (onFullSupported "nixos.tests.gnome3") + (onFullSupported "nixos.tests.gnome3-xorg") + (onSystems ["x86_64-linux"] "nixos.tests.hibernate") + (onFullSupported "nixos.tests.i3wm") + (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") + (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvolDefault") + (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSubvols") + (onSystems ["x86_64-linux"] "nixos.tests.installer.luksroot") + (onSystems ["x86_64-linux"] "nixos.tests.installer.lvm") + (onSystems ["x86_64-linux"] "nixos.tests.installer.separateBootFat") + (onSystems ["x86_64-linux"] "nixos.tests.installer.separateBoot") + (onSystems ["x86_64-linux"] "nixos.tests.installer.simpleLabels") + (onSystems ["x86_64-linux"] "nixos.tests.installer.simpleProvided") + (onSystems ["x86_64-linux"] "nixos.tests.installer.simpleUefiSystemdBoot") + (onSystems ["x86_64-linux"] "nixos.tests.installer.simple") + (onSystems ["x86_64-linux"] "nixos.tests.installer.swraid") + (onFullSupported "nixos.tests.ipv6") + (onFullSupported "nixos.tests.keymap.azerty") + (onFullSupported "nixos.tests.keymap.colemak") + (onFullSupported "nixos.tests.keymap.dvorak") + (onFullSupported "nixos.tests.keymap.dvp") + (onFullSupported "nixos.tests.keymap.neo") + (onFullSupported "nixos.tests.keymap.qwertz") + (onFullSupported "nixos.tests.lightdm") + (onFullSupported "nixos.tests.login") + (onFullSupported "nixos.tests.misc") + (onFullSupported "nixos.tests.mutableUsers") + (onFullSupported "nixos.tests.nat.firewall-conntrack") + (onFullSupported "nixos.tests.nat.firewall") + (onFullSupported "nixos.tests.nat.standalone") + (onFullSupported "nixos.tests.networking.scripted.bond") + (onFullSupported "nixos.tests.networking.scripted.bridge") + (onFullSupported "nixos.tests.networking.scripted.dhcpOneIf") + (onFullSupported "nixos.tests.networking.scripted.dhcpSimple") + (onFullSupported "nixos.tests.networking.scripted.loopback") + (onFullSupported "nixos.tests.networking.scripted.macvlan") + (onFullSupported "nixos.tests.networking.scripted.sit") + (onFullSupported "nixos.tests.networking.scripted.static") + (onFullSupported "nixos.tests.networking.scripted.vlan") + (onFullSupported "nixos.tests.nfs3.simple") + (onFullSupported "nixos.tests.nfs4.simple") + (onFullSupported "nixos.tests.openssh") + (onFullSupported "nixos.tests.pantheon") + (onFullSupported "nixos.tests.php.fpm") + (onFullSupported "nixos.tests.php.pcre") + (onFullSupported "nixos.tests.plasma5") + (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd") + (onFullSupported "nixos.tests.predictable-interface-names.predictable") + (onFullSupported "nixos.tests.predictable-interface-names.unpredictableNetworkd") + (onFullSupported "nixos.tests.predictable-interface-names.unpredictable") + (onFullSupported "nixos.tests.printing") + (onFullSupported "nixos.tests.proxy") + (onFullSupported "nixos.tests.sddm.default") + (onFullSupported "nixos.tests.simple") + (onFullSupported "nixos.tests.switchTest") + (onFullSupported "nixos.tests.udisks2") + (onFullSupported "nixos.tests.xfce") + (onSystems ["i686-linux"] "nixos.tests.zfs.installer") + (onFullSupported "nixpkgs.emacs") + (onFullSupported "nixpkgs.jdk") + ["nixpkgs.tarball"] + ]; }; - constituents = [ - "nixos.channel" - "nixos.dummy.x86_64-linux" - "nixos.iso_minimal.aarch64-linux" - "nixos.iso_minimal.i686-linux" - "nixos.iso_minimal.x86_64-linux" - "nixos.iso_plasma5.x86_64-linux" - "nixos.manual.x86_64-linux" - "nixos.ova.x86_64-linux" - "nixos.sd_image.aarch64-linux" - "nixos.tests.boot.biosCdrom.x86_64-linux" - "nixos.tests.boot.biosUsb.x86_64-linux" - "nixos.tests.boot-stage1.x86_64-linux" - "nixos.tests.boot.uefiCdrom.x86_64-linux" - "nixos.tests.boot.uefiUsb.x86_64-linux" - "nixos.tests.chromium.x86_64-linux" - "nixos.tests.containers-imperative.x86_64-linux" - "nixos.tests.containers-ip.x86_64-linux" - "nixos.tests.docker.x86_64-linux" - "nixos.tests.ecryptfs.x86_64-linux" - "nixos.tests.env.x86_64-linux" - "nixos.tests.firefox-esr.x86_64-linux" - "nixos.tests.firefox.x86_64-linux" - "nixos.tests.firewall.x86_64-linux" - "nixos.tests.fontconfig-default-fonts.x86_64-linux" - "nixos.tests.gnome3.x86_64-linux" - "nixos.tests.gnome3-xorg.x86_64-linux" - "nixos.tests.hibernate.x86_64-linux" - "nixos.tests.i3wm.x86_64-linux" - "nixos.tests.installer.btrfsSimple.x86_64-linux" - "nixos.tests.installer.btrfsSubvolDefault.x86_64-linux" - "nixos.tests.installer.btrfsSubvols.x86_64-linux" - "nixos.tests.installer.luksroot.x86_64-linux" - "nixos.tests.installer.lvm.x86_64-linux" - "nixos.tests.installer.separateBootFat.x86_64-linux" - "nixos.tests.installer.separateBoot.x86_64-linux" - "nixos.tests.installer.simpleLabels.x86_64-linux" - "nixos.tests.installer.simpleProvided.x86_64-linux" - "nixos.tests.installer.simpleUefiSystemdBoot.x86_64-linux" - "nixos.tests.installer.simple.x86_64-linux" - "nixos.tests.installer.swraid.x86_64-linux" - "nixos.tests.ipv6.x86_64-linux" - "nixos.tests.keymap.azerty.x86_64-linux" - "nixos.tests.keymap.colemak.x86_64-linux" - "nixos.tests.keymap.dvorak.x86_64-linux" - "nixos.tests.keymap.dvp.x86_64-linux" - "nixos.tests.keymap.neo.x86_64-linux" - "nixos.tests.keymap.qwertz.x86_64-linux" - "nixos.tests.lightdm.x86_64-linux" - "nixos.tests.login.x86_64-linux" - "nixos.tests.misc.x86_64-linux" - "nixos.tests.mutableUsers.x86_64-linux" - "nixos.tests.nat.firewall-conntrack.x86_64-linux" - "nixos.tests.nat.firewall.x86_64-linux" - "nixos.tests.nat.standalone.x86_64-linux" - "nixos.tests.networking.scripted.bond.x86_64-linux" - "nixos.tests.networking.scripted.bridge.x86_64-linux" - "nixos.tests.networking.scripted.dhcpOneIf.x86_64-linux" - "nixos.tests.networking.scripted.dhcpSimple.x86_64-linux" - "nixos.tests.networking.scripted.loopback.x86_64-linux" - "nixos.tests.networking.scripted.macvlan.x86_64-linux" - "nixos.tests.networking.scripted.sit.x86_64-linux" - "nixos.tests.networking.scripted.static.x86_64-linux" - "nixos.tests.networking.scripted.vlan.x86_64-linux" - "nixos.tests.nfs3.simple.x86_64-linux" - "nixos.tests.nfs4.simple.x86_64-linux" - "nixos.tests.openssh.x86_64-linux" - "nixos.tests.pantheon.x86_64-linux" - "nixos.tests.php-pcre.x86_64-linux" - "nixos.tests.plasma5.x86_64-linux" - "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux" - "nixos.tests.predictable-interface-names.predictable.x86_64-linux" - "nixos.tests.predictable-interface-names.unpredictableNetworkd.x86_64-linux" - "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux" - "nixos.tests.printing.x86_64-linux" - "nixos.tests.proxy.x86_64-linux" - "nixos.tests.sddm.default.x86_64-linux" - "nixos.tests.simple.x86_64-linux" - "nixos.tests.switchTest.x86_64-linux" - "nixos.tests.udisks2.x86_64-linux" - "nixos.tests.xfce.x86_64-linux" - "nixos.tests.zfs.installer.i686-linux" - "nixpkgs.emacs.x86_64-linux" - "nixpkgs.jdk.x86_64-linux" - "nixpkgs.tarball" - ]; - }; - } diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 2a15073b669..6da2c59cedd 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -40,7 +40,7 @@ in rec { nat nfs3 openssh - php-pcre + php predictable-interface-names proxy simple; @@ -108,7 +108,8 @@ in rec { "nixos.tests.nat.standalone.x86_64-linux" "nixos.tests.nfs3.simple.x86_64-linux" "nixos.tests.openssh.x86_64-linux" - "nixos.tests.php-pcre.x86_64-linux" + "nixos.tests.php.fpm.x86_64-linux" + "nixos.tests.php.pcre.x86_64-linux" "nixos.tests.predictable-interface-names.predictable.x86_64-linux" "nixos.tests.predictable-interface-names.predictableNetworkd.x86_64-linux" "nixos.tests.predictable-interface-names.unpredictable.x86_64-linux" diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 3501c551625..76ca4941617 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -121,12 +121,16 @@ in handbrake = handleTestOn ["x86_64-linux"] ./handbrake.nix {}; haproxy = handleTest ./haproxy.nix {}; hardened = handleTest ./hardened.nix {}; - hibernate = handleTest ./hibernate.nix {}; + # 9pnet_virtio used to mount /nix partition doesn't support + # hibernation. This test happens to work on x86_64-linux but + # not on other platforms. + hibernate = handleTestOn ["x86_64-linux"] ./hibernate.nix {}; hitch = handleTest ./hitch {}; hocker-fetchdocker = handleTest ./hocker-fetchdocker {}; home-assistant = handleTest ./home-assistant.nix {}; hound = handleTest ./hound.nix {}; hydra = handleTest ./hydra {}; + hydra-db-migration = handleTest ./hydra/db-migration.nix {}; i3wm = handleTest ./i3wm.nix {}; icingaweb2 = handleTest ./icingaweb2.nix {}; iftop = handleTest ./iftop.nix {}; @@ -166,6 +170,7 @@ in #logstash = handleTest ./logstash.nix {}; lorri = handleTest ./lorri/default.nix {}; magnetico = handleTest ./magnetico.nix {}; + magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; mathics = handleTest ./mathics.nix {}; matomo = handleTest ./matomo.nix {}; @@ -211,6 +216,7 @@ in nghttpx = handleTest ./nghttpx.nix {}; nginx = handleTest ./nginx.nix {}; nginx-etag = handleTest ./nginx-etag.nix {}; + nginx-pubhtml = handleTest ./nginx-pubhtml.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; @@ -235,7 +241,7 @@ in peerflix = handleTest ./peerflix.nix {}; pgjwt = handleTest ./pgjwt.nix {}; pgmanage = handleTest ./pgmanage.nix {}; - php-pcre = handleTest ./php-pcre.nix {}; + php = handleTest ./php {}; plasma5 = handleTest ./plasma5.nix {}; plotinus = handleTest ./plotinus.nix {}; postgis = handleTest ./postgis.nix {}; @@ -251,6 +257,7 @@ in prosodyMysql = handleTest ./xmpp/prosody-mysql.nix {}; proxy = handleTest ./proxy.nix {}; quagga = handleTest ./quagga.nix {}; + quorum = handleTest ./quorum.nix {}; rabbitmq = handleTest ./rabbitmq.nix {}; radarr = handleTest ./radarr.nix {}; radicale = handleTest ./radicale.nix {}; @@ -307,6 +314,7 @@ in vault = handleTest ./vault.nix {}; victoriametrics = handleTest ./victoriametrics.nix {}; virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; + wg-quick = handleTest ./wireguard/wg-quick.nix {}; wireguard = handleTest ./wireguard {}; wireguard-generated = handleTest ./wireguard/generated.nix {}; wireguard-namespaces = handleTest ./wireguard/namespaces.nix {}; diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index 90dd747525d..22fe5cada48 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -183,15 +183,15 @@ let monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") monA.succeed( - "ceph osd pool create multi-node-test 100 100", + "ceph osd pool create multi-node-test 128 128", "ceph osd pool ls | grep 'multi-node-test'", "ceph osd pool rename multi-node-test multi-node-other-test", "ceph osd pool ls | grep 'multi-node-other-test'", ) - monA.wait_until_succeeds("ceph -s | grep '1 pools, 100 pgs'") + monA.wait_until_succeeds("ceph -s | grep '1 pools, 128 pgs'") monA.succeed("ceph osd pool set multi-node-other-test size 2") monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") - monA.wait_until_succeeds("ceph -s | grep '100 active+clean'") + monA.wait_until_succeeds("ceph -s | grep '128 active+clean'") monA.fail( "ceph osd pool ls | grep 'multi-node-test'", "ceph osd pool delete multi-node-other-test multi-node-other-test --yes-i-really-really-mean-it", diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix index 1a027e17836..01c4b413845 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node.nix @@ -143,12 +143,12 @@ let monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") monA.succeed( - "ceph osd pool create single-node-test 100 100", + "ceph osd pool create single-node-test 128 128", "ceph osd pool ls | grep 'single-node-test'", "ceph osd pool rename single-node-test single-node-other-test", "ceph osd pool ls | grep 'single-node-other-test'", ) - monA.wait_until_succeeds("ceph -s | grep '1 pools, 100 pgs'") + monA.wait_until_succeeds("ceph -s | grep '1 pools, 128 pgs'") monA.succeed( "ceph osd getcrushmap -o crush", "crushtool -d crush -o decrushed", @@ -158,7 +158,7 @@ let "ceph osd pool set single-node-other-test size 2", ) monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") - monA.wait_until_succeeds("ceph -s | grep '100 active+clean'") + monA.wait_until_succeeds("ceph -s | grep '128 active+clean'") monA.fail( "ceph osd pool ls | grep 'multi-node-test'", "ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it", diff --git a/nixos/tests/dovecot.nix b/nixos/tests/dovecot.nix index c19850f418b..bcbe234fd80 100644 --- a/nixos/tests/dovecot.nix +++ b/nixos/tests/dovecot.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix { services.dovecot2.protocols = [ "imap" "pop3" ]; environment.systemPackages = let sendTestMail = pkgs.writeScriptBin "send-testmail" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} exec sendmail -vt <<MAIL From: root@localhost To: alice@localhost @@ -19,7 +19,7 @@ import ./make-test-python.nix { ''; sendTestMailViaDeliveryAgent = pkgs.writeScriptBin "send-lda" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} exec ${pkgs.dovecot}/libexec/dovecot/deliver -d bob <<MAIL From: root@localhost diff --git a/nixos/tests/gerrit.nix b/nixos/tests/gerrit.nix index e8b5cb4c4fe..6cee64a2009 100644 --- a/nixos/tests/gerrit.nix +++ b/nixos/tests/gerrit.nix @@ -24,7 +24,6 @@ in { enable = true; serverId = "aa76c84b-50b0-4711-a0a0-1ee30e45bbd0"; listenAddress = "[::]:80"; - jvmPackage = pkgs.jdk12_headless; jvmHeapLimit = "1g"; plugins = [ lfs ]; diff --git a/nixos/tests/hydra/common.nix b/nixos/tests/hydra/common.nix new file mode 100644 index 00000000000..f612717dc96 --- /dev/null +++ b/nixos/tests/hydra/common.nix @@ -0,0 +1,47 @@ +{ system, ... }: +{ + baseConfig = { pkgs, ... }: let + trivialJob = pkgs.writeTextDir "trivial.nix" '' + { trivial = builtins.derivation { + name = "trivial"; + system = "${system}"; + builder = "/bin/sh"; + allowSubstitutes = false; + preferLocalBuild = true; + args = ["-c" "echo success > $out; exit 0"]; + }; + } + ''; + + createTrivialProject = pkgs.stdenv.mkDerivation { + name = "create-trivial-project"; + dontUnpack = true; + buildInputs = [ pkgs.makeWrapper ]; + installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; + postFixup = '' + wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} + ''; + }; + in { + virtualisation.memorySize = 2048; + time.timeZone = "UTC"; + environment.systemPackages = [ createTrivialProject pkgs.jq ]; + services.hydra = { + enable = true; + # Hydra needs those settings to start up, so we add something not harmfull. + hydraURL = "example.com"; + notificationSender = "example@example.com"; + extraConfig = '' + email_notification = 1 + ''; + }; + services.postfix.enable = true; + nix = { + buildMachines = [{ + hostName = "localhost"; + systems = [ system ]; + }]; + binaryCaches = []; + }; + }; +} diff --git a/nixos/tests/hydra/db-migration.nix b/nixos/tests/hydra/db-migration.nix new file mode 100644 index 00000000000..aa1c81c9e77 --- /dev/null +++ b/nixos/tests/hydra/db-migration.nix @@ -0,0 +1,86 @@ +{ system ? builtins.currentSystem, ... }: + +let inherit (import ./common.nix { inherit system; }) baseConfig; in + +{ mig = import ../make-test-python.nix ({ pkgs, lib, ... }: { + name = "hydra-db-migration"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; + + nodes = { + original = { pkgs, lib, ... }: { + imports = [ baseConfig ]; + + # An older version of Hydra before the db change + # for testing purposes. + services.hydra.package = pkgs.hydra-migration.overrideAttrs (old: { + inherit (old) pname; + version = "2020-02-06"; + src = pkgs.fetchFromGitHub { + owner = "NixOS"; + repo = "hydra"; + rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc"; + sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick"; + }; + }); + }; + + migration_phase1 = { pkgs, lib, ... }: { + imports = [ baseConfig ]; + services.hydra.package = pkgs.hydra-migration; + }; + + finished = { pkgs, lib, ... }: { + imports = [ baseConfig ]; + services.hydra.package = pkgs.hydra-unstable; + }; + }; + + testScript = { nodes, ... }: let + next = nodes.migration_phase1.config.system.build.toplevel; + finished = nodes.finished.config.system.build.toplevel; + in '' + original.start() + original.wait_for_unit("multi-user.target") + original.wait_for_unit("postgresql.service") + original.wait_for_unit("hydra-init.service") + original.require_unit_state("hydra-queue-runner.service") + original.require_unit_state("hydra-evaluator.service") + original.require_unit_state("hydra-notify.service") + original.succeed("hydra-create-user admin --role admin --password admin") + original.wait_for_open_port(3000) + original.succeed("create-trivial-project.sh") + original.wait_until_succeeds( + 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' + ) + + out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") + assert "jobset_id" not in out + + original.succeed( + "${next}/bin/switch-to-configuration test >&2" + ) + original.wait_for_unit("hydra-init.service") + + out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") + assert "jobset_id|integer|||" in out + + original.succeed("hydra-backfill-ids") + + original.succeed( + "${finished}/bin/switch-to-configuration test >&2" + ) + original.wait_for_unit("hydra-init.service") + + out = original.succeed("su -l postgres -c 'psql -d hydra <<< \"\\d+ jobs\" -A'") + assert "jobset_id|integer||not null|" in out + + original.wait_until_succeeds( + 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' + ) + + original.shutdown() + ''; + }); +} diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index 1c0ed3369b1..2336e4033d6 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -3,102 +3,57 @@ , pkgs ? import ../../.. { inherit system config; } }: -let - - trivialJob = pkgs.writeTextDir "trivial.nix" '' - { trivial = builtins.derivation { - name = "trivial"; - system = "${system}"; - builder = "/bin/sh"; - allowSubstitutes = false; - preferLocalBuild = true; - args = ["-c" "echo success > $out; exit 0"]; - }; - } - ''; +with import ../../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; - createTrivialProject = pkgs.stdenv.mkDerivation { - name = "create-trivial-project"; - dontUnpack = true; - buildInputs = [ pkgs.makeWrapper ]; - installPhase = "install -m755 -D ${./create-trivial-project.sh} $out/bin/create-trivial-project.sh"; - postFixup = '' - wrapProgram "$out/bin/create-trivial-project.sh" --prefix PATH ":" ${pkgs.stdenv.lib.makeBinPath [ pkgs.curl ]} --set EXPR_PATH ${trivialJob} - ''; - }; +let - callTest = f: f { inherit system pkgs; }; + inherit (import ./common.nix { inherit system; }) baseConfig; hydraPkgs = { - inherit (pkgs) nixStable nixUnstable nixFlakes; + inherit (pkgs) hydra-migration hydra-unstable; }; - tests = pkgs.lib.flip pkgs.lib.mapAttrs hydraPkgs (name: nix: - callTest (import ../make-test-python.nix ({ pkgs, lib, ... }: - { - name = "hydra-with-${name}"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ pstn lewo ma27 ]; - }; - - machine = { pkgs, ... }: - { - virtualisation.memorySize = 1024; - time.timeZone = "UTC"; - - environment.systemPackages = [ createTrivialProject pkgs.jq ]; - services.hydra = { - enable = true; - - #Hydra needs those settings to start up, so we add something not harmfull. - hydraURL = "example.com"; - notificationSender = "example@example.com"; - - package = pkgs.hydra.override { inherit nix; }; - - extraConfig = '' - email_notification = 1 - ''; - }; - services.postfix.enable = true; - nix = { - buildMachines = [{ - hostName = "localhost"; - systems = [ system ]; - }]; - - binaryCaches = []; - }; - }; - - testScript = '' - # let the system boot up - machine.wait_for_unit("multi-user.target") - # test whether the database is running - machine.wait_for_unit("postgresql.service") - # test whether the actual hydra daemons are running - machine.wait_for_unit("hydra-init.service") - machine.require_unit_state("hydra-queue-runner.service") - machine.require_unit_state("hydra-evaluator.service") - machine.require_unit_state("hydra-notify.service") - - machine.succeed("hydra-create-user admin --role admin --password admin") - - # create a project with a trivial job - machine.wait_for_open_port(3000) - - # make sure the build as been successfully built - machine.succeed("create-trivial-project.sh") - - machine.wait_until_succeeds( - 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' - ) - - machine.wait_until_succeeds( - 'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"' - ) - ''; - }))); + makeHydraTest = with pkgs.lib; name: package: makeTest { + name = "hydra-${name}"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ pstn lewo ma27 ]; + }; + + machine = { pkgs, lib, ... }: { + imports = [ baseConfig ]; + services.hydra = { inherit package; }; + }; + + testScript = '' + # let the system boot up + machine.wait_for_unit("multi-user.target") + # test whether the database is running + machine.wait_for_unit("postgresql.service") + # test whether the actual hydra daemons are running + machine.wait_for_unit("hydra-init.service") + machine.require_unit_state("hydra-queue-runner.service") + machine.require_unit_state("hydra-evaluator.service") + machine.require_unit_state("hydra-notify.service") + + machine.succeed("hydra-create-user admin --role admin --password admin") + + # create a project with a trivial job + machine.wait_for_open_port(3000) + + # make sure the build as been successfully built + machine.succeed("create-trivial-project.sh") + + machine.wait_until_succeeds( + 'curl -L -s http://localhost:3000/build/1 -H "Accept: application/json" | jq .buildstatus | xargs test 0 -eq' + ) + + machine.wait_until_succeeds( + 'journalctl -eu hydra-notify.service -o cat | grep -q "sending mail notification to hydra@localhost"' + ) + ''; + }; in - tests + +mapAttrs makeHydraTest hydraPkgs diff --git a/nixos/tests/initrd-network-ssh/default.nix b/nixos/tests/initrd-network-ssh/default.nix index 73d9f938e22..017de688208 100644 --- a/nixos/tests/initrd-network-ssh/default.nix +++ b/nixos/tests/initrd-network-ssh/default.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ({ lib, ... }: { name = "initrd-network-ssh"; meta = with lib.maintainers; { - maintainers = [ willibutz ]; + maintainers = [ willibutz emily ]; }; nodes = with lib; { @@ -17,9 +17,9 @@ import ../make-test-python.nix ({ lib, ... }: enable = true; ssh = { enable = true; - authorizedKeys = [ "${readFile ./openssh.pub}" ]; + authorizedKeys = [ (readFile ./id_ed25519.pub) ]; port = 22; - hostRSAKey = ./dropbear.priv; + hostKeys = [ ./ssh_host_ed25519_key ]; }; }; boot.initrd.preLVMCommands = '' @@ -42,11 +42,11 @@ import ../make-test-python.nix ({ lib, ... }: "${toString (head (splitString " " ( toString (elemAt (splitString "\n" config.networking.extraHosts) 2) )))} " - "${readFile ./dropbear.pub}" + "${readFile ./ssh_host_ed25519_key.pub}" ]; }; sshKey = { - source = ./openssh.priv; # dont use this anywhere else + source = ./id_ed25519; mode = "0600"; }; }; @@ -56,7 +56,17 @@ import ../make-test-python.nix ({ lib, ... }: testScript = '' start_all() client.wait_for_unit("network.target") - client.wait_until_succeeds("ping -c 1 server") + + + def ssh_is_up(_) -> bool: + status, _ = client.execute("nc -z server 22") + return status == 0 + + + with client.nested("waiting for SSH server to come up"): + retry(ssh_is_up) + + client.succeed( "ssh -i /etc/sshKey -o UserKnownHostsFile=/etc/knownHosts server 'touch /fnord'" ) diff --git a/nixos/tests/initrd-network-ssh/dropbear.priv b/nixos/tests/initrd-network-ssh/dropbear.priv deleted file mode 100644 index af340535f0a..00000000000 --- a/nixos/tests/initrd-network-ssh/dropbear.priv +++ /dev/null Binary files differdiff --git a/nixos/tests/initrd-network-ssh/dropbear.pub b/nixos/tests/initrd-network-ssh/dropbear.pub deleted file mode 100644 index 385c625522a..00000000000 --- a/nixos/tests/initrd-network-ssh/dropbear.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCzJ0OniLB91MpPC86I1m3wwJeAc+Gme7bAuaLIU/cSfPwxT5NO7MfCp0Pu94gYDKtDXMs/wXg0bTAVDeAFFkdIj6kBBumEmQLCTL48q2UxDIXVLT/E/AAgj6q7WwgCg7fwm4Vjn4z7aUyBx8EfRy+5/SQyeYla3D/lFYgMi5x4D6J+yeR+JPAptDE/IR5IizNV7mY0ZcoXYyHrrehI1tTYEEqjX13ZqS4OCBFWwHe1QHhRNM+jHhcATbgikjAj8FyFPtLvc+dSVtkuhQktQl36Bi8zMUQcV6+mM7Ln6DBcDlM9urHKLYPTWmUAyhxM955iglOn5z0RaAIcyNMT6hz0rHaNf0BIlmbXoTC0XGjHh/OnoOEC/zg0JqgQTnPiU45K4TnRSSXp2GfiDfiQAK0+HaXACkjuFR68u7WCZpB1Bse1OgKNClFqtRhIr5DilUb2/e5DCCmFkddMUcjmYqzZdbXNt7fo8CFULe+mbiCp8+tMg4aRTaDZ/Hk93nCvGE5TP2ypEMbfL6nRVKvXOjhdvSQQgKwx+O003FDEHCSG0Bpageh7yVpna+SPrbGklce7MjTpbx3iIwmvKpQ6asnK1L3KkahpY1S3NhQ+/S3Gs8KWQ5LAU+d3xiPX3jfIVHsCIIyxHDbwcJvxM4MFBFQpqRMD6E+LoM9RHjl4C9k2iQ== tmtynkky@duuni diff --git a/nixos/tests/initrd-network-ssh/generate-keys.nix b/nixos/tests/initrd-network-ssh/generate-keys.nix index 0183e12d7a8..3d7978890ab 100644 --- a/nixos/tests/initrd-network-ssh/generate-keys.nix +++ b/nixos/tests/initrd-network-ssh/generate-keys.nix @@ -1,12 +1,10 @@ with import ../../.. {}; runCommand "gen-keys" { - buildInputs = [ dropbear openssh ]; + buildInputs = [ openssh ]; } '' mkdir $out - dropbearkey -t rsa -f $out/dropbear.priv -s 4096 | sed -n 2p > $out/dropbear.pub - ssh-keygen -q -t rsa -b 4096 -N "" -f client - mv client $out/openssh.priv - mv client.pub $out/openssh.pub + ssh-keygen -q -t ed25519 -N "" -f $out/ssh_host_ed25519_key + ssh-keygen -q -t ed25519 -N "" -f $out/id_ed25519 '' diff --git a/nixos/tests/initrd-network-ssh/id_ed25519 b/nixos/tests/initrd-network-ssh/id_ed25519 new file mode 100644 index 00000000000..f914b3f712f --- /dev/null +++ b/nixos/tests/initrd-network-ssh/id_ed25519 @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACAVcX+32Yqig25RxRA8bel/f604wV0p/63um+Oku/3vfwAAAJi/AJZMvwCW +TAAAAAtzc2gtZWQyNTUxOQAAACAVcX+32Yqig25RxRA8bel/f604wV0p/63um+Oku/3vfw +AAAEAPLjQusjrB90Lk3996G3AbtTeK+XweNgxaegYnml/A/RVxf7fZiqKDblHFEDxt6X9/ +rTjBXSn/re6b46S7/e9/AAAAEG5peGJsZEBsb2NhbGhvc3QBAgMEBQ== +-----END OPENSSH PRIVATE KEY----- diff --git a/nixos/tests/initrd-network-ssh/id_ed25519.pub b/nixos/tests/initrd-network-ssh/id_ed25519.pub new file mode 100644 index 00000000000..40de4a8ac60 --- /dev/null +++ b/nixos/tests/initrd-network-ssh/id_ed25519.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBVxf7fZiqKDblHFEDxt6X9/rTjBXSn/re6b46S7/e9/ nixbld@localhost diff --git a/nixos/tests/initrd-network-ssh/openssh.priv b/nixos/tests/initrd-network-ssh/openssh.priv deleted file mode 100644 index 816d65435fd..00000000000 --- a/nixos/tests/initrd-network-ssh/openssh.priv +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIJKAIBAAKCAgEA7+9A2PCPOTAlFmrablrUWA+VZdAuLfM6JXeHsOF7ZbC2F6lv -WmvDM925DQqhiAjcgWnt5WHWS5Y+b7lGnuzT7fyKegXd80nCRmqlpSG3srX0/lxR -aQAJLzfoDjcsF+ceswQo6GSsYnCHVxMNs007gbbVY3f7o+sWZtLdxJPD2iHvl5Zr -LK0d1RLMmU6cfIhIABlL0S8EWiv29RROepsCQnS0dnK2b+von1SCYoggvAMe2ToA -IAJ8+uqaYfGAyn9q8fjZiRHxLmKDq90tKoCUL5r/2dmEIE+t8T/3PfHoq1QzZts9 -W9idhBdT21dEXBtGyoMtckp5njk5m82LQDYiOXkuSoIUhSOteh5g7fBv1BtVSERx -Jg3UeJjPeGKFwdnzapmAKC2w/6V8xcIINNA+fhZA7B9fD1RAi2TECZ+gyMYDc4T+ -USlMSm9cfvSOrf2+5ngtFb84nHjqvClxCMLu+bCWK8HamqUzhE/a5LbR+48E7PyG -s3KV+sWFN9KOnakTjj/6iQhXZRhgeAK39F2XTk5Ms5Y+BRSStnMoMZA2grIV+jHi -1zbWokVqXPI5YRo5isR/PgtKAV6FfNWumcYoFJ9F40pMHQ6hJVEmtrCBx7EApSl3 -mSGbQJUmilLC51qNhwQRbD//ZtpIrN82HTMKzZ6kj7kDCdsff+wsnkIXmmMCAwEA -AQKCAgA4tMINw6UF7hQF3VEsnbjr6xrzCiWv5HlMm5htPI1OdlpC81+G7ksfOfrf -UzDkFrwOtftsqBfem268Nvyy2OQprfMIbdSMCFWrEM9/XJ2u1gRGDYmMGF8TUtI8 -cduw9oWx53zHl+uKBHBoKu+k/c7flFeQf63wisIroRCawhWau0SF/h3sXCndzuie -Hw8q+4aQx2m80bDkotlmCNuXbIU3MZ/pEql9gDLlXTLHmMaryM0EqAmZhx0ErGe6 -WDqJIV4kPB0loSDwRoY6GzbugZ8ENUzcruTkQhCpIOYNNNw5idfwKkaxK1vm+SBv -iYt1fVjYyfH2vhVKSNoNsaGEloa1u4Dymt/FpFztEpRzHXcw93N8BdLxJ4OUhzm2 -iAbpiyjniTIeAVVi7BUwLXh5WAx8nT0eeb1zKoZg1p1ciK5cYl1Uel7j8xRycsSW -3YgmtuPqY4Agbc9v3eXbQZNDk48JFMEqpIxk97FAkRYpzfxg5Qq14WJCp60CkdRt -T60hXy8lT/BcI8OWLfGJuBbsVLNRiC7PpwqRKQAinXSv134FpP7jrhpkMybs2oIS -5obRG7J5OfOTp925erG5mrpwqa3BPkgqx347Wj9z8quOZyuhi+XaPvqmPtvs5JOl -4RCqjt6RQlHm7xos9ZZGI4jDAIFaFWgyVZrYplOgwxWma4DTgQKCAQEA9+tizQRU -lF0lxNcEPvsFnYJo80Y+MQK9VdtlhR19YuSfwP1NCaMG1MhQ+PVBVmepOwJMRJR7 -9PLfOouNMfixKBGP12dtStMuh7jowq/BxhRI6JWp3RhTZ1yJ9ouzHze7IDrEBa6w -p0hUu9H0Sbt51LXbC3JmTyhbdhfry559DfyGW1Ma/bv/pihL9B5Y7sNf1thNp1gi -GbQ9B+o2Yyw8ZD8zY+sl+aYDSWyCtcBV/KXEF74Bkfs/a5ExJ00X0jYj/TAp2ray -T4PY0FR8wN/O10bFLP9j+Xa/ywbcPhoj8nvVRIg9VfWT/QaEd+KR0EZVxdjCCqne -enbSQksTpAZNwQKCAQEA98E+BMmS+yHUVUhNZABtQ5avwuV4+DoSN8KTp3xwQ0CH -m9fWxSDs12FdyMhDxrJPeywvHtZ18/7cl3dr8wnFVE0s4ongnRDXsNk5xN6J3AaO -KqW4HF9cbwZqzLILy8TrO+EK/EQV9FypbrxqvxAlP1kezIA2CJNzVRAgimSuV/H7 -05HTnp5W06fjtEf8U1CUrdNetoSROUo1j/IMGPYGlsBFYAGrj5y/BlKd+3T3kjRp -Xje7HpiykjrZHn0WDp04Ln+u9nveEewXmHKch313emt7HpW0xspp8JM8OZtEKozk -D5PfYdBfMJJOUlqovCCzTTJ6kNOahknKXFeO/qs5IwKCAQEAjF0/zhWikXF/fcfD -Bql2z2vTYdEmSvdjHSYff1Nn90K71DdVk5wytOxJM/sfp/z+yoMNjVKIL/IGQw5Z -va4xFx+CUhGjxlZ0pLEjT37U9gHsGYsK5jvslLvG/MixfH5AOwoqi5ERQVTpbIF9 -jvVPEAh6YSu/ExglWGJIxTsRUIblxvTxdjEnl/p+rlM0RNJnA6vpo1J51BXA7CdF -7bZQ5u0Feo/bK1I70ClYg/DGfkmYEV0pZG5cxNkqfDbgwsqWa7YGLGd94xkh+ymq -jETqxeWyozxhbQ83nYpfzeVc7t//qlJ8b5uf0wUKoRmtNr9rtp13lzP/21REzPXW -w+oxwQKCAQAoAf2Y2lAw25KlPuq4ZlU+n9u8FkBFnWMJvBMJ7c9XHNmJMf6NkLaO -RTvWy3geYvbwxf7J9QnRH+vRTciR05cY+Olxn6A03N5nwXxRrToH3MsiWeZ0NnX/ -u8KNUYcUHbV60ulqOThuYHQ/3I9EUUAijaqqjV2sXts19ke68W0x6HKpBJhuudT9 -ktPzbdhyP8Xyl/pocNnerXwexZBsi3Ye6+eIDFz+8OnsBHVcgNPluS72tvsxgqj7 -ciNTiBGCxKKo55eCWBhRPpXE2WUrf/hGPYsBMl2h6FfZMH1+M/N7B4tgdJmS+woU -Ftws8lTjJEiwA6HFN1ZxrwLNjJobx9yPAoIBAE0igsBuWWn6rXeOPylYg4264XOq -8gb94pte2n9amDgCzyCn8m6AL3snLC/AoCD19DK+gyK0ukoesXPa3iX6w2xv69ZC -urDx36Jhd4zrJb4QsFPoeKfDP+UvNVZaS41vipRRzY/y11em15prUZ4U8FA/UT1Y -FzkBo9r6iUZRnyBLppMuEfWASDtuRNmeIHynoT1AcQOH3l9vR210iEpmAuJr0CYA -bvTuz3UzzGGEAuIUvuaiRtkfKY52jBmiEr7SSPCr1HvLj3Ccz8bgjgR2kiXmcU50 -1zLnaPAD44LZ/0Fjqj+PimQGT6K7CNXPllmYh7MvoU52g3SVPf6rHlIR0Nc= ------END RSA PRIVATE KEY----- diff --git a/nixos/tests/initrd-network-ssh/openssh.pub b/nixos/tests/initrd-network-ssh/openssh.pub deleted file mode 100644 index 5b72b8085f2..00000000000 --- a/nixos/tests/initrd-network-ssh/openssh.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDv70DY8I85MCUWatpuWtRYD5Vl0C4t8zold4ew4XtlsLYXqW9aa8Mz3bkNCqGICNyBae3lYdZLlj5vuUae7NPt/Ip6Bd3zScJGaqWlIbeytfT+XFFpAAkvN+gONywX5x6zBCjoZKxicIdXEw2zTTuBttVjd/uj6xZm0t3Ek8PaIe+XlmssrR3VEsyZTpx8iEgAGUvRLwRaK/b1FE56mwJCdLR2crZv6+ifVIJiiCC8Ax7ZOgAgAnz66pph8YDKf2rx+NmJEfEuYoOr3S0qgJQvmv/Z2YQgT63xP/c98eirVDNm2z1b2J2EF1PbV0RcG0bKgy1ySnmeOTmbzYtANiI5eS5KghSFI616HmDt8G/UG1VIRHEmDdR4mM94YoXB2fNqmYAoLbD/pXzFwgg00D5+FkDsH18PVECLZMQJn6DIxgNzhP5RKUxKb1x+9I6t/b7meC0VvziceOq8KXEIwu75sJYrwdqapTOET9rkttH7jwTs/IazcpX6xYU30o6dqROOP/qJCFdlGGB4Arf0XZdOTkyzlj4FFJK2cygxkDaCshX6MeLXNtaiRWpc8jlhGjmKxH8+C0oBXoV81a6ZxigUn0XjSkwdDqElUSa2sIHHsQClKXeZIZtAlSaKUsLnWo2HBBFsP/9m2kis3zYdMwrNnqSPuQMJ2x9/7CyeQheaYw== tmtynkky@duuni diff --git a/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key b/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key new file mode 100644 index 00000000000..f1e29459b7a --- /dev/null +++ b/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key @@ -0,0 +1,7 @@ +-----BEGIN OPENSSH PRIVATE KEY----- +b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW +QyNTUxOQAAACDP9Mz6qlxdQqA4omrgbOlVsxSGONCJstjW9zqquajlIAAAAJg0WGFGNFhh +RgAAAAtzc2gtZWQyNTUxOQAAACDP9Mz6qlxdQqA4omrgbOlVsxSGONCJstjW9zqquajlIA +AAAEA0Hjs7LfFPdTf3ThGx6GNKvX0ItgzgXs91Z3oGIaF6S8/0zPqqXF1CoDiiauBs6VWz +FIY40Imy2Nb3Oqq5qOUgAAAAEG5peGJsZEBsb2NhbGhvc3QBAgMEBQ== +-----END OPENSSH PRIVATE KEY----- diff --git a/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key.pub b/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key.pub new file mode 100644 index 00000000000..3aa1587e1dc --- /dev/null +++ b/nixos/tests/initrd-network-ssh/ssh_host_ed25519_key.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/0zPqqXF1CoDiiauBs6VWzFIY40Imy2Nb3Oqq5qOUg nixbld@localhost diff --git a/nixos/tests/kafka.nix b/nixos/tests/kafka.nix index f3de24e873b..d29c802b47b 100644 --- a/nixos/tests/kafka.nix +++ b/nixos/tests/kafka.nix @@ -77,7 +77,7 @@ let + "--from-beginning --max-messages 1" ) ''); - }) {}); + }) { inherit system; }); in with pkgs; { kafka_0_9 = makeKafkaTest "kafka_0_9" apacheKafka_0_9; diff --git a/nixos/tests/magic-wormhole-mailbox-server.nix b/nixos/tests/magic-wormhole-mailbox-server.nix new file mode 100644 index 00000000000..144a07e1349 --- /dev/null +++ b/nixos/tests/magic-wormhole-mailbox-server.nix @@ -0,0 +1,38 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "magic-wormhole-mailbox-server"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mmahut ]; + }; + + nodes = { + server = { ... }: { + networking.firewall.allowedTCPPorts = [ 4000 ]; + services.magic-wormhole-mailbox-server.enable = true; + }; + + client_alice = { ... }: { + networking.firewall.enable = false; + environment.systemPackages = [ pkgs.magic-wormhole ]; + }; + + client_bob = { ... }: { + environment.systemPackages = [ pkgs.magic-wormhole ]; + }; + }; + + testScript = '' + start_all() + + # Start the wormhole relay server + server.wait_for_unit("magic-wormhole-mailbox-server.service") + server.wait_for_open_port(4000) + + # Create a secret file and send it to Bob + client_alice.succeed("echo mysecret > secretfile") + client_alice.succeed("wormhole --relay-url=ws://server:4000/v1 send -0 secretfile &") + + # Retrieve a secret file from Alice and check its content + client_bob.succeed("wormhole --relay-url=ws://server:4000/v1 receive -0 --accept-file") + client_bob.succeed("grep mysecret secretfile") + ''; +}) diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix index ee7fc50f7ec..a637ec4bfc0 100644 --- a/nixos/tests/mongodb.nix +++ b/nixos/tests/mongodb.nix @@ -33,7 +33,7 @@ import ./make-test-python.nix ({ pkgs, ... }: nodes = { node = {...}: { environment.systemPackages = with pkgs; [ -# mongodb-3_4 + mongodb-3_4 mongodb-3_6 mongodb-4_0 ]; @@ -43,7 +43,7 @@ import ./make-test-python.nix ({ pkgs, ... }: testScript = '' node.start() '' -# + runMongoDBTest pkgs.mongodb-3_4 + + runMongoDBTest pkgs.mongodb-3_4 + runMongoDBTest pkgs.mongodb-3_6 + runMongoDBTest pkgs.mongodb-4_0 + '' diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index 895b7e2014c..60aef586ad5 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: # License: http://creativecommons.org/licenses/by-sa/4.0/ name = "Blue_Wave_Theory-Skyhawk_Beach.mp3"; - url = https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3; + url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3"; sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp"; }; diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix index 84673181e1a..11c1dabf936 100644 --- a/nixos/tests/mysql.nix +++ b/nixos/tests/mysql.nix @@ -68,6 +68,11 @@ import ./make-test-python.nix ({ pkgs, ...} : { "testdb2.*" = "ALL PRIVILEGES"; }; }]; + services.mysql.settings = { + mysqld = { + plugin-load-add = [ "ha_tokudb.so" "ha_rocksdb.so" ]; + }; + }; services.mysql.package = pkgs.mariadb; }; @@ -106,5 +111,33 @@ import ./make-test-python.nix ({ pkgs, ...} : { mariadb.succeed( "echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42" ) + + # Check if TokuDB plugin works + mariadb.succeed( + "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25" + ) + mariadb.succeed( + "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser" + ) + + # Check if RocksDB plugin works + mariadb.succeed( + "echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; insert into rocksdb values (28);' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; select test_id from rocksdb;' | sudo -u testuser mysql -u testuser -N | grep 28" + ) + mariadb.succeed( + "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser" + ) ''; }) diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index 75862feb202..92ac5c46e8f 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -32,7 +32,7 @@ in { testScript = let withRcloneEnv = pkgs.writeScript "with-rclone-env" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" @@ -41,12 +41,12 @@ in { "''${@}" ''; copySharedFile = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} echo 'hi' | ${withRcloneEnv} ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file ''; diffSharedFile = pkgs.writeScript "diff-shared-file" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) ''; in '' diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index b9ba5888187..8db630be893 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -61,14 +61,14 @@ in { testScript = let configureMemcached = pkgs.writeScript "configure-memcached" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} nextcloud-occ config:system:set memcached_servers 0 0 --value 127.0.0.1 --type string nextcloud-occ config:system:set memcached_servers 0 1 --value 11211 --type integer nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\APCu' --type string nextcloud-occ config:system:set memcache.distributed --value '\OC\Memcache\Memcached' --type string ''; withRcloneEnv = pkgs.writeScript "with-rclone-env" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" @@ -76,12 +76,12 @@ in { export RCLONE_CONFIG_NEXTCLOUD_PASS="$(${pkgs.rclone}/bin/rclone obscure ${adminpass})" ''; copySharedFile = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file ''; diffSharedFile = pkgs.writeScript "diff-shared-file" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) ''; in '' diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 324853350af..95219cac9be 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -60,14 +60,14 @@ in { testScript = let configureRedis = pkgs.writeScript "configure-redis" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} nextcloud-occ config:system:set redis 'host' --value 'localhost' --type string nextcloud-occ config:system:set redis 'port' --value 6379 --type integer nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\Redis' --type string nextcloud-occ config:system:set memcache.locking --value '\OC\Memcache\Redis' --type string ''; withRcloneEnv = pkgs.writeScript "with-rclone-env" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav export RCLONE_CONFIG_NEXTCLOUD_URL="http://nextcloud/remote.php/webdav/" export RCLONE_CONFIG_NEXTCLOUD_VENDOR="nextcloud" @@ -76,12 +76,12 @@ in { "''${@}" ''; copySharedFile = pkgs.writeScript "copy-shared-file" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} echo 'hi' | ${pkgs.rclone}/bin/rclone rcat nextcloud:test-shared-file ''; diffSharedFile = pkgs.writeScript "diff-shared-file" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) ''; in '' diff --git a/nixos/tests/nginx-pubhtml.nix b/nixos/tests/nginx-pubhtml.nix new file mode 100644 index 00000000000..432913cb42d --- /dev/null +++ b/nixos/tests/nginx-pubhtml.nix @@ -0,0 +1,20 @@ +import ./make-test-python.nix { + name = "nginx-pubhtml"; + + machine = { pkgs, ... }: { + services.nginx.enable = true; + services.nginx.virtualHosts.localhost = { + locations."~ ^/\\~([a-z0-9_]+)(/.*)?$".alias = "/home/$1/public_html$2"; + }; + users.users.foo.isNormalUser = true; + }; + + testScript = '' + machine.wait_for_unit("nginx") + machine.wait_for_open_port(80) + machine.succeed("chmod 0711 /home/foo") + machine.succeed("su -c 'mkdir -p /home/foo/public_html' foo") + machine.succeed("su -c 'echo bar > /home/foo/public_html/bar.txt' foo") + machine.succeed('test "$(curl -fvvv http://localhost/~foo/bar.txt)" = bar') + ''; +} diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 5407a62339f..6a38f5ca531 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -51,6 +51,8 @@ let hashed-mirrors = connect-timeout = 1 ''; + # save some memory + documentation.enable = false; }; # /etc/nixos/configuration.nix for the vm configFile = pkgs.writeText "configuration.nix" '' diff --git a/nixos/tests/php/default.nix b/nixos/tests/php/default.nix new file mode 100644 index 00000000000..9ab14f722d0 --- /dev/null +++ b/nixos/tests/php/default.nix @@ -0,0 +1,7 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../../.. { inherit system config; } +}: { + fpm = import ./fpm.nix { inherit system pkgs; }; + pcre = import ./pcre.nix { inherit system pkgs; }; +} diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix new file mode 100644 index 00000000000..e93a3183418 --- /dev/null +++ b/nixos/tests/php/fpm.nix @@ -0,0 +1,55 @@ +import ../make-test-python.nix ({pkgs, ...}: { + name = "php-fpm-nginx-test"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; + + machine = { config, lib, pkgs, ... }: { + services.nginx = { + enable = true; + + virtualHosts."phpfpm" = let + testdir = pkgs.writeTextDir "web/index.php" "<?php phpinfo();"; + in { + root = "${testdir}/web"; + locations."~ \.php$".extraConfig = '' + fastcgi_pass unix:${config.services.phpfpm.pools.foobar.socket}; + fastcgi_index index.php; + include ${pkgs.nginx}/conf/fastcgi_params; + include ${pkgs.nginx}/conf/fastcgi.conf; + ''; + locations."/" = { + tryFiles = "$uri $uri/ index.php"; + index = "index.php index.html index.htm"; + }; + }; + }; + + services.phpfpm.pools."foobar" = { + user = "nginx"; + settings = { + "listen.group" = "nginx"; + "listen.mode" = "0600"; + "listen.owner" = "nginx"; + "pm" = "dynamic"; + "pm.max_children" = 5; + "pm.max_requests" = 500; + "pm.max_spare_servers" = 3; + "pm.min_spare_servers" = 1; + "pm.start_servers" = 2; + }; + }; + }; + testScript = { ... }: '' + machine.wait_for_unit("nginx.service") + machine.wait_for_unit("phpfpm-foobar.service") + + # Check so we get an evaluated PHP back + assert "PHP Version ${pkgs.php.version}" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") + + # Check so we have database and some other extensions loaded + assert "json" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") + assert "opcache" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") + assert "pdo_mysql" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") + assert "pdo_pgsql" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") + assert "pdo_sqlite" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") + ''; +}) diff --git a/nixos/tests/php-pcre.nix b/nixos/tests/php/pcre.nix index d5c22e0582a..56a87778579 100644 --- a/nixos/tests/php-pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -1,7 +1,6 @@ - -let testString = "can-use-subgroups"; in - -import ./make-test-python.nix ({ ...}: { +let + testString = "can-use-subgroups"; +in import ../make-test-python.nix ({ ...}: { name = "php-httpd-pcre-jit-test"; machine = { lib, pkgs, ... }: { time.timeZone = "UTC"; @@ -10,15 +9,13 @@ import ./make-test-python.nix ({ ...}: { adminAddr = "please@dont.contact"; enablePHP = true; phpOptions = "pcre.jit = true"; - extraConfig = - let + extraConfig = let testRoot = pkgs.writeText "index.php" - '' - <?php + '' + <?php preg_match('/(${testString})/', '${testString}', $result); var_dump($result); - ?> - ''; + ''; in '' Alias / ${testRoot}/ @@ -30,11 +27,11 @@ import ./make-test-python.nix ({ ...}: { }; }; testScript = { ... }: - '' - machine.wait_for_unit("httpd.service") - # Ensure php evaluation by matching on the var_dump syntax - assert 'string(${toString (builtins.stringLength testString)}) "${testString}"' in machine.succeed( - "curl -vvv -s http://127.0.0.1:80/index.php" - ) - ''; + '' + machine.wait_for_unit("httpd.service") + # Ensure php evaluation by matching on the var_dump syntax + assert 'string(${toString (builtins.stringLength testString)}) "${testString}"' in machine.succeed( + "curl -vvv -s http://127.0.0.1:80/index.php" + ) + ''; }) diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix new file mode 100644 index 00000000000..846d2a93018 --- /dev/null +++ b/nixos/tests/quorum.nix @@ -0,0 +1,79 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "quorum"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ mmahut ]; + }; + + nodes = { + machine = { ... }: { + services.quorum = { + enable = true; + permissioned = false; + staticNodes = [ "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0" ]; + genesis = { + alloc = { + "189d23d201b03ae1cf9113672df29a5d672aefa3" = { + balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; + }; + "44b07d2c28b8ed8f02b45bd84ac7d9051b3349e6" = { + balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; + }; + "4c1ccd426833b9782729a212c857f2f03b7b4c0d" = { + balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; + }; + "7ae555d0f6faad7930434abdaac2274fd86ab516" = { + balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; + }; + c1056df7c02b6f1a353052eaf0533cc7cb743b52 = { + balance = "0x446c3b15f9926687d2c40534fdb564000000000000"; + }; + }; + coinbase = "0x0000000000000000000000000000000000000000"; + config = { + byzantiumBlock = 1; + chainId = 10; + eip150Block = 1; + eip150Hash = + "0x0000000000000000000000000000000000000000000000000000000000000000"; + eip155Block = 1; + eip158Block = 1; + isQuorum = true; + istanbul = { + epoch = 30000; + policy = 0; + }; + }; + difficulty = "0x1"; + extraData = + "0x0000000000000000000000000000000000000000000000000000000000000000f8aff869944c1ccd426833b9782729a212c857f2f03b7b4c0d94189d23d201b03ae1cf9113672df29a5d672aefa39444b07d2c28b8ed8f02b45bd84ac7d9051b3349e694c1056df7c02b6f1a353052eaf0533cc7cb743b52947ae555d0f6faad7930434abdaac2274fd86ab516b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0"; + gasLimit = "0xe0000000"; + gasUsed = "0x0"; + mixHash = + "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365"; + nonce = "0x0"; + number = "0x0"; + parentHash = + "0x0000000000000000000000000000000000000000000000000000000000000000"; + timestamp = "0x5cffc201"; + }; + }; + }; + }; + + testScript = '' + start_all() + machine.wait_until_succeeds("mkdir -p /var/lib/quorum/keystore") + machine.wait_until_succeeds( + 'echo \{\\"address\\":\\"9377bc3936de934c497e22917b81aa8774ac3bb0\\",\\"crypto\\":\{\\"cipher\\":\\"aes-128-ctr\\",\\"ciphertext\\":\\"ad8341d8ef225650403fd366c955f41095e438dd966a3c84b3d406818c1e366c\\",\\"cipherparams\\":\{\\"iv\\":\\"2a09f7a72fd6dff7c43150ff437e6ac2\\"\},\\"kdf\\":\\"scrypt\\",\\"kdfparams\\":\{\\"dklen\\":32,\\"n\\":262144,\\"p\\":1,\\"r\\":8,\\"salt\\":\\"d1a153845bb80cd6274c87c5bac8ac09fdfac5ff131a6f41b5ed319667f12027\\"\},\\"mac\\":\\"a9621ad88fa1d042acca6fc2fcd711f7e05bfbadea3f30f379235570c8e270d3\\"\},\\"id\\":\\"89e847a3-1527-42f6-a321-77de0a14ce02\\",\\"version\\":3\}\\" > /var/lib/quorum/keystore/UTC--2020-03-23T11-08-34.144812212Z--9377bc3936de934c497e22917b81aa8774ac3bb0' + ) + machine.wait_until_succeeds( + "echo fe2725c4e8f7617764b845e8d939a65c664e7956eb47ed7d934573f16488efc1 > /var/lib/quorum/nodekey" + ) + machine.wait_until_succeeds("systemctl restart quorum") + machine.wait_for_unit("quorum.service") + machine.sleep(15) + machine.wait_until_succeeds( + 'geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep 0x9377bc3936de934c497e22917b81aa8774ac3bb0' + ) + ''; +}) diff --git a/nixos/tests/rabbitmq.nix b/nixos/tests/rabbitmq.nix index 8e7f34d06e3..f403e4ac2ed 100644 --- a/nixos/tests/rabbitmq.nix +++ b/nixos/tests/rabbitmq.nix @@ -15,7 +15,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_unit("rabbitmq.service") machine.wait_until_succeeds( - 'su -s ${pkgs.stdenv.shell} rabbitmq -c "rabbitmqctl status"' + 'su -s ${pkgs.runtimeShell} rabbitmq -c "rabbitmqctl status"' ) ''; }) diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index f0f4cbf6a21..73eb684f33a 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -15,13 +15,13 @@ let services.redmine.database.type = "mysql2"; services.redmine.plugins = { redmine_env_auth = pkgs.fetchurl { - url = https://github.com/Intera/redmine_env_auth/archive/0.7.zip; + url = "https://github.com/Intera/redmine_env_auth/archive/0.7.zip"; sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; }; }; services.redmine.themes = { dkuk-redmine_alex_skin = pkgs.fetchurl { - url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; + url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip"; sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; }; }; @@ -43,13 +43,13 @@ let services.redmine.database.type = "postgresql"; services.redmine.plugins = { redmine_env_auth = pkgs.fetchurl { - url = https://github.com/Intera/redmine_env_auth/archive/0.7.zip; + url = "https://github.com/Intera/redmine_env_auth/archive/0.7.zip"; sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; }; }; services.redmine.themes = { dkuk-redmine_alex_skin = pkgs.fetchurl { - url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; + url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip"; sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; }; }; diff --git a/nixos/tests/rxe.nix b/nixos/tests/rxe.nix index 194a2e3d2b9..10753c4ed0c 100644 --- a/nixos/tests/rxe.nix +++ b/nixos/tests/rxe.nix @@ -28,7 +28,7 @@ in { # Test if rxe interface comes up server.wait_for_unit("default.target") server.succeed("systemctl status rxe.service") - server.succeed("ibv_devices | grep rxe0") + server.succeed("ibv_devices | grep rxe_eth1") client.wait_for_unit("default.target") diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 7076bd77b77..9ef96cec5ef 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { # Ensures failures pass through using pipefail, otherwise failing to # switch-to-configuration is hidden by the success of `tee`. stderrRunner = pkgs.writeScript "stderr-runner" '' - #! ${pkgs.stdenv.shell} + #! ${pkgs.runtimeShell} set -e set -o pipefail exec env -i "$@" | tee /dev/stderr diff --git a/nixos/tests/systemd-confinement.nix b/nixos/tests/systemd-confinement.nix index b7b10fb36aa..f22836e227b 100644 --- a/nixos/tests/systemd-confinement.nix +++ b/nixos/tests/systemd-confinement.nix @@ -3,14 +3,14 @@ import ./make-test.nix { machine = { pkgs, lib, ... }: let testServer = pkgs.writeScript "testserver.sh" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} export PATH=${lib.escapeShellArg "${pkgs.coreutils}/bin"} - ${lib.escapeShellArg pkgs.stdenv.shell} 2>&1 + ${lib.escapeShellArg pkgs.runtimeShell} 2>&1 echo "exit-status:$?" ''; testClient = pkgs.writeScriptBin "chroot-exec" '' - #!${pkgs.stdenv.shell} -e + #!${pkgs.runtimeShell} -e output="$(echo "$@" | nc -NU "/run/test$(< /teststep).sock")" ret="$(echo "$output" | sed -nre '$s/^exit-status:([0-9]+)$/\1/p')" echo "$output" | head -n -1 diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 8028145939b..ca2e36a443e 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -22,7 +22,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { test-support.displayManager.auto.user = "alice"; systemd.shutdown.test = pkgs.writeScript "test.shutdown" '' - #!${pkgs.stdenv.shell} + #!${pkgs.runtimeShell} PATH=${lib.makeBinPath (with pkgs; [ utillinux coreutils ])} mount -t 9p shared -o trans=virtio,version=9p2000.L /tmp/shared touch /tmp/shared/shutdown-test diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 0cbfa0c4c7b..64f5b6c40d2 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let stick = pkgs.fetchurl { - url = http://nixos.org/~eelco/nix/udisks-test.img.xz; + url = "http://nixos.org/~eelco/nix/udisks-test.img.xz"; sha256 = "0was1xgjkjad91nipzclaz5biv3m4b2nk029ga6nk7iklwi19l8b"; }; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index f03dc1cc413..aec8da6a2af 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -23,7 +23,7 @@ let guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions; miniInit = '' - #!${pkgs.stdenv.shell} -xe + #!${pkgs.runtimeShell} -xe export PATH="${lib.makeBinPath [ pkgs.coreutils pkgs.utillinux ]}" mkdir -p /run/dbus @@ -80,7 +80,7 @@ let touch /mnt-root/boot-done hostname "${vmName}" mkdir -p /nix/store - unshare -m ${escapeShellArg pkgs.stdenv.shell} -c ' + unshare -m ${escapeShellArg pkgs.runtimeShell} -c ' mount -t vboxsf nixstore /nix/store exec "$stage2Init" ' diff --git a/nixos/tests/wireguard/default.nix b/nixos/tests/wireguard/default.nix index 8206823a918..e3bc31c600f 100644 --- a/nixos/tests/wireguard/default.nix +++ b/nixos/tests/wireguard/default.nix @@ -1,97 +1,71 @@ -let - wg-snakeoil-keys = import ./snakeoil-keys.nix; -in - -import ../make-test-python.nix ({ pkgs, ...} : { - name = "wireguard"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ ma27 ]; - }; - - nodes = { - peer0 = { lib, ... }: { - boot.kernel.sysctl = { - "net.ipv6.conf.all.forwarding" = "1"; - "net.ipv6.conf.default.forwarding" = "1"; - "net.ipv4.ip_forward" = "1"; - }; - - networking.useDHCP = false; - networking.interfaces.eth1 = { - ipv4.addresses = lib.singleton { - address = "192.168.0.1"; - prefixLength = 24; - }; - ipv6.addresses = lib.singleton { - address = "fd00::1"; - prefixLength = 64; - }; - }; +import ../make-test-python.nix ({ pkgs, lib, ...} : + let + wg-snakeoil-keys = import ./snakeoil-keys.nix; + peer = (import ./make-peer.nix) { inherit lib; }; + in + { + name = "wireguard"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ma27 ]; + }; - networking.firewall.allowedUDPPorts = [ 23542 ]; - networking.wireguard.interfaces.wg0 = { - ips = [ "10.23.42.1/32" "fc00::1/128" ]; - listenPort = 23542; + nodes = { + peer0 = peer { + ip4 = "192.168.0.1"; + ip6 = "fd00::1"; + extraConfig = { + networking.firewall.allowedUDPPorts = [ 23542 ]; + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.1/32" "fc00::1/128" ]; + listenPort = 23542; - inherit (wg-snakeoil-keys.peer0) privateKey; + inherit (wg-snakeoil-keys.peer0) privateKey; - peers = lib.singleton { - allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; + peers = lib.singleton { + allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; - inherit (wg-snakeoil-keys.peer1) publicKey; + inherit (wg-snakeoil-keys.peer1) publicKey; + }; + }; }; }; - }; - peer1 = { pkgs, lib, ... }: { - boot.kernel.sysctl = { - "net.ipv6.conf.all.forwarding" = "1"; - "net.ipv6.conf.default.forwarding" = "1"; - "net.ipv4.ip_forward" = "1"; - }; - - networking.useDHCP = false; - networking.interfaces.eth1 = { - ipv4.addresses = lib.singleton { - address = "192.168.0.2"; - prefixLength = 24; - }; - ipv6.addresses = lib.singleton { - address = "fd00::2"; - prefixLength = 64; + peer1 = peer { + ip4 = "192.168.0.2"; + ip6 = "fd00::2"; + extraConfig = { + networking.wireguard.interfaces.wg0 = { + ips = [ "10.23.42.2/32" "fc00::2/128" ]; + listenPort = 23542; + allowedIPsAsRoutes = false; + + inherit (wg-snakeoil-keys.peer1) privateKey; + + peers = lib.singleton { + allowedIPs = [ "0.0.0.0/0" "::/0" ]; + endpoint = "192.168.0.1:23542"; + persistentKeepalive = 25; + + inherit (wg-snakeoil-keys.peer0) publicKey; + }; + + postSetup = let inherit (pkgs) iproute; in '' + ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 + ${iproute}/bin/ip route replace fc00::1/128 dev wg0 + ''; + }; }; }; - - networking.wireguard.interfaces.wg0 = { - ips = [ "10.23.42.2/32" "fc00::2/128" ]; - listenPort = 23542; - allowedIPsAsRoutes = false; - - inherit (wg-snakeoil-keys.peer1) privateKey; - - peers = lib.singleton { - allowedIPs = [ "0.0.0.0/0" "::/0" ]; - endpoint = "192.168.0.1:23542"; - persistentKeepalive = 25; - - inherit (wg-snakeoil-keys.peer0) publicKey; - }; - - postSetup = let inherit (pkgs) iproute; in '' - ${iproute}/bin/ip route replace 10.23.42.1/32 dev wg0 - ${iproute}/bin/ip route replace fc00::1/128 dev wg0 - ''; - }; }; - }; - testScript = '' - start_all() + testScript = '' + start_all() - peer0.wait_for_unit("wireguard-wg0.service") - peer1.wait_for_unit("wireguard-wg0.service") + peer0.wait_for_unit("wireguard-wg0.service") + peer1.wait_for_unit("wireguard-wg0.service") - peer1.succeed("ping -c5 fc00::1") - peer1.succeed("ping -c5 10.23.42.1") - ''; -}) + peer1.succeed("ping -c5 fc00::1") + peer1.succeed("ping -c5 10.23.42.1") + ''; + } +) diff --git a/nixos/tests/wireguard/make-peer.nix b/nixos/tests/wireguard/make-peer.nix new file mode 100644 index 00000000000..d2740549738 --- /dev/null +++ b/nixos/tests/wireguard/make-peer.nix @@ -0,0 +1,23 @@ +{ lib, ... }: { ip4, ip6, extraConfig }: +lib.mkMerge [ + { + boot.kernel.sysctl = { + "net.ipv6.conf.all.forwarding" = "1"; + "net.ipv6.conf.default.forwarding" = "1"; + "net.ipv4.ip_forward" = "1"; + }; + + networking.useDHCP = false; + networking.interfaces.eth1 = { + ipv4.addresses = [{ + address = ip4; + prefixLength = 24; + }]; + ipv6.addresses = [{ + address = ip6; + prefixLength = 64; + }]; + }; + } + extraConfig +] diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix new file mode 100644 index 00000000000..7354dd01a34 --- /dev/null +++ b/nixos/tests/wireguard/wg-quick.nix @@ -0,0 +1,63 @@ +import ../make-test-python.nix ({ pkgs, lib, ... }: + let + wg-snakeoil-keys = import ./snakeoil-keys.nix; + peer = (import ./make-peer.nix) { inherit lib; }; + in + { + name = "wg-quick"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ xwvvvvwx ]; + }; + + nodes = { + peer0 = peer { + ip4 = "192.168.0.1"; + ip6 = "fd00::1"; + extraConfig = { + networking.firewall.allowedUDPPorts = [ 23542 ]; + networking.wg-quick.interfaces.wg0 = { + address = [ "10.23.42.1/32" "fc00::1/128" ]; + listenPort = 23542; + + inherit (wg-snakeoil-keys.peer0) privateKey; + + peers = lib.singleton { + allowedIPs = [ "10.23.42.2/32" "fc00::2/128" ]; + + inherit (wg-snakeoil-keys.peer1) publicKey; + }; + }; + }; + }; + + peer1 = peer { + ip4 = "192.168.0.2"; + ip6 = "fd00::2"; + extraConfig = { + networking.wg-quick.interfaces.wg0 = { + address = [ "10.23.42.2/32" "fc00::2/128" ]; + inherit (wg-snakeoil-keys.peer1) privateKey; + + peers = lib.singleton { + allowedIPs = [ "0.0.0.0/0" "::/0" ]; + endpoint = "192.168.0.1:23542"; + persistentKeepalive = 25; + + inherit (wg-snakeoil-keys.peer0) publicKey; + }; + }; + }; + }; + }; + + testScript = '' + start_all() + + peer0.wait_for_unit("wg-quick-wg0.service") + peer1.wait_for_unit("wg-quick-wg0.service") + + peer1.succeed("ping -c5 fc00::1") + peer1.succeed("ping -c5 10.23.42.1") + ''; + } +) diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index f82462c3933..673c8071d4b 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec { pkgconfig python3 wrapGAppsHook + glib # for glib-compile-resources ]; buildInputs = [ @@ -63,7 +64,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Checks whether the contrast between two colors meet the WCAG requirements"; - homepage = https://gitlab.gnome.org/World/design/contrast; + homepage = "https://gitlab.gnome.org/World/design/contrast"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar ]; }; diff --git a/pkgs/applications/accessibility/dasher/default.nix b/pkgs/applications/accessibility/dasher/default.nix index 9e8084e7a87..43844d0c66b 100644 --- a/pkgs/applications/accessibility/dasher/default.nix +++ b/pkgs/applications/accessibility/dasher/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ] ++ lib.optional speechSupport speechd; meta = { - homepage = http://www.inference.org.uk/dasher/; + homepage = "http://www.inference.org.uk/dasher/"; description = "Information-efficient text-entry interface, driven by natural continuous pointing gestures"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.Profpatsch ]; diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index e4fd66679a7..b645bc61848 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { The features can be activated and configured through the Universal Access panel of the GNOME Control Center. ''; - homepage = https://wiki.gnome.org/Projects/Mousetweaks; + homepage = "https://wiki.gnome.org/Projects/Mousetweaks"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.johnazoidberg ]; diff --git a/pkgs/applications/audio/AMB-plugins/default.nix b/pkgs/applications/audio/AMB-plugins/default.nix index d9a05e0bf66..2e2af8f3a9a 100644 --- a/pkgs/applications/audio/AMB-plugins/default.nix +++ b/pkgs/applications/audio/AMB-plugins/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { 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; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/FIL-plugins/default.nix b/pkgs/applications/audio/FIL-plugins/default.nix index cf383c1dd49..253e724cd31 100644 --- a/pkgs/applications/audio/FIL-plugins/default.nix +++ b/pkgs/applications/audio/FIL-plugins/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { This should make this plugin a good candidate for use in systems that allow automation of plugin control ports, such as Ardour, or for stage use. ''; version = version; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/ladspa/index.html"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/MMA/default.nix b/pkgs/applications/audio/MMA/default.nix index 4304fe59bdf..8b7629bc908 100644 --- a/pkgs/applications/audio/MMA/default.nix +++ b/pkgs/applications/audio/MMA/default.nix @@ -61,7 +61,7 @@ meta = { description = "Creates MIDI tracks for a soloist to perform over from a user supplied file containing chords"; - homepage = http://www.mellowood.ca/mma/index.html; + homepage = "https://www.mellowood.ca/mma/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 28331720048..64468bddc85 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -18,11 +18,11 @@ in stdenv.mkDerivation { patches = [ (fetchpatch { - url = https://repo.or.cz/a2jmidid.git/patch/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2; + url = "https://repo.or.cz/a2jmidid.git/patch/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2"; sha256 = "1nxrvnhxlgqc9wbxnp1gnpw4wjyzxvymwcg1gh2nqzmssgfykfkc"; }) (fetchpatch { - url = https://repo.or.cz/a2jmidid.git/patch/7f82da7eb2f540a94db23331be98d42a58ddc269; + url = "https://repo.or.cz/a2jmidid.git/patch/7f82da7eb2f540a94db23331be98d42a58ddc269"; sha256 = "1nab9zf0agbcj5pvhl90pz0cx1d204d4janqflc5ymjhy8jyrsdv"; }) ]; diff --git a/pkgs/applications/audio/aacgain/default.nix b/pkgs/applications/audio/aacgain/default.nix index 5892351225d..194514c65b5 100644 --- a/pkgs/applications/audio/aacgain/default.nix +++ b/pkgs/applications/audio/aacgain/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "ReplayGain for AAC files"; - homepage = https://aacgain.altosdesign.com; + homepage = "https://aacgain.altosdesign.com"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.robbinch ]; diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix index adb38d4bbba..4cb28e512a7 100644 --- a/pkgs/applications/audio/abcde/default.nix +++ b/pkgs/applications/audio/abcde/default.nix @@ -46,7 +46,7 @@ in ''; meta = with stdenv.lib; { - homepage = http://abcde.einval.com/wiki/; + homepage = "http://abcde.einval.com/wiki/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ gebner ]; description = "Command-line audio CD ripper"; diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix index ee9932a7aa3..bfd75b4e75c 100644 --- a/pkgs/applications/audio/aeolus/default.nix +++ b/pkgs/applications/audio/aeolus/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "aeolus"; - version = "0.9.7"; + version = "0.9.8"; src = fetchurl { url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0lhbr95hmbfj8ynbcpawn7jzjbpvrkm6k2yda39yhqk1bzg38v2k"; + sha256 = "1zfr3567mwbqsfybkhg03n5dvmhllk88c9ayb10qzz2nh6d7g2qn"; }; buildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Synthetized (not sampled) pipe organ emulator"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/applications/audio/airwave/default.nix index 1d91ad4d2be..176d1d4cfb3 100644 --- a/pkgs/applications/audio/airwave/default.nix +++ b/pkgs/applications/audio/airwave/default.nix @@ -83,7 +83,7 @@ multiStdenv.mkDerivation { protocol to correctly embed the plugin editor into the host window. ''; - homepage = https://github.com/phantom-code/airwave; + homepage = "https://github.com/phantom-code/airwave"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/audio/aj-snapshot/default.nix b/pkgs/applications/audio/aj-snapshot/default.nix index 5c379b57ad6..f781aad905d 100644 --- a/pkgs/applications/audio/aj-snapshot/default.nix +++ b/pkgs/applications/audio/aj-snapshot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { You can also run aj-snapshot in daemon mode if you want to have your connections continually restored. ''; - homepage = http://aj-snapshot.sourceforge.net/; + homepage = "http://aj-snapshot.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.mrVanDalo ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index cd951701e77..25fceb357cc 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { # master has the Qt5 version as of April 2018 but a formal release has not # yet been made so change this back to the proper upstream when such a # release is out - url = git://anongit.kde.org/amarok.git; + url = "git://anongit.kde.org/amarok.git"; # url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; rev = "457fbda25a85a102bfda92aa7137e7ef5e4c8b00"; sha256 = "1ig2mg8pqany6m2zplkrvldcv4ibxwsypnyv5igm7nz7ax82cd5j"; diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 5b2f6931ed1..8c55c29b527 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -4,7 +4,7 @@ , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv, lrdf, lv2, makeWrapper , perl, pkgconfig, python2, rubberband, serd, sord, sratom -, taglib, vampSDK, dbus, fftw, pango, suil, libarchive +, taglib, vamp-plugin-sdk, dbus, fftw, pango, suil, libarchive , wafHook }: let @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libmad libogg librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv lrdf lv2 makeWrapper pango perl pkgconfig python2 rubberband serd sord - sratom suil taglib vampSDK libarchive + sratom suil taglib vamp-plugin-sdk libarchive ]; # ardour's wscript has a "tarball" target but that required the git revision @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { Please consider supporting the ardour project financially: https://community.ardour.org/node/8288 ''; - homepage = http://ardour.org/; + homepage = "http://ardour.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.fps ]; diff --git a/pkgs/applications/audio/ario/default.nix b/pkgs/applications/audio/ario/default.nix index 4b48f5f1eea..99a09e7ee33 100644 --- a/pkgs/applications/audio/ario/default.nix +++ b/pkgs/applications/audio/ario/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK client for MPD (Music player daemon)"; - homepage = http://ario-player.sourceforge.net/; + homepage = "http://ario-player.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 4b76ebdf605..0265e0f75ec 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk ]; meta = with stdenv.lib; { - homepage = http://openavproductions.com/artyfx/; + homepage = "http://openavproductions.com/artyfx/"; description = "A LV2 plugin bundle of artistic realtime effects"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix index 5a0b6797a24..7d90ac36f36 100644 --- a/pkgs/applications/audio/asunder/default.nix +++ b/pkgs/applications/audio/asunder/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A graphical Audio CD ripper and encoder for Linux"; - homepage = http://littlesvr.ca/asunder/index.php; + homepage = "http://littlesvr.ca/asunder/index.php"; license = licenses.gpl2; maintainers = with maintainers; [ mudri ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 12e8237d485..b06175f37f3 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audio player"; - homepage = https://audacious-media-player.org/; + homepage = "https://audacious-media-player.org/"; maintainers = with maintainers; [ eelco ramkromberg ]; platforms = with platforms; linux; license = with licenses; [ diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index baf7b108e50..45525571a64 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -81,7 +81,7 @@ mkDerivation { meta = with lib; { description = "Audio player"; - homepage = https://audacious-media-player.org/; + homepage = "https://audacious-media-player.org/"; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; license = with licenses; [ diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 57e0c52e640..a1f4b9ad950 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound editor with graphical UI"; - homepage = http://audacityteam.org/; + homepage = "http://audacityteam.org/"; license = licenses.gpl2Plus; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM maintainers = with maintainers; [ the-kenny ]; diff --git a/pkgs/applications/audio/audio-recorder/default.nix b/pkgs/applications/audio/audio-recorder/default.nix index 534b87e9fa7..eee293b76c2 100644 --- a/pkgs/applications/audio/audio-recorder/default.nix +++ b/pkgs/applications/audio/audio-recorder/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { automatically record your Skype calls. It supports several audio (output) formats such as OGG audio, Flac, MP3 and WAV. ''; - homepage = https://launchpad.net/~audio-recorder; + homepage = "https://launchpad.net/~audio-recorder"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index db5f081c4ed..5bc7f843258 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { Aumix adjusts an audio mixer from X, the console, a terminal, the command line or a script. ''; - homepage = http://www.jpj.net/~trevor/aumix.html; + homepage = "http://www.jpj.net/~trevor/aumix.html"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; diff --git a/pkgs/applications/audio/avldrums-lv2/default.nix b/pkgs/applications/audio/avldrums-lv2/default.nix deleted file mode 100644 index d71718c32a8..00000000000 --- a/pkgs/applications/audio/avldrums-lv2/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchFromGitHub, pkgconfig, pango, cairo, libGLU, lv2 }: - -stdenv.mkDerivation rec { - pname = "avldrums.lv2"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "x42"; - repo = pname; - rev = "v${version}"; - sha256 = "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv"; - fetchSubmodules = true; - }; - - installFlags = [ "PREFIX=$(out)" ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - pango cairo libGLU lv2 - ]; - - meta = with stdenv.lib; { - description = "Dedicated AVLDrumkits LV2 Plugin"; - homepage = http://x42-plugins.com/x42/x42-avldrums; - license = licenses.gpl2; - maintainers = [ maintainers.magnetophon ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/applications/audio/axoloti/default.nix b/pkgs/applications/audio/axoloti/default.nix index fb9b3c9513f..3d907e421b3 100644 --- a/pkgs/applications/audio/axoloti/default.nix +++ b/pkgs/applications/audio/axoloti/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.axoloti.com; + homepage = "http://www.axoloti.com"; description = '' Sketching embedded digital audio algorithms. diff --git a/pkgs/applications/audio/axoloti/dfu-util.nix b/pkgs/applications/audio/axoloti/dfu-util.nix index e9fa6daecfe..80ec696c645 100644 --- a/pkgs/applications/audio/axoloti/dfu-util.nix +++ b/pkgs/applications/audio/axoloti/dfu-util.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { phones. With dfu-util you are able to download firmware to your device or upload firmware from it. ''; - homepage = http://dfu-util.sourceforge.net; + homepage = "http://dfu-util.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ ]; diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index 1a6ebd346cc..49b788f6653 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.libusb.info; + homepage = "http://www.libusb.info"; description = "User-space USB library"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index c35df95b24c..0d95675d1e6 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { displays, and continuous capture tools for hunting down and studying elusive signal characteristics. ''; - homepage = http://www.baudline.com/; + homepage = "http://www.baudline.com/"; # See http://www.baudline.com/faq.html#licensing_terms. # (Do NOT (re)distribute on hydra.) license = licenses.unfree; diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix deleted file mode 100644 index 29cecb16999..00000000000 --- a/pkgs/applications/audio/beast/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool -, gtk2, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: - -stdenv.mkDerivation rec { - name = "beast-0.7.1"; - - src = fetchurl { - url = "https://ftp.gtk.org/pub/beast/v0.7/${name}.tar.bz2"; - sha256 = "0jyl1i1918rsn4296w07fsf6wx3clvad522m3bzgf8ms7gxivg5l"; - }; - - buildInputs = - [ zlib guile libart_lgpl pkgconfig intltool gtk2 glib - libogg libvorbis libgnomecanvas gettext - ]; - - patchPhase = '' - unset patchPhase; patchPhase - sed 's=-DG_DISABLE_DEPRECATED==g' -i `find -type f` # the patches didn't remove all occurences - sed 's=/bin/bash=/${stdenv.shell}=g' -i `find -type f` - sed 's=/usr/bin/perl=/${perl}/bin/perl=g' -i `find -type f` - ''; - - patches = - [ (fetchurl { - url = mirror://gentoo/distfiles/beast-0.7.1-guile-1.8.diff.bz2; - sha256 = "dc5194deff4b0a0eec368a69090db682d0c3113044ce2c2ed017ddfec9d3814e"; - }) - ./patch.patch # patches taken from gentoo - ]; - - meta = with stdenv.lib; { - description = "A music composition and modular synthesis application"; - homepage = http://beast.gtk.org; - license = with licenses; [ gpl2 lgpl21 ]; - broken = true; - }; -} diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix index 6f471f3a028..ac05a9367cc 100644 --- a/pkgs/applications/audio/bitmeter/default.nix +++ b/pkgs/applications/audio/bitmeter/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/bitmeter/files/bitmeter-1.2-fix-build-system.patch"; sha256 = "021mz6933iw7mpk6b9cbjr8naj6smbq1hwqjszlyx72qbwrrid7k"; }) ]; meta = with stdenv.lib; { - homepage = http://devel.tlrmx.org/audio/bitmeter/; + homepage = "http://devel.tlrmx.org/audio/bitmeter/"; description = "Also known as jack bitscope. Useful to detect denormals"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix index 83586847190..910c1cfe51b 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { production, performance and DJing, with a focus on flexible editing tools and a super-fast workflow. ''; - homepage = https://www.bitwig.com/; + homepage = "https://www.bitwig.com/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus mrVanDalo ]; diff --git a/pkgs/applications/audio/bristol/default.nix b/pkgs/applications/audio/bristol/default.nix index 504900d6595..704b888e229 100644 --- a/pkgs/applications/audio/bristol/default.nix +++ b/pkgs/applications/audio/bristol/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A range of synthesiser, electric piano and organ emulations"; - homepage = http://bristol.sourceforge.net; + homepage = "http://bristol.sourceforge.net"; license = licenses.gpl3; platforms = ["x86_64-linux" "i686-linux"]; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/bs1770gain/default.nix b/pkgs/applications/audio/bs1770gain/default.nix index 2dee463aeee..76a78935619 100644 --- a/pkgs/applications/audio/bs1770gain/default.nix +++ b/pkgs/applications/audio/bs1770gain/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A audio/video loudness scanner implementing ITU-R BS.1770"; license = licenses.gpl2Plus; - homepage = http://bs1770gain.sourceforge.net/; + homepage = "http://bs1770gain.sourceforge.net/"; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index b91554f5716..e63124e8547 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/sjaehn/BSEQuencer; + homepage = "https://github.com/sjaehn/BSEQuencer"; description = "Multi channel MIDI step sequencer LV2 plugin"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/bshapr/default.nix b/pkgs/applications/audio/bshapr/default.nix index 88a671495c3..a2f96bc288c 100644 --- a/pkgs/applications/audio/bshapr/default.nix +++ b/pkgs/applications/audio/bshapr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BShapr"; - version = "0.7"; + version = "0.8"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "v${version}"; - sha256 = "1422xay28jkmqlj5y4vhb57kljy6ysvxh20cxpfxm980m8n54gq5"; + sha256 = "0jlq5rjicc4fxlpk869dg0l5bwwz8k9aj2wfk9v89b0qw8l8kaxl"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/sjaehn/BShapr; + homepage = "https://github.com/sjaehn/BShapr"; description = "Beat / envelope shaper LV2 plugin"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/bslizr/default.nix b/pkgs/applications/audio/bslizr/default.nix index 97a9d60ec27..d97381a7a06 100644 --- a/pkgs/applications/audio/bslizr/default.nix +++ b/pkgs/applications/audio/bslizr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/sjaehn/BSlizr; + homepage = "https://github.com/sjaehn/BSlizr"; description = "Sequenced audio slicing effect LV2 plugin (step sequencer effect)"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 7aa2872224d..4f4ad4b8c5b 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -91,7 +91,7 @@ mkDerivation rec { '') scriptAndSource; meta = { - homepage = https://github.com/falkTX/Cadence/; + homepage = "https://github.com/falkTX/Cadence/"; description = "Collection of tools useful for audio production"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ genesis worldofpeace ]; diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 0106e8b4584..bbeef4c395a 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://calf-studio-gear.org; + homepage = "http://calf-studio-gear.org"; description = "A set of high quality open source audio plugins for musicians"; license = licenses.lgpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index cd1783ff685..799cefc7819 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,5 +1,5 @@ -{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, vlc -, qtbase, qtmultimedia, qtsvg, qttools +{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig +, qtbase, qtsvg, qttools # Cantata doesn't build with cdparanoia enabled so we disable that # default for now until I (or someone else) figure it out. @@ -9,12 +9,14 @@ , withMusicbrainz ? false, libmusicbrainz5 , withTaglib ? true, taglib, taglib_extras +, withHttpStream ? true, qtmultimedia , withReplaygain ? true, ffmpeg, speex, mpg123 , withMtp ? true, libmtp , withOnlineServices ? true , withDevices ? true, udisks2 , withDynamic ? true , withHttpServer ? true +, withLibVlc ? false, vlc , withStreams ? true }: @@ -26,6 +28,7 @@ assert withMtp -> withTaglib; assert withMusicbrainz -> withCdda && withTaglib; assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; +assert withLibVlc -> withHttpStream; let version = "2.4.1"; @@ -45,15 +48,17 @@ in mkDerivation { sha256 = "0ix7xp352bziwz31mw79y7wxxmdn6060p8ry2px243ni1lz1qx1c"; }; - buildInputs = [ vlc qtbase qtmultimedia qtsvg ] + buildInputs = [ qtbase qtsvg ] ++ lib.optionals withTaglib [ taglib taglib_extras ] ++ lib.optionals withReplaygain [ ffmpeg speex mpg123 ] + ++ lib.optional withHttpStream qtmultimedia ++ lib.optional withCdda cdparanoia ++ lib.optional withCddb libcddb ++ lib.optional withLame lame ++ lib.optional withMtp libmtp ++ lib.optional withMusicbrainz libmusicbrainz5 - ++ lib.optional withUdisks udisks2; + ++ lib.optional withUdisks udisks2 + ++ lib.optional withLibVlc vlc; nativeBuildInputs = [ cmake pkgconfig qttools ]; @@ -62,6 +67,7 @@ in mkDerivation { cmakeFlags = lib.flatten [ (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ]) (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ]) + (fstat withHttpStream "HTTP_STREAM_PLAYBACK") (fstat withCdda "CDPARANOIA") (fstat withCddb "CDDB") (fstat withLame "LAME") @@ -71,6 +77,7 @@ in mkDerivation { (fstat withDynamic "DYNAMIC") (fstat withDevices "DEVICES_SUPPORT") (fstat withHttpServer "HTTP_SERVER") + (fstat withLibVlc "LIBVLC") (fstat withStreams "STREAMS") (fstat withUdisks "UDISKS2") "-DENABLE_HTTPS_SUPPORT=ON" diff --git a/pkgs/applications/audio/caps/default.nix b/pkgs/applications/audio/caps/default.nix index eabbf866837..dc8511bf500 100644 --- a/pkgs/applications/audio/caps/default.nix +++ b/pkgs/applications/audio/caps/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { considerations are latency-free realtime operation, modesty of resource demands and meaningful control interfaces. ''; - homepage = http://www.quitte.de/dsp/caps.html; + homepage = "http://www.quitte.de/dsp/caps.html"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.astsmtl ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/applications/audio/carla/default.nix index 6641e99e491..2b794b98f88 100644 --- a/pkgs/applications/audio/carla/default.nix +++ b/pkgs/applications/audio/carla/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://kxstudio.sf.net/carla; + homepage = "http://kxstudio.sf.net/carla"; description = "An audio plugin host"; longDescription = '' It currently supports LADSPA (including LRDF), DSSI, LV2, VST2/3 diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix index 1ab39311258..c9539095863 100644 --- a/pkgs/applications/audio/caudec/default.nix +++ b/pkgs/applications/audio/caudec/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://caudec.net/; + homepage = "http://caudec.net/"; description = "A multiprocess audio converter that supports many formats (FLAC, MP3, Ogg Vorbis, Windows codecs and many more)"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 5c5c262056e..2bdca386bf4 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Console-based Audio Visualizer for Alsa"; - homepage = https://github.com/karlstav/cava; + homepage = "https://github.com/karlstav/cava"; license = licenses.mit; maintainers = with maintainers; [ offline mirrexagon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 864e04d88f3..2ceb5f6d09a 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin IOKit; meta = with stdenv.lib; { - homepage = http://linukz.org/cd-discid.shtml; + homepage = "http://linukz.org/cd-discid.shtml"; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 4e517ee636e..0658305723c 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://xiph.org/paranoia; + homepage = "https://xiph.org/paranoia"; description = "A tool and library for reading digital audio from CDs"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch b/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch new file mode 100644 index 00000000000..2e2746f4341 --- /dev/null +++ b/pkgs/applications/audio/cheesecutter/0001-fix-impure-build-date-display.patch @@ -0,0 +1,26 @@ +diff --git a/src/ct2util.d b/src/ct2util.d +index 523cadc..e462b09 100644 +--- a/src/ct2util.d ++++ b/src/ct2util.d +@@ -105,7 +105,7 @@ int main(string[] args) { + speeds.length = 32; + masks.length = 32; + void printheader() { +- enum hdr = "CheeseCutter 2 utilities" ~ com.util.versionInfo; ++ enum hdr = "CheeseCutter 2 utilities"; + writefln(hdr); + writefln("\nUsage: \t%s <command> <options> <infile> <-o outfile>",args[0]); + writefln("\t%s import <infile> <infile2> <-o outfile>",args[0]); +diff --git a/src/ui/ui.d b/src/ui/ui.d +index e418dda..21af408 100644 +--- a/src/ui/ui.d ++++ b/src/ui/ui.d +@@ -231,7 +231,7 @@ class Infobar : Window { + + screen.clrtoeol(0, headerColor); + +- enum hdr = "CheeseCutter 2.9" ~ com.util.versionInfo; ++ enum hdr = "CheeseCutter 2.9"; + screen.cprint(4, 0, 1, headerColor, hdr); + screen.cprint(screen.width - 14, 0, 1, headerColor, "F12 = Help"); + int c1 = audio.player.isPlaying ? 13 : 12; diff --git a/pkgs/applications/audio/cheesecutter/default.nix b/pkgs/applications/audio/cheesecutter/default.nix new file mode 100644 index 00000000000..732c2968fde --- /dev/null +++ b/pkgs/applications/audio/cheesecutter/default.nix @@ -0,0 +1,48 @@ +{ stdenv, lib, fetchFromGitHub, fetchpatch +, acme, ldc, patchelf +, SDL +}: + +stdenv.mkDerivation rec { + pname = "cheesecutter"; + version = "unstable-2019-12-06"; + + src = fetchFromGitHub { + owner = "theyamo"; + repo = "CheeseCutter"; + rev = "6b433c5512d693262742a93c8bfdfb353d4be853"; + sha256 = "1szlcg456b208w1237581sg21x69mqlh8cr6v8yvbhxdz9swxnwy"; + }; + + nativeBuildInputs = [ acme ldc patchelf ]; + + buildInputs = [ SDL ]; + + patches = [ + ./0001-fix-impure-build-date-display.patch + ]; + + makefile = "Makefile.ldc"; + + installPhase = '' + for exe in {ccutter,ct2util}; do + install -D $exe $out/bin/$exe + done + + mkdir -p $out/share/cheesecutter/example_tunes + cp -r tunes/* $out/share/cheesecutter/example_tunes + ''; + + postFixup = '' + rpath=$(patchelf --print-rpath $out/bin/ccutter) + patchelf --set-rpath "$rpath:${lib.makeLibraryPath buildInputs}" $out/bin/ccutter + ''; + + meta = with lib; { + description = "A tracker program for composing music for the SID chip."; + homepage = "https://github.com/theyamo/CheeseCutter/"; + license = licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 04b31ae2c0b..6970296cbd9 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Programming language for real-time sound synthesis and music creation"; - homepage = http://chuck.cs.princeton.edu; + homepage = "http://chuck.cs.princeton.edu"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ftrvxmtrx ]; diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 479f2a16fd8..4a32b099d15 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -91,7 +91,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://www.clementine-player.org; + homepage = "http://www.clementine-player.org"; description = "A multiplatform music player"; license = licenses.gpl3Plus; platforms = platforms.linux; @@ -130,7 +130,7 @@ let ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.clementine-player.org; + homepage = "http://www.clementine-player.org"; description = "Spotify integration for Clementine"; # The blob itself is Apache-licensed, although libspotify is unfree. license = licenses.asl20; diff --git a/pkgs/applications/audio/clerk/default.nix b/pkgs/applications/audio/clerk/default.nix index 4da2228c6c1..3c78295db67 100644 --- a/pkgs/applications/audio/clerk/default.nix +++ b/pkgs/applications/audio/clerk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An MPD client built on top of rofi"; - homepage = https://github.com/carnager/clerk; + homepage = "https://github.com/carnager/clerk"; license = licenses.mit; maintainers = with maintainers; [ anderspapitto ]; }; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 023e35bd787..3e5916ba098 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small, fast and powerful console music player for Linux and *BSD"; - homepage = https://cmus.github.io/; + homepage = "https://cmus.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.oxij ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix index 54f1050da46..6695b9a7237 100644 --- a/pkgs/applications/audio/cmusfm/default.nix +++ b/pkgs/applications/audio/cmusfm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { + run `cmusfm init` to generate configuration file under ~/.config/cmus/cmusfm.conf + Inside cmus run `:set status_display_program=cmusfm` to set up cmusfm ''; - homepage = https://github.com/Arkq/cmusfm/; + homepage = "https://github.com/Arkq/cmusfm/"; maintainers = with stdenv.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 865bc130db9..a5947bd37f1 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -75,7 +75,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A modern audio book player for Linux using GTK 3"; - homepage = https://cozy.geigi.de/; + homepage = "https://cozy.geigi.de/"; maintainers = [ maintainers.makefu ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/audio/crip/default.nix b/pkgs/applications/audio/crip/default.nix index f7bf919c221..0181ede26dd 100644 --- a/pkgs/applications/audio/crip/default.nix +++ b/pkgs/applications/audio/crip/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://bach.dynet.com/crip/; + 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; diff --git a/pkgs/applications/audio/csa/default.nix b/pkgs/applications/audio/csa/default.nix index 0b8afada020..756c21892fb 100644 --- a/pkgs/applications/audio/csa/default.nix +++ b/pkgs/applications/audio/csa/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postInstall = "rm $out/lib/ladspa/celllm_3890.*"; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/csa/; + homepage = "https://sourceforge.net/projects/csa/"; description = "A group of LADSPA Audio plugins for FM broadcast and more"; longDescription = '' CSA means : Contrôle Signal Audio. diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/applications/audio/csound/csound-qt/default.nix index d16d9331821..895609d3c02 100644 --- a/pkgs/applications/audio/csound/csound-qt/default.nix +++ b/pkgs/applications/audio/csound/csound-qt/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features."; - homepage = https://csoundqt.github.io/; + homepage = "https://csoundqt.github.io/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ hlolli ]; diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 758448c2fb3..4b426609fea 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms"; - homepage = http://www.csounds.com/; + homepage = "http://www.csounds.com/"; license = licenses.gpl2; maintainers = [maintainers.marcweber]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix index 2df6b9931cf..4c2323fbe8a 100644 --- a/pkgs/applications/audio/deadbeef/default.nix +++ b/pkgs/applications/audio/deadbeef/default.nix @@ -59,13 +59,13 @@ assert remoteSupport -> curl != null; stdenv.mkDerivation rec { pname = "deadbeef"; - version = "1.8.2"; + version = "1.8.3"; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; rev = version; - sha256 = "016wwnh5jqdcfxn1ff6in5dz73c3gdhh3fva8inq7sc3vzdz5khj"; + sha256 = "0n0q7zfl56gnadcqqp5rg7sbh1xvfcmp7cvmh2ax07037b346qig"; }; buildInputs = with stdenv.lib; [ jansson ] @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ultimate Music Player for GNU/Linux"; - homepage = http://deadbeef.sourceforge.net/; + homepage = "http://deadbeef.sourceforge.net/"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/audio/deadbeef/fix-wildmidi.patch b/pkgs/applications/audio/deadbeef/fix-wildmidi.patch deleted file mode 100644 index c37308459bb..00000000000 --- a/pkgs/applications/audio/deadbeef/fix-wildmidi.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/plugins/wildmidi/src/wildmidi_lib.c -+++ b/plugins/wildmidi/src/wildmidi_lib.c -@@ -394,11 +394,11 @@ free_gauss (void) { - } - } - --unsigned long int delay_size[4][2]; --signed long int a[5][2]; --signed long int b[5][2]; --signed long int gain_in[4]; --signed long int gain_out[4]; -+static unsigned long int delay_size[4][2]; -+static signed long int a[5][2]; -+static signed long int b[5][2]; -+static signed long int gain_in[4]; -+static signed long int gain_out[4]; - - void init_lowpass (void) { - float c = 0; diff --git a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix index b26360f0c46..337d570a935 100644 --- a/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix +++ b/pkgs/applications/audio/deadbeef/plugins/headerbar-gtk3.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Plug-in that adds GTK 3 header bar to the DeaDBeeF music player"; - homepage = https://github.com/saivert/ddb_misc_headerbar_GTK3; + homepage = "https://github.com/saivert/ddb_misc_headerbar_GTK3"; license = licenses.gpl2Plus; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/deadbeef/plugins/infobar.nix b/pkgs/applications/audio/deadbeef/plugins/infobar.nix index 8a81101983f..294d3a0ad8b 100644 --- a/pkgs/applications/audio/deadbeef/plugins/infobar.nix +++ b/pkgs/applications/audio/deadbeef/plugins/infobar.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { broken = true; # crashes DeaDBeeF and is abandoned (https://bitbucket.org/dsimbiriatin/deadbeef-infobar/issues/38/infobar-causes-deadbeef-180-to-crash) description = "DeaDBeeF Infobar Plugin"; - homepage = https://bitbucket.org/dsimbiriatin/deadbeef-infobar; + homepage = "https://bitbucket.org/dsimbiriatin/deadbeef-infobar"; license = licenses.gpl2Plus; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix index 5b27f3c3f32..95606a869b7 100644 --- a/pkgs/applications/audio/deadbeef/plugins/mpris2.nix +++ b/pkgs/applications/audio/deadbeef/plugins/mpris2.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPRISv2 plugin for the DeaDBeeF music player"; - homepage = https://github.com/Serranya/deadbeef-mpris2-plugin/; + homepage = "https://github.com/Serranya/deadbeef-mpris2-plugin/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/applications/audio/denemo/default.nix b/pkgs/applications/audio/denemo/default.nix index f3adec4fece..1438b066061 100644 --- a/pkgs/applications/audio/denemo/default.nix +++ b/pkgs/applications/audio/denemo/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music notation and composition software used with lilypond"; - homepage = http://denemo.org; + homepage = "http://denemo.org"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.olynch ]; diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 1785ca60060..7965cbd83fd 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { there are basic functionalities to align the signals in time and amplitude, this software does not aim to be an audio editor. ''; - homepage = http://gillesdegottex.github.io/dfasma/; + homepage = "http://gillesdegottex.github.io/dfasma/"; license = [ licenses.gpl3Plus reaperFork.meta.license ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix index 1fcdda40896..5e0cf3616fe 100644 --- a/pkgs/applications/audio/dirt/default.nix +++ b/pkgs/applications/audio/dirt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An unimpressive thingie for playing bits of samples with some level of accuracy"; - homepage = https://github.com/tidalcycles/Dirt; + homepage = "https://github.com/tidalcycles/Dirt"; license = licenses.gpl3; maintainers = with maintainers; [ anderspapitto ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix index 36f7dcc5993..0f651f47a48 100644 --- a/pkgs/applications/audio/distrho/default.nix +++ b/pkgs/applications/audio/distrho/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://distrho.sourceforge.net; + homepage = "http://distrho.sourceforge.net"; description = "A collection of cross-platform audio effects and plugins"; longDescription = '' Includes: diff --git a/pkgs/applications/audio/dr14_tmeter/default.nix b/pkgs/applications/audio/dr14_tmeter/default.nix index ea0ce8cb5f3..fbf25384eef 100644 --- a/pkgs/applications/audio/dr14_tmeter/default.nix +++ b/pkgs/applications/audio/dr14_tmeter/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Compute the DR14 of a given audio file according to the procedure described by the Pleasurize Music Foundation"; license = licenses.gpl3Plus; - homepage = http://dr14tmeter.sourceforge.net/; + homepage = "http://dr14tmeter.sourceforge.net/"; maintainers = [ maintainers.adisbladis ]; }; } diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index 1ce7115ad85..99c07ba8f5f 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/michaelwillis/dragonfly-reverb; + homepage = "https://github.com/michaelwillis/dragonfly-reverb"; description = "A hall-style reverb based on freeverb3 algorithms"; maintainers = [ maintainers.magnetophon ]; license = licenses.gpl3; diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix index 2581f223c91..454befd55f9 100644 --- a/pkgs/applications/audio/drumgizmo/default.nix +++ b/pkgs/applications/audio/drumgizmo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An LV2 sample based drum plugin"; - homepage = https://www.drumgizmo.org; + homepage = "https://www.drumgizmo.org"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.nico202 ]; diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index d3399315376..ae32a5f41a3 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "0hmnmk9vvi43wl6say0dg7j088h7mmwmfdwjhsq89c7i7cpg78da"; + sha256 = "1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; @@ -15,7 +15,7 @@ mkDerivation rec { meta = with lib; { description = "An old-school drum-kit sampler synthesizer with stereo fx"; - homepage = http://drumkv1.sourceforge.net/; + homepage = "http://drumkv1.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 4c2b97e727f..3f294342da7 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View and edit tags for various audio files"; - homepage = https://wiki.gnome.org/Apps/EasyTAG; + homepage = "https://wiki.gnome.org/Apps/EasyTAG"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/ecasound/default.nix b/pkgs/applications/audio/ecasound/default.nix index c17f6b745b3..13c48fc12af 100644 --- a/pkgs/applications/audio/ecasound/default.nix +++ b/pkgs/applications/audio/ecasound/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "Ecasound is a software package designed for multitrack audio processing"; license = with stdenv.lib.licenses; [ gpl2 lgpl21 ]; - homepage = http://nosignal.fi/ecasound/; + homepage = "http://nosignal.fi/ecasound/"; }; } diff --git a/pkgs/applications/audio/eflite/default.nix b/pkgs/applications/audio/eflite/default.nix index 2338c0ed376..f9a579512ca 100644 --- a/pkgs/applications/audio/eflite/default.nix +++ b/pkgs/applications/audio/eflite/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { CFLAGS = stdenv.lib.optionalString debug " -DDEBUG=2"; meta = { - homepage = http://eflite.sourceforge.net; + homepage = "http://eflite.sourceforge.net"; description = "EFlite is a speech server for screen readers"; longDescription = '' EFlite is a speech server for Emacspeak and other screen diff --git a/pkgs/applications/audio/elisa/default.nix b/pkgs/applications/audio/elisa/default.nix deleted file mode 100644 index 1d56ce089d9..00000000000 --- a/pkgs/applications/audio/elisa/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ mkDerivation, fetchFromGitHub, lib -, extra-cmake-modules, kdoctools, wrapGAppsHook -, qtmultimedia, qtquickcontrols2, qtwebsockets -, kconfig, kcmutils, kcrash, kdeclarative, kfilemetadata, kinit, kirigami2 -, baloo, vlc -}: - -mkDerivation rec { - pname = "elisa"; - version = "19.12.3"; - - src = fetchFromGitHub { - owner = "KDE"; - repo = "elisa"; - rev = "v${version}"; - sha256 = "0s1sixkrx4czckzg0llkrbp8rp397ljsq1c309z23m277jsmnnb6"; - }; - - buildInputs = [ vlc ]; - - nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; - - propagatedBuildInputs = [ - qtmultimedia qtquickcontrols2 qtwebsockets - kconfig kcmutils kcrash kdeclarative kfilemetadata kinit kirigami2 - baloo - ]; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Elisa Music Player"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - inherit (kconfig.meta) platforms; - }; -} diff --git a/pkgs/applications/audio/ensemble-chorus/default.nix b/pkgs/applications/audio/ensemble-chorus/default.nix index 5940203d04d..e2413a4fe87 100644 --- a/pkgs/applications/audio/ensemble-chorus/default.nix +++ b/pkgs/applications/audio/ensemble-chorus/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/jpcima/ensemble-chorus; + homepage = "https://github.com/jpcima/ensemble-chorus"; description = "Digital model of electronic string ensemble chorus"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index b4ad1505320..cc3a3c9ac1f 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { # glibc 2.27 compatibility - url = https://sources.debian.org/data/main/e/eq10q/2.2~repack0-2.1/debian/patches/05-pow10.patch; + url = "https://sources.debian.org/data/main/e/eq10q/2.2~repack0-2.1/debian/patches/05-pow10.patch"; sha256 = "07b0wf6k4xqgigv4h095bzfaw8r218wa36r9w1817jcys13r6c5r"; }) ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { 64 bits floating point internal audio processing. Nice GUI with powerful metering for every plugin. ''; - homepage = http://eq10q.sourceforge.net/; + homepage = "http://eq10q.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/applications/audio/espeak/default.nix index 6b5101b50b5..aa68fd5363d 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/applications/audio/espeak/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compact open source software speech synthesizer"; - homepage = http://espeak.sourceforge.net/; + homepage = "http://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/applications/audio/espeak/edit.nix index 8d7db50fd32..6bcffcbc5c3 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/applications/audio/espeak/edit.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Phoneme editor for espeak"; - homepage = http://espeak.sourceforge.net/; + homepage = "http://espeak.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/eteroj.lv2/default.nix b/pkgs/applications/audio/eteroj.lv2/default.nix index bbfe1ad5623..c86e7b5e9ba 100644 --- a/pkgs/applications/audio/eteroj.lv2/default.nix +++ b/pkgs/applications/audio/eteroj.lv2/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OSC injection/ejection from/to UDP/TCP/Serial for LV2"; - homepage = https://open-music-kontrollers.ch/lv2/eteroj; + homepage = "https://open-music-kontrollers.ch/lv2/eteroj"; license = licenses.artistic2; maintainers = with maintainers; [ magnetophon ]; }; diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 687608b4352..64b8e724431 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -17,8 +17,8 @@ let }; meta = with stdenv.lib; { - homepage = http://faust.grame.fr/; - downloadPage = https://sourceforge.net/projects/faudiostream/files/; + homepage = "http://faust.grame.fr/"; + downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon pmahoney ]; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index cca0e21f835..33df1ce5d4e 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -31,8 +31,8 @@ let }; meta = with stdenv.lib; { - homepage = http://faust.grame.fr/; - downloadPage = https://sourceforge.net/projects/faudiostream/files/; + homepage = "http://faust.grame.fr/"; + downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ magnetophon pmahoney ]; diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 3b6ca9e4053..90bd8bc60ad 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { together the convenience of a standalone interpreted language with the efficiency of a compiled language. It's ideal for fast prototyping. ''; - homepage = http://faust.grame.fr/; + homepage = "http://faust.grame.fr/"; license = licenses.gpl3; }; } diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index df3aa987c3f..bd8b9bea82b 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" "doc" ]; meta = with stdenv.lib; { - homepage = https://xiph.org/flac/; + homepage = "https://xiph.org/flac/"; description = "Library and tools for encoding and decoding the FLAC lossless audio file format"; platforms = platforms.all; license = licenses.bsd3; diff --git a/pkgs/applications/audio/flac123/default.nix b/pkgs/applications/audio/flac123/default.nix index 19ed2352355..6f13b710eff 100644 --- a/pkgs/applications/audio/flac123/default.nix +++ b/pkgs/applications/audio/flac123/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ flac libao libogg popt ]; meta = with stdenv.lib; { - homepage = http://flac-tools.sourceforge.net/; + homepage = "http://flac-tools.sourceforge.net/"; description = "A command-line program for playing FLAC audio files"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/applications/audio/flacon/default.nix index eb39309a254..1da40e75415 100644 --- a/pkgs/applications/audio/flacon/default.nix +++ b/pkgs/applications/audio/flacon/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extracts audio tracks from an audio CD image to separate tracks."; - homepage = https://flacon.github.io/; + homepage = "https://flacon.github.io/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ snglth ]; diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix index 8e2895bf847..9d9772cde29 100644 --- a/pkgs/applications/audio/fluidsynth/default.nix +++ b/pkgs/applications/audio/fluidsynth/default.nix @@ -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 = "http://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 ee45217e490..114cf5e192f 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { FMIT is a graphical utility for tuning musical instruments, with error and volume history, and advanced features. ''; - homepage = http://gillesdegottex.github.io/fmit/; + homepage = "http://gillesdegottex.github.io/fmit/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/fmsynth/default.nix b/pkgs/applications/audio/fmsynth/default.nix index 248967e06e6..d957c7ec33d 100644 --- a/pkgs/applications/audio/fmsynth/default.nix +++ b/pkgs/applications/audio/fmsynth/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { - Full floating point implementation optimized for SIMD - Hard real-time constraints ''; - homepage = https://github.com/Themaister/libfmsynth; + homepage = "https://github.com/Themaister/libfmsynth"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index 9f7f0b09007..a712eef0650 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ lv2 python2 ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/fomp/; + homepage = "http://drobilla.net/software/fomp/"; description = "An LV2 port of the MCP, VCO, FIL, and WAH plugins by Fons Adriaensen"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/foo-yc20/default.nix b/pkgs/applications/audio/foo-yc20/default.nix index e514032f44e..643b648fa88 100644 --- a/pkgs/applications/audio/foo-yc20/default.nix +++ b/pkgs/applications/audio/foo-yc20/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { broken = true; # see: https://github.com/sampov2/foo-yc20/issues/7 description = "A Faust implementation of a 1969 designed Yamaha combo organ, the YC-20"; - homepage = https://github.com/sampov2/foo-yc20; + homepage = "https://github.com/sampov2/foo-yc20"; license = "BSD"; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 34494871f29..6ee120f3d1a 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { software, released under the GNU GPL license. '' ; - homepage = http://freewheeling.sourceforge.net; + homepage = "http://freewheeling.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.sepi ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index 5bebf1c667c..e80239553f1 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.09"; + version = "1.15"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "18my7fywaf66rq8phsly8lglxzpglran8rj27fvwgpni8098ic7d"; + sha256 = "19xgdaij71gpvq216zjlp60zmfdl2a8kf8sc3bpk8a4d4xh4n151"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/game-music-emu/default.nix b/pkgs/applications/audio/game-music-emu/default.nix index d95b3eea596..51f895ea2d5 100644 --- a/pkgs/applications/audio/game-music-emu/default.nix +++ b/pkgs/applications/audio/game-music-emu/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/mpyne/game-music-emu/wiki/Home; + homepage = "https://bitbucket.org/mpyne/game-music-emu/wiki/Home"; description = "A collection of video game music file emulators"; license = licenses.lgpl21Plus; platforms = platforms.all; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index b8ec2d7116f..08eec313508 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 42285ba4bf8..9e016c68608 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Generates playlists such that each song sounds good following the previous song"; - homepage = http://gjay.sourceforge.net/; + homepage = "http://gjay.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index cae35b62519..7ae02ae38d8 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { libmpd = stdenv.mkDerivation { name = "libmpd-11.8.17"; src = fetchurl { - url = http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz; + url = "http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz"; sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; }; patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://gmpclient.org; + homepage = "https://gmpclient.org"; description = "A GTK2 frontend for Music Player Daemon"; license = licenses.gpl2; maintainers = []; diff --git a/pkgs/applications/audio/gmu/default.nix b/pkgs/applications/audio/gmu/default.nix index 8446855d190..bfe9f72d664 100644 --- a/pkgs/applications/audio/gmu/default.nix +++ b/pkgs/applications/audio/gmu/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://wejp.k.vu/projects/gmu; + homepage = "http://wejp.k.vu/projects/gmu"; description = "Open source music player for portable gaming consoles and handhelds"; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 47945de7833..e24bd61693e 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -43,6 +43,7 @@ rustPlatform.buildRustPackage rec { rustc python3 wrapGAppsHook + glib ]; buildInputs = [ @@ -73,7 +74,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Listen to your favorite podcasts"; - homepage = https://wiki.gnome.org/Apps/Podcasts; + homepage = "https://wiki.gnome.org/Apps/Podcasts"; license = licenses.gpl3; maintainers = gnome3.maintainers; platforms = platforms.unix; 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 332f2ca2342..509d3ddcf75 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.googleplaymusicdesktopplayer.com/; + homepage = "https://www.googleplaymusicdesktopplayer.com/"; description = "A beautiful cross platform Desktop Player for Google Play Music"; license = stdenv.lib.licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 332a633616c..1905699e516 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -73,7 +73,7 @@ python3Packages.buildPythonApplication rec { gPodder downloads and manages free audio and video content (podcasts) for you. Listen directly on your computer or on your mobile devices. ''; - homepage = http://gpodder.org/; + homepage = "http://gpodder.org/"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ skeidel mic92 ]; diff --git a/pkgs/applications/audio/gradio/default.nix b/pkgs/applications/audio/gradio/default.nix index 487b0a730d8..384235fc065 100644 --- a/pkgs/applications/audio/gradio/default.nix +++ b/pkgs/applications/audio/gradio/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation { patches = [ ./0001-Remove-post-install-script-that-hardcodes-paths.patch ]; meta = with stdenv.lib; { - homepage = https://github.com/haecker-felix/gradio; + homepage = "https://github.com/haecker-felix/gradio"; description = "A GTK3 app for finding and listening to internet radio stations"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix index b653ae5ca58..a81834c1fff 100644 --- a/pkgs/applications/audio/gtklick/default.nix +++ b/pkgs/applications/audio/gtklick/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = { - homepage = http://das.nasophon.de/gtklick/; + homepage = "http://das.nasophon.de/gtklick/"; description = "Simple metronome with an easy-to-use GTK interface"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index fd3632ee155..1f293fe2d79 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK Manager for an Apple ipod"; - homepage = http://gtkpod.sourceforge.net; + homepage = "http://gtkpod.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.skeidel ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index acb078fea87..095cd79b56e 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { clean-sounds, nice overdrive, fat distortion and a diversity of crazy sounds never heard before. ''; - homepage = http://guitarix.sourceforge.net/; + homepage = "http://guitarix.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ astsmtl goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/gxmatcheq-lv2/default.nix b/pkgs/applications/audio/gxmatcheq-lv2/default.nix index 1d5579d74c0..b2d99e0eba8 100644 --- a/pkgs/applications/audio/gxmatcheq-lv2/default.nix +++ b/pkgs/applications/audio/gxmatcheq-lv2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ]; meta = with stdenv.lib; { - homepage = https://github.com/brummer10/GxMatchEQ.lv2; + homepage = "https://github.com/brummer10/GxMatchEQ.lv2"; description = "Matching Equalizer to apply EQ curve from one source to another source"; maintainers = [ maintainers.magnetophon ]; license = licenses.gpl3; diff --git a/pkgs/applications/audio/gxplugins-lv2/default.nix b/pkgs/applications/audio/gxplugins-lv2/default.nix index 1f4323eb9d5..077bb407020 100644 --- a/pkgs/applications/audio/gxplugins-lv2/default.nix +++ b/pkgs/applications/audio/gxplugins-lv2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/brummer10/GxPlugins.lv2; + homepage = "https://github.com/brummer10/GxPlugins.lv2"; description = "A set of extra lv2 plugins from the guitarix project"; maintainers = [ maintainers.magnetophon ]; license = licenses.gpl3; diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index bfd211316a7..3ada3224e33 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "One music sequencer for all major platforms, both desktop and mobile"; - homepage = https://helio.fm/; + homepage = "https://helio.fm/"; license = licenses.gpl3; maintainers = [ maintainers.suhr ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 428490e119a..8459967a363 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -34,7 +34,7 @@ ''; meta = with stdenv.lib; { - homepage = http://tytel.org/helm; + homepage = "http://tytel.org/helm"; description = "A free, cross-platform, polyphonic synthesizer"; longDescription = '' A free, cross-platform, polyphonic synthesizer. diff --git a/pkgs/applications/audio/hybridreverb2/default.nix b/pkgs/applications/audio/hybridreverb2/default.nix index 19aac1bd1e9..3f1fac79623 100644 --- a/pkgs/applications/audio/hybridreverb2/default.nix +++ b/pkgs/applications/audio/hybridreverb2/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www2.ika.ruhr-uni-bochum.de/HybridReverb2; + homepage = "http://www2.ika.ruhr-uni-bochum.de/HybridReverb2"; description = "Reverb effect using hybrid impulse convolution"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index d8aa2a013c4..b3aff4e4c50 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced drum machine"; - homepage = http://www.hydrogen-music.org; + homepage = "http://www.hydrogen-music.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/i-score/default.nix b/pkgs/applications/audio/i-score/default.nix index f3928499413..daedb9b9820 100644 --- a/pkgs/applications/audio/i-score/default.nix +++ b/pkgs/applications/audio/i-score/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = { description = "An interactive sequencer for the intermedia arts"; - homepage = http://i-score.org/; + 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 a893390d74e..2d4a2e9265a 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Graphical open-source sequencer,"; - homepage = https://www.iannix.org/; + homepage = "https://www.iannix.org/"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix index 0fdb3b2a4a1..75d999ede1d 100644 --- a/pkgs/applications/audio/id3v2/default.nix +++ b/pkgs/applications/audio/id3v2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line editor for id3v2 tags"; - homepage = http://id3v2.sourceforge.net/; + homepage = "http://id3v2.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; unix; }; diff --git a/pkgs/applications/audio/infamousPlugins/default.nix b/pkgs/applications/audio/infamousPlugins/default.nix index 341c4181842..2cfe77ec291 100644 --- a/pkgs/applications/audio/infamousPlugins/default.nix +++ b/pkgs/applications/audio/infamousPlugins/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairomm lv2 libpthreadstubs libXdmcp libXft ntk pcre fftwFloat zita-resampler ]; meta = with stdenv.lib; { - homepage = https://ssj71.github.io/infamousPlugins; + homepage = "https://ssj71.github.io/infamousPlugins"; description = "A collection of open-source LV2 plugins"; longDescription = '' These are audio plugins in the LV2 format, developed for linux. Most are suitable for live use. diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 9d3fb6aae40..c5d4b3f87f4 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modular audio processing system using JACK and LV2 or LADSPA plugins"; - homepage = http://drobilla.net/software/ingen; + homepage = "http://drobilla.net/software/ingen"; license = licenses.agpl3Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix index 9d3656a81f9..f9f58ab5ec1 100644 --- a/pkgs/applications/audio/ir.lv2/default.nix +++ b/pkgs/applications/audio/ir.lv2/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://factorial.hu/plugins/lv2/ir; + homepage = "http://factorial.hu/plugins/lv2/ir"; description = "Zero-latency, realtime, high performance signal convolver especially for creating reverb effects"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/jaaa/default.nix b/pkgs/applications/audio/jaaa/default.nix index 92b2f8ac515..80f15935af2 100644 --- a/pkgs/applications/audio/jaaa/default.nix +++ b/pkgs/applications/audio/jaaa/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; description = "JACK and ALSA Audio Analyser"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/jack-capture/default.nix b/pkgs/applications/audio/jack-capture/default.nix index c62ccc4fc88..e443a0a5269 100644 --- a/pkgs/applications/audio/jack-capture/default.nix +++ b/pkgs/applications/audio/jack-capture/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program for recording soundfiles with jack"; - homepage = http://archive.notam02.no/arkiv/src; + homepage = "http://archive.notam02.no/arkiv/src"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index 5bad5453504..08263f2abdd 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple waveform viewer for JACK"; - homepage = http://das.nasophon.de/jack_oscrolloscope; + homepage = "http://das.nasophon.de/jack_oscrolloscope"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index 2f9b9db93c2..d13dbcc1688 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { be controlled using the ALSA sequencer. It's phat; it turns your computer into an effects box. ''; - homepage = http://jack-rack.sourceforge.net/; + homepage = "http://jack-rack.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.astsmtl ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jackmeter/default.nix b/pkgs/applications/audio/jackmeter/default.nix index e44dfddd37b..2a75b384af5 100644 --- a/pkgs/applications/audio/jackmeter/default.nix +++ b/pkgs/applications/audio/jackmeter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Console jack loudness meter"; - homepage = https://www.aelius.com/njh/jackmeter/; + homepage = "https://www.aelius.com/njh/jackmeter/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/applications/audio/jackmix/default.nix index fe7c83dd56f..c3a46439ba7 100644 --- a/pkgs/applications/audio/jackmix/default.nix +++ b/pkgs/applications/audio/jackmix/default.nix @@ -3,15 +3,14 @@ stdenv.mkDerivation { name = "jackmix-0.5.2"; src = fetchurl { - url = https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz; + url = "https://github.com/kampfschlaefer/jackmix/archive/v0.5.2.tar.gz"; sha256 = "18f5v7g66mgarhs476frvayhch7fy4nyjf2xivixc061ipn0m82j"; }; patches = [ ./no_error.patch ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ scons.py2 pkgconfig ]; buildInputs = [ - scons qt4 lash jack @@ -23,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Matrix-Mixer for the Jack-Audio-connection-Kit"; - homepage = http://www.arnoldarts.de/jackmix/; + homepage = "http://www.arnoldarts.de/jackmix/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.kampfschlaefer ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 51ec102dbfd..bbf66a74bc5 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple but fully featured LV2 host for Jack"; - homepage = http://drobilla.net/software/jalv; + homepage = "http://drobilla.net/software/jalv"; license = licenses.isc; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix index 818630585cf..a9b423320a0 100644 --- a/pkgs/applications/audio/jamin/default.nix +++ b/pkgs/applications/audio/jamin/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "jamin-0.95.0"; src = fetchurl { - url = mirror://sourceforge/jamin/jamin-0.95.0.tar.gz; + url = "mirror://sourceforge/jamin/jamin-0.95.0.tar.gz"; sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://jamin.sourceforge.net; + homepage = "http://jamin.sourceforge.net"; description = "JACK Audio Mastering interface"; license = licenses.gpl2; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix index a9eb15aabf3..426fea21107 100644 --- a/pkgs/applications/audio/japa/default.nix +++ b/pkgs/applications/audio/japa/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A 'perceptual' or 'psychoacoustic' audio spectrum analyser for JACK and ALSA"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix index d47fc3b6190..710c1e80792 100644 --- a/pkgs/applications/audio/keyfinder/default.nix +++ b/pkgs/applications/audio/keyfinder/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { management, no track suggestions, no media player. Just a fast, efficient workflow tool. ''; - homepage = http://www.ibrahimshaath.co.uk/keyfinder/; + homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index dcd305abdee..cfcad390f4c 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { - Edit synchronized lyrics and event timing codes, import and export LRC files ''; - homepage = http://kid3.sourceforge.net/; + homepage = "http://kid3.sourceforge.net/"; license = licenses.lgpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/klick/default.nix b/pkgs/applications/audio/klick/default.nix index f33245d8f1c..9ff063c1c80 100644 --- a/pkgs/applications/audio/klick/default.nix +++ b/pkgs/applications/audio/klick/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { - homepage = http://das.nasophon.de/klick/; + homepage = "http://das.nasophon.de/klick/"; description = "Advanced command-line metronome for JACK"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix index 44186abc3c4..a0fc8631fb3 100644 --- a/pkgs/applications/audio/ladspa-plugins/default.nix +++ b/pkgs/applications/audio/ladspa-plugins/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://plugin.org.uk/; + homepage = "http://plugin.org.uk/"; description = "LADSPA format audio plugins"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix index a7779ee8aee..76acd1daba7 100644 --- a/pkgs/applications/audio/ladspa-sdk/default.nix +++ b/pkgs/applications/audio/ladspa-sdk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ten example LADSPA plugins and three example programs (applyplugin, analyseplugin and listplugins). ''; - homepage = http://www.ladspa.org/ladspa_sdk/overview.html; + homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix index 3fad5de1de5..d51aa3b75e1 100644 --- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix +++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { The ladspa.h API header file from the LADSPA SDK. For the full SDK, use the ladspa-sdk package. ''; - homepage = http://www.ladspa.org/ladspa_sdk/overview.html; + homepage = "http://www.ladspa.org/ladspa_sdk/overview.html"; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index 0dbe60b6a61..cb0a3ee05e1 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { longDescription = '' Session management system for GNU/Linux audio applications. ''; - homepage = https://www.nongnu.org/lash; + homepage = "https://www.nongnu.org/lash"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix index 3135a00334c..efafc5b05b1 100644 --- a/pkgs/applications/audio/lastfmsubmitd/default.nix +++ b/pkgs/applications/audio/lastfmsubmitd/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { installCommand = "python setup.py install --prefix=$out"; meta = { - homepage = https://www.red-bean.com/decklin/lastfmsubmitd/; + homepage = "https://www.red-bean.com/decklin/lastfmsubmitd/"; license = lib.licenses.mit; description = "An last.fm audio scrobbler and daemon"; }; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index d2ec92e0654..bf45a466d30 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -1,25 +1,45 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, alsaLib, libglade }: +{ stdenv +, fetchurl +, pkg-config +, intltool +, gtk3 +, wrapGAppsHook +, alsaLib +, libpulseaudio +, fftw +}: -stdenv.mkDerivation { - name = "lingot-0.9.1"; +stdenv.mkDerivation rec { + pname = "lingot"; + version = "1.0.1"; src = fetchurl { - url = mirror://savannah/lingot/lingot-0.9.1.tar.gz; - sha256 = "0ygras6ndw2fylwxx86ac11pcr2y2bcfvvgiwrh92z6zncx254gc"; + url = "mirror://savannah/${pname}/${pname}-${version}.tar.gz"; + sha256 = "cbjHe7mI6DhKDsv0yGHYOPe5hShKjhj3VTKrmBbGoA8="; }; - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ + pkg-config + intltool + wrapGAppsHook + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 alsaLib libglade ]; + buildInputs = [ + gtk3 + alsaLib + libpulseaudio + fftw + ]; - configureFlags = [ "--disable-jack" ]; + configureFlags = [ + "--disable-jack" + ]; meta = { description = "Not a Guitar-Only tuner"; - homepage = https://www.nongnu.org/lingot/; + homepage = "https://www.nongnu.org/lingot/"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [viric]; + maintainers = with stdenv.lib.maintainers; [ viric ]; }; } diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index b5a99150cb2..cd9ca5e2674 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -29,7 +29,7 @@ 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/; + homepage = "http://linuxband.org/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/linuxsampler/default.nix b/pkgs/applications/audio/linuxsampler/default.nix index f13f10d15e8..6b6cfd55926 100644 --- a/pkgs/applications/audio/linuxsampler/default.nix +++ b/pkgs/applications/audio/linuxsampler/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "Sampler backend"; longDescription = '' Includes sampler engine, audio and MIDI drivers, network layer diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index 0420a52d89b..c243e9beb23 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "DAW similar to FL Studio (music production software)"; - homepage = https://lmms.io; + homepage = "https://lmms.io"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ goibhniu yegortimoshenko ]; diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index ddb4646ba54..a3580ce3b52 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.2.23"; + version = "1.2.32"; format = "other"; doCheck = false; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "059z7ri5qwkmfh2kvv8rq5wp80mz75423wc5hnm33wb9sgdd5x47"; + sha256 = "03x6qihd349pq5lmgahb77sys60g16v5v6qkdlzf8k88451k8p7n"; }; nativeBuildInputs = [ @@ -94,7 +94,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { changelog = "https://gitlab.gnome.org/World/lollypop/tags/${version}"; description = "A modern music player for GNOME"; - homepage = https://wiki.gnome.org/Apps/Lollypop; + homepage = "https://wiki.gnome.org/Apps/Lollypop"; license = licenses.gpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index b146fcecc8e..a8aa101ab4d 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.13"; + version = "1.1.15"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = "${pname}-${version}"; - sha256 = "00mhrr873kgcnqy3q0yi1r5zacfcvz7fqpzsmfhw5d095jm970al"; + sha256 = "0lynyjs5zp27gnzcv8a23pvb7c1ghzc2dspypca3ciq40bfpfzik"; }; nativeBuildInputs = [ pkgconfig php makeWrapper ]; @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder ''out''}" + "ETC_PATH=$(out)/etc" ]; NIX_CFLAGS_COMPILE = "-DLSP_NO_EXPERIMENTAL"; @@ -139,7 +140,7 @@ stdenv.mkDerivation rec { - Delay Compensator Stereo - Verzögerungsausgleicher Stereo - Delay Compensator x2 Stereo - Verzögerungsausgleicher x2 Stereo ''; - homepage = https://lsp-plug.in; + homepage = "https://lsp-plug.in"; maintainers = with maintainers; [ magnetophon ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/luppp/default.nix b/pkgs/applications/audio/luppp/default.nix index fdba836a6ae..c1494ffc333 100644 --- a/pkgs/applications/audio/luppp/default.nix +++ b/pkgs/applications/audio/luppp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://openavproductions.com/luppp/; + homepage = "http://openavproductions.com/luppp/"; description = "A music creation tool, intended for live use"; license = licenses.gpl3Plus; maintainers = with maintainers; [ prusnak ]; diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index f1eddb62624..aee910f56eb 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/portalmod/lv2bm; + homepage = "https://github.com/portalmod/lv2bm"; description = "A benchmark tool for LV2 plugins"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix index 6488d1bd65e..e16198696a6 100644 --- a/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CharacterCompressor/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A compressor with character. For jack and lv2"; - homepage = https://github.com/magnetophon/CharacterCompressor; + homepage = "https://github.com/magnetophon/CharacterCompressor"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix index c5728b6e8b7..1ccc9f3fcd5 100644 --- a/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/CompBus/default.nix @@ -36,7 +36,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; + homepage = "https://github.com/magnetophon/CompBus"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix index 331e58c4bd2..d5ed7e85b69 100644 --- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix @@ -26,7 +26,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; + homepage = "https://github.com/magnetophon/constant-detune-chorus"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix index 046ee70e990..6d119394d5d 100644 --- a/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/LazyLimiter/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A fast yet clean lookahead limiter for jack and lv2"; - homepage = https://magnetophon.github.io/LazyLimiter/; + homepage = "https://magnetophon.github.io/LazyLimiter/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix index aa7da17dafd..0eb68e65eae 100644 --- a/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/MBdistortion/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Mid-side multiband distortion for jack and lv2"; - homepage = https://github.com/magnetophon/MBdistortion; + homepage = "https://github.com/magnetophon/MBdistortion"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix index ae05866e57d..be8ad72d28d 100644 --- a/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/RhythmDelay/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Tap a rhythm into your delay! For jack and lv2"; - homepage = https://github.com/magnetophon/RhythmDelay; + homepage = "https://github.com/magnetophon/RhythmDelay"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 718bbdaf49e..dce2db4cb77 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Turn your voice into a synthesizer"; - homepage = https://github.com/magnetophon/VoiceOfFaust; + homepage = "https://github.com/magnetophon/VoiceOfFaust"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index 735e7efe54d..172b5ed3891 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of bread and butter compressors"; - homepage = https://github.com/magnetophon/faustCompressors; + homepage = "https://github.com/magnetophon/faustCompressors"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix index 356e95bf97c..11d51d756ab 100644 --- a/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/pluginUtils/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Some simple utility lv2 plugins"; - homepage = https://github.com/magnetophon/pluginUtils; + homepage = "https://github.com/magnetophon/pluginUtils"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix index 292cd3dfd86..360cee243c3 100644 --- a/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/shelfMultiBand/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A multiband compressor made from shelving filters."; - homepage = https://github.com/magnetophon/shelfMultiBand; + homepage = "https://github.com/magnetophon/shelfMultiBand"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/mda-lv2/default.nix b/pkgs/applications/audio/mda-lv2/default.nix index 6c4170cf0fb..2464abb6585 100644 --- a/pkgs/applications/audio/mda-lv2/default.nix +++ b/pkgs/applications/audio/mda-lv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ fftwSinglePrec lv2 ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/mda-lv2/; + homepage = "http://drobilla.net/software/mda-lv2/"; description = "An LV2 port of the MDA plugins by Paul Kellett"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/meterbridge/default.nix b/pkgs/applications/audio/meterbridge/default.nix index 4d2fa0e15b4..9d807358cd5 100644 --- a/pkgs/applications/audio/meterbridge/default.nix +++ b/pkgs/applications/audio/meterbridge/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Various meters (VU, PPM, DPM, JF, SCO) for Jack Audio Connection Kit"; - homepage = http://plugin.org.uk/meterbridge/; + homepage = "http://plugin.org.uk/meterbridge/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index 12383dcbbda..cd9523d2710 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Collection of audio level meters with GUI in LV2 plugin format"; - homepage = http://x42.github.io/meters.lv2/; + homepage = "http://x42.github.io/meters.lv2/"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index e4d6c0293df..67204260da2 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical program for editing, playing and recording sound files"; - homepage = https://github.com/magnush/mhwaveedit; + homepage = "https://github.com/magnush/mhwaveedit"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/mid2key/default.nix b/pkgs/applications/audio/mid2key/default.nix index 3c5660724d3..071b18e5a8a 100644 --- a/pkgs/applications/audio/mid2key/default.nix +++ b/pkgs/applications/audio/mid2key/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/bin && mv mid2key $out/bin"; meta = with stdenv.lib; { - homepage = http://code.google.com/p/mid2key/; + homepage = "http://code.google.com/p/mid2key/"; description = "A simple tool which maps midi notes to simulated keystrokes"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/midas/m32edit.nix b/pkgs/applications/audio/midas/m32edit.nix index c8a751c235b..6af11d42e31 100644 --- a/pkgs/applications/audio/midas/m32edit.nix +++ b/pkgs/applications/audio/midas/m32edit.nix @@ -5,5 +5,5 @@ callPackage ./generic.nix (args // { type = "M32"; version = "3.2"; sha256 = "1cds6qinz37086l6pmmgrzrxadygjr2z96sjjyznnai2wz4z2nrd"; - homepage = http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads; + homepage = "http://www.musictri.be/Categories/Midas/Mixers/Digital/M32/p/P0B3I/downloads"; }) diff --git a/pkgs/applications/audio/midas/x32edit.nix b/pkgs/applications/audio/midas/x32edit.nix index 4aacfcc89a3..7e364ff984a 100644 --- a/pkgs/applications/audio/midas/x32edit.nix +++ b/pkgs/applications/audio/midas/x32edit.nix @@ -5,5 +5,5 @@ callPackage ./generic.nix (args // { type = "X32"; version = "3.2"; sha256 = "1lzmhd0sqnlzc0khpwm82sfi48qhv7rg153a57qjih7hhhy41mzk"; - homepage = http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads; + homepage = "http://www.musictri.be/Categories/Behringer/Mixers/Digital/X32/p/P0ASF/downloads"; }) diff --git a/pkgs/applications/audio/midisheetmusic/default.nix b/pkgs/applications/audio/midisheetmusic/default.nix index 48052fc4ec8..388fc2a1b3e 100644 --- a/pkgs/applications/audio/midisheetmusic/default.nix +++ b/pkgs/applications/audio/midisheetmusic/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Convert MIDI Files to Piano Sheet Music for two hands"; - homepage = http://midisheetmusic.com; + homepage = "http://midisheetmusic.com"; license = licenses.gpl2; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/mikmod/default.nix b/pkgs/applications/audio/mikmod/default.nix index 42fa8b7621a..9be303cb652 100644 --- a/pkgs/applications/audio/mikmod/default.nix +++ b/pkgs/applications/audio/mikmod/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tracker music player for the terminal"; - homepage = http://mikmod.shlomifish.org/; + homepage = "http://mikmod.shlomifish.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index bc508f92e3b..d7b9e5a6355 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music tracker application, similar to Fasttracker II"; - homepage = http://milkytracker.org; + homepage = "http://milkytracker.org"; license = licenses.gpl3Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ zoomulator ]; diff --git a/pkgs/applications/audio/mimic/default.nix b/pkgs/applications/audio/mimic/default.nix index e91b2c9360d..e33e69ad78c 100644 --- a/pkgs/applications/audio/mimic/default.nix +++ b/pkgs/applications/audio/mimic/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Mycroft's TTS engine, based on CMU's Flite (Festival Lite)"; - homepage = https://mimic.mycroft.ai/; + homepage = "https://mimic.mycroft.ai/"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.noneucat ]; diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index 2d301a8b6a9..47e9fa306dc 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = { - homepage = https://savannah.nongnu.org/projects/mimms/; + homepage = "https://savannah.nongnu.org/projects/mimms/"; license = stdenv.lib.licenses.gpl3; description = "An mms (e.g. mms://) stream downloader"; diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index 82db91dcb07..f889d9e1e8d 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -1,11 +1,22 @@ -{ stdenv, mkDerivation, fetchFromGitHub, chromaprint +{ stdenv, 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 -, qtx11extras, rubberband, scons, sqlite, taglib, upower, vampSDK +, qtx11extras, rubberband, scons, sqlite, taglib, upower, vamp-plugin-sdk }: +let + # Because libshout 2.4.2 and newer seem to break streaming in mixxx, build it + # with 2.4.1 instead. + libshout241 = libshout.overrideAttrs (o: rec { + name = "libshout-2.4.1"; + src = fetchurl { + url = "http://downloads.xiph.org/releases/libshout/${name}.tar.gz"; + sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k"; + }; + }); +in mkDerivation rec { pname = "mixxx"; version = "2.2.3"; @@ -17,10 +28,11 @@ mkDerivation rec { sha256 = "1h7q25fv62c5m74d4cn1m6mpanmqpbl2wqbch4qvn488jb2jw1dv"; }; + nativeBuildInputs = [ scons.py2 ]; buildInputs = [ - chromaprint fftw flac faad2 glibcLocales mp4v2 libid3tag libmad libopus libshout libsndfile + 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 - qtx11extras rubberband scons sqlite taglib upower vampSDK + qtx11extras rubberband sqlite taglib upower vamp-plugin-sdk ]; enableParallelBuilding = true; @@ -37,7 +49,7 @@ mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://mixxx.org; + homepage = "https://mixxx.org"; description = "Digital DJ mixing software"; license = licenses.gpl2Plus; maintainers = [ maintainers.aszlig maintainers.goibhniu maintainers.bfortz ]; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index 5615f4cace3..18b5a980633 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An ncurses console audio player designed to be powerful and easy to use"; - homepage = http://moc.daper.net/; + homepage = "http://moc.daper.net/"; license = licenses.gpl2; maintainers = with maintainers; [ aethelz pSub jagajaga ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/mod-distortion/default.nix b/pkgs/applications/audio/mod-distortion/default.nix index c20f04ec947..765def25d60 100644 --- a/pkgs/applications/audio/mod-distortion/default.nix +++ b/pkgs/applications/audio/mod-distortion/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; meta = with stdenv.lib; { - homepage = https://github.com/portalmod/mod-distortion; + homepage = "https://github.com/portalmod/mod-distortion"; description = "Analog distortion emulation lv2 plugins"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index c1c8bb964e4..66be35bfcc8 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -4,13 +4,13 @@ python3Packages.buildPythonApplication rec { pname = "mopidy"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "0fpjprjw143ixak68iwxjpscdjgyb7rsr1cxj7fsdrw6hc83nq4z"; + sha256 = "1n9lpgq0p112cjgsrc1cd6mnffk56y36g2c5skk9cqzw27qrkd15"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://www.mopidy.com/; + homepage = "https://www.mopidy.com/"; description = '' An extensible music server that plays music from local disk, Spotify, SoundCloud, Google Play Music, and more diff --git a/pkgs/applications/audio/mopidy/gmusic.nix b/pkgs/applications/audio/mopidy/gmusic.nix index 8c173140efd..3dea9156f8f 100644 --- a/pkgs/applications/audio/mopidy/gmusic.nix +++ b/pkgs/applications/audio/mopidy/gmusic.nix @@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://www.mopidy.com/; + homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from Google Play Music"; license = licenses.asl20; maintainers = [ maintainers.jgillich ]; diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 000a0bc0bfe..2badfd6a0b1 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jaedb/Iris; + homepage = "https://github.com/jaedb/Iris"; description = "A fully-functional Mopidy web client encompassing Spotify and many other backends"; license = licenses.asl20; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/applications/audio/mopidy/local-images.nix b/pkgs/applications/audio/mopidy/local-images.nix index 2ffc736572b..085fe855e8a 100644 --- a/pkgs/applications/audio/mopidy/local-images.nix +++ b/pkgs/applications/audio/mopidy/local-images.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/mopidy/mopidy-local-images; + homepage = "https://github.com/mopidy/mopidy-local-images"; description = "Mopidy local library proxy extension for handling embedded album art"; license = licenses.asl20; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/applications/audio/mopidy/local-sqlite.nix b/pkgs/applications/audio/mopidy/local-sqlite.nix index 6d0cc370ff3..23e01c02a0f 100644 --- a/pkgs/applications/audio/mopidy/local-sqlite.nix +++ b/pkgs/applications/audio/mopidy/local-sqlite.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/mopidy/mopidy-local-sqlite; + homepage = "https://github.com/mopidy/mopidy-local-sqlite"; description = "Mopidy SQLite local library extension"; license = licenses.asl20; maintainers = [ maintainers.rvolosatovs ]; diff --git a/pkgs/applications/audio/mopidy/moped.nix b/pkgs/applications/audio/mopidy/moped.nix index d41fb12ae8d..ffd9af76d17 100644 --- a/pkgs/applications/audio/mopidy/moped.nix +++ b/pkgs/applications/audio/mopidy/moped.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/martijnboland/moped; + homepage = "https://github.com/martijnboland/moped"; description = "A web client for Mopidy"; license = licenses.mit; maintainers = []; diff --git a/pkgs/applications/audio/mopidy/mopify.nix b/pkgs/applications/audio/mopidy/mopify.nix index b657f69e26e..a9902ca4172 100644 --- a/pkgs/applications/audio/mopidy/mopify.nix +++ b/pkgs/applications/audio/mopidy/mopify.nix @@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/dirkgroenen/mopidy-mopify; + homepage = "https://github.com/dirkgroenen/mopidy-mopify"; description = "A mopidy webclient based on the Spotify webbased interface"; license = licenses.gpl3; maintainers = [ maintainers.Gonzih ]; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index a01bf6c80d3..0793ae01c29 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://www.mopidy.com/; + homepage = "https://www.mopidy.com/"; description = "Mopidy extension for playing music from Spotify"; license = licenses.asl20; maintainers = []; diff --git a/pkgs/applications/audio/mp3blaster/default.nix b/pkgs/applications/audio/mp3blaster/default.nix index 727133be78d..2943a31454a 100644 --- a/pkgs/applications/audio/mp3blaster/default.nix +++ b/pkgs/applications/audio/mp3blaster/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An audio player for the text console"; - homepage = http://www.mp3blaster.org/; + homepage = "http://www.mp3blaster.org/"; license = licenses.gpl2; maintainers = with maintainers; [ earldouglas ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix index 233aebfa147..f2b4564c7cc 100644 --- a/pkgs/applications/audio/mp3gain/default.nix +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Lossless mp3 normalizer with statistical analysis"; - homepage = http://mp3gain.sourceforge.net/; + homepage = "http://mp3gain.sourceforge.net/"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 6700f21fc8c..69ca271d27d 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { other attributes in a pre-defined or user-specifiable output format. ''; - homepage = http://www.ibiblio.org/mp3info/; + homepage = "http://www.ibiblio.org/mp3info/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/audio/mp3splt/default.nix b/pkgs/applications/audio/mp3splt/default.nix index f067c5af6df..323854575ea 100644 --- a/pkgs/applications/audio/mp3splt/default.nix +++ b/pkgs/applications/audio/mp3splt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; - homepage = https://sourceforge.net/projects/mp3splt/; + homepage = "https://sourceforge.net/projects/mp3splt/"; license = licenses.gpl2; maintainers = [ maintainers.bosu ]; platforms = platforms.unix; diff --git a/pkgs/applications/audio/mp3val/default.nix b/pkgs/applications/audio/mp3val/default.nix index 6c35779f6c4..636fb7d9b9a 100644 --- a/pkgs/applications/audio/mp3val/default.nix +++ b/pkgs/applications/audio/mp3val/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also other MPEG versions and layers. The tool is also aware of the most common types of tags (ID3v1, ID3v2, APEv2). ''; - homepage = http://mp3val.sourceforge.net/index.shtml; + homepage = "http://mp3val.sourceforge.net/index.shtml"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index 1e8d73ce560..a226b720df9 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimalist command line interface to MPD"; - homepage = https://www.musicpd.org/clients/mpc/; + homepage = "https://www.musicpd.org/clients/mpc/"; license = licenses.gpl2; maintainers = with maintainers; [ algorith ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index f024e5a6a1d..ef5cb169a2c 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://mpc123.sourceforge.net/; + homepage = "http://mpc123.sourceforge.net/"; description = "A Musepack (.mpc) audio player"; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 6c4b9a43176..53e66e580da 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast console MPEG Audio Player and decoder library"; - homepage = http://mpg123.org; + homepage = "http://mpg123.org"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index 08fe9b4f9af..63b8e2d867a 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line MP3 player"; - homepage = http://mpg321.sourceforge.net/; + homepage = "http://mpg321.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/applications/audio/mup/default.nix b/pkgs/applications/audio/mup/default.nix index 43098be12e3..347cddca856 100644 --- a/pkgs/applications/audio/mup/default.nix +++ b/pkgs/applications/audio/mup/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # Undeclared dependencies + https://stackoverflow.com/a/19822767/1687334 for prolog.ps. meta = with stdenv.lib; { - homepage = http://www.arkkra.com/; + homepage = "http://www.arkkra.com/"; description = "Music typesetting program (ASCII to PostScript and MIDI)"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/audio/muse/fix-parallel-building.patch b/pkgs/applications/audio/muse/fix-parallel-building.patch index abeec5d54cc..a11970b7111 100644 --- a/pkgs/applications/audio/muse/fix-parallel-building.patch +++ b/pkgs/applications/audio/muse/fix-parallel-building.patch @@ -36,6 +36,13 @@ In file included from ../muse/mixer/rack.cpp:49: ui_plugindialogbase.h: No such file or directory +ninja muse/midiedit/CMakeFiles/midiedit.dir/drumedit.o + +In file included from /build/source/muse3/muse/midiedit/drumedit.cpp:64: +/build/source/muse3/muse/components/filedialog.h:29:10: fatal error: +ui_fdialogbuttons.h: No such file or directory + + --- a/muse/components/CMakeLists.txt +++ b/muse/components/CMakeLists.txt @@ -343,4 +343,5 @@ set_target_properties( components @@ -76,3 +83,11 @@ ui_plugindialogbase.h: No such file or directory + components widgets ) +--- a/muse/midiedit/CMakeLists.txt ++++ b/muse/midiedit/CMakeLists.txt +@@ -93,4 +93,5 @@ set_target_properties( midiedit + target_link_libraries ( midiedit + ${QT_LIBRARIES} ++ components + al + ctrl diff --git a/pkgs/applications/audio/musescore/darwin.nix b/pkgs/applications/audio/musescore/darwin.nix index 8b08aed62b8..8870a144c9f 100644 --- a/pkgs/applications/audio/musescore/darwin.nix +++ b/pkgs/applications/audio/musescore/darwin.nix @@ -25,10 +25,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music notation and composition software"; - homepage = https://musescore.org/; + homepage = "https://musescore.org/"; license = licenses.gpl2; platforms = platforms.darwin; maintainers = with maintainers; [ yurrriq ]; - repositories.git = https://github.com/musescore/MuseScore; + repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index 7ef6328c02c..bd4b2db380a 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -31,10 +31,10 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Music notation and composition software"; - homepage = https://musescore.org/; + homepage = "https://musescore.org/"; license = licenses.gpl2; maintainers = with maintainers; [ vandenoever ]; platforms = platforms.linux; - repositories.git = https://github.com/musescore/MuseScore; + repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index e7a9e22c2d6..b1e8822cdcf 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { '' else ""; meta = with stdenv.lib; { - homepage = https://www.musly.org; + homepage = "https://www.musly.org"; description = "A fast and high-quality audio music similarity library written in C/C++"; longDescription = '' Musly analyzes the the audio signal of music pieces to estimate their similarity. diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index c95177cd382..c08e4f7f4ff 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Curses-based interface for MPD (music player daemon)"; - homepage = https://www.musicpd.org/clients/ncmpc/; + homepage = "https://www.musicpd.org/clients/ncmpc/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 2ba36b4a50d..f8adc522fcb 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A featureful ncurses based MPD client inspired by ncmpc"; - homepage = https://ncmpcpp.rybczak.net/; + homepage = "https://ncmpcpp.rybczak.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jfrankenau koral lovek323 ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/ncpamixer/default.nix b/pkgs/applications/audio/ncpamixer/default.nix index 53ed9b3297c..32d8df2f048 100644 --- a/pkgs/applications/audio/ncpamixer/default.nix +++ b/pkgs/applications/audio/ncpamixer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An ncurses mixer for PulseAudio inspired by pavucontrol"; - homepage = https://github.com/fulhax/ncpamixer; + homepage = "https://github.com/fulhax/ncpamixer"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ StijnDW ]; diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 0d8fd8e2637..bee1065328a 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -2,26 +2,28 @@ , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null +, withMPRIS ? false, dbus ? null }: let features = [ "cursive/pancurses-backend" ] ++ lib.optional withALSA "alsa_backend" ++ lib.optional withPulseAudio "pulseaudio_backend" - ++ lib.optional withPortAudio "portaudio_backend"; + ++ lib.optional withPortAudio "portaudio_backend" + ++ lib.optional withMPRIS "mpris"; in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "10jp2yh8jlvdwh297658q9fi3i62vwsbd9fbwjsir7s1c9bgdy8k"; + sha256 = "144a7wn5l64fhvj8vgwl7z4bp8lbq0pb0dl38x9y4wkqmdh6wrli"; }; - cargoSha256 = "0081wc3xw11hivz0nwy4my3y4a53ch857bq989dr0pm9p2pirvj1"; + cargoSha256 = "19gn0v7j1ly3ywgflfj27pnrwjiiy17m3g1z0kzagxpjy2xi2qxy"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; @@ -30,7 +32,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ ncurses openssl ] ++ lib.optional withALSA alsaLib ++ lib.optional withPulseAudio libpulseaudio - ++ lib.optional withPortAudio portaudio; + ++ lib.optional withPortAudio portaudio + ++ lib.optional withMPRIS dbus; doCheck = false; diff --git a/pkgs/applications/audio/netease-cloud-music/default.nix b/pkgs/applications/audio/netease-cloud-music/default.nix index 15afe233b3a..c4cc291d026 100644 --- a/pkgs/applications/audio/netease-cloud-music/default.nix +++ b/pkgs/applications/audio/netease-cloud-music/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { meta = { description = "Client for Netease Cloud Music service"; - homepage = https://music.163.com; + homepage = "https://music.163.com"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.mlatus ]; license = stdenv.lib.licenses.unfreeRedistributable; diff --git a/pkgs/applications/audio/noise-repellent/default.nix b/pkgs/applications/audio/noise-repellent/default.nix index bc5b35396e2..3b2f233c6af 100644 --- a/pkgs/applications/audio/noise-repellent/default.nix +++ b/pkgs/applications/audio/noise-repellent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An lv2 plugin for broadband noise reduction"; - homepage = https://github.com/lucianodato/noise-repellent; + homepage = "https://github.com/lucianodato/noise-repellent"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" ]; diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index 651db50f0a7..9b4b147c230 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Lightweight and lightning fast modular Digital Audio Workstation"; - homepage = http://non.tuxfamily.org; + homepage = "http://non.tuxfamily.org"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/applications/audio/nootka/default.nix new file mode 100644 index 00000000000..b0d4843aecd --- /dev/null +++ b/pkgs/applications/audio/nootka/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake +, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch, qtbase +}: + +stdenv.mkDerivation rec { + name = "nootka-1.4.7"; + + src = fetchurl { + url = "mirror://sourceforge/nootka/${name}-source.tar.bz2"; + sha256 = "1y9wlwri74v2z9dwbcfjs7xri54yra24vpwq19xi2lfv1nbs518x"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch qtbase + ]; + + cmakeFlags = [ + "-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse" + "-DENABLE_JACK=ON" + "-DENABLE_PULSEAUDIO=ON" + ]; + + meta = with stdenv.lib; { + description = "Application for practicing playing musical scores and ear training"; + homepage = "https://nootka.sourceforge.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/nootka/unstable.nix b/pkgs/applications/audio/nootka/unstable.nix new file mode 100644 index 00000000000..16df55c1dfb --- /dev/null +++ b/pkgs/applications/audio/nootka/unstable.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, cmake +, alsaLib, fftwSinglePrec, libjack2, libpulseaudio, libvorbis, soundtouch +, qtbase, qtdeclarative, qtquickcontrols2 +}: + +stdenv.mkDerivation rec { + name = "nootka-1.7.0-beta1"; + + src = fetchurl { + url = "mirror://sourceforge/nootka/${name}-source.tar.bz2"; + sha256 = "13b50vnpr1zx2mrgkc8fmhsyfa19rqq1rksvn31145dy6fk1f3gc"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ + alsaLib fftwSinglePrec libjack2 libpulseaudio libvorbis soundtouch + qtbase qtdeclarative qtquickcontrols2 + ]; + + cmakeFlags = [ + "-DCMAKE_INCLUDE_PATH=${libjack2}/include/jack;${libpulseaudio.dev}/include/pulse" + "-DENABLE_JACK=ON" + "-DENABLE_PULSEAUDIO=ON" + ]; + + meta = with stdenv.lib; { + description = "Application for practicing playing musical scores and ear training"; + homepage = "https://nootka.sourceforge.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/normalize/default.nix b/pkgs/applications/audio/normalize/default.nix index 490ecc967bb..0aa26411693 100644 --- a/pkgs/applications/audio/normalize/default.nix +++ b/pkgs/applications/audio/normalize/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmad ]; meta = with stdenv.lib; { - homepage = https://www.nongnu.org/normalize/; + homepage = "https://www.nongnu.org/normalize/"; description = "Audio file normalizer"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/audio/nova-filters/default.nix b/pkgs/applications/audio/nova-filters/default.nix index 0bb970500bd..bc5a3efc59a 100644 --- a/pkgs/applications/audio/nova-filters/default.nix +++ b/pkgs/applications/audio/nova-filters/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "nova-filters"; src = fetchurl { - url = https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz; + url = "https://klingt.org/~tim/nova-filters/nova-filters_0.2-2.tar.gz"; sha256 = "16064vvl2w5lz4xi3lyjk4xx7fphwsxc14ajykvndiz170q32s6i"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "LADSPA plugins based on filters of nova"; - homepage = http://klingt.org/~tim/nova-filters/; + homepage = "http://klingt.org/~tim/nova-filters/"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index 24ac52e7e31..aebc7dc7baa 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A cross-platform command-line based module file player"; - homepage = https://lib.openmpt.org/libopenmpt/; + homepage = "https://lib.openmpt.org/libopenmpt/"; license = licenses.bsd3; maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix index 69fa75d85f4..9d95c362d92 100644 --- a/pkgs/applications/audio/opus-tools/default.nix +++ b/pkgs/applications/audio/opus-tools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to work with opus encoded audio streams"; - homepage = http://www.opus-codec.org/; + homepage = "http://www.opus-codec.org/"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index 25636863793..c09b3f415d8 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-level API for decoding and seeking in .opus files"; - homepage = http://www.opus-codec.org/; + homepage = "http://www.opus-codec.org/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/applications/audio/padthv1/default.nix index 0cb0f00844e..911bb4c8c77 100644 --- a/pkgs/applications/audio/padthv1/default.nix +++ b/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "padthv1"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "1zz3rz990k819q0rlzllqdwvag0x9k63443lb0mp8lwlczxnza6l"; + sha256 = "1c1zllph86qswcxddz4vpsj6r9w21hbv4gkba0pyd3q7pbfqr7nz"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftw ]; @@ -15,7 +15,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "polyphonic additive synthesizer"; - homepage = http://padthv1.sourceforge.net/; + homepage = "http://padthv1.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pamix/default.nix b/pkgs/applications/audio/pamix/default.nix index 2507f08e9e5..cc5d84d9471 100644 --- a/pkgs/applications/audio/pamix/default.nix +++ b/pkgs/applications/audio/pamix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pulseaudio terminal mixer"; - homepage = https://github.com/patroclos/PAmix; + homepage = "https://github.com/patroclos/PAmix"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index 7c452096785..71d85248599 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { - Increase / Decrease the volume for a device - Mute or unmute a device ''; - homepage = https://github.com/cdemoulins/pamixer; + homepage = "https://github.com/cdemoulins/pamixer"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 9c59b5466c7..b5ec1206ce3 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { dialog for the PulseAudio sound server. ''; - homepage = http://freedesktop.org/software/pulseaudio/paprefs/; + homepage = "http://freedesktop.org/software/pulseaudio/paprefs/"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index e7c4cab9af1..ac679d6dd94 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "patchage"; version = "1.0.1"; src = fetchsvn { - url = http://svn.drobilla.net/lad/trunk/patchage/; + url = "http://svn.drobilla.net/lad/trunk/patchage/"; rev = "5821"; sha256 = "1ar64l0sg468qzxj7i6ppgfqjpm92awcp5lzskamrf3ln17lrgj7"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Modular patch bay for Jack and ALSA systems"; - homepage = http://non.tuxfamily.org; + homepage = "http://non.tuxfamily.org"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/paulstretch/default.nix b/pkgs/applications/audio/paulstretch/default.nix index b9a3f39affb..f6cee7672f7 100644 --- a/pkgs/applications/audio/paulstretch/default.nix +++ b/pkgs/applications/audio/paulstretch/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { special effects by "spectral smoothing" the sounds. It can transform any sound/music to a texture. ''; - homepage = http://hypermammut.sourceforge.net/paulstretch/; + homepage = "http://hypermammut.sourceforge.net/paulstretch/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index d07cf8a476b..301e44168d3 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { easily control the volume of all clients, sinks, etc. ''; - homepage = http://freedesktop.org/software/pulseaudio/pavucontrol/; + homepage = "http://freedesktop.org/software/pulseaudio/pavucontrol/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix index 6440f6e787f..56f1ec518de 100644 --- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix +++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix @@ -25,7 +25,7 @@ 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; + homepage = "http://puredata.info/downloads/cyclone"; license = stdenv.lib.licenses.tcltk; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix index 6c7a4b03ef5..be5a385d308 100644 --- a/pkgs/applications/audio/pd-plugins/helmholtz/default.nix +++ b/pkgs/applications/audio/pd-plugins/helmholtz/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { description = "Time domain pitch tracker for Pure Data"; - homepage = http://www.katjaas.nl/helmholtz/helmholtz.html; + homepage = "http://www.katjaas.nl/helmholtz/helmholtz.html"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix index 21ba375200b..aec793c4ee8 100644 --- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix +++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A library of non-tilde externals for puredata, by Miller Puckette"; - homepage = http://puredata.info/downloads/maxlib; + homepage = "http://puredata.info/downloads/maxlib"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix index 028a4667cb2..cefee430ad5 100644 --- a/pkgs/applications/audio/pd-plugins/mrpeach/default.nix +++ b/pkgs/applications/audio/pd-plugins/mrpeach/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = { description = "A collection of Pd objectclasses for OSC-messages"; - homepage = http://puredata.info/downloads/osc; + homepage = "http://puredata.info/downloads/osc"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/puremapping/default.nix b/pkgs/applications/audio/pd-plugins/puremapping/default.nix index c214d3fcf40..7a5014664d5 100644 --- a/pkgs/applications/audio/pd-plugins/puremapping/default.nix +++ b/pkgs/applications/audio/pd-plugins/puremapping/default.nix @@ -23,7 +23,7 @@ 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; + 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; diff --git a/pkgs/applications/audio/pd-plugins/timbreid/default.nix b/pkgs/applications/audio/pd-plugins/timbreid/default.nix index fa9660fbbf6..e68610a0226 100644 --- a/pkgs/applications/audio/pd-plugins/timbreid/default.nix +++ b/pkgs/applications/audio/pd-plugins/timbreid/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A collection of audio feature analysis externals for puredata"; - homepage = http://williambrent.conflations.com/pages/research.html; + homepage = "http://williambrent.conflations.com/pages/research.html"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/pd-plugins/zexy/default.nix b/pkgs/applications/audio/pd-plugins/zexy/default.nix index cc307417c06..4f826908136 100644 --- a/pkgs/applications/audio/pd-plugins/zexy/default.nix +++ b/pkgs/applications/audio/pd-plugins/zexy/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "The swiss army knife for puredata"; - homepage = http://puredata.info/downloads/zexy; + homepage = "http://puredata.info/downloads/zexy"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 8bbeffb1f7a..322eba2b952 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MIDI controllable audio sampler"; longDescription = "a fork of Specimen"; - homepage = http://petri-foo.sourceforge.net; + homepage = "http://petri-foo.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index f2130fe5559..4832fce1e96 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,35 +1,31 @@ -{ stdenv, fetchurl, alsaLib, cmake, libGLU, libGL, makeWrapper, qt4 }: +{ stdenv, fetchFromGitHub, cmake, pkg-config, qttools +, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pianobooster"; - version = "0.6.4b"; + version = "0.7.2b"; - src = fetchurl { - url = "mirror://sourceforge/pianobooster/pianobooster-src-0.6.4b.tar.gz"; - sha256 = "1xwyap0288xcl0ihjv52vv4ijsjl0yq67scc509aia4plmlm6l35"; + src = fetchFromGitHub { + owner = "captnfab"; + repo = "PianoBooster"; + rev = "v${version}"; + sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj"; }; - patches = [ - ./pianobooster-0.6.4b-cmake.patch - ./pianobooster-0.6.4b-cmake-gcc4.7.patch - ]; - - preConfigure = "cd src"; + nativeBuildInputs = [ cmake pkg-config qttools ]; - buildInputs = [ alsaLib cmake makeWrapper libGLU libGL qt4 ]; - NIX_LDFLAGS = "-lGL -lpthread"; + buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ]; - postInstall = '' - wrapProgram $out/bin/pianobooster \ - --prefix LD_LIBRARY_PATH : ${libGL}/lib \ - --prefix LD_LIBRARY_PATH : ${libGLU}/lib - ''; + cmakeFlags = [ + "-DOpenGL_GL_PREFERENCE=GLVND" + ]; meta = with stdenv.lib; { description = "A MIDI file player that teaches you how to play the piano"; - homepage = http://pianobooster.sourceforge.net; - license = licenses.gpl3; + homepage = "https://github.com/captnfab/PianoBooster"; + license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu orivej ]; }; } diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch deleted file mode 100644 index 2b1b28c5a84..00000000000 --- a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake-gcc4.7.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig 2013-04-06 10:48:02.469532914 -0700 -+++ pianobooster-src-0.6.4b/src/CMakeLists.txt 2013-04-06 10:48:12.989532445 -0700 -@@ -203,8 +203,6 @@ - ${PIANOBOOSTER_UI_HDRS} ) - ENDIF(WIN32) - --SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS "-mwindows") -- - IF (USE_PCH) - ADD_PRECOMPILED_HEADER( pianobooster ${CMAKE_CURRENT_SOURCE_DIR}/precompile/precompile.h ) - ENDIF (USE_PCH) diff --git a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch b/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch deleted file mode 100644 index 8cdd8738e2b..00000000000 --- a/pkgs/applications/audio/pianobooster/pianobooster-0.6.4b-cmake.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- pianobooster-src-0.6.4b/src/CMakeLists.txt.orig -+++ pianobooster-src-0.6.4b/src/CMakeLists.txt -@@ -2,12 +2,6 @@ - # for the debug build type cmake -DCMAKE_BUILD_TYPE=Debug - SET(CMAKE_BUILD_TYPE Release) - SET(CMAKE_VERBOSE_MAKEFILE OFF) --SET(USE_FLUIDSYNTH OFF) -- --# The inplace directory is mainly for windows builds --# SET(FLUIDSYNTH_INPLACE_DIR C:/download/misc/ljb/fluidsynth-1.0.9) --SET(FLUIDSYNTH_INPLACE_DIR /home/louis/build/fluidsynth-1.0.9) -- - - # Testing precompiled headers it does not work -- leave as OFF. - SET(USE_PCH OFF) -@@ -78,18 +72,7 @@ - ADD_DEFINITIONS(-DPB_USE_FLUIDSYNTH) - MESSAGE("Building using fluidsynth") - SET( PB_BASE_SRCS MidiDeviceFluidSynth.cpp ) -- -- IF(FLUIDSYNTH_INPLACE_DIR) -- INCLUDE_DIRECTORIES(${FLUIDSYNTH_INPLACE_DIR}/include/) -- IF(WIN32) -- LINK_LIBRARIES( ${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.dll.a) -- ENDIF(WIN32) -- IF(UNIX) -- LINK_LIBRARIES(${FLUIDSYNTH_INPLACE_DIR}/src/.libs/libfluidsynth.so) -- ENDIF(UNIX) -- ELSEIF(FLUIDSYNTH_INPLACE_DIR) -- LINK_LIBRARIES( fluidsynth) -- ENDIF(FLUIDSYNTH_INPLACE_DIR) -+ LINK_LIBRARIES(fluidsynth) - ENDIF(USE_FLUIDSYNTH) - - -@@ -214,8 +197,6 @@ - INSTALL(TARGETS pianobooster RUNTIME DESTINATION bin) - #INSTALL( index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kmidimon ) - --INSTALL( FILES ../README.txt DESTINATION share/doc/pianobooster ) -- - INSTALL ( FILES images/pianobooster.png DESTINATION share/pixmaps ) - - diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index b241f750d03..5830e1eefb8 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,7 +1,15 @@ -{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 }: +{ stdenv, python3Packages, fetchFromGitHub, gettext, chromaprint, qt5 +, enablePlayback ? true +, gst_all_1 +}: let pythonPackages = python3Packages; + pyqt5 = if enablePlayback then + pythonPackages.pyqt5_with_qtmultimedia + else + pythonPackages.pyqt5 + ; in pythonPackages.buildPythonApplication rec { pname = "picard"; version = "2.3.1"; @@ -13,7 +21,16 @@ in pythonPackages.buildPythonApplication rec { sha256 = "0xalg4dvaqb396h4s6gzxnplgv1lcvsczmmrlhyrj0kfj10amhsj"; }; - nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ]; + nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] + ++ stdenv.lib.optionals (pyqt5.multimediaEnabled) [ + qt5.qtmultimedia.bin + gst_all_1.gstreamer + gst_all_1.gst-vaapi + gst_all_1.gst-libav + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + ] + ; propagatedBuildInputs = with pythonPackages; [ pyqt5 @@ -27,10 +44,14 @@ in pythonPackages.buildPythonApplication rec { substituteInPlace setup.cfg --replace "‘" "'" ''; - installPhase = '' - python setup.py install --prefix="$out" - wrapQtApp $out/bin/picard - ''; + # In order to spare double wrapping, we use: + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + '' + + stdenv.lib.optionalString (pyqt5.multimediaEnabled) '' + makeWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + '' + ; meta = with stdenv.lib; { homepage = "https://picard.musicbrainz.org/"; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 20a6e928cef..6c3ffebc8c9 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Pandora Internet Radio player for GNOME"; - homepage = https://pithos.github.io/; + homepage = "https://pithos.github.io/"; license = licenses.gpl3; maintainers = with maintainers; [ obadz ]; }; diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix index 8c21dc8f2ad..15385e91927 100644 --- a/pkgs/applications/audio/playbar2/default.nix +++ b/pkgs/applications/audio/playbar2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mpris2 Client for Plasma5"; - homepage = https://github.com/audoban/PlayBar2; + homepage = "https://github.com/audoban/PlayBar2"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pjones ]; diff --git a/pkgs/applications/audio/plugin-torture/default.nix b/pkgs/applications/audio/plugin-torture/default.nix index f444ad6cb32..3c852cf450e 100644 --- a/pkgs/applications/audio/plugin-torture/default.nix +++ b/pkgs/applications/audio/plugin-torture/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/cth103/plugin-torture; + homepage = "https://github.com/cth103/plugin-torture"; description = "A tool to test LADSPA and LV2 plugins"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/pmidi/default.nix b/pkgs/applications/audio/pmidi/default.nix index f9b3fbae213..0da86ca9bd1 100644 --- a/pkgs/applications/audio/pmidi/default.nix +++ b/pkgs/applications/audio/pmidi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ alsaLib ]; meta = with stdenv.lib; { - homepage = http://www.parabola.me.uk/alsa/pmidi.html; + homepage = "http://www.parabola.me.uk/alsa/pmidi.html"; description = "A straightforward command line program to play midi files through the ALSA sequencer"; maintainers = with maintainers; [ lheckemann ]; license = licenses.gpl2; diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index 6d168ec5661..6c289a97384 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI PulseAudio Volume Control"; - homepage = https://github.com/falconindy/ponymix; + homepage = "https://github.com/falconindy/ponymix"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 9414f4211d7..2fb8e30a64d 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Doing phonetics by computer"; - homepage = http://www.fon.hum.uva.nl/praat/; + homepage = "http://www.fon.hum.uva.nl/praat/"; license = stdenv.lib.licenses.gpl2Plus; # Has some 3rd-party code in it though platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/audio/projectm/default.nix b/pkgs/applications/audio/projectm/default.nix index 347774010ae..205a3ad287e 100644 --- a/pkgs/applications/audio/projectm/default.nix +++ b/pkgs/applications/audio/projectm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "Music Visualizer"; - homepage = http://projectm.sourceforge.net/; + homepage = "http://projectm.sourceforge.net/"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { }; patch_gcc6 = fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/45abd63abc6644b6e177c057b5b42d894dbf8e29/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch; + url = "https://raw.githubusercontent.com/gentoo/gentoo/45abd63abc6644b6e177c057b5b42d894dbf8e29/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch"; sha256 = "1i50scxv1jlqvb3jm3sql89a7wqckxhlpvnhz20vvmm1kii6lrsn"; }; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index f659d20f463..2f21e3ea56b 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.06"; + version = "1.07"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "00zifwiprd3i60z4pf4471jxbc33vh9p30ib0lnzwpgjz5pnxqnr"; + sha256 = "0g2bp9n05ng2fvqw86pb941zamcqnfz1l066wvh5j3av1w22khi8"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 3a6cd298557..a0813fa0c80 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -29,7 +29,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; - homepage = https://docs.puddletag.net; + homepage = "https://docs.puddletag.net"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 6b7d242e1f6..125dafc132e 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Control pulseaudio volume from the shell or mapped to keyboard shortcuts. No need for alsa-utils."; - homepage = https://bbs.archlinux.org/viewtopic.php?id=124513; + homepage = "https://bbs.archlinux.org/viewtopic.php?id=124513"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix index 328bd8b0b04..efe39aa1600 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; - homepage = https://github.com/jstasiak/python-zeroconf; + homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; maintainers = [ ]; }; diff --git a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix index b8082c12c64..2511cf0f20a 100644 --- a/pkgs/applications/audio/pulseaudio-modules-bt/default.nix +++ b/pkgs/applications/audio/pulseaudio-modules-bt/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/EHfive/pulseaudio-modules-bt; + homepage = "https://github.com/EHfive/pulseaudio-modules-bt"; description = "LDAC, aptX, aptX HD, AAC codecs (A2DP Audio) support for Linux PulseAudio"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 00c5af4422d..2972849a2d4 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -46,13 +46,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.7.1"; + version = "4.7.2"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "1r1hk5zp2cgrwyqkvp8kg2dkbihdyx3ydzhmirkwya8jag9pwadd"; + sha256 = "1yga25da5bpg12zkikp6dn4wqhn9f7r10awvjzfcz8s6w9xlz6rx"; }; nativeBuildInputs = [ @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; - homepage = https://github.com/wwmm/pulseeffects; + homepage = "https://github.com/wwmm/pulseeffects"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 5886a465409..9880a65d0ca 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A real-time graphical programming environment for audio, video, and graphical processing''; - homepage = http://puredata.info; + homepage = "http://puredata.info"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 753f6fe8206..54bbbf05377 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A Qt application to control the JACK sound server daemon"; - homepage = http://qjackctl.sourceforge.net/; + homepage = "http://qjackctl.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/qmidiarp/default.nix b/pkgs/applications/audio/qmidiarp/default.nix new file mode 100644 index 00000000000..4bbfe79a2c9 --- /dev/null +++ b/pkgs/applications/audio/qmidiarp/default.nix @@ -0,0 +1,49 @@ +{ stdenv +, fetchgit +, automake +, autoreconfHook +, lv2 +, pkg-config +, qt5 +, alsaLib +, libjack2 +}: + +stdenv.mkDerivation rec { + name = "qmidiarp"; + version = "0.6.5"; + + src = fetchgit { + url = "https://git.code.sf.net/p/qmidiarp/code"; + sha256 = "1g2143gzfbihqr2zi3k2v1yn1x3mwfbb2khmcd4m4cq3hcwhhlx9"; + rev = "qmidiarp-0.6.5"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + qt5.wrapQtAppsHook + ]; + + buildInputs = [ + alsaLib + lv2 + libjack2 + ] ++ (with qt5; [ + qttools + ]); + + meta = with stdenv.lib; { + description = "An advanced MIDI arpeggiator"; + longDescription = '' + An advanced MIDI arpeggiator, programmable step sequencer and LFO for Linux. + It can hold any number of arpeggiator, sequencer, or LFO modules running in + parallel. + ''; + + homepage = "http://qmidiarp.sourceforge.net"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ sjfloat ]; + }; +} diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 2b79818543f..10cbcb5d5b1 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { meta = with lib; { description = "A MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network"; - homepage = http://qmidinet.sourceforge.net/; + homepage = "http://qmidinet.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index a941ea485b7..fe7b9f8ba66 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. mkDerivation rec { - name = "qmmp-1.3.6"; + name = "qmmp-1.3.7"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "0dihy6v6j1cfx4qgwgajdn8rx6nf8x5srk8yjki9xh1mlcaanhp8"; + sha256 = "13mk8p7bfl3fkavpqyhpcxkxb8a4f5d4qc1lasyf7wls3ghrdag7"; }; nativeBuildInputs = [ cmake pkgconfig ]; @@ -55,10 +55,10 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Qt-based audio player that looks like Winamp"; - homepage = http://qmmp.ylsoftware.com/; + homepage = "http://qmmp.ylsoftware.com/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; - repositories.svn = http://qmmp.googlecode.com/svn/; + repositories.svn = "http://qmmp.googlecode.com/svn/"; }; } diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/applications/audio/qsampler/default.nix index 33411002c23..1f65b374838 100644 --- a/pkgs/applications/audio/qsampler/default.nix +++ b/pkgs/applications/audio/qsampler/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "Graphical frontend to LinuxSampler"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 29f5704c730..8235a2835fb 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Fluidsynth GUI"; - homepage = https://sourceforge.net/projects/qsynth; + homepage = "https://sourceforge.net/projects/qsynth"; license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 4076692e7fe..523a743ef3b 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -23,9 +23,11 @@ stdenv.mkDerivation rec { suil ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Audio/MIDI multi-track sequencer"; - homepage = http://qtractor.sourceforge.net; + homepage = "http://qtractor.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix index 68e8e6402ac..5b84989a7c4 100644 --- a/pkgs/applications/audio/qtscrobbler/default.nix +++ b/pkgs/applications/audio/qtscrobbler/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware. ''; - homepage = http://qtscrob.sourceforge.net; + homepage = "http://qtscrob.sourceforge.net"; license = licenses.gpl2; maintainers = [ maintainers.vanzef ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 597cf68f4d0..704e20cc8c5 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -74,6 +74,6 @@ python3.pkgs.buildPythonApplication rec { ''; maintainers = with maintainers; [ coroa sauyon ]; - homepage = https://quodlibet.readthedocs.io/en/latest/; + homepage = "https://quodlibet.readthedocs.io/en/latest/"; }; } diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index a64e407b39b..014906594a7 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An internet radio player for linux"; - homepage = https://github.com/ebruck/radiotray-ng; + homepage = "https://github.com/ebruck/radiotray-ng"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/rakarrack/default.nix b/pkgs/applications/audio/rakarrack/default.nix index 36302458a75..4548f9ba624 100644 --- a/pkgs/applications/audio/rakarrack/default.nix +++ b/pkgs/applications/audio/rakarrack/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-effects processor emulating a guitar effects pedalboard"; - homepage = http://rakarrack.sourceforge.net; + homepage = "http://rakarrack.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix index 236c42b5293..2e63a3e8c7c 100644 --- a/pkgs/applications/audio/reaper/default.nix +++ b/pkgs/applications/audio/reaper/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Digital audio workstation"; - homepage = https://www.reaper.fm/; + homepage = "https://www.reaper.fm/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 2fb1943e0e5..1cbd5b3afa2 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { description = "Modern tracker-based DAW"; - homepage = https://www.renoise.com/; + homepage = "https://www.renoise.com/"; license = licenses.unfree; maintainers = []; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/audio/rhvoice/default.nix b/pkgs/applications/audio/rhvoice/default.nix index e3eb750496b..7a0a8a59a08 100644 --- a/pkgs/applications/audio/rhvoice/default.nix +++ b/pkgs/applications/audio/rhvoice/default.nix @@ -15,7 +15,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ - scons pkgconfig + scons.py2 pkgconfig ]; buildInputs = [ @@ -33,7 +33,7 @@ in stdenv.mkDerivation { meta = { description = "A free and open source speech synthesizer for Russian language and others"; - homepage = https://github.com/Olga-Yakovleva/RHVoice/wiki; + homepage = "https://github.com/Olga-Yakovleva/RHVoice/wiki"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ berce ]; platforms = with lib.platforms; all; diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index b6bff79fa03..79560451e54 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Rhythmbox; + homepage = "https://wiki.gnome.org/Apps/Rhythmbox"; description = "A music playing application for GNOME"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix index 0ff23102e75..59979c41083 100644 --- a/pkgs/applications/audio/rkrlv2/default.nix +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Rakarrak effects ported to LV2"; - homepage = https://github.com/ssj71/rkrlv2; + homepage = "https://github.com/ssj71/rkrlv2"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.joelmo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix index 97c737675ad..ef57466ec84 100644 --- a/pkgs/applications/audio/rofi-mpd/default.nix +++ b/pkgs/applications/audio/rofi-mpd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "rofi-mpd"; - version = "2.0.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "Rofi_MPD"; rev = "v${version}"; - sha256 = "12zzx0m2nwyzxzzqgzq30a27k015kcw4ylvs7cyalf5gf6sg27kl"; + sha256 = "1b0y8706mmrxhiyz8g6znisllc35j8g7sz8gfjll9svysjmvb6lc"; }; propagatedBuildInputs = with python3Packages; [ mutagen mpd2 toml appdirs ]; diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 3d9342f16ca..921c8fff67a 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.rosegardenmusic.com/; + homepage = "https://www.rosegardenmusic.com/"; description = "Music composition and editing environment"; longDescription = '' Rosegarden is a music composition and editing environment based around diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/applications/audio/samplv1/default.nix index 8c8e5407f7a..86f8f666d80 100644 --- a/pkgs/applications/audio/samplv1/default.nix +++ b/pkgs/applications/audio/samplv1/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "samplv1"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { url = "mirror://sourceforge/samplv1/${pname}-${version}.tar.gz"; - sha256 = "0xzjxiqzcf1ygabrjsy0iachhnpy85rp9519fmj2f568r6ml6hzg"; + sha256 = "0clsp6s5qfnh0xaxbd35vq2ppi72q9dfayrzlgl73800a8p7gh9m"; }; buildInputs = [ libjack2 alsaLib liblo libsndfile lv2 qt5.qtbase qt5.qttools]; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An old-school all-digital polyphonic sampler synthesizer with stereo fx"; - homepage = http://samplv1.sourceforge.net/; + homepage = "http://samplv1.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index f902b2dd41b..b50dd78ff1a 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Music tracker application, free reimplementation of Impulse Tracker"; - homepage = http://schismtracker.org/; + homepage = "http://schismtracker.org/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 9bab024f021..c8347d70b1d 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimal loop based midi sequencer"; - homepage = http://www.filter24.org/seq24; + homepage = "http://www.filter24.org/seq24"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/applications/audio/sfxr-qt/default.nix b/pkgs/applications/audio/sfxr-qt/default.nix index 615a8a8c660..165f8446c76 100644 --- a/pkgs/applications/audio/sfxr-qt/default.nix +++ b/pkgs/applications/audio/sfxr-qt/default.nix @@ -10,12 +10,12 @@ mkDerivation rec { pname = "sfxr-qt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "agateau"; repo = "sfxr-qt"; rev = version; - sha256 = "1ndw1dcmzvkrc6gnb0y057zb4lqlhwrv18jlbx26w3s4xrbxqr41"; + sha256 = "15yjgjl1c5k816mnpc09104zq0ack2a3mjsxmhcik7cmjkfiipr5"; fetchSubmodules = true; }; nativeBuildInputs = [ @@ -27,10 +27,9 @@ mkDerivation rec { qtquickcontrols2 SDL ]; - configurePhase = "cmake . -DCMAKE_INSTALL_PREFIX=$out"; meta = with lib; { - homepage = https://github.com/agateau/sfxr-qt; + homepage = "https://github.com/agateau/sfxr-qt"; description = "A sound effect generator, QtQuick port of sfxr"; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/applications/audio/shntool/default.nix b/pkgs/applications/audio/shntool/default.nix index e3bfc60a40a..de18f3c2ce8 100644 --- a/pkgs/applications/audio/shntool/default.nix +++ b/pkgs/applications/audio/shntool/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "shntool"; src = fetchurl { - url = http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz; + url = "http://www.etree.org/shnutils/shntool/dist/src/shntool-3.0.10.tar.gz"; sha256 = "00i1rbjaaws3drkhiczaign3lnbhr161b7rbnjr8z83w8yn2wc3l"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Multi-purpose WAVE data processing and reporting utility"; - homepage = http://www.etree.org/shnutils/shntool/; + homepage = "http://www.etree.org/shnutils/shntool/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/applications/audio/shortwave/default.nix b/pkgs/applications/audio/shortwave/default.nix new file mode 100644 index 00000000000..d26d314cd3e --- /dev/null +++ b/pkgs/applications/audio/shortwave/default.nix @@ -0,0 +1,87 @@ +{ stdenv +, fetchFromGitLab +, cargo +, dbus +, desktop-file-utils +, gdk-pixbuf +, gettext +, glib +, gst_all_1 +, gtk3 +, libhandy +, meson +, ninja +, openssl +, pkg-config +, python3 +, rust +, rustc +, rustPlatform +, sqlite +, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "shortwave"; + version = "1.0.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "Shortwave"; + rev = version; + sha256 = "13lhlh75vw02vkcknl4nvy0yvpdf0qx811mmyja8bzs4rj1j9kr8"; + }; + + cargoSha256 = "0aph5z54a6i5p8ga5ghhx1c9hjc8zdw5pkv9inmanca0bq3hkdlh"; + + nativeBuildInputs = [ + cargo + desktop-file-utils + gettext + glib # for glib-compile-schemas + meson + ninja + pkg-config + python3 + rustc + wrapGAppsHook + ]; + + buildInputs = [ + dbus + gdk-pixbuf + glib + gtk3 + libhandy + openssl + sqlite + ] ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + ]); + + # Don't use buildRustPackage phases, only use it for rust deps setup + configurePhase = null; + buildPhase = null; + checkPhase = null; + installPhase = null; + + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + meta = with stdenv.lib; { + homepage = "https://gitlab.gnome.org/World/Shortwave"; + description = "Find and listen to internet radio stations"; + longDescription = '' + Shortwave is a streaming audio player designed for the GNOME + desktop. It is the successor to the older Gradio application. + ''; + maintainers = with maintainers; [ lasandell ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index aff8c173d9f..b0a50bbf128 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A SID player using libsidplayfp"; - homepage = https://sourceforge.net/projects/sidplay-residfp/; + homepage = "https://sourceforge.net/projects/sidplay-residfp/"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ dezgeg ]; platforms = with platforms; linux; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index f95655f5e9a..07215fc42f8 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple audio oscilloscope with variable time scale, triggering, cursors and numeric readout in LV2 plugin format"; - homepage = http://x42.github.io/sisco.lv2/; + homepage = "http://x42.github.io/sisco.lv2/"; license = licenses.gpl2; maintainers = [ maintainers.e-user ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/snapcast/default.nix b/pkgs/applications/audio/snapcast/default.nix index 21a36cecbe5..531a633f05d 100644 --- a/pkgs/applications/audio/snapcast/default.nix +++ b/pkgs/applications/audio/snapcast/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Synchronous multi-room audio player"; - homepage = https://github.com/badaix/snapcast; + homepage = "https://github.com/badaix/snapcast"; maintainers = with maintainers; [ fpletz ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index cfe79f4e361..9bc8fcb6694 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-20.1"; + name = "snd-20.2"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "0v7zhavkkbh1bagzy3l08kb235hhdqn28y0m4znkd3k31p4l4dz8"; + sha256 = "0ip4sfyxqlbghlggipmvvqjqs1a7qas0zcmzw8d1nwg6krjkfj0r"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/sndpeek/default.nix b/pkgs/applications/audio/sndpeek/default.nix index 376aadc7385..d239fda11ae 100644 --- a/pkgs/applications/audio/sndpeek/default.nix +++ b/pkgs/applications/audio/sndpeek/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { * available on MacOS X, Linux, and Windows under GPL * part of the sndtools distribution. ''; - homepage = https://soundlab.cs.princeton.edu/software/sndpeek/; + homepage = "https://soundlab.cs.princeton.edu/software/sndpeek/"; license = licenses.gpl2; maintainers = [ maintainers.laikq ]; }; diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index b9293fe2729..68eefadf411 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -61,7 +61,7 @@ in buildPythonApplication rec { - Commandline control - Available in 24 languages ''; - homepage = https://www.nongnu.org/sonata/; + homepage = "https://www.nongnu.org/sonata/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.rvl ]; diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/applications/audio/sonic-lineup/default.nix index 68e1b6b3f8a..b837eb07cf1 100644 --- a/pkgs/applications/audio/sonic-lineup/default.nix +++ b/pkgs/applications/audio/sonic-lineup/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, boost, bzip2, fftw, fftwFloat, libfishsound , libid3tag, liblo, libmad, liboggz, libpulseaudio, libsamplerate -, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, vampSDK, capnproto +, libsndfile, lrdf, opusfile, portaudio, rubberband, serd, sord, capnproto , wrapQtAppsHook, pkgconfig }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Comparative visualisation of related audio recordings"; - homepage = https://www.sonicvisualiser.org/sonic-lineup/; + homepage = "https://www.sonicvisualiser.org/sonic-lineup/"; license = licenses.gpl2Plus; maintainers = [ maintainers.vandenoever ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index 187c887baa5..e8b6a4d4313 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -3,7 +3,7 @@ { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo , libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate , libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland -, rubberband, serd, sord, vampSDK, fftwFloat +, rubberband, serd, sord, vamp-plugin-sdk, fftwFloat , capnproto, liboggz, libfishsound, libid3tag, opusfile , wrapQtAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband - libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland + libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland serd sord # optional @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View and analyse contents of music audio files"; - homepage = https://www.sonicvisualiser.org/; + homepage = "https://www.sonicvisualiser.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 768b40a1138..3fb111db851 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; version = version; - homepage = http://essej.net/sooperlooper/index.html; + homepage = "http://essej.net/sooperlooper/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index 5d8ae0928c9..7601f942868 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://openavproductions.com/sorcer/; + homepage = "http://openavproductions.com/sorcer/"; description = "A wavetable LV2 plugin synth, targeted at the electronic / dubstep genre"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 7f22a03c1bb..dcad0cec1e8 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -27,13 +27,12 @@ in stdenv.mkDerivation rec{ passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; meta = with stdenv.lib; { description = "A Gnome CD Ripper"; - homepage = https://wiki.gnome.org/Apps/SoundJuicer; + homepage = "https://wiki.gnome.org/Apps/SoundJuicer"; maintainers = [ maintainers.bdimcheff ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 5b5f01eef5c..741211bd90d 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { version = "2016-11-03"; src = fetchgit { - url = https://github.com/SoundScapeRenderer/ssr; + url = "https://github.com/SoundScapeRenderer/ssr"; rev = "0dd0136dd24e47b63d8a4e05de467f5c7b047ec9"; sha256 = "095x2spv9bmg6pi71mpajnghbqj58ziflg16f9854awx0qp9d8x7"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://spatialaudio.net/ssr/; + 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 ]; diff --git a/pkgs/applications/audio/spectmorph/default.nix b/pkgs/applications/audio/spectmorph/default.nix index a4f48aa0c21..d8209dad02d 100644 --- a/pkgs/applications/audio/spectmorph/default.nix +++ b/pkgs/applications/audio/spectmorph/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows to analyze samples of musical instruments, and to combine them (morphing) to construct hybrid sounds"; - homepage = http://spectmorph.org; + homepage = "http://spectmorph.org"; license = licenses.gpl3; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix index 4c1682b1e0b..35534750d0c 100644 --- a/pkgs/applications/audio/spectrojack/default.nix +++ b/pkgs/applications/audio/spectrojack/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A little spectrogram/audiogram/sonogram/whatever for JACK"; - homepage = http://sed.free.fr/spectrojack; + homepage = "http://sed.free.fr/spectrojack"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ sleexyz ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/audio/speech-denoiser/default.nix b/pkgs/applications/audio/speech-denoiser/default.nix index 6598d24fb07..706a6956c5d 100644 --- a/pkgs/applications/audio/speech-denoiser/default.nix +++ b/pkgs/applications/audio/speech-denoiser/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Speech denoise lv2 plugin based on RNNoise library"; - homepage = https://github.com/lucianodato/speech-denoiser; + homepage = "https://github.com/lucianodato/speech-denoiser"; license = licenses.lgpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/spek/default.nix b/pkgs/applications/audio/spek/default.nix index f4922e388c4..88b22c59ae5 100644 --- a/pkgs/applications/audio/spek/default.nix +++ b/pkgs/applications/audio/spek/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Analyse your audio files by showing their spectrogram"; - homepage = http://spek.cc/; + homepage = "http://spek.cc/"; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix index 3c9565df919..efad434e307 100644 --- a/pkgs/applications/audio/split2flac/default.nix +++ b/pkgs/applications/audio/split2flac/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Split flac/ape/wv/wav + cue sheet into separate tracks"; - homepage = https://github.com/ftrvxmtrx/split2flac; + homepage = "https://github.com/ftrvxmtrx/split2flac"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 5837bd45310..5f9cf2720cd 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.17.0"; + version = "0.17.1"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1jx2qyshqg84l3fm682h8262da0hy68qjjg3dm2i53dxqxrm5ji9"; + sha256 = "1gsddjinxmglm05hhphclax08d9pig1f0wjjs3bbcq096fydxgfs"; }; - cargoSha256 = "12qwp59gshc9d6nz0s3w03zc8sxqri12vrav94vi54fqagiikinm"; + cargoSha256 = "1y398ypckk3gw1sfzf97xzwf5d5z3kxlcpn3bccmsfr59kvkf661"; nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ openssl ] @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Spotify for the terminal written in Rust"; - homepage = https://github.com/Rigellute/spotify-tui; + homepage = "https://github.com/Rigellute/spotify-tui"; changelog = "https://github.com/Rigellute/spotify-tui/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ jwijenbergh ]; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index eb2055ec7c1..245d96dee01 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.spotify.com/; + homepage = "https://www.spotify.com/"; description = "Play music from the Spotify music service"; license = licenses.unfree; maintainers = with maintainers; [ eelco ftrvxmtrx sheenobu mudri timokau ma27 ]; diff --git a/pkgs/applications/audio/spotifywm/default.nix b/pkgs/applications/audio/spotifywm/default.nix index 2380c8e5d9e..a51e82f29c4 100644 --- a/pkgs/applications/audio/spotifywm/default.nix +++ b/pkgs/applications/audio/spotifywm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/dasJ/spotifywm; + homepage = "https://github.com/dasJ/spotifywm"; description = "Wrapper around Spotify that correctly sets class name before opening the window"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index ce0153e9f26..de135706ad3 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight headless squeezebox client emulator"; - homepage = https://github.com/ralph-irving/squeezelite; + homepage = "https://github.com/ralph-irving/squeezelite"; license = with licenses; [ gpl3 ] ++ optional dsdSupport bsd2; maintainers = with maintainers; [ samdoshi ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix index 496ce779ffb..e6dd48018e7 100644 --- a/pkgs/applications/audio/squishyball/default.nix +++ b/pkgs/applications/audio/squishyball/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { comparisons of groups of up to ten samples; this is the default mode of operation. ''; - homepage = https://svn.xiph.org/trunk/squishyball; + homepage = "https://svn.xiph.org/trunk/squishyball"; license = licenses.gpl2Plus; maintainers = with maintainers; [ michalrus ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/ssrc/default.nix b/pkgs/applications/audio/ssrc/default.nix index 1247bbc19f9..9d519e14147 100644 --- a/pkgs/applications/audio/ssrc/default.nix +++ b/pkgs/applications/audio/ssrc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; version = version; - homepage = http://shibatch.sourceforge.net/; + homepage = "http://shibatch.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ leenaars]; platforms = with platforms; [ linux ] ; diff --git a/pkgs/applications/audio/stone-phaser/default.nix b/pkgs/applications/audio/stone-phaser/default.nix index 6e64ebc7fb3..d36b28df978 100644 --- a/pkgs/applications/audio/stone-phaser/default.nix +++ b/pkgs/applications/audio/stone-phaser/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/jpcima/stone-phaser; + homepage = "https://github.com/jpcima/stone-phaser"; description = "A classic analog phaser effect, made with DPF and Faust"; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/streamripper/default.nix b/pkgs/applications/audio/streamripper/default.nix index efa87a2f72c..55ed40c2fb8 100644 --- a/pkgs/applications/audio/streamripper/default.nix +++ b/pkgs/applications/audio/streamripper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libogg libvorbis libmad ]; meta = with stdenv.lib; { - homepage = http://streamripper.sourceforge.net/; + homepage = "http://streamripper.sourceforge.net/"; description = "Application that lets you record streaming mp3 to your hard drive"; license = licenses.gpl2; maintainers = with maintainers; [ the-kenny ]; diff --git a/pkgs/applications/audio/svox/default.nix b/pkgs/applications/audio/svox/default.nix index 3e9fe4725af..0f8e5143883 100644 --- a/pkgs/applications/audio/svox/default.nix +++ b/pkgs/applications/audio/svox/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Text-to-speech engine"; - homepage = https://android.googlesource.com/platform/external/svox; + homepage = "https://android.googlesource.com/platform/external/svox"; platforms = platforms.linux; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix index b59752d7cc3..02499d54476 100644 --- a/pkgs/applications/audio/swh-lv2/default.nix +++ b/pkgs/applications/audio/swh-lv2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = "make install-system"; meta = with stdenv.lib; { - homepage = http://plugin.org.uk; + homepage = "http://plugin.org.uk"; description = "LV2 version of Steve Harris' SWH plugins"; longDescription = '' SWH plugins include: diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index f58166a5984..6339dad7f37 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "synthv1"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "1amxrl1cqwgncw5437r572frgf6xhss3cfpbgh178i8phlq1q731"; + sha256 = "0bb48myvgvqcibwm68qhd4852pjr2g19rasf059a799d1hzgfq3l"; }; buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; @@ -15,7 +15,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "An old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx"; - homepage = https://synthv1.sourceforge.io/; + homepage = "https://synthv1.sourceforge.io/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/tambura/default.nix b/pkgs/applications/audio/tambura/default.nix index 030bb2c01a7..96f9bb7053e 100644 --- a/pkgs/applications/audio/tambura/default.nix +++ b/pkgs/applications/audio/tambura/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A FAUST patch inspired by the Indian Tambura/Tanpura - a four string drone instrument, known for its unique rich harmonic timbre"; - homepage = https://github.com/olilarkin/Tambura; + homepage = "https://github.com/olilarkin/Tambura"; license = licenses.gpl2; maintainers = [ maintainers.magnetophon ]; }; diff --git a/pkgs/applications/audio/tetraproc/default.nix b/pkgs/applications/audio/tetraproc/default.nix index 40362fdd496..8780e54bb7c 100644 --- a/pkgs/applications/audio/tetraproc/default.nix +++ b/pkgs/applications/audio/tetraproc/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Converts the A-format signals from a tetrahedral Ambisonic microphone into B-format signals ready for recording"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/"; license = licenses.gpl2; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix index 3564f875c9b..8be43346bc0 100644 --- a/pkgs/applications/audio/timemachine/default.nix +++ b/pkgs/applications/audio/timemachine/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio recorder"; - homepage = http://plugin.org.uk/timemachine/; + homepage = "http://plugin.org.uk/timemachine/"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/applications/audio/tony/default.nix new file mode 100644 index 00000000000..011d8025364 --- /dev/null +++ b/pkgs/applications/audio/tony/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, pkgconfig, wrapQtAppsHook +, alsaLib, boost, bzip2, fftw, fftwFloat, libX11, libfishsound, libid3tag +, libjack2, liblo, libmad, libogg, liboggz, libpulseaudio, libsamplerate +, libsndfile, lrdf, opusfile, qtbase, qtsvg, rubberband, serd, sord +}: + +stdenv.mkDerivation rec { + name = "tony-2.1.1"; + + src = fetchurl { + url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${name}.tar.gz"; + sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp"; + }; + + nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; + + buildInputs = [ + alsaLib boost bzip2 fftw fftwFloat libX11 libfishsound libid3tag + libjack2 liblo libmad libogg liboggz libpulseaudio libsamplerate + libsndfile lrdf opusfile qtbase qtsvg rubberband serd sord + ]; + + # comment out the tests + preConfigure = '' + sed -i 's/sub_test_svcore_/#sub_test_svcore_/' tony.pro + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Pitch and note annotation of unaccompanied melody"; + homepage = "https://www.sonicvisualiser.org/tony/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/transcode/default.nix b/pkgs/applications/audio/transcode/default.nix index d7d5b65375e..c7ee3914f25 100644 --- a/pkgs/applications/audio/transcode/default.nix +++ b/pkgs/applications/audio/transcode/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Suite of command line utilities for transcoding video and audio codecs, and for converting between different container formats"; - homepage = http://www.transcoding.org/; + homepage = "http://www.transcoding.org/"; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix index 8eb846ac9c5..d9469fa4b7a 100644 --- a/pkgs/applications/audio/transcribe/default.nix +++ b/pkgs/applications/audio/transcribe/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { has many transcription-specific features not found on conventional music players. ''; - homepage = https://www.seventhstring.com/xscribe/; + homepage = "https://www.seventhstring.com/xscribe/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 9188003ce66..504e6ae9644 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { version = "0.49.6"; src = fetchurl { - url = "http://traverso-daw.org/traverso-0.49.6.tar.gz"; + url = "https://traverso-daw.org/traverso-0.49.6.tar.gz"; sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Cross-platform multitrack audio recording and audio editing suite"; - homepage = http://traverso-daw.org/; + homepage = "https://traverso-daw.org/"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.all; maintainers = with maintainers; [ coconnor ]; diff --git a/pkgs/applications/audio/tree-from-tags/Gemfile.lock b/pkgs/applications/audio/tree-from-tags/Gemfile.lock index 2ef77caa6f6..0ae90c1aebb 100644 --- a/pkgs/applications/audio/tree-from-tags/Gemfile.lock +++ b/pkgs/applications/audio/tree-from-tags/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES taglib-ruby BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/applications/audio/tree-from-tags/default.nix b/pkgs/applications/audio/tree-from-tags/default.nix index 521133cb08f..3b25b4218f1 100644 --- a/pkgs/applications/audio/tree-from-tags/default.nix +++ b/pkgs/applications/audio/tree-from-tags/default.nix @@ -30,7 +30,7 @@ EOF meta = with stdenv.lib; { description = "Create file hierarchies from media tags"; - homepage = https://www.emacswiki.org/emacs/Bongo; + homepage = "https://www.emacswiki.org/emacs/Bongo"; platforms = ruby.meta.platforms; maintainers = [ maintainers.livnev maintainers.dbrock ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix index 844eea11f51..9130461e4d7 100644 --- a/pkgs/applications/audio/uade123/default.nix +++ b/pkgs/applications/audio/uade123/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; - homepage = http://zakalwe.fi/uade/; + homepage = "http://zakalwe.fi/uade/"; license = licenses.gpl2; maintainers = [ stdenv.lib.maintainers.gnidorah ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/audio/vcv-rack/default.nix b/pkgs/applications/audio/vcv-rack/default.nix index 21aa27fa5bc..2aa09ec0be8 100644 --- a/pkgs/applications/audio/vcv-rack/default.nix +++ b/pkgs/applications/audio/vcv-rack/default.nix @@ -93,7 +93,7 @@ with stdenv.lib; stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source virtual modular synthesizer"; - homepage = https://vcvrack.com/; + homepage = "https://vcvrack.com/"; # The source is BSD-3 licensed, some of the art is CC-BY-NC 4.0 or under a # no-derivatives clause license = with licenses; [ bsd3 cc-by-nc-40 unfreeRedistributable ]; diff --git a/pkgs/applications/audio/vimpc/default.nix b/pkgs/applications/audio/vimpc/default.nix index 7f02ea9cefe..bcbfa6d3874 100644 --- a/pkgs/applications/audio/vimpc/default.nix +++ b/pkgs/applications/audio/vimpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vi/vim inspired client for the Music Player Daemon (mpd)"; - homepage = https://github.com/boysetsfrog/vimpc; + homepage = "https://github.com/boysetsfrog/vimpc"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/audio/vkeybd/default.nix b/pkgs/applications/audio/vkeybd/default.nix index 3f77a657472..0e8f12823d1 100644 --- a/pkgs/applications/audio/vkeybd/default.nix +++ b/pkgs/applications/audio/vkeybd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Virtual MIDI keyboard"; - homepage = https://www.alsa-project.org/~tiwai/alsa.html; + homepage = "https://www.alsa-project.org/~tiwai/alsa.html"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index c928962c983..6ef992ffff6 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -7,6 +7,7 @@ , pantheon , gtk3 , glib +, glib-networking , libxml2 , webkitgtk , clutter-gtk @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { pantheon.granite sqlite webkitgtk + glib-networking ]; passthru = { @@ -70,7 +72,7 @@ stdenv.mkDerivation rec { longDescription = '' Vocal is a powerful, fast, and intuitive application that helps users find new podcasts, manage their libraries, and enjoy the best that indepedent audio and video publishing has to offer. Vocal features full support for both episode downloading and streaming, native system integration, iTunes store search and top 100 charts (with international results support), iTunes link parsing, OPML importing and exporting, and so much more. Plus, it has great smart features like automatically keeping your library clean from old files, and the ability to set custom skip intervals. ''; - homepage = https://github.com/needle-and-thread/vocal; + homepage = "https://github.com/needle-and-thread/vocal"; license = licenses.gpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index 44d322069fc..2270e56e62a 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -10,7 +10,7 @@ in stdenv.mkDerivation { name = "vorbis-tools-1.4.0"; src = fetchurl { - url = http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz; + url = "http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.4.0.tar.gz"; sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { A set of command-line tools to manipulate Ogg Vorbis audio files, notably the `ogg123' player and the `oggenc' encoder. ''; - homepage = https://xiph.org/vorbis/; + homepage = "https://xiph.org/vorbis/"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/audio/waon/default.nix b/pkgs/applications/audio/waon/default.nix index b27fdbffb7d..bc05547e641 100644 --- a/pkgs/applications/audio/waon/default.nix +++ b/pkgs/applications/audio/waon/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Wave-to-Notes transcriber"; - homepage = https://kichiki.github.io/WaoN/; + homepage = "https://kichiki.github.io/WaoN/"; license = licenses.gpl2; maintainers = [ maintainers.puckipedia ]; platforms = platforms.all; diff --git a/pkgs/applications/audio/wavegain/default.nix b/pkgs/applications/audio/wavegain/default.nix index 5f56fb7297f..d9b13f53273 100644 --- a/pkgs/applications/audio/wavegain/default.nix +++ b/pkgs/applications/audio/wavegain/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "ReplayGain for wave files"; - homepage = https://github.com/MestreLion/wavegain; + homepage = "https://github.com/MestreLion/wavegain"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.robbinch ]; diff --git a/pkgs/applications/audio/whipper/default.nix b/pkgs/applications/audio/whipper/default.nix index ff278d4d7f2..5cbc9a07b6c 100644 --- a/pkgs/applications/audio/whipper/default.nix +++ b/pkgs/applications/audio/whipper/default.nix @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/whipper-team/whipper; + homepage = "https://github.com/whipper-team/whipper"; description = "A CD ripper aiming for accuracy over speed"; maintainers = with maintainers; [ rycee emily ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/wolf-shaper/default.nix b/pkgs/applications/audio/wolf-shaper/default.nix index 13bf1d674c7..7d42a3c4e7b 100644 --- a/pkgs/applications/audio/wolf-shaper/default.nix +++ b/pkgs/applications/audio/wolf-shaper/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://pdesaulniers.github.io/wolf-shaper/; + homepage = "https://pdesaulniers.github.io/wolf-shaper/"; description = "Waveshaper plugin with spline-based graph editor"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/x42-avldrums/default.nix b/pkgs/applications/audio/x42-avldrums/default.nix new file mode 100644 index 00000000000..fb05a50b4e5 --- /dev/null +++ b/pkgs/applications/audio/x42-avldrums/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cairo, glib, libGLU, lv2, pango }: + +stdenv.mkDerivation rec { + pname = "x42-avldrums"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "x42"; + repo = "avldrums.lv2"; + rev = "v${version}"; + sha256 = "1vwdp3d8qzd493qa99ddya7iql67bbfxmbcl8hk96lxif2lhmyws"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ cairo glib libGLU lv2 pango ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Drum sample player LV2 plugin dedicated to Glen MacArthur's AVLdrums"; + homepage = "https://x42-plugins.com/x42/x42-avldrums"; + maintainers = with maintainers; [ magnetophon orivej ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/x42-gmsynth/default.nix b/pkgs/applications/audio/x42-gmsynth/default.nix new file mode 100644 index 00000000000..7a96e3fd4f2 --- /dev/null +++ b/pkgs/applications/audio/x42-gmsynth/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, pkgconfig, glib, lv2 }: + +stdenv.mkDerivation rec { + pname = "x42-gmsynth"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "x42"; + repo = "gmsynth.lv2"; + rev = "v${version}"; + sha256 = "08dvdj8r17sfl6l18g2b8abgls2irkbrq5vhrfai01hp2m0rlm34"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ glib lv2 ]; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Chris Colins' General User soundfont player LV2 plugin"; + homepage = "https://x42-plugins.com/x42/x42-gmsynth"; + maintainers = with maintainers; [ orivej ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index f4087506daa..8ec53b0c66a 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of LV2 plugins by Robin Gareus"; - homepage = https://github.com/x42/x42-plugins; + homepage = "https://github.com/x42/x42-plugins"; maintainers = with maintainers; [ magnetophon ]; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index c8902f1dda4..68423197f3c 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; # taken from the debian yasr package meta = { - homepage = http://yasr.sourceforge.net; + 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; diff --git a/pkgs/applications/audio/ympd/default.nix b/pkgs/applications/audio/ympd/default.nix index 7976f747717..8f86d6e7ba9 100644 --- a/pkgs/applications/audio/ympd/default.nix +++ b/pkgs/applications/audio/ympd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake mpd_clientlib openssl ]; meta = { - homepage = https://www.ympd.org; + 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; diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 40691be1a0c..f8ea58fef3c 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ZynAddSubFX along with very good Jack and Alsa midi/audio functionality on Linux ''; - homepage = http://yoshimi.sourceforge.net; + homepage = "http://yoshimi.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index b9645fa4d8a..a34773513d9 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.zamaudio.com/?p=976; + homepage = "http://www.zamaudio.com/?p=976"; description = "A collection of LV2/LADSPA/VST/JACK audio plugins by ZamAudio"; license = licenses.gpl2Plus; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/applications/audio/zita-ajbridge/default.nix b/pkgs/applications/audio/zita-ajbridge/default.nix new file mode 100644 index 00000000000..6247d1d282a --- /dev/null +++ b/pkgs/applications/audio/zita-ajbridge/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, alsaLib, libjack2, zita-alsa-pcmi, zita-resampler }: + +stdenv.mkDerivation rec { + name = "zita-ajbridge-0.8.2"; + + src = fetchurl { + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "1gvk6g6w9rsiib89l0i9myl2cxxfzmcpbg9wdypq6b27l9s5k64j"; + }; + + buildInputs = [ alsaLib libjack2 zita-alsa-pcmi zita-resampler ]; + + preConfigure = '' + cd ./source/ + ''; + + makeFlags = [ + "PREFIX=$(out)" + "MANDIR=$(out)/share/man/man1" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Connect additional ALSA devices to JACK"; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/zita-at1/default.nix b/pkgs/applications/audio/zita-at1/default.nix new file mode 100644 index 00000000000..d357febd882 --- /dev/null +++ b/pkgs/applications/audio/zita-at1/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl +, cairo, fftwSinglePrec, libX11, libXft, libclthreads, libclxclient, libjack2 +, xorgproto, zita-resampler +}: + +stdenv.mkDerivation rec { + name = "zita-at1-0.6.2"; + + src = fetchurl { + url = "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2"; + sha256 = "0mxfn61zvhlq3r1mqipyqzjbanrfdkk8x4nxbz8nlbdk0bf3vfqr"; + }; + + buildInputs = [ + cairo fftwSinglePrec libX11 libXft libclthreads libclxclient libjack2 + xorgproto zita-resampler + ]; + + preConfigure = '' + cd ./source/ + ''; + + makeFlags = [ + "PREFIX=$(out)" + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Autotuner Jack application to correct the pitch of vocal tracks"; + homepage = "https://kokkinizita.linuxaudio.org/linuxaudio/index.html"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/zita-njbridge/default.nix b/pkgs/applications/audio/zita-njbridge/default.nix index 1ec6946cf38..3a293cfc026 100644 --- a/pkgs/applications/audio/zita-njbridge/default.nix +++ b/pkgs/applications/audio/zita-njbridge/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "command line Jack clients to transmit full quality multichannel audio over a local IP network"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/index.html"; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index e22bf9ed653..9a432f73d3f 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High quality software synthesizer"; - homepage = http://zynaddsubfx.sourceforge.net; + homepage = "http://zynaddsubfx.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.goibhniu maintainers.nico202 ]; diff --git a/pkgs/applications/backup/areca/default.nix b/pkgs/applications/backup/areca/default.nix index d02aa4b8444..b4d644430dd 100644 --- a/pkgs/applications/backup/areca/default.nix +++ b/pkgs/applications/backup/areca/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.areca-backup.org/; + homepage = "http://www.areca-backup.org/"; description = "An Open Source personal backup solution"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix new file mode 100644 index 00000000000..1a4d1832c7e --- /dev/null +++ b/pkgs/applications/backup/vorta/default.nix @@ -0,0 +1,42 @@ +{ buildPythonApplication, fetchFromGitHub, lib, paramiko, peewee, pyqt5 +, python-dateutil, APScheduler, psutil, qdarkstyle, secretstorage +, appdirs, setuptools, qt5 +}: + +buildPythonApplication rec { + pname = "vorta"; + version = "0.6.24"; + + src = fetchFromGitHub { + owner = "borgbase"; + repo = "vorta"; + rev = "v${version}"; + sha256 = "1xc4cng4npc7g739qd909a8wim6s6sn8h8bb1wpxzg4gcnfyin8z"; + }; + + postPatch = '' + sed -i -e '/setuptools_git/d' -e '/pytest-runner/d' setup.cfg + ''; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + propagatedBuildInputs = [ + paramiko peewee pyqt5 python-dateutil APScheduler psutil qdarkstyle + secretstorage appdirs setuptools + ]; + + # QT setup in tests broken. + doCheck = false; + + postFixup = '' + wrapQtApp $out/bin/vorta + ''; + + meta = with lib; { + license = licenses.gpl3; + homepage = "https://vorta.borgbase.com/"; + maintainers = with maintainers; [ ma27 ]; + description = "Desktop Backup Client for Borg"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/blockchains/aeon/default.nix b/pkgs/applications/blockchains/aeon/default.nix index db9e68ae905..5e0c25466eb 100644 --- a/pkgs/applications/blockchains/aeon/default.nix +++ b/pkgs/applications/blockchains/aeon/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Private, secure, untraceable currency"; - homepage = http://www.aeon.cash/; + homepage = "http://www.aeon.cash/"; license = licenses.bsd3; maintainers = [ maintainers.aij ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 1fb4078696b..afc5b40f9db 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.1"; + version = "0.21.3"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1aswgmzqk3vhxhp5k0m0awk22lf5ayaqg2cmlqy12jvfmpka9lrj"; + sha256 = "1pzdgghbsss2qjfgl42lvkbs5yc5q6jnzqnp24lljmrh341g2zn4"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index ddce5c3f715..01c1264567c 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { will continue to release updates that are in line with Satoshi’s whitepaper & vision, and are agreed upon by the community. ''; - homepage = https://bitcoinclassic.com/; + homepage = "https://bitcoinclassic.com/"; maintainers = with maintainers; [ jefdaj ]; license = licenses.mit; broken = stdenv.isDarwin; diff --git a/pkgs/applications/blockchains/bitcoin-unlimited.nix b/pkgs/applications/blockchains/bitcoin-unlimited.nix index c0d51e66db3..f755efaa0e1 100644 --- a/pkgs/applications/blockchains/bitcoin-unlimited.nix +++ b/pkgs/applications/blockchains/bitcoin-unlimited.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { support Bitcoin conflict resolution as originally envisioned by its founder - consider running a Bitcoin Unlimited client. ''; - homepage = https://www.bitcoinunlimited.info/; + homepage = "https://www.bitcoinunlimited.info/"; maintainers = with maintainers; [ DmitryTsygankov ]; license = licenses.mit; broken = stdenv.isDarwin; diff --git a/pkgs/applications/blockchains/bitcoin.nix b/pkgs/applications/blockchains/bitcoin.nix index c1143f898e2..15094a1eee4 100644 --- a/pkgs/applications/blockchains/bitcoin.nix +++ b/pkgs/applications/blockchains/bitcoin.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { parties. Users hold the crypto keys to their own money and transact directly with each other, with the help of a P2P network to check for double-spending. ''; - homepage = http://www.bitcoin.org/; + homepage = "http://www.bitcoin.org/"; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 0add60cc19e..61765913464 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Bitcoin, enabling secure and instant transfer of funds between any two parties for any amount. ''; - homepage = https://github.com/ElementsProject/lightning; + homepage = "https://github.com/ElementsProject/lightning"; maintainers = with maintainers; [ jb55 ]; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/blockchains/cryptop/default.nix b/pkgs/applications/blockchains/cryptop/default.nix index 01c47b320de..f0bcda57930 100644 --- a/pkgs/applications/blockchains/cryptop/default.nix +++ b/pkgs/applications/blockchains/cryptop/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { doCheck = false; meta = { - homepage = https://github.com/huwwp/cryptop; + homepage = "https://github.com/huwwp/cryptop"; description = "Command line Cryptocurrency Portfolio"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ bhipple ]; diff --git a/pkgs/applications/blockchains/dashpay.nix b/pkgs/applications/blockchains/dashpay.nix index 03dcd6cb54e..d0c3fed4350 100644 --- a/pkgs/applications/blockchains/dashpay.nix +++ b/pkgs/applications/blockchains/dashpay.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { with instant transactions. It allows you to keep your finances private as you make transactions without waits, similar to cash. ''; - homepage = https://www.dash.org; + homepage = "https://www.dash.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/blockchains/dogecoin.nix b/pkgs/applications/blockchains/dogecoin.nix index 02744e50647..b1ebebdd213 100644 --- a/pkgs/applications/blockchains/dogecoin.nix +++ b/pkgs/applications/blockchains/dogecoin.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { internet currency." It is named after a famous Internet meme, the "Doge" - a Shiba Inu dog. ''; - homepage = http://www.dogecoin.com/; + homepage = "http://www.dogecoin.com/"; license = licenses.mit; maintainers = with maintainers; [ edwtjo offline AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/blockchains/freicoin.nix b/pkgs/applications/blockchains/freicoin.nix index 6cf84f76f91..cc28fff96c4 100644 --- a/pkgs/applications/blockchains/freicoin.nix +++ b/pkgs/applications/blockchains/freicoin.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Peer-to-peer currency with demurrage fee"; - homepage = http://freicoi.in/; + homepage = "http://freicoi.in/"; license = licenses.mit; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 80e17cf1138..980b485b956 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -1,17 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit, CoreServices }: +{ stdenv, buildGoModule, fetchFromGitHub, libobjc, IOKit }: buildGoModule rec { pname = "go-ethereum"; - version = "1.9.11"; + version = "1.9.12"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "0xhkdxn5ajzi05252is5whqank81xy94jp1l5z2a44rajv8rh9vs"; + sha256 = "143imiphyzk3009cfnqj7q013pb1wva13zq63byfj3d204b58cg6"; }; - modSha256 = "0jcj0knkhyndndyv1j9xhgbg5psagvyd27ailna3x9ikjlb8f7gg"; + modSha256 = "15a8if5gx361nrqgv201jy8saq1ir1g18rpqzdmavg4ic75si5x1"; subPackages = [ "cmd/abigen" @@ -30,8 +30,6 @@ buildGoModule rec { "cmd/wnode" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc IOKit ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 64562fc445a..edc68f9d0c7 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "1.20.0"; + version = "2.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "09mgd5nsd65w4irgzgmfz1k0r1k4fgkq490pkil8nqy6akjrsw1z"; + sha256 = "1ywvdqmq8asczhmvc6ai2v6di1f5q19x3ygqlinwz8d1hrj3496r"; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/blockchains/litecoin.nix b/pkgs/applications/blockchains/litecoin.nix index 47077266541..ec1658b595d 100644 --- a/pkgs/applications/blockchains/litecoin.nix +++ b/pkgs/applications/blockchains/litecoin.nix @@ -46,7 +46,7 @@ mkDerivation rec { the regular computers and GPUs most people already have. The Litecoin network is scheduled to produce 84 million currency units. ''; - homepage = https://litecoin.org/; + homepage = "https://litecoin.org/"; platforms = platforms.unix; license = licenses.mit; broken = stdenv.isDarwin; diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index 4be19beedc3..dd45746c8df 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "lnd"; @@ -13,12 +13,10 @@ buildGoModule rec { modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Lightning Network Daemon"; homepage = "https://github.com/lightningnetwork/lnd"; - license = licenses.mit; + license = lib.licenses.mit; maintainers = with maintainers; [ cypherpunk2140 ]; }; } diff --git a/pkgs/applications/blockchains/mist.nix b/pkgs/applications/blockchains/mist.nix index 2990b44c7f4..9dd564d715c 100644 --- a/pkgs/applications/blockchains/mist.nix +++ b/pkgs/applications/blockchains/mist.nix @@ -8,7 +8,7 @@ let meta = with stdenv.lib; { description = "Browse and use Ðapps on the Ethereum network"; - homepage = https://github.com/ethereum/mist; + homepage = "https://github.com/ethereum/mist"; license = licenses.gpl3; maintainers = with maintainers; []; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 980e20d04b7..48a6d81b6ba 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "Private, secure, untraceable currency"; - homepage = https://getmonero.org/; + homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; badPlatforms = platforms.darwin; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index c942197006c..2a04beb9379 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Private, secure, untraceable currency"; - homepage = https://getmonero.org/; + homepage = "https://getmonero.org/"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ ehmry rnhmjoj ]; diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix index 7d9fdb06d18..664e2674062 100644 --- a/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/pkgs/applications/blockchains/nano-wallet/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = "Wallet for Nano cryptocurrency"; - homepage = https://nano.org/en/wallet/; + homepage = "https://nano.org/en/wallet/"; license = lib.licenses.bsd2; # Fails on Darwin. See: # https://github.com/NixOS/nixpkgs/pull/39295#issuecomment-386800962 diff --git a/pkgs/applications/blockchains/parity-ui/default.nix b/pkgs/applications/blockchains/parity-ui/default.nix index 0615aed2ca0..b18c121607a 100644 --- a/pkgs/applications/blockchains/parity-ui/default.nix +++ b/pkgs/applications/blockchains/parity-ui/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UI for Parity. Fast, light, robust Ethereum implementation"; - homepage = http://parity.io; + homepage = "http://parity.io"; license = licenses.gpl3; maintainers = [ maintainers.sorpaas ]; platforms = platforms.linux; diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index 613d57cd9c8..5cb94b8bd54 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { An open source, decentralized privacy platform built for global person to person eCommerce. RPC daemon and CLI client only. ''; - homepage = https://particl.io/; + homepage = "https://particl.io/"; maintainers = with maintainers; [ demyanrogozhin ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/blockchains/pivx.nix b/pkgs/applications/blockchains/pivx.nix index af8085232e9..600e462b390 100644 --- a/pkgs/applications/blockchains/pivx.nix +++ b/pkgs/applications/blockchains/pivx.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { Zero Knowledge cryptography proofs for industry-leading transaction anonymity. ''; license = licenses.mit; - homepage = https://www.dash.org; + homepage = "https://www.dash.org"; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.unix; # TODO diff --git a/pkgs/applications/blockchains/stellar-core.nix b/pkgs/applications/blockchains/stellar-core.nix index 4c3f9fe0760..6bb717a0344 100644 --- a/pkgs/applications/blockchains/stellar-core.nix +++ b/pkgs/applications/blockchains/stellar-core.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation { instances of stellar-core on the network. Optionally, stellar-core can store historical records of the ledger and participate in consensus. ''; - homepage = https://www.stellar.org/; + homepage = "https://www.stellar.org/"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ chris-martin ]; license = licenses.asl20; diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix index eb813a36125..1094d7f0f7b 100644 --- a/pkgs/applications/blockchains/wownero.nix +++ b/pkgs/applications/blockchains/wownero.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { signatures using different participants for the same tx outputs on opposing forks. ''; - homepage = https://wownero.org/; + homepage = "https://wownero.org/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ fuwa ]; 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 3128f125cd9..488ef4cfedd 100644 --- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "lightdm-enso-os-greeter"; src = fetchgit { - url = https://github.com/nick92/Enso-OS; + url = "https://github.com/nick92/Enso-OS"; rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; sha256 = "11jm181jq1vbn83h235avpdxz7pqq6prqyzki5yryy53mkj4kgxz"; }; @@ -60,7 +60,7 @@ stdenv.mkDerivation { A fork of pantheon greeter that positions elements in a central and vertigal manner and adds a blur effect to the background ''; - homepage = https://github.com/nick92/Enso-OS; + homepage = "https://github.com/nick92/Enso-OS"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ diff --git a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix index b5b26d7cc43..9068e12adba 100644 --- a/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-mini-greeter/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A minimal, configurable, single-user GTK3 LightDM greeter"; - homepage = https://github.com/prikhi/lightdm-mini-greeter; + homepage = "https://github.com/prikhi/lightdm-mini-greeter"; license = licenses.gpl3; maintainers = with maintainers; [ mnacamura prikhi ]; platforms = platforms.linux; diff --git a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix index 323df736936..7e37d134874 100644 --- a/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-tiny-greeter/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiny multi user lightdm greeter"; - homepage = https://github.com/off-world/lightdm-tiny-greeter; + homepage = "https://github.com/off-world/lightdm-tiny-greeter"; license = licenses.bsd3; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index c251af74b21..1a65ebd3357 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/CanonicalLtd/lightdm; + homepage = "https://github.com/CanonicalLtd/lightdm"; description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix index be586bdac9b..ab7dd90801c 100644 --- a/pkgs/applications/display-managers/lightdm/gtk-greeter.nix +++ b/pkgs/applications/display-managers/lightdm/gtk-greeter.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { }]; meta = with stdenv.lib; { - homepage = https://launchpad.net/lightdm-gtk-greeter; + homepage = "https://launchpad.net/lightdm-gtk-greeter"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ ocharles ]; diff --git a/pkgs/applications/display-managers/ly/default.nix b/pkgs/applications/display-managers/ly/default.nix index 2f0a770bc71..f16dd62bb1a 100644 --- a/pkgs/applications/display-managers/ly/default.nix +++ b/pkgs/applications/display-managers/ly/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "TUI display manager"; license = licenses.wtfpl; - homepage = https://github.com/cylgom/ly; + homepage = "https://github.com/cylgom/ly"; maintainers = [ maintainers.spacekookie ]; }; } diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 735e83a0842..3ebeaa6262b 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -60,7 +60,7 @@ in mkDerivation { meta = with lib; { description = "QML based X11 display manager"; - homepage = https://github.com/sddm/sddm; + homepage = "https://github.com/sddm/sddm"; maintainers = with maintainers; [ abbradar ttuegel ]; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/editors/aewan/default.nix b/pkgs/applications/editors/aewan/default.nix index 1bd73bebe03..56a144bdfb8 100644 --- a/pkgs/applications/editors/aewan/default.nix +++ b/pkgs/applications/editors/aewan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Ascii-art Editor Without A Name"; - homepage = http://aewan.sourceforge.net/; + homepage = "http://aewan.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/amp/default.nix b/pkgs/applications/editors/amp/default.nix index 625a5d3c0ab..9be6d56ab34 100644 --- a/pkgs/applications/editors/amp/default.nix +++ b/pkgs/applications/editors/amp/default.nix @@ -14,8 +14,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "09v991rl2w4c4jh7ga7q1lk6wyl2vr71j5cpniij8mcvszrz78qf"; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ openssl python3 xorg.libxcb libgit2 ] ++ stdenv.lib.optionals stdenv.isDarwin + nativeBuildInputs = [ cmake pkgconfig python3 ]; + buildInputs = [ openssl xorg.libxcb libgit2 ] ++ stdenv.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 bd1685f7cdb..8df24137e58 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -185,8 +185,8 @@ in runCommand IntelliJ IDEA. ''; homepage = if channel == "stable" - then https://developer.android.com/studio/index.html - else https://developer.android.com/studio/preview/index.html; + then "https://developer.android.com/studio/index.html" + else "https://developer.android.com/studio/preview/index.html"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 9a476ada214..1134b67a24a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,14 +8,14 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.6.1.0"; # "Android Studio 3.6.1" - build = "192.6241897"; - sha256Hash = "1mwzk18224bl8hbw9cdxwzgj5cfain4y70q64cpj4p0snffxqm77"; + version = "3.6.2.0"; # "Android Studio 3.6.2" + build = "192.6308749"; + sha256Hash = "04r4iwlmns1lf3wfd32cqmndbdz9rf7hfbi5r6qmvpi8j83fghvr"; }; betaVersion = { - version = "4.0.0.12"; # "Android Studio 4.0 Beta 3" - build = "193.6296804"; - sha256Hash = "072rvh20xkn7izh6f2r2bspy06jrvcibj2hc12hz76m8cwzf4v0m"; + version = "4.0.0.13"; # "Android Studio 4.0 Beta 4" + build = "193.6348893"; + sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2"; }; latestVersion = { # canary & dev version = "4.1.0.4"; # "Android Studio 4.1 Canary 4" diff --git a/pkgs/applications/editors/uberwriter/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 48ebc79e705..623f86a61c2 100644 --- a/pkgs/applications/editors/uberwriter/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, cmake +{ stdenv, fetchFromGitLab, meson, ninja, cmake , wrapGAppsHook, pkgconfig, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection , gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive @@ -10,14 +10,15 @@ let texliveDist = texlive.combined.scheme-medium; in stdenv.mkDerivation rec { - pname = "uberwriter"; - version = "unstable-2020-01-24"; + pname = "apostrophe"; + version = "unstable-2020-03-29"; - src = fetchFromGitHub { - owner = pname; + src = fetchFromGitLab { + owner = "somas"; repo = pname; - rev = "0647b413407eb8789a25c353602c4ac979dc342a"; - sha256 = "19z52fpbf0p7dzx7q0r5pk3nn0c8z69g1hv6db0cqp61cqv5z95q"; + domain = "gitlab.gnome.org"; + rev = "219fa8976e3b8a6f0cea15cfefe4e336423f2bdb"; + sha256 = "192n5qs3x6rx62mqxd6wajwm453pns8kjyz5v3xc891an6bm1kqx"; }; nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils @@ -30,10 +31,10 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs --build build-aux/meson_post_install.py - substituteInPlace uberwriter/config.py --replace "/usr/share/uberwriter" "$out/share/uberwriter" + substituteInPlace ${pname}/config.py --replace "/usr/share/${pname}" "$out/share/${pname}" # get rid of unused distributed dependencies - rm -r uberwriter/{pylocales,pressagio} + rm -r ${pname}/pylocales ''; preFixup = '' @@ -46,7 +47,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://uberwriter.github.io/uberwriter/; + homepage = "https://gitlab.gnome.org/somas/apostrophe"; description = "A distraction free Markdown editor for GNU/Linux"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/editors/aseprite/default.nix b/pkgs/applications/editors/aseprite/default.nix index 6e6d7db8177..4ba8932fec2 100644 --- a/pkgs/applications/editors/aseprite/default.nix +++ b/pkgs/applications/editors/aseprite/default.nix @@ -98,8 +98,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { inherit skia; }; + meta = with lib; { - homepage = https://www.aseprite.org/; + homepage = "https://www.aseprite.org/"; description = "Animated sprite editor & pixel art tool"; license = if unfree then licenses.unfree else licenses.gpl2; longDescription = diff --git a/pkgs/applications/editors/aseprite/skia.nix b/pkgs/applications/editors/aseprite/skia.nix index c89ebd4ad0c..141d51bed0f 100644 --- a/pkgs/applications/editors/aseprite/skia.nix +++ b/pkgs/applications/editors/aseprite/skia.nix @@ -6,6 +6,14 @@ let # skia-deps.nix is generated by: ./skia-make-deps.sh 'angle2|dng_sdk|piex|sfntly' depSrcs = import ./skia-deps.nix { inherit fetchgit; }; + gnOld = gn.overrideAttrs (oldAttrs: rec { + version = "20190403"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; + sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy"; + }; + }); in stdenv.mkDerivation { name = "skia-aseprite-m71"; @@ -14,11 +22,11 @@ stdenv.mkDerivation { owner = "aseprite"; repo = "skia"; # latest commit from aseprite-m71 branch - rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; + rev = "89e4ca4352d05adc892f5983b108433f29b2c0c2"; # TODO: Remove the gnOld override sha256 = "0n3vrkswvi6rib9zv2pzi18h3j5wm7flmgkgaikcm6q7iw4l2c7x"; }; - nativeBuildInputs = [ python2 gn ninja ]; + nativeBuildInputs = [ python2 gnOld ninja ]; buildInputs = [ fontconfig expat icu58 libglvnd libjpeg libpng libwebp zlib diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 0a7e362e75a..fbe08dbfe7b 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -74,7 +74,7 @@ let meta = with stdenv.lib; { description = "A hackable text editor for the 21st Century"; - homepage = https://atom.io/; + homepage = "https://atom.io/"; license = licenses.mit; maintainers = with maintainers; [ offline nequissimus ysndr ]; platforms = platforms.x86_64; diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index f78f7fbf914..ff1daef8b80 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful editor targeted towards programmers and webdevelopers"; - homepage = http://bluefish.openoffice.nl/; + homepage = "http://bluefish.openoffice.nl/"; license = licenses.gpl3Plus; maintainers = [maintainers.vbgl]; platforms = platforms.all; diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 439b721632d..3e01bcdb0f9 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source code editor for the web, written in JavaScript, HTML and CSS"; - homepage = http://brackets.io/; + homepage = "http://brackets.io/"; license = licenses.mit; maintainers = [ maintainers.matejc ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/editors/bvi/default.nix b/pkgs/applications/editors/bvi/default.nix index 2e79b80d610..8a61e0252bc 100644 --- a/pkgs/applications/editors/bvi/default.nix +++ b/pkgs/applications/editors/bvi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hex editor with vim style keybindings"; - homepage = http://bvi.sourceforge.net/download.html; + homepage = "http://bvi.sourceforge.net/download.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix index 5fab7fe9da6..2cf094c091a 100644 --- a/pkgs/applications/editors/bviplus/default.nix +++ b/pkgs/applications/editors/bviplus/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ncurses based hex editor with a vim-like interface"; - homepage = http://bviplus.sourceforge.net; + homepage = "http://bviplus.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index cbed08f317f..4e2ac8a50f1 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { It is designed to be very extensible and fully configurable. Finally, an IDE with all the features you need, having a consistent look, feel and operation across platforms. ''; - homepage = http://www.codeblocks.org; + homepage = "http://www.codeblocks.org"; license = licenses.gpl3; }; } diff --git a/pkgs/applications/editors/dhex/default.nix b/pkgs/applications/editors/dhex/default.nix index efb3a2f9ffa..0a635b7ba82 100644 --- a/pkgs/applications/editors/dhex/default.nix +++ b/pkgs/applications/editors/dhex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A themeable hex editor with diff mode"; - homepage = http://www.dettus.net/dhex/; + homepage = "http://www.dettus.net/dhex/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/editors/dit/default.nix b/pkgs/applications/editors/dit/default.nix index 2f83b0b8d99..f973e67599c 100644 --- a/pkgs/applications/editors/dit/default.nix +++ b/pkgs/applications/editors/dit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dit"; - version = "0.5"; + version = "0.6"; src = fetchurl { url = "https://hisham.hm/dit/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "05vhr1gl3bb5fg49v84xhmjaqdjw6djampvylw10ydvbpnpvjvjc"; + sha256 = "0ryvm54xxkg2gcgz4r8zdxrl6j2h8mgg9nfqmdmdr31qkcj8wjsq"; }; buildInputs = [ ncurses lua ] @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console text editor for Unix that you already know how to use"; - homepage = https://hisham.hm/dit/; + homepage = "https://hisham.hm/dit/"; license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ davidak ]; diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 6ae9eb078e2..f8cbac06b0d 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://www.eclipse.org/; + homepage = "http://www.eclipse.org/"; inherit description; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 345f7eae9fc..d3113b819f7 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -69,12 +69,12 @@ in rec { src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { # tested - url = https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86_64.tar.gz; + url = "https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86_64.tar.gz"; sha256 = "4c2d1ac68384e12a11a851cf0fc7757aea087eba69329b21d539382a65340d27"; } else fetchurl { # untested - url = https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86.tar.gz; + url = "https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86.tar.gz"; sha256 = "35383cb09567187e14a30c15de9fd9aa0eef99e4bbb342396ce3acd11fb5cbac"; }; }; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index a60b1a2ae51..fab7317868a 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -106,7 +106,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/tobiasmelcher/EclipseAceJump; + homepage = "https://github.com/tobiasmelcher/EclipseAceJump"; description = "Provides fast jumps to text based on initial letter"; license = licenses.mit; platforms = platforms.all; @@ -153,7 +153,7 @@ rec { meta = with stdenv.lib; { description = "A powerful parser generator for processing structured text or binary files"; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.rycee ]; @@ -176,7 +176,7 @@ rec { meta = with stdenv.lib; { description = "A powerful parser generator for processing structured text or binary files"; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.rycee ]; @@ -198,7 +198,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://andrei.gmxhome.de/anyedit/; + homepage = "http://andrei.gmxhome.de/anyedit/"; description = "Adds new tools to the context menu of text-based editors"; license = licenses.epl10; platforms = platforms.all; @@ -221,7 +221,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/cypher256/eclipse-encoding-plugin; + homepage = "https://github.com/cypher256/eclipse-encoding-plugin"; description = "Show file encoding and line ending for the active editor in the eclipse status bar"; license = licenses.epl10; platforms = platforms.all; @@ -244,7 +244,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://andrei.gmxhome.de/bytecode/; + homepage = "http://andrei.gmxhome.de/bytecode/"; description = "Shows disassembled bytecode of current java editor or class file"; license = licenses.bsd2; platforms = platforms.all; @@ -263,7 +263,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://eclipse.org/cdt/; + homepage = "https://eclipse.org/cdt/"; description = "C/C++ development tooling"; license = licenses.epl10; platforms = platforms.all; @@ -282,7 +282,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://eclipse-cs.sourceforge.net/; + homepage = "https://eclipse-cs.sourceforge.net/"; description = "Checkstyle integration into the Eclipse IDE"; license = licenses.lgpl21; platforms = platforms.all; @@ -306,7 +306,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://eclipsecolorthemes.org/; + homepage = "http://eclipsecolorthemes.org/"; description = "Plugin to switch color themes conveniently and without side effects"; license = licenses.epl10; platforms = platforms.all; @@ -339,7 +339,7 @@ rec { propagatedBuildInputs = [ zest ]; meta = with stdenv.lib; { - homepage = http://www2.cs.tum.edu/projects/cup/eclipse.php; + homepage = "http://www2.cs.tum.edu/projects/cup/eclipse.php"; description = "IDE for developing CUP based parsers"; platforms = platforms.all; maintainers = [ maintainers.romildo ]; @@ -367,7 +367,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://www.drools.org/; + homepage = "https://www.drools.org/"; description = "Drools is a Business Rules Management System (BRMS) solution"; license = licenses.asl20; }; @@ -384,7 +384,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://www.eclemma.org/; + homepage = "https://www.eclemma.org/"; description = "EclEmma is a free Java code coverage tool for Eclipse"; license = licenses.epl10; platforms = platforms.all; @@ -407,7 +407,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://findbugs.sourceforge.net/; + homepage = "http://findbugs.sourceforge.net/"; description = "Plugin that uses static analysis to look for bugs in Java code"; license = licenses.epl10; platforms = platforms.all; @@ -426,7 +426,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://gnuarmeclipse.livius.net/; + homepage = "http://gnuarmeclipse.livius.net/"; description = "GNU ARM Eclipse Plug-ins"; license = licenses.epl10; platforms = platforms.all; @@ -465,7 +465,7 @@ rec { meta = with stdenv.lib; { description = "Adds support for JSON files to Eclipse"; - homepage = https://github.com/boothen/Json-Eclipse-Plugin; + homepage = "https://github.com/boothen/Json-Eclipse-Plugin"; license = licenses.epl10; platforms = platforms.all; maintainers = [ maintainers.rycee ]; @@ -483,7 +483,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://www.eclipse.org/jdt/; + homepage = "https://www.eclipse.org/jdt/"; description = "Eclipse Java development tools"; license = licenses.epl10; platforms = platforms.all; @@ -506,7 +506,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/angelozerr/jdt-codemining; + homepage = "https://github.com/angelozerr/jdt-codemining"; description = "Provides JDT Java CodeMining"; license = licenses.epl10; platforms = platforms.all; @@ -532,7 +532,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/RustDT; + homepage = "https://github.com/RustDT"; description = "Rust development tooling"; license = licenses.epl10; platforms = platforms.all; @@ -549,7 +549,7 @@ rec { }; meta = with stdenv.lib; { - homepage = http://scala-ide.org/; + homepage = "http://scala-ide.org/"; description = "The Scala IDE for Eclipse"; license = licenses.bsd3; platforms = platforms.all; @@ -568,7 +568,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://spotbugs.github.io/; + homepage = "https://spotbugs.github.io/"; description = "Plugin that uses static analysis to look for bugs in Java code"; license = licenses.lgpl21; platforms = platforms.all; @@ -591,7 +591,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://testng.org/doc/; + homepage = "https://testng.org/doc/"; description = "Eclipse plugin for the TestNG testing framework"; license = licenses.asl20; platforms = platforms.all; @@ -636,7 +636,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://github.com/oyse/yedit; + homepage = "https://github.com/oyse/yedit"; description = "A YAML editor plugin for Eclipse"; license = licenses.epl10; platforms = platforms.all; @@ -654,7 +654,7 @@ rec { }; meta = with stdenv.lib; { - homepage = https://www.eclipse.org/gef/zest/; + homepage = "https://www.eclipse.org/gef/zest/"; description = "The Eclipse Visualization Toolkit"; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/editors/edit/default.nix b/pkgs/applications/editors/edit/default.nix index 27c13c0cb39..05220600261 100644 --- a/pkgs/applications/editors/edit/default.nix +++ b/pkgs/applications/editors/edit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "20160425"; src = fetchgit { - url = git://c9x.me/ed.git; + url = "git://c9x.me/ed.git"; rev = "323d49b68c5e804ed3b8cada0e2274f1589b3484"; sha256 = "0wv8i3ii7cd9bqhjpahwp2g5fcmyk365nc7ncmvl79cxbz3f7y8v"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A relaxing mix of Vi and ACME"; - homepage = http://c9x.me/edit; + homepage = "http://c9x.me/edit"; license = licenses.publicDomain; maintainers = [ maintainers.vrthra ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/elvis/default.nix b/pkgs/applications/editors/elvis/default.nix index 4b7e4c8a3ca..3a6c8c97b22 100644 --- a/pkgs/applications/editors/elvis/default.nix +++ b/pkgs/applications/editors/elvis/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { configureFlags = [ "--ioctl=termios" ]; meta = { - homepage = http://elvis.vi-editor.org/; + homepage = "http://elvis.vi-editor.org/"; description = "A vi clone for Unix and other operating systems"; license = stdenv.lib.licenses.free; }; diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix index 5fbe095c4f3..45f20fccad9 100644 --- a/pkgs/applications/editors/emacs-modes/cedet/default.nix +++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://cedet.sourceforge.net/; + homepage = "http://cedet.sourceforge.net/"; # Fails with `semantic-idle.el:42:1:Error: Invalid function: class-p` broken = true; diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix index 33f2ad79ea0..ba54e5f4341 100644 --- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Precision colors for machines and people"; - homepage = http://ethanschoonover.com/solarized; + homepage = "http://ethanschoonover.com/solarized"; maintainers = [ maintainers.samuelrivas ]; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index aa0f625124f..9ae07c1c900 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -1070,10 +1070,10 @@ elpaBuild { pname = "elisp-benchmarks"; ename = "elisp-benchmarks"; - version = "1.3"; + version = "1.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.3.tar"; - sha256 = "05a891mwbz50q3a44irbf2w4wlp5dm2yxwcvxqrckvpjm1amndmf"; + url = "https://elpa.gnu.org/packages/elisp-benchmarks-1.4.tar"; + sha256 = "18ia04aq4pqa8374x60g3g66jqmm17c6n904naa0jhqphlgam8pb"; }; packageRequires = []; meta = { @@ -1572,7 +1572,7 @@ license = lib.licenses.free; }; }) {}; - ioccur = callPackage ({ elpaBuild, fetchurl, lib }: + ioccur = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ioccur"; ename = "ioccur"; @@ -1581,7 +1581,7 @@ url = "https://elpa.gnu.org/packages/ioccur-2.4.el"; sha256 = "1isid3kgsi5qkz27ipvmp9v5knx0qigmv7lz12mqdkwv8alns1p9"; }; - packageRequires = []; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://elpa.gnu.org/packages/ioccur.html"; license = lib.licenses.free; @@ -2215,10 +2215,10 @@ elpaBuild { pname = "oauth2"; ename = "oauth2"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/oauth2-0.11.el"; - sha256 = "0ydkc9jazsnbbvfhd47mql52y7k06n3z7r0naqxkwb99j9blqsmp"; + url = "https://elpa.gnu.org/packages/oauth2-0.12.el"; + sha256 = "1rfyfy0h7shr3fmd8lh6s2i3ahfh28wb5fqiqlsjwspn5h77ll29"; }; packageRequires = []; meta = { @@ -3056,10 +3056,10 @@ elpaBuild { pname = "sql-indent"; ename = "sql-indent"; - version = "1.4"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-indent-1.4.tar"; - sha256 = "1nilxfm30nb2la1463729rgbgbma7igkf0z325k8cbapqanb1wgl"; + url = "https://elpa.gnu.org/packages/sql-indent-1.5.tar"; + sha256 = "07k5rn9hbxppnka7nq0a3a6zyqqa1hp8j6qrb344js6zyak0cb63"; }; packageRequires = [ cl-lib ]; meta = { @@ -3225,10 +3225,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.4.3.2"; + version = "2.4.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.4.3.2.tar"; - sha256 = "17kay6rpkgz79jggzj53awkbqfsp5sq93wpssw5vlwnigd4mrkzx"; + url = "https://elpa.gnu.org/packages/tramp-2.4.3.3.tar"; + sha256 = "1di9ia59k6x7j9r8flwf05r160j30nrg0jvq5fjc9iazag9lniyw"; }; packageRequires = [ emacs ]; meta = { 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 077e72f5576..5beaed58240 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 @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Popup descriptions of R objects"; - homepage = https://github.com/myuhe/ess-R-object-popup.el; + homepage = "https://github.com/myuhe/ess-R-object-popup.el"; platforms = stdenv.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 c6e1c5a50f4..00879463276 100644 --- a/pkgs/applications/editors/emacs-modes/helm-words/default.nix +++ b/pkgs/applications/editors/emacs-modes/helm-words/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Emacs major mode for jade and stylus"; - homepage = https://github.com/brianc/helm-words; + homepage = "https://github.com/brianc/helm-words"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/hol_light/default.nix b/pkgs/applications/editors/emacs-modes/hol_light/default.nix index 255b30d60ed..34b74374b23 100644 --- a/pkgs/applications/editors/emacs-modes/hol_light/default.nix +++ b/pkgs/applications/editors/emacs-modes/hol_light/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "73"; src = fetchsvn { - url = http://seanmcl-ocaml-lib.googlecode.com/svn/trunk/workshop/software/emacs; + url = "http://seanmcl-ocaml-lib.googlecode.com/svn/trunk/workshop/software/emacs"; rev = version; sha256 = "3ca83098960439da149a47e1caff32536601559a77f04822be742a390c67feb7"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A HOL Light mode for Emacs"; - homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/; + homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/editors/emacs-modes/hsc3/default.nix b/pkgs/applications/editors/emacs-modes/hsc3/default.nix index 75b72516a3c..6c2db85d794 100644 --- a/pkgs/applications/editors/emacs-modes/hsc3/default.nix +++ b/pkgs/applications/editors/emacs-modes/hsc3/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { pname = "hsc3-mode"; inherit version; src = fetchurl { - url = mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz; + url = "mirror://hackage/hsc3-0.15/hsc3-0.15.tar.gz"; sha256 = "2f3b15655419cf8ebe25ab1c6ec22993b2589b4ffca7c3a75ce478ca78a0bde6"; }; @@ -21,7 +21,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://rd.slavepianos.org/?t=hsc3; + homepage = "http://rd.slavepianos.org/?t=hsc3"; description = "hsc3 mode package for Emacs"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix index 27dcd1063bf..94634292228 100644 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ b/pkgs/applications/editors/emacs-modes/icicles/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/"; meta = { - homepage = https://www.emacswiki.org/emacs/Icicles; + homepage = "https://www.emacswiki.org/emacs/Icicles"; description = "Enhance Emacs minibuffer input with cycling and powerful completion"; license = stdenv.lib.licenses.gpl2Plus; platforms = emacs.meta.platforms; diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index c3c21b40a65..f04319f23de 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -52,6 +52,19 @@ }; }; + agda-input = self.trivialBuild { + pname = "agda-input"; + + inherit (external.Agda) src version; + + postUnpack = "mv $sourceRoot/src/data/emacs-mode/agda-input.el $sourceRoot"; + + meta = { + description = "Standalone package providing the agda-input method without building Agda."; + inherit (external.Agda.meta) homepage license; + }; + }; + ess-R-object-popup = callPackage ./ess-R-object-popup { }; diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix index becc2dc5dc9..4240263dd0b 100644 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ b/pkgs/applications/editors/emacs-modes/ocaml/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://caml.inria.fr; + homepage = "http://caml.inria.fr"; description = "OCaml mode package for Emacs"; platforms = stdenv.lib.platforms.unix; }; 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 4d8f40074bd..93af03ce229 100644 --- a/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix +++ b/pkgs/applications/editors/emacs-modes/org-mac-link/default.nix @@ -24,7 +24,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; + homepage = "https://orgmode.org/worg/org-contrib/org-mac-link.html"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix index 9f251f54d6a..7f2454c811a 100644 --- a/pkgs/applications/editors/emacs-modes/perl-completion/default.nix +++ b/pkgs/applications/editors/emacs-modes/perl-completion/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Minor mode provides useful features for editing perl codes"; - homepage = http://emacswiki.org/emacs/PerlCompletion; + homepage = "http://emacswiki.org/emacs/PerlCompletion"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/prolog/default.nix b/pkgs/applications/editors/emacs-modes/prolog/default.nix index 337a1585b1b..7f5a097daa9 100644 --- a/pkgs/applications/editors/emacs-modes/prolog/default.nix +++ b/pkgs/applications/editors/emacs-modes/prolog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://bruda.ca/emacs/prolog_mode_for_emacs/; + homepage = "http://bruda.ca/emacs/prolog_mode_for_emacs/"; description = "Prolog mode for Emacs"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/editors/emacs-modes/railgun/default.nix b/pkgs/applications/editors/emacs-modes/railgun/default.nix index ba716e1dd13..8ca8d1feaa1 100644 --- a/pkgs/applications/editors/emacs-modes/railgun/default.nix +++ b/pkgs/applications/editors/emacs-modes/railgun/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Propel yourself through a rails project with the power of magnets"; - homepage = https://github.com/mbriggs/railgun.el; + homepage = "https://github.com/mbriggs/railgun.el"; platforms = stdenv.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 d1cd1018027..b512d5f5c75 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -283,10 +283,10 @@ }, { "ename": "ac-alchemist", - "commit": "ef9037aa41a8d9467838495bb235db32c19cc417", - "sha256": "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0cakni8lvkhgdrzwa2cdqwnkbaiac1fn4j2lqgmx33z7hmrk8am6", "fetcher": "github", - "repo": "syohex/emacs-ac-alchemist", + "repo": "emacsorphanage/ac-alchemist", "unstable": { "version": [ 20150908, @@ -334,10 +334,10 @@ }, { "ename": "ac-capf", - "commit": "929da263f57b904c50f5f17b09d4c4b480999c97", - "sha256": "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "08a1ywyv5l1npbkpmg3wmprnqk837bmbwjpcgf5di9a2j33xqbin", "fetcher": "github", - "repo": "syohex/emacs-ac-capf", + "repo": "emacsorphanage/ac-capf", "unstable": { "version": [ 20151101, @@ -516,10 +516,10 @@ }, { "ename": "ac-emoji", - "commit": "15f591f9cba367b071046fef5ae01bbbd0475ce3", - "sha256": "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "06cwaasv2bsxr86wsjc21ggibcyqfp352wnc8i5fbr4ypd3vbk42", "fetcher": "github", - "repo": "syohex/emacs-ac-emoji", + "repo": "emacsorphanage/ac-emoji", "unstable": { "version": [ 20150823, @@ -547,10 +547,10 @@ }, { "ename": "ac-etags", - "commit": "fda9c7def8bc54af4ab17dc049dd94324c8f10fa", - "sha256": "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1qy6v37v7lx93lnpgh5bf2ccxpg2ldzwgdyigqmby9fy0wzwr8sf", "fetcher": "github", - "repo": "syohex/emacs-ac-etags", + "repo": "emacsorphanage/ac-etags", "unstable": { "version": [ 20161001, @@ -582,15 +582,15 @@ "repo": "xiaohanyu/ac-geiser", "unstable": { "version": [ - 20130929, - 647 + 20200318, + 824 ], "deps": [ "auto-complete", "geiser" ], - "commit": "502d18a8a0bd4b5fdd495a99299ba2a632c5cd9a", - "sha256": "0h2kakb4f5hgzf5l2kpqngalcmc4402lkg1pvs88c8z4rqp2vfvz" + "commit": "93818c936ee7e2f1ba1b315578bde363a7d43d05", + "sha256": "00n2qa26yilaj837n1yp6lbqa4gf30nkkbvanl7m9ih7k48ssqmw" }, "stable": { "version": [ @@ -814,10 +814,10 @@ }, { "ename": "ac-ispell", - "commit": "b41acb7387ebef9af2906fa16298b64d6431bfb0", - "sha256": "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0npbrvwww6mi8q8x3cc6sf02x1b3ns2w7499lip7ymbr1zi9gdxg", "fetcher": "github", - "repo": "syohex/emacs-ac-ispell", + "repo": "emacsorphanage/ac-ispell", "unstable": { "version": [ 20151101, @@ -1020,10 +1020,10 @@ }, { "ename": "ac-racer", - "commit": "e4318daf4dbb6864ee41f41287c89010fb811641", - "sha256": "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0vxnc6q2khxf5xl3k8lwvjg5biqxasr4vm9k3c8033xwl6in299r", "fetcher": "github", - "repo": "syohex/emacs-ac-racer", + "repo": "emacsorphanage/ac-racer", "unstable": { "version": [ 20170114, @@ -2242,26 +2242,26 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20191127, - 1123 + 20200326, + 1553 ], "deps": [ "memoize" ], - "commit": "1416f37984486a44c6c0cbe0a2c985e82f965b6b", - "sha256": "1nwqn1cwjrmlp8g87ciwpv1h0pd61nh05bdpvz2kqg8b5ssfc4gd" + "commit": "f6cbb51c152dd60be5718218600a4ec14d9fd6cc", + "sha256": "0a59m1vv0s7czsccfalqyyp3v4lhydn1wbvyxkzy8i9fsjqbyxsa" }, "stable": { "version": [ - 3, - 2, - 0 + 4, + 0, + 1 ], "deps": [ "memoize" ], - "commit": "52d1f2d36468146c93aaf11399f581401a233306", - "sha256": "1sdl33117lccznj38021lwcdnpi9nxmym295q6y460y4dm4lx0jn" + "commit": "d363bb3e73909be013fcf35e1458bb654ec5bbaa", + "sha256": "0yh7gnv9xfqn8q4rzaa6wpyn9575vyfxy7d3afly2mqsb367fgm5" } }, { @@ -2272,14 +2272,14 @@ "repo": "jtbm37/all-the-icons-dired", "unstable": { "version": [ - 20200301, - 1346 + 20200327, + 758 ], "deps": [ "all-the-icons" ], - "commit": "733e0b520562d1f78f757f21287547272cedcaef", - "sha256": "1ml9xzdaqjnpwb8rnqr0967n3zk7fb56xy531gc52k3pxj68zbcc" + "commit": "816987d339630e43f77a5a64ef308e95d341dda7", + "sha256": "01wgxdw222pz2sv7x9jwlislkasaw01bkq1nkpdp4jwl816aza8l" } }, { @@ -2309,14 +2309,14 @@ "repo": "seagle0128/all-the-icons-ibuffer", "unstable": { "version": [ - 20200315, - 1244 + 20200319, + 1625 ], "deps": [ "all-the-icons" ], - "commit": "8f8a09e0443738df5c659c1d85c714fc7c111a2d", - "sha256": "0rpjrfprpddhp1wymwrx798x09wp6hrjl8131wgkpsnpi3bxcaz5" + "commit": "3ee9e32f480329e94e45f86538343b0ddc7ddd4f", + "sha256": "1cs9027q26nfm5k3182mbmmhj8s8y2nv47gsyamwpjqdma0sbl73" }, "stable": { "version": [ @@ -2371,15 +2371,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20200315, - 1225 + 20200324, + 550 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "a12e39b9f343b28a1868112eafce7661aaf883ef", - "sha256": "0bdwb5diplzygn768aqmayy276i9cy5qg8dam3bs3vqkmm0is4q1" + "commit": "a9a4389c1930a5a071857b4d450eaecb21f4d6b9", + "sha256": "133vl3awl3qxxd2ka8zdr33v6s8hrjpsv4bv2db5j8jz35m0hx9d" }, "stable": { "version": [ @@ -2595,14 +2595,14 @@ "repo": "stardiviner/amread-mode", "unstable": { "version": [ - 20200315, - 323 + 20200322, + 843 ], "deps": [ "cl-lib" ], - "commit": "b0c9ec7e8c55e89a565361712dff11dc7b74845f", - "sha256": "0bc2p8n5mr06w0jww3snlq15qd125c17qv5fpih3lr7n76zqfcdv" + "commit": "76ebe8d56b4d19f2bf75f54479f0e7ecc9cbaac9", + "sha256": "09jmllb9an992mzgncxral8i7j532l8i80yvvqwaqwv9azwab5sd" } }, { @@ -2930,11 +2930,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20200312, - 1352 + 20200317, + 1703 ], - "commit": "b8fd76f712042c210b2139448e53d5f9923ba5f0", - "sha256": "179nhb2f2lq2q5pwq6l10n1cgjyr300083g7nsxn4z72la9m5gh4" + "commit": "44b378b16ad407c36e8cf728e671c17116d854b6", + "sha256": "1xhmgadi4maci25si3mf854d0ammz7w9l317r4m81v1gkdfvv8wi" }, "stable": { "version": [ @@ -3200,17 +3200,17 @@ }, { "ename": "anzu", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "181hzwy9bc0zfhax26p20q9cjibrmi9ngps5fa3ja5g6scxfs9g1", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0m9wwq5fl7g6gfzv6m9hlrjf8nvqn1q7nqif1x93sh7q3vfwgxzl", "fetcher": "github", - "repo": "syohex/emacs-anzu", + "repo": "emacsorphanage/anzu", "unstable": { "version": [ - 20190303, - 1701 + 20200328, + 2019 ], - "commit": "592f8ee6d0b1bc543943b36a30063c2d1aac4b22", - "sha256": "123zbnl36vi0gkffd6m6mkskhmjmm0am23j45w1mbmfyq03r1d8b" + "commit": "61cb32aa61f9bd088c519ea3cc96b81e241efed7", + "sha256": "1b2zjich6mvypycsrz5jkpv5mbaj77jka17vcc5ss2390dad92f8" }, "stable": { "version": [ @@ -3264,6 +3264,30 @@ } }, { + "ename": "apdl-mode", + "commit": "2fd3f323919b8eebba081689c93bb918d0af1359", + "sha256": "11in64hcs5gmvviv986043r68l34byi31v5vibwqx63qg8k3gqfn", + "fetcher": "github", + "repo": "dieter-wilhelm/apdl-mode", + "unstable": { + "version": [ + 20200329, + 2024 + ], + "commit": "af7764828555486a78727194a001193d03dc12f0", + "sha256": "1p5w7kzmmsc3ayh4rvmd0a9g9wchvddhr22dx3jl7dx42s3sig5m" + }, + "stable": { + "version": [ + 20, + 3, + 0 + ], + "commit": "17bbc63239d2b791887c3d263fa7b4e8ea9d0ccb", + "sha256": "0g9nf0853c56w8vpzys4rxw6ki887ajr3h7cgqb295aa16bg65x7" + } + }, + { "ename": "apel", "commit": "4976446a8ae40980d502186615902fc05c15ec7c", "sha256": "0zrm8m66p3aqr0108s3cj6z4xqbg2hx37z1pam4c65bqlhh74s8y", @@ -3446,8 +3470,8 @@ "let-alist", "request" ], - "commit": "265ab11044b527ca70762fc5d633227001dd4da6", - "sha256": "09xww9vz7jjlrya8cyayh79x4inlhi6y7sdgg3xrbaxi9avflcs8" + "commit": "5fe8b035b2b6bc165728444bb8e9792d14b7409d", + "sha256": "1wbpjz5jgpph6c6wk29dxz8r368ai6jx9cb4y2mdcpngig8kmazm" } }, { @@ -3493,11 +3517,11 @@ "repo": "rubikitch/archive-region", "unstable": { "version": [ - 20140201, - 2342 + 20200316, + 1425 ], - "commit": "0d357d4c42a6a248c457f358f81b20fd20fede2f", - "sha256": "03pmwgvlxxlp4wh0sg5czpx1i88i43lz8lwdbfa6l28g1sv0f264" + "commit": "53cd2d96ea7c33f320353982b36854f25c900c2e", + "sha256": "1c3ji0asnhdls8pa5hbqg65kc35jc6yndib7cx1zvnpb8pjlvbbr" } }, { @@ -3638,6 +3662,24 @@ } }, { + "ename": "ascii-table", + "commit": "d6d5599ff68bf9125a9825ddd2a00009242bf2e1", + "sha256": "0p3dyxzs5xaq17209nnf2cqs87hz2b1k3x1nkq4jvhn71v4jcaj1", + "fetcher": "github", + "repo": "lassik/emacs-ascii-table", + "unstable": { + "version": [ + 20200329, + 1744 + ], + "deps": [ + "cl-lib" + ], + "commit": "572b62c8305b8c26082a17e15bc2f53066ddcb5a", + "sha256": "1k1wfbwzn9gjv7hmc7ffr3r211vxrxassryar6gnajmj9xbzwcgi" + } + }, + { "ename": "asilea", "commit": "858e673c66e876d80f41d47d307c944d7bdb147d", "sha256": "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j", @@ -3715,6 +3757,24 @@ } }, { + "ename": "astyle", + "commit": "b495f29653edd15cef8eb3c9ea4d8aea35b0ac75", + "sha256": "0vchbm2lb9qa66fspyylyv0snmrxjfpzc332j0k7pkp6cmi08fnh", + "fetcher": "github", + "repo": "storvik/emacs-astyle", + "unstable": { + "version": [ + 20200328, + 616 + ], + "deps": [ + "reformatter" + ], + "commit": "04ff2941f08c4b731fe6a18ee1697436d1ca1cc0", + "sha256": "0midga1dz9yl7mzn6syb3iwnfpzvnfpqnxi9rsv63rqnrm36qy4q" + } + }, + { "ename": "asx", "commit": "2eda72c3574c41184104532bb129cbe0efc8afd4", "sha256": "0kijqfwkwm5kd1h3v0rab9fm8ivmqnmijy065iz5xhmi3yicx4aq", @@ -3936,8 +3996,8 @@ "deps": [ "auctex" ], - "commit": "24270d9452c0b4ae974648cdbcdbad4401f4b1b5", - "sha256": "0la88z6g5vf2jq0gk8qfv83mgld1i10q84vn1ihhmnd9sqv99j5s" + "commit": "76fba4a1a918ce8a276fa0e22f026ad9a45a47dc", + "sha256": "1rd92s2c08z3l2r2wxcs46bbri4rj0d0aym36v89pwq0fcqqx2ry" }, "stable": { "version": [ @@ -4667,6 +4727,24 @@ } }, { + "ename": "auto-scroll-mode", + "commit": "195041c70d2807184d4d8c711bcd3f54b8dfc73a", + "sha256": "1hvnhszn1cqzw42wn7w0hrq7wn161alg2w6xpd53ydg61g31i68n", + "fetcher": "github", + "repo": "stardiviner/auto-scroll-mode", + "unstable": { + "version": [ + 20200316, + 134 + ], + "deps": [ + "cl-lib" + ], + "commit": "a23669a8747e71ca5b1003b923f7a3d3834740e3", + "sha256": "033msm39fdhm6iqd7khjsqvxrv4314h8klsq3g06zsrgpmjki1xr" + } + }, + { "ename": "auto-shell-command", "commit": "ea710bfa77fee7c2688eea8258ca9d2105d1896e", "sha256": "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j", @@ -4824,6 +4902,21 @@ } }, { + "ename": "autocrypt", + "commit": "c5aac210984709f020f96f3ca166185900accddf", + "sha256": "1y5p5n2p2qk638i1as3wbfz82r08jv4q91470xz9r1gkdnn1xyx8", + "fetcher": "git", + "url": "https://git.sr.ht/~zge/autocrypt", + "unstable": { + "version": [ + 20200327, + 1958 + ], + "commit": "f970fb51c80d582dcc6682106388d6a870ef2c83", + "sha256": "0qfawvnjyc0rrvr5zhkq7ngllrf5h9z3wsi2a75s74545d6nyyjq" + } + }, + { "ename": "autodisass-java-bytecode", "commit": "a094845521d76754a29435012af5fba9f7975a8e", "sha256": "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc", @@ -5476,11 +5569,11 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20200102, - 1933 + 20200325, + 1053 ], - "commit": "87589331a8f0850a46964dbdbdcc3f2191b03376", - "sha256": "0yzz090997jn3d1ah8a32q491bsgzan6zqp2szv7d8ga4ziv3gkp" + "commit": "11e121aed7f5fe90700bd3f49d987bff0a796c2d", + "sha256": "0y6rdfhywjp0d4l39hjhlzzwp64wgd3xrvr80c2f6xbc74c6l5hk" }, "stable": { "version": [ @@ -6455,20 +6548,20 @@ "repo": "riscy/bifocal-mode", "unstable": { "version": [ - 20190623, - 2236 + 20200325, + 539 ], - "commit": "c354fc32b0a666203f5c546bb2d2c397cb003391", - "sha256": "0wzsbrj1rhfl6qgjnphbh6ijfbjdr2wid7mqzz49ykcb9ldm7kjj" + "commit": "773a6dde790c4a240e643a9071e4c7bce09d40de", + "sha256": "11dirb13hblfa95hqqshrsjri4d4qzcq5qhhnd4xqajdchr62758" }, "stable": { "version": [ 0, 0, - 5 + 6 ], - "commit": "add30c678488cec04976a85ba8cda20805938a01", - "sha256": "01j8s6c3qm4scxy1dk07l41y0n55gz83zzfi254kc2vyx02vqg7f" + "commit": "773a6dde790c4a240e643a9071e4c7bce09d40de", + "sha256": "11dirb13hblfa95hqqshrsjri4d4qzcq5qhhnd4xqajdchr62758" } }, { @@ -6515,8 +6608,8 @@ "bind-key", "key-chord" ], - "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", - "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" + "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", + "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" }, "stable": { "version": [ @@ -6542,8 +6635,8 @@ 20191110, 416 ], - "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", - "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" + "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", + "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" }, "stable": { "version": [ @@ -6752,6 +6845,29 @@ } }, { + "ename": "blackout", + "commit": "9128d87569dc74b90f57dd65edead7199f5c7911", + "sha256": "06gxgald2vchfwhbiaap7rfjk7kirfv4yjc4r98g998v96bilw64", + "fetcher": "github", + "repo": "raxod502/blackout", + "unstable": { + "version": [ + 20200326, + 1640 + ], + "commit": "87498cc91916c2f41d28e93fd80102c42b93ccf6", + "sha256": "156mnqwcpv3zl5pklqvmayq5j76hm4jc3has4qydfygz8fhx1zhy" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "87822abd1ed46411368ef91752a7f51c0ef2aee0", + "sha256": "0n0889vsm3lzswkcdgdykgv3vz4pb9s88wwkinc5bn70vc187byp" + } + }, + { "ename": "blgrep", "commit": "e78ed9dc4a7ff57524e79213973157ab364ae14d", "sha256": "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm", @@ -6951,14 +7067,14 @@ "repo": "sergeyklay/bnf-mode", "unstable": { "version": [ - 20200313, - 2245 + 20200323, + 1348 ], "deps": [ "cl-lib" ], - "commit": "9c8c27e38cce6ba4d059a052ee0e0ece103e0684", - "sha256": "0daiv5ac7xnmprqmmc2d8gw83qyvsa8h9wnzh2ak1xs9hpar2nkw" + "commit": "d88eef69ae66ea1ffa21a65317afe84c9ddb0814", + "sha256": "1bci2w8drwgcli9hqg55izaxpwq4fvqdigvlrfc0524s7021ij24" }, "stable": { "version": [ @@ -7360,6 +7476,48 @@ } }, { + "ename": "brf", + "commit": "203e7d21e2387866107740ead4ec28787d82ebfb", + "sha256": "0439bzzzy6kx536zh9azxrdmfpb69xrr8axxg5q7989892iaqi5m", + "fetcher": "git", + "url": "https://bitbucket.org/MikeWoolley/brf-mode", + "unstable": { + "version": [ + 20200329, + 1531 + ], + "deps": [ + "fringe-helper" + ], + "commit": "f1ae0c5eb74f62af109ebaf18e8663d6f51270cb", + "sha256": "1pzxz5irx6ysa8nhl9x50v8l5r2cvd6pafj71q4i5lrxv9a1dkl1" + } + }, + { + "ename": "brightscript-mode", + "commit": "9acbba1c180ea7c03156009c08285697a7aae419", + "sha256": "0g0lwmd53v6lqihksqdirl12rz6a9ljp9zdm1xpd4wbqz72w17jw", + "fetcher": "github", + "repo": "viseztrance/brightscript-mode", + "unstable": { + "version": [ + 20200321, + 2126 + ], + "commit": "51f2d43e08960aa65a67273101733636026790a6", + "sha256": "0dzgkpaqlrqfzsmb61idlrp91vs3lrcymbdd4k6ls58kdv75v1j8" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "01405633a14269ab26d053ca6f1494c987d24195", + "sha256": "0952smngj32an30v2bqgfc14xrl90xwr4a038w01cdgg9k848g7y" + } + }, + { "ename": "broadcast", "commit": "6ed51896112e702a8b853059884aad50d37738c2", "sha256": "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib", @@ -7763,6 +7921,60 @@ } }, { + "ename": "buffer-wrap", + "commit": "446fb5528644d9e51a10ade59de97e248729d3f3", + "sha256": "1fdk490hwz1mf4ldw8bh0w2byxi03qwdapgdgcvzir3s913gagrw", + "fetcher": "github", + "repo": "jcs-elpa/buffer-wrap", + "unstable": { + "version": [ + 20200223, + 605 + ], + "commit": "460f90bc024b6c287ed8afac3ff1bed2a147c777", + "sha256": "07r50iiiyhbqbia9c8c3kz1hvqjs6dkb8rkqpq4yyv3vd1kc9qnb" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "813a3dab3007a34fa27cf0a1ae687dc0eae98240", + "sha256": "0m2ryic16083ab0x6qwfrxrpsgq84s518vn0cbfcxycblpdh89al" + } + }, + { + "ename": "bufler", + "commit": "b50d5939113ca9a8ad1ba606f3d3030f110a800b", + "sha256": "0y1gfpb99777sxizxvqyffsmbv6ib4zasi2dyrf8imf4z45r6adh", + "fetcher": "github", + "repo": "alphapapa/bufler.el", + "unstable": { + "version": [ + 20200318, + 2005 + ], + "deps": [ + "dash", + "dash-functional", + "f", + "magit-section", + "pretty-hydra" + ], + "commit": "39e756a23196d12792a3af4a06ab024d8235ee19", + "sha256": "1b9ddgdd7b6x6353f8s6cv97xqsmmka6vwmv68sq75104wr189w5" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "2eca0959657030c5853020da017fe98a19bba3f1", + "sha256": "0yqgaqz41sbfdbvjxf773p5m2qsr4mm22j2qgn3mp0z1r5dx67ai" + } + }, + { "ename": "bufshow", "commit": "543a734795eed11aa47a8e1348d14e362b341af0", "sha256": "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h", @@ -8978,8 +9190,8 @@ 20200314, 1557 ], - "commit": "2dcd552b314bc64daa40fd7ac09937439e447548", - "sha256": "1scixb6s795hjmkpkljccxg8ja2lqkja905gg5lmp09vykf8x5ir" + "commit": "37593d191b255d8633231099c70b1b26b3da0d39", + "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" } }, { @@ -8990,16 +9202,16 @@ "repo": "MaskRay/emacs-ccls", "unstable": { "version": [ - 20200204, - 444 + 20200327, + 1915 ], "deps": [ "dash", "lsp-mode", "projectile" ], - "commit": "e5cc4c3e6f40c9c9f0f53e99154c08018eb36944", - "sha256": "1yc7jj4g0kh0m1a4r98shvr48wp9i5mawld0xzs9mbfj97dsb96v" + "commit": "17ec7bb4cf362b7268c24e070e841f0dfac1c919", + "sha256": "08pndwbw6wcpysnvhkqfvrw91ac0np31swiq0yv3dr2x0sq70cp5" } }, { @@ -9028,8 +9240,8 @@ 20200314, 1557 ], - "commit": "2dcd552b314bc64daa40fd7ac09937439e447548", - "sha256": "1scixb6s795hjmkpkljccxg8ja2lqkja905gg5lmp09vykf8x5ir" + "commit": "37593d191b255d8633231099c70b1b26b3da0d39", + "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" } }, { @@ -9163,15 +9375,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20200312, - 1817 + 20200325, + 1236 ], "deps": [ "cl-lib", "powerline" ], - "commit": "69fc454d86eaf279b93efed7b0ee9df67c8a25a2", - "sha256": "1jfj6jfz74ia2sdhxy5vp4svsvvqpxlwydfcj3vc65ic7hzh39nd" + "commit": "e6bf9f5257fa5401695e0e33d0376a0821ac2f2f", + "sha256": "1gm06par7pglwj25ydvlp1n2vniq6283mm0g4s53ra77ywsz73jv" }, "stable": { "version": [ @@ -9298,8 +9510,8 @@ 20171115, 2108 ], - "commit": "b1d6dca276e44e220be69052e7db1fc09cda6fc7", - "sha256": "0d5ngarandq3jagpjag7z99ma52wm6nbi46xp4zhx0m2ligq4v2m" + "commit": "f09d88781a5557d4b2b7d039757cc5e9a7ddd275", + "sha256": "10zr6a3z7gzvqvn5fb4l7hg9wi5vhmkdln0c44gskmikdsm173x1" }, "stable": { "version": [ @@ -9882,6 +10094,40 @@ } }, { + "ename": "chronometrist", + "commit": "35d03fe9c066e7388d5ff4adad1afa1e30145995", + "sha256": "09dil46qjn7y55y7qax92l7mcw8g1bsb1mjqc92zgln96asi25kj", + "fetcher": "git", + "url": "https://framagit.org/contrapunctus/chronometrist/", + "unstable": { + "version": [ + 20200324, + 653 + ], + "deps": [ + "dash", + "s", + "seq" + ], + "commit": "dc0fb3bed6b893ecb924f5b1228ab718325cc808", + "sha256": "08mzv8rijsagkj4ykxlgr99axp0kxnz36d3iaffkqzyv50cm4r6f" + }, + "stable": { + "version": [ + 0, + 4, + 2 + ], + "deps": [ + "dash", + "s", + "seq" + ], + "commit": "cc791cd61ee4580c9786f8c58d9e1964e0ff0c64", + "sha256": "1ccy7qz1wcmggqlf3hwigbqq4wrx1amds4x9bxz9py6bypglyjc5" + } + }, + { "ename": "chronos", "commit": "53648c5699fc03e50774270f9560c727e2c22873", "sha256": "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d", @@ -9937,8 +10183,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200308, - 1030 + 20200328, + 1555 ], "deps": [ "clojure-mode", @@ -9949,8 +10195,8 @@ "sesman", "spinner" ], - "commit": "c027c4948562f736fd77e441dc10cb5d6bb355a1", - "sha256": "0p808ks2x9dg98v80icxldynvvvfwwsf2y89la40fsc572s8zqjw" + "commit": "dfc13f9c199920522ee02feac1d5da1c0b578b6b", + "sha256": "12yifir74qicryl5v5gl80s5m2qvlb09ck6jywx20yin3jkw6l58" }, "stable": { "version": [ @@ -10233,21 +10479,6 @@ } }, { - "ename": "cl-font-lock", - "commit": "c4cc415c24fc1c404aa9e4d8fcc7bf70ed182633", - "sha256": "1igiclz5lshq9bz4sndf0qgsvnrfk39jnpld8g4a985gr2hislb4", - "fetcher": "github", - "repo": "equwal/cl-font-lock", - "unstable": { - "version": [ - 20200315, - 649 - ], - "commit": "9520969b67a42aa577cee2e46f16518fef248dc4", - "sha256": "05w6yy4jgar0p4b2715gp7armhfsbw84zyvm5c9j9qawlrjfxr1d" - } - }, - { "ename": "cl-format", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "09jwy0fgaz2f04dvcdns6w859s6izvrkp8ib4lws3x8kx8z918fy", @@ -10454,11 +10685,11 @@ "repo": "spudlyo/clipetty", "unstable": { "version": [ - 20200105, - 15 + 20200327, + 2241 ], - "commit": "fda5a80cf4b24389b2f95eeec1d567df80a8fb11", - "sha256": "1nzlrd7vf4sqhb2a0bsg1gaj722id5i1s9f1wdi2bmx58rzhqnhp" + "commit": "7ee3f9c52f70f80820a8c66fb6f796d6e01dd92d", + "sha256": "1vgk4ci5di0dxm2ql02g1h484nd6abqiv2xa7fh2d9rbkfh9px30" }, "stable": { "version": [ @@ -10741,11 +10972,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20191112, - 1948 + 20200326, + 1542 ], - "commit": "51016faaa88956bdd4decf2fa94dd5198777a47c", - "sha256": "13xx6ihhr2175w5d0m5zbyg3fmk1s46wj399f4lrc4skwjxbrlgg" + "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55", + "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr" }, "stable": { "version": [ @@ -10765,14 +10996,14 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20190712, - 639 + 20200320, + 823 ], "deps": [ "clojure-mode" ], - "commit": "51016faaa88956bdd4decf2fa94dd5198777a47c", - "sha256": "13xx6ihhr2175w5d0m5zbyg3fmk1s46wj399f4lrc4skwjxbrlgg" + "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55", + "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr" }, "stable": { "version": [ @@ -11074,19 +11305,17 @@ 20190710, 1319 ], - "commit": "a6d95f57cc8934813ba273e1016d03bb190c44c0", - "sha256": "0m2bg4s4ldm5jmjnhgb82l3dm45pjkrsppkdh31x9clh6gvscvw5" + "commit": "887eb6b7680685ae9bc8697f30bf6406df2d318e", + "sha256": "1lcfn79fn3cn0sdhw5f50l8830w6lh0j7lhrz7la27sg4ag5rmg0" }, "stable": { "version": [ 3, 17, - 0, - -1, - 3 + 0 ], - "commit": "1ec72e09471287630cf142d8587a9b8d9abad629", - "sha256": "1r0cqv2vfyswzhbh1ydq6g0vkhkhyz3mwhm0irlc22sfxj2dy56y" + "commit": "e3185e3d1b92a95c18f22f70b3cef6944dd019eb", + "sha256": "1r8nnaisx10d5r3kzyfz4af9mwb5f0nzz8nmn3xvnr12rryg2bwl" } }, { @@ -11154,11 +11383,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20200226, - 206 + 20200327, + 101 ], - "commit": "1baddba41af7edd6d4eb3c24ac85ba4a1b30aa3f", - "sha256": "0hspqc5xhi0mmrwyakqbq7dikn56q05c5xsnpgkx2mjjx7z05jh1" + "commit": "d741332ad4bcd9a136d5dc4974a050da8ca28888", + "sha256": "1f2nrklzvm0b09d1s5rxvzahc32rs5qdqx910a45fj95hlw2w2wc" }, "stable": { "version": [ @@ -11312,10 +11541,10 @@ }, { "ename": "codic", - "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", - "sha256": "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "05pa2a74c4ra7qqv3da3bx623vf36qrk5dm1jx1a4x1vbpgv5mz0", "fetcher": "github", - "repo": "syohex/emacs-codic", + "repo": "emacsorphanage/codic", "unstable": { "version": [ 20150926, @@ -11410,14 +11639,14 @@ "repo": "patbl/colemak-evil", "unstable": { "version": [ - 20171015, - 2307 + 20200326, + 2359 ], "deps": [ "evil" ], - "commit": "192c779281ae1fbf2405dcdb55b3c5b2a1d0b3d1", - "sha256": "1clnvr7n6mx5b8pq1c6zchq7n1g8ip8hwgzc61ywrmiyv0v8rnc6" + "commit": "981bdcb1a48c6d9139493abe7e25fabe126e43c3", + "sha256": "0dqyqaqr71z4mipb4g5jxdw96lzb108fd5w4wi27023hfll3j1hc" } }, { @@ -11627,11 +11856,11 @@ "url": "https://git.sr.ht/~lthms/colorless-themes.el", "unstable": { "version": [ - 20200221, - 1655 + 20200325, + 1307 ], - "commit": "a7b7c0a32b174988f40378996cd8997f73524f19", - "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz" + "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37", + "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn" }, "stable": { "version": [ @@ -12017,11 +12246,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20200228, - 1919 + 20200324, + 2145 ], - "commit": "94e22c45e92cf220abb9b5a582f85aa99c06004d", - "sha256": "0l3hxj2cf9fw7ma3ac95cigw733h2k0dv987hanfhlx2jckjyma1" + "commit": "61ddd9afb58879267bf947b152a68f3dbadb9259", + "sha256": "097xy8ar6dms4zn7ymxxgmhap096fs8nc5j3js5srzmv14rswm36" }, "stable": { "version": [ @@ -12786,22 +13015,22 @@ }, { "ename": "company-jedi", - "commit": "bded1840a39fbf1e014c01276eb2f9c5a4fc218f", - "sha256": "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0a1p00jcvslm7h08kzdf6by9v4lf850jb2ki8gl8hgdcf5yvkdyi", "fetcher": "github", - "repo": "syohex/emacs-company-jedi", + "repo": "emacsorphanage/company-jedi", "unstable": { "version": [ - 20151217, - 321 + 20200324, + 25 ], "deps": [ "cl-lib", "company", "jedi-core" ], - "commit": "2f54e791e10f5dc0ff164bfe97f1878359fab6f6", - "sha256": "0bpqswcc6a65wms0pdk9rsad9jiigmx2l1jaqr8bz4va945qdlhg" + "commit": "5232fbc1fdbfc81b1dd883afb720338c3e39556b", + "sha256": "155dba3qim7r8xhrv6dkhzhcc2km9761g5d3qmgd37jnk0mmd8l0" }, "stable": { "version": [ @@ -12836,8 +13065,8 @@ "lean-mode", "s" ], - "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609", - "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf" + "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c", + "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n" } }, { @@ -12949,6 +13178,25 @@ } }, { + "ename": "company-native-complete", + "commit": "b112834a7ab05829fbc9101151bf82440bf6e551", + "sha256": "18f62r8y9k5flkqhzz6sr2w3srdhb6cpzrcyl98pv0zy3dq49lp4", + "fetcher": "github", + "repo": "CeleritasCelery/emacs-native-shell-complete", + "unstable": { + "version": [ + 20200315, + 2144 + ], + "deps": [ + "company", + "native-complete" + ], + "commit": "11803df3706fb23d58e418a14ce981204a64e847", + "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1" + } + }, + { "ename": "company-nginx", "commit": "fb8843cddfa9133ea9e2790e8a1d8051cd4dabea", "sha256": "15pxz0v3zpshwri0v15yh995k7ih9h46y81n4xywlyyh34wys3sj", @@ -13030,6 +13278,38 @@ } }, { + "ename": "company-org-roam", + "commit": "546d4c869c4d2a0981a572b5653f5e9ab8bcec47", + "sha256": "0kxf4fhs8ikw06ljdkk4ky1fb83xpmknasp7kyd3lpdk63cfvijh", + "fetcher": "github", + "repo": "jethrokuan/company-org-roam", + "unstable": { + "version": [ + 20200329, + 609 + ], + "deps": [ + "company", + "dash", + "org-roam" + ], + "commit": "0d14bf56f53b1fcf14418d3e545785f4857b5f06", + "sha256": "0kjf3pqlb95m1z057sjkqmsi1qhh3d4snp29gk3fzz278bc7sl45" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "company", + "org-roam" + ], + "commit": "a4c3f60883de783b190d4eb8bcc85f5912d9393a", + "sha256": "087z699i7y0q72s5qc7ks09bzin9cl3gm3aqs4ka99lzg676lrl8" + } + }, + { "ename": "company-php", "commit": "ac283f1b65c3ba6278e9d3236e5a19734e42b123", "sha256": "1gnhklfkg17vxfx7fw65lr4nr07jx71y84mhs9zszwcr9p840hh5", @@ -13078,8 +13358,8 @@ "company", "phpactor" ], - "commit": "5ccf65d59e6bbc9cd958dd5988e8fd2143b0d57f", - "sha256": "0k4dzn4a5y4kq7yz3ifvzziv90rp5si380c5ypgxr5iwb1b8a0l3" + "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05", + "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5" }, "stable": { "version": [ @@ -13143,15 +13423,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200315, - 815 + 20200327, + 148 ], "deps": [ "company", "posframe" ], - "commit": "37a1f136f61bed4050dbeb182767c7e51cb73e1b", - "sha256": "09vryzs42lvwsv9sid5fqnyy8cvmpnf89kb30jjqy71ia8ijqx7l" + "commit": "18b83d29dae75239e22ca73d91eb09ceca5e77c4", + "sha256": "0gb3y80qhk1xgdx0iglcj78wvnbxnaiyvfgg0bmfvhswjii80160" }, "stable": { "version": [ @@ -13182,8 +13462,8 @@ "company", "prescient" ], - "commit": "7fd8c3b8028da4733434940c4aac1209281bef58", - "sha256": "1igsjdkxax2lavglc03h0dk3d7fpgqvlymnhyxx738sjyfzl09cr" + "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", + "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" }, "stable": { "version": [ @@ -13579,8 +13859,8 @@ "repo": "TommyX12/company-tabnine", "unstable": { "version": [ - 20200102, - 2025 + 20200327, + 2137 ], "deps": [ "cl-lib", @@ -13589,8 +13869,8 @@ "s", "unicode-escape" ], - "commit": "a207f493eaf1cc766eb25ae84d0eca4c9d3e433b", - "sha256": "1qk0l4zcsd9jjivbaw7zbhx2dsdnb30slqc66qd3w69aq4r1xyv7" + "commit": "e986a4ad0d0e0174b08f1fb94c4f804a98a344e4", + "sha256": "1g5qv1fg22x1nkj696n12ixa2akgzivdc5q7yzy502kqjg67mkx5" } }, { @@ -14397,14 +14677,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200314, - 2005 + 20200319, + 1329 ], "deps": [ "swiper" ], - "commit": "8fae568daafdc79d4990ad739bac42ee230d3234", - "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1" + "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", + "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" }, "stable": { "version": [ @@ -14544,14 +14824,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200224, - 410 + 20200320, + 19 ], "deps": [ "counsel" ], - "commit": "172c1f1d806f36d10bdeb6284e1adbce6c52091f", - "sha256": "0kbkf5244ajxri4x8aaxsc11jq90lsmpw3jyb5z8yfk1wisdx274" + "commit": "0abd7a1b6abaf59a01774ca05f51cc0c6ce7f287", + "sha256": "0kfj3b8gx95pa7yaps25javmag2bnlz5zn802wf0x81np4d3hgjs" }, "stable": { "version": [ @@ -14779,14 +15059,14 @@ "repo": "Lautaro-Garcia/counsel-spotify", "unstable": { "version": [ - 20200315, + 20200326, 156 ], "deps": [ "ivy" ], - "commit": "51315644440c648b5aada68d5461a5c0b3b58797", - "sha256": "1xnzwbn4bf6id8mr804y367rms7g00dlw100kapmwiqmyzshgvb8" + "commit": "5d23a898483de19cb60773492c9846facb8ae281", + "sha256": "0k9m8xi9p5w2qnpz0zmdf52ip6viws06qq5rssgvb0cr888iqib2" } }, { @@ -14853,8 +15133,8 @@ "counsel", "request" ], - "commit": "3fadfa55f8e78b4a26f75fed6e972a83688bea7d", - "sha256": "0sficf1q881k3vr7yvdcc5gxnac27dp1na9b458fx2mam0892sz7" + "commit": "35c648b4cdd9f266ab54512a0fec2a3ca55d5bc6", + "sha256": "128vl9a5w8v2xzfi5xn9cqshxmcfq2pcmnkkqcxfmi401m2lm0bx" } }, { @@ -15021,6 +15301,18 @@ ], "commit": "08208ca7b9dc4ac940ce9ca1f79424d2f3d3d391", "sha256": "0yspf51h5b7wbqvi9lbd22chyw799n5d05xdzl5axg0i33lzk7bq" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "cl-lib" + ], + "commit": "08208ca7b9dc4ac940ce9ca1f79424d2f3d3d391", + "sha256": "0yspf51h5b7wbqvi9lbd22chyw799n5d05xdzl5axg0i33lzk7bq" } }, { @@ -15439,8 +15731,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20200301, - 31 + 20200326, + 2154 ], "deps": [ "dash", @@ -15448,8 +15740,8 @@ "multi", "shut-up" ], - "commit": "f8a1af8cfdf9093911a159f73d39ba4f1f671e6c", - "sha256": "1gni984j1jlv2is0ah4730xalhv96wimm1iziavbsrsm4hcqqcgh" + "commit": "f278a0e13ecd6b00cd7b056a2e36021322bed8ea", + "sha256": "1axib3rgy7kdyprpp8cs94rc9yr34faii4n9f70jjkk6x7pr398m" }, "stable": { "version": [ @@ -15779,6 +16071,21 @@ } }, { + "ename": "curl-to-elisp", + "commit": "11453864d71c7853bc743341db7ca071126ca160", + "sha256": "16qyw6yx5vlm32ikmgxhf162jjl1nq7lmrcn6g43fkk93id0374n", + "fetcher": "github", + "repo": "xuchunyang/curl-to-elisp", + "unstable": { + "version": [ + 20200321, + 953 + ], + "commit": "79da15f739984e3ce3e0b137df3634582abb4546", + "sha256": "04qjap6wsjd8kdz47bz1a11h1bdn7bmlvfg6y0bqy5yq55f4ampa" + } + }, + { "ename": "cursor-test", "commit": "6439f7561cfab4f6f3beb132d2a65e94b3deba9e", "sha256": "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1", @@ -15959,17 +16266,17 @@ 20190111, 2150 ], - "commit": "bd990e4a3a3f821b395b58e6d68b0bbd8f406241", - "sha256": "0bn1c1iw6598zpfhmrj35hyqj8ylj84gwsn59kk62bf8hqvrwabf" + "commit": "6a30fecff5decdf20029763afea6183de3177dc3", + "sha256": "1qdxr4wdl7mmbahsdhybq4qmc6ahf2h342gf6y99y6jkj8akvjy3" }, "stable": { "version": [ 0, 29, - 15 + 16 ], - "commit": "26cb654dcf4ed1b1858daf16b39fd13406b1ac64", - "sha256": "1b76f47yhalg4pipiarmax3869bwbv43a4qs8h1qrnibyzpwfy2z" + "commit": "c8425604fc3e4ea846016689942fa98e886b5f4f", + "sha256": "1794w6d9ams691ah8sah93vzb97wpss0j36z0fcn3sfvnf8kvpby" } }, { @@ -16167,8 +16474,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200223, - 1146 + 20200325, + 546 ], "deps": [ "bui", @@ -16179,8 +16486,8 @@ "lsp-treemacs", "s" ], - "commit": "e7a5144ce746942b00a21d35a1ca8be71195f5d4", - "sha256": "1ryn49v89d204f7dhdc6igw03vzz5gzqrpqmsdrcxcj5yci2wxyk" + "commit": "e2086fc9fbde4413f779b314bd5a93f808a3fb78", + "sha256": "1ig4s5aimd7zfyaa4fgb584lpzmi38kbfqc4jncifh0i69mi6x9k" }, "stable": { "version": [ @@ -16578,6 +16885,40 @@ } }, { + "ename": "dashboard-ls", + "commit": "656977197e0030525c52b14de8f6e1faa042daeb", + "sha256": "10dsdzps7kh3v5p5grdjwf2xjr7rvaiqp57fg9vh4pficvhylqaa", + "fetcher": "github", + "repo": "jcs-elpa/dashboard-ls", + "unstable": { + "version": [ + 20200329, + 1443 + ], + "deps": [ + "dashboard", + "f", + "s" + ], + "commit": "9026fd157f94b023a7b660a418b66ad638b14272", + "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "dashboard", + "f", + "s" + ], + "commit": "9026fd157f94b023a7b660a418b66ad638b14272", + "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + } + }, + { "ename": "dashboard-project-status", "commit": "dfc05873c6532c866d89c4cc07eb84b447a25c70", "sha256": "1r25xmscz3lrjm6jjix416py26za5l1ck3xa77qbyrr4rf1gsakg", @@ -16811,15 +17152,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200314, - 2116 + 20200325, + 1337 ], "deps": [ "ccc", "cdb" ], - "commit": "2dcd552b314bc64daa40fd7ac09937439e447548", - "sha256": "1scixb6s795hjmkpkljccxg8ja2lqkja905gg5lmp09vykf8x5ir" + "commit": "37593d191b255d8633231099c70b1b26b3da0d39", + "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" } }, { @@ -17610,14 +17951,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20191223, - 26 + 20200329, + 1724 ], "deps": [ "cl-lib" ], - "commit": "fb9eb1cd3c4c6ed24b93de1a7cfb369d2983be74", - "sha256": "0ksp86izjw7vgh21jn4rwl5vnfn1jvgs05lv216mnwia8p14ihjz" + "commit": "7fce94f7d5eebea06aed153b0f574567182c8d2b", + "sha256": "11m9ab7ymvbsxgddwxwcr8mrll3m67lnib8bpmb9vmh16zb2mzcl" }, "stable": { "version": [ @@ -17712,19 +18053,20 @@ "repo": "retroj/digistar-mode", "unstable": { "version": [ - 20160218, - 1955 + 20200322, + 2109 ], - "commit": "15288b1e1a04b79b5ab7097fdd26d48b2ff41076", - "sha256": "0qxdfv1p0140fqcxh677hhxwpx1fihvwhvh76pysn4q4pcfr6ldr" + "commit": "567fff3933f80f00f53610e7b08f75bb636b12c0", + "sha256": "0252lhkv2r8gy4512frhdh381xrf64nspvfm2hp7bkhz47dlrs7y" }, "stable": { "version": [ 0, - 4 + 6, + 1 ], - "commit": "0dcde58ec6e473042e55d4f283b223554546de5b", - "sha256": "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6" + "commit": "8b350b7a143219b3f927cb3a1aeb16a299363f05", + "sha256": "1sxfzirl8kgzmq8l9l868yl92mz1r8yk58fnxf7p6z4y0pdlcqfg" } }, { @@ -17840,8 +18182,8 @@ 20191127, 1326 ], - "commit": "96b47cf90360e4bd19138fe82dc59bfa86c7bf7d", - "sha256": "1ar2bl1w4s3gx8slryf5qzq4qzprdyhm1fngvlnfhxg83k2g3969" + "commit": "6ec6ebc391371418efc6c98d70b013f34af5a2ee", + "sha256": "0q8pihj9fwq9w978ycmvzv8kq8ksrdf8zfadjy8i2iwc4ib0jg7y" }, "stable": { "version": [ @@ -17884,11 +18226,11 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20200308, - 2331 + 20200329, + 35 ], - "commit": "e13541621e6fa82510fd5cb6ff029c1a134d0bfc", - "sha256": "13l33z9ydsh7m2d91dh2m2hin051k9ydbnbww40mpmsimmc90pxi" + "commit": "5298af739ce30bacadda892b620858b95709c84b", + "sha256": "0dlgk66mcbzdbpw0xn6l7fxjayvgczccsx0igda9745pwm8yvy9z" }, "stable": { "version": [ @@ -18256,17 +18598,17 @@ }, { "ename": "dired-k", - "commit": "7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7", - "sha256": "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1nimv6rzk0rrzvniirrsxzd78f4yil1aajcxyra2nmx7dr4xszqh", "fetcher": "github", - "repo": "syohex/emacs-dired-k", + "repo": "emacsorphanage/dired-k", "unstable": { "version": [ - 20200315, - 1214 + 20200322, + 2035 ], - "commit": "256a73b170dfb16e4d7355ce5e9d9caacff2acd9", - "sha256": "1b464mr56azv5xmmfs9y5bzn1z3gicgz9g8ayvbbq1f293zxzd44" + "commit": "1f90cf6ac932ad30ccfefec27ea7e514c24ab335", + "sha256": "1bmpn18z42i8dy331yrks5gsivpvwj677yc58iw66ckjnyjnyjps" }, "stable": { "version": [ @@ -18285,11 +18627,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20180607, - 1841 + 20200318, + 1715 ], - "commit": "ad45940f76ef2f6c3bb55e998829b311de191dae", - "sha256": "057nqlvqnq30gxfidmynp33040bgdq4gbwk0qdm294c5ap2af5yj" + "commit": "1f73233065ddb077adb7019ae33efd8acce9b561", + "sha256": "1sc0y7ffvyq5785gcmlgkkblz1nyyx4a5h1m1bi50zkqpna1pxbf" } }, { @@ -18655,14 +18997,14 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20200229, - 1525 + 20200319, + 2357 ], "deps": [ "dash" ], - "commit": "1f93e3f9cae5ec171939fe5c1fe9744a28fa6576", - "sha256": "0xkqn4604k2imas6azy1www56br8ls4iv9a44pxcd8h94j1fp44d" + "commit": "1daf479b9b7600ce9681f2a980deae7fcb2f3d59", + "sha256": "08hwjd1xmq6hxab537zm11kwqhwnc1dfznfqzy66c4agl9z9a7vx" }, "stable": { "version": [ @@ -19583,11 +19925,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200313, - 1851 + 20200329, + 1548 ], - "commit": "2850e2401c214db0bf0fa7e4773ef4f44ac6df86", - "sha256": "1lcw2s6yzvqxhgwv75q8ibmdm4j0z68j10j19jiir56x5bw426g1" + "commit": "e788ec71dafdd57a5c0eb3633794abbe3355f0c9", + "sha256": "19zqhcjpb23h4nn9h22jn1gh7a53y5v8f52809scl3vif0ch9b2h" } }, { @@ -19702,16 +20044,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200311, - 1726 + 20200322, + 636 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "06a79f5c5035b12c3110a7ab43b48e50217a2ae7", - "sha256": "0pgng5nqc3cj7bb57l0abqc2sr1542lgv7271i602k56sg7ak431" + "commit": "0642f7107102e88fb8818da02e6612c6855537ff", + "sha256": "1wmsrvzbvixzps6zp1d2r5fn7gkfwvjz2ksjqd6a8sd4swdx9ggk" }, "stable": { "version": [ @@ -19736,14 +20078,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200313, - 1948 + 20200327, + 1325 ], "deps": [ "cl-lib" ], - "commit": "b51ab8f35cbbdec137a1b84cd9b07df6735d3d0e", - "sha256": "1yj0c7lx1rg31245yrrjza82m64bwk2686ydijkrd6j4pn9ksmck" + "commit": "bbb3725af973485424f6ca716b648923defa176c", + "sha256": "0pybwshmcfj0ll2hjcdrqdqbf6crn10pjlkbiyf3k23w5ayaql49" }, "stable": { "version": [ @@ -19972,20 +20314,20 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200304, - 1730 + 20200324, + 1726 ], - "commit": "ed2f68d85b637636a4f7b782f19ee4f8e9f6fa44", - "sha256": "19qvkrknnhkr77hkyv9x1dg6m4difwz59sy2mqzw50wfb6vsy17n" + "commit": "e4672e22885772d2be0c75df03c4f805f1acf5fa", + "sha256": "0pb0q8grybzl3sh75km93n1cvk7wh5c2r2nbm8rkwzzhxrhrvffl" }, "stable": { "version": [ 1, - 5, - 1 + 7, + 0 ], - "commit": "66e429f4d576346661ae3a111bafaa06febc1d94", - "sha256": "0lyy8vjzzcfcj4hm7scxl4cg4qm67rprzdj7dmyc3907yad4n023" + "commit": "7751d4d3115c5e873b73b670248c49ce8910997e", + "sha256": "15y2djc5jljlvls1x9kp50m1kp0dcksmyixafsyimj66xpq9ngh0" } }, { @@ -20184,8 +20526,8 @@ "repo": "dtk01/dtk", "unstable": { "version": [ - 20200314, - 247 + 20200315, + 1931 ], "deps": [ "cl-lib", @@ -20193,8 +20535,8 @@ "s", "seq" ], - "commit": "230ef5ca2fb0de3d4977942e19ba0c1f65bd5dad", - "sha256": "1x2bnammsbz9d2mz8nspzaa4wqda4s4v8p93g2i4ykwd4c2w00fl" + "commit": "d21a5b7958da058bb53d36fe9234089409f62c5e", + "sha256": "0w46yr5d108z2pipvh449p15qnm6mnix21pbnq3alczilzxzf9lw" } }, { @@ -20356,8 +20698,8 @@ 20191016, 1241 ], - "commit": "d9c34d1dc421850544ab7f33a23322a7748c2db4", - "sha256": "1wjdm7vk4r580lnyxy9h92xq1f3wfklbqrnnv8s94fjfj623bx6b" + "commit": "d864995d98479a21fb88fcf6d24b8262f2fdeae2", + "sha256": "091c58yvvwly070dgzz1202njlp695fzq85873v4dak1rwxisrwh" }, "stable": { "version": [ @@ -20722,16 +21064,16 @@ "repo": "aki2o/e2wm-term", "unstable": { "version": [ - 20141009, - 1308 + 20200322, + 729 ], "deps": [ "e2wm", "log4e", "yaxception" ], - "commit": "65b5ac88043d5c4048920a048f3599904ca55981", - "sha256": "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw" + "commit": "74362d6271e736272df32ea807c5a22e4df54a50", + "sha256": "1cr2mp1visx4fnxc73sk6gw7wnl1mxfb624rm1sxz7wwry8b8fx9" }, "stable": { "version": [ @@ -21025,14 +21367,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200308, - 2130 + 20200327, + 1040 ], "deps": [ "parsebib" ], - "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10", - "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz" + "commit": "f57e138d56bd293f30a64c33ab8b374758acfb08", + "sha256": "0h8bxy6p91hhx6mvzbxv2j3cr6bxcdbpgbaqa9ibcaxy72d9xrjp" }, "stable": { "version": [ @@ -21432,6 +21774,24 @@ } }, { + "ename": "edit-chrome-textarea", + "commit": "d9e8d07ed13d190a8a7eab75a59ec5b9a01d97a8", + "sha256": "0xp7925y04gr09j204r01jq7hqjp32gqsazwsbih4fkx0n30aqbs", + "fetcher": "github", + "repo": "xuchunyang/edit-chrome-textarea.el", + "unstable": { + "version": [ + 20200324, + 1513 + ], + "deps": [ + "websocket" + ], + "commit": "7074fe87c2df4aa7afecb7513326f5d481dcf92d", + "sha256": "17kbakpr6d79cih1fmvnrivs0vk41fw0njhb5y6dbml6ppi11i57" + } + }, + { "ename": "edit-color-stamp", "commit": "2ad2ea105b895cb958ce0ab2bf2fad2b40d41b2f", "sha256": "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8", @@ -21887,8 +22247,8 @@ 20200107, 2333 ], - "commit": "39d416a6ef2c1f863a9482e7ada59d5da6fb7883", - "sha256": "0f66fnzkwl37qp8rj3hhnnayx27l06c18n7x3422pvbgxc78c7i8" + "commit": "6ea43326d142b714363042a27e06d3487f7845d7", + "sha256": "0pvaz69rjaz8m32s4chq7kavf20njb78l380xl97blj9h0yry1l4" }, "stable": { "version": [ @@ -21908,15 +22268,15 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200113, - 1722 + 20200320, + 852 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "606e234ea867d057f201fde9a4de2a896f35782e", - "sha256": "0fjgy377vb3znzlb49xjf5a6k4ihmql1lbiaw2fla7282r5z5ja6" + "commit": "2209779972eee595ff6ea8e75c002f7e5726b0c8", + "sha256": "08mfgg9s76wmjzvpdirnm8rsa3fsvlvjivxjdn53aj1pnky55z8d" }, "stable": { "version": [ @@ -22033,8 +22393,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200314, - 443 + 20200328, + 2131 ], "deps": [ "anaphora", @@ -22044,8 +22404,8 @@ "request", "websocket" ], - "commit": "a0943af912bdda3bbe5a5cb2b49cb529a20a5a6a", - "sha256": "15713bv8aqsfh8zf80qsys7sd81hs0bx691jwmrdfhvdi1nyp8qj" + "commit": "6fc75f20aa0b6666e743ce674c6da526f88793b1", + "sha256": "10cm3pvpjrqy76xd9067ayn108z34014cyaal4vj2l69yrkfr0m1" }, "stable": { "version": [ @@ -22119,8 +22479,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200308, - 1421 + 20200325, + 1455 ], "deps": [ "auto-complete", @@ -22129,8 +22489,8 @@ "direx", "spinner" ], - "commit": "046bffbaac2a78e440d39a1f1e2dd8055a39f3bd", - "sha256": "0ccww05ivqgsvvrhjlwlciv00213qar4sdzawzmxh85vxj3a045b" + "commit": "5bf46fc49b7827604ee82d56b80eee36630b562d", + "sha256": "0dcnzq9l1mnfrn7rq8kvyfkbw36r6iagp61c0p757xwfawsaxns4" }, "stable": { "version": [ @@ -22556,11 +22916,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20200224, - 1509 + 20200322, + 2027 ], - "commit": "61cd3834f8650a13d34d845138e40c5aaab75cb7", - "sha256": "0l3hv190xkzyalfnxsb0x7npmwdgf9bpc0qdi7p7issbf0vrjp4n" + "commit": "94b0afb9bac32fa72354517347646166d6bec986", + "sha256": "11gj67d83hx9wfjf4j277jy8jxf97i6bd9r8r057v4i8301qh91p" } }, { @@ -22628,11 +22988,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20191102, - 1433 + 20200316, + 1956 ], - "commit": "913786070769fac83e7b8ef790b57c8d8cbf8853", - "sha256": "0lgwixznvrmgzkridbsmhxqdsgchs5k56vb8nmpmchgf08qvaiz2" + "commit": "7fa3b78d073c235ad945fc28d692c5f5fb60860a", + "sha256": "06cy6dsn3drfk0jkc10b96qzvi5rfhkjy7cib5dk2kqgg615is6d" }, "stable": { "version": [ @@ -22690,15 +23050,15 @@ "repo": "stardiviner/eldoc-overlay", "unstable": { "version": [ - 20200216, - 546 + 20200328, + 619 ], "deps": [ "inline-docs", "quick-peek" ], - "commit": "3123b20f26d2f74033de6feb398fd36745c46e14", - "sha256": "16crwazyn28qyb9zax1jfz2favgw402z676yf67qchgzsf2jj43s" + "commit": "ec318acb564ac5679285b51b7d979410d393fac9", + "sha256": "0dx1b9d7zyqcwsnhl18hyrkmrc0zy68zwhp81d43fw84gjb4jcx8" } }, { @@ -22940,28 +23300,28 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20200222, - 7 + 20200328, + 1855 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "f14c0526676dd90be62b6aa086462047f7ac2da0", - "sha256": "099ch2jlj0fxn3d2v6z9rymkqbkrm3xp0bz4zkqbm54qcvdwib79" + "commit": "916c47b3590b2ff3c5075dcc1def4b36a4b14947", + "sha256": "1vhchbyy3c79cgvdz12wnryklr5g1bwh02d604zj2wca3b0199w4" }, "stable": { "version": [ 0, - 3, - 0 + 4, + 4 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "f14c0526676dd90be62b6aa086462047f7ac2da0", - "sha256": "099ch2jlj0fxn3d2v6z9rymkqbkrm3xp0bz4zkqbm54qcvdwib79" + "commit": "916c47b3590b2ff3c5075dcc1def4b36a4b14947", + "sha256": "1vhchbyy3c79cgvdz12wnryklr5g1bwh02d604zj2wca3b0199w4" } }, { @@ -23082,11 +23442,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20200312, - 2343 + 20200329, + 2310 ], - "commit": "0d74766f0c081f8db1292a61889e625bb9a8a758", - "sha256": "0j72w9bjgywiwrgw4hfjhgzmlzy68v4wfpsaa78f3vlnkjca82is" + "commit": "57dd4ae3e47ecca6cb9eee87328f159b3eb53702", + "sha256": "15cjv97240nnmjjbdx9iqz4qwxvbxxsyjllcjwbmkkbpv6x91b89" }, "stable": { "version": [ @@ -23151,24 +23511,28 @@ "repo": "gonewest818/elisp-lint", "unstable": { "version": [ - 20200217, - 38 + 20200324, + 2217 ], "deps": [ "dash", "package-lint" ], - "commit": "7a3866326631ba1ba8f4cd7a6cfd03c467c32aae", - "sha256": "1ldyv0c21dvl362kj566q8gd84gqq8g558slxyl73cf651q0nr84" + "commit": "35a3fcc3131c243206fa914b8562cda771eab8c5", + "sha256": "09ibaq3mjnw3vm1rwrljdcgybxly2fk9gjdim39s9fpgar4ys12p" }, "stable": { "version": [ 0, - 3, + 4, 0 ], - "commit": "d4dc13addde8cacd7660efcb369af5e54a547114", - "sha256": "1zyy8dj11sn74wq86hibp17a1zbps2pv26ncn8fh8wvsfy1vdfif" + "deps": [ + "dash", + "package-lint" + ], + "commit": "2b645266be8010a6a49c6d0ebf6a3ad5bd290ff4", + "sha256": "1gg9ik0x67cnldzsclp45i7gf190y9pxl11k3grdkrkqjiph1375" } }, { @@ -23673,8 +24037,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20200202, - 2031 + 20200329, + 1830 ], "deps": [ "company", @@ -23683,13 +24047,13 @@ "s", "yasnippet" ], - "commit": "b25ab8c195472cf152fed80c212750b33837025e", - "sha256": "1nidig1yxr1fbwkfhpgd5zyqkd4mi5bp5h9bg17azs79xqprkrfx" + "commit": "fc54812f5f53889842e7e707727e50d9589443ca", + "sha256": "1jdpg6vq88kxg1wfhp9hwnvfadxazmznzscfhvr967fbgq46w6qj" }, "stable": { "version": [ 1, - 32, + 33, 0 ], "deps": [ @@ -23699,8 +24063,8 @@ "s", "yasnippet" ], - "commit": "d54e78edad91660caaabd19e4a6e416889ccfe31", - "sha256": "0f00mdnzx6xqwni86rgvaa6sfkwyh62xfbwz8qsar15j0j6vc2dj" + "commit": "b69ae7652e5efdda2e3dc650cd425b987ddd65ad", + "sha256": "1g9x67dvg5al6i9hnjcyi0zjsz71iv2jbinpzj7gcx77d0dn3cpk" } }, { @@ -24199,10 +24563,10 @@ }, { "ename": "emamux", - "commit": "6de1ed3dfccb9f7e7b8586e8334af472a4988840", - "sha256": "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0y75dnaz65fwk8d9l6n1bkbj32rcmzaf58fhj686b1n55bsz3xz6", "fetcher": "github", - "repo": "syohex/emacs-emamux", + "repo": "emacsorphanage/emamux", "unstable": { "version": [ 20200315, @@ -24222,10 +24586,10 @@ }, { "ename": "emamux-ruby-test", - "commit": "f11759710881bdf5a77bd309acb03a6699cc7fd6", - "sha256": "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1lk2fpqnmzh1gsbp9pkh36lgr76sf2mbf12577xs4scia7xr29bc", "fetcher": "github", - "repo": "syohex/emamux-ruby-test", + "repo": "emacsorphanage/emamux-ruby-test", "unstable": { "version": [ 20130812, @@ -24690,6 +25054,38 @@ } }, { + "ename": "emoji-github", + "commit": "64d18d6bb06d2d747b101845d3ed298787abaec0", + "sha256": "09b9kyx1zzi1i2m4isvnhb5526589vscv81xg35pgxwv6ilkky4z", + "fetcher": "github", + "repo": "jcs-elpa/emoji-github", + "unstable": { + "version": [ + 20200323, + 233 + ], + "deps": [ + "emojify", + "request" + ], + "commit": "43f63c0dd64aae6c8054c2dad617bf810abdfadd", + "sha256": "0wcxsy3q8912kf87bn3mi2si010i5dd99yinf23nhb2nqvqgiw94" + }, + "stable": { + "version": [ + 0, + 2, + 2 + ], + "deps": [ + "emojify", + "request" + ], + "commit": "5d1512fb30c65018a507ef549d92c668d8221da3", + "sha256": "00dj0kfllyhiklylj4cjcv64zjaxs6a4cc79f8pppmzvf1spivvz" + } + }, + { "ename": "emoji-recall", "commit": "8f03b34d3e8e5edf9888c71b6e4bd2e1a5aec016", "sha256": "06cahk2h6q3vlw2p4jmjrpzycxpm884p31yhbp77lagkqhs2fzbk", @@ -25082,8 +25478,8 @@ "closql", "dash" ], - "commit": "edf8c009066360af61caedf67a2482eaa19481b0", - "sha256": "1ml5337wbw2zsf1vwv5svwvhd93jgl9sq79l1byiz32bnb0q5nhh" + "commit": "37f06fd2daca6a7afa163ceb0ccccd450af85e68", + "sha256": "18prjspaz4wlfrk2zzzzpxs4z8dkxxx68sbq2b4bdgg34fgnj02z" }, "stable": { "version": [ @@ -25280,20 +25676,20 @@ "repo": "leathekd/erc-hl-nicks", "unstable": { "version": [ - 20180415, - 1946 + 20200317, + 16 ], - "commit": "756c4438a8245ccd3e389bf6c9850ee8453783ec", - "sha256": "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f" + "commit": "a67fe361c8f2aa20fc235447fbb898f424b51439", + "sha256": "0k57scxa8rm859fqsm8srhps7rlq06jzazhjbwnadzrh8i5fyvra" }, "stable": { "version": [ 1, 3, - 3 + 4 ], - "commit": "756c4438a8245ccd3e389bf6c9850ee8453783ec", - "sha256": "0c82rxpl5v7bbxirf1ksg06xv5xcddh8nkrpj7i6nvfarwdfnk4f" + "commit": "a67fe361c8f2aa20fc235447fbb898f424b51439", + "sha256": "0k57scxa8rm859fqsm8srhps7rlq06jzazhjbwnadzrh8i5fyvra" } }, { @@ -25618,15 +26014,15 @@ "repo": "ergoemacs/ergoemacs-mode", "unstable": { "version": [ - 20190527, - 348 + 20200319, + 1250 ], "deps": [ "cl-lib", "undo-tree" ], - "commit": "7d3656541a00cc04ba4cefa31c0d127adb5a260a", - "sha256": "1rw237xiw5nz736l5jdmlsa11l14qvzdac0wqymi80a0rfwqikga" + "commit": "4a6ba06d9c618e9380d059fa25ed677b45d134a7", + "sha256": "0wgdzxla6kz1zfc3vfd8wc2j40kq023z7b83m2k435hcqdffark8" }, "stable": { "version": [ @@ -25673,18 +26069,18 @@ 20200313, 1030 ], - "commit": "bd554119dd80e0e0f71e2e948e69eaff5ff6a88f", - "sha256": "00qp7jp4zmdklilj8vjmrd1s4wy6kzcmcdv3klb89whiymc7jxiq" + "commit": "f805a35f696d965b297de3988a2340f86bfe88ba", + "sha256": "102yzbgmqyy5m74zhr8kaai17dyhg8k6w0ykxyvmb0q7ghwaq01s" }, "stable": { "version": [ 23, 0, -1, - 1 + 2 ], - "commit": "2b823b90b7dbd56aae3a3fbdcb182f9fd5127a59", - "sha256": "00dsbnii0w56jmbzzn43j18rprmc4d2ckd8ad0kzc6cb856mxs9s" + "commit": "a24425668beed38e04039c292361e09c4826683f", + "sha256": "1i91p2hsajcwjqv10ri6jj2a94g68mb6fmxqx47g50fbc5f0dqj5" } }, { @@ -25826,8 +26222,8 @@ "repo": "rejeep/ert-runner.el", "unstable": { "version": [ - 20180831, - 1145 + 20200321, + 2158 ], "deps": [ "ansi", @@ -25837,13 +26233,13 @@ "s", "shut-up" ], - "commit": "90b8fdd5970ef76a4649be60003b37f82cdc1a65", - "sha256": "04nxmyzncacj2wmzd84vv9wkkr2dk9lcb10dvygqmg3p1gadnwzz" + "commit": "1829f05c46b0baaae160d900f89c8881f4fcdbcc", + "sha256": "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98" }, "stable": { "version": [ 0, - 7, + 8, 0 ], "deps": [ @@ -25854,8 +26250,8 @@ "s", "shut-up" ], - "commit": "00056c37817f15b1870ccedd13cedf102e3194dd", - "sha256": "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf" + "commit": "1829f05c46b0baaae160d900f89c8881f4fcdbcc", + "sha256": "08gygn9fjank5gpi4v6ynrkn0jbknxbwsn7md4p9ndygdbmnkf98" } }, { @@ -26206,11 +26602,11 @@ "repo": "zwild/eshell-prompt-extras", "unstable": { "version": [ - 20200310, - 809 + 20200319, + 322 ], - "commit": "6a30813893e04ab8c0793757cdb2ff9873ab0c56", - "sha256": "0vk30sq0p3afpaw9phmfpglvhs01f97rhm3ygzwiv8h4smy9zgsj" + "commit": "1801b3aeccf1363f138fe01ee99d892d10fc2a07", + "sha256": "1dgfd9yf4ikn5whqpxyliyp21vs1h852wjfqy5lmxzhnzic1xsi1" }, "stable": { "version": [ @@ -26422,11 +26818,11 @@ "repo": "walseb/espy", "unstable": { "version": [ - 20180929, - 1602 + 20200317, + 2333 ], - "commit": "b64a99185c96c20d4d4caa3daf1f5510b039bd6a", - "sha256": "1i8wc55rihah39i95w0rryp5scq8v3zyk4cayw5pz8g5bbl8w4zb" + "commit": "2c01be937a5e5bde62921684a0b27300705fb4e0", + "sha256": "1nnnr184y29g1svxqxlqyg5irzrf1xmay4p78jfv8v07sisl90kp" } }, { @@ -26474,14 +26870,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200314, - 1134 + 20200328, + 1547 ], "deps": [ "julia-mode" ], - "commit": "a2fb8ff841b08c70b1c401724b92afc0c2b496c4", - "sha256": "14arrqjji44kw2mizz6rnsnjzbjiv4fca5632f8lwplgsr63j8nk" + "commit": "1c2387fdba509c1c9d072150f65ccc318a570870", + "sha256": "0llsjqrvabcvpd2nhixiklwmm2lisywif77iwfrsdc6lfxp8cdd0" }, "stable": { "version": [ @@ -26616,14 +27012,14 @@ "repo": "jschaf/esup", "unstable": { "version": [ - 20200130, - 2034 + 20200318, + 2256 ], "deps": [ "cl-lib" ], - "commit": "4e5bf7d265c3b1484017fc0fd0ad50d2403c2bbe", - "sha256": "1jdsy5bqnmbai7kylidyfd0nla26apqvfl2f6vdvjs02hlr1w2s7" + "commit": "c9c95e245068d15d8e2732098af9a5d2bc8ec931", + "sha256": "0i4cwwvs5zs8g2ajrrkqgrpxzywsa255rc1g7a6bxzvg9hk77f4k" }, "stable": { "version": [ @@ -26649,8 +27045,8 @@ 20171129, 807 ], - "commit": "5548ceba17deae0c3c6d0092672edc4de3c75ce3", - "sha256": "00vv8a75wdklygdyr4km9mc2ismxak69c45jmcny41xl44rp9x8m" + "commit": "193d199305e7abcb5ed795b9bc5434ded20ae60e", + "sha256": "1cbzdwfndz6pdmb3vzb6l2smxb2l47sncmkccya0nzlvvhz3p8c0" }, "stable": { "version": [ @@ -26958,10 +27354,10 @@ }, { "ename": "evil-anzu", - "commit": "06b0609b56016d938b28d56d9eeb6305116b38af", - "sha256": "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "08cc33wjq5853c0hqwn30342ylkfldy7xg7yd2ak0apjxnz4qr40", "fetcher": "github", - "repo": "syohex/emacs-evil-anzu", + "repo": "emacsorphanage/evil-anzu", "unstable": { "version": [ 20170124, @@ -27133,16 +27529,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200219, - 1042 + 20200327, + 722 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "a478a95a8a3665e40bdae3bab2a0519db6c1f29c", - "sha256": "15ii5lw6hs4yyl22yyzfwzagdma2sman4rm5gq4m9773g4ava515" + "commit": "2df9bedfa48bdc22e46bf4d43f6e2792d4cafbea", + "sha256": "17737k612gl5bhkkq8fdivk9rxbcypfl9hnm3mbp5v2wpr8chw3a" }, "stable": { "version": [ @@ -27864,11 +28260,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20200222, - 901 + 20200324, + 2310 ], - "commit": "fa40dab8d2f010db17e1e62dfd245c1504d0542f", - "sha256": "0dn712k54qsxy82jqbqip77k5i3zv8m7afj2yi39zqx28iqvic0z" + "commit": "4387407615258d5e95f71bfb425cbe92dd813290", + "sha256": "0v31gbn423g20lqksvbc72z325lh0qjmgz8nhy8ygqli4b2msvzb" }, "stable": { "version": [ @@ -28185,26 +28581,26 @@ "repo": "porras/evil-ruby-text-objects", "unstable": { "version": [ - 20190821, - 1527 + 20200323, + 1552 ], "deps": [ "evil" ], - "commit": "0ddc4c256a0c778fa65d75b707f20df874e5b5fa", - "sha256": "1ppwcyfy5dssswfzd16i1rx14si5r80mdvrnfwaf9jr3c2ws23lg" + "commit": "32983d91be83ed903b6ef9655e00f69beed2572c", + "sha256": "0qha7xxqxh7c6n6r26r49y85inxcbr4nvxlv2zzj0qkifw7f9ana" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "evil" ], - "commit": "93cfc5ae3da0ffb19319e301734c51ecb43506b5", - "sha256": "0jizvchrisrdc7bl6xfc59axyjz1dmr6hi36jyv1bdwyayj2ifqi" + "commit": "e69abb6aad7687222cb47a8a64dc4dd66ef96a9e", + "sha256": "0m1ilv4w4rlg8005cqp5l5dwdhqnrf1mb44qmvd8qwkl2rvslsbs" } }, { @@ -28584,10 +28980,10 @@ }, { "ename": "evil-textobj-line", - "commit": "24bf766525ffdaded519ac9f78ae89d8ab5108ef", - "sha256": "158w524qzj0f03ihid2fisxyf1g7vwpv3ckfkzi7c2l549jnsdsa", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1jwhg56nhf5iv7zbfdzi6ygikc49bnrqh1r5kd98n5wxz9vz2h75", "fetcher": "github", - "repo": "syohex/evil-textobj-line", + "repo": "emacsorphanage/evil-textobj-line", "unstable": { "version": [ 20150729, @@ -29512,11 +29908,11 @@ "repo": "thblt/eziam-theme-emacs", "unstable": { "version": [ - 20200124, - 1045 + 20200327, + 1810 ], - "commit": "9ae0fdb2ad751044b3bd60aee08523d460db2bd6", - "sha256": "0gvf7g5s7wrchwbh0bnr0ryx9zaw56mx09bd4f32793lpv9sxyi6" + "commit": "7a585de01b6fee081eaa167b09d7e12d02cf4149", + "sha256": "11v8rbaiaihpky1m7azbflz77mwg76nbg8hsgybs86wyjk5797dv" }, "stable": { "version": [ @@ -29824,6 +30220,29 @@ } }, { + "ename": "fantom-theme", + "commit": "e5cb6a9f6a657b72a00a39c118d90416ae2f343c", + "sha256": "18p82f82hr1sx8w9lmjxr3hvvy4ddxvyd245v32vjay5zc730y33", + "fetcher": "github", + "repo": "adsva/fantom-emacs-theme", + "unstable": { + "version": [ + 20200328, + 604 + ], + "commit": "2c1c7fd53086c2ff86ee0961642c3b58e2343c08", + "sha256": "1clvpjsf241fdkk3915zjqb4wivsjsvc9phf633pzbvi61qwhaap" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "70cef2886ca90c93bcafc869bcc77bad1e390c33", + "sha256": "1q15wx53zq6b9f567anrfmfpj04f3r6wz28w4237f9lg62yqhm9x" + } + }, + { "ename": "farmhouse-theme", "commit": "3b0d427db8ab66d2fe323366b0837595b3b59afa", "sha256": "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229", @@ -30055,6 +30474,36 @@ } }, { + "ename": "feather", + "commit": "ffb7d037679110473a8c3f9e98f737ecaba37c40", + "sha256": "1k3sxwpibk5sdim4pzfi83pzsm4vnq0xl006dy76pv363r9mvs21", + "fetcher": "github", + "repo": "conao3/feather.el", + "unstable": { + "version": [ + 20200321, + 1237 + ], + "deps": [ + "async", + "async-await", + "page-break-lines", + "ppp" + ], + "commit": "529b7ec69f1694d7dc8aacb5066cf4ddcf24cc58", + "sha256": "0flph6yv5fj5ladksjqfpj9j8p2jcc102kbc833bvx1cnmjx7qk4" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "4cb69055cfc42841bad1de072f69dd6923899766", + "sha256": "1fq5ysxwiaah56rizkc47vjqi8906af3ga1n1frvrvap8m9vdz4m" + } + }, + { "ename": "feature-mode", "commit": "0a70991695f9ff305f12cfa45e0a597f4a782ba3", "sha256": "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg", @@ -30503,6 +30952,21 @@ } }, { + "ename": "fira-code-mode", + "commit": "0dc34b2d3cfd5e48df0fbe2086b8b4be1358dea4", + "sha256": "09i3xyk1xj7j895xmjwmxl1gaw73j9y22c5mgnavq0sm3fbpk4w0", + "fetcher": "github", + "repo": "jming422/fira-code-mode", + "unstable": { + "version": [ + 20200316, + 1708 + ], + "commit": "64c4e655ea6ef29c7e720a5bf9281e865f2e3fa7", + "sha256": "0c11lfwdibx35wwvpq3vl4img4rz2slslqhlqaqbab212ii9jsmy" + } + }, + { "ename": "firecode-theme", "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c", "sha256": "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739", @@ -30606,11 +31070,11 @@ "repo": "IBM/firrtl-mode", "unstable": { "version": [ - 20190224, - 344 + 20200329, + 2002 ], - "commit": "e55c555809037b7aaf2367ad2255f0a27addd23a", - "sha256": "1nsihyx9znblc4kxyk06r7alhd4wh67312zwp9discgyf4ksm572" + "commit": "fa40141411a876ce7a1a9d6d3fe47134bc1fa954", + "sha256": "1pj7b8ppkbjp8q5dzw5v086v8lp1gv1il6qc65l4nlm8p5iicvzq" } }, { @@ -30668,11 +31132,11 @@ "repo": "marcowahl/fit-text-scale", "unstable": { "version": [ - 20200218, - 1057 + 20200315, + 2120 ], - "commit": "cc570af6b8bda346028d070482f4cb30d438b867", - "sha256": "143mamvmgn4qyax3faknz77hgmkik0lbc48506kdvcg5mgcbzgn8" + "commit": "387acab18f9f4064c051771cf666b8550718dc27", + "sha256": "0mrl112vjsl6ddjv0j2pg97s6zk8c2qb92wqsq775ahr1cbhvbw7" }, "stable": { "version": [ @@ -31302,8 +31766,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200224, - 2057 + 20200329, + 2344 ], "deps": [ "dash", @@ -31311,8 +31775,8 @@ "pkg-info", "seq" ], - "commit": "08345d38e2872a3dcb14228edff796195809266f", - "sha256": "183s05gm7zkgwphrwq0bq9fv2sldhrxjik8skz7rvbz448syh0c5" + "commit": "1751a4e9f8f6f20706a1620429422f101eabcd38", + "sha256": "10w9fgcwyni5iid7sfzrza155wrh481gdylwrwa7v640a9jmbyls" }, "stable": { "version": [ @@ -31521,14 +31985,14 @@ "repo": "alexmurray/flycheck-clang-analyzer", "unstable": { "version": [ - 20190724, - 542 + 20200320, + 428 ], "deps": [ "flycheck" ], - "commit": "223faa244502150d08a34898858a0b4806c92d4c", - "sha256": "1di3d9y0p8g8mndwkzkiiq2svsgk05rnzf7bzfnhig2fchg7ipap" + "commit": "7e1bf9853a34828c7f81d824dc4785f1620f2006", + "sha256": "1iw3vjdnskbk8zlbyvxiwlisj72d7q8nz8n55ffwz3v44ymzhya6" } }, { @@ -32884,6 +33348,25 @@ } }, { + "ename": "flycheck-pest", + "commit": "f0c1b89d79456ecaa22b95f3c292799f5d1aa133", + "sha256": "06nvryshinagp26idjcb1r98k39x4k82cjj735l9kiwpiag53ash", + "fetcher": "github", + "repo": "ksqsf/pest-mode", + "unstable": { + "version": [ + 20200317, + 1503 + ], + "deps": [ + "flycheck", + "pest-mode" + ], + "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023", + "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih" + } + }, + { "ename": "flycheck-phpstan", "commit": "5a2b6cc39957e6d7185bd2bdfa3755e5b1f474a6", "sha256": "1dr0h6cnwxdjmhlackv4gpsljwzs27gk41p8q99r0m44dada9gaf", @@ -33158,27 +33641,27 @@ "repo": "purcell/flycheck-relint", "unstable": { "version": [ - 20200304, - 152 + 20200320, + 2223 ], "deps": [ "flycheck", "relint" ], - "commit": "f498c130408411906bda81c1023a88b1498dcf18", - "sha256": "18sgnj6y9vsj9np58d8cr72jfady0kwdg6rdx667098lbznaw0da" + "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c", + "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "flycheck", "relint" ], - "commit": "39ec5deabdd23afaf6e1e34e13edd14d910899d0", - "sha256": "0m46n91hmh6gml9ravd0d1i79jnl9vbr733na3w0kg87mixnjdy8" + "commit": "296cf8e2f9e85ab0c1c591816b50ecd7c766060c", + "sha256": "148xh1alng4s3ydnhwjjrcmq1390pn6ymjszaamrzljwfqzh85ky" } }, { @@ -34231,6 +34714,24 @@ } }, { + "ename": "flymake-pest", + "commit": "747e1b060e3aa78b91d61abcf2c9a4dc0d4aaf7e", + "sha256": "17bsvrd1g7d5b0z5psx0bvg2ym0bi7dh1vvl8a45dnzpig141f36", + "fetcher": "github", + "repo": "ksqsf/pest-mode", + "unstable": { + "version": [ + 20200317, + 1503 + ], + "deps": [ + "pest-mode" + ], + "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023", + "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih" + } + }, + { "ename": "flymake-php", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", "sha256": "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk", @@ -34476,11 +34977,11 @@ "repo": "federicotdn/flymake-shellcheck", "unstable": { "version": [ - 20181214, - 24 + 20200329, + 2005 ], - "commit": "e22385a9e752e58b18d4c6371e6ff1602bb764f2", - "sha256": "0gfk2wsi72n4zkgjpqasdn83zrxlzm735q6c3gs1sfqd7h1jqnwq" + "commit": "bb413006afc23105a0f84df6fb82504a06483a55", + "sha256": "09cqn0255pxim34v5zfypbzr4clfd2ajlsyxpc9h64wg6v9876y5" } }, { @@ -34994,6 +35495,21 @@ } }, { + "ename": "font-lock-cl", + "commit": "b7a2635ceb34f49f84f35e11c14521592a9d330f", + "sha256": "1d8r3d558ipk324hpgfm4fv4kxk6mhvkka3aqd4kcv8zv0k79iq3", + "fetcher": "github", + "repo": "font-lock-cl/font-lock-cl", + "unstable": { + "version": [ + 20200321, + 533 + ], + "commit": "1a54066611da213626ab69ea426ba3c63ece3438", + "sha256": "1c7n099b8dkrcrvxsva7da1m1z01p0acbyj271lix9w331h9gbf6" + } + }, + { "ename": "font-lock-profiler", "commit": "b372892a29376bc3f0101ea5865efead41e1df26", "sha256": "089r74jgi5gwjk9w1bc600vkj0p5ac84rgcl7aqcpqfbh9ylwcp9", @@ -35057,10 +35573,10 @@ }, { "ename": "fontawesome", - "commit": "93b92f10802ceffc353db3d220dccfd47ea7fa41", - "sha256": "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1xqq0ndq6hndpyar11qlylkdgqpq5kxhbayyjbad3vbm6r5i9nri", "fetcher": "github", - "repo": "syohex/emacs-fontawesome", + "repo": "emacsorphanage/fontawesome", "unstable": { "version": [ 20170305, @@ -35128,11 +35644,11 @@ "repo": "k-talo/foreign-regexp.el", "unstable": { "version": [ - 20180224, - 1121 + 20200325, + 50 ], - "commit": "2ec5c44f27c2396ee487aa0ed77ae47d143fa5aa", - "sha256": "0zww0q8x99sfwzf05pk7blsi3v8xiw4xgmlwnv1qlf2qxjkz1xhb" + "commit": "e2dd47f2160cadc194eb156e7c76c3c869e6706e", + "sha256": "0bqhabpv992ss8rw3fgym6q5kq1d6b9ycs0a5ndgjpcz19rmlr66" } }, { @@ -35687,6 +36203,30 @@ } }, { + "ename": "freeze-it", + "commit": "0b50aa7ce66a827ddd975eddf8e95ba655e05239", + "sha256": "03wnmp6m9ss3vvzibajjdvzbgh2ydvq95xk9k2rhrgjj9pdz5ml8", + "fetcher": "github", + "repo": "rnkn/freeze-it", + "unstable": { + "version": [ + 20200322, + 700 + ], + "commit": "0e2ddd99dc1211800d55e874c1bd078f879e0d9c", + "sha256": "08jdlwn8da8cgkpwpx8834rhx8is5iigq0cv3abbydmz5lrd72nl" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "commit": "cf53f31e4f266b7f0b12e091de074e763c7d565b", + "sha256": "0drznbwci4swfxmmdvkm14qmpb9y9pykyflhh69l5fdxiigpdlb8" + } + }, + { "ename": "fringe-current-line", "commit": "eaaa6f7f2f753a7c8489415ae406c4169eda9fa8", "sha256": "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8", @@ -35851,8 +36391,8 @@ "deps": [ "cl-lib" ], - "commit": "426d8f09b2d62d29a5b89a53492890ce2a49158a", - "sha256": "04nwx43xh68nqh84fbrcvnyh57yricr7l7k7shyqdv7922km947a" + "commit": "2d85dafa9872fa34b463f6473e61a1ed71c17788", + "sha256": "0zwrlvp2i0n4imba84cc0hsivyaxv4sy98bsqfwpy65xm94h0d96" }, "stable": { "version": [ @@ -36290,17 +36830,26 @@ }, { "ename": "gdscript-mode", - "commit": "52f99eafb2e80a7fa13a98add98b03a147f35e8b", - "sha256": "0v4ab5xxpq1kya2is5qq61fmfgxgvbigyz7wp907z3mc00kg2818", + "commit": "b4414989beecd113ec405116402a5232ac32cb85", + "sha256": "1clakvkjifqhi847p6zrxxfkr5s3hv33qsh7r96w04pihyd38q9l", "fetcher": "github", - "repo": "AdamBark/gdscript-mode", + "repo": "GDQuest/emacs-gdscript-mode", "unstable": { "version": [ - 20180118, - 456 + 20200328, + 1820 + ], + "commit": "56a864ecff99ae314b838b755cf26af66f4f9323", + "sha256": "0mlvvagdr2bj13ibms1vq8p9zp10ag4qhyfklkj93lg6j744qav4" + }, + "stable": { + "version": [ + 1, + 0, + 2 ], - "commit": "31af5283eaec207bc864022a28e2824132471eaf", - "sha256": "0f24zsklkhhvj6qdyid2j1qcyhjnncxjma93zhr0klvn5j1z3aar" + "commit": "361439f28bd10649c9f58f1d3290b4ee63ee4f54", + "sha256": "1ymblv04as076yfi3inmc3s66j0nqslqvfx34s3da6s8g8zi0ash" } }, { @@ -36388,11 +36937,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200225, - 1423 + 20200327, + 2213 ], - "commit": "5fcd56b2d560c04a173ae7d8b21540471322afa4", - "sha256": "00zvll0glzx9lp4s9l1ix1grdqa9cj24kszil1akaa8rqniiafn1" + "commit": "9b45785173dc61a2897b17edf27df9407d1d94ce", + "sha256": "0r21fs262jzzpilynnlnqc9bd42fbq7hn522dfnx93jjmni35kjc" }, "stable": { "version": [ @@ -36412,14 +36961,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20200226, - 101 + 20200320, + 2340 ], "deps": [ "cl-lib" ], - "commit": "7fdb13e9f90600968d15704851df9c45b5df8ca5", - "sha256": "1l8766p9svzjhwglah3ffl93rij106d2gz7sdwx8r30s6p01q2mf" + "commit": "14ad4c888b34eb8ebd946d26917aaf2dd4fcce29", + "sha256": "09hp8aavimlhasnxl5z74pk6afvjpcpd6fpv7j2amdmyhbflxv9h" } }, { @@ -36459,6 +37008,21 @@ } }, { + "ename": "geoip", + "commit": "40336cd135414e1c6f478705e5873eaa396554b0", + "sha256": "0j70gl9423ghrjp4k250kq8xpngxa8pzlpivpksyzzj32s7dy1nw", + "fetcher": "github", + "repo": "xuchunyang/geoip.el", + "unstable": { + "version": [ + 20200310, + 911 + ], + "commit": "25eb1278788b942c38405c233d3614a1de92ddea", + "sha256": "0nbgbqxmpq6c487yx4igph58zmaslqn7z92x9b1xymw58fnlyrm6" + } + }, + { "ename": "geolocation", "commit": "fddc094aa08365c0e04f0d8f2f19a47908964f50", "sha256": "03mxy8dfmy8db8rx9j7q1lvzy11grz0bd3054ckwgmlb6ng7d72q", @@ -36883,11 +37447,11 @@ "repo": "Ambrevar/emacs-gif-screencast", "unstable": { "version": [ - 20200207, - 1358 + 20200327, + 1332 ], - "commit": "dce0f3bb71ab8761a689c7382864a20198874b8e", - "sha256": "0yf665w06ijjxvzfbg8naa95f5ga3z2kcaq9baq7md222r52xd7q" + "commit": "e39786458fb30e2e9683094c75c6c2cef537d9c4", + "sha256": "135mkyi8kqsxs0a3qa20splvx4xhl8k91s48yy6gwlz6m81vwvb5" }, "stable": { "version": [ @@ -37050,11 +37614,11 @@ "repo": "ryuslash/git-auto-commit-mode", "unstable": { "version": [ - 20200217, - 2348 + 20200322, + 2007 ], - "commit": "ae69e61233417a7f14efba35e42bd842b707aeb0", - "sha256": "0nrx3wnn2jii4yiv9c1cbbll4bgll5j73ypp1fi82kk99n0d8372" + "commit": "dd0c2441de0f5ff8c69c8260d9450d0b607e3e55", + "sha256": "0r7jry1sbqsp7c1vxf7fchc7ivmnccfrflg52379v3gmpvd8s0kn" }, "stable": { "version": [ @@ -37179,8 +37743,8 @@ "transient", "with-editor" ], - "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634", - "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz" + "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", + "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" }, "stable": { "version": [ @@ -37252,17 +37816,17 @@ }, { "ename": "git-gutter", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1vcrjxg9pckixsbfmvpf0624s990nx33qn0p6xhnag4jn81ih03x", "fetcher": "github", - "repo": "syohex/emacs-git-gutter", + "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20200315, - 752 + 20200326, + 1814 ], - "commit": "219f845ccb13f4da44293f12649e6b51178fea3e", - "sha256": "0ap4j00anmkbjpmf55k8rv4s0yfnylmc6sh3rdx495zb6nfj9ky9" + "commit": "2c3242116a42dbbe30fc0844d1ec3c41074cdaba", + "sha256": "18gbns5mjwr5kirgpzjp4iqmj130qa5m1hs4phx1057qdq11ihrr" }, "stable": { "version": [ @@ -37308,22 +37872,22 @@ }, { "ename": "git-gutter-fringe", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1i8vvh2si3fdgq1m0yyzs9qbw5jzykp4qgl3ksm4xrimlw1ln4vc", "fetcher": "github", - "repo": "syohex/emacs-git-gutter-fringe", + "repo": "emacsorphanage/git-gutter-fringe", "unstable": { "version": [ - 20170113, - 533 + 20200323, + 2249 ], "deps": [ "cl-lib", "fringe-helper", "git-gutter" ], - "commit": "16226caab44174301f1659f7bf8cc67a76153445", - "sha256": "1y77gjl0yznamdj0f55d418zb75k22izisjg7ikvrfsl2yfqf3pm" + "commit": "da19a474137876b29b5658ee7e9ae366f2b65c1d", + "sha256": "015qaaap2cvy4cxl31r27z48zbgd9vyj6rac9yv3caw5zsvzlkiv" }, "stable": { "version": [ @@ -37469,20 +38033,20 @@ }, { "ename": "git-messenger", - "commit": "e791293133f30e5d96c4b29e972f9016c06c476d", - "sha256": "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0nmxx7543x7cl40m69lmyb5fv68gzdwbr8dq18qbi5kapvhg5b8y", "fetcher": "github", - "repo": "syohex/emacs-git-messenger", + "repo": "emacsorphanage/git-messenger", "unstable": { "version": [ - 20200315, - 1050 + 20200321, + 2337 ], "deps": [ "popup" ], - "commit": "321fcdaca8bc63a1a6d54ab3532891dbd6822e18", - "sha256": "1xcn7c4ck21p5s149rjp879l05qqhxhc8wj4s4a1b1x1a5scqni2" + "commit": "2d64e62e33be9f881ebb019afc183caac9c62eda", + "sha256": "1w23qjc740bxj95gdzjcy3qldfmx4y19dhcrzh83l9wfz4y566c7" }, "stable": { "version": [ @@ -38465,11 +39029,11 @@ "repo": "emacsorphanage/gnuplot", "unstable": { "version": [ - 20200310, - 536 + 20200322, + 53 ], - "commit": "a080f79b6f7a6ca94d11cda0d341acfc6e76d0c5", - "sha256": "111n89p74iymxrla3mk387xffnqmkb11pixjfgiv61l9b35hx94g" + "commit": "f0001c30010b2899e36d7d89046322467e923088", + "sha256": "1qnlcfzaihwc6kxdr1h2mrhccnhlwsdqwmcygxi2s01q2ifq1nc1" }, "stable": { "version": [ @@ -38667,10 +39231,10 @@ }, { "ename": "go-add-tags", - "commit": "55d3b893bd68d3d2d86ecdbb4ed442edd256516a", - "sha256": "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0syra7h9wixiq3g4ydamvzw2vc0852zcx5ij0rhw103hrvhrzcjd", "fetcher": "github", - "repo": "syohex/emacs-go-add-tags", + "repo": "emacsorphanage/go-add-tags", "unstable": { "version": [ 20161123, @@ -38767,10 +39331,10 @@ }, { "ename": "go-direx", - "commit": "032c0c3cd04f36f1bc66bb7d9d789d354c620a09", - "sha256": "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0x9yrbbcwsc5kf88d1j75g02yndavgb4g4wwhy9ml58a6d6kq5y3", "fetcher": "github", - "repo": "syohex/emacs-go-direx", + "repo": "emacsorphanage/go-direx", "unstable": { "version": [ 20150316, @@ -38828,10 +39392,10 @@ }, { "ename": "go-eldoc", - "commit": "6ce1190db06cc214746215dd27648eded5fe5140", - "sha256": "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1x8qwmn8b2wc79dqqx89c3l1m9sj08hgdwh5lwrlp1l80vhfp3sr", "fetcher": "github", - "repo": "syohex/emacs-go-eldoc", + "repo": "emacsorphanage/go-eldoc", "unstable": { "version": [ 20170305, @@ -38996,10 +39560,10 @@ }, { "ename": "go-impl", - "commit": "aa1a0845cc1a6970018b397d13394aaa8147e5d0", - "sha256": "09frwpwc080rfpwkb63yv47dyj741lrpyrp65sq2bn4sf03xw0cx", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1vi986ymza88cpjlxjz88na1w9dq4dr9d82vdbpav762vz828h9i", "fetcher": "github", - "repo": "syohex/emacs-go-impl", + "repo": "emacsorphanage/go-impl", "unstable": { "version": [ 20170125, @@ -39280,17 +39844,26 @@ }, { "ename": "god-mode", - "commit": "2dff8dc08583048f9b7b4cb6d8f05a18dd4e8b42", - "sha256": "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa", + "commit": "c4f8b0a0766bcff6b716b9e35da25c00b8a91abd", + "sha256": "0l8hdn227axan7ryx6z4fbk9nqsb50bmhwqxgy3g8g19vqhflhfr", "fetcher": "github", - "repo": "chrisdone/god-mode", + "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20180117, - 1134 + 20200329, + 209 ], - "commit": "344167ed9b4c212273dd056e7481cf1373b461d0", - "sha256": "0y7phh7amrdphv9dkf0304z2knyas745ir59ybngh1a55dfc2mf4" + "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15", + "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4" + }, + "stable": { + "version": [ + 2, + 16, + 0 + ], + "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15", + "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4" } }, { @@ -39408,10 +39981,10 @@ }, { "ename": "gom-mode", - "commit": "0a1e5f505e048b36c12de36b23b779beeaefc45f", - "sha256": "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0qwqvkdvxmwnijj60jvqzwvikw1avrg6i66cl74qbqqcqkhazbpz", "fetcher": "github", - "repo": "syohex/emacs-gom-mode", + "repo": "emacsorphanage/gom-mode", "unstable": { "version": [ 20131008, @@ -39422,6 +39995,24 @@ } }, { + "ename": "gomacro-mode", + "commit": "ce33236843b8eb266769f588e8d8341b056ccf2c", + "sha256": "0gfx9z8cb3lakr1c6irjmcb7fv3val349vxibwlxjbmax689r5v5", + "fetcher": "github", + "repo": "storvik/gomacro-mode", + "unstable": { + "version": [ + 20200326, + 1103 + ], + "deps": [ + "go-mode" + ], + "commit": "3112e56d2d5e645a3e0fd877f3e810dbccbf989f", + "sha256": "1f3y46q7djr1riz7x26gc7a1gf9p8sfdrnlqyiwzmi9vkk6h8wdz" + } + }, + { "ename": "google", "commit": "45237d37da807559498bb958184e05109f880070", "sha256": "11a521cq5bj7afl7bqiilg0c81dy00lnhak7h3d9c9kwg7kfljiq", @@ -39810,8 +40401,8 @@ "magit-popup", "s" ], - "commit": "41e33d1f83b19662fc1a894f362c00f25c53e797", - "sha256": "1mkdxa51d4nhbfknchg0p9sx2pa0n7fdh88xv5rq282myh2zaxm8" + "commit": "a01612b9850519603bfef116bd7bddd9c8e3b975", + "sha256": "0kbnhm6m7sf1j63yykrn4p7ykkjvvair3x95wi4b59icc6ydvwv7" }, "stable": { "version": [ @@ -40046,8 +40637,8 @@ "s", "websocket" ], - "commit": "ffff850b77ebbab827538f6ebee872b2638586bc", - "sha256": "1kxcnivlbv7dl09y09j72368sycqs96hk5nf7vsnqlfrrbc0337a" + "commit": "709bf3124b6e130efcede8b38fc2fed38699e19b", + "sha256": "1lz74qqzznv5c6pnsnnp0x0k16q663pkqakvwpg69lavcg68ysxh" }, "stable": { "version": [ @@ -40742,14 +41333,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20200309, - 707 + 20200326, + 1725 ], "deps": [ "cl-lib" ], - "commit": "a0bacb4e3659db5808056e6235abc9f00570cecd", - "sha256": "13hqqfjwd69ycmn85rzjpr9qdjv6jvnx7dl555c934xwdlnw9c2d" + "commit": "f4ce91eba3c479d08fedf0a3ced6c1265a7838ca", + "sha256": "0z7agqi5sgjjidhmnrv7615737xk7p1s6pdhr6swjcr117dq44fm" } }, { @@ -41724,11 +42315,11 @@ "repo": "purcell/emacs-hcl-mode", "unstable": { "version": [ - 20200225, - 2130 + 20200315, + 2129 ], - "commit": "6599520a350e01354300a962463ecbf5564db622", - "sha256": "18vs2cwa1pyly2kh2lapm10n8akam5fvsx8rvgp41lcwrdxs2323" + "commit": "c3d1158ad1a64f06aa8986ab1cdea6b7fbdd4bf7", + "sha256": "0qza5pgpzcabik3592dk25glsv9zcg84pn1jzm43f9b1j9w5iv4i" }, "stable": { "version": [ @@ -41786,16 +42377,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200314, - 1003 + 20200325, + 757 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "b38c9d1b098310262f331e191a9baaaba789fc25", - "sha256": "1rnmdg65r54g2r96j1pq6sz9akjgrpnl5q3la2rrn9pr22mjv0q7" + "commit": "0181b7ef468def6ef5547c7241b5c4c854816166", + "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq" }, "stable": { "version": [ @@ -41833,10 +42424,10 @@ }, { "ename": "helm-ack", - "commit": "258d447778525c26c65a5819ba1edc00e2bb65e5", - "sha256": "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "124w7grwindyv86xfshfm70h0xfq29ns067pchk8dcbjbgh9yl7b", "fetcher": "github", - "repo": "syohex/emacs-helm-ack", + "repo": "emacsorphanage/helm-ack", "unstable": { "version": [ 20141030, @@ -41903,31 +42494,31 @@ }, { "ename": "helm-ag", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0jzfycbaz88r6scsiw74prcnbvilsaphljdys6i5k9g5rhn5sxh5", "fetcher": "github", - "repo": "syohex/emacs-helm-ag", + "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200315, - 1231 + 20200328, + 533 ], "deps": [ "helm" ], - "commit": "e24fb378c8d61e7c2bf12d99a41712126f9878cf", - "sha256": "1k5ldnjpcgskn71jrg3mcph8z1rdrdyysl5vbi3bpfx61hw4z2ij" + "commit": "ad3ef038584007fbf1b7d6e727be1f18e39a8730", + "sha256": "06gjbc1rkxg13nb2hr3gm65zyzpxv77pvsz7b7c9i3qfw782zsax" }, "stable": { "version": [ 0, - 58 + 59 ], "deps": [ "helm" ], - "commit": "39ed137823665fca2fa5b215f7c3e8701173f7b7", - "sha256": "0a6yls52pkqsaj6s5nsi70kzpvssdvb87bfnp8gp26q2y3syx4ni" + "commit": "79373d7f1616d175a5e0730e1e0c3855f04bd945", + "sha256": "0vsz2b5qw4qahlf74059z4p1grinhfz28f0psw4c3qf4jasv3b9j" } }, { @@ -42647,8 +43238,8 @@ "deps": [ "async" ], - "commit": "b38c9d1b098310262f331e191a9baaaba789fc25", - "sha256": "1rnmdg65r54g2r96j1pq6sz9akjgrpnl5q3la2rrn9pr22mjv0q7" + "commit": "0181b7ef468def6ef5547c7241b5c4c854816166", + "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq" }, "stable": { "version": [ @@ -42981,16 +43572,16 @@ "repo": "emacs-helm/helm-emms", "unstable": { "version": [ - 20191111, - 1954 + 20200322, + 1309 ], "deps": [ "cl-lib", "emms", "helm" ], - "commit": "f0bf6b307f9747ba16b3f582e8364a5012e41465", - "sha256": "0wldy81xyb96kg1pz6l2i463pi83qz84m1rmiff7866w9rl1fifd" + "commit": "37e5aa029abfa5a5c48636314de8157142944fa2", + "sha256": "0r1ai6xhzayyik30w2sx9n62bxxwm12vfmjspv0daqif9az8y3vg" }, "stable": { "version": [ @@ -43168,15 +43759,28 @@ "repo": "emacs-helm/helm-exwm", "unstable": { "version": [ - 20180827, - 837 + 20200325, + 1022 ], "deps": [ "exwm", "helm" ], - "commit": "e21c6ffabadd2fe8d6c7805b6027cc59a6f914e9", - "sha256": "11fyqk3h9cqynifc2zzqn0czrcj082wkdg1qhbj97nl4gcj787rl" + "commit": "00ddb4d2a127087a0b99f0a440562bd54408572d", + "sha256": "0g4k01ps14bp2az8v6dcag9llg045k2b4kdis81xx4lvw76znr9v" + }, + "stable": { + "version": [ + 0, + 0, + 2 + ], + "deps": [ + "exwm", + "helm" + ], + "commit": "00ddb4d2a127087a0b99f0a440562bd54408572d", + "sha256": "0g4k01ps14bp2az8v6dcag9llg045k2b4kdis81xx4lvw76znr9v" } }, { @@ -43820,20 +44424,20 @@ }, { "ename": "helm-gtags", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0qcn6hmm26irlljcq93c6ap0k1kihdakr2jpgzvdbm8km2cxrm47", "fetcher": "github", - "repo": "syohex/emacs-helm-gtags", + "repo": "emacsorphanage/helm-gtags", "unstable": { "version": [ - 20170116, - 529 + 20200321, + 1456 ], "deps": [ "helm" ], - "commit": "108e93d0d099ebb7b98847388f368311cf177033", - "sha256": "0hfshcnzrrvf08yw4xz5c93g9pw6bvjp2bmv0s6acrsjqgwhx158" + "commit": "ff4329fec2cc1f53b404054ddab4cd16faef7241", + "sha256": "14jjjk258hg2d47d8fgg6qb410ij16400anx5kcghi2680a92f2w" }, "stable": { "version": [ @@ -44024,10 +44628,10 @@ }, { "ename": "helm-ispell", - "commit": "edc42b26027dcd7daf0d6f2bd19ca4736fc12d6d", - "sha256": "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "14slvcjyqd1ryymh63an7r2z1882dybwpq73bb50xkwrk7rs0389", "fetcher": "github", - "repo": "syohex/emacs-helm-ispell", + "repo": "emacsorphanage/helm-ispell", "unstable": { "version": [ 20151231, @@ -44198,8 +44802,8 @@ "helm", "lean-mode" ], - "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609", - "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf" + "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c", + "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n" } }, { @@ -44365,16 +44969,30 @@ "repo": "montag451/helm-lxc", "unstable": { "version": [ - 20190116, - 2050 + 20200323, + 816 + ], + "deps": [ + "cl-lib", + "helm", + "lxc-tramp" + ], + "commit": "37fe2d7ed97967edf59a3b68b1434910516ae24f", + "sha256": "1xnkwmdcdjfvslahhslw2xnlcym9fvb3m8384c455bas6s180qxh" + }, + "stable": { + "version": [ + 0, + 2, + 0 ], "deps": [ "cl-lib", "helm", "lxc-tramp" ], - "commit": "a4e17dda329ec39a3dac5751ddcef1145b3d91c1", - "sha256": "1z6d752682b21ydp7s5a9jkhjqw7nbascv21qcs9418ydisl8q8d" + "commit": "02812daf09d5ffb02abef7a8e0fa1f7b7c472d67", + "sha256": "14x69laf6mfz766w6lrzj5a430jr0lrilk60ywc6i1wlpcs2v10v" } }, { @@ -44604,10 +45222,10 @@ }, { "ename": "helm-open-github", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1lqjaprgybs4svnrgxvnbbzrkibgkf1zvhbg4ipiljz7h1byzqs7", "fetcher": "github", - "repo": "syohex/emacs-helm-open-github", + "repo": "emacsorphanage/helm-open-github", "unstable": { "version": [ 20170220, @@ -44812,21 +45430,21 @@ }, { "ename": "helm-perldoc", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1xl075bg35lc48zxnwbvyr7dqcz8cxk3v87i9v506kqwfmfpiz95", "fetcher": "github", - "repo": "syohex/emacs-helm-perldoc", + "repo": "emacsorphanage/helm-perldoc", "unstable": { "version": [ - 20160918, - 556 + 20200315, + 1716 ], "deps": [ "deferred", "helm-core" ], - "commit": "1979f9f67814c11ec9498502237c89a5e1153100", - "sha256": "0fvjw8sqnwnjx978y7fghvgp5dznx31hx0pjp4iih01xa1hcwbnc" + "commit": "6f3526f07f3df3059dbde779f8e681f5f1fee6ea", + "sha256": "1g7f2vdvzh9qhk8lviii86w7cb06a60kz6gvv8gnbqx88mndqclq" }, "stable": { "version": [ @@ -45090,10 +45708,10 @@ }, { "ename": "helm-pydoc", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0a2vn7xgvcil8vp40jiljff83hwb2ysb240amd8darxbfxz1j9mi", "fetcher": "github", - "repo": "syohex/emacs-helm-pydoc", + "repo": "emacsorphanage/helm-pydoc", "unstable": { "version": [ 20160918, @@ -45319,10 +45937,10 @@ }, { "ename": "helm-robe", - "commit": "e7018f57f6f0e4bd71e172ae23c050b44276581b", - "sha256": "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "143azbrj32mk0xv0i7wpvwcj4lqvphbjj3rbcpwnx76rywi3iqp7", "fetcher": "github", - "repo": "syohex/emacs-helm-robe", + "repo": "emacsorphanage/helm-robe", "unstable": { "version": [ 20151209, @@ -45750,14 +46368,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20200121, - 1859 + 20200321, + 231 ], "deps": [ "helm" ], - "commit": "9324d8c196ab2a86fde7142f159e081b87a4d277", - "sha256": "1nznfrnzfbxa5qlwbddjma96k93f9hr7jv9sqx3krc0i1061nbg8" + "commit": "069dc0b3970f1e796e34b7789ae51b1b7979ee30", + "sha256": "1jf1573r8v4mda1xiszrz51qarb1ii31cyk0v3ci16bi9dpp8swb" }, "stable": { "version": [ @@ -45873,20 +46491,20 @@ }, { "ename": "helm-themes", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "15qs23f467j99wybjd0n6dacgik5ibf96jn00j9fip55v8rp66gj", "fetcher": "github", - "repo": "syohex/emacs-helm-themes", + "repo": "emacsorphanage/helm-themes", "unstable": { "version": [ - 20160918, - 545 + 20200323, + 712 ], "deps": [ "helm-core" ], - "commit": "1160af42590b0d845a55e65e1e782d9e4027fd6e", - "sha256": "0856h8rnbgrxp3v3jpfmwq7kcdm1ymd4gcfvh0h27mk05113vz53" + "commit": "244121903650c2d25a233d12b378060cf8b010e7", + "sha256": "0ii70wn3vadx8a36q2frmsvrmlpz1w58qgn2w3knjivj195knliw" }, "stable": { "version": [ @@ -46457,6 +47075,21 @@ } }, { + "ename": "hidepw", + "commit": "f2ee7663bcedaffa935b8379cc77168035cb1f14", + "sha256": "0qnvlcjldg1mcb5ilcy538sbf294glrx5g1a7vbmspdm3wby7lna", + "fetcher": "github", + "repo": "jekor/hidepw", + "unstable": { + "version": [ + 20200326, + 112 + ], + "commit": "73f099da79d73fe4087472df3469d8b9b20a59f2", + "sha256": "1lcm5nfpcrvy3700g1zzi89j59n0508xvk3v66x9px5aq6a8xk2j" + } + }, + { "ename": "hideshow-org", "commit": "3de48eee24a5cca9c8b7dba2d6d01dfbc679d8d6", "sha256": "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc", @@ -47264,16 +47897,16 @@ "repo": "thanhvg/emacs-hnreader", "unstable": { "version": [ - 20190909, - 258 + 20200321, + 1900 ], "deps": [ "org", "promise", "request" ], - "commit": "7e68beff596a7c67ff436be5cc29660acd46f5df", - "sha256": "0yynfz8bw7nvzk05zxypn183y6hf243s55kxfiicnxx7shag217i" + "commit": "5dd287e932e2398aab0f34cb23b99457b81ac370", + "sha256": "0ynq9dg00frk1sriraglzsszxpx51mpfdkbd1iqdz648rlhzyp3m" } }, { @@ -47506,20 +48139,20 @@ "repo": "ericdallo/hover.el", "unstable": { "version": [ - 20200309, - 1550 + 20200321, + 1819 ], - "commit": "5d94d07b0213b45fc3b2d57362fd9bcb86a2fbe8", - "sha256": "1fkzlp92lqkwnld3hnfk3qywy7ssyfy03vjxxrisryhnyam9r87d" + "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f", + "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals" }, "stable": { "version": [ 1, - 0, - 3 + 1, + 0 ], - "commit": "5d94d07b0213b45fc3b2d57362fd9bcb86a2fbe8", - "sha256": "1fkzlp92lqkwnld3hnfk3qywy7ssyfy03vjxxrisryhnyam9r87d" + "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f", + "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals" } }, { @@ -47553,8 +48186,8 @@ "promise", "request" ], - "commit": "8bfaffeff945bcfbc1e2b2cfb65e8452a7a34717", - "sha256": "05k7ar832bbzvjicri4v5dyivdrypgkqgninf72izykl89v8yzgx" + "commit": "ef7f42c14f0f4aec475b74d56931daa36aded6c8", + "sha256": "1a1wr86z5368zwvlgyp979x1ypz38m2w2qnp5607vjjplcrcmay2" } }, { @@ -48622,8 +49255,8 @@ "deps": [ "dash" ], - "commit": "a142ff1c33df23ed9665497d0dcae2943b3c706a", - "sha256": "0967709jyp9s04i6gi90axgqzhz03cdf1j1w39yrkds6q1b6v7jw" + "commit": "a814e25cb272401bdfee94cb98d915119d307414", + "sha256": "040mpwwldivyapmj0pjxsk8drgi113k7rpx8ym4jqz1hah5n33s1" }, "stable": { "version": [ @@ -48808,8 +49441,8 @@ "deps": [ "dash" ], - "commit": "522af5d55b3d4cd6885f3b4100913566c202cec4", - "sha256": "0yh8px5ffx4pjmy97v1z9nwxb3qgzc5pdaj9nn6lsdxv9z7w5p3v" + "commit": "6a0bfeaca2e334b47b4f38ab80d63f53535b189e", + "sha256": "0q4w0akmnwk42ldbzqxbr7swz026q8wr1g27bl4i4k25bidqlx9q" }, "stable": { "version": [ @@ -49442,16 +50075,15 @@ "repo": "skeeto/impatient-mode", "unstable": { "version": [ - 20181002, - 1231 + 20200327, + 1619 ], "deps": [ - "cl-lib", "htmlize", "simple-httpd" ], - "commit": "96f6a05f8de74e19d570217fe83f0734623ddb0c", - "sha256": "1qddy3b3fmxgkpl10p0hvmgrzhkrxyxg72sxxg5ndfwvjpf2rf91" + "commit": "fc84f4a333d47ca853842570cf35e659753a3ebe", + "sha256": "14zycqky7xkmbfacmfdqbmq1qs3sj2r41nfmg09dv0hl97pavir8" }, "stable": { "version": [ @@ -49499,10 +50131,10 @@ }, { "ename": "import-popwin", - "commit": "a6f0629515f36e2e98839a6894ca8c0f58862dc2", - "sha256": "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0ax0s2jkfmjlnvj741n58m52srppzcn58l4vqq5gvmqj3dbh9rhd", "fetcher": "github", - "repo": "syohex/emacs-import-popwin", + "repo": "emacsorphanage/import-popwin", "unstable": { "version": [ 20170218, @@ -49590,8 +50222,8 @@ 20200128, 1052 ], - "commit": "2976e6d9679f3578196ed7c104b4054f4a713b7e", - "sha256": "0ggnlvarpy49cp98970jla34khknj7xlkkg4r74hrywa9kk7j0hk" + "commit": "9548f14e7f0f7220d6cd1b8e88756b89fc57c471", + "sha256": "1hmrg1pyzcldqh858j3zpb6y0ap4x6142m56pas0lyh65d2wzggk" }, "stable": { "version": [ @@ -49825,11 +50457,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20200303, - 1736 + 20200327, + 1418 ], - "commit": "e4ae089218bda49eb87beb2ca3593260e2fa3748", - "sha256": "1a3r1piljsrn2sbzkqjl6ffgygx6xjh6c7a7p85br84kq2ca4mfq" + "commit": "41e5ed3a886fca56990486f1987bb3bae0dbd54b", + "sha256": "12qgd2p664rh0ks5kq6sxaqi5nlmxrzj5p0kpqrx40caicj6jfpl" }, "stable": { "version": [ @@ -49950,11 +50582,11 @@ "repo": "oitofelix/info-rename-buffer", "unstable": { "version": [ - 20191005, - 2346 + 20200328, + 1450 ], - "commit": "c983ae687481f39b8fd0d4ee9d85fd82b6a4ba03", - "sha256": "068flcy4rdzwjpzqqlxpcpcqjxd5f11xq00g55ph17vzxf4iwk3c" + "commit": "87fb263b18717538fd04878e3358e1e720415db8", + "sha256": "07ylrbl9i2d09nspj481hkgcq9vs4ikvl86sfj7594zzdyy6b8qx" } }, { @@ -50027,20 +50659,20 @@ "repo": "zonuexe/init-open-recentf.el", "unstable": { "version": [ - 20161206, - 1445 + 20200321, + 737 ], - "commit": "7d8fb124806291f7f6ef2ec3a664ea25899b6d68", - "sha256": "0vswa7304s7m6cirbaky9rmrxjb2aylvif2vg2p6l274k37c4jyh" + "commit": "369304d6adb6875948c4534419c4f303ac23c4f6", + "sha256": "1i41xcjj0kdhn7m29jb5gq2j2cyxn424y4lwx6s3fjj1ckx808ii" }, "stable": { "version": [ 0, - 0, - 3 + 2, + 1 ], - "commit": "a4f5338a14302d44fa5aebb1ddc7aff3dc9abbe3", - "sha256": "0iph5cpz2dva1rnvp5xynmkndny87z308pziadk1qgf05mc0i61d" + "commit": "369304d6adb6875948c4534419c4f303ac23c4f6", + "sha256": "1i41xcjj0kdhn7m29jb5gq2j2cyxn424y4lwx6s3fjj1ckx808ii" } }, { @@ -50166,11 +50798,11 @@ "url": "https://git.sr.ht/~zge/kaomoji", "unstable": { "version": [ - 20200102, - 1942 + 20200325, + 2248 ], - "commit": "0c52e1266e61131ca0c8bd0f2092aad7b6d44ed9", - "sha256": "01sqc1cg89flxzhav9bgr733840xgqxy1i4sphfhd96c05yj287z" + "commit": "b943fe73327acc08dcd431eb8168a01609b9ab76", + "sha256": "13fk3b80gmgmr0d5296csvjfyjdq1jdxy3iahaj5mbhb9m3ganpc" }, "stable": { "version": [ @@ -50193,8 +50825,8 @@ 20180403, 1214 ], - "commit": "7bfea92ba1dae9d13d442e2f84f9fb6c05a0a9bd", - "sha256": "01f2p58qsny7p9l6vrra0i2m2g1k05p39m0bzi906zm5awx7l0rr" + "commit": "af5f95ff98e2432837f5aa848ba38dd626e82fce", + "sha256": "0rdh4bzwq60m641r41kbsgzpkx8hxl7vx82y1cf7zp8zk8la4pd8" }, "stable": { "version": [ @@ -50462,11 +51094,14 @@ "repo": "thierryvolpiatto/ioccur", "unstable": { "version": [ - 20130822, - 548 + 20200326, + 1341 + ], + "deps": [ + "cl-lib" ], - "commit": "4c0ef992a6fcd2aed62e3866d56650463108ab5a", - "sha256": "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra" + "commit": "59350b2066d61444f93c8a51b16353e746486e4c", + "sha256": "1055db76008a5nkb243ciq680fg4nn5yzkdv4x8sd1mq1hrs33qh" } }, { @@ -50943,11 +51578,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200311, - 1144 + 20200319, + 1247 ], - "commit": "8fae568daafdc79d4990ad739bac42ee230d3234", - "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1" + "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", + "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" }, "stable": { "version": [ @@ -51075,6 +51710,24 @@ } }, { + "ename": "ivy-emoji", + "commit": "f1121a85321a3184d1fa990ae86f5d1f3b04f145", + "sha256": "0sp8z7r1kffgfm4jrn5cqfi335vaynn27hs9345ybrxi3r4a3c0g", + "fetcher": "github", + "repo": "sbozzolo/ivy-emoji", + "unstable": { + "version": [ + 20200316, + 2351 + ], + "deps": [ + "ivy" + ], + "commit": "a1b7d32048278afd9b06536a8af96f533639d146", + "sha256": "0h3051qq6xjc7gkl2a8if9b9ak6wnlc4gmh268s8jvi0nd8dfw2z" + } + }, + { "ename": "ivy-erlang-complete", "commit": "ac1b9e350d3f066e4e56202ebb443134d5fc3669", "sha256": "00fqjgrhvcn3ibpgiy4b0sr4x9p6ym5r1rvi4rdzsw2i3nxmgf3a", @@ -51091,8 +51744,8 @@ "erlang", "ivy" ], - "commit": "7d60ed111dbfd34ab6ec1b07c06e2d16a5380b9a", - "sha256": "0z34ljmwr0hmkaq5z85p87vljywpv3nnsvhp1zc8cw4hvqarcjqg" + "commit": "c443dba0c466d36bef01a8985474f5da0a5a65fe", + "sha256": "0f0qr6h4y891lzlfi3k0a555qg0jw79fl9bfgv5fxi06m24q4683" }, "stable": { "version": [ @@ -51243,8 +51896,8 @@ "hydra", "ivy" ], - "commit": "8fae568daafdc79d4990ad739bac42ee230d3234", - "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1" + "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", + "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" }, "stable": { "version": [ @@ -51434,8 +52087,8 @@ "ivy", "prescient" ], - "commit": "7fd8c3b8028da4733434940c4aac1209281bef58", - "sha256": "1igsjdkxax2lavglc03h0dk3d7fpgqvlymnhyxx738sjyfzl09cr" + "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", + "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" }, "stable": { "version": [ @@ -51489,26 +52142,26 @@ "repo": "Yevgnen/ivy-rich", "unstable": { "version": [ - 20200308, - 331 + 20200322, + 1326 ], "deps": [ "ivy" ], - "commit": "0f22aff4c7d7d01bb11561578f5fcd7a2eaa7058", - "sha256": "0d8q58k5j0vzq8m2z7kc597ks93hq1x98svjkqzlvnak241yzkim" + "commit": "596874d1469667f896b83731914d7d4456025553", + "sha256": "0yym3l24zzn1yjg3fjkq7lpvpp9w7wi2vl161v53pmg1v94xig6s" }, "stable": { "version": [ 0, 1, - 5 + 6 ], "deps": [ "ivy" ], - "commit": "d2e64aee221228e27e670f6b1c051052cea33ea6", - "sha256": "1g45pk1w5vcrrlv7d7yz4qdk26v31a8ik2zkzk323bqwzc2safhi" + "commit": "840e13314774a40b69f10f0a15ce1d6af4187b12", + "sha256": "1ra18v6lgz3m6asm6d5b92zn1x22yiz4cwxd9b54dnvwi11121m7" } }, { @@ -51550,14 +52203,14 @@ "repo": "Kungsgeten/ivy-todo", "unstable": { "version": [ - 20171208, - 1609 + 20200323, + 2005 ], "deps": [ "ivy" ], - "commit": "964e347cea1a6097854d7113f5b07f6c5ef81df0", - "sha256": "07208qdk1a77dgh9qmpn164x5mgkzvprsdvb7y35ax12r2q541b8" + "commit": "d74501cd334b7d709659946c5e02b21cfd5507de", + "sha256": "0j9cdzr5s7zi6qf4cax8bc2jrprgaz85mfvc9cx52ryd3yn8l6g0" } }, { @@ -51793,11 +52446,11 @@ "url": "https://bitbucket.org/sbarbit/jack-connect", "unstable": { "version": [ - 20191125, - 1321 + 20200325, + 1639 ], - "commit": "e951217ee3ea0ac6b9ed9a209305ef9a72ec019a", - "sha256": "03dklv7daxlqzmv8dq9whc07ia0fihy988gfgdr006pfy2x6mnq7" + "commit": "c227d1ed3016960c8666a60e4215bbb029436bc7", + "sha256": "1w66dpn0cmdqwgjd1528cd2739ijxhsr62zyx2arlr9ldrnqy5f6" } }, { @@ -52346,8 +52999,8 @@ "repo": "emiller88/emacs-jest", "unstable": { "version": [ - 20200223, - 28 + 20200318, + 237 ], "deps": [ "cl-lib", @@ -52358,8 +53011,23 @@ "projectile", "s" ], - "commit": "777cca00f8fdb93226225b16b48eb955493243c5", - "sha256": "0292bhkc98pbj6lchfkx9i6zyllab2h60cly07ck71glq96kfx3c" + "commit": "b51be19c1de9e82ee1dc62921be2222fc5685eed", + "sha256": "1jdphlhp9vxvkj51cswqfgka910216snyjhql700x4dgpmvkcv56" + } + }, + { + "ename": "jest-test-mode", + "commit": "767499b7048cc0f1e47dff17f66f1e2fe8b023b5", + "sha256": "09vwidm49bw8kb4a9vax4rgbzk1ndg0fkdaj9k9sy973rapb213a", + "fetcher": "github", + "repo": "rymndhng/jest-test-mode", + "unstable": { + "version": [ + 20200329, + 506 + ], + "commit": "f04d08db36715d7509fd68448f74f917c6c1a382", + "sha256": "1pmzls19wpg60ql0b5l6rhml8hh8mzpbc0dgylzhps1jghi055s1" } }, { @@ -52595,11 +53263,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20200312, - 1315 + 20200317, + 852 ], - "commit": "b1a4137b30c3d50feb70eb00d8d2e41fa999763c", - "sha256": "0bdwfn3frq00sb14fmrsll9jg2p446gg4z7w0czmfqfay6av0hla" + "commit": "bc904840f27fe7b0e6dbdaeb912a7175a3837110", + "sha256": "0w5cgys1yfhirhsvj4n5k6km2xwyqvlnbv0m0sim1vavizzfmda4" }, "stable": { "version": [ @@ -52769,14 +53437,14 @@ "repo": "sooqua/js-react-redux-yasnippets", "unstable": { "version": [ - 20190911, - 1259 + 20200316, + 1144 ], "deps": [ "yasnippet" ], - "commit": "70785d126a28ffcb314fb4b354319418586e06b1", - "sha256": "0adlnjkcq0kpadc1dqwfzrrk0xd4jc0rc4k8hbj6nh4dhc7shnk0" + "commit": "9f509043f01fa59bff4daf31b2e95d63f8deab4a", + "sha256": "00icd76y7sp3cby6n1mkxma4h6aqkrq6cqsnbqrpsgq99qqy30my" } }, { @@ -53249,11 +53917,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20200310, - 1429 + 20200324, + 1652 ], - "commit": "b800403fada2b83bc98d6006cfd370e0cfd7876f", - "sha256": "1ay4wm303qh48h6g75di66w2f2smg5dnlqv40dgx4nhkyi68wrvg" + "commit": "1c122f1dff8dd2674245b2ce5e43b62504864bfd", + "sha256": "1ki42xx7vws8hb5vr1rgm2aih4qadf9qva8c4zq1hzmzq5j74jry" }, "stable": { "version": [ @@ -53317,8 +53985,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200315, - 529 + 20200327, + 602 ], "deps": [ "cl-lib", @@ -53329,8 +53997,8 @@ "spinner", "vterm" ], - "commit": "13ddf77079d07326291a1f9ea87d33521d49537d", - "sha256": "18p9wm27yhpxa1cai79abiawh9arwn523lk4iy26rbpp0h64vy6f" + "commit": "c293f0db0203708e49139cb3b32e5826056ef972", + "sha256": "1fyw36c5f70j53jl03yk79pgr0x4q89mwyb77n9xcbscdhaxv3s2" }, "stable": { "version": [ @@ -53338,7 +54006,7 @@ 0, 0, -2, - 5 + 6 ], "deps": [ "cl-lib", @@ -53349,8 +54017,8 @@ "spinner", "vterm" ], - "commit": "a614471cad3a133a00f77a7855407d506d94ce65", - "sha256": "01wdly6l0xkzqmqab529mhjc7mnijpv3f78cjnx0w0ak13srva93" + "commit": "596f59774edf213c4c4885992dda158de145be03", + "sha256": "0x8mlvq264ihhcdbkljhaij6hsvlh8s4fmrd8x970c7i3qi3hh7k" } }, { @@ -53485,8 +54153,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20200314, - 1939 + 20200329, + 828 ], "deps": [ "cl-lib", @@ -53494,8 +54162,8 @@ "websocket", "zmq" ], - "commit": "045f2b8b429fd6dc3ecb4f7baf2bd3012e0887b0", - "sha256": "0v78ara8277k92w4qirvk4fh6ljvzp75gfllcag57kzljfvxm17p" + "commit": "b691d38483b6540d42d482a32d35eb54178e5658", + "sha256": "1lp6xg71snlsaffl7afrgjcs99l2axc5xrbkrncc50zjhxlimxrr" }, "stable": { "version": [ @@ -53812,15 +54480,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20200314, - 1600 + 20200324, + 1349 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "a523c0a535b8022bfe63aeb592a5c8a744d60d4d", - "sha256": "0ai28v2dcdz31qa1hdg4i21pklfx59zglwampwlnjlakmrra879g" + "commit": "9877c12ad412e79b3d88423f911be1ff59a72e0e", + "sha256": "079si7dhl45rx2vf8kf8srflk6nd6yxqz44xbsrh0s39gpp9v5dh" }, "stable": { "version": [ @@ -54518,8 +55186,8 @@ 20180702, 2029 ], - "commit": "84e7bceb79e0324e0150f7f92421f2b7799d1d58", - "sha256": "17z8cw6b8pff8kqr62w5hvzajfv7w8l8jwbwnxic9m5aqcvxs8k6" + "commit": "26228b202e821824afd8b2536234b26c23ae1b9d", + "sha256": "1329xyhriha7037lnsg8bf4xqkc20f0h3bv7xifm2i40ib0z3wlx" }, "stable": { "version": [ @@ -54806,16 +55474,16 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200314, - 1655 + 20200316, + 207 ], "deps": [ "dash", "s", "transient" ], - "commit": "5f8fefa60d17a11f00d1652ef5278b2fc11da136", - "sha256": "055x4cv843k2lk1rwy2dbq42cn1cvcpgcyhs88gh9vhb0wvp5jwf" + "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e", + "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3" }, "stable": { "version": [ @@ -54841,8 +55509,8 @@ "evil", "kubel" ], - "commit": "5f8fefa60d17a11f00d1652ef5278b2fc11da136", - "sha256": "055x4cv843k2lk1rwy2dbq42cn1cvcpgcyhs88gh9vhb0wvp5jwf" + "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e", + "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3" }, "stable": { "version": [ @@ -55177,25 +55845,26 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20200214, - 2254 + 20200321, + 724 ], "deps": [ "cl-lib" ], - "commit": "dc18099dd74a954601ab425ef6cfd3ed32003023", - "sha256": "1mwkv4cyz8n8vm9jf7nw980j0ig487ch37ayx356nvvznnrfnm5s" + "commit": "756f238b4fda63f6e0980f627869eb3c03d13f66", + "sha256": "18i1l7vpfa0y5zpy9hbcrkp79n30n7pkf0kasq718cj8ggczj120" }, "stable": { "version": [ 0, - 4 + 4, + 2 ], "deps": [ "cl-lib" ], - "commit": "dc18099dd74a954601ab425ef6cfd3ed32003023", - "sha256": "1mwkv4cyz8n8vm9jf7nw980j0ig487ch37ayx356nvvznnrfnm5s" + "commit": "2c7b8599fc7fb56b0c820a9ae9f08053c71a8738", + "sha256": "10vrx3vfg8glrqngbyhwgkg5maib8ihv03psdd6qjhd0kik83498" } }, { @@ -55206,8 +55875,8 @@ "repo": "mihaiolteanu/lastfm.el", "unstable": { "version": [ - 20200207, - 1316 + 20200320, + 1839 ], "deps": [ "anaphora", @@ -55216,13 +55885,13 @@ "request", "s" ], - "commit": "cff7699343467b36ff3dad90061b567025ff9b23", - "sha256": "1jk400xh07pnwzab23xwsiyv9j0f4b8fl0v6w712vsn2n1ab88gm" + "commit": "54636059512adec0176950e8fce3b9bf7423619d", + "sha256": "1ffvh71vgsdv118hhz0x2xfmqb2bayk7i3mdxc1ybs2vrdggnim4" }, "stable": { "version": [ 1, - 0 + 2 ], "deps": [ "anaphora", @@ -55231,8 +55900,8 @@ "request", "s" ], - "commit": "c2b39d2fa4fb7f56e4aacb0a50ed2aa509ab992c", - "sha256": "09k8p5bpl7f4dgkvvx4gf91pgyc5ikm6kynkjhdwrsnpnnl2cc9b" + "commit": "96568f07324ba32804be9352016956694923f5f3", + "sha256": "04a563g6rby8374azpfjdagbgdylcg2glfx5wdx5agd98bs15j28" } }, { @@ -55243,15 +55912,15 @@ "repo": "storvik/emacs-lastpass", "unstable": { "version": [ - 20191102, - 611 + 20200320, + 2117 ], "deps": [ "cl-lib", "seq" ], - "commit": "e07b1a062153b9d56d0112ac45caf76d6bce67c5", - "sha256": "0pz5svbs7jp7zcjl7p5pbfxqh6xzh48dzz3swkywms9hfh2ynqzp" + "commit": "ac472f844bd1e109c62479253cbc40bb5e50ed8f", + "sha256": "07bh7vkczzpmkbxxyyhn912b5rjm975a49y1bq08y4vd006zsq4x" } }, { @@ -55452,8 +56121,8 @@ "deps": [ "colorless-themes" ], - "commit": "a7b7c0a32b174988f40378996cd8997f73524f19", - "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz" + "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37", + "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn" }, "stable": { "version": [ @@ -55528,11 +56197,11 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20200225, - 1023 + 20200327, + 1411 ], - "commit": "0179836fcc8ef613d6f9d7fa509a79a8fbf8db22", - "sha256": "0r5crz2n0q8xrh840gp3m8gy647i0khvwzj9pc3w5y9xkw7ca7vh" + "commit": "199045bfe411afc30cb7c7d18b8a6b03edebeae1", + "sha256": "0apaa5w2zfycigdf8d7x3h8aw8m11mz8b6l2d546dlbvxr5yra28" }, "stable": { "version": [ @@ -55552,14 +56221,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20200214, - 1749 + 20200328, + 845 ], "deps": [ "leaf" ], - "commit": "138af8613feded5eaeda84ffaff2621e62c2e0fe", - "sha256": "03jvjmr6ki28ngdc0j7sjj14qyzd730jxp8gdcajjln76ni5cayy" + "commit": "3164f1f4b98be9efa9e28170cc9b8d14a10b3e56", + "sha256": "165x864rn9ha8dd3k62xgdp97fi961x75p6a7nldl0znzan65691" }, "stable": { "version": [ @@ -55579,8 +56248,8 @@ "repo": "leanprover/lean-mode", "unstable": { "version": [ - 20200211, - 2010 + 20200319, + 838 ], "deps": [ "dash", @@ -55589,8 +56258,8 @@ "flycheck", "s" ], - "commit": "c9dffcda2951c22c483d1d22411d13bc132ce609", - "sha256": "1lj6j21hzya41fmlnw7faqmhvsdcgcidwibyvicgsb0gm6qqipjf" + "commit": "65b55b1711fb61129312044d5ac7e6a2c2ee245c", + "sha256": "1zmw8950qhry2ixk2ng0pg4j0vwx11nvjlrpab9jg6x47ys9j65n" } }, { @@ -55686,11 +56355,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200312, - 2023 + 20200328, + 1927 ], - "commit": "0ec6c5a74d636b9ec649c1cae26acecf84d1a830", - "sha256": "147k8l9mmkq6hhyh9dhqi7cv3l3s2sk0qbqlbx0y4plzbi1v0yay" + "commit": "bfa25a92d0cf63c5316b5aa8d50bd6809297ea9e", + "sha256": "1gx9brcwdmwhk0w2p93szdla5bgn25f1bsi9lna2l8ax1sn3l5kd" }, "stable": { "version": [ @@ -55927,8 +56596,8 @@ 20200122, 1934 ], - "commit": "dccd751682a0954165c7f2c08414bea0168a9a9f", - "sha256": "12njc6pmbadwn71h811alr4rpsmw1b48b3jjmxpy3s51ja44vcc4" + "commit": "4bf80c2bb1e679b6e42e8d6547d6f33996830f73", + "sha256": "152731dwf0q1i1p5cjd3fwznl100vzsjk45ks1wxw4zv0w59q399" } }, { @@ -56446,8 +57115,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20200305, - 1858 + 20200323, + 1616 ], "deps": [ "ace-window", @@ -56456,8 +57125,8 @@ "iedit", "zoutline" ], - "commit": "c7e282ae06f654bf985466ae05dedc4efc87144d", - "sha256": "1gw03xwjwvgvp1m2nl3wmz3y6d2q6xqpawpdfw95kn4rpw1lsh4w" + "commit": "b07ab5d8374c75bd1401b320fda17486325bc96d", + "sha256": "0gknqazf8pihn903518a5hmy5ggqmmq40rxz4kq2nfblpm6s5zkz" }, "stable": { "version": [ @@ -56741,10 +57410,10 @@ }, { "ename": "literate-coffee-mode", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "18fdgay7xfgza75z3xma666f414m9dn7d50w94wzzmv7ja74sp64", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "00zd5i6wpn95sslz0gd7m1h1fw7w07swszfqwaphkbqfwckgll6m", "fetcher": "github", - "repo": "syohex/emacs-literate-coffee-mode", + "repo": "emacsorphanage/literate-coffee-mode", "unstable": { "version": [ 20170211, @@ -56776,14 +57445,14 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20191012, - 606 + 20200327, + 620 ], "deps": [ "cl-lib" ], - "commit": "3bd795288db8dcd3edf5b33ca8fc213fe16c62d5", - "sha256": "0in5cryj1abcg6850lxx8qqhxvdij54jmm4ip9ra2kwz55smq4ky" + "commit": "732d649136051a4b6d43c2fabeb5233c3e5f16d7", + "sha256": "1d4p6s9dj5368ywfpp46pysxvcqwsiacih3n1hia9c4y7p0xx4cz" }, "stable": { "version": [ @@ -56867,11 +57536,11 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200221, - 611 + 20200329, + 2216 ], - "commit": "b4ede4811d82063b1439bbc0523587c993bcb17e", - "sha256": "10j4ih5vp3bic2hjqwvd90sr1dbza9k2490l6k7m0sfy1pqlqy07" + "commit": "18587cf78fa22d61a7365238da852be4a55c0656", + "sha256": "0141svf43miy1xyfc4wi3lrv0jyx97qbg9yhnxwlxz5i6gdrnyza" }, "stable": { "version": [ @@ -57287,6 +57956,21 @@ } }, { + "ename": "lol-data-dragon", + "commit": "c54747f74db0d3c270682c8994e3babdac9d36c4", + "sha256": "18aydjkv331gkbsyxgvrrlw37v2m2g65alz82287nwjswgns4pia", + "fetcher": "github", + "repo": "xuchunyang/lol-data-dragon.el", + "unstable": { + "version": [ + 20200321, + 2142 + ], + "commit": "6f53bb3971daad60bd0529d1e3889d5f9fedf235", + "sha256": "0xblv8l6krp3581m0xava95pm6wcsjm3rsl47dsvzpgns1kyz8lx" + } + }, + { "ename": "lolcat", "commit": "38e720f524b23b5742764186a695d143f983e179", "sha256": "044y0s1wiwjwfw58nhx5zvrli527nim3d81dix2h60d8qwx0566a", @@ -57417,6 +58101,25 @@ } }, { + "ename": "lsp-docker", + "commit": "f592ec9b1d6a05e1e115d4b313be108c8e47ee67", + "sha256": "1xmkwhgkcsf52hngb811n2q7q4rav75wwjz7zin6x17vfv8hqifx", + "fetcher": "github", + "repo": "emacs-lsp/lsp-docker", + "unstable": { + "version": [ + 20200222, + 505 + ], + "deps": [ + "dash", + "lsp-mode" + ], + "commit": "f46e56e554c9207d5ab5b9aebf994df8b41955f3", + "sha256": "1281qrskwwjz3x3mi99a6sp9694wbd08myhy0nlba6493ip8wbhz" + } + }, + { "ename": "lsp-elixir", "commit": "c875a05e68d09ecf37f7e13149f2624c70164ea3", "sha256": "0mimb67swcq2yis0s6w2bkk7sgqv7lyvz1hrh48h2q6qr3ywmq0n", @@ -57479,16 +58182,16 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20191028, - 902 + 20200327, + 1007 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "78c1429c62c19006058b89d462657e1448d1e595", - "sha256": "1bry1vsv6p2h4qrzx8aq7bsqfw12w3v5gz548dwkdk2cwmhsmi3d" + "commit": "39b90e7aef755b6e7756f2ae306d66b01cb4d18d", + "sha256": "1nss84rzpa1lwxx9sr28nsq1p6z82ifs7n7dh4zl6xm7rl7cr9pz" } }, { @@ -57499,8 +58202,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20200114, - 2313 + 20200327, + 2019 ], "deps": [ "dash", @@ -57512,8 +58215,8 @@ "request", "treemacs" ], - "commit": "0cea6fd5e7b163766ddf47380d655771c1b070e5", - "sha256": "17d5xf2dzy1lnxm6cip0gmzrw37xv362fakn05nhkq5ygl7bhpz6" + "commit": "5c6953441916c1e2e76ab0c41384ea6f57a18a5e", + "sha256": "13070b986jg1xd8chbr6am8915zg8wjk8mn9zlmn0d9k45zw1gsv" }, "stable": { "version": [ @@ -57592,8 +58295,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200315, - 950 + 20200329, + 1431 ], "deps": [ "dash", @@ -57604,8 +58307,8 @@ "markdown-mode", "spinner" ], - "commit": "6113e321b107915375e7f3fa8e9f85242f7fc874", - "sha256": "1vkicqf7p9dkp526svkk331pvb51zq1m26jbdvqvcs17zv8si3xr" + "commit": "9835e93f5526110bdeb164e42d8da16c1e39feb7", + "sha256": "0vd0vdbhfv31r63cygg40bzfj2v66k3zqd66hmkfzghhjl9d4q9f" }, "stable": { "version": [ @@ -57853,7 +58556,7 @@ 1434 ], "commit": "1f596a93b3f1caadd7bba01030f8c179b029600b", - "sha256": "0fdnkv37m7nf8yjjf01c856g2wrzyzqicv67fnbrnx7abrrfb1nd" + "sha256": "0swnan2v2lc7s1jsnmkyzv7gajx08akgm6dvbsgm5hzp0mjbbpy4" }, "stable": { "version": [ @@ -57970,26 +58673,26 @@ "repo": "montag451/lxc-tramp", "unstable": { "version": [ - 20180523, - 2024 + 20200321, + 1815 ], "deps": [ "cl-lib" ], - "commit": "1aab85fef50df2067902bff13e1bac5e6366908b", - "sha256": "066qwyk38r42xriifg1ik2f0am0m57wlfrk5278sycr8vbag6fc9" + "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6", + "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "cl-lib" ], - "commit": "17fc5962e7c27ac4f0bcc4ed7312dd5709063341", - "sha256": "03h6aw98mbwwqj08bzpg147hanx97r8fr8jv790zw7iqqjp46hsm" + "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6", + "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y" } }, { @@ -58270,8 +58973,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200313, - 1657 + 20200318, + 1224 ], "deps": [ "async", @@ -58280,8 +58983,8 @@ "transient", "with-editor" ], - "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634", - "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz" + "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", + "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" }, "stable": { "version": [ @@ -58608,8 +59311,8 @@ "libgit", "magit" ], - "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634", - "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz" + "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", + "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" } }, { @@ -58757,14 +59460,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200313, - 314 + 20200318, + 1224 ], "deps": [ "dash" ], - "commit": "e293416cee73dc47a6dc7f0bc2f4624d69625634", - "sha256": "0kshzx82ics43x6z8i7wcl5866li8ai05mzkri14l6jrcarz9fjz" + "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", + "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" }, "stable": { "version": [ @@ -59004,8 +59707,8 @@ }, { "ename": "magma-mode", - "commit": "59764a0aab7c3f32b5a872a3d10a7e144f273a7e", - "sha256": "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc", + "commit": "0a82892371eb390d8a802919458c6c2baacd1597", + "sha256": "134zm9mg7p0qcqr0m7wsxnwqxr64s9z1njxmvjhsbxi3rhaivcsl", "fetcher": "github", "repo": "ThibautVerron/magma-mode", "unstable": { @@ -59354,8 +60057,8 @@ "deps": [ "manage-minor-mode" ], - "commit": "e68d979a8a508a86a35eb37a0282d53c1159dfb1", - "sha256": "1a10fyqfakrr1a9bp53l1h9m77jn92k6gqpxdldnjjjnv5xfkra4" + "commit": "cd126cbeb2e99c8d00b48310938a85448ebc2e1a", + "sha256": "1lk2rmv0qhzfyg57h461qdxgqciwqjggipl9i146m9bpjp7bjjvx" }, "stable": { "version": [ @@ -60516,8 +61219,8 @@ 20191025, 851 ], - "commit": "a3eb8ce9a52d48cb521eb2c01297fd224ccf25ee", - "sha256": "0i8nxaqb2icw0arbjin23p1ah6p9v4dbvrdr7sak3fm7hxv1v7yi" + "commit": "37e38e44f57fa2caac5ed8a1268e747a42174c85", + "sha256": "1r73dy1wyrdclcnp9dpk7r463fwkh2ybi31q1mmxym1xwvkg5ahl" }, "stable": { "version": [ @@ -60566,14 +61269,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20200221, - 1938 + 20200320, + 1357 ], "deps": [ "f" ], - "commit": "833abce1fb232b7dbeac0ee568afe8c468077029", - "sha256": "0znc9sv5xv0bqq4szcaz6nlxypijqm5lmi0igkcpibry6bwfipgj" + "commit": "a5b16bc4308e2a520711c2ef8a964e269115cbf7", + "sha256": "150a69rn0wkfb0bmyx21vywh7vcd5a3yfi7i9jgp8zf8hfclsymg" } }, { @@ -60694,8 +61397,8 @@ 20191018, 242 ], - "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", - "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" + "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f", + "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi" }, "stable": { "version": [ @@ -60748,11 +61451,11 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20200130, - 145 + 20200316, + 221 ], - "commit": "bdafb13aadeae6af73dadd9f6b383ea6903da32f", - "sha256": "09k9bkwf6hz8jnklsm30w79v3vkwsf5nd97cxfmi44j7wlb6kkr1" + "commit": "5145145f87bfbe80fd91e82ded33033cf78ef54f", + "sha256": "0wdbgh3bady6xad0gnlg3irds5vdffl8d39raqayzgn17yb98pcf" }, "stable": { "version": [ @@ -60796,8 +61499,8 @@ "projectile", "s" ], - "commit": "4501d996767caa9bc9592105113c9743b20b7bc0", - "sha256": "1xz5yzgjz2i3bdv6vqij527z5hxxsmm4ga033rdyphfip8ls55ji" + "commit": "5eb0423d4b7083cb330a73ef1cfd3e0dd8538567", + "sha256": "0vk2d59jvzhdm47w4kcn58njps444i0350lp5z7dnzhaag10dwc0" }, "stable": { "version": [ @@ -61001,6 +61704,21 @@ } }, { + "ename": "mini-frame", + "commit": "2a10ea61ac4a3c8fa800f4107f256fa3ac5907f2", + "sha256": "06zv8qmbvzqzinmb5zcd40a43kmmq7mby6dgacpq81cg5azyfkr7", + "fetcher": "github", + "repo": "muffinmad/emacs-mini-frame", + "unstable": { + "version": [ + 20200327, + 2218 + ], + "commit": "30000e659b0ad2501591343b4818e5877783483b", + "sha256": "07b4903i3h91rjdixqsyhfclwg936n538bpiglay9r2klaa6kjp1" + } + }, + { "ename": "mini-header-line", "commit": "122db5436ff9061713c0d3d8f44c47494067843e", "sha256": "1yg8i7gsmiv8zwl1wqvgrh2xl2hm5nn3q11rz4hpyxw26355i817", @@ -61023,14 +61741,14 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20200309, - 413 + 20200319, + 526 ], "deps": [ "dash" ], - "commit": "4d97bf35cf0f9d58b14d13a78172c15463820382", - "sha256": "0cqzqrc8wpxav08fx9n1ljpzf97hj3wdhizywj4avnyxj3g63zwi" + "commit": "efe3f9743004d7989ea3b82d2bc71960e990bdc0", + "sha256": "0wy52ixj16029xk5grh1531afdcmpfi25iacl9bhplsrivzjl7hf" }, "stable": { "version": [ @@ -61321,20 +62039,20 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20200310, - 130 + 20200321, + 1331 ], - "commit": "60907165f118648d658572c578f9fd642bd42beb", - "sha256": "0icflm968n89p6kayy8rxm5sll4pxqlnk5pfqq648y3zg273lfk6" + "commit": "734fbdf2d2c17beee151faf39bd10174a87eea5d", + "sha256": "1i0yd7akkyqhkd8g2g793n6syiy0mbnlq9apg7p1s4xycmwxx684" }, "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], - "commit": "15bb9ec6d8be0812a46917205be6c3a1c78f68ff", - "sha256": "1458sy5b6bis1i0k23jdqk6hfqg0ghk637r3ajql2g19ym48rf58" + "commit": "734fbdf2d2c17beee151faf39bd10174a87eea5d", + "sha256": "1i0yd7akkyqhkd8g2g793n6syiy0mbnlq9apg7p1s4xycmwxx684" } }, { @@ -61356,6 +62074,21 @@ } }, { + "ename": "mlso-theme", + "commit": "2e026e2511ead77022cf8ed9d45d0d5a5aa104b9", + "sha256": "1abv6zhz28x5yk0rjn19wjxwvdq0ps3j2sx45n0dlbqfrqgw86d1", + "fetcher": "github", + "repo": "Mulling/mlso-theme", + "unstable": { + "version": [ + 20200329, + 1516 + ], + "commit": "a4bb7b55ce81d8dcc0ad8d92acbde309c7cc1ea0", + "sha256": "15fmzsf5rpgx5f1fr45j24hgzmz95zxkj1jihdb64p049ak2h5a9" + } + }, + { "ename": "mmm-jinja2", "commit": "721b9a6f16fb8efd4d339ac7953cc07d7a234b53", "sha256": "0zg4psrgikb8644x3vmsns0id71ni9fcpm591zn16b4j64llvgsi", @@ -61698,6 +62431,29 @@ } }, { + "ename": "modern-fringes", + "commit": "c765214f003426ac7a0e98c5764b14dd61ccce52", + "sha256": "0acp18v97k2iahbd5kp240g46wqdmrk4ddrsgvckzm0chsmjmm8q", + "fetcher": "github", + "repo": "specialbomb/emacs-modern-fringes", + "unstable": { + "version": [ + 20200321, + 1817 + ], + "commit": "108daba8407dc8acf140157e7f49137c397a0af7", + "sha256": "15370yw3147fzx8ly1svk7xvm0l9fg2gbzd8sx9ls93nyml7c5k7" + }, + "stable": { + "version": [ + 4, + 4 + ], + "commit": "6884dd16e4d76dedd792f0c5fed48ca8a2f11222", + "sha256": "10h5557sppi41pgbbjsffc9n67h8ja28skhdlklc0n6zap71m87s" + } + }, + { "ename": "modtime-skip-mode", "commit": "486a675ca4898f99133bc18202e123fb58af54c0", "sha256": "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28", @@ -61720,20 +62476,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200315, - 841 + 20200330, + 706 ], - "commit": "856626de1662986d582b7d264f5415c10657463b", - "sha256": "1ynj2ay0r99rjxnh1fmz81gygfi5kxfgflvd1x1rb2lapb8p7k8k" + "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", + "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" }, "stable": { "version": [ 0, - 6, + 7, 0 ], - "commit": "a9d1ae86522f158eea2410571ec992775e04b284", - "sha256": "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa" + "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", + "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" } }, { @@ -61744,20 +62500,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200315, - 841 + 20200330, + 706 ], - "commit": "856626de1662986d582b7d264f5415c10657463b", - "sha256": "1ynj2ay0r99rjxnh1fmz81gygfi5kxfgflvd1x1rb2lapb8p7k8k" + "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", + "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" }, "stable": { "version": [ 0, - 6, + 7, 0 ], - "commit": "a9d1ae86522f158eea2410571ec992775e04b284", - "sha256": "15z6qq0b0npp7hscmh04i3mi10bynzdy52fv2b160nji264zvcwa" + "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", + "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" } }, { @@ -61920,11 +62676,11 @@ "repo": "belak/emacs-monokai-pro-theme", "unstable": { "version": [ - 20191115, - 714 + 20200318, + 830 ], - "commit": "622e3a7203907978ce0d2409e3df2d65c63ce938", - "sha256": "08gl9wcr4xi1v8750j2bqvn0szv2iifi3y8ay9c9lscqax9knx83" + "commit": "90f34d48baad78a86f60eb3fae902c545bb82505", + "sha256": "0sjxyvv16jm2xss6kxiankn9n92z52l20p2mkv95p2bd47mxn5iw" } }, { @@ -61935,11 +62691,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20190801, - 1701 + 20200329, + 49 ], - "commit": "e407f51d34b0c30cfe9d815f80a0c3539b998b08", - "sha256": "0psz6z59v0fdl846vaydqrhmy4swxcvz6swa523rcpjxlp3w2vyq" + "commit": "1b937eab15326b3b2e4183229a01376c30e6781c", + "sha256": "0c2sfzxag01w2n61xy02aw2hwv7k1nm64iwbjyf0rsqcq0m64pz8" }, "stable": { "version": [ @@ -62559,16 +63315,16 @@ "repo": "kljohann/mpv.el", "unstable": { "version": [ - 20180602, - 1014 + 20200315, + 2158 ], "deps": [ "cl-lib", "json", "org" ], - "commit": "9dedf3b7c1bfd778284df7f394207ce0447ea7aa", - "sha256": "15z62wi47pwvkbh4qgvz06yk4cyy570pjz1276sd9frdwgd4kc19" + "commit": "2d40c4550558eb1bf35a69446777c4e9cae7a623", + "sha256": "0f9iq83dfj73gbx7zndvh32b102582lzv4xb8gvqjs26k5bywdxj" }, "stable": { "version": [ @@ -62632,6 +63388,21 @@ } }, { + "ename": "msgpack", + "commit": "773cb12f9aef4ad45179cb7dd07275d886907836", + "sha256": "1vcbngsr0xpqy00g837p2awkin82s145ksh223c1msszwwwgdx5m", + "fetcher": "github", + "repo": "xuchunyang/msgpack.el", + "unstable": { + "version": [ + 20200323, + 515 + ], + "commit": "90e3086f259549b1667a3c5b9aa2d70aaeaa4d3d", + "sha256": "0g9a59x7xjf1p2swbi3v8bawdwkqliw3kcg70bca5dgg2jxgd4z6" + } + }, + { "ename": "msvc", "commit": "69939b85353a23f374cab996ede879ab315a323b", "sha256": "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3", @@ -62714,11 +63485,11 @@ "repo": "cdominik/mu2tex", "unstable": { "version": [ - 20190520, - 503 + 20200329, + 758 ], - "commit": "9467076ee4115d7fc19abaeadecc603e9115bf8d", - "sha256": "1acyynjrr5pxn15g59hd3cq1yvx989ks1b79g1kmhb1cqfpz58b8" + "commit": "536a7a0db4ddbdb30a16fdd56c79b78c9b50d865", + "sha256": "18s4mks7yxbxlhdkn9s2bgxyl14rv7ds7n6c7g3pzjd94j404b64" } }, { @@ -63802,6 +64573,21 @@ } }, { + "ename": "native-complete", + "commit": "abc5469b4400ed05192dcfd6c00504768f05292e", + "sha256": "0y1zqmd34jswfw5fi3j6n0d9dhpvl14x3h5nfl6wmxj2g8vv4gns", + "fetcher": "github", + "repo": "CeleritasCelery/emacs-native-shell-complete", + "unstable": { + "version": [ + 20200321, + 2300 + ], + "commit": "11803df3706fb23d58e418a14ce981204a64e847", + "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1" + } + }, + { "ename": "nav", "commit": "0fda2b54a0ff0b6fc3bd6d20cfcbbf63cae5380f", "sha256": "0ly1fk4ak1p8gkz3qmmxyslcjgicnfm8bpqqgndvwcznp8pvpjml", @@ -63954,11 +64740,11 @@ "repo": "nickav/naysayer-theme.el", "unstable": { "version": [ - 20191207, - 1936 + 20200326, + 1937 ], - "commit": "22ac2901c7dfbc73f802f6280621fa4e2f92ff78", - "sha256": "1n6c43l0c8csagsajc7ibg4395qmigfvhsprba0xgqm95pl7whd9" + "commit": "e4d80cb70324a45102075ea923af454a563e9133", + "sha256": "0kxlbvpszb0lrj5dzfmzc1iaxgvhcjwq4hwykif22mkgdigxppx3" } }, { @@ -64026,8 +64812,8 @@ 20161029, 2023 ], - "commit": "7c63573fe66897b089963e9831546e5de7787c5a", - "sha256": "15cwfma9cq8i9x8cpaanzjgszddgvxbkn9q5aci0nnvl6nggqzpn" + "commit": "ae60dc55822ea1715b203775179080c5d62700d8", + "sha256": "0q46r9r2vc50vn3bh321l317lgbbmmbylhgbxllbjpyaidfqzvb9" }, "stable": { "version": [ @@ -64070,14 +64856,14 @@ "repo": "jaypei/emacs-neotree", "unstable": { "version": [ - 20181121, - 2026 + 20200324, + 1946 ], "deps": [ "cl-lib" ], - "commit": "c2420a4b344a9337760981c451783f0ff9df8bbf", - "sha256": "1wfx37kvsfwrql8zs2739nx7wb51m26vwlcz1jygbrb62n6wq14k" + "commit": "98fe21334affaffe2334bf7c987edaf1980d2d0b", + "sha256": "1m4d5l48k1frbkspk6wlzhbjn133bj7spp5chlgv8p4p9rpnc2zr" }, "stable": { "version": [ @@ -64429,8 +65215,8 @@ 20181024, 1439 ], - "commit": "1f3cc7b7207309c441ce5bf120b57081bbea0c18", - "sha256": "1y19f8qqd5bvkrpr3b8d18ff8qdi4j0fgha4dkb7zgjhi0rb9nb7" + "commit": "8900fa55b56ba1e2f83b3f3ba2a1b336c97e5dc3", + "sha256": "0x6l5r5i1q7pbvziynbvb395q8rihkr1zyhp4xzw35xn55qyskiy" }, "stable": { "version": [ @@ -64606,6 +65392,35 @@ } }, { + "ename": "nixpkgs-fmt", + "commit": "36f9451ad54c787f9e94bfda0e71de99da94be34", + "sha256": "1j9k4r25iylmrg0hbjb8jamrci3jxyrpx2baawmcyhqgxiz3lcz8", + "fetcher": "github", + "repo": "purcell/emacs-nixpkgs-fmt", + "unstable": { + "version": [ + 20200327, + 2302 + ], + "deps": [ + "reformatter" + ], + "commit": "cc8ee143d4ef45a8c540901852326ccdf6ff8482", + "sha256": "0a1ih8w8xk8rdd96k7236v6xh2xr1r6gaiv2b6js95k04igdqxnh" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "reformatter" + ], + "commit": "83e03d6f20bdf79c1c448c15734367b1a7cc6b02", + "sha256": "0hw0m4a637w1fm47snywn0mxz09qa5diy4hqngbqf7gxfj6hmfnz" + } + }, + { "ename": "nlinum-hl", "commit": "b13a886535a5c33fe389a6b616988b7377249625", "sha256": "17lcp1ira7yhch9npg9sf3npwg06yh9zyhg0lnb22xg09lbndj0x", @@ -64683,8 +65498,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20200309, - 242 + 20200315, + 2046 ], "deps": [ "anaphora", @@ -64693,8 +65508,8 @@ "json-rpc", "rbenv" ], - "commit": "6cf4c73e8144b5eb6708fd5f35245f81389e7859", - "sha256": "0l16ql64741m6wkhf691639d17066gizq02s8vnpxqif10zsgaap" + "commit": "280ac4943af307e6fe8d43a350c663c18c9c7ea8", + "sha256": "11ncy09y4lbivsp72l1lbg45ahqhgdzn56p9j4dxkczv5pnsg6p1" } }, { @@ -64705,8 +65520,8 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20200310, - 855 + 20200323, + 1803 ], "deps": [ "anaphora", @@ -64714,8 +65529,8 @@ "dash-functional", "request" ], - "commit": "ac896a7becd1dcfded728a36ce13cf7dcd823e04", - "sha256": "02gv1kc46aa7sbalh02sphaq50kgi055803cnxjbjvlqhlmwc2cw" + "commit": "ab0db2b7e76efa8efc72c0f587a33da1f0dc9905", + "sha256": "10scn7y0v0hirwlckwxb8cr98qmdl0r6c605qdh8jigmcp4c782j" } }, { @@ -64741,8 +65556,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20200301, - 1930 + 20200327, + 413 ], "deps": [ "anaphora", @@ -64751,8 +65566,8 @@ "request", "virtualenvwrapper" ], - "commit": "a7e6a3b93949da0a1cf91318ce8bd8cf5cfb2216", - "sha256": "0mcj4bdzhin9ibp3m6rrhqh54a2n07ck25djka3apqyd16dvx2y2" + "commit": "ccba00ddd62f06e9f085f7f58532b961369d1677", + "sha256": "0fkcp3masas1sdrhp27c017b4r2gw2gp65lcjkvcfck2k9hnypip" } }, { @@ -64778,14 +65593,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20200309, - 533 + 20200328, + 1359 ], "deps": [ "cl-lib" ], - "commit": "05ef102cffd2f32061eacf2d379663122257f5b1", - "sha256": "0c75arxqb8p3bp1nasfcwy32al4ys3jv68q48dnc2addvjmld42g" + "commit": "92661bc9b33af1e9d405d23f226c1fc80c0c9c01", + "sha256": "1c1zrfnzr7vh4fsrzyr1ivsf07ydxyr4v1776z2xv9bynvwb6lhz" }, "stable": { "version": [ @@ -64914,11 +65729,11 @@ "repo": "abicky/nodejs-repl.el", "unstable": { "version": [ - 20200223, - 1449 + 20200320, + 1645 ], - "commit": "ed2052522d1770cc951863000f96165e0c42ec7b", - "sha256": "0a5mmg3cmdi73giblp07ksl06xzl9nb2m3f96ny4r3rv0ar3v1bx" + "commit": "6fad7d764fa0d818ba497450bd722ae10cb8efed", + "sha256": "0saky39n0p8w7lmalg3j4da0crrx40yz0rz1zdjzwpd2bd9v2izg" }, "stable": { "version": [ @@ -65046,8 +65861,8 @@ "deps": [ "colorless-themes" ], - "commit": "a7b7c0a32b174988f40378996cd8997f73524f19", - "sha256": "0khsf4xz0wjn774hy08pxafm79j55ns28q25pfzyj9s07hi4r0vz" + "commit": "2b4c341640c8191a39e4bc28d6cd04c7d6dcbb37", + "sha256": "0ni9cnrv464fk840i1ll241kzkiy1zc6nfrbdv3ciixxdxbshxbn" }, "stable": { "version": [ @@ -65099,11 +65914,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20200109, - 114 + 20200323, + 121 ], - "commit": "018ad3703ba46ea603854f51f8ff5ae86183cca0", - "sha256": "0vr17rhc74cf8k1n1snnfb82rzpsfc9xxcb8y2ydi0pbwd2h87r6" + "commit": "1fcf068e331b9b79e14f79c8b126711fc3d72cbb", + "sha256": "1pf9xds5csw6vwkb4b15isrw29psdifx8gl8y61la7d1k7b6m517" }, "stable": { "version": [ @@ -65123,15 +65938,15 @@ "repo": "publicimageltd/notmuch-bookmarks", "unstable": { "version": [ - 20200105, - 1041 + 20200322, + 1925 ], "deps": [ "notmuch", "seq" ], - "commit": "28a8e58521b50bfe0944f74eb2945521e03daad3", - "sha256": "0ma8rmxcq0xh1gskzyc8ay5681nidc340ghjryic3g30njidbiwd" + "commit": "ec8edfdbd1ac475530591d73a570ded5c18ed86a", + "sha256": "01bhxvjsmgxvh08r80lzlyj0wk1izx5bq22w6zsdzvxiclgrzk16" }, "stable": { "version": [ @@ -65246,6 +66061,24 @@ } }, { + "ename": "npm", + "commit": "012ca672c63711197c98eded098b1d1a9a24fd51", + "sha256": "0zi4c5a8cn03i6jdranak586s580bw772vazslxa3zs1y3xripir", + "fetcher": "github", + "repo": "shaneikennedy/npm.el", + "unstable": { + "version": [ + 20200329, + 1904 + ], + "deps": [ + "transient" + ], + "commit": "2201ab1d9d424146c725d5e9ad24cc8e0219ba95", + "sha256": "18bm31f6zaskyncn97mfwxdih6b31jpm8v858m920i5j45gh78r5" + } + }, + { "ename": "npm-mode", "commit": "22dd6b2f8a94f56a61f4b70bd7e44b1bcf96eb18", "sha256": "1aym4jfr6im6hdc5d7995q6myhgig286fk9hpaxdf418h1s17rqr", @@ -66176,11 +67009,11 @@ "repo": "arnm/ob-mermaid", "unstable": { "version": [ - 20200311, - 2111 + 20200320, + 1504 ], - "commit": "06ca38e963475542dbf48e416a820c21e1441f28", - "sha256": "12g221bcw04gzq7w60j2i2yhqxpy783b5zp38xdyqg34hnk0p1ji" + "commit": "cca09b64eff689d8bb15a77de9d4c7fe9845a1f9", + "sha256": "1wwmf14df2rnxlfs8bwb9p4q1a1plschbq2g9vqflphj6kv213m4" } }, { @@ -66275,14 +67108,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20200109, - 730 + 20200316, + 759 ], "deps": [ "restclient" ], - "commit": "c5c22e603531dca48575d0a425fddff16dc0f391", - "sha256": "19fs6ms6rj75w4v7p7z0k2004gnb246nksv20mb8cqjnzkj0495s" + "commit": "f7449b2068498fe9d8ab9589e0a638148861533f", + "sha256": "0s3931w9ab3yfml2pmq71rw21yf6hpg7m3vihxyy3vs6zli1cvmq" } }, { @@ -66743,10 +67576,10 @@ }, { "ename": "octicons", - "commit": "c62867eae1a254eb5fe820d4387dd4e8a0ff9be2", - "sha256": "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0p66i8i2ksqld3bd0iq7f7ssskj1hp42s170q74crh3ilapjnkpq", "fetcher": "github", - "repo": "syohex/emacs-octicons", + "repo": "emacsorphanage/octicons", "unstable": { "version": [ 20151101, @@ -66808,26 +67641,20 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20200313, - 842 - ], - "deps": [ - "org-re-reveal" + 20200325, + 946 ], - "commit": "8351748a2f79fbf67cea1f1f6a245c4bfef12c9b", - "sha256": "1sfjrpd0vn1dgnjgkhg48wvfwr5nfiavddws2jxj6nrzj2jdga6l" + "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a", + "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n" }, "stable": { "version": [ 2, - 5, - 0 - ], - "deps": [ - "org-re-reveal" + 7, + 2 ], - "commit": "8351748a2f79fbf67cea1f1f6a245c4bfef12c9b", - "sha256": "1sfjrpd0vn1dgnjgkhg48wvfwr5nfiavddws2jxj6nrzj2jdga6l" + "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a", + "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n" } }, { @@ -66890,11 +67717,11 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20200311, - 527 + 20200320, + 1154 ], - "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d", - "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3" + "commit": "5dc27716c706166e1932f4a0e9f94384b6d17cb0", + "sha256": "0im6ds8mvnwfrh3z0cd05g32w9rklhl56xmhzl9i2180pv6qwil8" }, "stable": { "version": [ @@ -67745,30 +68572,29 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200229, - 2229 + 20200328, + 1700 ], "deps": [ - "org", - "org-ql" + "org" ], - "commit": "6b7fced8015387efd03f28e53be47c3ca8907d7f", - "sha256": "01s8cjgxfl5pplswy80qgxisiv7p1kmbq28g3xx1qn2w7pfiyfwa" + "commit": "ec4bd9dd290459657426bb06e78f666ac0310420", + "sha256": "18937fm3np1ngxc1rmjsg0mzrf7jr56gd87ygsi84y5cmw4j08zb" } }, { "ename": "org-bullets", - "commit": "fe60fc3c60d87b5fd7aa24e858c79753d5f7d2f6", - "sha256": "0yrfgd6r71rng3qipp3y9i5mpm6510k4xsfgyidcn25v27fysk3v", + "commit": "aa0e1ebac172a73bfed7d55cb4d9eb52178dcbdc", + "sha256": "0jcqgp23wgzdmw7il8phwiqdndwyjc7lcc27mk8rfip4ngp3wiyn", "fetcher": "github", - "repo": "emacsorphanage/org-bullets", + "repo": "integral-dw/org-bullets", "unstable": { "version": [ - 20190802, - 927 + 20200317, + 1740 ], - "commit": "c19b13be00df8d8dc596e4f1aef4a094b08ac801", - "sha256": "1rvhinwnz660mfz4wkr2wa51ss5cm4gzpwfvwc0s0srk14s2h66h" + "commit": "767f55feb58b840a5a04eabfc3fbbf0d257c4792", + "sha256": "01ll5b39wpx9qpqybndy58wkq97n512rg7j87482l1ry1s5b02d5" }, "stable": { "version": [ @@ -67821,13 +68647,13 @@ "repo": "IvanMalison/org-projectile", "unstable": { "version": [ - 20180601, - 242 + 20200329, + 313 ], "deps": [ "org" ], - "commit": "de37d0094791ab1146276904f3a37eba699e0b60", + "commit": "96a57a43555e24e5e0d81e79f0fbb47001c41bac", "sha256": "05h9scvnd9ggfwbbl1m124k6sdn5kp9mv2695cril2m4dkr1kyqz" }, "stable": { @@ -67934,11 +68760,11 @@ "repo": "justintaft/org-clock-split", "unstable": { "version": [ - 20191219, - 457 + 20200315, + 1716 ], - "commit": "361a7a96af2a7d09ccaf561423b80caca7a108cb", - "sha256": "00k7av97l609rf31zqndy92ypbdyvwnr0bdpxfisw33icw7706nb" + "commit": "322379f1bf08c74c034c5c86d8a3045675ee64ac", + "sha256": "0nigylzzxwm4wn8zp5vyrj4y41czcpkvglvy3p4dqn35agklz5mw" } }, { @@ -68539,20 +69365,20 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20200314, - 1732 + 20200323, + 1404 ], - "commit": "6de86372d46ca9639f22fe05eaadc0cbec58f5bc", - "sha256": "1h4lh9cfz6808wmmhq5xad6a37i145i5ifb84gygcpdx6g7xzjha" + "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567", + "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524" }, "stable": { "version": [ 6, 1, - 1 + 2 ], - "commit": "6de86372d46ca9639f22fe05eaadc0cbec58f5bc", - "sha256": "1h4lh9cfz6808wmmhq5xad6a37i145i5ifb84gygcpdx6g7xzjha" + "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567", + "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524" } }, { @@ -68657,16 +69483,16 @@ "repo": "gizmomogwai/org-kanban", "unstable": { "version": [ - 20200126, - 1158 + 20200329, + 543 ], "deps": [ "dash", "org", "s" ], - "commit": "4e352ca1a0b712fc92f656b4fe436a04c7033a20", - "sha256": "0smjn7jmg5w9nwjp0qadl0sx6r78ycaqm8y3a2wm6slmdad2p1jb" + "commit": "544aac80f1c7113cfe42cf1a2b89f5ca6bd9ead6", + "sha256": "0sx4mvr5g2ipj1s1jg82vr1q90jkq9lm0pg5cdab8lrx464lqf2c" }, "stable": { "version": [ @@ -68810,14 +69636,14 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20191226, - 2309 + 20200323, + 130 ], "deps": [ "cl-lib" ], - "commit": "b1899762170eaa656555ce62c58e613ca3509ec4", - "sha256": "1p3ffxanjpb83xvk4c42lafhfbckh4rkmi32wjdp86fkqx30nvrg" + "commit": "778f818ad3d101f27786556c2a7a9995d5da47c6", + "sha256": "0w3yyqn225c5y0if5pjvvszpasrvh3rh4f0bqjabrvqvrhf1q8ny" }, "stable": { "version": [ @@ -69168,6 +69994,26 @@ } }, { + "ename": "org-pdftools", + "commit": "62cf59d93b7b6700c4f7711e5fd22ece04896e6a", + "sha256": "0fqkq8hpcxzpj3irczkad78m3chadqk2895bdbj7xpdlr0803n32", + "fetcher": "github", + "repo": "fuxialexander/org-pdftools", + "unstable": { + "version": [ + 20200329, + 1507 + ], + "deps": [ + "org", + "org-noter", + "pdf-tools" + ], + "commit": "96fe7275c75842732c3fd1527619088f66b6a80a", + "sha256": "1ri58hyksp4fhmm6323ndc1h3ljkxjgbzcp588h76fkpk19lzhq1" + } + }, + { "ename": "org-pdfview", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1qhlmzf2ffcrjnx4yghv7n6rsry8bcwnkw489spgraq9vxvqklah", @@ -69362,7 +70208,7 @@ "projectile", "s" ], - "commit": "de37d0094791ab1146276904f3a37eba699e0b60", + "commit": "96a57a43555e24e5e0d81e79f0fbb47001c41bac", "sha256": "05h9scvnd9ggfwbbl1m124k6sdn5kp9mv2695cril2m4dkr1kyqz" }, "stable": { @@ -69396,7 +70242,7 @@ "helm", "org-projectile" ], - "commit": "de37d0094791ab1146276904f3a37eba699e0b60", + "commit": "96a57a43555e24e5e0d81e79f0fbb47001c41bac", "sha256": "05h9scvnd9ggfwbbl1m124k6sdn5kp9mv2695cril2m4dkr1kyqz" }, "stable": { @@ -69447,8 +70293,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20200314, - 1908 + 20200315, + 2004 ], "deps": [ "dash", @@ -69463,14 +70309,14 @@ "transient", "ts" ], - "commit": "5bc4a4a825f5961d1a47b6f35bd3e458bb2546e2", - "sha256": "1drn82ajcdzjzaa3qsqp6y5f0ynanb7xcpa57lpw01j4isja5zkw" + "commit": "ab5e9aa9116010e5da1995bf19ff26f55b93c214", + "sha256": "0h90vagb91zskvmy06yq0b1vjbkqry0fkxiagg4d076rbx3ryc0n" }, "stable": { "version": [ 0, 4, - 3 + 4 ], "deps": [ "dash", @@ -69483,8 +70329,8 @@ "s", "ts" ], - "commit": "ba7d4a2e82f134b8bb9976c81227ec795dde00d4", - "sha256": "01qgnasab82aakx1p2iyjc60qhs6wahlhhmyacwa4s41ki0nlha1" + "commit": "4fef5b089f8f77b0dc25dac5f096406156e90858", + "sha256": "065wkxd269v19r5s8g2haapwhwr3s6c5amwzshfl2hq5z0bldvqi" } }, { @@ -69766,26 +70612,26 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20200224, - 548 + 20200325, + 1003 ], "deps": [ "dash" ], - "commit": "800e1094892be1b62087317bd7dbd6c2cdca07f2", - "sha256": "1rb9gc99jb1sbzc7hlc6yndaci1dfravjvnlix9wk9bix27g3vca" + "commit": "afac070eb64cc24917c0ab0e14686258da4916f6", + "sha256": "1737r8c5kpb68yb2sixp88fm7fcmr7rvpkpywyxzwgqk30xpsjgq" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "dash" ], - "commit": "6fad8d248acfd32c7b2347223c9326351f8cefd4", - "sha256": "08kwbc630ijmz7nzypzm6bcr3yzij47rhb3ih1hgq6z5pm5cla6v" + "commit": "cfb14dc77768ea901fe5a49662ae10ae3ccc7bde", + "sha256": "05qjj4zfm84s7lmlnq2nndmh76cpnhh62rybdiz2fjsj1ns0zjln" } }, { @@ -69828,6 +70674,46 @@ } }, { + "ename": "org-roam", + "commit": "278f993cf094b39b5d049f05e0cbba61e52a6f0c", + "sha256": "1m4nw1r8kdxigdvws5arqglamrx4g62v4p482flikk7w52gcs7is", + "fetcher": "github", + "repo": "jethrokuan/org-roam", + "unstable": { + "version": [ + 20200329, + 1330 + ], + "deps": [ + "dash", + "emacsql", + "emacsql-sqlite", + "f", + "org", + "s" + ], + "commit": "b86d2c8637f5eafd587c4cf4fe85e7d0380844f4", + "sha256": "04i8i3dixf50vqp8jrwcbf4c8d7m47g9lyzj76h49jd8bv2fqang" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "dash", + "emacsql", + "emacsql-sqlite", + "f", + "org", + "s" + ], + "commit": "1433dbc31602c412914c71ecc81aa5dcf6b03daf", + "sha256": "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a" + } + }, + { "ename": "org-rtm", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "1hdcwmiv2qivdr2g78xz9fl38wn45vj0bn55dbsdj3qx7k7wgfx6", @@ -70051,20 +70937,20 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20200117, - 800 + 20200324, + 747 ], - "commit": "5c19300d7634e94ae813b1b66abc716fbb1e5fc9", - "sha256": "1m7vmibjc6yk2npfrnnqd3g2099300r0q8mr8cvyivmk5ailbfrh" + "commit": "635ec9901be9d03402dd3d4b11e71f07bf1cf6f9", + "sha256": "1fc0r53209igflfxm2dncpmdh8zncr40y1ylj1j2pcyrdlghqpvw" }, "stable": { "version": [ 1, - 2, - 1 + 3, + 0 ], - "commit": "f69d2fd6671fb250fbd87df5efa898a7bf5b9bda", - "sha256": "1h9c96rbxxk1jypib5f9pfi5zkimkvhxi61j0sps6r39435dd3w7" + "commit": "afe250fc43cd1beffd7946b54692d712d9263ff2", + "sha256": "15iy3z8rglaqbx1fz14inh18ksgjsmq30b8hyv3lgjvcc9ssaiw0" } }, { @@ -70523,6 +71409,26 @@ } }, { + "ename": "org-treescope", + "commit": "f824498a74dcf0b8130baf474841b240adfa07a7", + "sha256": "13j7xz9i11kga1s0yvdv3k54076llna8vnnp0v8ri5pgbdrmc20w", + "fetcher": "github", + "repo": "mtekman/org-treescope.el", + "unstable": { + "version": [ + 20200324, + 1959 + ], + "deps": [ + "dash", + "org", + "org-ql" + ], + "commit": "cad2aa82e5ca73bd7afc31b7a5e764da5ab716c3", + "sha256": "1jsc39xmli54mcqcdddzyaphmhlamwq167vfr2g133c3p0wx8swh" + } + }, + { "ename": "org-trello", "commit": "188ed8dc1ce2704838f7a2883c41243598150a46", "sha256": "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i", @@ -70660,8 +71566,8 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20191114, - 1632 + 20200328, + 1153 ], "deps": [ "alert", @@ -70669,14 +71575,14 @@ "dash", "dash-functional" ], - "commit": "713c5205869dde4d42127fd9365f5831ec222503", - "sha256": "0585v39lxrqnv4p2k2pcswmx14gvm6l17j05q30cssn5zqy8cv8a" + "commit": "4011d7f557da3ae5eee73c56ae514b963fb4d1c1", + "sha256": "0mr5qmrnz0mr6w7ib8bcdlqwhzwnxfbnd47zyg9i6lmh20p8qrns" }, "stable": { "version": [ 0, - 3, - 2 + 4, + 0 ], "deps": [ "alert", @@ -70684,8 +71590,8 @@ "dash", "dash-functional" ], - "commit": "f2ea8a719cf61742def57475400222a498256bb6", - "sha256": "0wrr52bryvv1aj2fk5ik71iifh15bzmvrw1ixzs1afcdp2fn0bcm" + "commit": "4011d7f557da3ae5eee73c56ae514b963fb4d1c1", + "sha256": "0mr5qmrnz0mr6w7ib8bcdlqwhzwnxfbnd47zyg9i6lmh20p8qrns" } }, { @@ -70741,8 +71647,8 @@ "repo": "org2blog/org2blog", "unstable": { "version": [ - 20200303, - 418 + 20200317, + 2136 ], "deps": [ "htmlize", @@ -70750,8 +71656,8 @@ "metaweblog", "xml-rpc" ], - "commit": "0177fc4e7edd705db59b82c83a24db51dc405890", - "sha256": "1whl7kz4im2jmdz99336wfn152q0l3qwii4w7sn45rlsm2sijiw1" + "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f", + "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi" }, "stable": { "version": [ @@ -71194,8 +72100,8 @@ "deps": [ "reformatter" ], - "commit": "7b1905787de919e671cbd44360688678025c8395", - "sha256": "1l2wz4zk9x66cgnl5c6x3ajhz0cmmjmxvwzl1p3bnykygkndiwj6" + "commit": "5d991188b511e9d650c84fc578f2f49c9f995693", + "sha256": "1x5nx064cgcjj99xwp7drcvhfmmav1f72jnwwlxllhas2is458m0" } }, { @@ -71608,11 +72514,11 @@ "repo": "emacsorphanage/ov", "unstable": { "version": [ - 20200124, - 1842 + 20200326, + 1042 ], - "commit": "3b246691d5b728ef1f0164f0cefffe00c9554e64", - "sha256": "10synkwxz6kqldx97pc52falr7h7khq97gck5fqidijwzmvs7jb2" + "commit": "c5b9aa4e1b00d702eb2caedd61c69a22a5fa1fab", + "sha256": "1g3r4jsgvf713jazw0j5mcsbrw9shix9qrc683jm7dccwwrv5pcy" }, "stable": { "version": [ @@ -71707,30 +72613,30 @@ "repo": "aki2o/owdriver", "unstable": { "version": [ - 20170401, - 1312 + 20200326, + 1608 ], "deps": [ "log4e", "smartrep", "yaxception" ], - "commit": "d934f182bafe29aa16c173440eff3fef08b0ec10", - "sha256": "0yy5sah7vcjxcik3sp2cxp9gvcryyzw799h8zf4wbvjxv74kd17c" + "commit": "a243051365eb7ac0d1845c8b468b90510998f66e", + "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn" }, "stable": { "version": [ 0, - 0, - 6 + 1, + 1 ], "deps": [ "log4e", "smartrep", "yaxception" ], - "commit": "0479389d9df9e70ff9ce69dff06252d3aa40fc86", - "sha256": "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk" + "commit": "a243051365eb7ac0d1845c8b468b90510998f66e", + "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn" } }, { @@ -72038,11 +72944,14 @@ "repo": "linktohack/ox-latex-subfigure", "unstable": { "version": [ - 20200113, - 1029 + 20200326, + 919 + ], + "deps": [ + "org" ], - "commit": "18bcee0c89c19da847f38660946a5b9343607cfb", - "sha256": "1hpwsx3cba6kk2n954h144pb1ba5yy46gcni8ikvsbqm8j17ragm" + "commit": "be0a0dde62fde8cdf8d72b6968344906aa8c6f54", + "sha256": "1afikv50ii4xk9pkg4m6dx246bjnwka37lccif8i5r48hfy5w4bq" }, "stable": { "version": [ @@ -72203,14 +73112,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20200304, - 937 + 20200327, + 1636 ], "deps": [ "org" ], - "commit": "0d947cbce655cadb035e3b5da0fa2af8c228d69b", - "sha256": "1sf8qdih1fbzhsyvkf8grmfsglvrgim0ww14ww01w9xnr02fkb0g" + "commit": "ea8b5021702d8f12aa5285fb2a8561ceaeb1332e", + "sha256": "1fppdz2r8zig6r1v1n82bxmxyn2f6i1rjv9qll4n866gahkknlkr" } }, { @@ -72966,11 +73875,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20190907, - 314 + 20200317, + 1932 ], - "commit": "5a3da498a8ab8a60cef3a3a5e8f3e14dea9992dd", - "sha256": "04fa2895vr0z6y1w1mkpxhzx2q323vl7r3hayxr0vldd8mz8m0lw" + "commit": "2a17e3e5c57132777cfef9704565f6bfa129dbe2", + "sha256": "02aysxdb660dh19l07g6h2qvckrrd4aj79lryd6h7j3in1s0sn05" } }, { @@ -73154,14 +74063,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200308, - 1727 + 20200322, + 1714 ], "deps": [ "autothemer" ], - "commit": "1aa8cd5e3673c1c55941afa61cbf7a7a45474078", - "sha256": "1s95d2pzivq52ci4disnfr95knh0kdr0jqi0br8c8zaxys3p43c8" + "commit": "bf158a064e4a00a47d24ed0c1725204ce6675064", + "sha256": "1vqvfxrwrlmnmp0bidagphajwlxs6kf480xajkpz590m0zf1xfp3" }, "stable": { "version": [ @@ -73639,17 +74548,16 @@ "repo": "zx2c4/password-store", "unstable": { "version": [ - 20190929, - 1627 + 20200328, + 1214 ], "deps": [ "auth-source-pass", - "f", "s", "with-editor" ], - "commit": "88936b11aff49e48f79842e4628c55620e0ad736", - "sha256": "0hjb0zh94mda4xq20srba40mh3iww3gg45w3vaqyvplxiw08hqrq" + "commit": "98193d3bbb3538eda457d0db4ccccbcc4b04ce3d", + "sha256": "133b2m49jd2bw0k5f77y8gc2w53vhp3rym5mzqx7mlfgssgd795k" }, "stable": { "version": [ @@ -74589,25 +75497,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200313, - 1842 + 20200326, + 2358 ], "deps": [ "cl-lib" ], - "commit": "0debeeb542b2b449ad6c2a7e36eeb8691f27ed5b", - "sha256": "11jfm3sxnvpwn69y8y3cayq9svpfm21ch01nv58fd5padshagz5n" + "commit": "2ac6aff0569923993a251beddb3046ec44841408", + "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had" }, "stable": { "version": [ 2, - 5 + 6 ], "deps": [ "cl-lib" ], - "commit": "21877375d718e57d5e10808f06f78ba0c4d420c8", - "sha256": "0a1s1ygxday0602xk5dg19v1wjmz8dm4ajiwiflvyhqas4wcv9j2" + "commit": "2ac6aff0569923993a251beddb3046ec44841408", + "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had" } }, { @@ -74637,6 +75545,21 @@ } }, { + "ename": "pest-mode", + "commit": "d3145c38d53aa94c6ae33f2bc0cb804e246a8558", + "sha256": "0d89s1lqif6mdbm1fh6h1m4414sxa382rjyw3qqsm5iz2b5vf14p", + "fetcher": "github", + "repo": "ksqsf/pest-mode", + "unstable": { + "version": [ + 20200321, + 504 + ], + "commit": "4ae88a9c81d499bbe99978ff0216b645fed70023", + "sha256": "1zc7dmgp3s9q33wkvw6i7zzlcaa65ixx3hxb78m62lk2a7fzb3ih" + } + }, + { "ename": "pfuture", "commit": "5fb70c9f56a58b5c7a2e8b69b191aa2fc7c9bcc8", "sha256": "15fr9wkpv8v1p22wz7hsyihq7f807ck105c2crfs8y7capfvs53s", @@ -75056,11 +75979,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20200301, - 1404 + 20200323, + 1215 ], - "commit": "547a31d71991e7bb1d9e5d1ce45b6be6e5740058", - "sha256": "1iwbh8cc3a5ayq1r6lv8jkx5hfa4yfz1rgzmvb2s08si9q3y5wna" + "commit": "b5d99881002e3c62ebe874ad9f48474afc16c62d", + "sha256": "0pq7nccmrbvrf7120d48aqymdwh5jgjvzwi2820hdw8j6b7prm4h" }, "stable": { "version": [ @@ -75148,8 +76071,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20200121, - 1218 + 20200324, + 1347 ], "deps": [ "async", @@ -75158,8 +76081,8 @@ "f", "php-runtime" ], - "commit": "5ccf65d59e6bbc9cd958dd5988e8fd2143b0d57f", - "sha256": "0k4dzn4a5y4kq7yz3ifvzziv90rp5si380c5ypgxr5iwb1b8a0l3" + "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05", + "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5" }, "stable": { "version": [ @@ -75996,6 +76919,25 @@ } }, { + "ename": "playonline", + "commit": "27d8ea9dac3637eed39a68308194b30c1672a8ca", + "sha256": "10shq955cz664r0j0yjfrnnbvzjpcyq638lm6hwkiia5xbvsdz88", + "fetcher": "github", + "repo": "twlz0ne/playonline.el", + "unstable": { + "version": [ + 20200317, + 642 + ], + "deps": [ + "dash", + "request" + ], + "commit": "c75da1fdc1dfbd5d9aa274dc4e90ff631ea08e70", + "sha256": "0vkgzqdcxp4mlkz9z8p4307lbvjz51wpqhzpmyw4gwl079xc6gkq" + } + }, + { "ename": "plenv", "commit": "a0819979b9567ac5fab9ed6821eba8fe7ee6a299", "sha256": "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4", @@ -76368,15 +77310,15 @@ "repo": "galaunay/poetry.el", "unstable": { "version": [ - 20200112, - 2309 + 20200326, + 1328 ], "deps": [ "pyvenv", "transient" ], - "commit": "01da45f478c8ace3dea5088746873ac2d7c23dbb", - "sha256": "08x1q54pnb3hh4a2wbmghffl5cnq99sf280qdbgc65vqhdkj8r1z" + "commit": "6dcc9d22cac6642a861770b5518398d8ee4fcc9a", + "sha256": "1za8s1k5ni11yqz64rz777lps400jnga151cca2f3l3xx2lcc2c7" }, "stable": { "version": [ @@ -76472,20 +77414,21 @@ "repo": "polymode/poly-R", "unstable": { "version": [ - 20190605, - 2103 + 20200316, + 1315 ], "deps": [ "poly-markdown", "poly-noweb", "polymode" ], - "commit": "0443c89b4d2bc2ed235a0c017109c2dbd342aa02", - "sha256": "1v5djxwgqksf84pxfpgbm7qaz3yq5ha7cac0792p62pj1ydzvghi" + "commit": "51ffeb6ec45dd44eafa4d22ad2d6150cc4b248fc", + "sha256": "0a4wx73jkngw5nbq1fa4jfhba6bsmyn6vnsf887x3xhb5v3ykhsg" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ @@ -76493,8 +77436,8 @@ "poly-noweb", "polymode" ], - "commit": "0443c89b4d2bc2ed235a0c017109c2dbd342aa02", - "sha256": "1v5djxwgqksf84pxfpgbm7qaz3yq5ha7cac0792p62pj1ydzvghi" + "commit": "51ffeb6ec45dd44eafa4d22ad2d6150cc4b248fc", + "sha256": "0a4wx73jkngw5nbq1fa4jfhba6bsmyn6vnsf887x3xhb5v3ykhsg" } }, { @@ -76542,25 +77485,26 @@ "repo": "polymode/poly-erb", "unstable": { "version": [ - 20190605, - 2102 + 20200316, + 1314 ], "deps": [ "polymode" ], - "commit": "304204f415b9e46ee36b64531b7d170540828335", - "sha256": "0v13ssv9fjardg5as832hkhlx7yhjcdkm3bdcdj0qy31cmvk6dzb" + "commit": "56c744b8d87d8cbe0aba2696d4e8525afc4aa0e8", + "sha256": "118x9qrays54n6ksnln51ps5c298zs8ih7k49mn6aq6lpvwy5wjr" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "polymode" ], - "commit": "304204f415b9e46ee36b64531b7d170540828335", - "sha256": "0v13ssv9fjardg5as832hkhlx7yhjcdkm3bdcdj0qy31cmvk6dzb" + "commit": "56c744b8d87d8cbe0aba2696d4e8525afc4aa0e8", + "sha256": "118x9qrays54n6ksnln51ps5c298zs8ih7k49mn6aq6lpvwy5wjr" } }, { @@ -76571,27 +77515,28 @@ "repo": "polymode/poly-markdown", "unstable": { "version": [ - 20190916, - 702 + 20200316, + 1315 ], "deps": [ "markdown-mode", "polymode" ], - "commit": "a867e5e5689f1e1a5bab5db57c7d39bac2448bcb", - "sha256": "1mrmrwmrv6xsafhn7ys3y8nbdqgzhkrb2mm0gir63g03kd6bn793" + "commit": "1536cf0c32f71d5cd05c90f7905905e38006e95d", + "sha256": "1q4qq0ql08hxkdrd2aal03560k612my7bvnfpfij3g432hn0p7v6" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "markdown-mode", "polymode" ], - "commit": "b0de1a9f3e4d7191b1b23b65ebf03dd0ac007afc", - "sha256": "0b6wlmhrpcw9g8rbw7q7k5fr2lgcp1rpy7d9p9f0gzn52yvcr4dr" + "commit": "1536cf0c32f71d5cd05c90f7905905e38006e95d", + "sha256": "1q4qq0ql08hxkdrd2aal03560k612my7bvnfpfij3g432hn0p7v6" } }, { @@ -76602,25 +77547,26 @@ "repo": "polymode/poly-noweb", "unstable": { "version": [ - 20190605, - 2102 + 20200316, + 1315 ], "deps": [ "polymode" ], - "commit": "4e65cb22d6bca901021205257f867f868989c665", - "sha256": "1pnjg615i5p9h5fppvn36vq2naz4r1mziwqjwwxka6kic5ng81h8" + "commit": "3b0cd36ca9a707e8a09337a3468fa85d81fc461c", + "sha256": "1jl5h4nf10xd2gdlsxi6h2n3z5zh26ffcixn68xfp5q4zl34zk8p" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "polymode" ], - "commit": "4e65cb22d6bca901021205257f867f868989c665", - "sha256": "1pnjg615i5p9h5fppvn36vq2naz4r1mziwqjwwxka6kic5ng81h8" + "commit": "3b0cd36ca9a707e8a09337a3468fa85d81fc461c", + "sha256": "1jl5h4nf10xd2gdlsxi6h2n3z5zh26ffcixn68xfp5q4zl34zk8p" } }, { @@ -76631,25 +77577,26 @@ "repo": "polymode/poly-org", "unstable": { "version": [ - 20200304, - 1057 + 20200316, + 1315 ], "deps": [ "polymode" ], - "commit": "9f89c1f590f616e2cd93df4f441cd1e9818cc7ac", - "sha256": "0r5vlvz2kinblxnzpshxa6mww3al4kwj8gy19hzrq3gj9jpr4ymb" + "commit": "8f4d11489532be98a291258ca27405aa528fc126", + "sha256": "1srnwcsn2bh8gqzxixkhffk7gbnk66kd4dgvxbnps5nxqc6v0qhc" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "polymode" ], - "commit": "8b0de75b1f9b65c22f7e3fbc205c9408214c8a1f", - "sha256": "04x6apjad4kg30456z1j4ipp64yjgkcaim6hqr6bb0rmrianqhck" + "commit": "8f4d11489532be98a291258ca27405aa528fc126", + "sha256": "1srnwcsn2bh8gqzxixkhffk7gbnk66kd4dgvxbnps5nxqc6v0qhc" } }, { @@ -76660,25 +77607,26 @@ "repo": "polymode/poly-rst", "unstable": { "version": [ - 20190605, - 2103 + 20200316, + 1315 ], "deps": [ "polymode" ], - "commit": "1a7d38e1c1d35cf64e4dad408db486a8e1931e61", - "sha256": "1xzbznm43hsvmg2ibqa6a1rymfy85nagjsxadn5mj9r04ivhf2fd" + "commit": "8530f56fbdce01bcf4004839ff54e4156282c2b5", + "sha256": "088wzagwxpf2j67wb1i6agqfa944sahh2fm8my2m50spbbd9ymhl" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "polymode" ], - "commit": "1a7d38e1c1d35cf64e4dad408db486a8e1931e61", - "sha256": "1xzbznm43hsvmg2ibqa6a1rymfy85nagjsxadn5mj9r04ivhf2fd" + "commit": "8530f56fbdce01bcf4004839ff54e4156282c2b5", + "sha256": "088wzagwxpf2j67wb1i6agqfa944sahh2fm8my2m50spbbd9ymhl" } }, { @@ -76719,27 +77667,28 @@ "repo": "polymode/poly-slim", "unstable": { "version": [ - 20190605, - 2103 + 20200316, + 1316 ], "deps": [ "polymode", "slim-mode" ], - "commit": "a4fb8166d110b82eb3f1d0b4fc87045c3308bd7d", - "sha256": "06kwhmw5r5h4bsaqscr7dl3rfsa6wp642597zcmzdly94h26iwy9" + "commit": "9e9b5164c68955974fd5f5d220aec5af9b5ba3ae", + "sha256": "1742wlx07khra7xfbd6f8d3i030w87mncnyx6kf6im10khf8qwmb" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "polymode", "slim-mode" ], - "commit": "a4fb8166d110b82eb3f1d0b4fc87045c3308bd7d", - "sha256": "06kwhmw5r5h4bsaqscr7dl3rfsa6wp642597zcmzdly94h26iwy9" + "commit": "9e9b5164c68955974fd5f5d220aec5af9b5ba3ae", + "sha256": "1742wlx07khra7xfbd6f8d3i030w87mncnyx6kf6im10khf8qwmb" } }, { @@ -76769,19 +77718,20 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20200307, - 1519 + 20200316, + 1314 ], - "commit": "44601aace1e9cef9b89379cc7b4e2144cca60b6a", - "sha256": "0wl2lc5niq89axbxi2frls2iq0ns6pmdqdaknnppgrasvfjxfwj3" + "commit": "44265e35161d77f6eaa09388ea2256b89bd5dcc8", + "sha256": "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn" }, "stable": { "version": [ 0, + 2, 2 ], - "commit": "82a0c3d71cc02e32a347033b3f42afeac4e43f66", - "sha256": "04v0gnzfsjb50bgly6kvpryx8cyzwjaq2llw4qv9ijw1l6ixmq3b" + "commit": "44265e35161d77f6eaa09388ea2256b89bd5dcc8", + "sha256": "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn" } }, { @@ -76911,29 +77861,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20170918, - 248 + 20200322, + 737 ], "deps": [ "log4e", "yaxception" ], - "commit": "909025c5a871ca4b9ec7aed7f1a27c819a94dba1", - "sha256": "0qbb36qijkzbzxlmqsvvddm7x2gk9rkafnyjbkxsl76rz1ajy6nz" + "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708", + "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s" }, "stable": { "version": [ - 0, - 9, - 3 + 1, + 1, + 0 ], "deps": [ "log4e", - "popup", "yaxception" ], - "commit": "28dc6a76e726f371bcca3160c27ae2017324399c", - "sha256": "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19" + "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708", + "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s" } }, { @@ -76983,10 +77932,10 @@ }, { "ename": "popup-complete", - "commit": "b43b85f90c476a3b88f94927a7db90bdc72cd171", - "sha256": "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1mw892nr3dfhsjiqyyf3znd7vji4kxly295bbq74vszza2i0b87i", "fetcher": "github", - "repo": "syohex/emacs-popup-complete", + "repo": "emacsorphanage/popup-complete", "unstable": { "version": [ 20141109, @@ -77205,11 +78154,11 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20200304, - 631 + 20200319, + 907 ], - "commit": "4ff106ed5c6e3dc9ddba7e158c7ae9085a43b0bc", - "sha256": "1468g9n1dxnsws31zvzm9y6sfcpxx24qj24jmsv7x6r4qk00bq29" + "commit": "c15800a8388696474fe9f8466fce1b40735b9304", + "sha256": "14xjly5cqziqb0gnklsgg28vimdrpq8273z2inf1c0jnak8x2vzn" }, "stable": { "version": [ @@ -77234,6 +78183,14 @@ ], "commit": "ebaacd7266ae7a66605317f57b9f42e9cfb2ce1e", "sha256": "0kdcpd59jd1gasqk5gx4ggbyp492b53dy6n3nkv9j2rj8618yzs6" + }, + "stable": { + "version": [ + 0, + 1 + ], + "commit": "ebaacd7266ae7a66605317f57b9f42e9cfb2ce1e", + "sha256": "0kdcpd59jd1gasqk5gx4ggbyp492b53dy6n3nkv9j2rj8618yzs6" } }, { @@ -77415,11 +78372,11 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200313, - 437 + 20200318, + 806 ], - "commit": "7504b1e4f3aa7063f15ba683e0e8e65bc1312ab0", - "sha256": "1jsliv29h4vz8np8l6vclly5n4i8w1v7kf3d2iq66spr36csdilq" + "commit": "bfb9ddfbc124b8b97d7a12610947b76794c0fd06", + "sha256": "1632y0vaxv043w4js5jpd9zr36bzy9pwxnhmlh44hmkvgfw07qvn" }, "stable": { "version": [ @@ -77480,8 +78437,8 @@ 20191224, 220 ], - "commit": "7fd8c3b8028da4733434940c4aac1209281bef58", - "sha256": "1igsjdkxax2lavglc03h0dk3d7fpgqvlymnhyxx738sjyfzl09cr" + "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", + "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" }, "stable": { "version": [ @@ -77665,25 +78622,25 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20200301, - 1139 + 20200315, + 1926 ], "deps": [ "dash" ], - "commit": "a9bb7ec3dcf83b4352f2a68134b6fd1d4977b27f", - "sha256": "04awq9h795ji90bp7z1d9cmg9s2sjx32snbzyp81gb55z02abihd" + "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2", + "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "dash" ], - "commit": "682034ff5f3fd62bd24eee1873a2c68498e8b7d3", - "sha256": "1bzqqvyraj5h4flzmhxbjgaw98wgqd21hmjq1jg4j3yxwg8cbrw9" + "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2", + "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0" } }, { @@ -78078,14 +79035,14 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20200307, - 1701 + 20200329, + 1908 ], "deps": [ "pkg-info" ], - "commit": "588692ad56395ed4fd072bac496b33992096bfe4", - "sha256": "1dysdh4nwxxz6yqimy65ssyvkyki0lk8j0v120csh9igb97ryy6v" + "commit": "56e18fcefa2f286edfec98853189985823d0e53c", + "sha256": "0iq93ghwj96xxfsa5s90g36ngwpa92bj91zvkkk40zn9faqkdllc" }, "stable": { "version": [ @@ -78450,11 +79407,11 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20200209, - 616 + 20200320, + 341 ], - "commit": "c45b4e09d796385823cfb42ab15a4e67feb01b77", - "sha256": "1crhny97p6yz3z2lb1m43334vsprdiz3sb79jp7czyxskkwqn86r" + "commit": "02c470bd6c7bf4ea4244d304f57997bad37c9bb7", + "sha256": "1sjwwram45pb9bjap6h24m6734qr5yhnai2lqbdvxd0nplfv91ng" }, "stable": { "version": [ @@ -78530,11 +79487,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20200313, - 907 + 20200326, + 1804 ], - "commit": "23d1199c24927cf5dc6fa53f082291b6e181cd13", - "sha256": "1c1rz3n3bli4ggnkp3zk0j5df1s8hsrsygdjn5nqs50gprb683dp" + "commit": "9196749d55413224355409d55003f7f8c8ba0f79", + "sha256": "17ak2nbgiqwldk6y4cg4qq49hnvzw32jm4m3dqag2smvkl6rjw19" }, "stable": { "version": [ @@ -78637,8 +79594,8 @@ 20170526, 1650 ], - "commit": "422053f3bcb39cac483d2769e936c473e7c8bcdb", - "sha256": "0hlyxvriivk0fydqjx0862v53rynlh50sci9h5m3j5b7y3nsykry" + "commit": "dec4939439d9ca2adf2bb14edccf876c2587faf2", + "sha256": "0kxrgv1pb38lsgpgilaqjlvw6inmlbs8rdrm2bfilzcwwrr92bi9" }, "stable": { "version": [ @@ -78702,8 +79659,8 @@ "repo": "purescript-emacs/psc-ide-emacs", "unstable": { "version": [ - 20191217, - 1144 + 20200317, + 1013 ], "deps": [ "company", @@ -78714,8 +79671,8 @@ "s", "seq" ], - "commit": "2a9394422da317b54aa1da021aea6cded19004c1", - "sha256": "18pfi04grvdbgz8v5yb06y5mv0q6mkwm4rj43h35nw75l2gwaapv" + "commit": "7fc2b841be25f5bc5e1eb7d0634436181c38b3fe", + "sha256": "0r0fymyai30jimm34z1cmav4wgij8ci6s1d9y7qigygfbbfrdsmj" } }, { @@ -78849,8 +79806,8 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20200312, - 1930 + 20200315, + 1938 ], "deps": [ "deferred", @@ -78858,14 +79815,14 @@ "s", "unidecode" ], - "commit": "b801f7480401e6f3207f150cd945fc5abd96f884", - "sha256": "1w9hxh94zkgnsw26hqrs5gdnb8xi7cnavjby9dy71l9n6js7bdb1" + "commit": "cc5d258ac83650ad6e8043c8c01d9162c2460308", + "sha256": "13n7i80734848by8f0b3z0mqv0rh9x42hglkc8abhmilc0sg4i0y" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "deferred", @@ -78873,8 +79830,8 @@ "s", "unidecode" ], - "commit": "b801f7480401e6f3207f150cd945fc5abd96f884", - "sha256": "1w9hxh94zkgnsw26hqrs5gdnb8xi7cnavjby9dy71l9n6js7bdb1" + "commit": "f6e13137ad7731c8b0eb1720aed48d1a1edf4719", + "sha256": "1nanaj0liilnplh1njbmch7qsa2h7izkc51bpd4hxw6k4bslplqc" } }, { @@ -79461,8 +80418,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20200315, - 735 + 20200326, + 719 ], "deps": [ "async", @@ -79470,8 +80427,8 @@ "pyim-basedict", "xr" ], - "commit": "92af8c283531f08aebf23fb6a0efd452fcc58d42", - "sha256": "0nzhg4hl1wv7yz1rbwm6j3vw9lgpg7rl2al1xbxliqkrfv9lh1mi" + "commit": "84af8e80a4ac8fa19e7b01a3f9984280e7d501b4", + "sha256": "0351mvnnm0xzmlm71byxlbn8dp7qnpw8d12ghwdmd53q87pfgz9s" }, "stable": { "version": [ @@ -79616,8 +80573,8 @@ 20170402, 1255 ], - "commit": "16ed52ec500388aff2277a7144fc8138afb6f796", - "sha256": "01xh11991bwijhq44sp4xbmwsmfgj10c3ip9icns143c878svany" + "commit": "53e5406b9279008f3ae8b5f045e5cd5773771d70", + "sha256": "0c6d0pmbinj65kacnqzbsa6acb3as8blrl5f202s8bbb9zd62vam" } }, { @@ -79694,14 +80651,14 @@ "repo": "ionrock/pytest-el", "unstable": { "version": [ - 20181005, - 1524 + 20200330, + 41 ], "deps": [ "s" ], - "commit": "1bfa7549001e61ecd59cd6eae7c6656a924d1ba4", - "sha256": "1ry0czn0qjjiw75v47jamxbfzh70jxai6lvf3pp5v87wp1xhnznh" + "commit": "6934047242db79b1c53e9fe3e0734cc9719ed1c4", + "sha256": "1gh5sqmhw7hl67m7nqgd4wwns7a10j0sfmabm97k1cmmbwdj0vca" } }, { @@ -79712,20 +80669,20 @@ "repo": "poppyschmo/pytest-pdb-break", "unstable": { "version": [ - 20191218, - 530 + 20200316, + 301 ], - "commit": "8b097f5fc8b42a9eddb5b020fd2d531c2b1fcddd", - "sha256": "0r1j9jjm013gah0cx10wrmv0blqqk6fwgs3wfgq7hsdrkm4pjil9" + "commit": "007427af712df9fa2c54869388d74e97f91b2bd7", + "sha256": "14l14605lgq498j37916p4gjwkqjb8z4ky85wlk3pgyx6bp20ckz" }, "stable": { "version": [ 0, 0, - 7 + 8 ], - "commit": "8b097f5fc8b42a9eddb5b020fd2d531c2b1fcddd", - "sha256": "0r1j9jjm013gah0cx10wrmv0blqqk6fwgs3wfgq7hsdrkm4pjil9" + "commit": "007427af712df9fa2c54869388d74e97f91b2bd7", + "sha256": "14l14605lgq498j37916p4gjwkqjb8z4ky85wlk3pgyx6bp20ckz" } }, { @@ -79736,15 +80693,15 @@ "repo": "wbolster/emacs-python-black", "unstable": { "version": [ - 20190817, - 1754 + 20200324, + 930 ], "deps": [ "dash", "reformatter" ], - "commit": "706d317f0874d7c5b5a3d844698bcfb8b1fe253e", - "sha256": "0fjnd85nlkck156dj6cahk8chhgkbgl2kwywqzi8bl4yj700m4dk" + "commit": "a11ca73f6dfcdc125d27ff184496d66bdbd71326", + "sha256": "1jv2fwlf7q8l5npqcpr05xzqmfqlx6xmjn0zphh9rx6dd2dpdma9" }, "stable": { "version": [ @@ -80205,11 +81162,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20200304, - 1835 + 20200329, + 719 ], - "commit": "497c281fce65c671aa2bfe780aea5dff4f097d13", - "sha256": "05k096qky4hn9m27gv3pri95mhn57m0vl8lp8phz5br9gm1isp9h" + "commit": "a3c4490a3bb08ee7819b330a93a284b2fd4cd70c", + "sha256": "1rm27y9zni9nscrvsmvi653nwkrlr4gd4cy5pyrynh3q32yhkqik" } }, { @@ -80312,10 +81269,10 @@ }, { "ename": "quickrun", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "02wxja6l1xq7gini17ana8qy4kvpfzri0gn2dypjnj2nfh1vvk9i", "fetcher": "github", - "repo": "syohex/emacs-quickrun", + "repo": "emacsorphanage/quickrun", "unstable": { "version": [ 20200315, @@ -80480,14 +81437,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200218, - 1623 + 20200329, + 1841 ], "deps": [ - "faceup" + "faceup", + "pos-tip" ], - "commit": "7a1414f83981aa174feba28f3d83e95574c7f075", - "sha256": "1bszd21fwaqfqkksqpqiq5058hm7wr500qj75zx1xa2j6r67w7sa" + "commit": "c8ac9971814ca9df8ec406f3b76c9ba4878a5d57", + "sha256": "0jnw9plmw3r2c12kcy4435v2kf0vmmla9ljb670zhcg690a5cjqh" } }, { @@ -81811,19 +82769,19 @@ "repo": "purcell/reformatter.el", "unstable": { "version": [ - 20200304, - 2250 + 20200327, + 2358 ], - "commit": "af393979570b801263bd57d7f136dc5bfd1106d1", - "sha256": "04ikh7rmm2rs3wjzgl8b0jgpp49kwafffix942av3bmcd4dw3a4d" + "commit": "e8f70b20caf6672353a2b0ee3161d4791c412696", + "sha256": "19mji7frfvj925nx2m2cdvsx0lf69dzdl5wbdppyra9717rsspbq" }, "stable": { "version": [ 0, - 4 + 5 ], - "commit": "b2963f51009948d5e4885237a148695008d4ccbc", - "sha256": "0hhy6x1bkwlhdlarsgm06g3am4yh02yqv8qs34szpzgy53x84qah" + "commit": "e8f70b20caf6672353a2b0ee3161d4791c412696", + "sha256": "19mji7frfvj925nx2m2cdvsx0lf69dzdl5wbdppyra9717rsspbq" } }, { @@ -81949,6 +82907,30 @@ } }, { + "ename": "register-quicknav", + "commit": "fed1473b565f42f7849c7676d0c9739a39562c95", + "sha256": "1487mkyz2h5929580racxr4nbc343klns9bcm7m5jn4hsx5aiq6m", + "fetcher": "git", + "url": "https://schlomp.space/tastytea/register-quicknav.git", + "unstable": { + "version": [ + 20200325, + 1612 + ], + "commit": "06afa1efc490a6cbc1d814fc6f1e7a80a601ecc7", + "sha256": "055bffsa81chjpv39p2fn10dwikpzb034k19k0mc1026d8a423kg" + }, + "stable": { + "version": [ + 0, + 4, + 3 + ], + "commit": "e30883a7085ad1f4e1113dc84f5f2222ac4bcd37", + "sha256": "18mskl1w5n2cksjds27d1gcrwb065vp9n6hnw9402j3n6z0w8srv" + } + }, + { "ename": "related", "commit": "555932a7b9cf11b50a61c2a9dd2636fd6844fac8", "sha256": "08cfr5qbm1h5j4v3vf3kjjwb9nxsrk74lx9gi1icdhqw631h3yxf", @@ -82583,19 +83565,19 @@ "repo": "a13/reverse-im.el", "unstable": { "version": [ - 20200219, - 1137 + 20200324, + 1113 ], - "commit": "45a55810ce3e07d4e42d9fb666100d7242004b4e", - "sha256": "1669fksymr24fz2lhxv419fm7csm94bkpycz20l2qy55ppn03his" + "commit": "030e89a38df6d194546b0629f90c9e1898370eb7", + "sha256": "1mfjwxf1l0py2ididzdv86r118ws9iscdv23a0kgf2cjd6ydpbjc" } }, { "ename": "reverse-theme", - "commit": "81f0f525680fea98e804f39dbde1dada887e8821", - "sha256": "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "133wl2k0niy9ih0bjn7qx51fykqjj392ibkp1bvmy5dbl09x4gic", "fetcher": "github", - "repo": "syohex/emacs-reverse-theme", + "repo": "emacsorphanage/reverse-theme", "unstable": { "version": [ 20141205, @@ -82833,6 +83815,27 @@ } }, { + "ename": "rime", + "commit": "0144879cf0dfe4f0447c5da7cd061f7aac91d4fe", + "sha256": "1m9jp307czp4mx4xpfnj9bhq7w5xg656dx9l9ih603cbz24salq4", + "fetcher": "github", + "repo": "DogLooksGood/emacs-rime", + "unstable": { + "version": [ + 20200329, + 1205 + ], + "deps": [ + "cl-lib", + "dash", + "popup", + "posframe" + ], + "commit": "f78719e5d8c8d2ec6da0f66e0b1e7d660d3a5a89", + "sha256": "0pcncx1w7y8rnsg23lf055cc38xrwhx26yhrqwzdf996cad54y6w" + } + }, + { "ename": "rimero-theme", "commit": "c6d07b0c021001195e6e0951c890566a5a784ce1", "sha256": "0jbknrp9hc8s956cy2gqffxnx0fgnhmjqp2i4vyp0ywh45wrls5r", @@ -83025,8 +84028,8 @@ "deps": [ "inf-ruby" ], - "commit": "8190cb7c7beb8385dd3abf6ea357f33d8981ae8a", - "sha256": "1lqckmfxm2csh0as22bwf4rvbn5rwqry18xx9m5nfhfl57360q75" + "commit": "68503b32bb3a005787ecb7a7fdeb3bb4a2317e2b", + "sha256": "1v4nbfr3rhdm1733gb88cv0f018iy53cw5hdcwpshrmjj36a2lpn" }, "stable": { "version": [ @@ -83436,26 +84439,26 @@ }, { "ename": "ruby-electric", - "commit": "5fd5fa797a813e02a6433ecbe2bca1270a383753", - "sha256": "02xskivi917l8xyhrij084dmzwjq3knjcn65l2iwz34s767fbwl2", + "commit": "ccae5ba7c1088837f2dd6cb0992f49ea2dc5bcdf", + "sha256": "1fj5vb4n7jiq93z0yakr39vyfd0f5yhf4p4aw4bdm9cx5dmpr8g6", "fetcher": "github", - "repo": "knu/ruby-electric.el", + "repo": "ruby/elisp-ruby-electric", "unstable": { "version": [ - 20191217, - 1214 + 20200328, + 1528 ], - "commit": "ea9571ce3af546fdb1234274c8b1a147109b4869", - "sha256": "16g1764igf9y717sg2rg4b2ysxxlnyjyzk2s6w9jx9dnr2lqih39" + "commit": "f2323cd9b5df3b34aa9810ba8109502824925d23", + "sha256": "1p0l0fsn0jcgb4raimyc4d1wpfksrfhn0rkwdazadvm6s8baydf7" }, "stable": { "version": [ 2, 3, - 2 + 3 ], - "commit": "0e6c1f1022ac84db6a03d60e7a0f9f1fd42ecc99", - "sha256": "1l3zz62d04m3kwj3swffsbkpvkayp9r651cpl07palghx9b34h3m" + "commit": "f2323cd9b5df3b34aa9810ba8109502824925d23", + "sha256": "1p0l0fsn0jcgb4raimyc4d1wpfksrfhn0rkwdazadvm6s8baydf7" } }, { @@ -83760,11 +84763,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200303, - 932 + 20200322, + 1749 ], - "commit": "eb5270bc1cef48d30f33c2a312bff0638a9ff821", - "sha256": "1iip9qhcr3rzvpns71l44vwmm80n5ccldc8zw48xl2ghlxpk2r08" + "commit": "2df6cf72163db57fd0c79fefd0e79f38f29f7d93", + "sha256": "1f8fbzkc6ifx91kcf5blx22bh3713qmm5kj95i06k8cn10nlx11f" }, "stable": { "version": [ @@ -84630,11 +85633,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20200106, - 442 + 20200328, + 116 ], - "commit": "2fbd643ea9632d0e15d32e70b6f3c641476e3071", - "sha256": "1gjwsyvjwj4xsp83nws4bcmzsyxv4zp95a9fx0md86cc9gxw3h6n" + "commit": "2d79a6d9c2497f701335fd66154a67cd51073c9f", + "sha256": "0m2605k8i2z44mqw5ibviwsbn3j8g8hs4q9cih5ip14lik6hhrdz" } }, { @@ -85037,16 +86040,16 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20200203, - 1858 + 20200323, + 220 ], "deps": [ "htmlize", - "simple-httpd", + "impatient-mode", "web-mode" ], - "commit": "6e09efaa613f411b9cc8cd30f46ddab44154a1e2", - "sha256": "0f6x2w94y1clqzl65f3qgw9hm9d97p91jaak4k8k92qnd9s3471r" + "commit": "32f0dbf5a9b39535bc079c9c70456479d0dd3fb2", + "sha256": "1284fdraamjsbaslyk8k75a3m1rfa1i8pwrh56k3vsmfmd8a0cib" }, "stable": { "version": [ @@ -85130,6 +86133,25 @@ } }, { + "ename": "separedit", + "commit": "297ba98f4bc011948c34aad30ae28b7adc611938", + "sha256": "00p4crbzr5fkcj8lhpfd9w44ynpmhd9fay9yrwgz0yh87lll6nqx", + "fetcher": "github", + "repo": "twlz0ne/separedit.el", + "unstable": { + "version": [ + 20200325, + 1711 + ], + "deps": [ + "dash", + "edit-indirect" + ], + "commit": "2ee55780eeced9b0bb086a9d731526ee1a9c3658", + "sha256": "08xxl3z7abqk0m4lwflp0cnz7pcy66f6hps8dmxfas2hgl0qyz7i" + } + }, + { "ename": "sequences", "commit": "4cf716df68fb2d6a41fe75fac0b41e356bddcf30", "sha256": "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh", @@ -85332,6 +86354,21 @@ } }, { + "ename": "sexp-diff", + "commit": "d29e4d21bf808a74bef27ee00d500ec1f816be74", + "sha256": "0cr35b7k6a5japm14bjgnw93g1kqggzwlqwwr0mhg73klnn6qyn8", + "fetcher": "github", + "repo": "xuchunyang/sexp-diff.el", + "unstable": { + "version": [ + 20200314, + 2018 + ], + "commit": "7e8c988bea2af209e17b70fa51316ade55529acb", + "sha256": "1daz6jss2346a2p30fhc66m230sj7vyxm7jw6zqz5n8h9lqxpjyk" + } + }, + { "ename": "sexp-move", "commit": "855ea20024b606314f8590129259747cac0bcc97", "sha256": "0sdm3kr4594fy9hk8yljj2iwa40bgs8nqpwwl2a60r060spz54z9", @@ -85517,6 +86554,21 @@ } }, { + "ename": "share2computer", + "commit": "47647167cc7b9d7ad0a2fc4785849f69dc07d6cb", + "sha256": "067xc1awknx9iqwd4lfj1gkni6aszzfr1179avzzfn1ggp7yzkmq", + "fetcher": "github", + "repo": "tumashu/share2computer", + "unstable": { + "version": [ + 20200316, + 31 + ], + "commit": "15da47625a800e3310b8dc714bd4e41e32966d6a", + "sha256": "04h8vhg0fxabjlqgfqsvxkgsmkcp5qmcinxg46xib386r7rzrx4g" + } + }, + { "ename": "shell-command", "commit": "ae489be43b1aee93614e40f492ebdf0b98a3fbc1", "sha256": "01nviashfr64wm78zi3vrqrqdqgsamp76d9kasxv0b7fqmfx7yjk", @@ -85807,8 +86859,8 @@ 20190930, 730 ], - "commit": "cf30c23a119ef50d1c3ae3fa19ba3c1d07800466", - "sha256": "1d94qrb4kvvz75pgqci10akr1cg5knss66mix6sdfmcvg2q8l3zh" + "commit": "cbb15424431cd5f579b12307b8fa03122d525006", + "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h" } }, { @@ -86669,8 +87721,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200315, - 743 + 20200320, + 457 ], "deps": [ "alert", @@ -86680,8 +87732,8 @@ "request", "websocket" ], - "commit": "c1baa8f57895cc7093dcd156bd268c5a0b3ab68c", - "sha256": "1fklwbj1cgl2r0mqnw0yd62xqyfnmh11n4dmmsvvcjscw7n82p60" + "commit": "03345aabe728da3f5238954eaa0ddbce604807d5", + "sha256": "0kyd959a9113vd7d4prgfga7sj6y6n8zrw6nkqxsfkm5sfpv31iv" } }, { @@ -86742,15 +87794,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20200314, - 1241 + 20200326, + 1453 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "9add8d167cee8ecec0e0ce0f2afa2505499000a2", - "sha256": "09c9zpsbgg8c219hxrmw85w43qb0xdqq3skqpzig29yzbn4y0pvl" + "commit": "faa0c6a0b7c77f6a2db8d3244f24563106857944", + "sha256": "1dgmakfazz3p6s64qmy03schapxi1010sa8g7p1paqkpawr9d5qp" }, "stable": { "version": [ @@ -86970,8 +88022,8 @@ 20200314, 55 ], - "commit": "c3a0e8b0480416f73aca253fe9c24724fbe6a603", - "sha256": "1wm18sqyhh9hgn8icn6bqjfp3jkfyr9f8vfvhcs4cfv3av032pnc" + "commit": "1382bda945ecfb4b177c7d05a36da8fd41e0384c", + "sha256": "1hmdx3nakhpsmg6zr52090pimmy0kpjz2adyi0m1wzh9zdg5cx4x" }, "stable": { "version": [ @@ -87143,11 +88195,11 @@ "repo": "zenitani/elisp", "unstable": { "version": [ - 20190522, - 1125 + 20200322, + 24 ], - "commit": "366a4cdab1ad20105910bc24c4f3e4f8734e4eae", - "sha256": "1kk7ya14p4vpw31rzcgwq0pmay0wm3pg2j70fv5mms9ala1jyhsy" + "commit": "e2a390b9b8518ad62283046400a0fb3e81eb5b79", + "sha256": "1s23r0dr10wjnk0j5gicy1dxvbhvnz3zmbssk431vccbba1jm8yg" } }, { @@ -87477,15 +88529,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20200229, - 1752 + 20200324, + 2147 ], "deps": [ "cl-lib", "dash" ], - "commit": "1f8857c5febe8b82654ba44ae43e6d2f435f4832", - "sha256": "02b05rh474kyk3vmkgh54366k7fqshdf2x5zgrd5q4a8jcffb5nf" + "commit": "555626a43f9bb1985aa9a0eb675f2b88b29702c8", + "sha256": "0hfywwhzv2dphi7gacp1sdyk47cmajzx5sqrcwxkn7mlwx876nsx" }, "stable": { "version": [ @@ -87604,17 +88656,17 @@ }, { "ename": "smeargle", - "commit": "c5b985b24a23499454dc61bf071073df325de571", - "sha256": "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "04z1prwdd1h91jyf9fnggqp657830657kvbch7m2f2pgmn3czvvs", "fetcher": "github", - "repo": "syohex/emacs-smeargle", + "repo": "emacsorphanage/smeargle", "unstable": { "version": [ - 20161212, - 2358 + 20200323, + 533 ], - "commit": "0665b1ff5109731898bc4a0ca6d939933b804777", - "sha256": "0p0kxmjdr02l9injlyyrnnzqdbb7mirz1xx79c3lw1rgpalf0jnf" + "commit": "a0e9bc2ea694aa2940102e1f4cfd8db8be437931", + "sha256": "05n6vgxw91cxk5ri4mmsxc62jcad0yhjjnn16gk1qhjxjqvrlcis" }, "stable": { "version": [ @@ -88098,14 +89150,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20200309, - 2116 + 20200329, + 1048 ], "deps": [ "dash" ], - "commit": "8de268144ab2171896906c8553be7763d5c45fa5", - "sha256": "1z19axaaipia56c9b4nvw4wlcr89wapnwza2gc3mdph3jkwwfjfl" + "commit": "8cd79c8afd7563a69764c4174098d2b8e7fd0c96", + "sha256": "1x1cbyd7kr1izcbbffq1amxgg1gqfwaa5y4m17ffmdrhal37mdzb" }, "stable": { "version": [ @@ -88337,21 +89389,21 @@ }, { "ename": "sound-wav", - "commit": "8333470e3d84d5433be489a23e065c876bed2ab2", - "sha256": "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1sb3345x6rbbxr71x12fj6bzzvj6nin712777rxk59riam4nknd6", "fetcher": "github", - "repo": "syohex/emacs-sound-wav", + "repo": "emacsorphanage/sound-wav", "unstable": { "version": [ - 20181126, - 1726 + 20200323, + 728 ], "deps": [ "cl-lib", "deferred" ], - "commit": "49a9f10334b914cf6429e49b5449e0711a3aa251", - "sha256": "1zg32gn0r06qcp6i5fxwns8xv5nqpc6hfzqajwj0hfvhkqdndv4j" + "commit": "8a18f8a62f4fdde80dfa069986aa959091a42472", + "sha256": "18iahla8m9b6bdn63x2yrvr3rzyw5ybipf44q9avyy6s1pqsby2a" }, "stable": { "version": [ @@ -88448,10 +89500,10 @@ }, { "ename": "sourcemap", - "commit": "557d18259543263932fccdbaf44c4e7986bd277b", - "sha256": "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "1yxjvv3vg14in492hzb3czjfwrg2qp60h4mpxxpx18cjgx8mkybr", "fetcher": "github", - "repo": "syohex/emacs-sourcemap", + "repo": "emacsorphanage/sourcemap", "unstable": { "version": [ 20200315, @@ -88610,11 +89662,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20200127, - 1656 + 20200324, + 1107 ], - "commit": "e088bff4f190495615c29de93079aaa823e2300c", - "sha256": "09p5pzy3ibrl8dxmg10v8j16wxdn1fkdqpbi8l9pgfib2azmnvnc" + "commit": "f79c40fb241e204539fde97200abae91e828e585", + "sha256": "1l2kkiyrskkpx8f901v0wrzaah1wjg15zdyv88spj3mh3hwd3b6n" } }, { @@ -88926,10 +89978,10 @@ }, { "ename": "splitjoin", - "commit": "51e172f46045fbb71b6a13b3521b502339a4a02b", - "sha256": "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0g2i1q1npwrczgzp5321lpljff2ykmq932lzj6pdwnn6cyqixzzb", "fetcher": "github", - "repo": "syohex/emacs-splitjoin", + "repo": "emacsorphanage/splitjoin", "unstable": { "version": [ 20150505, @@ -89231,14 +90283,14 @@ "repo": "purcell/sqlformat", "unstable": { "version": [ - 20200303, - 802 + 20200327, + 2329 ], "deps": [ "reformatter" ], - "commit": "f18a0bb425a5052022af699df322ba90e6d65e20", - "sha256": "10sqq8k27p4fhhwrlq5p1283wrkykkx76fmp4806jiqh4617932f" + "commit": "2f10382034cd5cd2356cc69b4a1e9116d77a0d86", + "sha256": "18z9hljifw63zy4jrsyg4x2lqzgx29sfibx3maj0dm90yzj6zmcg" }, "stable": { "version": [ @@ -89359,6 +90411,35 @@ } }, { + "ename": "srfi", + "commit": "ff844713373e376a637625494321c8e8f197b48e", + "sha256": "1ik6gbcv79l1za7vr2llph1kb2ll8snq11szdxd0r8lnls7l33xf", + "fetcher": "github", + "repo": "srfi-explorations/emacs-srfi", + "unstable": { + "version": [ + 20200326, + 752 + ], + "deps": [ + "cl-lib" + ], + "commit": "fa0c9e1fae26780dcce266df8ad8bf5efc971c30", + "sha256": "1azdc14y2jsmqcphk16qbxaj2fc7ajddwjjhc73xbhbn67knk1af" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "cl-lib" + ], + "commit": "c0a1ae75bfb3fdc81bb722dff5f5e2fae3f07024", + "sha256": "1zymgidk09yyjdd23cz7rx2hql8vpmpqn21i07hwcr7032v0kl7k" + } + }, + { "ename": "srv", "commit": "6b0b7f22631e7749da484ced9192d8ae5e1be941", "sha256": "0xrgbi63vg0msxkcmcnvijkxa9y0s7613liqac7fs9514yvkbwin", @@ -89427,14 +90508,14 @@ "repo": "magit/ssh-agency", "unstable": { "version": [ - 20191009, - 156 + 20200329, + 1535 ], "deps": [ "dash" ], - "commit": "89ea87dbfa0aa2fe644f7215aa3628c3008852c5", - "sha256": "0mkrn3jildlqyrkbdp31zf24vkzx4ycy49kxqs3vspbbcpanpj7j" + "commit": "67975f7773bfa0140d9dc09bd67df7f5489aa6ea", + "sha256": "0vwa1szfy45xpqqv44kyasjv2x0y2n3v680wlb1v3w2mxwwg8vda" }, "stable": { "version": [ @@ -89962,6 +91043,30 @@ } }, { + "ename": "stripes", + "commit": "f4c7beb05435a70293806b729b6f35c2fc2e8ca4", + "sha256": "0pwkqqyhg6gkpj8qh84ylsvq6wjykkkmmil4igw7mn80gy15zd09", + "fetcher": "gitlab", + "repo": "stepnem/stripes-el", + "unstable": { + "version": [ + 20200322, + 2350 + ], + "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5", + "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5", + "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x" + } + }, + { "ename": "stumpwm-mode", "commit": "caaa21f235c4864f6008fb454d0a970a2fd22a86", "sha256": "11yk7xmmccgv7hin5qd1ibcsm1za01xfwsxa25q7vqwk6svnb0sf", @@ -90428,6 +91533,21 @@ } }, { + "ename": "svelte-mode", + "commit": "fc6a992830520750d2e4a9596668ba3d0eefaa11", + "sha256": "0mc9bc8p3a6lkqag72f48xprlrnj077h9mnglq4znxrslm91jr0h", + "fetcher": "github", + "repo": "leafOfTree/svelte-mode", + "unstable": { + "version": [ + 20200327, + 406 + ], + "commit": "17a53e5f8dd45c6bca44659a80a79ca30d161635", + "sha256": "1hrrcg42b1fnf8y0mz3fli6mp7aha7w0rv7nhrsrvhrilnq97wzl" + } + }, + { "ename": "svg-mode-line-themes", "commit": "2ca54d78b5e87c3bb582b178e4892af2bf447d1e", "sha256": "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506", @@ -90580,16 +91700,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20191226, - 103 + 20200321, + 10 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "04c2bf38c16d7cf03a43c065baabaed3a80e78d3", - "sha256": "0xi23ywj9kf5qsw933raqs66yl859hhg62na3zybm78l2kq6dnhg" + "commit": "e58f26b8ab9cf0522d52fe9890d39dc9e645577e", + "sha256": "1yx73wgvaf01wi26ahc9cblsk3sj98rgljb19dxc9ab7hjyncd46" }, "stable": { "version": [ @@ -90697,14 +91817,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200314, - 1959 + 20200319, + 1334 ], "deps": [ "ivy" ], - "commit": "8fae568daafdc79d4990ad739bac42ee230d3234", - "sha256": "18ppxzafz9f8dn7wwdb9vab3c91n20csvn9kjr3djkjgngz6qjd1" + "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", + "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" }, "stable": { "version": [ @@ -90807,16 +91927,29 @@ "repo": "emacsorphanage/swoop", "unstable": { "version": [ - 20160120, - 1715 + 20200321, + 319 ], "deps": [ "async", "ht", "pcre2el" ], - "commit": "a5e475db7a9f5db02ba3d08cd3c1c3594e2e01d7", - "sha256": "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5" + "commit": "7f6f20d0f32b76b7ce5b1459afa44c1ab700f8bb", + "sha256": "1d134f3dyh8sa8q8dgmla01wiky61y4jmhqb5whqpb7c2p53niyc" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "async", + "ht", + "pcre2el" + ], + "commit": "de2d29eb45edab802cf8b275aa1c25a24050122e", + "sha256": "1caq17f7s4pdy6jzyxfh5zwqmwkwkbfpgcnj5f09qgmwanjygjya" } }, { @@ -90879,6 +92012,36 @@ } }, { + "ename": "sxiv", + "commit": "1b3da730053c1f45e67fefb2e9bfce222cc38628", + "sha256": "0jj0bzw365227anvg9zqy78zdfczfvqlac47kjdyziqmj958yhh8", + "fetcher": "gitlab", + "repo": "contrapunctus/sxiv.el", + "unstable": { + "version": [ + 20200326, + 1433 + ], + "deps": [ + "dash" + ], + "commit": "dae46e6f5890f3d97d45eaadf0194b7ff01f6baf", + "sha256": "094kvg0cznddzn5q1clgj9r26h3ygab96rpbr00qn2wnmdb79bhq" + }, + "stable": { + "version": [ + 0, + 3, + 1 + ], + "deps": [ + "dash" + ], + "commit": "dae46e6f5890f3d97d45eaadf0194b7ff01f6baf", + "sha256": "094kvg0cznddzn5q1clgj9r26h3ygab96rpbr00qn2wnmdb79bhq" + } + }, + { "ename": "symbol-overlay", "commit": "c2a468ebe1a3e5a35ef40c59a62befbf8960bd7b", "sha256": "1al60x2mnjsv99jd10v5sd56zz185wsddiq7128phf1l35bkibis", @@ -91582,11 +92745,11 @@ "repo": "11111000000/tao-theme-emacs", "unstable": { "version": [ - 20200306, - 1306 + 20200325, + 344 ], - "commit": "20d38a10b9d9cc49fdf99b99a39f2b03a1f077d6", - "sha256": "1g04j5j5w69qr59r9mlv50859bmfirrivlp01li14a0jy8jymcxv" + "commit": "34917843cde086943816d8a48977658c663a784e", + "sha256": "1ks4pnwp5fg2vswr93hrli2shfd7rrf3nwqwr1qwmqxhq1600f3x" }, "stable": { "version": [ @@ -91606,11 +92769,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20200225, - 1349 + 20200321, + 2124 ], - "commit": "6ebb8b188a39decf22a5cd675aeaa9684e4ea4ef", - "sha256": "0j3cxakgf943wv7bf73bwa69gc3m0g2ksw78xanz5hc0r0bsxbac" + "commit": "9ca1afb561433ff6d2e8527e3d8d9152de5912f7", + "sha256": "0a3hlwzq9ckf7jcxq6drrgl1g8hi5ad0f6lgm3nawbsqmrb6r28y" }, "stable": { "version": [ @@ -91806,14 +92969,14 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200314, - 1914 + 20200329, + 1557 ], "deps": [ "visual-fill-column" ], - "commit": "b7c0b2438cb3152929824bc672ee39e82c67e93a", - "sha256": "1lcimnpg3z4gbwryhkqhmmg3896all2kjb5rhv7prw3794hjpf38" + "commit": "0da852c0b72ad3473432f9e846ce1371d7c8cd61", + "sha256": "0n4jvl6c68wkddvsjfyw82rxy5h7ikc6qrjd35h2v864080gmbjp" }, "stable": { "version": [ @@ -92358,10 +93521,10 @@ }, { "ename": "terraform-mode", - "commit": "93e06adf34bc613edf95feaca64c69a0a2a4b567", - "sha256": "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "14bhn86d7xv4nvqdr65pm0nwmzawbnxyxyig5i4k8ax20xh59d67", "fetcher": "github", - "repo": "syohex/emacs-terraform-mode", + "repo": "emacsorphanage/terraform-mode", "unstable": { "version": [ 20170112, @@ -92673,26 +93836,26 @@ "repo": "myTerminal/theme-looper", "unstable": { "version": [ - 20190501, - 127 + 20200326, + 1651 ], "deps": [ "cl-lib" ], - "commit": "67ca7e6ac4740a412a1ea29f86e46ceeb636535a", - "sha256": "07bfiikrbmk1jc9ir5d3iwvsi3hbfcsira8gsicphwzhaiahqc1c" + "commit": "7077ca11508c6a00d98d592dee967e92185480ff", + "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr" }, "stable": { "version": [ 2, - 4, + 5, 0 ], "deps": [ "cl-lib" ], - "commit": "388138a238fbab9b4bc5ada0300c9bc5ef63d3f1", - "sha256": "0gab7ph1d7z0bjflqrj1y1lb4nk4c32bkpi943px0m5s5cjm54jv" + "commit": "7077ca11508c6a00d98d592dee967e92185480ff", + "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr" } }, { @@ -92816,18 +93979,18 @@ 20200212, 1903 ], - "commit": "e2b274cab473f85ffa8136942664211ed64ff742", - "sha256": "18z50i08y4fg4ygaz3fqyh5rf07jpah2w2y9zhmkpgqkigdwp3sl" + "commit": "9889eb8b3a3a773e8f06df327a76e408f9214cd4", + "sha256": "1vhfkfsrnhdzsk1353xl383nsb7x6a01v7r79lxdcrkj5yxppz0d" }, "stable": { "version": [ 2020, 3, - 9, + 23, 0 ], - "commit": "2ece938967751345394c81381efeea4e3165570f", - "sha256": "15wzhpd1djzviq9r46srzbrwj8zdfmwg7ca9zjm86nff0asv6i01" + "commit": "186d782f02d80c7d8e93be352c2011ed4097c228", + "sha256": "1wj4ng9ymi0hszl3kmdg7rqrff4zk0zipbbn1jcxcii2swrkw12g" } }, { @@ -92883,8 +94046,8 @@ "deps": [ "haskell-mode" ], - "commit": "d9c6b84d8cfadcb5111e291c17c1a2a01a984820", - "sha256": "13xyx6bb15g7kay1n1cfpfvjkya5i9r4r0182cvpdvcig8l3ii84" + "commit": "5d4bce7a9af5e39e6df0d2577962579e31964b65", + "sha256": "0hnqcfvc8gca98wyzcrjldn9kcxdc4m8aa9cdr1884kp4kf5dmvj" }, "stable": { "version": [ @@ -92907,8 +94070,8 @@ "repo": "ananthakumaran/tide", "unstable": { "version": [ - 20200308, - 259 + 20200327, + 1218 ], "deps": [ "cl-lib", @@ -92917,8 +94080,8 @@ "s", "typescript-mode" ], - "commit": "10e5c19de798aba2d57fb1ec83ad3d1369e6547a", - "sha256": "137kkpsdg4mg2rxidnhzq0a6lqgfld3q1zv91j1k0s2m0q2pb3ck" + "commit": "3b45610faaab33bc53ae2d44e1e573f19f35a74a", + "sha256": "1507xp8ndhyqvzd5j2qx3y4lpxq52j40srh5mp9784bf1hm9gg2s" }, "stable": { "version": [ @@ -93246,15 +94409,15 @@ "repo": "laishulu/emacs-tmux-pane", "unstable": { "version": [ - 20200227, - 1230 + 20200330, + 456 ], "deps": [ "names", "s" ], - "commit": "be321093575c1b68946296edd57762c4323c253b", - "sha256": "14f1nvnp6qxgq64410kqwi59f29p2shr6v8qg1ck8g9fiarilx5w" + "commit": "942270359587d54f4fd6e37e8d35da38373447c5", + "sha256": "1x5b0680vxvjqcj5r3674n7gnp4994js13707pikl362bhv398kw" } }, { @@ -93476,6 +94639,24 @@ } }, { + "ename": "tongbu", + "commit": "e97578be9aa9bdadc6bdf6c7105242ca9d23bf80", + "sha256": "1gnjvb4w0mgr0swpqqk3hmscypv9bdg9q2ixkp2sv19d45gd4pvb", + "fetcher": "github", + "repo": "xuchunyang/tongbu.el", + "unstable": { + "version": [ + 20200321, + 1817 + ], + "deps": [ + "web-server" + ], + "commit": "cf3b3ee1468c3dcd1721a5e6802821c8f52f34ce", + "sha256": "0s4h711rwkpf1dbqbak4akbm95y8crd0niisx19jmk9lms5kj5n5" + } + }, + { "ename": "tornado-template-mode", "commit": "f329baae028fd17618824128f312a49aa0a0807e", "sha256": "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h", @@ -93803,14 +94984,14 @@ "repo": "holomorph/transmission", "unstable": { "version": [ - 20200215, - 1350 + 20200321, + 216 ], "deps": [ "let-alist" ], - "commit": "49d3d764819afabf7a66f9d887a6b16c53566317", - "sha256": "00hk1rgqilxhlaabi7pgz25k0ykfizwhpp65yzgs453q6kvhccfv" + "commit": "05a80e7a90303cd80f67681df2ec8e1bac88c394", + "sha256": "02chl6k9r0mki7iy5rs9xwgd74ypf0c79q9d3p7fw1rc1wqxk9ji" }, "stable": { "version": [ @@ -93983,8 +95164,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200309, - 2057 + 20200328, + 1143 ], "deps": [ "ace-window", @@ -93996,8 +95177,8 @@ "pfuture", "s" ], - "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", - "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" + "commit": "4c1add44cc0c5a710c22788663353c9c24909149", + "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" }, "stable": { "version": [ @@ -94033,8 +95214,8 @@ "evil", "treemacs" ], - "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", - "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" + "commit": "4c1add44cc0c5a710c22788663353c9c24909149", + "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" }, "stable": { "version": [ @@ -94064,8 +95245,8 @@ "cl-lib", "treemacs" ], - "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", - "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" + "commit": "4c1add44cc0c5a710c22788663353c9c24909149", + "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" }, "stable": { "version": [ @@ -94096,8 +95277,8 @@ "pfuture", "treemacs" ], - "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", - "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" + "commit": "4c1add44cc0c5a710c22788663353c9c24909149", + "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" }, "stable": { "version": [ @@ -94129,8 +95310,8 @@ "persp-mode", "treemacs" ], - "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", - "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" + "commit": "4c1add44cc0c5a710c22788663353c9c24909149", + "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" } }, { @@ -94148,8 +95329,8 @@ "projectile", "treemacs" ], - "commit": "81b69d9ee26326178cef08d5aef2811df4f659ed", - "sha256": "138iw9sva5s6d2asl1ch0723q3q8zqlyllhxrac3phgmqzjdw68c" + "commit": "4c1add44cc0c5a710c22788663353c9c24909149", + "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" }, "stable": { "version": [ @@ -95607,14 +96788,14 @@ "repo": "jwiegley/use-package", "unstable": { "version": [ - 20191126, - 2034 + 20200322, + 2110 ], "deps": [ "bind-key" ], - "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", - "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" + "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", + "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" }, "stable": { "version": [ @@ -95645,8 +96826,8 @@ "key-chord", "use-package" ], - "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", - "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" + "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", + "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" }, "stable": { "version": [ @@ -95707,8 +96888,8 @@ "system-packages", "use-package" ], - "commit": "42db6b3d90ee57d0f5947d3b0bf4b0010bdf7b40", - "sha256": "1an2whgy68l9c1l1qx8p8jz47g4hj2abf0kxvcmbc6wj8lp5zny8" + "commit": "c873d5529c9c80cb58222f22873a4f081c307cb2", + "sha256": "0jbq3w9ijsbl5gblhr24b0rh4gyp1xx696g20l438a7sbsk4b531" }, "stable": { "version": [ @@ -95817,8 +96998,8 @@ 20190715, 1836 ], - "commit": "c719401992c255f30ed42c4a942651ce7982ce9d", - "sha256": "1dafg3549mpkkl4c698byghai7nlr9nfzl2l7bgqxqwh5qrwp15k" + "commit": "30c77ce4d7996822721e97ac8042d5bc0d415584", + "sha256": "03947csh8nzqqa58z2hq5i87kqf7z65f7b19nyvy0can2flznl7q" }, "stable": { "version": [ @@ -96438,20 +97619,20 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200313, - 1956 + 20200326, + 2322 ], - "commit": "b2570e4809fc0c97add33b4f2e05e5361750c877", - "sha256": "02ikvwcqgma8nzpx13nzdjw3y8dmk2y0d5b3g882i9rp04xs0y1l" + "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c", + "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2" }, "stable": { "version": [ 2, - 8, - 1 + 9, + 0 ], - "commit": "b2570e4809fc0c97add33b4f2e05e5361750c877", - "sha256": "02ikvwcqgma8nzpx13nzdjw3y8dmk2y0d5b3g882i9rp04xs0y1l" + "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c", + "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2" } }, { @@ -96499,8 +97680,8 @@ "repo": "mihaiolteanu/versuri", "unstable": { "version": [ - 20200309, - 737 + 20200316, + 852 ], "deps": [ "anaphora", @@ -96511,8 +97692,8 @@ "request", "s" ], - "commit": "9cae9900e01cb41064209762ca289ca6da8bb196", - "sha256": "04r4qg9a1p6igg1j6praa2kxxg5rlc25s0s6gvl56gxb9s1qchh1" + "commit": "41e20583d1080beeeda0e36d1b2e6d74b9c57920", + "sha256": "0fgc1rai9gp6lwl0rxr9400vi420py0c0b8nv9wzl12ph80yhwj7" } }, { @@ -96611,8 +97792,8 @@ "helm-rg", "outshine" ], - "commit": "8584e73ab550841b3df7419dea32b874cdd64425", - "sha256": "0s0ljcn6lgcr6zqhw31llg4ri2drkxbz31kviir0xwgr8hn4p5dn" + "commit": "3dbfe8160e22053f0a9bee70ba6f8e1e3967bc46", + "sha256": "1pr7skldslq35ry17yyslfrl2d84msxyh0q77a3djv7ssqlpd270" }, "stable": { "version": [ @@ -96750,15 +97931,15 @@ "repo": "mrkkrp/vimish-fold", "unstable": { "version": [ - 20200223, - 1836 + 20200329, + 1242 ], "deps": [ "cl-lib", "f" ], - "commit": "d3248a41a79092ea270b07ac60bf7420befa2146", - "sha256": "164jx09m7sgmffixlarjdyn8zdrqcmm4ngwddpjyv3phi65pnpj0" + "commit": "63685239655a151181b9152e45478dad587f86f2", + "sha256": "1l6zca08diq3ppmg1pllihbfj0pcaqvbnisryr92mvbblhk44wxs" }, "stable": { "version": [ @@ -96977,6 +98158,21 @@ } }, { + "ename": "vlc", + "commit": "bcb69969893a3f70fe9e7e3b2a836df3ba212fb8", + "sha256": "1pf3ry205pl4369hbpvcc1xlicf16ws4dc018mk6c1m4fi9qc3lk", + "fetcher": "github", + "repo": "xuchunyang/vlc.el", + "unstable": { + "version": [ + 20200328, + 1143 + ], + "commit": "932840f874e7510ee86e796bb5dc20d44514e31a", + "sha256": "0vqsdvaqi8ih98ic9hdwwwwcs4v0yjz3nrwwwkwh2a99l9a59j5g" + } + }, + { "ename": "vlf", "commit": "9116b11eb513dd9e1dc9542d274dd60f183b24c4", "sha256": "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8", @@ -97164,11 +98360,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200315, - 1353 + 20200327, + 1447 ], - "commit": "186914a3f3666b92a5c52fc77063953974a96c47", - "sha256": "06d51aqri06lxbnki0hag9g641amgbcnb64arj33wv4cf495q595" + "commit": "996c535b9cc6aa70c3595413582d97abfab16edd", + "sha256": "0f84376rc9gm54llfln1528p82svczfrz9p48d1vh9pmf5ba09vw" } }, { @@ -97248,6 +98444,28 @@ } }, { + "ename": "vuiet", + "commit": "4f63056cf2f637fcb3426851501eeff5e6f40bb3", + "sha256": "0hf99rgzhi66in3lr0pl3g8g56l00zcvz1qgclfsbw1yb9ig626y", + "fetcher": "github", + "repo": "mihaiolteanu/vuiet", + "unstable": { + "version": [ + 20200326, + 1738 + ], + "deps": [ + "bind-key", + "lastfm", + "mpv", + "s", + "versuri" + ], + "commit": "c917155a0c72d9fceb9f7c39efcc97320f9e9028", + "sha256": "14djavnczks11lvmldwf0j8nnj4jd0jmz30l6r4hv12f3zjwyk7a" + } + }, + { "ename": "vyper-mode", "commit": "492d42d60bc188a567c5e438b838a275a124c699", "sha256": "0mf1w4mw0ijmd9zxip1df85cp15fbvv9j5dqjmb8lfm4m43wpd96", @@ -97292,11 +98510,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20200313, - 0 + 20200325, + 2226 ], - "commit": "cf30c23a119ef50d1c3ae3fa19ba3c1d07800466", - "sha256": "1d94qrb4kvvz75pgqci10akr1cg5knss66mix6sdfmcvg2q8l3zh" + "commit": "cbb15424431cd5f579b12307b8fa03122d525006", + "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h" } }, { @@ -97384,11 +98602,11 @@ "repo": "darkstego/wakib-keys", "unstable": { "version": [ - 20190910, - 1011 + 20200326, + 2329 ], - "commit": "23237fc2c255de798b8d3fc2cb68c7c22b53caa9", - "sha256": "1s5n2gcldwj5srjn44pigd788x0hv4c7lz75krqyz1hysriydv9p" + "commit": "7564b39aaa2b38ccca0a21bc72a797f065a0b171", + "sha256": "132jwf1d54ykbvw4f9f7i27ig5hpc6wsmm1ib44m5hx1kv1kxvh6" } }, { @@ -97418,15 +98636,30 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20200224, - 1501 + 20200319, + 1739 ], "deps": [ "org", "transient" ], - "commit": "bdc026b58dc023cf078ec5eafae3b334ac5c39ef", - "sha256": "13bhdmylg7k9r5y6wi158rv8rm4cndv8av35g65vc6qk0bgnnwpz" + "commit": "da90c9dcd501c1bb88c6bde055911c34bf4202a7", + "sha256": "04gzb1v6wva24xbl8r8rr1ys2zmz03ccl0517d3pkgbd9v1wha2f" + } + }, + { + "ename": "wallpaper", + "commit": "764c5b8438197d6f24113e7b3a696b8327a8d6d9", + "sha256": "18wpj5qzac0msp9mi8511kpw6157k7dj9zvzh1y6rhd7a5nd0clg", + "fetcher": "github", + "repo": "farlado/emacs-wallpaper", + "unstable": { + "version": [ + 20200321, + 1220 + ], + "commit": "762354e958dbe298de06d119493d1aee8ffd0112", + "sha256": "1vcpfamawaja9q2n5qqkfn1bn2psi3ymcniw9g66k3whkqsh0kji" } }, { @@ -97931,14 +99164,14 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20200102, - 637 + 20200321, + 102 ], "deps": [ "cl-lib" ], - "commit": "ee44af2cc55415591e7ccb1007193294c702affd", - "sha256": "01pc03kial647r1nad1vw6rcbd251hrvjjh87gqqlhh9ksrcwnl9" + "commit": "31e122a9d7a1ae092e8f970df718fb8256e16574", + "sha256": "1yjdrpn2dwaarmcymf1i8lj72jyvrpp3jqwr3rv59bg8fldin0rs" }, "stable": { "version": [ @@ -98376,11 +99609,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20190529, - 1554 + 20200326, + 1909 ], - "commit": "c86c0ad9adc4787a422cca11b66229cc14a6d83a", - "sha256": "1abn5rzapbvk217h1s7lk166y48g7fvdvjmy2fsbz60rwq2zhpk6" + "commit": "2186a52db77badd809c99d5c21502878298d78f6", + "sha256": "1dnr7navhjzca2hapwx41xdx4i5fgjyjnw2ms5na6n572xp8kgnj" }, "stable": { "version": [ @@ -98846,11 +100079,11 @@ "repo": "ArneBab/wisp", "unstable": { "version": [ - 20190921, - 2218 + 20191114, + 2340 ], - "commit": "0d2c025ac4cfd394706c07fbb60999eaf711020b", - "sha256": "1fs4dpc78aax4mzcp0vzcvzf2mxiwzbdwjfgpylwppxamqdycdwy" + "commit": "33b4fcdd8a17aa19d57971e4f6db5fcb7758843c", + "sha256": "09rrv89b17s4sklkqgci1pmzlnkjlrira22884dh10sbfij42vbp" } }, { @@ -98970,14 +100203,14 @@ "repo": "p3r7/with-shell-interpreter", "unstable": { "version": [ - 20200306, - 1445 + 20200319, + 1351 ], "deps": [ "cl-lib" ], - "commit": "055b46755b7cbc324a8d92e092de671b9bc97098", - "sha256": "10xf2aqxkqdls0ym2a5dvwz96zzziw7v0y493krw2jchzpwkwryk" + "commit": "e806b1e5537ba2f23b507a3cc28aa7c3cacd2315", + "sha256": "1qklc135ydslcxjhlgbmagib3j184gm72paky6glzdjh2yf8mm50" } }, { @@ -99677,11 +100910,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20200311, - 1951 + 20200330, + 557 ], - "commit": "691a2bac50db70fc3bda5aa836952c4d3c3aed6f", - "sha256": "1cwl2jz0iwkr53b9l2vpj6yik4bghwqd2kcjpp7dpqx29i3sppyw" + "commit": "d75567f7f6b85830b97b18ab1b5d8e70acaa05bf", + "sha256": "1lmca03y7h584agid7fr5g2w3s9psk55n0qlrcfgg10d67nq6l75" } }, { @@ -100325,8 +101558,8 @@ 20171022, 1412 ], - "commit": "db84dbb30ed39079d34d5eba01cc67af6f7d92de", - "sha256": "1syxgm3a51i3kybbjgjlwlrrgr6rscr4iqam3aa7r55z0hlx8k2r" + "commit": "ecb66f0b77aac0123e5b3336ee1910fa07fa44f9", + "sha256": "1cvsp6x94b223g21avr2z255s5xwdwmdxnhwzq8qj2c3qrax6sx9" } }, { @@ -100486,11 +101719,11 @@ "repo": "JorisE/yapfify", "unstable": { "version": [ - 20200117, - 1245 + 20200326, + 917 ], - "commit": "0b4f20af0b00a86353ddc286df26eade89381269", - "sha256": "1k91fav3dvdjkg632zhkmgbjvichbixwqdir4x8lc332ma3wwi0h" + "commit": "2e5d344b6d9cf1965a1153b160b3a52582d492ff", + "sha256": "1pi1dgcqz1xn5r4z5pjxbyx4kq75cxzl3711zzp0dyn48w0a7sj3" }, "stable": { "version": [ @@ -100616,14 +101849,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20191222, - 2206 + 20200329, + 1434 ], "deps": [ "cl-lib" ], - "commit": "3bf9a3b1af37174a004798b7195826af0123fa6a", - "sha256": "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv" + "commit": "7c02bc142c3b157699ab8c4f24ff98da94401248", + "sha256": "1yjqlb9jdbsmmywgg49wd25psbf9637hzgnx5i1q3diaravlnji6" }, "stable": { "version": [ @@ -100899,6 +102132,21 @@ } }, { + "ename": "yesterbox", + "commit": "21f684c47e5778c9d46c9f28dae1113197717b78", + "sha256": "1ah4l8zz565jgr52d9n29iv93z7qwmlz9pdjw3l51qhqf79lkf1w", + "fetcher": "github", + "repo": "sje30/yesterbox", + "unstable": { + "version": [ + 20200327, + 52 + ], + "commit": "10591342f1759e25756f5865371a53c132d8b0a0", + "sha256": "0cd77m4zyqs74iz56l4h0k7ccxnxhis0247j4f5mf94s51fn1x7p" + } + }, + { "ename": "yoficator", "commit": "5156f01564978718dd99ab3a54f19b6512de5c3c", "sha256": "0b6lv6wk5ammhb9rws9kig02wkm84i5avm7a1vd4sb7wkgm9nj9r", @@ -101134,30 +102382,34 @@ }, { "ename": "zephir-mode", - "commit": "5bd901c93ce7f64de6082e801327adbd18fd4517", - "sha256": "0nxm6w7z89q2vvf3bp1p6hb6f2axv9ha85jyiv4k02l46sjprf4j", + "commit": "fac9fb89cbe5c3eea987fadf23db20c214eab4d9", + "sha256": "133m47a54hdsczzmk3wg7f47q314qnw824lkh8zqx0nw68063i79", "fetcher": "github", - "repo": "sergeyklay/zephir-mode", + "repo": "zephir-lang/zephir-mode", "unstable": { "version": [ - 20170918, - 425 + 20200329, + 1235 ], "deps": [ "cl-lib", "pkg-info" ], - "commit": "1db4071a014a796120b5c3d0a7f91eb77359eb10", - "sha256": "0kqnihir4rr8ckzz3wn5sz3qwgnvpa8bqw767khn887bpf7qsmiq" + "commit": "3e112ba7c52b5caad0c230e014b6e842d6379ab1", + "sha256": "1h6lhz7fvx6c2zwgjwm5aiax5f22v65dmq3rj0s51vpasyj2k9ib" }, "stable": { "version": [ 0, - 3, - 3 + 5, + 0 ], - "commit": "243f0fb7fd1dfebf0f0bdf94046b72d1bea4f66c", - "sha256": "0jydy2zcbksi7db7bvfhgdh08np8k4a1yd6q2wq6m3ll2y3zd0w2" + "deps": [ + "cl-lib", + "pkg-info" + ], + "commit": "76c310faf792db93bc6750305f5b54aa6a4963bd", + "sha256": "1najsypq8qix6jgxqqj5kkfdp7b10l3xz25qw0y5lzz4by4pzzpa" } }, { @@ -101227,14 +102479,14 @@ "repo": "efls/zetteldeft", "unstable": { "version": [ - 20200314, - 1814 + 20200329, + 1506 ], "deps": [ "deft" ], - "commit": "4871425426ee1d283b1147d0cf6daa7598fa8e70", - "sha256": "0l6s8psp98h8jch6g1pbqb25zzqjz352h4m3kpgdlxf68cq9iary" + "commit": "1dd8b052bb4bc8fcd18740e798057ace97cb63ac", + "sha256": "16bkcp6mq98bn1qli2qi6wgf5zrkxfqs912fi9fg88bcixk50k9j" } }, { @@ -101245,11 +102497,11 @@ "repo": "ziglang/zig-mode", "unstable": { "version": [ - 20191023, - 1551 + 20200322, + 131 ], - "commit": "77202ac26ee6091d69d40990fddb1ce6cfcc6dc8", - "sha256": "0d2f6nz99dp3yxr7m8i78lc313qzssm7k4783w6kkvcsbpknazlw" + "commit": "fc7fde327f45533bb73be643e7bda1eda10394b6", + "sha256": "1ld34xs25bysxw9ialrlm6pnp5qbzx94zbb3594ghc2ggz5ph5d5" } }, { @@ -101260,8 +102512,8 @@ "repo": "WillForan/zim-wiki-mode", "unstable": { "version": [ - 20191208, - 2241 + 20200316, + 1223 ], "deps": [ "dokuwiki-mode", @@ -101270,8 +102522,8 @@ "link-hint", "pretty-hydra" ], - "commit": "030fb78600a6782f8746fe547b979bcc9a24f0ed", - "sha256": "0b3rd83mbpyf782jnfv2yfhfq2ffps3wbn31iblyydmv790lpdvx" + "commit": "410fa67d5947b8801b03a58fcb2bd414cb5294f7", + "sha256": "14dmda7ahnflv0db9yzssz7bidz3zsdnxxwnby0y48vcjv94nnl5" } }, { @@ -101297,14 +102549,14 @@ "repo": "dzop/emacs-zmq", "unstable": { "version": [ - 20190812, - 1910 + 20200305, + 2345 ], "deps": [ "cl-lib" ], - "commit": "0544b70bf99b6eb95f46e0fcd788d98da50cb892", - "sha256": "0r9aq933b2pk9m70phfz3ah3dk1c5axmjixcf8cf19sjsv1hcc9x" + "commit": "2aed40aee51d19cbca83d1f1edc23a5f1522dd8d", + "sha256": "1viz4sw4vmnjhhqw68wp8a4ks1751s2dk09gx2gyl8gy5vw2fcg6" }, "stable": { "version": [ @@ -101488,25 +102740,25 @@ }, { "ename": "zoom-window", - "commit": "8a55cc66cc0deb1c24023f638b8e920c9d975859", - "sha256": "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3", + "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", + "sha256": "0h4rr6h79g6sh8caa0l0fxssbd02v2llapqmikz72vpsghqg7y57", "fetcher": "github", - "repo": "syohex/emacs-zoom-window", + "repo": "emacsorphanage/zoom-window", "unstable": { "version": [ - 20170302, - 827 + 20200323, + 720 ], - "commit": "cd6ecc103fc30b171bda7daf1f44a550854d0dbf", - "sha256": "1rfhdzwyag32s15ysmf75976nvkx995581afaa4ychj45vwnaqfm" + "commit": "ab14a365f3e496b07f5efc20992f9094ec166f06", + "sha256": "0ah0gfzp0c90vrqmsfd6crl3i6bjqgb78hnpcvvg53gk5i19i4aw" }, "stable": { "version": [ 0, - 5 + 6 ], - "commit": "eefe36d26e04a9f89aad27671d1f06e9d4736ac6", - "sha256": "08splg49ncgfsap3ivpc974wmg22ikshwv33l0i6advjjv9cskhm" + "commit": "ab14a365f3e496b07f5efc20992f9094ec166f06", + "sha256": "0ah0gfzp0c90vrqmsfd6crl3i6bjqgb78hnpcvvg53gk5i19i4aw" } }, { diff --git a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix index 54e5a89dd9f..4320a88457a 100644 --- a/pkgs/applications/editors/emacs-modes/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs-modes/rect-mark/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Mark a rectangle of text with highlighting"; - homepage = http://emacswiki.org/emacs/RectangleMark; + homepage = "http://emacswiki.org/emacs/RectangleMark"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix index 165e0c13c8f..e4b739af051 100644 --- a/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix +++ b/pkgs/applications/editors/emacs-modes/session-management-for-emacs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { (add-hook 'after-init-hook 'session-initialize) */ description = "Small session management for emacs"; - homepage = http://emacs-session.sourceforge.net/; + homepage = "http://emacs-session.sourceforge.net/"; license = "GPL"; }; } diff --git a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix index fcb37e7ebad..7e611d68a0a 100644 --- a/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix +++ b/pkgs/applications/editors/emacs-modes/sunrise-commander/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "sunrise-commander-6r435"; src = fetchgit { - url = https://github.com/escherdragon/sunrise-commander.git; + url = "https://github.com/escherdragon/sunrise-commander.git"; rev = "7a44ca7abd9fe79f87934c78d00dc2a91419a4f1"; sha256 = "2909beccc9daaa79e70876ac6547088c2459b624c364dda1886fe4d7adc7708b"; }; @@ -22,7 +22,7 @@ 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; + homepage = "http://www.emacswiki.org/emacs/Sunrise_Commander"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix index 3b746c293d8..b87390d4609 100644 --- a/pkgs/applications/editors/emacs-modes/tramp/default.nix +++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [ emacs texinfo ]; meta = { description = "Transparently access remote files from Emacs. Newer versions than built-in."; - homepage = https://www.gnu.org/software/tramp; + homepage = "https://www.gnu.org/software/tramp"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix index 209a99245ec..4dc56894914 100644 --- a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix +++ b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Comprehensive Emacs integration with Oddmuse wikis"; - homepage = http://emacswiki.org/emacs/Yaoddmuse; + homepage = "http://emacswiki.org/emacs/Yaoddmuse"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix index 9403a51df53..c771f5423a9 100644 --- a/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix +++ b/pkgs/applications/editors/emacs-modes/zeitgeist/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Integreate Emacs with Zeitgeist"; - homepage = http://zeitgeist-project.com/; + homepage = "http://zeitgeist-project.com/"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/editors/emacs/25.nix b/pkgs/applications/editors/emacs/25.nix index e4643102f0e..1ee2f5d4fe7 100644 --- a/pkgs/applications/editors/emacs/25.nix +++ b/pkgs/applications/editors/emacs/25.nix @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; - homepage = https://www.gnu.org/software/emacs/; + homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2b40eb77e2c..9d0fc456538 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The extensible, customizable GNU text editor"; - homepage = https://www.gnu.org/software/emacs/; + homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 peti the-kenny jwiegley adisbladis ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/emacs/macport.nix b/pkgs/applications/editors/emacs/macport.nix index e9307c7e80b..1624e62026a 100644 --- a/pkgs/applications/editors/emacs/macport.nix +++ b/pkgs/applications/editors/emacs/macport.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The extensible, customizable text editor"; - homepage = https://www.gnu.org/software/emacs/; + homepage = "https://www.gnu.org/software/emacs/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jwiegley matthewbauer ]; platforms = platforms.darwin; diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index e48fba1551e..c6089fd5308 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtsvg qtx11extras ]; meta = with stdenv.lib; { description = "Lightweight Qt5 Plain-Text Editor for Linux"; - homepage = https://github.com/tsujan/FeatherPad; + homepage = "https://github.com/tsujan/FeatherPad"; platforms = platforms.linux; maintainers = [ maintainers.flosse ]; license = licenses.gpl3; diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index cbff8e606f2..3d6aac7e18e 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WYSIWYG PostScript annotator"; - homepage = http://flpsed.org/flpsed.html; + homepage = "https://flpsed.org/flpsed.html"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/editors/fte/default.nix b/pkgs/applications/editors/fte/default.nix index ab149131b80..f19a264c06a 100644 --- a/pkgs/applications/editors/fte/default.nix +++ b/pkgs/applications/editors/fte/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free text editor for developers"; - homepage = http://fte.sourceforge.net/; + homepage = "http://fte.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/glow/default.nix b/pkgs/applications/editors/glow/default.nix index 80fdcc8a09c..928291940cf 100644 --- a/pkgs/applications/editors/glow/default.nix +++ b/pkgs/applications/editors/glow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "glow"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "0r0yq7kgz7i1wf4gxxihdrn1c8mi4wcyhadncxbln24s9c5apxsf"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=" "-X=main.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Render markdown on the CLI"; homepage = "https://github.com/charmbracelet/glow"; license = licenses.mit; diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index bda0552e752..b9f06e44a87 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -5,7 +5,6 @@ , docbook_xsl , docbook_xml_dtd_43 , fetchurl -, fetchpatch , flatpak , gnome3 , libgit2-glib @@ -18,6 +17,7 @@ , jsonrpc-glib , libdazzle , libpeas +, libportal , libxml2 , meson , ninja @@ -39,25 +39,13 @@ stdenv.mkDerivation rec { pname = "gnome-builder"; - version = "3.34.1"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19018pq94cxf6fywd7fsmy98x56by5zfmh140pl530gaaw84cvhb"; + sha256 = "G0nl6DVzb3k6cN2guFIe/XNhFNhKbaq5e8wz62VA0Qo="; }; - patches = [ - # Fix build with Meson 0.52 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/c8b862b491cfbbb4f79b24d7cd90e4fb1f37cb9f.patch"; - sha256 = "0n8kg7nnjqmbnyag1ps6dvrlqrxc94djjncqx10d6y7ijwdxf4w8"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-builder/commit/da26dfbf78468f5ed724e022b300a07862a95833.patch"; - sha256 = "0psa65bzjpjj7vc5rknv2w2dz3p50jjv10s6j2fd6lpw8j2800k4"; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils @@ -65,7 +53,7 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 gobject-introspection gtk-doc - (meson.override ({ inherit stdenv; })) + meson ninja pkgconfig python3 @@ -80,6 +68,7 @@ stdenv.mkDerivation rec { gnome3.glade libgit2-glib libpeas + libportal vte gspell gtk3 @@ -109,8 +98,6 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post_install.py ''; - NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - mesonFlags = [ "-Dpython_libprefix=${python3.libPrefix}" "-Ddocs=true" @@ -162,7 +149,7 @@ stdenv.mkDerivation rec { currently recommend running gnome-builder inside a nix-shell with appropriate dependencies loaded. ''; - homepage = https://wiki.gnome.org/Apps/Builder; + homepage = "https://wiki.gnome.org/Apps/Builder"; license = licenses.gpl3Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index cfd3a428990..33a32132934 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { passthru.updateScript = gnome3.updateScript { packageName = pname; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/GNOME-LaTeX; + homepage = "https://wiki.gnome.org/Apps/GNOME-LaTeX"; description = "A LaTeX editor for the GNOME desktop"; maintainers = [ maintainers.manveru ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index f194227932d..e3d039e4223 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = http://gobby.0x539.de/; + 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; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix index 4e67fc304b1..7d1830c842b 100644 --- a/pkgs/applications/editors/heme/default.nix +++ b/pkgs/applications/editors/heme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Portable and fast console hex editor for unix operating systems"; - homepage = http://heme.sourceforge.net/; + homepage = "http://heme.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/hexcurse/default.nix b/pkgs/applications/editors/hexcurse/default.nix index c87694321f3..a1b90b83d58 100644 --- a/pkgs/applications/editors/hexcurse/default.nix +++ b/pkgs/applications/editors/hexcurse/default.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation rec { patches = [ # gcc7 compat (fetchpatch { - url = https://github.com/LonnyGomes/hexcurse/commit/d808cb7067d1df067f8b707fabbfaf9f8931484c.patch; + url = "https://github.com/LonnyGomes/hexcurse/commit/d808cb7067d1df067f8b707fabbfaf9f8931484c.patch"; sha256 = "0h8345blmc401c6bivf0imn4cwii67264yrzxg821r46wrnfvyi2"; }) # gcc7 compat (fetchpatch { - url = https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch; + url = "https://github.com/LonnyGomes/hexcurse/commit/716b5d58ac859cc240b8ccb9cbd79ace3e0593c1.patch"; sha256 = "0v6gbp6pjpmnzswlf6d97aywiy015g3kcmfrrkspsbb7lh1y3nix"; }) ]; meta = with lib; { description = "ncurses-based console hexeditor written in C"; - homepage = https://github.com/LonnyGomes/hexcurse; + homepage = "https://github.com/LonnyGomes/hexcurse"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/hexdino/default.nix b/pkgs/applications/editors/hexdino/default.nix index 48cd58570f8..79e0027d509 100644 --- a/pkgs/applications/editors/hexdino/default.nix +++ b/pkgs/applications/editors/hexdino/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage { meta = with stdenv.lib; { description = "A hex editor with vim like keybindings written in Rust"; - homepage = https://github.com/Luz/hexdino; + homepage = "https://github.com/Luz/hexdino"; license = licenses.mit; maintainers = [ maintainers.luz ]; platforms = platforms.all; diff --git a/pkgs/applications/editors/hexedit/default.nix b/pkgs/applications/editors/hexedit/default.nix index 09191b38e1b..916dd4a1594 100644 --- a/pkgs/applications/editors/hexedit/default.nix +++ b/pkgs/applications/editors/hexedit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "View and edit files in hexadecimal or in ASCII"; - homepage = http://prigaux.chez.com/hexedit.html; + homepage = "http://prigaux.chez.com/hexedit.html"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/howl/default.nix b/pkgs/applications/editors/howl/default.nix index 5e5f2f8563c..975016d5541 100644 --- a/pkgs/applications/editors/howl/default.nix +++ b/pkgs/applications/editors/howl/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://howl.io/; + homepage = "https://howl.io/"; description = "A general purpose, fast and lightweight editor with a keyboard-centric minimalistic user interface"; license = licenses.mit; maintainers = with maintainers; [ pacien ]; diff --git a/pkgs/applications/editors/ht/default.nix b/pkgs/applications/editors/ht/default.nix index fc1fe969bdc..096b69a5e82 100644 --- a/pkgs/applications/editors/ht/default.nix +++ b/pkgs/applications/editors/ht/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "File editor/viewer/analyzer for executables"; - homepage = http://hte.sourceforge.net; + homepage = "http://hte.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix index 21a6a847518..fd8b5337251 100644 --- a/pkgs/applications/editors/jedit/default.nix +++ b/pkgs/applications/editors/jedit/default.nix @@ -3,11 +3,11 @@ let version = "5.2.0"; bcpg = fetchurl { - url = http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar; + url = "http://central.maven.org/maven2/org/bouncycastle/bcpg-jdk16/1.46/bcpg-jdk16-1.46.jar"; sha256 = "16xhmwks4l65m5x150nd23y5lyppha9sa5fj65rzhxw66gbli82d"; }; jsr305 = fetchurl { - url = http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar; + url = "http://central.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.0/jsr305-2.0.0.jar"; sha256 = "0s74pv8qjc42c7q8nbc0c3b1hgx0bmk3b8vbk1z80p4bbgx56zqy"; }; in @@ -58,7 +58,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mature programmer's text editor (Java based)"; - homepage = http://www.jedit.org; + homepage = "http://www.jedit.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 8d5e8540aa1..5ff03918d1e 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -15,7 +15,7 @@ let inherit name version src wmClass jdk; product = "CLion"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/clion/; + homepage = "https://www.jetbrains.com/clion/"; inherit description license; longDescription = '' Enhancing productivity for every C and C++ @@ -83,7 +83,7 @@ let inherit name version src wmClass jdk; product = "DataGrip"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/datagrip/; + homepage = "https://www.jetbrains.com/datagrip/"; inherit description license; longDescription = '' DataGrip is a new IDE from JetBrains built for database admins. @@ -100,7 +100,7 @@ let inherit name version src wmClass jdk; product = "Goland"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/go/; + homepage = "https://www.jetbrains.com/go/"; inherit description license; longDescription = '' Goland is the codename for a new commercial IDE by JetBrains @@ -125,7 +125,7 @@ let inherit name version src wmClass jdk; product = "IDEA"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/idea/; + homepage = "https://www.jetbrains.com/idea/"; inherit description license; longDescription = '' IDE for Java SE, Groovy & Scala development Powerful @@ -143,7 +143,7 @@ let inherit name version src wmClass jdk; product = "PhpStorm"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/phpstorm/; + homepage = "https://www.jetbrains.com/phpstorm/"; inherit description license; longDescription = '' PhpStorm provides an editor for PHP, HTML and JavaScript @@ -160,7 +160,7 @@ let inherit name version src wmClass jdk; product = "PyCharm"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/pycharm/; + homepage = "https://www.jetbrains.com/pycharm/"; inherit description license; longDescription = '' Python IDE with complete set of tools for productive @@ -187,7 +187,7 @@ let inherit name version src wmClass jdk; product = "Rider"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/rider/; + homepage = "https://www.jetbrains.com/rider/"; inherit description license; longDescription = '' JetBrains Rider is a new .NET IDE based on the IntelliJ @@ -213,7 +213,7 @@ let inherit name version src wmClass jdk; product = "RubyMine"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/ruby/; + homepage = "https://www.jetbrains.com/ruby/"; inherit description license; longDescription = description; maintainers = with maintainers; [ edwtjo ]; @@ -226,7 +226,7 @@ let inherit name version src wmClass jdk; product = "WebStorm"; meta = with stdenv.lib; { - homepage = https://www.jetbrains.com/webstorm/; + homepage = "https://www.jetbrains.com/webstorm/"; inherit description license; longDescription = '' WebStorm provides an editor for HTML, JavaScript (incl. Node.js), diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 6f5839b3d06..bb227512387 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A full featured terminal-based screen editor"; - homepage = https://joe-editor.sourceforge.io; + homepage = "https://joe-editor.sourceforge.io"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/applications/editors/jucipp/default.nix b/pkgs/applications/editors/jucipp/default.nix index 2682c1e789b..53549986ed2 100644 --- a/pkgs/applications/editors/jucipp/default.nix +++ b/pkgs/applications/editors/jucipp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.2.3"; meta = { - homepage = https://github.com/cppit/jucipp; + homepage = "https://github.com/cppit/jucipp"; description = "A lightweight, platform independent C++-IDE with support for C++11, C++14, and experimental C++17 features depending on libclang version"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix index 4a44b35a0fa..9db44bc4008 100644 --- a/pkgs/applications/editors/jupp/default.nix +++ b/pkgs/applications/editors/jupp/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { and has a lot of bugs fixed. It is based upon an older version of joe because these behave better overall. ''; - homepage = http://mirbsd.de/jupp; + homepage = "http://mirbsd.de/jupp"; license = licenses.gpl1; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix index 43cea9fcae9..fba884f5a2f 100644 --- a/pkgs/applications/editors/jupyter/kernel.nix +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -67,7 +67,7 @@ in meta = { description = "Wrapper to create jupyter notebook kernel definitions"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; maintainers = with maintainers; [ aborsu ]; }; }; diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 8cb70af40e0..6a468bd67eb 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://kakoune.org/; + homepage = "http://kakoune.org/"; description = "A vim inspired text editor"; license = licenses.publicDomain; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix index b3315313813..ad83bd43af2 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { KDevelop-PG-Qt is the parser-generator from KDevplatform. It is used for some KDevelop-languagesupport-plugins (Ruby, PHP, CSS...). ''; - homepage = https://www.kdevelop.org; + homepage = "https://www.kdevelop.org"; license = with stdenv.lib.licenses; [ lgpl2Plus ]; }; } diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix index 494ad686ee3..f928dbb6ad1 100644 --- a/pkgs/applications/editors/kile/default.nix +++ b/pkgs/applications/editors/kile/default.nix @@ -54,7 +54,7 @@ mkDerivation rec { meta = { description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment"; - homepage = https://www.kde.org/applications/office/kile/; + homepage = "https://www.kde.org/applications/office/kile/"; maintainers = with lib.maintainers; [ fridh ]; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index 9d0d91f4be5..71fa2bcd41b 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -125,8 +125,8 @@ in (with JavaScript coming soon). Using Kha or Kore you can access all hardware at the lowest possible level in a completely portable way. ''; - homepage = http://kode.tech/; - downloadPage = https://github.com/Kode/KodeStudio/releases; + homepage = "http://kode.tech/"; + downloadPage = "https://github.com/Kode/KodeStudio/releases"; license = licenses.mit; maintainers = [ maintainers.patternspandemic ]; platforms = [ "x86_64-linux" "i686-cygwin" ]; diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index 508d2329edc..94fa0be0173 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A notepad clone for GTK 2.0"; - homepage = http://tarot.freeshell.org/leafpad; + homepage = "http://tarot.freeshell.org/leafpad"; platforms = platforms.linux; maintainers = [ maintainers.flosse ]; license = licenses.gpl3; diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index bd433436eb0..f7c6d80dbf1 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -1,19 +1,19 @@ -{ stdenv, python3, fetchFromGitHub, makeWrapper, makeDesktopItem }: +{ lib, mkDerivation, python3, fetchFromGitHub, makeWrapper, wrapQtAppsHook, makeDesktopItem }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "leo-editor"; - version = "5.7.3"; + version = "6.2"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "0ri6l6cxwva450l05af5vs1lsgrz6ciwd02njdgphs9pm1vwxbl9"; + sha256 = "07f10qwvi3p7bskzxnx5rlhlfrh7rx8v0xdlc4vs2271438j1j2z"; }; dontBuild = true; - nativeBuildInputs = [ makeWrapper python3 ]; + nativeBuildInputs = [ wrapQtAppsHook makeWrapper python3 ]; propagatedBuildInputs = with python3.pkgs; [ pyqt5 docutils ]; desktopItem = makeDesktopItem { @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { comment = meta.description; desktopName = "Leo"; genericName = "Text Editor"; - categories = stdenv.lib.concatStringsSep ";" [ - "Application" "Development" "IDE" "QT" + categories = lib.concatStringsSep ";" [ + "Application" "Development" "IDE" ]; startupNotify = "false"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "text/plain" "text/asp" "text/x-c" "text/x-script.elisp" "text/x-fortran" "text/html" "application/inf" "text/x-java-source" "application/x-javascript" "application/javascript" "text/ecmascript" "application/x-ksh" "text/x-script.ksh" @@ -53,10 +53,12 @@ stdenv.mkDerivation rec { makeWrapper ${python3.interpreter} $out/bin/leo \ --set PYTHONPATH "$PYTHONPATH:$out/share/leo-editor" \ --add-flags "-O $out/share/leo-editor/launchLeo.py" + + wrapQtApp $out/bin/leo ''; - meta = with stdenv.lib; { - homepage = http://leoeditor.com; + meta = with lib; { + homepage = "http://leoeditor.com"; description = "A powerful folding editor"; longDescription = "Leo is a PIM, IDE and outliner that accelerates the work flow of programmers, authors and web designers."; license = licenses.mit; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 90e8c73e075..26c5ee42152 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The next generation code editor"; - homepage = http://www.lighttable.com/; + homepage = "http://www.lighttable.com/"; license = licenses.gpl3; maintainers = [ maintainers.matejc ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/editors/manuskript/default.nix b/pkgs/applications/editors/manuskript/default.nix index dc8eb200fff..deeb9b36c71 100644 --- a/pkgs/applications/editors/manuskript/default.nix +++ b/pkgs/applications/editors/manuskript/default.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A open-source tool for writers"; - homepage = http://www.theologeek.ch/manuskript; + homepage = "http://www.theologeek.ch/manuskript"; longDescription = '' Manuskript is a tool for those writer who like to organize and plan everything before writing. The snowflake method can help you diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index e6b93f20c48..f9e7b38cbe0 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { buildFlagsArray = [ "-ldflags=" "-X main.Version=${version}" ]; meta = with stdenv.lib; { - homepage = https://micro-editor.github.io; + homepage = "https://micro-editor.github.io"; description = "Modern and intuitive terminal-based text editor"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 9cfcf95e78b..1397ea2d586 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { MindForger is actually more than an editor or IDE - it's human mind inspired personal knowledge management tool ''; - homepage = https://www.mindforger.com; + homepage = "https://www.mindforger.com"; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix index 4e960524b94..060abda33d0 100644 --- a/pkgs/applications/editors/moe/default.nix +++ b/pkgs/applications/editors/moe/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { completion, directory browser, duplicate removal from prompt histories, delimiter matching, text conversion from/to UTF-8, romanization, etc. ''; - homepage = https://www.gnu.org/software/moe/; + homepage = "https://www.gnu.org/software/moe/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix index 8522ecf9c78..08841eb5810 100644 --- a/pkgs/applications/editors/music/tuxguitar/default.nix +++ b/pkgs/applications/editors/music/tuxguitar/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { TuxGuitar is a multitrack guitar tablature editor and player written in Java-SWT. It can open GuitarPro, PowerTab and TablEdit files. ''; - homepage = http://www.tuxguitar.com.ar/; + homepage = "http://www.tuxguitar.com.ar/"; license = licenses.lgpl2; maintainers = [ maintainers.ardumont ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 3350f6a3db3..b4ce588050f 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "4.9"; + version = "4.9.1"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "19ik88b3g0d9xwav4hkai2h1acmjy5fdnh21gdc1mjq5s4lrff8f"; + sha256 = "0v5s58j3lbg5s6gapl9kjmzph7zgwaam53qspycy2sxaxw65mkaj"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.nano-editor.org/; + homepage = "https://www.nano-editor.org/"; description = "A small, user-friendly console text editor"; license = licenses.gpl3Plus; maintainers = with maintainers; [ diff --git a/pkgs/applications/editors/nano/nanorc/default.nix b/pkgs/applications/editors/nano/nanorc/default.nix index eab37fba19a..5f3a1ac91bd 100644 --- a/pkgs/applications/editors/nano/nanorc/default.nix +++ b/pkgs/applications/editors/nano/nanorc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Improved Nano Syntax Highlighting Files"; - homepage = https://github.com/scopatz/nanorc; + homepage = "https://github.com/scopatz/nanorc"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ nequissimus ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index 2fff5cdce85..475330a5fe5 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -112,7 +112,7 @@ in modifications to the core source - Improve extensibility with a new plugin architecture ''; - homepage = https://www.neovim.io; + homepage = "https://www.neovim.io"; # "Contributions committed before b17d96 by authors who did not sign the # Contributor License Agreement (CLA) remain under the Vim license. # Contributions committed after b17d96 are licensed under Apache 2.0 unless diff --git a/pkgs/applications/editors/neovim/neovim-remote.nix b/pkgs/applications/editors/neovim/neovim-remote.nix index c77cfd9c2b6..06beff03f90 100644 --- a/pkgs/applications/editors/neovim/neovim-remote.nix +++ b/pkgs/applications/editors/neovim/neovim-remote.nix @@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A tool that helps controlling nvim processes from a terminal"; - homepage = https://github.com/mhinz/neovim-remote/; + homepage = "https://github.com/mhinz/neovim-remote/"; license = licenses.mit; maintainers = with maintainers; [ edanaher ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock index 6a3f581c4e8..d0827bf2a7f 100644 --- a/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock +++ b/pkgs/applications/editors/neovim/ruby_provider/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES neovim BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/editors/netbeans/default.nix b/pkgs/applications/editors/netbeans/default.nix index 0fddddbaacf..b2a13e3db7c 100644 --- a/pkgs/applications/editors/netbeans/default.nix +++ b/pkgs/applications/editors/netbeans/default.nix @@ -3,7 +3,7 @@ }: let - version = "11.2"; + version = "11.3"; desktopItem = makeDesktopItem { name = "netbeans"; exec = "netbeans"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip"; - sha512 = "d589481808832c4f0391ee1ecb8e18202cebeee8bd844cb4bdbf6125113b41f9138a34c4c2ef1fdf228294ef8c24b242ffec9ba5fdc4f1d288db4a3f19ba1509"; + sha512 = "ae828836138b5a4156d58df24dd4053be58018cb6b5beb179cb0f4cd8b5db72d2a7356a434d01157aacb78d228732950cf4e3a0b6c725da8e053b6ccd91075d6"; }; buildCommand = '' @@ -60,7 +60,7 @@ stdenv.mkDerivation { 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 ]; + maintainers = with stdenv.lib.maintainers; [ sander rszibele asbachb ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix index efda2c58360..a51f5106930 100644 --- a/pkgs/applications/editors/notepadqq/default.nix +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://notepadqq.com/; + homepage = "https://notepadqq.com/"; description = "Notepad++-like editor for the Linux desktop"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index a7a6b35a24a..e28b2b43061 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.bostic.com/vi/; + homepage = "http://www.bostic.com/vi/"; description = "The Berkeley Vi Editor"; license = stdenv.lib.licenses.free; }; diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index 567f4752035..dcf42b55c5c 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -30,7 +30,7 @@ in pythonPackages.buildPythonApplication rec { meta = with pkgs.lib; { description = "A simplenote-syncing note-taking tool inspired by Notational Velocity"; - homepage = https://github.com/cpbotha/nvpy; + homepage = "https://github.com/cpbotha/nvpy"; platforms = platforms.linux; license = licenses.bsd3; }; diff --git a/pkgs/applications/editors/quilter/default.nix b/pkgs/applications/editors/quilter/default.nix index 338708e3f82..9bc8e1bc920 100644 --- a/pkgs/applications/editors/quilter/default.nix +++ b/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.1.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1nk6scn98kb43h056ajycpj71jkx7b9p5g05khgl6bwj9hvjvcbw"; + sha256 = "1bgsbcx09ca063kdqfc7nigly99d7xgx2cbkpk1nkhr0hvkyg9l9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/qxmledit/default.nix b/pkgs/applications/editors/qxmledit/default.nix new file mode 100644 index 00000000000..cb658e8fcda --- /dev/null +++ b/pkgs/applications/editors/qxmledit/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, + qmake, qtbase, qtxmlpatterns, qtsvg, qtscxml, qtquick1, libGLU }: + +stdenv.mkDerivation rec { + name = "qxmledit-${version}" ; + version = "0.9.15" ; + src = fetchFromGitHub ( stdenv.lib.importJSON ./qxmledit.json ) ; + nativeBuildInputs = [ qmake ] ; + buildInputs = [ qtbase qtxmlpatterns qtsvg qtscxml qtquick1 libGLU ] ; + qmakeFlags = [ "CONFIG+=release" ] ; + outputs = [ "out" "doc" ] ; + + preConfigure = '' + export QXMLEDIT_INST_DATA_DIR="$out/share/data" + export QXMLEDIT_INST_TRANSLATIONS_DIR="$out/share/i18n" + export QXMLEDIT_INST_INCLUDE_DIR="$out/include" + export QXMLEDIT_INST_DIR="$out/bin" + export QXMLEDIT_INST_LIB_DIR="$out/lib" + export QXMLEDIT_INST_DOC_DIR="$doc" + ''; + + meta = with stdenv.lib; { + description = "Simple XML editor based on qt libraries" ; + homepage = "https://sourceforge.net/projects/qxmledit"; + license = licenses.lgpl2; + platforms = platforms.all; + } ; +} diff --git a/pkgs/applications/editors/qxmledit/qxmledit.json b/pkgs/applications/editors/qxmledit/qxmledit.json new file mode 100644 index 00000000000..3b50532d6a0 --- /dev/null +++ b/pkgs/applications/editors/qxmledit/qxmledit.json @@ -0,0 +1,6 @@ +{ + "owner": "lbellonda", + "repo": "qxmledit", + "rev": "6136dca50ceb3b4447c91a7a18dcf84785ea11d1", + "sha256": "1wcnphalwf0a5gz9r44jgk8wcv1w2qipbwjkbzkra2kxanxns834" +} \ No newline at end of file diff --git a/pkgs/applications/editors/retext/default.nix b/pkgs/applications/editors/retext/default.nix index e9742389261..7752313b2a7 100644 --- a/pkgs/applications/editors/retext/default.nix +++ b/pkgs/applications/editors/retext/default.nix @@ -54,7 +54,7 @@ in python.pkgs.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://github.com/retext-project/retext/; + homepage = "https://github.com/retext-project/retext/"; description = "Simple but powerful editor for Markdown and reStructuredText"; license = licenses.gpl3; maintainers = with maintainers; [ klntsky ]; diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index f10578b1168..d429bb4bcbb 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -57,7 +57,7 @@ mkDerivation rec { dictionaries = largeDicts ++ otherDicts; mathJaxSrc = fetchurl { - url = https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip; + url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-26.zip"; sha256 = "0wbcqb9rbfqqvvhqr1pbqax75wp8ydqdyhp91fbqfqp26xzjv6lk"; }; @@ -127,7 +127,7 @@ mkDerivation rec { meta = with lib; { description = "Set of integrated tools for the R language"; - homepage = https://www.rstudio.com/; + homepage = "https://www.rstudio.com/"; license = licenses.agpl3; maintainers = with maintainers; [ ehmry changlinli ciil ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index 78dd0d09541..4e92856fee2 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "4.0.5"; src = fetchurl { - url = https://www.scintilla.org/scite405.tgz; + url = "https://www.scintilla.org/scite405.tgz"; sha256 = "0h16wk2986nkkhhdv5g4lxlcn02qwyja24x1r6vf02r1hf46b9q2"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.scintilla.org/SciTE.html; + homepage = "https://www.scintilla.org/SciTE.html"; description = "SCIntilla based Text Editor"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/editors/sigil/default.nix b/pkgs/applications/editors/sigil/default.nix index ac171f60ead..cbb9f7bd5b8 100644 --- a/pkgs/applications/editors/sigil/default.nix +++ b/pkgs/applications/editors/sigil/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Free, open source, multi-platform ebook (ePub) editor"; - homepage = https://github.com/Sigil-Ebook/Sigil/; + homepage = "https://github.com/Sigil-Ebook/Sigil/"; license = licenses.gpl3; # currently unmaintained platforms = platforms.linux; diff --git a/pkgs/applications/editors/standardnotes/default.nix b/pkgs/applications/editors/standardnotes/default.nix index 5a13d91aef2..18d9338f909 100644 --- a/pkgs/applications/editors/standardnotes/default.nix +++ b/pkgs/applications/editors/standardnotes/default.nix @@ -1,38 +1,47 @@ -{ stdenv, appimage-run, fetchurl, runtimeShell }: +{ stdenv, appimageTools, autoPatchelfHook, desktop-file-utils + , fetchurl, runtimeShell }: let - version = "3.0.15"; + version = "3.3.3"; + pname = "standardnotes"; + name = "${pname}-${version}"; plat = { - i386-linux = "i386"; - x86_64-linux = "x86_64"; + i386-linux = "-i386"; + x86_64-linux = ""; }.${stdenv.hostPlatform.system}; sha256 = { - i386-linux = "0v2nsis6vb1lnhmjd28vrfxqwwpycv02j0nvjlfzcgj4b3400j7a"; - x86_64-linux = "130n586cw0836zsbwqcz3pp3h0d4ny74ngqs4k4cvfb92556r7xh"; + i386-linux = "2ccdf23588b09d645811e562d4fd7e02ac0e367bf2b34e373d8470d48544036d"; + x86_64-linux = "6366d0a37cbf2cf51008a666e40bada763dd1539173de01e093bcbe4146a6bd8"; }.${stdenv.hostPlatform.system}; -in - -stdenv.mkDerivation { - pname = "standardnotes"; - inherit version; src = fetchurl { - url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}-${plat}.AppImage"; + url = "https://github.com/standardnotes/desktop/releases/download/v${version}/standard-notes-${version}${plat}.AppImage"; inherit sha256; }; - buildInputs = [ appimage-run ]; + appimageContents = appimageTools.extract { + inherit name src; + }; + + nativeBuildInputs = [ autoPatchelfHook desktop-file-utils ]; + +in appimageTools.wrapType2 rec { + inherit name src; + + extraInstallCommands = '' + # directory in /nix/store so readonly + cp -r ${appimageContents}/* $out + cd $out + chmod -R +w $out + mv $out/bin/${name} $out/bin/${pname} - dontUnpack = true; + # fixup and install desktop file + ${desktop-file-utils}/bin/desktop-file-install --dir $out/share/applications \ + --set-key Exec --set-value ${pname} standard-notes.desktop - installPhase = '' - mkdir -p $out/{bin,share} - cp $src $out/share/standardNotes.AppImage - echo "#!${runtimeShell}" > $out/bin/standardnotes - echo "${appimage-run}/bin/appimage-run $out/share/standardNotes.AppImage" >> $out/bin/standardnotes - chmod +x $out/bin/standardnotes $out/share/standardNotes.AppImage + rm usr/lib/* AppRun standard-notes.desktop .so* ''; meta = with stdenv.lib; { @@ -41,7 +50,7 @@ stdenv.mkDerivation { Standard Notes is a private notes app that features unmatched simplicity, end-to-end encryption, powerful extensions, and open-source applications. ''; - homepage = https://standardnotes.org; + homepage = "https://standardnotes.org"; license = licenses.agpl3; maintainers = with maintainers; [ mgregoire ]; platforms = [ "i386-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/editors/sublime/2/default.nix b/pkgs/applications/editors/sublime/2/default.nix index 24639f3bfd4..b10008d0c49 100644 --- a/pkgs/applications/editors/sublime/2/default.nix +++ b/pkgs/applications/editors/sublime/2/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { fetchurl { name = "sublimetext-2.0.2.tar.bz2"; url = [ - http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2 - https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2 + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%202.0.2.tar.bz2" ]; sha256 = "026g5mppk28lzzzn9ibykcqkrd5msfmg0sc0z8w8jd7v3h28wcq7"; } @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { fetchurl { name = "sublimetext-2.0.2.tar.bz2"; url = [ - http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2 - https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2 + "http://c758482.r82.cf2.rackcdn.com/Sublime%20Text%202.0.2.tar.bz2" + "https://download.sublimetext.com/Sublime%20Text%202.0.2%20x64.tar.bz2" ]; sha256 = "115b71nbv9mv8cz6bkjwpbdf2ywnjc1zy2d3080f6ck4sqqfvfh1"; }; diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index 8e52237d949..a75233fcf35 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -145,7 +145,7 @@ in stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Sophisticated text editor for code, markup and prose"; - homepage = https://www.sublimetext.com/; + homepage = "https://www.sublimetext.com/"; maintainers = with maintainers; [ jtojnar wmertens demin-dmitriy zimbatm ]; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index 6714f917315..dc18bd694c6 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Level editor for SuperTux"; - homepage = https://github.com/SuperTux/supertux-editor; + homepage = "https://github.com/SuperTux/supertux-editor"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mathnerd314 ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix index 48af4a99dad..3df13260d51 100644 --- a/pkgs/applications/editors/tecoc/default.nix +++ b/pkgs/applications/editors/tecoc/default.nix @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { 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; }; + homepage = "https://github.com/blakemcbride/TECOC"; + 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 ec2498aa69b..9479295e747 100644 --- a/pkgs/applications/editors/texmacs/common.nix +++ b/pkgs/applications/editors/texmacs/common.nix @@ -62,7 +62,7 @@ rec { Scheme extension language. A native spreadsheet and tools for collaborative authoring are planned for later. ''; - homepage = http://texmacs.org/; + homepage = "http://texmacs.org/"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix index c45025dd80c..0b78ff54c35 100644 --- a/pkgs/applications/editors/texmaker/default.nix +++ b/pkgs/applications/editors/texmaker/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. ''; - homepage = http://www.xm1math.net/texmaker/; + homepage = "http://www.xm1math.net/texmaker/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cfouche markuskowa ]; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index d6db89e5c5e..94837023ca0 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { LaTeX editing with completion, structure viewer, preview, spell checking and support of any compilation chain. ''; - homepage = http://texstudio.sourceforge.net; + homepage = "http://texstudio.sourceforge.net"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ ajs124 cfouche ]; diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index 85006e51b66..bb771c89010 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { ]; src = fetchhg { - url = http://foicica.com/hg/textadept; + url = "http://foicica.com/hg/textadept"; rev = "textadept_${version}"; sha256 = "0fai8xqddkkprmbf0cf8wwgv7ccfdb1iyim30nppm2m16whkc8fl"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extensible text editor based on Scintilla with Lua scripting"; - homepage = http://foicica.com/textadept; + homepage = "http://foicica.com/textadept"; license = licenses.mit; maintainers = with maintainers; [ raskin mirrexagon ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/texworks/default.nix b/pkgs/applications/editors/texworks/default.nix index d5549c52592..d0347bcb37c 100644 --- a/pkgs/applications/editors/texworks/default.nix +++ b/pkgs/applications/editors/texworks/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "texworks"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "TeXworks"; repo = "texworks"; rev = "release-${version}"; - sha256 = "0d7f23c6c1wj4aii4h5w9piv01qfb69zrd79dvxwydrk99i8gnl4"; + sha256 = "1lw1p4iyzxypvjhnav11g6rwf6gx7kyzwy2iprvv8zzpqcdkjp2z"; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/applications/editors/tweak/default.nix b/pkgs/applications/editors/tweak/default.nix index 6bfce921d0f..3dc7d04ede3 100644 --- a/pkgs/applications/editors/tweak/default.nix +++ b/pkgs/applications/editors/tweak/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An efficient hex editor"; - homepage = http://www.chiark.greenend.org.uk/~sgtatham/tweak; + homepage = "http://www.chiark.greenend.org.uk/~sgtatham/tweak"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 09baf383f97..bd183f97c12 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A minimal Markdown reading & writing app"; - homepage = https://typora.io; + homepage = "https://typora.io"; license = licenses.unfree; maintainers = with maintainers; [ jensbin worldofpeace ]; platforms = [ "x86_64-linux"]; diff --git a/pkgs/applications/editors/uemacs/default.nix b/pkgs/applications/editors/uemacs/default.nix index 0a2df6b6d4b..e14a07eb683 100644 --- a/pkgs/applications/editors/uemacs/default.nix +++ b/pkgs/applications/editors/uemacs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2014-12-08"; src = fetchgit { - url = git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git; + url = "git://git.kernel.org/pub/scm/editors/uemacs/uemacs.git"; rev = "8841922689769960fa074fbb053cb8507f2f3ed9"; sha256 = "14yq7kpkax111cg6k7i3mnqk7sq7a65krq6qizzj7vvnm7bsj3sd"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = https://git.kernel.org/cgit/editors/uemacs/uemacs.git; + homepage = "https://git.kernel.org/cgit/editors/uemacs/uemacs.git"; description = "Torvalds Micro-emacs fork"; longDescription = '' uEmacs/PK 4.0 is a full screen editor based on MicroEMACS 3.9e diff --git a/pkgs/applications/editors/vbindiff/default.nix b/pkgs/applications/editors/vbindiff/default.nix index d1aa59569e6..110b7caaf81 100644 --- a/pkgs/applications/editors/vbindiff/default.nix +++ b/pkgs/applications/editors/vbindiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A terminal visual binary diff viewer"; - homepage = https://www.cjmweb.net/vbindiff/; + homepage = "https://www.cjmweb.net/vbindiff/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index bb3d571e6f8..3b37c805cdd 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -14,7 +14,7 @@ , features ? "huge" # One of tiny, small, normal, big or huge , wrapPythonDrv ? false -, guiSupport ? config.vim.gui or "gtk3" +, guiSupport ? config.vim.gui or (if stdenv.isDarwin then "gtk2" else "gtk3") , luaSupport ? config.vim.lua or true , perlSupport ? config.vim.perl or false # Perl interpreter , pythonSupport ? config.vim.python or true # Python interpreter diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index ae4e9ac8a9c..95d2076153c 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -2,7 +2,7 @@ # default vimrc , vimrc ? fetchurl { name = "default-vimrc"; - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?id=68f6d131750aa778807119e03eed70286a17b1cb; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?id=68f6d131750aa778807119e03eed70286a17b1cb"; sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c"; } # apple frameworks diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 92992b8896a..9eabadae3b0 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Vim - the text editor - for macOS"; - homepage = https://github.com/macvim-dev/macvim; + homepage = "https://github.com/macvim-dev/macvim"; license = licenses.vim; maintainers = with maintainers; [ cstrahan lilyball ]; platforms = platforms.darwin; diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 81948918a11..0e3a4a15052 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -32,7 +32,7 @@ in { enableParallelBuilding = true; # test this src = fetchgit { - url = https://bitbucket.org/equalsraf/vim-qt.git; + url = "https://bitbucket.org/equalsraf/vim-qt.git"; rev = "refs/tags/package-" + tag; inherit sha256; }; @@ -104,7 +104,7 @@ in { meta = with stdenv.lib; { description = "The most popular clone of the VI editor (Qt GUI fork)"; - homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; + homepage = "https://bitbucket.org/equalsraf/vim-qt/wiki/Home"; license = licenses.vim; maintainers = with maintainers; [ smironov ttuegel ]; platforms = platforms.linux; diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix new file mode 100644 index 00000000000..d067b418121 --- /dev/null +++ b/pkgs/applications/editors/vim/vimacs.nix @@ -0,0 +1,34 @@ +{ stdenv, config, vim_configurable, macvim, vimPlugins +, useMacvim ? stdenv.isDarwin && (config.vimacs.macvim or true) +, vimacsExtraArgs ? "" }: + +stdenv.mkDerivation rec { + pname = "vimacs"; + version = vimPackage.version; + vimPackage = if useMacvim then macvim else vim_configurable; + + buildInputs = [ vimPackage vimPlugins.vimacs ]; + + buildCommand = '' + mkdir -p "$out"/bin + cp "${vimPlugins.vimacs}"/share/vim-plugins/vimacs/bin/vim $out/bin/vimacs + substituteInPlace "$out"/bin/vimacs \ + --replace '-vim}' '-@bin@/bin/vim}' \ + --replace '-gvim}' '-@bin@/bin/vim -g}' \ + --replace '--cmd "let g:VM_Enabled = 1"' \ + '--cmd "let g:VM_Enabled = 1" --cmd "set rtp^=@rtp@" ${vimacsExtraArgs}' \ + --replace @rtp@ ${vimPlugins.vimacs.rtp} \ + --replace @bin@ ${vimPackage} + for prog in vm gvm gvimacs vmdiff vimacsdiff + do + ln -s "$out"/bin/vimacs $out/bin/$prog + done + ''; + + meta = with stdenv.lib; { + description = "Vim-Improved eMACS: Emacs emulation for Vim"; + homepage = "http://algorithm.com.au/code/vimacs"; + license = licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ millerjason ]; + }; +} diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 1bda6958206..85f78035a0f 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A vim like editor"; - homepage = https://github.com/martanne/vis; + homepage = "https://github.com/martanne/vis"; license = licenses.isc; maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index a573c518b5d..abd4a55c92b 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -25,7 +25,7 @@ in comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = executableName; - icon = "@out@/share/pixmaps/code.png"; + icon = "code"; startupNotify = "true"; categories = "Utility;TextEditor;Development;IDE;"; mimeType = "text/plain;inode/directory;"; @@ -37,7 +37,7 @@ in [Desktop Action new-empty-window] Name=New Empty Window Exec=${executableName} --new-window %F - Icon=@out@/share/pixmaps/code.png + Icon=code ''; }; @@ -47,7 +47,7 @@ in comment = "Code Editing. Redefined."; genericName = "Text Editor"; exec = executableName + " --open-url %U"; - icon = "@out@/share/pixmaps/code.png"; + icon = "code"; startupNotify = "true"; categories = "Utility;TextEditor;Development;IDE;"; mimeType = "x-scheme-handler/vscode;"; @@ -83,10 +83,8 @@ in ln -s $out/lib/vscode/bin/${executableName} $out/bin mkdir -p $out/share/applications - substitute $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop \ - --subst-var out - substitute $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop \ - --subst-var out + ln -s $desktopItem/share/applications/${executableName}.desktop $out/share/applications/${executableName}.desktop + ln -s $urlHandlerDesktopItem/share/applications/${executableName}-url-handler.desktop $out/share/applications/${executableName}-url-handler.desktop mkdir -p $out/share/pixmaps cp $out/lib/vscode/resources/app/resources/linux/code.png $out/share/pixmaps/code.png diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 967cd45946f..0f36bf164f0 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,15 +11,17 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0i8dmh9w7xgzfjii4m116lavydpfpcp7fxs4bcykf0a779pzwv87"; - x86_64-darwin = "0z0r0dmmzk3k095g7jbrrk9gl1jpb3cai973xrjw17ank1lddcjf"; + x86_64-linux = "0q1fk5a4ymndnyxzps8960y1rl657q95i2rydbqyjl37y79wmllx"; + x86_64-darwin = "02ybgp6v1ray4a867hihp2fvc872ilqla6z52qv90dfjx69g77ib"; }.${system}; in callPackage ./generic.nix rec { # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.43.0"; + # Please backport all compatible updates to the stable release. + # This is important for the extension ecosystem. + version = "1.44.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; @@ -46,8 +48,8 @@ in and code refactoring. It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences ''; - homepage = https://code.visualstudio.com/; - downloadPage = https://code.visualstudio.com/Updates; + homepage = "https://code.visualstudio.com/"; + downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; maintainers = with maintainers; [ eadwu synthetica ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index bffe73ec4f6..8c884f77faa 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "139sqaixlcqlpcrn2vkcp9fxvcjgnhn2dwxclxq3bnb814pw7rba"; - x86_64-darwin = "0jkd3p1jqg38z9l22k5w7b45fdnxwrhzlgyhinw7wlqz7zvflkn1"; + x86_64-linux = "1prv4rzr5z905s6jnmkmd97zr5kz8nn4m9bil483bnx4wqr2k10g"; + x86_64-darwin = "1p0a94i80s7fq6ars01bvr41qxiq35s0r6crfv857ma01g9ia7k3"; }.${system}; sourceRoot = { @@ -25,7 +25,9 @@ in # The update script doesn't correctly change the hash for darwin, so please: # nixpkgs-update: no auto update - version = "1.43.0"; + # Please backport all compatible updates to the stable release. + # This is important for the extension ecosystem. + version = "1.44.0"; pname = "vscodium"; executableName = "codium"; @@ -49,8 +51,8 @@ in and code refactoring. It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences ''; - homepage = https://github.com/VSCodium/vscodium; - downloadPage = https://github.com/VSCodium/vscodium/releases; + homepage = "https://github.com/VSCodium/vscodium"; + downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; maintainers = with maintainers; [ synthetica ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/editors/wily/default.nix b/pkgs/applications/editors/wily/default.nix index aab3aecd7d6..ac741599bda 100644 --- a/pkgs/applications/editors/wily/default.nix +++ b/pkgs/applications/editors/wily/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An emulation of ACME"; - homepage = http://wily.sourceforge.net; + homepage = "http://wily.sourceforge.net"; license = licenses.artistic1; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix index 4725d8143b4..9b0fd592a6a 100644 --- a/pkgs/applications/editors/wxhexeditor/default.nix +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/EUA/wxHexEditor/issues/90 (fetchpatch { - url = https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch; + url = "https://github.com/EUA/wxHexEditor/commit/d0fa3ddc3e9dc9b05f90b650991ef134f74eed01.patch"; sha256 = "1wcb70hrnhq72frj89prcqylpqs74xrfz3kdfdkq84p5qfz9svyj"; }) ./missing-semicolon.patch @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { a good reverse engineer tool like a good hex editor, you welcome. wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes. ''; - homepage = http://www.wxhexeditor.org/; + homepage = "http://www.wxhexeditor.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/editors/xmlcopyeditor/default.nix b/pkgs/applications/editors/xmlcopyeditor/default.nix index eeda097db25..f3270fccdfe 100644 --- a/pkgs/applications/editors/xmlcopyeditor/default.nix +++ b/pkgs/applications/editors/xmlcopyeditor/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast, free, validating XML editor"; - homepage = http://xml-copy-editor.sourceforge.net/; + homepage = "http://xml-copy-editor.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ candeira ]; diff --git a/pkgs/applications/editors/zile/default.nix b/pkgs/applications/editors/zile/default.nix index ae3871bb87a..c7c57a9e3ef 100644 --- a/pkgs/applications/editors/zile/default.nix +++ b/pkgs/applications/editors/zile/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { compiles to about 130Kb. ''; - homepage = https://www.gnu.org/software/zile/; + homepage = "https://www.gnu.org/software/zile/"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 8734fabfdcf..cb574ffc8f1 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://grass.osgeo.org/; + 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; diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 80115ab8243..2e11f22f517 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -49,7 +49,7 @@ in mkDerivation rec { meta = { description = "A Free and Open Source Geographic Information System"; - homepage = http://www.qgis.org; + homepage = "http://www.qgis.org"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [ lsix ]; diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 30ae92f58ae..05f895bdee1 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { pname = "saga"; - version = "7.6.1"; + version = "7.6.2"; # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin @@ -18,8 +18,8 @@ stdenv.mkDerivation { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11 -Wno-narrowing"; src = fetchurl { - url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.6.1/saga-7.6.1.tar.gz"; - sha256 = "1i0cp1lms6cmjl7f5vgr9pl3qc02fmappn4kq21y0dn2gy7j2mkn"; + url = "https://sourceforge.net/projects/saga-gis/files/SAGA%20-%207/SAGA%20-%207.6.2/saga-7.6.2.tar.gz"; + sha256 = "09j5magmayq2y620kqa490mfd1kpdp3lng2ifcgbrmssc079ybm0"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/gis/whitebox-tools/default.nix b/pkgs/applications/gis/whitebox-tools/default.nix index a10e62be467..d81a08e2900 100644 --- a/pkgs/applications/gis/whitebox-tools/default.nix +++ b/pkgs/applications/gis/whitebox-tools/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "An advanced geospatial data analysis platform"; - homepage = http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html; + homepage = "http://www.uoguelph.ca/~hydrogeo/WhiteboxTools/index.html"; license = licenses.mit; maintainers = [ maintainers.mpickering ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 31eebf7d0a9..c07c3957254 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.imagemagick.org/; + homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 9cfccc7425b..57ce02bb661 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.imagemagick.org/; + homepage = "http://www.imagemagick.org/"; description = "A software suite to create, edit, compose, or convert bitmap images"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ the-kenny ]; diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index e35a0190d8b..487648d07ca 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ python python.pkgs.boost imagemagick ]; meta = with stdenv.lib; { - homepage = http://www.imagemagick.org/script/api.php; + homepage = "http://www.imagemagick.org/script/api.php"; license = licenses.imagemagick; description = "PythonMagick provides object oriented bindings for the ImageMagick Library."; }; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 87bddf9099e..c5f1bf86801 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ahodesuka/ahoviewer; + homepage = "https://github.com/ahodesuka/ahoviewer"; description = "A GTK2 image viewer, manga reader, and booru browser"; maintainers = with maintainers; [ skrzyp xzfc ]; license = licenses.mit; diff --git a/pkgs/applications/graphics/alchemy/default.nix b/pkgs/applications/graphics/alchemy/default.nix index 5132d5950aa..6fc84e088dd 100644 --- a/pkgs/applications/graphics/alchemy/default.nix +++ b/pkgs/applications/graphics/alchemy/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Experimental in nature, Alchemy lets you brainstorm visually to explore an expanded range of ideas and possibilities in a serendipitous way. ''; - homepage = http://al.chemy.org/; + homepage = "http://al.chemy.org/"; license = licenses.gpl3Plus; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/animbar/default.nix b/pkgs/applications/graphics/animbar/default.nix index c4f1b4218d0..771145d54b6 100644 --- a/pkgs/applications/graphics/animbar/default.nix +++ b/pkgs/applications/graphics/animbar/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { names: picket fence animation, barrier grid animation, Moiré animation, to name a few. ''; - homepage = http://animbar.mnim.org; + homepage = "http://animbar.mnim.org"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index 5966d6427ed..363f3b8c84d 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -4,19 +4,19 @@ }: let - gitRev = "6dfe6822e0279a4cc2f1c60e85b42212627285fe"; + gitRev = "8fb4b0929ce84cf375bfb83a9d522ccd80681eaf"; gitBranch = "develop"; gitTag = "0.9.3"; in stdenv.mkDerivation { pname = "antimony"; - version = "2019-10-30"; + version = "2020-03-28"; src = fetchFromGitHub { owner = "mkeeter"; repo = "antimony"; rev = gitRev; - sha256 = "07zlkwlk79czq8dy85b6n3ds3g36l8qy4ix849ady6ia3gm8981j"; + sha256 = "1s0zmq5jmhmb1wcsyaxfmii448g6x8b41mzvb1awlljj85qj0k2s"; }; patches = [ ./paths-fix.patch ]; @@ -29,11 +29,10 @@ in buildInputs = [ libpng python3 python3.pkgs.boost - libGLU libGL qtbase wrapQtAppsHook - ncurses + libGLU libGL qtbase ncurses ]; - nativeBuildInputs = [ cmake flex lemon ]; + nativeBuildInputs = [ cmake flex lemon wrapQtAppsHook ]; cmakeFlags= [ "-DGITREV=${gitRev}" @@ -45,7 +44,7 @@ in meta = with stdenv.lib; { description = "A computer-aided design (CAD) tool from a parallel universe"; - homepage = https://github.com/mkeeter/antimony; + homepage = "https://github.com/mkeeter/antimony"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index 5ce36f4f10e..f6f9cb281a7 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://apitrace.github.io; + homepage = "https://apitrace.github.io"; description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/autopanosiftc/default.nix b/pkgs/applications/graphics/autopanosiftc/default.nix index c64604975ab..14af98ebc48 100644 --- a/pkgs/applications/graphics/autopanosiftc/default.nix +++ b/pkgs/applications/graphics/autopanosiftc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "autopano-sift-C-2.5.1"; src = fetchurl { - url = mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz; + url = "mirror://sourceforge/hugin/autopano-sift-C-2.5.1.tar.gz"; sha256 = "0dqk8ff82gmy4v5ns5nr9gpzkc1p7c2y8c8fkid102r47wsjk44s"; }; @@ -12,13 +12,13 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/autopano-sift-C/files/autopano-sift-C-2.5.1-lm.patch"; sha256 = "1bfcr5sps0ip9gl4jprji5jgf9wkczz6d2clsjjlbsy8r3ixi3lv"; }) ]; meta = { - homepage = http://hugin.sourceforge.net/; + 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; diff --git a/pkgs/applications/graphics/autotrace/default.nix b/pkgs/applications/graphics/autotrace/default.nix index 57e95dfef10..cd7937f8a54 100644 --- a/pkgs/applications/graphics/autotrace/default.nix +++ b/pkgs/applications/graphics/autotrace/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://autotrace.sourceforge.net/; + homepage = "http://autotrace.sourceforge.net/"; description = "Utility for converting bitmap into vector graphics"; platforms = platforms.unix; maintainers = with maintainers; [ hodapp ]; diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index b827a12f81c..c02140e1905 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { enableParallelBuilding = false; meta = { - homepage = https://github.com/kmkolasinski/AwesomeBump; + homepage = "https://github.com/kmkolasinski/AwesomeBump"; description = "A program to generate normal, height, specular or ambient occlusion textures from a single image"; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 51156dea4a1..3c78c8b6dbd 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "batik-1.6"; builder = ./builder.sh; src = fetchurl { - url = http://tarballs.nixos.org/batik-1.6.zip; + url = "http://tarballs.nixos.org/batik-1.6.zip"; sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Java based toolkit for handling SVG"; - homepage = https://xmlgraphics.apache.org/batik; + homepage = "https://xmlgraphics.apache.org/batik"; license = licenses.asl20; platforms = platforms.unix; knownVulnerabilities = [ diff --git a/pkgs/applications/graphics/c3d/default.nix b/pkgs/applications/graphics/c3d/default.nix index 55a5d49f752..61efec8dc9d 100644 --- a/pkgs/applications/graphics/c3d/default.nix +++ b/pkgs/applications/graphics/c3d/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional stdenv.isDarwin Cocoa; meta = with stdenv.lib; { - homepage = http://www.itksnap.org/c3d; + homepage = "http://www.itksnap.org/c3d"; description = "Medical imaging processing tool"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/comical/default.nix b/pkgs/applications/graphics/comical/default.nix index 2796a5535a0..8e6e151aff6 100644 --- a/pkgs/applications/graphics/comical/default.nix +++ b/pkgs/applications/graphics/comical/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Viewer of CBR and CBZ files, often used to store scanned comics"; - homepage = http://comical.sourceforge.net/; + homepage = "http://comical.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/graphics/deskew/default.nix b/pkgs/applications/graphics/deskew/default.nix index c35aaa044ae..422c7a0e15e 100644 --- a/pkgs/applications/graphics/deskew/default.nix +++ b/pkgs/applications/graphics/deskew/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line tool for deskewing scanned text documents"; - homepage = https://bitbucket.org/galfar/app-deskew/overview; + homepage = "https://bitbucket.org/galfar/app-deskew/overview"; license = licenses.mit; maintainers = with maintainers; [ryantm]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 3984cfc17ca..6ec54201fbf 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { version = "0.97.3.20170622"; src = fetchgit { - url = https://gitlab.gnome.org/GNOME/dia.git; + url = "https://gitlab.gnome.org/GNOME/dia.git"; rev = "b86085dfe2b048a2d37d587adf8ceba6fb8bc43c"; sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnome Diagram drawing software"; - homepage = http://live.gnome.org/Dia; + homepage = "http://live.gnome.org/Dia"; maintainers = with maintainers; [ raskin ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index e6e24e0e56f..50162166013 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -125,7 +125,7 @@ mkDerivation rec { meta = with lib; { description = "Photo Management Program"; license = licenses.gpl2; - homepage = https://www.digikam.org; + homepage = "https://www.digikam.org"; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 7a4db535b2b..7a99361a03d 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -20,7 +20,7 @@ in buildPythonApplication { enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/project/dispcalgui/release/3.5.0.0/DisplayCAL-3.5.0.0.tar.gz; + url = "mirror://sourceforge/project/dispcalgui/release/3.5.0.0/DisplayCAL-3.5.0.0.tar.gz"; sha256 = "1j496sv8pbhby5hkkbp07k6bs3f7mb1l3dijmn2iga3kmix0fn5q"; }; @@ -62,7 +62,7 @@ in buildPythonApplication { meta = { description = "Display Calibration and Characterization powered by Argyll CMS"; - homepage = https://displaycal.net/; + homepage = "https://displaycal.net/"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index e26886b070e..b491c3e3ead 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; - homepage = https://dosage.rocks/; + homepage = "https://dosage.rocks/"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 144c723da20..ccd4fd660f7 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "2D design & drafting application, meant to be similar to AutoCAD"; longDescription = "Professional-grade 2D design and drafting solution from Dassault Systèmes that lets you create, edit, view and mark up any kind of 2D CAD drawing."; - homepage = https://www.3ds.com/products-services/draftsight-cad-software/; + homepage = "https://www.3ds.com/products-services/draftsight-cad-software/"; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ hodapp ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index 67fa5da398b..fb68276b168 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { pname = "drawing"; - version = "0.4.11"; + version = "0.4.13"; format = "other"; @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { owner = "maoschanz"; repo = pname; rev = version; - sha256 = "00c1h6jns11rmsg35gy40fb6ahvik80wpbm2133bjcqxfwwnlal6"; + sha256 = "0mj2nmfrckv89srgkn16fnbrb35f5a655ak8bb3rd9na3hd5bq53"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 2a7efea5271..aa1ac0f2620 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "12.6.5"; + version = "12.9.9"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "14x4h680q3w9wsdmivy2k1bggb09vdm3a3wrpfwd79dbaagjk4lc"; + sha256 = "07lx99fd4vkgdhagshzawrh8ncbv19hvxjpzgd3yjdj0nalvmxin"; }; nativeBuildInputs = [ @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A desktop application for creating diagrams"; - homepage = https://about.draw.io/; + homepage = "https://about.draw.io/"; license = licenses.asl20; maintainers = with maintainers; [ danieldk ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index a8c4e6d14ba..0ffcb5cdb41 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -86,8 +86,8 @@ in mkDerivation rec { meta = { description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; - homepage = https://drawpile.net/; - downloadPage = https://drawpile.net/download/; + homepage = "https://drawpile.net/"; + downloadPage = "https://drawpile.net/download/"; license = licenses.gpl3; maintainers = with maintainers; [ fgaz ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/epeg/default.nix b/pkgs/applications/graphics/epeg/default.nix index 3b7bdfb8efc..bdbdf04bcd5 100644 --- a/pkgs/applications/graphics/epeg/default.nix +++ b/pkgs/applications/graphics/epeg/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mattes/epeg; + homepage = "https://github.com/mattes/epeg"; description = "Insanely fast JPEG/ JPG thumbnail scaling"; platforms = platforms.linux ++ platforms.darwin; license = { diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index d8b08faf239..7841e9d571b 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; - homepage = http://openexr.com; + homepage = "http://openexr.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/applications/graphics/exrtools/default.nix b/pkgs/applications/graphics/exrtools/default.nix index c8928540bb6..39c23eb4fe8 100644 --- a/pkgs/applications/graphics/exrtools/default.nix +++ b/pkgs/applications/graphics/exrtools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of utilities for manipulating OpenEXR images"; - homepage = http://scanline.ca/exrtools; + homepage = "http://scanline.ca/exrtools"; platforms = platforms.linux; license = licenses.mit; maintainers = [ maintainers.juliendehos ]; diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix index 3e64783df31..7f0167f9834 100644 --- a/pkgs/applications/graphics/fbida/default.nix +++ b/pkgs/applications/graphics/fbida/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Image viewing and manipulation programs including fbi, fbgs, ida, exiftran and thumbnail.cgi"; - homepage = https://www.kraxel.org/blog/linux/fbida/; + homepage = "https://www.kraxel.org/blog/linux/fbida/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index c364badc174..cd7db3d29c5 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to convert Xfig files to other formats"; - homepage = http://mcj.sourceforge.net/; + homepage = "http://mcj.sourceforge.net/"; license = licenses.xfig; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/fluxus/default.nix b/pkgs/applications/graphics/fluxus/default.nix index a8094071101..a53eb806bcf 100644 --- a/pkgs/applications/graphics/fluxus/default.nix +++ b/pkgs/applications/graphics/fluxus/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { owner = "nebogeo"; repo = "fluxus"; rev = "ba9aee218dd4a9cfab914ad78bdb6d59e9a37400"; - hash = "sha256:0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28"; + sha256 = "0mwghpgq4n1khwlmgscirhmcdhi6x00c08q4idi2zcqz961bbs28"; }; buildInputs = [ @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { openssl.dev racket ]; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ scons.py2 ]; patches = [ ./fix-build.patch ]; sconsFlags = [ @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Livecoding environment for 3D graphics, sound, and games"; license = licenses.gpl2; - homepage = http://www.pawfal.org/fluxus/; + homepage = "http://www.pawfal.org/fluxus/"; maintainers = [ maintainers.brainrape ]; }; } diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index 7b186312301..877328e8823 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Find the most beautiful wallpapers for your desktop"; - homepage = https://github.com/calo001/fondo; + homepage = "https://github.com/calo001/fondo"; license = licenses.agpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix index 3b866297603..99ca119b3bc 100644 --- a/pkgs/applications/graphics/fontmatrix/default.nix +++ b/pkgs/applications/graphics/fontmatrix/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac"; - homepage = https://github.com/fontmatrix/fontmatrix; + homepage = "https://github.com/fontmatrix/fontmatrix"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index 57321220fb1..11d203746e1 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "freepv-0.3.0"; src = fetchurl { - url = mirror://sourceforge/freepv/freepv-0.3.0.tar.gz; + url = "mirror://sourceforge/freepv/freepv-0.3.0.tar.gz"; sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Open source panorama viewer using GL"; - homepage = http://freepv.sourceforge.net/; + homepage = "http://freepv.sourceforge.net/"; license = [ stdenv.lib.licenses.lgpl21 ]; }; } diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index f729c9c2bba..f585a0c5d29 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Simple GTK 2 color selector"; - homepage = http://gcolor2.sourceforge.net/; + homepage = "http://gcolor2.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ notthemessiah ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 67be3ba6782..1c1c6ba08ee 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple color chooser written in GTK3"; - homepage = https://www.hjdskes.nl/projects/gcolor3/; + homepage = "https://www.hjdskes.nl/projects/gcolor3/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 4275c6f0dcf..51c066196ef 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; - homepage = http://geeqie.sourceforge.net; + homepage = "http://geeqie.sourceforge.net"; maintainers = with maintainers; [ jfrankenau pSub ]; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 0a06c42b5fc..0b5e6a7f379 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -45,7 +45,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { */ name = "gap-2.6.0"; src = fetchurl { - url = https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2; + url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2"; sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; NIX_LDFLAGS = "-lm"; @@ -56,7 +56,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; - homepage = https://www.gimp.org; + homepage = "https://www.gimp.org"; # The main code is given in GPLv3, but it has ffmpeg in it, and I think ffmpeg license # falls inside "free". license = with licenses; [ gpl3 free ]; @@ -143,7 +143,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { name = "wavelet-sharpen-0.1.2"; NIX_LDFLAGS = "-lm"; src = fetchurl { - url = http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz; + url = "http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; }; installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? @@ -156,7 +156,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { name = "lqr-plugin-0.6.1"; buildInputs = with pkgs; [ liblqr1 ]; src = fetchurl { - url = http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2; + url = "http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2"; sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; }; #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"''; @@ -189,7 +189,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { meta = { description = "GIMP plugin to correct lens distortion using the lensfun library and database"; - homepage = http://lensfun.sebastiankraft.net/; + homepage = "http://lensfun.sebastiankraft.net/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; @@ -203,7 +203,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { exposureBlend = scriptDerivation { name = "exposure-blend"; src = fetchurl { - url = http://tir.astro.utoledo.edu/jdsmith/code/eb/exposure-blend.scm; + url = "http://tir.astro.utoledo.edu/jdsmith/code/eb/exposure-blend.scm"; sha256 = "1b6c9wzpklqras4wwsyw3y3jp6fjmhnnskqiwm5sabs8djknfxla"; }; meta.broken = true; @@ -212,7 +212,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { lightning = scriptDerivation { name = "Lightning"; src = fetchurl { - url = http://registry.gimp.org/files/Lightning.scm; + url = "http://registry.gimp.org/files/Lightning.scm"; sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49"; }; }; @@ -235,7 +235,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { # http://registry.gimp.org/node/153 name = "lightning-gate"; src = fetchurl { - url = http://registry.gimp.org/files/LightningGate.scm; + url = "http://registry.gimp.org/files/LightningGate.scm"; sha256 = "181w1zi9a99kn2mfxjp43wkwcgw5vbb6iqjas7a9mhm8p04csys2"; }; }; diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index fef296f45be..be487fcb8a6 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create labels and business cards"; - homepage = https://glabels.org/; + homepage = "https://glabels.org/"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.unix; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 6cbe5448b40..3d0397528bc 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Access, organize and share your photos"; - homepage = https://wiki.gnome.org/Apps/Photos; + homepage = "https://wiki.gnome.org/Apps/Photos"; license = licenses.gpl3Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/gnuclad/default.nix b/pkgs/applications/graphics/gnuclad/default.nix index 5b6dd42e09e..fcb4bdb5374 100644 --- a/pkgs/applications/graphics/gnuclad/default.nix +++ b/pkgs/applications/graphics/gnuclad/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/gnuclad; + homepage = "https://launchpad.net/gnuclad"; description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project."; license = licenses.gpl3Plus; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/graphics/gocr/default.nix b/pkgs/applications/graphics/gocr/default.nix index f5fa8ca9221..7c586374ec5 100644 --- a/pkgs/applications/graphics/gocr/default.nix +++ b/pkgs/applications/graphics/gocr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://jocr.sourceforge.net/; + homepage = "http://jocr.sourceforge.net/"; description = "GPL Optical Character Recognition"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix index 84fdb60c31e..6fb5b91c2a9 100644 --- a/pkgs/applications/graphics/goxel/default.nix +++ b/pkgs/applications/graphics/goxel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Source 3D voxel editor"; - homepage = https://guillaumechereau.github.io/goxel/; + homepage = "https://guillaumechereau.github.io/goxel/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ tilpner ]; diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index 86867cd1cca..9e3ab37c322 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple and fast image viewer for X"; - homepage = http://lxde.sourceforge.net/gpicview/; - repositories.git = git://lxde.git.sourceforge.net/gitroot/lxde/gpicview; + homepage = "http://lxde.sourceforge.net/gpicview/"; + repositories.git = "git://lxde.git.sourceforge.net/gitroot/lxde/gpicview"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index d82238f925b..965ac5db682 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "gqview-2.1.5"; src = fetchurl { - url = mirror://sourceforge/gqview/gqview-2.1.5.tar.gz; + url = "mirror://sourceforge/gqview/gqview-2.1.5.tar.gz"; sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fast image viewer"; - homepage = http://gqview.sourceforge.net; + homepage = "http://gqview.sourceforge.net"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 039bb1917d3..2a2a6a67598 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; - homepage = http://pulkomandy.tk/projects/GrafX2; + homepage = "http://pulkomandy.tk/projects/GrafX2"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.zoomulator ]; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 403a5285e15..be5114565ff 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.graphicsmagick.org; + homepage = "http://www.graphicsmagick.org"; description = "Swiss army knife of image processing"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 76bb0bc1317..352b6b900cc 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.6.3"; + version = "2.6.5"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/${version}/${pname}-${version}.tar.xz"; - sha256 = "1chmk51xwylnjrgc6hw23x7g7cpwzgwmjc49fcah7pkd3dk1cvvr"; + sha256 = "0x8931i5zs4zl3iqjhlp7h8y6ssklxiqsddz5kh84nl3p0izbg0y"; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -100,7 +100,7 @@ perlPackages.buildPerlPackage rec { meta = { description = "A GUI to produce PDFs or DjVus from scanned documents"; - homepage = http://gscan2pdf.sourceforge.net/; + homepage = "http://gscan2pdf.sourceforge.net/"; license = licenses.gpl3; maintainers = with maintainers; [ pacien ]; }; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index b51db1e945f..4a6526fe9c6 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -59,7 +59,10 @@ stdenv.mkDerivation rec { gnome3.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base - gst_all_1.gstreamer + (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly gtk3 json-glib lcms2 diff --git a/pkgs/applications/graphics/guetzli/default.nix b/pkgs/applications/graphics/guetzli/default.nix index d7b96425968..ccddf907e94 100644 --- a/pkgs/applications/graphics/guetzli/default.nix +++ b/pkgs/applications/graphics/guetzli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { 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; + homepage = "https://github.com/google/guetzli"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.x86_64; maintainers = [ stdenv.lib.maintainers.seppeljordan ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 8f7800a7323..7314ff893b0 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hugin.sourceforge.net/; + homepage = "http://hugin.sourceforge.net/"; description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end"; license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index 3e17a045ecc..4bf414cf8dd 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; - homepage = https://github.com/cassidyjames/ideogram; + homepage = "https://github.com/cassidyjames/ideogram"; license = licenses.gpl2Plus; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/image_optim/Gemfile.lock b/pkgs/applications/graphics/image_optim/Gemfile.lock index 20c9772ce46..3ffadb5acbe 100644 --- a/pkgs/applications/graphics/image_optim/Gemfile.lock +++ b/pkgs/applications/graphics/image_optim/Gemfile.lock @@ -20,4 +20,4 @@ DEPENDENCIES image_optim BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/applications/graphics/image_optim/default.nix b/pkgs/applications/graphics/image_optim/default.nix index 385f9825e46..ba437eab412 100644 --- a/pkgs/applications/graphics/image_optim/default.nix +++ b/pkgs/applications/graphics/image_optim/default.nix @@ -58,7 +58,7 @@ bundlerApp { meta = with lib; { description = "Command line tool and ruby interface to optimize (lossless compress, optionally lossy) jpeg, png, gif and svg images using external utilities (advpng, gifsicle, jhead, jpeg-recompress, jpegoptim, jpegrescan, jpegtran, optipng, pngcrush, pngout, pngquant, svgo)"; - homepage = https://github.com/toy/image_optim; + homepage = "https://github.com/toy/image_optim"; license = licenses.mit; maintainers = with maintainers; [ srghma nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/imagej/default.nix b/pkgs/applications/graphics/imagej/default.nix index 6472712bcb4..d47369f5094 100644 --- a/pkgs/applications/graphics/imagej/default.nix +++ b/pkgs/applications/graphics/imagej/default.nix @@ -32,7 +32,7 @@ let --add-flags "-jar $out/share/java/ij.jar -ijpath $out/share" ''; meta = with stdenv.lib; { - homepage = https://imagej.nih.gov/ij/; + homepage = "https://imagej.nih.gov/ij/"; description = "Image processing and analysis in Java"; longDescription = '' ImageJ is a public domain Java image processing program diff --git a/pkgs/applications/graphics/imgcat/default.nix b/pkgs/applications/graphics/imgcat/default.nix index 1fa3ec8ccc6..5943632930c 100644 --- a/pkgs/applications/graphics/imgcat/default.nix +++ b/pkgs/applications/graphics/imgcat/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "It's like cat, but for images"; - homepage = https://github.com/eddieantonio/imgcat; + homepage = "https://github.com/eddieantonio/imgcat"; license = licenses.isc; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix index 8ca4d71bb56..06549468efe 100644 --- a/pkgs/applications/graphics/imlibsetroot/default.nix +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Xinerama Aware Background Changer"; - homepage = http://robotmonkeys.net/2010/03/30/imlibsetroot/; + homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ dwarfmaster ]; diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix index 26a6cabf784..88b4a847665 100644 --- a/pkgs/applications/graphics/imv/default.nix +++ b/pkgs/applications/graphics/imv/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line image viewer for tiling window managers"; - homepage = https://github.com/eXeC64/imv; + homepage = "https://github.com/eXeC64/imv"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj markus1189 ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 3996b94ba14..763c9f4db22 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = "GPL"; - homepage = https://www.inkscape.org; + homepage = "https://www.inkscape.org"; description = "Vector graphics editor"; platforms = platforms.all; longDescription = '' diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 0cb09ecb643..c6cf71cc67b 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "An editor for drawing figures"; - homepage = http://ipe.otfried.org; + homepage = "http://ipe.otfried.org"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' Ipe is an extensible drawing editor for creating figures in PDF and Postscript format. diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index cc1ca3a0ff2..265ce82b8ac 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimize JPEG files"; - homepage = https://www.kokkonen.net/tjko/projects.html ; + homepage = "https://www.kokkonen.net/tjko/projects.html"; license = licenses.gpl2; maintainers = [ maintainers.aristid ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/applications/graphics/jpegrescan/default.nix index 1c65c7da3a2..5fe35edabdf 100644 --- a/pkgs/applications/graphics/jpegrescan/default.nix +++ b/pkgs/applications/graphics/jpegrescan/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "losslessly shrink any JPEG file"; - homepage = https://github.com/kud/jpegrescan; + homepage = "https://github.com/kud/jpegrescan"; license = licenses.publicDomain; maintainers = [ maintainers.ramkromberg ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 31085cd8023..c74f35e4334 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { /* glibmm 2.50 fix */ - url = https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch; + url = "https://github.com/K-3D/k3d/commit/c65889d0652490d88a573e47de7a9324bf27bff2.patch"; sha256 = "162icv1hicr2dirkb9ijacvg9bhz5j30yfwg7b45ijavk8rns62j"; }) ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A 3D editor with support for procedural editing"; - homepage = http://www.k-3d.org/; + homepage = "http://www.k-3d.org/"; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 3cc4834d756..3f7eb84ed83 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -45,7 +45,7 @@ mkDerivation rec { meta = with lib; { description = "A free and open source painting application"; - homepage = https://krita.org/; + homepage = "https://krita.org/"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/krop/default.nix b/pkgs/applications/graphics/krop/default.nix index 401e5f6fc57..818fc63535e 100644 --- a/pkgs/applications/graphics/krop/default.nix +++ b/pkgs/applications/graphics/krop/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = { - homepage = http://arminstraub.com/software/krop; + homepage = "http://arminstraub.com/software/krop"; description = "Graphical tool to crop the pages of PDF files"; longDescription = '' Krop is a tool that allows you to optimise your PDF files, and remove diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix index 201a4fe113e..5e950eeac04 100644 --- a/pkgs/applications/graphics/leocad/default.nix +++ b/pkgs/applications/graphics/leocad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CAD program for creating virtual LEGO models"; - homepage = https://www.leocad.org/; + homepage = "https://www.leocad.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 94899c937a8..3359365cff1 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { - homepage = http://qtpfsgui.sourceforge.net/; + homepage = "http://qtpfsgui.sourceforge.net/"; description = "A complete open source solution for HDR photography"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/meh/default.nix b/pkgs/applications/graphics/meh/default.nix index 7ad8c388a20..0b2e5bc3777 100644 --- a/pkgs/applications/graphics/meh/default.nix +++ b/pkgs/applications/graphics/meh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A minimal image viewer using raw XLib"; - homepage = https://www.johnhawthorn.com/meh/; + homepage = "https://www.johnhawthorn.com/meh/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 9733f1e2efa..6ac937dcb93 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -126,7 +126,7 @@ in mkDerivation { meta = { description = "A system for processing and editing 3D triangular meshes."; - homepage = http://www.meshlab.net/; + homepage = "http://www.meshlab.net/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; diff --git a/pkgs/applications/graphics/minidjvu/default.nix b/pkgs/applications/graphics/minidjvu/default.nix index d629c776194..2af79659ced 100644 --- a/pkgs/applications/graphics/minidjvu/default.nix +++ b/pkgs/applications/graphics/minidjvu/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "minidjvu-0.8"; src = fetchurl { - url = mirror://sourceforge/minidjvu/minidjvu-0.8.tar.gz; + url = "mirror://sourceforge/minidjvu/minidjvu-0.8.tar.gz"; sha256 = "0jmpvy4g68k6xgplj9zsl6brg6vi81mx3nx2x9hfbr1f4zh95j79"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://djvu.sourceforge.net/djview4.html; + 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 ]; diff --git a/pkgs/applications/graphics/mozjpeg/default.nix b/pkgs/applications/graphics/mozjpeg/default.nix index 63cc4a3a8d3..e17664a018a 100644 --- a/pkgs/applications/graphics/mozjpeg/default.nix +++ b/pkgs/applications/graphics/mozjpeg/default.nix @@ -22,7 +22,7 @@ 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 ; + homepage = "https://github.com/mozilla/mozjpeg"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.aristid ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/graphics/mtpaint/default.nix b/pkgs/applications/graphics/mtpaint/default.nix index 7274bdacd9d..91278c9881f 100644 --- a/pkgs/applications/graphics/mtpaint/default.nix +++ b/pkgs/applications/graphics/mtpaint/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Due to its simplicity and lack of dependencies it runs well on GNU/Linux, Windows and older PC hardware. ''; - homepage = http://mtpaint.sourceforge.net/; + homepage = "http://mtpaint.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vklquevs ]; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index 48a79e8844e..f0d9329bc5a 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -63,11 +63,11 @@ mkDerivation rec { "-DUSE_SYSTEM_QUAZIP=ON"]; meta = with stdenv.lib; { - homepage = https://nomacs.org; + homepage = "https://nomacs.org"; description = "Qt-based image viewer"; maintainers = [maintainers.ahmedtd]; license = licenses.gpl3Plus; - repositories.git = https://github.com/nomacs/nomacs.git; + repositories.git = "https://github.com/nomacs/nomacs.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index 9c4a8b22939..89d49a15145 100644 --- a/pkgs/applications/graphics/openimageio/2.x.nix +++ b/pkgs/applications/graphics/openimageio/2.x.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.openimageio.org; + homepage = "http://www.openimageio.org"; description = "A library and tools for reading and writing images"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu jtojnar ]; diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix index 23cad7e859d..1f2861e7109 100644 --- a/pkgs/applications/graphics/openimageio/default.nix +++ b/pkgs/applications/graphics/openimageio/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.openimageio.org; + homepage = "http://www.openimageio.org"; description = "A library and tools for reading and writing images"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 2c95f6d403f..95af658ddd3 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -77,7 +77,7 @@ mkDerivation rec { machine parts but pretty sure is not what you are looking for when you are more interested in creating computer-animated movies. ''; - homepage = http://openscad.org/; + homepage = "http://openscad.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; diff --git a/pkgs/applications/graphics/panotools/default.nix b/pkgs/applications/graphics/panotools/default.nix index 719aca5096a..c03bdd8331b 100644 --- a/pkgs/applications/graphics/panotools/default.nix +++ b/pkgs/applications/graphics/panotools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { #doCheck = true; meta = { - homepage = http://panotools.sourceforge.net/; + homepage = "http://panotools.sourceforge.net/"; description = "Free software suite for authoring and displaying virtual reality panoramas"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index ac01c28ebd4..15d70d14308 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -59,7 +59,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.paraview.org/; + homepage = "http://www.paraview.org/"; description = "3D Data analysis and visualization application"; license = licenses.free; maintainers = with maintainers; [ guibert ]; diff --git a/pkgs/applications/graphics/pbrt/default.nix b/pkgs/applications/graphics/pbrt/default.nix index 78f6d8bcbaf..fa3034cb3b0 100644 --- a/pkgs/applications/graphics/pbrt/default.nix +++ b/pkgs/applications/graphics/pbrt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ git flex bison cmake zlib ]; meta = with stdenv.lib; { - homepage = http://pbrt.org; + homepage = "http://pbrt.org"; description = "The renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'"; platforms = platforms.linux ; license = licenses.bsd2; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index f31506ce733..b127be821c1 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "A PDF processor written in Go"; - homepage = https://pdfcpu.io; + homepage = "https://pdfcpu.io"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.all; diff --git a/pkgs/applications/graphics/photoflow/default.nix b/pkgs/applications/graphics/photoflow/default.nix index 78d16e69226..9fec8b99c1b 100644 --- a/pkgs/applications/graphics/photoflow/default.nix +++ b/pkgs/applications/graphics/photoflow/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fully non-destructive photo retouching program providing a complete RAW image editing workflow"; - homepage = https://aferrero2707.github.io/PhotoFlow/; + homepage = "https://aferrero2707.github.io/PhotoFlow/"; license = licenses.gpl3Plus; maintainers = [ maintainers.MtP ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix index 14c49d30004..71c63bc82aa 100644 --- a/pkgs/applications/graphics/photoqt/default.nix +++ b/pkgs/applications/graphics/photoqt/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://photoqt.org/; + homepage = "https://photoqt.org/"; description = "Simple, yet powerful and good looking image viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 5e7fb5cf7a0..1c6c1b43354 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An image viewer and organizer"; - homepage = https://sourceforge.net/projects/phototonic/; + homepage = "https://sourceforge.net/projects/phototonic/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index 14090376684..af51c78a169 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -74,7 +74,7 @@ buildDotnetPackage rec { ''; meta = { - homepage = http://www.pinta-project.com/; + homepage = "http://www.pinta-project.com/"; description = "Drawing/editing program modeled after Paint.NET"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/applications/graphics/potrace/default.nix b/pkgs/applications/graphics/potrace/default.nix index 35ab27bcbf6..dd8e84349fa 100644 --- a/pkgs/applications/graphics/potrace/default.nix +++ b/pkgs/applications/graphics/potrace/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://potrace.sourceforge.net/; + homepage = "http://potrace.sourceforge.net/"; description = "A tool for tracing a bitmap, which means, transforming a bitmap into a smooth, scalable image"; platforms = platforms.unix; maintainers = [ maintainers.pSub ]; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 7639a2a9c76..505f28a2451 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Powerful image viewer with minimal UI"; - homepage = http://www.pberndt.com/Programme/Linux/pqiv; + homepage = "http://www.pberndt.com/Programme/Linux/pqiv"; license = licenses.gpl3; maintainers = []; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 9972ea75709..cad6a35ce3f 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # do not download a file during build ${xmlstarlet}/bin/xmlstarlet ed --inplace -P -d '//get[@src="http://download.processing.org/reference.zip"]' build/build.xml install -D -m0444 ${fetchurl { - url = http://download.processing.org/reference.zip; + url = "http://download.processing.org/reference.zip"; sha256 = "198bpk8mzns6w5h0zdf50wr6iv7sgdi6v7jznj5rbsnpgyilxz35"; } } ./java/reference.zip @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A language and IDE for electronic arts"; - homepage = https://processing.org; + homepage = "https://processing.org"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index 4d416a7c106..4f7e5b931f4 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/stolowski/QComicBook; + homepage = "https://github.com/stolowski/QComicBook"; description = "Comic book reader in Qt5"; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 750217d9918..d3dd917d7b7 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Quick image viewer"; - homepage = http://spiegl.de/qiv/; + homepage = "http://spiegl.de/qiv/"; inherit version; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix index fafc76a76ff..1653ea92720 100644 --- a/pkgs/applications/graphics/qscreenshot/default.nix +++ b/pkgs/applications/graphics/qscreenshot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple creation and editing of screenshots"; - homepage = https://sourceforge.net/projects/qscreenshot/; + homepage = "https://sourceforge.net/projects/qscreenshot/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix index afdd2262e50..aa6db0accdb 100644 --- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -80,7 +80,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Photo and video importer for cameras, phones, and memory cards"; - homepage = https://www.damonlynch.net/rapid/; + homepage = "https://www.damonlynch.net/rapid/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index 3f89b7f8b3a..812c26f56e5 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "RAW converter and digital photo processing software"; - homepage = http://www.rawtherapee.com/; + homepage = "http://www.rawtherapee.com/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ jcumming mahe the-kenny ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index e345fcce01e..bf0b92b6f6d 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -65,7 +65,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A single-frame graphics debugger"; - homepage = https://renderdoc.org/; + homepage = "https://renderdoc.org/"; license = licenses.mit; longDescription = '' RenderDoc is a free MIT licensed stand-alone graphics debugger that diff --git a/pkgs/applications/graphics/runwayml/default.nix b/pkgs/applications/graphics/runwayml/default.nix index c3f747837e0..eb8ecc34b8f 100644 --- a/pkgs/applications/graphics/runwayml/default.nix +++ b/pkgs/applications/graphics/runwayml/default.nix @@ -37,7 +37,7 @@ in meta = with lib; { description = "Machine learning for creators"; - homepage = https://runwayml.com/; + homepage = "https://runwayml.com/"; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/sane/backends/airscan/default.nix b/pkgs/applications/graphics/sane/backends/airscan/default.nix new file mode 100644 index 00000000000..11529eee210 --- /dev/null +++ b/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg +, sane-backends, meson, ninja }: +stdenv.mkDerivation rec { + pname = "sane-airscan"; + version = "0.9.17"; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ avahi libsoup libjpeg sane-backends ]; + + src = fetchFromGitHub { + owner = "alexpevzner"; + repo = pname; + rev = version; + sha256 = "03y0c1z5s3wbvxa9nvji62w42cmvcgm2sw72j7wm831995q3abmx"; + }; + + meta = with lib; { + homepage = "https://github.com/alexpevzner/sane-airscan"; + description = "Scanner Access Now Easy - Apple AirScan (eSCL) driver"; + longDescription = '' + sane-airscan: Linux support of Apple AirScan (eSCL) compatible document scanners. + ''; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zaninime ]; + }; +} diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index cd75088ea53..22e8a2ca536 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { meta = { description = "Brother brscan4 sane backend driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.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 da136a7f9e1..682e401c069 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother type1 scanners udev rules"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/applications/graphics/sane/backends/dsseries/default.nix b/pkgs/applications/graphics/sane/backends/dsseries/default.nix index d4165be3784..37ac0298706 100644 --- a/pkgs/applications/graphics/sane/backends/dsseries/default.nix +++ b/pkgs/applications/graphics/sane/backends/dsseries/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother DSSeries SANE backend driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ callahad ]; diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index b00f8f6c58d..188431bda6c 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scanner Access Now Easy"; - homepage = http://www.sane-project.org/; + homepage = "http://www.sane-project.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peti ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 09b431fdb11..22a8f4dc3bd 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional gimpSupport gimp; meta = { - homepage = http://www.sane-project.org/; + homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [peti]; diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix index f9d6c87675f..e4598193469 100644 --- a/pkgs/applications/graphics/scantailor/advanced.nix +++ b/pkgs/applications/graphics/scantailor/advanced.nix @@ -17,7 +17,7 @@ mkDerivation rec { buildInputs = [ libjpeg libpng libtiff boost qtbase ]; meta = with stdenv.lib; { - homepage = https://github.com/4lex4/scantailor-advanced; + homepage = "https://github.com/4lex4/scantailor-advanced"; description = "Interactive post-processing tool for scanned pages"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/graphics/scantailor/default.nix b/pkgs/applications/graphics/scantailor/default.nix index 14efe48f30d..bc54f3aa627 100644 --- a/pkgs/applications/graphics/scantailor/default.nix +++ b/pkgs/applications/graphics/scantailor/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = http://scantailor.org/; + homepage = "http://scantailor.org/"; description = "Interactive post-processing tool for scanned pages"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/graphics/screencloud/default.nix b/pkgs/applications/graphics/screencloud/default.nix index 88bbbd9d864..11e37c4bf64 100644 --- a/pkgs/applications/graphics/screencloud/default.nix +++ b/pkgs/applications/graphics/screencloud/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://screencloud.net/; + 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 ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 79bc743fbf0..b03d0a01dd6 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.0"; + version = "0.31.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pwq953wl7h9cvw7rvlr6pcbq9w28kkr7ddb8x2si81ngp0imwyx"; + sha256 = "0mbgrad4d4snffw2z3rkhwqq1bkxdgy52pblx99vjadvpgspb034"; }; nativeBuildInputs = [ @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; - homepage = https://wiki.gnome.org/Apps/Shotwell; + homepage = "https://wiki.gnome.org/Apps/Shotwell"; license = licenses.lgpl21Plus; maintainers = with maintainers; [domenkozar]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index dd41ee4c3f8..cddc99eebe2 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Screenshot and annotation tool"; - homepage = https://shutter-project.org/; + homepage = "https://shutter-project.org/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix index 314b4007aad..0df161cd473 100644 --- a/pkgs/applications/graphics/smartdeblur/default.nix +++ b/pkgs/applications/graphics/smartdeblur/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SYSTEM_FFTW=ON" ]; meta = { - homepage = https://github.com/Y-Vladimir/SmartDeblur; + 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; [ ]; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index 7046caad295..bd084b4287d 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "solvespace-2.3-20190501"; rev = "e7b75f19c34c923780db776592b47152650d8f22"; src = fetchgit { - url = https://github.com/solvespace/solvespace; + url = "https://github.com/solvespace/solvespace"; inherit rev; sha256 = "07k4mbzxf0dmzwdhjx5nc09y7rn1schkaypsw9kz0l7ppylprpp2"; fetchSubmodules = true; @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.edef ]; platforms = platforms.linux; - homepage = http://solvespace.com; + homepage = "http://solvespace.com"; }; } diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix index f56646e5aed..fc9132ec0b4 100644 --- a/pkgs/applications/graphics/swingsane/default.nix +++ b/pkgs/applications/graphics/swingsane/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { simultaneous scan jobs, image transformation jobs (deskew, binarize, crop, etc), PDF and PNG output. ''; - homepage = http://swingsane.com/; + homepage = "http://swingsane.com/"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/applications/graphics/sxiv/default.nix b/pkgs/applications/graphics/sxiv/default.nix index f5429958328..4cf0ae55578 100644 --- a/pkgs/applications/graphics/sxiv/default.nix +++ b/pkgs/applications/graphics/sxiv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple X Image Viewer"; - homepage = https://github.com/muennich/sxiv; + homepage = "https://github.com/muennich/sxiv"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 188f7cb2934..e2ffd160258 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A 2D animation program"; - homepage = http://www.synfig.org; + homepage = "http://www.synfig.org"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/graphics/tesseract/tesseract3.nix b/pkgs/applications/graphics/tesseract/tesseract3.nix index 157c0b9742b..dc9d4ac2d59 100644 --- a/pkgs/applications/graphics/tesseract/tesseract3.nix +++ b/pkgs/applications/graphics/tesseract/tesseract3.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; - homepage = https://github.com/tesseract-ocr/tesseract; + 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; diff --git a/pkgs/applications/graphics/tesseract/tesseract4.nix b/pkgs/applications/graphics/tesseract/tesseract4.nix index 95896337720..d7c3cacc1f9 100644 --- a/pkgs/applications/graphics/tesseract/tesseract4.nix +++ b/pkgs/applications/graphics/tesseract/tesseract4.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "OCR engine"; - homepage = https://github.com/tesseract-ocr/tesseract; + 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; diff --git a/pkgs/applications/graphics/timelapse-deflicker/default.nix b/pkgs/applications/graphics/timelapse-deflicker/default.nix index 8355545e8dd..ac382bb6327 100644 --- a/pkgs/applications/graphics/timelapse-deflicker/default.nix +++ b/pkgs/applications/graphics/timelapse-deflicker/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple script to deflicker images taken for timelapses"; - homepage = https://github.com/cyberang3l/timelapse-deflicker; + homepage = "https://github.com/cyberang3l/timelapse-deflicker"; license = licenses.gpl3; maintainers = with maintainers; [ valeriangalliat ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 131d83f0d58..9e05a41e848 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/sergiomb2/ufraw; + homepage = "https://github.com/sergiomb2/ufraw"; description = "Utility to read and manipulate raw images from digital cameras"; diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index 09abfc60a52..14ff5f9a519 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -107,7 +107,7 @@ in meta = { description = "The Unigine Valley GPU benchmarking tool"; - homepage = http://unigine.com/products/benchmarks/valley/; + homepage = "http://unigine.com/products/benchmarks/valley/"; license = stdenv.lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ stdenv.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 a80e89e72bc..41463a7627a 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3; - homepage = http://siyanpanayotov.com/project/viewnior/; + homepage = "http://siyanpanayotov.com/project/viewnior/"; maintainers = [ stdenv.lib.maintainers.smironov ]; diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index fab85052df3..b5e9d0b8cf2 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -64,7 +64,7 @@ python3Packages.buildPythonApplication rec { postInstall = "make DESTDIR=\"$out\" install"; meta = { - homepage = https://github.com/karlch/vimiv; + homepage = "https://github.com/karlch/vimiv"; description = "An image viewer with Vim-like keybindings"; license = lib.licenses.mit; platforms = lib.platforms.linux; diff --git a/pkgs/applications/graphics/wings/default.nix b/pkgs/applications/graphics/wings/default.nix index 8d6eca7ef32..19c30f3ecc4 100644 --- a/pkgs/applications/graphics/wings/default.nix +++ b/pkgs/applications/graphics/wings/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.wings3d.com/; + 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]; diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index 0f1020b0b07..b1bfbe3c4cf 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.styluslabs.com/; + homepage = "http://www.styluslabs.com/"; description = "Write is a word processor for handwriting."; platforms = platforms.linux; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index e80362c386b..767f3aa920b 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://xaos.sourceforge.net/; + homepage = "http://xaos.sourceforge.net/"; description = "Fractal viewer"; license = stdenv.lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index 56388a8a255..5e3c252435c 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "xaralx-0.7r1785"; src = fetchurl { - url = http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2; + url = "http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2"; sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh"; }; diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index ae4765fc9e7..8d36e4630dc 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfree; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://www.fractint.net/; + homepage = "https://www.fractint.net/"; }; } diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 6d10a7cae23..8a5d9c3597b 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://xournal.sourceforge.net/; + homepage = "http://xournal.sourceforge.net/"; description = "Note-taking application (supposes stylus)"; maintainers = [ maintainers.guibert ]; license = licenses.gpl2; diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index de3f3a78988..67f43faf99a 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { mkdir -p $out/share/{app-install/desktop,applications,info,pixmaps} ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/xzgv/; + homepage = "https://sourceforge.net/projects/xzgv/"; description = "Picture viewer for X with a thumbnail-based selector"; license = licenses.gpl2; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/applications/graphics/zgv/default.nix b/pkgs/applications/graphics/zgv/default.nix index 7b14d7750c3..6cc59a7e60b 100644 --- a/pkgs/applications/graphics/zgv/default.nix +++ b/pkgs/applications/graphics/zgv/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://foss.aueb.gr/mirrors/linux/gentoo/media-gfx/zgv/files/zgv-5.9-libpng15.patch; + url = "https://foss.aueb.gr/mirrors/linux/gentoo/media-gfx/zgv/files/zgv-5.9-libpng15.patch"; sha256 = "1blw9n04c28bnwcmcn64si4f5zpg42s8yn345js88fyzi9zm19xw"; }) ./switch.patch @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.svgalib.org/rus/zgv/; + homepage = "http://www.svgalib.org/rus/zgv/"; description = "Picture viewer with a thumbnail-based selector"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 6788a5df3ff..5994eaf1c71 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -78,6 +78,7 @@ let dolphin = callPackage ./dolphin.nix {}; dolphin-plugins = callPackage ./dolphin-plugins.nix {}; dragon = callPackage ./dragon.nix {}; + elisa = callPackage ./elisa.nix {}; eventviews = callPackage ./eventviews.nix {}; ffmpegthumbs = callPackage ./ffmpegthumbs.nix { }; filelight = callPackage ./filelight.nix {}; diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix new file mode 100644 index 00000000000..a2bfa88f812 --- /dev/null +++ b/pkgs/applications/kde/elisa.nix @@ -0,0 +1,46 @@ +{ mkDerivation +, fetchFromGitHub +, lib +, extra-cmake-modules +, kdoctools +, qtmultimedia +, qtquickcontrols2 +, qtwebsockets +, kconfig +, kcmutils +, kcrash +, kdeclarative +, kfilemetadata +, kinit +, kirigami2 +, baloo +, vlc +}: + +mkDerivation rec { + name = "elisa"; + + buildInputs = [ vlc ]; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + + propagatedBuildInputs = [ + baloo + kcmutils + kconfig + kcrash + kdeclarative + kfilemetadata + kinit + kirigami2 + qtmultimedia + qtquickcontrols2 + qtwebsockets + ]; + + meta = with lib; { + description = "A simple media player for KDE"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 424c759b56c..3f6dc9ef181 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.1/src ) +WGET_ARGS=( http://download.kde.org/stable/release-service/19.12.3/src ) diff --git a/pkgs/applications/kde/ffmpeg-path.patch b/pkgs/applications/kde/ffmpeg-path.patch new file mode 100644 index 00000000000..a0cef882f59 --- /dev/null +++ b/pkgs/applications/kde/ffmpeg-path.patch @@ -0,0 +1,25 @@ +diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg +index 5edad5ae7..d35347a40 100644 +--- a/src/kdenlivesettings.kcfg ++++ b/src/kdenlivesettings.kcfg +@@ -403,17 +403,17 @@ + + <entry name="ffmpegpath" type="Path"> + <label>FFmpeg / Libav binary path.</label> +- <default></default> ++ <default>@ffmpeg@/bin/ffmpeg</default> + </entry> + + <entry name="ffplaypath" type="Path"> + <label>FFplay / avplay binary path.</label> +- <default></default> ++ <default>@ffmpeg@/bin/ffplay</default> + </entry> + + <entry name="ffprobepath" type="Path"> + <label>FFprobe / avprobe binary path.</label> +- <default></default> ++ <default>@ffmpeg@/bin/ffprobe</default> + </entry> + + <entry name="mltthreads" type="Int"> diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix index b7c691e9594..95496f90e04 100644 --- a/pkgs/applications/kde/kdenlive.nix +++ b/pkgs/applications/kde/kdenlive.nix @@ -70,14 +70,24 @@ mkDerivation { kpurpose kdeclarative ]; - patches = [ ./mlt-path.patch ]; + # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it + # doesn't find them. See: + # https://github.com/NixOS/nixpkgs/issues/83885 + patches = [ ./mlt-path.patch ./ffmpeg-path.patch ]; inherit mlt; + ffmpeg = ffmpeg-full; postPatch = # Module Qt5::Concurrent must be included in `find_package` before it is used. '' sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|' substituteAllInPlace src/kdenlivesettings.kcfg ''; + # Frei0r path needs to be set too or Kdenlive will complain. See: + # https://github.com/NixOS/nixpkgs/issues/83885 + # https://github.com/NixOS/nixpkgs/issues/29614#issuecomment-488849325 + qtWrapperArgs = [ + "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" + ]; meta = { license = with lib.licenses; [ gpl2Plus ]; }; diff --git a/pkgs/applications/kde/keditbookmarks.nix b/pkgs/applications/kde/keditbookmarks.nix index 57741c03ad5..efe247df737 100644 --- a/pkgs/applications/kde/keditbookmarks.nix +++ b/pkgs/applications/kde/keditbookmarks.nix @@ -9,7 +9,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kio kparts kwindowsystem ]; meta = with lib; { - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/applications/kde/kipi-plugins.nix b/pkgs/applications/kde/kipi-plugins.nix index 5fb953acbd6..180d066a87c 100644 --- a/pkgs/applications/kde/kipi-plugins.nix +++ b/pkgs/applications/kde/kipi-plugins.nix @@ -17,7 +17,7 @@ mkDerivation { meta = { description = "Plugins for KDE-based image applications"; license = lib.licenses.gpl2; - homepage = https://cgit.kde.org/kipi-plugins.git; + homepage = "https://cgit.kde.org/kipi-plugins.git"; maintainers = with lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix index ce66de251dc..303ea6162ba 100644 --- a/pkgs/applications/kde/kitinerary.nix +++ b/pkgs/applications/kde/kitinerary.nix @@ -2,6 +2,7 @@ mkDerivation, lib, extra-cmake-modules , qtbase, qtdeclarative, ki18n, kmime, kpkpass , poppler, kcontacts, kcalendarcore +, shared-mime-info }: mkDerivation { @@ -10,7 +11,10 @@ mkDerivation { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; }; - nativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ + extra-cmake-modules + shared-mime-info # for update-mime-database + ]; buildInputs = [ qtbase qtdeclarative ki18n kmime kpkpass poppler kcontacts kcalendarcore diff --git a/pkgs/applications/kde/krdc.nix b/pkgs/applications/kde/krdc.nix index 89ac92bb474..2b0a1a5c514 100644 --- a/pkgs/applications/kde/krdc.nix +++ b/pkgs/applications/kde/krdc.nix @@ -17,7 +17,7 @@ mkDerivation { --prefix PATH : ${lib.makeBinPath [ freerdp ]} ''; meta = with lib; { - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index 377fbe3339a..c399335c4a8 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -19,7 +19,7 @@ mkDerivation { qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; meta = with lib; { - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; maintainers = with maintainers; [ ttuegel ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 60cf49fa05e..dc6eb0f09e8 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1731 +4,1731 @@ { akonadi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-19.12.1.tar.xz"; - sha256 = "991680be1b57a5335690341ab2a681fc7d8e77a4951673021f0662f3005856a3"; - name = "akonadi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-19.12.3.tar.xz"; + sha256 = "e41714d81ecbb629aaa0b267e0c32a4b1d83c6a45cf3f37d52232003b4c0f325"; + name = "akonadi-19.12.3.tar.xz"; }; }; akonadi-calendar = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-calendar-19.12.1.tar.xz"; - sha256 = "4bec3252bd1a32874a22b28dcb82a2aed533b31e1955ca68803ddf076dbbd5be"; - name = "akonadi-calendar-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-calendar-19.12.3.tar.xz"; + sha256 = "c58d18153ef711a79962ba907e44338a0ddd62968e0a6c50486bba09a6e2a446"; + name = "akonadi-calendar-19.12.3.tar.xz"; }; }; akonadi-calendar-tools = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-calendar-tools-19.12.1.tar.xz"; - sha256 = "0650e12b2155b08cf70cc4620f9ea3868bad66affc4668775cd050539eacbec9"; - name = "akonadi-calendar-tools-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-calendar-tools-19.12.3.tar.xz"; + sha256 = "ad2c23cf188228dc697d39e2120b56ce445bbea3eb46721794cd6344aa7e94ba"; + name = "akonadi-calendar-tools-19.12.3.tar.xz"; }; }; akonadiconsole = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadiconsole-19.12.1.tar.xz"; - sha256 = "e6a755875b9ef9db4f022888b77bd011a5edf2c21667074b971d15818659dd5b"; - name = "akonadiconsole-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadiconsole-19.12.3.tar.xz"; + sha256 = "0dedcccfcfd7e6ad9a5af0aa61ce05f26cbb625d8bf6b6d210ac6e3c5813487f"; + name = "akonadiconsole-19.12.3.tar.xz"; }; }; akonadi-contacts = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-contacts-19.12.1.tar.xz"; - sha256 = "0fbca91b3251d57291629e441ecf5cdd9b71a56f74f05f6c55a428402d3b4c91"; - name = "akonadi-contacts-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-contacts-19.12.3.tar.xz"; + sha256 = "b0baed9edb8c05b6d9b8db84239cd83a334d8f1d14d4aa8027dc1139a543eadf"; + name = "akonadi-contacts-19.12.3.tar.xz"; }; }; akonadi-import-wizard = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-import-wizard-19.12.1.tar.xz"; - sha256 = "a58d29407eebd9ce895d38b121cb034f92c81b85afd1b8da9c70cc3d7dc29b3d"; - name = "akonadi-import-wizard-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-import-wizard-19.12.3.tar.xz"; + sha256 = "2c1491e4f5994ed0d317a27cc717184a86f7d92c4b44f8bd056e147e80bee8c5"; + name = "akonadi-import-wizard-19.12.3.tar.xz"; }; }; akonadi-mime = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-mime-19.12.1.tar.xz"; - sha256 = "9ca3794a36e31a5dd759b741e91420f4910f05b0d726f6e803d365b8ab058f5b"; - name = "akonadi-mime-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-mime-19.12.3.tar.xz"; + sha256 = "13bdf9a233a183d5aeee1be0991617fca6d73ffd35bc14ca0d18714149f04392"; + name = "akonadi-mime-19.12.3.tar.xz"; }; }; akonadi-notes = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-notes-19.12.1.tar.xz"; - sha256 = "cf8059cb14eca880c09fc83285576b4d03a8edf0799cebdf42d59084bb6904ca"; - name = "akonadi-notes-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-notes-19.12.3.tar.xz"; + sha256 = "a34c2420190925b985b0629d7d2d19be04443cfeeaf284229666338e039e56e2"; + name = "akonadi-notes-19.12.3.tar.xz"; }; }; akonadi-search = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akonadi-search-19.12.1.tar.xz"; - sha256 = "78a0feaa41d4b474a2e90c74230bc5196349e1c4e72ad46fe341a1cb6e51a5b8"; - name = "akonadi-search-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akonadi-search-19.12.3.tar.xz"; + sha256 = "60072a36f6c817d009a8476bad2e80c4131b14358e03b4889a03aa42340ed041"; + name = "akonadi-search-19.12.3.tar.xz"; }; }; akregator = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/akregator-19.12.1.tar.xz"; - sha256 = "e6f00777059e5b9fe2458a7e4248a59652f08d836518bf0395aaf2ed77ef4d52"; - name = "akregator-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/akregator-19.12.3.tar.xz"; + sha256 = "63db0f6c75bffe9235122201445d151f4eaa7061d2a8df4eb924bca1a4600f68"; + name = "akregator-19.12.3.tar.xz"; }; }; analitza = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/analitza-19.12.1.tar.xz"; - sha256 = "0c6c4ee1b4546ab84eb9503220ca0aa09f80cdd7cea3b89201db1d5aac2c4ce5"; - name = "analitza-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/analitza-19.12.3.tar.xz"; + sha256 = "47ca3acaf2d2f52e91cd2253742ab97d9b07abc3fef0d632bfc36d253dbf161b"; + name = "analitza-19.12.3.tar.xz"; }; }; ark = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ark-19.12.1.tar.xz"; - sha256 = "37b9dfc0b6005ebd0f2757ecce940568839e8a5d73b3bcbc1931ce4eccbb9d0c"; - name = "ark-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ark-19.12.3.tar.xz"; + sha256 = "78594029729c197fc90321850696f1bd189b40d8d7fbc9faf51ad6b2ab744a07"; + name = "ark-19.12.3.tar.xz"; }; }; artikulate = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/artikulate-19.12.1.tar.xz"; - sha256 = "407f72193c7c4ec3f8ac7fa93889803f2ec6523aebb59bdf9a9210e9fac0ee7d"; - name = "artikulate-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/artikulate-19.12.3.tar.xz"; + sha256 = "c27a5cb98a8e2975638fe74683a73f92c160ce133b133878844062dd99ffded6"; + name = "artikulate-19.12.3.tar.xz"; }; }; audiocd-kio = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/audiocd-kio-19.12.1.tar.xz"; - sha256 = "3b4433bbbdd56bbafcf0418eaebb655b8fd4e03a4c29489112394393f3dc3815"; - name = "audiocd-kio-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/audiocd-kio-19.12.3.tar.xz"; + sha256 = "b920170ae816f29a61a6f6b25df68c9125a5d4d9fec225feee45e46317d64d42"; + name = "audiocd-kio-19.12.3.tar.xz"; }; }; baloo-widgets = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/baloo-widgets-19.12.1.tar.xz"; - sha256 = "a9fb3a136267bb0089192f7bc523903bd304e528160d9f653ccd052b4a8c110c"; - name = "baloo-widgets-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/baloo-widgets-19.12.3.tar.xz"; + sha256 = "236c0bb0bcb345f4ce5f07d591bded6221383bc7b190b42b96999893390cd8a5"; + name = "baloo-widgets-19.12.3.tar.xz"; }; }; blinken = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/blinken-19.12.1.tar.xz"; - sha256 = "4a1f7c782dc236d963bc1de11b7dcbc79012d47e3e6cc5ce692ca91ecb788388"; - name = "blinken-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/blinken-19.12.3.tar.xz"; + sha256 = "06ef385ab73d99fa3f1925a6f2ef522f691d04cd594777f5d9fa52a5f2e45a94"; + name = "blinken-19.12.3.tar.xz"; }; }; bomber = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/bomber-19.12.1.tar.xz"; - sha256 = "f0007dae42d6586ab6c9da5775c835fb515cbf180698a1453a90efd2ba8f2795"; - name = "bomber-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/bomber-19.12.3.tar.xz"; + sha256 = "ea4926fe08c62ac5da28c3bb480a6986e51f7a77e3245d1dc1603c38617da4b0"; + name = "bomber-19.12.3.tar.xz"; }; }; bovo = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/bovo-19.12.1.tar.xz"; - sha256 = "54cee2f71e9736057187c8121313b9c73f6cadd0fa463ea2a29cf0e86969d5ae"; - name = "bovo-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/bovo-19.12.3.tar.xz"; + sha256 = "ac67aff75c1e8e0d1a1a8142ae94431e4f39565f411287f57c2778f8820316af"; + name = "bovo-19.12.3.tar.xz"; }; }; calendarsupport = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/calendarsupport-19.12.1.tar.xz"; - sha256 = "6f5e3282ff385044061320b7ccb4bef80a1848fa890afcbd12e16bd2524a4189"; - name = "calendarsupport-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/calendarsupport-19.12.3.tar.xz"; + sha256 = "ecbd194b5aa39284d33f7f2ddca75175f8699efee1bfbd5000ea10076567bae8"; + name = "calendarsupport-19.12.3.tar.xz"; }; }; cantor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/cantor-19.12.1.tar.xz"; - sha256 = "509ebe0bc173124d28e29483effa07985eef24cdd989e5e4e1fc233632cdf568"; - name = "cantor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/cantor-19.12.3.tar.xz"; + sha256 = "8347160f18993f53c857ec0d418dfebbc533878ad9f480047646d121e4e644cb"; + name = "cantor-19.12.3.tar.xz"; }; }; cervisia = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/cervisia-19.12.1.tar.xz"; - sha256 = "2a7d32ac0c1460c135397cedec177db8eb99117b53ec2c9652763b0e90184188"; - name = "cervisia-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/cervisia-19.12.3.tar.xz"; + sha256 = "733a90f521cd79157f6d02eeb28376bc703239800473e8cf366611dd4f3342a6"; + name = "cervisia-19.12.3.tar.xz"; }; }; dolphin = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/dolphin-19.12.1.tar.xz"; - sha256 = "492b4ca71e33373c7000aad5c7daf6e04d7ad537e1fde8a73d2c3db15858e8c8"; - name = "dolphin-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/dolphin-19.12.3.tar.xz"; + sha256 = "ba16f4d5be5ccc3c135a913f2e3c7dd3b7a492cfc9ec9ae518f714fcd7c2ab47"; + name = "dolphin-19.12.3.tar.xz"; }; }; dolphin-plugins = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/dolphin-plugins-19.12.1.tar.xz"; - sha256 = "9392571a7004c08aac02dcc6453f58b6d0de4716b7cd61776f78d9b1783c60e0"; - name = "dolphin-plugins-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/dolphin-plugins-19.12.3.tar.xz"; + sha256 = "7dbd5c0fe4281c46df789f86f468c4ea32949285055cae4652bab3de59acdfd3"; + name = "dolphin-plugins-19.12.3.tar.xz"; }; }; dragon = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/dragon-19.12.1.tar.xz"; - sha256 = "a804ae2089c0e96700e91d90ba2100d9a42a81a128a3fdbb037ed94c31f380cd"; - name = "dragon-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/dragon-19.12.3.tar.xz"; + sha256 = "c5b09b2bd37f4e86f8412d3b950331d330257ba53278b1a569f36bf3fbf560ee"; + name = "dragon-19.12.3.tar.xz"; }; }; elisa = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/elisa-19.12.1.tar.xz"; - sha256 = "4929da2ebe68a3dc0d22a809a7b2a84493aa6f072e16515bd557ddaac51fd8fa"; - name = "elisa-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/elisa-19.12.3.tar.xz"; + sha256 = "28ad795c1d993969d49ab71514129589a71ee6fe8a2de785e22f17f5af7c3d32"; + name = "elisa-19.12.3.tar.xz"; }; }; eventviews = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/eventviews-19.12.1.tar.xz"; - sha256 = "5eb73fb2c541a6b073ad231a28abe6affc0cad92f5fd4d36a4b58aba8a46193c"; - name = "eventviews-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/eventviews-19.12.3.tar.xz"; + sha256 = "e2ac6a77c6bdee008229a2b03262ac5602e0cabfd325a92df58be63aaa7db662"; + name = "eventviews-19.12.3.tar.xz"; }; }; ffmpegthumbs = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ffmpegthumbs-19.12.1.tar.xz"; - sha256 = "5f7853788c07d409bc2dd2fd7c9afab4cd847f3d2dc6db4dc30cfd78e762bdbd"; - name = "ffmpegthumbs-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ffmpegthumbs-19.12.3.tar.xz"; + sha256 = "cc4a1c3b4768dc674d210294a9957d622448cbe9cdaf713c1cb40bff3a79260e"; + name = "ffmpegthumbs-19.12.3.tar.xz"; }; }; filelight = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/filelight-19.12.1.tar.xz"; - sha256 = "29806a4149b3fb60f81372d56c184d0e2f861816639a0a21b85cd7af314f860b"; - name = "filelight-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/filelight-19.12.3.tar.xz"; + sha256 = "9ea78509f932cd2bd553d934e2af75c25d0b65d85d2b0ab4a007ac5929b2d3b5"; + name = "filelight-19.12.3.tar.xz"; }; }; granatier = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/granatier-19.12.1.tar.xz"; - sha256 = "98051d292dd5a3ba3f873e8bc2bed6cdae291c9516b9cb21a64703b3135baa7f"; - name = "granatier-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/granatier-19.12.3.tar.xz"; + sha256 = "aa2e410e4eeae74f3902028069955017a31a922dff98b81850f20743f7b54c95"; + name = "granatier-19.12.3.tar.xz"; }; }; grantlee-editor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/grantlee-editor-19.12.1.tar.xz"; - sha256 = "63a2571369aff6cc648b064bcbc32227eede19475cad8937cfc454984423ea0c"; - name = "grantlee-editor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/grantlee-editor-19.12.3.tar.xz"; + sha256 = "5df3e5ce7933290f9f6423bdbcb0ff5614a1a4b6fda250a37bd3ed57647f8a3c"; + name = "grantlee-editor-19.12.3.tar.xz"; }; }; grantleetheme = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/grantleetheme-19.12.1.tar.xz"; - sha256 = "f23aaf86ff8c630a2f3498b3eebcd6533b01ee806dcf4130df7dd55e3b890ddd"; - name = "grantleetheme-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/grantleetheme-19.12.3.tar.xz"; + sha256 = "cc0ce448c9d8396dcadea2a43089feca8e1074572df42752f70dd176676f29f9"; + name = "grantleetheme-19.12.3.tar.xz"; }; }; gwenview = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/gwenview-19.12.1.tar.xz"; - sha256 = "ed36590a0193fbe22f08c1a026e58f86a3067f516b3a894f29b72aa229967c84"; - name = "gwenview-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/gwenview-19.12.3.tar.xz"; + sha256 = "b453cd55b7409bf8e4446a1b714dc66e73a0376d2da65b184b82f786767164e7"; + name = "gwenview-19.12.3.tar.xz"; }; }; incidenceeditor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/incidenceeditor-19.12.1.tar.xz"; - sha256 = "1f1345db2e518bfe9405df5fa441ece3af1093cbc75066673d252a0760262484"; - name = "incidenceeditor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/incidenceeditor-19.12.3.tar.xz"; + sha256 = "c608a95f6d09433b378f5df0243eff77be3738fb56f99ab439774f2cad5908a6"; + name = "incidenceeditor-19.12.3.tar.xz"; }; }; juk = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/juk-19.12.1.tar.xz"; - sha256 = "de1d9f3581f791ea050700b467dce4b38d9ec2dc20884b495826e479d3245edf"; - name = "juk-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/juk-19.12.3.tar.xz"; + sha256 = "4bc4210d223afc23cb6edc9262eceee038ecc6243a550698e676230168943611"; + name = "juk-19.12.3.tar.xz"; }; }; k3b = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/k3b-19.12.1.tar.xz"; - sha256 = "59def9d9c9e14de52a14d58a22c15173d98086d9a156a3a463b9607dc7be602d"; - name = "k3b-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/k3b-19.12.3.tar.xz"; + sha256 = "832c314d528ed21971d9d9d26c1c4d6c61323c9b3b01787d710541e3651575a5"; + name = "k3b-19.12.3.tar.xz"; }; }; kaccounts-integration = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kaccounts-integration-19.12.1.tar.xz"; - sha256 = "0dda504f51b86207180aceb00d86d42cb16c7ebe81c60ca1ed6bf8fa20699127"; - name = "kaccounts-integration-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kaccounts-integration-19.12.3.tar.xz"; + sha256 = "452b95113de5fb0d19a13ef75e229ee07b0e92cc1e7a17e9a2dc7879121d9d33"; + name = "kaccounts-integration-19.12.3.tar.xz"; }; }; kaccounts-providers = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kaccounts-providers-19.12.1.tar.xz"; - sha256 = "abcd1fa9f63248f3ce7f9c98d940b124ff5c70c1a3381a6cfad6ce7012b23c69"; - name = "kaccounts-providers-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kaccounts-providers-19.12.3.tar.xz"; + sha256 = "8774e9a8113e4aba593afeff655e38f6259c78e7dbaf1d95ea00235be880f3dd"; + name = "kaccounts-providers-19.12.3.tar.xz"; }; }; kaddressbook = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kaddressbook-19.12.1.tar.xz"; - sha256 = "32e19973015151ac32fe7ae1f0a17e82e2834ce69ba052f31e8d197930f0be5c"; - name = "kaddressbook-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kaddressbook-19.12.3.tar.xz"; + sha256 = "1dede421e6fef2b1abc7d36dd1855cef43cc82de909a432cd38cff42d4168fba"; + name = "kaddressbook-19.12.3.tar.xz"; }; }; kajongg = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kajongg-19.12.1.tar.xz"; - sha256 = "2f0944ea23cefb07187e0c176ae0a12cbba1b591aefeab9be9a59d5cab9e7a59"; - name = "kajongg-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kajongg-19.12.3.tar.xz"; + sha256 = "23e2b1be670b48bdd027e4e7a57e86a94b322afe6d37d8492c3d17689decfae5"; + name = "kajongg-19.12.3.tar.xz"; }; }; kalarm = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kalarm-19.12.1.tar.xz"; - sha256 = "06a8d9544d1107ac3f2e8c4c2e9604055706dcb6b7f3b0267f0d4cb45f1caf35"; - name = "kalarm-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kalarm-19.12.3.tar.xz"; + sha256 = "526ab8884752c15622233db8b72e88d0c22a7a1bd265763d850b6e18e32de417"; + name = "kalarm-19.12.3.tar.xz"; }; }; kalarmcal = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kalarmcal-19.12.1.tar.xz"; - sha256 = "18644d5cbc61b414675de66dd25d9a1dd30b0e93851f6223292f052d30a365e6"; - name = "kalarmcal-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kalarmcal-19.12.3.tar.xz"; + sha256 = "0ec5188f1164d91de702639ab2f85a713889feef48fc02dfe7385c945d06aa60"; + name = "kalarmcal-19.12.3.tar.xz"; }; }; kalgebra = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kalgebra-19.12.1.tar.xz"; - sha256 = "49d623186800eb8f6fbb91eb43fb14dff78e112624c9cda6b331d494d610b16a"; - name = "kalgebra-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kalgebra-19.12.3.tar.xz"; + sha256 = "ac865dded31b61c438ddb9db721543b8facba79c9b39365750b4bebfe2645640"; + name = "kalgebra-19.12.3.tar.xz"; }; }; kalzium = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kalzium-19.12.1.tar.xz"; - sha256 = "f50cc18d94ce9a1aaedcbee3a5dccc2cc6723ac8ec151a0ae0ff60009a7c6943"; - name = "kalzium-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kalzium-19.12.3.tar.xz"; + sha256 = "e44f359d1343c30cf1993a3970a3e610d0d5782f92a6b331b035cf4fef104195"; + name = "kalzium-19.12.3.tar.xz"; }; }; kamera = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kamera-19.12.1.tar.xz"; - sha256 = "831d7b3d7ffdc73b03116b564fb1a23c651d468cae97c1c31791f6df1a8890ac"; - name = "kamera-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kamera-19.12.3.tar.xz"; + sha256 = "22e19527bf9748cdc298be4c3fa2cb0a3b8b337da3a3a804c9d6066d7f3e1110"; + name = "kamera-19.12.3.tar.xz"; }; }; kamoso = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kamoso-19.12.1.tar.xz"; - sha256 = "c1776bf7f8eafd9f4c501aabc0df30035a0f1d40951e525312aa257e67cf74a7"; - name = "kamoso-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kamoso-19.12.3.tar.xz"; + sha256 = "9ae14c4c80cdbbf2ce2e92db5e9c814fbd685e81aa5c319aac5477649fc39fe4"; + name = "kamoso-19.12.3.tar.xz"; }; }; kanagram = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kanagram-19.12.1.tar.xz"; - sha256 = "2127eada150ee3f023948b637890aa93d602874fd6c037c4bd031886a12a2fdc"; - name = "kanagram-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kanagram-19.12.3.tar.xz"; + sha256 = "441cae90d3b70dbef40bebbcf1325fa06e0df174a3f961b4b117a5fa1b40d6e3"; + name = "kanagram-19.12.3.tar.xz"; }; }; kapman = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kapman-19.12.1.tar.xz"; - sha256 = "cd5bef40c51bc6ef635adab501acd2a40c2291c989c4ba3ef6e34a1cbebe4c49"; - name = "kapman-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kapman-19.12.3.tar.xz"; + sha256 = "3c81e3395ce2b2ea0937b09c0836cb58b8a941c2b7e2a27bd9741b2a9be1c1dd"; + name = "kapman-19.12.3.tar.xz"; }; }; kapptemplate = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kapptemplate-19.12.1.tar.xz"; - sha256 = "b2fc583125aae1968c0342063a6cfcea2dbeff21e0ef505a021b689ed3a34085"; - name = "kapptemplate-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kapptemplate-19.12.3.tar.xz"; + sha256 = "5bef4e4fb74da3102cba6672584195962514ee3f53fb369b48d492d6ce7255ad"; + name = "kapptemplate-19.12.3.tar.xz"; }; }; kate = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kate-19.12.1.tar.xz"; - sha256 = "9d2401907e5b163d5af0af5b4d28383896ef709bcde7f6ee2234e1a3adc28a47"; - name = "kate-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kate-19.12.3.tar.xz"; + sha256 = "f60b52e5a6a78920ac703a458f1eaf0ced02ffcd8b5f2d49de9a48674eeb007c"; + name = "kate-19.12.3.tar.xz"; }; }; katomic = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/katomic-19.12.1.tar.xz"; - sha256 = "bc51424757434e905b5b611a6fa634147e533e375922c03f896a093fa61e57a3"; - name = "katomic-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/katomic-19.12.3.tar.xz"; + sha256 = "d7ed527e2546e94cb091e433a2e61618301152704c48e1f003e1f8e60b4f0cbd"; + name = "katomic-19.12.3.tar.xz"; }; }; kbackup = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kbackup-19.12.1.tar.xz"; - sha256 = "1b30c142576d823043d4e78fa37592e8df79b5e13ea7a980d336b25c1093ecf8"; - name = "kbackup-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kbackup-19.12.3.tar.xz"; + sha256 = "1761009f9cd854d3fb4f98eb24b5ee7f3c42c4541f7cfb2ff1589786c86bdc99"; + name = "kbackup-19.12.3.tar.xz"; }; }; kblackbox = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kblackbox-19.12.1.tar.xz"; - sha256 = "57901d6bf56228691b6c6436ca2f60e62542854e80f9c4fda7a60362a216e1ed"; - name = "kblackbox-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kblackbox-19.12.3.tar.xz"; + sha256 = "dffb910a5d429dfc231b7d2185119430856d26af2c027d34c551a6d664ae49c6"; + name = "kblackbox-19.12.3.tar.xz"; }; }; kblocks = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kblocks-19.12.1.tar.xz"; - sha256 = "1077477910d1dfff60f1abad7b1cf937daf1f3e3a5e8b18407b7e2809b2fc3d9"; - name = "kblocks-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kblocks-19.12.3.tar.xz"; + sha256 = "5bc5cb14b91c9b230563388b4d935211975bae34ed36cb0479cbf25bc3b652fb"; + name = "kblocks-19.12.3.tar.xz"; }; }; kblog = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kblog-19.12.1.tar.xz"; - sha256 = "6385ecfc024cf554a55e2840c3faf6b9e6ee81eb3536d5632899d32aecd54b9f"; - name = "kblog-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kblog-19.12.3.tar.xz"; + sha256 = "3fba584c4c217c5b5b3be52752f8f3c371fb877fe3b730a48711028fedc6b3d4"; + name = "kblog-19.12.3.tar.xz"; }; }; kbounce = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kbounce-19.12.1.tar.xz"; - sha256 = "e9e1df6f2f57e102d95707b82b0aa582f9f1a6c3e395660b5faa33ef953e7fb3"; - name = "kbounce-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kbounce-19.12.3.tar.xz"; + sha256 = "d1b7ac99e54070e1e28a3449e8773691e90625c9f881cf94352ef752700197d0"; + name = "kbounce-19.12.3.tar.xz"; }; }; kbreakout = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kbreakout-19.12.1.tar.xz"; - sha256 = "17475a5aa80f494876fb3b91d32df4c447417e79f4dd60d46f594cfab03f489f"; - name = "kbreakout-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kbreakout-19.12.3.tar.xz"; + sha256 = "ca662c9f2c6765f5f8b07bd4cc2e2aa0a43b69fec6428c3deda2cfad0ab675fa"; + name = "kbreakout-19.12.3.tar.xz"; }; }; kbruch = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kbruch-19.12.1.tar.xz"; - sha256 = "94f9951c0ee3b4aea6d649f971f2d946d462b916a76e4e76ddafa809ce7e5550"; - name = "kbruch-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kbruch-19.12.3.tar.xz"; + sha256 = "522ddae0b2ec640e70c717a9fe0d6a95aef1ed3fe2acbca4b93a99a309abd559"; + name = "kbruch-19.12.3.tar.xz"; }; }; kcachegrind = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcachegrind-19.12.1.tar.xz"; - sha256 = "210e04441519c47d103871e52d98351abc41a04b9385c577a7839eec31a2f400"; - name = "kcachegrind-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcachegrind-19.12.3.tar.xz"; + sha256 = "a30b70bac32f2b33c3c90b8c17754cfbf7d293c9eff0d573747eca2b45353b41"; + name = "kcachegrind-19.12.3.tar.xz"; }; }; kcalc = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcalc-19.12.1.tar.xz"; - sha256 = "51630cd5c6d7ebbf35fb91419acfe9b2d2719ebfcdc2fff8358dbfaa2cecda57"; - name = "kcalc-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcalc-19.12.3.tar.xz"; + sha256 = "bbda4fc074e1ea748e95840aa79c51fdf0a1943ebb63ce6c7b68c197831258bd"; + name = "kcalc-19.12.3.tar.xz"; }; }; kcalutils = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcalutils-19.12.1.tar.xz"; - sha256 = "0298e92d84d9f4b612ea1a27abee1368bc624af2bc5bc4b5eb1053a27575ea04"; - name = "kcalutils-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcalutils-19.12.3.tar.xz"; + sha256 = "00da1f331110a63c3d3c2c96394ead3d282f582d73fa925065560a50807fb7ff"; + name = "kcalutils-19.12.3.tar.xz"; }; }; kcharselect = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcharselect-19.12.1.tar.xz"; - sha256 = "5f23458974d6fa66c49d434937e7a7a31cc94e46616db866b35316025bb84b0c"; - name = "kcharselect-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcharselect-19.12.3.tar.xz"; + sha256 = "9be6ac607148b0815bd985075fbb97d44561fdd6a955b60f0afc728f9cbd978b"; + name = "kcharselect-19.12.3.tar.xz"; }; }; kcolorchooser = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcolorchooser-19.12.1.tar.xz"; - sha256 = "713d1151f45382d8a889187ebb02f8e73ffbf28ac8abea0e03626888711d2c22"; - name = "kcolorchooser-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcolorchooser-19.12.3.tar.xz"; + sha256 = "cb0395c1b4f953fd51129cfe5088702ec261f84cc045f889e22c13e81793744a"; + name = "kcolorchooser-19.12.3.tar.xz"; }; }; kcron = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kcron-19.12.1.tar.xz"; - sha256 = "8c7d5fa24349b9ff7c4927579876ef84895398d8cde6122804d7104a4f4d5963"; - name = "kcron-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kcron-19.12.3.tar.xz"; + sha256 = "22d07834e8431d0fcc756a0e7d92d4e8993008766bf336254f8650c9455c9ab0"; + name = "kcron-19.12.3.tar.xz"; }; }; kdav = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdav-19.12.1.tar.xz"; - sha256 = "5059a295f3ecd9046da6f5ecadab596b3e47c75c5090650a1d6cd1f86a8b7498"; - name = "kdav-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdav-19.12.3.tar.xz"; + sha256 = "7a0ed47378e064536b26dfdfcf7abcdb8dd2ec253a7bbcef7962b701d368872a"; + name = "kdav-19.12.3.tar.xz"; }; }; kdebugsettings = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdebugsettings-19.12.1.tar.xz"; - sha256 = "2730430123e6198131acbabb5d02800981082f7249f0d9b9001b5313b2d45f35"; - name = "kdebugsettings-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdebugsettings-19.12.3.tar.xz"; + sha256 = "ad18d13dd0943a3651ec4729441899b103bd2dc743a4a373ce7bd14fb38dd3e0"; + name = "kdebugsettings-19.12.3.tar.xz"; }; }; kde-dev-scripts = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kde-dev-scripts-19.12.1.tar.xz"; - sha256 = "c2965dee649abea0791774ae264230dbe673af07eb0bd85bf3e8c7c6a739cea5"; - name = "kde-dev-scripts-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kde-dev-scripts-19.12.3.tar.xz"; + sha256 = "94c0ba9de369dd6af14dcea505616025bf06599618a6c7557861aa9fb89ea628"; + name = "kde-dev-scripts-19.12.3.tar.xz"; }; }; kde-dev-utils = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kde-dev-utils-19.12.1.tar.xz"; - sha256 = "94f983c9b49ed3bc59b20849b23e7c26b64b7b303fbd86147c4bc823f87cda7d"; - name = "kde-dev-utils-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kde-dev-utils-19.12.3.tar.xz"; + sha256 = "772ec425865082b8be3650cf0af10ad943f38096036227cab22405b32c4e1fae"; + name = "kde-dev-utils-19.12.3.tar.xz"; }; }; kdeedu-data = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdeedu-data-19.12.1.tar.xz"; - sha256 = "d140f048e1ca8bd777b4a431904b3313a86446a5fd04e1f9c4e1fb4641a09b15"; - name = "kdeedu-data-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdeedu-data-19.12.3.tar.xz"; + sha256 = "76fd5c0efaf339bcfc5ac9f131bac8889cff1df2dd3452ea7dd507b8d9e2645b"; + name = "kdeedu-data-19.12.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdegraphics-mobipocket-19.12.1.tar.xz"; - sha256 = "546d11af89e97831cc09868051142d4180e9621cc537c2941272b42a85e71c6a"; - name = "kdegraphics-mobipocket-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdegraphics-mobipocket-19.12.3.tar.xz"; + sha256 = "c459f9f04cf98cdc88a6763da8880f418e0c33b3cbd1d06b9a7347ebb470d835"; + name = "kdegraphics-mobipocket-19.12.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdegraphics-thumbnailers-19.12.1.tar.xz"; - sha256 = "a91335c11637a351d3ea8798f5519ac5596d655aec92266e46ed2a1bab46a299"; - name = "kdegraphics-thumbnailers-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdegraphics-thumbnailers-19.12.3.tar.xz"; + sha256 = "92a045ac0e9ca57ea27760df3cca0203f29ba435574e9d837d0c1069b8e88f72"; + name = "kdegraphics-thumbnailers-19.12.3.tar.xz"; }; }; kdenetwork-filesharing = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdenetwork-filesharing-19.12.1.tar.xz"; - sha256 = "823e31424998e96084eeb909dfb7ee6a8e8e6d33b5d2a57ada7d583350967684"; - name = "kdenetwork-filesharing-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdenetwork-filesharing-19.12.3.tar.xz"; + sha256 = "8cc75f47ef8038cd7ee75974056cd48022816ab42c76cb6bd2c35a3619445180"; + name = "kdenetwork-filesharing-19.12.3.tar.xz"; }; }; kdenlive = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdenlive-19.12.1.tar.xz"; - sha256 = "fccf34a4660ce8a78ceefe8a4b9dd93d104f6871976d991ceec769366627dc77"; - name = "kdenlive-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdenlive-19.12.3.tar.xz"; + sha256 = "cebcb8f019bc0fc719ef54d00507dc1281758e3c8c69ea2f93f99feda777bc64"; + name = "kdenlive-19.12.3.tar.xz"; }; }; kdepim-addons = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdepim-addons-19.12.1.tar.xz"; - sha256 = "091e3fd007ad54cd1dcd4e2d51c4ac883a2d9e365ca78592aa91a37835c4dcf5"; - name = "kdepim-addons-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdepim-addons-19.12.3.tar.xz"; + sha256 = "f33bc70ac54ab56eea7bd8ca4c0ac98d9612acc4ddc9ce989d06b99f04f62c19"; + name = "kdepim-addons-19.12.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdepim-apps-libs-19.12.1.tar.xz"; - sha256 = "4ff633c98cd128f2409cb78c193dd72f1078ae29eba8db3e304248a019e17e43"; - name = "kdepim-apps-libs-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdepim-apps-libs-19.12.3.tar.xz"; + sha256 = "e133cf76364f6b244338eafd39845a9f392eb9b55c43446541acbcb24a6f4796"; + name = "kdepim-apps-libs-19.12.3.tar.xz"; }; }; kdepim-runtime = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdepim-runtime-19.12.1.tar.xz"; - sha256 = "31b1fe9778723079048d0fe1750028fd3f5f5b467ee10dcfa7fab37202a6ca39"; - name = "kdepim-runtime-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdepim-runtime-19.12.3.tar.xz"; + sha256 = "dabf7da1ad35dfaa3531639a8964b61dbd7094ec0a9b3d62f50fa24a22f5db13"; + name = "kdepim-runtime-19.12.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdesdk-kioslaves-19.12.1.tar.xz"; - sha256 = "e8e8f02e019bad7983cdc5cddbd435ccf676fd804ee7f960653acdda5676abb2"; - name = "kdesdk-kioslaves-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdesdk-kioslaves-19.12.3.tar.xz"; + sha256 = "8b075bff545883aba24fee1763d0cdc64bf9444ae865f0623a33fc1ca295d254"; + name = "kdesdk-kioslaves-19.12.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdesdk-thumbnailers-19.12.1.tar.xz"; - sha256 = "77f64ddb075407f781cf2d658af760840f9427cc171e8ec15805f47105da0e56"; - name = "kdesdk-thumbnailers-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdesdk-thumbnailers-19.12.3.tar.xz"; + sha256 = "b304843045f93e91e0aeeeacf968018dc192ea71ed9977be3d9cfc4e149edcde"; + name = "kdesdk-thumbnailers-19.12.3.tar.xz"; }; }; kdf = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdf-19.12.1.tar.xz"; - sha256 = "bf5c96e5a78e0465e9b91617ffff0c37f04e896dc059d70962bbdd943c6c1c04"; - name = "kdf-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdf-19.12.3.tar.xz"; + sha256 = "257e07e27376f45eaa1bfb1b3055c7f10759ca7ec185aa7572dc60317c8119bd"; + name = "kdf-19.12.3.tar.xz"; }; }; kdialog = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdialog-19.12.1.tar.xz"; - sha256 = "2a13d1957089e4a0307681786b9b5467b5df777311afd4598dd1cb69b4e070f6"; - name = "kdialog-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdialog-19.12.3.tar.xz"; + sha256 = "e6f9a7a6b7c2f18795070bf9466dd6256568b02683d955ef3253432216594d00"; + name = "kdialog-19.12.3.tar.xz"; }; }; kdiamond = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kdiamond-19.12.1.tar.xz"; - sha256 = "4f7770138d16bb7b91920b7f3c7024a89ef35dc330a2ac929a2fa5d4ee12b982"; - name = "kdiamond-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kdiamond-19.12.3.tar.xz"; + sha256 = "95dfd2fd3daa59a58d128c35b95b609117438efdb5d60110414ab7aff5fe3e7c"; + name = "kdiamond-19.12.3.tar.xz"; }; }; keditbookmarks = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/keditbookmarks-19.12.1.tar.xz"; - sha256 = "11a950d53bc6e0b50d62a3ced2b74eaaa85c595b845ca8f2dcfa65e69d407fb0"; - name = "keditbookmarks-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/keditbookmarks-19.12.3.tar.xz"; + sha256 = "1c5efb63eb0a714942677eb03f91ae0bbd10731eace5471ea12ae9d3296b6b05"; + name = "keditbookmarks-19.12.3.tar.xz"; }; }; kfind = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kfind-19.12.1.tar.xz"; - sha256 = "e9f5defa7796bbb54208b28af1fa76333a38e743d7febb8dd14739cf00d376eb"; - name = "kfind-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kfind-19.12.3.tar.xz"; + sha256 = "b3738d6e3f26fffbfcc204d946e165ae0727d9f460cb2065ceb221b4872019b1"; + name = "kfind-19.12.3.tar.xz"; }; }; kfloppy = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kfloppy-19.12.1.tar.xz"; - sha256 = "77581323d16f8666fefca3372c91567dfe5233c0f92c79ead11b2253aee64e2c"; - name = "kfloppy-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kfloppy-19.12.3.tar.xz"; + sha256 = "7f384f9197d5066a5db978a9551665ae9a90b1f3afd1937f800ab61e376d3723"; + name = "kfloppy-19.12.3.tar.xz"; }; }; kfourinline = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kfourinline-19.12.1.tar.xz"; - sha256 = "76e31b59f1b31ddb755def377324d5fa5b5a4835f1f537a30632a028bf671a3e"; - name = "kfourinline-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kfourinline-19.12.3.tar.xz"; + sha256 = "1d2f4fdbf427e2ce86a0519ee61a70df0675f039cebd658cd75bd27af4fe69f6"; + name = "kfourinline-19.12.3.tar.xz"; }; }; kgeography = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kgeography-19.12.1.tar.xz"; - sha256 = "47f809fdb6da503c0b00f5d2052f9def3af0964ace45325e683227a1971c3a1b"; - name = "kgeography-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kgeography-19.12.3.tar.xz"; + sha256 = "3947ca1f50910d77f85c630b49128a085fed4230c7919e09281bc1765529a533"; + name = "kgeography-19.12.3.tar.xz"; }; }; kget = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kget-19.12.1.tar.xz"; - sha256 = "33b043857b3d1c55d877d1c3af2bcc46feefe15019b7af40a9951c16e288658c"; - name = "kget-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kget-19.12.3.tar.xz"; + sha256 = "a4b1d8fb94617c80a557c27ae58a14131bda4476340c136262e5bf8f51d918d9"; + name = "kget-19.12.3.tar.xz"; }; }; kgoldrunner = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kgoldrunner-19.12.1.tar.xz"; - sha256 = "1f2044656732ab7a72117139576201ca1701666d525c93b726473d4cd9aed29c"; - name = "kgoldrunner-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kgoldrunner-19.12.3.tar.xz"; + sha256 = "5808d797fb9df178526b3ea462bc902ca36b5926ef7c51233816ba3da6bc0bdd"; + name = "kgoldrunner-19.12.3.tar.xz"; }; }; kgpg = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kgpg-19.12.1.tar.xz"; - sha256 = "e64dc85f303e45b8a7ef635525f6834c4fd2db36c5131fdb231fa11f7237fdb5"; - name = "kgpg-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kgpg-19.12.3.tar.xz"; + sha256 = "53e5726a1ccf34a70090ac0bbf2effb6f1f9f9b3d0164a5beead982a24c97e38"; + name = "kgpg-19.12.3.tar.xz"; }; }; khangman = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/khangman-19.12.1.tar.xz"; - sha256 = "42fa9d9a9a72fe4b14127b12d5b662d66c00c1899eeefba6102be95136333def"; - name = "khangman-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/khangman-19.12.3.tar.xz"; + sha256 = "55286b318ec2c2d8b7e63f4063fc0e39a8ff81c0a9d3f06c9879f141c94762a8"; + name = "khangman-19.12.3.tar.xz"; }; }; khelpcenter = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/khelpcenter-19.12.1.tar.xz"; - sha256 = "cd38f6b719f4f6228e3a7f94fc63f16020e86382ca402179ae767f2f0b846466"; - name = "khelpcenter-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/khelpcenter-19.12.3.tar.xz"; + sha256 = "526c89e46cace9e8afb4e748f9bbf0d105472a4cc4a6d8bb821e8b9b88ab0f73"; + name = "khelpcenter-19.12.3.tar.xz"; }; }; kidentitymanagement = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kidentitymanagement-19.12.1.tar.xz"; - sha256 = "7df38592610e0ed74c55baf6670331d07b2df0c98484d5f8cf8f135b6d229702"; - name = "kidentitymanagement-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kidentitymanagement-19.12.3.tar.xz"; + sha256 = "254bfc3a60df7bc1960fa1e6d5b7733f6aa5ed7772c1097d9a8cfcdda2704516"; + name = "kidentitymanagement-19.12.3.tar.xz"; }; }; kig = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kig-19.12.1.tar.xz"; - sha256 = "507d89cddc0e128ab398ce0f551af22af0ba1583a4419574296cfefb96d944ee"; - name = "kig-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kig-19.12.3.tar.xz"; + sha256 = "1ae2c3024cdd14e476ff15b730f4ebe9b279477b67cc4cc89606755c7d3beef3"; + name = "kig-19.12.3.tar.xz"; }; }; kigo = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kigo-19.12.1.tar.xz"; - sha256 = "235df9bca39b02dac6648b408d71f7b0978604f8389ea7ef5aa8e0be87fbcf9d"; - name = "kigo-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kigo-19.12.3.tar.xz"; + sha256 = "ee18b8563c49e3e01924ea76cd8c6ec376482c2100e0fac7cdfd14b5899592d5"; + name = "kigo-19.12.3.tar.xz"; }; }; killbots = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/killbots-19.12.1.tar.xz"; - sha256 = "3d524028e7df412e4306daf4e7b1aca803d26b65985fa429c98db10cffff010f"; - name = "killbots-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/killbots-19.12.3.tar.xz"; + sha256 = "3c5dc7e1f27036d2584f6ee58bf3bbffd9e56a467f30a8e2eab9e1bda1e7d4a3"; + name = "killbots-19.12.3.tar.xz"; }; }; kimagemapeditor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kimagemapeditor-19.12.1.tar.xz"; - sha256 = "9869f3a060dc44f2fad0646fa9c0f1c2924d68c3cc3de5147170456f27a39e77"; - name = "kimagemapeditor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kimagemapeditor-19.12.3.tar.xz"; + sha256 = "1aee6521974bde5151744d92823f6b405ee4a8bd2dfe3c538324a209e18c6b35"; + name = "kimagemapeditor-19.12.3.tar.xz"; }; }; kimap = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kimap-19.12.1.tar.xz"; - sha256 = "898e1f3b233b3631ffc74859d54bf402d36f0c5bae7f792e97d3fa5116d8bd0e"; - name = "kimap-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kimap-19.12.3.tar.xz"; + sha256 = "5c3b3cdf928754f9919030d865a2cdad0ad342c82c436afef660d018f85de4d2"; + name = "kimap-19.12.3.tar.xz"; }; }; kio-extras = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kio-extras-19.12.1.tar.xz"; - sha256 = "79b3735510c3c8da9b3e019ee5a54b115f85bb8d89f1c04dbbf16dde3007e7b6"; - name = "kio-extras-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kio-extras-19.12.3.tar.xz"; + sha256 = "413cb21479fedf1421a6e2585b4df813c3a3fadaa77c248a9f810021f58cea4b"; + name = "kio-extras-19.12.3.tar.xz"; }; }; kipi-plugins = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kipi-plugins-19.12.1.tar.xz"; - sha256 = "bcd27ab29b491f13116a156e403126d04ffbaa352b581eca7fb0904e13c5dabe"; - name = "kipi-plugins-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kipi-plugins-19.12.3.tar.xz"; + sha256 = "16997bd6fbb59c194c2997732c870e33bbacd3d7346546af9a255db3330ec5ac"; + name = "kipi-plugins-19.12.3.tar.xz"; }; }; kirigami-gallery = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kirigami-gallery-19.12.1.tar.xz"; - sha256 = "de7f9d739feeac481223c7992179cb3cfaa2aabca1097b0d3597c5c9d737cb19"; - name = "kirigami-gallery-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kirigami-gallery-19.12.3.tar.xz"; + sha256 = "17febaeb77e0dfc6f591dd285fd7f538466572f2f2e3253461c41f92d6cb05fe"; + name = "kirigami-gallery-19.12.3.tar.xz"; }; }; kiriki = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kiriki-19.12.1.tar.xz"; - sha256 = "f3079b53ed45ec46def7a95b336d441dba18151cc77c88ef8ce2d02fcf1d6375"; - name = "kiriki-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kiriki-19.12.3.tar.xz"; + sha256 = "abbaa49f9b47286f9afbe7c968eb6fbfeecb4be84ed4b2ce7514a3ed1e92b2d5"; + name = "kiriki-19.12.3.tar.xz"; }; }; kiten = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kiten-19.12.1.tar.xz"; - sha256 = "abee050c05b54fae25562237b91a14156dabcb26ea142c714b5ec9e1907f54f3"; - name = "kiten-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kiten-19.12.3.tar.xz"; + sha256 = "663739a8b252cb95a38294c6f7d675c833daaa81f2654f5cabd8e512fd353560"; + name = "kiten-19.12.3.tar.xz"; }; }; kitinerary = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kitinerary-19.12.1.tar.xz"; - sha256 = "6497469e9966c9c21c2810a1f21c2633b89e54dafb74d5689aa24382e3824926"; - name = "kitinerary-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kitinerary-19.12.3.tar.xz"; + sha256 = "4188efe8672091cbdaa4f757f5d8b94a30b1373dceafc076b01330602d5086e2"; + name = "kitinerary-19.12.3.tar.xz"; }; }; kjumpingcube = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kjumpingcube-19.12.1.tar.xz"; - sha256 = "3e4abd57d14dccc9b39669eebdab578fc865464b8a4309c3ab8103002edc2ff0"; - name = "kjumpingcube-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kjumpingcube-19.12.3.tar.xz"; + sha256 = "b969111cb884efc9ad8ef585066ca33d7168bb045c93a3f18668173a11d29ea2"; + name = "kjumpingcube-19.12.3.tar.xz"; }; }; kldap = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kldap-19.12.1.tar.xz"; - sha256 = "5595f840c2b97e96f265ffd91fb007f4beb198aaf67a0dbfd941108acbcb9aa3"; - name = "kldap-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kldap-19.12.3.tar.xz"; + sha256 = "49f1ad32ae10b7f997c77f3a8db0776b972b93f9e18873b77baabf0db05cd5d4"; + name = "kldap-19.12.3.tar.xz"; }; }; kleopatra = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kleopatra-19.12.1.tar.xz"; - sha256 = "94ee94031696dd5d79d7a0ca00a2e51b4569466689e8a76c129deae645af08f4"; - name = "kleopatra-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kleopatra-19.12.3.tar.xz"; + sha256 = "04edf29e42088b2bccdfe36b9b7170c38acd7816657673da5393244b73773098"; + name = "kleopatra-19.12.3.tar.xz"; }; }; klettres = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/klettres-19.12.1.tar.xz"; - sha256 = "4f103d85918d40e0a3ffc451bf3862c45b37b8bd2453e6ee7d21d4c738967c36"; - name = "klettres-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/klettres-19.12.3.tar.xz"; + sha256 = "f2a1bbb002954a80045780de24f494154214b8add53a5c01a8783cbeb26d26c7"; + name = "klettres-19.12.3.tar.xz"; }; }; klickety = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/klickety-19.12.1.tar.xz"; - sha256 = "66cba17839023b6fe563a461da8f52a3c8a2bd4949195da2d63d780547f2e159"; - name = "klickety-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/klickety-19.12.3.tar.xz"; + sha256 = "351e421ecca5fc80955ed614453c81d8b790200185db16f56be1e0ca9325ad39"; + name = "klickety-19.12.3.tar.xz"; }; }; klines = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/klines-19.12.1.tar.xz"; - sha256 = "111c4e607c4ba434a8ff593e45ba669c78e6c1fbf9e4d77d0fc5d611e733604e"; - name = "klines-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/klines-19.12.3.tar.xz"; + sha256 = "8d11894d0a02de20090e52ef697a5a3c00e902213c018a82c94ca0985e92350a"; + name = "klines-19.12.3.tar.xz"; }; }; kmag = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmag-19.12.1.tar.xz"; - sha256 = "59e5a59407894976574acf78e7248fd0609ce6ee222c60388a99e5576ac2061f"; - name = "kmag-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmag-19.12.3.tar.xz"; + sha256 = "d1e8bbc8006cd2cfcb345e30aac73350562bff98b69b0333ad49726cdce81e7e"; + name = "kmag-19.12.3.tar.xz"; }; }; kmahjongg = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmahjongg-19.12.1.tar.xz"; - sha256 = "e157f2e603c03128fb99ac4d0b4bc3ab2002a60960c780a3907e35bb8aee9bd3"; - name = "kmahjongg-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmahjongg-19.12.3.tar.xz"; + sha256 = "41a07f74cc4e3bf05f6a57a380d4e093b0303528cb703369981b262a0b1787c8"; + name = "kmahjongg-19.12.3.tar.xz"; }; }; kmail = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmail-19.12.1.tar.xz"; - sha256 = "a8fa4a604f8f88b91beebf0f3f9bb0ac7c040671bd75ab4478d8087a21cde40c"; - name = "kmail-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmail-19.12.3.tar.xz"; + sha256 = "7f70e5270960e474b15631a36110e13fdf7238d6fd9f1b3fdb6d8c145b6529ba"; + name = "kmail-19.12.3.tar.xz"; }; }; kmail-account-wizard = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmail-account-wizard-19.12.1.tar.xz"; - sha256 = "e7cbda3946b19d01f5c3a722d2c104b7be072ab411f80437a25b8200d73e7cfa"; - name = "kmail-account-wizard-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmail-account-wizard-19.12.3.tar.xz"; + sha256 = "4199e8c73456bf31b829596919ca481c3a95e59dee7c9bfb2e680311d0354ff0"; + name = "kmail-account-wizard-19.12.3.tar.xz"; }; }; kmailtransport = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmailtransport-19.12.1.tar.xz"; - sha256 = "1a46563c441a7d09e6cc2bf98a628b724944193e0df88607d5d867f4fa65c1a4"; - name = "kmailtransport-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmailtransport-19.12.3.tar.xz"; + sha256 = "077b3dba7c02dde9693c003ab7039f3b2a530e3b1aecfcf187313db5226e8953"; + name = "kmailtransport-19.12.3.tar.xz"; }; }; kmbox = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmbox-19.12.1.tar.xz"; - sha256 = "7442fd3a421a917a3f27e47259a7da7e08ff6191290a0e9e67c67005c82c606a"; - name = "kmbox-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmbox-19.12.3.tar.xz"; + sha256 = "de69683abb42c5c24ccb4f034e067f50c94d5a10c53f359b0e6ad4b75a70b376"; + name = "kmbox-19.12.3.tar.xz"; }; }; kmime = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmime-19.12.1.tar.xz"; - sha256 = "4d6db5d59b239b884bf8811f3ea616520ab1f69224a809cef3f79023b2563085"; - name = "kmime-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmime-19.12.3.tar.xz"; + sha256 = "5ed20ad77000c60ba5723aaa22149fca3a3956f930d63e70984f0a17b9339300"; + name = "kmime-19.12.3.tar.xz"; }; }; kmines = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmines-19.12.1.tar.xz"; - sha256 = "8f921aa4bda7397c0fa6265ba07a6ce68190174864d0ee16ee575be806b49539"; - name = "kmines-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmines-19.12.3.tar.xz"; + sha256 = "05d8004f2e560bf2c9e32a3ca1988b3848b99bfb9cc96307c1ac2b703c202dad"; + name = "kmines-19.12.3.tar.xz"; }; }; kmix = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmix-19.12.1.tar.xz"; - sha256 = "97fff89e4a102351d01265a9659c5664b030b9b4f27fa021b997fe7ab8801ad6"; - name = "kmix-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmix-19.12.3.tar.xz"; + sha256 = "a4c637383e988ffa21b9c48c72ef6d8855fe207c852d0679011337a331ccfc5c"; + name = "kmix-19.12.3.tar.xz"; }; }; kmousetool = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmousetool-19.12.1.tar.xz"; - sha256 = "d056fd05ffb900f65670e3a77dc8a0c08fbc02d86f4fba1b34dd8f6b5f60c3e5"; - name = "kmousetool-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmousetool-19.12.3.tar.xz"; + sha256 = "3741aff20c778bb704c76df7ff005da36ef6c41b07fca35f257ba440741b8413"; + name = "kmousetool-19.12.3.tar.xz"; }; }; kmouth = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmouth-19.12.1.tar.xz"; - sha256 = "da46e472a05920225c3ae0caba21279dc817b7c8e77ae981b1ad6cf2083a49ad"; - name = "kmouth-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmouth-19.12.3.tar.xz"; + sha256 = "424dd4cf81cd43e47630ada0f2a9e47be8106b31ebf2e5c8c1077e55e3a8113f"; + name = "kmouth-19.12.3.tar.xz"; }; }; kmplot = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kmplot-19.12.1.tar.xz"; - sha256 = "b82d9f9d4f3d3447e9125b42918819fe8effd5658d9a385da79e81e12f7466cf"; - name = "kmplot-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kmplot-19.12.3.tar.xz"; + sha256 = "2743e3a472ccf40281f5afd9c6110dde6fb9bc437e8e291beba484d405d8152e"; + name = "kmplot-19.12.3.tar.xz"; }; }; knavalbattle = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/knavalbattle-19.12.1.tar.xz"; - sha256 = "1cc2c7fec2e2edc634cb1f83cf7e433522b0bc7d76c04cbcde66bb486a832856"; - name = "knavalbattle-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/knavalbattle-19.12.3.tar.xz"; + sha256 = "59875e10b0f2b06c2d3165f2f2457113f04550215947c8296ce1dcaf385ee37f"; + name = "knavalbattle-19.12.3.tar.xz"; }; }; knetwalk = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/knetwalk-19.12.1.tar.xz"; - sha256 = "95725a45c56956a2b8e8e2db36b6baedfc0271af0d6e3541d6143342e6f41ca5"; - name = "knetwalk-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/knetwalk-19.12.3.tar.xz"; + sha256 = "24cb7cfa4143b2ab1bcaf38a6698cd01252201238c6561bc711e0673366642ae"; + name = "knetwalk-19.12.3.tar.xz"; }; }; knights = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/knights-19.12.1.tar.xz"; - sha256 = "60ce0d76eb13c95ba81b0f2dfe5bd3e80ed2226319e4ef97150c3240f428d355"; - name = "knights-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/knights-19.12.3.tar.xz"; + sha256 = "4796654dcaff355b4f1097260748cfe04812ff926acc7ca0f037711875dd1512"; + name = "knights-19.12.3.tar.xz"; }; }; knotes = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/knotes-19.12.1.tar.xz"; - sha256 = "e89f22ee1a918553be5241e167bd038797391502cb98c5f260c96b25017dd235"; - name = "knotes-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/knotes-19.12.3.tar.xz"; + sha256 = "b27846609dfac1ffcb3ac5e7165b7557231b096f6a84206da956c37233aed7b0"; + name = "knotes-19.12.3.tar.xz"; }; }; kolf = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kolf-19.12.1.tar.xz"; - sha256 = "78c5e74d61f8c19b31d4d08781d12a87bc6101d0105081e0c15f4506e36ef6f5"; - name = "kolf-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kolf-19.12.3.tar.xz"; + sha256 = "2ba1f781d7d98ca0b10231e4f963b27d043c726f44da662b6c77105da4f9cffc"; + name = "kolf-19.12.3.tar.xz"; }; }; kollision = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kollision-19.12.1.tar.xz"; - sha256 = "a48515f63c0dbcc890aa9c01e344ea5bcb123e587459879796acc39a16243c09"; - name = "kollision-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kollision-19.12.3.tar.xz"; + sha256 = "ce0bb077e8db8a959f965d463bb25bac02c91585b422af6c9249ad8a8f25eaab"; + name = "kollision-19.12.3.tar.xz"; }; }; kolourpaint = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kolourpaint-19.12.1.tar.xz"; - sha256 = "a2db2312ddf79024358309da8b70cb2b9979d208372ce5f0960f662b8aab2518"; - name = "kolourpaint-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kolourpaint-19.12.3.tar.xz"; + sha256 = "7c134da2feb75a87bfda6b4265ef705868a9be03d70a828111a2869ca0b517b1"; + name = "kolourpaint-19.12.3.tar.xz"; }; }; kompare = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kompare-19.12.1.tar.xz"; - sha256 = "c2eede65a85d59067caf6161606c3de4f18ec6b5e824cb1da9e6b3a8f1b7a92d"; - name = "kompare-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kompare-19.12.3.tar.xz"; + sha256 = "b89b266b6f648500627d2e70df29b73248c7b7d7d5e7c1bbcaddaedf072f6f1a"; + name = "kompare-19.12.3.tar.xz"; }; }; konqueror = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/konqueror-19.12.1.tar.xz"; - sha256 = "20da57d7dd141e2c45345457ca90be26af28c2078224eb461dff9f9589889a09"; - name = "konqueror-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/konqueror-19.12.3.tar.xz"; + sha256 = "0f2b31a1dae1740839232bd646bf22d7cb57e34995584b9a96271ebcb0da7f0e"; + name = "konqueror-19.12.3.tar.xz"; }; }; konquest = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/konquest-19.12.1.tar.xz"; - sha256 = "178e42f76115f8e8b47494ea7732fb76a692debe714590c06d84f7071930b65a"; - name = "konquest-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/konquest-19.12.3.tar.xz"; + sha256 = "e23732a7d78382c73fca0d31afb3ed85614ee4b4bfe2f07647a13582fa0811a5"; + name = "konquest-19.12.3.tar.xz"; }; }; konsole = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/konsole-19.12.1.tar.xz"; - sha256 = "39797ed81c5ace12fd90f4a6e65c25d33db8e4385ab2baad2bd6a3b2db0ef075"; - name = "konsole-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/konsole-19.12.3.tar.xz"; + sha256 = "0bde8eb6365c53e96489d0ceb05baa0bb0385ee865492622033164a4c4bfccdc"; + name = "konsole-19.12.3.tar.xz"; }; }; kontact = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kontact-19.12.1.tar.xz"; - sha256 = "e9f7911154953d58be962bd392baf7d9c310e9e665adb0c875ed5a50dcfe5e01"; - name = "kontact-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kontact-19.12.3.tar.xz"; + sha256 = "8dbd01f73c181f7b44df5dfffac1cf33c36b36149294fd854403bada9ef33052"; + name = "kontact-19.12.3.tar.xz"; }; }; kontactinterface = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kontactinterface-19.12.1.tar.xz"; - sha256 = "a88b782b495d662920fd5f51c287c472c107c577af92431b4470787a78866b2c"; - name = "kontactinterface-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kontactinterface-19.12.3.tar.xz"; + sha256 = "1a0392cbeb6833f4834c86f202ff06e5b6069d12100bffe37de6427f0531af89"; + name = "kontactinterface-19.12.3.tar.xz"; }; }; kopete = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kopete-19.12.1.tar.xz"; - sha256 = "eca3610cc9607c27620c7c23f9bb54bdd80d2fb295adaf6636506597fc0b848d"; - name = "kopete-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kopete-19.12.3.tar.xz"; + sha256 = "8d58fb0c9dd8b651bfc996e6928f7ccdad8e21cba39ffd0e54d46f7145fa7b27"; + name = "kopete-19.12.3.tar.xz"; }; }; korganizer = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/korganizer-19.12.1.tar.xz"; - sha256 = "8bd84dfdca4f4738152c19d336b8c516f0c79fd888f0361005bc5d6359eeb117"; - name = "korganizer-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/korganizer-19.12.3.tar.xz"; + sha256 = "ea0a970aa510d5cdbbf80e974049fa3e7591e02c9ec2c4206137c49266df1acb"; + name = "korganizer-19.12.3.tar.xz"; }; }; kpat = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kpat-19.12.1.tar.xz"; - sha256 = "cb72a256a2a6a34bd8ee05e09b28f0eedee6643f24f793c5f67a9465040c30c3"; - name = "kpat-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kpat-19.12.3.tar.xz"; + sha256 = "00b823b1b204b68e0c8671e5ddfe5f96abe8c9fcfb1efa9b7f70191cfa5384e1"; + name = "kpat-19.12.3.tar.xz"; }; }; kpimtextedit = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kpimtextedit-19.12.1.tar.xz"; - sha256 = "253ded44f3ccb7de1a0a8879e45cc361c14dda2924619aeb04f4286c917f5475"; - name = "kpimtextedit-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kpimtextedit-19.12.3.tar.xz"; + sha256 = "64be03d7a8d4b9ece40c0065a23113023c2b3320dc57068fe00f6c4bc72537d5"; + name = "kpimtextedit-19.12.3.tar.xz"; }; }; kpkpass = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kpkpass-19.12.1.tar.xz"; - sha256 = "b5a079dc1c102c52e29c1d0da3e5a1e51bf9e0a666bb82d6b783f1b55eaa7ada"; - name = "kpkpass-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kpkpass-19.12.3.tar.xz"; + sha256 = "45723989170e86c6739c8a377c54b3ba7456a8dc3ed6cf52eef884074c2df189"; + name = "kpkpass-19.12.3.tar.xz"; }; }; kqtquickcharts = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kqtquickcharts-19.12.1.tar.xz"; - sha256 = "641f5c993e627dd6d0778066016d20196b7502e34ab793fcf17dd6b226d08ae8"; - name = "kqtquickcharts-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kqtquickcharts-19.12.3.tar.xz"; + sha256 = "94669a7add0cef9a1c0969a92ece8e60a67fbb0ff32826cc49ce87bd890c976c"; + name = "kqtquickcharts-19.12.3.tar.xz"; }; }; krdc = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/krdc-19.12.1.tar.xz"; - sha256 = "b3d9b9c43bfe5801d807be08172ca4c773ff6fc2d846cf5b2456c3360ca21824"; - name = "krdc-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/krdc-19.12.3.tar.xz"; + sha256 = "12602912abbc22e061067b6b5048d37a7cbdaaf99d203829d3f52fdf7319acce"; + name = "krdc-19.12.3.tar.xz"; }; }; kreversi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kreversi-19.12.1.tar.xz"; - sha256 = "b81e6544ba23b0869329d734618b3bc4408b585d550985338e6d90bf2d3a17f3"; - name = "kreversi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kreversi-19.12.3.tar.xz"; + sha256 = "6bfe3a2faa7c0d08fb689b75341bfd5881d66bc865445573b2f4dbb316a751e8"; + name = "kreversi-19.12.3.tar.xz"; }; }; krfb = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/krfb-19.12.1.tar.xz"; - sha256 = "7f25790480ac3a8db8a8bd847d80937a0ab763f6c5c12fa2ce704c4b24810287"; - name = "krfb-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/krfb-19.12.3.tar.xz"; + sha256 = "cb88997dc7b15b992d1de5c5cabaeccb37122e20823501ac29140875259782ee"; + name = "krfb-19.12.3.tar.xz"; }; }; kross-interpreters = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kross-interpreters-19.12.1.tar.xz"; - sha256 = "c5ec40971befd1d214d80c8c2ced3e30aaadfd2d4000ea782751f769783f8130"; - name = "kross-interpreters-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kross-interpreters-19.12.3.tar.xz"; + sha256 = "2b4060494901a68ca1d07e0c345cc0814e11fb84e9f48014a7231021e4377487"; + name = "kross-interpreters-19.12.3.tar.xz"; }; }; kruler = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kruler-19.12.1.tar.xz"; - sha256 = "0ecbc70561c0d973866c4bd27333a5ddc904b748fb3a64f66b6b06040b30d34a"; - name = "kruler-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kruler-19.12.3.tar.xz"; + sha256 = "803a0d31bbb5bfbfa057b13a7f6bbf7630dcc1816a0d41ea13cc4592bdacaa47"; + name = "kruler-19.12.3.tar.xz"; }; }; kshisen = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kshisen-19.12.1.tar.xz"; - sha256 = "a361dfc41595640287dd5b800921859ff17a45f7360e5e2fc6f520cc0e421afa"; - name = "kshisen-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kshisen-19.12.3.tar.xz"; + sha256 = "f6ce353725d71ce65269b1b7b3d118cb8555cd065db0d3b17fe4696d87c10601"; + name = "kshisen-19.12.3.tar.xz"; }; }; ksirk = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksirk-19.12.1.tar.xz"; - sha256 = "4f71e4ef3b4d2041edd48537f4b475cb505fc54e45b39b81a08c82d4eec7cc8e"; - name = "ksirk-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksirk-19.12.3.tar.xz"; + sha256 = "6387d7a6320e644157f10b94474ca715e7ad7fd15cdf7156a8e7d94bff019dcb"; + name = "ksirk-19.12.3.tar.xz"; }; }; ksmtp = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksmtp-19.12.1.tar.xz"; - sha256 = "6c7d6ce91d65d7430cb31fb4a1fd44a600a5a459b3956807ee3180b5822dbac0"; - name = "ksmtp-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksmtp-19.12.3.tar.xz"; + sha256 = "1fd69f494afee91c11667ddbba43bc6cc316b51acf5894fe4c3a2631f53fae27"; + name = "ksmtp-19.12.3.tar.xz"; }; }; ksnakeduel = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksnakeduel-19.12.1.tar.xz"; - sha256 = "73e9c55cce88a6e5d00683c73382ee82db64bfe788c14c3a4eda8decf382188f"; - name = "ksnakeduel-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksnakeduel-19.12.3.tar.xz"; + sha256 = "8db1dece78571f3e6933f8edcd693c3ceb1035acff780547a72c98b9f7decb87"; + name = "ksnakeduel-19.12.3.tar.xz"; }; }; kspaceduel = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kspaceduel-19.12.1.tar.xz"; - sha256 = "0bc1f1c12bcfc9e5c778918fb9fa644f5c7ec5c3e687c015d45a7c5c31a27834"; - name = "kspaceduel-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kspaceduel-19.12.3.tar.xz"; + sha256 = "a9b5dc498b3695b59ae8925cc572cfc521ccadc8532756fa95ac876a7423c444"; + name = "kspaceduel-19.12.3.tar.xz"; }; }; ksquares = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksquares-19.12.1.tar.xz"; - sha256 = "955225b9fadbda464bdaf1b59c95c3d12310f84484a296968737e9fb87b37b46"; - name = "ksquares-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksquares-19.12.3.tar.xz"; + sha256 = "45a922e4d85835cc655de560b6fd9be87d8cabc74eadbdecda3f17ba53ac92af"; + name = "ksquares-19.12.3.tar.xz"; }; }; ksudoku = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksudoku-19.12.1.tar.xz"; - sha256 = "4dd72a5b0bb0c951508bbe2c60ce280efcd0414899e025a2ca4d92336576ec2a"; - name = "ksudoku-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksudoku-19.12.3.tar.xz"; + sha256 = "1cf36e762f31464b0640a88c739dfbb39b10129cace7fb5b74093ec607dea06c"; + name = "ksudoku-19.12.3.tar.xz"; }; }; ksystemlog = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ksystemlog-19.12.1.tar.xz"; - sha256 = "497496ca7451cd34f193ba11fe3100479515a89a34f0437ca2f508a48e68e895"; - name = "ksystemlog-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ksystemlog-19.12.3.tar.xz"; + sha256 = "8225b1308ace76ebbf9bb805a2b6fae9bf8a425d0b09518645234c1b2df522dc"; + name = "ksystemlog-19.12.3.tar.xz"; }; }; kteatime = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kteatime-19.12.1.tar.xz"; - sha256 = "49a0531b64e93ceb29548a7f75da755e75afda001fce2e6ba906372456b5dc17"; - name = "kteatime-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kteatime-19.12.3.tar.xz"; + sha256 = "0ab5fb6e33583e6d627b8f9dfaba5ce59e2b363e8045dfc66a4f65236d56542f"; + name = "kteatime-19.12.3.tar.xz"; }; }; ktimer = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktimer-19.12.1.tar.xz"; - sha256 = "0c5fac1baddfa3144b8930f3d42b78a3eb8681d642a3c3339c903ad2cb30a2ba"; - name = "ktimer-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktimer-19.12.3.tar.xz"; + sha256 = "921af876a176a4731a74b5e9e76d751853043ec4f4857301b39a5c680246557c"; + name = "ktimer-19.12.3.tar.xz"; }; }; ktnef = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktnef-19.12.1.tar.xz"; - sha256 = "2fce576e517e6ae9001ade6f07a51fcfa899a6569bc4b8c3948827adfc0af20c"; - name = "ktnef-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktnef-19.12.3.tar.xz"; + sha256 = "3537515b432e5da00d401046e94e0098fa54c071246cb0e357e3d8f47296ed3c"; + name = "ktnef-19.12.3.tar.xz"; }; }; ktouch = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktouch-19.12.1.tar.xz"; - sha256 = "64b8a025f82b951c69c3be7aa7d3c23f14ccef9ed5e900776eb01462cff9a99f"; - name = "ktouch-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktouch-19.12.3.tar.xz"; + sha256 = "522fb081da5877717d577493fdaeeecbfe3d8d773e5d7fc83ecced008744ef0e"; + name = "ktouch-19.12.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-accounts-kcm-19.12.1.tar.xz"; - sha256 = "1ae81e4b7bae97d9d18c1fdc9e7083cc810b39d58dff5755dc9d78bd62551577"; - name = "ktp-accounts-kcm-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-accounts-kcm-19.12.3.tar.xz"; + sha256 = "ae5ae5004ecbf34596711a56e069d480c952de5ea784f5e90c391750439aff51"; + name = "ktp-accounts-kcm-19.12.3.tar.xz"; }; }; ktp-approver = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-approver-19.12.1.tar.xz"; - sha256 = "502a63f13db44fc8a28f64e37c43839b8da22086bf858dc9c492476d9ba14b50"; - name = "ktp-approver-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-approver-19.12.3.tar.xz"; + sha256 = "af4f6d247b6332745f6b6dfacef74eb2ea0f7bbea9398080fc7b57e5953fdfbd"; + name = "ktp-approver-19.12.3.tar.xz"; }; }; ktp-auth-handler = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-auth-handler-19.12.1.tar.xz"; - sha256 = "109583d4800d293fe11eeaa553d72643f2a3709c0d078a6e842f2e4b228d93e0"; - name = "ktp-auth-handler-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-auth-handler-19.12.3.tar.xz"; + sha256 = "40822e78879d97c3cc1d16f44f7d3b581980c4e249a273d7471b291adf3b9225"; + name = "ktp-auth-handler-19.12.3.tar.xz"; }; }; ktp-call-ui = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-call-ui-19.12.1.tar.xz"; - sha256 = "adb3025f8f878fd4a56ce125bd51c155f26b02661b9365b6321fb456153b0c55"; - name = "ktp-call-ui-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-call-ui-19.12.3.tar.xz"; + sha256 = "96b1dd64b0f87228d76f12b6cad3677afeb4c44d6f18645c3001555506573fb1"; + name = "ktp-call-ui-19.12.3.tar.xz"; }; }; ktp-common-internals = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-common-internals-19.12.1.tar.xz"; - sha256 = "4a1f189c1393164fba710e63b0e8f1aae6f22a5faacea0d86544e3e4a471603a"; - name = "ktp-common-internals-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-common-internals-19.12.3.tar.xz"; + sha256 = "48cde7fc4f2f0d39999f70699867044e0f85e06769a0824aac49c572fb1af5a4"; + name = "ktp-common-internals-19.12.3.tar.xz"; }; }; ktp-contact-list = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-contact-list-19.12.1.tar.xz"; - sha256 = "c293fa90899d496c4e29b9c9986a3864e06ef22dabbd4583123abbc232f4fe25"; - name = "ktp-contact-list-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-contact-list-19.12.3.tar.xz"; + sha256 = "093544e84ca12169966837be5f01d339ddc59e5f031d78e68ddf7be4dd890efd"; + name = "ktp-contact-list-19.12.3.tar.xz"; }; }; ktp-contact-runner = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-contact-runner-19.12.1.tar.xz"; - sha256 = "a86d8a67f3d8f3d741c6c4548a58cbdff384e8bd5ed5cd1d82db65456240ac0f"; - name = "ktp-contact-runner-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-contact-runner-19.12.3.tar.xz"; + sha256 = "50646e8670449d6f6a9b107e36f18174b5ec37052a7b4f471617f4f53fecc96b"; + name = "ktp-contact-runner-19.12.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-desktop-applets-19.12.1.tar.xz"; - sha256 = "63f1a0df6a392f41a54fda8c4896754c2687ba34968cf5bbc0ac84a37c1a1741"; - name = "ktp-desktop-applets-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-desktop-applets-19.12.3.tar.xz"; + sha256 = "4ab8f04537345db8e41ed9f8ff7a6a2f3135e3539382cef97d1a7e9f0eddb54e"; + name = "ktp-desktop-applets-19.12.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-filetransfer-handler-19.12.1.tar.xz"; - sha256 = "208aab8c78f4b7f38e331802a63fa10d00a65c115900c72c7a710b799ea56034"; - name = "ktp-filetransfer-handler-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-filetransfer-handler-19.12.3.tar.xz"; + sha256 = "b2e81fec33b51628d9d88707b6bd844c69eb2c9bfb00cb0b45759a4fd9769b03"; + name = "ktp-filetransfer-handler-19.12.3.tar.xz"; }; }; ktp-kded-module = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-kded-module-19.12.1.tar.xz"; - sha256 = "274f97c6874eeb2af14b937ed20430d2ac2e1a769890a70da8d477ac33ed6082"; - name = "ktp-kded-module-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-kded-module-19.12.3.tar.xz"; + sha256 = "6bb0c05683812738e254c88d39936565966096a7156111565d8a64a59c55ef0d"; + name = "ktp-kded-module-19.12.3.tar.xz"; }; }; ktp-send-file = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-send-file-19.12.1.tar.xz"; - sha256 = "5652e40e02ac191ad6e8df276a5faf8805000760261d495f3f4424416da3b977"; - name = "ktp-send-file-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-send-file-19.12.3.tar.xz"; + sha256 = "566d9dccc0c2fa7c23c95051c25543d3aabe76065ddff7dff9d8a37683d2022b"; + name = "ktp-send-file-19.12.3.tar.xz"; }; }; ktp-text-ui = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktp-text-ui-19.12.1.tar.xz"; - sha256 = "226efc09343bb9218c461858747a1bc084ad8291fbbcc9f49eb888acfe2039c6"; - name = "ktp-text-ui-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktp-text-ui-19.12.3.tar.xz"; + sha256 = "b8ad9a224ae300c0412874d0877fdc8e050869d3a8f60a4051a0919a8749c50f"; + name = "ktp-text-ui-19.12.3.tar.xz"; }; }; ktuberling = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/ktuberling-19.12.1.tar.xz"; - sha256 = "4c0d594ef72bd2dda5d42daf0f8b430319cbea6d28ba5c9725895b1221cdaace"; - name = "ktuberling-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/ktuberling-19.12.3.tar.xz"; + sha256 = "c4d74d18173d5761f7e6f8adf6178713a726c671aaa2eda4e6c77115484e9e55"; + name = "ktuberling-19.12.3.tar.xz"; }; }; kturtle = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kturtle-19.12.1.tar.xz"; - sha256 = "de10ea1ee142aea6fba8dee0d27d2e431aa806c6d7be4f5b5727cba8984e8d51"; - name = "kturtle-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kturtle-19.12.3.tar.xz"; + sha256 = "6958a88c484261919cd89cb1f0d163b0c5d5f1e28b10b3b4e3b6b9e82e379ef1"; + name = "kturtle-19.12.3.tar.xz"; }; }; kubrick = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kubrick-19.12.1.tar.xz"; - sha256 = "485e7e4a30b01cb2661c640214bdc71a3e0a8b61a9071c64ffbbe75e2270af3c"; - name = "kubrick-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kubrick-19.12.3.tar.xz"; + sha256 = "8fc0a0e68d255481c6efb3f4ff894c5e376367b29958c4738bd72d3f4b1ff557"; + name = "kubrick-19.12.3.tar.xz"; }; }; kwalletmanager = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kwalletmanager-19.12.1.tar.xz"; - sha256 = "b2370fbf559a3b8e8551daedada9c97d07041388dc74f8bd1286c64ab18b936b"; - name = "kwalletmanager-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kwalletmanager-19.12.3.tar.xz"; + sha256 = "247c7f80a54babd21a13e6b9386370b72ec12bdf928c08a7e8a647ccca53e393"; + name = "kwalletmanager-19.12.3.tar.xz"; }; }; kwave = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kwave-19.12.1.tar.xz"; - sha256 = "e6c336644c00a457b37820fc87668dd9b8a448d8abf84cda267b6e5cd01e0645"; - name = "kwave-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kwave-19.12.3.tar.xz"; + sha256 = "3c90115d4702dbe46767e2404c952d84533137fa558b787b87ff95ed61f6930d"; + name = "kwave-19.12.3.tar.xz"; }; }; kwordquiz = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/kwordquiz-19.12.1.tar.xz"; - sha256 = "8ee204de56fe2bf33e11d19b9c0c21d7e3dcf26bf550f9dffa79b22a3082659f"; - name = "kwordquiz-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/kwordquiz-19.12.3.tar.xz"; + sha256 = "6965a3b3c171c3f62aeecf4ccdddde14d23062ab914b1860822546a5770b80fc"; + name = "kwordquiz-19.12.3.tar.xz"; }; }; libgravatar = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libgravatar-19.12.1.tar.xz"; - sha256 = "84525db5f24c04cfa2bb44376a3bd64368e9d9478a160cf862c695052f3fc254"; - name = "libgravatar-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libgravatar-19.12.3.tar.xz"; + sha256 = "70ea306f48aede9f8f327eaa74ea5ce5761e5dfe67f2da50d3242c0f312edc86"; + name = "libgravatar-19.12.3.tar.xz"; }; }; libkcddb = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkcddb-19.12.1.tar.xz"; - sha256 = "50c139aaa14a5f27b3818cec7ec6ede4b764d461b6547651b61e4edd295afe6f"; - name = "libkcddb-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkcddb-19.12.3.tar.xz"; + sha256 = "69cbaf03adba24c0cabf957ee4149c4fa86d403eb6b8a07f7f80eb17be49e892"; + name = "libkcddb-19.12.3.tar.xz"; }; }; libkcompactdisc = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkcompactdisc-19.12.1.tar.xz"; - sha256 = "95b14098b24a86094b01b357e36ae135fb6c85c838e8735c843d27b101cc2bd9"; - name = "libkcompactdisc-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkcompactdisc-19.12.3.tar.xz"; + sha256 = "74aac7dcac84c60a7962f23e7bcc6eb693048fd96ca21015441a87487baa9d1c"; + name = "libkcompactdisc-19.12.3.tar.xz"; }; }; libkdcraw = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkdcraw-19.12.1.tar.xz"; - sha256 = "bbdd5b1b9b40780b5f2be567d9ba0ab163fe7dcc7121070b788106e0fe966c1e"; - name = "libkdcraw-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkdcraw-19.12.3.tar.xz"; + sha256 = "9454aed707ee311dbfb921f8d45fba11710ffc01f48d65f64585d12c2580116f"; + name = "libkdcraw-19.12.3.tar.xz"; }; }; libkdegames = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkdegames-19.12.1.tar.xz"; - sha256 = "317513544e08d03b2381bdb4c0bcd24c844dd8af7ccc4896569dd05933061d9c"; - name = "libkdegames-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkdegames-19.12.3.tar.xz"; + sha256 = "39cf5039b7fe11688028df026252c9cd4424546817b5bb635af2558f71ba6b20"; + name = "libkdegames-19.12.3.tar.xz"; }; }; libkdepim = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkdepim-19.12.1.tar.xz"; - sha256 = "1d626a959a0f9fcb24c4e01c553126d40314c789db9bc80d6b52f2bb75e233cd"; - name = "libkdepim-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkdepim-19.12.3.tar.xz"; + sha256 = "911e7d174240d4c056472549dbd1f3da4467a57c765f3cb34fbac32943f38dbb"; + name = "libkdepim-19.12.3.tar.xz"; }; }; libkeduvocdocument = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkeduvocdocument-19.12.1.tar.xz"; - sha256 = "a0e3921dab9d892d5efcddfbca548f230b508fc81ab4d7735c7610a710791816"; - name = "libkeduvocdocument-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkeduvocdocument-19.12.3.tar.xz"; + sha256 = "31594d30e03890507b25d676981164fd64258e69c6b264b85939118377eda964"; + name = "libkeduvocdocument-19.12.3.tar.xz"; }; }; libkexiv2 = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkexiv2-19.12.1.tar.xz"; - sha256 = "53b9a4ecda0f76df1a5b9f7b8184b85e847838cf97e4ad3036a6c5bb719993e5"; - name = "libkexiv2-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkexiv2-19.12.3.tar.xz"; + sha256 = "f5d0947f6b1ca0583d569990dc6f68bb01d8f7756a38bcc40b1e54f7814e4d4d"; + name = "libkexiv2-19.12.3.tar.xz"; }; }; libkgapi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkgapi-19.12.1.tar.xz"; - sha256 = "8bfa16ab76b0042e2a0b827cf251b1155c0e693db39ffcb2805613d3393389cf"; - name = "libkgapi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkgapi-19.12.3.tar.xz"; + sha256 = "f52923c382272b47782348fbadb32902fbcd4652f4100875a745ba57033cf48a"; + name = "libkgapi-19.12.3.tar.xz"; }; }; libkgeomap = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkgeomap-19.12.1.tar.xz"; - sha256 = "68c9c5b91e77a4b4a07ca646d58e8e890975825f8f851d850c95dacb7a1d90d2"; - name = "libkgeomap-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkgeomap-19.12.3.tar.xz"; + sha256 = "eb604deffe78cdcd4a8c7d888416246d0a17f2e3b7d80d6959e1412f03ab2755"; + name = "libkgeomap-19.12.3.tar.xz"; }; }; libkipi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkipi-19.12.1.tar.xz"; - sha256 = "79f0a994b348467353425aea60dc4f4234c9a259cffcb55ac60d8c195bd0122c"; - name = "libkipi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkipi-19.12.3.tar.xz"; + sha256 = "3a57d07cd4fe8e118558d807242bf483fa2aac1bcf3dcdc29139636c2b280786"; + name = "libkipi-19.12.3.tar.xz"; }; }; libkleo = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkleo-19.12.1.tar.xz"; - sha256 = "8e9b78fbeb861370ab81f98150ff9ea8afc960293ae8324fedd0b877302994a7"; - name = "libkleo-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkleo-19.12.3.tar.xz"; + sha256 = "1e715442a0c52ca561316abdce9662082f52ad9f3101ea01435a90984989a057"; + name = "libkleo-19.12.3.tar.xz"; }; }; libkmahjongg = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkmahjongg-19.12.1.tar.xz"; - sha256 = "e6a107a32c01c654a2372fda984724b4acd59dbc2902f3f9c7a7d9e14587639c"; - name = "libkmahjongg-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkmahjongg-19.12.3.tar.xz"; + sha256 = "f8ea23952a576e6081052d10e9c967bebe5db017ad62775183f91236158cc19f"; + name = "libkmahjongg-19.12.3.tar.xz"; }; }; libkomparediff2 = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libkomparediff2-19.12.1.tar.xz"; - sha256 = "319d61742f7603a60d781151cd717291c5cb976ff0f2895df9d167526cfb0b4a"; - name = "libkomparediff2-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libkomparediff2-19.12.3.tar.xz"; + sha256 = "aadc6e420e24bdebe203d4dfc76f5c23c8529be70ac057d89b516ab57b165094"; + name = "libkomparediff2-19.12.3.tar.xz"; }; }; libksane = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libksane-19.12.1.tar.xz"; - sha256 = "5a5998996848e83c80589c8ed0b1a6c1fa48bb61686288d199d831ac810e1603"; - name = "libksane-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libksane-19.12.3.tar.xz"; + sha256 = "0aab855b8414041c37ddfbb9f0732272206af1c0844376f1370b9d2a907af71d"; + name = "libksane-19.12.3.tar.xz"; }; }; libksieve = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/libksieve-19.12.1.tar.xz"; - sha256 = "6c3d49e2ce4d8e6b7c1b4328aa6065a01c7711223dd4f3b9db3a542f9fc0a84c"; - name = "libksieve-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/libksieve-19.12.3.tar.xz"; + sha256 = "990e6a15e7e88120bf6c744fe6f1ac78184d6470318005f24634a70219f45002"; + name = "libksieve-19.12.3.tar.xz"; }; }; lokalize = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/lokalize-19.12.1.tar.xz"; - sha256 = "ee29cff9a513d68cde72e6ace0f893de77be5cb3fe56b4b6e0d1fa5b808b424c"; - name = "lokalize-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/lokalize-19.12.3.tar.xz"; + sha256 = "8015c994e974fd51c1c7f5903a005bbbc25f094656bdd44cd5e8675cd69cea92"; + name = "lokalize-19.12.3.tar.xz"; }; }; lskat = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/lskat-19.12.1.tar.xz"; - sha256 = "0aa36c4cc554b708f7334b32362831537ea52db81b8480b80ffac5c27a041e8f"; - name = "lskat-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/lskat-19.12.3.tar.xz"; + sha256 = "5f13417ba9f6831a5f48c220a5c67a8d73787715b8b4aa433e6e356b7ac58776"; + name = "lskat-19.12.3.tar.xz"; }; }; mailcommon = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/mailcommon-19.12.1.tar.xz"; - sha256 = "160135049bc2e4984f14022af793a9ac05bf488faa6f9eb7bd86a094de1c9bfe"; - name = "mailcommon-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/mailcommon-19.12.3.tar.xz"; + sha256 = "d3999d290505b20aecbb4b14bec5af4d6a7db72d1f26f7a40b4aff231588c7e5"; + name = "mailcommon-19.12.3.tar.xz"; }; }; mailimporter = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/mailimporter-19.12.1.tar.xz"; - sha256 = "c1a042560438d6f6195a1f64355515489b74a44c1d2f5f547ced6785439215f1"; - name = "mailimporter-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/mailimporter-19.12.3.tar.xz"; + sha256 = "b81e8a5794aee24aa611c1a1912f93a308ce56c429ad4a72afe308e6b554c4a7"; + name = "mailimporter-19.12.3.tar.xz"; }; }; marble = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/marble-19.12.1.tar.xz"; - sha256 = "46ec0dcab4773ccfb843ae52881ae833b038a00b7690977a2e721099264dc8dd"; - name = "marble-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/marble-19.12.3.tar.xz"; + sha256 = "73a2c5234f8a1728e2a97499166e7bbf8dfb2f48d10fe8cff96380631d064627"; + name = "marble-19.12.3.tar.xz"; }; }; mbox-importer = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/mbox-importer-19.12.1.tar.xz"; - sha256 = "04dd6220192095d0f7befb368b9d96a321acac7af43b3575faf25ae89d17b5f4"; - name = "mbox-importer-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/mbox-importer-19.12.3.tar.xz"; + sha256 = "62fb1490517e0a49bf823946c8b747062cb970dbe00281d459adda73596f0046"; + name = "mbox-importer-19.12.3.tar.xz"; }; }; messagelib = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/messagelib-19.12.1.tar.xz"; - sha256 = "d2514ac31f78235340353701f735a15f69d99374a55566ec7702a3a5ddd23d05"; - name = "messagelib-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/messagelib-19.12.3.tar.xz"; + sha256 = "5e776d5ea7b0cbb246b03cf2bfc84a65a959e7433a7f80b77a5f67cfa7c23ccb"; + name = "messagelib-19.12.3.tar.xz"; }; }; minuet = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/minuet-19.12.1.tar.xz"; - sha256 = "735b340f9f0d6ee09c2c6aa76061282da6bd921f8b77683c53311731a77edff1"; - name = "minuet-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/minuet-19.12.3.tar.xz"; + sha256 = "740a3704004336f08c0fde148257c1562254b4e706704ec7eb2149fb3d7b6b9b"; + name = "minuet-19.12.3.tar.xz"; }; }; okular = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/okular-19.12.1.tar.xz"; - sha256 = "485044127c6bbe0d4c71f1518da15050957c06b8fe36633462367d15d684d4bd"; - name = "okular-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/okular-19.12.3.tar.xz"; + sha256 = "c5de22cc4292e3b7adae3f6ef6566dcba33a1dd5995fb0b968ea3e705a4c04e0"; + name = "okular-19.12.3.tar.xz"; }; }; palapeli = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/palapeli-19.12.1.tar.xz"; - sha256 = "ea4d9dd576066a610444680f3e8686f242bc8be9222020423acab52ec98a185f"; - name = "palapeli-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/palapeli-19.12.3.tar.xz"; + sha256 = "6989bbc94ed955f6990d40bccbc0c38768898bf2ccb8163c45119517340b723d"; + name = "palapeli-19.12.3.tar.xz"; }; }; parley = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/parley-19.12.1.tar.xz"; - sha256 = "54b91178a9bd1ff9c1817bd0df69a3a4bb9e4f3488f052034dd45e729f1325b6"; - name = "parley-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/parley-19.12.3.tar.xz"; + sha256 = "ebf9fdec981abca988d83d8a77e921e7ce871eb010b6cf4ea9065ee6d45f5089"; + name = "parley-19.12.3.tar.xz"; }; }; picmi = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/picmi-19.12.1.tar.xz"; - sha256 = "5428ef9add8dd9479f319b8c08fbfefca9ee34fbf503bee1c55b04ecf82ae9f9"; - name = "picmi-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/picmi-19.12.3.tar.xz"; + sha256 = "04a69125fc76b1fcd58d873452e4a4e642ee9ee672cdb7656214d8cd854fc178"; + name = "picmi-19.12.3.tar.xz"; }; }; pimcommon = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/pimcommon-19.12.1.tar.xz"; - sha256 = "d3058407ec578a32df82eb83eb7631d2904e75d6d345ed61dac0f3744840ebf5"; - name = "pimcommon-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/pimcommon-19.12.3.tar.xz"; + sha256 = "443e2915eb42a4f56f1ddf47785ceeceb4ca1e0384ff48bc93fc4a7756392766"; + name = "pimcommon-19.12.3.tar.xz"; }; }; pim-data-exporter = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/pim-data-exporter-19.12.1.tar.xz"; - sha256 = "3f650c1c221826079d7c739e4070e295a7a1b1156f75e8e3100b06f878efed12"; - name = "pim-data-exporter-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/pim-data-exporter-19.12.3.tar.xz"; + sha256 = "8e9961fcc4f1ed0305d589e3a417f8924657d89d798a77c53956d73f6bf19938"; + name = "pim-data-exporter-19.12.3.tar.xz"; }; }; pim-sieve-editor = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/pim-sieve-editor-19.12.1.tar.xz"; - sha256 = "3fdca7147c581dce4a014dc2d30bd7e6616c0559654cf9fee68e9292fd6ef037"; - name = "pim-sieve-editor-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/pim-sieve-editor-19.12.3.tar.xz"; + sha256 = "641ea56304df079a80e098fb253c173b63266990856f8795af093c144c3883ae"; + name = "pim-sieve-editor-19.12.3.tar.xz"; }; }; poxml = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/poxml-19.12.1.tar.xz"; - sha256 = "f02aa4d1f7de8fb38921fe73076b3e905185979d9b75ff6345efaca8aad0ebb9"; - name = "poxml-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/poxml-19.12.3.tar.xz"; + sha256 = "190178290ce18fe3a684c22d650843f3008a6e31ebbab8fff25491c58b21e276"; + name = "poxml-19.12.3.tar.xz"; }; }; print-manager = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/print-manager-19.12.1.tar.xz"; - sha256 = "76336be7da80a7494e2e5d5c9ab431047672a98630c7d61f916aa4b9edc35776"; - name = "print-manager-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/print-manager-19.12.3.tar.xz"; + sha256 = "74c13802a65136539b4542fec10fb248149a3324e8060e947a8f305ce665269a"; + name = "print-manager-19.12.3.tar.xz"; }; }; rocs = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/rocs-19.12.1.tar.xz"; - sha256 = "cc9ff080b05bd6c48ee438c968917d8eb6f6eccb45ca70b45c5e53dce396bb45"; - name = "rocs-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/rocs-19.12.3.tar.xz"; + sha256 = "f834e69e676913e364162906b79da5a75a6043f4a5c8506954d1630abda45e3c"; + name = "rocs-19.12.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/signon-kwallet-extension-19.12.1.tar.xz"; - sha256 = "a98397cc15733b9c1010f022a8d6bcf7727c4065ba6ae662273ba97864836bbe"; - name = "signon-kwallet-extension-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/signon-kwallet-extension-19.12.3.tar.xz"; + sha256 = "46199be023bad630b769b14c2c0a63feff2949da944c76780b1ebd9a50ee3daa"; + name = "signon-kwallet-extension-19.12.3.tar.xz"; }; }; spectacle = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/spectacle-19.12.1.tar.xz"; - sha256 = "140f388c531043eeefff8d639eb468d1ed33397925021c6809c0c8a799bb25c9"; - name = "spectacle-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/spectacle-19.12.3.tar.xz"; + sha256 = "443f114dab1fb50e7e12a046fdf06c0456bf99a3abdf09dce05605fdf7d3de81"; + name = "spectacle-19.12.3.tar.xz"; }; }; step = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/step-19.12.1.tar.xz"; - sha256 = "f171c58b567bb29ed50109b341e53dc00116e814c90f51aa7a6e405326982907"; - name = "step-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/step-19.12.3.tar.xz"; + sha256 = "0eb62c87553769e009daa02406b1d95742c946bdffe0d22327776ec558e7584b"; + name = "step-19.12.3.tar.xz"; }; }; svgpart = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/svgpart-19.12.1.tar.xz"; - sha256 = "6083457999121ead13b6c267211a78ea04c925d6f9f7447b31677c0b49f6898b"; - name = "svgpart-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/svgpart-19.12.3.tar.xz"; + sha256 = "942d877a516d8407ef2782d7c6869ab688274fee6cde9b23ab1061bcbddf2cc9"; + name = "svgpart-19.12.3.tar.xz"; }; }; sweeper = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/sweeper-19.12.1.tar.xz"; - sha256 = "50b1464c08b738f4af4c78b4edc291ce93877a52831b810cd12c8ca6a4df0cf9"; - name = "sweeper-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/sweeper-19.12.3.tar.xz"; + sha256 = "cf89cfba61c9eeda9b4e7921c21a23e7d9a110b134ab6fbd127c37d036bd0517"; + name = "sweeper-19.12.3.tar.xz"; }; }; umbrello = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/umbrello-19.12.1.tar.xz"; - sha256 = "077a1b5a3dfe15d37f03ee97ca5b40a1b8e7e0f2305df2f16a966861cc79e0d6"; - name = "umbrello-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/umbrello-19.12.3.tar.xz"; + sha256 = "b2f769c7bd1cc259170b62c68d2dca05b4a143dd1048dbb507cf2bbb3020a193"; + name = "umbrello-19.12.3.tar.xz"; }; }; yakuake = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/yakuake-19.12.1.tar.xz"; - sha256 = "abff4f358f41f544b2e12c340a74d92482241b1b95906b14add7810384602e42"; - name = "yakuake-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/yakuake-19.12.3.tar.xz"; + sha256 = "0e4f16eaf155750b0c35f1f8f1a625909f386f3359b9f23bf4e7c2f9045384e3"; + name = "yakuake-19.12.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "19.12.1"; + version = "19.12.3"; src = fetchurl { - url = "${mirror}/stable/release-service/19.12.1/src/zeroconf-ioslave-19.12.1.tar.xz"; - sha256 = "39641a186de9d0704a58063a8a37cfb3a405ff6bd9957c7d09efec3bec4dfc60"; - name = "zeroconf-ioslave-19.12.1.tar.xz"; + url = "${mirror}/stable/release-service/19.12.3/src/zeroconf-ioslave-19.12.3.tar.xz"; + sha256 = "c9b2146030a9845b8164f5784d1c6fcc198b6cfe0e23f6a91edf78d093e4368f"; + name = "zeroconf-ioslave-19.12.3.tar.xz"; }; }; } diff --git a/pkgs/applications/kde/yakuake.nix b/pkgs/applications/kde/yakuake.nix index 6f9c8df3001..cb7f7070b24 100644 --- a/pkgs/applications/kde/yakuake.nix +++ b/pkgs/applications/kde/yakuake.nix @@ -24,7 +24,7 @@ mkDerivation { ]; meta = { - homepage = https://yakuake.kde.org; + homepage = "https://yakuake.kde.org"; description = "Quad-style terminal emulator for KDE"; maintainers = with lib.maintainers; [ fridh ]; license = lib.licenses.gpl2; diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 1c409c232a8..5f6118ef2fc 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "1Password command-line tool"; - homepage = https://support.1password.com/command-line/; - downloadPage = https://app-updates.agilebits.com/product_history/CLI; + homepage = "https://support.1password.com/command-line/"; + downloadPage = "https://app-updates.agilebits.com/product_history/CLI"; maintainers = with maintainers; [ joelburget marsam ]; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/misc/abook/default.nix b/pkgs/applications/misc/abook/default.nix index f87bd4c11ec..4c03b197b4a 100644 --- a/pkgs/applications/misc/abook/default.nix +++ b/pkgs/applications/misc/abook/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses readline ]; meta = { - homepage = http://abook.sourceforge.net/; + 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 ]; diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index d1e4856e052..b67e514ce54 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "Adobe Reader, a viewer for PDF documents"; - homepage = http://www.adobe.com/products/reader; + homepage = "http://www.adobe.com/products/reader"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix index 465c72d73f5..043f1c86bd1 100644 --- a/pkgs/applications/misc/airtame/default.nix +++ b/pkgs/applications/misc/airtame/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; meta = with stdenv.lib; { - homepage = https://airtame.com/download; + homepage = "https://airtame.com/download"; description = "Wireless streaming client for Airtame devices"; license = licenses.unfree; maintainers = with maintainers; [ thanegill ]; diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 78e7249a087..b6248b8f6f1 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -1,40 +1,38 @@ -{ stdenv, - lib, - fetchFromGitHub, - rustPlatform, - - cmake, - gzip, - installShellFiles, - makeWrapper, - ncurses, - pkgconfig, - python3, - - expat, - fontconfig, - freetype, - libGL, - libX11, - libXcursor, - libXi, - libXrandr, - libXxf86vm, - libxcb, - libxkbcommon, - wayland, - xdg_utils, +{ stdenv +, lib +, fetchFromGitHub +, rustPlatform + +, cmake +, gzip +, installShellFiles +, makeWrapper +, ncurses +, pkgconfig +, python3 + +, expat +, fontconfig +, freetype +, libGL +, libX11 +, libXcursor +, libXi +, libXrandr +, libXxf86vm +, libxcb +, libxkbcommon +, wayland +, xdg_utils # Darwin Frameworks - AppKit, - CoreGraphics, - CoreServices, - CoreText, - Foundation, - OpenGL }: - -with rustPlatform; - +, AppKit +, CoreGraphics +, CoreServices +, CoreText +, Foundation +, OpenGL +}: let rpathLibs = [ expat @@ -51,18 +49,19 @@ let libxkbcommon wayland ]; -in buildRustPackage rec { +in +rustPlatform.buildRustPackage rec { pname = "alacritty"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { - owner = "jwilm"; + owner = "alacritty"; repo = pname; rev = "v${version}"; - sha256 = "05jcg33ifngpzw2hdhgb614j87ihhhlqgar0kky183rywg0dxikg"; + sha256 = "133d8vm7ihlvgw8n1jghhh35h664h0f52h6gci54f11vl6c1spws"; }; - cargoSha256 = "182j8ah67b2gw409vjfml3p41i00zh0klx9m8bwfkm64y2ki2bip"; + cargoSha256 = "07gq63qd11zz229b8jp9wqggz39qfpzd223z1zk1xch7rhqq0pn4"; nativeBuildInputs = [ cmake @@ -75,9 +74,17 @@ in buildRustPackage rec { ]; buildInputs = rpathLibs - ++ lib.optionals stdenv.isDarwin [ AppKit CoreGraphics CoreServices CoreText Foundation OpenGL ]; + ++ lib.optionals stdenv.isDarwin [ + AppKit + CoreGraphics + CoreServices + CoreText + Foundation + OpenGL + ]; outputs = [ "out" "terminfo" ]; + postPatch = '' substituteInPlace alacritty/src/config/mouse.rs \ --replace xdg-open ${xdg_utils}/bin/xdg-open @@ -90,14 +97,16 @@ in buildRustPackage rec { install -D target/release/alacritty $out/bin/alacritty - '' + (if stdenv.isDarwin then '' - mkdir $out/Applications - cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app - '' else '' - install -D extra/linux/alacritty.desktop -t $out/share/applications/ - install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg - patchelf --set-rpath "${stdenv.lib.makeLibraryPath rpathLibs}" $out/bin/alacritty - '') + '' + '' + ( + if stdenv.isDarwin then '' + mkdir $out/Applications + cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app + '' else '' + install -D extra/linux/Alacritty.desktop -t $out/share/applications/ + install -D extra/logo/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty + '' + ) + '' installShellCompletion --zsh extra/completions/_alacritty installShellCompletion --bash extra/completions/alacritty.bash @@ -116,11 +125,11 @@ in buildRustPackage rec { dontPatchELF = true; - meta = with stdenv.lib; { - description = "GPU-accelerated terminal emulator"; - homepage = "https://github.com/jwilm/alacritty"; + meta = with lib; { + description = "A cross-platform, GPU-accelerated terminal emulator"; + homepage = "https://github.com/alacritty/alacritty"; license = licenses.asl20; - maintainers = with maintainers; [ filalex77 mic92 ]; + maintainers = with maintainers; [ filalex77 mic92 cole-h ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 6fc5f951465..5c43d717913 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = https://albertlauncher.github.io/; + homepage = "https://albertlauncher.github.io/"; description = "Desktop agnostic launcher"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes synthetica ]; diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 06321d9d621..8b7234239a7 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small GTK application to allow to keep a diary of your life"; - homepage = https://wiki.gnome.org/Apps/Almanah_Diary; + homepage = "https://wiki.gnome.org/Apps/Almanah_Diary"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = gnome3.maintainers; diff --git a/pkgs/applications/misc/aminal/default.nix b/pkgs/applications/misc/aminal/default.nix index 8c5aded5ed9..dff6b15494b 100644 --- a/pkgs/applications/misc/aminal/default.nix +++ b/pkgs/applications/misc/aminal/default.nix @@ -61,7 +61,7 @@ buildGoPackage rec { - Built-in patched fonts for powerline - Retina display support ''; - homepage = https://github.com/liamg/aminal; + homepage = "https://github.com/liamg/aminal"; license = licenses.gpl3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/misc/antfs-cli/default.nix b/pkgs/applications/misc/antfs-cli/default.nix index 8108b9e4ddb..49da252b6c0 100644 --- a/pkgs/applications/misc/antfs-cli/default.nix +++ b/pkgs/applications/misc/antfs-cli/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication { version = "unstable-2017-02-11"; meta = with stdenv.lib; { - homepage = https://github.com/Tigge/antfs-cli; + homepage = "https://github.com/Tigge/antfs-cli"; description = "Extracts FIT files from ANT-FS based sport watches"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index cda75ac4c05..d5d37ae27c9 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Edit the Pantheon desktop application menu"; - homepage = https://github.com/donadigo/appeditor; + homepage = "https://github.com/donadigo/appeditor"; maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/misc/apvlv/default.nix b/pkgs/applications/misc/apvlv/default.nix index b5af1af91f3..48efafa74fc 100644 --- a/pkgs/applications/misc/apvlv/default.nix +++ b/pkgs/applications/misc/apvlv/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://naihe2010.github.io/apvlv/; + homepage = "http://naihe2010.github.io/apvlv/"; description = "PDF viewer with Vim-like behaviour"; longDescription = '' apvlv is a PDF/DJVU/UMD/TXT Viewer Under Linux/WIN32 diff --git a/pkgs/applications/misc/archiver/default.nix b/pkgs/applications/misc/archiver/default.nix index 8c79d867c83..64b592b7871 100644 --- a/pkgs/applications/misc/archiver/default.nix +++ b/pkgs/applications/misc/archiver/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv -, Security +, lib }: buildGoModule rec { @@ -17,9 +16,7 @@ buildGoModule rec { modSha256 = "1mrfqhd0zb78rlqlj2ncb0srwjfl7rzhy2p9mwa82pgysvlp08gv"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Easily create & extract archives, and compress & decompress files of various formats"; homepage = "https://github.com/mholt/archiver"; license = licenses.mit; diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index b03d2aa208b..648a2cfd994 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; - homepage = http://artha.sourceforge.net; + homepage = "http://artha.sourceforge.net"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/asciiquarium/default.nix b/pkgs/applications/misc/asciiquarium/default.nix index 0e524ede091..592c0938ffb 100644 --- a/pkgs/applications/misc/asciiquarium/default.nix +++ b/pkgs/applications/misc/asciiquarium/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Enjoy the mysteries of the sea from the safety of your own terminal!"; - homepage = https://robobunny.com/projects/asciiquarium/html/; + homepage = "https://robobunny.com/projects/asciiquarium/html/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.utdemir ]; diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 622e7169fae..32ea821b22d 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Sample Rate Converter for audio"; - homepage = http://sox.sourceforge.net/; + homepage = "http://sox.sourceforge.net/"; maintainers = [ lib.maintainers.marcweber ]; license = if enableAMR then lib.licenses.unfree else lib.licenses.gpl2Plus; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 20a754ba98a..59c7154fa7d 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An audio resampling library"; - homepage = http://soxr.sourceforge.net; + homepage = "http://soxr.sourceforge.net"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/audio/wavesurfer/default.nix b/pkgs/applications/misc/audio/wavesurfer/default.nix index 0add5ed78cc..0ca01c8d2ae 100644 --- a/pkgs/applications/misc/audio/wavesurfer/default.nix +++ b/pkgs/applications/misc/audio/wavesurfer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "wavesurfer-1.8.5"; src = fetchurl { - url = https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz; + url = "https://www.speech.kth.se/wavesurfer/wavesurfer-1.8.5.tar.gz"; sha256 = "1yx9s1j47cq0v40cwq2gn7bdizpw46l95ba4zl9z4gg31mfvm807"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Tool for recording, playing, editing, viewing and labeling of audio"; - homepage = http://www.speech.kth.se/wavesurfer/; + homepage = "http://www.speech.kth.se/wavesurfer/"; license = "BSD"; }; } diff --git a/pkgs/applications/misc/audio/wavrsocvt/default.nix b/pkgs/applications/misc/audio/wavrsocvt/default.nix index 09b75e27d46..ebb04a30ab8 100644 --- a/pkgs/applications/misc/audio/wavrsocvt/default.nix +++ b/pkgs/applications/misc/audio/wavrsocvt/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { supported sample rates in the standard NXT firmware). You can then upload these with e.g. nxt-python. ''; - homepage = http://bricxcc.sourceforge.net/; + homepage = "http://bricxcc.sourceforge.net/"; license = licenses.mpl11; maintainers = with maintainers; [ leenaars ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/autospotting/default.nix b/pkgs/applications/misc/autospotting/default.nix index b00686fb24f..a33261e7a59 100644 --- a/pkgs/applications/misc/autospotting/default.nix +++ b/pkgs/applications/misc/autospotting/default.nix @@ -20,7 +20,7 @@ buildGoPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/AutoSpotting/AutoSpotting; + homepage = "https://github.com/AutoSpotting/AutoSpotting"; description = "Automatically convert your existing AutoScaling groups to up to 90% cheaper spot instances with minimal configuration changes"; license = licenses.free; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 165bee76b69..f4a56e4f924 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "GUI for AVRDUDE (AVR microcontroller programmer)"; - homepage = https://github.com/zkemble/AVRDUDESS; + homepage = "https://github.com/zkemble/AVRDUDESS"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/misc/barrier/default.nix b/pkgs/applications/misc/barrier/default.nix index 10e46176c6e..28b65d2b58b 100644 --- a/pkgs/applications/misc/barrier/default.nix +++ b/pkgs/applications/misc/barrier/default.nix @@ -32,8 +32,8 @@ mkDerivation rec { Synergy was a commercialized reimplementation of the original CosmoSynergy written by Chris Schoeneman. ''; - homepage = https://github.com/debauchee/barrier; - downloadPage = https://github.com/debauchee/barrier/releases; + 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; diff --git a/pkgs/applications/misc/bashSnippets/default.nix b/pkgs/applications/misc/bashSnippets/default.nix index 0976e7625bc..4a023849f39 100644 --- a/pkgs/applications/misc/bashSnippets/default.nix +++ b/pkgs/applications/misc/bashSnippets/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A collection of small bash scripts for heavy terminal users"; - homepage = https://github.com/alexanderepstein/Bash-Snippets; + homepage = "https://github.com/alexanderepstein/Bash-Snippets"; license = licenses.mit; maintainers = with maintainers; [ infinisil ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/bb/default.nix b/pkgs/applications/misc/bb/default.nix index 06df1df9f76..fd7eb4990f0 100644 --- a/pkgs/applications/misc/bb/default.nix +++ b/pkgs/applications/misc/bb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://aa-project.sourceforge.net/bb; + homepage = "http://aa-project.sourceforge.net/bb"; description = "AA-lib demo"; license = licenses.gpl2; maintainers = [ maintainers.rnhmjoj ]; diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index d0af940ac92..9489bfa0016 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "A Qt4 Bible study tool"; - homepage = http://www.bibletime.info/; + homepage = "http://www.bibletime.info/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.piotr ]; diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix index 22eb3e3d859..41b0d3c13a8 100644 --- a/pkgs/applications/misc/bicon/default.nix +++ b/pkgs/applications/misc/bicon/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bidirectional console"; - homepage = https://github.com/behdad/bicon; + homepage = "https://github.com/behdad/bicon"; license = [ licenses.lgpl21 licenses.psfl licenses.bsd0 ]; maintainers = [ maintainers.linarcx ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index 39ecaa995d1..29522f75c25 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { meta = with lib; { description = "Mail system tray notification icon for Thunderbird"; - homepage = https://github.com/gyunaev/birdtray; + homepage = "https://github.com/gyunaev/birdtray"; license = licenses.gpl3Plus; maintainers = with maintainers; [ Flakebi ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 4b2e1c66761..0111f8519e7 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -54,7 +54,7 @@ pythonPackages.buildPythonApplication rec { strictDeps = false; meta = with stdenv.lib; { - homepage = http://bleachbit.sourceforge.net; + homepage = "http://bleachbit.sourceforge.net"; description = "A program to clean your computer"; longDescription = "BleachBit helps you easily clean your computer to free space and maintain privacy."; license = licenses.gpl3; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 98f6e2895d1..f4018cff5f4 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub }: with python3.pkgs; buildPythonApplication rec { - version = "4.2.2"; + version = "4.3"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "1wy5i1av1s98yr56ybiq66kv0vg48zci3fp91zfgj04nh2966w1w"; + sha256 = "1cq508ymak3g5fhi1n4bdiiqkc86s2l3k4dvzw842vv2x0441cac"; }; checkInputs = [ @@ -31,6 +31,7 @@ with python3.pkgs; buildPythonApplication rec { flask-api flask-bootstrap flask-paginate + flask-reverse-proxy-fix flask_wtf arrow werkzeug @@ -70,7 +71,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with stdenv.lib; { description = "Private cmdline bookmark manager"; - homepage = https://github.com/jarun/Buku; + homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ matthiasbeyer infinisil ]; diff --git a/pkgs/applications/misc/calcurse/default.nix b/pkgs/applications/misc/calcurse/default.nix index 8f8934cb084..ce3a2c0a271 100644 --- a/pkgs/applications/misc/calcurse/default.nix +++ b/pkgs/applications/misc/calcurse/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "calcurse"; - version = "4.5.1"; + version = "4.6.0"; src = fetchurl { url = "https://calcurse.org/files/${pname}-${version}.tar.gz"; - sha256 = "0cgkd285x5pk62lmdx9fjxl46c5lj8wj2cqbxq7d99yb4il5fdjk"; + sha256 = "0hzhdpkkn75jlymanwzl69hrrf1pw29hrchr11wlxqjpl43h62gs"; }; buildInputs = [ ncurses gettext python3 python3Packages.wrapPython ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { customized to suit user needs and a very powerful set of command line options can be used to filter and format appointments, making it suitable for use in scripts. ''; - homepage = http://calcurse.org/; + homepage = "http://calcurse.org/"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index e29a8ebfd19..bc3f846ad6c 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -166,6 +166,7 @@ mkDerivation rec { disallowedReferences = [ podofo.dev ]; calibreDesktopItem = makeDesktopItem { + fileValidation = false; # fails before substitution name = "calibre-gui"; desktopName = "calibre"; exec = "@out@/bin/calibre --detach %F"; @@ -212,6 +213,7 @@ mkDerivation rec { }; ebookEditDesktopItem = makeDesktopItem { + fileValidation = false; # fails before substitution name = "calibre-edit-book"; desktopName = "Edit E-book"; genericName = "E-book Editor"; @@ -224,6 +226,7 @@ mkDerivation rec { }; ebookViewerDesktopItem = makeDesktopItem { + fileValidation = false; # fails before substitution name = "calibre-ebook-viewer"; desktopName = "E-book Viewer"; genericName = "E-book Viewer"; diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index 77cabc409c7..a951046ce01 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GRBL controller application with G-Code visualizer written in Qt"; - homepage = https://github.com/Denvi/Candle; + homepage = "https://github.com/Denvi/Candle"; license = licenses.gpl3; maintainers = with maintainers; [ matti-kariluoma ]; }; diff --git a/pkgs/applications/misc/cardpeek/default.nix b/pkgs/applications/misc/cardpeek/default.nix index 40dbfea9801..83340f78dd4 100644 --- a/pkgs/applications/misc/cardpeek/default.nix +++ b/pkgs/applications/misc/cardpeek/default.nix @@ -20,7 +20,7 @@ in enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/L1L1/cardpeek; + homepage = "https://github.com/L1L1/cardpeek"; description = "A tool to read the contents of ISO7816 smart cards"; license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/catclock/default.nix b/pkgs/applications/misc/catclock/default.nix index 09c36f9eb2f..6b4ab1f3a8b 100644 --- a/pkgs/applications/misc/catclock/default.nix +++ b/pkgs/applications/misc/catclock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { buildInputs = [ xlibsWrapper motif ]; meta = with stdenv.lib; { - homepage = http://codefromabove.com/2014/05/catclock/; + homepage = "http://codefromabove.com/2014/05/catclock/"; license = with licenses; mit; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix index ac2948c2d6e..e7664244db7 100644 --- a/pkgs/applications/misc/cbatticon/default.nix +++ b/pkgs/applications/misc/cbatticon/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight and fast battery icon that sits in the system tray"; - homepage = https://github.com/valr/cbatticon; + homepage = "https://github.com/valr/cbatticon"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/misc/cgminer/default.nix b/pkgs/applications/misc/cgminer/default.nix index c05c7423d9a..09236565d59 100644 --- a/pkgs/applications/misc/cgminer/default.nix +++ b/pkgs/applications/misc/cgminer/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { monitoring, (over)clocking and fanspeed support for bitcoin and derivative coins. Do not use on multiple block chains at the same time! ''; - homepage = https://github.com/ckolivas/cgminer; + homepage = "https://github.com/ckolivas/cgminer"; license = licenses.gpl3; maintainers = [ maintainers.offline ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index ffe2759a5e7..b4765c0aae3 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchFromGitHub, buildGoModule }: +{ stdenv, fetchFromGitHub +, buildGoModule, installShellFiles }: buildGoModule rec { pname = "cheat"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "062dlc54x9qwb3hsxp20h94dpwsa1nzpjln9cqmvwjhvp434l97r"; + sha256 = "0jbqflkcfdrinx1lk45klm8ml0n4cgp43nzls1376cd3hfayby1y"; }; subPackages = [ "cmd/cheat" ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion scripts/cheat.{bash,fish,zsh} + ''; + modSha256 = "1is19qca5wgzya332rmpk862nnivxzgxchkllv629f5fwwdvdgmg"; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index eec2b9dd24a..72279e84909 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { pname = "cherrytree"; - version = "0.39.0"; + version = "0.39.1"; src = fetchurl { url = "https://www.giuspen.com/software/${pname}-${version}.tar.xz"; - sha256 = "07ibr891qix7xa2sk6fdxdsji8q56c1wf786mxaz77500m0xfx4m"; + sha256 = "0qhycblnixvbybzr8psgmgcpfs6jc9m0p2h9lmd5zmiaggqlcsv7"; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index 4986661e2f6..112341dcd4f 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/dpayne/cli-visualizer; + homepage = "https://github.com/dpayne/cli-visualizer"; description = "CLI based audio visualizer"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/clight/clightd.nix b/pkgs/applications/misc/clight/clightd.nix index f9c08d1f00a..bfa6f2ea855 100644 --- a/pkgs/applications/misc/clight/clightd.nix +++ b/pkgs/applications/misc/clight/clightd.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux bus interface that changes screen brightness/temperature"; - homepage = https://github.com/FedeDP/Clightd; + homepage = "https://github.com/FedeDP/Clightd"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ diff --git a/pkgs/applications/misc/clight/default.nix b/pkgs/applications/misc/clight/default.nix index a2e45256269..ed8767419d4 100644 --- a/pkgs/applications/misc/clight/default.nix +++ b/pkgs/applications/misc/clight/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C daemon that turns your webcam into a light sensor"; - homepage = https://github.com/FedeDP/Clight; + homepage = "https://github.com/FedeDP/Clight"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 129516a4498..82d6272aadc 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,20 +1,41 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }: +{ fetchFromGitHub, fetchpatch, stdenv +, autoreconfHook, intltool, pkgconfig +, gtk3, xdotool, which, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "clipit"; - version = "1.4.2"; + version = "1.4.4"; - src = fetchurl { - url = "https://github.com/downloads/shantzu/ClipIt/${pname}-${version}.tar.gz"; - sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; + src = fetchFromGitHub { + owner = "shantzu"; + repo = "ClipIt"; + rev = "v${version}"; + sha256 = "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 xdotool ]; + patches = [ + # gtk3 support, can be removed in the next release + (fetchpatch { + url = "https://github.com/CristianHenzel/ClipIt/commit/22e012c7d406436e1785b6dd3c4c138b25f68431.patch"; + sha256 = "0la4gc324dzxpx6nk2lqg5fmjgjpm2pyvzwddmfz1il8hqvrqg3j"; + }) + ]; + + preConfigure = '' + intltoolize --copy --force --automake + ''; + + nativeBuildInputs = [ pkgconfig wrapGAppsHook autoreconfHook intltool ]; + configureFlags = [ "--with-gtk3" ]; + buildInputs = [ gtk3 ]; + + gappsWrapperArgs = [ + "--prefix" "PATH" ":" "${stdenv.lib.makeBinPath [ xdotool which ]}" + ]; meta = with stdenv.lib; { description = "Lightweight GTK Clipboard Manager"; - homepage = "http://clipit.rspwn.com"; + inherit (src.meta) homepage; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/clipmenu/default.nix b/pkgs/applications/misc/clipmenu/default.nix index 7577c0a3db9..4bc56f0c452 100644 --- a/pkgs/applications/misc/clipmenu/default.nix +++ b/pkgs/applications/misc/clipmenu/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "clipmenu"; - version = "5.6.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "cdown"; repo = "clipmenu"; rev = version; - sha256 = "13hyarzazh6j33d808h3s5yk320wqzivc0ni9xm8kalvn4k3a0bq"; + sha256 = "0053j4i14lz5m2bzc5sch5id5ilr1bl196mp8fp0q8x74w3vavs9"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/cmatrix/default.nix b/pkgs/applications/misc/cmatrix/default.nix index 9f86ec94f18..fa0e10f9eef 100644 --- a/pkgs/applications/misc/cmatrix/default.nix +++ b/pkgs/applications/misc/cmatrix/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { CMatrix simulates the display from "The Matrix" and is based on the screensaver from the movie's website. ''; - homepage = https://github.com/abishekvashok/cmatrix; + homepage = "https://github.com/abishekvashok/cmatrix"; platforms = ncurses.meta.platforms; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/applications/misc/colort/default.nix b/pkgs/applications/misc/colort/default.nix index 554c7d8c78b..1eda11890e7 100644 --- a/pkgs/applications/misc/colort/default.nix +++ b/pkgs/applications/misc/colort/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A program for 'tinting' color values"; - homepage = https://github.com/neeasade/colort; + homepage = "https://github.com/neeasade/colort"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.neeasade ]; diff --git a/pkgs/applications/misc/confclerk/default.nix b/pkgs/applications/misc/confclerk/default.nix index b07e0fb8c52..bb1aacc2069 100644 --- a/pkgs/applications/misc/confclerk/default.nix +++ b/pkgs/applications/misc/confclerk/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Offline conference schedule viewer"; - homepage = http://www.toastfreeware.priv.at/confclerk; + homepage = "http://www.toastfreeware.priv.at/confclerk"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ehmry ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix index c9dcc97d5cd..739ad07adbf 100644 --- a/pkgs/applications/misc/cool-retro-term/default.nix +++ b/pkgs/applications/misc/cool-retro-term/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { feel of the old cathode tube screens. It has been designed to be eye-candy, customizable, and reasonably lightweight. ''; - homepage = https://github.com/Swordfish90/cool-retro-term; + 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 ]; diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 16be8e06b68..081acb3acb6 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -21,7 +21,7 @@ mkDerivation rec { ] ++ lib.optional webkitSupport qtwebkit; meta = with lib; { - homepage = https://hluk.github.io/CopyQ; + homepage = "https://hluk.github.io/CopyQ"; description = "Clipboard Manager with Advanced Features"; license = licenses.gpl3; maintainers = [ maintainers.willtim ]; diff --git a/pkgs/applications/misc/coursera-dl/default.nix b/pkgs/applications/misc/coursera-dl/default.nix index c09457d2c65..bbb7c53b61f 100644 --- a/pkgs/applications/misc/coursera-dl/default.nix +++ b/pkgs/applications/misc/coursera-dl/default.nix @@ -38,7 +38,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "CLI for downloading Coursera.org videos and naming them"; - homepage = https://github.com/coursera-dl/coursera-dl; + homepage = "https://github.com/coursera-dl/coursera-dl"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index dae25f6b817..aed44d1213c 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ethereum C++ client"; - homepage = https://github.com/ethereum/cpp-ethereum; + homepage = "https://github.com/ethereum/cpp-ethereum"; license = licenses.gpl3; maintainers = with maintainers; [ artuuge ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/crumbs/default.nix b/pkgs/applications/misc/crumbs/default.nix index 2d612c16fef..889c17e6988 100644 --- a/pkgs/applications/misc/crumbs/default.nix +++ b/pkgs/applications/misc/crumbs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bookmarks for the command line"; - homepage = https://github.com/fasseg/crumbs; + homepage = "https://github.com/fasseg/crumbs"; license = licenses.wtfpl; platforms = platforms.all; maintainers = with maintainers; [ thesola10 ]; diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix index 72918a40733..602fe430816 100644 --- a/pkgs/applications/misc/ctodo/default.nix +++ b/pkgs/applications/misc/ctodo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ctodo.apakoh.dk/; + homepage = "http://ctodo.apakoh.dk/"; description = "A simple ncurses-based task list manager"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix index d48efb1a112..4c4fe9b1abd 100644 --- a/pkgs/applications/misc/cura/default.nix +++ b/pkgs/applications/misc/cura/default.nix @@ -55,7 +55,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = https://github.com/Ultimaker/Cura; + homepage = "https://github.com/Ultimaker/Cura"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar gebner ]; diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch b/pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch new file mode 100644 index 00000000000..3826e92440f --- /dev/null +++ b/pkgs/applications/misc/cura/lulzbot/curaengine-openmp-compat.patch @@ -0,0 +1,47 @@ +# Notes by Charles Duffy <charles@dyfis.net> -- +# +# - The new version of OpenMP does not allow outside variables to be referenced +# *at all* without an explicit declaration of how they're supposed to be +# handled. Thus, this was an outright build failure beforehand. The new +# pragmas copy the initial value from the outer scope into each parallel +# thread. Since these variables are all constant within the loops, this is +# clearly correct. (Not sure it's *optimal*, but quite sure it isn't +# *wrong*). +# - Upstream has been contacted -- I'm a Lulzbot customer with an active +# support contract and sent them the patch. That said, they're in the middle +# of some major corporate churn (sold themselves out of near-bankruptcy to an +# out-of-state business entity formed as a holding company; moved to that +# state; have been slowly restaffing after), so a response may take a while. +# - The patch is purely my own work. + +--- curaengine/src/support.cpp.orig 2020-03-28 10:38:01.953912363 -0500 ++++ curaengine/src/support.cpp 2020-03-28 10:45:28.999791908 -0500 +@@ -854,7 +854,7 @@ + const double tan_angle = tan(angle) - 0.01; // the XY-component of the supportAngle + xy_disallowed_per_layer[0] = storage.getLayerOutlines(0, false).offset(xy_distance); + // for all other layers (of non support meshes) compute the overhang area and possibly use that when calculating the support disallowed area +- #pragma omp parallel for default(none) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) ++ #pragma omp parallel for default(none) firstprivate(layer_count, is_support_mesh_place_holder, use_xy_distance_overhang, z_distance_top, tan_angle, xy_distance, xy_distance_overhang) shared(xy_disallowed_per_layer, storage, mesh) schedule(dynamic) + for (unsigned int layer_idx = 1; layer_idx < layer_count; layer_idx++) + { + Polygons outlines = storage.getLayerOutlines(layer_idx, false); +@@ -1054,7 +1054,7 @@ + const int max_checking_layer_idx = std::min(static_cast<int>(storage.support.supportLayers.size()) + , static_cast<int>(layer_count - (layer_z_distance_top - 1))); + const size_t max_checking_idx_size_t = std::max(0, max_checking_layer_idx); +-#pragma omp parallel for default(none) shared(support_areas, storage) schedule(dynamic) ++#pragma omp parallel for default(none) firstprivate(max_checking_idx_size_t, layer_z_distance_top) shared(support_areas, storage) schedule(dynamic) + for (size_t layer_idx = 0; layer_idx < max_checking_idx_size_t; layer_idx++) + { + support_areas[layer_idx] = support_areas[layer_idx].difference(storage.getLayerOutlines(layer_idx + layer_z_distance_top - 1, false)); +--- curaengine/src/layerPart.cpp.orig 2020-03-28 10:36:40.381023651 -0500 ++++ curaengine/src/layerPart.cpp 2020-03-28 10:39:54.584140465 -0500 +@@ -49,7 +49,7 @@ + { + const auto total_layers = slicer->layers.size(); + assert(mesh.layers.size() == total_layers); +-#pragma omp parallel for default(none) shared(mesh, slicer) schedule(dynamic) ++#pragma omp parallel for default(none) firstprivate(total_layers) shared(mesh, slicer) schedule(dynamic) + for (unsigned int layer_nr = 0; layer_nr < total_layers; layer_nr++) + { + SliceLayer& layer_storage = mesh.layers[layer_nr]; diff --git a/pkgs/applications/misc/cura/lulzbot/curaengine.nix b/pkgs/applications/misc/cura/lulzbot/curaengine.nix index aad9b9bee89..a5cfa937fd8 100644 --- a/pkgs/applications/misc/cura/lulzbot/curaengine.nix +++ b/pkgs/applications/misc/cura/lulzbot/curaengine.nix @@ -1,26 +1,27 @@ -{ stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }: +{ gcc8Stdenv, callPackage, fetchgit, fetchpatch, cmake, libarcusLulzbot, stb, protobuf }: -stdenv.mkDerivation rec { +gcc8Stdenv.mkDerivation rec { pname = "curaengine-lulzBot"; version = "3.6.21"; src = fetchgit { - url = https://code.alephobjects.com/source/curaengine-lulzbot.git; + url = "https://code.alephobjects.com/source/curaengine-lulzbot.git"; rev = "ec6a1a0f0aa387ef97e5c106633cf8d7fb9cd00d"; sha256 = "0wdkvg1hmqp1gaym804lw09x4ngf5ffasd861jhflpy7djbmkfn8"; }; + patches = [ ./curaengine-openmp-compat.patch ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ libarcusLulzbot stb protobuf ]; cmakeFlags = [ "-DCURA_ENGINE_VERSION=${version}" ]; - meta = with stdenv.lib; { + meta = with gcc8Stdenv.lib; { description = "A powerful, fast and robust engine for processing 3D models into 3D printing instruction"; - homepage = https://code.alephobjects.com/source/curaengine-lulzbot/; + homepage = "https://code.alephobjects.com/source/curaengine-lulzbot/"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; }; } - diff --git a/pkgs/applications/misc/cura/lulzbot/default.nix b/pkgs/applications/misc/cura/lulzbot/default.nix index c67fcb74047..229966561c6 100644 --- a/pkgs/applications/misc/cura/lulzbot/default.nix +++ b/pkgs/applications/misc/cura/lulzbot/default.nix @@ -4,7 +4,7 @@ let # admittedly, we're using (printer firmware) blobs when we could compile them ourselves. curaBinaryDataVersion = "3.6.21"; # Marlin v2.0.0.174 for Bio, v2.0.0.144 for others. curaBinaryData = fetchgit { - url = https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git; + url = "https://code.alephobjects.com/diffusion/CBD/cura-binary-data.git"; rev = "5c75d0f6c10d8b7a903e2072a48cd1f08059509e"; sha256 = "1qdsj6rczwzdwzyr7nz7fnypbphckjrnwl8c9dr6izsxyzs465c4"; }; @@ -30,7 +30,7 @@ mkDerivation rec { version = "3.6.21"; src = fetchgit { - url = https://code.alephobjects.com/source/cura-lulzbot.git; + url = "https://code.alephobjects.com/source/cura-lulzbot.git"; rev = "7faeb18604c83004846a02c60cb240708db0034f"; sha256 = "10q38s8c8x6xkh1vns4p3iqa5y267vrjh5vq8h55mg1q5001scyq"; }; @@ -74,7 +74,7 @@ mkDerivation rec { meta = with lib; { description = "3D printer / slicing GUI built on top of the Uranium framework"; - homepage = https://code.alephobjects.com/diffusion/CURA/; + homepage = "https://code.alephobjects.com/diffusion/CURA/"; license = licenses.agpl3; # a partial relicense to LGPL has happened, but not certain that all AGPL bits are expunged platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; diff --git a/pkgs/applications/misc/cura/lulzbot/libarcus.nix b/pkgs/applications/misc/cura/lulzbot/libarcus.nix index 733aa27da85..5edaabbacb0 100644 --- a/pkgs/applications/misc/cura/lulzbot/libarcus.nix +++ b/pkgs/applications/misc/cura/lulzbot/libarcus.nix @@ -6,7 +6,7 @@ buildPythonPackage { format = "other"; src = fetchgit { - url = https://code.alephobjects.com/source/arcus.git; + url = "https://code.alephobjects.com/source/arcus.git"; rev = "aeda02d7727f45b657afb72cef203283fbf09325"; sha256 = "1ak0d4k745sx7paic27was3s4987z9h3czscjs21hxbi6qy83g99"; }; @@ -24,7 +24,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Communication library between internal components for Ultimaker software"; - homepage = https://code.alephobjects.com/source/arcus/; + homepage = "https://code.alephobjects.com/source/arcus/"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; diff --git a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix index e6c277959e0..e32117a103e 100644 --- a/pkgs/applications/misc/cura/lulzbot/libsavitar.nix +++ b/pkgs/applications/misc/cura/lulzbot/libsavitar.nix @@ -7,7 +7,7 @@ buildPythonPackage { format = "other"; src = fetchgit { - url = https://code.alephobjects.com/source/savitar.git; + url = "https://code.alephobjects.com/source/savitar.git"; rev = "ee8ada42c55f54727ce4d275c294ba426d3d8234"; sha256 = "1wm5ii3cmni8dk3c65kw4wglpypkdsfpgd480d3hc1r5bqpq0d6j"; }; @@ -25,7 +25,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "C++ implementation of 3mf loading with SIP python bindings"; - homepage = https://github.com/Ultimaker/libSavitar; + homepage = "https://github.com/Ultimaker/libSavitar"; license = licenses.lgpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ chaduffy ]; diff --git a/pkgs/applications/misc/cura/lulzbot/uranium.nix b/pkgs/applications/misc/cura/lulzbot/uranium.nix index acffc741d57..2ce0fab170e 100644 --- a/pkgs/applications/misc/cura/lulzbot/uranium.nix +++ b/pkgs/applications/misc/cura/lulzbot/uranium.nix @@ -8,7 +8,7 @@ buildPythonPackage { format = "other"; src = fetchgit { - url = https://code.alephobjects.com/diffusion/U/uranium.git; + url = "https://code.alephobjects.com/diffusion/U/uranium.git"; rev = "54d911edd2551c5875c554928896122835a0dd6c"; sha256 = "04bym3vwikaxw8ab0mymv9sc9n8i7yw5kfsv99ic811g9lzz3j1i"; }; @@ -29,7 +29,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = https://code.alephobjects.com/diffusion/U/; + homepage = "https://code.alephobjects.com/diffusion/U/"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ chaduffy ]; diff --git a/pkgs/applications/misc/cura/stable.nix b/pkgs/applications/misc/cura/stable.nix index 1972042f805..1191be09f76 100644 --- a/pkgs/applications/misc/cura/stable.nix +++ b/pkgs/applications/misc/cura/stable.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "3D printing host software"; - homepage = https://github.com/daid/Cura; + homepage = "https://github.com/daid/Cura"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/applications/misc/curabydagoma/default.nix b/pkgs/applications/misc/curabydagoma/default.nix index a367efaaef3..821b88f9b20 100644 --- a/pkgs/applications/misc/curabydagoma/default.nix +++ b/pkgs/applications/misc/curabydagoma/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Slicer for 3D printers built by Dagoma"; - homepage = https://dagoma.fr/cura-by-dagoma.html; + homepage = "https://dagoma.fr/cura-by-dagoma.html"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ tiramiseb ]; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/applications/misc/curaengine/stable.nix index 41f110e9ee1..d353fff87ef 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/applications/misc/curaengine/stable.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Engine for processing 3D models into 3D printing instructions"; - homepage = https://github.com/Ultimaker/CuraEngine; + homepage = "https://github.com/Ultimaker/CuraEngine"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 1334813131b..64c3f8ac282 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.0.1"; + version = "7.0.2"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "1kq0ingzfl6q2yz3y5nj9k35y9f1izg1idgbgvpz784gn7937m64"; + sha256 = "0p75kvs9ng5i5x5cpdqxlf18y3k83pqsvrkab0i1azk3x4lfkzmd"; }; installPhase = '' diff --git a/pkgs/applications/misc/dbvisualizer/default.nix b/pkgs/applications/misc/dbvisualizer/default.nix index fbeb965df38..7612c00393f 100644 --- a/pkgs/applications/misc/dbvisualizer/default.nix +++ b/pkgs/applications/misc/dbvisualizer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dbvisualizer-9.5.7"; src = fetchurl { - url = https://www.dbvis.com/product_download/dbvis-9.5.7/media/dbvis_unix_9_5_7.tar.gz; + url = "https://www.dbvis.com/product_download/dbvis-9.5.7/media/dbvis_unix_9_5_7.tar.gz"; sha256 = "1xv4fw7cji2ffvv7z8vjl5lap512pj60s2ynihirrqld7pmklnyr"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "The universal database tool"; - homepage = https://www.dbvis.com/; + homepage = "https://www.dbvis.com/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index 7d211b26a42..c4639150dd4 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,40 +1,38 @@ -{stdenv, fetchFromGitHub, python3}: +{ stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "1.7"; + version = "1.8"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "0kcl8z9w8iwn3pxay1pfahhw6vs2l1dp60yfv3i19in4ac9va7m0"; + sha256 = "1cyaindcg2vc3ij0p6b35inr01c6ys04izxsn1h70ixhsz46qg8z"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = [ python3 ]; makeFlags = [ "PREFIX=$(out)" ]; - preBuild = '' - # Version 1.7 was released as 1.6 - # https://github.com/jarun/ddgr/pull/95 - sed -i "s/_VERSION_ = '1.6'/_VERSION_ = '1.7'/" ddgr + # Version 1.8 was released as 1.7 + postPatch = '' + substituteInPlace ddgr --replace "_VERSION_ = '1.7'" "_VERSION_ = '${version}'" ''; postInstall = '' - mkdir -p "$out/share/bash-completion/completions/" - cp "auto-completion/bash/ddgr-completion.bash" "$out/share/bash-completion/completions/" - mkdir -p "$out/share/fish/vendor_completions.d/" - cp "auto-completion/fish/ddgr.fish" "$out/share/fish/vendor_completions.d/" - mkdir -p "$out/share/zsh/site-functions/" - cp "auto-completion/zsh/_ddgr" "$out/share/zsh/site-functions/" + installShellCompletion --bash --name ddgr.bash auto-completion/bash/ddgr-completion.bash + installShellCompletion --fish auto-completion/fish/ddgr.fish + installShellCompletion --zsh auto-completion/zsh/_ddgr ''; meta = with stdenv.lib; { - homepage = https://github.com/jarun/ddgr; + homepage = "https://github.com/jarun/ddgr"; description = "Search DuckDuckGo from the terminal"; license = licenses.gpl3; maintainers = with maintainers; [ ceedubs markus1189 ]; - platforms = platforms.unix; + platforms = python3.meta.platforms; }; } diff --git a/pkgs/applications/misc/deco/default.nix b/pkgs/applications/misc/deco/default.nix index a1fdabd8ccb..ad8b56e830f 100644 --- a/pkgs/applications/misc/deco/default.nix +++ b/pkgs/applications/misc/deco/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ebzzry/deco; + homepage = "https://github.com/ebzzry/deco"; description = "A simple root image setter"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 5699396a084..2961baee102 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { positioned at a specific screen position, or position a window on a specific workspace. ''; - homepage = http://www.gusnan.se/devilspie2/; + homepage = "https://www.gusnan.se/devilspie2/"; license = licenses.gpl3; maintainers = [ maintainers.ebzzry ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/dfilemanager/default.nix b/pkgs/applications/misc/dfilemanager/default.nix index 1bfb6bbfeaf..69c7f0dc17f 100644 --- a/pkgs/applications/misc/dfilemanager/default.nix +++ b/pkgs/applications/misc/dfilemanager/default.nix @@ -17,7 +17,7 @@ mkDerivation { cmakeFlags = [ "-DQT5BUILD=true" ]; meta = { - homepage = http://dfilemanager.sourceforge.net/; + homepage = "http://dfilemanager.sourceforge.net/"; description = "File manager written in Qt/C++"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/misc/diffpdf/default.nix b/pkgs/applications/misc/diffpdf/default.nix index 957d3ee72bb..17dfd08f90b 100644 --- a/pkgs/applications/misc/diffpdf/default.nix +++ b/pkgs/applications/misc/diffpdf/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch; + url = "https://raw.githubusercontent.com/gentoo/gentoo/9b971631588ff46e7c2d501bc35cd0d9ce2d98e2/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch"; sha256 = "0sax8gcqcmzf74hmdr3rarqs4nsxmml9qmh6pqyjmgl3lypxhafg"; }) ./fix_path_poppler_qt5.patch @@ -50,7 +50,7 @@ mkDerivation rec { ''; meta = { - homepage = http://www.qtrac.eu/diffpdfc.html; + 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 ]; diff --git a/pkgs/applications/misc/ding/default.nix b/pkgs/applications/misc/ding/default.nix index e76f95b6a50..374c4cf6648 100644 --- a/pkgs/applications/misc/ding/default.nix +++ b/pkgs/applications/misc/ding/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and fast dictionary lookup tool"; - homepage = https://www-user.tu-chemnitz.de/~fri/ding/; + homepage = "https://www-user.tu-chemnitz.de/~fri/ding/"; license = licenses.gpl2Plus; platforms = platforms.linux; # homepage says: unix-like except darwin maintainers = [ maintainers.exi ]; diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix index 8f7dbd2d2ed..038df41875f 100644 --- a/pkgs/applications/misc/direwolf/default.nix +++ b/pkgs/applications/misc/direwolf/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway"; - homepage = https://github.com/wb2osz/direwolf/; + homepage = "https://github.com/wb2osz/direwolf/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.the-kenny ]; diff --git a/pkgs/applications/misc/dmensamenu/default.nix b/pkgs/applications/misc/dmensamenu/default.nix index 1c3b4133867..cf02efdcece 100644 --- a/pkgs/applications/misc/dmensamenu/default.nix +++ b/pkgs/applications/misc/dmensamenu/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/dotlambda/dmensamenu; + homepage = "https://github.com/dotlambda/dmensamenu"; description = "Print German canteen menus using dmenu and OpenMensa"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix index 8d13ac42e1f..e4d0c82c417 100644 --- a/pkgs/applications/misc/dmenu/default.nix +++ b/pkgs/applications/misc/dmenu/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A generic, highly customizable, and efficient menu for the X Window System"; - homepage = https://tools.suckless.org/dmenu; + homepage = "https://tools.suckless.org/dmenu"; license = licenses.mit; maintainers = with maintainers; [ pSub globin ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/dockbarx/default.nix b/pkgs/applications/misc/dockbarx/default.nix index 3888c4ce0a0..97510bc3b45 100644 --- a/pkgs/applications/misc/dockbarx/default.nix +++ b/pkgs/applications/misc/dockbarx/default.nix @@ -29,7 +29,7 @@ pythonPackages.buildPythonApplication rec { ++ [ keybinder ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/dockbar/; + homepage = "https://launchpad.net/dockbar/"; description = "DockBarX is a lightweight taskbar / panel replacement for Linux which works as a stand-alone dock"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/misc/doing/Gemfile.lock b/pkgs/applications/misc/doing/Gemfile.lock index 4d266827415..1b969869f76 100644 --- a/pkgs/applications/misc/doing/Gemfile.lock +++ b/pkgs/applications/misc/doing/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES doing (= 1.0.10pre) BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/applications/misc/doing/default.nix b/pkgs/applications/misc/doing/default.nix index d72a5b84826..48e45328f67 100644 --- a/pkgs/applications/misc/doing/default.nix +++ b/pkgs/applications/misc/doing/default.nix @@ -17,7 +17,7 @@ bundlerEnv { in a TaskPaper-formatted text file. It allows for multiple sections/categories and flexible output formatting. ''; - homepage = https://brettterpstra.com/projects/doing/; + homepage = "https://brettterpstra.com/projects/doing/"; license = licenses.mit; maintainers = with maintainers; [ ktf nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index da36e89db1f..999904a21d3 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -19,7 +19,7 @@ mkDerivation { hardeningDisable = stdenv.lib.optional stdenv.isDarwin "format"; meta = with stdenv.lib; { - homepage = http://doomseeker.drdteam.org/; + homepage = "http://doomseeker.drdteam.org/"; description = "Multiplayer server browser for many Doom source ports"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/misc/dotfiles/default.nix b/pkgs/applications/misc/dotfiles/default.nix index 5150f13fb80..b515074fd47 100644 --- a/pkgs/applications/misc/dotfiles/default.nix +++ b/pkgs/applications/misc/dotfiles/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Easily manage your dotfiles"; - homepage = https://github.com/jbernard/dotfiles; + homepage = "https://github.com/jbernard/dotfiles"; license = licenses.isc; }; } diff --git a/pkgs/applications/misc/dozenal/default.nix b/pkgs/applications/misc/dozenal/default.nix index 226bdea0301..05d3ddb7cfb 100644 --- a/pkgs/applications/misc/dozenal/default.nix +++ b/pkgs/applications/misc/dozenal/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { Roman numerals. Arbitrary ranks and symbols may be used. Defaults to dozenal Roman numerals. ''; - homepage = https://github.com/dgoodmaniii/dozenal/; + homepage = "https://github.com/dgoodmaniii/dozenal/"; maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 5d99cbaa988..052e290120d 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://eaglemode.sourceforge.net; + homepage = "http://eaglemode.sourceforge.net"; description = "Zoomable User Interface"; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/electron-cash/default.nix b/pkgs/applications/misc/electron-cash/default.nix index 5b1cafaea32..1616c082c01 100644 --- a/pkgs/applications/misc/electron-cash/default.nix +++ b/pkgs/applications/misc/electron-cash/default.nix @@ -1,14 +1,14 @@ -{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook }: +{ lib, fetchFromGitHub, python3Packages, qtbase, wrapQtAppsHook, secp256k1 }: python3Packages.buildPythonApplication rec { pname = "electron-cash"; - version = "4.0.11"; + version = "4.0.14"; src = fetchFromGitHub { owner = "Electron-Cash"; repo = "Electron-Cash"; rev = version; - sha256 = "1k4zbaj0g8bgk1l5vrb835a8bqfay2707bcb4ql2vx4igcwpb680"; + sha256 = "1dp7cj1185h6xfz6jzh0iq58zvg3wq9hl96bkgxkf5h4ygni2vm6"; }; propagatedBuildInputs = with python3Packages; [ @@ -25,6 +25,7 @@ python3Packages.buildPythonApplication rec { requests tlslite-ng qdarkstyle + stem # plugins keepkey @@ -56,8 +57,14 @@ python3Packages.buildPythonApplication rec { --replace "Exec=electron-cash" "Exec=$out/bin/electron-cash" ''; + # If secp256k1 wasn't added to the library path, the following warning is given: + # + # Electron Cash was unable to find the secp256k1 library on this system. + # Elliptic curve cryptography operations will be performed in slow + # Python-only mode. postFixup = '' - wrapQtApp $out/bin/electron-cash + wrapQtApp $out/bin/electron-cash \ + --prefix LD_LIBRARY_PATH : ${secp256k1}/lib ''; doInstallCheck = true; @@ -73,7 +80,7 @@ python3Packages.buildPythonApplication rec { and the ability to perform transactions without downloading a copy of the blockchain. ''; - homepage = https://www.electroncash.org/; + homepage = "https://www.electroncash.org/"; platforms = platforms.linux; maintainers = with maintainers; [ lassulus nyanloutre ]; license = licenses.mit; diff --git a/pkgs/applications/misc/electrum/dash.nix b/pkgs/applications/misc/electrum/dash.nix index fc5192bb5e4..33a8284744e 100644 --- a/pkgs/applications/misc/electrum/dash.nix +++ b/pkgs/applications/misc/electrum/dash.nix @@ -39,7 +39,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Electrum DASH"; - homepage = https://github.com/dashpay/electrum-dash; + homepage = "https://github.com/dashpay/electrum-dash"; license = licenses.gpl3; maintainers = with maintainers; [ np ]; knownVulnerabilities = [ "CVE-2018-1000022" ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 924d4dc9e0b..d1011548b2a 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -143,7 +143,7 @@ python3Packages.buildPythonApplication { and the ability to perform transactions without downloading a copy of the blockchain. ''; - homepage = https://electrum.org/; + homepage = "https://electrum.org/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ ehmry joachifm np ]; diff --git a/pkgs/applications/misc/electrum/ltc.nix b/pkgs/applications/misc/electrum/ltc.nix index 88f44c6cc85..b7c655caaaf 100644 --- a/pkgs/applications/misc/electrum/ltc.nix +++ b/pkgs/applications/misc/electrum/ltc.nix @@ -48,7 +48,7 @@ python3Packages.buildPythonApplication rec { about losing your litecoins to theft or hardware failure. No waiting, no lengthy blockchain downloads and no syncing to the network. ''; - homepage = https://electrum-ltc.org/; + homepage = "https://electrum-ltc.org/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/elogind/default.nix b/pkgs/applications/misc/elogind/default.nix index 84982b6b019..78dc54497dd 100644 --- a/pkgs/applications/misc/elogind/default.nix +++ b/pkgs/applications/misc/elogind/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://github.com/elogind/elogind; + homepage = "https://github.com/elogind/elogind"; description = ''The systemd project's "logind", extracted to a standalone package''; platforms = platforms.linux; # probably more license = licenses.lgpl21Plus; diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix index 62358d41cc5..e0fcc221100 100644 --- a/pkgs/applications/misc/emem/default.nix +++ b/pkgs/applications/misc/emem/default.nix @@ -29,7 +29,7 @@ EOF ''; meta = with stdenv.lib; { - homepage = https://github.com/ebzzry/emem; + homepage = "https://github.com/ebzzry/emem"; description = "A trivial Markdown to HTML converter"; license = licenses.epl10; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index de922bb3990..7cbae2271ae 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://packages.debian.org/wheezy/epdfview; + homepage = "https://packages.debian.org/wheezy/epdfview"; description = "A lightweight PDF document viewer using Poppler and GTK"; longDescription = '' ePDFView is a free lightweight PDF document viewer using Poppler and diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix index 56cac7ca918..b51acd9fa72 100644 --- a/pkgs/applications/misc/eterm/default.nix +++ b/pkgs/applications/misc/eterm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Terminal emulator"; - homepage = http://www.eterm.org; + homepage = "http://www.eterm.org"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/eureka-editor/default.nix b/pkgs/applications/misc/eureka-editor/default.nix index e9d1317390e..d72aeb629c3 100644 --- a/pkgs/applications/misc/eureka-editor/default.nix +++ b/pkgs/applications/misc/eureka-editor/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://eureka-editor.sourceforge.net; + homepage = "http://eureka-editor.sourceforge.net"; description = "A map editor for the classic DOOM games, and a few related games such as Heretic and Hexen"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index 984ade077a8..7a5284a527a 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { version = "0.5.2-20140827"; src = fetchgit { - url = https://github.com/caleb-/evilvte.git; + url = "https://github.com/caleb-/evilvte.git"; rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a"; sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "VTE based, highly customizable terminal emulator"; - homepage = http://www.calno.com/evilvte; + homepage = "http://www.calno.com/evilvte"; license = licenses.gpl2; maintainers = [ maintainers.bodil ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/exercism/default.nix b/pkgs/applications/misc/exercism/default.nix index 81c2d978299..a071761599a 100644 --- a/pkgs/applications/misc/exercism/default.nix +++ b/pkgs/applications/misc/exercism/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "exercism"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0pg0hxrr6jjd03wbjn5y65x02md3h352mnm1gr6vyiv7hn4ws14m"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "./exercism" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/extract_url/default.nix b/pkgs/applications/misc/extract_url/default.nix index f96d3f0f57c..9daaf7268c3 100644 --- a/pkgs/applications/misc/extract_url/default.nix +++ b/pkgs/applications/misc/extract_url/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://www.memoryhole.net/~kyle/extract_url/; + homepage = "https://www.memoryhole.net/~kyle/extract_url/"; description = "Extracts URLs from MIME messages or plain text"; license = licenses.bsd2; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index 7c6573630a1..1a79554f0fe 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An orthodox file manager"; - homepage = https://github.com/elfmz/far2l; + homepage = "https://github.com/elfmz/far2l"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/fbreader/default.nix b/pkgs/applications/misc/fbreader/default.nix index 857ef9ac27b..18798807743 100644 --- a/pkgs/applications/misc/fbreader/default.nix +++ b/pkgs/applications/misc/fbreader/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An e-book reader for Linux"; - homepage = http://www.fbreader.org/; + homepage = "http://www.fbreader.org/"; license = licenses.gpl3; broken = stdenv.isDarwin # untested, might work || uiType == "gtk"; # builds, but the result is unusable, hangs a lot diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index db78f2ec920..cae637c2c4a 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Small desktop application launcher with reasonable memory footprint"; - homepage = https://gitlab.com/fehlstart/fehlstart; + homepage = "https://gitlab.com/fehlstart/fehlstart"; license = licenses.gpl3; maintainers = [ maintainers.mounium ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 07691b26b75..9e379009027 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.2"; + version = "6.4.3"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "0c563if3kribnj771l14aj06irmrlhm61dc68w6dp7zj4qrnn7z2"; + sha256 = "1r6k14m40ni9114i3j1lr6zwpxky6k89mycgxxg0cpdap4a0wdmh"; }; buildInputs = [ openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-ssl=${openssl.dev}" ]; meta = { - homepage = https://www.fetchmail.info/; + homepage = "https://www.fetchmail.info/"; description = "A full-featured remote-mail retrieval and forwarding utility"; longDescription = '' A full-featured, robust, well-documented remote-mail retrieval and diff --git a/pkgs/applications/misc/fff/default.nix b/pkgs/applications/misc/fff/default.nix index e87c86f1b4b..1397f0a057d 100644 --- a/pkgs/applications/misc/fff/default.nix +++ b/pkgs/applications/misc/fff/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fucking Fast File-Manager"; - homepage = https://github.com/dylanaraps/fff; + homepage = "https://github.com/dylanaraps/fff"; license = licenses.mit; maintainers = [ maintainers.tadeokondrak ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/filet/default.nix b/pkgs/applications/misc/filet/default.nix index edee9ab33e9..ee4b05fa689 100644 --- a/pkgs/applications/misc/filet/default.nix +++ b/pkgs/applications/misc/filet/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fucking fucking fast file fucker (afffff)"; - homepage = https://github.com/buffet/filet; + homepage = "https://github.com/buffet/filet"; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/applications/misc/firestarter/default.nix b/pkgs/applications/misc/firestarter/default.nix index 82bcf5a4aa0..05c535e62c0 100644 --- a/pkgs/applications/misc/firestarter/default.nix +++ b/pkgs/applications/misc/firestarter/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://tu-dresden.de/zih/forschung/projekte/firestarter; + homepage = "https://tu-dresden.de/zih/forschung/projekte/firestarter"; description = "Processor Stress Test Utility"; platforms = platforms.linux; maintainers = with maintainers; [ astro ]; diff --git a/pkgs/applications/misc/flamerobin/default.nix b/pkgs/applications/misc/flamerobin/default.nix index 06cf3c06ffa..2e389c753e2 100644 --- a/pkgs/applications/misc/flamerobin/default.nix +++ b/pkgs/applications/misc/flamerobin/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Database administration tool for Firebird RDBMS"; - homepage = https://github.com/mariuz/flamerobin; + homepage = "https://github.com/mariuz/flamerobin"; license = licenses.bsdOriginal; maintainers = with maintainers; [ uralbash ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 2ca059820ef..cf93729eddd 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec{ Its user-friendly interface will help you to edit, delete, move (Drag and Drop) a row, a submenu, etc very easily. ''; - homepage = https://github.com/rdehouss/fme/; + homepage = "https://github.com/rdehouss/fme/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index afa0a06d33f..008e59eebee 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://fontmanager.github.io/; + homepage = "https://fontmanager.github.io/"; description = "Simple font management for GTK desktop environments"; longDescription = '' Font Manager is intended to provide a way for average users to diff --git a/pkgs/applications/misc/freemind/default.nix b/pkgs/applications/misc/freemind/default.nix index aee3937689b..5774320220a 100644 --- a/pkgs/applications/misc/freemind/default.nix +++ b/pkgs/applications/misc/freemind/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mind-mapping software"; - homepage = http://freemind.sourceforge.net/wiki/index.php/Main_Page; + homepage = "http://freemind.sourceforge.net/wiki/index.php/Main_Page"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/fsv/default.nix b/pkgs/applications/misc/fsv/default.nix index bbc78efe5cd..8b6898958d3 100644 --- a/pkgs/applications/misc/fsv/default.nix +++ b/pkgs/applications/misc/fsv/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { hard drive, or any arbitrarily large collection of files, limited only by the host computer's memory and graphics hardware. ''; - homepage = https://github.com/mcuelenaere/fsv; + homepage = "https://github.com/mcuelenaere/fsv"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/applications/misc/fusee-interfacee-tk/default.nix b/pkgs/applications/misc/fusee-interfacee-tk/default.nix index d74b6565ba3..91a7b0ed37f 100644 --- a/pkgs/applications/misc/fusee-interfacee-tk/default.nix +++ b/pkgs/applications/misc/fusee-interfacee-tk/default.nix @@ -3,13 +3,13 @@ let pythonEnv = python3.withPackages(ps: [ ps.tkinter ps.pyusb ]); in stdenv.mkDerivation rec { pname = "fusee-interfacee-tk"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "nh-server"; repo = pname; rev = "V${version}"; - sha256 = "0ycsxv71b5yvkcawxmcnmywxfvn8fdg1lyq71xdw7qrskxv5fgq7"; + sha256 = "0ngwbwsj999flprv14xvhk7lp51nprrvcnlbnbk6y4qx5casm5md"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/gImageReader/default.nix b/pkgs/applications/misc/gImageReader/default.nix index 67d4bd65a9f..2884fca6239 100644 --- a/pkgs/applications/misc/gImageReader/default.nix +++ b/pkgs/applications/misc/gImageReader/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple Gtk/Qt front-end to tesseract-ocr"; - homepage = https://github.com/manisandro/gImageReader; + homepage = "https://github.com/manisandro/gImageReader"; license = licenses.gpl3Plus; maintainers = with maintainers; [teto]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix index ecf8ae9da8d..1964ba6aaf7 100644 --- a/pkgs/applications/misc/galculator/default.nix +++ b/pkgs/applications/misc/galculator/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { - Binary arithmetic of configurable bit length and signedness - Quad-precision floating point arithmetic, and 112-bit binary arithmetic ''; - homepage = http://galculator.sourceforge.net/; + homepage = "http://galculator.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index d0cf9673180..791db13e423 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.13.1"; + version = "1.13.3"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0a5k7gcs3vn6x1f2qg3ajpqsl39pmw2hsj2srd5y2l1xw7mkkqj6"; + sha256 = "0nhbhli45i2xhkmyj9mpg8fn1l58y2zmr6nnnnms557wpdpg112x"; }; doCheck = false; diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix index fb6902634da..ff3408eb8dd 100644 --- a/pkgs/applications/misc/gammu/default.nix +++ b/pkgs/applications/misc/gammu/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://wammu.eu/gammu/; + homepage = "https://wammu.eu/gammu/"; description = "Command line utility and library to control mobile phones"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/ganttproject-bin/default.nix b/pkgs/applications/misc/ganttproject-bin/default.nix index 96d3d34046e..2e8478f41d3 100644 --- a/pkgs/applications/misc/ganttproject-bin/default.nix +++ b/pkgs/applications/misc/ganttproject-bin/default.nix @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Project scheduling and management"; - homepage = https://www.ganttproject.biz/; - downloadPage = https://www.ganttproject.biz/download; + homepage = "https://www.ganttproject.biz/"; + downloadPage = "https://www.ganttproject.biz/download"; # GanttProject itself is GPL3+. All bundled libraries are declared # ‘GPL3-compatible’. See ${downloadPage} for detailed information. license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index b97b079ab66..ba6868b62f6 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "garmin-plugin-0.3.26"; src = fetchurl { - url = https://github.com/adiesner/GarminPlugin/archive/V0.3.26.tar.gz; + url = "https://github.com/adiesner/GarminPlugin/archive/V0.3.26.tar.gz"; sha256 = "15gads1fj4sj970m5960dgnhys41ksi4cm53ldkf67wn8dc9i4k0"; }; sourceRoot = "GarminPlugin-0.3.26/src"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp npGarminPlugin.so $out/lib/mozilla/plugins ''; meta = { - homepage = http://www.andreas-diesner.de/garminplugin; + homepage = "http://www.andreas-diesner.de/garminplugin"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.ocharles ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/gcal/default.nix b/pkgs/applications/misc/gcal/default.nix index 713000d3f69..24906b11dd5 100644 --- a/pkgs/applications/misc/gcal/default.nix +++ b/pkgs/applications/misc/gcal/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { hybrid and proleptic Julian and Gregorian calendar sheets. It also displays holiday lists for many countries around the globe. ''; - homepage = https://www.gnu.org/software/gcal/; + homepage = "https://www.gnu.org/software/gcal/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index 8381f182e5d..b8b1193058b 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { meta = with lib; { description = "CLI for Google Calendar"; - homepage = https://github.com/insanum/gcalcli; + homepage = "https://github.com/insanum/gcalcli"; license = licenses.mit; maintainers = with maintainers; [ nocoolnametom ]; inherit version; diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index 71ea8a3d43f..b7b90448e4b 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "geoipupdate"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1bypanvrkcqp8rk84cv2569671irgaf3cy27lcrknyina4pdvir5"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 5db328072e4..9c05e984720 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -33,7 +33,7 @@ perlPackages.buildPerlPackage rec { meta = { description = "Downloads TV and radio from BBC iPlayer"; license = licenses.gpl3Plus; - homepage = https://squarepenguin.co.uk/; + homepage = "https://squarepenguin.co.uk/"; platforms = platforms.all; maintainers = with maintainers; [ rika ]; }; diff --git a/pkgs/applications/misc/getxbook/default.nix b/pkgs/applications/misc/getxbook/default.nix index aa901a7ba51..8ac0b000c46 100644 --- a/pkgs/applications/misc/getxbook/default.nix +++ b/pkgs/applications/misc/getxbook/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of tools to download books from Google Books"; - homepage = https://njw.me.uk/getxbook/; + homepage = "https://njw.me.uk/getxbook/"; license = licenses.isc; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index f44cdd0bad7..bc7c66ee531 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { manager, Gtk, or any other theme. ''; - homepage = http://gkrellm.srcbox.net; + homepage = "http://gkrellm.srcbox.net"; license = licenses.gpl3Plus; maintainers = [ ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 4a806cbb183..bfa50447761 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { programs that need to ask a user's password to run another program as another user. ''; - homepage = https://www.nongnu.org/gksu/; + homepage = "https://www.nongnu.org/gksu/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/glava/default.nix b/pkgs/applications/misc/glava/default.nix index 519df42c789..88991bb40a1 100644 --- a/pkgs/applications/misc/glava/default.nix +++ b/pkgs/applications/misc/glava/default.nix @@ -82,7 +82,7 @@ in description = '' OpenGL audio spectrum visualizer ''; - homepage = https://github.com/wacossusca34/glava; + homepage = "https://github.com/wacossusca34/glava"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index b8f13d01424..1f70111c92e 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -125,7 +125,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An easy-to-use database designer and user interface"; - homepage = http://www.glom.org/; + homepage = "http://www.glom.org/"; license = [ licenses.lgpl2 licenses.gpl2 ]; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gmrun/default.nix b/pkgs/applications/misc/gmrun/default.nix index 50dda9510b9..eaee8fb5fb3 100644 --- a/pkgs/applications/misc/gmrun/default.nix +++ b/pkgs/applications/misc/gmrun/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { Also, supports CTRL-R / CTRL-S / "!" for searching through history. Running commands in a terminal with CTRL-Enter. URL handlers. ''; - homepage = https://sourceforge.net/projects/gmrun/; + homepage = "https://sourceforge.net/projects/gmrun/"; license = "GPL"; maintainers = []; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/gmtp/default.nix b/pkgs/applications/misc/gmtp/default.nix index db2193dbd3d..5ed69e7bc69 100644 --- a/pkgs/applications/misc/gmtp/default.nix +++ b/pkgs/applications/misc/gmtp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "A simple MP3 and Media player client for UNIX and UNIX like systems."; - homepage = https://gmtp.sourceforge.io; + homepage = "https://gmtp.sourceforge.io"; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 11bfbaaacd0..7975ee1f299 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for writing an ISO file to multiple USB devices at once"; - homepage = https://wiki.gnome.org/Apps/MultiWriter; + homepage = "https://wiki.gnome.org/Apps/MultiWriter"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 01f5af339ff..da39a440f33 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Recipe management application for GNOME"; - homepage = https://wiki.gnome.org/Apps/Recipes; + homepage = "https://wiki.gnome.org/Apps/Recipes"; maintainers = gnome3.maintainers; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock index 6a705b6a9d8..4759cdcf573 100644 --- a/pkgs/applications/misc/gollum/Gemfile.lock +++ b/pkgs/applications/misc/gollum/Gemfile.lock @@ -1,59 +1,106 @@ GEM remote: https://rubygems.org/ specs: - charlock_holmes (0.7.7) - diff-lcs (1.3) - gemojione (3.3.0) + backports (3.17.0) + concurrent-ruby (1.1.6) + crass (1.0.6) + execjs (2.7.0) + ffi (1.12.2) + gemojione (4.3.2) json - github-markup (1.7.0) - gitlab-grit (2.8.3) - charlock_holmes (~> 0.7) - diff-lcs (~> 1.1) - mime-types (>= 1.16, < 3) - posix-spawn (~> 0.3) - gollum (4.1.4) - gemojione (~> 3.2) - gollum-lib (~> 4.2, >= 4.2.10) - kramdown (~> 1.9.0) + github-markup (3.0.4) + gollum (5.0.1) + gemojione (~> 4.1) + gollum-lib (~> 5.0) + kramdown (~> 2.1.0) + kramdown-parser-gfm (~> 1.0.0) mustache (>= 0.99.5, < 1.0.0) - sinatra (~> 1.4, >= 1.4.4) + octicons (~> 8.5) + rss (~> 0.2.9) + sass (~> 3.5) + sinatra (~> 2.0) + sinatra-contrib (~> 2.0) + sprockets (~> 3.7) + sprockets-helpers (~> 1.2) + therubyrhino (~> 2.1.0) + uglifier (~> 3.2) useragent (~> 0.16.2) - gollum-grit_adapter (1.0.1) - gitlab-grit (~> 2.7, >= 2.7.1) - gollum-lib (4.2.10) - gemojione (~> 3.2) - github-markup (~> 1.6) - gollum-grit_adapter (~> 1.0) - nokogiri (>= 1.6.1, < 2.0) - rouge (~> 2.1) - sanitize (~> 2.1.1, >= 2.1.1) - stringex (~> 2.6) + gollum-lib (5.0.3) + gemojione (~> 4.1) + github-markup (~> 3.0) + gollum-rugged_adapter (~> 0.99.4, >= 0.99.4) + loofah (~> 2.3) + nokogiri (~> 1.8) + octicons (~> 8.5) + rouge (~> 3.1) twitter-text (= 1.14.7) + gollum-rugged_adapter (0.99.4) + mime-types (>= 1.15) + rugged (~> 0.99) json (2.3.0) - kramdown (1.9.0) - mime-types (2.99.3) + kramdown (2.1.0) + kramdown-parser-gfm (1.0.1) + kramdown (~> 2.0) + loofah (2.5.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2019.1009) mini_portile2 (2.4.0) + multi_json (1.14.1) mustache (0.99.8) - nokogiri (1.10.8) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - posix-spawn (0.3.13) - rack (1.6.13) - rack-protection (1.5.5) + octicons (8.5.0) + nokogiri (>= 1.6.3.1) + rack (2.2.2) + rack-protection (2.0.8.1) rack - rouge (2.2.1) - sanitize (2.1.1) - nokogiri (>= 1.4.4) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) - stringex (2.8.5) + rb-fsevent (0.10.3) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.4) + rouge (3.17.0) + rss (0.2.9) + rexml + ruby2_keywords (0.0.2) + rugged (0.99.0) + sass (3.7.4) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sinatra (2.0.8.1) + mustermann (~> 1.0) + rack (~> 2.0) + rack-protection (= 2.0.8.1) + tilt (~> 2.0) + sinatra-contrib (2.0.8.1) + backports (>= 2.8.2) + multi_json + mustermann (~> 1.0) + rack-protection (= 2.0.8.1) + sinatra (= 2.0.8.1) + tilt (~> 2.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-helpers (1.2.3) + sprockets (>= 2.2) + therubyrhino (2.1.2) + therubyrhino_jar (>= 1.7.4, < 1.7.9) + therubyrhino_jar (1.7.8) tilt (2.0.10) twitter-text (1.14.7) unf (~> 0.1.0) + uglifier (3.2.0) + execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext - unf_ext (0.0.7.6) + unf_ext (0.0.7.7) useragent (0.16.10) PLATFORMS @@ -63,4 +110,4 @@ DEPENDENCIES gollum BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix index 251e84f04c3..9005f38f563 100644 --- a/pkgs/applications/misc/gollum/default.nix +++ b/pkgs/applications/misc/gollum/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "gollum"; - # nix-shell -p bundix icu zlib + # nix-shell -p bundix icu zlib cmake pkg-config openssl version = (import ./gemset.nix).gollum.version; nativeBuildInputs = [ makeWrapper ]; @@ -20,13 +20,16 @@ stdenv.mkDerivation rec { mkdir -p $out/bin makeWrapper ${env}/bin/gollum $out/bin/gollum \ --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} + makeWrapper ${env}/bin/gollum-migrate-tags $out/bin/gollum-migrate-tags \ + --prefix PATH ":" ${stdenv.lib.makeBinPath [ git ]} ''; passthru.updateScript = bundlerUpdateScript "gollum"; meta = with stdenv.lib; { - description = "A simple, Git-powered wiki"; - homepage = https://github.com/gollum/gollum; + description = "A simple, Git-powered wiki with a sweet API and local frontend"; + homepage = "https://github.com/gollum/gollum"; + changelog = "https://github.com/gollum/gollum/blob/v${version}/HISTORY.md"; license = licenses.mit; maintainers = with maintainers; [ jgillich primeos nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix index 7ce1d853f36..3febcea2f9a 100644 --- a/pkgs/applications/misc/gollum/gemset.nix +++ b/pkgs/applications/misc/gollum/gemset.nix @@ -1,88 +1,107 @@ { - charlock_holmes = { + backports = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hybw8jw9ryvz5zrki3gc9r88jqy373m6v46ynxsdzv1ysiyr40p"; + sha256 = "13ywgyyxzlgks7nb17gwqjmdqjjmhc8si3iliv8jhf51lb3s865v"; type = "gem"; }; - version = "0.7.7"; + version = "3.17.0"; }; - diff-lcs = { + concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.3"; + version = "1.1.6"; }; - gemojione = { - dependencies = ["json"]; + crass = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ayk8r147k1s38nj18pwk76npx1p7jhi86silk800nj913pjvrhj"; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; type = "gem"; }; - version = "3.3.0"; + version = "1.0.6"; }; - github-markup = { + execjs = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17g6g18gdjg63k75sfwiskjzl9i0hfcnrkcpb4fwrnb20v3jgswp"; + sha256 = "1yz55sf2nd3l666ms6xr18sm2aggcvmb8qr3v53lr4rir32y1yp1"; type = "gem"; }; - version = "1.7.0"; + version = "2.7.0"; }; - gitlab-grit = { - dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"]; + ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xvcizc4856xlvara1zzwl6j61vxxshzcrdagp58xzfl68vbi63p"; + sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; type = "gem"; }; - version = "2.8.3"; + version = "1.12.2"; }; - gollum = { - dependencies = ["gemojione" "gollum-lib" "kramdown" "mustache" "sinatra" "useragent"]; + gemojione = { + dependencies = ["json"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ik1b0f73lcxfwfml1h84dp6br79g0z9v6x54wvl46n9d1ndrhl7"; + sha256 = "097mrsahv1h67kjrk1cpiqc1cbrfgvlp2rqwmzdzxrq0kx50461w"; type = "gem"; }; - version = "4.1.4"; + version = "4.3.2"; }; - gollum-grit_adapter = { - dependencies = ["gitlab-grit"]; + github-markup = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0fcibm63v1afc0fj5rki0mm51m7nndil4cjcjjvkh3yigfn4nr4b"; + sha256 = "14991x92v8s60hfqv7162jfmdqa20fifn2bz0km3k5cgi01pf9rs"; type = "gem"; }; - version = "1.0.1"; + version = "3.0.4"; + }; + gollum = { + dependencies = ["gemojione" "gollum-lib" "kramdown" "kramdown-parser-gfm" "mustache" "octicons" "rss" "sass" "sinatra" "sinatra-contrib" "sprockets" "sprockets-helpers" "therubyrhino" "uglifier" "useragent"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f9p1230xmrvcb7ii2gkcvhpgcaqvvd47gy3c58nn730jkv471dr"; + type = "gem"; + }; + version = "5.0.1"; }; gollum-lib = { - dependencies = ["gemojione" "github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex" "twitter-text"]; + dependencies = ["gemojione" "github-markup" "gollum-rugged_adapter" "loofah" "nokogiri" "octicons" "rouge" "twitter-text"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1699wiir6f2a8yawk3qg0xn3zdc10mz783v53ri1ivfnzdrm3dvf"; + sha256 = "0r59fyf7i4rlp6wj9ilnqd9pmgpkafv0yl4jmrxa6hr2p4cmnf1g"; type = "gem"; }; - version = "4.2.10"; + version = "5.0.3"; + }; + gollum-rugged_adapter = { + dependencies = ["mime-types" "rugged"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0016yfac3b3sy34k9wrqg422mjm8cpd1jd1m4gdn4x2d4jxhxkzq"; + type = "gem"; + }; + version = "0.99.4"; }; json = { groups = ["default"]; @@ -99,20 +118,53 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12sral2xli39mnr4b9m2sxdlgam4ni0a1mkxawc5311z107zj3p0"; + sha256 = "1dl840bvx8d9nq6lg3mxqyvbiqnr6lk3jfsm6r8zhz7p5srmd688"; + type = "gem"; + }; + version = "2.1.0"; + }; + kramdown-parser-gfm = { + dependencies = ["kramdown"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ykna2apphld9llmjnz0210fipp4fkmj2ja18l7iz9xikg0h0ihi"; type = "gem"; }; - version = "1.9.0"; + version = "1.0.1"; + }; + loofah = { + dependencies = ["crass" "nokogiri"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; + type = "gem"; + }; + version = "2.5.0"; }; mime-types = { + dependencies = ["mime-types-data"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9"; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; type = "gem"; }; - version = "2.99.3"; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh"; + type = "gem"; + }; + version = "3.2019.1009"; }; mini_portile2 = { groups = ["default"]; @@ -124,6 +176,16 @@ }; version = "2.4.0"; }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + type = "gem"; + }; + version = "1.14.1"; + }; mustache = { groups = ["default"]; platforms = []; @@ -134,36 +196,48 @@ }; version = "0.99.8"; }; + mustermann = { + dependencies = ["ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + type = "gem"; + }; + version = "1.1.1"; + }; nokogiri = { dependencies = ["mini_portile2"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.8"; + version = "1.10.9"; }; - posix-spawn = { + octicons = { + dependencies = ["nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pmxmpins57qrbr31bs3bm7gidhaacmrp4md6i962gvpq4gyfcjw"; + sha256 = "0fy6shpfmla58dxx3kb2zi1hs7vmdw6pqrksaa8yrva05s4l3y75"; type = "gem"; }; - version = "0.3.13"; + version = "8.5.0"; }; rack = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wr1f3g9rc9i8svfxa9cijajl1661d817s56b2w7rd572zwn0zi0"; + sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp"; type = "gem"; }; - version = "1.6.13"; + version = "2.2.2"; }; rack-protection = { dependencies = ["rack"]; @@ -171,52 +245,169 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0my0wlw4a5l3hs79jkx2xzv7djhajgf8d28k8ai1ddlnxxb0v7ss"; + sha256 = "1zyj97bfr1shfgwk4ddmdbw0mdkm4qdyh9s1hl0k7accf3kxx1yi"; + type = "gem"; + }; + version = "2.0.8.1"; + }; + rb-fsevent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; type = "gem"; }; - version = "1.5.5"; + version = "0.10.3"; + }; + rb-inotify = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jm76h8f8hji38z3ggf4bzi8vps6p7sagxn3ab57qc0xyga64005"; + type = "gem"; + }; + version = "0.10.1"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; + type = "gem"; + }; + version = "3.2.4"; }; rouge = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02kpahk5nkc33yxnn75649kzxaz073wvazr2zyg491nndykgnvcs"; + sha256 = "0xl7k5paf66p57sphm4nfa4k86yf93lhdzzr0cv0l4divq12g2pr"; type = "gem"; }; - version = "2.2.1"; + version = "3.17.0"; }; - sanitize = { - dependencies = ["nokogiri"]; + rss = { + dependencies = ["rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b1zx07kr64kkpm4lssd4r1a1qyr829ppmfl85i4adcvx9mqfid0"; + type = "gem"; + }; + version = "0.2.9"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17pcc0wgvh3ikrkr7bm3nx0qhyiqwidd13ij0fa50k7gsbnr2p0l"; + type = "gem"; + }; + version = "0.0.2"; + }; + rugged = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04rkxwzaa6897da3mnm70g720gpxwyh71krfn6ag1dkk80x8a8yz"; + type = "gem"; + }; + version = "0.99.0"; + }; + sass = { + dependencies = ["sass-listen"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p95lhs0jza5l7hqci1isflxakz83xkj97lkvxl919is0lwhv2w0"; + type = "gem"; + }; + version = "3.7.4"; + }; + sass-listen = { + dependencies = ["rb-fsevent" "rb-inotify"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12ip1d80r0dgc621qn7c32bk12xxgkkg3w6q21s1ckxivcd7r898"; + sha256 = "0xw3q46cmahkgyldid5hwyiwacp590zj2vmswlll68ryvmvcp7df"; type = "gem"; }; - version = "2.1.1"; + version = "4.0.0"; }; sinatra = { - dependencies = ["rack" "rack-protection" "tilt"]; + dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0riy3hwjab1mr73jcqx3brmbmwspnw3d193j06a5f0fy1w35z15q"; + type = "gem"; + }; + version = "2.0.8.1"; + }; + sinatra-contrib = { + dependencies = ["backports" "multi_json" "mustermann" "rack-protection" "sinatra" "tilt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mmrfm4pqh98f3irjpkvfpazhcx6q42bnx6bbms9dqvmck3mid28"; + type = "gem"; + }; + version = "2.0.8.1"; + }; + sprockets = { + dependencies = ["concurrent-ruby" "rack"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "182jw5a0fbqah5w9jancvfmjbk88h8bxdbwnl4d3q809rpxdg8ay"; + type = "gem"; + }; + version = "3.7.2"; + }; + sprockets-helpers = { + dependencies = ["sprockets"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hy67dwz76n5db00d9n3qy59ici96c2g25c9xpmp2nh8ilvha338"; + type = "gem"; + }; + version = "1.2.3"; + }; + therubyrhino = { + dependencies = ["therubyrhino_jar"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byxzl7rx3ki0xd7aiv1x8mbah7hzd8f81l65nq8857kmgzj1jqq"; + sha256 = "034mzpkxm3zjsi4rwa45dhhgq2b9vkabs5bnzbl1d3ka7210b3fc"; type = "gem"; }; - version = "1.4.8"; + version = "2.1.2"; }; - stringex = { + therubyrhino_jar = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15ns7j5smw04w6w7bqd5mm2qcl7w9lhwykyb974i4isgg9yc23ys"; + sha256 = "149a5lsvn2n7k7vcfs77n836q1alv8yjh0503sf9cs65p974ah25"; type = "gem"; }; - version = "2.8.5"; + version = "1.7.8"; }; tilt = { groups = ["default"]; @@ -239,6 +430,17 @@ }; version = "1.14.7"; }; + uglifier = { + dependencies = ["execjs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wmqvn4xncw6h3d5gp2a44170zwxfyj3iq4rsjp16zarvzbdmgnz"; + type = "gem"; + }; + version = "3.2.0"; + }; unf = { dependencies = ["unf_ext"]; groups = ["default"]; @@ -255,10 +457,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; type = "gem"; }; - version = "0.0.7.6"; + version = "0.0.7.7"; }; useragent = { groups = ["default"]; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 181273752ea..dff69130c18 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A world sphere viewer"; - homepage = http://earth.google.com; + homepage = "http://earth.google.com"; license = licenses.unfree; maintainers = with maintainers; [ markus1189 ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index 41cdf267f5d..350cb56695f 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { # so we explicitly disable them to avoid breaking the hash # especially as the externals appear to be unused src = fetchsvn { - url = http://svn.openstreetmap.org/applications/rendering/gosmore; + url = "http://svn.openstreetmap.org/applications/rendering/gosmore"; sha256 = "0qsckpqx7i7f8gkqhkzdamr65250afk1rpnh3nbman35kdv3dsxi"; rev = version; ignoreExternals = true; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open Street Map viewer"; - homepage = https://sourceforge.net/projects/gosmore/; + homepage = "https://sourceforge.net/projects/gosmore/"; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index a4889014412..cd7b724a1d7 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical user interface for the GnuPG"; - homepage = https://www.gnupg.org/related_software/gpa/; + homepage = "https://www.gnupg.org/related_software/gpa/"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/gpg-mdp/default.nix b/pkgs/applications/misc/gpg-mdp/default.nix index 9954ff660ad..cf3d6fe9e93 100644 --- a/pkgs/applications/misc/gpg-mdp/default.nix +++ b/pkgs/applications/misc/gpg-mdp/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation { pname = "gpg-mdp"; inherit version; meta = { - homepage = https://tamentis.com/projects/mdp/; + homepage = "https://tamentis.com/projects/mdp/"; license = [stdenv.lib.licenses.isc]; description = "Manage your passwords with GnuPG and a text editor"; }; diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index d06970e8d07..1235a41ffc7 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { digital cameras. Through libgphoto2, it supports PTP, MTP, and much more.. ''; - homepage = http://www.gphoto.org/; + homepage = "http://www.gphoto.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.jcumming ]; diff --git a/pkgs/applications/misc/gphoto2/gphotofs.nix b/pkgs/applications/misc/gphoto2/gphotofs.nix index c1c2a44bd7f..668706ca389 100644 --- a/pkgs/applications/misc/gphoto2/gphotofs.nix +++ b/pkgs/applications/misc/gphoto2/gphotofs.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fuse FS to mount a digital camera"; - homepage = http://www.gphoto.org/; + homepage = "http://www.gphoto.org/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = with licenses; [ lgpl2 gpl2 ]; diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index 9d244ca18f3..ef4c732ef52 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip; + url = "https://sources.debian.net/data/main/g/gpsbabel/1.5.3-2/debian/patches/use_minizip"; sha256 = "03fpsmlx1wc48d1j405zkzp8j64hcp0z72islf4mk1immql3ibcr"; }) ]; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { process data that may (or may not be) placed on a map, such as waypoints, tracks, and routes. ''; - homepage = http://www.gpsbabel.org/; + homepage = "http://www.gpsbabel.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 9c0dc48d42e..63ca213c2c4 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,16 +1,16 @@ -{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: stdenv.mkDerivation rec { pname = "gpsprune"; - version = "19.2"; + version = "20"; src = fetchurl { url = "https://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "1q2kpkkh75b9l1x7fkmv88s8k84gzcdnrg5sgf8ih0zrp49lawg9"; + sha256 = "1i9p6h98azgradrrkcwx18zwz4c6zkxp4bfykpa2imi1z3ry5q2b"; }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre8 ]; + buildInputs = [ jdk11 ]; desktopItem = makeDesktopItem { name = "gpsprune"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildCommand = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar - makeWrapper ${jre8}/bin/java $out/bin/gpsprune \ + makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \ --add-flags "-jar $out/share/java/gpsprune.jar" mkdir -p $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Application for viewing, editing and converting GPS coordinate data"; - homepage = https://activityworkshop.net/software/gpsprune/; + homepage = "https://activityworkshop.net/software/gpsprune/"; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 04ab062c1a1..64296688c93 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; meta = with stdenv.lib; { - homepage = https://blog.sarine.nl/tag/gpxviewer/; + homepage = "https://blog.sarine.nl/tag/gpxviewer/"; description = "Simple tool to visualize tracks and waypoints stored in a gpx file"; platforms = with platforms; linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/gpx/default.nix b/pkgs/applications/misc/gpx/default.nix index a341a212a37..dcf022fc445 100644 --- a/pkgs/applications/misc/gpx/default.nix +++ b/pkgs/applications/misc/gpx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Gcode to x3g conversion postprocessor"; - homepage = https://github.com/markwal/GPX/; + homepage = "https://github.com/markwal/GPX/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.leo60228 ]; diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 907a198ee3d..eeb76091aa8 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.25"; + version = "7.27"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0lml3hz2zxljl9j5wnh7bn9bj8k9v3wf6bk3g77x9nnarsmw0fcx"; + sha256 = "1yillax9npmz912c6qa6yijrqrbm1gaz2h69v2ab9fb127qv4anj"; }; nativeBuildInputs = [ qmake qttools ]; diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 84be50ccb5e..e5a2b87f16e 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -58,7 +58,7 @@ in buildPythonApplication rec { meta = with stdenv.lib; { description = "Genealogy software"; - homepage = https://gramps-project.org; + homepage = "https://gramps-project.org"; license = licenses.gpl2; maintainers = with maintainers; [ joncojonathan ]; }; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index d86db7adb9d..4e888f4faac 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/schandinat/green/; + homepage = "https://github.com/schandinat/green/"; description = "Viewer for PDF files, uses SDL and libpoppler"; platforms = platforms.unix; diff --git a/pkgs/applications/misc/gremlin-console/default.nix b/pkgs/applications/misc/gremlin-console/default.nix index 87e636b9c03..a4932943fa2 100644 --- a/pkgs/applications/misc/gremlin-console/default.nix +++ b/pkgs/applications/misc/gremlin-console/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://tinkerpop.apache.org/; + homepage = "https://tinkerpop.apache.org/"; description = "Console of the Apache TinkerPop graph computing framework"; license = licenses.asl20; maintainers = [ maintainers.lewo ]; diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index b70901bac81..e64ae08037a 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK-based audio CD player/ripper"; - homepage = http://nostatic.org/grip; + homepage = "http://nostatic.org/grip"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber peti ]; diff --git a/pkgs/applications/misc/gsctl/default.nix b/pkgs/applications/misc/gsctl/default.nix index b84053b94ad..e80f43f5bd9 100644 --- a/pkgs/applications/misc/gsctl/default.nix +++ b/pkgs/applications/misc/gsctl/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "The Giant Swarm command line interface"; - homepage = https://github.com/giantswarm/gsctl; + homepage = "https://github.com/giantswarm/gsctl"; license = licenses.asl20; maintainers = with maintainers; [ joesalisbury ]; }; diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix index ea78331e476..e83e349b21c 100644 --- a/pkgs/applications/misc/gsimplecal/default.nix +++ b/pkgs/applications/misc/gsimplecal/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = http://dmedvinsky.github.io/gsimplecal/; + homepage = "http://dmedvinsky.github.io/gsimplecal/"; description = "Lightweight calendar application written in C++ using GTK"; longDescription = '' gsimplecal was intentionally made for use with tint2 panel in the diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix index 9b8d6a7f976..21ad7d757a1 100644 --- a/pkgs/applications/misc/gtk2fontsel/default.nix +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { Font selection tool similar to xfontsel implemented using GTK 2. Trivial, but useful nonetheless. ''; - homepage = http://gtk2fontsel.sourceforge.net/; - downloadPage = https://sourceforge.net/projects/gtk2fontsel/; + homepage = "http://gtk2fontsel.sourceforge.net/"; + downloadPage = "https://sourceforge.net/projects/gtk2fontsel/"; license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index f94f8f5dd70..accf62c0c46 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - homepage = https://www.gnu.org/software/gv/; + homepage = "https://www.gnu.org/software/gv/"; description = "PostScript/PDF document viewer"; longDescription = '' diff --git a/pkgs/applications/misc/gxneur/default.nix b/pkgs/applications/misc/gxneur/default.nix index c44523a8b75..adabe22c6b6 100644 --- a/pkgs/applications/misc/gxneur/default.nix +++ b/pkgs/applications/misc/gxneur/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gxneur-0.20.0"; src = fetchurl { - url = https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz; + url = "https://github.com/AndrewCrewKuznetsov/xneur-devel/raw/f66723feb272c68f7c22a8bf0dbcafa5e3a8a5ee/dists/0.20.0/gxneur_0.20.0.orig.tar.gz"; sha256 = "0avmhdcj0hpr55fc0iih8fjykmdhn34c8mwdnqvl8jh4nhxxchxr"; }; diff --git a/pkgs/applications/misc/haxor-news/default.nix b/pkgs/applications/misc/haxor-news/default.nix index 7353078600d..98f84ca68b8 100644 --- a/pkgs/applications/misc/haxor-news/default.nix +++ b/pkgs/applications/misc/haxor-news/default.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/donnemartin/haxor-news; + homepage = "https://github.com/donnemartin/haxor-news"; description = "Browse Hacker News like a haxor"; license = licenses.asl20; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/hdate/default.nix b/pkgs/applications/misc/hdate/default.nix index 989dfb886ec..c97a67c0bd3 100644 --- a/pkgs/applications/misc/hdate/default.nix +++ b/pkgs/applications/misc/hdate/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { description = "Hebrew calendar and solar astronomical times library and utilities"; - homepage = https://sourceforge.net/projects/libhdate/; + homepage = "https://sourceforge.net/projects/libhdate/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ CharlesHD ]; }; diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index 8bae8ce373c..32c8c696730 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; - homepage = https://www.gnu.org/software/hello/manual/; + homepage = "https://www.gnu.org/software/hello/manual/"; changelog = "https://git.savannah.gnu.org/cgit/hello.git/plain/NEWS?h=v${version}"; license = licenses.gpl3Plus; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index b3fb84340f2..8a8f80f5797 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/DarthSim/; + homepage = "https://github.com/DarthSim/"; description = "Process manager for Procfile-based applications"; license = with licenses; [ mit ]; maintainers = [ maintainers.sveitser ]; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index 279791561d9..51b08af23c5 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "3D animation application software"; - homepage = https://www.sidefx.com; + homepage = "https://www.sidefx.com"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.canndrew ]; diff --git a/pkgs/applications/misc/hovercraft/default.nix b/pkgs/applications/misc/hovercraft/default.nix index ba23078bba9..edb8114e4a4 100644 --- a/pkgs/applications/misc/hovercraft/default.nix +++ b/pkgs/applications/misc/hovercraft/default.nix @@ -28,7 +28,7 @@ buildPythonApplication rec { meta = with lib; { description = "Makes impress.js presentations from reStructuredText"; - homepage = https://github.com/regebro/hovercraft; + homepage = "https://github.com/regebro/hovercraft"; license = licenses.mit; maintainers = with maintainers; [ goibhniu makefu ]; }; diff --git a/pkgs/applications/misc/hr/default.nix b/pkgs/applications/misc/hr/default.nix index 437c42b0331..91a66bc7378 100644 --- a/pkgs/applications/misc/hr/default.nix +++ b/pkgs/applications/misc/hr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/LuRsT/hr; + homepage = "https://github.com/LuRsT/hr"; description = "A horizontal bar for your terminal"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index 31ecfccd584..b1e740fb760 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/dvorka/hstr; + 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 ]; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index b2997ece5d5..bbe05e0396b 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Time tracking software"; - homepage = https://hubstaff.com/; + homepage = "https://hubstaff.com/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michalrus srghma ]; diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 9509e895109..46abf369616 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hugo"; - version = "0.68.1"; + version = "0.68.3"; + + goPackagePath = "github.com/gohugoio/hugo"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1h7zymvxk71jq51az4qnldk54jl9sd4zwkn5r5323xzjffwzny82"; + sha256 = "138sv4q6f1szpkrrxnzhvxr6rrznhq1d7in0zba1pifsw3yimqq4"; }; modSha256 = "04vzm65kbj9905z4cf5yh6yc6g3b0pd5vc00lrxw84pwgqgc0ykb"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlags = [ "-tags" "extended" ]; subPackages = [ "." ]; diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix index f21675e60b2..1535b1a2568 100644 --- a/pkgs/applications/misc/hyper/default.nix +++ b/pkgs/applications/misc/hyper/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = with lib; { description = "A terminal built on web technologies"; - homepage = https://hyper.is/; + homepage = "https://hyper.is/"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index 3ee4fd8259a..7b642dffa50 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IceSL is a GPU-accelerated procedural modeler and slicer for 3D printing."; - homepage = http://shapeforge.loria.fr/icesl/index.html; + homepage = "http://shapeforge.loria.fr/icesl/index.html"; license = licenses.inria-icesl; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ mgttlinger ]; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 8b908f1f9cf..1515b4b0f99 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { meta = { description = "Wiki compiler, storing pages and history in a RCS"; - homepage = http://ikiwiki.info/; + homepage = "http://ikiwiki.info/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.peti ]; diff --git a/pkgs/applications/misc/img2pdf/default.nix b/pkgs/applications/misc/img2pdf/default.nix index 902e9268f72..972e3b7e7b6 100644 --- a/pkgs/applications/misc/img2pdf/default.nix +++ b/pkgs/applications/misc/img2pdf/default.nix @@ -4,11 +4,11 @@ with python3Packages; buildPythonApplication rec { pname = "img2pdf"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "1ksn33j9d9df04n4jx7dli70d700rafbm37gjaz6lwsswrzc2xwx"; + sha256 = "0jgfk191vvxn2r6bbdknvw5v510mx9g0xrgnmcghaxkv65zjnj0b"; }; doCheck = false; # needs pdfrw @@ -19,7 +19,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Convert images to PDF via direct JPEG inclusion"; - homepage = https://gitlab.mister-muffin.de/josch/img2pdf; + homepage = "https://gitlab.mister-muffin.de/josch/img2pdf"; license = licenses.lgpl2; platforms = platforms.unix; maintainers = [ maintainers.veprbl ]; diff --git a/pkgs/applications/misc/iterm2/default.nix b/pkgs/applications/misc/iterm2/default.nix index cabe306defc..e273eda45c3 100644 --- a/pkgs/applications/misc/iterm2/default.nix +++ b/pkgs/applications/misc/iterm2/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A replacement for Terminal and the successor to iTerm"; - homepage = https://www.iterm2.com/; + homepage = "https://www.iterm2.com/"; license = licenses.gpl2; maintainers = with maintainers; [ tricktron ]; platforms = platforms.darwin; diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index c8951059d4c..2d7dca36d20 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.jbidwatcher.com/; + homepage = "http://www.jbidwatcher.com/"; description = "Monitor and snipe Ebay auctions"; license = "LGPL"; diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock index 332f1bbf197..b421ea71795 100644 --- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock @@ -98,4 +98,4 @@ DEPENDENCIES jemoji BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/misc/jekyll/default.nix b/pkgs/applications/misc/jekyll/default.nix index 4d4dd248bc5..111b0a8867a 100644 --- a/pkgs/applications/misc/jekyll/default.nix +++ b/pkgs/applications/misc/jekyll/default.nix @@ -46,7 +46,7 @@ in bundlerApp { web server. Jekyll is the engine behind GitHub Pages, which you can use to host sites right from your GitHub repositories. ''; - homepage = https://jekyllrb.com/; + homepage = "https://jekyllrb.com/"; license = licenses.mit; maintainers = with maintainers; [ primeos pesterhazy ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock index ebde3c93e21..51a835e4b9f 100644 --- a/pkgs/applications/misc/jekyll/full/Gemfile.lock +++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock @@ -149,4 +149,4 @@ DEPENDENCIES yajl-ruby (~> 1.4) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index 3561fcde839..134354de40b 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { # Debian sources src = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz; + url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3.orig.tar.gz"; sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv"; }; patches = [ (fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-4.diff.gz; + url = "http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-4.diff.gz"; sha256 = "03zsh57fijciiv23lf55k6fbfhhzm866xjhx83x54v5s1g2h6m8y"; }) ./sizewidth.patch @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Download utility that can fetch files from several sources simultaneously"; - homepage = http://atterer.net/jigdo/; + homepage = "http://atterer.net/jigdo/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 4219851fc9d..8c066ddf0b8 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -40,7 +40,7 @@ in appimageTools.wrapType2 rec { applications directly or from your own text editor. The notes are in Markdown format. ''; - homepage = https://joplin.cozic.net/; + homepage = "https://joplin.cozic.net/"; license = licenses.mit; maintainers = with maintainers; [ rafaelgg raquelgb ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index 4a47437b249..eec7a066a88 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "josm"; - version = "15937"; + version = "16239"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1mwrmhs5k3b3pvl3cmq78h8gh8zna06l4sym1a4vvlcx6j26a01f"; + sha256 = "041n81mnd587043f8wwjv8ckbx0hlsqf3pc7hzbns1y89xdghms1"; }; buildInputs = [ jdk11 makeWrapper ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extensible editor for OpenStreetMap"; - homepage = https://josm.openstreetmap.de/; + homepage = "https://josm.openstreetmap.de/"; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/jotta-cli/default.nix b/pkgs/applications/misc/jotta-cli/default.nix index 1756aefe19a..70ca28b4678 100644 --- a/pkgs/applications/misc/jotta-cli/default.nix +++ b/pkgs/applications/misc/jotta-cli/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Jottacloud CLI"; - homepage = https://www.jottacloud.com/; - downloadPage = https://repo.jotta.us/archives/linux/; + homepage = "https://www.jottacloud.com/"; + downloadPage = "https://repo.jotta.us/archives/linux/"; maintainers = with maintainers; [ evenbrenden ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index 1aece5eb4e2..d30e5d96df4 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libjpeg ]; meta = with stdenv.lib; { - homepage = https://csl.name/jp2a/; + homepage = "https://csl.name/jp2a/"; description = "A small utility that converts JPG images to ASCII"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/misc/jrnl/default.nix b/pkgs/applications/misc/jrnl/default.nix index 3260f6a5069..992b981c003 100644 --- a/pkgs/applications/misc/jrnl/default.nix +++ b/pkgs/applications/misc/jrnl/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://maebert.github.io/jrnl/; + homepage = "http://maebert.github.io/jrnl/"; description = "A simple command line journal application that stores your journal in a plain text file"; license = licenses.mit; maintainers = with maintainers; [ zalakain ]; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 69d78575e2a..8899654cc4c 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimizes PDF/DJVU files for mobile e-readers (e.g. the Kindle) and smartphones"; - homepage = http://www.willus.com/k2pdfopt; + homepage = "http://www.willus.com/k2pdfopt"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ bosu danielfullmer ]; diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index b790fb9e6c4..9e2857c960f 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Kanban project management software"; - homepage = https://kanboard.net; + homepage = "https://kanboard.net"; license = licenses.mit; maintainers = with maintainers; [ fpletz lheckemann ]; }; diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix index e8bdcb37118..c3d2feb2fed 100644 --- a/pkgs/applications/misc/kdeconnect/default.nix +++ b/pkgs/applications/misc/kdeconnect/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { meta = with lib; { description = "KDE Connect provides several features to integrate your phone and your computer"; - homepage = https://community.kde.org/KDEConnect; + homepage = "https://community.kde.org/KDEConnect"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix index 76ea9df78c2..f9dbf14624f 100644 --- a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -17,7 +17,7 @@ let meta = { description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP"; - homepage = https://github.com/pfn/keepasshttp; + homepage = "https://github.com/pfn/keepasshttp"; platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix index 562835159eb..3d41c45f6dc 100644 --- a/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keepassrpc/default.nix @@ -12,7 +12,7 @@ let meta = with stdenv.lib; { description = "The KeePassRPC plugin that needs to be installed inside KeePass in order for Kee to be able to connect your browser to your passwords"; - homepage = https://github.com/kee-org/keepassrpc; + homepage = "https://github.com/kee-org/keepassrpc"; platforms = [ "x86_64-linux" ]; license = licenses.gpl2; maintainers = with maintainers; [ mjanczyk svsdep mgregoire ]; diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index b954d2d3cdb..1d668e039bd 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -107,7 +107,7 @@ with builtins; buildDotnetPackage rec { meta = { description = "GUI password manager with strong cryptography"; - homepage = http://www.keepass.info/; + homepage = "http://www.keepass.info/"; maintainers = with stdenv.lib.maintainers; [ amorsillo obadz joncojonathan jraygauthier ]; platforms = with stdenv.lib.platforms; all; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix index 36734a97516..fdd11db509f 100644 --- a/pkgs/applications/misc/keepassx/2.0.nix +++ b/pkgs/applications/misc/keepassx/2.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = https://www.keepassx.org/; + homepage = "https://www.keepassx.org/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ qknight ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index c6bcd56167c..0ed1cd27be0 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation rec { meta = { 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/; + homepage = "https://keepassxc.org/"; license = licenses.gpl2; maintainers = with maintainers; [ jonafato ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/misc/keepassx/default.nix b/pkgs/applications/misc/keepassx/default.nix index 7adbcb86c50..d0980001c8f 100644 --- a/pkgs/applications/misc/keepassx/default.nix +++ b/pkgs/applications/misc/keepassx/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Qt password manager compatible with its Win32 and Pocket PC versions"; - homepage = https://www.keepassx.org/; + homepage = "https://www.keepassx.org/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ qknight ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index c435eaefed5..ae9576e6cbc 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -61,7 +61,7 @@ with python3.pkgs; buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://lostpackets.de/khal/; + homepage = "http://lostpackets.de/khal/"; description = "CLI calendar application"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 1c6708c51c9..0d3c9d0cbd0 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,12 +1,12 @@ { stdenv, glibcLocales, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.15.1"; + version = "0.16.0"; pname = "khard"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "18ba2xgfq8sw0bg6xmlfjpizid1hkzgswcfcc54gl21y2dwfda2w"; + sha256 = "0a1zpkq0pplmn9flxczq2wafs6zc07r9xx9qi6dqmyv9mhy9d87f"; }; propagatedBuildInputs = with python3.pkgs; [ @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = { - homepage = https://github.com/scheibler/khard; + homepage = "https://github.com/scheibler/khard"; description = "Console carddav client"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index 6860f04f99c..d1682227920 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.17.1"; + version = "0.17.2"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "1ydli1phgcy17iz6jxgixn8yc86dp8q2yfxk08c8lwh7gxjnjz7f"; + sha256 = "0xiwz89ynhh8aj0c9jbqfsxf129hnzs0gz4bzcparnjisq2sh3cq"; }; buildInputs = [ @@ -122,7 +122,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/kovidgoyal/kitty; + homepage = "https://github.com/kovidgoyal/kitty"; description = "A modern, hackable, featureful, OpenGL based terminal emulator"; license = licenses.gpl3; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 898186b714b..ff6b1e9de2d 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -9,19 +9,19 @@ with stdenv.lib; let xulrunner64_tar = fetchurl { - url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.tar.bz2; + url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.tar.bz2"; sha256 = "0i3m30gm5z7qmas14id6ypvbmnb2k7jhz8aby2wz5vvv49zqmx3s"; }; xulrunnersdk64_tar = fetchurl { - url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.sdk.tar.bz2; + url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.sdk.tar.bz2"; sha256 = "0z90v7c4mq15g5klmsj8vs2r10fbygj3qzynx4952hkv8ihw8n3a"; }; xulrunner32_tar = fetchurl { - url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.tar.bz2; + url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.tar.bz2"; sha256 = "0yln6pxz8f6b9wm9124sx049z8mgi17lgd63rcv2hnix825y8gjb"; }; xulrunnersdk32_tar = fetchurl { - url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.sdk.tar.bz2; + url = "http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.sdk.tar.bz2"; sha256 = "1h9vcbvf8wgds6i2z20y7krpys0mqsqhv1ijyfljanp6vyll9fvi"; }; @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { meta = { description = "An offline reader for Web content"; - homepage = https://kiwix.org; + homepage = "https://kiwix.org"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ robbinch ]; diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index 7868e74d010..307781931e9 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -2,7 +2,7 @@ let -patch-base = https://github.com/LukeSmithxyz/kjv/commit/; +patch-base = "https://github.com/LukeSmithxyz/kjv/commit/"; add-apocrypha = fetchpatch { url = patch-base + "b92b7622285d10464f9274f11e740bef90705bbc.patch"; diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix new file mode 100644 index 00000000000..78b32f7fca1 --- /dev/null +++ b/pkgs/applications/misc/klayout/default.nix @@ -0,0 +1,63 @@ +{ lib, mkDerivation, fetchFromGitHub, fetchpatch +, python, ruby, qtbase, qtmultimedia, qttools, qtxmlpatterns +, which, perl, makeWrapper, fixDarwinDylibNames +}: + +mkDerivation rec { + pname = "klayout"; + version = "0.26.2"; + + src = fetchFromGitHub { + owner = "KLayout"; + repo = "klayout"; + rev = "v${version}"; + sha256 = "0svyqayvr45snqw0dhx6jpnjhg4qb097pz28s8k1crx5i31nnd94"; + }; + + postPatch = '' + substituteInPlace src/klayout.pri --replace "-Wno-reserved-user-defined-literal" "" + patchShebangs . + ''; + + nativeBuildInputs = [ + which + ]; + + buildInputs = [ + python + ruby + qtbase + qtmultimedia + qttools + qtxmlpatterns + ]; + + buildPhase = '' + runHook preBuild + mkdir -p $out/lib + ./build.sh -qt5 -prefix $out/lib -j$NIX_BUILD_CORES + runHook postBuild + ''; + + postBuild = '' + mkdir $out/bin + mv $out/lib/klayout $out/bin/ + ''; + + NIX_CFLAGS_COMPILE = [ "-Wno-parentheses" ]; + + dontInstall = true; # Installation already happens as part of "build.sh" + + # Fix: "gsiDeclQMessageLogger.cc:126:42: error: format not a string literal + # and no format arguments [-Werror=format-security]" + hardeningDisable = [ "format" ]; + + meta = with lib; { + description = "High performance layout viewer and editor with support for GDS and OASIS"; + license = with licenses; [ gpl3 ]; + homepage = "https://www.klayout.de/"; + platforms = platforms.linux; + maintainers = with maintainers; [ knedlsepp ]; + }; +} + diff --git a/pkgs/applications/misc/kondo/default.nix b/pkgs/applications/misc/kondo/default.nix new file mode 100644 index 00000000000..9df4c59717c --- /dev/null +++ b/pkgs/applications/misc/kondo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "kondo"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "tbillington"; + repo = pname; + rev = "v${version}"; + sha256 = "1rrg0xfm3vn5jh861r4ismrga673g7v6qnzl2v1haflgjhvdazwd"; + }; + + cargoSha256 = "1y7g8gw9hsm997d6i99c3dj2gb8y8cgws5001n85f9bpnlvvmf9y"; + + meta = with stdenv.lib; { + description = "Save disk space by cleaning unneeded files from software projects"; + homepage = "https://github.com/tbillington/kondo"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 8b6b7741c7d..816b352460b 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -25,7 +25,7 @@ in mkDerivation rec { meta = with lib; { description = "A powerful batch renamer for KDE"; - homepage = https://kde.org/applications/utilities/krename/; + homepage = "https://kde.org/applications/utilities/krename/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; inherit (kconfig.meta) platforms; diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 15979def34b..4ae8a99b35a 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -19,7 +19,7 @@ in mkDerivation rec { meta = with lib; { description = "Norton/Total Commander clone for KDE"; license = licenses.gpl2; - homepage = http://www.krusader.org; + homepage = "http://www.krusader.org"; maintainers = with maintainers; [ sander ]; }; diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index ad824b238f8..3fc5099acc2 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "01b2zr2x5hnadkvj687lwi3l6dwq3kdn5y9k4qf1bv0sa4vw6hn9"; + sha256 = "11s9fslr33h3ic14ifr43jphf68jpny8jmhvmrrwcz6w0p3falzw"; name = "${pname}-${version}.tar.xz"; }; diff --git a/pkgs/applications/misc/lenmus/default.nix b/pkgs/applications/misc/lenmus/default.nix index 76abe7c9b4b..532166cf6fb 100644 --- a/pkgs/applications/misc/lenmus/default.nix +++ b/pkgs/applications/misc/lenmus/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { It allows you to focus on specific skills and exercises, on both theory and aural training. The different activities can be customized to meet your needs ''; - homepage = http://www.lenmus.org/; + homepage = "http://www.lenmus.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix index 846ce309842..2bd8bfa99bc 100644 --- a/pkgs/applications/misc/libosmocore/default.nix +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "libosmocore"; - homepage = https://github.com/osmocom/libosmocore; + homepage = "https://github.com/osmocom/libosmocore"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index 7b5b40d65a3..9e651c59d4e 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple flexible popup dialog to run on X"; - homepage = https://github.com/emgram769/lighthouse; + homepage = "https://github.com/emgram769/lighthouse"; license = licenses.mit; maintainers = with maintainers; [ ramkromberg ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix index e9dba4bcf46..28f9625b5b6 100644 --- a/pkgs/applications/misc/lilyterm/default.nix +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -2,40 +2,41 @@ , pkgconfig , autoconf, automake, intltool, gettext , gtk, vte - , flavour ? "stable" }: assert lib.assertOneOf "flavour" flavour [ "stable" "git" ]; let + pname = "lilyterm"; stuff = if flavour == "stable" then rec { version = "0.9.9.4"; src = fetchurl { - url = "https://lilyterm.luna.com.tw/file/lilyterm-${version}.tar.gz"; + url = "https://lilyterm.luna.com.tw/file/${pname}-${version}.tar.gz"; sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; }; } else { - version = "2017-01-06"; + version = "2019-07-25"; src = fetchFromGitHub { owner = "Tetralet"; - repo = "lilyterm"; - rev = "20cce75d34fd24901c9828469d4881968183c389"; - sha256 = "0am0y65674rfqy69q4qz8izb8cq0isylr4w5ychi40jxyp68rkv2"; + repo = pname; + rev = "faf1254f46049edfb1fd6e9191e78b1b23b9c51d"; + sha256 = "054450gk237c62b677365bcwrijr63gd9xm8pv68br371wdzylz7"; }; }; in -stdenv.mkDerivation { - pname = "lilyterm"; +with stdenv.lib; +stdenv.mkDerivation rec { + inherit pname; inherit (stuff) src version; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake intltool gettext gtk vte ]; + nativeBuildInputs = [ pkgconfig autoconf automake intltool gettext ]; + buildInputs = [ gtk vte ]; preConfigure = "sh autogen.sh"; @@ -49,7 +50,7 @@ stdenv.mkDerivation { longDescription = '' LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. ''; - homepage = https://lilyterm.luna.com.tw/; + homepage = "https://lilyterm.luna.com.tw/"; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres Profpatsch ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 25f9b10b1e8..e2ec64932ff 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://repo.or.cz/w/llpp.git; + homepage = "https://repo.or.cz/w/llpp.git"; description = "A MuPDF based PDF pager written in OCaml"; platforms = platforms.linux; maintainers = with maintainers; [ pSub enzime ]; diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix index 846df292eb1..4b201c66fe5 100644 --- a/pkgs/applications/misc/loxodo/default.nix +++ b/pkgs/applications/misc/loxodo/default.nix @@ -30,7 +30,7 @@ py.buildPythonApplication { meta = with stdenv.lib; { description = "A Password Safe V3 compatible password vault"; - homepage = https://www.christoph-sommer.de/loxodo/; + homepage = "https://www.christoph-sommer.de/loxodo/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/ltwheelconf/default.nix b/pkgs/applications/misc/ltwheelconf/default.nix index 61151cb1550..2ceb8e91def 100644 --- a/pkgs/applications/misc/ltwheelconf/default.nix +++ b/pkgs/applications/misc/ltwheelconf/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/thk/LTWheelConf; + homepage = "https://github.com/thk/LTWheelConf"; description = "Logitech wheels configuration tool"; license = licenses.gpl3; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index a3a5d0ce751..6f8d690779b 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -103,7 +103,7 @@ in buildFHSUserEnv { # WINE cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap - ocl-icd utillinux + ocl-icd utillinux libkrb5 # Winetricks fribidi diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 6cd5c6d204e..297596b8e39 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -1,7 +1,7 @@ { buildPythonApplication, lib, fetchFromGitHub, fetchpatch , wrapGAppsHook, gobject-introspection, gnome-desktop, libnotify, libgnome-keyring, pango , gdk-pixbuf, atk, webkitgtk, gst_all_1 -, evdev, pyyaml, pygobject3, requests, pillow +, dbus-python, evdev, pyyaml, pygobject3, requests, pillow , xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma , libstrangle, wine, fluidsynth, xorgserver }: @@ -31,22 +31,15 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "0i4i6g3pys1vf2q1pbs1fkywgapj4qfxrjrvim98hzw9al4l06y9"; + sha256 = "1g093g0difnkjmnm91p20issdsxn9ri4c56zzddj5wfrbmhwdfag"; }; - patches = [( - fetchpatch { - url = "https://github.com/lutris/lutris/pull/2558.patch"; - sha256 = "1wbsplri5ii06gzv6mzhiic61zkgsp9bkjkaknkd83203p0i9b2d"; - } - )]; - buildInputs = [ wrapGAppsHook gobject-introspection gnome-desktop libnotify libgnome-keyring pango gdk-pixbuf atk webkitgtk @@ -57,7 +50,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = [ - evdev pyyaml pygobject3 requests pillow + evdev pyyaml pygobject3 requests pillow dbus-python ]; preCheck = "export HOME=$PWD"; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index 0802a32d92b..8c002bd14b0 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { desktop-independent VTE-based terminal emulator for LXDE without any unnecessary dependencies. ''; - homepage = https://wiki.lxde.org/en/LXTerminal; + homepage = "https://wiki.lxde.org/en/LXTerminal"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.velovix ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/lyx/default.nix b/pkgs/applications/misc/lyx/default.nix index f9d8599e329..b96e6b2a02d 100644 --- a/pkgs/applications/misc/lyx/default.nix +++ b/pkgs/applications/misc/lyx/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { meta = with lib; { description = "WYSIWYM frontend for LaTeX, DocBook"; - homepage = http://www.lyx.org; + homepage = "http://www.lyx.org"; license = licenses.gpl2Plus; maintainers = [ maintainers.vcunat ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/madonctl/default.nix b/pkgs/applications/misc/madonctl/default.nix index 9a134343d29..a61c66d9374 100644 --- a/pkgs/applications/misc/madonctl/default.nix +++ b/pkgs/applications/misc/madonctl/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "CLI for the Mastodon social network API"; - homepage = https://github.com/McKael/madonctl; + homepage = "https://github.com/McKael/madonctl"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index f2585f78146..7dedf52e893 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://megastep.org/makeself; + homepage = "http://megastep.org/makeself"; description = "Utility to create self-extracting packages"; license = licenses.gpl2; maintainers = [ maintainers.wmertens ]; diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix index f86effe989f..89ae647042d 100644 --- a/pkgs/applications/misc/mako/default.nix +++ b/pkgs/applications/misc/mako/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight Wayland notification daemon"; - homepage = https://wayland.emersion.fr/mako/; + homepage = "https://wayland.emersion.fr/mako/"; license = licenses.mit; maintainers = with maintainers; [ dywedir synthetica ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mapproxy/default.nix b/pkgs/applications/misc/mapproxy/default.nix index e5826c09d77..0261dfbe899 100644 --- a/pkgs/applications/misc/mapproxy/default.nix +++ b/pkgs/applications/misc/mapproxy/default.nix @@ -57,8 +57,8 @@ buildPythonApplication rec { doCheck = false; meta = with lib; { description = "MapProxy is an open source proxy for geospatial data"; - homepage = https://mapproxy.org/; + homepage = "https://mapproxy.org/"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix index 03f30d64fb2..b96c4d00214 100644 --- a/pkgs/applications/misc/mdp/default.nix +++ b/pkgs/applications/misc/mdp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = https://github.com/visit1985/mdp; + homepage = "https://github.com/visit1985/mdp"; description = "A command-line based markdown presentation tool"; maintainers = with maintainers; [ matthiasbeyer vrthra ]; license = licenses.gpl3; diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index b84bc08ddb3..bd018a690d4 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; - homepage = https://mediaarea.net/; + homepage = "https://mediaarea.net/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix index f084d17e389..1ed1ef4afb5 100644 --- a/pkgs/applications/misc/mediainfo/default.nix +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }: stdenv.mkDerivation rec { - version = "19.09"; + version = "20.03"; pname = "mediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; + sha256 = "1f1shnycf0f1fwka9k9s250l228xjkg0k4k73h8bpld8msighgnw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { MediaInfo is a convenient unified display of the most relevant technical and tag data for video and audio files. ''; - homepage = https://mediaarea.net/; + homepage = "https://mediaarea.net/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 9fe810e4147..c54151de3b1 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MEGA Command Line Interactive and Scriptable Application"; - homepage = https://mega.nz/; + homepage = "https://mega.nz/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.wedens ]; diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 3749f568aef..66fe0d7207c 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { A simple tool written in bash to memorize stuff. Memo organizes is structured through topics which are folders in ~/memo. ''; - homepage = http://palovandalo.com/memo/; - downloadPage = https://github.com/mrVanDalo/memo/releases; + 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; diff --git a/pkgs/applications/misc/menumaker/default.nix b/pkgs/applications/misc/menumaker/default.nix index e06f2a88ade..22cf63e536c 100644 --- a/pkgs/applications/misc/menumaker/default.nix +++ b/pkgs/applications/misc/menumaker/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Heuristics-driven menu generator for several window managers"; - homepage = http://menumaker.sourceforge.net; + homepage = "http://menumaker.sourceforge.net"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/misc/merkaartor/default.nix b/pkgs/applications/misc/merkaartor/default.nix index 08643577b49..79ee45b4c1c 100644 --- a/pkgs/applications/misc/merkaartor/default.nix +++ b/pkgs/applications/misc/merkaartor/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenStreetMap editor"; - homepage = http://merkaartor.be/; + homepage = "http://merkaartor.be/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/applications/misc/metar/default.nix b/pkgs/applications/misc/metar/default.nix index ca4f91533ec..f5185c63987 100644 --- a/pkgs/applications/misc/metar/default.nix +++ b/pkgs/applications/misc/metar/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ curl ]; meta = with stdenv.lib; { - homepage = https://github.com/keesL/metar; + homepage = "https://github.com/keesL/metar"; license = licenses.gpl2; maintainers = [ maintainers.zalakain ]; description = "Downloads weather reports and optionally decodes them"; diff --git a/pkgs/applications/misc/milu/default.nix b/pkgs/applications/misc/milu/default.nix index 2eee9ad40c1..84cc0e0bc8d 100644 --- a/pkgs/applications/misc/milu/default.nix +++ b/pkgs/applications/misc/milu/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "Higher Order Mutation Testing Tool for C and C++ programs"; - homepage = https://github.com/yuejia/Milu; + homepage = "https://github.com/yuejia/Milu"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.vrthra ]; diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index baa8f69cfac..fd1aa050fe7 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "0y30gdnx270m857iijhgdv7a2nqxmmd8w6kfhd80763ygk17xk1r"; + sha256 = "0pfp0dglj2ig2p1h000137dxw777mjvzzqj3gcnbxjxqz3m6fzc0"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/pkgs/applications/misc/minergate-cli/default.nix b/pkgs/applications/misc/minergate-cli/default.nix index eff93c8e99c..61b900c4012 100644 --- a/pkgs/applications/misc/minergate-cli/default.nix +++ b/pkgs/applications/misc/minergate-cli/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Minergate CPU/GPU console client mining software"; - homepage = https://www.minergate.com/; + homepage = "https://www.minergate.com/"; license = licenses.unfree; maintainers = with maintainers; [ bfortz ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/minergate/default.nix b/pkgs/applications/misc/minergate/default.nix index a8402d97593..6fbe39c4da2 100644 --- a/pkgs/applications/misc/minergate/default.nix +++ b/pkgs/applications/misc/minergate/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Minergate CPU/GPU mining software"; - homepage = https://www.minergate.com/; + homepage = "https://www.minergate.com/"; license = licenses.unfree; maintainers = with maintainers; [ bfortz ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index b2012801e17..da6250fadf3 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi Lingual TERMinal emulator on X11"; - homepage = http://mlterm.sourceforge.net/; + homepage = "http://mlterm.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 08f510a2840..328e106694b 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source implementation of NVIDIA's GameStream"; - homepage = https://github.com/irtimmer/moonlight-embedded; + homepage = "https://github.com/irtimmer/moonlight-embedded"; license = licenses.gpl3; maintainers = [ maintainers.globin ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index c0d41cda02d..81c23658965 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Simple stock tracker implemented in go"; - homepage = https://github.com/mop-tracker/mop; + homepage = "https://github.com/mop-tracker/mop"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/mpvc/default.nix b/pkgs/applications/misc/mpvc/default.nix index 35de284c0ba..eacc4b5758c 100644 --- a/pkgs/applications/misc/mpvc/default.nix +++ b/pkgs/applications/misc/mpvc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A mpc-like control interface for mpv"; - homepage = https://github.com/wildefyr/mpvc; + homepage = "https://github.com/wildefyr/mpvc"; license = licenses.mit; maintainers = [ maintainers.neeasade ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/mqtt-bench/default.nix b/pkgs/applications/misc/mqtt-bench/default.nix index 0e8cc2ebcea..1f6112d7d7b 100644 --- a/pkgs/applications/misc/mqtt-bench/default.nix +++ b/pkgs/applications/misc/mqtt-bench/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Mosquitto benchmark tool"; - homepage = https://github.com/takanorig/mqtt-bench; + homepage = "https://github.com/takanorig/mqtt-bench"; maintainers = with maintainers; [ disassembler ]; }; } diff --git a/pkgs/applications/misc/mrxvt/default.nix b/pkgs/applications/misc/mrxvt/default.nix index a6efb19b577..6717fc3c97f 100644 --- a/pkgs/applications/misc/mrxvt/default.nix +++ b/pkgs/applications/misc/mrxvt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz; + url = "mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz"; sha256 = "1mqhmnlz32lvld9rc6c1hyz7gjw4anwf39yhbsjkikcgj1das0zl"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { Multitabbed lightweight terminal emulator based on rxvt. Supports transparency, backgroundimages, freetype fonts, ... "; - homepage = https://sourceforge.net/projects/materm; + homepage = "https://sourceforge.net/projects/materm"; license = "GPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/misc/mucommander/default.nix b/pkgs/applications/misc/mucommander/default.nix index 12a0720e447..e598e099d06 100644 --- a/pkgs/applications/misc/mucommander/default.nix +++ b/pkgs/applications/misc/mucommander/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.mucommander.com/; + homepage = "http://www.mucommander.com/"; description = "Cross-platform file manager"; license = licenses.gpl3; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/misc/multibootusb/default.nix b/pkgs/applications/misc/multibootusb/default.nix index ab8802a1b69..5225f88094f 100644 --- a/pkgs/applications/misc/multibootusb/default.nix +++ b/pkgs/applications/misc/multibootusb/default.nix @@ -76,7 +76,7 @@ python36Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Multiboot USB creator for Linux live disks"; - homepage = http://multibootusb.org/; + homepage = "http://multibootusb.org/"; license = licenses.gpl2; maintainers = []; # Looking for a maintainer! }; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 32c117c0173..a3067bc4af8 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -80,8 +80,8 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://mupdf.com; - repositories.git = git://git.ghostscript.com/mupdf.git; + homepage = "https://mupdf.com"; + repositories.git = "git://git.ghostscript.com/mupdf.git"; description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra fpletz ]; diff --git a/pkgs/applications/misc/mwic/default.nix b/pkgs/applications/misc/mwic/default.nix index 249d9ff1d40..3be02e7c41c 100644 --- a/pkgs/applications/misc/mwic/default.nix +++ b/pkgs/applications/misc/mwic/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: stdenv.mkDerivation rec { - version = "0.7.7"; + version = "0.7.8"; pname = "mwic"; src = fetchurl { url = "https://github.com/jwilk/mwic/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0l4anwiiqclymx0awwn4hzaj8n26ycg8nz76wjphsyscn7z2awad"; + sha256 = "0nnhziz9v523hpciylnxfajmxabh2ig5iawzwrfpf7aww70v330x"; }; makeFlags=["PREFIX=\${out}"]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://jwilk.net/software/mwic; + homepage = "http://jwilk.net/software/mwic"; description = "spell-checker that groups possible misspellings and shows them in their contexts"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/misc/mystem/default.nix b/pkgs/applications/misc/mystem/default.nix index 6a6c95b6572..27caef9ea2e 100644 --- a/pkgs/applications/misc/mystem/default.nix +++ b/pkgs/applications/misc/mystem/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Morphological analysis of Russian text"; - homepage = https://yandex.ru/dev/mystem/; + homepage = "https://yandex.ru/dev/mystem/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix index b4d97c368ea..cf7689367bd 100644 --- a/pkgs/applications/misc/nanoblogger/default.nix +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Small weblog engine written in Bash for the command line"; - homepage = http://nanoblogger.sourceforge.net/; + homepage = "http://nanoblogger.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/navipowm/default.nix b/pkgs/applications/misc/navipowm/default.nix index 9a40e3bc105..80c455f41a0 100644 --- a/pkgs/applications/misc/navipowm/default.nix +++ b/pkgs/applications/misc/navipowm/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "navipowm-0.2.4"; src = fetchurl { - url = mirror://sourceforge/navipowm/NaviPOWM-0.2.4.tar.gz; + url = "mirror://sourceforge/navipowm/NaviPOWM-0.2.4.tar.gz"; sha256 = "1kdih8kwpgcgfh6l6njkr9gq2j5hv39xvzmzgvhip553kn6bss7b"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; meta = { - homepage = http://navipowm.sourceforge.net/; + homepage = "http://navipowm.sourceforge.net/"; description = "Car navigation system"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 2263dfc1fbc..099bcbfb25d 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.navit-project.org; + homepage = "https://www.navit-project.org"; description = "Car navigation system with routing engine using OSM maps"; license = licenses.gpl2; maintainers = [ maintainers.genesis ]; diff --git a/pkgs/applications/misc/neap/default.nix b/pkgs/applications/misc/neap/default.nix index 4104d35cf10..992a3c0248a 100644 --- a/pkgs/applications/misc/neap/default.nix +++ b/pkgs/applications/misc/neap/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Systray workspace pager"; - homepage = https://github.com/vzxwco/neap; + homepage = "https://github.com/vzxwco/neap"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/misc/netsurf/browser/default.nix b/pkgs/applications/misc/netsurf/browser/default.nix index c1ba5ba23b1..f2fdd01215d 100644 --- a/pkgs/applications/misc/netsurf/browser/default.nix +++ b/pkgs/applications/misc/netsurf/browser/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Free opensource web browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix index 0560b1d25b3..9d690546102 100644 --- a/pkgs/applications/misc/netsurf/buildsystem/default.nix +++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Build system for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libcss/default.nix b/pkgs/applications/misc/netsurf/libcss/default.nix index ed0b7b12e98..528b0d9b958 100644 --- a/pkgs/applications/misc/netsurf/libcss/default.nix +++ b/pkgs/applications/misc/netsurf/libcss/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE= "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Cascading Style Sheets library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libdom/default.nix b/pkgs/applications/misc/netsurf/libdom/default.nix index de92219e7f9..8dde3e336cd 100644 --- a/pkgs/applications/misc/netsurf/libdom/default.nix +++ b/pkgs/applications/misc/netsurf/libdom/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Document Object Model library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libhubbub/default.nix b/pkgs/applications/misc/netsurf/libhubbub/default.nix index 03ee66fc598..7cfd0a935f3 100644 --- a/pkgs/applications/misc/netsurf/libhubbub/default.nix +++ b/pkgs/applications/misc/netsurf/libhubbub/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "HTML5 parser library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsbmp/default.nix b/pkgs/applications/misc/netsurf/libnsbmp/default.nix index b0fb18c89b1..a553eb3e715 100644 --- a/pkgs/applications/misc/netsurf/libnsbmp/default.nix +++ b/pkgs/applications/misc/netsurf/libnsbmp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "BMP Decoder for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsfb/default.nix b/pkgs/applications/misc/netsurf/libnsfb/default.nix index 29b0a7867db..4e56ce7f5a1 100644 --- a/pkgs/applications/misc/netsurf/libnsfb/default.nix +++ b/pkgs/applications/misc/netsurf/libnsfb/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "CSS parser and selection library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnsgif/default.nix b/pkgs/applications/misc/netsurf/libnsgif/default.nix index e826dee0d25..8bb67df70da 100644 --- a/pkgs/applications/misc/netsurf/libnsgif/default.nix +++ b/pkgs/applications/misc/netsurf/libnsgif/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "GIF Decoder for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libnslog/default.nix b/pkgs/applications/misc/netsurf/libnslog/default.nix index 497630c9aa6..43b4622ab03 100644 --- a/pkgs/applications/misc/netsurf/libnslog/default.nix +++ b/pkgs/applications/misc/netsurf/libnslog/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "NetSurf Parametric Logging Library"; license = licenses.mit; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/applications/misc/netsurf/libnspsl/default.nix b/pkgs/applications/misc/netsurf/libnspsl/default.nix index f0abbdc049a..5ded38d974e 100644 --- a/pkgs/applications/misc/netsurf/libnspsl/default.nix +++ b/pkgs/applications/misc/netsurf/libnspsl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "NetSurf Public Suffix List - Handling library"; license = licenses.mit; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/applications/misc/netsurf/libnsutils/default.nix b/pkgs/applications/misc/netsurf/libnsutils/default.nix index 3eaa882cb73..6d3a3d1f104 100644 --- a/pkgs/applications/misc/netsurf/libnsutils/default.nix +++ b/pkgs/applications/misc/netsurf/libnsutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Generalised utility library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libparserutils/default.nix b/pkgs/applications/misc/netsurf/libparserutils/default.nix index ea9d7c9ea85..9fcd5cfebf6 100644 --- a/pkgs/applications/misc/netsurf/libparserutils/default.nix +++ b/pkgs/applications/misc/netsurf/libparserutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Parser building library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix b/pkgs/applications/misc/netsurf/libsvgtiny/default.nix index 9a4f922c2b6..b6e1b5a1667 100644 --- a/pkgs/applications/misc/netsurf/libsvgtiny/default.nix +++ b/pkgs/applications/misc/netsurf/libsvgtiny/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "NetSurf SVG decoder"; license = licenses.mit; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/applications/misc/netsurf/libutf8proc/default.nix b/pkgs/applications/misc/netsurf/libutf8proc/default.nix index 2144ccd3303..dcd56182e32 100644 --- a/pkgs/applications/misc/netsurf/libutf8proc/default.nix +++ b/pkgs/applications/misc/netsurf/libutf8proc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "UTF8 Processing library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix index ad59b1be10e..f3c7bcbd1a0 100644 --- a/pkgs/applications/misc/netsurf/libwapcaplet/default.nix +++ b/pkgs/applications/misc/netsurf/libwapcaplet/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "String internment library for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/netsurf/nsgenbind/default.nix b/pkgs/applications/misc/netsurf/nsgenbind/default.nix index 88ac4f0c3eb..2dd4b830102 100644 --- a/pkgs/applications/misc/netsurf/nsgenbind/default.nix +++ b/pkgs/applications/misc/netsurf/nsgenbind/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.netsurf-browser.org/; + homepage = "http://www.netsurf-browser.org/"; description = "Generator for JavaScript bindings for netsurf browser"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/applications/misc/nix-tour/default.nix b/pkgs/applications/misc/nix-tour/default.nix index 31afed3061a..05ef696f99b 100644 --- a/pkgs/applications/misc/nix-tour/default.nix +++ b/pkgs/applications/misc/nix-tour/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "'the tour of nix' from nixcloud.io/tour as offline version"; - homepage = https://nixcloud.io/tour; + homepage = "https://nixcloud.io/tour"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/applications/misc/nixnote2/default.nix b/pkgs/applications/misc/nixnote2/default.nix index dec8b4ba0a7..92bb4ca2207 100644 --- a/pkgs/applications/misc/nixnote2/default.nix +++ b/pkgs/applications/misc/nixnote2/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "An unofficial client of Evernote"; - homepage = http://www.nixnote.org/; + homepage = "http://www.nixnote.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ htr ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/noice/default.nix b/pkgs/applications/misc/noice/default.nix index 6cc5dc9066d..2be5a4ab83b 100644 --- a/pkgs/applications/misc/noice/default.nix +++ b/pkgs/applications/misc/noice/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Small ncurses-based file browser"; - homepage = https://git.2f30.org/noice/; + homepage = "https://git.2f30.org/noice/"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 1c02441474c..a84d3a4c09a 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stupidly-simple sticky notes applet"; - homepage = https://github.com/lainsce/notejot; + homepage = "https://github.com/lainsce/notejot"; license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index d75ec9ef2c2..36fa888e888 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Daemon that displays passive pop-up notifications"; - homepage = https://launchpad.net/notify-osd; + homepage = "https://launchpad.net/notify-osd"; license = licenses.gpl3; maintainers = [ maintainers.imalison ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index 484ff62e9e6..e2bff003118 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Daemon that displays passive pop-up notifications"; - homepage = https://launchpad.net/notify-osd; + homepage = "https://launchpad.net/notify-osd"; license = licenses.gpl3; maintainers = [ maintainers.bodil ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/nrsc5/default.nix b/pkgs/applications/misc/nrsc5/default.nix index 3ad83776842..ada603cba96 100644 --- a/pkgs/applications/misc/nrsc5/default.nix +++ b/pkgs/applications/misc/nrsc5/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DUSE_COLOR=ON" "-DUSE_FAAD2=ON" ]; meta = with stdenv.lib; { - homepage = https://github.com/theori-io/nrsc5; + homepage = "https://github.com/theori-io/nrsc5"; description = "HD-Radio decoder for RTL-SDR"; platforms = stdenv.lib.platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 8b0cab31588..ce80ae14f23 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { interface for monitoring and administering UPS, PDU and SCD hardware. It uses a layered approach to connect all of the parts. ''; - homepage = https://networkupstools.org/; - repositories.git = https://github.com/networkupstools/nut.git; + homepage = "https://networkupstools.org/"; + repositories.git = "https://github.com/networkupstools/nut.git"; platforms = platforms.linux; maintainers = [ maintainers.pierron ]; license = with licenses; [ gpl1Plus gpl2Plus gpl3Plus ]; diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index ff09500c43a..aa11c069a7a 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "obinskit"; - version = "1.1.1"; + version = "1.1.4"; src = fetchurl { url = "http://releases.obins.net/occ/linux/tar/ObinsKit_${version}_x64.tar.gz"; - sha256 = "0052m4msslc4k9g3i5vl933cz5q2n1affxhnm433w4apajr8h28h"; + sha256 = "0q422rmfn4k4ww1qlgrwdmxz4l10dxkd6piynbcw5cr4i5icnh2l"; }; unpackPhase = "tar -xzf $src"; diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix index a604349afb0..ef371dc59ff 100644 --- a/pkgs/applications/misc/ocropus/default.nix +++ b/pkgs/applications/misc/ocropus/default.nix @@ -52,7 +52,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Open source document analysis and OCR system"; license = licenses.asl20; - homepage = https://github.com/tmbdev/ocropy/; + homepage = "https://github.com/tmbdev/ocropy/"; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 29a04627bef..b9951b66629 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -94,7 +94,7 @@ in py.pkgs.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://octoprint.org/; + homepage = "https://octoprint.org/"; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3; maintainers = with maintainers; [ abbradar gebner ]; diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 10c4f2f8448..69eb313238b 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -39,7 +39,7 @@ let meta = with stdenv.lib; { description = "OctoPrint plugin for the Micro 3D printer"; - homepage = https://github.com/donovan6000/M33-Fio; + homepage = "https://github.com/donovan6000/M33-Fio"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; @@ -60,7 +60,7 @@ let meta = with stdenv.lib; { description = "Publish printer status MQTT"; - homepage = https://github.com/OctoPrint/OctoPrint-MQTT; + homepage = "https://github.com/OctoPrint/OctoPrint-MQTT"; license = licenses.agpl3; maintainers = with maintainers; [ peterhoeg ]; }; @@ -79,7 +79,7 @@ let meta = with stdenv.lib; { description = "Show printers status in window title"; - homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; + homepage = "https://github.com/MoonshineSG/OctoPrint-TitleStatus"; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; }; @@ -98,7 +98,7 @@ let meta = with stdenv.lib; { description = "A simple stl viewer tab for OctoPrint"; - homepage = https://github.com/jneilliii/Octoprint-STLViewer; + homepage = "https://github.com/jneilliii/Octoprint-STLViewer"; license = licenses.agpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/applications/misc/omegat.nix b/pkgs/applications/misc/omegat.nix index 27d7ad8730b..47536cc9f6a 100644 --- a/pkgs/applications/misc/omegat.nix +++ b/pkgs/applications/misc/omegat.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "omegat"; src = fetchurl { # their zip has repeated files or something, so no fetchzip - url = mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%204.3.0/OmegaT_4.3.0_Without_JRE.zip; + url = "mirror://sourceforge/project/omegat/OmegaT%20-%20Standard/OmegaT%204.3.0/OmegaT_4.3.0_Without_JRE.zip"; sha256 = "0axz7r30p34z5hgvdglznc82g7yvm3g56dv5190jixskx6ba58rs"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation { tool with fuzzy matching, translation memory, keyword search, glossaries, and translation leveraging into updated projects. ''; - homepage = http://www.omegat.org/; + homepage = "http://www.omegat.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ t184256 ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/misc/onboard/default.nix b/pkgs/applications/misc/onboard/default.nix index 1e578cde512..e427519d4d6 100644 --- a/pkgs/applications/misc/onboard/default.nix +++ b/pkgs/applications/misc/onboard/default.nix @@ -173,7 +173,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://launchpad.net/onboard; + homepage = "https://launchpad.net/onboard"; description = "Onscreen keyboard useful for tablet PC users and for mobility impaired users"; maintainers = with maintainers; [ johnramsden ]; license = licenses.gpl3; diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 8f7f74f7123..e5857010324 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "make install prefix=$out"; meta = { - homepage = http://fabrice.thiroux.free.fr/openbox-menu_en.html; + homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html"; description = "Dynamic XDG menu generator for Openbox"; longDescription = '' Openbox-menu is a pipemenu for Openbox window manager. It provides a diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index e943263600c..6140343fae7 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool to edit resource files (BRF)"; - homepage = https://github.com/cfcohen/openbrf; + homepage = "https://github.com/cfcohen/openbrf"; maintainers = with stdenv.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 375552aaa33..f5a88cbaee1 100644 --- a/pkgs/applications/misc/opencpn/default.nix +++ b/pkgs/applications/misc/opencpn/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.kragniz ]; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; - homepage = https://opencpn.org/; + homepage = "https://opencpn.org/"; }; } diff --git a/pkgs/applications/misc/openjump/default.nix b/pkgs/applications/misc/openjump/default.nix index c98defee57a..e537180686c 100644 --- a/pkgs/applications/misc/openjump/default.nix +++ b/pkgs/applications/misc/openjump/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "openjump-1.3.1"; src = fetchurl { - url = mirror://sourceforge/jump-pilot/OpenJUMP/1.3.1/openjump-1.3.1.zip; + url = "mirror://sourceforge/jump-pilot/OpenJUMP/1.3.1/openjump-1.3.1.zip"; sha256 = "0y4z53yx0x7rp3c8rnj028ni3gr47r35apgcpqp3jl7r2di6zgqm"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "Open source Geographic Information System (GIS) written in the Java programming language"; - homepage = http://www.openjump.org/index.html; + homepage = "http://www.openjump.org/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix index 53d6e398cf0..f20d5ccdc4a 100644 --- a/pkgs/applications/misc/opentx/default.nix +++ b/pkgs/applications/misc/opentx/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "opentx"; - version = "2.3.5"; + version = "2.3.7"; src = fetchFromGitHub { owner = "opentx"; repo = "opentx"; - rev = version; - sha256 = "18iv3c74y9fpp1045s2l7l2dqfn9riyagrwmfwp2mmf2ccsrwz2g"; + rev = "release/${version}"; + sha256 = "1wl3bk7s8h20dfys1hblzxc0br9zlwhcqlghgsbn81ki0xb6jmkf"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 998d5d528e9..c19e71e10dd 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.34.2"; + version = "3.36.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0aaagz8mxvfigrsdbmg22q44vf5yhkbw4rh4cnizysbfvijk4dan"; + sha256 = "07w3k0f791zd1pj9j6d27k7gk7c6hx112ngrdz18h573df5n9b61"; }; patches = [ diff --git a/pkgs/applications/misc/orpie/default.nix b/pkgs/applications/misc/orpie/default.nix index e404da974c4..d869b093955 100644 --- a/pkgs/applications/misc/orpie/default.nix +++ b/pkgs/applications/misc/orpie/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses gsl ] ++ (with ocamlPackages; [ ocaml camlp4 ]); meta = { - homepage = https://github.com/pelzlpj/orpie; + homepage = "https://github.com/pelzlpj/orpie"; description = "A fullscreen RPN calculator for the console"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/osmctools/default.nix b/pkgs/applications/misc/osmctools/default.nix index c03e57920da..b0f1f48d9ae 100644 --- a/pkgs/applications/misc/osmctools/default.nix +++ b/pkgs/applications/misc/osmctools/default.nix @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line tools for transforming Open Street Map files"; homepage = [ - https://wiki.openstreetmap.org/wiki/osmconvert - https://wiki.openstreetmap.org/wiki/osmfilter - https://wiki.openstreetmap.org/wiki/osmupdate + "https://wiki.openstreetmap.org/wiki/osmconvert" + "https://wiki.openstreetmap.org/wiki/osmfilter" + "https://wiki.openstreetmap.org/wiki/osmupdate" ]; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index c6cd118aea8..202e7a2de95 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = optional withGtk3 "--with-gtk=3"; meta = with stdenv.lib; { - homepage = https://blog.lxde.org/category/pcmanfm/; + homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.gpl2Plus; description = "File manager with GTK interface"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix index 17253173a5e..6c3241d629b 100644 --- a/pkgs/applications/misc/pcmanx-gtk2/default.nix +++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://pcman.ptt.cc; + homepage = "https://pcman.ptt.cc"; license = licenses.gpl2; description = "Telnet BBS browser with GTK interface"; maintainers = [ maintainers.sifmelcara ]; diff --git a/pkgs/applications/misc/pdf-quench/default.nix b/pkgs/applications/misc/pdf-quench/default.nix index 9756d9b42b0..d364074d445 100644 --- a/pkgs/applications/misc/pdf-quench/default.nix +++ b/pkgs/applications/misc/pdf-quench/default.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://github.com/linuxerwang/pdf-quench; + homepage = "https://github.com/linuxerwang/pdf-quench"; description = "A visual tool for cropping pdf files"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix index ee54904bfd6..93ca8c64479 100644 --- a/pkgs/applications/misc/pdfdiff/default.nix +++ b/pkgs/applications/misc/pdfdiff/default.nix @@ -33,7 +33,7 @@ py.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://www.cs.ox.ac.uk/people/cas.cremers/misc/pdfdiff.html; + homepage = "http://www.cs.ox.ac.uk/people/cas.cremers/misc/pdfdiff.html"; description = "Tool to view the difference between two PDF or PS files"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix index fa500989cac..d8203b9e7b5 100644 --- a/pkgs/applications/misc/pdfpc/default.nix +++ b/pkgs/applications/misc/pdfpc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A presenter console with multi-monitor support for PDF files"; - homepage = https://pdfpc.github.io/; + homepage = "https://pdfpc.github.io/"; license = licenses.gpl2Plus; 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 d82f8e1664b..abf49f93684 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.1.1"; + version = "4.1.2"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "17qb3l7xibhb3fbskddvparrj2cxj4kz9qbril094kxrgbvyc9gs"; + sha256 = "1k1azxz92vkb4hylk4ki0szfn47ids0lwg01zfs54yc89j0c6142"; }; unpackPhase = '' diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix index fc4e5229c9c..ae96ce6925e 100644 --- a/pkgs/applications/misc/pell/default.nix +++ b/pkgs/applications/misc/pell/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ebzzry/pell; + homepage = "https://github.com/ebzzry/pell"; description = "A simple host availability monitor"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index ae81ef3c9f6..87a6bdf5e53 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -43,7 +43,7 @@ in buildGoPackage rec { meta = with lib; { description = "A way of storing, syncing, sharing, modelling and backing up content (née Camlistore)"; - homepage = https://perkeep.org; + homepage = "https://perkeep.org"; license = licenses.asl20; maintainers = with maintainers; [ cstrahan kalbasit ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix index 86e10ae0943..5fc0703e011 100644 --- a/pkgs/applications/misc/pgadmin/default.nix +++ b/pkgs/applications/misc/pgadmin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PostgreSQL administration GUI tool"; - homepage = https://www.pgadmin.org; + homepage = "https://www.pgadmin.org"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar wmertens ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/pgmanage/default.nix b/pkgs/applications/misc/pgmanage/default.nix index 241d5786468..68f29cb9b9a 100644 --- a/pkgs/applications/misc/pgmanage/default.nix +++ b/pkgs/applications/misc/pgmanage/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { PostgreSQL interface can hope to be. (Note: pgManage replaces Postage, which is no longer maintained.) ''; - homepage = https://github.com/pgManage/pgManage; + homepage = "https://github.com/pgManage/pgManage"; license = licenses.postgresql; maintainers = [ maintainers.basvandijk ]; }; diff --git a/pkgs/applications/misc/pgmodeler/default.nix b/pkgs/applications/misc/pgmodeler/default.nix index 83e45e25581..7532c6e9bc9 100644 --- a/pkgs/applications/misc/pgmodeler/default.nix +++ b/pkgs/applications/misc/pgmodeler/default.nix @@ -24,9 +24,9 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A database modeling tool for PostgreSQL"; longDescription = ''pgModeler (PostgreSQL Database Modeler) is an open source database modeling tool designed for PostgreSQL.''; - homepage = https://pgmodeler.io/; + homepage = "https://pgmodeler.io/"; license = licenses.gpl3; maintainers = [ maintainers.esclear ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/misc/phwmon/default.nix b/pkgs/applications/misc/phwmon/default.nix index 6fb70f1c9a2..017383a79a2 100644 --- a/pkgs/applications/misc/phwmon/default.nix +++ b/pkgs/applications/misc/phwmon/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://gitlab.com/o9000/phwmon; + 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; diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index 48188574ad4..fe9838fe0d9 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -103,7 +103,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "GUI for managing Windows programs under linux"; - homepage = https://www.playonlinux.com/; + homepage = "https://www.playonlinux.com/"; license = licenses.gpl3; maintainers = [ maintainers.a1russell ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix index 8413f8c8f10..fc86b2e885d 100644 --- a/pkgs/applications/misc/polar-bookshelf/default.nix +++ b/pkgs/applications/misc/polar-bookshelf/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://getpolarized.io/; + 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; diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 7209ee3e400..674570ec3dd 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://posterazor.sourceforge.net/; + homepage = "http://posterazor.sourceforge.net/"; description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ maintainers.madjar ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index 34144e35bd5..cadd98c7426 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -30,7 +30,7 @@ python27Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Pronterface, Pronsole, and Printcore - Pure Python 3d printing host software"; - homepage = https://github.com/kliment/Printrun; + homepage = "https://github.com/kliment/Printrun"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index cd3a46ab09b..1e6c558defb 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { patches = [ ./CVE-2014-3618.patch (fetchurl { - url = https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30; + url = "https://sources.debian.org/data/main/p/procmail/3.22-26/debian/patches/30"; sha256 = "11zmz1bj0v9pay3ldmyyg7473b80h89gycrhndsgg9q50yhcqaaq"; name = "CVE-2017-16844"; }) @@ -25,13 +25,13 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz; + url = "ftp://ftp.fu-berlin.de/pub/unix/mail/procmail/procmail-3.22.tar.gz"; sha256 = "05z1c803n5cppkcq99vkyd5myff904lf9sdgynfqngfk9nrpaz08"; }; meta = with stdenv.lib; { description = "Mail processing and filtering utility"; - homepage = http://www.procmail.org/; + homepage = "http://www.procmail.org/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix index caf4f270a15..144addf02c6 100644 --- a/pkgs/applications/misc/prusa-slicer/default.nix +++ b/pkgs/applications/misc/prusa-slicer/default.nix @@ -1,32 +1,34 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, cmake, pkgconfig +{ 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 }: -let - nloptVersion = if lib.hasAttr "version" nlopt - then lib.getAttr "version" nlopt - else "2.4"; -in stdenv.mkDerivation rec { pname = "prusa-slicer"; - version = "2.1.1"; + version = "2.2.0"; enableParallelBuilding = true; nativeBuildInputs = [ cmake - makeWrapper pkgconfig ]; buildInputs = [ boost cereal + cgal_5 curl eigen expat glew + gmp + ilmbase libpng + mpfr + nlopt + openvdb + systemd tbb wxGTK31 xorg.libX11 @@ -35,31 +37,34 @@ stdenv.mkDerivation rec { checkInputs = [ gtest ]; # The build system uses custom logic - defined in - # xs/src/libnest2d/cmake_modules/FindNLopt.cmake in the package source - - # for finding the nlopt library, which doesn't pick up the package in the nix store. - # We need to set the path via the NLOPT environment variable instead. + # cmake/modules/FindNLopt.cmake in the package source - for finding the nlopt + # library, which doesn't pick up the package in the nix store. We + # additionally need to set the path via the NLOPT environment variable. NLOPT = nlopt; - # Disable compiler warnings that clutter the build log + # Disable compiler warnings that clutter the build log. # It seems to be a known issue for Eigen: # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221 NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes"; + # prusa-slicer uses dlopen on `libudev.so` at runtime + NIX_LDFLAGS = "-ludev"; + prePatch = '' # In nix ioctls.h isn't available from the standard kernel-headers package # like in other distributions. The copy in glibc seems to be identical to the # one in the kernel though, so we use that one instead. sed -i 's|"/usr/include/asm-generic/ioctls.h"|<asm-generic/ioctls.h>|g' src/libslic3r/GCodeSender.cpp - '' + lib.optionalString (lib.versionOlder "2.5" nloptVersion) '' + # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx # now seems to be integrated into the main lib. - sed -i 's|nlopt_cxx|nlopt|g' src/libnest2d/cmake_modules/FindNLopt.cmake + sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake ''; src = fetchFromGitHub { owner = "prusa3d"; repo = "PrusaSlicer"; - sha256 = "0i393nbc2salb4j5l2hvy03ng7hmf90d2xj653pw9bsikhj0r3jd"; + sha256 = "0954k9sm09y8qnz1jyswyysg10k54ywz8mswnwa4n2hnpq9qx73m"; rev = "version_${version}"; }; @@ -86,8 +91,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "G-code generator for 3D printer"; - homepage = https://github.com/prusa3d/PrusaSlicer; + homepage = "https://github.com/prusa3d/PrusaSlicer"; license = licenses.agpl3; - maintainers = with maintainers; [ tweber ]; + maintainers = with maintainers; [ moredread tweber ]; }; } diff --git a/pkgs/applications/misc/pt/Gemfile.lock b/pkgs/applications/misc/pt/Gemfile.lock index 501fae0ef0a..dfaa018d372 100644 --- a/pkgs/applications/misc/pt/Gemfile.lock +++ b/pkgs/applications/misc/pt/Gemfile.lock @@ -66,4 +66,4 @@ DEPENDENCIES pt BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/misc/pt/default.nix b/pkgs/applications/misc/pt/default.nix index f5504721987..ef490702a67 100644 --- a/pkgs/applications/misc/pt/default.nix +++ b/pkgs/applications/misc/pt/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Minimalist command-line Pivotal Tracker client"; - homepage = http://www.github.com/raul/pt; + homepage = "http://www.github.com/raul/pt"; license = licenses.mit; maintainers = with maintainers; [ ebzzry manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/ptask/default.nix b/pkgs/applications/misc/ptask/default.nix index 81e316eb0ee..a5fd55c967b 100644 --- a/pkgs/applications/misc/ptask/default.nix +++ b/pkgs/applications/misc/ptask/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wpitchoune.net/ptask/; + homepage = "http://wpitchoune.net/ptask/"; description = "GTK-based GUI for taskwarrior"; license = licenses.gpl2; maintainers = [ maintainers.spacefrogg ]; diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 76350773b32..e90a86f225b 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "1yx69pwdal0p5dfhabjdns9z6z3fa41wh7bxa4dpsjx37ziglcsp"; + sha256 = "11x4y3ah9f7mv9jssws95sw7rd20fxwdh11mrhcb4vwk59cmqsjz"; }; - cargoSha256 = "1ksr5fw9p3j1bnlgfimb5nsryb4si8ic2x4prsra1mwkc91hr7x3"; + cargoSha256 = "06zv3li14sg4a8bgj38zzx576ggm32ss0djmys1g0h5a0nxaaqfx"; checkPhase = "cargo test -- --skip test_single_huge_payload"; diff --git a/pkgs/applications/misc/pydf/default.nix b/pkgs/applications/misc/pydf/default.nix index ae29993a79a..aa283510708 100644 --- a/pkgs/applications/misc/pydf/default.nix +++ b/pkgs/applications/misc/pydf/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "colourised df(1)-clone"; - homepage = http://kassiopeia.juls.savba.sk/~garabik/software/pydf/; + homepage = "http://kassiopeia.juls.savba.sk/~garabik/software/pydf/"; license = licenses.publicDomain; maintainers = with maintainers; [ monsieurp ]; }; diff --git a/pkgs/applications/misc/pyditz/cerberus.nix b/pkgs/applications/misc/pyditz/cerberus.nix index 614e3ca8135..be12906e61e 100644 --- a/pkgs/applications/misc/pyditz/cerberus.nix +++ b/pkgs/applications/misc/pyditz/cerberus.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ pytestrunner pytest ]; meta = with stdenv.lib; { - homepage = http://python-cerberus.org/; + homepage = "http://python-cerberus.org/"; description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; license = licenses.mit; }; diff --git a/pkgs/applications/misc/pyditz/default.nix b/pkgs/applications/misc/pyditz/default.nix index 60de2f9abdc..05338b38dfe 100644 --- a/pkgs/applications/misc/pyditz/default.nix +++ b/pkgs/applications/misc/pyditz/default.nix @@ -20,7 +20,7 @@ in buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://pythonhosted.org/pyditz/; + homepage = "https://pythonhosted.org/pyditz/"; description = "Drop-in replacement for the Ditz distributed issue tracker"; maintainers = [ maintainers.ilikeavocadoes ]; license = licenses.lgpl2; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index bb3a92e72c3..00c45114179 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -85,7 +85,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pytrainer/pytrainer/wiki; + homepage = "https://github.com/pytrainer/pytrainer/wiki"; description = "Application for logging and graphing sporting excursions"; maintainers = [ maintainers.rycee ]; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/qMasterPassword/default.nix b/pkgs/applications/misc/qMasterPassword/default.nix index 97751127342..c2adcabe414 100644 --- a/pkgs/applications/misc/qMasterPassword/default.nix +++ b/pkgs/applications/misc/qMasterPassword/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { there is no password file that can be lost or get stolen. There is also no need to trust any online password service. ''; - homepage = https://github.com/bkueng/qMasterPassword; + homepage = "https://github.com/bkueng/qMasterPassword"; license = licenses.gpl3; maintainers = [ maintainers.tadeokondrak ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/qcad/application-dir.patch b/pkgs/applications/misc/qcad/application-dir.patch new file mode 100644 index 00000000000..84782e1e717 --- /dev/null +++ b/pkgs/applications/misc/qcad/application-dir.patch @@ -0,0 +1,35 @@ +diff --git a/src/core/RS.cpp b/src/core/RS.cpp +index d8a135d6f..659795dbb 100644 +--- a/src/core/RS.cpp ++++ b/src/core/RS.cpp +@@ -151,7 +151,7 @@ QStringList RS::getDirectoryList(const QString& subDirectory) { + dirList.append(appDir + "/../../../" + subDirectory); + dirList.append(QDir::currentPath() + "/" + subDirectory); + #else +- dirList.append(appDir + "/" + subDirectory); ++ dirList.append(appDir + "/../lib/" + subDirectory); + #endif + + /* +diff --git a/src/core/RSettings.cpp b/src/core/RSettings.cpp +index c6c31cbf5..c51b59ce6 100644 +--- a/src/core/RSettings.cpp ++++ b/src/core/RSettings.cpp +@@ -367,6 +367,8 @@ QString RSettings::getApplicationPath() { + ret.cdUp(); + } + ++ ret.cd("../lib"); ++ + return ret.path(); + } + +@@ -1268,7 +1270,7 @@ QString RSettings::getRevisionString() { + } + + QString RSettings::getReleaseDate() { +- return __DATE__; ++ return ""; + } + + int RSettings::getSnapRange() { diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix new file mode 100644 index 00000000000..4f046e34b18 --- /dev/null +++ b/pkgs/applications/misc/qcad/default.nix @@ -0,0 +1,92 @@ +{ boost +, fetchFromGitHub +, mkDerivationWith +, muparser +, pkgconfig +, qmake +, qt5 +, stdenv +, libGLU +}: + +mkDerivationWith stdenv.mkDerivation rec { + pname = "qcad"; + version = "3.24.2.1"; + + src = fetchFromGitHub { + owner = "qcad"; + repo = "qcad"; + rev = "v${version}"; + sha256 = "1g295gljq051x09f4d8k586bkg3vs8z22dn3rxj6xrm6803z8zw2"; + }; + + patches = [ + ./application-dir.patch + ]; + + postPatch = '' + mkdir src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version} + cp \ + src/3rdparty/qt-labs-qtscriptgenerator-5.12.3/qt-labs-qtscriptgenerator-5.12.3.pro \ + src/3rdparty/qt-labs-qtscriptgenerator-${qt5.qtbase.version}/qt-labs-qtscriptgenerator-${qt5.qtbase.version}.pro + ''; + + qmakeFlags = [ + "MUPARSER_DIR=${muparser}" + "INSTALLROOT=$(out)" + "BOOST_DIR=${boost.dev}" + ]; + + installPhase = '' + runHook preInstall + + install -Dm555 -t $out/bin release/qcad-bin + install -Dm555 -t $out/lib release/libspatialindexnavel.so + install -Dm555 -t $out/lib release/libqcadcore.so + install -Dm555 -t $out/lib release/libqcadentity.so + install -Dm555 -t $out/lib release/libqcadgrid.so + install -Dm555 -t $out/lib release/libqcadsnap.so + install -Dm555 -t $out/lib release/libqcadoperations.so + install -Dm555 -t $out/lib release/libqcadstemmer.so + install -Dm555 -t $out/lib release/libqcadspatialindex.so + install -Dm555 -t $out/lib release/libqcadgui.so + install -Dm555 -t $out/lib release/libqcadecmaapi.so + + install -Dm444 -t $out/share/applications qcad.desktop + install -Dm644 -t $out/share/pixmaps scripts/qcad_icon.png + + cp -r scripts $out/lib + cp -r plugins $out/lib/plugins + cp -r patterns $out/lib/patterns + + install -Dm644 scripts/qcad_icon.svg $out/share/icons/hicolor/scalable/apps/qcad.svg + + runHook postInstall + ''; + + buildInputs = [ + boost + muparser + libGLU + qt5.qtbase + qt5.qtscript + qt5.qtsvg + qt5.qtxmlpatterns + ]; + + nativeBuildInputs = [ + pkgconfig + qt5.qmake + qt5.qttools + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "2D CAD package based on Qt"; + homepage = "https://qcad.org"; + license = licenses.gpl3; + maintainers = with maintainers; [ yvesf ]; + platforms = qt5.qtbase.meta.platforms; + }; +} diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix index b9645980c64..d780125fbbf 100644 --- a/pkgs/applications/misc/qlandkartegt/default.nix +++ b/pkgs/applications/misc/qlandkartegt/default.nix @@ -79,7 +79,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = http://www.qlandkarte.org/; + homepage = "http://www.qlandkarte.org/"; description = '' QLandkarte GT is the ultimate outdoor aficionado's tool. It supports GPS maps in GeoTiff format as well as Garmin's img vector map format. diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix index 382e7dbe121..21378084214 100644 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.qlandkarte.org/; + homepage = "http://www.qlandkarte.org/"; description = "Garmin Device Drivers for QlandkarteGT"; license = licenses.gpl2; maintainers = with maintainers; [ sikmir ]; diff --git a/pkgs/applications/misc/qmapshack/default.nix b/pkgs/applications/misc/qmapshack/default.nix index 21fbbf3253f..a3238f7cba4 100644 --- a/pkgs/applications/misc/qmapshack/default.nix +++ b/pkgs/applications/misc/qmapshack/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "qmapshack"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { owner = "Maproom"; repo = pname; rev = "V_${version}"; - sha256 = "07c2hrq9sn456w7l3gdr599rmjfv2k6mh159zza7p1py8r7ywksa"; + sha256 = "0hghynb4ac98fg1pwc645zriqkghxwp8mr3jhr87pa6fh0y848py"; }; nativeBuildInputs = [ cmake ]; @@ -30,7 +30,7 @@ mkDerivation rec { ]; meta = with lib; { - homepage = https://github.com/Maproom/qmapshack; + homepage = "https://github.com/Maproom/qmapshack"; description = "Consumer grade GIS software"; license = licenses.gpl3; maintainers = with maintainers; [ dotlambda sikmir ]; diff --git a/pkgs/applications/misc/qmetro/default.nix b/pkgs/applications/misc/qmetro/default.nix index 49993f2f7ea..623bd050dc9 100644 --- a/pkgs/applications/misc/qmetro/default.nix +++ b/pkgs/applications/misc/qmetro/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/qmetro/; + homepage = "https://sourceforge.net/projects/qmetro/"; description = "Worldwide transit maps viewer"; license = licenses.gpl3; diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index c96fbab4d81..913d2bc3c6b 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -20,7 +20,7 @@ mkDerivation { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/ludios/qolibri; + homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 4100ab3536b..3e55215f473 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -43,7 +43,7 @@ mkDerivation { license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://launchpad.net/qpdfview; + homepage = "https://launchpad.net/qpdfview"; updateWalker = true; }; } diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix index 46b446b429b..70d9f600fa0 100644 --- a/pkgs/applications/misc/qsyncthingtray/default.nix +++ b/pkgs/applications/misc/qsyncthingtray/default.nix @@ -56,7 +56,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/sieren/QSyncthingTray/; + homepage = "https://github.com/sieren/QSyncthingTray/"; description = "A Traybar Application for Syncthing written in C++"; longDescription = '' A cross-platform status bar for Syncthing. diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index 702cadfdaa9..c65e5377eb3 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Editor of tesseract-ocr box files"; - homepage = https://github.com/zdenop/qt-box-editor; + homepage = "https://github.com/zdenop/qt-box-editor"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/qtbitcointrader/default.nix b/pkgs/applications/misc/qtbitcointrader/default.nix index 21d51f17258..c5dfdf95fb5 100644 --- a/pkgs/applications/misc/qtbitcointrader/default.nix +++ b/pkgs/applications/misc/qtbitcointrader/default.nix @@ -28,7 +28,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Bitcoin trading client"; - homepage = https://centrabit.com/; + homepage = "https://centrabit.com/"; license = licenses.gpl3; platforms = qt5.qtbase.meta.platforms; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 6b68071d4d0..faa19914749 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { meta = with lib; { description = "A multi-platform GUI for pass, the standard unix password manager"; - homepage = https://qtpass.org; + homepage = "https://qtpass.org"; license = licenses.gpl3; maintainers = [ maintainers.hrdinka ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix index 948bcf33d37..1956f0ad41d 100644 --- a/pkgs/applications/misc/quicksynergy/default.nix +++ b/pkgs/applications/misc/quicksynergy/default.nix @@ -29,7 +29,7 @@ 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/; + homepage = "https://sourceforge.net/projects/quicksynergy/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.spinus ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 243913d0a09..68ddef65697 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "File manager with minimalistic curses interface"; - homepage = http://ranger.github.io/; + homepage = "http://ranger.github.io/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.toonn maintainers.magnetophon ]; diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index ac62ccc00cb..ec40347cbcb 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -75,7 +75,7 @@ EOF meta = with lib; { description = "Cross-platform open source Redis DB management tool"; - homepage = https://redisdesktop.com/; + homepage = "https://redisdesktop.com/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/misc/redshift-plasma-applet/default.nix b/pkgs/applications/misc/redshift-plasma-applet/default.nix index 2eebe67c46d..c14eee398ce 100644 --- a/pkgs/applications/misc/redshift-plasma-applet/default.nix +++ b/pkgs/applications/misc/redshift-plasma-applet/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "KDE Plasma 5 widget for controlling Redshift"; - homepage = https://github.com/kotelnik/plasma-applet-redshift-control; + homepage = "https://github.com/kotelnik/plasma-applet-redshift-control"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ benley zraexy ]; diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index e9862041f4a..81fbcc8b483 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -93,7 +93,7 @@ rec { be set to match the lamps in your room. ''; license = licenses.gpl3Plus; - homepage = http://jonls.dk/redshift; + homepage = "http://jonls.dk/redshift"; platforms = platforms.unix; maintainers = with maintainers; [ yegortimoshenko globin ]; }; @@ -112,7 +112,7 @@ rec { meta = redshift.meta // { description = redshift.meta.description + "(with wlroots patches)"; - homepage = https://github.com/minus7/redshift; + homepage = "https://github.com/minus7/redshift"; }; }; } diff --git a/pkgs/applications/misc/regextester/default.nix b/pkgs/applications/misc/regextester/default.nix index 816a158c031..22f46eed7df 100644 --- a/pkgs/applications/misc/regextester/default.nix +++ b/pkgs/applications/misc/regextester/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A desktop application to test regular expressions interactively"; - homepage = https://github.com/artemanufrij/regextester; + homepage = "https://github.com/artemanufrij/regextester"; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index 00640be6c74..f42a58e0057 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://robomongo.org/; + homepage = "https://robomongo.org/"; description = "Query GUI for mongodb"; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index 8df4e960c18..ef0a3047297 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://robomongo.org/; + 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; diff --git a/pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch b/pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch new file mode 100644 index 00000000000..9b9479b1b49 --- /dev/null +++ b/pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch @@ -0,0 +1,25 @@ +From 695e7a441fc28b874e65917fe2c0059b5b8ca749 Mon Sep 17 00:00:00 2001 +From: Cole Helbling <cole.e.helbling@outlook.com> +Date: Sat, 28 Mar 2020 23:46:03 -0700 +Subject: [PATCH] Patch plugindir to output + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 75e476f..cb1ddf7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -55,7 +55,7 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 ]) + PKG_CHECK_MODULES([cairo], [cairo]) + PKG_CHECK_MODULES([rofi], [rofi]) + +-[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`" ++[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`" + AC_SUBST([rofi_PLUGIN_INSTALL_DIR]) + + LT_INIT([disable-static]) +-- +2.25.1 + diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix new file mode 100644 index 00000000000..14742da35da --- /dev/null +++ b/pkgs/applications/misc/rofi-emoji/default.nix @@ -0,0 +1,69 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchpatch +, substituteAll +, makeWrapper + +, autoreconfHook +, pkgconfig + +, cairo +, glib +, libnotify +, rofi-unwrapped +, wl-clipboard +, xclip +, xsel +}: + +stdenv.mkDerivation rec { + pname = "rofi-emoji"; + version = "2.1.2"; + + src = fetchFromGitHub { + owner = "Mange"; + repo = pname; + rev = "v${version}"; + sha256 = "0knsvsdff2c7ww94120bq92735qrfriyd28mi0n72ccb2iikyi8b"; + }; + + patches = [ + # Look for plugin-related files in $out/lib/rofi + ./0001-Patch-plugindir-to-output.patch + ]; + + postPatch = '' + patchShebangs clipboard-adapter.sh + ''; + + postFixup = '' + chmod +x $out/share/rofi-emoji/clipboard-adapter.sh + wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \ + --prefix PATH ":" ${lib.makeBinPath [ libnotify wl-clipboard xclip xsel ]} + ''; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + cairo + glib + libnotify + makeWrapper + rofi-unwrapped + wl-clipboard + xclip + xsel + ]; + + meta = with lib; { + description = "An emoji selector plugin for Rofi"; + homepage = "https://github.com/Mange/rofi-emoji"; + license = licenses.mit; + maintainers = with maintainers; [ cole-h ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/rofi-menugen/default.nix b/pkgs/applications/misc/rofi-menugen/default.nix index 2255089ab7e..088ec29ae37 100644 --- a/pkgs/applications/misc/rofi-menugen/default.nix +++ b/pkgs/applications/misc/rofi-menugen/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Generates menu based applications using rofi"; - homepage = https://github.com/octotep/menugen; + homepage = "https://github.com/octotep/menugen"; maintainers = with maintainers; [ ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/rofi/wrapper.nix b/pkgs/applications/misc/rofi/wrapper.nix index 1c7284a2db2..4e69f9cce14 100644 --- a/pkgs/applications/misc/rofi/wrapper.nix +++ b/pkgs/applications/misc/rofi/wrapper.nix @@ -1,23 +1,26 @@ -{ stdenv, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null }: +{ symlinkJoin, lib, rofi-unwrapped, makeWrapper, hicolor-icon-theme, theme ? null, plugins ? [] }: -stdenv.mkDerivation { - pname = "rofi"; - version = rofi-unwrapped.version; +symlinkJoin { + name = "rofi-${rofi-unwrapped.version}"; + + paths = [ + rofi-unwrapped.out + ] ++ (lib.forEach plugins (p: p.out)); buildInputs = [ makeWrapper ]; preferLocalBuild = true; passthru.unwrapped = rofi-unwrapped; - buildCommand = '' - mkdir $out - ln -s ${rofi-unwrapped}/* $out - rm $out/bin + postBuild = '' + rm -rf $out/bin mkdir $out/bin ln -s ${rofi-unwrapped}/bin/* $out/bin rm $out/bin/rofi makeWrapper ${rofi-unwrapped}/bin/rofi $out/bin/rofi \ --prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share \ - ${if theme != null then ''--add-flags "-theme ${theme}"'' else ""} + ${lib.optionalString (plugins != []) ''--prefix XDG_DATA_DIRS : ${lib.concatStringsSep ":" (lib.forEach plugins (p: "${p.out}/share"))}''} \ + ${lib.optionalString (theme != null) ''--add-flags "-theme ${theme}"''} \ + ${lib.optionalString (plugins != []) ''--add-flags "-plugin-path $out/lib/rofi"''} rm $out/bin/rofi-theme-selector makeWrapper ${rofi-unwrapped}/bin/rofi-theme-selector $out/bin/rofi-theme-selector \ diff --git a/pkgs/applications/misc/rsibreak/default.nix b/pkgs/applications/misc/rsibreak/default.nix index 6ee9966401b..eefc0a0c577 100644 --- a/pkgs/applications/misc/rsibreak/default.nix +++ b/pkgs/applications/misc/rsibreak/default.nix @@ -22,7 +22,7 @@ in mkDerivation rec { meta = with lib; { description = "RSIBreak takes care of your health and regularly breaks your work to avoid repetitive strain injury (RSI)"; license = licenses.gpl2; - homepage = https://www.kde.org/applications/utilities/rsibreak/; + homepage = "https://www.kde.org/applications/utilities/rsibreak/"; maintainers = with maintainers; [ vandenoever ]; }; } diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 20211ecb53b..c4547e87513 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -38,7 +38,7 @@ buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/michael-lazar/rtv; + homepage = "https://github.com/michael-lazar/rtv"; description = "Browse Reddit from your Terminal"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer wedens ]; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix index 4f4319af6cb..f81709b9739 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-font-size/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Change the urxvt font size on the fly"; - homepage = https://github.com/majutsushi/urxvt-font-size; + homepage = "https://github.com/majutsushi/urxvt-font-size"; license = licenses.mit; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix index 13e005014f1..0c95acd7205 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Perl extensions for the rxvt-unicode terminal emulator"; - homepage = https://github.com/effigies/urxvt-perl; + homepage = "https://github.com/effigies/urxvt-perl"; license = licenses.gpl3; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix index dac04141070..53bb938c333 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-perls/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Perl extensions for the rxvt-unicode terminal emulator"; - homepage = https://github.com/muennich/urxvt-perls; + homepage = "https://github.com/muennich/urxvt-perls"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix index 2982c02cce9..71a55f9293c 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-tabbedex/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tabbed plugin for rxvt-unicode with many enhancements (mina86's fork)"; - homepage = https://github.com/mina86/urxvt-tabbedex; + homepage = "https://github.com/mina86/urxvt-tabbedex"; maintainers = with maintainers; [ abbradar ]; platforms = with platforms; unix; }; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix index ba8ec3a6e72..5a84a9b472a 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-theme-switch/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "urxvt plugin that allows to switch color themes during runtime"; - homepage = https://github.com/felixr/urxvt-theme-switch; + homepage = "https://github.com/felixr/urxvt-theme-switch"; license = "CCBYNC"; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix index 3d0dec20c9a..aebbedacef6 100644 --- a/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix +++ b/pkgs/applications/misc/rxvt-unicode-plugins/urxvt-vtwheel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Pass mouse wheel commands to secondary screens (screen, less, nano, etc)"; - homepage = https://aur.archlinux.org/packages/urxvt-vtwheel; + homepage = "https://aur.archlinux.org/packages/urxvt-vtwheel"; license = licenses.mit; maintainers = with maintainers; [ danbst ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/rxvt/default.nix b/pkgs/applications/misc/rxvt/default.nix index acdd21a1c21..c71973da13b 100644 --- a/pkgs/applications/misc/rxvt/default.nix +++ b/pkgs/applications/misc/rxvt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://rxvt.sourceforge.net/; + homepage = "http://rxvt.sourceforge.net/"; description = "Colour vt102 terminal emulator with less features and lower memory consumption"; longDescription = '' rxvt (acronym for our extended virtual terminal) is a terminal diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 125170d36c2..f6bb7133d99 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -61,7 +61,7 @@ in buildPythonApplication rec { doCheck = false; # no tests meta = { - homepage = http://slgobinath.github.io/SafeEyes; + homepage = "http://slgobinath.github.io/SafeEyes"; description = "Protect your eyes from eye strain using this simple and beautiful, yet extensible break reminder. A Free and Open Source Linux alternative to EyeLeo"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ srghma ]; diff --git a/pkgs/applications/misc/sakura/default.nix b/pkgs/applications/misc/sakura/default.nix index f646b473915..34a6142e83a 100644 --- a/pkgs/applications/misc/sakura/default.nix +++ b/pkgs/applications/misc/sakura/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A terminal emulator based on GTK and VTE"; - homepage = http://www.pleyades.net/david/projects/sakura; + homepage = "http://www.pleyades.net/david/projects/sakura"; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl codyopel ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/sbagen/default.nix b/pkgs/applications/misc/sbagen/default.nix index 6f38ba5662b..821fbe35ca1 100644 --- a/pkgs/applications/misc/sbagen/default.nix +++ b/pkgs/applications/misc/sbagen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Binaural sound generator"; - homepage = http://uazu.net/sbagen; + homepage = "http://uazu.net/sbagen"; license = "GPL"; platforms = [ "i686-linux" ]; }; diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix index c95eba48bdf..6ee4695d171 100644 --- a/pkgs/applications/misc/sc-im/default.nix +++ b/pkgs/applications/misc/sc-im/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/andmarti1424/sc-im; + homepage = "https://github.com/andmarti1424/sc-im"; description = "SC-IM - Spreadsheet Calculator Improvised - SC fork"; license = licenses.bsdOriginal; maintainers = [ ]; diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 3cebcc0101f..997786fc107 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-D__GNU_LIBRARY__"; meta = with stdenv.lib; { - homepage = https://dushistov.github.io/sdcv/; + homepage = "https://dushistov.github.io/sdcv/"; description = "Console version of StarDict"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix index 9bbae33b3e4..fe8598e4915 100644 --- a/pkgs/applications/misc/sent/default.nix +++ b/pkgs/applications/misc/sent/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple plaintext presentation tool"; - homepage = https://tools.suckless.org/sent/; + homepage = "https://tools.suckless.org/sent/"; license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 4199e198c53..da7e501b271 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -11,13 +11,13 @@ let in stdenv.mkDerivation rec { pname = "sequeler"; - version = "0.7.3"; + version = "0.7.4"; src = fetchFromGitHub { owner = "Alecaddd"; repo = pname; rev = "v${version}"; - sha256 = "16vc3v9qls9fxg9h8fsi67z68s4acl5hj14gbcrnqm7mf3kmk3aw"; + sha256 = "0ki8dganj6hmvg5qwdlc3y0a4pdmx7454np790yf5wnqb6ixb6gv"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gettext wrapGAppsHook python3 desktop-file-utils ]; @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { editor with language recognition, and visualize SELECT results in a Gtk.Grid Widget. ''; - homepage = https://github.com/Alecaddd/sequeler; + homepage = "https://github.com/Alecaddd/sequeler"; license = licenses.gpl3; maintainers = [ maintainers.etu ] ++ pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/applications/misc/sequelpro/default.nix b/pkgs/applications/misc/sequelpro/default.nix index e81c0b99264..16a11342d81 100644 --- a/pkgs/applications/misc/sequelpro/default.nix +++ b/pkgs/applications/misc/sequelpro/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "MySQL database management for macOS"; - homepage = http://www.sequelpro.com/; + homepage = "http://www.sequelpro.com/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.darwin; }; diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index 2b44b0398b5..c0e255a36e3 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Yet another simple static gallery generator"; - homepage = http://sigal.saimon.org/en/latest/index.html; + homepage = "http://sigal.saimon.org/en/latest/index.html"; license = licenses.mit; maintainers = with maintainers; [ domenkozar matthiasbeyer ]; }; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 7ec72eae6fa..195437250a1 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.15.0"; + version = "1.15.1"; sha256 = { - x86_64-linux = "08h3g2rw75k63ssd62c6jrb2dy9sz85y5jpfj5np64dvw70a1811"; + x86_64-linux = "1q1y5favj2ny0l2iq53vq39ns68zfr2z1plskxdg2d93jarvcr8x"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/slade/default.nix b/pkgs/applications/misc/slade/default.nix index d2d5e9548a0..e93baa997c8 100644 --- a/pkgs/applications/misc/slade/default.nix +++ b/pkgs/applications/misc/slade/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Doom editor"; - homepage = http://slade.mancubus.net/; + homepage = "http://slade.mancubus.net/"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/applications/misc/slade/git.nix b/pkgs/applications/misc/slade/git.nix index 9ee30d347b0..1eaf907b7ed 100644 --- a/pkgs/applications/misc/slade/git.nix +++ b/pkgs/applications/misc/slade/git.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Doom editor"; - homepage = http://slade.mancubus.net/; + homepage = "http://slade.mancubus.net/"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ ertes ]; diff --git a/pkgs/applications/misc/sleepyhead/default.nix b/pkgs/applications/misc/sleepyhead/default.nix index a3270929417..0753045cc4b 100644 --- a/pkgs/applications/misc/sleepyhead/default.nix +++ b/pkgs/applications/misc/sleepyhead/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation { inherit name; src = fetchgit { - url = https://gitlab.com/sleepyhead/sleepyhead-code.git; + url = "https://gitlab.com/sleepyhead/sleepyhead-code.git"; rev = "9e2329d8bca45693231b5e3dae80063717c24578"; sha256 = "0448z8gyaxpgpnksg34lzmffj36jdpm0ir4xxa5gvzagkx0wk07h"; }; @@ -29,7 +29,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://sleepyhead.jedimark.net/; + homepage = "https://sleepyhead.jedimark.net/"; description = "Review and explore data produced by CPAP and related machines"; longDescription = '' SleepyHead is cross platform, opensource sleep tracking program for reviewing CPAP and Oximetry data, which are devices used in the treatment of Sleep Disorders like Obstructive Sleep Apnea. diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index 1465b0ea052..25019f76545 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.''; - homepage = https://slic3r.org/; + homepage = "https://slic3r.org/"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor the-kenny ]; diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix index bfb3d010a3c..5c13cbf8669 100644 --- a/pkgs/applications/misc/slstatus/default.nix +++ b/pkgs/applications/misc/slstatus/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "unstable-2018-04-16"; src = fetchgit { - url = https://git.suckless.org/slstatus; + url = "https://git.suckless.org/slstatus"; rev = "97ef7c2a1d67bb2c9c379e657fbc8e35acd6aafb"; sha256 = "1777hgl10imk0l2sgnqgbkfchv1mpxrd82ninzwp7f1rgwchz36v"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = https://tools.suckless.org/slstatus/; + homepage = "https://tools.suckless.org/slstatus/"; description = "status monitor for window managers that use WM_NAME like dwm"; license = licenses.isc; maintainers = with maintainers; [ geistesk ]; diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 722b0bc5077..d2a883c295d 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec { To be able to use it, make sure you have access to /dev/hidraw* files. ''; license = licenses.gpl2; - homepage = https://pwr-solaar.github.io/Solaar/; + homepage = "https://pwr-solaar.github.io/Solaar/"; platforms = platforms.linux; maintainers = with maintainers; [ spinus ysndr ]; }; diff --git a/pkgs/applications/misc/spacefm/default.nix b/pkgs/applications/misc/spacefm/default.nix index 47e13fa2508..45dc487c8ed 100644 --- a/pkgs/applications/misc/spacefm/default.nix +++ b/pkgs/applications/misc/spacefm/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { with built-in VFS, udev- or HAL-based device manager, customizable menu system, and bash integration ''; - homepage = http://ignorantguru.github.io/spacefm/; + homepage = "http://ignorantguru.github.io/spacefm/"; platforms = platforms.linux; license = licenses.gpl3Plus; maintainers = with maintainers; [ jagajaga obadz ]; diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix index 103075024dd..27d5610956d 100644 --- a/pkgs/applications/misc/sqliteman/default.nix +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple but powerful Sqlite3 GUI database manager"; - homepage = http://sqliteman.yarpen.cz/; + homepage = "http://sqliteman.yarpen.cz/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eikek ]; diff --git a/pkgs/applications/misc/ssocr/default.nix b/pkgs/applications/misc/ssocr/default.nix index bb1655b4463..c52573785ef 100644 --- a/pkgs/applications/misc/ssocr/default.nix +++ b/pkgs/applications/misc/ssocr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Seven Segment Optical Character Recognition"; - homepage = https://github.com/auerswal/ssocr; + homepage = "https://github.com/auerswal/ssocr"; license = licenses.gpl3; maintainers = [ maintainers.kroell ]; }; diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 47d7279a47f..bc70aad8da9 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://st.suckless.org/; + homepage = "https://st.suckless.org/"; description = "Simple Terminal for X from Suckless.org Community"; license = licenses.mit; maintainers = with maintainers; [andsild]; diff --git a/pkgs/applications/misc/st/xst.nix b/pkgs/applications/misc/st/xst.nix index 9407243c6a2..3e29abee5d6 100644 --- a/pkgs/applications/misc/st/xst.nix +++ b/pkgs/applications/misc/st/xst.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/neeasade/xst; + homepage = "https://github.com/neeasade/xst"; description = "Simple terminal fork that can load config from Xresources"; license = licenses.mit; maintainers = [ maintainers.vyp ]; diff --git a/pkgs/applications/misc/stag/default.nix b/pkgs/applications/misc/stag/default.nix index ebb50e685da..6b4bf194630 100644 --- a/pkgs/applications/misc/stag/default.nix +++ b/pkgs/applications/misc/stag/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "stag-1.0"; src = fetchgit { - url = https://github.com/seenaburns/stag.git; + url = "https://github.com/seenaburns/stag.git"; rev = "90e2964959ea8242349250640d24cee3d1966ad6"; sha256 = "1yrzjhcwrxrxq5jj695wvpgb0pz047m88yq5n5ymkcw5qr78fy1v"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/seenaburns/stag; + homepage = "https://github.com/seenaburns/stag"; description = "Terminal streaming bar graph passed through stdin"; license = stdenv.lib.licenses.bsdOriginal; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/stog/default.nix b/pkgs/applications/misc/stog/default.nix index 8c47de3afac..038d04adeaa 100644 --- a/pkgs/applications/misc/stog/default.nix +++ b/pkgs/applications/misc/stog/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML documents and web site compiler"; - homepage = https://www.good-eris.net/stog; + homepage = "https://www.good-eris.net/stog"; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix index 9769045b9ce..87e8316c2c4 100644 --- a/pkgs/applications/misc/stretchly/default.nix +++ b/pkgs/applications/misc/stretchly/default.nix @@ -53,8 +53,8 @@ stdenv.mkDerivation rec { seconds every 10 minutes. Every 30 minutes, it displays a window containing an idea for a longer 5 minute break. ''; - homepage = https://hovancik.net/stretchly; - downloadPage = https://hovancik.net/stretchly/downloads/; + homepage = "https://hovancik.net/stretchly"; + downloadPage = "https://hovancik.net/stretchly/downloads/"; license = licenses.bsd2; maintainers = with maintainers; [ cdepillabout ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/stupidterm/default.nix b/pkgs/applications/misc/stupidterm/default.nix index b786b34e955..0a6e947f15c 100644 --- a/pkgs/applications/misc/stupidterm/default.nix +++ b/pkgs/applications/misc/stupidterm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple wrapper around the VTE terminal emulator widget for GTK"; - homepage = https://github.com/esmil/stupidterm; + homepage = "https://github.com/esmil/stupidterm"; license = licenses.lgpl3Plus; maintainers = [ maintainers.etu ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix index 340b59d5ff2..67f48d67f80 100644 --- a/pkgs/applications/misc/styx/default.nix +++ b/pkgs/applications/misc/styx/default.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Nix based static site generator"; maintainers = with maintainers; [ ericsagnes ]; - homepage = https://styx-static.github.io/styx-site/; - downloadPage = https://github.com/styx-static/styx/; + homepage = "https://styx-static.github.io/styx-site/"; + downloadPage = "https://github.com/styx-static/styx/"; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 960b7b9eeef..040a269d62f 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -22,7 +22,7 @@ let enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libdivecomputer.org; + homepage = "http://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = with maintainers; [ mguentner ]; license = licenses.lgpl21; @@ -100,7 +100,7 @@ in stdenv.mkDerivation { conveniently be entered using a map interface), logging of equipment used and names of other divers, and lets users rate dives and provide additional notes. ''; - homepage = https://subsurface-divelog.org; + homepage = "https://subsurface-divelog.org"; license = licenses.gpl2; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix index 8102375479b..dd1218282d8 100644 --- a/pkgs/applications/misc/super_user_spark/default.nix +++ b/pkgs/applications/misc/super_user_spark/default.nix @@ -27,6 +27,6 @@ mkDerivation { jailbreak = true; description = "Configure your dotfile deployment with a DSL"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/NorfairKing/super-user-spark; + homepage = "https://github.com/NorfairKing/super-user-spark"; maintainers = [ stdenv.lib.maintainers.badi ]; } diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 76a62d1762c..7f094607859 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -59,7 +59,7 @@ let dontStrip = true; meta = { - homepage = http://www.sweethome3d.com/index.jsp; + homepage = "http://www.sweethome3d.com/index.jsp"; inherit description; inherit license; maintainers = [ stdenv.lib.maintainers.edwtjo ]; diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix index 1d3f1a41e16..ec759572443 100644 --- a/pkgs/applications/misc/sweethome3d/editors.nix +++ b/pkgs/applications/misc/sweethome3d/editors.nix @@ -47,7 +47,7 @@ let dontStrip = true; meta = { - homepage = http://www.sweethome3d.com/index.jsp; + homepage = "http://www.sweethome3d.com/index.jsp"; inherit description; inherit license; maintainers = [ stdenv.lib.maintainers.edwtjo ]; diff --git a/pkgs/applications/misc/synapse/default.nix b/pkgs/applications/misc/synapse/default.nix index c12f5b17679..751c0a48f5b 100644 --- a/pkgs/applications/misc/synapse/default.nix +++ b/pkgs/applications/misc/synapse/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { the Zeitgeist engine ''; description = "Semantic launcher to start applications and find relevant files"; - homepage = https://launchpad.net/synapse-project; + homepage = "https://launchpad.net/synapse-project"; license = licenses.gpl3; maintainers = with maintainers; [ mahe ]; platforms = with platforms; all; diff --git a/pkgs/applications/misc/syncthing-tray/default.nix b/pkgs/applications/misc/syncthing-tray/default.nix index a07fe0c7510..38826b7735f 100644 --- a/pkgs/applications/misc/syncthing-tray/default.nix +++ b/pkgs/applications/misc/syncthing-tray/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Simple application tray for syncthing"; - homepage = https://github.com/alex2108/syncthing-tray; + homepage = "https://github.com/alex2108/syncthing-tray"; license = licenses.mit; maintainers = with maintainers; [ nickhu ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 20dd3d6a3c6..16bfdfb9a03 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -20,14 +20,14 @@ }: mkDerivation rec { - version = "0.10.7"; + version = "0.10.8"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "0qix22wblakpxwqy63378p5rksnx2ik9gfw0c6za19mzhx7gwln8"; + sha256 = "1g27v109m0ar090b340x6lsrzfp85hskcr3kapc2rgdhaa0mygpd"; }; buildInputs = [ qtbase cpp-utilities qtutilities ] diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 645ed7433b3..bb922f3ca5b 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchFromGitHub, cmake, openssl +{ stdenv, lib, fetchFromGitHub, cmake, openssl, qttools , ApplicationServices, Carbon, Cocoa, CoreServices, ScreenSaver , xlibsWrapper, libX11, libXi, libXtst, libXrandr, xinput, avahi-compat , withGUI ? true, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "synergy"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "symless"; @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl + ] ++ lib.optionals withGUI [ + qttools ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Carbon Cocoa CoreServices ScreenSaver ] ++ lib.optionals stdenv.isLinux [ @@ -71,7 +73,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Share one mouse and keyboard between multiple computers"; - homepage = http://synergy-project.org/; + homepage = "http://synergy-project.org/"; license = licenses.gpl2; maintainers = with maintainers; [ aszlig enzime ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/tabula/default.nix b/pkgs/applications/misc/tabula/default.nix index fbb1832735b..1b29118c9b1 100644 --- a/pkgs/applications/misc/tabula/default.nix +++ b/pkgs/applications/misc/tabula/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { out of PDF files. Tabula allows you to extract that data into a CSV or Microsoft Excel spreadsheet using a simple, easy-to-use interface. ''; - homepage = https://tabula.technology/; + homepage = "https://tabula.technology/"; license = licenses.mit; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/taizen/default.nix b/pkgs/applications/misc/taizen/default.nix index bf9770acacd..993606d39c0 100644 --- a/pkgs/applications/misc/taizen/default.nix +++ b/pkgs/applications/misc/taizen/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0chrgwm97y1a3gj218x25yqk1y1h74a6gzyxjdm023msvs58nkni"; meta = with lib; { - homepage = https://crates.io/crates/taizen; + homepage = "https://crates.io/crates/taizen"; license = licenses.mit; description = "curses based mediawiki browser"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/applications/misc/taskjuggler/2.x/default.nix b/pkgs/applications/misc/taskjuggler/2.x/default.nix index a0dc7b7c71e..a1d04a13af8 100644 --- a/pkgs/applications/misc/taskjuggler/2.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/2.x/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { installFlags = [ "kde_locale=\${out}/share/locale" ]; meta = { - homepage = http://www.taskjuggler.org; + homepage = "http://www.taskjuggler.org"; license = stdenv.lib.licenses.gpl2; description = "Project management tool"; longDescription = '' diff --git a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock index d1642e76fa6..8831993117d 100644 --- a/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock +++ b/pkgs/applications/misc/taskjuggler/3.x/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES taskjuggler BUNDLED WITH - 1.10.5 + 2.1.4 diff --git a/pkgs/applications/misc/taskjuggler/3.x/default.nix b/pkgs/applications/misc/taskjuggler/3.x/default.nix index 23252d0c480..6b3ef60d638 100644 --- a/pkgs/applications/misc/taskjuggler/3.x/default.nix +++ b/pkgs/applications/misc/taskjuggler/3.x/default.nix @@ -8,7 +8,7 @@ bundlerEnv { meta = { description = "A modern and powerful project management tool"; - homepage = http://taskjuggler.org/; + homepage = "http://taskjuggler.org/"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; }; diff --git a/pkgs/applications/misc/taskjuggler/Gemfile.lock b/pkgs/applications/misc/taskjuggler/Gemfile.lock index dcc46e370e7..0f05c496173 100644 --- a/pkgs/applications/misc/taskjuggler/Gemfile.lock +++ b/pkgs/applications/misc/taskjuggler/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES taskjuggler BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/misc/taskjuggler/default.nix b/pkgs/applications/misc/taskjuggler/default.nix index 838cc199a6c..64753397833 100644 --- a/pkgs/applications/misc/taskjuggler/default.nix +++ b/pkgs/applications/misc/taskjuggler/default.nix @@ -13,7 +13,7 @@ bundlerApp { meta = with lib; { description = "A modern and powerful project management tool"; - homepage = http://taskjuggler.org/; + homepage = "http://taskjuggler.org/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ manveru nicknovitski ]; diff --git a/pkgs/applications/misc/tasknc/default.nix b/pkgs/applications/misc/tasknc/default.nix index 0450cb40a55..46378aec33a 100644 --- a/pkgs/applications/misc/tasknc/default.nix +++ b/pkgs/applications/misc/tasknc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { - homepage = https://github.com/lharding/tasknc; + homepage = "https://github.com/lharding/tasknc"; description = "A ncurses wrapper around taskwarrior"; maintainers = with maintainers; [ matthiasbeyer infinisil ]; platforms = platforms.linux; # Cannot test others diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 847092356d2..a60ca997ee0 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Script for taking notes and open urls with taskwarrior"; - homepage = https://github.com/ValiValpas/taskopen; + homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; license = stdenv.lib.licenses.free ; maintainers = [ maintainers.winpat ]; diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 931a27fbeff..4c577049f44 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "REPL for taskwarrior"; - homepage = http://tasktools.org; + homepage = "http://tasktools.org"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index ba919fbc626..67f2fd8927b 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Highly flexible command-line tool to manage TODO lists"; - homepage = https://taskwarrior.org; + homepage = "https://taskwarrior.org"; license = licenses.mit; maintainers = with maintainers; [ marcweber ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/misc/tdrop/default.nix b/pkgs/applications/misc/tdrop/default.nix index 547eea4f2d2..020298a0c52 100644 --- a/pkgs/applications/misc/tdrop/default.nix +++ b/pkgs/applications/misc/tdrop/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Glorified WM-Independent Dropdown Creator"; - homepage = https://github.com/noctuid/tdrop; + homepage = "https://github.com/noctuid/tdrop"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ wedens ]; diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index 94eacb1fe06..5ccdbbbb6b4 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Starts a countdown to or from TIMESPEC"; longDescription = "Countdown timer and stopwatch in your terminal"; - homepage = https://github.com/trehn/termdown; + homepage = "https://github.com/trehn/termdown"; license = licenses.gpl3; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index 00300e65abb..cde53ef4165 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { maintainers = with maintainers; [ cstrahan ]; - homepage = https://github.com/julienXX/terminal-notifier; + homepage = "https://github.com/julienXX/terminal-notifier"; license = licenses.mit; platforms = platforms.darwin; }; diff --git a/pkgs/applications/misc/terminal-parrot/default.nix b/pkgs/applications/misc/terminal-parrot/default.nix index ba898932f06..68241d79850 100644 --- a/pkgs/applications/misc/terminal-parrot/default.nix +++ b/pkgs/applications/misc/terminal-parrot/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Shows colorful, animated party parrot in your terminial"; - homepage = https://github.com/jmhobbs/terminal-parrot; + homepage = "https://github.com/jmhobbs/terminal-parrot"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.heel ]; diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index d09c98b6709..ea73d5cbb68 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -33,7 +33,7 @@ python2.pkgs.buildPythonApplication rec { quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports). ''; - homepage = https://gnometerminator.blogspot.no/p/introduction.html; + homepage = "https://gnometerminator.blogspot.no/p/introduction.html"; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix index fce46d120de..4c38e530247 100644 --- a/pkgs/applications/misc/terminus/default.nix +++ b/pkgs/applications/misc/terminus/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = with lib; { description = "A terminal for a more modern age"; - homepage = https://eugeny.github.io/terminus/; + homepage = "https://eugeny.github.io/terminus/"; maintainers = with maintainers; [ jlesquembre ]; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 2a610edde03..63565e207f7 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple VTE-based terminal"; license = licenses.lgpl2Plus; - homepage = https://github.com/thestinger/termite/; + homepage = "https://github.com/thestinger/termite/"; maintainers = with maintainers; [ koral ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/teseq/default.nix b/pkgs/applications/misc/teseq/default.nix index b1764591982..1ba22911c51 100644 --- a/pkgs/applications/misc/teseq/default.nix +++ b/pkgs/applications/misc/teseq/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://www.gnu.org/software/teseq/; + homepage = "https://www.gnu.org/software/teseq/"; description = "Escape sequence illuminator"; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/applications/misc/thinking-rock/default.nix b/pkgs/applications/misc/thinking-rock/default.nix index c057fde95d7..fd6065010fb 100644 --- a/pkgs/applications/misc/thinking-rock/default.nix +++ b/pkgs/applications/misc/thinking-rock/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "thinkingrock-binary-2.2.1"; src = fetchurl { - url = mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz; + url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz"; sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Task management system"; - homepage = http://www.thinkingrock.com.au/; + homepage = "http://www.thinkingrock.com.au/"; license = "CDDL"; # Common Development and Distribution License platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 39f54156fef..f8ae5587ff9 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchzip, pkgconfig -, autoreconfHook, gettext, expat +{ stdenv, fetchFromGitHub, pkgconfig +, autoreconfHook, gettext, expat, pcre2 , libconfuse, vte, gtk , makeWrapper }: +with stdenv.lib; stdenv.mkDerivation rec { pname = "tilda"; - version = "1.4.1"; + version = "1.5.0"; - src = fetchzip { - url = "https://github.com/lanoxx/tilda/archive/${pname}-${version}.tar.gz"; - sha256 = "154rsldqjv2m1bddisb930qicb0y35kx7bxq392n2hn68jr2pxkj"; + src = fetchFromGitHub { + owner = "lanoxx"; + repo = "tilda"; + rev = "${pname}-${version}"; + sha256 = "13djibj3s7ig13c57ywy38pxy3qfmqihii2c0g15fy2h9q8xp1gx"; }; nativeBuildInputs = [ autoreconfHook makeWrapper pkgconfig ]; - buildInputs = [ gettext libconfuse vte gtk ]; + buildInputs = [ gettext pcre2 libconfuse vte gtk ]; LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build @@ -27,9 +30,9 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - meta = with stdenv.lib; { + meta = { description = "A Gtk based drop down terminal for Linux and Unix"; - homepage = https://github.com/lanoxx/tilda/; + homepage = "https://github.com/lanoxx/tilda/"; license = licenses.gpl3; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tilix/default.nix b/pkgs/applications/misc/tilix/default.nix index 2fa193fc8e7..4707685e3da 100644 --- a/pkgs/applications/misc/tilix/default.nix +++ b/pkgs/applications/misc/tilix/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; - homepage = https://gnunn1.github.io/tilix-web; + homepage = "https://gnunn1.github.io/tilix-web"; license = licenses.mpl20; maintainers = with maintainers; [ midchildan worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index c85feff4360..dc991402eec 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gitlab.com/o9000/tint2; + homepage = "https://gitlab.com/o9000/tint2"; description = "Simple panel/taskbar unintrusive and light (memory, cpu, aestetic)"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tnef/default.nix b/pkgs/applications/misc/tnef/default.nix index bbd3073a4d8..40505c4fdbe 100644 --- a/pkgs/applications/misc/tnef/default.nix +++ b/pkgs/applications/misc/tnef/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { The TNEF program allows one to unpack the attachments which were encapsulated into the TNEF attachment. Thus alleviating the need to use Microsoft Outlook to view the attachment. ''; - homepage = https://github.com/verdammelt/tnef; + homepage = "https://github.com/verdammelt/tnef"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/todoist-electron/default.nix b/pkgs/applications/misc/todoist-electron/default.nix index cb0ee20f555..798f1708ae7 100644 --- a/pkgs/applications/misc/todoist-electron/default.nix +++ b/pkgs/applications/misc/todoist-electron/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "todoist-electron"; - version = "1.19"; + version = "1.20"; src = fetchurl { url = "https://github.com/KryDos/todoist-linux/releases/download/${version}/Todoist_${version}.0_amd64.deb"; - sha256 = "1w0l7k7wmbhwzv71cffsir0q7zg9m0617fmyvd4a01b6flpxrpfx"; + sha256 = "0w885xqy1304cp6b0jll5lvm6b1zd1ciqjl97d2hkdi8c9gv3bqx"; }; desktopItem = makeDesktopItem { name = "Todoist"; exec = "todoist"; desktopName = "Todoist"; - categories = "Utility;Productivity"; + categories = "Utility"; }; nativeBuildInputs = [ makeWrapper dpkg ]; diff --git a/pkgs/applications/misc/todoist/default.nix b/pkgs/applications/misc/todoist/default.nix index a625c834055..1e82ac2cccb 100644 --- a/pkgs/applications/misc/todoist/default.nix +++ b/pkgs/applications/misc/todoist/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "todoist"; @@ -13,12 +13,10 @@ buildGoModule rec { modSha256 = "1nnp5ijz4n34gc97rar4wlvlbx21ndpjyb2mc6gxdk1wzx3mgswp"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { - homepage = https://github.com/sachaos/todoist; + meta = { + homepage = "https://github.com/sachaos/todoist"; description = "Todoist CLI Client"; - license = licenses.mit; - platforms = platforms.unix; + license = lib.licenses.mit; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/misc/toggldesktop/default.nix b/pkgs/applications/misc/toggldesktop/default.nix index a0d663efb3c..410c17be803 100644 --- a/pkgs/applications/misc/toggldesktop/default.nix +++ b/pkgs/applications/misc/toggldesktop/default.nix @@ -140,7 +140,7 @@ buildEnv { meta = with lib; { description = "Client for Toggl time tracking service"; - homepage = https://github.com/toggl/toggldesktop; + homepage = "https://github.com/toggl/toggldesktop"; license = licenses.bsd3; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/tomboy/default.nix b/pkgs/applications/misc/tomboy/default.nix index d8a6f86f104..ff4faf139e6 100644 --- a/pkgs/applications/misc/tomboy/default.nix +++ b/pkgs/applications/misc/tomboy/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tomboy; + homepage = "https://wiki.gnome.org/Apps/Tomboy"; description = "A simple note-taking application with synchronization"; platforms = platforms.linux; license = stdenv.lib.licenses.lgpl2; diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index e619ab053e7..904782f3e1f 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple Mastodon client designed for elementary OS"; - homepage = https://github.com/bleakgrey/tootle; + homepage = "https://github.com/bleakgrey/tootle"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/applications/misc/tpmmanager/default.nix index b955711d003..2bbb95d01ae 100644 --- a/pkgs/applications/misc/tpmmanager/default.nix +++ b/pkgs/applications/misc/tpmmanager/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://projects.sirrix.com/trac/tpmmanager; + homepage = "https://projects.sirrix.com/trac/tpmmanager"; description = "Tool for managing the TPM"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix index a2f6980abd9..e418ee69b95 100644 --- a/pkgs/applications/misc/translate-shell/default.nix +++ b/pkgs/applications/misc/translate-shell/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.soimort.org/translate-shell; + homepage = "https://www.soimort.org/translate-shell"; description = "Command-line translator using Google Translate, Bing Translator, Yandex.Translate, and Apertium"; license = licenses.unlicense; maintainers = with maintainers; [ ebzzry infinisil ]; diff --git a/pkgs/applications/misc/tthsum/default.nix b/pkgs/applications/misc/tthsum/default.nix index 76ac3f75b26..792b80d0462 100644 --- a/pkgs/applications/misc/tthsum/default.nix +++ b/pkgs/applications/misc/tthsum/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { The specification of the THEX algorithm is at: http://adc.sourceforge.net/draft-jchapweske-thex-02.html ''; - homepage = http://tthsum.devs.nu/; + homepage = "http://tthsum.devs.nu/"; license = licenses.gpl3Plus; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix new file mode 100644 index 00000000000..586766e5456 --- /dev/null +++ b/pkgs/applications/misc/tut/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "tut"; + version = "0.0.2"; + + goPackagePath = "github.com/RasmusLindroth/tut"; + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "RasmusLindroth"; + repo = pname; + rev = version; + sha256 = "0c44mgkmjnfpf06cj63i6mscxcsm5cipm0l4n6pjxhc7k3qhgsfw"; + }; + + meta = with stdenv.lib; { + description = "A TUI for Mastodon with vim inspired keys"; + homepage = "https://github.com/RasmusLindroth/tut"; + license = licenses.mit; + maintainers = with maintainers; [ equirosa ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/misc/tut/deps.nix b/pkgs/applications/misc/tut/deps.nix new file mode 100644 index 00000000000..89453f121a9 --- /dev/null +++ b/pkgs/applications/misc/tut/deps.nix @@ -0,0 +1,273 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/DATA-DOG/go-sqlmock"; + fetch = { + type = "git"; + url = "https://github.com/DATA-DOG/go-sqlmock"; + rev = "v1.3.3"; + sha256 = "1xrly2vmy1mgj9dbkmivhh8gvq6v9f9xy2yp2dw54i1895zzs928"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/goquery"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/goquery"; + rev = "v1.5.0"; + sha256 = "1fqf4rs66wy02nxz6w4mvs2qawf2j8srz17i294v64y8gvxisp56"; + }; + } + { + goPackagePath = "github.com/andybalholm/cascadia"; + fetch = { + type = "git"; + url = "https://github.com/andybalholm/cascadia"; + rev = "v1.0.0"; + sha256 = "09j8cavbhqqdxjqrkwbc40g8p0i49zf3184rpjm5p2rjbprcghcc"; + }; + } + { + 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/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.9.0"; + sha256 = "086z8ssmr1fn9ba4mqnw7pnccfpys6l5yfhvycv1gdrsk7n27mvs"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "v1.0.0"; + sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "v1.3.0"; + sha256 = "1csg9qkmbg4ksj5247kgqcy7bxvqgz6b98r0rv2s4c1mkc99gx2r"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "v1.4.1"; + sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; + }; + } + { + goPackagePath = "github.com/kyoh86/xdg"; + fetch = { + type = "git"; + url = "https://github.com/kyoh86/xdg"; + rev = "v1.2.0"; + sha256 = "0a5nz53fdz1c2qvwlf2dpjdd72nxri95i6q4b07c37kiipgaxncn"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "v1.0.3"; + sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.1.4"; + sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.11"; + sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; + }; + } + { + goPackagePath = "github.com/mattn/go-mastodon"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-mastodon"; + rev = "3e91c76504df"; + sha256 = "1wh2hqrzx80gfs1y34f4h68mnz83asx88v0bsw372ch5j1shswlr"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.8"; + sha256 = "14ilkbhnhl8yj443dd1ga4biapswv4g0b4vm2mix78a8srdww39j"; + }; + } + { + goPackagePath = "github.com/mattn/go-tty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-tty"; + rev = "v0.0.3"; + sha256 = "0d1d63q02pc5k5ga8bw4yjbkrli2769vg237psajsskjirjy53vf"; + }; + } + { + goPackagePath = "github.com/microcosm-cc/bluemonday"; + fetch = { + type = "git"; + url = "https://github.com/microcosm-cc/bluemonday"; + rev = "v1.0.2"; + sha256 = "0j0aylsxqjcj49w7ph8cmpaqjlpvg7mb5mrcrd9bg71dlb9z9ir2"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.6.0"; + sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; + }; + } + { + goPackagePath = "github.com/rivo/tview"; + fetch = { + type = "git"; + url = "https://github.com/rivo/tview"; + rev = "cd38d7432498"; + sha256 = "1rs048gf1jip0p20qir99vy5k0f3m54h7bh56l1sh8lxij5qj406"; + }; + } + { + goPackagePath = "github.com/rivo/uniseg"; + fetch = { + type = "git"; + url = "https://github.com/rivo/uniseg"; + rev = "v0.1.0"; + sha256 = "0flpc1px1l6b1lxzhdxi0mvpkkjchppvgxshxxnlmm40s76i9ww5"; + }; + } + { + goPackagePath = "github.com/tomnomnom/linkheader"; + fetch = { + type = "git"; + url = "https://github.com/tomnomnom/linkheader"; + rev = "02ca5825eb80"; + sha256 = "1ghrv28vrvvrpyr4d4q817yby8g1j04mid8ql00sds1pvfv67d32"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "118fecf932d8"; + sha256 = "1rwrqfwh2yhnnhy7x0mbmlmk0rg1mi2jjad476y45i259a0c2ym6"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "12a6c2dcc1e4"; + sha256 = "0z1g49d36kh459dz0xhnss2f88vw7n5b3l3637v46f7daddvln67"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "90fa682c2a6e"; + sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + }; + } + { + goPackagePath = "gopkg.in/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.4"; + sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + }; + } +] diff --git a/pkgs/applications/misc/tvbrowser/bin.nix b/pkgs/applications/misc/tvbrowser/bin.nix index 38865ca4f3d..68d25e4e3de 100644 --- a/pkgs/applications/misc/tvbrowser/bin.nix +++ b/pkgs/applications/misc/tvbrowser/bin.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Electronic TV Program Guide"; - homepage = https://www.tvbrowser.org/; + homepage = "https://www.tvbrowser.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix index cd58219721c..69f58b828c4 100644 --- a/pkgs/applications/misc/twmn/default.nix +++ b/pkgs/applications/misc/twmn/default.nix @@ -28,7 +28,7 @@ mkDerivation { meta = { description = "A notification system for tiling window managers"; - homepage = https://github.com/sboli/twmn; + homepage = "https://github.com/sboli/twmn"; platforms = with lib.platforms; linux; maintainers = [ lib.maintainers.matejc ]; license = lib.licenses.lgpl3; diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix index 3cc4fcc1517..dbf721888df 100644 --- a/pkgs/applications/misc/udevil/default.nix +++ b/pkgs/applications/misc/udevil/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "udevil-0.4.4"; src = fetchurl { - url = https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz; + url = "https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz"; sha256 = "0z1bhaayambrcn7bgnrqk445k50ifabmw8q4i9qj49nnbcvxhbxd"; }; nativeBuildInputs = [ pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { patches = [ ./device-info-sys-stat.patch ]; 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/; + homepage = "https://ignorantguru.github.io/udevil/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix index 7b2c4997497..aa2246603f3 100644 --- a/pkgs/applications/misc/udiskie/default.nix +++ b/pkgs/applications/misc/udiskie/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Removable disk automounter for udisks"; license = licenses.mit; - homepage = https://github.com/coldfix/udiskie; + homepage = "https://github.com/coldfix/udiskie"; maintainers = with maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch b/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch new file mode 100644 index 00000000000..f14d7f71802 --- /dev/null +++ b/pkgs/applications/misc/ulauncher/0001-Adjust-get_data_path-for-NixOS.patch @@ -0,0 +1,55 @@ +From 86cc27022015697a61d1ec1b13e52f9dbe7f6c57 Mon Sep 17 00:00:00 2001 +From: worldofpeace <worldofpeace@protonmail.ch> +Date: Mon, 23 Mar 2020 18:34:00 -0400 +Subject: [PATCH] Adjust get_data_path for NixOS + +We construct the ulauncher data path from xdg_data_dirs +and prevent it from being a nix store path or being xdg_data_home. +We do this to prevent /nix/store paths being hardcoded to shortcuts.json. +On NixOS this path will either be /run/current-system/sw/share/ulauncher +or $HOME/.nix-profile/share/ulauncher if the user used nix-env. +--- + ulauncher/config.py | 27 ++++++++++++++++++--------- + 1 file changed, 18 insertions(+), 9 deletions(-) + +diff --git a/ulauncher/config.py b/ulauncher/config.py +index f21014e..cc636e1 100644 +--- a/ulauncher/config.py ++++ b/ulauncher/config.py +@@ -50,15 +50,24 @@ def get_data_path(): + is specified at installation time. + """ + +- # Get pathname absolute or relative. +- path = os.path.join( +- os.path.dirname(__file__), __ulauncher_data_directory__) +- +- abs_data_path = os.path.abspath(path) +- if not os.path.exists(abs_data_path): +- raise ProjectPathNotFoundError(abs_data_path) +- +- return abs_data_path ++ paths = list( ++ filter( ++ os.path.exists, ++ [ ++ os.path.join(dir, "ulauncher") ++ for dir in xdg_data_dirs ++ # Get path that isn't in the /nix/store so they don't get hardcoded into configs ++ if not dir.startswith("/nix/store/") ++ # Exclude .local/share/ulauncher which isn't what we want ++ if not dir.startswith(xdg_data_home) ++ ], ++ ) ++ ) ++ ++ try: ++ return paths[0] ++ except: ++ raise ProjectPathNotFoundError() + + + def is_wayland(): +-- +2.25.1 + diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 9fa284aba43..93ef9f3da4f 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -1,8 +1,11 @@ { stdenv , fetchurl -, python27Packages +, python3Packages +, gdk-pixbuf +, glib , gnome3 , gobject-introspection +, gtk3 , wrapGAppsHook , webkitgtk , libnotify @@ -11,49 +14,54 @@ , intltool , wmctrl , xvfb_run +, librsvg }: -python27Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "ulauncher"; - version = "4.4.0.r1"; + version = "5.6.1"; - # Python 3 support is currently in development - # on the dev branch and 5.x.x releases - disabled = ! python27Packages.isPy27; + disabled = python3Packages.isPy27; src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; - sha256 = "12v7qpjhf0842ivsfflsl2zlvhiaw25f9ffv7vhnkvrhrmksim9f"; + sha256 = "14k68lp58wldldhaq4cf0ffkhi81czv4ps9xa86iw1j5b1gd2vbl"; }; - nativeBuildInputs = with python27Packages; [ + nativeBuildInputs = with python3Packages; [ distutils_extra intltool wrapGAppsHook ]; buildInputs = [ + gdk-pixbuf + glib gnome3.adwaita-icon-theme gobject-introspection + gtk3 keybinder3 libappindicator libnotify + librsvg webkitgtk wmctrl ]; - propagatedBuildInputs = with python27Packages; [ + propagatedBuildInputs = with python3Packages; [ + mock + mypy + mypy-extensions dbus-python - notify pygobject3 pyinotify - pysqlite python-Levenshtein pyxdg + requests websocket_client ]; - checkInputs = with python27Packages; [ + checkInputs = with python3Packages; [ mock pytest pytest-mock @@ -63,6 +71,9 @@ python27Packages.buildPythonApplication rec { patches = [ ./fix-path.patch + ./fix-permissions.patch # ulauncher PR #523 + ./0001-Adjust-get_data_path-for-NixOS.patch + ./fix-extensions.patch ]; postPatch = '' @@ -73,7 +84,7 @@ python27Packages.buildPythonApplication rec { doCheck = false; preCheck = '' - export PYTHONPATH=$PYTHONPATH:$out/${python27Packages.python.sitePackages} + export PYTHONPATH=$PYTHONPATH:$out/${python3Packages.python.sitePackages} ''; # Simple translation of @@ -95,7 +106,7 @@ python27Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A fast application launcher for Linux, written in Python, using GTK"; - homepage = https://ulauncher.io/; + homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ aaronjanse worldofpeace ]; diff --git a/pkgs/applications/misc/ulauncher/fix-extensions.patch b/pkgs/applications/misc/ulauncher/fix-extensions.patch new file mode 100644 index 00000000000..f6d00f9fafd --- /dev/null +++ b/pkgs/applications/misc/ulauncher/fix-extensions.patch @@ -0,0 +1,13 @@ +diff --git a/ulauncher/api/server/ExtensionRunner.py b/ulauncher/api/server/ExtensionRunner.py +index 22042bf..f7b31c8 100644 +--- a/ulauncher/api/server/ExtensionRunner.py ++++ b/ulauncher/api/server/ExtensionRunner.py +@@ -79,7 +79,7 @@ class ExtensionRunner: + cmd = [sys.executable, os.path.join(self.extensions_dir, extension_id, 'main.py')] + env = os.environ.copy() + env['ULAUNCHER_WS_API'] = self.extension_server.generate_ws_url(extension_id) +- env['PYTHONPATH'] = ':'.join(filter(bool, [ULAUNCHER_APP_DIR, os.getenv('PYTHONPATH')])) ++ env['PYTHONPATH'] = ':'.join([ULAUNCHER_APP_DIR] + sys.path) + + if self.verbose: + env['VERBOSE'] = '1' diff --git a/pkgs/applications/misc/ulauncher/fix-permissions.patch b/pkgs/applications/misc/ulauncher/fix-permissions.patch new file mode 100644 index 00000000000..9d743c950f9 --- /dev/null +++ b/pkgs/applications/misc/ulauncher/fix-permissions.patch @@ -0,0 +1,12 @@ +diff --git a/ulauncher/utils/Theme.py b/ulauncher/utils/Theme.py +index 9cde624..4e36c4f 100644 +--- a/ulauncher/utils/Theme.py ++++ b/ulauncher/utils/Theme.py +@@ -138,6 +138,9 @@ class Theme: + rmtree(new_theme_dir) + copytree(self.path, new_theme_dir) + ++ # change file permissions (because Nix store is read-only) ++ os.chmod(new_theme_dir, 0o755) ++ + return os.path.join(new_theme_dir, 'generated.css') diff --git a/pkgs/applications/misc/urlscan/default.nix b/pkgs/applications/misc/urlscan/default.nix index 791075e4dd9..ef4684689b8 100644 --- a/pkgs/applications/misc/urlscan/default.nix +++ b/pkgs/applications/misc/urlscan/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Mutt and terminal url selector (similar to urlview)"; - homepage = https://github.com/firecat53/urlscan; + homepage = "https://github.com/firecat53/urlscan"; license = licenses.gpl2; maintainers = with maintainers; [ dpaetzel jfrankenau ]; }; diff --git a/pkgs/applications/misc/urlview/default.nix b/pkgs/applications/misc/urlview/default.nix index ad29c8f94d8..6430a1bc719 100644 --- a/pkgs/applications/misc/urlview/default.nix +++ b/pkgs/applications/misc/urlview/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract URLs from text"; - homepage = https://packages.qa.debian.org/u/urlview.html; + homepage = "https://packages.qa.debian.org/u/urlview.html"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/applications/misc/usync/default.nix b/pkgs/applications/misc/usync/default.nix index 344c07d845b..9234d8ad202 100644 --- a/pkgs/applications/misc/usync/default.nix +++ b/pkgs/applications/misc/usync/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ebzzry/usync; + homepage = "https://github.com/ebzzry/usync"; description = "A simple site-to-site synchronization tool"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index 5a12465c4c4..6a1dd06de32 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source sewing pattern drafting software"; - homepage = https://valentinaproject.bitbucket.io/; + homepage = "https://valentinaproject.bitbucket.io/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 6d8da4a1007..4241f915329 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -66,7 +66,7 @@ buildPythonApplication rec { meta = with lib; { description = "A wallpaper manager for Linux systems. It supports numerous desktops and wallpaper sources, including local files and online services: Flickr, Wallhaven, Unsplash, and more"; - homepage = https://github.com/varietywalls/variety; + homepage = "https://github.com/varietywalls/variety"; license = licenses.gpl3; maintainers = [ maintainers.zfnmxt ]; }; diff --git a/pkgs/applications/misc/vcal/default.nix b/pkgs/applications/misc/vcal/default.nix index b25e7f76cef..9519e033473 100644 --- a/pkgs/applications/misc/vcal/default.nix +++ b/pkgs/applications/misc/vcal/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Parser for VCalendar and ICalendar files, usable from the command line"; - homepage = https://waynemorrison.com/software/; + homepage = "https://waynemorrison.com/software/"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/applications/misc/veracrypt/default.nix b/pkgs/applications/misc/veracrypt/default.nix index fe1de349cff..07e0a046ac5 100644 --- a/pkgs/applications/misc/veracrypt/default.nix +++ b/pkgs/applications/misc/veracrypt/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Free Open-Source filesystem on-the-fly encryption"; - homepage = https://www.veracrypt.fr/; + homepage = "https://www.veracrypt.fr/"; license = [ licenses.asl20 /* or */ "TrueCrypt License version 3.0" ]; maintainers = with maintainers; [ dsferruzza ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/verbiste/default.nix b/pkgs/applications/misc/verbiste/default.nix index 680573fd304..a322756c157 100644 --- a/pkgs/applications/misc/verbiste/default.nix +++ b/pkgs/applications/misc/verbiste/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://sarrazip.com/dev/verbiste.html; + homepage = "http://sarrazip.com/dev/verbiste.html"; description = "French and Italian verb conjugator"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index f71e7a7a960..d939beb443e 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { platforms = if mediaSupport then platforms.linux else platforms.unix; license = licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; - homepage = https://vifm.info/; + homepage = "https://vifm.info/"; inherit version; updateWalker = true; }; diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 9ce37ea8a46..03d3256e375 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { on the map, make new tracks and waypoints, see real-time GPS position, etc. ''; - homepage = https://sourceforge.net/projects/viking/; + homepage = "https://sourceforge.net/projects/viking/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub sikmir ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 506ab559919..3ae4aacb872 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/scottkosty/vit; + homepage = "https://github.com/scottkosty/vit"; description = "Visual Interactive Taskwarrior"; maintainers = with maintainers; [ dtzWill arcnmx ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix index 3561135ce61..845bdae6bec 100644 --- a/pkgs/applications/misc/volnoti/default.nix +++ b/pkgs/applications/misc/volnoti/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight volume notification for Linux"; - homepage = https://github.com/davidbrazdil/volnoti; + homepage = "https://github.com/davidbrazdil/volnoti"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.gilligan ]; diff --git a/pkgs/applications/misc/vp/default.nix b/pkgs/applications/misc/vp/default.nix index a59a25a144e..7284fa65e8b 100644 --- a/pkgs/applications/misc/vp/default.nix +++ b/pkgs/applications/misc/vp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL -I${SDL_image}/include/SDL"; meta = with stdenv.lib; { - homepage = http://brlcad.org/~erik/; + homepage = "http://brlcad.org/~erik/"; description = "SDL based picture viewer/slideshow"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix index 3c6c4a87f98..ce45471c2f0 100644 --- a/pkgs/applications/misc/vym/default.nix +++ b/pkgs/applications/misc/vym/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { While a tree like structure like shown on this page can be drawn by hand or any drawing software vym offers much more features to work with such maps. ''; - homepage = http://www.insilmaril.de/vym/; + homepage = "http://www.insilmaril.de/vym/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/wcalc/default.nix b/pkgs/applications/misc/wcalc/default.nix index ff770f516bc..94c56ba5439 100644 --- a/pkgs/applications/misc/wcalc/default.nix +++ b/pkgs/applications/misc/wcalc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line calculator"; - homepage = http://w-calc.sourceforge.net; + homepage = "http://w-calc.sourceforge.net"; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/weather/default.nix b/pkgs/applications/misc/weather/default.nix index 2748d576c69..ce4fae1cb22 100644 --- a/pkgs/applications/misc/weather/default.nix +++ b/pkgs/applications/misc/weather/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://fungi.yuggoth.org/weather; + homepage = "http://fungi.yuggoth.org/weather"; description = "Quick access to current weather conditions and forecasts"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/wikicurses/default.nix b/pkgs/applications/misc/wikicurses/default.nix index 9b1e9f091e2..e528dab0c9f 100644 --- a/pkgs/applications/misc/wikicurses/default.nix +++ b/pkgs/applications/misc/wikicurses/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A simple curses interface for MediaWiki sites such as Wikipedia"; - homepage = https://github.com/ids1024/wikicurses/; + homepage = "https://github.com/ids1024/wikicurses/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ pSub ]; diff --git a/pkgs/applications/misc/with-shell/default.nix b/pkgs/applications/misc/with-shell/default.nix index 6a5f7c17b20..d3b5541ac4d 100644 --- a/pkgs/applications/misc/with-shell/default.nix +++ b/pkgs/applications/misc/with-shell/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { cp with $out/bin/with ''; meta = { - homepage = https://github.com/mchav/With; + 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; diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix index 68f6c4df159..8e760b787b4 100644 --- a/pkgs/applications/misc/wmname/default.nix +++ b/pkgs/applications/misc/wmname/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Prints or set the window manager name property of the root window"; - homepage = https://tools.suckless.org/wmname; + homepage = "https://tools.suckless.org/wmname"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/wofi/default.nix b/pkgs/applications/misc/wofi/default.nix index 3c14219b141..37b991e6d47 100644 --- a/pkgs/applications/misc/wofi/default.nix +++ b/pkgs/applications/misc/wofi/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { url = "https://paste.sr.ht/blob/1cbddafac3806afb203940c029e78ce8390d8f49"; - sha256 = "18960y9ajilrwwl6mjnrh6wj0sm4ivczmacck36p2dj9xd0n8vkh"; + sha256 = "1n4jpmh66p7asjhj0z2s94ny91lmaq4hhh2356nj406vlqr15vbb"; }) ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "A launcher/menu program for wlroots based wayland compositors such as sway"; homepage = "https://hg.sr.ht/~scoopta/wofi"; license = licenses.gpl3; - maintainers = with maintainers; [ erictapen ]; + maintainers = with maintainers; [ elyhaka ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 5a1093b4779..1f0414838ad 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { for computational linguistics and natural language processing. ''; - homepage = https://wordnet.princeton.edu/; + homepage = "https://wordnet.princeton.edu/"; license = { fullName = "WordNet 3.0 license"; - url = https://wordnet.princeton.edu/license-and-commercial-use; + url = "https://wordnet.princeton.edu/license-and-commercial-use"; }; maintainers = [ ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index d8d9598e54a..8b9ed830064 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A two-pane file manager with advanced file manipulation features"; - homepage = http://www.boomerangsworld.de/cms/worker/index.html; + homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; license = licenses.gpl2; maintainers = []; }; diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index 4fc06b5c1ad..b0020b64ede 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { Repetitive Strain Injury (RSI). The program frequently alerts you to take micro-pauses, rest breaks and restricts you to your daily limit. ''; - homepage = http://www.workrave.org/; - downloadPage = https://github.com/rcaelers/workrave/releases; + homepage = "http://www.workrave.org/"; + downloadPage = "https://github.com/rcaelers/workrave/releases"; license = licenses.gpl3; maintainers = with maintainers; [ prikhi ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 8c34baba582..12780ca73a1 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -1,23 +1,22 @@ { buildGoModule , fetchFromGitHub -, stdenv +, lib , makeWrapper , ncurses -, Security }: buildGoModule rec { pname = "wtf"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0j184s82bnnhrpm7vdsqg7i3xfm2wqz8jmwqxjkfw87ifgvaha5d"; + sha256 = "0pybj2h844x9vncwdcaymihyd1mwdnxxpnzpq0p29ra0cwmsxcgr"; }; - modSha256 = "14qbjv8rnidfqxzqhli7jyj4573s0swwypdj11mpykcrzk9by8xk"; + modSha256 = "00xvhajag25kfkizi2spv4ady3h06as43rnbjzfbv7z1mln844y4"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -25,14 +24,12 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - postInstall = '' mv "$out/bin/wtf" "$out/bin/wtfutil" wrapProgram "$out/bin/wtfutil" --prefix PATH : "${ncurses.dev}/bin" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "The personal information dashboard for your terminal"; homepage = "https://wtfutil.com/"; license = licenses.mpl20; diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 4086c0e094a..719d26c7199 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical APRS client"; - homepage = https://xastir.org; + homepage = "https://xastir.org"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 295d721d3c5..4f441d8a9a9 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Autoclicker application, which enables you to automatically click the left mousebutton"; - homepage = http://xautoclick.sourceforge.net; + homepage = "http://xautoclick.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 8946e83c94a..bf6b37b1028 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = with lib; { description = "An x509 certificate generation tool, handling RSA, DSA and EC keys, certificate signing requests (PKCS#10) and CRLs"; - homepage = https://hohnstaedt.de/xca/; + homepage = "https://hohnstaedt.de/xca/"; license = licenses.bsd3; maintainers = with maintainers; [ offline peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/misc/xcruiser/default.nix b/pkgs/applications/misc/xcruiser/default.nix index 8875c95fe57..80a1ced563f 100644 --- a/pkgs/applications/misc/xcruiser/default.nix +++ b/pkgs/applications/misc/xcruiser/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xcruiser-0.30"; src = fetchurl { - url = mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz; + url = "mirror://sourceforge/xcruiser/xcruiser/xcruiser-0.30/xcruiser-0.30.tar.gz"; sha256 = "1r8whva38xizqdh7jmn6wcmfmsndc67pkw22wzfzr6rq0vf6hywi"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { It constructs a virtually 3-D formed universe from a directory tree and allows you to "cruise" within a visualized filesystem. ''; - homepage = http://xcruiser.sourceforge.net/; + homepage = "http://xcruiser.sourceforge.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; linux; diff --git a/pkgs/applications/misc/xdgmenumaker/default.nix b/pkgs/applications/misc/xdgmenumaker/default.nix index 56168b34859..b4d821e1deb 100644 --- a/pkgs/applications/misc/xdgmenumaker/default.nix +++ b/pkgs/applications/misc/xdgmenumaker/default.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Command line tool that generates XDG menus for several window managers"; - homepage = https://github.com/gapan/xdgmenumaker; + homepage = "https://github.com/gapan/xdgmenumaker"; license = licenses.gpl2Plus; # NOTE: exclude darwin from platforms because Travis reports hash mismatch platforms = with platforms; filter (x: !(elem x darwin)) unix; diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 444ab802673..29a20e0ece2 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov. Xfe aims to be the filemanager of choice for all the Unix addicts! ''; - homepage = https://sourceforge.net/projects/xfe/; + homepage = "https://sourceforge.net/projects/xfe/"; license = stdenv.lib.licenses.gpl2; maintainers = []; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index 5d2b70a80ee..c61e64a8a3a 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.x.org/; + 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]; diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 2e81e9b05d3..027ff8f264c 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { and featureful environment for reading, study, and research using modules from The SWORD Project and elsewhere. ''; - homepage = http://www.xiphos.org/; + homepage = "http://www.xiphos.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xkbd/default.nix b/pkgs/applications/misc/xkbd/default.nix index d6709ecc1a6..d03d78a9fd1 100644 --- a/pkgs/applications/misc/xkbd/default.nix +++ b/pkgs/applications/misc/xkbd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/mahatma-kaganovich/xkbd; + homepage = "https://github.com/mahatma-kaganovich/xkbd"; description = "onscreen soft keyboard for X11"; license = licenses.gpl2Plus; maintainers = [ maintainers.genesis ]; diff --git a/pkgs/applications/misc/xkblayout-state/default.nix b/pkgs/applications/misc/xkblayout-state/default.nix index abc808477a3..296d6f38db6 100644 --- a/pkgs/applications/misc/xkblayout-state/default.nix +++ b/pkgs/applications/misc/xkblayout-state/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small command-line program to get/set the current XKB keyboard layout"; - homepage = https://github.com/nonpop/xkblayout-state; + homepage = "https://github.com/nonpop/xkblayout-state"; license = licenses.gpl2; maintainers = [ maintainers.jagajaga ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix index dc618e4561e..1e6384c7d57 100644 --- a/pkgs/applications/misc/xkbmon/default.nix +++ b/pkgs/applications/misc/xkbmon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "install -D -t $out/bin xkbmon"; meta = with stdenv.lib; { - homepage = https://github.com/xkbmon/xkbmon; + homepage = "https://github.com/xkbmon/xkbmon"; description = "Command-line keyboard layout monitor for X11"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix index f65f5bc26e8..3e729af71fe 100644 --- a/pkgs/applications/misc/xmind/default.nix +++ b/pkgs/applications/misc/xmind/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { GTD. Meanwhile, XMind can read FreeMind and MindManager files, and save to Evernote. ''; - homepage = https://www.xmind.net/; + homepage = "https://www.xmind.net/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ma27 ]; diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index 252d9dd87c6..a205b402bc8 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.7.0"; + version = "5.10.0"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "14mqfjwff7mj3xckz4wkxlmqm6a0ci1bz0zj1h045ac8hfvw5k4k"; + sha256 = "06nxhrb5vnlq3sxybiyzdpbv6ah1zam7r07s1c31sv37znlb77d5"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index f3bbbf42d5b..e75055e92b8 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Utility for switching between keyboard layouts"; - homepage = https://xneur.ru; + homepage = "https://xneur.ru"; license = licenses.gpl2Plus; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix index 40f7ef9da08..8944011a8d7 100644 --- a/pkgs/applications/misc/xpad/default.nix +++ b/pkgs/applications/misc/xpad/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A sticky note application for jotting down things to remember"; - homepage = https://launchpad.net/xpad; + homepage = "https://launchpad.net/xpad"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/applications/misc/xpdf/libxpdf.nix b/pkgs/applications/misc/xpdf/libxpdf.nix index cf6f5f32ee2..3b982b1766f 100644 --- a/pkgs/applications/misc/xpdf/libxpdf.nix +++ b/pkgs/applications/misc/xpdf/libxpdf.nix @@ -5,25 +5,25 @@ stdenv.mkDerivation { name = "libxpdf-3.02pl4"; src = fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02.tar.gz"; sha256 = "000zq4ddbwyxiki4vdwpmxbnw5n9hsg9hvwra2p33hslyib7sfmk"; }; patches = [ (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl1.patch"; sha256 = "1wxv9l0d2kkwi961ihpdwi75whdvk7cgqxkbfym8cjj11fq17xjq"; }) (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl2.patch"; sha256 = "1nfrgsh9xj0vryd8h65myzd94bjz117y89gq0hzji9dqn23xihfi"; }) (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl3.patch"; sha256 = "0jskkv8x6dqr9zj4azaglas8cziwqqrkbbnzrpm2kzrvsbxyhk2r"; }) (fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch; + url = "ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.02pl4.patch"; sha256 = "1c48h7aizx0ngmzlzw0mpja1w8vqyy3pg62hyxp7c60k86al715h"; }) ./xpdf-3.02-protection.patch diff --git a/pkgs/applications/misc/xrandr-invert-colors/default.nix b/pkgs/applications/misc/xrandr-invert-colors/default.nix index 41071012ae9..9d57b4fcfac 100644 --- a/pkgs/applications/misc/xrandr-invert-colors/default.nix +++ b/pkgs/applications/misc/xrandr-invert-colors/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Inverts the colors of your screen"; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://github.com/zoltanp/xrandr-invert-colors; + homepage = "https://github.com/zoltanp/xrandr-invert-colors"; maintainers = [stdenv.lib.maintainers.magnetophon ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/xrq/default.nix b/pkgs/applications/misc/xrq/default.nix index 244a2c43a15..e3db746ee02 100644 --- a/pkgs/applications/misc/xrq/default.nix +++ b/pkgs/applications/misc/xrq/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "X utility for querying xrdb"; - homepage = https://github.com/arianon/xrq; + homepage = "https://github.com/arianon/xrq"; license = stdenv.lib.licenses.mit; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/applications/misc/xscope/default.nix b/pkgs/applications/misc/xscope/default.nix index 517105d7e1f..4db034476c7 100644 --- a/pkgs/applications/misc/xscope/default.nix +++ b/pkgs/applications/misc/xscope/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "program to monitor X11/Client conversations"; - homepage = https://cgit.freedesktop.org/xorg/app/xscope/; + homepage = "https://cgit.freedesktop.org/xorg/app/xscope/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index 8842d01e706..f6837b692b1 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://invisible-island.net/xterm; + homepage = "https://invisible-island.net/xterm"; license = with stdenv.lib.licenses; [ mit ]; maintainers = with stdenv.lib.maintainers; [vrthra]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/misc/xtermcontrol/default.nix b/pkgs/applications/misc/xtermcontrol/default.nix index 51575d62ed5..f7c0edf2242 100644 --- a/pkgs/applications/misc/xtermcontrol/default.nix +++ b/pkgs/applications/misc/xtermcontrol/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { Window manipulations de-/iconify, raise/lower, maximize/restore and reset are also supported. To complete the feature set; xtermcontrol lets advanced users issue any xterm control sequence of their choosing. ''; - homepage = http://thrysoee.dk/xtermcontrol; + homepage = "http://thrysoee.dk/xtermcontrol"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.derchris ]; diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix index 612e4a557a7..64d55322896 100644 --- a/pkgs/applications/misc/xxkb/default.nix +++ b/pkgs/applications/misc/xxkb/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A keyboard layout indicator and switcher"; - homepage = http://xxkb.sourceforge.net/; + homepage = "http://xxkb.sourceforge.net/"; license = stdenv.lib.licenses.artistic2; maintainers = with stdenv.lib.maintainers; [ rasendubi ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/misc/yaft/default.nix b/pkgs/applications/misc/yaft/default.nix index 2135c7fd617..e66f397a383 100644 --- a/pkgs/applications/misc/yaft/default.nix +++ b/pkgs/applications/misc/yaft/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" "MANPREFIX=$(out)/share/man" ]; meta = { - homepage = https://github.com/uobikiemukot/yaft; + homepage = "https://github.com/uobikiemukot/yaft"; description = "Yet another framebuffer terminal"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/applications/misc/yarssr/default.nix b/pkgs/applications/misc/yarssr/default.nix index f2da2957bd3..c5489b8b981 100644 --- a/pkgs/applications/misc/yarssr/default.nix +++ b/pkgs/applications/misc/yarssr/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/tsyrogit/zxcvbn-c; + homepage = "https://github.com/tsyrogit/zxcvbn-c"; description = "A fork of Yarssr (a RSS reader for the GNOME Tray) from http://yarssr.sf.net with various fixes."; license = licenses.gpl1; platforms = platforms.linux; diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix index 09a6cc4a3c0..6c03bbc33b3 100644 --- a/pkgs/applications/misc/yate/default.nix +++ b/pkgs/applications/misc/yate/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Yet another telephony engine"; - homepage = http://yate.null.ro/; + homepage = "http://yate.null.ro/"; # Yate's license is GPL with an exception for linking with # OpenH323 and PWlib (licensed under MPL). license = ["GPL" "MPL"]; diff --git a/pkgs/applications/misc/yokadi/default.nix b/pkgs/applications/misc/yokadi/default.nix index 6b3a4f747f4..00507d2ee88 100644 --- a/pkgs/applications/misc/yokadi/default.nix +++ b/pkgs/applications/misc/yokadi/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A command line oriented, sqlite powered, todo-list"; - homepage = https://yokadi.github.io/index.html; + homepage = "https://yokadi.github.io/index.html"; license = licenses.gpl3Plus; maintainers = [ maintainers.nipav ]; }; diff --git a/pkgs/applications/misc/zathura/wrapper.nix b/pkgs/applications/misc/zathura/wrapper.nix index 4a6ef041b54..5d37b5190d0 100644 --- a/pkgs/applications/misc/zathura/wrapper.nix +++ b/pkgs/applications/misc/zathura/wrapper.nix @@ -19,7 +19,7 @@ in symlinkJoin { ''; meta = with lib; { - homepage = https://git.pwmt.org/pwmt/zathura/; + homepage = "https://git.pwmt.org/pwmt/zathura/"; description = "A highly customizable and functional PDF viewer"; longDescription = '' Zathura is a highly customizable and functional PDF viewer based on the diff --git a/pkgs/applications/misc/zk-shell/default.nix b/pkgs/applications/misc/zk-shell/default.nix index ec8deadf9f5..df6e011e4d5 100644 --- a/pkgs/applications/misc/zk-shell/default.nix +++ b/pkgs/applications/misc/zk-shell/default.nix @@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A powerful & scriptable shell for Apache ZooKeeper"; - homepage = https://github.com/rgs1/zk_shell; + homepage = "https://github.com/rgs1/zk_shell"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.mahe ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index 18876cf355b..402032b5cec 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "A text scroller for use with panels and shells"; - homepage = https://github.com/noctuid/zscroll; + homepage = "https://github.com/noctuid/zscroll"; license = licenses.bsd2; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/brig/default.nix b/pkgs/applications/networking/brig/default.nix index 31eb4dd7378..66329b64eac 100644 --- a/pkgs/applications/networking/brig/default.nix +++ b/pkgs/applications/networking/brig/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "File synchronization on top of ipfs with git like interface and FUSE filesystem"; - homepage = https://github.com/sahib/brig; + homepage = "https://github.com/sahib/brig"; license = licenses.agpl3; platforms = platforms.unix; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/networking/browsers/arora/default.nix b/pkgs/applications/networking/browsers/arora/default.nix index 57db827169e..88ad2c609bf 100644 --- a/pkgs/applications/networking/browsers/arora/default.nix +++ b/pkgs/applications/networking/browsers/arora/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { platforms = qt4.meta.platforms; maintainers = [ maintainers.phreedom ]; description = "A cross-platform Qt4 Webkit browser"; - homepage = https://github.com/Arora/arora; + homepage = "https://github.com/Arora/arora"; license = with licenses; [ gpl2 gpl3 ]; }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 2adc2ec7c79..bab24d01456 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.5.112"; + version = "1.5.123"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "0am7qr09pvy6v720rngfxilh4yalxzp7vcq2yndcz6726wnhw9zx"; + sha256 = "1yv6hfjqzcd60b0bjpfbj8d4s2yf10swanxhbmnslcqp6ajb2nqr"; }; dontConfigure = true; diff --git a/pkgs/applications/networking/browsers/browsh/default.nix b/pkgs/applications/networking/browsers/browsh/default.nix index 94e939b9ab4..3662c3badd3 100644 --- a/pkgs/applications/networking/browsers/browsh/default.nix +++ b/pkgs/applications/networking/browsers/browsh/default.nix @@ -53,7 +53,7 @@ in buildGoPackage rec { meta = with stdenv.lib; { description = "A fully-modern text-based browser, rendering to TTY and browsers"; - homepage = https://www.brow.sh/; + homepage = "https://www.brow.sh/"; maintainers = [ maintainers.kalbasit ]; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index 88bd32da8f1..3ce04842c6e 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { meta = with lib; { description = "Dedicated Chrome instance to log into captive portals without messing with DNS settings"; - homepage = https://blog.filippo.io/captive-browser; + homepage = "https://blog.filippo.io/captive-browser"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index edbf97e8963..7c0609730c2 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -76,7 +76,7 @@ mkChromiumDerivation (base: rec { the web. It has a minimalist user interface and provides the vast majority of source code for Google Chrome (which has some additional features). ''; - homepage = https://www.chromium.org/; + homepage = "https://www.chromium.org/"; maintainers = with maintainers; [ bendlas thefloweringash primeos ]; # Overview of the maintainer roles: # nixos-unstable: diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 83c492e1e65..9f7583b1ef5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, llvmPackages, gn, ninja, which, nodejs, fetchpatch, gnutar +{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -21,9 +21,11 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport , libva ? null # useVaapi +, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone # package customization , useVaapi ? false +, useOzone ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -115,7 +117,7 @@ let ninja which python2Packages.python perl pkgconfig python2Packages.ply python2Packages.jinja2 nodejs gnutar - ]; + ] ++ optional (versionAtLeast version "83") python2Packages.setuptools; buildInputs = defaultDependencies ++ [ nspr nss systemd @@ -129,7 +131,8 @@ let ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional useVaapi libva - ++ optional pulseSupport libpulseaudio; + ++ optional pulseSupport libpulseaudio + ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; patches = [ ./patches/nix_plugin_paths_68.patch @@ -137,8 +140,6 @@ let ./patches/no-build-timestamps.patch ./patches/widevine-79.patch ./patches/dont-use-ANGLE-by-default.patch - # fix race condition in the interaction with pulseaudio - ./patches/webrtc-pulse.patch # Unfortunately, chromium regularly breaks on major updates and # then needs various patches backported in order to be compiled with GCC. # Good sources for such patches and other hints: @@ -261,6 +262,16 @@ let } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; + } // optionalAttrs useOzone { + use_ozone = true; + ozone_platform_gbm = false; + use_xkbcommon = true; + use_glib = true; + use_gtk = true; + use_system_libwayland = true; + use_system_minigbm = true; + use_system_libdrm = true; + system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; } // (extraAttrs.gnFlags or {})); configurePhase = '' @@ -270,7 +281,7 @@ let libExecPath="${libExecPath}" python build/linux/unbundle/replace_gn_files.py \ --system-libraries ${toString gnSystemLibraries} - ${gn}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 @@ -278,6 +289,11 @@ let runHook postConfigure ''; + # Don't spam warnings about unknown warning options. This is useful because + # our Clang is always older than Chromium's and the build logs have a size + # of approx. 25 MB without this option (and this saves e.g. 66 %). + NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + buildPhase = let # Build paralelism: on Hydra the build was frequently running into memory # exhaustion, and even other users might be running into similar issues. diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 8968a10bed0..564e50b8670 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,6 @@ { newScope, config, stdenv, llvmPackages_9, llvmPackages_10 , makeWrapper, ed -, glib, gtk3, gnome3, gsettings-desktop-schemas +, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , gcc, nspr, nss, patchelfUnstable, runCommand , lib @@ -13,6 +13,7 @@ , enablePepperFlash ? false , enableWideVine ? false , useVaapi ? false # test video on radeon, before enabling this +, useOzone ? false , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux , commandLineArgs ? "" @@ -31,9 +32,20 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; - mkChromiumDerivation = callPackage ./common.nix { - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi; - }; + mkChromiumDerivation = callPackage ./common.nix ({ + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone; + gnChromium = gn; + } // lib.optionalAttrs (channel == "dev") { + # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-03-23"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; + sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; + }; + }); + }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; diff --git a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch b/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch deleted file mode 100644 index cf24e270419..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/webrtc-pulse.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 704dc99bd05a94eb61202e6127df94ddfd571e85 Mon Sep 17 00:00:00 2001 -From: Dale Curtis <dalecurtis@chromium.org> -Date: Mon, 02 Mar 2020 22:12:22 +0000 -Subject: [PATCH] Hold PulseAudio mainloop lock while querying input device info. - -a22cc23955cb3d58b7525c5103314226b3ce0137 moved this section out of -UpdateNativeAudioHardwareInfo(), but forgot to bring the lock along. - -R=guidou - -Bug: 1043040 -Change-Id: I5b17a2cf0ad55d61c0811db1dae7045af4a91370 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083814 -Commit-Queue: Dale Curtis <dalecurtis@chromium.org> -Commit-Queue: Guido Urdaneta <guidou@chromium.org> -Reviewed-by: Guido Urdaneta <guidou@chromium.org> -Auto-Submit: Dale Curtis <dalecurtis@chromium.org> -Cr-Commit-Position: refs/heads/master@{#746115} ---- - -diff --git a/media/audio/pulse/audio_manager_pulse.cc b/media/audio/pulse/audio_manager_pulse.cc -index 90e9317..829846f 100644 ---- a/media/audio/pulse/audio_manager_pulse.cc -+++ b/media/audio/pulse/audio_manager_pulse.cc -@@ -104,22 +104,27 @@ - - AudioParameters AudioManagerPulse::GetInputStreamParameters( - const std::string& device_id) { -- int user_buffer_size = GetUserBufferSize(); -- int buffer_size = -- user_buffer_size ? user_buffer_size : kDefaultInputBufferSize; -- - UpdateNativeAudioHardwareInfo(); -- auto* operation = pa_context_get_source_info_by_name( -- input_context_, default_source_name_.c_str(), DefaultSourceInfoCallback, -- this); -- WaitForOperationCompletion(input_mainloop_, operation, input_context_); -+ -+ { -+ AutoPulseLock auto_lock(input_mainloop_); -+ auto* operation = pa_context_get_source_info_by_name( -+ input_context_, default_source_name_.c_str(), DefaultSourceInfoCallback, -+ this); -+ WaitForOperationCompletion(input_mainloop_, operation, input_context_); -+ } - - // We don't want to accidentally open a monitor device, so return invalid -- // parameters for those. -+ // parameters for those. Note: The value of |default_source_is_monitor_| -+ // depends on the the call to pa_context_get_source_info_by_name() above. - if (device_id == AudioDeviceDescription::kDefaultDeviceId && - default_source_is_monitor_) { - return AudioParameters(); - } -+ -+ const int user_buffer_size = GetUserBufferSize(); -+ const int buffer_size = -+ user_buffer_size ? user_buffer_size : kDefaultInputBufferSize; - return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, - CHANNEL_LAYOUT_STEREO, - native_input_sample_rate_ ? native_input_sample_rate_ diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 0e939f2fd21..c5f9d60122d 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "177hv5jkgpcbi6khk7j883rf3rzzkjmi8cqqpzckaiw7pcwsvyvd"; - sha256bin64 = "0sicz51d2l3gj70mfpyh5idwarjl19pba5lc6ahznxxqsrjfp80r"; - version = "81.0.4044.69"; + sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; + sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; + version = "81.0.4044.92"; }; dev = { - sha256 = "0s0072rmg287iijh6wwm9i5a5fsh96qm6nhd13xwbxrvj6pldb7n"; - sha256bin64 = "0l5ljjz0s5x9727syq4gs5xshl9vs8apvw6xw8il0xy5qax32g85"; - version = "82.0.4083.0"; + sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; + sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; + version = "83.0.4100.3"; }; stable = { - sha256 = "07icl3hgg1wjkmz88lbpjf6ll4xyi64spki1nmsy6899jgkxvgjh"; - sha256bin64 = "0qgp6hv4qj04v6pzfx9ggjvcl1vi6ljjc3cpi4hfr67p4jab40ji"; - version = "80.0.3987.149"; + sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; + sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72"; + version = "81.0.4044.92"; }; } diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 8d6c99d2468..fa1fa76340c 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ssl" ]; meta = with stdenv.lib; { - homepage = https://www.dillo.org/; + homepage = "https://www.dillo.org/"; description = "A fast graphical web browser with a small footprint"; longDescription = '' Dillo is a small, fast web browser, tailored for older machines. diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 8d62bd7d5cc..985497a095c 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "elinks-0.12pre6"; src = fetchurl { - url = http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2; + url = "http://elinks.or.cz/download/elinks-0.12pre6.tar.bz2"; sha256 = "1nnakbi01g7yd3zqwprchh5yp45br8086b0kbbpmnclabcvlcdiq"; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Full-featured text-mode web browser"; - homepage = http://elinks.or.cz; + homepage = "http://elinks.or.cz"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index b9b183a03ff..cfccacf1ae0 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A new GNOME web browser"; - homepage = https://wiki.gnome.org/Apps/Eolie; + homepage = "https://wiki.gnome.org/Apps/Eolie"; license = licenses.gpl3Plus; maintainers = with maintainers; [ samdroid-apps worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index ea840694bd3..dd0365760f9 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.3.0"; + version = "6.3.1"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "0h159szljvphs2hvagxwv6nncx46q0mvr4ylhl2nimap9jvss91n"; + sha256 = "13rl26lv5xgagiv21yp5pz69bkwh4nnz1lx9wryhsplki45xm1sq"; }; nativeBuildInputs = [ @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The always-incognito web browser"; - homepage = https://github.com/cassidyjames/ephemeral; + homepage = "https://github.com/cassidyjames/ephemeral"; maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index 6e21456a9a9..954b45a2042 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "QtWebEngine based cross-platform web browser"; - homepage = https://community.kde.org/Incubator/Projects/Falkon; + homepage = "https://community.kde.org/Incubator/Projects/Falkon"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index f9356fc802e..20e08a8c3ab 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "75.0b2"; + version = "76.0b1"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ach/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ach/firefox-76.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "159fc50feb7ea1d8f567b94756476b8325de2a2255aceaadb7975cebd763ff44cc74c621532b840f5aef7156024f605ffefc3fb1b3609a44925d7a280b63f183"; + sha512 = "c008d921c75cac20b6840f677739c79bceeed87a3808b60b019c0c59b713a46896a5220d9939126df7f10382ee0a7dc3d05aa35a0a6e64980617e135b15f9ed1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/af/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/af/firefox-76.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "224a98e4028513e30897fe73de8dee67a90844990eb13564e7fc32c4aa9426730da7d4b528666ecd5a76a6ce68c0eb3d0564b09823e12721424c471fa7cfe191"; + sha512 = "e68675ca9acc285eb8a466e01369e3c39ff727557ce3a69f4133eb085f8ac0b95060317c9747d3ba8c3a04bc2f2bf0517157065d6f0d01099ad610f181e30d0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/an/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/an/firefox-76.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "7973ab3c94616e0eb1b2b36209836c3ed81c55927f26da9bfc672eeb5f6f36d8447bf9dac705219b38edd1d217c6b7d701ce11285f37d37219ddbc0340fbaf61"; + sha512 = "27be07732ae15f9c9ea0dd080539a82440b48d766f2aadc8cefaaf0ddfe2a1cf39c907a5bd4e57f505a9919b25a1582b3147941704fb31e70ad24cf4dc771844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ar/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ar/firefox-76.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "11dfb7553ca61b7abe857ab7dc75db73e3a3002b9d4dce98f005d0c298ff119d29b64309fb8e5c62fafa08f9ff426c14f45956e5f6cfb7cb9af7dde41190bf43"; + sha512 = "fcfb58f2bf79f3fbe35d9c229b22132f43800baa8337408e4d13b6500ebcfed9bbf594b9c3560af992d9bc1243cee21bca1a590d3b2526fe1c999938bd7f8dfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ast/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ast/firefox-76.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "23f00418b48d660c64c4480cd6c983da80fd8990f3ae055a0e4792f01b881b69251f4ec123ef3d961623b94dd7a968a82f27d29aa87731ca77e4ac4b1ec32464"; + sha512 = "1d86aab0f0288f4de8ca7c87c1314797e648244486fcbd26a3b95785d1f4f9357f0573cc53fa72301d7cff60a42047a249c5cfe0ff2544d1a443d550cfa98199"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/az/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/az/firefox-76.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "85e1c4ef9870c9aaf670d107b5810782b7e148f6edf61123c4326be0809b1103f9bc5a05e87d06771fb8faf405d9f648df364d99cae9be32ae2242d1c488b5c9"; + sha512 = "f61b53831dc9b83b007d1557582f6e36c0d169e7f4868c5959fe96e1840f7fb9e131df663c70de21b6657c67526d5650ab3795b28c46e4002335403f9f08988d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/be/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/be/firefox-76.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "34bb18b6f6ecd032ce0984513e590e422d01ed5b92b8960a7a4e64b2a5f5b2f19aeeaa6b7227a96cf6b6e97168674a34cc3332d019dc5d3257504c7188ab8418"; + sha512 = "80d9d24897ff9d20011e458306b7a3b76714f84a06ed595b70f1e6713377faeac0054b6d6d7d7571a9eea8a455af33174ebd27379f092d578f0a0326f37b043f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bg/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/bg/firefox-76.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "2481e01d1656a26458cca5f1f9eb7d7f101dc98e7aa7ee620889b630393a70a82132758323d4ec37c5ee640874419cdd2d5464d64e820876cb924679f03eba64"; + sha512 = "cdaf01b156285869a94952f9a330029c5c99d4ab098280104f1957d71cc5312dc1028a0aaa39ce1e93db76bf5510ac6c04d8c3ce759ead3f47806f8e25bdafdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/bn/firefox-76.0b1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "6dc0d391e179cc13465f60c98f9a6425f6fc4f28f2340928a35bc3abfb623c28decbd179012d162cff661dc807974f5df34427879d4838ab481ffa75c0957e77"; + sha512 = "6eb21882bae779ed7ada1f24a63cff5281d21034972926234a1186a6a20b144f19e157813cc041b81a4aaabdc36a8b32b30b4646fabf9817e1fc903b7c13f538"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/br/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/br/firefox-76.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "6fce902e7e23277c8446df902349e626ae5dce2435ce56e57824c7a0b5729ae95b10878525f9b5251e9c91e1cbd97cc1ea7792136b271cf88626fc97cee5f4be"; + sha512 = "9bb5eb2fc197a33ddbbaef9485c16c940dab78788a52e0ebe59a43f9e8dd6c9b73ca2b9c957f0ae27451dd23e34fa394c138d5cf7669722a4f4b3cd4c27a79a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/bs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/bs/firefox-76.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "cd46d5f1e8d68a7390b2bdd4338829db0e25e5dcf0a52d538db311b957809c33f7fc9cfef92a73357743ddb9b3ed0ce593c9c0cc8428f7f891edc3292c00d37d"; + sha512 = "041640d96d7e3ceed3353faed37ba4f8ae243f48f845dec3a5e97362f0c0cbf4d7c50ee39cc96986596461eb3e2a0ce6a8f5c5bab37c0edf6d76e97c61882bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ca-valencia/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ca-valencia/firefox-76.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "e79af87bd369b75319565bc6301cf312022b85562ccf6cd2abd6fd59a26b1081a62f166c7efb4fbb6ad1ccb7befa8a8eec557addd9c4115f7da1594a633d243c"; + sha512 = "fce818eede4f8850497cc8fdf030a16b5786b05c87e28d3d184c99872d56bef47160e0bfaf70e653c97a2e89890269a8df03b9c7a903f53afd952cfb77153ab7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ca/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ca/firefox-76.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "4241eae0654e5466a1c04aff0de003a676c775470329a973204a2413590fc4558aec96ac33e9e14cf1ab7eb52054ec34e7ebbb149648dd4e8d33cefe2b3c18c7"; + sha512 = "13980c330ca6c2229d0a350fb525a88628a5ec220606ec9f0a84f8592ed95f8a37a211fdd37e219848058fd106fe407a69400e8c994550d783d9af0720dc09d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cak/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/cak/firefox-76.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5bb2b8a2eeffdb7a06c16244458ad8f305725741f05c0fa367534da99d0bf0c4399e05453b64c505f441c4036f3e5e7a4e5729852a848b8ff4210d674ce7f065"; + sha512 = "5eada744dbd15a7c32b27ae897d185497caa51838cdb818cf45c052e38824909e6d90e58270194c091cc72805ba74b1062027b770290ae3f01566273a47c76ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/cs/firefox-76.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "50c6ba425d3be7e12667d80bd6e57907082bd3c155b8d3b6bedae64054046d3bb02d8894445cd5d27e3251507730c06bd3eddc96a11c36c4e9c7a3b9cdf796ff"; + sha512 = "f47feb99877e60ee021d0398b935c5f83a4b91db4677f3b26349f931ee66f7b04a430449e8c5b92f833c5a6e3d3f407407ab01a30db248984244fbf5f42bfe22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/cy/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/cy/firefox-76.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "0dee8828858c2e0013788b680b8f907e6464e219fc6745af8d0e7d08575291e926f2be56ea7becb1b231f1fa0feb1827b5779b7f720606729a37847f7d8322db"; + sha512 = "a2f6acd4a15312281dfbe7866c73faa45ef2d07743b9f0566fb3b59e7af57f4cc8cbbac6a2371de56d2c7eb0be31fb1669128c80e942dc15b32fd435586d92cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/da/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/da/firefox-76.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "d69320ec8c0ffbead25906f9957d73ee9bee8c7ff922e7d2d2e3cca3487ded5e836d41b8faca42627f722c1f2d43fd918e6db6e9d93268155865f1ebfaf6a5e5"; + sha512 = "dfc7cc47aa160d755dcdd790c89742cdcc2515c4c2c81f5d52dc6cd508ed90798fb94605514961765f4f14302765707979c01994b6d123836b4d59d7eaf2914c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/de/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/de/firefox-76.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "a64fe63ef81c8ceca0c1baa0bf55f0aa34b662fd9d0417a262e7d539164ac2f0b32eae89bcc74cec4113356fdb1ecce890509877bbef9af2eb6f7e91c2c2ca33"; + sha512 = "e21c3b489c50b40756523da080fca8b16fb77bb34ab452b58225a966840b6a387e738c576c2523fd923a6a7ce9f2bfe6ee90d55a008d27caa36aa2abbaabfbab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/dsb/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/dsb/firefox-76.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "776c66f6421f250f22063cb77c5313df75b20b7b06a396c8124f7836b56e7a18fbf9ea996d9ebffb58a00ca0a27957199e4a53b777f5ed04281317926a95a84a"; + sha512 = "5114f6bc86fa3c0c395af4bfe83c974272372371eace78e5d12418785981085bb4fa4b7ac37a27b6f5b9733d393d00aa88c8b7741aa7bedb58db26e59cfa39b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/el/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/el/firefox-76.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "5daaea449ade4d15deb93864b0313f3b8f780b6f51e1ff63098a37fe83b39151bff5526d8685171fdcc2ff7ee874f697e689e47a60e37d01ffdf2a9d3efbc38f"; + sha512 = "068d55f47619a1c1e281b480444c042a7346620b5291d2f0092138e7bb5864288a73afbd6d17735aaef2668bfa3d849239c3d8dd20b129f86e3776d89733ae95"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-CA/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/en-CA/firefox-76.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "2d3f4aaafd042888a2b192419fc5fd5e841a922a1b24ff8cc95d52343750e64ae8a0deda694faf3a1ec11e447f25d8303f5905b1f98349ba5f0e705eae4fd615"; + sha512 = "f0dd5496fe3550c8cc13159bbc10173e7f9872110cc788cdaee0bc03db228146742e05c602f62b19dfc4d6fddd8d6c906fc5b797f178801aff1e6c933175ea91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-GB/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/en-GB/firefox-76.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "e977d28c7f2a54793098e6557dbdba56a8a6b0069912188c59f246a004147d17454a338df4f4335144e9d4e5a52a510bc94076d3f38c8fb28797a08c59a903fa"; + sha512 = "2ad9c48ff43c64e0ed013479f489e7341ef2d1dfb58838f8a70d0c639cbadfa32adca1290853c59f87c3b05447c0f1b89ce9f749d62a3776ab4370decd2f2803"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/en-US/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/en-US/firefox-76.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "e30d89b9ea552e7758f550632b41c19a34dcd75291a71def8aeccb4a51ddc0a3da16e181a8c9d441da0d671a89d0f7a481e19599f4815beb96aaf7a95e10e078"; + sha512 = "04675d0809a12a749ab9d4733281ff91777e9701fd205d417268a37e9b022aa1e6a8a4e7df41e115fb7beeeb953122bd5c60f6af81fb1bba1e83aab723eab373"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/eo/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/eo/firefox-76.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "5d086d6725cf99aa3894974d78cf0e337de0244163e3fe8507aeea9386233d14ae7a1f1550c563a5fb59f0cae51d579c4f0e578c9fb56ee48d39be6d644451d9"; + sha512 = "b755b912eb0c4fb3a7b5af88c1340e105c1279cc8dd044011b160c24d028c651ffa37259858c52199aff69ee6e748f284cce29c977326fa9770255d346f4f75e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-AR/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/es-AR/firefox-76.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ff818af501719ec198d21b5a53d54603fd591d266a2028827283ddbf5bccfceb4382e7ee9ad1119936a2301b067882f91fb04a354426d4587134e065033b4028"; + sha512 = "0ac533f801714d9a594b0a15061bb01681c0343a0fbd593eba54466a3ef29d9ec796a32a88363c7d079df52756c0060ed194eb1f107c2d4c696f4d0d8650b66f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-CL/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/es-CL/firefox-76.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "2bb98c8dbcdb4d2ff0eb660517e1adb99d7917e9cfc6429e870ed3ce168f4c2292feef353e870293bf76f7d9cea4095c6d22c59fb9ccaa9f336c93e9009f8d50"; + sha512 = "e17066e0b3a6891c92dcfd935dd9e5326d56f1925533c5373ad0fac50c82fb3d9e06dc43048c519b0732a082d88c93a66d64962b632541411d7addfa337e63f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-ES/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/es-ES/firefox-76.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "4992db4b3e0d5273e73fd7f88e7284809a5922c2b700b695830da7ccc11c40a23954a03a602bf319678a432da218be8de825b15e2eb62b6eb62a0f34787ba0f3"; + sha512 = "1a388f4115f854ed8b733b4b358c5dabdd9a45104cc7e7e7d2d19607c05ff7f63d40fb185231beb4a367fc9f731c0b4c194fd1678372210011f95844515ecf04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/es-MX/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/es-MX/firefox-76.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "df8fd54ca32af5e0d579a2fdff569688248f4abfd30ed677d56a0ad850fd603ac14aef086fe8ac167d1819d0e7b354de77c948613a9ccc3e9c9adefbab99d077"; + sha512 = "227778965653952dd94d88f7995422debd7ab489d8280ab26e8ea2f1d1658fc3eb3232e030778ce3d200bcc80d71654607c163d7607947faac72635b5abb2b47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/et/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/et/firefox-76.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "ac96ffaac54039cab3b59063614ba8eb5e731ad0912e83f4b61f812c927f0f075d9d9a6123a3e1211bf96c886a925273f16fbd31d75709a195379b763e936fed"; + sha512 = "12ae12712cfbf97d5d163630eed0031fef0ff9e4dffd02a0568dc9edc5d5986d8398368d02b85a795371070af0df6d9617a93eb0fb8007bc2570c7350a5b4221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/eu/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/eu/firefox-76.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "4ced029f5d52fdd172d9f25e8dd062278758b6987fae56554e657dc32c2323caa52ef89021564d9fcd4663e75e0a8163e925c32048d77acfc92a0db9ac171248"; + sha512 = "c7a94d0d45391522eca37bd70f2f695fb63d9f1c0d8f02e368333dddebc2e9a81843a7e0562186bf39bd3c1ffbe6f8d549132cde6273b938ff903e4bdee42e24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fa/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/fa/firefox-76.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "c4f131631f72b98b9fc919596bfbfea8b605f2108b5094e9e265df84317a825de9a06cfc4ae52f7901138b429f9c7ffaa4b719b18e1485007c6ffe96d689f690"; + sha512 = "db47c3b5f7e270ad93b98db65b433956a6f2f4137f95b66e4a83f6f2b8d3ff6d58f845d2e19af609a3069f1e4f724767c58228c1d003e5004be08a61dd4c7a6b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ff/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ff/firefox-76.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "c0f61fe82231d8a22f550d8399e05e7ece426fb2f1d15d36b6c43ba3c3872f07f76102a69759fab6533bf08a8248ca7dac3c59d723b3f54161e959d85c24348a"; + sha512 = "dfa42eba7f9300771ea1dce4f6820263a7e819832781213adebe964c14fd46cb3ebe9659049cf5bbe72b641588297822485c091627e36636dae697b568bb46bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fi/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/fi/firefox-76.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "39bab8b71d79b58157278d3f480353d637c54cd5f13e75323d9eb2ec95980bc004e828c612f080414f85838460e82f90a490dba51d312a5147788fa7fc5c5fd0"; + sha512 = "c27dacd68b99f1102047a9b72ebfbf6e0ff888f665c1727388614805df83135c134a4c8d819502818a0361a81598ddba5e06d2752b6404ec8c75664dba6f80c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/fr/firefox-76.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "93a42248cddfd6d3c4151c6f53d2ab00f9200537056005998c7d9e5a3e8444a0f47c621d850829bc0e0f0b21cab9611c1ad5487f0bd8b2a3d41da7d1256119a3"; + sha512 = "6bdb52fabd84fe04fb1bdc2ef8bc27b8e133f043266aa5e204245e7a1a55150283e9960703cf171729f800ddd72c5343ae7b3f73bbecc1832a166d8b49b7f007"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/fy-NL/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/fy-NL/firefox-76.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "23acca680d2d1a585103a26eb9aa1d8e84d35865fc3854d3a2055ec8337d42aac3d2bb0eac21930816577b60eb4bd6d47580fbce5f7a5e47791dbf798c50487f"; + sha512 = "547050b68cb5cd8b108e37add411aadb2150b81de18bb969a7e3606f46f2e4a1c5b13107c3e380332f4fb618283bce06e320201012bcf3857e4ffe7c406dcf04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ga-IE/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ga-IE/firefox-76.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "05cfd56f53d033a70c1e1ec08e1355e281ef525f6389ce849c87b92bc6edbb4c953e054326eb094c5862dd74db64839e36ec31cf8ad3fc2248ce2ea309a40bac"; + sha512 = "2476df820a78769df6bfa0270b096e4671a0aa6b80600ea792742b8c2117a7f10028a46aa5343895be9d4788e3cd857b2030cebbc80600c57ce8ccbecacf65b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gd/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/gd/firefox-76.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "aab0c4ce13a418c9de0fc5655bb5d5269dcd07ac67e75bec66c419f06348043c2c69816704b770398e95ea0a65cea531600bf9322545bb40394b3c599b71cf58"; + sha512 = "81930ac202d18c6b3d5ec52edca4e5cec3beacb53af6e98a2fa55e4d82b60d1375e61f0ea27aceb9a393c38042c12642ea46ec4f58ff0fddd14ff99a4111313e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/gl/firefox-76.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "61f4b6e54d98939b361fdce716be0701a51fe789085db0df4dbeac5a64258fb3ef3dc30ee6cdc1539d9facce481cdff5076dc19bfffce31f459e6377f7fa6872"; + sha512 = "0b34df2212eb393bb803407b7f79fb99c22d2b3217dc243822773be76fc9b434ebfc88485ad2e67a56364501f64936860c5f476d09a05b2799f6dcd6aa2c8c24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/gn/firefox-76.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "fc77cb70f71f832ca7f9c6b6ac9e7e6e75737c669b229e3dd68c9061a0b5b239cd3e5d4c501a45b8b964c862230736c21a1431dffbee82dabcb4b9f7b95ed09f"; + sha512 = "5135158c12b398bd0fa9caf3065135e4b84118b83e4873cf98721a8f2a93198487b1aba3935f778aa6fc0fd5ca781de175adb4cd322b501f8ef42b92e19cc459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/gu-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/gu-IN/firefox-76.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c5e4d9e031b97c61b1026073fa3f772158b803c688c8bcf35fb6725b86daf9a3fa970788b8468f4e95303adf73c400ba7b72c52e008d0b6a835867c73a583164"; + sha512 = "b469c343d792fd9fce3bacedb04d7c309b21bd8b01c5cadfb418d4207be48fed80624c3893d36240e45c9409996d9f86b96992313494525c6e4af5e366982c48"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/he/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/he/firefox-76.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "49ab14bae6d4e7211904a8da54558e70276897fbde5252760bab17aabd845f6d961e79b79c775e338564b94534a4610742968fa8abf09a4bbd49cf7241b86f8f"; + sha512 = "99f2abc9f02aabd89e03e414b317d797ad0e9c7d9debb7d7029c3381d0764504aa4e65ffe45e08c0e9c2f48f5d97986284ad1372bd7b9dc68b157e1e9a058e1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hi-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hi-IN/firefox-76.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f7b89b02f01de7f9157160523c30388064cfd1c9bb2f24788e41d3f6eff706a76d50c562c7f270d3b1287d8d886988f42d0480f39694aa6d1be141bcd926c6a0"; + sha512 = "ff7fe6d665b6efa694e91a6560c83fe4210d9ddd110c9436a20742e5b657c0f46345c25c53fc0c30a82582efdb1fa1fd53d328e9f2c85c9b800be04ad796a7e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hr/firefox-76.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "d8319df0d4ca8c3bb403fca56565fcd16916e1057470046173853fc9d299a04226eb2e00a1cd14206d9e576b73f64722ad65e7c0dc6c99de498bde7ea5b35f11"; + sha512 = "6168039b77edacad882f06e68a3591e5de7f2980619d17b7cc01b0ed41ae5d57b60f2aacc29cd7ad4a92317a87c3f5de97942cb8f78642a2a29c130c04535bf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hsb/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hsb/firefox-76.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "bcff9cb8396e05dfe124fb3bcff48cd526322920ff38800988a1c82dc9adb6927b8df41ad52b9bd3cee18a72e6f065c8dee0239137b84581d555cb9a69e3ee78"; + sha512 = "155d355bddd648bb63bb51112b1d443a212297288f8035b1a0c7dbea3209ade492c88bcff371d369fe2cf1910d1ea0027d162fd148dc648b464569e8d51545cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hu/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hu/firefox-76.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a570bfc699c1e3e5e9bb733eb1b92a8d8d31313aed84d57039a20cf3c821b51de36523c17d03dc4e1f05d57e53b07ca1457317452170cba84bb5a98ebcd59c41"; + sha512 = "231bb489d45f47c827d7bd7a1675ed422c1e2af10da0817d599a8ef0cf27b51c06dab0f79957def6625baaa61994097020f539de2ac7263bf09efdb12c6a5ed9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/hy-AM/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/hy-AM/firefox-76.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "72758745bc2fd3ff651d5df2ec3a7af7697f299f488da5096fe2b740dc2a3340ef29cc4ed107318533c4b1e7438688169f5bf2d103b307c615bbb9400a334091"; + sha512 = "4bf95879356abc7f0e7b7373da4fa3a9c12ac3dc544b05549303a8d445730987f4d4b1a6f4df11b83f2585e97e160caba5bfe8a76fab041a5c21ed89ff8ee24b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ia/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ia/firefox-76.0b1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "9fb6659aad83d753c244e4efacf55e5918692964c84d6428f069e90710693da7b82a47ceedccbfda32eba6f3a8948e01ec32695c9261bc254c4b7e1b8f84eeb3"; + sha512 = "3404f0434c4794a3cee7874649ba74e6a182164369386812a447dc088bf3733eaf1d370b90cc393d534c38d705effe558914d43725c0d7678c3240ff89e171e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/id/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/id/firefox-76.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "c54aba052fe2f4d4e9eb08a69b0bcddcd4e3dc84ec6be643d34eeaa638e50d17658f530100577d5d6acc97dc7a5b4baa640bfd0329648390cbdb22713ef70911"; + sha512 = "33903d23a2d3d2cf0a674f5a2e396af98b5323172a17b2c2f8f57e8666d61a31fd5615fcb1b6aa7b82614a0decc2e7de1db61451809f91d1fca5196f2dd2e998"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/is/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/is/firefox-76.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "01f552f0224e2ad316e84d3ac55051f1403cf2338d5c07767db463db05bc19728b7f096a3d30bc03cdf86bf81bc799a310241d33b8a4e7e5dbf3db61bfbde263"; + sha512 = "ab6dc63a4d99ef251210e267ed5c14e8a81b10b2e3aeffe030600e2cd8206d55cc89c3950900dff127270ad51a0cbf54f2569c8c5b65beb805fcaaac9e904a7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/it/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/it/firefox-76.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "bbe8a2f64dfb54a3a4b13d7bb14a0746a28bd16be46608744696bb12aee1b6acd0ad4991e2ff7867e9679a3bc51c8d47690e08705b6c860cac1e27530aab24de"; + sha512 = "47dee92970f981b18b6a2bfdcb653001b44dffc165c535e5ea79a5e2b7cf2629675044d090f4e741a7a022d175c36a33f5afa225951cac0d70d999a3c63e311d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ja/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ja/firefox-76.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "437e74242ac37576dc01be92bf4fa57900d282b0919e4fac8a073bcfaf681ac2dfe58c2461ea18e912fcee85b97ff40df3f8f1c649ea442a557388544887f7b8"; + sha512 = "7ae184daeecd38289e6c3f4060162bec02a0324319b84b68da1588614c6afe6f28744b482b05b70b33031ff2928ee5e66fe9fdef0d3772f112b0504a3a4e0bb0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ka/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ka/firefox-76.0b1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "d7d4374c1f2ea6e2c2c40e3d425093065dcf624b50532116e576f60fad51b85251ed7284a63b4cc2cc368d1bd80eadce8d82a581789e02ca5249a2811fcccdb4"; + sha512 = "1cfff13b6f904cf59c6a3dc1c6677e5422beb636abf399d6cf5a6c56cf052875c34ebd6582cecc881a9351207ccf6b230389f9e860ed5ad98850dc0deaf5ee44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kab/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/kab/firefox-76.0b1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "235f9ad96c86ac81ee8b7fe9ade89559751969ef48eab577276e0289cededc708bc05eaa413febae13ca4eede96772915ab4b6726dd8bd5bc6b7ee545971c791"; + sha512 = "846c208fc457b855cb3c41a62d71fbdeeee5e4414e2eeef078681653f7ee6cec3a8e1c1f83005890032d71cf417fc5589baf5007f2d262155fd0df2145964be7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/kk/firefox-76.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d443ac7f6ef50da01038c7bba9bf4a2eb12b53410a5201f64162eb2a287f5f4f16d3408715ddfa58471d53e0e58edf46778141118a9b67dea410af683540f82d"; + sha512 = "025cca3bc228afa9fea18f84dfd111fa9b8c1d8f529107662f963f63c7311166e812ac5e5c892d4e5a1565ddc718c915eb5981de700096e2e8ef5c699bd2d54c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/km/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/km/firefox-76.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "b3d35fb421b9dbef950fbea28e80b530c9433a9d51760d1d43043637a6b497a3e2a890de8b2eee9b911e60a95308669035298fb429648a21151e3f08dc6a32ec"; + sha512 = "dece035ffd0267c56242cd1ac3ef0bd001429ce3a32395e8ee27786384cec80db928148b3253fcea976858ee7c943eca5275d1b2b92ae46b7e8519c43cc7616a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/kn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/kn/firefox-76.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "65d0bd986874b9619caa455f9585d309a30a87b482d0375de27e46a70dc84b5ffc4d066202b7b597d1ac7b28e7be91550bccebb419c4a24a847180c62b7c46de"; + sha512 = "d05be55571ff99f86784089bb9b3b0f8e4435526bb7602146e29e18c8ede2d9291c64019b7d8e415d26f5badabcd549e361a817fb7769c38614b7107df521cf3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ko/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ko/firefox-76.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "bf43ec6311e6ba2259e802b1ba569516d5117207738ff4259b2346b97ff85b8048e5c1a6d2b4b3c27a91ebc40ad6a85eaba84250be79e41f4570294448a1dcde"; + sha512 = "107681f2426316fbb2e61a4b9d79e8c3f79508606ba2f34c51700fcc95ff8f48f1b1d5ee6b78174ff2758cfc63aae62555176e79c299100e3814e7e215424a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lij/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/lij/firefox-76.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "1af356fa06b39b9d638b13822e82f4961a237e3587f8b671baf5862a87898f440f564f9836284af6e2e3e8b1f3ec462af1e9c9621ae51289fd0b1bf827a2bf1e"; + sha512 = "fd590767f7e05a662a516515a25e294c3526c5676b7f6c0732dd6d00be596ad32dcf587d4218d27d059b9bd0e7caf05bb96c0605c19b78c48b227c3a9088c32a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lt/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/lt/firefox-76.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a4ea24a874261b51032a1021878ed2c0102bbcddedbe887c8f5893f428c1d3fe6cd906b3dc53b5b51654c35e03245244aba8a2811deb7c3cd9f6d0e2dae3bdcb"; + sha512 = "c84b879875b2e4792b67ac2e3dada7a1a6a11d79fbbf4f1f05bd924d8498072fde4021a542a9e80beb2c2d1f527a066cabe1dda8e5d91db27b88c9eeeddf9b1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/lv/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/lv/firefox-76.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "a8f385bb407d498ca291d088101adf0a4f93b8fcfb9abd3fc36311fd8e4e36424f888f5abcbc1662ec4f7dabba891ef765b10c4a9dd8364898e803fafb82f7a5"; + sha512 = "791fa6b41e1bf7641980251acb61dd944477b280f3a3bb9cdaaebac2fd5ab7b4d0e4ef03963627e84be0477a45a42988946c6cf151b42d23d05c93c12716171e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/mk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/mk/firefox-76.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "453a3e2726115ff8aa057445bf05fbd9bf5c796fe8efad9590aa09ee8ef3d70cd6de3008503c336770ea3cd259d226962c1a6e198bf2519742e14cf3846b1975"; + sha512 = "29acfa93dd502f9ac97cee86c498f1b6a880c423d47c69f7d1a30350373da95a898fb748b8c16bcdea019865c603a7c9f275d7dfa0a3836942aeb3bf861ae06b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/mr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/mr/firefox-76.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "91bde3db18f77850affe7c3b981b8d233febe8e95d8528443a80c0b569b587d2e605ae6109206463ab273c9a28ca8db51cd6920ac30664cbbde9148fcab6cd36"; + sha512 = "d28f900f5216e971577ea47ea995cdbb55dec219bc01e27a0e49ff5d87c3afbf5a95f6d6653d5f1baf881111f63085ef23ba9bee936911efbe6a7ca3259e9873"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ms/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ms/firefox-76.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "8e758ecfbd281cf443dfff4950b1065337fa92b1c47c4a73f9e78f5ff1c19ef46e3d1ea1e9458646a9beb6367dde72062144a2d1d2a94a0e0ac1b40a2991fe3f"; + sha512 = "05b0e1bd2fcdfdbc4f6429990dd9d7073522f9e3eec4a4fba371a9dac05292b144dc941f07aa7fe6bb17dafbba8ffb04656b2d857fe4aa71db9e5318748597e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/my/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/my/firefox-76.0b1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1129e76bbd5ba3c96e8110b3b00eab0975fe38749da46846ddd37299f73840b987826ad80a3d3f2dfc4ad0ff38305fe45f736fa90c671162a3a9563eb1a1e755"; + sha512 = "a7a43621aef2342b4ffc5e94eae8c01ae7d4bc4d88db345ae27c3a6e585a452d90b636875505910a3a84442a2a0dd1759689c037fd1ae4da9e2d16724b1b15df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nb-NO/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/nb-NO/firefox-76.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "3aa4e29466e7d6e3e3d34a570d967d4c14b3fc3977912161d30a6845d75abe6ec745ed77d08716a11ad8a6d6e6656f1c5861453af27c10184795ec29bb22a386"; + sha512 = "4eaed0fdf2de75af7bb44a6102a4a547ac6dcde61b4311c83730f8bd15f97f37ff8857d53666a80ef987fed4b865139ebaac1818f964d2b3a6f0370ffe0d6766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ne-NP/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ne-NP/firefox-76.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "4f9e880dc686e04249553c5be99fc9628105aeee67af7db88cd0662bc4a9fd37e8b9b18921b608e275d7e0b5f2c03923552705094e6749e0a3d0421e82a2bfa8"; + sha512 = "7a547372f165073f50347ccf6c8690cd8f1939552102bb345ea79f86972ab2e0a9672d6d3a9f402c27cde428b84010f9e7d93cafcf3837f2f198048a75d86171"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/nl/firefox-76.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e271a6208e6b7fe662284f76f22482d854be8e700923c96b2426036588f02a52c9698ef05bbe8422dcbc4a899eac3bfe247f28146e2f64ebe0699669219051ce"; + sha512 = "0bfea49494b20ab7307802fd63329d09514458b9f15fc2ea7dcd45a1655c4c4adda5f94be7d6a9b59158f93c3f2febe9787bb168212144b55e4c0e10586243f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/nn-NO/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/nn-NO/firefox-76.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e7a2b1e038cae097babc40eca692da1a4066f01a18ad958378533ea03cdc49e917e13c18aae0fc40dfc99723e3f86b25b1ae35f2d400f83add63c4151a4807a3"; + sha512 = "1f6313d7b493bec8eb0319f135f6846df800473f192ae173659b2bcf963275d8dbca21992e86e17a0365cc4702f5f36e71962b044b76f572f1afdf1a02564913"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/oc/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/oc/firefox-76.0b1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d9c3701024ac70fb83ccff3e2b843d224115608b7fad1d6db672af3716e9fe7a80efb8d92a366d085376dea51daf099299acca629113779622b39eb19750dfca"; + sha512 = "330e031d4cbd7d426afbbb70b0a10ca5d916611e7a10a1a1826d4ceaf76441e0edd4c8854197ea1b529890c9962fc9f6fa5787f5b6d4468c75be43c4045f16da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pa-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/pa-IN/firefox-76.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "68d13fab28380f7ea29898dc2ff91d6a2d591a2bccf0498023494466827b4b4eb7ca7769b93e042dc855994d590d770b80b9c5d1b636f6923534a595cf6d356d"; + sha512 = "c5c738969b18a922282ee53214d89d36a67c103165d4c2c1593d253cedbcc9a3d074b81594d8ccd85127ebcac60673a6766fe82bb4da1f6f78cd79c41ed7ff0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/pl/firefox-76.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "69b5807c0cf3053f87e5a8b2fe51dfa40146685afbab623a7824f6fe6fbe786dbd17c683d697f6b61adf78f800b84c0c5a16e7caef54a6b3dc02d0ffd5ca89ac"; + sha512 = "e6e5dae278c07b57eae31b21eb25a11a9d3cbd68972f36e4e7dd6b1a6382a2c1553eccc9c214ad4c8b7f078e34a6eb97c46dc2af0084705ca34fea75e8655f54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pt-BR/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/pt-BR/firefox-76.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "f9ae02b7c9c72a97b8d28ef1e1196dfbbd5ae30acd82939c8b7fe37a1de0c73492ad286e4ff05c0b5f8c2784e0a1b2b68445b94bf765b501c062f33ad1ea8e61"; + sha512 = "afbbc4ffd7052bc1cdd4a46e0f8b6c9b86961651d99cc50363f12eecdfd8f8f28a1f6777ef448d10397e8b032e252af1fbb9ba67fe73c5aa31109988ad7818d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/pt-PT/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/pt-PT/firefox-76.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "e89bada391d72440f6fb60933f33e78642a595dafb277d4d20768fd418c6049f6969cad8d1b95c76670cf7a033acdf438348e0a6efce9c699a7a2276d2b03f56"; + sha512 = "87f98e8d9861ecf9553de23cf309ab48d31ae710bd415ba18dc9aaf240206987116336c165f7d7f7c77bef0529702d6524efd5fc8d4b0778e989e695e4c3e05c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/rm/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/rm/firefox-76.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "281ff5d841f3dcf7e2ef42a159a5a43426fca475bda02f70a34b7fce50a0e313f61cb11d25f0876314aca3f3c285504098c60f0e79385653f8b877994e5e5275"; + sha512 = "e8665a8d5c1f329bc141087f3e0cc6cdfe14e23fdbbd0d3802bc09be299c618b19cfd7de273b57153757c57a6fbdb971c21feaf0c6dda1f9fe9c99af962a4d28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ro/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ro/firefox-76.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "62bd91413af9017d6d4b70145f4c763fa7b35d78719ed14ca808ab3a38a4a3717eff3584a29b4c38de05c78365351cdc5a07bb3a56d46c65ee5447a3a0226276"; + sha512 = "d734b6b9881259fafd0e075d8e494c59bc4c8ec84a405da9fc17113cee4cfeef96c992400c6c19a582ed90c3f93eb7a38cd401bd826c380f163ce8390b4558a9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ru/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ru/firefox-76.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "40e917d1a07ebe8a1cc6af2b399187f4f918ac3d509eeb8c6125147313b469847e34f8b9e705b400123d4327ad1b13f2b4de24f70e33236f7bd4260b4b13ca94"; + sha512 = "50ddf9bf9d63d632e38213c3e2d1e6288dda1816f87540f3efa7dc2c78de0cae8be85f477276c104e8cab012a4a6fbe8c1217cdc232386c0afd797af799266a2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/si/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/si/firefox-76.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "58874b4198c1a7b374ed0d72cc223733889a3bad6f717151dbfe7e584df3059527d6a4ba055575d1c2dea74393f3d70705185e0c2cc589306c5f1e62a31aecfb"; + sha512 = "a1e984f674a53074a37e98771cd2bacd6e6a923dfbd6be59bf439af965fb408187b7c56fd202796e51224cd57e17a926618f743175f255b6ce2be3006c602982"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sk/firefox-76.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6cc148e5f962006d2f5a5651c99e170b706c0e51ed82736aa51a3a15e8b254a67f6df6d7067e261d0a269e71995e1555de7fed81b02776885dab67881cd17cfd"; + sha512 = "83ab99539bca4d2028551e6538c2e3325bd803f8b5068ef7b1a4f65decbc91e0c7f5f7d78c351579d3b47c2a91e886ecfdf7ee2075567416184098b117074cc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sl/firefox-76.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "1abfd77e7ef638d1d1fe1e1d8b31631f0a93e982c22c6affc9fc9af77dacc81d53afa95f63fee1a1b444ea7db88826a4f6a851c87b6518f2c6a77329c4aa2c8d"; + sha512 = "aec8bdee4a190cc623eac9ef82f7e93c185920f3cfe35e8b9d97bb39b5f2c99e17dc71cc800f60e28f604f809613f82d41c7b5cd8e8b867bdb3c11a73bb6c5fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/son/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/son/firefox-76.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "80e7fd5e34fbf115b4462913449d58e8bdd725f45120d068b8ea6624293cc944ddc218e3854b7e6935675ee1640446f063858515c70bc1a7990a3c10ac812529"; + sha512 = "258602af8e2283cdc14f73d51ea1af1ae5cecea273534be6521831619e76d59ad635bd6b86624b72afd53a0c71e622ad0d6eb55f8593d42e97144e3e7b521d47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sq/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sq/firefox-76.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "9e5088a05c22a448bb1212d2296d0b8690189d6bba8053661445e891b6e8c2716ef76a82e6659eda9c434f92a7f063e13845ce20944df571ff318eef764c2ef2"; + sha512 = "e6220df0ebcef2312376d1a12f6a121e6c52871dd48dee4acb8de92d92921d348c4006a14a2cfb27db341a283ceaf100088c107b3c70d0437fcc1fc6a57875d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sr/firefox-76.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "18bfaaf378edb31b99bee33a60ffb06138dc6c7ff34c166de30255ffdfbcd7c2cda214678bfd0e11d4f5afc4a666d6c3ab7d1ffc92137abbd08c9e704f4d1d7a"; + sha512 = "b6bd9028d35a06a2f50b2ae383b166e443bb1213f05585a2edbcfc92fd22e7c206aeb894bb7cb82f359c0bcb1fdf5250fa91244a9732348541ffd581d35fb7a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/sv-SE/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/sv-SE/firefox-76.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f27fed18480927afae490b8f0c2c4c925045e56bb355404ef499289909e256fafc694cf51f030fd69ea395ad5b5e593f991ac428274af745bf39336d247e868d"; + sha512 = "546fddaa1d9f07578a1002711aaa10ad683e015d6a4494f571d8a1fed3c9c0f4fef1ccfe5e20076abb47b5de6c793464191b1eaa8735bd95a3a81134f7f49698"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ta/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ta/firefox-76.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "200b41c6db82f1282155cdb348b8496bc61c9e248e6049e7dbaaec3732b4711f32b38b3ea349b47f1228bd8c712b15db3b9296babc177169795fe1819144ca93"; + sha512 = "7b77aa5ce741767f2078dddb5e8c108b1e3db2da99b06be13537e2eab2be57045c7c0979aee16bd48bed152003aa87e93ab2bc47b1304311f0152a0636b14ae0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/te/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/te/firefox-76.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "193a3b9cf98de69ab236f9efd59e23deee25eec41e409a93c9949789d242957f2b58bf724fe3effa28111595c9d1e49a657a5d7f6c1b77a285386b712bee67aa"; + sha512 = "e9e41551d2221aca5fc045269e435ed69377e1d110f0b80e4d36e8a3c3703adc1264e9f3963e9838de845624a454431671771a5839588e08eaae213cb44f6544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/th/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/th/firefox-76.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3ab9a77fb25870271c9cc415c31f1ec0258a66b3f1855c761dac367cfb509b6c73630c88f022cae271cc553adce8ffe63fb1bbd489067b92772286fbcd765c16"; + sha512 = "917d50125d280c839f6ac60598197102d3a40a97509e25ddddccea43cf9f78d2ced2ad1e3f47a3b043637be3df131a8d5a9f7035daaed81b91962e9f474c89f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/tl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/tl/firefox-76.0b1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "f386b2d32e2656ef8e9a0afe0050eb7c8d8a1a00b92badeb6b5c2c6d8e046a2ca7b038677af56e725d15ca4c6111a04e1c929cad0575a034745e2476497c2cdf"; + sha512 = "74c19eaf5ceecc4ea4d40b921520b9f7d313a445a629529624bb4c382edc59c8361f37e32657479b5a760d27dbbe5ff10f93c83a310b7e8fd5f520f299736e71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/tr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/tr/firefox-76.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "802c72564706b4e447f0cc2835046b44395519d0c2d7fcf6c8f8478540649362a49144dba942e1c1e33e69ff69708437a985665389ea2b1307f8c386690f9664"; + sha512 = "4352f9872ccfef5f9bd39d61ef583ff270185ffca63db795580337db227a6e1c5c9450da95b28662f6c98d95433e96c78ad0db9e72470096793fe04a91f3b26e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/trs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/trs/firefox-76.0b1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "60f8f09625d8d2633ca7b08fa3f66573ce0d23035f16773a338fc96944c66e6bc77af36b128589634fc99f86009bb1016ee2d1ed503407c2ff085d20c5e2fb12"; + sha512 = "807f2857b8f165749fbdc7a1af0292efbd9ce834feef9dd1ca43a83022fe1e5afd259eb1771096d9b9507bf3a1a6ef53a4fa30dc30be9e978d760efbf2099bdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/uk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/uk/firefox-76.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d3b63163cacd6ba99e3f7dc9d5ac81e98155e77c0315ce9adc2e23cfce614f67b519ebc5ee8aa4f1aaf932c7f619f828487f41c6a712557c3f8289f9b3205f2e"; + sha512 = "1d6780ee40ba9cb55f9ed2f6a431c0077747630bec036f7b1994b6d60d273dba7ed5a764d8072dd2ad040d91c7c05c02f9bd471a84271c232dd4a3997412bde5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/ur/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/ur/firefox-76.0b1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "ae76e9dfd1b22a7cdd15c4b4b8b2a508168359cbc6b15ec9b52e489f2670799e1056eb6d7fd6fd28680b721a4912bba982ab259a02b050834e31030960b2a8d8"; + sha512 = "433a03b7c9f78733615331ef49595bee7ec21b7b3e8c5af77672ec2390b2be83bc7d943adf98d871617009bede234d56689c22fb51fa8ae3c97723b500796716"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/uz/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/uz/firefox-76.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "6216b85a6b4329f378d057d72418a283c4e9e1454f918636c7dd0845e63a00827259397e82c7875d1157bf05dba32d706cef94239cd9ef6ffe03fb02255659f7"; + sha512 = "5d3ceb49f6ef3c4f0e307981815f2201f07eb34eee3374c9b2d7d1d9a012364f392c1d39a6b700bfe181577da5e1a150337e01b562aa24c083b75622bce99393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/vi/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/vi/firefox-76.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "ba8fff9fdeb195f42409a10d0fdcb6e8889a6cc49fd3c787013109b32692e19109b9029d69a8458b05b51d8df1dcf085c818a0c1ff5a48d32f68d251e41e9681"; + sha512 = "a5583c925e1daa20f9ad6f35f28544930932cd7d04f95635f2931ce71cd08655da97dacf5acde5d90e195fa05a5cb2df998183ac6322130916931117a2c4700f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/xh/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/xh/firefox-76.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "0493e6e0d685809ac5f757a829cc0ca0564d8d778dadec422698c369f9aecdccf94be594919273b9bdcd23677f0e8a760e01dd40439262c98c9ae5f17b7888cb"; + sha512 = "792fbf676be79e8eaf8fcac9dbd060ff62e0c187b911e1af7980b2274f244d22278fa8e5c541acce6ac7cc512b62b5d2cdb50fa63cc228c77663817035eb3e76"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/zh-CN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/zh-CN/firefox-76.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "efe3823502fd81587460486dd7df33fbb878e8dc657c3d65d8e3f112374d3452abdfb797eb95ea7d4e3fd7003a2b906e78643ff1f344088e9a8a577f554affb2"; + sha512 = "1ce1c7ff55e905549ef7d26cfa52eaf3d95c5d1428f71a91265aba5815a3769c7ffaf3cb19b7809420a081e9e1f0792d9282cd40de7a5966ba1bef7bae6a182e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-x86_64/zh-TW/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-x86_64/zh-TW/firefox-76.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "d3561f2f043480c2c6bb2e0d455a752c2a00f800fd049a21c80cddd03ddf04d184f3bf352446dd3a858bcab5a42543992ebcc86246815205a455095b5884df75"; + sha512 = "fa2d3d638f5f9bae6948e4db8e6f22b66414f55de904831fcb578e191b25064cdd785fdc64718e7b2f52fc35ac896d7a53d4ca07373734fb033c8d633998a393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ach/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ach/firefox-76.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "7b9cf2172a3e4a7e7bfea4ecec10adba14944dad36db06d3ed60c36a5d893c67a0c6eb9e65f612040e7c3e2b7a9e966c53be7c2d5faca60e37fad2c497194d44"; + sha512 = "7d18df1fe3443f85408c6f850a2ad4cb8ea63ce3bb74e7ea07d395f647b7106eaf976855d0629308eba20e12105d61f80622084a5d295fd950d5e8d9c2ff8b4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/af/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/af/firefox-76.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3dd2f4ac297e6e358657f90beaac9093816d339f84c21dbe3f87283c6712b1ab70c6fd9e70d05bc79a8997ba314711c37ace35c7c7e8a4140b9da99d953968f0"; + sha512 = "5ce286cd2565c855a8234799517c30c665030481c2f0d65ef6739d7a2ffd80f58b67d1589b7952ae007427c2d2c519995f8b48003d033f2f6e5f23c7d646c349"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/an/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/an/firefox-76.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "e04e6875c8873fdeceae22c486b0a5f718085f35a5e46b4f3340ce4654709e4421060be73bccb315db4ac4a93991b5e844653b19518fc122150dd6c6ad84e89f"; + sha512 = "0761d2be3847985354938b5f14e9c767a7ad6fa5a2d81d04635f56342f2b43f43b34ea36d89b063e7aed36e4c967730447c187d43402a8dde749e918cd60fbab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ar/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ar/firefox-76.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "0c1728f66fc037ffef1ab0f68d5a7e5ca3207467ad03981c0681981c562b6f51df0026b8b323dc4f0e15ccfcca470c1705776353c0b2d4802aeb8879fe306548"; + sha512 = "7742c7828d7cad40f1c18efbac94c203dacfa45205789b5aac06568693228ad21c6dcdd1166c4cdb1042397744f0c0a82d278ceef236eb3c5279948969ff4f4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ast/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ast/firefox-76.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "1b8fb16468b2db02e8e16d6f11d4924960f48dec2996ff087d94106d4b80c2250acc6e07f510ae4f7db65f590944df8a44eacede55deb915259fa719ad30514e"; + sha512 = "4dd9380b8c327f653c4228ee354344a11c0bf8cd0c9340f11d94d1bcd0e8795df7fc9bd05ffd78d8a51494798cabdddac4f659425be1c072e776417df2ac327b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/az/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/az/firefox-76.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "500ea5cea770c8d8e5e89d367e9239fe4ad065f43ceb2c1ecb2ca997dc27989a489586b6f387149d6d97d204a2cedfef7ee3eb745bc91d140ee8ff162d6327be"; + sha512 = "c69aa89cf0ef6270fe0c1c79b00cb0c6e599bf668991b130412a64b86703dd8580d9e270d89bc13131528a406d74a3b55caa74418b6a3c88a22386251c0873f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/be/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/be/firefox-76.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "5c258e46db0b6a22b6a658dbbb4a321226b54ca66fcbf8e41d345ace9c1fb36fcfb415d06dcbe0da14cb9ef9d952146f232ebe962b975d5a45df70b30e0b0b50"; + sha512 = "3d6a9126c3134a7ccbe58e0d7e5dd417a082bcea3d30c38fb9c208029a6abc39397a921f61978c6748d0ee5504c189f403615c36f0f3ede89bab32569bed3fb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bg/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/bg/firefox-76.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a970851cfb8c1231399d2fadd15390f7a7a9a317169b85543d262b7c1003c84e11140fa364312938271c0288e4a10804628f6ee286dd68d1bccf1cabf4c015d8"; + sha512 = "7b935192feccbc34159ebd7fd1fb08851a2004a1be71d49877e0878717574a413ce5e309cb6c000557ce638ac4d9e19f5a6c214036e06a36f395db9ca8dcfe7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/bn/firefox-76.0b1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "a8442613f7aefa8bb4ab963e2271612cddb102bb8274e09cc80436e85ad606fa3d4938188c85c0a10aa01479976dadc4c4d6c2a17835980191e9dfc4608a9482"; + sha512 = "fe300975621e290995533ace66387a8dd2d3619cfc45da185104f1e932143459458325b08316649c95b5ca265f1d3619218c90e834385f86d495b068df1808db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/br/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/br/firefox-76.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "a3d32c2ee9fc1abb86162f04ebc7d13d3bf03d1596874c2198e031e2f993d0140fdbdc47f22bb7c821ade80f2cf12471f9d8191c5b7f7c87849a5577e4638531"; + sha512 = "93d2c5ed98cc55b7dfcc8eeb1d6091817b5f257aa3b2b366cc0472662be2dad7e1e426a3f5fae56934f4ff8f99d7e2a0fcd50b0d51e941f3141867a162ade19a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/bs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/bs/firefox-76.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "a5d54761563e2a62d0aae4b946b39f2d04d57f2a1245266c11bb4bd872d73cf7738c3a9d7c2ad47ee4c13175bf4f142e45a3a7f62582bef03a946ae98b7c038f"; + sha512 = "18126891bb8471e8e1116e6eb1ec3276c02cdb10f7ec6f9f23ced45dd0eeb2101705b2a5e0c281e6284f3c0dcb956abb16d98310a8a2ded5adceb9308aa14f8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ca-valencia/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ca-valencia/firefox-76.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "0b6d18b4f6cc77704997a7fa9d81dc58e70c1f4c08403164b93ab915683c7005410f5f90204a8e609a54dfba5cdaafdb268450d075182efdbc73701f07adc1ef"; + sha512 = "e69a617d2f4fc149a6c12efa04d2de876cef18b2a75b945599add772b030721e1af78ec3b89d1ffeac4272b3e8356a6ac9814ee3aa4681ebb6126b5071e17cdc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ca/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ca/firefox-76.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "c65b0437b82cb4ea3b1eff84fc75ebcbf65cbaae22631471fbc8ccf4e2a6ff846adb88e4d93566fcfd394fd4ef4c4d15e63e41c11ded3678fe69032765dbd3d9"; + sha512 = "838c86688387a6e19388b1ce02b22df61bff1bfcca2fa3720445e2edd57bc0bd54bbc7df8ca6eef17c95ad476d4619869068849e2ca4ce03c6fd01e0f93d979f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cak/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/cak/firefox-76.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "2eb289a7c474279422dbd4fd6396f08946790e3ec98a6c5c40e217efc47a9099d16f01205027c995c0441e5787f48d95d6c40216ced393219eca3d55159a5459"; + sha512 = "4a2e76d270c85969903c12fe0fbb512cbc4b6c9a130ffcd75c03261ef7eb29992eff4bb60b01b9fe54b17af07b9435beafca37a4e5e9160b311b88f48e099332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/cs/firefox-76.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "bf15d558e81ae3a766801b532b9cc2ac5511b2ca6eafaef012a4f9dc8fba06c6ae0e906541db01b59d566453b916bcad79749e1b036573c4a01a04a95a0dd60c"; + sha512 = "105312908744f72eb5b87e7f403dcba3da3bde62347f4f3dfb9051689b9328e374fef546bef3e8921cf211c00d09a916868c20c91b340fb01ded65f7048ca014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/cy/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/cy/firefox-76.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "66883ec6b398b6071b13c55027a3e3343e3e71b6de5ce7ea72c052c9991636a09737509d8127d2a27fb6550e0937ea21954c85d6daa8492c87c2287d542d73ad"; + sha512 = "c515feead11875bdc67ba65a7dc55f5582163bc5036a743ef5737b09f23a57bb082cf3188289b54b11086cde20505c32f6c4730197ff387fd16d2bb2feca0149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/da/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/da/firefox-76.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "d496d35be0076336a5ce37097026959ff8ce391c07b7ecdaa543d45740af18e3d466470478c9639c4f3b8a5d6ea76dade7196f65e411bd90e5dad9ec1c10a258"; + sha512 = "306cc5ddfbc0ce0ffcfe2668b8861327086b72a9fbca05142d6e7464ffc09e1eb19e41c35a6b3267a44b65d5700b9a0bdb66d269ca6c105f9538edd846b3a253"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/de/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/de/firefox-76.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7df38aa573d796c23e00715ca333c7a1f90d560513c17ae35afa80ddf2783ed4f091cf2e0d8b25174186008ef818e5aabe993e2f013af7d9b61fb0ad0c954886"; + sha512 = "794cc8287686c527a8e7c62d57b3f23d0b625d88b76792c508d0ca4d2965da40d183b12c81282b8af71a33d0813ad484d3425446731745f8ad4141857a44ca87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/dsb/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/dsb/firefox-76.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "d72d5940904da04577dd0ec0f90128bf4c89b8261f54ade9a265547957fa9ebb7687ade1503a0b8bfbffac094953cd0d1fcc836e26203545ad497221152a2847"; + sha512 = "d9a043754c21673cd1e65e141e2e73c8fe89325053239c8ff45b809640a7d759212a12a1f67a77acc5da83e182cc4d0cf2b10ee4fc68461904e3c479df9d5f4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/el/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/el/firefox-76.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "d05716e457a5eb13a51b0bbfda6eba4f9ce775f567e4750831a1a3fe2d5d2beb8668d80dd7375e7b4db2603d589a6209634d6704ef34a851f1a8a750d1ec40db"; + sha512 = "39f7818fdf6574035d89d7b0eae16cefa0ac511fc8dbebe60cdd0032c7e227986d6df888b88fac0c9dbc4a7123adcd73536d59daa0128509e26f04669e47abcf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-CA/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/en-CA/firefox-76.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "0821949d86082a2556ed163fa2c977e79293f45b6dfbf2517c3a01cb4ad5d50491e6db900106c4141a93461cb456d613c5be3aeb9afc8d4f502df0fae15c1b58"; + sha512 = "8d047f18bb5136b31b51d3799a59215f923d5de921d33bd92e84a6f4fc93b8bc6da498782c606970f986b879c34fe136f50e6324522695dfd97307bcf7bfbbe6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-GB/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/en-GB/firefox-76.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "df4bba4600e6100772a373c6bad0064c0ba3d04c7db50a2a8780bece46666e254402d3cfae20114b29a1cadf19d978d47127c0e39619d40876b0fa3df4b2a84b"; + sha512 = "75291465efeec916442cf1e495a5b4e56d0e66e32e0563b555cdf10c613922bf3b6392fd38ffa2f0dd02157800ebe5831d2ab4a5feda30f9fd8ccbc2a0061800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/en-US/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/en-US/firefox-76.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "56f6fa58f059e2c757e564a3cc25121d816c2afc347bb47fcf2c5de23b384cdaadf291f02636aa179eab0e6ef185b3b79653f5bdccf6a92d825c3a7c2c9a11a7"; + sha512 = "f8b18128878564683986150825a9e4ed3dee081a698be8cc987a166edf3d04cee0a5289392f0acbe085f055ed483c8316214679c75792e98de2725b917cc2586"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/eo/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/eo/firefox-76.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "9ff03e25d258168238f0d6c2654ae4896fad897e0c9b797911716e7496846b853601e0dba92db5b1c86ae94476752d9dd5714242dce620cabb5ebddaeae062c4"; + sha512 = "36138fd43941b8dc0a418e24aa9af4186f9294fd8e3f685a81e6afe6a6a55762068c3b8366c0003a03ad5699052ddd62ce137ee7ad67e16b4bcd6104fa17415d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-AR/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/es-AR/firefox-76.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "05be15de79e1c2807427a927ca3d580d3bbdb5d4df0e4be06e23462a843d125df22471d5793be410a24b262b1796fbbaabcd27cdfa12cd0769b68967ebc9f5f1"; + sha512 = "eb8418c1dbecebf6c609569f8b9914ce5f8109eebb80423c386870f42b8210f43b985c66cee2a0aae3c62debb6b481c26675b4fcf206b7a44fef4bb048732c2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-CL/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/es-CL/firefox-76.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "22e4bb6047ed7ad134ed1c33880e44dc7067a2e1510452483004075763b30f91dd1221cf3ac0069e2f31cf0a360305bbcbd116e62133b56ad509ac3c4035bce6"; + sha512 = "ec3156b0e057b59e1220d4289484810972a473327dd6d231094108ecc2f0df217ed70237242cb4536aa9bd10a8b6f86447528fed4d3224c5024cc40ddeb36f54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-ES/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/es-ES/firefox-76.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "0930851d3c29384c619347fe6098764119b1a994640c744ab57f2b727164f6596b7c2c160459e483a9947fbecc55d6a1781ebfe52e8b6ed28403f3464f56c98e"; + sha512 = "d90ddb9b173076a1a145eeb52ff25c25cec45c72c195b3e7ca11593adc9babf0e12994d437cc04c518814caa3207049a4488c35ce373cea3adda7fed68426ad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/es-MX/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/es-MX/firefox-76.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "ce7b0b898fdf70b6751ee95ca098e5b1bd6a8798313cb1cce0201d8457bb90b10faa2ed2bcba04113e10a76f92f3b3b0b8beab7771fefb9cf2cdcac3a4385041"; + sha512 = "140741d62afaf15b676313923cebab714d9d09617f62302c861fca82b7b06551dda0d60ebf0de09bbb28139b836149ff65c964340ff5d7e7d7423f5c6481e136"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/et/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/et/firefox-76.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "0d8961cde7ca4bcdb16bcf579158ceebbff44f07565267765178ddbb9a5318e58d60b2f70bc1fe0a939d06d1705f986770b9fb17a8d22149feb1d66c44e89d38"; + sha512 = "2af762edd98cea3205339ccb25e4247b90fbae83eb4ecc172ee069af7c14a7accd0aa03e0b28489804e741ab6841ded0e97c170d388da30d68bfc5c43950763c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/eu/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/eu/firefox-76.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "f77101548344ab87593ea80be86fcf6f27ef6db48f394db549815c1faed4fd439a28ba87321befcbf79f0c9dda93169abd1cf68649f626da694032fb291a0434"; + sha512 = "6690a291b2af54fc50fa8d405087833716cb0f330b9e5dd0b24d0b8efd15f5e8c8892f95afa5ffdbad3c39af4db9b823ba0257b2be7147989ac44c75a4552a0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fa/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/fa/firefox-76.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "c65ad5b2726dc17ae327ee02704ef1eddf29bdea9b27096ca571dfc4f12449a4f1a6cb8550e401d6ecb106a2ac0ffdbd536a12f41d6fb4944012f106adb0b72b"; + sha512 = "195e89b37a016d22a8a53e4c01dd2370fa4e13554811e0eefa66f4caa47652e16e44e7b314db383113048056b2837696beee093957b8bfc643290784d05019cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ff/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ff/firefox-76.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "09baa6e459175ca1042b489b63c0f6e8248e4039d6addb2d873dee777cc94b5e3e4b0c77f78f8462239f6886e74deeaff528c271a03433589caf4db6c2202c4a"; + sha512 = "961b76ef1121a44a194a06c2e98b583718fcfb25c81ee1cadfe67875e34f4275adb8215b4065d71d3bf4f195801aa7f61a8571c378dc12d271f633ea8c437cc1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fi/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/fi/firefox-76.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "52d3945bb5f16874c28a37230c0b2a593d368842dea2aaca9cae6c017f182eaf165fb3658a6a1a0881d54c88fa5dd7ff42806f8eb95653095364f66f0598b26a"; + sha512 = "b81e0cefd5e1de67e5af360b888ff5cc9857b09fc34f797ef799689ef33e96ec09613051501e0dfbdfb66c87e2bbe0fdf971f0b7c477fd405e7f99ba54632ad5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/fr/firefox-76.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "8bd4b0d20ca32693f34c8aba6f01fe1a2b0a3a7730ef1948de81dbe8944dba09ca6d24f87a131831d7276f9ecc44234778cedf4d1f814784e65607d13829990c"; + sha512 = "7531aa720608c34525063742ac1bf005f03298ba6a7b1b26ef5614d6fbb958b2b15d92d42e17276e99c0f46c46b8df9f177a370e488c18e46aa03be19d7cb187"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/fy-NL/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/fy-NL/firefox-76.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "851cb969a20e1927f06a6d33a0851f6e63ed14defea566de90ed2c98e592a00cfd1bf34de55c125449c2355002870b7cf5e3548d37055a5cc16a36192f9c92d2"; + sha512 = "f0338536c0a015d9e462508f5fed459a2477f7ae5bed9155b0eec5372cedfa37bb2c45328d063ce78cc3e52875b05a933f4e364ff148c282ffe1ee7156ffa75d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ga-IE/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ga-IE/firefox-76.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "79ab060d152b810917803cffab7aef198670a98d8d72d9ebde1c3d3dfb6882ba19cc27e6454654d7a164dd712280d257b33e954f628ed7d59c8d3915031c2767"; + sha512 = "7166350fc9c9f1d8b76a6218d06ed2eee380a7e4197451af71d7561c0853896b935a4b5165a0ccec9c25f2022bdd9f5479509e614fb5c48a81706517bf855370"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gd/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/gd/firefox-76.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "4800e3ec3a0a53ef9a2cd605ec93d4609f862afe1f3c2e7bc7d64ebc5b5ca17ead6aa2027a5da7b28648d7e4db2059987872d74225ad765f68a4cc5c45f14a1f"; + sha512 = "2cca60d8c714ca63b3f1275cbf42cd97b58e2b9199f2bfe7f29feddc0cc05258d69c7a6859b95c5932ae7d243dc080b022ebef1259fdecca1eb83610cd54f526"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/gl/firefox-76.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "8fa1cd71b985fbac1f0e4d817a1c3c7c7ccef1a1e8c59fe14593f4ac09a6f6f55919c060adf25f3fee9aec706e5ae07a14ea3d7c945d6820129a712ea237b232"; + sha512 = "4b685b477cdfcc0f15299c5ce98460f1538544451d3c50405bd220255fe1d4ae5ee72770bba6cb4163a64b70d1fce1e52dc273b6454ec57af4190874a84bd800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/gn/firefox-76.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "8eb3a9b75d70ef358559414b39853177fc65bc7d7756f446ce65a5c9c94ece92d59f76d74c17dbdf877ffd977aa41cc2e52b3ab10122908e422566f12a016c6c"; + sha512 = "0e45f091b4865aa1a13d7639590b17dbf6c9388de3be92c1cb798d4ace06d03c3313f715d0d0710087506ca15590057550ea81a38818a3fd1d754a94c78f6da2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/gu-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/gu-IN/firefox-76.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "741004043f30eaf344a1bd6ad36f7de64d935f7b056dd9daa516df64dff3632dae02d300afc27ff1c0cdcc5208e64dadec64b1df8139098efdc05f7d95a066d2"; + sha512 = "0b5b6e108c80ccf9bc14840feb1f48c3af91e251d82600ba518b7305422b33dedece2e6f0a95be243f50652604d8634018e3270d53378475604f2f8a2be1383d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/he/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/he/firefox-76.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "b6afd8db87c18cc0b5cb7ba45386555ca45b27baa469272dba66ad4b3fe11db7e5c6c48742691febcbe7963729bf34c778dbb6248c01c1db3a685f38a17d6bfe"; + sha512 = "6e45fa51974f60aa8bf2717ddbcc46fa7fd82015cd4461a75dd6cd43b7cc6910876f0a522ae7ee324ae6e9c83411eeda8da90c7436e62aa003666140ea4a59e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hi-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hi-IN/firefox-76.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "b73988b29f52012ed911bdc97e1978ad8e56e640666879358a1cb79f88c56676e25f578a64b449372522a27abcfd37c44071955e273f4291ccf15fccceedb645"; + sha512 = "a1a945e459ccf761cd68f4219262f143b0140b184842133bb04a4a981660457c799a5b247c6b2bb35982e9574bdee9a0bca8c9a8aa93c940fb2de368790bc766"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hr/firefox-76.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "603ac12312015dc9f9f24d0ae48b50b55d8f109e31566823f387ffc17a1b99fa958d14f6214d7aa8efc4cb71e090901fdca2068e491218cb17acf914e3f8570c"; + sha512 = "37d23b0579f24e2b09b7acf29b1ec7254a62f50595ee6581f253aab58d237147040b007096eddfffe38a3360a14c38a7dbbd946bea57cc0016dce9e0ea309424"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hsb/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hsb/firefox-76.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "a15a1c2a67ab12f2dc506e9138bcfde2740de9dddbcbe825300555b7c72be7b78ef15433eba60a132f8c8537cd1b42f05272eee399dc3f69e8defbe5ac696fa6"; + sha512 = "eac9d8effde7d36e22812fd2ca208e5e4448cb063048fd33411847577705dd5947ea170fbe217cb037fe32444152638b07a9052e769a8cb8136836e0670c5491"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hu/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hu/firefox-76.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "829f16afa6bd4d1909633e3f4cd0134a4d397b32c1b85b1203f54217f23577da0eda8bb207b07a46a7c9c09bccd392f4dd89ade408d2460720ba5667842b9a4d"; + sha512 = "0a59efbece0b22c362e77af37ac4568723c7c88866ee6537f444474915271722c0f9bb46cabd1af468195ef651fb2431659e5fad2a1e7849a1398ecb7e51fa16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/hy-AM/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/hy-AM/firefox-76.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "acca12ef2379c4c833b3cae7510fbc01f71edc3d6a9b6ca39dc560fd892b8ade2aa05eab318a79db5bac0e1d98af6c31599bac029ee7f58195c062d3bbdf3a23"; + sha512 = "a997ed67b1f2d298bfda6913f93e063e9924bd09fd16cab2e7c07ea2d1b1a5d1f4da2e7bb6b48691750402184cfc92f8642bf482e887926babf3f9dd109c65dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ia/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ia/firefox-76.0b1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "c33bf450f946110bf8c72023c1c6079287c944af445f63e4d8154de3fa5be8f6905c9b479d79aa82883aed95741f6d53776b87245e7d0d71af3988f54591f344"; + sha512 = "80b4d48746a4f4edac6eeca9f3ac9aaa961a6fc7a54a30d452575eaaddb5411b0fb798c47a29aa2f7bc0f990e694047623fe02e0049a0f906995605f06ea0c80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/id/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/id/firefox-76.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "f3c9aa62d4a35b43aa60d6d577ac6136d1646e5d577a0a1b7e02781dd33f7579fc5dca0c82c1ed0be226c0b3fb8fd1cbf1eac4d17a8cbde2fefef026e9e4518c"; + sha512 = "1a239030834a5ce36b00cb0253fae6febdc8a1df2d6dc8c6e8e8ebd5fcdd8299731d7414592003ca7f9b714bf1607bbd679622daac45fdd8c769cb50184259cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/is/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/is/firefox-76.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e3fdd7ab88f947359973827320c4b27150c83ddf9c650d4358198d8466c7da92df2e50252a8988ea346c72ae491a6013558795b968ec947ab9215ae285416a40"; + sha512 = "cfa78bbeccde1122e93bb24b5238f85c8839882f4795a9b4fa7ee15e1d7ac457c9ae3595711d883bb10b218e27c620b7cc2fc1e96f599e3698911159bf2887d4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/it/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/it/firefox-76.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "1d02f91f1612e3e94e9c39307fcca3ec90148a46c6289ab4b6509fa6dd5249e1fb3677980adfbd43166c104f265f5059ca732f56a37ca19bbe9937dbc0971113"; + sha512 = "3410512d2c83f076d208e743a1afd6bfaef6e0ef6b670e22f3f0b955b1b38cae5e14a936f47dbd8d5e3f94de9698b784f7265f06d90aa0601f307f4e0ad262b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ja/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ja/firefox-76.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "cdc66861781be3233ba9461aaac720ed2e0f1517b97dd76d002cba7ae5c9ca4f3fa11b69e0f87a284e52c96ca6274ec6386d8392ce47e433c65eecb20a5e9cd6"; + sha512 = "eb86195d5bc686e26c159d5288c161e0510394056f3e4481a50480dce29be43116abbf837e70a1b121d481c9f40a4d235d8f10170cc9b69b40dd6443b2144736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ka/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ka/firefox-76.0b1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "95e2d1276083f356d8c176ef2deee23b933f8dea4056d68e6befa45ed4848d985eecc2cb6024bb51fa9768ef9463b84cb66180fe1ca7da752a5828bd721a7344"; + sha512 = "5e455f82def0b804f368a7215642caa270b35eb9fc478eae4b00601e5d644abcfa5be3fde1aa17199fa8d7e694dd5d4178f26920353a430aa8362c8ceae7494c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kab/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/kab/firefox-76.0b1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "d9d7eca0eac6554d1917c750c9f6b3fd1a0f838e3dece2f1e6e7f3e943051978ddc430fda3b73bed8b21fe3b07a7c509f2fdc61e061e8ab227beb277b7e3388f"; + sha512 = "81d935f8bf20b68324972f45892d0ba913efc23988b1c09b61454f22059bffcff2856795b95328354e783124c98f1f2e03b9cbf03abb90b90302403cbfddeda0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/kk/firefox-76.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a3b7c99fec93983aa18541b3b0ef11e57366f38da522ebb283bffeabc504e21672f4eee2b93e2f364dc6c2656b39fbdd4beb74880b86b6bfd88a09f6764b2c8e"; + sha512 = "02e89c01d0fe2b610a51b1a209f97bb556fa2e0ae218d4d1f9966e6e6135b7a59ab7fac5c67b3f01bf9800980e8870b1dfd6a107c6d5026a160f6aa28cbc9183"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/km/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/km/firefox-76.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "f5c35db5f9b64656b4cec5361587371374bf7577e7d5aabe329d34e9f02d4b4c27508ef8fe7743c8453c61e3534cd5b85178460778174eb7e19ad15260f9d682"; + sha512 = "75068ad7278d51b4a44f8977495cc441945c284ec3a96055deaec0951eb0bc38dd65eb11759c338d5bc37f154a8bda4abc7c47a6f9da68398e51db42ecf90cb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/kn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/kn/firefox-76.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c94cae5a2bd8797bba6cdb689d885f106a94b34c06ceaec11798a1a3bbc36a64ebac4d2bfe978e92ddf5cd4c9aa23a4924def8e6b54c457ad54b25d4768b3b3a"; + sha512 = "d7739796d00440929a3923535d53cb3dab05208fb4645dfb0de5d96991400a9f7de226e2f81a7ff2e67a5c0ae52ba21f67127da4d11f554ec7032c94f227b3a6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ko/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ko/firefox-76.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2ca35e7e02b4ac0188be48666636bc9adda6a3e98f0725c65ee8e5ac941837f056479697fbcbbd1f9f8f87d7f48f52fd8aefbfe3db5ba472cb38f9e33162c96c"; + sha512 = "67751bba7a96a7974dbcd1e7946d9851c1d0b8de15a85e4e14f7a497ee67c3ee9752bc44f8dccb362b61f2966076c0bd6ac1238921552b4bc8e6f859e3917f09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lij/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/lij/firefox-76.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "6d1584249c1ba837d6be87f2bf57a52c4cc0dcacc3de82b26e57a55171db872de809773ee42a74017552b38718e5cd2fd9a57332730b303c379ea62b4047486c"; + sha512 = "4bfdf475896095169d9c7fcfb4e353ff5e4df36d4c99e7acddcd78114335ee04f07026e81f5ecef2983caad0bcab960954543dcf826c0285eb0e2f03a52c0b8c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lt/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/lt/firefox-76.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "ceca1e4224cec7c4bb9eedcf5c5e563ec7592add530aef1d701d06023359ce519a3e4c885cf3e691aec7fb732705f8a8f9ef919495a6a55a4eb1324956a6dd7c"; + sha512 = "3d519425c081124d38f42bbc127a9331fb12d3d9a984120e39d07384f10be83eb1431dc44da6fd83b992e746b1000e031e843735c8c488b7596ca5fde0c409e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/lv/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/lv/firefox-76.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "005ef32f152e7eb8021ee3872105c9915a647440a5302a951abb7a1967210719b38923c3355150c7dc76f2ce52dc508ac6defcf1d6f7ee834ed59b8ffa166122"; + sha512 = "ec59ced3bc195f4047531715aaddfeb21a63a4c65d803066b3719613600f52a2f3ca2b98d7f7b4f80b9c2321f251a02e8a7cf4d513040109498a0b67b4d7024a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/mk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/mk/firefox-76.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "98c87f7d897b9857955ca24f3bae177e9329010fd22445da16f71897e88f74cf641410c0cb77573bb74a51dc54943fe06082f6963b0594e1c1caf727a573961a"; + sha512 = "608be1efb1adb91760031780ada28678332c21e08486241704c0f20cf83486692665f616803d4a2ebf67816d9c0006e05f30100dfb41ffcae0375f278a854304"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/mr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/mr/firefox-76.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "fdb22c0feec80297fe3339a9f08756e419b3439df2ed23c91d26eb6d870f55501785a11fb3eb98113df031aeb3d4f0462a790f16740862054fe90fc35878a8ab"; + sha512 = "300250e0234c3151b3f11c568e48e480573908904e7f661fb12a0e9c625006c2f51b1f6c3963214a1c7a54c0739590d288b9ee6d6255661c9743f25b6148f930"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ms/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ms/firefox-76.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "e6c5ada949b9950b218d189904ba050e476f6f9705b1b125ac5df974c25031d804e1fb1852d3d2bec1e87900b4757e5a62a793d97fc597fa3ff136939f9e733d"; + sha512 = "bb7e67264b804f9fbb2f3ef18234b93ef47f3f79cc3dad6a871a82bcf339edba9ffb380e6d440e71eb04b8402a4f4765ea3aeaf88f3140d37a1d8c58793beb64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/my/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/my/firefox-76.0b1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "0666911bab682f27bc89b33ce186cb229ededa1637d7ffa9007c4de2fe74412a89b9774ceb04007052b85093b9752df3844403ce22f07481ad502145a2f34742"; + sha512 = "4b5cb93a7c495f0ef4b4146f2127e0cc0c34e193b63d65b577213e9dbfc493d7bb9be50c16faf35734011fe9a8344483591e706266e72f7541d92e576695896c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nb-NO/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/nb-NO/firefox-76.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "46d4851f65d91e4585c24f7d89f271a18e92611431e2c4a6a5f369c066e7b4dbe07b7816e586668faa2b6d8d8f0eda04616fc48664287d08f7b17e84de26a96b"; + sha512 = "c1b702956d2264dcb76e218ae45f1b23731ecff9dd8f1ab5e6e66787f45f4ce4c22f38c2c75098f47bad5345c2f7312d20e16d4fd963b34de144cc14bfe604ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ne-NP/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ne-NP/firefox-76.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "d2bb3f29f6939e36c66bd9a7e92a9c81784458ff75bcf570c6efbedba3e526a75ee797d9fb836e0d20e78d7bed5a64ed9d640ae71900f64a98c0a928809c40c7"; + sha512 = "69710144c5fbb7cb3b631de69bdd5fd3571a4db24cedc8aec6081590645af73e216ffe23e76fb9defae1942d1b579cc3a8e340c8e8d4bd9ed87c661f3e0fa57e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/nl/firefox-76.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "bc8acde71daf8794956c5014e35eae1fdf557b1b9de7bb955b8f8a457e81d043880b9978e3b14fda504a53efb2768c5745ffef32c89e1bbbde77469429d7f686"; + sha512 = "9e7e854f6a36908355d3b994681641df5ac522e82c154db29daa48e1be728a3c57338cefa6f88a17164275cc16c586a58fd842e9a55f2228fdc2d50e8e78e4e7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/nn-NO/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/nn-NO/firefox-76.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "a5911405c58a400c332b697ade2c7756e416575dceb9b3a6f8ddde8759aa79e54454f53449688d080b7c6859f6595c7cd79b71ee88062158b95a4525b23e1076"; + sha512 = "1fd0d26a513744563506f7ffd2ad180d2ecae603c4de4f6f1ffa7c4140cc9b943149eceec85da8436aef05d6ba984b9b9a8960fa2a013f338f742d78c9c2d18c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/oc/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/oc/firefox-76.0b1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "7b0323fbf64f9a6c693f85972b3c6999314bbf72a3291330e1fa7c9905d1d2a3c5783cd0ed0535363c197cd4a78a2ec7dd0a6c6bd48497a254f53eece2b35633"; + sha512 = "d2459d39ee8fdb524b427e373a86dab5d4470b18acebf0f0fa8624342e5cb57d44de7c654532c034bcab33afb16dcd4a4bb629e4977f8b12fb04a80c183d82a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pa-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/pa-IN/firefox-76.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "20830ece0ef0129dc5ce188f55aa1c699052f12819e40cb4a0d9dd300f9c15a464f0957d060d61fd0db56aaf0081b6c8e587990e7b91989e880feccc8d22eed9"; + sha512 = "b857b144ca6d1a4070d124b8cd409c3bb7d3ff15f8eb9f853e862546b42e2de29189c2861fe87ce532e63cff820113fb7d1ebdf90e4e72bfcbb696dfc84d5ffe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/pl/firefox-76.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3dc0c22bb4fba597fb225b98a1ed112759d9f3f83d5620a05fd7aa20cf2d0cf79802dc1455a346206376bb11ec325da4a043bde87f61226c043a935a7d975d23"; + sha512 = "9ed9c53c0e553ac31c79a7d16aca513f81943bb50a32c99133daf20faed47fac644a2257ed52ba3366379df5fd1e3f952568e9f5c0b6cdeaf7636efb7971c9f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pt-BR/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/pt-BR/firefox-76.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "b97e061bcbb1eb7593676d1b96f4601c130a64cfc1836e0f49fa058d18a6e9d935e02b58f4a65cd227cc3364e79add782d379cf729ae41e7a6544cfcf280a26a"; + sha512 = "08a7111a48ab4d9a8667c9aeaa36bad9fb192258e23ed37d146791e82343a9c9756e7b1d2e678b121e33d7d408558f64031ae6c440a32e0547073dd7983a2de8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/pt-PT/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/pt-PT/firefox-76.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "21f6d41bbef5b12aeab46aba2cc05797d4852dd7effcc00d5346604424dfbb5efcb673567b1933b4d723be80f9fdbcca98eb69cad8059d8e6f716675e2255ede"; + sha512 = "a36f3bbd877059cf10a05bafaafb24304f17b2e4b5f912110415a045347b8ccd409f2fc323cd26c0b9cc2d1bb530b5f5587d1ce45ae3ce87ca033ce93ef129de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/rm/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/rm/firefox-76.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "fb13e69e606e4508a02221a1778a72e24524ba61f1683f5e076b4105e84fba03d8b27f29e2eb6ff3941da688b2ff5288a72af081db875ada83c6ae82149ab91b"; + sha512 = "f80bf3304c183ebdc711b4838af6c7ce854a06795c272c4fefca0cfab80fc91450715e2315801508c05395877f0cb50cf380fda66c4b55ff5f4c5ec9250814ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ro/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ro/firefox-76.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "0d1f1df7d7516f10bc7c3f6144656936feeb7068839db29f97495697235ea9ab50a1587146bb069cc1e025b6a7345ccbba041043ec5b467bc9ce878403d8e7dd"; + sha512 = "d711246248303ba0754b32baaced6d6f789d42c2318a86c1ad62e78a44c20d18bd8371ef256c4b3f554bf19c26fe8ec07e2a05bf62fc9d98622a6ad88f03a179"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ru/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ru/firefox-76.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "be89a374b149f4ae21b544b75146bcdd71a90c0a3be44e4abde75d3b0eae11afb9b7cc6447e33019aad216f0ff1ae46e80b612aaa0b8f27590d75ef9454098df"; + sha512 = "54920b27983222bb44242abca0e06c0f9d7533e3503bbab80d5dc98de10f2f37e3f5136bffa26281f8aa8bdd02724cf07d23997c224cd42d53109333fee141ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/si/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/si/firefox-76.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "12693ba3b6fea7b54d8f128e37b0529f22b45e975c6a0b890a7fcad37db7679a85b0a79adeeb3a15737b6f5135d98e87506b51751a77e054553f67285a2ddcfe"; + sha512 = "68ae5f192ce6fc53a94ec39ae52b51ac021c55f09b04f59b46f37069cbe258d9527920d2bfff59ee8973fb3af96549d78e6c4abd4bece7f8038588eeb2317c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sk/firefox-76.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "94294db92a4053c209b7350d5979c3310e683da4292d4bbcf2eaf0e1729a15cc12773dfed0dd9a3e097807a3c889388fc95f28781ffa924e9128625a7fb888dc"; + sha512 = "b2ee9384089d2b7072a3d5b213e22881d5726e06b3623d8ed3503b43c42581f091ccdceeb3dd8d9ea00839c0e44de8f652571251dcf10a21fc0530a1a811ab7e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sl/firefox-76.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "70d556713742972870b6cbe5805a5a9b55360ee501ce8162164abd809be3ddd0f4220b7f151aa5bfa5d67cb2307ddd3ec0d353c1a40d94692381ca5023b5a8e3"; + sha512 = "a3c781959dae6e3b3c2508e60cc1a807bc5de02529a20448acfe95ea8033130b570e61f88183d61fb55ec04d3d217d0974c078df57beb372fd036c9589fe4796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/son/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/son/firefox-76.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "886b2fdd7cd5ea376cf17ffd07f5ba3521fce40265a6e45fe9b586c6e57519648cd8cab57e0004288318de706a075ec5bd89b13bae3e34eaa3fc6861c9620a70"; + sha512 = "8fa2d12f1d033e2e6d3364e6eb4953ce6353ced7db621c8b5474dbfd192dd797e1497b5c98e407c2b3c5cc13fa823fde949390547fa613556f74c240d8dbb94d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sq/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sq/firefox-76.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6a4f4b87286df05d4c5ee9f2810e7aa5d77fead041061223a21d51dd4705cef15bdc2060ed85ee1e2a4c54555698df6ab8880554b1a476d5d27947d95a13a31c"; + sha512 = "9a1b4984436e97d5f86ab2f391cf50efa465de58fadbf5d5cbd15a3cb6ed9c020d909e3d6ce7dfd4307286b88d68edb9a9184395b50fa67c06d9c0a7502c9cae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sr/firefox-76.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ba5bdc0c0de9a1f773497fdd50a84eb4314ab6caeed3514e7ce63acea8ca1ffd7d9544ff4d3a12142dcedd19d0ec933ecf5ec522a3bd2943064fa39e0f84da34"; + sha512 = "4924e0c95884aa8fb1cdca9741a20cd9680db1599e34555c83904920c796c3e0d5beebe98d9a90185b287ddd5b3e46cf0c2d6d001d33b8a0adcc3edaa0e1da14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/sv-SE/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/sv-SE/firefox-76.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "30e581b784a7290f4a4238839afcf76948987cc1fe8f073a264d65c3adca97b243e1ae335e0104044f0e768ffaf0d9c3553f95ef4b7d53c5d06b656e23e5fae5"; + sha512 = "b59829037189d0521dbd9027c6095a185007d56296ebf078ca979a26ec630e3ddfa899b2f42c62f7fc6f03ffc5324d7dad4e911d692bd3220dbcfda54930acce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ta/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ta/firefox-76.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "31c2f580cd9ad62413161b437fefd13ab793d94ed2532537c1ceac939ec57d84c82cff07d300a743dd6c7be08db7010320b78a9a70f96c0363add4a059f9a053"; + sha512 = "bed1f93d7d06514543582c8a153f9264f5463c506f3bec71a417124b2de11ebedaddb97a67ec32e25689dd7c408f4be97b7670bfafddbeedfe8eb54cde5a4e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/te/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/te/firefox-76.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "52bd53f013d149df4ddf4026419293c7cf16f72eeebbe7db2167688e149ae8e4bba724ace2a56c93a6177908581bac163eb4db6d5f9a2ffa48f2665e2a80e35c"; + sha512 = "cc46a8a8a9829c5d745a5a6e48649c9a0f9febc179b7e162f13182d991087b7a1b5ecb181f15722fee242adaef4b6c0b6404026138004832981170262a9fb04f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/th/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/th/firefox-76.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f81c421dcedf9755836e8554bddac1394b94185f22b83b3628622023b325e7dcbbc8e008d082d6478546dc1a1f6bf7181fbd41f1d746986dbf8b273639e95fc1"; + sha512 = "d7f2257d83fec3d8c6034001131bec8810b495270fbf7bd583d4b542743d4e573195cd7a7c20beeda17707bb2bd419c040e451e2437e57ade3c356a2c353b993"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/tl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/tl/firefox-76.0b1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "6a29bbb380253caec23fc7493ef52bcac4688979292803c4063d6d318870346eb917d8f57b17279ab45171cf1554d7314e5f4f84bd94ff466b504db9e1461be4"; + sha512 = "674c4f2b8d4e3c48523fa915f4bff80f751c9a282b4e6068f4687ffedeb1c44216336d826725d2d613d9653c3162fe70c51c66b7ba11872173e49640712b2ee6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/tr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/tr/firefox-76.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "346c02d8dd9e6330e83c9984d757d23ec8648172803f808cc096af6e8e7ca768b1bba36a8c35689644bcbc02e63b118d738471270180101eec8e00d7cbfced49"; + sha512 = "f906d0d197dfd368d25a27917e246b9bce1d2cba3bb0843ac5960df3a2af0b8132aa7896fc6be5b2278d8079447a2eff1811232c5cf14a9a07a7d533873f9759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/trs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/trs/firefox-76.0b1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "c3201998646d7bf8b1449571597cd0fe2911a4bd74c265afb21b706161a5667bb5556d8e1be4dbfefa29e753bc6544adc26e966dfcb79acc38485e6c618bf282"; + sha512 = "e5407ddfab522d96a5c77de896d2f0b5370fe495e4d3de9f0c120f6fbd9adf0a93e93ebd298ea721ab958bfb94aa3686f17a831a753da80f4648ed002d316ef4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/uk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/uk/firefox-76.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "24b01dbd82c4cef9ffd8b88db4415eaf1bb9d83c7bd307663636bb372a1525789354ab15021b591e7aa697db511c71d078cf3fccf89024f13b19099925e9ed54"; + sha512 = "4770960c79341cfa6438615f8706bfecc1edd4352eee42df7b359cb00af223a99914a1efca56503e15adbcc8df829673c7d356f01e7dd36d123e0468f51e4c6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/ur/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/ur/firefox-76.0b1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "720d058c4e4d2cf4a08460ac4ed4616bf492704c8db10d28faa3117d6d3662a3325155f99414a7d61421eeee96be4d36ab11304e029751eed423fae3487cd2b7"; + sha512 = "43d54d50f3140e01325ab99f7ea8caa2715e7b91ef1168418ce17ce4b6d81b628f0b42ec1a2c403eccdc1b0828be61561592c28aca874db3f16fd86e70aaf31c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/uz/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/uz/firefox-76.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "59554a7a87b11e679487ecf9bd0ff6001f86bf14a0f73768b1984ca36cc2ee4774e99dacecc238d633556bb04816451ad82cb5ed2d26b2b811bddecee01e53eb"; + sha512 = "9b24cef39ee28abacd4b8b26296221ec4a42998be4a4f378879f3dbce51f974c7d1cc855d51382381830e8db6dc173dd60711716a63e8ac28ec6a9a5ec95ce86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/vi/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/vi/firefox-76.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "030c10b2314545644b402d6b5b011c7b782c06be1f7460782f02e2071230cd9adb018558db7f98f8c2c64e7e7a6d835b38a14bb7080f1dbd160cbd113348b1f7"; + sha512 = "31bc2ed67edc0b64f31bfad87a5c007648a55570ab602b726872ed534f58629d1ddf71a9dbcb4b7e49612f96bce34295dba7593630739c0d795ea2d3ae179296"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/xh/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/xh/firefox-76.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "25bfbc493a66ecedbf1a625d96e3c98dd6c1d835823c2f2afede41329a1dadd146459e6b44d49a4f966d9eccec1e2e1d8046f00573ffa4ba8cb43c8a0802e18a"; + sha512 = "d15afc1e2d159b4941f6ecdb4ac9c729191b06389480ad0aa29bcebaabf5d62ba06b05c4e5010d771375f74b38822863f3e27b0eb2194495f2c7457e3a3f84c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/zh-CN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/zh-CN/firefox-76.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "dea1bde6eaa34ce31d7775c3f86bdedf442bb67623a890549a470386e93e93bdcf7f50a7006a1230ea3880b0031a2ea7590b94862f1a098cebfb7664f9aa6380"; + sha512 = "47d4539a71b131e4c4898a6538cad895a475f91e51a82426ed04355fe6f5c380660b23f1a0db13ebce146a333b775105307bfb0a1e54787d61503293d2d409d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0b2/linux-i686/zh-TW/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b1/linux-i686/zh-TW/firefox-76.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "22224a9a06c8b528d0847e10a95003d19fbc7cdadddc605e1188da7de845d38f511319e73de6201b7daf9b2b3b59a2eb12a6ced03cafcc1bbcd86e51422a2497"; + sha512 = "0d5f2ef5f4315f3d1b4d1f67c10f97cdb5551c09a14e93ebd1dcdf834cfc70ae147cfe0f3bbe57e5f7f92b7cd62a6246d8c8509c0429563e90f9006aa9b762a3"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index c9dbe6ba4b9..71940c1b33a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -199,10 +199,10 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { description = "Mozilla Firefox, free web browser (binary package)"; - homepage = http://www.mozilla.org/firefox/; + homepage = "http://www.mozilla.org/firefox/"; license = { free = false; - url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; + url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; platforms = builtins.attrNames mozillaPlatforms; maintainers = with maintainers; [ taku0 ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index e84a48660c6..5adac4bbb9a 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "75.0b2"; + version = "76.0b1"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ach/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ach/firefox-76.0b1.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "73f8521550149a0c62c841b23289371f945a94aafdab6752b6b4838594147c68dee1352608fdca2682251db3fed691ddf606e0a7874e2a35c905c30a2dedf4a3"; + sha512 = "18894233ff9bb8623a9b8c0fe143759958dd2c054f9ecbc78a43e10692a90f26e43f5692443847a689c925756ef21d23685c72a7ca99bef3ea22e654cafc9deb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/af/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/af/firefox-76.0b1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e6933f3de32fa91f4835553bb8aa48ad20ea45288087bda59920d6edb616809d12cbf9966c722040d0473a35f5a4aa0a7c17fe38d8a0c2eef5fbc5d7451ec709"; + sha512 = "ede9f3fcf92dfe7ffac6a80d27f25b6792f1817aa91fe82ab8fd5f0ab0cce8d8817460230a680d32ffb740f2f2fd93a1b0acea376263b80b52a6ea584c48a674"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/an/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/an/firefox-76.0b1.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "186edc252065ea668412630d7ae37a6cc465d41104578886c6f01bd90d8a605afe6e023cb9d566d53b43d9fe411fc56a4322e2140983279521e1f73fdd2c251e"; + sha512 = "b048747cbd4275d9133b55de1a90f8182f3847fc3a536fb4f24ea8e1c5af8f79af8c02762c9d85649131ccf65916aa5b76f5b65dba296cbe9c5fdc82da15655c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ar/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ar/firefox-76.0b1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "cc5c4cad6ffd695590264ef222fae56004c3b626c8e36cdb3b118daf62e84c912f112df7bc8471cb9c549f385cc878c12ed06b1ecbca164f12f26cda3213e7d7"; + sha512 = "4156da408ba6fbeda08fba6ee066aac9f4ef62d24e409c05e805c8c10e1d513462f6640f04fc6a0aa5219d5754b23aa1f01935e8859f00e9e7bf4a1f3172330a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ast/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ast/firefox-76.0b1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "62ef8d3ff486543b45751f4aa43a3b009ebc9c909d1e0904622c212fd534bba14014ec8389ef5d21815fc3d5909757c7289a814f3a836d94188819b94ebe2640"; + sha512 = "15679e79a1bd9c3d5f8d430ea439586c4c176f63c809f2f77f9eeedb91dd64313170d828734d6ab34de2ca2265e79236c44483ee954b4e26b8fd035e534eb74a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/az/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/az/firefox-76.0b1.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "c2161b2f4a3decc15ac5e780126b94a805d521bf8999379643f4ff8f9c1630fb07094528e37f2aea8c8789925acee7c77d0c6a179d4428b984ab329a973a5a0f"; + sha512 = "2600940b1d499c2298f1b5cc2e129dbbc076c2904cbec45c0d9153a26d288aff2065f9e59e4e31ffcb78443df257e0426feb2480a27168d5337818d1ed287358"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/be/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/be/firefox-76.0b1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "9e49307c8bb04dbc83532414a5f09ce8cb202fcd68e145d2ef132a20ee47988d459ef1851ea610ddd527f335bb68a7f1fa04041914097fd65f6fd03ea6499ebb"; + sha512 = "5681d42533a313403c44f167b49ec30b4b260f8e1f8773cdb7d3bc92e46276e6a732d8c7358a9ae87dcd2b27e1aae17725360f5d0fd3e779fffd325521e73b2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bg/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/bg/firefox-76.0b1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "ee5fe8387cffa96d449d4dd5a2671558a6f36645b15cdd017ebdbe7316d3e0740f05efb6ca5175ca917a937f4483175c9a20cad2fd956bff5110cd7d641a12c0"; + sha512 = "cf1f5ddf935f2bded1fc04c561ee46e8b19ef673870977843ddec52970d09daf4b4e41c9e3433eeb0bf32fa611cc1037d9e6f1b9fa9d8f81985d05735fe3480b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/bn/firefox-76.0b1.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "4409a8d09e837a95fbfaaa5c8476fe25d50926c11be2927c0415b8a7e71f18ddc392a90ffcd5c142ce4c5847ad493f3a51680e802eb2f709aa8148375c9ccd30"; + sha512 = "fb7ca5932a9471eb6636bc93d72749101a8e3d1ec7d59bed0b3e48c01af7fc5465217ef9fe1228b114bc3e4eea05b2479c847b823094345e62791b2e6d913eb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/br/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/br/firefox-76.0b1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "cf71b0554eb8058e3f2457518d473b7170f9fa654c2f5033db830f633e7cb8ee16f08f651c245f4146f85b537b30f3adf235786d66c625cca61438ed502d7ccd"; + sha512 = "55e44c44a5a0301f7105f591d0b88eacf0b9821c1f33ef234e934cfb6fb409d540f7ba5305742b6db6426e8e0b7e71216a0c2cfc7b34f9f993828bf6ceea5916"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/bs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/bs/firefox-76.0b1.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "743b0b485eaab640a54c6777c8849356b847d7fb4ccb56318007dbb01480410fbc119e7721393afbe2886af59d51b9aeefeaf495e670562dd16a350e803fec74"; + sha512 = "f62f178fa07f5bc24f71a9b862f5cb0b074edc7b7f56bd57aeedcdb58d30a816a889a3f889efa53ffac6344345eabd78dea268390240d87366e8cec4396aceb3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ca-valencia/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ca-valencia/firefox-76.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "547c80bf05a23023ede2d7268e0c023756e196c3a18f81ef084cac330ee0c7bb69021f33ff926162a2ca7afd2c0b4ff08107a4e18560382810b5d7110cef02ee"; + sha512 = "ea6c077f21afa270b1da0608eef075fea5cec7f040d7785c862be60738db42c32347a053549c1c22dbe224cd9750a606ada15e5d89d06effae40055b4179edcd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ca/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ca/firefox-76.0b1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "86648dfaa650d18bd934efd57c5de495c963728f45e375b6e6f4c71caa163fadbec2b5064ce370e981bd668445314fff64374e15a17d2c8c337cb1f088edc486"; + sha512 = "8cce2b63308a0f7c2e90dacbbc3b7bd7cba78ec50e39c8515572e40a090c63bebd26acdcd3eec9bebc687edfd4b56d42dbb3d6f043e27931e230200b76fce9c1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cak/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/cak/firefox-76.0b1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "023afccafe29bb6f70657cb0c1b9e285a661127599f0b4e350f814370b4afd17a82157e836ccc394e8bb6b535a7e7341981f006363c03a46a723e4cb480c180a"; + sha512 = "051a36aae99038b7ee456872e935cc68857587408960defcc77d4638432b5c7f62407f7a626fff11d419ec9e2f68e8372e10944a466b07f9634ad5a14c9297ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/cs/firefox-76.0b1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "7d14b78faf8151ee01e8899a85fa8f9851c6958f4c3d7a99f7cd934fed8b704c40d2dfe53e24ac5b7a44bf67da2131eb7cd8161c315d4e0cf9bd7cdb1bc75446"; + sha512 = "ecb599f6b25f01701aa2ba20a955a174fa34dc666f82bea32061c34007b042a620fd892b4171dff06259eb69e6c27f96bcad4c8435f7894d0a3e67167c219ec0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/cy/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/cy/firefox-76.0b1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "5fec2412e904bc231c4203aeb40f3f7a6386c56476f83e80e94c2395c20f09436b6d2195c42861130606d101639eeb2fa2f710d5f5e23422cf39befcf46c840e"; + sha512 = "7d35edcc268eeebbc8fbdc1525ff7b918656a88fa04f748b2932c0c99cd867d85a782aadf89314e584eccc7b3bcaba8ed63881fd4f06fffc053167271ebf0d7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/da/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/da/firefox-76.0b1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b78ba1e8748775d3655305b3cb925e13423cc11e4429c806902b029a195105cc1ec83c57245c97ee046149f94488c8b09bcc043a0220cba87809a98f20d34e42"; + sha512 = "f6cf8c1504148c59d50203b807afb1445d40b53739c4574be7229e9c8c219907a8742e01764b2ab4340fd7720bffed3f160e367178ea16f8a24c603cb3f304dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/de/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/de/firefox-76.0b1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "e5afe83d665cae93e9c25827a9079953a55dc1523027bfa8e2e8ecd0b347465f48e190233e3c7e08dcd647211a5063172bf05d55efb567a4f29c5123485bc2c1"; + sha512 = "afd40e7e26375fd4ae4a51652db5e5862c8ec2aaa319065bd057804cf50dcbc322389fe2b3a318fb02cac42f14d7b867d3f68cc6883a325fb721fcb0fe86036e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/dsb/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/dsb/firefox-76.0b1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "f9455b9cfc3b65b18960d870db977fa57ae03801fd42c6313aa114851897a14f1a64c02351a95f5a841476c41b55a39f6fc47bb5173e21b2a7da0f6536d73582"; + sha512 = "988df89ffc2f53635df25bc6c10771a470bb01c45f67929bac995d961ce5646c501c002a19ff32d4895fba9f00206d87226774e480f86ac05cb9dc631cf5734e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/el/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/el/firefox-76.0b1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d697998bcc27f468bce353b6f8a4bb0c01f0cbdbeda5a0ffa92054b590eb8f2255654740db2e31fc95513c7a6a4de703772ed35122e7c4e3e9b21ab3cd9e7626"; + sha512 = "8d91949902f3c51c213d7a89382049e2f1d9df55865ee3235676ca4224f486f50752f8f667d424efcb86d8b95449be45f2fa18932a2904a9f58a819556c98243"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-CA/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/en-CA/firefox-76.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "362ce03dfe65b802b153360be1540cd1c760e81bea0d35e2a59af701fec1a489abf30d52b1b1b0f66acafbc91c2bba3bc60bbd1f2a05844b7f53b25696712066"; + sha512 = "05aa730044331e13cac0d35e62383f4e46aab2d35f781f427460bab0320c12ba7c918d0f2f6d17f37d2be11a48b22653aca1bbe2a6387a5d21af0cbc97baa574"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-GB/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/en-GB/firefox-76.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "d674575f46fe24fc85af4dea8d0c18b2c1c8a0e92eaac76447a476c5532891d87247f6497663fcce546a85e92076f23fdf3890c8c8e3a902e3cd6a4eab6b84fc"; + sha512 = "663fa89ee1b0ea10c1abfb8b41da519c305152d37cdef631475287439d9f28c83e41471b63e1643b6e1e79bb1ecbe48795ed5de4127e3e9d55d2fbe566b487f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/en-US/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/en-US/firefox-76.0b1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "092e13a53b18c2c09a4c79b2fe15d49468b60509bd6668bf5710f425a0cc0d4f89216e3bc1e252b7781186bd553cf015c53c5bced5aefe2cbe43666fd5337f3e"; + sha512 = "d6d21efdac9d15b4274462280af5bcac357df959486801e2035e7ad3658cddd9794b88b231078e3cd705f5725a20a71b0ec686887a9c1ee0cd044c4bac5caaf7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/eo/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/eo/firefox-76.0b1.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "199ac2eb0253659dc0c862869a72879d1d90d5b2d7d01a68dcc674e0b0b815f04823edea1d9794626e86489120da08585ef10c0852a636f1897df23e363579f6"; + sha512 = "974d3621d2d860b9d7a41073fea92f2052bdb49384cd845ba0fdc76ed4228c836f6ea5b9a4d79bdb7ae71f3735d3f57c0028285b273ce6b1f8db800bbc88f13e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-AR/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/es-AR/firefox-76.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0faeb4ef0fc8033156f922bf25367351e389596ccad6b2b435678bafd563ac0624bae5f5a49183e442ea93f1d76e8ac8e53121c6d8dfbea1f254c84d7d323f46"; + sha512 = "6e37dd0b5c4c8409911d406e966dd5f87397c3d8f17cb4868e368c4d1fa1bc1eb865729d27f75f859bb8e2147aba1a9ad6fe385efbac10da44a5c8c1eec34064"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-CL/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/es-CL/firefox-76.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "f0bb330857416097308928d8cafd09c3d1fec559f78ac94e2fd3624381074d511eb8d5e2764feb1f33494f09be6b9fd3cd63e182296a8ddca06b84c673e2b0bb"; + sha512 = "f8fcab0ae6d36f6d2c88ce3dfdbbad100265b1e6706a6b902b040a9a0406fea6b45f0bc1a2b5cd10e1c2c0d04123b3b9c928d0b3f7ea6e0fe4f9fff86b5753c2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-ES/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/es-ES/firefox-76.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "37b149761f68bc8b2326e0c4ec9eed789ee2d04edc0e42219b9faba420835c7b4a7f2cde76a02fc4f7bd452059572fd2b4551fe9d879fa74c34f066689ba2934"; + sha512 = "0cc702dacd2355b5ada0caa24daf2607b30bd7fd6c0d82adb833df67248f8962ceb6ac585ba9339b52683f2bf2575dd5f5b03a4217ede120771514d1a5028184"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/es-MX/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/es-MX/firefox-76.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "80ffc2ab7314fc8a435aef01926f159166f4bd7d88fe1b44061abb80feb606115ba976cd321a2ba1384f2152499a59481e9ac622f1ab57d096eaa05b73f92869"; + sha512 = "2dde4ca37ffbd306ece615960289a78b4c68f15115e88420efa22822707dd3f0f9600a1e0044b1547fc6df6140895bdbd7d208e3b4de73be38d602c561aadcd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/et/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/et/firefox-76.0b1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "87f00de95bf58fd3bcf54569843973eaa8a435d7a4d861346f7bd08ffa475bac7c43a2ab178b1907b9614cc6fbbf7af611163fb5c13e685f7c748e3451d01110"; + sha512 = "85be77e74b2e796a3fcfc378ded52358d4348e646c114f6bffcccf15a5b59600ca2c024ac90901d384fd57a26355be4e82ac8cb42c2d7f15b7fb5f23dd94cbcc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/eu/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/eu/firefox-76.0b1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "551e2df324eaa2741619c3f2fa3a6b3d90e3f85d1b410ceeb372541bddf2b049aaeb165cd33f4b20a7164cd7fa5e8d201860f429e35adb071eac22e9ff87f4e7"; + sha512 = "12bf6c4877667c65e1d7f23e7e6fc4f03f09ed51c51ea4fa78b0ce40e7b8d62053dcfbbfb2bf08a8486e9f36b4aa56119083fc2ba62f90ee6310357ac3d4428c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fa/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/fa/firefox-76.0b1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "15f7a4b78ed89634d7ce99c0ea68c8bd1251c8c88f6d789f8bbd0f3b37c5d5f651b973478679c05d29c1b04ec0c6b6f230363f444406f451d9422fbda7770df0"; + sha512 = "becabc14537ddf9e71614bdcad2215109d38401ec66c0827b16216cf114fddf53112fc961dc525cbaecf570d19b1c815057929e51506769f71b75454ec2870de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ff/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ff/firefox-76.0b1.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4c01c5163f14c531e9eb864b7deda329ea9914ea023cb7efb64cf4f56d48fd13d08dd4057207c4543a6b60bc23037d9c343ac36901d6819c422cfc14ea75b38a"; + sha512 = "123a43f2700be827686cf88a792ad3c849199c56313f1e87c46c7a39dda9d9c5c730adf758eb39a244da42f136e7b06bdff513742aab9f6593b6bbc5995cc8ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fi/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/fi/firefox-76.0b1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a5c1063a00ae0f9dde7e51556aa42846230a5c802c94c84c06d4bd91cbe767363c40962b8e9d940f1e99141e73267fdaf8b35c85122b3fceecaf57a939507273"; + sha512 = "e658d443013837d2b33e8833d699113a43533b4e45409a53cf91629e12156335c5fcd2aee926f8fe03b94b4ed0767693272492531c4b348f5b9d08c3924b9a4f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/fr/firefox-76.0b1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "42015fa91befd39501ede0fc44ba98835703bf939e7dc4de9ca6c26390350c0e1196ace4eebd4f8d9e162c8f515249eb61a56ed370cf7279831a75c6abca570a"; + sha512 = "8d57fde37423bb469b7075725aa4f8481d212318340234856a2168ccb7f49b20cf236193caf760046a50d418da2be69a4fbc859a9b726f8b732007f8bce6998f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/fy-NL/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/fy-NL/firefox-76.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "c775dbaf216863c0dfc91bb1d26cd9ba9908684d981b7c9ac416fb0fe5f1dde7c64ebf13b8864bdb4c56e7051c3e33e677e757c225876a6e1f88955ebe01cc05"; + sha512 = "32a4e7afadaec3b210dee498b0b7189c02c9307de5c52eb2deb09787cdaae1c95dc83f6aed8bc0ff843cf670bea5924513748ff24bc44313d4b32f749281b363"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ga-IE/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ga-IE/firefox-76.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "958277939ca65eaae828ed5e9a0f76b612be6f803176ddf0cceb13d1e60baa35a051ff95ecf344c1ca2d5cb6474dcc446c272053141d49b8f4604dbd70df8793"; + sha512 = "e1477bd3ed20431c036c3e9d65eea4660be028d3deb0d3f6ea7fecae0e8987daf8b9403260382bcfeb7fc2eb0928387bf8fffd3fa5aeb86da946369895c70c8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gd/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/gd/firefox-76.0b1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "db79dc9ab736973d08e6e180a4b7b10e903c7627eb0e0222c044d4b3f4d4d3edbb9f2f73d0e6f19d304e4fa75208db6395c0fad28d1e3875386036bb30086c41"; + sha512 = "7fe8f5e41679c1c21ede2d9cbc6274c068e76a5586dd0723b957801626f58a7a3279d8f8c750645f1028b15f880660e90a9e453ffcd531582d1a8372e3195662"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/gl/firefox-76.0b1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "212a697f1289dcf582201a2f0be56b739a71d2ddc0157c65b567c7dbcf6f51922ab2d0743dd979134b1127661addde43612d18f6a4b88b530578fdfccaee4063"; + sha512 = "01aa3a369fee3b3d5d1eef380c7de07546649ddd08343e2c23d16d1feb071d42c7dd38a3bc7e5d9ad7091d46165ae537ed48c66d0fc59554653638bbca975177"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/gn/firefox-76.0b1.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "713022f28bac680227d1bd5e2bedd36aff2950c0c2e498ef1205a02d6b3ec0bb7dfd754d18a43e7b141b535ddfb71b1ca711b1b4dd955c66ff469f43db71a8ff"; + sha512 = "871315ffdf8418bf065f51aa0ffea0eee3a246344f33cfa93069233470707824d3ec66b31d50cc251cf82dc149f9e2caa3b84a1fb3f6298ec98e8f9e8ed39c60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/gu-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/gu-IN/firefox-76.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "f0c80568e5050cb4758f8269b951f622441799e0d8ae70d1e3cc1c3a7af0972f6323ade7844f3b3002f8a701a2a1b29af320ee95e72a349ba9d9903cc4aee012"; + sha512 = "663cce89b88ed0c35836aec4b591d0e945a865c2ff3d40b28297fae550f762e25e69df74ff3906475d708a7301f428b183c964e0fbe602126f4391f22e5c1824"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/he/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/he/firefox-76.0b1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "5a5746afb795c4708559218d3de66042f220f6357d634e20c001d45a3b86df99fc6b277875837ad13138bf86f2d9577c27fc5573817c31e434de41d5f13a6dbc"; + sha512 = "007b4163cddcbf8e4379961ea7ffd52ded3a942acf2e2d8803086b24785f0c5f750f3f743f2f9f93efc505f95e378350369f2302f62352f1b2db90b8b0f5f83e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hi-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hi-IN/firefox-76.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "b03942c6d93f3baaf0944ebeb27aea39fa331806375135f91e9c8e45ad1ef62c9468d05d4c776f2c4766c0db31183fd23fa16a18f860ebd75dc0b79ff2abdf0d"; + sha512 = "85d5d996203cfb6e4b32de456fe8865181dca287898934e1a8c7d23f2f0ec0707eaba364c32762a2ccc80592e4096dd5cb99d1ed2be4a17b4aa6ca16f0be0c6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hr/firefox-76.0b1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "c090bb4ed245ed043218fb202f00e227bdf8a5425f78a9a311b1684df0d1987c1f54904f89a46a8408c28726e06798da5755ca83c0b7383561f9035ed4b8c105"; + sha512 = "974911c30b0103c206b3dc0e42b90c9c3946508d89014126e0ae729098bce54a79461386390f2d487b2d1d2d3c523754c60a517249c1cb12c874d792a6deec44"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hsb/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hsb/firefox-76.0b1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "71155f0231fcaa744be1828967a1194b5ecfcd30b2ead3fa0294be46ee7ed3476636304862c3fd222359ac8fadfb5279882bd2f7965eadf39641cb611c12d6cc"; + sha512 = "48568494ee7ce4662ddba6ba6f0ef03e802ef71de7b7082537ab74558fa96974c05c4f7c0eb0bb9d98702b68a8e14e0ca2441c1b508180d69404a799457c3b32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hu/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hu/firefox-76.0b1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "f35a883d82dca691e4537fd9860d72c8f68127f4b91a7dc1641342eeb2207700fe31965750e6916e1633728ee022bb9c940fef37d3d973bb4b1f1689779a74cb"; + sha512 = "ce29de70a7d9db3fc1a4e750456b7cb139f13c5828a08b8a9ed0fbe523e11844b95675c355e9690a470fb4140741ca001512cac76df4afa69de0a31852058195"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/hy-AM/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/hy-AM/firefox-76.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "b0c61c67db761c1c6833aebce55c02e17aaa7200150379ef9ba59d94d8a40ba61054863f80d0c6740a1fdab4abcf221b98407c4600507b0a1f363d4356fb1503"; + sha512 = "b9dbd3dd5ec4f9550d8074d19e9ec537547d4b18ff51d344509a495accaab0653339108dd583c6b19092284d39a23b2a3604e08f1e617ab254d61aafe82f0adf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ia/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ia/firefox-76.0b1.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "711ab43445da8d8f72411148fefcaddb346e253b191558ebe9fd363154bf6eb320a7bf5715e9c47bfa154623c2a4a96461aeecd69234155b130672bda1a991ce"; + sha512 = "52cf31376b91998d87216848e0074b08e8fbc8fc56598e4f7d2071a40a334260e2d426836e630da2d7980b63f11cc9fc45263aa882573bb896fcf00903da002c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/id/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/id/firefox-76.0b1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "a622c5f7a0e06eccd3f3a8da31b23837dc78ca1bfd3714c002ad551c6e12de8331e1ae12665395ddd174aaecf3b793f5190b51e34c33934f68636c5e49996a00"; + sha512 = "89d64188803178ec31c7675c874e76e14d56b1c9e929630a8bcfd41915efe1328df765cf9e80f8414b4567a0c581919b89f303dd81ca85ea2c66afe5978d3b68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/is/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/is/firefox-76.0b1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "2ed96a3de14709ce8c03e86b12ae1b77b707bc17bbccb05b0462680f19c0579e458be29c48aa293d6eb841aeece5ae8acd7b38209716c8d3c769297741e283e6"; + sha512 = "78e2bd7cc2b5fd1e2dc93a5df1324c1c255f32bf8c13c59abfbf2e21082061b4dbe611db10f2ee465415b2c43a8ff85597fbe8b25bff3fe48d04ca744e4967bb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/it/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/it/firefox-76.0b1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "302a12bedc6d20a568552da06c5a03cfae9f85d34cf8c6c5be1385025f3214affc23d1392fb237bd6f215ad12fcb0600230e87202ade6b9cc3ae5c13e0878f5d"; + sha512 = "c6035edbfc0338d5a5e21f4c0db1de13b13b1d4d9c66de0c23bca0af0b92788a61da931ca12db4a50ef0b3c0e6ce3ca062e09f2ab2f101cc58c9e617dd1cbc8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ja/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ja/firefox-76.0b1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "76217b47ae6936673906c0d60e15a516a855aed316df646f50a05228c52e63c19da8463c779ad95008ad190139152efd9c94603c2e71d3eaf28128832a70965d"; + sha512 = "66836d65141094adaaeaf08fb2e720f77e65f65d32f1f8f05800d6830198470e205f809997375c02a27d3fa5f8c38d1659b6cd512c3d38922a4e672706860d0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ka/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ka/firefox-76.0b1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "f61d5547e24b91b03c876aeb63764b9d382061aabfc43373cd0bd72be1173296ac0470b78861bec755ed83b0336debee3b63c93fb7b8f2b58cbdb4098b43004b"; + sha512 = "955fc6cbba271ddbbb082da0979843d4ef0397209b7951e1279032bf4ce2f8d56f0f5bf1e8d696b87e36d46630a734a517ca866035d237f0bd0c3a012dc84d81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kab/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/kab/firefox-76.0b1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "79368f5f6a68586927cc8831a1b0ec5af4141e17326f919cda3f526c86fe210dcb80fb598a04441d23559016c99d2e090aebec2ce4fb34e45fdbb686db5a5466"; + sha512 = "0e3897a47143664fee6857314bb5d6540454b4b6eaff6d1a568d3e7bc91e5f8741d5c953737670998268357fc137cbf7365eef713076701bb40903764dbae4f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/kk/firefox-76.0b1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "dc8ccef23f39f21b1d669968f72bbdb63ddad45b869b3ec0ac1a81c0f6b00bf5eb272426e4a44d002b51391bc86ca91b7271d48877824d094455ad059cb9b624"; + sha512 = "d883fd471ae047b9ad71d44d5e2a00095813c3e1a91a57bbf38f2ec39b7a4d04b67fbc9855fece909410b3d7ef0267c10bfa6d66baa12d0ae882c6910b1d4018"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/km/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/km/firefox-76.0b1.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "79ee964f99857f95d86a9d7ed45e52cbb19711a94aba236ab594a0bd98585f82957e113c02dcc0e094a23e5857107df2c8d3a88dbdda8fb9a04095b350155361"; + sha512 = "397634869d2ae50061ea5712f25523a73dd5aa3d3eaa9d2d83d6aeee0596539c7bf180590e75258ed846946c4422fa8c6dd5ca0f0dc359bdaf6a50f70f6a5bac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/kn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/kn/firefox-76.0b1.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "47648e65c7ca94b8208d6465544ecaff521e03b7abe333954edcf62ae24d1f0e886cbf63c637eb8aa6c97d3af1fcda88e8b4dedc037469a7e25eee7ef55fb276"; + sha512 = "dc702753aa322eb98e3fdbd6924359b35231e12fa3b604272bbebb0660b482d614e8d0b17f055276e00b2629e0bcfabaf08965f242948ea09b65d683cb47218d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ko/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ko/firefox-76.0b1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "dff738fabdaadfd325701b5e070e755f8e30c69e954b3a51706d6cf10e8888e55641ed9ac1f1d3434bcbf453bc86b9e4755cb596fba2c6928aa1e10dcdbecea9"; + sha512 = "29f5c060f78835852b10ed9db226f64e3de94bc22e0e2e9b129a17a59a58ac8c26ead1ce7115d18eeefbb8a6863eb5fe094ac1f90760fb9a86612d6ef854f308"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lij/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/lij/firefox-76.0b1.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "64a5d2546d0c10e9007c947b7ebada5f779ea5447c371014cd06edc4d6ee4e2511b8d3b5b39c8498f879734e7dc65f375bf32cde445a0331cf81465d61c90df8"; + sha512 = "618125e5072faa00efbb57de0a76d8cfef08260958e7a27e036b83d19730779f54a3dce6da1b5f8706dcf7925ecfd76dfffb31b20600ffa3608e9bf596fbbf51"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lt/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/lt/firefox-76.0b1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "0ecc945a159d80dd86a8b66061b9278a92a4b8f6f41dcd6f260202f1b57a8c0f582e7f92fbca675de8227893ed5f86a29a7dd79bbf95264dfbb2592fb499ca9a"; + sha512 = "7367024abe5c48f370b2be00786f366d2c3121d6000adb938967a5e2643799604938a494dca1fb22bf5ba43ccb2bc1f3dd73b1ac0d9d43bc89c617aecfa2df16"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/lv/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/lv/firefox-76.0b1.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "d0bcb0a69c29be9ebbc103830c0c3aaf264e07c6de0716fbdf38eadaec70d7d2928f64256e66a7e5bf916e6306e3dbc1105be12129e26254f2e5c969d348345d"; + sha512 = "319c3bd17930ba550d54aa5390c0c3a022da2307bbbe6c33477805024a77757bb12efe73dda16145afa6b569f8a9d0cfbbab92d04aba42519f4eb22bda92463c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/mk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/mk/firefox-76.0b1.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "86924cb5f2215b84aa92e20db474ebcbaf9428692f1dadf92af5a84f6eabfdb8ba86f304671f5190b0241ad564b639fb6a3311145f989c9815caac588a5b652a"; + sha512 = "cdcf68e9fe5b39139febc7866c11f17ec40aa85e18759eec5c8d04d3d0ba77446b00900308c913238b50f405d636bad3c8e56469c43e3289e7481c59954a994d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/mr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/mr/firefox-76.0b1.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "c3eda294490d43f5d3565d17da214c8743f21016758c3892958abeded0acfafa01239c3b9921a8ace6d973252952ecd48c968f915ebb58632accd6ff378ccaf9"; + sha512 = "abf95285a27aad3a40cf16a38b2e664f0855da60f1de92b7b2aa33cf5d42ec8b1c902a301be7e8fb1fda489553f58575bd6839f5a5d5573232be452c80b6ec1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ms/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ms/firefox-76.0b1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a05273b907ef572864b90af5a1118feb52d47379c9e642c23be5767c6505b180f7a45575d9853e754d8ca7d0e73cc955980d29cf628b9a5cdf553a385822e9f9"; + sha512 = "489f8d45cd3c1b9c5c890e26e64d954a663e1394ec886a17b81377ed4cf9e951a6d4c6c8b47be01ead23bca261cead473d597f752961cc7c38bbae1daf185f2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/my/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/my/firefox-76.0b1.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "2b566d3ec5ea31599f1ef580cb18c5e1b85a73f6ec186c00e64f11e668da3b7c8eed1f8fafbe4fc8e33ad51859b4b02ef1596af591e9c519bfdc798320d0e013"; + sha512 = "d39ea6cc64b0967b2b52af5f710b1561331b4d1512e380b83ecdabc23fe6d77aaaa16812bd420f2faa0a0700d7eeb61af6e7252d377e1d37f8af529bf3e3be1a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nb-NO/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/nb-NO/firefox-76.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "7608a9470683703efdda2fcc4168bcb4b77ee006fc1a94329de91676b9922d1540770a760dff84ca10b2c5a91e6f8b1adf96d9cf8d9b333427be373d5f4def3b"; + sha512 = "8ff8fddbce1cc246d69588742b5777582323e452babe8c6cefd20e97faf5b5a0522ed0bb1ccb6ae3645b298bcc1a5d59351a517838b38bcb69123d931de69873"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ne-NP/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ne-NP/firefox-76.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "17d488b5a8db722470fa0665f3985f9756a1e5f76a92f3770c4688b96148503697bef4ebee523071b7769ed859bb6cc70b5a4997f7126bf428da5433decd3d17"; + sha512 = "0e206398cdcd0b5aab5379874be3efd25887ed9050ed1e273e0e8a36bbb5168b4d3cdd49e60522f4c414904f6cb63f45d3f77300ae69755d50a48608ee519434"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/nl/firefox-76.0b1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e773852f0f9a9dc60fb2de5b85d33f281aefc6b32d0b6e4036af6d46dce0aabad88f0d772180a14f876c42112c65339a87177d53477f672f83f438ad933b3df7"; + sha512 = "4632a9742bc4090597418aa18ff75e71256f54b9e99a2f0257993b766246b57f6c0d6c7a566796874b7a288ef95726f75e138401485aa9ddc1ace7aba34895c3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/nn-NO/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/nn-NO/firefox-76.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "e0dc703dbd18b1e08fe7e6b6d1d359389497aa4339bedb5bb3916de0c1bac40acbc0ef8bde51cfcd05167c98dd81c9b06e53bde773f4c2a0d51bcc9afd8317e5"; + sha512 = "216237c9fa65d70c1f462d8564180437abf51d562260dd900d7579f4ef3a5d4ddd5237988dedc3339fbe121404d95fcdad4f91788cdd5751c66b117ca175f69a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/oc/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/oc/firefox-76.0b1.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "067eea40605f84011c9cb7cae951c5a4d3ba2952971a613148946f5f83a4dfe19576f6b9acde65dd2d266bf2bf5ab83ef94e4a169ec54a70091e89b6ce7ba8a7"; + sha512 = "18781d9b395bc576108c0be93b74ffe8bdd4d73a4a4c4eca9a34b3024c606b7894ec42862758a9fc9294532fa7307d07b6ee9e86cd406964b12cc98b7cdc3ad4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pa-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/pa-IN/firefox-76.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "edbd11856f14a1c2e4dc430752a9dc78b3f5f6d6587208e936b436aff6e2384c8604e9dfb90f292690f7ab7952b2b6598b04635972640336a17b01a03b7d7c62"; + sha512 = "27be4cca7ef0e8697b6d8866fced16322a34b0e9fcec26d55e552cfe610c5512f5780c50a1c271faa18032474c9e010992b89767074921c6920f3148453add04"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/pl/firefox-76.0b1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "78b9c89b93edec1e3a53697f3212c7084c714147e44437620b966f2a90b8b2c917bc219c3b8cba27b08bc327515e0993a7380b3316d2efb385be7af120e72de1"; + sha512 = "ab40cabd3ccd948888ac0c82151b7f190f222e70c24538dc1f50ed7001a6b1131e83ad75d26ed4226c2410d4bd0ca030b02eab3c7215e91b0cba00b48931ab82"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pt-BR/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/pt-BR/firefox-76.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "3ad8e83f2169ab552cb6e03f60d343762571824cef104f7884352583a5d77caa2a1e8c85c29793e43555dafd8761df684c8d6d11b733ff899d5da2b7d42822b6"; + sha512 = "db44f94197deeb65a7b4ae6d721e37f86100ade8e9528cca84c89e8aa57aa8f2359574aedf8c0b19c72bb72e465bd324f533cefe818ebb54e104018828656ad1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/pt-PT/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/pt-PT/firefox-76.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "83f4200e1de395c37fdc626aa6dfd3ee35597743d5f4d32832c143e917983426a725b0ae3f73090a35abdb96fb2c7aa55fc4595668641ad868e9b596679ed2e4"; + sha512 = "d1fd0eb8a37e78cbd8daaeeb731502f0e75542be2dfa7d6abd77d52105687c77e03c20a6adfb969b0716b80cf0c86ec956ceee352e4140adbacaa8ef89dc8370"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/rm/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/rm/firefox-76.0b1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "5c25da1ff0d73ecb7b77901341350c7f8caea4c8ee2d40740ad6f5ea70a7a83127df8efefeca2ef3b1f3240013540fc4f70208955c62c25e0ad9bc7c56763f92"; + sha512 = "c16d76d1c38ac12c2cb54676fb0873744e97da17e458a8b0e994d8fb15c1f6c0e7057e495b697e62cdc691a60fbf23a1923c4a823177e7002d60875d06a23fac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ro/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ro/firefox-76.0b1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "fd60dbebfec4b2514ca7151fffc9516c94cddf4bfb75e337735e0025746d1d19ca90762c84b97ca15893e81e29a1f62fafb4c970fcf1ea8e191fe74238078537"; + sha512 = "2f92b6658c98f02142ab9839c92daff612e9580e05b00953bf47b757d2da6608a8be57d0c0478ebceb9cf12a4e7f65cad06935b85e8e0948685c06c37bc07b5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ru/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ru/firefox-76.0b1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "db1015936799ed1ba14a4ae81adc5046e9b51b99fdf01d3e88e9925bdacd8367d97662278e2512cb15eadc4fe9fb40a6c4f66bdb6c7492dc6f411afa6e31b430"; + sha512 = "f81ec39c7a53f0e560af42ea7d5e8fdbe1158f7f62269c900b65fa41774f2875d34b19aea3e3348bebf09e95c6300c90a042118003b6eed9f638df3dc72da5cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/si/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/si/firefox-76.0b1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "16b685a3d27a94ea3bf1c35054d2b5c6b718e528598f0a749382470986adceeaa96e194090a4d0a0d3ddd3ae8b70b57f4a31307e81c1dc15dd7e30d4db8ea359"; + sha512 = "d08287a77c9b4f72c44a0821ca11051b82901e9bcda66cca068b2803d886065abef680621c00a7b310388272460ba4d50ecd146f84419251a6b1d5569c988d83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sk/firefox-76.0b1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "60b18d7786cdee2789cab02ad9fb28754ea9cc5325fe780b46f3e0766ef37cf0a7ffeff4ec1c207db3b0e14bfedf2a1598fcd0adb4ba28c63ba6411d2c95c79c"; + sha512 = "234f882c59f434f491a300cb6675c8897f0d97ae9ce1da9d150eeb0a53469658b34404f15fbfcc6968a79179ee41693634f1bfd2618fe2a1142e39f682ebd992"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sl/firefox-76.0b1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "55fa56427b0f6e6667ccc12f6b326111e7b19b88b231d084925d57a7d8c1528b81efb0be1dab5c0a857efdc112189d6d72f86736793264a866dae120ac28acbd"; + sha512 = "2556c3df0f6eea3771c34ecd6bff73a1f155c58ae60a2b3ffb84646716c391d8559769ebd6b450785286a00f49b25ee108207b38c21bea90ac6ad7190f1b9401"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/son/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/son/firefox-76.0b1.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "7a6aa2228a562910e1e1b0f358669d4da66112977373c7bb88e3138bcdcec8cce0c8c7530700b28872f5f38e6ac06a338c6740959b4ff7d75091f2c378c4a905"; + sha512 = "9b77a1cbeb304a1ec08e1d73ebd7f36caa50dc4a9929c922c55cf1246d735a58004171f835ed02771324e318a09f1375ec278b889beba410d94a913b124b051f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sq/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sq/firefox-76.0b1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4a2eaec9124333ee83d461762ba1d8fd12c9c108b1bcb7203e4a6d437e510b26eeec2706f8338f85ce161292758e719798cc20c6b79a0466be22dbdfa0939f88"; + sha512 = "6633eef932635eb91b11ff719d0c8df8ecd04900d2e93b62f1d76b3a488f1e77f78e87dd7e9ad08c5e5d5281bb37b0c3983f5cea7db2bb8171dd49c53afbdeca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sr/firefox-76.0b1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "a6fe13a64012c7383313304da2c8b4dac691416ba50d364fd6a40679353449700e2e320103fb542d8a979509730de2c84728fefd4b1fb2ebb203f7c7fc52b808"; + sha512 = "ebf3221be0d4447ea3989fb69e54ce266f803c102a68a28339c6ccdf46ea6818f5f8df280fbed1bb075ad984f8356a565afe6b00d5f92005d3d42e7162714d63"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/sv-SE/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/sv-SE/firefox-76.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "54568bca3be19e5d9777a2d0cccccd936b2b3b559b238635c89dd392a1c7f72504aa2198413d6954cae18000ded74593147a11abd9000ef10f61071d531b0e28"; + sha512 = "1e535b03dfaa4e7c48e0765b948ac04dba5eed4d697e00ac5d01b41becf16318ceb7b6be9e1fa8f6d882033e33ff3eeaa90a324fcbdabdf8a8f130d185633366"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ta/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ta/firefox-76.0b1.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a6b68224395e3ddba38740d283e1841ce43a28a1f4cbe6810ea71d6b7cd40001dfafe2fb053d212faa5133e2805366575566de2bea3bc8d3acaf7b782c3cdbaf"; + sha512 = "d990de0d6de65e19d6b71bcbf085ead5f5e3eb606cac0ed9b08147dd5c70dc13b5386e93f64efb416172856d903f7aec383c752000fec0e04ef03724e97b7d15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/te/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/te/firefox-76.0b1.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "e20d28c7cd95bbbe5b1680301d94894bf0b8c60aad997515d73f792c7fdf17c3efa4314c210082886bc8957b00a7f919959815e15b994bb616bd7c0ed0d40100"; + sha512 = "f27627f185ba3a37345fd7fa7afc1182afbdff6d90d8315371edcd9e1a7ffa1ab8d565b81035bf5645d72973a91d4b181f3847410939ffdd71a9119337f544de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/th/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/th/firefox-76.0b1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "11564e0ba2770f87549c272faecb746323e19f46d9c6e116ef44a977d571c4ab917d89d1c0cab702074242d36f544fa4a6810bedd2b1088af6d3e23cdd78a924"; + sha512 = "0e082029c8e631a46be009d2adaa64fc01c0eb56a8148b5ac25b8c0f35f3036ce003cc2b4e07869b148200cba1aec225927b7edd933cad8c7fbe6dc0365e3818"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/tl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/tl/firefox-76.0b1.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "072602e5f2973d7412dc8d3e4d0aa4a76aeecd493e2a1444d9348e66ee9dbcff1d8c09f35ba676dbf2f056aa0e843e87c2da6d73c6f3efd38281fea7f60c5d12"; + sha512 = "5d1826b2f5312eb604722d7632d9cef63ac5bb6afa46f58fd4c9d182cb30aeefdfe866c7c70c182ddd28dd7e906cff717737981ec13078b04cb5ecd4096db6ca"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/tr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/tr/firefox-76.0b1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "2b5ca4ee7ff322fbb986cf4946fcb65617606f8f317cdf357a81c2a9beb6492b3167286cce7a18083df5bc99a5782f98953ec79f6ed314d84b734f41c5b76254"; + sha512 = "6a8e3277cf09f00faeccdd252a4778fb28472b3473a3364ef17ac7abb89b5c0889ac9c5a5bbbe08190c0f0f03534a053f6af194bff238fb3ca8809216997c87f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/trs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/trs/firefox-76.0b1.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "10ed6b3cdef78a903ac32bf02dd767a016a33e7d59de0dbc9586d8afaf16ddf8bbceb557909753ca52e1c0fe1b24da5b72c3749bdb7a56986bfe30f49e2f6d9e"; + sha512 = "ea711c8d1cf7f53d3495c8100421aa1dc02d16631c32a5f66772bb38e8169fcbace34a9cefbf4b6af0993cc321bc0facf2803563100d1c28a49dda436873e423"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/uk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/uk/firefox-76.0b1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "2e640904dc0e6735510ec50a2f735f3647fde090f2c4a48b34ae2d123e39ad2b71923e58101a646da86d54865dac69b2c5ec7d4d54d30cf9521008e9ad6c0f04"; + sha512 = "e0f0f30a2704a5b1f2519a165b26d1eedd234d6ffcba955156424f19451632ffa9b545781bb838fc4393b09e7b6753336ca1cf4e4dc476dc47f35b0040340482"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/ur/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/ur/firefox-76.0b1.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "6aa743480ea70566a12f4486ed8bba83482c34387773f6ac7735ac4ed6a14a9e7e53fca77d5fd295c6cfeeb395fb309efa41af0bd00d77355e4b2a2da2575e2f"; + sha512 = "3f4c811b29d26b92f542e27e5d50d9f0af4487f826aabf83550984f23e18ea9c83f7dd5204ecc2aefd53debf3fe96f2e5dee8b1abdc5554a4537c207769da0b4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/uz/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/uz/firefox-76.0b1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "3292332ce5efa59d889c0f32daab5279a37b342c98e6f4aa05e90a3db8c91f8517c26fe83a5cd59b17400e7bea0e256ae8a44b58f9b620e58497bf3fc0a52b96"; + sha512 = "ceebf54d40ba52e73b70751969cd48493ddb4c6ef4179d688a018ba00b5e66ed613c6a933cb3b94c7c11aac66480cf5dcc8c7c153022689494f2e6b1ab8b5a3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/vi/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/vi/firefox-76.0b1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "8969ebe5a3148b85daf23f7a4299e755461c722b4696a700e2b6c66164ce14c60d2891691afb4093cc394021718c670ca6bd113bc8dbb7f6ae705299fc51f9f5"; + sha512 = "6c02eb47c9d89e255584275cb1a5ae161dff4f57b77f1371b4a7647ccb5da58767add89b19b02bc10f27da71aecb2e316e0a9ee1115492de952364f5800c2371"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/xh/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/xh/firefox-76.0b1.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "570a250b522b5061ee9b3fbfddecd9018c93baed7e813847ab9fd9426855ecc6bd940e15dd08b5bb0d3b34991245104ee95a5da4f74c7aca895fe086e0b66973"; + sha512 = "d02075f57fbefff722897bdecd01e4b2a50af6d7f54d8a69dffba698d1ddf240f48a8fbcb1f95b434365f273d291e887b0970cc976329dddccdc5ad4ff9b4a79"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/zh-CN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/zh-CN/firefox-76.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "b86320fe1ddbed83cf9ceba5d60c0d40e0e137f509a13b70be7b2024052bc5589fb3bc84ded1b3987bff6416dfca11a094f7e6fe881f04b35899fcce2854ce0e"; + sha512 = "c622c0f8f2372abb5dbe3b1a1216f31f079c7a43f43a0c4bd6058896cf8c1a2b65249659e725b761b593e22a9b730159b02e42d6debc328e67c62f66edbc71b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-x86_64/zh-TW/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-x86_64/zh-TW/firefox-76.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "0d5cc478d801dc2a70bac8a38bde654311d32ba5059f0047d07e8fd321fa593ae56baf3b8c8f6e93dfc9c3ea4a9c5298079271220da0b92010e65eab2b7dd707"; + sha512 = "deb55b3b4ec106ed211a8eb32eab1cfdb47d4e30f43ce3a35f8abb3d4b2d8353da39b065b482dde513fe317b61ed9ceeb74abd184c7e327712336c5b1b1188a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ach/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ach/firefox-76.0b1.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "f95b9ba5463a59a45fd34abceb5026c1f3834064cc318f91cf76aa118be5a796482b5fea14803f36b973c7a9f9f07af83561248feb7f92c82c1ec793471715c4"; + sha512 = "3586e46703034f223547dcae3d4633bf74026d10eb7abbd5829ff2ed3343a620dc133ad1a8d19803fe9669464df2b9a4abd3b3e3b401da8421945e5ea4c2b478"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/af/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/af/firefox-76.0b1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "4f68f211b7f2bd2e6c3f42f9698eba479b2c9dc60f8970cee1f0dad2f9a231ab8a1f093da4d1fca0589842e94bbda148ec79fc09290e1a85e7c505cb4f006020"; + sha512 = "af4e45671351ca690f3e5ad51f35d2f0094724016a75eb4791aaca799c16915fd1e95450f1a89b06722b078524f00b9b30d5138c80ab8789df71aeda731677d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/an/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/an/firefox-76.0b1.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "744962dde4cacbe6d9ba67fe7dc01a4267fa16578127a48d7ef59a2ef6768dc70f681bfc73405e827a1cf1b0b7d217133663ac47601fd35ece900d851c7ff78e"; + sha512 = "4c68399112672ae59a1e6b21184414891bae79997ab0e52c8aee394482831e7c8eb18f7d11de5ce7359f83fb946e667111f485ca16f75fff214d86291eb3327b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ar/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ar/firefox-76.0b1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "f71b142c885ed61f78921fa058ff107cf4079c1a7f0c5fb67ed07a30188d878086cf4cc3b07c3ec2d6a7febf4f2126c739b3dd14f2462d2a8cca418ef4b26b2c"; + sha512 = "b70c5b8e1c90e2a69bd87194e652d73cb6b3b029f2cc225c5eaf57687643c45df9b018cca44b40809436c543b8188a9f9b94847ffe904f11a4f244cbd4aa187f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ast/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ast/firefox-76.0b1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "3b30a05ccc6d10af86f7342d8b184f78e789275031ef317548acb051ca7f5e3b6e668f67087818a750999265674573cb55f2860690bb69a155d4e762bae59f52"; + sha512 = "9cdbb8459d2baf3924dd1f16c711433a614b80eed980e22206c1d429ee43fdd5598cf761b8f9bbe7e2f36e16036b7c4ad7088ff4bde334a24f67b6f206048c2e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/az/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/az/firefox-76.0b1.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a054387e9bbafa9c99013066627f028bca1bb59fe01168113957eb7b28aea6b367050bbaf73271ea332beb7d634f2374de0f7b29b5e72b37ccc65065efae0bd8"; + sha512 = "3b25dda7eb048a902053467c3ce10f39e782acc7ea2412bafb0ef15cbdca915d622619657183ba8e404662e096728a16c388c0739cd9e87489e0eeb7e33fd832"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/be/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/be/firefox-76.0b1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e865a0721f0ac9d6ef36b511b241d869cb2b9d6b76897c7a3b6f96c66c38b00da032ba8ad94fed9cd65a9c56736742f56fc0073768e594374ef39abdfe36c8d9"; + sha512 = "39714d86de5e3ec9b4acf55af572a6903a26270bea83bde0d4e4d7424b55eed95e545a101fb4ba63d01dfe6b8088cbe4f73179e10324e583a1a55cd484d828fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bg/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/bg/firefox-76.0b1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "0da867e56f18f268abb91da626a4519546d6ac73fc8eba66c52cab33de81456117791126094f4ee95169d64cf046c6800006ca8b85250fd0e240f0280376b62e"; + sha512 = "2bd37c06d8d7bf5199c2ff75f7ac4daf5a9ad59b99877ab5ba3235c53e8b82f0d87e2702e5ed4713ae904c70517e60b21f22d75160d312499a4c713d2036acf6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/bn/firefox-76.0b1.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "2ecffd8e81e3c8d570b2931a0579cf30a111710703eef07c24358506f9ed9a2b09952bc481bda2632417af9993560ac0dbe1784b98ba34b21784c626429339ef"; + sha512 = "e0fda1204b53d0c465150a9e6e8ed9ab812619edb01efbf7ba08c616ed0b9af972ca4f71dd4876bbb13c2f6e454b7b4860a2032fe198e9e2d8ed5e4732f0b66d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/br/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/br/firefox-76.0b1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "6ae78396927fc66c2a3a4097c6fa6f7f5e4c60757242e06e621ec0dc97b482425514a31a989de7aa2ce32c5e1caa99e77b9f8849d708f8f2af45a1004f919137"; + sha512 = "d19b29d8b2430d3f7e6cfd56a83fe4fdeaaea812437e9d552b3842ca726326aa294369730da81f38debb148e4ed0330b9880ef82b458e7db461e1e6daf82dc5b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/bs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/bs/firefox-76.0b1.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "e40f191a49741e48b4dec8871f290ca2ef72b11a37f57956bfa57b24bc1c3983e949e13cf22fe11a878744f401e9bc6fb699a5d78edbf55620c6b7b4efda42fc"; + sha512 = "60e0aa12b6b775dc9e4b950f6c1ec3d77f1c0bfa47279b603ac00378738ef92e00bc41e79548b59aa1a2ea7ec456225a43e0fec7b86d80c4696f08420e56c5ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ca-valencia/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ca-valencia/firefox-76.0b1.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "bf57f081cc6bdf3d0305ebbb01e98311b5ba40bd23773d93dd568bdf214ff867e495da4ddc6201d8b398f53976270ce81658017f10fc2f225419c373e68813a6"; + sha512 = "87267964fd97fcf6a7bb3d0c3ef29c21529cd6f76eafc5e2eb4c8fa1f2e907f4cd0c4dc251298e398be748af14b68740faf477d950a2e425e7f7eee0cee01be0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ca/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ca/firefox-76.0b1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "14ff3f4e17101054c64f408458d778771584581429a757f6d5d7bcaa31a51df1f2c0712b88a216b9792496ac92f6d3e56439660b56e2c1eb062094c74eb393ed"; + sha512 = "ab5f1e61fd3842a98e47a4f7def57e0af95ba73ea0a36f3d1634b731607362737fb3120cd2875af0ca9c4a18a2fb0593afb3360851ad8abf5f0e31b7932e3df3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cak/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/cak/firefox-76.0b1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "a600dc50aa7eb2c2fc5f3cc2f5ff31cf19f3aaaa680319599f77cbb615b6545c1fefbc1f75a3dfd455bfc0e7881d9793ae05b193842ce56bda5eb4c42da37c5d"; + sha512 = "f5598470f5e50f16a2763b35503820255918e7475491e7991e2c161254da1f3ef8204cbe4561bdfa4701f44bb75115e88c71f729e49470f6814e43521d4c1096"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/cs/firefox-76.0b1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "117f94c4f3b892070b071e16660e7b6dc62df90f62783fc456a220a3840917b5344379f88164a2b796cf7b9565025a5752498575ea7b68afc24a55dd2f975ed9"; + sha512 = "8072ae93b5b963306a36dfa8ed728f5047ea1c69a7b1fb73e1640e80980c54fc7087a3f9bbf4f95e010a1546114949b2d745cc665917add083e7d515c7b759ec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/cy/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/cy/firefox-76.0b1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "87ac39c6ce202d6eca6823a7d249ac122f36487c40b6386a179fb86657fb855baf149db5e73d4f9aa437de43bcb24f32b16772da29057e4a2e02044890dc314b"; + sha512 = "bd70c6e05a346576ac3c6b821dfc3635436d2f7f88b6ee9a9d6ab98c9671511383ab512dbb81aa9014720c285f45f0a7cf7d620e99dd285621c0c8238ed01016"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/da/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/da/firefox-76.0b1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9d89aaebbe4e8110d12bc1ccb9c84b03b4f39eda2f542c15eb77befa6cb28fd8bc6f6bd1e91a115ab4c5ff2c12df48ae97c8dbc06860911995ab6687f7a36ee7"; + sha512 = "fc8a6b48c04f0da4d09ec634f7136c3a3ca1602a7e05af480044a8a86c6929cb8c84365fd46e45ec1334d940c219d0d53a191b85640b6c6f7f884b2844be1ccf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/de/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/de/firefox-76.0b1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "e1e6df8039fbdf1071606cb6146b5b7e8c7cc793e4495c845ee68d6245820bb8f4e41c42e4c7dc4135bb21a0489bf2366cdea47c99fc56e89a89f77215167c50"; + sha512 = "504834dc1d878cbf0884c303f9dd5465411c7fdeaae8bd963175e611c4e8c65c31e1b7070bf9b82d4d15d789f3a20d1a53059f8981449f94c5adba8d4c0c57fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/dsb/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/dsb/firefox-76.0b1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b3630e5ca8a4ff299717e8458d9d3f8cf6d06c470e634e557c675c89f4c861f6cdcb3ed6ae4c8af4e17bdc0c3e6ceb10584fa08e600ae1355dae8ebc1d20acd8"; + sha512 = "1b1e5dd6d1016390ee291260abef2b378bb1cc9133c3e4178344744f82d1abbf2e7b9d7f78163116778f7b04db686cb16056b4b36b221ad4b5c3ecc198ba8294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/el/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/el/firefox-76.0b1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "9d6a637eedec5d5d4a794384201309b1bc57848760ed1af3c0afd1fb2bd70cba465710cd618bdb610cbc171253f4b8b3270b004af10a5604e0bd373dd0eae420"; + sha512 = "982847aa23173d58889f80fd7160bd34e601361a0e5f112e94a1912fedee116b36e327943e7de9399165de5a9122e904cc9b11d38beb67826143d17f16f2b64c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-CA/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/en-CA/firefox-76.0b1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "1658adcd506c209366efacbd730a0576c77591ba672a9d0714b6296b9ea24cd5f291a6a8003da6cb5d8667efb5c8db41dcbd0dbe83140ee45d8977f51882f4da"; + sha512 = "f96e641a835bf0db594caaeec89818e4ad4f6bd0e66dec03c7a9dd6bdf00e76615cef60cc4ca654d23f76c8469e11df7545f0b7267dc932b8fa9ed34e34b9b43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-GB/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/en-GB/firefox-76.0b1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "61720522cce0fafc76173331fae77d293b952bb05c5b6fede29f1b3ab3ecaa2a546c9a16a16ef4f62ebd19c04f0925db232d4de5b3da172b5468f9657b0d59f7"; + sha512 = "9f3ffb2b46bd124bd04243c40af164fdbca0086dff34b58a54edbd168d5599fb70001e2b60170f783946e17590d947a33998514b64eb3addb6f73c7e012ea2b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/en-US/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/en-US/firefox-76.0b1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "a45899b9efdf8de1ecae76d19c5c8a081ddc81ac2b04991c5000a3d7379d13ceaf192419bbcc87fbbfb9dea50fc6b99ffd7845f11ba47e280dee51fd5d832edb"; + sha512 = "550fc9127fda2768121e93736b2f590b43f2d98ac71015a2c8a8360c205fbb6b6e8000ae46169cf8606940aca81b0fe44084e0945bf83befcd05b8e4be66f4d1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/eo/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/eo/firefox-76.0b1.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "97409a0943ac848f96c54dc6e7ca8c955b6ed2aeed078833f8a69e187e550bc588c3b5ec82d4f56061cbcb689e5548a8a9b7f9171e637d04a096b91b4d4421d9"; + sha512 = "8bf90e8341936facce20e56125c7fe704763545e5b6bdd15f67bf8905d3e224ca3d57d12ead600ce47f12d7e16597f14584cf1f01a782bf19a2e36866e057a37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-AR/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/es-AR/firefox-76.0b1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "75c37f77ab57a1503de3ea27b55d4d77393d426b490413c4c35ff1072534da38bd31a2e78c5655bdc9b5d5f32ccc9517e83bca1be1a10fda7cbb3ba289e0ba3d"; + sha512 = "b37511d116f7f3c6c16e09af2d5435ec18b42c3bce20a038e62c6f6ba68cf909a7ebc28c562d78d7aa323ada352d550667b7dec6d4310249284592faf44a4f3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-CL/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/es-CL/firefox-76.0b1.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "d9c58844f4b241d749dc0cbd1d04a8e490a6296d0c3cd26da062b043060488794923728e29adfe171834b331ce9461465f14b71f6064e49a39d458256a99ac08"; + sha512 = "86864f44df0fe0014723cc6996f0e391f7c620e7e680e8ecfe4d7f39084a1620bc06bddc0a07a141fd836126ce2b4f4c773e073359223d708704556a11fa672b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-ES/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/es-ES/firefox-76.0b1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "9f4e74d5f01ce99e5bb9ee47f262b0442bc4ecfdf25a45e204bbc207a0bc49698b2e82bbb8ea8a80b5b912d6dbd4a3e0e42de75d3becb0a2fc2ebfb3c2bdabe9"; + sha512 = "ff013d15ce72c65c75f6bc3b76d712d86716290752cdff95de99ddbc9846dcf9bad851499476504a832a7bf96e9434b5df99299eca5c04a91dbf6e5ed5d91b39"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/es-MX/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/es-MX/firefox-76.0b1.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "612a5d746e31afd8d4f3be3b56c0bf28166474e68a16b237d6c65c974a6f5e1589c3c29165e52936117969c856ea1b5488649d22bdd08a4db05dee8a80142207"; + sha512 = "42a587b6dbb5afb24141a60d5c4d4aa5c2ed68fec09eb42e483629712b193b5fd69f406e2d348ce620abf607b2d66d17ebc82b2e0ad8ef7cfe709ffb65321667"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/et/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/et/firefox-76.0b1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "cd59ba16ededf91c6abbe45d059822fdb1e7f450fcc4a7c90816ebcf4aa7d9bca86ca23c105b1fde01944b06e188b240f8622b7664207fd680d73063164df81b"; + sha512 = "7e3c26c4f1be1e50f634915c9eab15ad6430f9262dd925761cdedf75f91961ea7f63a08a19cbab9b92829d08b3db3fba5dbc016ea2e86e42bb054b16b56d3e91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/eu/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/eu/firefox-76.0b1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "4a6d6c84ee790000a0e50b296d41956d9fb1708a20d55ab0d093147d823fb3b1d3b209cf83bea40c4a17ccd5f2fdfb898425ddc105bd11f7375fafdbe138d12f"; + sha512 = "799c2ac07feb46a3382e47a2e23443dca3d177d037662e40203bf0fea6a408c4931de445b358229a28686ecf2ddeee835b41a1069ea177aae71cd5888755023b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fa/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/fa/firefox-76.0b1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "12f2a70b386a6dcb7184c0afcb28b6f01daa0e2a5df0cb83cd9407659086036a379cf3e87a4c00466b1e6d730811f1394d2fe870a33149915a9551571054bd38"; + sha512 = "2a546aaca0bf12e9bb7e1fc0639bb5ddb55a28729f97816fd43d7850a4e8518d3e0a2b96cdd9b149748404eab7e90e31b4ef3572976fd29662f1356a1e6039b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ff/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ff/firefox-76.0b1.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "de6af7697f9450035c4bd14daa319c020f53943521e9867e3784c6c68183192d5a4076e1f416bf062d76d16cb2ce113c3aa2a462a879b360c8641cfe49e7cae0"; + sha512 = "290cddb3b333aa8c4fd4d978c18245751aaa773f4e7271dc62c7af770210d26e8b3b7b11b915237490eae3ebf3b641274cb18a1d7b14b33d44dfe8358e7b25b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fi/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/fi/firefox-76.0b1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "3b5a6b5ff92c79978dde410bade97b835bbc8159db7659557c6ce22675e33bb96c49478596ee3b3a8acfc67d8f4a24e02ddac18ee481a95250b975c174c4dab9"; + sha512 = "6d670f4091db4f0eabd17263fd78b847f2abbca9f735dd0592758b6b54ed5a223d2449131817e1d3208129b5a5f05205740d17ecb052257628735c1448b629fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/fr/firefox-76.0b1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "1038cf04afdeb236ef0b12ad096d0431c8576105e861c09bcaecd1b27a2ee02f56834eb874b8007f50534bd43a92859c51dd0aa0150cd258cb22368337da1d71"; + sha512 = "6aeb79a1c98b5f4b7d430aaf7d4d424a1627f9b46c66e32060b6663a4af785e6f1a25b04b0161eeaf0c0e5592b8b73a6a69e37109b817178e4bcc214681de1c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/fy-NL/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/fy-NL/firefox-76.0b1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c5139756c49eb6977f053003238df9b771fd61645d540482875775ab76157eac29be84869390d62261ddafc1b6005ce1df58bbfb7cbaf8d22ae4e98daf6d5d9a"; + sha512 = "24aa2f3b19662e7d0bea15cd9af03212f34cb99945a62d42a69b8e35bc33d875aefdeed34467479b3c37ad67924d8cb79c890a98249b076f601e940568e92888"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ga-IE/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ga-IE/firefox-76.0b1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "d9a5baf26001f438f20cb7799a6da9086039743e184814914199c57a64cf7cc993bdfb477ea61bcee43e2f7db05ccc02edff99a093a1e2a1f41de0ba72cca2f2"; + sha512 = "27e38f6444efac8d4c58028dde126e2e7d4f8e75c0e14bfcfe0796aa1e80f3bbc4252212b676d955d374d6050d60f3fc7e2838bf5c71f82b99b1af30cc225b1e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gd/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/gd/firefox-76.0b1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "d9c4f1ac7d5abb7c90b7cdb6aef437c5f3ba2f524db43a34cf65df3822b811293a5d4bc56707fe254cbb57f7a00cb0773a1619113f3b455ceac50c388fc8a2d7"; + sha512 = "ddd8cc3c83d701b70fa4980655407a7c85b94548638d140c43e4a4a588365c149d64f441b58c98c22299791e3600bd717cd02014b3b7a64a0278230b8f24c5c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/gl/firefox-76.0b1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "32b7e11e9f5c76b12c3012fcd90d5b0bc2ceed289780db6fe32e53ecb3dbe9fc31a83c5a684496aa35d3c51693c14265a24725131b9e0b6653c811dd2b60d933"; + sha512 = "9a545c74db03f5cff96a9d0a386466171692f3f8a6eb0fe8a1a4b44ddee6e11599e5615fbf98ceea121f927f66dbf03c481e5e53b2d9e5063a0e575771fff4ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/gn/firefox-76.0b1.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "89c763e8ddb051304e8b192a8071fde4c4dc4c0d1b233cde51faad5b2d8899609ba5c06399569203780959a70207041b59a0b8ebd0c1f08891afaa37a3e44a9f"; + sha512 = "59d09ab4aae409aa65bd8701481c3a972b8b315b730a3f1b514d807045923f243018d4df37e484eb9e4367475beeeb6c90cf0bbc3e90a0b5d665623f06079a54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/gu-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/gu-IN/firefox-76.0b1.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "4ed360cf1f16896f2bc7d9f90f66943ca4f8bf27336a4cce928760b820572b50bb4403137fbe9344c117e7a289cfaf70006d702e1aa6bc4eb15150fbb743119c"; + sha512 = "88f60019bee5d350339eb82e690ec0a2cb18b01741520e2917fa756514cb1234d23ade76a79d482096e81212a87b938979dcdd128913b580a64ced14766b7464"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/he/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/he/firefox-76.0b1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "f1aa69b9ecb760d4797dc15a15dc7237704e51575cb02ed7019652e81c0f862db3494b6aa5059a1e7c6b7159cd712666e7f279ec95466ef57af85e1ebe4dde85"; + sha512 = "0b6ff2b2c9a79f23806ae158fb98557a64cbc6af59a2d82bc91220c4e0f3ca19915879540a661deaa0e6fa2865e0f89a7f057ee2cd2c95bdac5a8ec01295ac86"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hi-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hi-IN/firefox-76.0b1.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "fdc7f76be1affb5e93cb316844724ee8929e84d6fd629797d3c0e150144595b0d6d2b06763d7f6a63210622b3da9a4181e5f704d2ea2383664857561806c2cd6"; + sha512 = "e2e767f29cc7bc0cc3e55c6070e2c1685253f1ea12f3847c7fbd725e05e940b099ba184df551dea0e333ff96f6ebf5850d7fc030312407d1ed3b63fed81abc19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hr/firefox-76.0b1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "dae36784f556cb0e4d371620b333b167b16e810eab97d4f4857320a9d61f14ae392a4b2a472fd43565a807ba2d75d4dd4848a25effe1e2e7747dbbc30d893cd6"; + sha512 = "bbc6bbacb2bbf311f89e8e13edc2d99045a592094e1c327dcc5091191338df22c67b78c9fcc66e196d4254f4d0f91808d642aeb5cc82dc68c222f24c56bd0357"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hsb/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hsb/firefox-76.0b1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "04c175a3ca68db0d848a6ed2eead84cedbd7078d741b43e725fb51f5a4124487c3e30f18c940eebb7702154061e67b9e63a53d7d219b8ba25121cc47de3a8049"; + sha512 = "0d1578bb97d59429dcebc05444ba1fd8b123ea62c9dd92e0fca2cae6ff73a5503b8dba5dc907f9ffd62fbde677f55a091ef96d1444a40c4a877962411804c591"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hu/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hu/firefox-76.0b1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "d6503a482ff7c43cc136e23126524c22e5636a7c5c8210052f353cbafc5d4a040c31572fd3271972dfe116ce3ac0d924ab509f677f4d8217bde282f76820180d"; + sha512 = "c71bca7733e29d4290dde7a6b9bf053854f919fc8e67c1f5eee22c13fa779677df548936f83964183bb6a10154b104d4d66403ec9b28d9f390a9517edb90a63e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/hy-AM/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/hy-AM/firefox-76.0b1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "4082fc2ef233e02b384cd576ec79bb2697bbbb8a04f469a1574f89fd9854ccf4138aed2569c2381697db2e073a471fe1e5a1b25b58b14a492d26d54229a1c6df"; + sha512 = "4797fa72c5fa9d9c503120bb46d48d3ada964e44f528915653b3e12651e9780e0e19f3fb2b9a66e13dccb8e192bd68e02028891d14301e5dea9e4640e8ca5074"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ia/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ia/firefox-76.0b1.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "f3e24a2778346cfe24a00f6cd966a2ba7b59906a0cf28e240313c72305ff9ad1a307b4db6846a6ff02b89deb72b3c9c4233f0f7c00e9e6f5f5dd949e04b12789"; + sha512 = "ec68bd7aecd1e335d0eec008a03c3ae7f88674d196be8d1e18ceeaf98286cc3ff94f89481e57f262e09db1befa51fb2a752402acf26bbd7fd8e5b73cf9c50aa3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/id/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/id/firefox-76.0b1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4728f20776da754eb696036f69b6a341d912856bd0d9c105954f56d1181abe6b3b71a125b836d86061dfb39ed6282c4eadc3c9a0a33f39c24e9b34ae8ce047fc"; + sha512 = "fdaf7c6552b42a98d6da1b33d391f4827dcfbdee336843672102c2d541189d4dccd772d28c2d05cf4d1efdca5c28032c6d134b418606b3c04bc47bbd6f569c05"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/is/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/is/firefox-76.0b1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0eee6d75916bc89554bbd9cc6736a289c816cfcd76c61999fe546489f5907ee23d9240686cc2f85fc56b005b4519883692d17225ea2daab7165f6bf0023d6290"; + sha512 = "8f688d3104fb15b7c15f1326c6183872be6270569583bde532dc0bd4dbb12e8cf832eaa1641549759ea622c6af5d609c7a0096d078d9b91215c2762fea931a91"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/it/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/it/firefox-76.0b1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "e61500f91e7351ea75b5fce63c0b3a258881449d16750cb84a8b91e65fdabae42cf2e8142ec06e408fc221c86e372a60a282a8635bdf103bfd65c097bf51d709"; + sha512 = "3a3ddeca616a0cf61ba4b6ecb16f7fc4192f583ffb73f76def7bf7c6484e7d71406e40e9943ee3b8bdfaffcb3a7d3a5937730a064730bfb52a728a8da6b846c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ja/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ja/firefox-76.0b1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "f4e8bcc5435864de90bf69820f18c8b2647fd8da250089e4940e752d36b2ecb5a437794874c3cfa5d3cd96ddeda4f6cbdf4c17725a31d57474e4d6330eafa801"; + sha512 = "8c281fe548e9d220d3bcd83802aa4ac95eeabd2f69dae118925984975fcfb03d7cb81e84ccfa995a5afe51933bc7559836050b22d3973c6c1847fdce8b31acea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ka/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ka/firefox-76.0b1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b516b2f8af0f306b78a67af63d9576b358f17f40f71520e82be35fc8dfab29b61ce5e4dd56cd52b6bed2e029597524db4a059fdc63f58ffa4013b1c6bed39cde"; + sha512 = "485ca9e9ba3d6dacb148cfa620e1919d643c710d4d119d162196b9cabaf22851fb5750c65b26307dc21ee523a7007394784967364a534475381fd3d322d89326"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kab/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/kab/firefox-76.0b1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "7a5c35f97deb3132f2575071eb81b5118f16403f37274f1f0d6677811de7b88059c2094aa3c35a7350a5a0f3308e904378e6095662af49188ad714b1bea920cf"; + sha512 = "97c555fffb9c8de96c7cfa0500917e90a30594be6776a98f7199a450ba02ff67244314549a4b01e25dc6a6da8bc4f74d01ace3a01ac25572a67654758da4a80a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/kk/firefox-76.0b1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "f7a21230d6f2102d0ef34e3407339e289f3c426fbea1e22044653908dab9430422d85000ea5c30fc2b07905a10aa2afa3662904f6ca388031ba30c91de760d0d"; + sha512 = "97bb0accfbd813f5a7b98cac840dd0184500b3a50d8b2970629b6a992eca4de9e86e3448f26a8a0a30da0742e517f3abfd82d91c45091f03de3181a44389251f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/km/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/km/firefox-76.0b1.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "b2b66527be2330554a69380ad44b56fb2b1c297ad9aab118446e55bacc35b7958f704b5acb543b826919db6c36e91514cbccb4aff3856dd9ee58dea9bda43cbf"; + sha512 = "510d2353b66aa5d0b11fd443ea52ac392d809663687cc6416332c94169bf31e5693dc46fd29611a0bd719a2f60f2efd43cf3d7a5be34d81a0363d347830d4c60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/kn/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/kn/firefox-76.0b1.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "b110a46b8c5d6f4e7a9cfcd126a80fee7ba95cc35082845ad8aeec0f6778dfcde805377ab395e70a5e9dce518c53449a5586d9ae6eb8c19dce0eed6b4757b8cf"; + sha512 = "c2e4cf96290b8995640a8eaf4f3e3a403523ada1af603bf49d8271f015863d7c3b9af776ed9748de3245ce27306b3ad032bb663bfa4b80db114075e9fc62a570"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ko/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ko/firefox-76.0b1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9a35c7a81cd8ee930f8164bb59e58c321f35aa47abe5f0e28faf320216b1555b89516aca94bd49a1b76c892abf29dace03a7055e571198bf981c4beeaf965973"; + sha512 = "dd233e5e49b4c99fd0c10614bb7b467ccd5b563556028eb620c041492c1d3b8482440e84154947f9111e7497731ba7a2d912c0718ae326e5280a580f4cfe23e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lij/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/lij/firefox-76.0b1.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "21a09cac09faa88963e185d2e1f732aacbe2dd8629a389a851bb149eb1b09e4aa21a78996021ac43f7861cd67646e6008e63420c690bd8072138bc707d937b04"; + sha512 = "f4c847ac00daaaa95ea95ad80ddd8dbcd0f571948bf69ae29f7c97fce0ab81330b6e59e884f88fb435d765c6afcbba02f73483769820265464ee9ba70e39a68c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lt/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/lt/firefox-76.0b1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "67864e1188716ae7e93f8a824709d597124ecdd4d76dd61ffc6a1dcc7048429e17440c8d096475811c7a00db2c42c778477f3c32f26e2facfdf538f562fd580e"; + sha512 = "6fdd503a6f53ccea26cea4abd3e822b51b4bb610e5d9731686864efd0e2a6b48637a4aa74ad230d2c3cc45d0d95c6e33663c5d1d144557797b44bb4c11708be1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/lv/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/lv/firefox-76.0b1.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "de68b8cce2abe936bed8015c88a9dd998bd99d177b127ffcc205c975aafd3f51eff40b83d8b8e18cf66ce8dbb9931a9a9ca27684dcd2e2bdaaffd7b96607dc4d"; + sha512 = "329972f3745af149d71b1f8bb090302bde3da3281791f1fe68fa9c4e67f0d21cea412afbd79ced9617504090608a416bb2911ac1a610812dfc04231224a3a4ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/mk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/mk/firefox-76.0b1.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "c5f0baa178293cf993fbfe73f54a7052a249dc070a3c1538df27949c38c14d1e3d486d7bac26a5c97bd744c051dbae265b4bea215b1bc96ac732fe57a7766439"; + sha512 = "c5884cc27ff3e2c8a97e0cc498a0767c8a9f830ec92bdb98f143cafd49c4043659b9a7aaab423e2d770d3ec51cd6a2eae0c7e25cfb3f8f32364349e726b6cfac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/mr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/mr/firefox-76.0b1.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "61e9f28f0c8505d6a132195aad5ba56ef5c9c41caffb22b323b764029b1af0f92dc43cea70580246fd11bac75908023553f3bc2238d842ee1f6962ac6c059ae5"; + sha512 = "9f54a29e19bdf171526eb802175cb9cd84eda0cd55d45ab334313a18fde347b0ab28760326417e454c9e5604c89743f9c6989df40becf7a57169d12bd68c2491"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ms/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ms/firefox-76.0b1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "4196f1eb297eca219ed58c58db77d691580f9a33158769f0559a2d1a815f4170c89d282bc01d4a94884b5dce6bf83fc6a6a687041eb02fd38f6dc0aaae78f555"; + sha512 = "b01d8f11c309a56b38a7311eb5b61718ded8f1ff392e7c3123f1954b2317f25f4b4017b02f7784bfeb4ded9641b20067ce149026e83298bb0010c90c98d2ff35"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/my/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/my/firefox-76.0b1.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "4c1b2e13bbf33ae4d8c213e94a0d1d41fcdf1471304e9eede6ed74d28eab659be559f2a5ffcade436b624604e26255e37941afcb8d9f36cfdca2c3fb9031f758"; + sha512 = "070e7f956e4c448936460ddba3627cd86a6d30ee6dfd26e474f333e0a9cad87843c2cca8d905c52fafbbaf16757257be6577bef4380998aa80804dce107a409a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nb-NO/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/nb-NO/firefox-76.0b1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "fc6d764124ae4182c01a96c12ba13ed807a7715d1ead7a7ae57c0c65d394166f0b80a18b12c351f87d8f28f894700d3e0892a42156cb6601fa34d173413ec121"; + sha512 = "8fbdd844b3638a94c180c73d0e543ef2c97a4890ac2152d244ee4edd294ebb32d698c974eb9bbf73ad8256abb412f5d3fe49e0257123b9e3a5abfe851805a77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ne-NP/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ne-NP/firefox-76.0b1.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "f285ea0cf2e4e6cd5da9ea2e04c5a942de5a9ba639c0c6be32fe64cb2d4076b15a0b8478a6b8e25d0bb7555b8148fda33313e5c78d91c5397d3cb8af7a5ab09d"; + sha512 = "da253d0d4f3c6d042b04049dbee3f0be62916517c3b233e7b767ad8efef5b392c331589ce75f9484b40ea8ffb7bcfc00386222d52b07d1da80b13ea08866d580"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/nl/firefox-76.0b1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "1e7e423cc24de27099375279a8f46572310a245709ab3b8450c7c1257ae28e219a1867477aaf50f68762eb1cb32b831ce3b73a1d4d7fcacef1fa4f6bc6a864f4"; + sha512 = "c04a3f3e860c0cf58d241cdb663b391f170e71745f6b4bba4ada92b5b2e922b94446295d7dac08b153c8ddf2b07d65c3c6c33fe87cc47f80ecfced653d0d4f87"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/nn-NO/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/nn-NO/firefox-76.0b1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "a1e70c2c4eac55f9f6ef46cf741fe421449e5ef1cdf1a125e07a86037c1d5ee7a329d0e2041338856ae8385778207ebb95163cce1a124da64a5ff334c73fb5dc"; + sha512 = "00d4f4dd4b10325e9ea13cb7c4f2b705aa143fb906163f0277aaad84e31376a436adb03d534a1546a3c37daf8fd726b6dc8a793fa66441fa01bd6c2d3f4ec64a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/oc/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/oc/firefox-76.0b1.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "ac4abba844e7d9bca5d10889ec5150c2fe357bc5e2fcc1a47cb4ae1489645ec884de70a0190b7cc7ea943f1233dae708e33be8c9e4453a39e10c89b418a05e32"; + sha512 = "a52a46f4bbab591a713721212c4628b928cbde08de518cb1d72b8be888a403d506bf0c0f7ad0c04fab95a4248f31295817243334c36c9fa279c30bf1c8c279a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pa-IN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/pa-IN/firefox-76.0b1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "59e0ac652e3a619d5a9ba1d94014e583fe85118f4fe54779abb657e9ac5f59865483007bc6c254fce6f29270b24b74805ee6b9d227eca6ca61a651e051be6bd7"; + sha512 = "c75fed260db1eed5e158dd1ac4d6ed8780eefaf2a2e67e0b1cb3008532bf4d35166050e070904651b69d5098071fe9eaec5c798193dadb68e34800ec97f191fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/pl/firefox-76.0b1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "3ba13b4616bd7381268e618cf0c00ea4ed807c38ff81e1f1b45457f9ab780e6676bfc563cea62df8767bbfe6962d91b8f1d7de63fc101242d18d2b1bbc045a1d"; + sha512 = "d9b71dcd310b28d4223ae8643b452d2e9f9fbc9a6420b4ed474dcb5536c69dfefdac6685513626ca9c6bc7f9cf12089ec81ab415a432898af8a77faafbe796f5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pt-BR/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/pt-BR/firefox-76.0b1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e115b3c9cbd88ea0fd43b58e9ba7996f3a95004269c5825b23244c9d30c75fb2f63abc4ebe6e645a91e21c798c4dfd7627604f44c0862547e156aa8f28e13d13"; + sha512 = "0e529a3209ae57941cd498eeb6d89b6ef68dbfecd7160ddd44fdb550b73afebb4f62a17a8510013b953953d977d9ac487753805c826b0dd071d80ce434179327"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/pt-PT/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/pt-PT/firefox-76.0b1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "7f53c4ba63b41c1f69c3ce11d401464d685983a906f44911a4a984073193c75b64d4df3d295fac9df004b4c8858d586424381d5607228d24663d4a3114e80a2c"; + sha512 = "1301af89d5cc86023fc6c4a7704e6ff8781d1b28d5c83455ed7dcf1469b31ec772f990967b7b575122fd38e53c56783bc5d5f414851221ce71abf6247994d68d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/rm/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/rm/firefox-76.0b1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "a397e6373787d0614f77641a10658dd72484364549f39ce89599554ec41b883a1c32b3a6a8df26a0b9065664012fd88e1c88d04d493ad4b2b5b39745113f4e99"; + sha512 = "e4edd9b51548fc2d9de2172cc360748b50d5d8ffecba51e293f95c283d1d7e836505c639c1656a122a0cb284ec64c8180dd2bc36cbc4c39ffb5b4f03469d7b33"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ro/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ro/firefox-76.0b1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "7eea48885af4efae7083c92797039d940594a26762551a5ec91479005414a8bdd7e0b57ae7e7f64d9fe80ed5d1da9dfb9c5b04aa1f721a7edaebde2c3885f790"; + sha512 = "e005191f5d72eff47b695a8ca9021c50efd144f9f464a2e52abb3e44a500d27238fb6bd4598b7613de410c9248b1da5e4066ebcb2a5f034b303dbc6b789cb7ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ru/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ru/firefox-76.0b1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "1362e789bb4890ce7791fb3c3d2e48428adab90ea5fa3f7644cf6fde6f6e0ad13ae01d318265013c48c8d0fb1d4bf67d2bf1001c6a49a2ab2fc0cc71813f6b3f"; + sha512 = "b5b4ec978e332449566e5e21a03e93c7daa2a53ee7dbf6aa48e8fa5afbc7adfd3ac4224883c1464634824ef526a250fd123c341a0edc526e8495768c7489f557"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/si/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/si/firefox-76.0b1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "f0369e0f40aa26933cd34b3e34e25a4fd3dc0f28ab85f58e4c5973732e1dd0c9539c9b2e83c82f70524fc0cd2d735a977ae2c62043470f2a590d9cd6e1f35643"; + sha512 = "1a883746ada6cc9fed22da12edb98b90cac2631c6c525e7e3317c66bb2b52eeeb97bf6e301634a5d7ec141229d245a23a343b39b5ca79fe9182b6467ee0a3fb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sk/firefox-76.0b1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "2c24711825bdf49ec2cc5ac558ab1dee43c4282966cf9dc00f4ec5c0f20761c31e57a79640b7465a50010d65270c5f730c4ba08bf268e9b85d87e3e800e77bb1"; + sha512 = "4ec70876ba04c07abf229f938fea5e86500037b5872f3eff06f62d811af294290125120dd1d142e54b4252dc3f685b2b2618a03adb61741d0c77af1ba6d76ddd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sl/firefox-76.0b1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "b25e7a1c421d98455bb141a48d29e3f6b57974b1869b5950c898c56a285fabc6c10b1308a64e033fce77ce9376c580a3d877a42c1cf336d4c17f99dc8c375789"; + sha512 = "5a830186de891d80b35915481470bf583e67df45bc5c4eafb011dc86116ca3faae84ac901c2fa036f5575a72c2339e353f8c32299a9ffa29880a5df9836681bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/son/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/son/firefox-76.0b1.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "10011f2340274dbf7bd6183bebbeacbfa41f45eb8a2b255ef996f9c7285781bd80f4ba5e3411093dcccd7431cf57936ab87c8fb27c4458e19a8f0a5489ddaecf"; + sha512 = "9de657a59c5dc2da3ace4972b855357d19c18709145a59d260741d5855b0c6f0adea1a68262b957f71d406ef05ad3536570834531afc2823f9db5da8be82b8df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sq/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sq/firefox-76.0b1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "e65105f1d8bb2aedfff769c5dfc55426cb846008d1d4bcc639a45c1fc24a00b2bdb8d1a1072755e552c7878526b75bac33d4a9bef6eb4637bbdc5a0d97020cc3"; + sha512 = "fc7750164759648fdce9b6df8a40cf4e08a97c60ec1c1f194d63a282a248b7cbab5131f98383de9675cf87b3ad3e924b620e48fc79ed75b12179e92caf08d106"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sr/firefox-76.0b1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "3d0bfadf39fbdd5b51c8187fac2ac6643bcceb06252365532b0369ca4beb0e09ef5116704f208d5fd66e23b321828a24dda7dd277c475967711128a6f8f3bdca"; + sha512 = "21321e433ae8b3958840514bbb1fafdf31d426bbfa0e5dc1b0a834a94b658624085811328c5d1914c7acad3fe37a02a10c2bd278539209356b9749f3a8b4635e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/sv-SE/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/sv-SE/firefox-76.0b1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "036773f6324a6c6872ed0fa312c7ee63a891fceef9ba51f402e135b1572bacfd31c7b137014118ac91f13607056430eedcf082aa4889c68af4f4249035bbf7ca"; + sha512 = "b2cbe20c536b34203b993fd095c96001883563e1e41b1b6f059a48cb9ce10bc4ed6c596517613e384a17ab97446bd06e439b2f06f402a6b32842f30dbd15c617"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ta/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ta/firefox-76.0b1.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "c9e4290b20655e9ad5e2f9bcf8982cfdb8c0492318ffdc716b0c257bd707b0d7db69bd6b48802e17026a3416cf1c78f6d10e782cdcdcaa0cc4a382517e1ea9e7"; + sha512 = "dacc36c42e031c8e26c7bb94a9100a38d99ade3eba8e860be8a9552797387795e3bafb5ad242231119948c9052e262e401a10fb5b2ea8db4f9a2a6cf7b7d7e13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/te/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/te/firefox-76.0b1.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "53a4c90bbd7854031dd180fddab6452f29c33f56111ba40d9bd634bb5e87584016581137e1b100ed247565557b8a556c6a473d2c46e1bd65f78fe5506420091a"; + sha512 = "bb73bf4634658cb4840f3cbeac2a01753657e74ee2e89511758bb268336eadd03cfc05bb8f5dd3573164846f07a2bc5fa35cee4476778599517e604e33c3ac08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/th/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/th/firefox-76.0b1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "f75d583ec397c57cac3bd1c384393c818020c3f46ed3b196060497fc2f09a36df3d31cb7b6637e3697a50e04c5222cde0c50fffafabf3415cb097552b67061f6"; + sha512 = "9232d7cc4a78b733b5b4fbad39723a11f6c0260a3a7a760968410110043f95ee58910ff9648b3b85b1b84cd7b48b04ba90abb183c5a542cd88b3852ee4c8898e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/tl/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/tl/firefox-76.0b1.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "607e6371397bf29c10893b5a72ff706c6cab84024c93832aedd1e7a57c1431c47350023424614680350536a3e8c6909a3ad89392d15208bdbceb6d63e1a2d95d"; + sha512 = "dd3863e44bb3a773556814363a7db844a2998e7f967d7d38c2d723ee416b7155cb4ed713a49da323be1e7e19f49e1d52c89d30bbd64087a16fd51f55c494faa5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/tr/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/tr/firefox-76.0b1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "c28d89bcae7ffc6145a1d8393a7cf4e9e63025f09ec54c42a7d5d7e6a0584f02ab52fbd4346c74e54b116ff461dedf7c533a77f2b2175e34b53f7a2b725023bc"; + sha512 = "17f732988e3565437c486bcf1d27a6e1210fa1bf91827e22ed2409b020b2f204330386a5ca7a18396e7aca61bb3dda6bec4f1e9ff150f13e0f6fc1fac6c724f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/trs/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/trs/firefox-76.0b1.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "eb505f85d35dade14f853bfbf4086f3ce28faed1f497a35f612f30bcf35d49fab6ea32bf2b00e436d12d255ae37dce6ff1fbdb1eb3dd1743064181404bb28774"; + sha512 = "b673188a607e60b726f07017a307a2a629d9740fa665d350ac41a55ad2796231ee7654e36ea9ffb8b61a25f4c06683f63418098c5a29638dcc81bbb3eae750cc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/uk/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/uk/firefox-76.0b1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "5045d30636c9f3d893ffe5a90e87f22d91718e36e720962e4d6d505106922290bed710ccb9ba50897228836f5df6844de21384143275460ef50aee37ca175ad6"; + sha512 = "4db86db3777c7e655f6d33b651b9e78fc51d04a8403bd2ebae66fc56309592821f0d3a96d1989f0d388ca9c797702398cf646bc421c982555e36cb849a146122"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/ur/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/ur/firefox-76.0b1.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "78daf235a6cd6301b356a887bb0b8318e9a8f7785ace0c3a398fbd982e4131acd8c43f818addc516f0f14b56d41ae41d51ba07f2848c0630baa057b323a5f268"; + sha512 = "c6b37a43d490e560f8f6b077e6df87b4c3f7f653b2a6729a3c7b240f272a5f35d7b4a9bb6ed8c720a3cb938f45c8ae5501a07a7a547d0741499ee4f7646a3012"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/uz/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/uz/firefox-76.0b1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "ed6edd3f1c54e2675c650ff48e5102f54c258cc999506ace655a99f19dccfb9e3140e4c63d6bede4d72b6f84a6eb300ba485d932316b83922288d3ed6ac66e00"; + sha512 = "9ed33a466d8ed5d1023adcee8812d1c73399c0e31ce79048c66f79bb66df528d547c0b7ecd62f3e68b1e0e660f716238973d38afa63b0fd8c5b216ec86f62343"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/vi/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/vi/firefox-76.0b1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "125e68eb19e1f1fbfc8a8ac0809bfeac48ec37da172052921cb0710d8ddbcb031c72139c81c6349a4ef3946eb6d10e49d398e561e2b09c23752182ad979c932b"; + sha512 = "08bc1ea459f9d5133c06e973d65ae4ae5a9f57d1dafd7d8636eb722bf6f73443240159dc8e3ff2366af46c302dd5c852430db66b86716a1319854e6cf46d3e84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/xh/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/xh/firefox-76.0b1.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "bdd6749ddbe15d1332a749a9f9d954b4f018c91c3975b61af2863509fb97169f2c1afe31bfcfb2b3ee68fb30a5b7cbe6fcb4e94ed751d5a1710c743b3a6bd9de"; + sha512 = "296d0c2703baa15b7ba5f0d506e61d989e9ed3458f02423cc6b4f9038ac9f298bd78097f153b39676d25dc93572a6a7e63e804a579e118f1c5d474c83bf37e5e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/zh-CN/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/zh-CN/firefox-76.0b1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "2da359cbc166375462ce9f75f60ee802b2b63bfd21afa661d3bdce7ee41a3c76639c81f6700292d352739f8d3988de3a33e27464d7a8d7023e52440865e92c12"; + sha512 = "599d4b7ccae6cc399539dfe0072766f89acf863439f7d480d29b0d048a4bfc07226539e3e67a8e467eedea9448a599a6b7be7e5910a7a29689fe295242ea0854"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/75.0b2/linux-i686/zh-TW/firefox-75.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b1/linux-i686/zh-TW/firefox-76.0b1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "99869cdc515c28505d025348013d7617a16ab79bc4b024240b893628e1884221fece1bee33013a62f800e2633bc1edbac256e74c411ea10b32b6802eac9e7855"; + sha512 = "d9e2ac951163c3445f5aa507a6683ff930431b17e465398273f42d5b432c3c48442be5233a4f5dd4390c00b6909f8e66963c2a9cdddca59a69b1fd602304b6d0"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 02c90006f34..997d6d98405 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 = "74.0"; + version = "75.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ach/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ach/firefox-75.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "e5d3f75026891916b44fe962b8a01bb76e434269c2e9c10c8815765a8fe3b5eadcd63ade57ac2b103a8b66fe26ea6715f6c6d1ef675390e339c4d82c7f6a2723"; + sha512 = "654ce2cccf5b123e25509f71f4526f42052b3cd6eb79694de47f94363af4ab2b98b60d73020bf45c11d5aee9d0b3e246f72a7795cdf770f34a34f8c097d3cb5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/af/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/af/firefox-75.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "0a901248b2ebf5a8cf9755abda8bc170a295f65fca461e39d4957595295b61b7be91af3d5ce72c20fb1848a2d2bd017d6d6ce1e13415383d1087bb824a9e56ce"; + sha512 = "615b948a59066bf7503d66a3fd574fa6523f85765f7e7f84d3929a78ef82b4833be6e810eeb95e266e3609e943703e1c84a0f7a26a542fb5e8a8bb0fcf379065"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/an/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/an/firefox-75.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ce2ccb8f33acf35b58462573efe1ae5c37ba79c6174340b0e5391d90f826b2ba40aa1925d1aa247f15ab4f1272f552a15167019161f3ba53edcb6b994592d83d"; + sha512 = "070d250a2a22ae6b97efc618fb65fe93efe209b82aab53f9c13d20c3c8bf3fb9b84e209661d0322759a0dbed68e17c69ce6ef24a53d9dfd3186f1fd987e7c60c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ar/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ar/firefox-75.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8f7e36ce99b292084528ff29f78a85808f9259d7c6f6b20aba1a1b20de97238a9efc5fc6aefb6ddd1137f98a27e1f6ce62db3f8bac0fb2d8a7659a6f1ffe7049"; + sha512 = "36f7e51b0a1b7eb1c5df858cd0e90c301c162bb0413882dc3e64ed1240b4c81fde26eb0d9f7d813ce92c8bbae1e87a98e97d4a6360d765fb32ffdd84298f7f37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ast/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ast/firefox-75.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "042d6eec61bbc6d4b98bae661ac3fe30120ad8c732ee450b363cc6ffc78ba8367eb72d42fcf6244b72822d6a333045d7cbd38498ef12901566d3b2576d34d181"; + sha512 = "693cc4eedc5ec9a058ecb618ef70b322bc55b5a6159f480b219807940061ec22c92843fd288252ef30341dc1e42d0ad63586f5b9f438011726dc5fe88ad6037e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/az/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/az/firefox-75.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3ad861f357fb538d45388b9b2959043b157422144e426053e84b3094ac99a61af1bcbcd4697ba4da9bae70ce50915aaeea62b82f03e465669c54c9ddba4482a6"; + sha512 = "9d78aa451a95f5c26685b6065c93c77c7b3f14db6cbc57ceb0b868a30ce2a023d28063d4a14b5617f65c2ebcb6eab7d2ec6ba2eab0909e44ab3f25b2b69471df"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/be/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/be/firefox-75.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "cbaaf387a9cdd6918d0a8dfe81ce02c0c6de644d791bd4ffb26dc84679a2129abfea068569967389672d7097e03c73b8999466b816942b14739eaa9d4c7c8772"; + sha512 = "6b898118e72cb2311d6230a2a151505c1927a35060bf703da6ce97a5d0735b06e56b163d5e5d4542931453923cf5e0afb9b527d2392e324a509da5185f2a2720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/bg/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bg/firefox-75.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "7cce07ef87dd0d0c2a7040238c2a3f9f2d52eb2e13f1037031d5e8e1c9ffd4b64f018b2e6ca76dd3bf9556603da2454bd5e0ec86af9bf38b4001fa9cdc3f1707"; + sha512 = "b9a12097e8312c099622c3f506c09507a9f3cb25e36f25967001c37f3840916f58c6693f272725ef3a35b22be916c3f4eea78b3bd0ea4a110647a0db53484cfd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/bn/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bn/firefox-75.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "3208c555544130df757d30a89769b9ed30a458712a109868d5d2d09212caba02b5c2200a30ae12546113c96b6ea32996367013aae11cfcfe358cbf60f2a26f87"; + sha512 = "b396e1e57c0e1cb7d554eb32ff4cd92db5458c5c232855bce42765aa2ab0d387ccd817f8a06624f84122f74dc1d5818992e9ca18138085a2f164ae3095485e14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/br/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/br/firefox-75.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2840bc7fda4e4713dbba8f09c0295b8c566de5aa86486db33be1f05b56ac02204227559b546b18c4531539e3a4beec13b8c61c2e9aa756bb38329a5dc2d6ab81"; + sha512 = "3aa6fb9dc3300b38038873e5fb06e40f4e9adbf30aa6fc4f3cfa7ebc399bd94d3464081f304843e83d4478989874283a8ae1be5704d34f4e43b2a699aab31466"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/bs/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bs/firefox-75.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "c0155a15069791538342d767e36ded097deae8ba66b27f6ed34ee00b31ce045fba718e58452dda47b53fa4f26dbc44420b5d1c2d6b6610c5a57d3a58c63eaef0"; + sha512 = "baf9e2909320fa15c70fc4a37e4e15a89726079d49d2a7edb72dcc4908b59cd8a8ae4917c1f4338063f5b85b119dfdd9c8d0480d71dd4fc45cca77ce465a3170"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ca-valencia/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca-valencia/firefox-75.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "29051c03f47f5c7d9c9b1ec62d4e94b3732f2e695f92300f1f035226cd81f308f3bdfe987bdbfbed19b15618e89bc1955be3086828a6f495488730d7cc76b014"; + sha512 = "a3e16f4ef89e8ffa65981cee1ed53817dc2ed235f2f3f7b9ba035db92ccc58893b10f5719fa7c37a400bfb9da07309f788c142e36e5f7a91e286d7f0d9ec3092"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ca/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca/firefox-75.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "8cc5c4a3302cae8449fbb215c456073a03d86cc555737ef0481480b695ff6e72d59a4ec54d8205423eb588f4aa9273711a2a61722241335d68461aa6597ec4ad"; + sha512 = "a68a75844cf22ecccd407f0478bd38b3ed6f19cf8e6b32cef2c9e5e6d03eaa621b60be924a649c729b6cca3dbdeaf518f56676cb0bc295cb50ebb1038571e31b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/cak/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cak/firefox-75.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "ba11aa53222ad1947a0a8d41b2a0d5e16afdf2857a0415e28c21fee8b27464741c0d10f8655182c5b2992362f040290aa6dfa720b3f76968f26407e9e9183ca6"; + sha512 = "5759039f87134d0a1653d8175c53a0aa8a71379cc4aad75831282956711e4fe485e62040c3325f24684e2d676fe4208ec4319aa959cb29c9682847b35906589d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/cs/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cs/firefox-75.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "59c3c417a4a686ab3ef0073f8e153964f2e516c98f6772cb1be93e6f25ff9d34a830042043ef9ef7436445e9932f862f59ac1c00ee55cdf273f4c514473df1cd"; + sha512 = "dcb7a5c9b89c524e61f7a99a2926099cb7ba088c7fbce82f3e8450b00554efc587dd7c4b757b6567519f0ec928edf50fcfd438367c37b48a3bff7d1ef66b4d51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/cy/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cy/firefox-75.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "06225ca6ee4fa5e7b4c790b0904faac902ff260acfc52df60f87d0a146c6bb299b74ce0163ffa6c2dd951bb8a6abc79f99ceff03ddac1481c548eac7ab717708"; + sha512 = "e788954f6ce821cc68afe9428c02823870533164b36123d7f7a9bce7a4d82392606d397713e8cf28b5360dc5897ca35bd3ff6aaaafbabb7fe5106462e8f687f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/da/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/da/firefox-75.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "0e0f3db805b0d63182060cd94dd0611ddedd2bdb0e9dd41e29ab8ea5e14c31ada265c284000de07fb3315e83a5c49bae7ad5d7976bf6eaff819de80270a8eaea"; + sha512 = "4a2da0b04a3f6cd6a5dff9c4d575d83b8ac195d815d4bc64e1bf59f5993c4b7e26fd56b81d7f0c5f6e5d084365b4d21477f7d554ab06a4f73400b8c484ad0fcc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/de/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/de/firefox-75.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "35a674acf20ac903d208bad89ff681ede7fb4c9ce2bfaa3ae0696ccdfe38e065c8e19cc9afbd711aa3ef0591a3fbb0f196e71e2bb2d3407d9084f12b297d0eab"; + sha512 = "6dd27ff5b7eab20c2548cb0dded8e677334b58040ee4e15a0d1095cafaa209bdde069d03b87ea7133899093375d425621bce7a9a3816f62aa603e20304be56af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/dsb/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/dsb/firefox-75.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "7aa789662ef83d31d7bb68ec95405becf328df9127b02d128638b6726ace88038b75b94262ff12774c2f4538e789ac75d8447935b0160b7967b8b46b4f576d55"; + sha512 = "abff1c0ab591a1c2572e88c25c785f218bfb7b9d86c415f4390830f4d0e2ae97f9ba44d2f0a552356fcdc2d6ef9a238b6d00f1287132df60348728b63fa322bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/el/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/el/firefox-75.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "67bde03970d1e5ec54badb0964ff2080158e49c8f6a39243c58e7152d17d7908ecf79c6513e1e492f2816d5e5daa31bbb60631be6d56545b55a37bc36d3d1fa3"; + sha512 = "9bfa5257fbefdc079f5d372d7feb3f52f52a33137367676e141a3aa57b5fde64a1e6d218a6cf9d81941a89fb3917edb5f1c4883796148fc63a32c55554538796"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/en-CA/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-CA/firefox-75.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "322cda1175c9550d10317149761f7fe4bb0a518adb1a7d4cbb96801f9cf3ecd86ca23b30109ccb513b398c1de7e4c9d3f86571a97fd8b3904c81cab1f18bf45c"; + sha512 = "5b6ff6a0b422bd399a5ac2893e187e4f46c6afc106aed7177d3f3a6a9f72c5cf283a589ec589625deed0ce4e3d7d1d45cd9d8a6c7015c48b7187edeb1c07b129"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/en-GB/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-GB/firefox-75.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "80200e9e82544cdc88d39d620be89c6794d9f9c094fede1f3b0dcc59ae782ae1335954a8ef230ed30bb4295c067ea9bb080bd1415fceda0acec1f7886c667d47"; + sha512 = "03e20bb7811ba53b2ae3f051279c478b4a240ad9ce0381e9a15daa8d04f15b11446456b05c84f41c3f628e3c7166ab2d19b8074c77b7f3190795cc4219be9be6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/en-US/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-US/firefox-75.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "6efa1ab5c884348ce011a5c3d370f04941ad37d14fbc36646f650ae877f2d3fa34960ab35368f8811132127d205c9d00bbca9d8d40f01a4d32f126bd20d9b0c1"; + sha512 = "7cbe8df35f61d82115ca1e4db4dd2e17cc96ba74cdf4e5e48aa4c1f5bdadf4e8b612b6ab58a09ce1352129ccfa68043ae92836b175fc5c328c3696f1f3426107"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/eo/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eo/firefox-75.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "afb711b4f859997c26973bb0c76dc1f1b30c2fc2b3bd7bad29e7a804d20cbdec746678767fc906f18263fecb0d2199ee96d569f9d13d7a23070804f7b2dcc3e8"; + sha512 = "933a872f25c6377abe21e33fe56a3184e605e299369cf11b84c0fcf420336f119abdc9568eb81b1e51bb58228616cab4c7171cfb8f8e40329bffb377a455c832"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-AR/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-AR/firefox-75.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "8411449eb3699f43d2c430791b31f76d65e446a171757a6f6a461966640e23ddd94bf94f832537b0b6bbc2f4618b7384856cbeb2a8a5e0130a40ce9362561ebc"; + sha512 = "5da5004a2985fce3a6dff5461f2c0fe174d3ad58e3dd37c4535edcd0883fad6f5a449f9f898c5bde5de3aebd9911e87e82c99bd48a06e9d953e38666e3f8fdee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-CL/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-CL/firefox-75.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "20400f859333966edf138b391206595c8c57cdfd57803fcecec993d6149019662d02b31a9e7c82bbbd3a57a827f29940ed1b4112a73e4cf4be6a1f327e834265"; + sha512 = "c2acae33bbf335d871ef14e27d197f4378e8ad1a94b9ba2df28497e4a72fd554a1d9428692cbd7cd5e3147f575d7517dbca07b3edb5eaa66c390000e7cbf5a7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-ES/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-ES/firefox-75.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b9017bc5587d16dd2cd5f1d3ac8ee6eda2768a4a6f15fbd05ecb437cb9cd341bf12a795a8dd110474abed874549855550af1f4d6836b13c4e020f6b66ef6f7f8"; + sha512 = "ce8ca7ce217bde7b42c9ce6d64874d37306754ccfd61f0b61c898e22f84feba6e30a33468b9766ad96f5ae8e6e674eab93881f36ded52f010216d8efa5f77907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/es-MX/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-MX/firefox-75.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "ec482c757317556b4e77e46bf885d99824b4a48577e3efde0c89d7bcb9464199c005ac4aae380294049f5c72b1f792c41fcc6592bac97cf4b7961925e82a5f58"; + sha512 = "fe32f01fcc01ccefaf7207fdc56da4450fd17928185382cd738d7a22425b5c3761ef60d0a9f7d35d314d0b7884859d614f08903eb20fb0a679f27dd1f4b136b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/et/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/et/firefox-75.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "afd3cf4f9384cccc079160f3bee5a87d0ced59387b1ee653200c73f541bfaf414f983110e29ef54bf45c869dc7b9e82f50baad2691c0bcbabf1f2f49283ba144"; + sha512 = "fc1855e6c7bc19f181c7e87909a79e1a5d08ce1fd38f52d65e20331daec8af8b54c1bb7f90eb1c3e53c900f141ae264f55895f6fdd3690a83945a26707eec27d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/eu/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eu/firefox-75.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "b09cd73ed933b56266955a82ebb2b6dc0f9f6ef372680172e5198f4ecc369e9bbeb98cf09a6278c4363c9a88c3367806453821da5293fbda18cf961c09cf94b5"; + sha512 = "a285ac60590113e41f04a85183038ad02f0d7e24fb42fe1a7b313eb6d3fb5b747ac5f90364278f7c8cc3f35d0ddc86c0bfbc7f7fa7ed2adc56ef6c77c5b25ad8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fa/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fa/firefox-75.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "8661510591646f2b581866a2f2c1816eefafedaea05f7daffb7a4ba51423de1390f9f234b03021ecbc1a344a2537585ad1284d69efb5b0e314d53cdae09f194d"; + sha512 = "84ee3198ca0cd8a3b20f4c696f6c08b94d35f9346e4443e1d6d6ef447d94a20fa1d58488a12124440290c4ae00ae827ee59c0cbdb7905210bdfca0c012f7e01c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ff/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ff/firefox-75.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "b42acd23ac34c4998e1cf27a1b74d12fbb954dc65ce7351d7721f91c16338e30239c79660c8d6c07eedcd9601fff6d7b7c94b69f7e86dbaf8001341a9bad8b20"; + sha512 = "f3b615fc63b12ade11fad5b5532d81741147156ae84d08b1bc3c0f43f2c204993601e1bb363ce7e3ed7ed3a5d790428ca51e3cb5decf56f159bf7a25e2e43a83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fi/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fi/firefox-75.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "25ec4fa9f055d2929d400614442bf771941236d6b54741ba1961d6775c070612367d61a23fb21ff3a8773b55614960e722372287c98079947afcbea6dc65a0cd"; + sha512 = "b629b55fe05c53ef814b091ff5222704afb3802630a5f44047bcaa17f8140c834725eff9e51786e55336910c462ac07b956878b551a5a48190b1ccd2904e57dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fr/firefox-75.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "2fe23f3c5b82b831f2cdc9b07381160078cf0ff92df5e464d249f896ab9467b8e4464d5415267014b9f620601e7bdeef884fd1eccfeffcd6c0df454df4c7853a"; + sha512 = "1794f58a31e91916492319091437ad9e5bbed95b3925854f744e6e635e9fb4c06abe73f9fed429fd04027c12cc29b63363e60a0c099640226a5a626a428b3002"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/fy-NL/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fy-NL/firefox-75.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3620d8f7e24f31a261c73fa6f34c88761148f5ddfd3341575e12e82e1889dd59d0cb21ee8bdbb43b92d9033d274bc4e98ae4a29adb95a750f07abe9e605a4f03"; + sha512 = "3aa9f95eeeadd81d0ecfa93b1df9b1b455425f430968395bfe65e60a65c6aed3d9316f842673c2638acffedfbf1d93940086f6b7a113496c7d8e580aecd8f25d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ga-IE/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ga-IE/firefox-75.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "75362b8c7bf608a2049d217a442364d0cf3e7dc31419997e43cb25a821d8a31e1d923a2770f9b360cb32923e4338c16718697fab9b16c018a7670299d55da462"; + sha512 = "43bb9830e38dddcc59480a7e162214e37ca3516cfa0d773c4851ec60f098837ea2849917eb460ae7e388612619b13cf29d26d9b1908a8734b6fde1add36c65bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gd/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gd/firefox-75.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "e888397bc7655e55c4c91376b7165a1dcbbd320e591cafddeef7726caf8c7eb5acca6fd82600ff05a22cf0e1514b9a2cecc8d34d8ae75142cf47a2134cd50407"; + sha512 = "8cf151995af5ebfaf9f713dc7373b9ff3d12ce582c4fd062741eb99e291aec68fe636d871709ee0a0bd628af0e9f1a412a12289c539334783c7a5d6b6b0d4822"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gl/firefox-75.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "66c695344af848e4d96c727abf72cfbe348dab0eb61cdd24feaeb462f90aadd55b6115c9e6ac6af7a3ec0691f2d8233008915eb51303da637a9b6167336347f1"; + sha512 = "da133c0af8546ab62c335faded8b35f917af2cc7fafac8cd22db1e3a867b390de60a2bc15adc7687044702907a675eee42b049cde335d41a55894537dd137fd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gn/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gn/firefox-75.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "c266adc6f166a57994ae92df8df47c9d6fd7a406b4d3b0f157a33196b31c04b8ad2fbf5c491b80b7fa200c98887b4b4a5ffd3750930984f18c8c86bf43d6b956"; + sha512 = "a1f6063560d70f81cab8d40f1f0e28ea866f284ec94a0093fe874c96795ad3e823c202e82dee2de7578f3ffc1231ac0e8bdcc1a21c44107cb1d4ab56cb56effe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/gu-IN/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gu-IN/firefox-75.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "4924605c3be69db7639708e76cab66758c4bfd217f8a1bc1340b772db1d31f5df19099dc30ca3422db53a7bddf548c87e8338535e1454fd4d9ace57a24b71832"; + sha512 = "60123058d668641a6c48a7a6a4247337515493267b3489a16e9f7fa2d0ab1ed8a5382974705a156fc041501560b8f6a2be3a97b47ebfdb5f6f527e63ac5acbcd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/he/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/he/firefox-75.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "faabb65699d0c83321178d845d7831c82078dd592d6a602a6b25eb56d5424c4c479345cd4ff331bda79e9dce616a06141973bfd7c221b20b3a8ebe899ffa2130"; + sha512 = "7693bad7f6505cfd1718e8268611133d26826adc49003eeb6d30bf38ddc1908c39ec270b80e20463c016e4b367ea8035dc8c9707b410299581e1b09df7a08df0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hi-IN/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hi-IN/firefox-75.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "6d331d8ac6ba025785b49af71067bf2fdc406caf9f1c82fa90e26b4f56a1a2eaf4043fbf5ff6a477ac69836377cfa2205e029bd9125982b7c4076d90111bae1c"; + sha512 = "f5b58f3507852cb2d900d1398c934bb8de725b3578d1037d424f5b81d7cf2e0a247e6be50037e027649dece8cae55c579f81205259c93f22eefb2d67af8b0d57"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hr/firefox-75.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "8229ec61969f2378f02e49f5071b49417c871799986a8ff9a77b177aa1753d410e76eef80675facc76b4c55799ddc4a16984cea4e1a321a96090afc98e741abf"; + sha512 = "6504e82cb541bcc9a893c5adcc063a8de3b85e68329d3e5dee0a461a0c614b330d7b59b6f3fa0195a01d69ee011017bdf999f95fbb19ad25136b291feef1ccb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hsb/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hsb/firefox-75.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "d78cd5a9dd7c5049e9b705412268a568b62e2a56602896659af9144ae9ae2ef0e25b7da6d470c7423bc2fec3fe14487b7d966ddeba69d5a451c6e3558808edcf"; + sha512 = "6d0828ce7c721aecdc66a1df441cd7ad43a1e96487797a414a5a9843bbee6edc1ad2aa23d82edac7b2bb1264a0880b1852bf2cbab184ac1f5f91da99fb4bb06d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hu/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hu/firefox-75.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "e0da837fdb4071e88bc74de77fb57367eb2d69fc6f319b1672c32e3d051facfbacbc93806f5067674342898cf9adb44158a99882c66428b65427b952d53842e1"; + sha512 = "a252051af8e299e6b21e9d601e54cbb0413d73eebce693403b522354cb0b6ceb240ef70b50c99ab55379d2a99a0f268483e2b0a02da3f9684a5b7a958b732cd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/hy-AM/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hy-AM/firefox-75.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "6f9ad04f2f48830cdbb1c9fbd781f50199593fcd3da0b8853b305c6c61dc627eb7669968aa69beb1ab6c0c93ec15a942e85b2984d55cd40d0b9447e28db458e5"; + sha512 = "aca7eb55987d98d69f024ac41414fc9394c8f05949bde1880d191c3b09bdea4798baedb4a92119faf923e5a36c760360d87ecfadc771a57f6425302483b6dd08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ia/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ia/firefox-75.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "4e399cfa525c847a0aed0b1c46d85bd981af6a3a68b07ec63860d53cb0d0e9cd004402522e2b54ffe81d95a6b594fb16290d9a5e01cff5cbe7264bef5e12a6e4"; + sha512 = "e23d26cd4f7cd40610ca841fd2b8be72f199eb2102560002c419fb6f00b1f2fffcf5fad6fd06c6e7a0146d2b7525c006e6dc696271f4bd4f5bb3bcefb8980e9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/id/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/id/firefox-75.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "50255eef2e33bb5737826a9864af5837e3b5e626e22361c5a3fae52a84afd0469d3de1db05317f1c8734f34c0a3e85e7853217660eb8fddb8cdaa0998535ebf8"; + sha512 = "f8ecfe334dbcf6598cc2241c56d6496ccf0755494d11c26e2624803d3f1a6001944d8c9b78c62bd8bdac85fc3d1e60b90212b8bd8b2842e0faf6824a1651a31d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/is/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/is/firefox-75.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "69e96b479069ef1bf07df49cf77e623ed56d71ddcb44417b5d8b7d410bcd93f18c2a49bbae6a128e16998bae99617aa2128aa2d13afa0987f3b3c98cb9f39a8a"; + sha512 = "9ce50d9746bcf6384627a83538a0e023091b7f264c6364e88de2bd8ebed0e081e1d31681ae0679d2a88f462bf9e04d7e9cd07826822cff3db1a1d338816875ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/it/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/it/firefox-75.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "a240412ffb762df4063532b6c07b5e1bed86b9d77d31ae2ffa58b2e7aa596ce6ab906e03a416039cea1ced3904a152b225106690e2f793c4061f0858fb807f07"; + sha512 = "9284d8657a4097696523cc07217908449102f46dba9564f98b2e4889707082be4cf285f889f650ceaa92e06f564daa19691dfcfe95b0b4a865987b767665b837"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ja/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ja/firefox-75.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "dd419563541b90833e50f3a65d54638719df741e5cdbe53d6dcee39f7623745925cb6777ec07097e9c25dd69deb0c7a183ae26055e623869df6e7a65bc020c6e"; + sha512 = "68bfe86b27d5d5d71121735a627e29964b2c3dd70e33e12f8ce3a9d380d253c33bede8d33eb7f0185acc68deb388b731ae6b40c7d71ac49c6fb5ee60e44e787c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ka/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ka/firefox-75.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "a1ad0cdb38c4fe1e2d87bf076cf16fb463f9f6fbdc60173768807570b6b1d4b7ebef9826d59e8666aba4598282556787e808371de37935c83c870d1514b855ea"; + sha512 = "b784f5fcc063c98481ee3eae767eb3df60c9ba4464fbb612cd10bbdf1abf54f5b2098700345f2494358de1ced339f1fade979ab6603f036e4a2f76b25c46a33e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/kab/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kab/firefox-75.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "d7f80172e0ae8ca780ad2f83fce0f75f53dc9a86d14908f14bf12c36ce4beededad592db90f35981e8c86ceafd41075c561e7b9b45340a27aae4489fa6cd8cc4"; + sha512 = "ac26df50c827efe7fecac013ae417a4b68d2a49062ec9fd443f5ff6d47646333ccbf6a98e92e0c8c2d5aa293b170336752c92d33999e41e3ed163292a6bf3d0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/kk/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kk/firefox-75.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d7c42163e48e7612d819247300a06d99f474a68016d099626c7493d6a836b9f6a0b641f686a2e110fea76c1df2f91c9d1b768c90011f9001cf708c5c4f6e8d95"; + sha512 = "47e516fc9fbba8e5b57fa3172df29fccf8d318fe1431233c2d70c5c657d40f2a8af1b20daf5e3d6b3978ee093b1d100dbf7ef8838385791b58ce5463d6899946"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/km/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/km/firefox-75.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "3d9e3e5d211260e5816419b77b9dcc8aa77bf967c795949f9483978ebcd588928b9c36cac637d7f7601239278cb72860a2f047e22c3cc9af8fa8ef56500c6fe7"; + sha512 = "ae0baee8e59fc4d44ebf57d7f708d3f30126989e4bd32309d8daa4478facfa4a929a96972acfb248eab0a1e04597b2dd521a4fee40f748fb0a4f6108220464de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/kn/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kn/firefox-75.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "ce3247275a30028580a0797838d7040e3f048bbee92684a39abe65a7d0425e883460aed711d4d7aa88295a5423a09872fddf51ac0d122fed50ca5d370fa27a84"; + sha512 = "c0c37e1b36408b0d8a4d34fbba254a6d6b37c80287ddc4abce88a623ba3fd5b92108509bee27bbee500abfc08d364886ce8ed5b816b9450aacd127aeba39df94"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ko/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ko/firefox-75.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "a869918da7166a3de1918115c4fd080c0e17455bfcb54141332f5046fc546e4cfeb301640c5c1475b5b562d6cc7c29bb970423982bbdaeeb5da469b59262c6b7"; + sha512 = "8867aa119becc3e88c63096c5ebfb2bea3a396cbbbc18f35725d5983df098543827bf6c069292322507b871263f744ffb411a59437687780a9dcafd276d04410"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/lij/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lij/firefox-75.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c5cace7eafa3fd6572bd00575c2e342ab1614b9647ba0fbe5b79faf65bc89c31deeca52fbc7618533dc48f6d60911a4af0020cd40fb28fc33f1c1538d3c3100f"; + sha512 = "c10c9dbcbd911c3ce324aef23629f37df959797128fcea7373f3d77fb8b3d538850aed797e754bd15edf59e666412158bcee2c1a9ce8d040d1b457de9ee007f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/lt/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lt/firefox-75.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "a53f8f6c7585d2301a8490a75ee7e90d3f47b1503e8521b1b80de49a062531749c2302b92a2332b5cab7f9a4453dcaddf623ad63c5f78dfef11ca190bb73e6b3"; + sha512 = "58517b58ac3c51c5aa2fddc0b5a458d100d3eec44e51c6d188a85c2e7538caf37cabb1440f4ebdc97d54d3677697a5fe07235d67ddc5c4287bcef10f9b7dc3bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/lv/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lv/firefox-75.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "26e7d07a0cfff802cd2a52e303af0df2227bd40616809acadcaf6787ed302e8ea5686de2a1cff800121f3899120c77de4df4eac246c9768b741b5e5e411e5d3b"; + sha512 = "9e07357febaa5b67eafa435d30a2a8f75f2ad25d1e87968cf71b8a265a647ea0020169d6f2cd77c4779dff905774664f84ad26fbcc8b9d4c986dfad52000e175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/mk/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mk/firefox-75.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "e07991906c0c4d73a83205add07eeb7522ab51d32133f9d3601dc0e99479073f1f55e617913f7ab02f5022d898aa023d473652577d2e48e86f6c5d87635940dd"; + sha512 = "249c45bf3f1b22e355bcfb4f5afa829163d8d1d72a8f192111eff2158b10585152c9c2dcb2fbc9ce66d8351d83d83236a04b42da4607fad92d2b4e25acdd39a4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/mr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mr/firefox-75.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "ce1f14f12949f7bb6493d72878fe81642619fa00dcb35c7de6d818a25c6cf1349c983ccb3976b796673340adecfcfd344042ef59c0eeca159cd1c60bd59d18ea"; + sha512 = "b5860b41a310cddc4dc81074f01deffdbd10ec3f682aaf3d27881f8c190cf5ba39c428b7bae688301f8fb40ca12b3cfdd9377501a3e750ce8995e1331fc015ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ms/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ms/firefox-75.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a2f3a1a8152835045c944cd70dd86a8053ab5cbdde7097d6d2e3c06485717ef8efd762f97c81b88f8f2bbed5e6d3d14e6adf192b286eebe413529bb60326a742"; + sha512 = "a1b88f527ce9e4d9f69d4b727313a68432db2d989d360fe5716f896d61e7dc098667720a2c60e33612b43157566f95abe6f1b149f7aa507a9738753e6c3213bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/my/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/my/firefox-75.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "e6280fa3a25bd44bfdfd80ae28b6909417731a81dc86bc728d70a3baa35f29d172c9495de43a87911b36e5bba187d4aba3d6680204ffd62b966bf0044ee7f6b1"; + sha512 = "74efc375475884fb9bfa9fa4d944dde0f6c734d1c73676d37b80a909618773147f12faa94ed6570a6aab6652c4c5c32cf386ac096acc025ba6c8440d8d345026"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/nb-NO/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nb-NO/firefox-75.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d0ea04c9f898eeef36ee46918b345f6a307877d6aee8f9ab958e1600c74494e3851563aadc8a34f0997d285cc0f2118052dac009a0efec3034d6c3eee72d119e"; + sha512 = "c1d4eafece0ba52022c96fd939651ad047e942fd9128dd8c6bada79f2d0eba01311b4829c805eafbbcc53ec4dee34d14e015742a86ec67de07d84d6950fff41e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ne-NP/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ne-NP/firefox-75.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "2baa7e1108390ca2baa28eb55afafecc7a67e746d3cf1a883fa515c623a9aaf996efcc4d54b6ba661f05f1ee00ad607ae75ed286847e7f9e74713e1a96df5cf7"; + sha512 = "a97b467bd40e1564973b18ad6acb10412da67184daaad25c34b84ec2a8f3a840f01fe4b9720f4774a546a7e035338d9ce297eeb882a3df2b50f6a9cffa2bee13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/nl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nl/firefox-75.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e6c2a98851617b9d6e0f2f2005b049de15cc6dc89793c977c0566be9ec1000041c5f2e423cfd5e71351913765c37ed37e62b4defaec4c59b7d2c5e698dada651"; + sha512 = "2d84393b851618e1742616ab6f3b1fb21b7f00cd65a98438cf3a1250275b7b184f6eb0cdb1d1425293d1ecbcf4591fba392283596146a5b18f29166111cd8844"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/nn-NO/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nn-NO/firefox-75.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "df2ae022d88000d677a487f5c409d57d1ea703ca5a91770863da62f74ffd3ebf7e58e463ab9e67d44514c630b7226b7b623797dd2e90185341afe532311ef039"; + sha512 = "c5782ddf73e00481ed338ccc989b2c2760f15e2b2960457cd3cf6403d6d3ad5d1b5d34cc6194b3a1ddc83df8d376796802d4e945b8ab47b7b7e1a4d5a4387a6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/oc/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/oc/firefox-75.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "8c52efdaab0e3b9eb2f4e99710c8c7cd9d1d1e894d4c38cd877fde81fd52f5d135f039c9b8619995c384dfe4aa44fda37121d9e0cb87003b8e9dc5eb013ec0cc"; + sha512 = "cd3a3fde21ab21e08467ebbb45d0a2d32cb901c2b6807edd6298eb75bc089684f9fd26c0741295f2ea82c2e25cb375bcd1e45e26c267c59d12d285a00f0d0b74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pa-IN/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pa-IN/firefox-75.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "fdb7acfb49db508be8334685ce47216fe84976205bd83b159d5e573c004417d6adbb49f7d471af81edf026d417f2abfd5411d0e360ab36c1b591282d767873c4"; + sha512 = "546e36c717f8a0c216c32f53cb56d2fb709702052bd52ac1184860c7cd755f9f0d657b8955c3f6347c37d382600ff9cf5add261dd066e8881e6a3e410fea151d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pl/firefox-75.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "ef4430578cb71488d0bae269610d962603f4da4a5e7e614acb90f700f4d487127faf8afff3000a9e46f81bb6a271fc2f6b40f06c881bad2096ce4a0de38dbd8e"; + sha512 = "837bde42f6b9c1aaca794be4fcf819fcee3e3456a883743882ed6983e71f98ba25e02292bb01811958a9f21cedac55586deb8066f52939971c348e21ef5ab75d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pt-BR/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-BR/firefox-75.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "0987da83232c8319a890c8f0f62cf43dd9e0a8c82b8e06b3f1277cf83d6eb09e73df163b0a9faf420ac9db8924b1ad8ef84f1d0e81ea54682a831f941dd40700"; + sha512 = "81a2620aee0f210782aba431e7e9e15ab2a0db49489aa61cf7a6af5944e59c62f38b65aafb198355d5d49aa5c52e1052ba60c03b1772916a972ed06aad616f25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/pt-PT/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-PT/firefox-75.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "4c052c11785da470cdad1a098ac1b1c8527a49e88a735319aa9385f4139c8f5f9e8fed496d1832cc502ff34be570dd5578c6b0d3af93731891753d842d3c07d4"; + sha512 = "c6b317d17a14c5d5d428410f7e86c7b9089442bcbefdf1a44875373390d649b2f7eff26c09c5cb32fd2f8f42293d289044a7007dae4b075bb1fc522b63f4b18a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/rm/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/rm/firefox-75.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "462d3e3514141bc7e604fa9666800b30bb15a01757bdb8e1119cc0d97dc4d585a0998b94459ae92f9ecddbbaabf2f1aa342c13acb03135620b0706246f0f7e38"; + sha512 = "12e6c10fcc9419a66aef11e50969fc6adc7084db46d2cc6202a08e1a7225b797fdcdebbfb9dff6a441e3fcc782cb33753361ef37767e5ccff35af2efefd82256"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ro/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ro/firefox-75.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "47bc24b33127efa652d2223fd6a624b6d8237911e10b8629f7b8ebba3320a4133f5751b9ec62f2acde9aaa45df0f0454e12a8b9defb366f8d2164db0356880ca"; + sha512 = "c03df00b865bec9765d28bf0171a5eb6a57e3c8cd64a9002f17bf67d4d0c118414d6b25a782aa3eaca50d5997203c40e376562f64a252aac4b26fd8419872feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ru/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ru/firefox-75.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "57f796bcf9d755e49639af0f4d7e38878d8f0fa0a4466f3c92fc8ea62c5fe365c10a81871017c3cc83915f80cd3db40669f470b53303bf3433c618c87c0c8502"; + sha512 = "418b70ec07a966a51c101e9ae341b0c949476452b75ed00677ee87b032d592fef65e6ce746004deb0d89b94cf9e2d18ffaf1d388026bb5024dff0994dc2fb058"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/si/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/si/firefox-75.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "d028506d4edeede079c14cc2f97d7d9cc665ff54f163a691ad84da2731250e119ecc8e69dc4351a7bb58e9d2402a1ccfb26d30a2fac8b3881ba149c71fdbb9a7"; + sha512 = "5adc26e616a8116fcd5b9579acccbb402fc5c88ac334cbbaca2da48e246c7e44868b6454c75bea355f5cbf6a182346efeb50f7a49b2c3f92c8fa988d50e19e52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sk/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sk/firefox-75.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "f56f3c77fcb6c12539f1b264f565f371a7c4e5635fb644ec706b19bfb6cb10d546e217e06f04af0b5f96754c65f70f2c7008219e4428e7e17e76296f04f903f4"; + sha512 = "d173c26b5ba44a98070fff9996efc5a35a3ad90de128c5345a996c83d4a68ca7d09e588bd75530c31abedd9f20f38561e22484a45e20fdf66f1cce682dfbc31a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sl/firefox-75.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "e3e284a74f742939ec99ecae43240be1e4ae6ab3e600d08cc07aa3df41aa15d9685256f4b976eb83409884209b1e3bea8522d6e3855f75eb67b88a842715e5eb"; + sha512 = "1b16278f2f6e4df7cd437a7bb6a17b950540dfed646e948585cf0bdeba45630b4d5bdfc249d4fb49bf37dcde8a415053ef4ac3384c2534592ba189264bcf4e0b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/son/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/son/firefox-75.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "baad547898d92d1c783463a8defccd2b87164773dccf45c8c3442da063a4e6379ccf75452e70993d7cff8654ee37bdacb281a608c5786f6baf31d2dfd5b0cce6"; + sha512 = "7e9c5c578d9669f47f3871a4d47e211d2ec9215633163605239603c0fc51cce1d1d4b5c3c5a06a9c29c16f82c3ff2583fef1b78652c8afbf093557375e912430"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sq/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sq/firefox-75.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "c38aa06a66a551d609a343528275f58c4a4f43b99066e5bb40f7653a0f2797d516819424164ff9d31d206598cea68e74db7c5023d05edb875dab8b7070d6b800"; + sha512 = "09dd8df3e07b2bcc59e77c55ff4f9b607c5c2cd343d784a3bfe172cc09fe0fa31ea519bdf671206a16ae73fa9550f08b77cfda0e030dac455de4be16750ce431"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sr/firefox-75.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "68d2d885f01e5bbd2e689752822e8562ea2825e806fac97e8c356ad98be05374f2feb2a329524128e67e26505b3ad8989260df3c9a9c12e55e936b19efa77d27"; + sha512 = "5a4dc12d716185ea86a8f31018198dc4eae0f791b04a247d2f2807d88747fd52fa39904bcd440c9da2e0225e64445c20da7cd7df75198c173a39aba59326e613"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/sv-SE/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sv-SE/firefox-75.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a7f612ccb43b4df144f48a635d0135967a1ecc27c61e637605b08f2e2d3edb038770df691ee07d1f734aef7044cd52a46973dd907ae988bc20da4937f0d51ec8"; + sha512 = "7082fcd2db01626e90e6850230b0a2b51c0eb394d47604a76de5d03e30997366f7331a7247e7610dbddb16f50c2a3259a842be248614fd3725f0063138e18d49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ta/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ta/firefox-75.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "f172d687b513750551f2ae314a8d9676c3714fb9909a0a6ac1dda26dacdddc5cbb37c6123700bb43aaa25ed8d7dc725b92be36028d9abde9a1e27ddd1769affb"; + sha512 = "a85ff07912d369b915d543f9d06cf383a180bd14fd9355fce6d918506d8191da6f89c32fade5a9146700a95dbaa4a181fb513df1b8f28aeb7a09641baeece0ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/te/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/te/firefox-75.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "e7989468298980f55157554d8ea79a4d2f6089179eb813e66244489dc9744ba0c509bd45dde97c489e823ab3c3d7dc3dea0603228e025b998573001d6e51e786"; + sha512 = "5313549c22fba2a3bad6550a000e59c15595dc0bd684a14ba025fe2c4de9097a1dd47566b8f256f569b74a21d20538ae89182d5278af01c674f50e00d49c873a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/th/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/th/firefox-75.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "914d4815daae91dc0c0a8322252e026172ee2f8de3e08f5dc9cb455565540985928ff5650c5a597acca7538b75668d249aa123bc5539595a346046e9ea68bb8c"; + sha512 = "3f2b038b17553c962d2d964d342bb0884dc4acb4204fddfa90f8ed3dceba1aac40d537745aa32629402a7077a97cb01efd1225009ccef5412e14fd08d2aefeee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/tl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tl/firefox-75.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "698c3404d574501c9acd61a38d778730ca7ce1b0003375ab2ce470530cec3a792ff5a6d9aed7788af293edc246c704f7ee96352bef792d2a43c14f56fc0ede41"; + sha512 = "1bd4ac5a59a06a71fc5bdf976e76da9535d0adb74da0aad922ce5ff6101bc48a7e6727c3f2d37161e1ae48be2ec47c2b7f6cb614a883739a8fa843fc5a5602b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/tr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tr/firefox-75.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "bdd0aca34a6fdcec44af39a9db78e7d786586a782203bc98b6484f971dd09f45ab5976e5729a028a29adc4c05baafbfb5058773426dae329c7b09aa6fb2130d5"; + sha512 = "817d6e54c256d72469f5e1c6f6ffd8d95669193c3506a36d9cf06756847e074be018ad6dac9ff8e91c7720cc70811df2768124e4df85f34f2963a6a64e9f7d26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/trs/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/trs/firefox-75.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "36e2c6bc099ec381565afcdf36fc69e8a01234a5dca7500fd2e0e642fbb294c819eb869ecdd57bdb1407c2de224db5b6a4e6b82a90daceb77346f561f99cf839"; + sha512 = "f3d691e6f04658aa09b4f864f0adabc9c8dd6a2fc135065126ef124f025a5ce6768ac9792470d60fb436f8d21229a92e1acb6abc848b3b84a2026179c15ae1cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/uk/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uk/firefox-75.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "cf7a6ae1535b09ccdd0d3354e682e5441324a914d7852fde12ddca3ab67e211860e6f2e87144185b6348d70a6243899c48d29be906f915ddc12a025a72b153bf"; + sha512 = "679b75df8c1d2d84a7cf9950a65869484cdd20b0a1c016007280d08782c2ae2ef393bc553fa5c3c85177bbf922e62158fd57bab43b222327048753934aff5bfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/ur/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ur/firefox-75.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "976eb06f7b0de8abb1a512b3f142920ebc4d3b35ab719913d5d01201921ae3380b8c5da8dd3e18de3b96eb139deb69502684d6fd1d33e378325103204cfa4004"; + sha512 = "e4408eb34923ec1f668b7313ade263d1cdfacf1a748b32a6aa54c3c38886c8e1ea750179b0fb6dd41dc92fb419c9307aa2f32a7acce7248e460fe136af7f175b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/uz/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uz/firefox-75.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e0e750a921ac766d46726ea1c0073604dd4a17ba29713dae7ee42679a0b305c5723f6d3776603c79719e4100717a9cdc0b0016521a20ffee762b4f8cd614630e"; + sha512 = "30a9c63cab66e47ba4b7f8bad3b798e720d3668f44f230581c564e8887b6674d2df90b8534a1d9b28684b07f1b928585a4c4b46edf1e740e3541b60b5607758c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/vi/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/vi/firefox-75.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "12561e674ef47a5d1817dd535f050b027ce316c75cef5802a8e365a4568609e44ff85840d27b91e81b5c46e4595b7e52736e2a43ed495db63b74fb2e2df1b376"; + sha512 = "dea4cc3161f0d1a79f91b8eaa426a6fd8ee045d843261e7a2191bbe7addc9fa131b2d9455925381957f90e91145711be13fdc3957ec4bd8fddb8252b6f8bba3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/xh/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/xh/firefox-75.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "365fdd88ddf29ac41d5cf388ade3dfe08bcba361153d244e45cb1f451969044956ca2387bae7e5f783c8cf0862e89141a39f52af873533139f49d2539f9401ed"; + sha512 = "d1fa435a17e23f3228a767733e54d24ba000599822fdb507d3a6dc35d92485bb87a3a398c12750080f79ea7e81dcf74dc73cc1747f923c0015f4875bdf3e75c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/zh-CN/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-CN/firefox-75.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "29451eab0d61193258338fe19382c0fe2851bc02af668c4ab7e2702b782718ff80f5773622c7580a731214ae11a199e6158985f678f98e51cf18e0afdcd035cb"; + sha512 = "5e236fd89a0c099da13c65c00526e93d152258049f9b7c8ff0387ce0ed6b843504163ef82cc205b01e0a0f265602b2d6ca64aa04c811cc0a6e94d1a8dc952e9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-x86_64/zh-TW/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-TW/firefox-75.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "7724fd993d38cc7169901b6f589868ef3e884ee25b9957cd05b30b06a3cd25f3fd7d7ecb500c6b286272aec6031e18b5df6e03c739d81d92b73de932d4029293"; + sha512 = "5b6b876f3dc8c2bd22ebb183cd4ee16a9157e14d93951e840d14a11a4067f85975c72873b82e49d797f7e67c00df6898e423a70360558838e8a18d95377af4ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ach/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ach/firefox-75.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "8c1773be02e8f9c40a77ff4078ee4e5d035b891e7de70f412d22cad305b0554f87c77ddad8663ff0d0dd36f621b58c7a143364ac3cd5c8ce5e2c87ea81fba400"; + sha512 = "33ab7bae767308f01bb5d0a5bf7ad73fee8eec71d8393246b704702b81b46240cdbf02c041753e1910bd8171e36f380c77a21afa2f71926f25dcadcb2d6c2b2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/af/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/af/firefox-75.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "678c058ecbd6bcf6bb749ec2677c0486b94af43b28a950dfada30516a70e8ec45fb2c76e4acc8c30125d07e5b4fe7c4387d73ab130e57bcb8592318225685356"; + sha512 = "83842f5ca120205597b6eaa5f03e2f1d720a91cf3323fd44723c79c9aa3bb73e2c31054665fb32300f6ce707363a32d5d34859d7407015d3b4456c831b290ecc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/an/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/an/firefox-75.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "7512f534594f36aebd9f9aa2524f568c35d55167fe89090313578aded6e87404fd8df3f34bb1da658349374537146cb02cc3119a87346f2eaf1c5cc38dec0cf5"; + sha512 = "2d53551b4918ce86842645492072db26fdc50fd4eaa4edffaecf04fbd83bc597c469a5d795c62aaffba4abfd3d130752d96739fdeeb82970c35826d005af16cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ar/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ar/firefox-75.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "51a65a604f8adbb07d1ec59a8013e3d0c2e0658b2691714c64971203e463f8934aaf9d2e71bc1685c255172eb474bea0823d1205d84cc3a530befe80ed257d01"; + sha512 = "1e42d930aa9903adf8385b695bd1a3aa051d51ad494d1dffc5d2bc04ba95574472daba608c182332195d7d60069b045f2a5c5762b7505e14ed7a639086fef264"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ast/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ast/firefox-75.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "ed032607ca192adcbc20a03b5b5742641500ad36de0685524ce36b33e49f74f83e491b9b5c5278d8f62ac19f701a9e393470d608c4de0c855e3ff91127c472ff"; + sha512 = "d52c316d21089535252ca626b6774b65e5994a62732203200a39605d7a5bace9c681d1f120e1425936be212a9ac871c24f739dd7d91c0f371029083e3d3afde8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/az/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/az/firefox-75.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "a8583b604f720549ac3ec92fc89174cf8ac56b68c230e69d718662e1a788aa2038101a2d76199b6030dfcedf27d66659b78eb4e361c2e74f5e66a49ca8ca256e"; + sha512 = "121c1e51d5b58f9ac912d0737c23ec34471a4c8fe99287606a350e70890edf23b28c9c145d8aa0d29d567753d047d484a0156c1f004228682a347145c1bd85af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/be/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/be/firefox-75.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "3f917c28730d23e7d0c03053d0d86c8ef75c173e31529dc312d6d86a87852229c4a6d2727af2c2071959772a3deef5662b5075e52f37fa63b37c6cbed9cfa2e9"; + sha512 = "f7c3039db50db23a43575e5ecda63643214731703179a42007b2ae44ea20649dc9629bce1f9738f35a882841666b1c3a0ff4bcfc38ed0e5005bb2b6b058b44a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/bg/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bg/firefox-75.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "4f960a211d2838308000aed8f20465dee70768734d111b5208a04fdf71af00bf8d4bcfd352d5d5490345a9e21a05c13b8ca1a1102181f785f4710cc56e60d04d"; + sha512 = "d9853f385468a9644684f3accd7572f081395071ab62b4bb8adaebc9213cb8bad8772ba613a404f9a2f0e75469a6d224264ce5d00ea97fe2f16f8d0a044b3104"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/bn/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bn/firefox-75.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "7d8378c33447dc528937409dc1c0eec947ef7c147cf026bc7f0a78fe4e76ec692f0a7dfa964bd93fe5093b1c2caec39b42fbcebe92ac9771d9e3598bf00c2fc6"; + sha512 = "1bff545fa7dfc083f07c8546b5d2c18d1bab3ce4844fb1bb667d151c081c639b3fdbc2122e45230ab45bd5251364b45d937d24a7b285b69139f4dc544e525c7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/br/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/br/firefox-75.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "59a4dba230c0a8e5c7754ead9088ef3407669a4d9340b2f3736fcf4a3d2049568b131ca929fd12b8167e08280b6cfc04f843f1dccbf06a1d7826bb264dac772f"; + sha512 = "cd724a5c402333792e5d739ba274c87cef983d3c29f6371cc1788a6b285031c5150b21cab235b603b240da3551c044abbc283f8313c8dd8b0082677b65406fd8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/bs/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bs/firefox-75.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "65a44a974e5aa9b9e28a01de9e954dbb36f5acdbe2537ade59d9d956074dac9382dfe7ebdc7df2269d82fcd8b9fe5c73e49eff9dd2692c7a3690b1bc8e54ecc7"; + sha512 = "47770c4421d2ec0035b0b3c6158462042f792f4ac87887c6704be2f3d34c8409c3e0570c6827f87e72c4697f89e5f0e0c574b9e90704798e9fbeb80c20968aa8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ca-valencia/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca-valencia/firefox-75.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "6cd4cf9b69dc35f4f5bab782305b6b4fc5044b807a5409ed4a8b13836c551f1df233c77614b989767755ce5357d597b9cd24f0011e62ad298ee5521766931f1e"; + sha512 = "9d23f45405e98eb5d6534d19e09237f7488cd9a6310acf85935c0f40132a91ba2f355a15a46742796d1f397d65e4f17d599aa81ccba57f2acb76da80c2d95af1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ca/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca/firefox-75.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "2bf061c948f012281468a0b7cf15bb8b806cef95b2e7b667b94825030ea134d110a261bee14717732fc176cad78988aa2c6d8acdcfba851dc8ea4122a1ad36b3"; + sha512 = "4f27d129114a4db3f597fc253447c6f27bcfb566fb197dc4dc26a984f1abbd868242b1c0d077e6d514efe1e2e083378304ff490eaba26f669ccfb5a744d3899d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/cak/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cak/firefox-75.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "c5e1c05b9649521470fcfd0eb89a4a7467c7cbe9e8f15916e6d5ac4ad88dde2e4eb62527e1436a2e48dd4d6d3aba7ea28ffdf6615ed31fc7d4b8dbbc729af515"; + sha512 = "522852f4ced9302068b6251a33735846cbec73bbbe9ab0371e8456d3665bcddfc81bc4c258ecf4f0e5bc8f6f15ed27d3e4f88ffe471e9e8af4beeae85aabc949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/cs/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cs/firefox-75.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "1f0d647db99680521bdff74038fa31e9881a71789a2cb18f552bd770bfef25760231fd27436608fc393829c14b2018de211a10bff6890c931b8a78fb3af888e1"; + sha512 = "1192630fffc7bbc3232c8328e066f8392f967da5a2254ba726243ed7a681c321747a39397dec8b11c5ddc4d725445712ffbb238677856b2ad2ddea41c8db090f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/cy/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cy/firefox-75.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "b19948cfcb0f10978e7aeb859f3741b797a473163823232b20dd6327475df1a1a3c752769903cee00d048952ecca9f73c0de59300f596f10154dd150b58cde28"; + sha512 = "3a327e31faf8eae17c60f7787bd53249957e5177d38ac2138cade1454ec4bd870c429215f1e0a5b9cd124aa660cf4d77a091ee579d865470c5cdae0703086b02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/da/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/da/firefox-75.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "7978f11614514d9aa7c18007729645af4a3a50a3d13ac500d0c23ddbd80bb50724d7b627f62c7a6c05a74c9e6182cc49243b6a0a1966b433335d22fa535eed73"; + sha512 = "297291ed06c290fbd9ad6172afb790e8f8a619ff0330337f5e777d1e4ef17ef52ff1cb94b2966161639a28221dbc9ce2eb28bd9ad14029ebcb878f79053386f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/de/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/de/firefox-75.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "819a4947a53ff27d421af3e09326c2f0451eefd9b0d95dc7427bf600780a9350c0ae84ff062816d5599eef1b44e2d4c742ef2c07ab83ed9cdc0b7382972706ee"; + sha512 = "7dec33f42715250c9a765c7f3f4f177101c69f7150661fc844c4742434a8d063fe1bc9149adf81c2729e848584fd6f68d1cd3d697159a1d5b4ed46d8dd9ae9ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/dsb/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/dsb/firefox-75.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "2e688088ee0c3712a5de56d855b013ecae815c482584711a4a27273f6a17a692552b70b2dc9d9beb108693b2c095c2e7365e661e8fbb84404fe27736964d8b88"; + sha512 = "b5d8c78df21e8f8f1d96ddb042dcbae44b4d622d6d39a0a3d7967e89004e5e229aee84842b6fbacc90ae3c65bbc252a9a879b552a2546ae168d7f07cc312d207"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/el/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/el/firefox-75.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "5b703bd93ad3e43027d2f85ad9f2916b9103d69a1380ffa529800800188d3227837ca84f835a6007197231ddc9f93bd60f00bbf8954cca6f14702eb4ce101292"; + sha512 = "8888a897dec9005edb469d27f40ce9ba3446c4ba713401f40955483f329114271c34a832afb93b48e0e41adfc1910e4813f79fd619a085ea15443743a72eeba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/en-CA/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-CA/firefox-75.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "c94222ea766fb7d8131686d9ec3c2d3ac59e8a91c6d1e65366776eb717804120c4221f8568a3537fce247f12e2f8085a22df6d31a405a1b654a074727b4cc1ba"; + sha512 = "713522e5c5305d111bd1eb55bba42cf201da74641593506b191ed1ab3eace55c1ac9c9a86182d667d7eae2bb4cf6fc9ddfa1ce4c8d31dcfdb0f2fab587fa6a8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/en-GB/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-GB/firefox-75.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "24e91c045d36be25346e598af8d8ac187cf37b2c790957887a7d3fa42b102dacd05c236476ed1dff20e21d51c88aac2d5123352d868580704a0dff88747bd62b"; + sha512 = "021b66ac6720deb68e45b1bdca86d8aa7db2e74cfa7391daee108cd002dbabc3f6302f380e6c029c7b56781dfd9bd34f8cdc1135851297e4dac9dc56f762eb69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/en-US/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-US/firefox-75.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "19e3bde2ad51783ca5aa492ffe9a097e91db66a5d18c28c6ea36f6cfca7e14e41172cfca9f9c223bf42632c2235fb5a942ffac470e2c210d1b7992c75c48beed"; + sha512 = "feef8046d08aba827f6dd2510cadea53a89983a4889c9c2baad3d88123639b90c8052b552e2bcfb03b6e9fb43ebda29815825ef7fd4d9ca867f238cfaa0ad1da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/eo/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eo/firefox-75.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "160912a75ca11a38c360924f206ed7baf53e0e0be4d42440c10e3e7e3a9ced4f4884db329917954af23ec5bb01b70ea7f567310c85242073d3d13c4ba19629c9"; + sha512 = "49b0adb7c5dc8e1b7ecc121f65e8a6853f497a9cc151b4eb9ff6631af33b12f7b00186ac2d13390cfcadd9fbd1b361a597ec1d9da62b1a0466d85d8e313be4fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-AR/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-AR/firefox-75.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "cfa240589014caf944d54971f7ed8f5b2f8656b03bffe7bc28628e07198f308406277b4ae8584a9b79d2e218f952f22c345982a264a47a7e2f129c297da134da"; + sha512 = "a74988338fec99d50f5a16ab6c59630ec1e535338da3f23f05c7967bdeff41cb058c238ab2e873f96cab93db821ab066e6222397761578a12fa73b42c0ffe3e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-CL/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-CL/firefox-75.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "228cda9199e333c030b43ed1fcc46d0f1d782f904e796f546092927597e661505477634219ea518972764049fce3a9db2e1e31ea766caea612a765d9532b5f50"; + sha512 = "b4abd3f7abf1869bf360f5987e13c37b142b4c8afde51c790feb2563351a4754f385e0880ed51a1cd7aa3a5ed907e3cc22ff3c707d2923c47459c977cfedeb08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-ES/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-ES/firefox-75.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "569c63b7b4599afb94fc725242661ae33d01de58012dd6bf46c020b55fcf5fc1dea1a95371f36e68aad6ae89f7e674e99e96139553fff3839a60a6ec36c418cf"; + sha512 = "8a9c61dd9329c983c394c33c97c962c703fcf51a283dce09bb781d96879450adae5d8d78ca9d0d1892380fcac7ab95651e37133a0f836865a13946e2cb8a7e39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/es-MX/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-MX/firefox-75.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "debb715bf2034640e573208b048c4f519a51a3b34c4500d27452f25f0f2d939f6812bf1f68856699a776ec8092696954e409381178b3328d417e97747f8ab720"; + sha512 = "a1b7dc0eab0d4a8c713e27620235617a244ecadd62a125de8b1b60de7811a4d7e65051569ad4391b2a312107cb750c74d4c541c580f3af86b88b2fb84d93ce67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/et/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/et/firefox-75.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "2ce02c48e6fc9407a09f89926e8452c385e8df739eb014f45d0d286d11d5c3f9c84220c99379ee7ce20f658617c3b28b8e59724c0a62a5fc961dcc47a1172cd8"; + sha512 = "181aaa954ff9024a4efc211bba348461c28b892b1cc04eb50989cc8da78d88a350341de520b4a60da096ae399c28ad05802aeb73cf133171e8a4ea2693cce5f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/eu/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eu/firefox-75.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "25356e53f1334cbcba60d44739fcd69a03945d923a36dda4accbb2a471927df1977ed956f993d510d60df8fcace4dfb2fe773b49f3ebde6d227e1f474ec8483b"; + sha512 = "893fa9700ca874b2a460d830f2e10f7999a6b521a351a88bf480232ca0270581f4ab334ac2d4721e3f5fbaec0105497afd5ef09b13f3b96a1e84556db79d0ef9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fa/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fa/firefox-75.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "d680434838694f6666c8decfee363e2aa5de22ecfdf690895bc7c027bdc2466c67518e69444d48413f1538e7c3751cda716df8fb2cb83ad68beff6b0975d3dc1"; + sha512 = "fbe8cefe9e626d07f360b1ab30fd04c8628669f5164d5dbfd12cca72e17e6454de367e170565e0d7f1c30e300d315f54d7c6cc06c8367e6d0c428a994e9ba067"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ff/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ff/firefox-75.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "3b6f7bb0dd61c2872b8ae2e9dff50d9c6e21f2755d8dac5eeb44708af3441ecfe43ba5eeba31a2de09fdd246afdaaae8ab8ce10f2f83495588cef561446956cd"; + sha512 = "7ea337b8f3cf536749cca253e063ab326e66a0a33ee0bb7863ba7c46d7d9ceef443bfec0551770346701f23f5adc2750225e8961d6fbbb48492afe7ec39a1272"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fi/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fi/firefox-75.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "0462288f84a7d4cc97758919cd8d6a2d275757ac91980752f538d0cc785813acf79f4e6908fda1eddbc34db2b574d5c381c03b8cef90c796f837706071a98044"; + sha512 = "c97d9ceb5a98acf54bf37c1397973c2872a039812bc591979b44497e7f2db1cf7bb5fab75b4a0cb70df2d48eee4cf5fc55def69c22da9a0b5964e2af81bd0457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fr/firefox-75.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "9a40af49d33a5c391a084d181d74bf418e5fb24ccc4aac96959f719624913b7b7d11b6977e4673046c89dcb5935a1b496b82b8a0b9729595689b158a7a96adc8"; + sha512 = "15081d21ed77c376257e23cec42ba26023792cceb634b0d0b928471e1abeba17d9245ba5454452b17e786e576e19e8e47f20478002a3df2e15c56e8cb19faaf0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/fy-NL/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fy-NL/firefox-75.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "97bc9a69879981a6f6ff32f534b31b986523a7d956644ad15de94913aa648af6b163a4a6125e6cb6869eb48d1d903773c3cd4f07a625da191b9fe34aa4b6dfa7"; + sha512 = "c352989e6ed3eeda8ce724ff110bb09c2ad3ce4a5b1f45bd9335c1186dcc1c310efdd24c9a2adf7a0f31278b3989d79a683f7f770670c8b1419967ccc2e0704a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ga-IE/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ga-IE/firefox-75.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "72d3dbc9799be8c37880cae2603423e128040b99409148a8c316ef9400b259963078bcf9a86dbe3d69bd017276312ed9631512972dd718c6ffb0fa2f3d351a90"; + sha512 = "ba27396ca8f76533033bc78066074c3aebcd687f1621b14db92a4952b226bebec0bd399f697dac92b71e14e91fefedfa6d4188dc067bbd575e07317182408510"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gd/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gd/firefox-75.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "637f08600c79790df3f683c7aadd1a7597e09f387d6f1e929ab7eb6301cf462df85e2a68a1ef5480cde0afc716c63dccee08f173c96358d461f3b5798ca2d75b"; + sha512 = "f18b4acc47fcb9135ac28206011b6fb3fef5dd6640fab3e88d8e8f9dc23b19d427fcd461f70a00750c1739b3e3f6874c171dacd9c54b213eb9076dbb9a511b5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gl/firefox-75.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "964541eb0d5ae8a7cef59b17d2e4002bf34b2137beb72593c2fee6e578e4e02f06bc443effa7d958631d46d097f482119aedcab4862f3881a8c68527bb88a998"; + sha512 = "e4bec63583908fd225b903e45007e29f357e00fe7901524d5fa15bfea04211f55d2557c1ccc1fba28eff1f2dfc5b364cb7c52d438428c26f09aed3592f817c50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gn/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gn/firefox-75.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "8c808172327308ea1eb4eca12642ee2628a01e1461ab33d56e326c4e5f675f3294a563f83bb42bb3b4eaa15311f89ae59c6de65c0fc565464611b89ca03d9a6b"; + sha512 = "dca1a1062e47b8644a7e1a772f6abec1ff615d8857d74d576baf9a515fbef814f6d2e89878a3ea2aa4a7efb6931caecb3845f6eefec91c70299c463c2141689c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/gu-IN/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gu-IN/firefox-75.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "9338b5d59f01b32d608a7e3202992e6e44e9f62f947bb8ab6aa64e539f8105dfd0e6436705276efde769a196e7de7a63190a98fd2d6664e2aa74365e0997fb7c"; + sha512 = "efa6f443a092585defac47cb75d8ce85faec76c2624ecbf4cec3b4e8ffe4e582de0fb55f4901bcebedb0d991d709338bba212117fe59b3c6496fc5f35c1a7694"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/he/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/he/firefox-75.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "fbac46c204f656f07f1ed43fdab6cfe2b3db33a0c46030e23eb716eda26064329fbbf97ce0a07c031ee06d90c1b76c432dc4ab1b55b9b53b26fbcd8e640819e1"; + sha512 = "ea76707fa795234f36088749cdc5a139482577d4488d476856cba926e40ce24d020f76a526efeebfd8a5840b9ebb2a93d71ce9be9fa8cd9255e6940074f22a8b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hi-IN/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hi-IN/firefox-75.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "3b5bb0426fde394e9102d13af677974bf522a6635921071bf5dc453d76431a10279a8622c8aa6642385c0803e30275058575e1dd0e986726e4f9e4f2ef742ce0"; + sha512 = "73bde105b324df05adbc581e59c1b723b1dc0ecd2b35b9029ececdb83acbd5cb9946382f78c9bd02a480635c58c9578ec982d61793ae7e64e5cf940c09c5a508"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hr/firefox-75.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "cdc430d37f861e65248d95f29aa384ba4910e9e2fbaff9f3bf236cc9b93ee16c71c1128fea51c84772859002e00d3015ac2028a3103d13cde9ef2335f650095e"; + sha512 = "e237486d9cc6418d213a006e07c23ecaa3732496d169f7a24a568866e1ec1276aa9096c16aa696baffe689096b8321c83e9d47a119257effd77c3b1b938323bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hsb/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hsb/firefox-75.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "07d4c85e8838022d4626ceac115b9d41a88db711107dced35a80967a359f72395b657219e92a7cf5e4f5a4e6c521a36101d4a219c58e56b63dfe0b25bc942155"; + sha512 = "be2a1bd69573ae49b011f266402a5f185a4eb8eb3e9b506a606b1444ef54091b36023e6d2dea2d118fa4ca5cc58dcd1afdf2e5dcbc3d38a7ceb776e6e06756b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hu/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hu/firefox-75.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "cd2b6d36f7b6f12d77e43333f1741828804e0434e1394142a554ac7fe3e42d46dd66617c58921114a7472092b7714618247ec30d46abba5fc40b7306ce5f88ed"; + sha512 = "405ce0eb8c7694ed2d9bb5548f8e56d63c14e59025cda561bd49f0deda1bf0b280c344138d154510ac8ed124e4ec95528f84212fe1634bf16477615971148f17"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/hy-AM/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hy-AM/firefox-75.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "ae4b468bfa3f03ebf5f7793acfb6f3785238bd4a6e78c0e7542c49627b5436d55d8e0108c7db0bb755009962020010e767e49105a8374087d1ca5d50eb7b7340"; + sha512 = "21d7c5343f62cb8a841872470013d9b836eecb0f780794108f56120c4bf26ddfe923400e630f6d981913d06875e7473dedaa3d4cbc2f9173db80ef34c3a6e0f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ia/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ia/firefox-75.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "87fdedb6b07be5709ff0c5de383eaa12707bbd64487559a5a75d475abe72a9b7877645fb61911d0a95b27616318cac2208a6344b90d4c1bfdaef6d11208fc62c"; + sha512 = "a8c070f164ebda582055628b324e03971602f15741314ce26024eec0539a92341020b7fee16cfd849189c5c106a0b3dc1fcb04d3177d7a4b06bd0cd2db74b614"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/id/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/id/firefox-75.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "b42fae3bdeaef76715c1698ed39f710e3932b39d7db67fa00c94e085c5ec23afea7bddfce99d444991126c67f3a9d81976362a3f32f99d7f24c81a0a70487bde"; + sha512 = "4bc7b360f3fb9a8115541da54f867c693e7c8c98bf24685ae9ac1c052c4cf54126ccfaa3aa2c714a0450ffee0b6198370b1092ac99ba13c289bc46a202ac1189"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/is/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/is/firefox-75.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "0e9888e900536eee6199d7847f4b92cf6314c63b35877b08bc0f51f2f4877e1f965bf760a59a080a517a9ca1b8da814abe465a893b0816d3e5e00f1b02da67c0"; + sha512 = "c9a1c9b03d3e7089a12f2ccceaa525b5c9ce62dc1e602a3899914e8adae571bfe12dfe7b2b5e54a4b2de01c869c33fa1f7478d1bc6d54e4dcb284ce1da7b32bc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/it/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/it/firefox-75.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "396e0b54e912317e3861c5eb25d32f7cbf3ea558bb115c7c6f0a7732a18b246c9a97dc8ca3172a1b21ed3238f5358a9a70c0976d83ffc7640f4d522adbe4317c"; + sha512 = "0adc5cb03da1e36650c90de0cd82065a014bd944da4ba29f80f2fe74eee91fbff13378011c938bd79c110bacd0e04fcb5ad6ee7995fd76bd5ee98cacf32c2c98"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ja/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ja/firefox-75.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "0c8620750bcdc116ca0c9d26d8cda350afd1de3f8cab93f98df685c12a3f1551d537cde094f74675c8156a48e6c88d77ec077ae20f3bb0bc7b72d3ed023cc622"; + sha512 = "fe743972968881f327812dd0a81ffb8564e0fa7a6f739a3a59dd039f560078827ddd36ba057b80792347b1cb19e262f34c276f6ce788453089ca0d8cf8d69a55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ka/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ka/firefox-75.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "2e91dc34ee5656cf39aeafab2c7648b9465fc56a3afed40ae5a9e391bf8c0a897551bf402409db0d265ea196bfb0abbf100290fbbb108c79979266f1e2b0dece"; + sha512 = "0715da694820f26550e0becaa151c19d366954fcfc2af7084b880cd12b2f031b6508e69b3ff687941f71c0b3467f5d118ec3f79be2cea6cdff22d2b5e4f050ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/kab/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kab/firefox-75.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "fe91f60852d0c6922884b1954f753cc04db696d28ecfe91505fc3cb23d2fd0c23dc010c37e0326fc3b782672400cb65f887ff799b6f6b039783d5f80c7373367"; + sha512 = "2de6d3cea7077ddc896cdb95104a122b85f001013c0f59902b049423fdb370d5090a8630501009803592935fd5f90ade7625ef64b3b0bfecc712141b10f2366f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/kk/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kk/firefox-75.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "581a46df5cb334c8cfd0925c78752887e636388d4e76ff41687ab2193f1a26c87be848a02753e427f297fa5169e7e203767b66ad96fd0825276aaad527f1fb88"; + sha512 = "a0a1a9e7c2fda1bc92bce084472d432d4007fdc96707d7a926e884521c4ba8993374ef55179b7da7267d14699f079f5722974edf2713d449a59b76f01fb897cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/km/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/km/firefox-75.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "8e53ba868d2d0a9dad832e68710c6958d55ccc70d75f16a138983bf5d1ec24ffda1e320d40fda0ea62bcad5e01419c81db52fd0b1eb3ef11cd90c4aa92b11be7"; + sha512 = "4008860591482c70b0194e565f3f1fbb30b1607b486c8a3afc3e3d9465e24c3cc0da2c889905a7cad349484a386d7a2082e86e29f41fba84073cabcd75c5e358"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/kn/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kn/firefox-75.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "ea0e3dcad9bee6b37b2de3178eec5c980b1f85ca38f47c4049f8f1d614dce581b8ed7ea7f8751443e737db62e09bc9888358f9d68690cd8c8d9ab16a4e62e727"; + sha512 = "2628e52d65223c5a1941d94435398041cdbc7d5588a2227a9f17227800576a56975d5db2283d295e82e63e10c4ce6d3bc7999329fa26dd3c8d44dea025f96640"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ko/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ko/firefox-75.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "a486e93785532f05f4004253f369d384d2949b86eff8fc88dc49cbb76def0214a35f4675d86728c2e3ab6d1786b90546d223d7fcb8f70092f35e7d117a20f76b"; + sha512 = "9b78d17bec3f243154cca1ae1d955282e8700dac9bd93890be6fe92852af67a1f81eaa5dc2465e2881398508af90f67fcb2c90d54edb1fe874f9717bd25dbe2b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/lij/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lij/firefox-75.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "ae06bc4a21640d47034596522415c275faa16fd12866582aeab9b0b8cf8dac4b854bb22067f36419fc1c45810c499ac60f9319127199cd30f8dca1c1daa8e035"; + sha512 = "01e4dbb561a962b4332cde78df74a229d6aae4cfe56bd471262fedd9fc16a948415e6f993724ed53eb878a999020b22f761f4ee3e6f006ae8447513201ed27d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/lt/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lt/firefox-75.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "d79206839e72915a5ad36674d624974aa4c2e09fc9b24eb82b54648f5e86cc97ca9c65c1e5fc97aa80b0afeae4cbd06a36fbc5cc6f0b8e915a820fde6d330d1b"; + sha512 = "c17fff73a4f72378dc3173ea0ecde0492937a6fcee4108935126256f0ab085eb934be830907f1f4464205673023ed3cb21794cd540533f4e8defb42325b3bc93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/lv/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lv/firefox-75.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "c7c1a9d6cab35e29492440a94c31514fd21ce9f6d6828e1f83addbc60b67ad83553913b102312ce3b4d9014f222f16d25cf510cf6a816c9212324fc4fe7baacf"; + sha512 = "22c90601b8162512ac045ffcc3d186dcf4e0d9d2330885e07f7df72224a840073415de0100419b981c08b73ba4c92da01edb49d1dcc9efb1abc0ce47b94da012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/mk/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mk/firefox-75.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "59dbf4c86c78ec02db97900b0db1ecf6d2f94c34bb8c5c7bcd60f2a3e8748655873d5994a9e4bf7a8762cd9646a14e180d1e330cdb2464bc146a1d365a7f789d"; + sha512 = "a185e91441e302b9111d558c3ea0d7601347e843393e00adda74a903ad0f93a23ded2c8e61c5eb628996c0ef5b0fd63209fa9fd98f3a0040a9a8d419214e5df6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/mr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mr/firefox-75.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "d11f86f1b515d047cbb68fedf17b535776ffd42c20f7cb60c7c3dd39afaab6f07744ca0a4da0b9a40379bd24a9ff1699f901b8221e587f440faa2243088506b5"; + sha512 = "e8d5066dcaa0c7168f804d1f1047435bb188c6daaf3f8aa472654b617c7d4471f7469ac2560782b6463c315ccd9ad60efacc8582110bec9279cdd16dc7da7d09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ms/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ms/firefox-75.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "a8d2447ca79e9d66344a4f1ffee66ad7de50ed5c0e01c9f32303011324229d0fe414f39e8844b5e4a06732509e17a17dca9cc729c87e51cf8b2ecb925c194815"; + sha512 = "dcdb08020fca5a43581b1900316cf7acba285a87b9cc0532ecaca8f85d1ac3b188eeb9d65ba68557d4350b7f2e0fee478dd5a9ababfd3c40ef1f7b4c57f08a39"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/my/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/my/firefox-75.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "9062c54b41a7bf1b7465cc649f90790a912576457ac1203aa6bbd14d927bdddaa41f31a9e7ddd7934c24d2db8357f8366d1b45a50a8f35462eb2b05028d673e4"; + sha512 = "d7005ab40feaa6053af8624130ba4e5d60e54978452b6e63a658afc8321c9f4a7eed5406f07a16961f6051e794943c6ac6582e1723cb8a518332557a94dedcc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/nb-NO/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nb-NO/firefox-75.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "fba107427926346ecac412016c7a6e58fd1e6652d13b6df632ccbbe3568ec34e8927771036394cd52a232b5aae975394061f6ace87958b84e6d8ca685930bc58"; + sha512 = "b6e0894cae9d257ce4d0becdcb65f9fe3693a947cfadfc88eb51ee93a4ade9924895a7f252317d145304d5bdc866294c437a5f03c15982fef8a970145678aa0e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ne-NP/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ne-NP/firefox-75.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "9b1b57700f22ee7827fdc7b391d05117b4286e0a27e90a45d25ec4afc7d9738a7d400f2720fcfdcaac311b6d6e4605c5a2e77ea2ae337cbd1acf5071b217c1f7"; + sha512 = "fc7a97902679402185813d666ea65cfa059e4121c126a4b82f2fc70ac04790b7e73441c4a3e7c49ea6292e049792368f7abb9924c74b52ca342d832231e80c51"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/nl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nl/firefox-75.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "f208d274f971c53db962b731226039e6cf0f33ef59ecb64614000be634daf40bbf89730c13affd5445986cef9c1f9a1d1c32f94c1cfd7133dd254f3e8a1cbac4"; + sha512 = "c96cfd08d2b3bcfc3380cfa4e7945c92ad6c1a1ca1f47db6977769792752a4f64ee99f90f6f904811ff3f1b7b2d07ba570ad1b80337d22e34c6bbb6ed0e511cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/nn-NO/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nn-NO/firefox-75.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "126eed4ad3a922c0b2e4f2f575be874a739d37d97fc19f83fcec01b8a029fc79c0132790e69c61622ef811f8f7bd16ebb1f742a8991f6e0aad0dd7a52af3ab34"; + sha512 = "7e10f521aa2ea9900d03a2874861f079171a62860f3508edd7dc51c39db88cef7a603ba0c6ca69469c2593182b027d354b6a8c13209beabd51a8690717d11eb4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/oc/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/oc/firefox-75.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "f0bba67e75513aaea00371bd3b6eadfcc765b5bceb8712f82dc1a0432bf9360e979190ca569fb9c677faa23200a62766775536910d29689a51bb496c2d82cf38"; + sha512 = "43413c027b618cd5ddd36fa42fa26f99a294ce2f6f33937a299b55d698b64b6e85d04954101ef27e7a739c00407d7457322e3b32d38a90df87529372c19e1b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pa-IN/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pa-IN/firefox-75.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "2e60b06a677e21149ed55e9b1f2cc3a4555fcaf78df90dd81f7a6fe56140ba1cdb6eaf29141c123b46e21c27bc116e1e8b97feedd86391fdc564ba20df078059"; + sha512 = "fb59faad43d729eeff12e1eeab15c0712f2429892574c526c1f59326518c9c652475177c9aba14aa591e4c449b133a6a8fcbef7bbc8d0c89b2b4d5dffd053abe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pl/firefox-75.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "a834560790d35559db67db2e6f826fbd8788eeef8ae47cfb48e0f3a8b7416b389e6c37150a8dda1d80e133d8a9219ff30e3d9a4422ce8d2de83ef6ef7f638049"; + sha512 = "406097bb810d60a16a88b675f6a893af84e0de905c222534b0e09802ae5b57912d000188920b06c4ffba198af0d096e42f9984222a94f53d45db64f41a4f3f9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pt-BR/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-BR/firefox-75.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ea8a2de3fc7f89ca15e118c9d4a2b75604fcb295c3ec1cb2b9b1961fe6a0abfc1bc9813f5fc7cc71e1ca10516d390cc7d36de03b57ef72e7fe7a45095fac8678"; + sha512 = "519f9777303a5dc6eca8933406ff0ffbf7654c75305c16e13f1600550d924569ded9dc6ba606050c9bacc31ecbc0d6e43dd91dbe8cb3b587ab71d20467564cd5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/pt-PT/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-PT/firefox-75.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "b6eb4096e7cdc2823667a99c654004c95b526a495d0dd1f24ea45643c8135cc01403417e7cd4d2aeb5fd935d153d44bbae53c6a581d9601c245a320f8114fd9e"; + sha512 = "92500d0b49090382e261baa0fdd4620e5d9e4a047c9c7098ad3f7ce34a5e97bde419a87019517125239144d21589b428c11138aec691328530fd41d5a78cc5db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/rm/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/rm/firefox-75.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "8de865c608b288feab89de6677974cbbb2897678514945907f421159049b2b63a332c9302a01e5ec4b355486085838930ef4b44ced7fdf78e5cd0a1f65186cf1"; + sha512 = "6b8f3655d962612a047bb7d961ba74b362da0bcf740362e8f31a2263b0898da90e051951cf5894bd8a493f40d2d89fd50d6060eecc78908518f8611218a27eb3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ro/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ro/firefox-75.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "848f4b90fdce6455a563bb38b097d9b4853aaee8e43ec0d9101f41a4046719527a714c0b5d2ad07461ac5dfb34e0cd10060b5169276004c6f7cee839e2b3d669"; + sha512 = "4f2e2012136c9821792241f2189550843320b52c44905d9902c7ef3f2be21f26dd79f930b719f752d3d4b5e7ab6ca8429d12ba6120f6bc365bf9e2f496ea85e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ru/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ru/firefox-75.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "9b624a07fccf6f2aa1707e8d4e04894e6a2d3f467dbde806bcd11eaa7ff3cf8cced1ee1ac237037c309472588db247d175151393001ab03ee9e281fcef91890f"; + sha512 = "7ce2ab97b3483b9632d24a979bbe051d8db539329359f91dc9df4446db0b4c1201dcbc6422e1406400dd3df007e5c3af6bcc8279966cf7448671608cc05a4231"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/si/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/si/firefox-75.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "c6f2d9666b32e635d35ba7c94dbc2c68c497a44b1cf464038ceacc0278a7348f11150c8e879ea5814f43ab9e9fc5ab14b0bfb553e52cf6e26c826cd3da154572"; + sha512 = "65edb310b0c94dbaa2f5ece2eb6593a4fa7d89b2fc9e4d3bd8c77bd43dd4517d09895a7a325b9d6a1b5fda965e9d6e3c10f7e4b889b582ad4aacc2061db6a443"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sk/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sk/firefox-75.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "c89e44eebcbd0945b1c462f748a71286167739d75d9b0e65529be07793bfb20dfe01eaed8280b94047d2523e0a0592145eb7af524f4de630388ea3c2c1638aa5"; + sha512 = "4e29357906cafb6df7dfddb4c668479d8e52722a4771e043a1d9e0c254e434251768a716f7791c6969e34c5004f276d1b3ae8b8c77176bb1ba76409295126671"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sl/firefox-75.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "e93922b8a6e946e39febb8d690d251d01d69cd82f4f07546209f21cb89532c342e6f4e37319821fd6786bc5bf5f7927a28463e5f2d1bc8fe87bba1817af5af00"; + sha512 = "c84cdabcb498c6a387a08b7ead1cdadfb68c173a955e34f4118a4d56417918649b7ffab2eeb88ddfa276656367f8429e17ddad4b909b1f39e120e41d1caca56c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/son/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/son/firefox-75.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "f7d2757cad117522d9964885d002d717772012b9952d1e03a53bce775967e927c7cba1358fcf6165f8732f761aeb148b393d32f7cd0e540d449605cadbc8a0f9"; + sha512 = "3fdf243217a00baef75aa36b9bcc257e1741fadc8070f5e50a4573c3c4b6b86eeb4405fab327b057e5d92543a0643429fc1159d3b77fe30ad918d8757d8970b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sq/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sq/firefox-75.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "b19f1832a460298e36509bd3e8a8dbcaf300373954ccbec9c4f402fe4e60bb9b24a79e52e62c63c0ac9cf5abbb32187215cf7690781dd88b3649eab1f4b60cf9"; + sha512 = "f8c32ef45297c86935bc8b99a9d6b8e4804320f76e085e70f988def0ec003f221666e8f7e34e1866c52c38dc45a3b6a39397ac1e81a7033a74652a1d42d32355"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sr/firefox-75.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "15a93a42b3d19d3d2da4e06ea0b071c05cbf82dd820d43f52e263900f233894112cd40132de93a85e544d7961ee7be11766be0e4c827b805025b0353bc4cdb7e"; + sha512 = "10dfc0655723a00be5b5e32a280ffc660cf464df0be0686601b2bb502730ea5ee6f7c23c3f40616e9df3c5eb17638b841cc70e8b2271b442cc8b95927191dd62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/sv-SE/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sv-SE/firefox-75.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c1c7cb83323e39d13bd04a65ab3bbacd9cca1ef90bf1870afd49ab72f0819bbcda8ef5c50db08537babd35e3ef117441915d87ee4b4dfd4548b023faf834adaa"; + sha512 = "57e77414cd484560716ef659271e28c14a8f02f7189bc858b4293a72ac07cb0acc77a6e719c25b7a9b76cd4da6b3b56df8a75236b6ddef0ace9f87113f4f8d72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ta/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ta/firefox-75.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "56ce445bdf12c7ab1bc31fd2f06f5ed3f63c0935e91d23e0e153a81362b1b44b1c874a3f36c2f3b7adf7821f1d08aa80aa55bc01594144fbd92da62e13ba8cc6"; + sha512 = "396fe91815427866908619b33df4fcc503e0b30f03c567a9d4baa51bfae19d91de816cfbca4bd94a48447c7abdfb56d52a294ad0b8fff8134d935db9d6a81221"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/te/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/te/firefox-75.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "2381931f7fab5578e870d589975eae78c4b45f14d75497d1524b9500ce8305ded0aca89409371cdab866be0b32e714ebd1efeedf83d176c12b4518d07b096c6b"; + sha512 = "87237a320372b1c34c583335335b5b8e85eaf0dd774883b0b0c74e883854c1cd14d459cc8b84db2dade7dc92b36d176c8f30bd17658f6e5660660b0f167fc715"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/th/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/th/firefox-75.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "0cc8606b5b15bd3cfc8e37f13c73eabf454c9997102c5bd4fb325b99f029c75bdbb6d48352c4dce40c3790c9446e6c2236885f2aa33ec171ff81a51b7277b780"; + sha512 = "ca5ca4be8242e1fe9a9714b117965b67ebe86b578381ea4339f378dfe74e08f268b63346b5d3bcf30cf1c108a933609d8cbb393caa7f7646557d265c2b40decb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/tl/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tl/firefox-75.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "5f7bcd704a3c960b2d89788e841dcac15eae1fa575205ce67bf75726a5477a0356c968e77146297ed96206e5f05083477155fc3db2c9ddef53bae373104d12cf"; + sha512 = "99322a06d7122438715b92f176b07203246c1e15a0a42dae4349f424232778f3d2b9bcd17a7b239b8eb6273a6ada8e259480601258275f16c567d9cee51fd16f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/tr/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tr/firefox-75.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "8fdf1faad4615db6c2aa577391c7a9aa2600e486234d9d20ec0cc340552f98e199565ee391ec48d2c660fb347cbf3ff733c16d58350c4ed1a47076108d731a0e"; + sha512 = "95a86989879b65c85032e9b8ffa9290d9a6fa1be409786b9782b284e4c0fb894719fc464ef7e6b96554e2cb852a3276a8e042bbff02a17bdb44aaf9ddc170361"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/trs/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/trs/firefox-75.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "1a08a191f34c3fe120d0d7915f872750f903e6692819c0ee1bf1341539346f8f816e89e79970a81e610fb78b0b1fd0327655e7a5db10c717c60a3ab425cc1b01"; + sha512 = "aae0652f74e82b0cdd752cb8f0747fd4f36f04fcdc50c3cd9d084c6418694cd3015e8de87d851605f5cac0b0159ddd8f9521755d81adbee0e561926b2ea1d393"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/uk/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uk/firefox-75.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "0e93003cc99f7251e6596b960a89eb4348e260fdebb348ed9356e850e5d5a589d1affe131bc94a3d370ba340062d3d8b59f18eaa0d446f677f767f3a4e26884d"; + sha512 = "df038e62ba6284245212f23c5458b2df14547ed532ba66adfed2297041ae7acf693a6e01a6af9c16f4a2e141806d9baf3c4fce91bf3316e635da7211ba9b057f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/ur/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ur/firefox-75.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ab5c15ed6f63d6c7b38e592f28e57cc895e191aa60e2eec819129c684a73480315925965ca0c4b69612c873637e56262b2c3372a59d451c11d73bcc888c92194"; + sha512 = "1bcc2f2e8f5e389c29fd0e7f4a5a376d91268e326758b396c9d829e59d1315a52df0449fe49e81170713f1161946c2ed224560dc96329f30a5d13c8413f26823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/uz/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uz/firefox-75.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "58a83c8ee2582112eb4bb04e875ebad5c3f31fb7f6be790cecaa4f599b2e2f2c3935df019578d5c79dc2df2e3f177796830dcd7b8d96e1435f0cc8cc338d4cf7"; + sha512 = "d957e4942ead1634d792555f57c6dbe54972fd9a97071e63901b422ed6b723426b27fe85afc8c33d75087a502112a4b4b2e0dc3f3a04a9d44a48ec867dc78cb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/vi/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/vi/firefox-75.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "70c26fa5f2922979919f30454ef5714f69b61089af76158e2f4c59204e9ca800e7af620d60cf8ac6208b791677e00d5337ded25b4bbd7a64dd46d353bb728d84"; + sha512 = "e3209382cf01d827f3e68230c46c6eda837798f92812c93ac19e81a77a0d72f3a5b53681320b71d886d8d4339fb2eb51d056bb4bc41466116aa51ffd50ff05d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/xh/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/xh/firefox-75.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "1dab6166eeb18ec291b7c96662c74583adeeed7fec56414cdf827b1d0d2976374d84437df6ebd131628fee9607b91307e074cfa0d3c4ea65423d37dde0951fa7"; + sha512 = "8719acd4bca1136668c6a90b3f7caaf29bd773acaab2776f2b7daca3c9028c33e73dc2c15c82d44064e92b61def23ca889a2ad09043c5bc5ad91db3214af1919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/zh-CN/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-CN/firefox-75.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "2f4c9461b178b646da63da07893fb3dc598ac2aa65e384ac4e0406eb748625bebb06b6e7d348b4324eddc794d0818e87958398d65a8d3354faec26854dfa7d07"; + sha512 = "681e276d7ff6a6f91be59994e53f9f6f082e16f9d22ec7e1d1b65813e91c6c2661f28989b0331100b6f0d4cdbbb0589204b0ed80bf5f0bc0d18016e905a71148"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/74.0/linux-i686/zh-TW/firefox-74.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-TW/firefox-75.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f1e0e92ba60358f3b5e1edc1f3fd2a58482a4723785ed9e8d914519b6550617f5d19468ce9b8a5a5f81a212ae0e387d3f39335755838e074cbbf765f2440027a"; + sha512 = "71ee272a7d02758187a9ef2d0a722760d04d9bf0fe11c90e841e15dc9019f44ba22483b6698e3f8eba9620e34d2678db2dbc2974c1ab5c7f0f79934aa4142432"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 82f1c267e77..4dc2df91f8a 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -6,7 +6,8 @@ , libjpeg, zlib, dbus, dbus-glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify , yasm, libGLU, libGL, sqlite, unzip, makeWrapper -, hunspell, libXdamage, libevent, libstartup_notification, libvpx +, hunspell, libXdamage, libevent, libstartup_notification +, libvpx, libvpx_1_8 , icu, libpng, jemalloc, glib , autoconf213, which, gnused, cargo, rustc, llvmPackages , rust-cbindgen, nodejs, nasm, fetchpatch @@ -108,8 +109,8 @@ stdenv.mkDerivation ({ xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file libnotify xorg.pixman yasm libGLU libGL xorg.libXScrnSaver xorg.xorgproto - xorg.libXext sqlite unzip makeWrapper - libevent libstartup_notification libvpx /* cairo */ + xorg.libXext unzip makeWrapper + libevent libstartup_notification /* cairo */ icu libpng jemalloc glib nasm # >= 66 requires nasm for the AV1 lib dav1d @@ -118,7 +119,8 @@ stdenv.mkDerivation ({ # https://groups.google.com/forum/#!msg/mozilla.dev.platform/o-8levmLU80/SM_zQvfzCQAJ nspr nss ] - + ++ lib.optionals (lib.versionOlder ffversion "75") [ libvpx sqlite ] + ++ lib.optional (lib.versionAtLeast ffversion "75.0") libvpx_1_8 ++ lib.optional alsaSupport alsaLib ++ lib.optional pulseaudioSupport libpulseaudio # only headers are needed ++ lib.optional gtk3Support gtk3 @@ -206,7 +208,6 @@ stdenv.mkDerivation ({ "--with-system-icu" "--enable-system-ffi" "--enable-system-pixman" - "--enable-system-sqlite" #"--enable-system-cairo" "--enable-startup-notification" #"--enable-content-sandbox" # TODO: probably enable after 54 @@ -221,6 +222,7 @@ stdenv.mkDerivation ({ "--with-system-nspr" "--with-system-nss" ] + ++ lib.optional (lib.versionOlder ffversion "75") "--enable-system-sqlite" ++ lib.optional (stdenv.isDarwin) "--disable-xcode-checks" ++ lib.optionals (lib.versionOlder ffversion "69") [ "--enable-webrender=build" diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index cf44639ad57..e419137c4e9 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,4 +1,4 @@ -{ config, lib, callPackage, fetchurl }: +{ config, stdenv, lib, callPackage, fetchurl }: let common = opts: callPackage (import ./common.nix opts) {}; @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "74.0"; + ffversion = "75.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "245n2ilfgx3rd0xlxzpg4gcwddcy0cgaqnaf5pwixjx0n8py1imiylwlsbihf70s41cq5q8awckchs287yysr4v6pdfqqbj7s0f02ki"; + sha512 = "0m3ibm6dy9cpvsxkzkzwj7na5rm5qz7sm3bpx604ibay9pccvgv59jxapisvmswzmlz2nv02l6p2gxlz3b0lbcg7rd5zasia92y7j99"; }; patches = [ @@ -19,10 +19,12 @@ rec { meta = { description = "A web browser built from Firefox source tree"; - homepage = http://www.mozilla.com/en-US/firefox/; + homepage = "http://www.mozilla.com/en-US/firefox/"; maintainers = with lib.maintainers; [ eelco andir ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; + broken = stdenv.buildPlatform.is32bit; # since Firefox 60, build on 32-bit platforms fails with "out of memory". + # not in `badPlatforms` because cross-compilation on 64-bit machine might work. license = lib.licenses.mpl20; }; updateScript = callPackage ./update.nix { @@ -33,10 +35,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.6.0esr"; + ffversion = "68.7.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "2ipajk86s7hfz7qky9lh24i5fgzgpv9hl12invr1rr6jhpp0h6gbb44ffim0z9lmcj49cr01cgqis0swhb4vph8dl1jvgfq9rjmsml4"; + sha512 = "29qbcc78hz1rsnz735a5miwfj0c3r1c5qm2043vyd9qz879vsh4ab82k7wncm3xa04kqdff26zh1rpbbjmdr7gwn4q8nmjzzs7wzpd3"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 53255ec5183..2d25643e2a3 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -133,7 +133,7 @@ in stdenv.mkDerivation { meta = { description = "A freeware web browser developed by Google"; - homepage = https://www.google.com/chrome/browser/; + homepage = "https://www.google.com/chrome/browser/"; license = licenses.unfree; maintainers = [ maintainers.msteen ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index b09be81cc41..d58fc8fd19b 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableDirectFB "--with-directfb"; meta = with stdenv.lib; { - homepage = http://links.twibright.com/; + homepage = "http://links.twibright.com/"; description = "A small browser with some graphics support"; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix index 0605eda7fc7..bf10043e942 100644 --- a/pkgs/applications/networking/browsers/luakit/default.nix +++ b/pkgs/applications/networking/browsers/luakit/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast, small, webkit based browser framework extensible in Lua"; - homepage = https://luakit.github.io/; + homepage = "https://luakit.github.io/"; license = licenses.gpl3; platforms = platforms.linux; # Only tested linux }; diff --git a/pkgs/applications/networking/browsers/lynx/default.nix b/pkgs/applications/networking/browsers/lynx/default.nix index 3f4f96d33ef..8aeee45b9e5 100644 --- a/pkgs/applications/networking/browsers/lynx/default.nix +++ b/pkgs/applications/networking/browsers/lynx/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A text-mode web browser"; - homepage = https://lynx.invisible-island.net/; + homepage = "https://lynx.invisible-island.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 1d1928d168b..66f6384643a 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight WebKitGTK web browser"; - homepage = https://www.midori-browser.org/; + homepage = "https://www.midori-browser.org/"; license = with licenses; [ lgpl21Plus ]; platforms = with platforms; linux; maintainers = with maintainers; [ raskin ramkromberg ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index e8841a0ab6f..b5407063287 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { passthru.mozillaPlugin = "/lib/mozilla/plugins"; meta = { - homepage = http://bluejeans.com; + homepage = "http://bluejeans.com"; license = stdenv.lib.licenses.unfree; maintainers = with maintainers; [ ocharles kamilchm ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 46a759cf27a..0cf73512fcb 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -139,7 +139,7 @@ stdenv.mkDerivation rec { meta = { description = "Adobe Flash Player browser plugin"; - homepage = http://www.adobe.com/products/flashplayer/; + homepage = "http://www.adobe.com/products/flashplayer/"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.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 5274d30e68a..64dd87c4ace 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation { meta = { description = "Adobe Flash Player standalone executable"; - homepage = https://www.adobe.com/support/flashplayer/debug_downloads.html; + homepage = "https://www.adobe.com/support/flashplayer/debug_downloads.html"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ taku0 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 101ae99d665..b59c30002d3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { Linux/BSD distributions that the official software doesn't support. ''; - homepage = http://fribid.se; + homepage = "http://fribid.se"; license = with licenses; [ gpl2 mpl10 ]; maintainers = [ maintainers.edwtjo ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 93f2ab2adfa..9923b100afa 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -110,7 +110,7 @@ stdenv.mkDerivation rec { passthru.mozillaPlugin = "/lib/mozilla/plugins"; meta = { - homepage = http://www.google.com/chat/video/; + homepage = "http://www.google.com/chat/video/"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix index fd956f62327..a7f2815b411 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Mozilla plugin for launching external program for handling in-page objects"; - homepage = http://mozplugger.mozdev.org/; + homepage = "http://mozplugger.mozdev.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index a5bfda9f26c..d4561772dc5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A browser plugin that uses mplayer to play digital media from websites"; - homepage = http://mplayerplug-in.sourceforge.net/; + homepage = "http://mplayerplug-in.sourceforge.net/"; license = with licenses; [ gpl2Plus lgpl2Plus "MPLv1+" ]; }; } diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix index 10ae0eb1da6..59eef8c8f3a 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = ''A wrapper to run browser plugins out-of-process''; - homepage = http://nspluginwrapper.org/; + homepage = "http://nspluginwrapper.org/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x64_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/applications/networking/browsers/next/default.nix b/pkgs/applications/networking/browsers/next/default.nix index d4726fab651..e03f918a587 100644 --- a/pkgs/applications/networking/browsers/next/default.nix +++ b/pkgs/applications/networking/browsers/next/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Infinitely extensible web-browser (with Lisp development files using WebKitGTK platform port)"; - homepage = https://next.atlas.engineer; + homepage = "https://next.atlas.engineer"; license = licenses.bsd3; maintainers = [ maintainers.lewo ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix index a71583ffbec..8039c549240 100644 --- a/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix +++ b/pkgs/applications/networking/browsers/next/next-gtk-webkit.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Infinitely extensible web-browser (user interface only)"; - homepage = https://next.atlas.engineer; + homepage = "https://next.atlas.engineer"; license = licenses.bsd3; maintainers = [ maintainers.lewo ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 12cf9b30fa6..537bb0ebf2e 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -105,7 +105,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/The-Compiler/qutebrowser; + homepage = "https://github.com/The-Compiler/qutebrowser"; description = "Keyboard-focused browser with a minimal GUI"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry ]; diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index 0437ab933bd..03571469da1 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { possible to embed it in another application. Furthermore, one can point surf to another URI by setting its XProperties. ''; - homepage = https://surf.suckless.org; + homepage = "https://surf.suckless.org"; license = licenses.mit; platforms = webkitgtk.meta.platforms; maintainers = with maintainers; [ joachifm ]; 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 a8a426b6162..97a03ccbab5 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -28,7 +28,7 @@ , apulse # Media support (implies audio support) -, mediaSupport ? false +, mediaSupport ? true , ffmpeg , gmp @@ -90,19 +90,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.0.6"; + version = "9.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 = "1vk1pww8zmpjd5snyfz0if9v17g140ymlp6navxp28snzlffahss"; + sha256 = "0ws4s0jn559j1ih60wqspxvr5wpqww29kzk0xzzbr56wfyahp4fg"; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "0bhikdilfz31iilgb48mayy9f4lilycq24pqsrq7w3dqdjg4v55v"; + sha256 = "0sv73jlv0qwlkxgqkmqg1flsa9lbkxa4yahny5wrfgsbw74xibkl"; }; }; in diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 0a72099e653..099d81c99f8 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { editor and also easily configurable during runtime. Vimb is mostly keyboard driven and does not detract you from your daily work. ''; - homepage = https://fanglingsu.github.io/vimb/; + homepage = "https://fanglingsu.github.io/vimb/"; license = stdenv.lib.licenses.gpl3; maintainers = []; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index e129542d530..776ed8f4471 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -17,11 +17,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.11.1811.49-1"; + version = "2.11.1811.52-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0xn23jmh8pqp1hc0q6nysc8x9xgpypzqr4wz2rzqyald4asxj60v"; + sha256 = "0bq9ggk75xzka2nbrnc7vghq8s7jjy9nbfmyrf51kf0nni1zg1fp"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/w3m/default.nix b/pkgs/applications/networking/browsers/w3m/default.nix index 373fa43c72c..a15d6844f56 100644 --- a/pkgs/applications/networking/browsers/w3m/default.nix +++ b/pkgs/applications/networking/browsers/w3m/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { LIBS = optionalString x11Support "-lX11"; meta = { - homepage = http://w3m.sourceforge.net/; + homepage = "http://w3m.sourceforge.net/"; description = "A text-mode web browser"; maintainers = [ maintainers.cstrahan ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/browsers/webmacs/default.nix b/pkgs/applications/networking/browsers/webmacs/default.nix index b86ba3c39f0..7dbb6a3c538 100644 --- a/pkgs/applications/networking/browsers/webmacs/default.nix +++ b/pkgs/applications/networking/browsers/webmacs/default.nix @@ -65,8 +65,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec { Based on QtWebEngine and Python 3. Fully customizable in Python. ''; - homepage = https://webmacs.readthedocs.io/en/latest/; - changelog = https://github.com/parkouss/webmacs/blob/master/CHANGELOG.md; + homepage = "https://webmacs.readthedocs.io/en/latest/"; + changelog = "https://github.com/parkouss/webmacs/blob/master/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ jacg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix index c000a37ff02..98d2f4aa81d 100644 --- a/pkgs/applications/networking/c14/default.nix +++ b/pkgs/applications/networking/c14/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "C14 is designed for data archiving & long-term backups."; - homepage = https://www.online.net/en/storage/c14-cold-storage; + homepage = "https://www.online.net/en/storage/c14-cold-storage"; license = licenses.mit; maintainers = with maintainers; [ apeyroux ]; }; diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 71997ff8ffa..18a9bc0f422 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -22,14 +22,14 @@ stdenv.mkDerivation rec { pname = "calls"; - version = "0.1.2"; + version = "0.1.4"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "calls"; rev = "v${version}"; - sha256 = "105r631a0rva1k1fa50lravsfk5dd3f0k3gfc7lvpn2jkd99s1g6"; + sha256 = "0715cap3w8gppxlfaynhiqvc2ss512xgykjcpqq8f5syz2776skh"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/cawbird/default.nix b/pkgs/applications/networking/cawbird/default.nix index af8b7241659..c9e6b6f6de0 100644 --- a/pkgs/applications/networking/cawbird/default.nix +++ b/pkgs/applications/networking/cawbird/default.nix @@ -20,14 +20,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.4"; + version = "1.0.5"; pname = "cawbird"; src = fetchFromGitHub { owner = "IBBoard"; repo = "cawbird"; rev = "v${version}"; - sha256 = "sha256:1gqi7bn08b9cjpb0mgs6bk1a2npdfhn56ckps95nck0jyqzfbnir"; + sha256 = "sha256:0prrrkgmnm78sq2c6yvy86qb3lcl51d250q7gvmqili2ffnjmamf"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/charles/default.nix b/pkgs/applications/networking/charles/default.nix index 4c1f7ea7749..11eb24ff703 100644 --- a/pkgs/applications/networking/charles/default.nix +++ b/pkgs/applications/networking/charles/default.nix @@ -47,7 +47,7 @@ let meta = with stdenv.lib; { description = "Web Debugging Proxy"; - homepage = https://www.charlesproxy.com/; + homepage = "https://www.charlesproxy.com/"; maintainers = [ maintainers.kalbasit ]; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 25fb33399c0..891d153a09e 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, buildGoPackage, fetchFromGitHub, Security }: +{ lib, buildGoModule, buildGoPackage, fetchFromGitHub }: let # Argo can package a static server in the CLI using the `staticfiles` go module. @@ -32,8 +32,6 @@ buildGoModule rec { subPackages = [ "cmd/argo" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preBuild = '' mkdir -p ui/dist/app echo "Built without static files" > ui/dist/app/index.html @@ -41,9 +39,9 @@ buildGoModule rec { ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Container native workflow engine for Kubernetes"; - homepage = https://github.com/argoproj/argo; + homepage = "https://github.com/argoproj/argo"; license = licenses.asl20; maintainers = with maintainers; [ groodt ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 51635292fa1..7f9ebda93c0 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, packr, Security }: +{ lib, buildGoModule, fetchFromGitHub, packr }: buildGoModule rec { pname = "argocd"; @@ -16,8 +16,6 @@ buildGoModule rec { nativeBuildInputs = [ packr ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - patches = [ ./use-go-module.patch ]; buildFlagsArray = '' @@ -33,7 +31,7 @@ buildGoModule rec { packr ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes"; homepage = "https://github.com/argoproj/argo"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index ce3a1730ae5..cb846060a3d 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "atlantis"; @@ -15,8 +15,6 @@ buildGoModule rec { subPackages = [ "." ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { homepage = "https://github.com/runatlantis/atlantis"; description = "Terraform Pull Request Automation"; diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix index 78be19cd81e..e2452b2b441 100644 --- a/pkgs/applications/networking/cluster/chronos/default.nix +++ b/pkgs/applications/networking/cluster/chronos/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://airbnb.github.io/chronos; + homepage = "http://airbnb.github.io/chronos"; license = licenses.asl20; description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules"; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/networking/cluster/click/default.nix b/pkgs/applications/networking/cluster/click/default.nix index ef90c0cde32..2c0e73fb30d 100644 --- a/pkgs/applications/networking/cluster/click/default.nix +++ b/pkgs/applications/networking/cluster/click/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = ''The "Command Line Interactive Controller for Kubernetes"''; - homepage = https://github.com/databricks/click; + homepage = "https://github.com/databricks/click"; license = [ licenses.asl20 ]; maintainers = [ maintainers.mbode ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 88dbd177da0..8e74f834eaf 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Container Network Interface - networking for Linux containers"; license = licenses.asl20; - homepage = https://github.com/containernetworking/cni; + homepage = "https://github.com/containernetworking/cni"; maintainers = with maintainers; [ offline vdemeester ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 39c3b9f6507..8988c7efc33 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -32,7 +32,7 @@ buildGoPackage rec { ]; meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; - homepage = https://github.com/containernetworking/plugins; + homepage = "https://github.com/containernetworking/plugins"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan saschagrunert ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 115dc3835fc..32108426032 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://docs.docker.com/machine/; + homepage = "https://docs.docker.com/machine/"; description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts."; license = licenses.asl20; maintainers = with maintainers; [ offline tailhook ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index 716e9da8b7e..ba3b1e4d889 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -13,7 +13,7 @@ buildGoModule rec { ''; meta = with lib; { - homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; + homepage = "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md"; description = "HyperKit driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ atkinschang ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm.nix b/pkgs/applications/networking/cluster/docker-machine/kvm.nix index de122dd2a5a..9352ba69da8 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix @@ -19,7 +19,7 @@ buildGoPackage rec { buildInputs = [ libvirt ]; meta = with stdenv.lib; { - homepage = https://github.com/dhiltgen/docker-machine-kvm; + homepage = "https://github.com/dhiltgen/docker-machine-kvm"; description = "KVM driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 609b7b02cbb..6659b18b1bd 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -13,7 +13,7 @@ buildGoModule rec { ''; meta = with lib; { - homepage = https://github.com/kubernetes/minikube/blob/master/docs/drivers.md; + homepage = "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md"; description = "KVM2 driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ tadfisher atkinschang ]; diff --git a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix index 1f1e59a56a4..8c63a70b6d6 100644 --- a/pkgs/applications/networking/cluster/docker-machine/xhyve.nix +++ b/pkgs/applications/networking/cluster/docker-machine/xhyve.nix @@ -30,7 +30,7 @@ buildGoPackage rec { buildInputs = [ Hypervisor vmnet ]; meta = with stdenv.lib; { - homepage = https://github.com/machine-drivers/docker-machine-driver-xhyve; + homepage = "https://github.com/machine-drivers/docker-machine-driver-xhyve"; description = "Xhyve driver for docker-machine."; license = licenses.bsd3; maintainers = with maintainers; [ periklis ]; diff --git a/pkgs/applications/networking/cluster/flink/default.nix b/pkgs/applications/networking/cluster/flink/default.nix index f8c73c65991..3d418f9a47f 100644 --- a/pkgs/applications/networking/cluster/flink/default.nix +++ b/pkgs/applications/networking/cluster/flink/default.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A distributed stream processing framework"; - homepage = https://flink.apache.org; - downloadPage = https://flink.apache.org/downloads.html; + homepage = "https://flink.apache.org"; + downloadPage = "https://flink.apache.org/downloads.html"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ mbode ]; - repositories.git = git://git.apache.org/flink.git; + repositories.git = "git://git.apache.org/flink.git"; }; } diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix index 75e097131ea..10991d47cca 100644 --- a/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -1,22 +1,22 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "fluxctl"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = "flux"; rev = version; - sha256 = "1sk82cnrj5ngcaml54rhh7ak8dg80r25623c4s8p7ybrj1m7krqj"; + sha256 = "1w6ndp0nrpps6pkxnq38hikbnzwahi6j9gn8l0bxd0qkf7cjc5w0"; }; - modSha256 = "0ij5q31a0818nmqsdql1ii6rhq6nb0liplnw509qih8py7dk5xkg"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0zwq7n1lggj27j5yxgfplbaccw5fhbm7vm0sja839r1jamrn3ips"; subPackages = [ "cmd/fluxctl" ]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with stdenv.lib; { description = "CLI client for Flux, the GitOps Kubernetes operator"; homepage = "https://github.com/fluxcd/flux"; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 822df765655..aee162ba6f2 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "helm"; @@ -16,9 +16,6 @@ buildGoModule rec { buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - postInstall = '' $out/bin/helm completion bash > helm.bash $out/bin/helm completion zsh > helm.zsh @@ -26,7 +23,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/kubernetes/helm; + homepage = "https://github.com/kubernetes/helm"; description = "A package manager for kubernetes"; license = licenses.asl20; maintainers = with maintainers; [ rlupton20 edude03 saschagrunert Frostman ]; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 2de07e9fdc7..1318ff003de 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,21 +1,23 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, Security }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -buildGoModule rec { +let version = "0.106.3"; in + +buildGoModule { pname = "helmfile"; - version = "0.102.0"; + inherit version; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0v7mhsnhswiqd62wrmkcpzsg9nfi6wvkh9danngs5rqjiz1zffhy"; + sha256 = "0pwkkgdcj9vx6nk574iaqwn074qfpgqd1c44d3kr3xdbac89yfyf"; }; - modSha256 = "0s7j7jbgr8gdc0s9dnl6zjwkpywqj05xyb7mkcank54kgrz0g5vq"; + goPackagePath = "github.com/roboll/helmfile"; - nativeBuildInputs = [ makeWrapper ]; + modSha256 = "1yv2b44qac0rms66v0qg13wsga0di6hwxa4dh2l0b1xvaf75ysay"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + nativeBuildInputs = [ makeWrapper ]; buildFlagsArray = '' -ldflags= @@ -24,14 +26,14 @@ buildGoModule rec { postInstall = '' wrapProgram $out/bin/helmfile \ - --prefix PATH : ${stdenv.lib.makeBinPath [ kubernetes-helm ]} + --prefix PATH : ${lib.makeBinPath [ kubernetes-helm ]} ''; - meta = with stdenv.lib; { + meta = { description = "Deploy Kubernetes Helm charts"; homepage = "https://github.com/roboll/helmfile"; - license = licenses.mit; - maintainers = with maintainers; [ pneumaticat yurrriq ]; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index b9413577b10..21f4011f070 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; - homepage = https://heptio.github.io/ark/; + homepage = "https://heptio.github.io/ark/"; license = licenses.asl20; maintainers = [maintainers.mbode]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/pkgs/applications/networking/cluster/hetzner-kube/default.nix index 8a59bf3197a..1d9940c8f31 100644 --- a/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hetzner-kube"; @@ -13,18 +13,16 @@ buildGoModule rec { modSha256 = "0jjrk93wdi13wrb5gchhqk7rgwm74kcizrbqsibgkgs2dszwfazh"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = '' -ldflags= -X github.com/xetys/hetzner-kube/cmd.version=${version} ''; - meta = with stdenv.lib; { + meta = { description = "A CLI tool for provisioning Kubernetes clusters on Hetzner Cloud"; homepage = "https://github.com/xetys/hetzner-kube"; - license = licenses.asl20; - maintainers = with maintainers; [ eliasp ]; - platforms = platforms.unix; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ eliasp ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index f817a68ced1..e2c0b663bef 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { name = "jx"; @@ -16,8 +16,6 @@ buildGoModule rec { ./3321-fix-location-of-thrift.patch ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; subPackages = [ "cmd/jx" ]; @@ -28,9 +26,9 @@ buildGoModule rec { -X github.com/jenkins-x/jx/pkg/version.Revision=${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "JX is a command line tool for installing and using Jenkins X."; - homepage = https://jenkins-x.io; + homepage = "https://jenkins-x.io"; longDescription = '' Jenkins X provides automated CI+CD for Kubernetes with Preview Environments on Pull Requests using Jenkins, Knative Build, Prow, diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix new file mode 100644 index 00000000000..b18e1f08dd4 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -0,0 +1,235 @@ +{ stdenv, lib, makeWrapper, socat, iptables, iproute, bridge-utils +, conntrack-tools, buildGoPackage, git, runc, libseccomp, pkgconfig +, ethtool, utillinux, ipset, fetchFromGitHub, fetchurl, fetchzip +, fetchgit +}: + +with lib; + +# k3s is a kinda weird derivation. One of the main points of k3s is the +# simplicity of it being one binary that can perform several tasks. +# However, when you have a good package manager (like nix), that doesn't +# actually make much of a difference; you don't really care if it's one binary +# or 10 since with a good package manager, installing and running it is +# identical. +# Since upstream k3s packages itself as one large binary with several +# "personalities" (in the form of subcommands like 'k3s agent' and 'k3s +# kubectl'), it ends up being easiest to mostly mimic upstream packaging, with +# some exceptions. +# K3s also carries patches to some packages (such as containerd and cni +# plugins), so we intentionally use the k3s versions of those binaries for k3s, +# even if the upstream version of those binaries exist in nixpkgs already. In +# the end, that means we have a thick k3s binary that behaves like the upstream +# one for the most part. +# However, k3s also bundles several pieces of unpatched software, from the +# strongswan vpn software, to iptables, to socat, conntrack, busybox, etc. +# Those pieces of software we entirely ignore upstream's handling of, and just +# make sure they're in the path if desired. +let + k3sVersion = "1.17.3+k3s1"; # k3s git tag + traefikChartVersion = "1.81.0"; # taken from ./scripts/version.sh at the above k3s tag + k3sRootVersion = "0.3.0"; # taken from .s/cripts/version.sh at the above k3s tag + # bundled into the k3s binary + traefikChart = fetchurl { + url = "https://kubernetes-charts.storage.googleapis.com/traefik-${traefikChartVersion}.tgz"; + sha256 = "1aqpzgjlvqhil0g3angz94zd4xbl4iq0qmpjcy5aq1xv9qciwdi9"; + }; + # so, k3s is a complicated thing to package + # This derivation attempts to avoid including any random binaries from the + # internet. k3s-root is _mostly_ binaries built to be bundled in k3s (which + # we don't care about doing, we can add those as build or runtime + # dependencies using a real package manager). + # In addition to those binaries, it's also configuration though (right now + # mostly strongswan configuration), and k3s does use those files. + # As such, we download it in order to grab 'etc' and bundle it into the final + # k3s binary. + k3sRoot = fetchzip { + # Note: marked as apache 2.0 license + url = "https://github.com/rancher/k3s-root/releases/download/v${k3sRootVersion}/k3s-root-amd64.tar"; + sha256 = "12xafn5jivl8lqdcs25b28xrc4mf7yf1xif5np169nvvxgvmpdxp"; + stripRoot=false; + }; + k3sPlugins = buildGoPackage rec { + name = "k3s-cni-plugins"; + version = "0.7.6-k3s1"; # from ./scripts/version.sh 'VERSION_CNIPLUGINS'; update when k3s's repo is updated. + + goPackagePath = "github.com/containernetworking/plugins"; + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "rancher"; + repo = "plugins"; + rev = "v${version}"; + sha256 = "0ax72z1ziann352bp6khfds8vlf3bbkqckrkpx4l4jxgqks45izs"; + }; + + meta = { + description = "CNI plugins, as patched by rancher for k3s"; + license = licenses.asl20; + homepage = "https://k3s.io"; + maintainers = [ maintainers.euank ]; + platforms = platforms.linux; + }; + }; + # Grab this separately from a build because it's used by both stages of the + # k3s build. + k3sRepo = fetchgit { + url = "https://github.com/rancher/k3s"; + rev = "v${k3sVersion}"; + leaveDotGit = true; # ./scripts/version.sh depends on git + sha256 = "0qahyc0mf9glxj49va6d20mcncqg4svfic2iz8b1lqid5c4g68mm"; + }; + # Stage 1 of the k3s build: + # Let's talk about how k3s is structured. + # One of the ideas of k3s is that there's the single "k3s" binary which can + # do everything you need, from running a k3s server, to being a worker node, + # to running kubectl. + # The way that actually works is that k3s is a single go binary that contains + # a bunch of bindata that it unpacks at runtime into directories (either the + # user's home directory or /var/lib/rancher if run as root). + # This bindata includes both binaries and configuration. + # In order to let nixpkgs do all its autostripping/patching/etc, we split this into two derivations. + # First, we build all the binaries that get packed into the thick k3s binary + # (and output them from one derivation so they'll all be suitably patched up). + # Then, we bundle those binaries into our thick k3s binary and use that as + # the final single output. + # This approach was chosen because it ensures the bundled binaries all are + # correctly built to run with nix (we can lean on the existing buildGoPackage + # stuff), and we can again lean on that tooling for the final k3s binary too. + # Other alternatives would be to manually run the + # strip/patchelf/remove-references step ourselves in the installPhase of the + # derivation when we've built all the binaries, but haven't bundled them in + # with generated bindata yet. + k3sBuildStage1 = buildGoPackage rec { + name = "k3s-build-1"; + version = "${k3sVersion}"; + + goPackagePath = "github.com/rancher/k3s"; + + src = k3sRepo; + + patches = [ ./patches/00-k3s.patch ]; + + nativeBuildInputs = [ git pkgconfig ]; + buildInputs = [ libseccomp ]; + + buildPhase = '' + pushd go/src/${goPackagePath} + + patchShebangs ./scripts/build ./scripts/version.sh + mkdir -p bin + ./scripts/build + + popd + ''; + + installPhase = '' + pushd go/src/${goPackagePath} + + mkdir -p "$bin/bin" + install -m 0755 -t "$bin/bin" ./bin/* + + popd + ''; + + meta = { + description = "The various binaries that get packaged into the final k3s binary."; + license = licenses.asl20; + homepage = "https://k3s.io"; + maintainers = [ maintainers.euank ]; + platforms = platforms.linux; + }; + }; + k3sBuild = buildGoPackage rec { + name = "k3s-build"; + version = "${k3sVersion}"; + + goPackagePath = "github.com/rancher/k3s"; + + src = k3sRepo; + + patches = [ ./patches/00-k3s.patch ]; + + nativeBuildInputs = [ git pkgconfig ]; + buildInputs = [ k3sBuildStage1 k3sPlugins runc ]; + + # In order to build the thick k3s binary (which is what + # ./scripts/package-cli does), we need to get all the binaries that script + # expects in place. + buildPhase = '' + pushd go/src/${goPackagePath} + + patchShebangs ./scripts/build ./scripts/version.sh ./scripts/package-cli + + mkdir -p bin + + install -m 0755 -t ./bin ${k3sBuildStage1}/bin/* + install -m 0755 -T "${k3sPlugins}/bin/plugins" ./bin/cni + # Note: use the already-nixpkgs-bundled k3s rather than the one bundled + # in k3s because the k3s one is completely unmodified from upstream + # (unlike containerd, cni, etc) + install -m 0755 -T "${runc}/bin/runc" ./bin/runc + cp -R "${k3sRoot}/etc" ./etc + mkdir -p "build/static/charts" + cp "${traefikChart}" "build/static/charts/traefik-${traefikChartVersion}.tgz" + + ./scripts/package-cli + + popd + ''; + + installPhase = '' + pushd go/src/${goPackagePath} + + mkdir -p "$bin/bin" + install -m 0755 -t "$bin/bin" ./dist/artifacts/k3s + + popd + ''; + + meta = { + description = "The k3s go binary which is used by the final wrapped output below."; + license = licenses.asl20; + homepage = "https://k3s.io"; + maintainers = [ maintainers.euank ]; + platforms = platforms.linux; + }; + }; +in +stdenv.mkDerivation rec { + name = "k3s"; + + # Important utilities used by the kubelet, see + # https://github.com/kubernetes/kubernetes/issues/26093#issuecomment-237202494 + # Note the list in that issue is stale and some aren't relevant for k3s. + k3sRuntimeDeps = [ + socat iptables iproute bridge-utils ethtool utillinux ipset conntrack-tools + ]; + + buildInputs = [ + k3sBuild makeWrapper + ] ++ k3sRuntimeDeps; + + unpackPhase = "true"; + + # And, one final derivation (you thought the last one was it, right?) + # We got the binary we wanted above, but it doesn't have all the runtime + # dependencies k8s wants, including mount utilities for kubelet, networking + # tools for cni/kubelet stuff, etc + # Use a wrapper script to reference all the binaries that k3s tries to + # execute, but that we didn't bundle with it. + installPhase = '' + mkdir -p "$out/bin" + makeWrapper ${k3sBuild}/bin/k3s "$out/bin/k3s" \ + --prefix PATH : ${lib.makeBinPath k3sRuntimeDeps} \ + --prefix PATH : "$out/bin" + ''; + + meta = { + description = "A lightweight Kubernetes distribution."; + license = licenses.asl20; + homepage = "https://k3s.io"; + maintainers = [ maintainers.euank ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch b/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch new file mode 100644 index 00000000000..afe2c356aa4 --- /dev/null +++ b/pkgs/applications/networking/cluster/k3s/patches/00-k3s.patch @@ -0,0 +1,74 @@ +diff --git a/main.go b/main.go +index 62908bb7bb..0527222887 100644 +--- a/main.go ++++ b/main.go +@@ -1,5 +1,5 @@ + //go:generate go run pkg/codegen/cleanup/main.go +-//go:generate /bin/rm -rf pkg/generated ++//go:generate rm -rf pkg/generated + //go:generate go run pkg/codegen/main.go + //go:generate go fmt pkg/deploy/zz_generated_bindata.go + //go:generate go fmt pkg/static/zz_generated_bindata.go +diff --git a/scripts/build b/scripts/build +index 72d3c07ece..3e5455b262 100755 +--- a/scripts/build ++++ b/scripts/build +@@ -10,7 +10,8 @@ PKG_CONTAINERD="github.com/containerd/containerd" + PKG_RANCHER_CONTAINERD="github.com/rancher/containerd" + PKG_CRICTL="github.com/kubernetes-sigs/cri-tools" + +-buildDate=$(date -u '+%Y-%m-%dT%H:%M:%SZ') ++# Deterministic build date ++buildDate="$(date -d "$(git log -1 --format=%ai)" -u "+%Y-%m-%dT%H:%M:%SZ")" + + VENDOR_PREFIX="${PKG}/vendor/" + VERSIONFLAGS=" +@@ -82,17 +83,7 @@ cleanup() { + } + + INSTALLBIN=$(pwd)/bin +-if [ ! -x ${INSTALLBIN}/cni ]; then +-( +- echo Building cni +- TMPDIR=$(mktemp -d) +- trap cleanup EXIT +- WORKDIR=$TMPDIR/src/github.com/containernetworking/plugins +- git clone -b $VERSION_CNIPLUGINS https://github.com/rancher/plugins.git $WORKDIR +- cd $WORKDIR +- GOPATH=$TMPDIR CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "$LDFLAGS $STATIC" -o $INSTALLBIN/cni +-) +-fi ++# skip building cni, use our separately built one + # echo Building agent + # CGO_ENABLED=1 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/k3s-agent ./cmd/agent/main.go + echo Building server +@@ -108,9 +99,8 @@ ln -s containerd ./bin/ctr + #CGO_ENABLED=1 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC_SQLITE" -o bin/ctr ./cmd/ctr/main.go + # echo Building containerd + # CGO_ENABLED=0 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS $STATIC" -o bin/containerd ./cmd/containerd/ +-echo Building runc +-make EXTRA_LDFLAGS="-w -s" BUILDTAGS="apparmor seccomp" -C ./vendor/github.com/opencontainers/runc static +-cp -f ./vendor/github.com/opencontainers/runc/runc ./bin/runc ++ ++# skip building runc; use our packaged one + + echo Building containerd-shim + make -C ./vendor/github.com/containerd/containerd bin/containerd-shim +diff --git a/scripts/package-cli b/scripts/package-cli +index 4c66ce32df..6d1e0c03cb 100755 +--- a/scripts/package-cli ++++ b/scripts/package-cli +@@ -55,10 +55,10 @@ LDFLAGS=" + -X github.com/rancher/k3s/pkg/version.GitCommit=${COMMIT:0:8} + -w -s + " +-STATIC="-extldflags '-static'" + if [ "$DQLITE" = "true" ]; then + DQLITE_TAGS="dqlite" + fi +-CGO_ENABLED=0 go build -tags "$DQLITE_TAGS" -ldflags "$LDFLAGS $STATIC" -o ${CMD_NAME} ./cmd/k3s/main.go ++go build -tags "$DQLITE_TAGS" -ldflags "$LDFLAGS" -o ${CMD_NAME} ./cmd/k3s/main.go + +-./scripts/build-upload ${CMD_NAME} ${COMMIT} ++# for nixos, don't upload it ++# ./scripts/build-upload ${CMD_NAME} ${COMMIT} diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 956d7b106b9..1cf76e1cff3 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -1,28 +1,24 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "k9s"; - version = "0.17.7"; - # rev is the release commit, mainly for version command output - rev = "8fedc42304ce33df314664eb0c4ac73be59065af"; + version = "0.18.1"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "0bqx1ckk89vzmk6fmqmv03cbdvw0agwrqzywzw35b4n0di37x0nv"; + sha256 = "0a5x4yamvx2qlwngfvainbhplwp0hqwgvdqlj2jbrbz4hfhr1l59"; }; buildFlagsArray = '' -ldflags= -s -w -X github.com/derailed/k9s/cmd.version=${version} - -X github.com/derailed/k9s/cmd.commit=${rev} + -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - modSha256 = "06m4xgl29zx6zpqx630m9cm52wmljms9cvly5f4pqdb4zicq7n86"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0wpf6iyq6p3a8azdkn17gdp01wq9khyzr1bab6qgvsnsnhnjzcky"; meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix index 52abc318990..ebf98840ee2 100644 --- a/pkgs/applications/networking/cluster/kanif/default.nix +++ b/pkgs/applications/networking/cluster/kanif/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { directories to several nodes ('kaput' command), and to gather several remote files or directories locally ('kaget' command). It relies on TakTuk for efficiency and scalability.''; - homepage = http://taktuk.gforge.inria.fr/kanif; + homepage = "http://taktuk.gforge.inria.fr/kanif"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/cluster/kontemplate/default.nix b/pkgs/applications/networking/cluster/kontemplate/default.nix index 359b289dbbc..87ae71f6a48 100644 --- a/pkgs/applications/networking/cluster/kontemplate/default.nix +++ b/pkgs/applications/networking/cluster/kontemplate/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { license = licenses.gpl3; maintainers = with maintainers; [ mbode tazjin ]; platforms = platforms.unix; - repositories.git = git://github.com/tazjin/kontemplate.git; + repositories.git = "git://github.com/tazjin/kontemplate.git"; longDescription = '' Kontemplate is a simple CLI tool that can take sets of diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 0e71e91fbc1..a5f1806e577 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -41,7 +41,7 @@ let meta = with stdenv.lib; { description = "Easiest way to get a production Kubernetes up and running"; - homepage = https://github.com/kubernetes/kops; + homepage = "https://github.com/kubernetes/kops"; license = licenses.asl20; maintainers = with maintainers; [ offline zimbatm kampka ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/kubecfg/default.nix b/pkgs/applications/networking/cluster/kubecfg/default.nix index 69d013e3f03..bf4ec949215 100644 --- a/pkgs/applications/networking/cluster/kubecfg/default.nix +++ b/pkgs/applications/networking/cluster/kubecfg/default.nix @@ -17,7 +17,7 @@ buildGoPackage { meta = { description = "A tool for managing Kubernetes resources as code"; - homepage = https://github.com/bitnami/kubecfg; + homepage = "https://github.com/bitnami/kubecfg"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ benley ]; platforms = lib.platforms.unix; diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 004e88ff44e..f171f69bffc 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { meta = { description = "Production-Grade Container Scheduling and Management"; license = licenses.asl20; - homepage = https://kubernetes.io; + homepage = "https://kubernetes.io"; maintainers = with maintainers; [johanot offline saschagrunert]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 092cee5f7a2..ef87b67a360 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -1,23 +1,21 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kubeseal"; - version = "0.10.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "14ahb02p1gqcqbjz6mn3axw436b6bi4ygq5ckm85jzs28s4wrfsv"; + sha256 = "0z51iwdc4m0y8wyyx3mcvbzxlrgws7n5wkcd0g7nr73irnsld4lh"; }; - modSha256 = "04dmjyz3vi2l0dfpyy42lkp2fv1vlfkvblrxh1dvb37phrkd5lbd"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "029h0zr3fpzlsv9hf1d1x5j7aalxkcsyszsxjz8fqrhjafqc7zvq"; subPackages = [ "cmd/kubeseal" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A Kubernetes controller and tool for one-way encrypted Secrets"; homepage = "https://github.com/bitnami-labs/sealed-secrets"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/kubetail/default.nix b/pkgs/applications/networking/cluster/kubetail/default.nix index 779edad8de3..114c5f5af15 100644 --- a/pkgs/applications/networking/cluster/kubetail/default.nix +++ b/pkgs/applications/networking/cluster/kubetail/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { multiple pods into one stream. This is the same as running "kubectl logs -f " but for multiple pods. ''; - homepage = https://github.com/johanhaleby/kubetail; + homepage = "https://github.com/johanhaleby/kubetail"; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 046052f78be..569baf6000a 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, lib, fetchFromGitHub, buildGoModule, makeWrapper }: buildGoModule rec { pname = "kubeval"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Validate your Kubernetes configuration files"; - homepage = https://github.com/instrumenta/kubeval; + homepage = "https://github.com/instrumenta/kubeval"; license = licenses.asl20; maintainers = with maintainers; [ nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index d52b25c2e01..3d66a7c62f2 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule { pname = "linkerd-unstablle"; @@ -13,13 +13,11 @@ buildGoModule { modSha256 = "0gahhywpcj16ww4l8s3wjwvavq24fpy258snhyf94ipy6lb797sl"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "cli/cmd" ]; meta = with stdenv.lib; { description = "A service mesh for Kubernetes and beyond."; - homepage = https://linkerd.io/; + homepage = "https://linkerd.io/"; license = licenses.asl20; maintainers = with maintainers; [ Gonzih ]; }; diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index af20be1b0da..010d8cf4d21 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs = ["--prefix PYTHONPATH . :"]; meta = with lib; { - homepage = https://github.com/spotify/luigi; + homepage = "https://github.com/spotify/luigi"; description = "Python package that helps you build complex pipelines of batch jobs"; longDescription = '' Luigi handles dependency resolution, workflow management, visualization, diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix index b7decc0c141..df571f4cf86 100644 --- a/pkgs/applications/networking/cluster/marathon/default.nix +++ b/pkgs/applications/networking/cluster/marathon/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mesosphere.github.io/marathon; + homepage = "https://mesosphere.github.io/marathon"; description = "Cluster-wide init and control system for services in cgroups or Docker containers"; license = licenses.asl20; maintainers = with maintainers; [ kamilchm pradeepchhetri ]; diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index ec152fdc464..ac1feee5d72 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -258,5 +258,6 @@ in stdenv.mkDerivation rec { description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan offline ]; platforms = platforms.unix; + broken = true; # Broken since 2019-10-22 (https://hydra.nixos.org/build/115475123) }; } diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index ebd78424f4a..ea1fec65143 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -6,10 +6,6 @@ , go-bindata , libvirt , vmnet -, xpc -, libobjc -, Foundation -, IOKit }: buildGoModule rec { @@ -31,7 +27,7 @@ buildGoModule rec { nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] - ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet xpc libobjc IOKit Foundation ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ]; preBuild = '' go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... @@ -62,7 +58,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/kubernetes/minikube; + homepage = "https://github.com/kubernetes/minikube"; description = "A tool that makes it easy to run Kubernetes locally"; license = licenses.asl20; maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang ]; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 43e960d9403..3dcfbf6fd7e 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -59,7 +59,7 @@ in buildGoPackage rec { a single-node OpenShift cluster inside a VM. You can try out OpenShift or develop with it, day-to-day, on your local host. ''; - homepage = https://github.com/minishift/minishift; + homepage = "https://github.com/minishift/minishift"; maintainers = with maintainers; [ fpletz vdemeester ]; platforms = platforms.linux; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 6afbbf215a3..8e59671159a 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nomad"; - version = "0.10.2"; + version = "0.10.5"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1kv67rkqnxiz2dkmc1v1df6qx9j5j4h7cis00v2i15sl824g22jw"; + sha256 = "0i9104anf3qaydm1izlwrzvpzizd6p1zy651hsynscnnxa56cmyk"; }; # ui: @@ -32,7 +32,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.nomadproject.io/; + homepage = "https://www.nomadproject.io/"; description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.unix; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index fb88dfdbb64..a9b0ed3fcb5 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -81,7 +81,7 @@ in buildGoPackage rec { meta = with stdenv.lib; { description = "Build, deploy, and manage your applications with Docker and Kubernetes"; license = licenses.asl20; - homepage = http://www.openshift.org; + homepage = "http://www.openshift.org"; maintainers = with maintainers; [offline bachp moretea]; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index de0bb015852..65a4a193843 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "Containerized Data Analytics"; - homepage = https://github.com/pachyderm/pachyderm; + homepage = "https://github.com/pachyderm/pachyderm"; license = licenses.asl20; maintainers = with maintainers; [offline]; }; diff --git a/pkgs/applications/networking/cluster/pig/default.nix b/pkgs/applications/networking/cluster/pig/default.nix index 26c39f8cbe2..afcd736e629 100644 --- a/pkgs/applications/networking/cluster/pig/default.nix +++ b/pkgs/applications/networking/cluster/pig/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://pig.apache.org/; + homepage = "https://pig.apache.org/"; description = "High-level language for Apache Hadoop"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch b/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch deleted file mode 100644 index ae407727b9d..00000000000 --- a/pkgs/applications/networking/cluster/prow/13918-fix-go-sum.patch +++ /dev/null @@ -1,22 +0,0 @@ -From b0ab95b9664916618ebf5fe637b1bc4de4ba9a6e Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" <wael.nasreddine@gmail.com> -Date: Wed, 14 Aug 2019 23:07:51 -0700 -Subject: [PATCH] fix the hash of gomodules.xyz/jsonpatch/v2 - ---- - go.sum | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/go.sum b/go.sum -index 6bb130b4d9b..b3f48a85d4a 100644 ---- a/go.sum -+++ b/go.sum -@@ -452,7 +452,7 @@ golang.org/x/tools v0.0.0-20190312170243-e65039ee4138 h1:H3uGjxCR/6Ds0Mjgyp7LMK8 - golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= - golang.org/x/tools v0.0.0-20190404132500-923d25813098 h1:MtqjsZmyGRgMmLUgxnmMJ6RYdvd2ib8ipiayHhqSxs4= - golang.org/x/tools v0.0.0-20190404132500-923d25813098/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= --gomodules.xyz/jsonpatch/v2 v2.0.0 h1:lHNQverf0+Gm1TbSbVIDWVXOhZ2FpZopxRqpr2uIjs4= -+gomodules.xyz/jsonpatch/v2 v2.0.0 h1:OyHbl+7IOECpPKfVK42oFr6N7+Y2dR+Jsb/IiDV3hOo= - gomodules.xyz/jsonpatch/v2 v2.0.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU= - google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= - google.golang.org/api v0.0.0-20181021000519-a2651947f503/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= diff --git a/pkgs/applications/networking/cluster/prow/default.nix b/pkgs/applications/networking/cluster/prow/default.nix index e3eb24b2374..0b2f798d35b 100644 --- a/pkgs/applications/networking/cluster/prow/default.nix +++ b/pkgs/applications/networking/cluster/prow/default.nix @@ -1,62 +1,55 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "prow-unstable"; - version = "2019-08-14"; - rev = "35a7744f5737bbc1c4e1256a9c9c5ad135c650e4"; + version = "2020-04-01"; + rev = "32e3b5ce7695fb622381421653db436cb57b47c5"; src = fetchFromGitHub { inherit rev; owner = "kubernetes"; repo = "test-infra"; - sha256 = "07kdlzrj59xyaa73vlx4s50fpg0brrkb0h0cyjgx81a0hsc7s03k"; + sha256 = "0mc3ynmbf3kidibdy8k3v3xjlvmxl8w7zm1z2m0skmhd0y4bpmk4"; }; - patches = [ - # https://github.com/kubernetes/test-infra/pull/13918 - ./13918-fix-go-sum.patch - ]; - - modSha256 = "06q1zvhm78k64aj475k1xl38h7nk83mysd0bja0wknja048ymgsq"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1xajdg10a27icc7g1y3ym4pkgg64rp4afybbjlhbg3k3whir9xa1"; subPackages = [ - "./prow/cmd/admission" - "./prow/cmd/artifact-uploader" - "./prow/cmd/branchprotector" - "./prow/cmd/build" - "./prow/cmd/checkconfig" - "./prow/cmd/clonerefs" - "./prow/cmd/config-bootstrapper" - "./prow/cmd/crier" - "./prow/cmd/deck" - "./prow/cmd/entrypoint" - "./prow/cmd/gcsupload" - "./prow/cmd/gerrit" - "./prow/cmd/hook" - "./prow/cmd/horologium" - "./prow/cmd/initupload" - "./prow/cmd/jenkins-operator" - "./prow/cmd/mkbuild-cluster" - "./prow/cmd/mkpj" - "./prow/cmd/mkpod" - "./prow/cmd/peribolos" - "./prow/cmd/phaino" - "./prow/cmd/phony" - "./prow/cmd/pipeline" - "./prow/cmd/plank" - "./prow/cmd/sidecar" - "./prow/cmd/sinker" - "./prow/cmd/status-reconciler" - "./prow/cmd/sub" - "./prow/cmd/tackle" - "./prow/cmd/tide" - "./prow/cmd/tot" + "prow/cmd/admission" + "prow/cmd/branchprotector" + "prow/cmd/checkconfig" + "prow/cmd/clonerefs" + "prow/cmd/cm2kc" + "prow/cmd/config-bootstrapper" + "prow/cmd/crier" + "prow/cmd/deck" + "prow/cmd/entrypoint" + "prow/cmd/exporter" + "prow/cmd/gcsupload" + "prow/cmd/gerrit" + "prow/cmd/hook" + "prow/cmd/horologium" + "prow/cmd/initupload" + "prow/cmd/jenkins-operator" + "prow/cmd/mkbuild-cluster" + "prow/cmd/mkpj" + "prow/cmd/mkpod" + "prow/cmd/peribolos" + "prow/cmd/phaino" + "prow/cmd/phony" + "prow/cmd/pipeline" + "prow/cmd/plank" + "prow/cmd/sidecar" + "prow/cmd/sinker" + "prow/cmd/status-reconciler" + "prow/cmd/sub" + "prow/cmd/tackle" + "prow/cmd/tide" + "prow/cmd/tot" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Prow is a Kubernetes based CI/CD system"; longDescription = '' Prow is a Kubernetes based CI/CD system. Jobs can be triggered by various diff --git a/pkgs/applications/networking/cluster/qbec/default.nix b/pkgs/applications/networking/cluster/qbec/default.nix index 4e475320a61..53b421ec552 100644 --- a/pkgs/applications/networking/cluster/qbec/default.nix +++ b/pkgs/applications/networking/cluster/qbec/default.nix @@ -1,21 +1,19 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "qbec"; - version = "0.10.5"; + version = "0.11.0"; src = fetchFromGitHub { owner = "splunk"; repo = "qbec"; rev = "v${version}"; - sha256 = "0j0ybbv4ix864scmghy1lvr3rs2fbj49cva6x48kbwli4y447758"; + sha256 = "0krdfaha19wzi10rh0wfhki5nknbd5mndaxhrq7y9m840xy43d6d"; }; - modSha256 = "165zqmannlylkzaz9gkmcrlyx8rfhz70ahzhiks4ycgq1qxr0av9"; + modSha256 = "1wb15vrkb4ryvrjp68ygmadnf78s354106ya210pnmsbb53rbhaz"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; homepage = "https://github.com/splunk/qbec"; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index b8d4b947e32..162585851d0 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = with maintainers; [ thoughtpolice offline kamilchm ]; - repositories.git = git://git.apache.org/spark.git; + repositories.git = "git://git.apache.org/spark.git"; }; } diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix index 3423163f590..a5a2ace2399 100644 --- a/pkgs/applications/networking/cluster/taktuk/default.nix +++ b/pkgs/applications/networking/cluster/taktuk/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { network to transport commands and perform I/Os multiplexing. It doesn't require any specific software on the nodes thanks to a self-propagation algorithm.''; - homepage = http://taktuk.gforge.inria.fr/; + homepage = "http://taktuk.gforge.inria.fr/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/cluster/terraform-docs/default.nix b/pkgs/applications/networking/cluster/terraform-docs/default.nix index 606cd0370aa..a5b6e7d2f5e 100644 --- a/pkgs/applications/networking/cluster/terraform-docs/default.nix +++ b/pkgs/applications/networking/cluster/terraform-docs/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "terraform-docs"; - version = "0.6.0"; + version = "0.9.1"; goPackagePath = "github.com/segmentio/${pname}"; @@ -9,7 +9,7 @@ buildGoPackage rec { owner = "segmentio"; repo = pname; rev = "v${version}"; - sha256 = "1p6prhjf82qnhf1zwl9h92j4ds5g383a6g9pwwnqbc3wdwy5zx7d"; + sha256 = "00sfzdqhf8g85m03r6mbzfas5vvc67iq7syb8ljcgxg8l1knxnjx"; }; preBuild = '' diff --git a/pkgs/applications/networking/cluster/terraform-inventory/default.nix b/pkgs/applications/networking/cluster/terraform-inventory/default.nix index 1bb8df88d01..38fbd1b4286 100644 --- a/pkgs/applications/networking/cluster/terraform-inventory/default.nix +++ b/pkgs/applications/networking/cluster/terraform-inventory/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/adammck/terraform-inventory; + homepage = "https://github.com/adammck/terraform-inventory"; description = "Terraform state to ansible inventory adapter"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock index b801fad546d..7307d8a33f3 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock +++ b/pkgs/applications/networking/cluster/terraform-landscape/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES terraform_landscape BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/applications/networking/cluster/terraform-landscape/default.nix b/pkgs/applications/networking/cluster/terraform-landscape/default.nix index 32f6680b2f8..903aa9abb6e 100644 --- a/pkgs/applications/networking/cluster/terraform-landscape/default.nix +++ b/pkgs/applications/networking/cluster/terraform-landscape/default.nix @@ -10,7 +10,7 @@ bundlerApp { meta = with lib; { description = "Improve Terraform's plan output to be easier to read and understand"; - homepage = https://github.com/coinbase/terraform-landscape; + homepage = "https://github.com/coinbase/terraform-landscape"; license = with licenses; asl20; maintainers = with maintainers; [ mbode manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index b78ab3f6dda..d07b6321cb2 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -1,5 +1,13 @@ # Generated with ./update-all { + aci = + { + owner = "terraform-providers"; + repo = "terraform-provider-aci"; + rev = "v0.1.8"; + version = "0.1.8"; + sha256 = "14hya00ygz0khljjxwvkp6wbrbsavh2n8f26s2mjakph2havb8a3"; + }; acme = { owner = "terraform-providers"; @@ -8,17 +16,25 @@ version = "1.5.0"; sha256 = "1h53bgflchavnn4laf801d920bsgqqg0ph4slnf7y1fpb0mz5vdv"; }; + akamai = + { + owner = "terraform-providers"; + repo = "terraform-provider-akamai"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "18l1ik10pn4aq0911sqnfjw9a5zxrm0qbsgynvf5vxc02zds13n5"; + }; alicloud = { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - rev = "v1.70.1"; - version = "1.70.1"; - sha256 = "19bhnnw5gh4pqap8y23v57lyk27z7fw1wb4p0faj860kdf2zpq4j"; + rev = "v1.77.0"; + version = "1.77.0"; + sha256 = "0g8i8dmxzgkzylh2hh4fa9nq6x8bmxqaz0ly0f0cijb82lcbc3qf"; }; archive = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-archive"; rev = "v1.3.0"; version = "1.3.0"; @@ -32,37 +48,53 @@ version = "1.1.0"; sha256 = "1akl9fzgm5qv01vz18xjzyqjnlxw699qq4x8vr96j16l1zf10h99"; }; - atlas = + auth0 = { owner = "terraform-providers"; - repo = "terraform-provider-atlas"; - rev = "v0.1.1"; - version = "0.1.1"; - sha256 = "0k73vv14vnjl5qm33w54s5zzi0mmk1kn2zs3qkfq71aqi9ml7d14"; + repo = "terraform-provider-auth0"; + rev = "v0.8.1"; + version = "0.8.1"; + sha256 = "0hfmbw76p99xa9jz2sjss56p4wzqqhnf9l9gqgyamywfrdd2bn57"; + }; + aviatrix = + { + owner = "terraform-providers"; + repo = "terraform-provider-aviatrix"; + rev = "v2.12.0"; + version = "2.12.0"; + sha256 = "01n3cqb5k8gd0cll3nqbdmnx3mi0scm57j0xpzhxnif14kpj15g6"; + }; + avi = + { + owner = "terraform-providers"; + repo = "terraform-provider-avi"; + rev = "v0.2.1"; + version = "0.2.1"; + sha256 = "1pyknx5maq1qxm4i2y69iz9c2ym3q3n0fd4hbwxcl83n39cb5iy6"; }; aws = { owner = "terraform-providers"; repo = "terraform-provider-aws"; - rev = "v2.45.0"; - version = "2.45.0"; - sha256 = "0416f32wy88zyagnwcf2flh1rh7i118b9h5qn8fwrm3sv43p3blm"; + rev = "v2.55.0"; + version = "2.55.0"; + sha256 = "0pxmwdy5cin0navva1nf3l02yrqqbg01xcq3hf8w0ch8fgr8mr25"; }; azuread = { owner = "terraform-providers"; repo = "terraform-provider-azuread"; - rev = "v0.7.0"; - version = "0.7.0"; - sha256 = "1a7w31dvjz5498445ia4m5gd1js3k7ghz6qqfq51f2n86iafs0xq"; + rev = "v0.8.0"; + version = "0.8.0"; + sha256 = "0vljhjbizxh5s8f2ki7yn6hzf5xbn5swhxmq9wpxmg7jw5z0k6ha"; }; azurerm = { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - rev = "v1.41.0"; - version = "1.41.0"; - sha256 = "0ma291m9d452wavjr3lgyik01r8napmwz91bbnbfzp1j48hhqc4h"; + rev = "v2.3.0"; + version = "2.3.0"; + sha256 = "195r6l0ddpjmmf947c1k5v0vdscnhsg2ilp6x7pna418pnx84y2d"; }; azurestack = { @@ -72,21 +104,29 @@ version = "0.9.0"; sha256 = "1msm7jwzry0vmas3l68h6p0migrsm6d18zpxcncv197m8xbvg324"; }; + baiducloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-baiducloud"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "1va0b9vqfcv2nrqh8jwf80ylyl1x826jhb7h4ghnf18c144qm0i1"; + }; bigip = { owner = "terraform-providers"; repo = "terraform-provider-bigip"; - rev = "v1.1.1"; - version = "1.1.1"; - sha256 = "15rx25fbvdmgvg5n0qnq1hyfnr7l4nx8igdb4107g41fp73bxg32"; + rev = "v1.12"; + version = "1.12"; + sha256 = "0yjv0xldplx7jfld1izzc7i93bzwdqrjjzymq02isy2xyfh8by35"; }; bitbucket = { owner = "terraform-providers"; repo = "terraform-provider-bitbucket"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "06bjagbgpgfphwym015wl00wx6qf7lsdig0fhpxqaykvlkn3sg49"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "11n4wpvmaab164g6k077n9dbdbhd5lwl7pxpha5492ks468nd95b"; }; brightbox = { @@ -96,6 +136,14 @@ version = "1.2.0"; sha256 = "0s1b2k58r2kmjrdqrkw2dlfpby79i81gml9rpa10y372bwq314zd"; }; + checkpoint = + { + owner = "terraform-providers"; + repo = "terraform-provider-checkpoint"; + rev = "v1.0.1"; + version = "1.0.1"; + sha256 = "1z2m8lbnplcfaij1xnclyhl4zlchx6bmvrc2fr4hwfzc58m9v7ra"; + }; chef = { owner = "terraform-providers"; @@ -104,13 +152,21 @@ version = "0.2.0"; sha256 = "0ihn4706fflmf0585w22l7arzxsa9biq4cgh8nlhlp5y0zy934ns"; }; - circonus = + cherryservers = { owner = "terraform-providers"; - repo = "terraform-provider-circonus"; - rev = "v0.5.0"; - version = "0.5.0"; - sha256 = "0m6xbmgbismsmxnh79xb9p3mvy9aqdwvmsvifpxsbd73lki232mc"; + repo = "terraform-provider-cherryservers"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "1z6ai6q8aw38kiy8x13rp0dsvb4jk40cv8pk5c069q15m4jab8lh"; + }; + ciscoasa = + { + owner = "terraform-providers"; + repo = "terraform-provider-ciscoasa"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "033pgy42qwjpmjyzylpml7sfzd6dvvybs56cid1f6sm4ykmxbal7"; }; clc = { @@ -124,9 +180,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "031xb0g1g74gc44nadbgrfn59hzjr5q0s98lgxrglsdm5mfgzdfr"; + rev = "v2.5.0"; + version = "2.5.0"; + sha256 = "1dqxn2iwbidmfb0850sicwqh4yp6ynarkl36lnr8nqw9lasvqr5a"; }; cloudscale = { @@ -156,25 +212,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-consul"; - rev = "v2.6.1"; - version = "2.6.1"; - sha256 = "17lgfanz3by7wfrgqbwbsbxs46mrr8a1iyqkj38qc8xg0m6pg97v"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "11c54waq7w34l79ak4kizjkmh8zjca5ygh9yib691hdmxsx2cifj"; }; datadog = { owner = "terraform-providers"; repo = "terraform-provider-datadog"; - rev = "v2.6.0"; - version = "2.6.0"; - sha256 = "05ijf01sxdxrxc3ii68ha8b6x8pz025kfa51i91q42ldhf3kqhsz"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "0cq11cjcm2nlszqhsrj425mk8dp0h5ljrrn7jplrbffp8g6wvadd"; }; digitalocean = { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - rev = "v1.12.0"; - version = "1.12.0"; - sha256 = "137p8q30pv28h5gfqag0i44dxbc1dbq239gnzbb4hkzgsqgrb9gp"; + rev = "v1.15.1"; + version = "1.15.1"; + sha256 = "0nld6lgz5vy8n4s0y0wpssrslp866rha2znli6pd5sw1nvi6yg0z"; }; dme = { @@ -184,29 +240,37 @@ version = "0.1.0"; sha256 = "1ipqw1sbx0i9rhxawsysrqxvf10z8ra2y86xwd4iz0f12x9drblv"; }; - dns = + dnsimple = { owner = "terraform-providers"; + repo = "terraform-provider-dnsimple"; + rev = "v0.3.0"; + version = "0.3.0"; + sha256 = "1m38whc6jx5mccaisnbnkawwlz1bxvy991rqy6h9xb10zyvqar62"; + }; + dns = + { + owner = "hashicorp"; repo = "terraform-provider-dns"; rev = "v2.2.0"; version = "2.2.0"; sha256 = "11xdxj6hfclaq9glbh14nihmrsk220crm9ld8bdv77w0bppmrrch"; }; - dnsimple = + docker = { owner = "terraform-providers"; - repo = "terraform-provider-dnsimple"; - rev = "v0.2.0"; - version = "0.2.0"; - sha256 = "0jj82fffqaz7gramj5d4avx7vka6w190yz4r9q7628qh8ih2pfhz"; + repo = "terraform-provider-docker"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "0pl515xjnic7mhfvqbml1z1win5mrhjdqb84jhd5n09j39lb24gx"; }; - docker = + dome9 = { owner = "terraform-providers"; - repo = "terraform-provider-docker"; - rev = "v2.6.0"; - version = "2.6.0"; - sha256 = "12qq7m75yxfczik78klqaimrzhp70m2vk5q0h3v8b2dwvvynj0dg"; + repo = "terraform-provider-dome9"; + rev = "v1.17.0"; + version = "1.17.0"; + sha256 = "123phc71rnb25lv9glybadhmr3pdsrbzl7xm6mj8j213a78qdmn5"; }; dyn = { @@ -216,9 +280,17 @@ version = "1.2.0"; sha256 = "1a3kxmbib2y0nl7gnxknbhsflj5kfknxnm3gjxxrb2h5d2kvqy48"; }; - external = + exoscale = { owner = "terraform-providers"; + repo = "terraform-provider-exoscale"; + rev = "v0.16.1"; + version = "0.16.1"; + sha256 = "0gs39nx12ws0ikal9zyqkyfiljbxbw0pj7llj9xsq96s7crvy6xr"; + }; + external = + { + owner = "hashicorp"; repo = "terraform-provider-external"; rev = "v1.2.0"; version = "1.2.0"; @@ -228,25 +300,41 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - rev = "v0.12.1"; - version = "0.12.1"; - sha256 = "1bczp7rdbpmycbky9ijirfix2capw0hjai4c7w5hmm4wda5spwb1"; + rev = "v0.13.0"; + version = "0.13.0"; + sha256 = "0mcjmk21fil4q98p8v3qln7s2fqbdkjv1pvba0cf9v9d101dhhi9"; }; flexibleengine = { owner = "terraform-providers"; repo = "terraform-provider-flexibleengine"; - rev = "v1.10.0"; - version = "1.10.0"; - sha256 = "1ys1dd7knfk3hic6ph4gi7qsf75s2m5mxkil16p3f9ywvfxpzq8w"; + rev = "v1.11.1"; + version = "1.11.1"; + sha256 = "12kgnq2ydwi2n29y0dc7r251zrnq8kkskiq8p5ypsrm23j3jm6dw"; + }; + fortios = + { + owner = "terraform-providers"; + repo = "terraform-provider-fortios"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "0m006ah351f2ih7zvd3pnpga4d8mh42i4m8af4wflhvyzkw50xnf"; + }; + genymotion = + { + owner = "terraform-providers"; + repo = "terraform-provider-genymotion"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "02jpr3cm7rrf810c69sr6lcxzvxpnf7icc5z80gnvg67wwfg4ph4"; }; github = { owner = "terraform-providers"; repo = "terraform-provider-github"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "02fd6rq25ms9lpjqn4n1wy13i2mnl9lvczpgjqlz69yj2aiwyw34"; + rev = "v2.5.1"; + version = "2.5.1"; + sha256 = "1lqnwq5gsz34n6zzwajxrh0i1cbyicl4zxakr4fch7makri2fqwg"; }; gitlab = { @@ -256,21 +344,21 @@ version = "2.5.0"; sha256 = "1g7girhjks6p7rcs82p2zd8clp6kdfn6d1synlmfwiw6d3496fvf"; }; - google = + google-beta = { owner = "terraform-providers"; - repo = "terraform-provider-google"; - rev = "v3.5.0"; - version = "3.5.0"; - sha256 = "09mlic67940bnq5f8a7magn27k2jm8hvq3z0zh2cv6a9gdpg821i"; + repo = "terraform-provider-google-beta"; + rev = "v3.15.0"; + version = "3.15.0"; + sha256 = "1xncw82y48dcc464v2gzfmr94l3kgh9x2rlmpmmy6g4mihiwh38b"; }; - google-beta = + google = { owner = "terraform-providers"; - repo = "terraform-provider-google-beta"; - rev = "v3.5.0"; - version = "3.5.0"; - sha256 = "1qkfvvidvb2j76x095vprj2vm272lig38a8rbxsir2kkvkmnzv5l"; + repo = "terraform-provider-google"; + rev = "v3.15.0"; + version = "3.15.0"; + sha256 = "0vw7sndy441xn34kiv2k9hq9p9g649amh7bk91rf0f5p8cmyll1c"; }; grafana = { @@ -280,61 +368,77 @@ version = "1.5.0"; sha256 = "0zy3bqgpxymp2zygaxzllk1ysdankwxa1sy1djfgr4fs2nlggkwi"; }; + gridscale = + { + owner = "terraform-providers"; + repo = "terraform-provider-gridscale"; + rev = "v1.5.0"; + version = "1.5.0"; + sha256 = "05nzia9sa555k07gkhyyckdgn9n6a50w8l3id69rjq1jjh0pngd7"; + }; hcloud = { owner = "terraform-providers"; repo = "terraform-provider-hcloud"; - rev = "v1.15.0"; - version = "1.15.0"; - sha256 = "0l554mf6s248j0453b4r5pafshcvhn2smk4pp23y9kq5g1xd0xmd"; + rev = "v1.16.0"; + version = "1.16.0"; + sha256 = "09v2bg4ffyh4ibz449dygxgd7mvjgh4b2r242l3cwi7pzn66imrz"; }; hedvig = { owner = "terraform-providers"; repo = "terraform-provider-hedvig"; - rev = "v1.0.5"; - version = "1.0.5"; - sha256 = "0dic4kqjwi3s8pss1pmgixnr7xi503gl5i7pcx66fam5y5ar92v5"; + rev = "v1.1.1"; + version = "1.1.1"; + sha256 = "1gd26jm9frn52hy2vm5sv003lbai5sjgdign6akhjmw5sdsmfr05"; }; helm = { owner = "terraform-providers"; repo = "terraform-provider-helm"; - rev = "v0.10.4"; - version = "0.10.4"; - sha256 = "0xl0wgh1j6yhymadqvlj21qddxfzaxk3d5wpzskfmhfk732795rc"; + rev = "v1.1.1"; + version = "1.1.1"; + sha256 = "0sna0xaibdh1aw3lxs1r2hidw95lxkpm4fqdw0hzmdqxwdmg4b40"; }; heroku = { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - rev = "v2.2.1"; - version = "2.2.1"; - sha256 = "145kfm4asca0ksprb076mjdhs5ahrlrad8cqz8spxra5fa3j46sq"; + rev = "v2.3.0"; + version = "2.3.0"; + sha256 = "1lv3l54fw6rgj2ixkz2dvaf3djj3slhrm0nlbza5c7zjb945igfq"; }; http = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-http"; - rev = "v1.1.1"; - version = "1.1.1"; - sha256 = "0ah4wi9gm5m7z0wyy6vn3baz2iw2sq7ah7q0lb9srwr887aai3x0"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "0q8ichbqrq62q1j0rc7sdz1jzfwg2l9v4ac9jqf6y485dblhmwqd"; + }; + huaweicloudstack = + { + owner = "terraform-providers"; + repo = "terraform-provider-huaweicloudstack"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "1zzf7jbvdlccfbb4cmw2k3mlfj4hh0lv59zahq2zy8afiajsb68i"; }; huaweicloud = { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - rev = "v1.12.0"; - version = "1.12.0"; - sha256 = "1wcr1d9y6bnwjh6b0a49i566wyn0d8bjnxnpgmd4s6wmr9sc4l0b"; + rev = "v1.13.0"; + version = "1.13.0"; + sha256 = "1caix3lycqnd856z6c3zp9mmq3vr7rblwhhbkwn4rrcld8sv285j"; }; icinga2 = { owner = "terraform-providers"; repo = "terraform-provider-icinga2"; - rev = "v0.2.0"; - version = "0.2.0"; - sha256 = "02ladn2w75k35vn8llj3zh9hbpnnnvpm47c9f29zshfs04acwbq0"; + rev = "v0.3.0"; + version = "0.3.0"; + sha256 = "0xwjxb84glhp9viqykziwanj696w2prq4r7k0565k0w3qiaz440v"; }; ignition = { @@ -344,6 +448,14 @@ version = "1.2.1"; sha256 = "0wd29iw0a5w7ykgs9m1mmi0bw5z9dl4z640qyz64x8rlh5hl1wql"; }; + incapsula = + { + owner = "terraform-providers"; + repo = "terraform-provider-incapsula"; + rev = "v2.1.0"; + version = "2.1.0"; + sha256 = "12zw2m7j52rszfawywbiv9rgv976h1w6bp98012qn45d4ap2kvzy"; + }; influxdb = { owner = "terraform-providers"; @@ -352,13 +464,29 @@ version = "1.3.0"; sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9"; }; + jdcloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-jdcloud"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "04vz0m3z9rfw2hp0h3jhn625r2v37b319krznvhqylqzksv39dzf"; + }; kubernetes = { owner = "terraform-providers"; repo = "terraform-provider-kubernetes"; - rev = "v1.10.0"; - version = "1.10.0"; - sha256 = "04hd9n9jm72fi81cmdz0yf374fg52r8yinsxy0ag29rd3r2l1k81"; + rev = "v1.11.1"; + version = "1.11.1"; + sha256 = "13m0g52i2z4s58grk22rv0yqbrfszfbxxhwisb5mi7cma4cp7506"; + }; + launchdarkly = + { + owner = "terraform-providers"; + repo = "terraform-provider-launchdarkly"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "1gj0srv8shn6qg109y1g42dx8dybkp3qrjn412bvs6f063ggk0zs"; }; librato = { @@ -372,13 +500,13 @@ { owner = "terraform-providers"; repo = "terraform-provider-linode"; - rev = "v1.9.1"; - version = "1.9.1"; - sha256 = "10f7nij91fhgf1808r6rv3l13nz7p37mcln5p3nfvhsxskss3vxn"; + rev = "v1.9.2"; + version = "1.9.2"; + sha256 = "1nrk8fi0fwkcm4csrppjwv7vd2ilpbj01dywak696nj8b15w176q"; }; local = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-local"; rev = "v1.4.0"; version = "1.4.0"; @@ -396,9 +524,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-logicmonitor"; - rev = "v1.2.1"; - version = "1.2.1"; - sha256 = "1fcv5g92l6xr4x69h9rg48zazjr99wrz9mkmr122fyq9s7kdd98y"; + rev = "v1.3.0"; + version = "1.3.0"; + sha256 = "00d8qx95cxaif636dyh935nv9nn6lmb1ybxy7n4myy9g80y50ap1"; }; mailgun = { @@ -408,6 +536,30 @@ version = "0.4.1"; sha256 = "1l76pg4hmww9zg2n4rkhm5dwjh42fxri6d41ih1bf670krkxwsmz"; }; + matchbox = + { + owner = "poseidon"; + repo = "terraform-provider-matchbox"; + rev = "v0.3.0"; + version = "0.3.0"; + sha256 = "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3"; + }; + metalcloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-metalcloud"; + rev = "v2.2.0"; + version = "2.2.0"; + sha256 = "0xii9gk96srzi9y4pbvlx2cvwypll4igvk89f9qrg18qrw72ags3"; + }; + mongodbatlas = + { + owner = "terraform-providers"; + repo = "terraform-provider-mongodbatlas"; + rev = "v0.4.2"; + version = "0.4.2"; + sha256 = "0cb8dh7bwz9yzyhz8v9j6ksi4dgmmz8d1qpm7234rj36ccirnjmz"; + }; mysql = { owner = "terraform-providers"; @@ -416,49 +568,65 @@ version = "1.9.0"; sha256 = "14gxxki3jhncv3s2x828ns2vgmf2xxzigdyp9b54mbkw5rnv1k2g"; }; + ncloud = + { + owner = "terraform-providers"; + repo = "terraform-provider-ncloud"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "1h2fr0ss58dr3ypqj6kw90iyji6s83sz2i85vhs5z2adjbk7h8va"; + }; netlify = { owner = "terraform-providers"; repo = "terraform-provider-netlify"; - rev = "v0.3.0"; - version = "0.3.0"; - sha256 = "0mmbli6d3fbpyvvdfsg32f1w83g8ga3x21b36rgmx3mn156r7yij"; + rev = "v0.4.0"; + version = "0.4.0"; + sha256 = "07xds84k2vgpvn2cy3id7hmzg57sz2603zs4msn3ysxmi28lmqyg"; }; newrelic = { owner = "terraform-providers"; repo = "terraform-provider-newrelic"; - rev = "v1.12.1"; - version = "1.12.1"; - sha256 = "17xdwhiyzfjxirvjwwl5jnan84i3zd930zch8l4jx04946vjzsc5"; + rev = "v1.16.0"; + version = "1.16.0"; + sha256 = "0ddfffyrw28syg0y2q9j7xh4k2sjb8l40167rwgz19w39p1caffv"; + }; + nixos = + { + owner = "tweag"; + repo = "terraform-provider-nixos"; + rev = "v0.0.1"; + version = "0.0.1"; + sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; }; nomad = { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - rev = "v1.4.2"; - version = "1.4.2"; - sha256 = "0h0snkzqdi4g5lp78f5pq98x6556ldwgkg9p9jkmrg04y7928w5v"; + rev = "v1.4.4"; + version = "1.4.4"; + sha256 = "05029s8h8vx7pl0y3d9cd5nlww3483caxhwkbrmk0vs7zdgxk8ns"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - rev = "v1.6.4"; - version = "1.6.4"; - sha256 = "08wg5qlqj7id5gfwxckjyx1ypfkiq919vjzq8qsdayg9sr9dpf5i"; + rev = "v1.8.0"; + version = "1.8.0"; + sha256 = "1h1pqrj11wdi0fnrrh2mkwahi59jl2vd8affy4acx7kny4n92s49"; }; nsxt = { owner = "terraform-providers"; repo = "terraform-provider-nsxt"; - rev = "v1.1.2"; - version = "1.1.2"; - sha256 = "1hnxivad7371j363sp3460mfzl5alb3dhxsbp0qwfl5mzvriwrbl"; + rev = "v2.0.0"; + version = "2.0.0"; + sha256 = "0fka793r0c06sz8vlxk0z7vbm6kab5xzk39r5pznkq34004r17sl"; }; null = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-null"; rev = "v2.1.2"; version = "2.1.2"; @@ -476,9 +644,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - rev = "v3.59.0-rc1"; - version = "3.59.0-rc1"; - sha256 = "1pgl95rmxk9h9whbkfgpzpbvvkhnm3223flqk73w673ylgrxss49"; + rev = "v3.69.0"; + version = "3.69.0"; + sha256 = "17vndv6bpa9ajs7llnf64bb482b15virbv311d3ds5lrva4vvrv8"; + }; + oktaasa = + { + owner = "terraform-providers"; + repo = "terraform-provider-oktaasa"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "093d5r8dz8gryk8qp5var2qrrgkvs1gwgw3zqpxry9xc5cpn30w0"; + }; + okta = + { + owner = "terraform-providers"; + repo = "terraform-provider-okta"; + rev = "v3.1.1"; + version = "3.1.1"; + sha256 = "1hky6hqrfyl2gj1lykb7gazj9awjgsxhc028558whm5rysx2wpsr"; }; oneandone = { @@ -496,29 +680,37 @@ version = "1.3.7"; sha256 = "01g09w8mqfp1d8phplsdj0vz63q5bgq9fqwy2kp4vrnwb70dq52w"; }; + opennebula = + { + owner = "terraform-providers"; + repo = "terraform-provider-opennebula"; + rev = "v0.1.1"; + version = "0.1.1"; + sha256 = "048cqd89fz5xpji1w8ylg75nbzzcx1c5n89y1k0ra8d3g2208yb2"; + }; openstack = { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - rev = "v1.25.0"; - version = "1.25.0"; - sha256 = "1yqc7nhmzlcq48csn23ma3fv6yb6cmkqqrxv63jjg6bxb7nyyqxd"; + rev = "v1.26.0"; + version = "1.26.0"; + sha256 = "1vsvzs8112vbi0x99yg6niw0wr55p09x7cg85qwjd0r42gpfdfq2"; }; opentelekomcloud = { owner = "terraform-providers"; repo = "terraform-provider-opentelekomcloud"; - rev = "v1.15.0"; - version = "1.15.0"; - sha256 = "080lzs40m3vny5bmg4vhsy7qz884c44ysmh325hi6s3v76dv4jxg"; + rev = "v1.16.0"; + version = "1.16.0"; + sha256 = "1bxkh8qnm1mw37wi4rxf29q8lksp864124nwbyn14fwb4h6m1yj4"; }; opsgenie = { owner = "terraform-providers"; repo = "terraform-provider-opsgenie"; - rev = "v0.2.7"; - version = "0.2.7"; - sha256 = "0yylf5iv1dba9naqys65l5whym3q0bwpn98dwxr0lyj0skr8nz7r"; + rev = "v0.2.9"; + version = "0.2.9"; + sha256 = "13y6awnm9j5qzq1bcmhg7ngzvx43h2dw9wmzdfi1xcpmv1ldvwpi"; }; oraclepaas = { @@ -532,25 +724,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-ovh"; - rev = "v0.6.0"; - version = "0.6.0"; - sha256 = "0hj029q9j2751hnay0rh0c8yxgmv2wd6xjwi12gkj6k6rmpgqfdh"; + rev = "v0.7.0"; + version = "0.7.0"; + sha256 = "167msjsl8xh8zy7lrxvkq2h98xpvxpsjzlil8lcxqmz8qq8a0q5f"; }; packet = { owner = "terraform-providers"; repo = "terraform-provider-packet"; - rev = "v2.7.3"; - version = "2.7.3"; - sha256 = "1dd9fa416crh5y61qyaj2l0jhn1kh0ndkzqdw3lsxjqdhcqppbns"; + rev = "v2.8.0"; + version = "2.8.0"; + sha256 = "1qnjla347hll0fav0ngnifblk6slbmh1klnm7k9jv327jmv92hz5"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - rev = "v1.4.1"; - version = "1.4.1"; - sha256 = "0dmafnlziyczad907isjqzsn1fyjzc8pdigp3m6114bbnca0ry5k"; + rev = "v1.5.1"; + version = "1.5.1"; + sha256 = "12n12sx1qxckqklcaphzr0j9bcwzrl6p8qzdc3d2csiqccqrpdas"; }; panos = { @@ -560,13 +752,21 @@ version = "1.6.2"; sha256 = "1qy6jynv61zhvq16s8jkwjhxz7r65cmk9k37ahh07pbhdx707mz5"; }; + pass = + { + owner = "camptocamp"; + repo = "terraform-provider-pass"; + rev = "1.2.1"; + version = "1.2.1"; + sha256 = "1hf5mvgz5ycp7shiy8px205d9kwswfjmclg7mlh9a55bkraffahk"; + }; postgresql = { owner = "terraform-providers"; repo = "terraform-provider-postgresql"; - rev = "v1.4.0"; - version = "1.4.0"; - sha256 = "162j6dyrbc9r4ipj6igj64wm6r65l4vb0dlwczfhlksix3qzr3kx"; + rev = "v1.5.0"; + version = "1.5.0"; + sha256 = "1c9vn1jpfan04iidzn030q21bz3xabrd5pdhlbblblf558ykn4q0"; }; powerdns = { @@ -584,13 +784,29 @@ version = "1.4.4"; sha256 = "0pzcl3pdhaykihvv1v38zrv607mydchvkzrzhwcakgmdkp3vq54i"; }; + pureport = + { + owner = "terraform-providers"; + repo = "terraform-provider-pureport"; + rev = "v1.1.8"; + version = "1.1.8"; + sha256 = "02vmqwjz5m5hj4zghwicjp27dxvc4qsiwj4gjsi66w6djdqnh4h1"; + }; rabbitmq = { owner = "terraform-providers"; repo = "terraform-provider-rabbitmq"; - rev = "v1.2.0"; - version = "1.2.0"; - sha256 = "1lhra8dvfyi6gn4s8mjd3lkkj6bz8y7xjhw1ki2kl5vpfw79d4l9"; + rev = "v1.3.0"; + version = "1.3.0"; + sha256 = "1adkbfm0p7a9i1i53bdmb34g5871rklgqkx7kzmwmk4fvv89n6g8"; + }; + rancher2 = + { + owner = "terraform-providers"; + repo = "terraform-provider-rancher2"; + rev = "v1.8.1"; + version = "1.8.1"; + sha256 = "15pvz1sd1x932yxdp7d679vax3dw56bfhp3422vxqsgmdgscwg1s"; }; rancher = { @@ -602,7 +818,7 @@ }; random = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-random"; rev = "v2.2.1"; version = "2.2.1"; @@ -636,25 +852,49 @@ { owner = "terraform-providers"; repo = "terraform-provider-scaleway"; - rev = "v1.13.0"; - version = "1.13.0"; - sha256 = "085wv59cfsaac2373gn783lknzp4qmgnrgi2yl1g27znm4b940i7"; + rev = "v1.14.0"; + version = "1.14.0"; + sha256 = "0j428pinwyyldg1jhlkad32213z98q3891yv906d6n7jg2bk5m6a"; + }; + secret = + { + owner = "tweag"; + repo = "terraform-provider-secret"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "09gv0fpsrxzgna0xrhrdk8d4va9s0gvdbz596r306qxb4mip4w3r"; + }; + segment = + { + owner = "ajbosco"; + repo = "terraform-provider-segment"; + rev = "v0.2.0"; + version = "0.2.0"; + sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz"; }; selectel = { owner = "terraform-providers"; repo = "terraform-provider-selectel"; - rev = "v3.0.0"; - version = "3.0.0"; - sha256 = "0fr97j85inaqvdqmlfk3xcq73zvncn001nsd03pp2ws30qqa8p7r"; + rev = "v3.1.0"; + version = "3.1.0"; + sha256 = "1ajhnjlx4bf91z04cp8245j3h2h9c30ajf934zr29jvwli0y3piw"; + }; + signalfx = + { + owner = "terraform-providers"; + repo = "terraform-provider-signalfx"; + rev = "v4.18.6"; + version = "4.18.6"; + sha256 = "1xjajkvkcksz0dnawjb3hv14ysp140g0vdj5warshafz8hjbys17"; }; skytap = { owner = "terraform-providers"; repo = "terraform-provider-skytap"; - rev = "v0.13.0"; - version = "0.13.0"; - sha256 = "1why3ipi5a7whf18z87f97lbzdj020hfp8gxpgzl0nwpzpwkhdz3"; + rev = "v0.14.0"; + version = "0.14.0"; + sha256 = "01cscykfw5qilf5rlvh7y2l3bqbv8f180ssqw7zqzyr9p4m6511l"; }; softlayer = { @@ -668,9 +908,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-spotinst"; - rev = "v1.13.4"; - version = "1.13.4"; - sha256 = "063lhm065y6qh9b2k11qjnqyfg5zrx6wa3bqrm7d1dqcha1i6d9f"; + rev = "v1.14.3"; + version = "1.14.3"; + sha256 = "06brm0bvr13f31km55y8bp4z1xj3imfi11k7l5nirjp73cbvcpmg"; + }; + stackpath = + { + owner = "terraform-providers"; + repo = "terraform-provider-stackpath"; + rev = "v1.3.0"; + version = "1.3.0"; + sha256 = "0gsr903v6fngaxm2r5h53g9yc3jpx2zccqq07rhzm9jbsfb6rlzn"; }; statuscake = { @@ -690,7 +938,7 @@ }; template = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-template"; rev = "v2.1.2"; version = "2.1.2"; @@ -700,9 +948,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - rev = "v1.30.1"; - version = "1.30.1"; - sha256 = "0gy7c3w217yzysv9hyrsw3q452g0iba9z72iijyfwcqm79gw3208"; + rev = "v1.30.7"; + version = "1.30.7"; + sha256 = "0d7byng63sxbgn8f5r92lkcaqvq3r0plm619h63f47h6z6z8xarc"; }; terraform = { @@ -716,13 +964,13 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - rev = "v0.11.4"; - version = "0.11.4"; - sha256 = "0ls5736cwshj3z1wgpbcma6bml9p45k5g7hm530bmqdxsamxfj1m"; + rev = "v0.15.1"; + version = "0.15.1"; + sha256 = "0372yjifsr4kvbc36hzhzf6ajlg6wy1r2x94p67m7rgr2fw061n2"; }; tls = { - owner = "terraform-providers"; + owner = "hashicorp"; repo = "terraform-provider-tls"; rev = "v2.1.1"; version = "2.1.1"; @@ -740,9 +988,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-ucloud"; - rev = "v1.15.1"; - version = "1.15.1"; - sha256 = "1djlpjig8y6x149r6f21x7y3p49fjvrxx7pbs2fpsyv437zff9vj"; + rev = "v1.17.0"; + version = "1.17.0"; + sha256 = "0dpy3bkrm20sk4zpkikas5c8ygl0zf9v6cnd34iblw1m41f44n7v"; }; ultradns = { @@ -756,57 +1004,57 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - rev = "v2.7.1"; - version = "2.7.1"; - sha256 = "1lvpgdyi8qk1bvz9i1wml22mmm5ga8kf413xmpj966wvxqsgw6z5"; + rev = "v2.9.0"; + version = "2.9.0"; + sha256 = "0a1jkwxz45qcbnd91im0xz948k197zal78n6y45bwcbqnil32yiy"; }; vcd = { owner = "terraform-providers"; repo = "terraform-provider-vcd"; - rev = "v2.6.0"; - version = "2.6.0"; - sha256 = "0f7c5l05h0xcq51yaqpx1v3lg4wmysszayysvcspipiwzrhx5cmg"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "0bh8hqxpy6722q1v9cnpvn8fqwh5llzz1aavrbsib5brgjc8vqmy"; }; - vsphere = + venafi = { owner = "terraform-providers"; - repo = "terraform-provider-vsphere"; - rev = "v1.15.0"; - version = "1.15.0"; - sha256 = "1hxzxkqphm00gp0d1s32xn0knxgf5vg05nq68ba3q27wpx4ipanl"; + repo = "terraform-provider-venafi"; + rev = "v0.9.2"; + version = "0.9.2"; + sha256 = "06nk5c7lxs8fc04sz97lc3yk1zk1b9phkzw6fj9fnmpgaak87bj9"; }; - yandex = + vra7 = { owner = "terraform-providers"; - repo = "terraform-provider-yandex"; - rev = "v0.28.0"; - version = "0.28.0"; - sha256 = "1ml96cqjvxzapb76fpblgl6ak15idv3jj5wcs9ix0dr6i2fdfwpc"; + repo = "terraform-provider-vra7"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "123yskwgzp771nx03sg49vwi5ph3zf2ajf06s7msj0blvz6wan4v"; }; - segment = + vsphere = { - owner = "ajbosco"; - repo = "terraform-provider-segment"; - rev = "v0.2.0"; - version = "0.2.0"; - sha256 = "0ic5b9djhnb1bs2bz3zdprgy3r55dng09xgc4d9l9fyp85g2amaz"; + owner = "terraform-providers"; + repo = "terraform-provider-vsphere"; + rev = "v1.17.0"; + version = "1.17.0"; + sha256 = "16fglpfy8grlifaa1d1ymvjys7wh39m6py8h45g1xgs1jyfkz00s"; }; - pass = + vthunder = { - owner = "camptocamp"; - repo = "terraform-provider-pass"; - rev = "1.2.1"; - version = "1.2.1"; - sha256 = "1hf5mvgz5ycp7shiy8px205d9kwswfjmclg7mlh9a55bkraffahk"; + owner = "terraform-providers"; + repo = "terraform-provider-vthunder"; + rev = "v0.1.0"; + version = "0.1.0"; + sha256 = "1mw55g0kjgp300p6y4s8wc91fgfxjm0cbszfzgbc8ca4b00j8cc2"; }; - matchbox = + vultr = { - owner = "poseidon"; - repo = "terraform-provider-matchbox"; - rev = "v0.3.0"; - version = "0.3.0"; - sha256 = "1nq7k8qa7rv8xyryjigwpwcwvj1sw85c4j46rkfdv70b6js25jz3"; + owner = "terraform-providers"; + repo = "terraform-provider-vultr"; + rev = "v1.1.4"; + version = "1.1.4"; + sha256 = "14anp7b759yyh78ickas52amads2lmwg85h8i0ikln7qhrhl42d7"; }; wavefront = { @@ -816,20 +1064,12 @@ version = "2.1.1"; sha256 = "0cbs74kd820i8f13a9jfbwh2y5zmmx3c2mp07qy7m0xx3m78jksn"; }; - nixos = - { - owner = "tweag"; - repo = "terraform-provider-nixos"; - rev = "v0.0.1"; - version = "0.0.1"; - sha256 = "00vz6qjq1pk39iqg4356b8g3c6slla9jifkv2knk46gc9q93q0lf"; - }; - secret = + yandex = { - owner = "tweag"; - repo = "terraform-provider-secret"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "09gv0fpsrxzgna0xrhrdk8d4va9s0gvdbz596r306qxb4mip4w3r"; + owner = "terraform-providers"; + repo = "terraform-provider-yandex"; + rev = "v0.35.0"; + version = "0.35.0"; + sha256 = "10zj5s0zdgh54rlczyvkq292v9xj1ivvn2k9ml65l6j3h0axlgxv"; }; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 1487f8ad875..c3c44160c1b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -2,7 +2,6 @@ , buildGoPackage , fetchFromGitHub , callPackage -, Security }: let list = import ./data.nix; @@ -16,20 +15,126 @@ let src = fetchFromGitHub { inherit owner repo rev sha256; }; - - # Terraform allow checking the provider versions, but this breaks # if the versions are not provided via file paths. postBuild = "mv go/bin/${repo}{,_v${version}}"; }; -in - { - elasticsearch = callPackage ./elasticsearch { - inherit Security; - }; + + # Google is now using the vendored go modules, which works a bit differently + # and is not 100% compatible with the pre-modules vendored folders. + # + # Instead of switching to goModules which requires a goModSha256, patch the + # goPackage derivation so it can install the top-level. + patchGoModVendor = drv: + drv.overrideAttrs (attrs: { + buildFlags = "-mod=vendor"; + + # override configurePhase to not move the source into GOPATH + configurePhase = '' + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOCACHE=$TMPDIR/go-cache + export GO111MODULE=on + ''; + + # just build and install into $GOPATH/bin + buildPhase = '' + go install -mod=vendor -v -p 16 . + ''; + + # don't run the tests, they are broken in this setup + doCheck = false; + }); + + # These providers are managed with the ./update-all script + automated-providers = lib.mapAttrs (_: toDrv) list; + + # These are the providers that don't fall in line with the default model + special-providers = { + # Override the google providers + google = patchGoModVendor automated-providers.google; + google-beta = patchGoModVendor automated-providers.google-beta; + + # providers that were moved to the `hashicorp` organization, + # but haven't updated their references yet: + + # https://github.com/hashicorp/terraform-provider-archive/pull/67 + archive = automated-providers.archive.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-archive hashicorp/terraform-provider-archive + substituteInPlace main.go --replace terraform-providers/terraform-provider-archive hashicorp/terraform-provider-archive + ''; + }); + + # https://github.com/hashicorp/terraform-provider-dns/pull/101 + dns = automated-providers.dns.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-dns hashicorp/terraform-provider-dns + substituteInPlace main.go --replace terraform-providers/terraform-provider-dns hashicorp/terraform-provider-dns + ''; + }); + + # https://github.com/hashicorp/terraform-provider-external/pull/41 + external = automated-providers.external.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-external hashicorp/terraform-provider-external + substituteInPlace main.go --replace terraform-providers/terraform-provider-external hashicorp/terraform-provider-external + ''; + }); + + # https://github.com/hashicorp/terraform-provider-http/pull/40 + http = automated-providers.http.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-http hashicorp/terraform-provider-http + substituteInPlace main.go --replace terraform-providers/terraform-provider-http hashicorp/terraform-provider-http + ''; + }); + + # https://github.com/hashicorp/terraform-provider-local/pull/40 + local = automated-providers.local.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-local hashicorp/terraform-provider-local + substituteInPlace main.go --replace terraform-providers/terraform-provider-local hashicorp/terraform-provider-local + ''; + }); + + # https://github.com/hashicorp/terraform-provider-null/pull/43 + null = automated-providers.null.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-null hashicorp/terraform-provider-null + substituteInPlace main.go --replace terraform-providers/terraform-provider-null hashicorp/terraform-provider-null + ''; + }); + + # https://github.com/hashicorp/terraform-provider-random/pull/107 + random = automated-providers.random.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-random hashicorp/terraform-provider-random + substituteInPlace main.go --replace terraform-providers/terraform-provider-random hashicorp/terraform-provider-random + ''; + }); + + # https://github.com/hashicorp/terraform-provider-template/pull/79 + template = automated-providers.template.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-template hashicorp/terraform-provider-template + substituteInPlace main.go --replace terraform-providers/terraform-provider-template hashicorp/terraform-provider-template + ''; + }); + + # https://github.com/hashicorp/terraform-provider-tls/pull/71 + tls = automated-providers.tls.overrideAttrs (attrs: { + prePatch = attrs.prePatch or "" + '' + substituteInPlace go.mod --replace terraform-providers/terraform-provider-tls hashicorp/terraform-provider-tls + substituteInPlace main.go --replace terraform-providers/terraform-provider-tls hashicorp/terraform-provider-tls + ''; + }); + + elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; ibm = callPackage ./ibm {}; libvirt = callPackage ./libvirt {}; lxd = callPackage ./lxd {}; ansible = callPackage ./ansible {}; - } // lib.mapAttrs (n: v: toDrv v) list + }; +in + automated-providers // special-providers diff --git a/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix b/pkgs/applications/networking/cluster/terraform-providers/elasticsearch/default.nix index 2f13000c0cd..1aadbbc5ccd 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 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "terraform-provider-elasticsearch"; version = "0.7.0"; @@ -12,8 +12,6 @@ buildGoModule rec { modSha256 = "1xk21xswqwpv34j4ba4fj8lcbvfdd12x7rq1hrdyd21mdhmrhw0p"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "." ]; # Terraform allow checking the provider versions, but this breaks diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix index 06d7b8a9f07..bd667dbc15f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; meta = with stdenv.lib; { - homepage = https://github.com/IBM-Cloud/terraform-provider-ibm; + homepage = "https://github.com/IBM-Cloud/terraform-provider-ibm"; description = "Terraform provider is used to manage IBM Cloud resources."; platforms = platforms.all; license = licenses.mpl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix index c2014a4d7bf..daffb593090 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix @@ -43,7 +43,7 @@ buildGoPackage rec { postBuild = "mv go/bin/terraform-provider-libvirt{,_v${version}}"; meta = with stdenv.lib; { - homepage = https://github.com/dmacvicar/terraform-provider-libvirt; + homepage = "https://github.com/dmacvicar/terraform-provider-libvirt"; description = "Terraform provider for libvirt"; platforms = platforms.linux; license = licenses.asl20; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.txt b/pkgs/applications/networking/cluster/terraform-providers/providers.txt deleted file mode 100644 index bdde6600678..00000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.txt +++ /dev/null @@ -1,18 +0,0 @@ -# lines starting with a # are comments - -# The accepted format (double escape all grep expresssions): -# <organisation> [grep-expression] [grep-v-expression] - include all repositories in the organisation. -# grep-expression: filter repo matching the expression -# grep-v-expression: filter repo not matching the expression -# <organisation>/<repo> - include only the named repository. - -# include all terraform-providers -terraform-providers terraform-provider- terraform-provider-\\(azure-classic\\|scaffolding\\) - -# include providers from individual repos -ajbosco/terraform-provider-segment -camptocamp/terraform-provider-pass -poseidon/terraform-provider-matchbox -spaceapegames/terraform-provider-wavefront -tweag/terraform-provider-nixos -tweag/terraform-provider-secret diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all index 893a6b1c7d7..89ed5a94f2a 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all @@ -1,6 +1,7 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p bash coreutils curl jq nix +#! nix-shell -i bash -p bash coreutils jq nix gitAndTools.hub # vim: ft=sh sw=2 et +# shellcheck shell=bash # # This scripts scans the github terraform-providers repo for new releases, # generates the corresponding nix code and finally generates an index of @@ -10,37 +11,53 @@ set -euo pipefail # the maximum number of attempts before giving up inside of GET and prefetch_github readonly maxAttempts=30 -GET() { - local url=$1 - local retry=1 - echo "fetching $url" >&2 - while ! curl -#fL -u "$GITHUB_AUTH" "$url"; do - echo "The curl command has failed. Attempt $retry/${maxAttempts}" >&2 - if [[ "${retry}" -eq "${maxAttempts}" ]]; then - exit 1 - fi - retry=$(( retry + 1 )) - sleep 5 - done -} - -get_org_repos() { +get_tf_providers_org() { + # returns all terraform providers in a given organization, and their the + # latest tags, in the format + # $org/$repo $rev local org=$1 - local page=1 - GET "https://api.github.com/orgs/$org/repos?per_page=100" | jq -r '.[].name' + hub api --paginate graphql -f query=" + query(\$endCursor: String) { + repositoryOwner(login: \"${org}\") { + repositories(first: 100, after: \$endCursor) { + nodes { + nameWithOwner + name + refs(first: 1, refPrefix: \"refs/tags/\", orderBy: {field: TAG_COMMIT_DATE, direction: DESC}) { + nodes { + name + } + } + } + pageInfo { + hasNextPage + endCursor + } + } + } + }" | \ + jq -r '.data.repositoryOwner.repositories.nodes[] | select(.name | startswith("terraform-provider-")) | select((.refs.nodes | length) > 0) | .nameWithOwner + " " + .refs.nodes[0].name' + # filter the result with jq: + # - repos need to start with `teraform-provider-` + # - they need to have at least one tag + # for each of the remaining repos, assemble a string $org/$repo $rev } -get_repo_tags() { +get_latest_repo_tag() { + # of a given repo and owner, retrieve the latest tag local owner=$1 local repo=$2 - GET "https://api.github.com/repos/$owner/$repo/git/refs/tags?per_page=100" | \ + hub api --paginate "https://api.github.com/repos/$owner/$repo/git/refs/tags" | \ jq -r '.[].ref' | \ grep -v 'v\.' | \ cut -d '/' -f 3- | \ - sort --version-sort + sort --version-sort | \ + tail -1 } prefetch_github() { + # of a given owner, repo and rev, fetch the tarball and return the output of + # `nix-prefetch-url` local owner=$1 local repo=$2 local rev=$3 @@ -59,7 +76,7 @@ echo_entry() { local owner=$1 local repo=$2 local rev=$3 - local version=$(echo $3 | sed 's/^v//') + local version=${rev#v} local sha256=$4 cat <<EOF { @@ -74,18 +91,18 @@ EOF indent() { sed 's/^/ /'; } -add_repo() { +add_provider() { org="${1}" repo="${2}" + rev="${3}" - echo "*** $repo ***" + echo "*** $org/$repo $rev ***" name=$(echo "$repo" | cut -d - -f 3-) - last_tag=$(get_repo_tags "$org" "$repo" | tail -1) - last_tag_sha256=$(prefetch_github "$org" "$repo" "$last_tag") + sha256=$(prefetch_github "$org" "$repo" "$rev") { echo " $name =" - echo_entry "$org" "$repo" "$last_tag" "$last_tag_sha256" | indent + echo_entry "$org" "$repo" "$rev" "$sha256" | indent } >> data.nix } @@ -93,50 +110,63 @@ add_repo() { cd "$(dirname "$0")" -if [[ -z "${GITHUB_AUTH:-}" ]]; then - cat <<'HELP' -Missing the GITHUB_AUTH env. This is required to work around the 60 request -per hour rate-limit. - -Go to https://github.com/settings/tokens and create a new token with the -"public_repo" scope. - -Then `export GITHUB_AUTH=<your user>:<your token>` and run this script again. -HELP - exit 1 -fi +# individual repos to fetch +slugs=( + ajbosco/terraform-provider-segment + camptocamp/terraform-provider-pass + poseidon/terraform-provider-matchbox + spaceapegames/terraform-provider-wavefront + tweag/terraform-provider-nixos + tweag/terraform-provider-secret +) + +# a list of providers to ignore +blacklist=( + terraform-providers/terraform-provider-azure-classic + terraform-providers/terraform-provider-cidr + terraform-providers/terraform-provider-circonus + terraform-providers/terraform-provider-cloudinit + terraform-providers/terraform-provider-quorum + hashicorp/terraform-provider-time + terraform-providers/terraform-provider-vmc +) cat <<HEADER > data.nix # Generated with ./update-all { HEADER -while read line; do - IFS=' ' read -r -a fields <<< "$line" - if [[ "${#fields[@]}" -eq 0 ]]; then - continue - fi - - if [[ "${fields[0]}" = *"/"* ]]; then - org="$(echo "${fields[0]}" | cut -d/ -f1)" - repo="$(echo "${fields[0]}" | cut -d/ -f2)" - add_repo "${org}" "${repo}" - else - org="${fields[0]}" - repos=$(get_org_repos "$org") - if [[ "${#fields[@]}" -ge 2 ]] && [[ -n "${fields[1]}" ]]; then - repos="$( echo "${repos[@]}" | grep "${fields[1]}" )" - fi - if [[ "${#fields[@]}" -eq 3 ]] && [[ -n "${fields[2]}" ]]; then - repos="$( echo "${repos[@]}" | grep -v "${fields[2]}" )" - fi - repos="$( echo "${repos[@]}" | sort )" - - for repo in $repos; do - add_repo "$org" "$repo" - done - fi -done < <(grep -v '^#\|^$' providers.txt) +# assemble list of terraform providers +providers=$(get_tf_providers_org "terraform-providers") +providers=$(echo "$providers";get_tf_providers_org "hashicorp") + +# add terraform-providers from slugs +for slug in "${slugs[@]}"; do + # retrieve latest tag + org=${slug%/*} + repo=${slug#*/} + rev=$(get_latest_repo_tag "$org" "$repo") + + # add to list + providers=$(echo "$providers";echo "$org/$repo $rev") +done + +# filter out all providers on the blacklist +for repo in "${blacklist[@]}"; do + providers=$(echo "$providers" | grep -v "^${repo} ") +done + +# sort results alphabetically by repo name +providers=$(echo "$providers" | sort -t "/" --key=2) + +# render list +IFS=$'\n' +for provider in $providers; do + org=$(echo "$provider" | cut -d " " -f 1 | cut -d "/" -f1) + repo=$(echo "$provider" | cut -d " " -f 1 | cut -d "/" -f2) + rev=$(echo "$provider" | cut -d " " -f 2) + add_provider "${org}" "${repo}" "${rev}" +done cat <<FOOTER >> data.nix } diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 1058b21d3e9..26c969c671f 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A thin wrapper for Terraform that supports locking for Terraform state and enforces best practices."; - homepage = https://github.com/gruntwork-io/terragrunt/; + homepage = "https://github.com/gruntwork-io/terragrunt/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index 30fc9264ae1..13f2c3d9bd9 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/pkgs/applications/networking/cluster/tilt/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; - homepage = https://tilt.dev/; + homepage = "https://tilt.dev/"; license = licenses.asl20; maintainers = with maintainers; [ anton-dessiatov ]; }; diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index a84de638066..38a08aaf4c0 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://davmail.sourceforge.net/; + homepage = "http://davmail.sourceforge.net/"; description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers"; maintainers = [ maintainers.hinton ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix new file mode 100644 index 00000000000..3f0a83d015d --- /dev/null +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, buildGoPackage}: + +buildGoPackage rec { + pname = "dnscontrol"; + version = "3.0.0"; + + goPackagePath = "github.com/StackExchange/dnscontrol"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "StackExchange"; + repo = pname; + rev = "v${version}"; + sha256 = "1j8i4k7bqkqmi6dmc9fxfab49a7qigig72rlbga902lw336p6cc7"; + }; + + postInstall = '' + rm $bin/bin/{build,convertzone,generate,validate} + ''; + + meta = with stdenv.lib; { + description = "Synchronize your DNS to multiple providers from a simple DSL"; + homepage = "https://stackexchange.github.io/dnscontrol/"; + license = licenses.mit; + maintainers = with maintainers; [ mmahut ]; + }; +} diff --git a/pkgs/applications/networking/dnscontrol/deps.nix b/pkgs/applications/networking/dnscontrol/deps.nix new file mode 100644 index 00000000000..55cb5daa18f --- /dev/null +++ b/pkgs/applications/networking/dnscontrol/deps.nix @@ -0,0 +1,1236 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "335e9e09b93e"; + sha256 = "1aiglr6d2369nf3s9ig1kc0nixsivcmh7p1fyzkcf6n6ql0p2zsm"; + }; + } + { + goPackagePath = "github.com/Azure/azure-sdk-for-go"; + fetch = { + type = "git"; + url = "https://github.com/Azure/azure-sdk-for-go"; + rev = "v39.1.0"; + sha256 = "1s0j7gh3d3p157py7v6525c6zs07hdiry97dhg4c8z7ww35wxhj7"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/BurntSushi/xgb"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/xgb"; + rev = "27f122750802"; + sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; + }; + } + { + goPackagePath = "github.com/DisposaBoy/JsonConfigReader"; + fetch = { + type = "git"; + url = "https://github.com/DisposaBoy/JsonConfigReader"; + rev = "5ea4d0ddac55"; + sha256 = "022wzrkf0rni9yb15439w81kj0kb4667zx6n2zq07ysw7lk6ahqz"; + }; + } + { + goPackagePath = "github.com/TomOnTime/utfutil"; + fetch = { + type = "git"; + url = "https://github.com/TomOnTime/utfutil"; + rev = "09c41003ee1d"; + sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i"; + }; + } + { + goPackagePath = "github.com/alecthomas/kingpin"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "v2.2.6"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "fb15b899a751"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "f65c72e2690d"; + sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; + }; + } + { + goPackagePath = "github.com/andreyvit/diff"; + fetch = { + type = "git"; + url = "https://github.com/andreyvit/diff"; + rev = "c7f18ee00883"; + sha256 = "1s4qjkxig5yqahpzfl4xqh4kzi9mymdpkzq6kj3f4dr5dl3hlynr"; + }; + } + { + 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/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "v1.29.21"; + sha256 = "0q97abz6cjj1gf3gfd52gjx39grfhlcjax8306zw9038a8v0nadc"; + }; + } + { + goPackagePath = "github.com/bgentry/speakeasy"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/speakeasy"; + rev = "v0.1.0"; + sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; + }; + } + { + goPackagePath = "github.com/billputer/go-namecheap"; + fetch = { + type = "git"; + url = "https://github.com/billputer/go-namecheap"; + rev = "0c7adb0710f8"; + sha256 = "09jkymml6f0nvz7md7s4ayj75xdms77ziz9rkw4kvj7jhv36302p"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "v2.1.1"; + sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; + }; + } + { + goPackagePath = "github.com/census-instrumentation/opencensus-proto"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-proto"; + rev = "v0.2.1"; + sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v2.0.0"; + sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; + }; + } + { + 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/digitalocean/godo"; + fetch = { + type = "git"; + url = "https://github.com/digitalocean/godo"; + rev = "v1.30.0"; + sha256 = "0z38lg1zd57b5ymxdxhz5rs5rynpzhqmbvm0marhh0v7v9bbk0rx"; + }; + } + { + goPackagePath = "github.com/dimchansky/utfbom"; + fetch = { + type = "git"; + url = "https://github.com/dimchansky/utfbom"; + rev = "v1.1.0"; + sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww"; + }; + } + { + goPackagePath = "github.com/dnsimple/dnsimple-go"; + fetch = { + type = "git"; + url = "https://github.com/dnsimple/dnsimple-go"; + rev = "v0.31.0"; + sha256 = "0i074r3m0bqggmplswymgj6yfzbsrcqw8gn6py9x8g3kyl4si0x0"; + }; + } + { + goPackagePath = "github.com/envoyproxy/go-control-plane"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/go-control-plane"; + rev = "5f8ba28d4473"; + sha256 = "1f1s764rd41vd9vgk3r14h1m6fz6pdvxj6fd83q58gxifbc4q5w4"; + }; + } + { + goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/protoc-gen-validate"; + rev = "v0.1.0"; + sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; + }; + } + { + goPackagePath = "github.com/exoscale/egoscale"; + fetch = { + type = "git"; + url = "https://github.com/exoscale/egoscale"; + rev = "v0.23.0"; + sha256 = "0dgc08sdvy2cj7yygrlnyp6v9m829h4v0pm3vdsj9yx3bps5v7iy"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "v1.1.0"; + sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; + }; + } + { + goPackagePath = "github.com/go-acme/lego"; + fetch = { + type = "git"; + url = "https://github.com/go-acme/lego"; + rev = "v2.7.2"; + sha256 = "1137l22jrwk8hvdzjbmfkvd9nllp6sznzy66ngmcsc0ybp19hcry"; + }; + } + { + goPackagePath = "github.com/go-ldap/ldap"; + fetch = { + type = "git"; + url = "https://github.com/go-ldap/ldap"; + rev = "v3.0.2"; + sha256 = "1srb1nkcbs0v1hcdz6j4zhg000h763j83jlklsiwanvbp48y4lhz"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.5.0"; + sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; + }; + } + { + goPackagePath = "github.com/go-test/deep"; + fetch = { + type = "git"; + url = "https://github.com/go-test/deep"; + rev = "042da051cf31"; + sha256 = "08bya0s7m15f5qm1kn2r42g1r4lpq0svpaqr0zaac4hmaxj7vnid"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "e7a84e9525fe"; + sha256 = "1v6vjklq06wqddv46ihajahaj1slv0imgaivlxr8bsx59i90js5q"; + }; + } + { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "v3.2.0"; + sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.3.1"; + sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.3.3"; + sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "v0.0.1"; + sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "v1.0.0"; + sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.4.0"; + sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; + }; + } + { + goPackagePath = "github.com/google/go-github"; + fetch = { + type = "git"; + url = "https://github.com/google/go-github"; + rev = "v17.0.0"; + sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "c8c88dbee036"; + sha256 = "1yckg2052mz7ps1m68wri6kyb5n4g0vx2yf7s0xs9gdqvvscp57l"; + }; + } + { + goPackagePath = "github.com/google/martian"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v2.1.0"; + sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; + }; + } + { + goPackagePath = "github.com/google/pprof"; + fetch = { + type = "git"; + url = "https://github.com/google/pprof"; + rev = "54271f7e092f"; + sha256 = "14x4ydifz23rzaylggvwbm3dwlv1bc6s0bclmkxck9nbjbqw89vy"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "v2.0.5"; + sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0766667cb4d1"; + sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; + }; + } + { + goPackagePath = "github.com/gopherjs/jquery"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/jquery"; + rev = "73f4c7416038"; + sha256 = "1xhl0k52v3djalnd02a0ph572f85i1szj2x4q3lglkq40j7racd2"; + }; + } + { + 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 = "v0.5.1"; + sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-hclog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-hclog"; + rev = "v0.9.2"; + sha256 = "0pakba7rdkjgq50r79sbbpavymbyib77cy613wl734mpi30ywrxm"; + }; + } + { + 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-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "v1.0.0"; + sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-plugin"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-plugin"; + rev = "v1.0.1"; + sha256 = "0aama8vdyrfzjdhxc1l4cwhmgydl989lywhq3pg3slzjg6r00rda"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-retryablehttp"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-retryablehttp"; + rev = "v0.6.3"; + sha256 = "1vnhr7yry71jldmmj5gxhq49crhi9vrmqc2i41mycpnva2zd8a0i"; + }; + } + { + 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-uuid"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-uuid"; + rev = "v1.0.1"; + sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-version"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-version"; + rev = "v1.1.0"; + sha256 = "1ykh3jl5zj5a4irkgp5mq936bqkznmf9lp23qk741vh4r5874vi8"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.1"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/hashicorp/yamux"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/yamux"; + rev = "2f1d1f20f75d"; + sha256 = "1fga3p6j2g24ip9qjfwn3nqjr00m4nnjz92app7ms3sz7vgq2a7s"; + }; + } + { + goPackagePath = "github.com/hexonet/go-sdk"; + fetch = { + type = "git"; + url = "https://github.com/hexonet/go-sdk"; + rev = "v2.2.3"; + sha256 = "0mgkfrc7qlm4xf1v7kb29p7wq6rmaaha9zv8kwa27r8hjx6qnb8c"; + }; + } + { + goPackagePath = "github.com/jarcoal/httpmock"; + fetch = { + type = "git"; + url = "https://github.com/jarcoal/httpmock"; + rev = "v1.0.4"; + sha256 = "1x04i9hhvdxi9xmyf0vbi5azlh7rr4blsq7fbhps8i2gdpga612y"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "2437e8417af5"; + sha256 = "1hwcbr7nrlfshwr4hrac8ch8gvfpf07qi72bpqmqi272c67ma89v"; + }; + } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "af01ea7f8024"; + sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; + }; + } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/malexdev/utfutil"; + fetch = { + type = "git"; + url = "https://github.com/malexdev/utfutil"; + rev = "00c8d4a8e7a8"; + sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i"; + }; + } + { + 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.3"; + sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "v1.1.27"; + sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; + }; + } + { + goPackagePath = "github.com/mitchellh/cli"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/cli"; + rev = "v1.0.0"; + sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; + }; + } + { + goPackagePath = "github.com/mitchellh/copystructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/copystructure"; + rev = "v1.0.0"; + sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; + }; + } + { + 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/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/mitchellh/reflectwalk"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/reflectwalk"; + rev = "v1.0.0"; + sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0"; + }; + } + { + goPackagePath = "github.com/mjibson/esc"; + fetch = { + type = "git"; + url = "https://github.com/mjibson/esc"; + rev = "v0.2.0"; + sha256 = "0ci3bdm01prm114plcwkgzbqn825lh0zc1iqaw3jicjay5sh0bis"; + }; + } + { + goPackagePath = "github.com/namedotcom/go"; + fetch = { + type = "git"; + url = "https://github.com/namedotcom/go"; + rev = "08470befbe04"; + sha256 = "00ai7fd74sn4alqmpqsiyczirli50b7m059b6zzg1izy9g4cdd4g"; + }; + } + { + goPackagePath = "github.com/oklog/run"; + fetch = { + type = "git"; + url = "https://github.com/oklog/run"; + rev = "v1.0.0"; + sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw"; + }; + } + { + goPackagePath = "github.com/ovh/go-ovh"; + fetch = { + type = "git"; + url = "https://github.com/ovh/go-ovh"; + rev = "ba5adb4cf014"; + sha256 = "1rwxib0pn2ni6nfn2sijvb6cd424n95gnqhs21q6mz08n9hnzspy"; + }; + } + { + goPackagePath = "github.com/pascaldekloe/goe"; + fetch = { + type = "git"; + url = "https://github.com/pascaldekloe/goe"; + rev = "v0.1.0"; + sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq"; + }; + } + { + goPackagePath = "github.com/philhug/opensrs-go"; + fetch = { + type = "git"; + url = "https://github.com/philhug/opensrs-go"; + rev = "9dfa7433020d"; + sha256 = "1bjw3llpx5n1srylw08310ch14sz1pw5mban1yakax8606q3dqdf"; + }; + } + { + goPackagePath = "github.com/pierrec/lz4"; + fetch = { + type = "git"; + url = "https://github.com/pierrec/lz4"; + rev = "v2.0.5"; + sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + }; + } + { + 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.1"; + sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "14fe0d1b01d4"; + sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; + }; + } + { + goPackagePath = "github.com/renier/xmlrpc"; + fetch = { + type = "git"; + url = "https://github.com/renier/xmlrpc"; + rev = "ce4a1a486c03"; + sha256 = "0byvacdwhagva53r2frzqws3f5j7qzigmxzxahpcv300i8pm9i50"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "c382bd3c16ff"; + sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v2.0.1"; + sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; + }; + } + { + goPackagePath = "github.com/ryanuber/columnize"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/columnize"; + rev = "v2.1.0"; + sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; + }; + } + { + goPackagePath = "github.com/ryanuber/go-glob"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/go-glob"; + rev = "v1.0.0"; + sha256 = "0mhrjy0iba3jr6bsgy7q50zjr42ar1njn1sb2fvihlkhxgb2ahv2"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.1.0"; + sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "v1.0.0"; + sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; + }; + } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "68dc04aab96a"; + sha256 = "1kas5v95fzhr88hg4rjy0vp03y4pzvy3pwwgkfz2yhn5nlj29nk6"; + }; + } + { + goPackagePath = "github.com/softlayer/softlayer-go"; + fetch = { + type = "git"; + url = "https://github.com/softlayer/softlayer-go"; + rev = "5e1c8cccc730"; + sha256 = "0jsi0f60gx92qm1n2lcz65v425bbqf59dsr0dw4x1wmychp25mk7"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; + }; + } + { + goPackagePath = "github.com/tdewolff/minify"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/minify"; + rev = "v2.3.6"; + sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; + }; + } + { + goPackagePath = "github.com/tdewolff/parse"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/parse"; + rev = "v2.3.4"; + sha256 = "00hclphbjgc5vjrqgnclp72v8c45k35vmj84d2a0f7bw8cc88zcd"; + }; + } + { + goPackagePath = "github.com/tdewolff/test"; + fetch = { + type = "git"; + url = "https://github.com/tdewolff/test"; + rev = "v1.0.6"; + sha256 = "12glhjb4cwp6yxwd17rwa6b4gxna3lm01bgc7yn9di58chc7lyh3"; + }; + } + { + goPackagePath = "github.com/tiramiseb/go-gandi"; + fetch = { + type = "git"; + url = "https://github.com/tiramiseb/go-gandi"; + rev = "e1cf2e430b3a"; + sha256 = "1m6wzif0dgssh5hzffwqg39789k9nwvj8xaq0d492f0fr14w0nng"; + }; + } + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v2.1.1"; + sha256 = "0znf7pim7xsl8x6pcgi9vm0px48xrqfkw6ysn4yv6xc2569zpjs1"; + }; + } + { + goPackagePath = "github.com/vultr/govultr"; + fetch = { + type = "git"; + url = "https://github.com/vultr/govultr"; + rev = "v0.2.0"; + sha256 = "09103hb2rx93d6vyr54bqdai35d6l5q3klk09k53aqrijp8pycfz"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "v0.22.0"; + sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "2aa609cf4a9d"; + sha256 = "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "efd6b22b2522"; + sha256 = "0ysahwb7p6y09izks4ca8nk2w414gmjxzz44l5rmadlvk3k66cgp"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "0694c2d4d067"; + sha256 = "0v4rs4xpi7agbdzjw713mp7gzij8z89058s0yfj3276mzlns3zk4"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "959b441ac422"; + sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; + }; + } + { + goPackagePath = "golang.org/x/mobile"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mobile"; + rev = "d3739f865fa6"; + sha256 = "079ck2dyikacnph9s5mf0hrjnqlk6lc8q64dwnyw45w3xbbc50mg"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "v0.2.0"; + sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "0de0cce0169b"; + sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "bf48bf16ab8d"; + sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "cb0a6d8edb6c"; + sha256 = "0xkrf2k6nn1qh64ckrc4rmf1vhkzs0p7f1rnhv4v4pz9mvgh3v6w"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "9d24e82272b4"; + sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "20ab64c0d93f"; + sha256 = "1gfhw6daabjy771b3c0k0yga18ja50845n648mgagsa441dxvlch"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "v0.20.0"; + sha256 = "13syr1x33k6mrn5w6l4sgdbzn368w3m60vf6kk2j10fwa45125rg"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.6.5"; + sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "24fa4b261c55"; + sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.27.0"; + sha256 = "1ijrmgrxyabfn51nm3p9l81iaasq5fg237wnr6mdc4dzsfcg8kd7"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/asn1-ber.v1"; + rev = "f715ec2f112d"; + sha256 = "00ixms8x3lrhywbvq5v2sagcqsxa1pcnlk17dp5lnwckv3xg4psb"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "41f04d3bba15"; + sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; + }; + } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "v1.42.0"; + sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; + }; + } + { + goPackagePath = "gopkg.in/ns1/ns1-go.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/ns1/ns1-go.v2"; + rev = "c563826f4cbe"; + sha256 = "0swpsy0bdkwqlb7i0fgxs55sdfsy7pbnh6a09crhbw5xldvswq5k"; + }; + } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "v1.0.5"; + sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v2"; + rev = "v2.3.1"; + sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + }; + } + { + goPackagePath = "honnef.co/go/tools"; + fetch = { + type = "git"; + url = "https://github.com/dominikh/go-tools"; + rev = "ea95bdfd59fc"; + sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; + }; + } + { + goPackagePath = "rsc.io/binaryregexp"; + fetch = { + type = "git"; + url = "https://github.com/rsc/binaryregexp"; + rev = "v0.2.0"; + sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; + }; + } +] diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 0967fd95dc0..ad1a0c9a533 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with lib; { - homepage = https://github.com/odeke-em/drive; + homepage = "https://github.com/odeke-em/drive"; description = "Google Drive client for the commandline"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix index d71b863f881..f3f5f54f409 100644 --- a/pkgs/applications/networking/droopy/default.nix +++ b/pkgs/applications/networking/droopy/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Mini Web server that let others upload files to your computer"; - homepage = http://stackp.online.fr/droopy; + homepage = "http://stackp.online.fr/droopy"; license = licenses.bsd3; maintainers = [ maintainers.Profpatsch ]; }; diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 9b3b99708df..12865bd6ca7 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -11,7 +11,7 @@ }: let - version = "2019.02.14"; + version = "2020.03.04"; dropboxd = "${dropbox}/bin/dropbox"; in stdenv.mkDerivation { @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://linux.dropboxstatic.com/packages/nautilus-dropbox-${version}.tar.bz2"; - sha256 = "09yg7q45sycl88l3wq0byz4a9k6sxx3m0r3szinvisfay9wlj35f"; + sha256 = "1jjc835n2j61d23kvygdb4n4jsrw33r9mbwxrm4fqin6x01l2w7k"; }; strictDeps = true; @@ -61,7 +61,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://www.dropbox.com; + homepage = "https://www.dropbox.com"; description = "Command line client for the dropbox daemon"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 693a7018213..b3655888e1d 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -77,7 +77,7 @@ buildFHSUserEnv { meta = with lib; { description = "Online stored folders (daemon version)"; - homepage = http://www.dropbox.com/; + homepage = "http://www.dropbox.com/"; license = licenses.unfree; maintainers = with maintainers; [ ttuegel ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index e4612579e0f..e72f50cd29b 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -24,7 +24,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "CloudFlare Dynamic DNS Client"; - homepage = https://github.com/colemickens/cfdyndns; + homepage = "https://github.com/colemickens/cfdyndns"; license = stdenv.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 59b48df1cd0..76d6d39baf2 100644 --- a/pkgs/applications/networking/enhanced-ctorrent/default.nix +++ b/pkgs/applications/networking/enhanced-ctorrent/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { CTorrent, a BitTorrent client implemented in C++, with bugfixes and performance enhancements. ''; - homepage = http://www.rahul.net/dholmes/ctorrent/; + homepage = "http://www.rahul.net/dholmes/ctorrent/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index d5dc287ecac..642677a9add 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -67,7 +67,7 @@ py.pkgs.buildPythonApplication rec { meta = with lib; { description = "Chatbot designed to be simple to extend with plugins written in Python"; - homepage = http://errbot.io/; + homepage = "http://errbot.io/"; maintainers = with maintainers; [ fpletz globin ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/esniper/default.nix b/pkgs/applications/networking/esniper/default.nix index a1539bd7165..0282483df8d 100644 --- a/pkgs/applications/networking/esniper/default.nix +++ b/pkgs/applications/networking/esniper/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple, lightweight tool for sniping eBay auctions"; - homepage = http://esniper.sourceforge.net; + homepage = "http://esniper.sourceforge.net"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 peti ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix index 36b4732ca2e..80106085e1b 100644 --- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { unreadable white text. An interface with almost infinite customization and extensibility using the excellent Python programming language. ''; - homepage = https://codezen.org/canto-ng/; + homepage = "https://codezen.org/canto-ng/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix index e700c5634ad..b8279f22de4 100644 --- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix +++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { unreadable white text. An interface with almost infinite customization and extensibility using the excellent Python programming language. ''; - homepage = https://codezen.org/canto-ng/; + homepage = "https://codezen.org/canto-ng/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index c336d2d0bba..f399aeaa98d 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modern desktop application designed to complement existing web-based RSS accounts"; - homepage = https://jangernert.github.io/FeedReader/; + homepage = "https://jangernert.github.io/FeedReader/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ edwtjo worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 15328c56d27..5b97859304c 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkgconfig asciidoctor - ] - ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; + gettext + ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; - buildInputs = [ stfl sqlite curl gettext libxml2 json_c ncurses ] + buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] ++ stdenv.lib.optional stdenv.isDarwin Security; postBuild = '' diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 7304fd2f654..9fdee56b99b 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec { namePrefix = ""; meta = with stdenv.lib; { - homepage = https://offog.org/code/rawdog/; + homepage = "https://offog.org/code/rawdog/"; description = "RSS Aggregator Without Delusions Of Grandeur"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 07f3f3fde0a..18f154d3ff7 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -37,7 +37,7 @@ buildPythonApplication rec { meta = with lib; { description = "A tool that converts RSS/Atom newsfeeds to email."; - homepage = https://pypi.python.org/pypi/rss2email; + homepage = "https://pypi.python.org/pypi/rss2email"; license = licenses.gpl2; maintainers = with maintainers; [ jb55 Profpatsch ]; }; diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 2bb592bfb42..d0825404f01 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { developed using Qt framework and with online feed synchronization support for ownCloud/Nextcloud. ''; - homepage = https://github.com/martinrotter/rssguard; + homepage = "https://github.com/martinrotter/rssguard"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix index 3e7909c91c0..49c97b3c49f 100644 --- a/pkgs/applications/networking/feedreaders/rsstail/default.nix +++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { RSSTail is more or less an RSS reader: it monitors an RSS feed and if it detects a new entry it'll emit only that new entry. ''; - homepage = http://www.vanheusden.com/rsstail/; + homepage = "http://www.vanheusden.com/rsstail/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index ab2ca160152..c6e8ab5c887 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { FireHOL, an iptables stateful packet filtering firewall for humans! FireQOS, a TC based bandwidth shaper for humans! ''; - homepage = https://firehol.org/; + homepage = "https://firehol.org/"; license = licenses.gpl2; maintainers = with maintainers; [ geistesk ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/firehol/iprange.nix b/pkgs/applications/networking/firehol/iprange.nix index 194dfc25eba..e47afba0294 100644 --- a/pkgs/applications/networking/firehol/iprange.nix +++ b/pkgs/applications/networking/firehol/iprange.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "manage IP ranges"; - homepage = https://github.com/firehol/iprange; + homepage = "https://github.com/firehol/iprange"; license = licenses.gpl2; maintainers = with maintainers; [ geistesk ]; }; diff --git a/pkgs/applications/networking/flent/http-getter.nix b/pkgs/applications/networking/flent/http-getter.nix index 2bebf4b0960..a38ac8511c2 100644 --- a/pkgs/applications/networking/flent/http-getter.nix +++ b/pkgs/applications/networking/flent/http-getter.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ cmake pkgconfig curl ]; meta = with stdenv.lib; { - homepage = https://github.com/tohojo/http-getter; + homepage = "https://github.com/tohojo/http-getter"; description = "Simple getter for HTTP URLs using cURL"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index cb40c347e1c..b6c8a534545 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The FTP Client that drives you anywhere"; - homepage = https://github.com/Alecaddd/taxi; + homepage = "https://github.com/Alecaddd/taxi"; license = licenses.gpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/gdrive/default.nix b/pkgs/applications/networking/gdrive/default.nix index 4a4c93128df..c5a5d1e970a 100644 --- a/pkgs/applications/networking/gdrive/default.nix +++ b/pkgs/applications/networking/gdrive/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/prasmussen/gdrive; + homepage = "https://github.com/prasmussen/gdrive"; description = "A command line utility for interacting with Google Drive"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix new file mode 100644 index 00000000000..ea387dad424 --- /dev/null +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gmailctl"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "mbrt"; + repo = "gmailctl"; + rev = "v${version}"; + sha256 = "0g581gdkib7bj86blpm8skjvbnivmzh9ddikxai9hr5qq231j1pb"; + }; + + modSha256 = "0pv3lhzl96ygzh9y01hi9klrrk403ii92imr9yrbimaf7rsvyvjp"; + + meta = with stdenv.lib; { + description = "Declarative configuration for Gmail filters"; + homepage = "https://github.com/mbrt/gmailctl"; + license = licenses.mit; + maintainers = [ maintainers.doronbehar ]; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix index a20728e2199..2acc838e4a4 100644 --- a/pkgs/applications/networking/gmailieer/default.nix +++ b/pkgs/applications/networking/gmailieer/default.nix @@ -27,8 +27,8 @@ python3Packages.buildPythonApplication rec { tags in the notmuch database may be pushed back remotely to your GMail account. ''; - homepage = https://github.com/gauteh/gmailieer; - repositories.git = https://github.com/gauteh/gmailieer.git; + homepage = "https://github.com/gauteh/gmailieer"; + repositories.git = "https://github.com/gauteh/gmailieer.git"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kaiha ]; }; diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 340cfdf879a..1d045afd4c0 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.6"; + stableVersion = "2.2.7"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -25,8 +25,8 @@ let }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "0inqy2zw5h9cgiyqb04kv8b5sjrdi4a637gdqs83k887axkd48aw"; - serverSrcHash = "04d9lny5vyk0kbi5ilv5mngaicnxb077xpcaaqlcd9b1m3kiq19n"; + guiSrcHash = "1rq1cb07mvakqny848nvwgasp8f6pxdy790gd98xh55xrbi8jvxp"; + serverSrcHash = "1cf3inppj2050mgmx5sgf540iz3m3nbh53p26dx8m67x2xfyb934"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 830eae1fc28..5465a27bbf2 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir $out && dune install --prefix $out"; meta = { - homepage = http://gdfuse.forge.ocamlcore.org/; + homepage = "http://gdfuse.forge.ocamlcore.org/"; description = "A FUSE-based file system backed by Google Drive, written in OCaml"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/gopher/gopher/default.nix b/pkgs/applications/networking/gopher/gopher/default.nix index f90e35ca7e2..4e571638644 100644 --- a/pkgs/applications/networking/gopher/gopher/default.nix +++ b/pkgs/applications/networking/gopher/gopher/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "export LIBS=-lncurses"; meta = with stdenv.lib; { - homepage = http://gopher.quux.org:70/devel/gopher; + homepage = "http://gopher.quux.org:70/devel/gopher"; description = "A ncurses gopher client"; platforms = platforms.linux; # clang doesn't like local regex.h license = licenses.gpl2; diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/pkgs/applications/networking/gopher/gopherclient/default.nix index 45d9235afc9..40e9401a40d 100644 --- a/pkgs/applications/networking/gopher/gopherclient/default.nix +++ b/pkgs/applications/networking/gopher/gopherclient/default.nix @@ -35,7 +35,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/prologic/gopherclient; + homepage = "https://github.com/prologic/gopherclient"; description = "Gopher Qt GUI client"; license = licenses.mit; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index d3f45f7f038..75c1cdaece9 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "hydroxide"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # FIXME: remove with next release patches = [ (fetchpatch { @@ -25,7 +23,7 @@ buildGoModule rec { subPackages = [ "cmd/hydroxide" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A third-party, open-source ProtonMail bridge"; homepage = "https://github.com/emersion/hydroxide"; license = licenses.mit; diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 9af105ad52e..871aba0a669 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Data AcQuisition library (DAQ), for packet I/O"; - homepage = https://www.snort.org; + homepage = "https://www.snort.org"; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 88df3857ec1..92415148ed5 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Network intrusion prevention and detection system (IDS/IPS)"; - homepage = https://www.snort.org; + homepage = "https://www.snort.org"; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 0b0491ffb86..93858ba3027 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.shrew.net/software; + homepage = "https://www.shrew.net/software"; description = "IPsec Client for FreeBSD, NetBSD and many Linux based operating systems"; platforms = platforms.unix; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix index 716989c7b56..f5ec3d7b6bd 100644 --- a/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix +++ b/pkgs/applications/networking/instant-messengers/SkypeExport/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Export Skype history to HTML"; - homepage = https://github.com/Temptin/SkypeExport; + homepage = "https://github.com/Temptin/SkypeExport"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ yegortimoshenko ]; diff --git a/pkgs/applications/networking/instant-messengers/amsn/default.nix b/pkgs/applications/networking/instant-messengers/amsn/default.nix index 6ff51445718..60d4ec829cc 100644 --- a/pkgs/applications/networking/instant-messengers/amsn/default.nix +++ b/pkgs/applications/networking/instant-messengers/amsn/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "amsn-0.98.9"; src = fetchurl { - url = mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz; + url = "mirror://sourceforge/amsn/amsn-0.98.9-src.tar.gz"; sha256 = "0b8ir7spxnsz8f7kvr9f1k91nsy8cb65q6jv2l55b04fl20x4z7r"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Instant messaging (MSN Messenger clone)"; - homepage = http://amsn-project.net; + homepage = "http://amsn-project.net"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix index a3497df1716..ace546227b9 100644 --- a/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { -DHAVE_INTTYPES_H -D__GLIBC__ -D__need_timeval -D__need_timespec -D__need_time_t ''; meta = { - homepage = http://www.creytiv.com/baresip.html; + homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix index 5094a13119f..52f8bb91874 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-discord/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Bitlbee plugin for Discord"; - homepage = https://github.com/sm00th/bitlbee-discord; + homepage = "https://github.com/sm00th/bitlbee-discord"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lassulus jb55 ]; platforms = stdenv.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 84067dc5f19..78016065610 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-facebook/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The Facebook protocol plugin for bitlbee"; - homepage = https://github.com/bitlbee/bitlbee-facebook; + homepage = "https://github.com/bitlbee/bitlbee-facebook"; license = licenses.gpl2Plus; platforms = stdenv.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 798dab2b646..14a3319c149 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Steam protocol plugin for BitlBee"; - homepage = https://github.com/jgeboski/bitlbee-steam; + homepage = "https://github.com/jgeboski/bitlbee-steam"; license = licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index 917610216ae..cf3f2549c81 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { Messenger, AIM and ICQ. ''; - homepage = https://www.bitlbee.org/; + homepage = "https://www.bitlbee.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index b6e13fe403d..f383daa6fd0 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -7,7 +7,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { version = "3.2.0"; src = fetchdarcs { - url = http://devel.ag-projects.com/repositories/blink-qt; + url = "http://devel.ag-projects.com/repositories/blink-qt"; rev = "release-${version}"; sha256 = "19rcwr5scw48qnj79q1pysw95fz9h98nyc3161qy2kph5g7dwkc3"; }; @@ -59,7 +59,7 @@ mkDerivationWith pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://icanblink.com/; + homepage = "http://icanblink.com/"; description = "A state of the art, easy to use SIP client for Voice, Video and IM"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 21b21e25349..14fbd4db1a0 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -1,47 +1,120 @@ -{ stdenv, fetchurl, rpmextract, patchelf, libnotify, libcap, cairo, pango, fontconfig, udev, dbus -, gtk2, atk, expat, gdk-pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage -, libXi, libXext, libXfixes, libXcomposite, alsaLib, bash +{ stdenv +, fetchurl +, rpmextract +, patchelf +, patchelfUnstable +, libnotify +, libuuid +, cairo +, cups +, pango +, fontconfig +, udev +, dbus +, gtk3 +, atk +, at-spi2-atk +, expat +, gdk-pixbuf +, freetype +, nspr +, glib +, nss +, libX11 +, libXrandr +, libXrender +, libXtst +, libXdamage +, libxcb +, libXcursor +, libXi +, libXext +, libXfixes +, libXft +, libXcomposite +, libXScrnSaver +, alsaLib +, pulseaudio +, makeWrapper }: stdenv.mkDerivation rec { pname = "bluejeans"; - version = "1.36.9"; + version = "2.1.0"; - src = - fetchurl { - url = "https://swdl.bluejeans.com/desktop/linux/1.36/${version}/bluejeans-${version}.x86_64.rpm"; - sha256 = "0sbv742pzqd2cxn3kq10lfi16jah486i9kyrmi8l1rpb9fhyw2m1"; - }; + src = fetchurl { + url = "https://swdl.bluejeans.com/desktop-app/linux/${version}/BlueJeans.rpm"; + sha256 = "1zhh0pla5gk75p8x84va9flvnk456pbcm1n6x8l82c9682fwr7dd"; + }; - nativeBuildInputs = [ patchelf rpmextract ]; + nativeBuildInputs = [ rpmextract makeWrapper ]; libPath = stdenv.lib.makeLibraryPath - [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk-pixbuf dbus udev.lib - freetype nspr glib stdenv.cc stdenv.cc.cc.lib nss gconf libX11 libXrender libXtst libXdamage - libXi libXext libXfixes libXcomposite alsaLib - ]; + [ + libnotify + libuuid + cairo + cups + pango + fontconfig + gtk3 + atk + at-spi2-atk + expat + gdk-pixbuf + dbus + udev.lib + freetype + nspr + glib + stdenv.cc.cc.lib + nss + libX11 + libXrandr + libXrender + libXtst + libXdamage + libxcb + libXcursor + libXi + libXext + libXfixes + libXft + libXcomposite + libXScrnSaver + alsaLib + pulseaudio + ]; + + localtime64_stub = ./localtime64_stub.c; buildCommand = '' mkdir -p $out/bin/ cd $out rpmextract $src - patchelf \ + mv usr/share share + rmdir usr + + ${patchelf}/bin/patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ - opt/bluejeans/bluejeans-bin - patchelf \ - --set-rpath ${libPath} \ - opt/bluejeans/bluejeans-bin - patchelf \ --replace-needed libudev.so.0 libudev.so.1 \ - opt/bluejeans/bluejeans-bin - ln -s $out/opt/bluejeans/bluejeans $out/bin/bluejeans - chmod +x $out/bin/bluejeans - patchShebangs $out + opt/BlueJeans/bluejeans-v2 + ${patchelfUnstable}/bin/patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + opt/BlueJeans/resources/BluejeansHelper + + cc $localtime64_stub -shared -o "$out"/opt/BlueJeans/liblocaltime64_stub.so + + makeWrapper $out/opt/BlueJeans/bluejeans-v2 $out/bin/bluejeans \ + --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/opt/BlueJeans \ + --set LD_PRELOAD "$out"/opt/BlueJeans/liblocaltime64_stub.so + + patchShebangs "$out" ''; meta = with stdenv.lib; { - description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day."; + description = "Video, audio, and web conferencing that works together with the collaboration tools you use every day"; homepage = "https://www.bluejeans.com"; license = licenses.unfree; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c b/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c new file mode 100644 index 00000000000..87c2fa11714 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/bluejeans/localtime64_stub.c @@ -0,0 +1,12 @@ +#include <stdio.h> +#include <stdlib.h> + +void *localtime64() { + fprintf(stderr, "nixpkgs: call into localtime64_r\n"); + abort(); +} + +void *localtime64_r() { + fprintf(stderr, "nixpkgs: call into localtime64_r\n"); + abort(); +} diff --git a/pkgs/applications/networking/instant-messengers/centerim/default.nix b/pkgs/applications/networking/instant-messengers/centerim/default.nix index daffb539676..52d8178764c 100644 --- a/pkgs/applications/networking/instant-messengers/centerim/default.nix +++ b/pkgs/applications/networking/instant-messengers/centerim/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.centerim.org/; + 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; diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index e507d986510..67c2a0db237 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "a safe and secure chat client"; - homepage = https://coy.im/; + homepage = "https://coy.im/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 9cf0032cf49..035878b8e00 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern Jabber/XMPP Client using GTK/Vala"; - homepage = https://github.com/dino/dino; + homepage = "https://github.com/dino/dino"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ mic92 qyliss ]; diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 896ca4f38a6..05767d1a9cd 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -46,6 +46,7 @@ rustPlatform.buildRustPackage rec { python3 rustc wrapGAppsHook + glib ]; buildInputs = [ @@ -79,9 +80,8 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Matrix group messaging app"; - homepage = https://gitlab.gnome.org/GNOME/fractal; + homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill worldofpeace ]; }; } - diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix index 605550beb50..0c5090574fa 100644 --- a/pkgs/applications/networking/instant-messengers/franz/default.nix +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A free messaging app that combines chat & messaging services into one application"; - homepage = https://meetfranz.com; + homepage = "https://meetfranz.com"; license = licenses.free; maintainers = [ maintainers.davidtwco ]; platforms = ["x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1fd8c47a99c..b2be635728d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -59,7 +59,7 @@ python3.pkgs.buildPythonApplication rec { ''; meta = { - homepage = http://gajim.org/; + homepage = "http://gajim.org/"; description = "Jabber client written in PyGTK"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin aszlig abbradar ]; diff --git a/pkgs/applications/networking/instant-messengers/gomuks/default.nix b/pkgs/applications/networking/instant-messengers/gomuks/default.nix index 27790c2c9e0..2962d190d36 100644 --- a/pkgs/applications/networking/instant-messengers/gomuks/default.nix +++ b/pkgs/applications/networking/instant-messengers/gomuks/default.nix @@ -1,21 +1,34 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, makeDesktopItem }: buildGoModule rec { pname = "gomuks"; - version = "2020-02-19"; + version = "2020-03-20"; goPackagePath = "maunium.net/go/gomuks"; src = fetchFromGitHub { owner = "tulir"; repo = pname; - rev = "702592bf89dfcf1ec382c0a09d99318bce7a3943"; - sha256 = "0g638q8ypkp6dbfy1s4hz798cpkld301f914il3yd70yf05vvysc"; + rev = "bce30e32a049b3ee76081c8d3881a3820b0e7341"; + sha256 = "0f7i88vrvl1xl4hmjplq3wwihqwijbgxy6nk5fkvc8pfmm5hsjcs"; }; - modSha256 = "03vbrh50pvx71rp6c23qc2sh0ir4jm1wl0gvi3z1c14ndzhsqky4"; + modSha256 = "10w0bjhnf6bbqx5jbgfv2jxxyqswzx25p64kkjmvh5qamjzpbjz2"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' + cp -r ${ + makeDesktopItem { + name = "net.maunium.gomuks.desktop"; + exec = "@out@/bin/gomuks"; + terminal = "true"; + desktopName = "Gomuks"; + genericName = "Matrix client"; + categories = "Network;Chat"; + comment = meta.description; + } + }/* $out/ + substituteAllInPlace $out/share/applications/* + ''; meta = with stdenv.lib; { homepage = "https://maunium.net/go/gomuks/"; diff --git a/pkgs/applications/networking/instant-messengers/gtmess/default.nix b/pkgs/applications/networking/instant-messengers/gtmess/default.nix index 3e16a58f54b..0661e6d7525 100644 --- a/pkgs/applications/networking/instant-messengers/gtmess/default.nix +++ b/pkgs/applications/networking/instant-messengers/gtmess/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtmess-0.97"; src = fetchurl { - url = mirror://sourceforge/gtmess/gtmess-0.97.tar.gz; + url = "mirror://sourceforge/gtmess/gtmess-0.97.tar.gz"; sha256 = "1ipmqsrj0r1ssbgs2fpr4x5vnzlxlqhx9jrnadp1jw7s0sxpjqv0"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Console MSN Messenger client for Linux and other unix systems"; - homepage = http://gtmess.sourceforge.net/; + homepage = "http://gtmess.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 47854683e0e..7213332a549 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -80,7 +80,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Desktop client for HipChat services"; - homepage = http://www.hipchat.com; + homepage = "http://www.hipchat.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 169ddf65b29..b3fc9d10515 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { inherit (ocamlPackages.topkg) installPhase; meta = with stdenv.lib; { - homepage = https://github.com/hannesm/jackline; + homepage = "https://github.com/hannesm/jackline"; description = "Terminal-based XMPP client in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index 7e01f97fe0d..13013dc4c75 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://jitsi.org/; + homepage = "https://jitsi.org/"; description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index b155f312964..ced6f91fa1c 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -1,61 +1,239 @@ -{ stdenv, intltool, pkgconfig, readline, openldap, cyrus_sasl, libupnp -, zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev -, ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp -, mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake -, libmatroska, bcunit, doxygen, gdk-pixbuf, glib, cairo, pango, mbedtls -, python, graphviz, belcard, bcg729 -, withGui ? true +{ bcg729 +, bctoolbox +, bcunit +, belcard +, belle-sip +, belr +, bzrtp +, cairo +, cmake +, cyrus_sasl +, fetchFromGitLab +, fetchurl +, ffmpeg +, gdk-pixbuf +, glib +, gnused +, graphviz +, gtk2 +, intltool +, lib +, libexosip +, liblinphone +, libmatroska +, libnotify +, libosip +, libsoup +, libupnp +, libX11 +, libxml2 +, makeWrapper +, mbedtls +, mediastreamer +, mediastreamer-openh264 +, mkDerivation +, openldap +, ortp +, pango +, pkgconfig +, python +, qtbase +, qtgraphicaleffects +, qtquickcontrols2 +, qttranslations +, readline +, speex +, sqlite +, stdenv +, udev +, zlib + # For Minizip 2.2.7: +, fetchFromGitHub +, libbsd }: +let + # Linphone Desktop requires Minizip 2.2.7. Nixpkgs contains a very old version + # from the time when it was part of zlib. The most recent release of Minizip + # is currently 2.9.2 but Linphone Desktop didn't work with that. So, even if + # we added most recent Minizip version to nixpkgs, probably Minizip 2.2.7 is + # only needed here and we shouldn't add this semi-old version to + # all-packages.nix. Therefore, just define it here locally. + minizip2 = stdenv.mkDerivation rec { + pname = "minizip"; + version = "2.2.7"; -stdenv.mkDerivation rec { - pname = "linphone"; - version = "3.12.0"; + disabled = stdenv.isAarch32; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitHub { + owner = "nmoinvaz"; + repo = pname; + rev = version; + sha256 = "1a88v1gjlflsd17mlrgxh420rpa38q0d17yh9q8j1zzqfrd1azch"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=YES" + ]; + + buildInputs = [ + zlib + libbsd # required in 2.2.7 but not in 2.9.2? + ]; + + meta = with stdenv.lib; { + description = "Compression library implementing the deflate compression method found in gzip and PKZIP"; + homepage = "https://github.com/nmoinvaz/minizip"; + license = licenses.zlib; + platforms = platforms.unix; + }; + }; +in +mkDerivation rec { + pname = "linphone-desktop"; + # Latest release is 4.1.1 old and doesn't build with the latest releases of + # some of the dependencies so let's use the latest commit. + version = "unstable-2020-03-06"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; - rev = version; - sha256 = "0az2ywrpx11sqfb4s4r2v726avcjf4k15bvrqj7xvhz7hdndmh0j"; + rev = "971997e162558d37051f89c9c34bbc240135f704"; + sha256 = "02ji4r8bpcm2kyisn9d3054m026l33g2574i1ag1cmb2dz2p8i1c"; }; - cmakeFlags = stdenv.lib.optional withGui [ "-DENABLE_GTK_UI=ON" ]; + # Without this patch, the build fails with: + # + # No rule to make target + # 'minizip_OUTPUT/nix/store/...linphone-desktop.../lib/libminizip.so', + # + # So, the makefile tries to use a full absolute path to the library but does + # it incorrectly. As we have installed Minizip properly, it's sufficient to + # just use "minizip" and the library is found automatically. If this patched + # target_link_libraries line was removed entirely, the build would fail at the + # very end when linking minizip. + patches = [ + ./fix_minizip_linking.patch + ]; + # See: https://gitlab.linphone.org/BC/public/linphone-desktop/issues/21 postPatch = '' - touch coreapi/liblinphone_gitversion.h + substituteInPlace src/app/AppController.cpp \ + --replace "LINPHONE_QT_GIT_VERSION" "\"${version}\"" ''; + # TODO: After linphone-desktop and liblinphone split into separate packages, + # there might be some build inputs here that aren't needed for + # linphone-desktop. buildInputs = [ - readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11 - mbedtls libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip - bctoolbox libmatroska gdk-pixbuf glib cairo pango bzrtp belcard bcg729 + bcg729 + bctoolbox + belcard + belle-sip + belr + bzrtp + cairo + cyrus_sasl + ffmpeg + gdk-pixbuf + glib + gtk2 + libX11 + libexosip + liblinphone + libmatroska + libnotify + libosip + libsoup + libupnp + libxml2 + mbedtls + mediastreamer + mediastreamer-openh264 + minizip2 + openldap + ortp + pango + qtbase + qtgraphicaleffects + qtquickcontrols2 + qttranslations + readline + speex + sqlite + udev + zlib ]; nativeBuildInputs = [ - intltool pkgconfig makeWrapper cmake bcunit doxygen graphviz - (python.withPackages (ps: [ ps.pystache ps.six ])) + bcunit + cmake + gnused + graphviz + intltool + makeWrapper + pkgconfig ]; - NIX_CFLAGS_COMPILE = [ - "-Wno-error" - "-I${glib.dev}/include/glib-2.0" - "-I${glib.out}/lib/glib-2.0/include" - "-I${gtk2.dev}/include/gtk-2.0/" - "-I${cairo.dev}/include/cairo" - "-I${pango.dev}/include/pango-1.0" - "-I${gtk2}/lib/gtk-2.0/include" - "-DLIBLINPHONE_GIT_VERSION=\"v${version}\"" + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=RelWithDebInfo" + "-DMINIZIP_INCLUDE_DIRS=${minizip2}/include" + "-DMINIZIP_LIBRARIES=minizip" ]; - postInstall = '' - for i in $(cd $out/bin && ls); do - wrapProgram $out/bin/$i --set MEDIASTREAMER_PLUGINS_DIR ${mediastreamer-openh264}/lib/mediastreamer/plugins - done + # The default install phase fails because the paths are somehow messed up in + # the makefiles. The errors were like: + # + # CMake Error at cmake_builder/linphone_package/cmake_install.cmake:49 (file): + # file INSTALL cannot find + # "/build/linphone-desktop-.../build/linphone-sdk/desktop//nix/store/.../bin": + # No such file or directory. + # + # If someone is able to figure out how to fix that, great. For now, just + # trying to pick all the relevant files to the output. + # + # Also, the exec path in linphone.desktop file remains invalid, pointing to + # the build directory, after the whole nix build process. So, let's use sed to + # manually fix that path. + # + # In order to find mediastreamer plugins, mediastreamer package was patched to + # support an environment variable pointing to the plugin directory. Set that + # environment variable by wrapping the Linphone executable. + # + # Also, some grammar files needed to be copied too from some dependencies. I + # suppose if one define a dependency in such a way that its share directory is + # found, then this copying would be unnecessary. These missing grammar files + # were discovered when linphone crashed at startup and it was run with + # --verbose flag. Instead of actually copying these files, create symlinks. + # + # It is quite likely that there are some other files still missing and + # Linphone will randomly crash when it tries to access those files. Then, + # those just need to be copied manually below. + installPhase = '' + mkdir -p $out/bin + cp linphone $out/bin/ + wrapProgram $out/bin/linphone \ + --set MEDIASTREAMER_PLUGINS_DIR \ + ${mediastreamer-openh264}/lib/mediastreamer/plugins + mkdir -p $out/share/applications + sed -i "s@/build/.*/OUTPUT/bin@$out/bin@" linphone.desktop + cp linphone.desktop $out/share/applications/ + cp -r ../assets/icons $out/share/ + mkdir -p $out/share/belr/grammars + ln -s ${belcard}/share/belr/grammars/* $out/share/belr/grammars/ + ln -s ${liblinphone}/share/belr/grammars/* $out/share/belr/grammars/ + mkdir -p $out/share/linphone + ln -s ${liblinphone}/share/linphone/* $out/share/linphone/ ''; - meta = with stdenv.lib; { - homepage = https://www.linphone.org/; + meta = with lib; { + homepage = "https://www.linphone.org/"; description = "Open source SIP phone for voice/video calls and instant messaging"; - license = licenses.gpl2Plus; + license = licenses.gpl3; platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch b/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch new file mode 100644 index 00000000000..bb88d0030fa --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/linphone/fix_minizip_linking.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3ee77441..18ea5c27 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -517,7 +517,7 @@ else() + target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") + execute_process(COMMAND install_name_tool -id "@executable_path/../Frameworks/libminizip.dylib" "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.dylib") + elseif(NOT WIN32) +- target_link_libraries(${TARGET_NAME} "${MINIZIP_OUTPUT_DIR}/${CMAKE_INSTALL_LIBDIR}/libminizip.so") ++ target_link_libraries(${TARGET_NAME} "minizip") + endif() + endif()#If (LinphoneCxx_FOUND AND Minizip_FOUND) + endif()#If (LinphoneCxx_FOUND) diff --git a/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix new file mode 100644 index 00000000000..97f77522022 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/matrix-dl/default.nix @@ -0,0 +1,25 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + pname = "matrix-dl-unstable"; + version = "2019-09-22"; + + src = fetchFromGitHub { + owner = "rubo77"; + repo = "matrix-dl"; + rev = "e91610f45b7b3b0aca34923309fc83ba377f8a69"; + sha256 = "036xfdd21pcfjlilknc67z5jqpk0vz07853wwcsiac32iypc6f2q"; + }; + + propagatedBuildInputs = with python3Packages; [ + matrix-client + ]; + + meta = with lib; { + description = "Download backlogs from Matrix as raw text"; + homepage = src.meta.homepage; + license = licenses.gpl1Plus; + maintainers = with maintainers; [ aw ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix index 012ad195a71..577619dcc04 100644 --- a/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix +++ b/pkgs/applications/networking/instant-messengers/matrix-recorder/node-packages.nix @@ -784,7 +784,7 @@ let version = "2.3.0"; src = fetchurl { name = "olm-2.3.0.tar.gz"; - url = https://packages.matrix.org/npm/olm/olm-2.3.0.tgz; + url = "https://packages.matrix.org/npm/olm/olm-2.3.0.tgz"; sha256 = "1f0f037a025a44509646cb849ded7c1a1f55e7bfed240fad19676c002fcd953a"; }; }; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index dbfc87b8e8d..0a41c9666b6 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -90,7 +90,7 @@ in meta = with stdenv.lib; { description = "Mattermost Desktop client"; - homepage = https://about.mattermost.com/; + homepage = "https://about.mattermost.com/"; license = licenses.asl20; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.joko ]; diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index f4111123711..98b326820b9 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://mcabber.com/; + homepage = "http://mcabber.com/"; description = "Small Jabber console client"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/networking/instant-messengers/mikutter/default.nix b/pkgs/applications/networking/instant-messengers/mikutter/default.nix index 7d2037d16a7..5c86157f502 100644 --- a/pkgs/applications/networking/instant-messengers/mikutter/default.nix +++ b/pkgs/applications/networking/instant-messengers/mikutter/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extensible Twitter client"; - homepage = https://mikutter.hachune.net; + homepage = "https://mikutter.hachune.net"; platforms = ruby.meta.platforms; license = licenses.mit; broken = true; diff --git a/pkgs/applications/networking/instant-messengers/mm/default.nix b/pkgs/applications/networking/instant-messengers/mm/default.nix index 7122a509215..3bdfcbfe7d1 100644 --- a/pkgs/applications/networking/instant-messengers/mm/default.nix +++ b/pkgs/applications/networking/instant-messengers/mm/default.nix @@ -15,7 +15,7 @@ buildGoPackage { meta = { description = "A file system based matrix client"; - homepage = https://gitlab.com/meutraa/mm; + homepage = "https://gitlab.com/meutraa/mm"; license = stdenv.lib.licenses.isc; }; } diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index f214f722143..1938bae4f74 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -71,7 +71,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; - homepage = https://github.com/Nheko-Reborn/nheko; + homepage = "https://github.com/Nheko-Reborn/nheko"; maintainers = with maintainers; [ ekleog fpletz ]; platforms = platforms.unix; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index 3b3b0c2fd66..e3595e07a78 100644 --- a/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Perl Console Twitter Client"; - homepage = http://oysttyer.github.io/; + homepage = "http://oysttyer.github.io/"; maintainers = with maintainers; [ woffs ]; license = with licenses; [ ffsl ]; }; 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 079fc7d57fb..18511630c93 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 pidgin ]; meta = with stdenv.lib; { - homepage = https://github.com/gkdr/carbons; + homepage = "https://github.com/gkdr/carbons"; description = "XEP-0280: Message Carbons plugin for libpurple"; license = licenses.gpl2; platforms = platforms.linux; 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 45214944309..eccb8de31e5 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 @@ -3,13 +3,13 @@ stdenv.mkDerivation { name = "pidgin-msn-pecan-0.1.4"; src = fetchurl { - url = http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2; + url = "http://msn-pecan.googlecode.com/files/msn-pecan-0.1.4.tar.bz2"; sha256 = "0d43z2ay9is1r2kkc9my8pz0fwdyzv7k19vdmbird18lg7rlbjd2"; }; meta = { description = "Alternative MSN protocol plug-in for Pidgin IM"; - homepage = https://github.com/felipec/msn-pecan; + homepage = "https://github.com/felipec/msn-pecan"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 9f5c246ede6..bdc16d101f5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libotr pidgin intltool ]; meta = with stdenv.lib; { - homepage = https://otr.cypherpunks.ca/; + homepage = "https://otr.cypherpunks.ca/"; description = "Plugin for Pidgin 2.x which implements OTR Messaging"; license = licenses.gpl2; platforms = platforms.linux; 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 bfd4b1abd5e..1fd248e0c89 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 @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/pidgin-latex/; + homepage = "https://sourceforge.net/projects/pidgin-latex/"; description = "LaTeX rendering plugin for Pidgin IM"; license = licenses.gpl2; platforms = platforms.linux; 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 3555e5a7197..13e165ad7a1 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 @@ -27,7 +27,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://github.com/dreadatour/pidgin-mra; + 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; 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 6d527f3a7e4..067a71a93dd 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 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/EionRobb/pidgin-opensteamworks; + homepage = "https://github.com/EionRobb/pidgin-opensteamworks"; description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix index ff065e7e2ce..bf9979c19f2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-osd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ xosd pidgin ]; meta = with stdenv.lib; { - homepage = https://github.com/mbroemme/pidgin-osd; + homepage = "https://github.com/mbroemme/pidgin-osd"; description = "Plugin for Pidgin which implements on-screen display via libxosd"; license = licenses.gpl3; platforms = platforms.linux; 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 c418b2e992a..cae84c054e8 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 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://github.com/EionRobb/skype4pidgin; + homepage = "https://github.com/EionRobb/skype4pidgin"; description = "SkypeWeb plugin for Pidgin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix index 7302ba89a71..463b6326b5a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-xmpp-receipts/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://devel.kondorgulasch.de/pidgin-xmpp-receipts/; + homepage = "http://devel.kondorgulasch.de/pidgin-xmpp-receipts/"; description = "Message delivery receipts (XEP-0184) Pidgin plugin"; license = licenses.gpl3; platforms = platforms.linux; 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 6695f8cb69b..0322005ae93 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 @@ -18,7 +18,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://github.com/EionRobb/purple-discord; + homepage = "https://github.com/EionRobb/purple-discord"; description = "Discord plugin for Pidgin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 5d2292b50ad..204d99f6d7a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_DATADIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://bitbucket.org/EionRobb/purple-hangouts; + homepage = "https://bitbucket.org/EionRobb/purple-hangouts"; description = "Native Hangouts support for pidgin"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix index e488ae73be0..0a6aa1a133d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-lurch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gkdr/lurch; + homepage = "https://github.com/gkdr/lurch"; description = "XEP-0384: OMEMO Encryption for libpurple"; license = licenses.gpl3; platforms = platforms.linux; 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 e9a0812e925..999235314fe 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 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/matrix-org/purple-matrix; + homepage = "https://github.com/matrix-org/purple-matrix"; description = "Matrix support for Pidgin / libpurple"; license = licenses.gpl2; maintainers = with maintainers; [ symphorien ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix index 8022d32a081..6739befbfea 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin intltool python ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/rekkanoryo/purple-plugin-pack; + homepage = "https://bitbucket.org/rekkanoryo/purple-plugin-pack"; description = "Plugin pack for Pidgin 2.x"; license = licenses.gpl2; platforms = platforms.linux; 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 10973345dec..7d7abbd1eed 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 @@ -18,7 +18,7 @@ stdenv.mkDerivation { PKG_CONFIG_PURPLE_DATAROOTDIR = "${placeholder "out"}/share"; meta = with stdenv.lib; { - homepage = https://github.com/dylex/slack-libpurple; + homepage = "https://github.com/dylex/slack-libpurple"; description = "Slack plugin for Pidgin"; license = licenses.gpl2; platforms = platforms.linux; 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 edb4ca3c349..76b242659e7 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 @@ -22,7 +22,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DCMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT=1" ]; meta = { - homepage = https://bitbucket.org/olegoandreev/purple-vk-plugin; + 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; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix index 83904531753..3277e12ec08 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-xmpp-http-upload/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/Junker/purple-xmpp-http-upload; + homepage = "https://github.com/Junker/purple-xmpp-http-upload"; description = "HTTP File Upload plugin for libpurple (XMPP Protocol XEP-0363)"; license = licenses.gpl3; platforms = 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 6657ff96b11..253d2ddfe24 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ]; meta = { - homepage = https://github.com/novas0x2a/skype4pidgin; + homepage = "https://github.com/novas0x2a/skype4pidgin"; license = stdenv.lib.licenses.gpl3Plus; description = "Plugin to use a running skype account through pidgin"; platforms = stdenv.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 c38ff8f454e..38424ca2597 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 @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/majn/telegram-purple; + homepage = "https://github.com/majn/telegram-purple"; description = "Telegram for Pidgin / libpurple"; license = licenses.gpl2; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix index 41f205514e7..de48ee26a6e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/tox-prpl/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/jin-eld/tox-prpl; + homepage = "https://github.com/jin-eld/tox-prpl"; description = "Tox plugin for Pidgin / libpurple"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix index 8f86256069c..f576f2ad9c3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/window-merge/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pidgin ]; meta = with stdenv.lib; { - homepage = https://github.com/dm0-/window_merge; + homepage = "https://github.com/dm0-/window_merge"; description = "Pidgin plugin that merges the Buddy List window with a conversation window"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 71168e1a692..369ae069324 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -67,7 +67,7 @@ let unwrapped = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; - homepage = http://pidgin.im; + homepage = "http://pidgin.im"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/applications/networking/instant-messengers/poezio/default.nix b/pkgs/applications/networking/instant-messengers/poezio/default.nix index 31c9fb4e7c3..f7238419b53 100644 --- a/pkgs/applications/networking/instant-messengers/poezio/default.nix +++ b/pkgs/applications/networking/instant-messengers/poezio/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { meta = with lib; { description = "Free console XMPP client"; - homepage = https://poez.io; + homepage = "https://poez.io"; license = licenses.mit; maintainers = [ maintainers.lsix ]; }; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index f6c1aa14e0f..86e760d497c 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi. ''; - homepage = http://www.profanity.im/; + homepage = "http://www.profanity.im/"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index 111f4e728e7..d76b8dd206e 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -31,7 +31,7 @@ python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://bitmessage.org/; + homepage = "https://bitmessage.org/"; description = "The official Bitmessage client"; license = licenses.mit; maintainers = with maintainers; [ jgillich ]; diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index a78e5d1c2d1..e3fc384f0f0 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -43,7 +43,7 @@ in mkDerivation { meta = with lib; { description = "Qt Tox client"; - homepage = https://tox.chat; + homepage = "https://tox.chat"; license = licenses.gpl3; maintainers = with maintainers; [ akaWolf peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index 757551c7074..ec6a497bde9 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,7 +1,7 @@ { mkDerivation, stdenv, lib, fetchFromGitHub, cmake , qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools , libqmatrixclient_0_5 -, gnome3 +, libsecret }: let @@ -16,7 +16,7 @@ let inherit sha256; }; - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library gnome3.libsecret ]; + buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library libsecret ]; nativeBuildInputs = [ cmake qttools ]; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 28ed924011e..1237892ef64 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -3,18 +3,18 @@ }: let - version = "0.7.4"; + version = "0.7.5"; in stdenv.mkDerivation rec { pname = "rambox"; inherit version; src = { x86_64-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-amd64.deb"; - sha256 = "0m9627bcwfg9aximv7ifsmspm8xi231pcnnd4p46lahb2qp19vbd"; + sha256 = "108yd5djnap37yh0nbjyqkp5ci1zmydfzqcsbapin40a4f36zm31"; }; i686-linux = fetchurl { url = "https://github.com/ramboxapp/community-edition/releases/download/${version}/Rambox-${version}-linux-i386.deb"; - sha256 = "162p6x400w3pny38adinp53rcifvbkjbs12cwrpf7s3b0yml8qxr"; + sha256 = "1pvh048h6m19rmbscsy69ih0jkyhazmq2pcagmf3kk8gmbi7y6p6"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; - homepage = http://rambox.pro; + homepage = "http://rambox.pro"; license = licenses.mit; maintainers = with maintainers; [ gnidorah ma27 ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/rambox/pro.nix b/pkgs/applications/networking/instant-messengers/rambox/pro.nix index df4675b0449..16c96a86a41 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/pro.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/pro.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "rambox-pro"; - version = "1.2.2"; + version = "1.3.1"; dontBuild = true; dontStrip = true; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/RamboxPro-${version}-linux-x64.tar.gz"; - sha256 = "1zzlfk86gzg20qapqz9s8p9vmak8vj1smkwn9yrzs2yisfqh0gpc"; + sha256 = "1cy4h2yzrpr3gxd16p4323w06i67d82jjlyx737c3ngzw7aahmq1"; }; installPhase = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Messaging and emailing app that combines common web applications into one"; - homepage = https://rambox.pro; + homepage = "https://rambox.pro"; license = licenses.unfree; maintainers = with maintainers; [ chrisaw ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 3768ecd137f..212ba3a31a4 100644 --- a/pkgs/applications/networking/instant-messengers/ratox/default.nix +++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = { description = "FIFO based tox client"; - homepage = http://ratox.2f30.org/; + homepage = "http://ratox.2f30.org/"; license = licenses.isc; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 96ce9c32a7d..01295697ad3 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Anonymous peer-to-peer instant messaging"; - homepage = https://ricochet.im; + homepage = "https://ricochet.im"; license = licenses.bsd3; maintainers = [ maintainers.codsl maintainers.jgillich maintainers.np ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix index 97c00924d6c..55624643a01 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix @@ -44,7 +44,7 @@ let ]); src = fetchgit { - url = https://gitlab.savoirfairelinux.com/ring/ring-daemon.git; + url = "https://gitlab.savoirfairelinux.com/ring/ring-daemon.git"; rev = "006b8dc7be08fe9beb68709af71004e7bc1ceb5c"; sha256 = "0ih9g0rismrhx6nqcy3jqfbcs166grg0shnfmrnmykl9h0xy8z47"; }; @@ -140,7 +140,7 @@ stdenv.mkDerivation { graphical user interfaces and even scripts to control the daemon from the shell. ''; - homepage = https://ring.cx; + homepage = "https://ring.cx"; license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix index d4298a3d32f..775b9015eb0 100644 --- a/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix +++ b/pkgs/applications/networking/instant-messengers/ring-daemon/restbed.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { business processes. Targeting mobile, tablet, desktop, and embedded production environments. ''; - homepage = https://corvusoft.co.uk/; + homepage = "https://corvusoft.co.uk/"; license = licenses.agpl3; maintainers = with maintainers; [ taeer ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 418375e80c3..390b61d8d36 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json @@ -2,7 +2,7 @@ "name": "riot-web", "productName": "Riot", "main": "src/electron-main.js", - "version": "1.5.12", + "version": "1.5.15", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index b76848c2b81..e1dce803b40 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -610,11 +610,11 @@ }; } { - name = "minimist___minimist_1.2.0.tgz"; + name = "minimist___minimist_1.2.2.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + name = "minimist___minimist_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz"; + sha1 = "b00a00230a1108c48c169e69a291aafda3aacd63"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index 87342115e1e..70be3698a78 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -1,17 +1,20 @@ -{ pkgs, stdenv, fetchFromGitHub, makeWrapper, makeDesktopItem, electron_7, riot-web, mkYarnPackage }: - +{ stdenv, fetchFromGitHub +, makeWrapper, makeDesktopItem, mkYarnPackage +, electron_7, riot-web, gtk3 +, wrapGAppsHook, glib +}: # Notes for maintainers: # * versions of `riot-web` and `riot-desktop` should be kept in sync. # * the Yarn dependency expression must be updated with `./update-riot-desktop.sh <git release tag>` let executableName = "riot-desktop"; - version = "1.5.13"; + version = "1.5.15"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "1p2bdqq8yziv3l7kjkwqvi27a8djav7rk3lsipl7dvdjk1926941"; + sha256 = "08yk5is6n9ci1jml0b94a3swdybx01k5klbl30i1b76biyn75m77"; }; electron = electron_7; @@ -24,7 +27,14 @@ in mkYarnPackage rec { packageJSON = ./riot-desktop-package.json; yarnNix = ./riot-desktop-yarndeps.nix; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + extraBuildInputs = [ + glib + gtk3 + ]; + + dontWrapGApps = true; installPhase = '' # resources @@ -44,10 +54,13 @@ in mkYarnPackage rec { # desktop item mkdir -p "$out/share" ln -s "${desktopItem}/share/applications" "$out/share/applications" + ''; + postFixup = '' # executable wrapper makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \ - --add-flags "$out/share/riot/electron" + --add-flags "$out/share/riot/electron" \ + "''${gappsWrapperArgs[@]}" ''; # Do not attempt generating a tarball for riot-web again. @@ -70,13 +83,13 @@ in mkYarnPackage rec { comment = meta.description; categories = "Network;InstantMessaging;Chat;"; extraEntries = '' - StartupWMClass="riot" + StartupWMClass=riot ''; }; meta = with stdenv.lib; { description = "A feature-rich client for Matrix.org"; - homepage = https://about.riot.im/; + homepage = "https://about.riot.im/"; license = licenses.asl20; maintainers = with maintainers; [ pacien worldofpeace ]; inherit (electron.meta) platforms; diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 1ff55fbb1cb..78fc4b45f6b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.13"; + version = "1.5.15"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0xghpf9rv7ns5aipc6n517qd9dp50rr93arvx6r36kqhkdyzbfad"; + sha256 = "09a9l1l65m2c4ldycjhnqn0mmblm3j65vc9rcjfkdxqbd6bh86h7"; }; installPhase = '' @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; - homepage = http://riot.im/; + homepage = "http://riot.im/"; maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; 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 13c7281aea7..6b9593a24b7 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -51,7 +51,7 @@ in ''; meta = with stdenv.lib; { - homepage = http://sat.goffi.org/; + homepage = "http://sat.goffi.org/"; description = "A multi-frontend XMPP client"; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 54959383f08..b16659ba44c 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -13,7 +13,7 @@ in python3Packages.buildPythonPackage { meta = with stdenv.lib; { description = "Non-official desktop client for Slack"; - homepage = https://github.com/raelgc/scudcloud; + homepage = "https://github.com/raelgc/scudcloud"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ volhovm ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 8471f43c6dd..a062d679f7f 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.5"; + version = "0.6.6"; # 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 = "082kq8kadxbwzf31fmlq4in714id2irk0hhqsl53vsl3wmv45zvv"; + sha256 = "1r0w9knxa2kx5my9xgmcnhq14287ixwbqxqip5ispj78d27g4zfq"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/AsamK/signal-cli; + homepage = "https://github.com/AsamK/signal-cli"; description = "Command-line and dbus interface for communicating with the Signal messaging service"; license = licenses.gpl3; maintainers = with maintainers; [ ivan erictapen ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 51b6816e4ec..454d9b2884f 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.32.2"; # Please backport all updates to the stable channel. + version = "1.33.0"; # 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: @@ -33,7 +33,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 = "0s64b66yzh797wbnggpj5hym0d1dklh3znbl3xib00hlwdqczbwz"; + sha256 = "0s403243cm8x3daj4p7cpp5z0hwmsnk21cq42zcfls2q5d30p6wz"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/pkgs/applications/networking/instant-messengers/silc-client/default.nix index 1219440bf83..0c84e1c5c80 100644 --- a/pkgs/applications/networking/instant-messengers/silc-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/silc-client/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { buildInputs = [ perl glib ncurses ]; meta = { - homepage = http://silcnet.org/; + homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/instant-messengers/sky/default.nix b/pkgs/applications/networking/instant-messengers/sky/default.nix index cdc176be65b..fe8b251c404 100644 --- a/pkgs/applications/networking/instant-messengers/sky/default.nix +++ b/pkgs/applications/networking/instant-messengers/sky/default.nix @@ -10,7 +10,7 @@ # Sky is linked to the libjpeg 8 version and checks for the version number in the code. libjpeg_original_fix = libjpeg_original.overrideAttrs (oldAttrs: { src = fetchurl{ - url = https://www.ijg.org/files/jpegsrc.v8d.tar.gz; + url = "https://www.ijg.org/files/jpegsrc.v8d.tar.gz"; sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0"; }; }); @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { longDescription = '' Lync & Skype for business on linux ''; - homepage = https://tel.red/; + homepage = "https://tel.red/"; license = licenses.unfree; maintainers = [ maintainers.Scriptkiddi ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix index 8093f91feb3..57d1ffece71 100644 --- a/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix +++ b/pkgs/applications/networking/instant-messengers/skype-call-recorder/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lvorbis"; meta = { - homepage = http://atdot.ch/scr/; + homepage = "http://atdot.ch/scr/"; description = "Open source tool to record your Skype calls on Linux"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index a4852f16245..5eda7971748 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpkg , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3 -, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg +, gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core }: let @@ -29,6 +29,7 @@ let gnome2.GConf gdk-pixbuf gtk3 + libappindicator-gtk3 gnome3.gnome-keyring @@ -110,7 +111,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Linux client for skype"; - homepage = https://www.skype.com; + homepage = "https://www.skype.com"; license = licenses.unfree; maintainers = with stdenv.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 d1f3e98c4ec..c862c253c00 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Slack client for your terminal"; - homepage = https://github.com/erroneousboat/slack-term; + homepage = "https://github.com/erroneousboat/slack-term"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix b/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix deleted file mode 100644 index 903d8e60d6d..00000000000 --- a/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchgit }: - -stdenv.mkDerivation rec { - rev = "f760176c6e133667ce73aeecba8b0c0eb8822941"; - version = "2019-09-11"; - pname = "slack-theme-black"; - - src = fetchgit { inherit rev; - url = "https://github.com/laCour/slack-night-mode"; - sha256 = "1kx8nx7mhrabs5wxqgvy86s5smy5hw49gv6yc95yxwx6ymwpgbzj"; - }; - - dontUnpack = true; - - buildCommand = '' - mkdir $out - cp $src/css/raw/black.css $out/theme.css - ''; -} diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 32f50b6fd63..e9a795b59cd 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,35 +1,60 @@ -{ theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo, -cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk-pixbuf, -libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg, -at-spi2-atk, at-spi2-core, libuuid, nodePackages, libpulseaudio, xdg_utils +{ stdenv +, fetchurl +, dpkg +, makeWrapper +, nodePackages +, alsaLib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, curl +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gnome2 +, gtk3 +, libappindicator-gtk3 +, libnotify +, libpulseaudio +, libuuid +, libxcb +, nspr +, nss +, pango +, systemd +, xdg_utils +, xorg }: let - version = "4.2.0"; + pname = "slack"; inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; - pname = "slack"; - sha256 = { - x86_64-darwin = "0947a98m7yz4hldjvcqnv9s17dpvlsk9sflc1zc99hf500zck0w1"; - x86_64-linux = "01b2klhky04fijdqcpfafgdqx2c5nh2fpnzvzgvz10hv7h16cinv"; + x86_64-darwin = "05xsbiviikrwfayjr6rvvfkm70681x2an6mgcg1cxw1fsi4sr6fd"; + x86_64-linux = "0h2rfgx92yq9a6dqsv9a0r8a6m5xfrywkljjk5w9snw49b0r1p12"; }.${system} or throwSystem; - meta = with stdenv.lib; { description = "Desktop client for Slack"; - homepage = https://slack.com; + homepage = "https://slack.com"; license = licenses.unfree; - maintainers = [ maintainers.mmahut ]; + maintainers = with maintainers; [ mmahut ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; }; linux = stdenv.mkDerivation rec { - inherit pname version meta; + inherit pname meta; + version = "4.4.0"; src = fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; inherit sha256; @@ -47,23 +72,22 @@ let expat fontconfig freetype + gdk-pixbuf glib gnome2.GConf - gdk-pixbuf gtk3 - pango + libappindicator-gtk3 libnotify + libpulseaudio + libuuid libxcb - libappindicator-gtk3 nspr nss + pango stdenv.cc.cc systemd - libuuid - libpulseaudio - - xorg.libxkbfile xorg.libX11 + xorg.libXScrnSaver xorg.libXcomposite xorg.libXcursor xorg.libXdamage @@ -73,65 +97,51 @@ let xorg.libXrandr xorg.libXrender xorg.libXtst - xorg.libXScrnSaver + xorg.libxkbfile ] + ":${stdenv.cc.cc.lib}/lib64"; buildInputs = [ gtk3 # needed for GSETTINGS_SCHEMAS_PATH ]; - + nativeBuildInputs = [ dpkg makeWrapper nodePackages.asar ]; - + dontUnpack = true; dontBuild = true; dontPatchELF = true; - + installPhase = '' # The deb file contains a setuid binary, so 'dpkg -x' doesn't work here dpkg --fsys-tarfile $src | tar --extract rm -rf usr/share/lintian - + mkdir -p $out mv usr/* $out - + # Otherwise it looks "suspicious" chmod -R g-w $out - + for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true patchelf --set-rpath ${rpath}:$out/lib/slack $file || true done - + # Replace the broken bin/slack symlink with a startup wrapper rm $out/bin/slack makeWrapper $out/lib/slack/slack $out/bin/slack \ --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ --prefix PATH : ${xdg_utils}/bin - + # Fix the desktop link substituteInPlace $out/share/applications/slack.desktop \ --replace /usr/bin/ $out/bin/ \ --replace /usr/share/ $out/share/ - '' + stdenv.lib.optionalString (theme != null) '' - asar extract $out/lib/slack/resources/app.asar $out/lib/slack/resources/app.asar.unpacked - cat <<EOF >> $out/lib/slack/resources/app.asar.unpacked/dist/ssb-interop.bundle.js - - var fs = require('fs'); - document.addEventListener('DOMContentLoaded', function() { - fs.readFile('${theme}/theme.css', 'utf8', function(err, css) { - let s = document.createElement('style'); - s.type = 'text/css'; - s.innerHTML = css; - document.head.appendChild(s); - }); - }); - EOF - asar pack $out/lib/slack/resources/app.asar.unpacked $out/lib/slack/resources/app.asar ''; }; - darwin = stdenv.mkDerivation { - inherit pname version meta; + darwin = stdenv.mkDerivation rec { + inherit pname meta; + version = "4.4.1"; phases = [ "installPhase" ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/update.sh b/pkgs/applications/networking/instant-messengers/slack/update.sh deleted file mode 100755 index 6a15298c4e7..00000000000 --- a/pkgs/applications/networking/instant-messengers/slack/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq - -set -eu -o pipefail - -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion slack-theme-black" | tr -d '"')" -latestSha="$(curl -L -s https://api.github.com/repos/laCour/slack-night-mode/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" - -if [ ! "null" = "${latestSha}" ]; then - latestDate="$(curl -L -s https://api.github.com/repos/laCour/slack-night-mode/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" - update-source-version slack-theme-black "${latestSha}" --version-key=rev - update-source-version slack-theme-black "${latestDate}" --ignore-same-hash - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/dark-theme.nix" - git add "${default_nix}" - git commit -m "slack-theme-black: ${oldVersion} -> ${latestDate}" -else - echo "slack-theme-black is already up-to-date" -fi diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix index 7a9ab4d127c..895ad30360e 100644 --- a/pkgs/applications/networking/instant-messengers/stride/default.nix +++ b/pkgs/applications/networking/instant-messengers/stride/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Desktop client for Atlassian Stride"; - homepage = https://www.stride.com/; + homepage = "https://www.stride.com/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index d47b7d00af9..ce59d574619 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./qt-5.11.patch ./scons.patch ]; - nativeBuildInputs = [ pkgconfig qttools scons ]; + nativeBuildInputs = [ pkgconfig qttools scons.py2 ]; buildInputs = [ GConf avahi boost hunspell libXScrnSaver libedit libidn libnatpmp libxml2 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { installFlags = [ "SWIFT_INSTALLDIR=${placeholder "out"}" ]; meta = with stdenv.lib; { - homepage = https://swift.im/; + homepage = "https://swift.im/"; description = "Qt XMPP client"; license = licenses.gpl3; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index c2a9f4be90a..b9835f45d27 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -101,10 +101,10 @@ stdenv.mkDerivation rec { meta = { description = "The TeamSpeak voice communication tool"; - homepage = https://teamspeak.com/; + homepage = "https://teamspeak.com/"; license = { fullName = "Teamspeak client license"; - url = http://sales.teamspeakusa.com/licensing.php; + url = "http://sales.teamspeakusa.com/licensing.php"; free = false; }; maintainers = [ stdenv.lib.maintainers.lhvwb ]; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 1cc3cf9cdd5..8af582c3f37 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "TeamSpeak voice communication server"; - homepage = https://teamspeak.com/; + homepage = "https://teamspeak.com/"; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ arobyn gerschtli ]; 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 862659fde8d..976eac59040 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -48,7 +48,7 @@ mkDerivation rec { ''; license = licenses.gpl3; platforms = platforms.linux; - homepage = https://kotatogram.github.io; + homepage = "https://kotatogram.github.io"; maintainers = with maintainers; [ ilya-fedin ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 3d409666798..60fd95a1476 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "1.9.21"; + version = "2.0.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1b7z68q2sb2y203nf4p6lmz72zkpi5gyv9ypqi5h99bm2j6bbyg1"; + sha256 = "0g3jw4can9gmp48s3b8s1w8n9xi54i142y74fszxf9jyq5drzlff"; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index a0cc73da46d..d81af8388aa 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://telepathy.freedesktop.org/components/telepathy-gabble/; + 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; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 769e639314e..6d4ff62f22a 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # Patch from Gentoo that helps telepathy-haze build with more # recent versions of pidgin. (fetchpatch { - url = https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch; + url = "https://raw.githubusercontent.com/gentoo/gentoo/master/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch"; sha256 = "0fa1p4n1559qd096w7ya4kvfnc1c98ykarkxzlpkwvzbczwzng3c"; }) ]; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index af0ca1589e5..f8e1f1f2c66 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logger service for Telepathy framework"; - homepage = https://telepathy.freedesktop.org/components/telepathy-logger/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-logger/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.gnu ++ platforms.linux; # Arbitrary choice 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 ef842275a5d..c590b6a0896 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , pkgconfig , dconf , telepathy-glib @@ -19,6 +20,16 @@ stdenv.mkDerivation rec { sha256 = "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"; }; + patches = [ + # Fix property name (new GLib is stricter) + # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-601494939 + # https://gitlab.gnome.org/GNOME/polari/-/merge_requests/141 + (fetchpatch { + url = "https://github.com/TelepathyIM/telepathy-mission-control/commit/d8dab08fe8db137c6bbd8bbdc3d9b01d98c48910.patch"; + sha256 = "Sw+V5QcWQ5zugwTTdkwa3pqV+v5XD0OhH6xI5ymgkOU="; + }) + ]; + buildInputs = [ python3 ]; # ToDo: optional stuff missing @@ -45,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An account manager and channel dispatcher for the Telepathy framework"; - homepage = https://telepathy.freedesktop.org/components/telepathy-mission-control/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-mission-control/"; license = licenses.lgpl21; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index 11845ecfb26..dcb2c720bc6 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://matrix.org/docs/projects/client/tensor.html; + homepage = "https://matrix.org/docs/projects/client/tensor.html"; description = "Cross-platform Qt5/QML-based Matrix client"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index edfec97edf8..8231f481ee0 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/prof7bit/TorChat; + homepage = "https://github.com/prof7bit/TorChat"; description = "Instant messaging application on top of the Tor network and it's location hidden services"; license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/applications/networking/instant-messengers/turses/default.nix b/pkgs/applications/networking/instant-messengers/turses/default.nix index 27977dae15f..b6017277b0a 100644 --- a/pkgs/applications/networking/instant-messengers/turses/default.nix +++ b/pkgs/applications/networking/instant-messengers/turses/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/louipc/turses; + homepage = "https://github.com/louipc/turses"; description = "A Twitter client for the console"; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 5ef0d916242..b360793e484 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight Tox client"; - homepage = https://github.com/uTox/uTox; + homepage = "https://github.com/uTox/uTox"; license = licenses.gpl3; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index 923ce373753..cbd32347c4e 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = http://www.vacuum-im.org; + homepage = "http://www.vacuum-im.org"; }; } diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index acdec1dc99c..e53b8c7391e 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation { dontPatchELF = true; meta = { - homepage = http://www.viber.com; + homepage = "http://www.viber.com"; description = "An instant messaging and Voice over IP (VoIP) app"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index 165e3e959e0..bece4e467a3 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -3,18 +3,18 @@ , wrapGAppsHook }: let - version = "4.5.2"; + version = "5.0.1"; in stdenv.mkDerivation { pname = "vk-messenger"; inherit version; src = { i686-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.i686.rpm"; - sha256 = "11xsdmvd2diq3m61si87x2c08nap0vakcypm90wjmdjwayg3fdlw"; + sha256 = "1ji23x13lzbkiqfrrwx1pj6gmms0p58cjmjc0y4g16kqhlxl60v6"; }; x86_64-linux = fetchurl { url = "https://desktop.userapi.com/rpm/master/vk-${version}.x86_64.rpm"; - sha256 = "0j65d6mwj6rxczi0p9fsr6jh37jxw3a3h6w67xwgdvibb7lf3gbb"; + sha256 = "01vvmia2qrxvrvavk9hkkyvfg4pg15m01grwb28884vy4nqw400y"; }; }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -46,7 +46,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple and Convenient Messaging App for VK"; - homepage = https://vk.com/messenger; + homepage = "https://vk.com/messenger"; license = licenses.unfree; maintainers = [ maintainers.gnidorah ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index ceb9b4a1140..1cd2df4c7ac 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Wavebox messaging application"; - homepage = https://wavebox.io; + homepage = "https://wavebox.io"; license = licenses.mpl20; maintainers = with maintainers; [ rawkode ]; platforms = ["x86_64-linux"]; diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index b6ed6ae9b22..d69f22f32ac 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -20,13 +20,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.12.3490"; - x86_64-linux = "3.12.2916"; + x86_64-darwin = "3.16.3630"; + x86_64-linux = "3.16.2923"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "0xvhx3r99fl1v1cdqj6sk46kzxv9qi7j754amkhv7knrpmgyp55z"; - x86_64-linux = "0xx03cpy6kapbjpygwranxjg1a0p8s1xq3cpapvi55rnkbk0qvjw"; + x86_64-darwin = "1lnjn45bhd36n9xgx6xx9cggwivvkr2s6r4zai2dwg0aac1bywr5"; + x86_64-linux = "0c8jmlsg2gnxsvly04xj1al80nj52rg4czfdha58sg14x14lyspz"; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -121,7 +121,7 @@ let src = fetchurl { url = "https://github.com/wireapp/wire-desktop/releases/download/" - + "macos%2F${version}/Wire.pkg"; + + "macos%2F${version}/Wire.pkg"; inherit sha256; }; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index 4047eba1fbb..52cf8e3279a 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An XMPP client with OTR support"; - homepage = https://github.com/agl/xmpp-client; + homepage = "https://github.com/agl/xmpp-client"; license = licenses.bsd3; maintainers = with maintainers; [ codsl ]; }; diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index ae92e23d0bd..7a46c0604cc 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.5.374815.0324"; + version = "3.5.383291.0407"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "1pnr00jwjjp23bbqdg5sv2s2rnciz57g1453sgi13kzpppydhzi5"; + sha256 = "1l560gv1wpfiggxylz3f62mcjjchpq3p0i1j4b2b68ckgc5sj80k"; }; }; diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 33392af766c..8245f5febc4 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "4.0.0"; + version = "5.0.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "1pni02mb5bvwx3k45vd6ga269ghdl633gjklyslai24rrhp16h9z"; + sha256 = "0qwlhkzb3lbzk3piyfx8nn827kcafrl3j1nxrn18f8px9gwasinz"; name="${pname}-${version}.AppImage"; }; @@ -32,7 +32,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Desktop client for Zulip Chat"; - homepage = https://zulipchat.com; + homepage = "https://zulipchat.com"; license = licenses.asl20; maintainers = with maintainers; [ jonafato ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/insync/default.nix b/pkgs/applications/networking/insync/default.nix index 3a2b32f0117..773a07dd6c2 100644 --- a/pkgs/applications/networking/insync/default.nix +++ b/pkgs/applications/networking/insync/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { platforms = ["x86_64-linux"]; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.benley ]; - homepage = https://www.insynchq.com; + 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 diff --git a/pkgs/applications/networking/ipfs-cluster/default.nix b/pkgs/applications/networking/ipfs-cluster/default.nix index 9bf7faf51f3..f921970175a 100644 --- a/pkgs/applications/networking/ipfs-cluster/default.nix +++ b/pkgs/applications/networking/ipfs-cluster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchgx, gx-go }: buildGoModule rec { pname = "ipfs-cluster"; @@ -14,13 +14,12 @@ buildGoModule rec { sha256 = "1jh6ynj50jd4w79widaqrgm3h3yz5h03vq0lbsx717a8d9073blh"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Allocate, replicate, and track Pins across a cluster of IPFS daemons"; - homepage = https://cluster.ipfs.io/; + homepage = "https://cluster.ipfs.io/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ jglukasik ]; }; } + diff --git a/pkgs/applications/networking/ipfs-migrator/default.nix b/pkgs/applications/networking/ipfs-migrator/default.nix index dc646f9471e..578ac9b0479 100644 --- a/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/pkgs/applications/networking/ipfs-migrator/default.nix @@ -19,7 +19,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Migration tool for ipfs repositories"; - homepage = https://ipfs.io/; + homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/applications/networking/ipfs-migrator/deps.nix b/pkgs/applications/networking/ipfs-migrator/deps.nix index 1ad1c383c8c..b4ae5ef827e 100644 --- a/pkgs/applications/networking/ipfs-migrator/deps.nix +++ b/pkgs/applications/networking/ipfs-migrator/deps.nix @@ -3,7 +3,7 @@ goPackagePath = "github.com/jbenet/goprocess"; fetch = { type = "git"; - url = https://github.com/jbenet/goprocess; + url = "https://github.com/jbenet/goprocess"; rev = "b497e2f366b8624394fb2e89c10ab607bebdde0b"; sha256 = "1lnvkzki7vnqn5c4m6bigk0k85haicmg27w903kwg30rdvblm82s"; }; @@ -12,7 +12,7 @@ goPackagePath = "github.com/jbenet/go-random"; fetch = { type = "git"; - url = https://github.com/jbenet/go-random; + url = "https://github.com/jbenet/go-random"; rev = "384f606e91f542a98e779e652eed88051618f0f7"; sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; }; @@ -21,7 +21,7 @@ goPackagePath = "github.com/jbenet/go-random-files"; fetch = { type = "git"; - url = https://github.com/jbenet/go-random-files; + url = "https://github.com/jbenet/go-random-files"; rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; }; @@ -30,7 +30,7 @@ goPackagePath = "github.com/hashicorp/golang-lru"; fetch = { type = "git"; - url = https://github.com/hashicorp/golang-lru; + url = "https://github.com/hashicorp/golang-lru"; rev = "20f1fb78b0740ba8c3cb143a61e86ba5c8669768"; sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; }; diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index c3a31f4e290..b94fc1addb0 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ipfs"; @@ -18,11 +18,9 @@ buildGoModule rec { modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; - homepage = https://ipfs.io/; + homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix index 9f206a8f48f..6a9bcaf32d2 100644 --- a/pkgs/applications/networking/ipget/default.nix +++ b/pkgs/applications/networking/ipget/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Retrieve files over IPFS and save them locally"; - homepage = https://ipfs.io/; + homepage = "https://ipfs.io/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/iptraf-ng/default.nix b/pkgs/applications/networking/iptraf-ng/default.nix index cdece4eb644..1fc81be240b 100644 --- a/pkgs/applications/networking/iptraf-ng/default.nix +++ b/pkgs/applications/networking/iptraf-ng/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { of the Linux kernel, so it can be used on a wide variety of supported network cards. ''; - homepage = https://fedorahosted.org/iptraf-ng/; + homepage = "https://fedorahosted.org/iptraf-ng/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/iptraf/default.nix b/pkgs/applications/networking/iptraf/default.nix index d2d9a67fb4d..83d9a019e48 100644 --- a/pkgs/applications/networking/iptraf/default.nix +++ b/pkgs/applications/networking/iptraf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "iptraf-3.0.1"; src = fetchurl { - url = ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz; + url = "ftp://iptraf.seul.org/pub/iptraf/iptraf-3.0.1.tar.gz"; sha256 = "12n059j9iihhpf6spmlaspqzxz3wqan6kkpnhmlj08jdijpnk84m"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ncurses]; meta = { - homepage = http://iptraf.seul.org/; + homepage = "http://iptraf.seul.org/"; license = stdenv.lib.licenses.gpl2Plus; description = "Console-based network statistics utility for Linux"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/irc/bip/default.nix b/pkgs/applications/networking/irc/bip/default.nix index 43ec0910cc2..af67c224e7d 100644 --- a/pkgs/applications/networking/irc/bip/default.nix +++ b/pkgs/applications/networking/irc/bip/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "An IRC proxy (bouncer)"; - homepage = http://bip.milkypond.org/; + homepage = "http://bip.milkypond.org/"; license = stdenv.lib.licenses.gpl2; downloadPage = "https://projects.duckcorp.org/projects/bip/files"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix index 8278f90d321..6cb6f2c2ef6 100644 --- a/pkgs/applications/networking/irc/communi/default.nix +++ b/pkgs/applications/networking/irc/communi/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple and elegant cross-platform IRC client"; - homepage = https://github.com/communi/communi-desktop; + homepage = "https://github.com/communi/communi-desktop"; license = licenses.bsd3; maintainers = with maintainers; [ hrdinka ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/irc/epic5/default.nix b/pkgs/applications/networking/irc/epic5/default.nix index 0cf06a1f452..cb2fa4ae682 100644 --- a/pkgs/applications/networking/irc/epic5/default.nix +++ b/pkgs/applications/networking/irc/epic5/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://epicsol.org; + homepage = "http://epicsol.org"; description = "A IRC client that offers a great ircII interface"; license = licenses.bsd3; maintainers = []; diff --git a/pkgs/applications/networking/irc/glowing-bear/default.nix b/pkgs/applications/networking/irc/glowing-bear/default.nix index 2d12386bafa..59278dddad1 100644 --- a/pkgs/applications/networking/irc/glowing-bear/default.nix +++ b/pkgs/applications/networking/irc/glowing-bear/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A web client for Weechat"; - homepage = https://github.com/glowing-bear/glowing-bear; + homepage = "https://github.com/glowing-bear/glowing-bear"; license = licenses.gpl3Plus; maintainers = with maintainers; [ delroth ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 263cf23c17f..c5b2a9f1b28 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A popular and easy to use graphical IRC (chat) client"; - homepage = https://hexchat.github.io/; + homepage = "https://hexchat.github.io/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/applications/networking/irc/ii/default.nix b/pkgs/applications/networking/irc/ii/default.nix index 4807f3419d1..163dec194b1 100644 --- a/pkgs/applications/networking/irc/ii/default.nix +++ b/pkgs/applications/networking/irc/ii/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://tools.suckless.org/ii/; + homepage = "https://tools.suckless.org/ii/"; license = stdenv.lib.licenses.mit; description = "Irc it, simple FIFO based irc client"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 1751812d67e..27b37e78a1a 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://irssi.org; + homepage = "https://irssi.org"; description = "A terminal based IRC client"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; diff --git a/pkgs/applications/networking/irc/irssi/fish/default.nix b/pkgs/applications/networking/irc/irssi/fish/default.nix index aefc48d4a3e..f1e0e9158ca 100644 --- a/pkgs/applications/networking/irc/irssi/fish/default.nix +++ b/pkgs/applications/networking/irc/irssi/fish/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "fish-irssi-20130413-e98156bebd"; src = fetchurl { - url = https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd; + url = "https://github.com/falsovsky/FiSH-irssi/tarball/e98156bebd"; name = "${name}.tar.gz"; sha256 = "1ndr51qrg66h1mfzacwzl1vd6lj39pdc4p4z5iihrj4r2f6gk11a"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp automake autoconf libtool openssl glib ]; meta = { - homepage = https://github.com/falsovsky/FiSH-irssi; + 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]; }; diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix index 6a58241b89a..2890deccb80 100644 --- a/pkgs/applications/networking/irc/konversation/default.nix +++ b/pkgs/applications/networking/irc/konversation/default.nix @@ -82,6 +82,6 @@ in mkDerivation rec { description = "Integrated IRC client for KDE"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ fridh ]; - homepage = https://konversation.kde.org; + homepage = "https://konversation.kde.org"; }; } diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index f78053bdc37..86f7793819b 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -80,7 +80,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ''; meta = with stdenv.lib; { - homepage = https://quassel-irc.org/; + homepage = "https://quassel-irc.org/"; description = "Qt/KDE distributed IRC client suppporting a remote daemon"; longDescription = '' Quassel IRC is a cross-platform, distributed IRC client, @@ -91,7 +91,7 @@ in (if !buildClient then stdenv.mkDerivation else mkDerivation) rec { ''; license = licenses.gpl3; maintainers = with maintainers; [ phreedom ttuegel ]; - repositories.git = https://github.com/quassel/quassel.git; + repositories.git = "https://github.com/quassel/quassel.git"; inherit (qtbase.meta) platforms; }; } diff --git a/pkgs/applications/networking/irc/qweechat/default.nix b/pkgs/applications/networking/irc/qweechat/default.nix index acf030222a1..27adb2cefc5 100644 --- a/pkgs/applications/networking/irc/qweechat/default.nix +++ b/pkgs/applications/networking/irc/qweechat/default.nix @@ -18,11 +18,11 @@ python27Packages.buildPythonApplication rec { ''; propagatedBuildInputs = with python27Packages; [ - pyside + pyside setuptools ]; meta = with stdenv.lib; { - homepage = https://github.com/weechat/qweechat; + homepage = "https://github.com/weechat/qweechat"; description = "Qt remote GUI for WeeChat"; license = licenses.gpl3; maintainers = with maintainers; [ ramkromberg ]; diff --git a/pkgs/applications/networking/irc/sic/default.nix b/pkgs/applications/networking/irc/sic/default.nix index 40914295597..69605af2f66 100644 --- a/pkgs/applications/networking/irc/sic/default.nix +++ b/pkgs/applications/networking/irc/sic/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple IRC client"; - homepage = https://tools.suckless.org/sic/; + homepage = "https://tools.suckless.org/sic/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 96d7b3faaed..4538edd2e76 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -27,12 +27,12 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "2.7.1"; + version = "2.8"; pname = "weechat"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0acz41jg7lmipni9z2agfqw4dhmx5hf6k9w4pvr4zih1fhkldva2"; + sha256 = "0xpzl7985j47rpmly4r833jxd448xpy7chqphaxmhlql2c0gc08z"; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; @@ -70,7 +70,7 @@ let ''; meta = { - homepage = http://www.weechat.org/; + homepage = "http://www.weechat.org/"; description = "A fast, light and extensible chat client"; longDescription = '' You can find more documentation as to how to customize this package diff --git a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix index 7b98630e85e..8df6c8d6124 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/wee-slack/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/wee-slack/wee-slack; + homepage = "https://github.com/wee-slack/wee-slack"; license = licenses.mit; maintainers = with maintainers; [ willibutz ]; description = '' diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix index 23a6996bcdd..883ed793ced 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-autosort/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Autosort is a weechat script to automatically or manually keep your buffers sorted"; - homepage = https://github.com/de-vri-es/weechat-autosort; + homepage = "https://github.com/de-vri-es/weechat-autosort"; license = licenses.gpl3; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix index ea5052f37a3..f1b075e6d08 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A WeeChat script in Lua that implements the matrix.org chat protocol"; - homepage = https://github.com/torhve/weechat-matrix-protocol-script; + homepage = "https://github.com/torhve/weechat-matrix-protocol-script"; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; # see https://github.com/torhve/weechat-matrix-protocol-script/blob/0052e7275ae149dc5241226391c9b1889ecc3c6b/matrix.lua#L53 platforms = 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 038611ca289..aca9a9a111d 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -22,13 +22,13 @@ let ]); in buildPythonPackage { pname = "weechat-matrix"; - version = "unstable-2020-01-21"; + version = "0.1.0"; src = fetchFromGitHub { owner = "poljar"; repo = "weechat-matrix"; - rev = "46640df3e0bfb058e97d8abe723bb88fdf4e5177"; - sha256 = "1j3l43j741csfxsp1nsc74y6wj2wm86c45iraf167g6p0sdzcq8z"; + rev = "65a5db7291439b6132e35e8cc09ed901614fabf6"; + sha256 = "0m3k5vrv5ab1aw1mjd0r8d71anwqzvncvv9v5zx9xp1i188sdm8x"; }; propagatedBuildInputs = [ @@ -53,11 +53,9 @@ in buildPythonPackage { mkdir -p $out/share $out/bin cp $src/main.py $out/share/matrix.py - cp \ - $src/contrib/matrix_upload \ - $src/contrib/matrix_decrypt \ - $src/contrib/matrix_sso_helper \ - $out/bin/ + cp $src/contrib/matrix_upload.py $out/bin/matrix_upload + cp $src/contrib/matrix_decrypt.py $out/bin/matrix_decrypt + cp $src/contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper substituteInPlace $out/bin/matrix_upload \ --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python' substituteInPlace $out/bin/matrix_sso_helper \ diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix index 996ab72d6f5..02bccb67bfe 100644 --- a/pkgs/applications/networking/irc/wraith/default.nix +++ b/pkgs/applications/networking/irc/wraith/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { The binary will not run when moved onto non-NixOS systems; use patchelf to fix its runtime dependenices. ''; - homepage = https://wraith.botpack.net/; + homepage = "https://wraith.botpack.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ elitak ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix index daddf6adf7e..f458e03913b 100644 --- a/pkgs/applications/networking/linssid/default.nix +++ b/pkgs/applications/networking/linssid/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical wireless scanning for Linux"; - homepage = https://sourceforge.net/projects/linssid/; + homepage = "https://sourceforge.net/projects/linssid/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index e0f98208e7a..f53f2244e9f 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoModule, fetchurl , go, ncurses, notmuch, scdoc -, python3, perl, w3m, dante, Security +, python3, perl, w3m, dante }: let @@ -29,8 +29,7 @@ in buildGoModule rec { python3.pkgs.colorama ]; - buildInputs = [ python3 notmuch ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ python3 notmuch ]; GOFLAGS="-tags=notmuch"; @@ -56,7 +55,7 @@ in buildGoModule rec { meta = with stdenv.lib; { description = "aerc is an email client for your terminal"; - homepage = https://aerc-mail.org/; + homepage = "https://aerc-mail.org/"; maintainers = with maintainers; [ tadeokondrak ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 54b3e10b5e2..7d7f660df7c 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { - homepage = https://github.com/afewmail/afew; + homepage = "https://github.com/afewmail/afew"; description = "An initial tagging script for notmuch mail"; license = licenses.isc; maintainers = with maintainers; [ andir flokli ]; diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 7d62aa43888..171136ce22c 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://astroidmail.github.io/; + homepage = "https://astroidmail.github.io/"; description = "GTK frontend to the notmuch mail system"; maintainers = with maintainers; [ bdimcheff SuprDewd ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/networking/mailreaders/balsa/default.nix b/pkgs/applications/networking/mailreaders/balsa/default.nix index e7c9d50cb9b..04d00a166aa 100644 --- a/pkgs/applications/networking/mailreaders/balsa/default.nix +++ b/pkgs/applications/networking/mailreaders/balsa/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://pawsa.fedorapeople.org/balsa/; + homepage = "http://pawsa.fedorapeople.org/balsa/"; description = "An e-mail client for GNOME"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 38e4bf5d710..fad018011ba 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ openssl pcre lua ]; meta = { - homepage = https://github.com/lefcha/imapfilter; + homepage = "https://github.com/lefcha/imapfilter"; description = "Mail filtering utility"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/lumail/default.nix b/pkgs/applications/networking/mailreaders/lumail/default.nix index 44b97fb3793..3dd03c97120 100644 --- a/pkgs/applications/networking/mailreaders/lumail/default.nix +++ b/pkgs/applications/networking/mailreaders/lumail/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Console-based email client"; - homepage = https://lumail.org/; + homepage = "https://lumail.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [orivej]; diff --git a/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/pkgs/applications/networking/mailreaders/mailcheck/default.nix index ffa3e92d390..96ce99580fc 100644 --- a/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple command line tool to check for new messages"; - homepage = http://mailcheck.sourceforge.net/; + homepage = "http://mailcheck.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix index 4cbaee4488b..8341cc63092 100644 --- a/pkgs/applications/networking/mailreaders/mailnag/default.nix +++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix @@ -41,7 +41,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "An extensible mail notification daemon"; - homepage = https://github.com/pulb/mailnag; + homepage = "https://github.com/pulb/mailnag"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix index 89231939bfb..6bd0995623d 100644 --- a/pkgs/applications/networking/mailreaders/mailpile/default.nix +++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix @@ -41,7 +41,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A modern, fast web-mail client with user-friendly encryption and privacy features"; - homepage = https://www.mailpile.is/; + homepage = "https://www.mailpile.is/"; license = [ licenses.asl20 licenses.agpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index ba8f272203b..82550cf43cc 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/chneukirchen/mblaze; + homepage = "https://github.com/chneukirchen/mblaze"; description = "Unix utilities to deal with Maildir"; license = licenses.cc0; platforms = platforms.all; diff --git a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix index 2fb30e5ae6a..c7554fc84b0 100644 --- a/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix +++ b/pkgs/applications/networking/mailreaders/mlarchive2maildir/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/flokli/mlarchive2maildir; + homepage = "https://github.com/flokli/mlarchive2maildir"; description = "Imports mail from (pipermail) archives into a maildir"; license = licenses.mit; maintainers = with maintainers; [ andir flokli ]; diff --git a/pkgs/applications/networking/mailreaders/msgviewer/default.nix b/pkgs/applications/networking/mailreaders/msgviewer/default.nix index fc8c167e984..3461b3b560f 100644 --- a/pkgs/applications/networking/mailreaders/msgviewer/default.nix +++ b/pkgs/applications/networking/mailreaders/msgviewer/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Viewer for .msg files (MS Outlook)"; - homepage = https://www.washington.edu/alpine/; + homepage = "https://www.washington.edu/alpine/"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 143153d4d9f..81b2fcf62bc 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.13.4"; + version = "1.13.5"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "016dzx2c0kr9xgnw4nfzpkn4nvpk56rdlcqhrwa820fq8083yzdm"; + sha256 = "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc"; }; patches = optional smimeSupport (fetchpatch { @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = { description = "A small but very powerful text-based mail client"; - homepage = http://www.mutt.org; + homepage = "http://www.mutt.org"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ the-kenny rnhmjoj ]; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index bcd35510dce..e554e91a39b 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; - homepage = http://www.neomutt.org; + homepage = "http://www.neomutt.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ cstrahan erikryb jfrankenau vrthra ma27 ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/notbit/default.nix b/pkgs/applications/networking/mailreaders/notbit/default.nix index 370c4f83887..868037c33c1 100644 --- a/pkgs/applications/networking/mailreaders/notbit/default.nix +++ b/pkgs/applications/networking/mailreaders/notbit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A minimal Bitmessage client"; - homepage = https://github.com/bpeel/notbit; + homepage = "https://github.com/bpeel/notbit"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix index 86aef501134..19b90b534ef 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-addrlookup/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Address lookup tool for Notmuch in C"; - homepage = https://github.com/aperezdc/notmuch-addrlookup-c; + homepage = "https://github.com/aperezdc/notmuch-addrlookup-c"; maintainers = with maintainers; [ mog ]; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index d9eae3c9c50..0b2a76cc00f 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/wangp/bower; + homepage = "https://github.com/wangp/bower"; description = "A curses terminal client for the Notmuch email system"; maintainers = with maintainers; [ erictapen ]; license = licenses.gpl3; diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index ac59dc91646..d9ed62bb94d 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv , pkgconfig, gnupg , xapian, gmime, talloc, zlib -, doxygen, perl +, doxygen, perl, texinfo , pythonPackages -, bash-completion , emacs , ruby , which, dtach, openssl, bash, gdb, man +, withEmacs ? true }: with stdenv.lib; @@ -25,15 +25,19 @@ stdenv.mkDerivation rec { sha256 = "0dfwa38vgnxk9cvvpza66szjgp8lir6iz6yy0cry9593lywh9xym"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkgconfig + doxygen # (optional) api docs + pythonPackages.sphinx # (optional) documentation -> doc/INSTALL + texinfo # (optional) documentation -> doc/INSTALL + ] ++ optional withEmacs [ emacs ]; + buildInputs = [ - gnupg # undefined dependencies + gnupg # undefined dependencies xapian gmime talloc zlib # dependencies described in INSTALL - doxygen perl # (optional) api docs - pythonPackages.sphinx pythonPackages.python # (optional) documentation -> doc/INSTALL - bash-completion # (optional) dependency to install bash completion - emacs # (optional) to byte compile emacs code, also needed for tests - ruby # (optional) ruby bindings + perl + pythonPackages.python + ruby ]; postPatch = '' @@ -42,13 +46,19 @@ stdenv.mkDerivation rec { substituteInPlace lib/Makefile.local \ --replace '-install_name $(libdir)' "-install_name $out/lib" - + '' + optionalString withEmacs '' substituteInPlace emacs/notmuch-emacs-mua \ --replace 'EMACS:-emacs' 'EMACS:-${emacs}/bin/emacs' \ --replace 'EMACSCLIENT:-emacsclient' 'EMACSCLIENT:-${emacs}/bin/emacsclient' ''; - configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" ]; + configureFlags = [ + "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" + "--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions" + "--infodir=${placeholder "info"}" + ] ++ optional (!withEmacs) "--without-emacs" + ++ optional (withEmacs) "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp" + ++ optional (isNull ruby) "--without-ruby"; # Notmuch doesn't use autoconf and consequently doesn't tag --bindir and # friends @@ -56,6 +66,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ "V=1" ]; + + outputs = [ "out" "man" "info" ] ++ stdenv.lib.optional withEmacs "emacs"; + preCheck = let test-database = fetchurl { url = "https://notmuchmail.org/releases/test-databases/database-v1.tar.xz"; @@ -68,16 +81,20 @@ stdenv.mkDerivation rec { checkTarget = "test"; checkInputs = [ which dtach openssl bash - gdb man + gdb man emacs ]; - installTargets = [ "install" "install-man" ]; + installTargets = [ "install" "install-man" "install-info" ]; + + postInstall = stdenv.lib.optionalString withEmacs '' + moveToOutput bin/notmuch-emacs-mua $emacs + ''; dontGzipMan = true; # already compressed meta = { description = "Mail indexer"; - homepage = https://notmuchmail.org/; + homepage = "https://notmuchmail.org/"; license = licenses.gpl3; maintainers = with maintainers; [ flokli puckipedia the-kenny ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix index 7382b97ba81..18264c5c6af 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/mutt.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/mutt.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Mutt support for notmuch"; - homepage = https://notmuchmail.org/; + homepage = "https://notmuchmail.org/"; license = with licenses; gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 8e1f6720120..8f268e67c30 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ optional sslSupport "--enable-ssl"; meta = { - homepage = http://sylpheed.sraoss.jp/en/; + homepage = "http://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/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f46e355cd57..e9217c84fc6 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -180,10 +180,10 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { description = "Mozilla Thunderbird, a full-featured email client (binary package)"; - homepage = http://www.mozilla.org/thunderbird/; + homepage = "http://www.mozilla.org/thunderbird/"; license = { free = false; - url = http://www.mozilla.org/en-US/foundation/trademarks/policy/; + url = "http://www.mozilla.org/en-US/foundation/trademarks/policy/"; }; maintainers = with stdenv.lib.maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index e5ef5567800..39950bd58c5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.6.0"; + version = "68.7.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ar/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ar/thunderbird-68.7.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "af46815cdcaa2f9d7819f9d38d9d924813e28784a94829717301fc603175a7e0c6d20b698f76125bc7a31be83753df65e155c36643c77e18eb48ac57257a4969"; + sha512 = "549c2fde5a7da05f1d0da28e6e203fffef5cc7d39073baef204da5ce221fdb12da53da64b29dc84cf4518eaee7394db71cee6e22611d5d86938df1b9b3bf8e0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ast/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ast/thunderbird-68.7.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "484b7abf08bbbb5a6302d35f4d6f5b40ecbba900b40b11d1e40f46e613af4c51a17413844bc8d5792b55bc11f5585d1ec8956cef99c7c1c6b6255389a34e7256"; + sha512 = "92fa156e6dd72d9c0a6b0b6889e7486d97922cad3d8c8a4e572b048ff5694cd4fcd7f7f91eff718417760b72a50d045e5508befb8404f9343ec73633c8c43040"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/be/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/be/thunderbird-68.7.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "32e26ea9effd43c50ca27c59e9e65dc2beb882fbb0df2d7ae7eca41fd736b740872c756a3722df69095bc6015657ffa314bf03d0ca6f8119ca861ac7835e8dde"; + sha512 = "1ddce136d33b7eb6065cc1fa02f3e167b76a546308a19edf51f1102e569b259cb2bbd98d720050d48669ae04610cde6c09400ae6a9f467d611f3a5d332dcf203"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/bg/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/bg/thunderbird-68.7.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "cc19721c742e339e1c988759dc3cc6055e9c43b590075994774985158e366347a3bada182224a613e8f181491bcbee6a05712a63e0ee1d02de11e61442faea37"; + sha512 = "31aeab60348dcb199e3fee7c167eccb8e02e98a62c0a30ad48d2963fda56a1cf25ff71eb9f16bc186db481fa90d795191c6aa29eef33742adab6e2df0c2e5282"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/br/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/br/thunderbird-68.7.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "590cffad2e7027a5b833462d752c3b4507c9ebc04af621013a745534091255ca1cfe6863d191200015057e6d1fe289691229c4e6242e8aa9047ca09b15d68ce4"; + sha512 = "f1555dbb5e30ad7d9d7468473f042424e9abd159a85325af55fdda74963c54e780f76093d15a2fc23a555b22896c6a76ad4c449846611222b63d13745cb577b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ca/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ca/thunderbird-68.7.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "56f6a25c737d18da4662410710306d93290f9db851cf338d564d9088004f6169390797fde3afd720b376d642394ba4052bddbb5aeff100d6b9e97ef7d2a1ea19"; + sha512 = "44e0a8cb1feda921b6a3afb6ef0f72d2ad3aaf681f908673c015ef43a660914df5a8b61a6d987c3ddb0b6abc6cd778e0ddb07c56c737a74848942e26d4ee45a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/cak/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cak/thunderbird-68.7.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "45057e2f2b4cbcca5349f25c2396311ee8d5ed13fb329d471907dde9fad89810eeb72a5eac1adddcb86527c7a9bfc8dd190987d579f28ad5f6e1a9b2e0792ce8"; + sha512 = "e907643f6c7065117fd131d24b452734c229fad3bace6d445de15757ffbed875fdc69dcfc535cbe7b00b38df30c0b69b378b50560382e57fabff166c71d7ea33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/cs/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cs/thunderbird-68.7.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "9c7452d7ff20c1c15f1f12cb06493ab65549aa934b86aa37ebd0be95e55f4156f155f5d3e7bbdaae79d02514292458ae7de14852072067f52715b0ba45ae99f6"; + sha512 = "1b65fe735bb61d2dbcd2d23ede39e7770a66feb6f898ec31cb7c198fdf95796d4f42876730fdb993767026c4c315a9be9cb53229cc21a5328ff443bc463ca4c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/cy/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cy/thunderbird-68.7.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "6498688d0f18c1a307c19d3d738611993c35e56e67fae024d0676ec49dba6a752b883b539e2a83085c06f6065772ce393f4d0f9e0a898bf02a141e36ebbf523c"; + sha512 = "77a3beb1ce6e78fb1d5138a7f0021462efb96e7f1d13cae2213670016a4a89dbd4a46bbe0e588ad15957ec71d053643cbd01033d9cdcc4e91b9e0303726abc27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/da/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/da/thunderbird-68.7.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "ad306983ae608ce8fa6a706a6459d8047e00f156870e8dc2e6b0c6c07661d6a836e8599a590b2f166b819a8d5b0e75106be7e4db0e7746566cac9397b9c29f7f"; + sha512 = "b9d12257b5b4fae31cb70edf36ff02d48dc56481b37fa3f3a65bacadc38d772e407d7c1382899179299c23d70e55652c1d05f8ada855621a9db5f300b9c983a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/de/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/de/thunderbird-68.7.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "0449a38f90aff5e05a0b5382d108999c59049b8974592c3310fe2efaa8d0928e056fb3d81ad096975d6f9307adb79f9285853ef8339d3de88326b9d64bab086e"; + sha512 = "c84cd6e76e18207ed02209bb333e922e3dc928c0f0ecd0243f4f8024d49c3ad1f4c3268dde921ced90a77cacffcd41eac82beab65d226dedcd07fd7a2f821a00"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/dsb/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/dsb/thunderbird-68.7.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "ea99eb1eab6e06da1bc62dfa8b1c203eb5b8d61027ae35f29cb38ec1c2753ae4d2d96ce93b39eba665c3a5c247dc4adf0654154bb19d5ecfcb0631dab9a38085"; + sha512 = "e29bd848258aa5b04eb60391183bead511ad8bdee038994a84982d068312c97b2e490cb5abe3821825101ed313c503c5c679e42d79011aab89bd116af7807276"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/el/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/el/thunderbird-68.7.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "25241521666f05d2206188b8a7078d8db4585818511453f5359e19683305b5970d47636b37e4287d170c3a3d222dc8f3f6c81558e05be63679cce298f5321e17"; + sha512 = "b203b8cb46f51f5dd176aabfc720eadc41ed081094c8feed87658885025ba4aef422ac19f4b4773976c42c4f8ce38aa80b39bc75f56c42ec59f5313ce4b98111"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/en-GB/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-GB/thunderbird-68.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "f247725c614dca6e6ede4622802a8ad3c342046eab0b4fe57dda6a1ba8be601adea20b9906e2a8d99c243712a0e067a2821c1e1b3a7ad57efd1766a60354840b"; + sha512 = "998aaa3ea0dcc387568802f367ea1637806a1dc19929ac8875ab4823c691c84004f62c6450b3c4439b88e017774ecbd4abfa38f72661fd9ce97208fe920060e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/en-US/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-US/thunderbird-68.7.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "0db0b36b095355d080d985df6547264a3df136d11ce828872dcc3b19c24a3156f521e1657c68059ba31de806f18a3d285275eaeecdb076344996bf8f6731bae6"; + sha512 = "583e9a08aff1d3e4be47e5a9f31b7595109e25a4062a36e8640468a354e29a47f389062db5fa134af6c231af5fb1caaa31368584fa662105100419a64134f0ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/es-AR/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-AR/thunderbird-68.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "5efa24ab3951d53828eb8a04bd34029428fb832f19284111192993fb66e2b7ca1d91e400180f1b989562f391281ff9a1c05c927a8ffc599b993c7192197b334e"; + sha512 = "d976f3b916430388af3a50f58253cd4ddcaa5adef935b3965c71f38e938a8e3ad28f7ea8d83d4a9e0d0c85d29a1613547a95d4c9c4917159dce06d700e3f8122"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/es-ES/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-ES/thunderbird-68.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "4d54f696793ca1264e7523ab7a3b64c64e57a8bf287257c21b5d06ea1eb51703cac251a2b9da7011942956bf110d1f09e661d28f5b7b861367d17cb299a740a2"; + sha512 = "e51afeb81b39f6f3e7c501a0d5ca839d87794ed3a7f04ce552175a7f1227fee9667dec917a0c13d509687e31d6d87516bd5580dfe0158a964b13e4c26c82fb52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/et/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/et/thunderbird-68.7.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "e6bd840cfa218b32b27315ee5c406db626a54597e6944426733e386a90b61cb0ad62c2b71f9d9bcaa8aa287e0778c3f89e3cb2ac589dc662da984d2b85748216"; + sha512 = "60872a5306f154af3e2b9e58dfecf6135927464c92a3a6cac7c44fb934cc074eefeef6bbb6242e7403aaad3e1fb850d475efb07aaa80a07043f213960b92bd3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/eu/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/eu/thunderbird-68.7.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "c39144c970c5f95d25e0a3a8065dd97fad9171159564a12fbc1596132aa8522191cf0db67e83a19f49e60e5df4251c00f7a8b779dbaa576ba48c93f5f7db199a"; + sha512 = "5f774a38904b5881d0a5bdf0ddad71fa7f85db82daf7879de54d337e8dae17021267b1a289676a11daf1e96572f2734f74a29327f23636e8b38aed084b874bd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/fi/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fi/thunderbird-68.7.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "038f4a2893f42db613135a9702430c312d9ffe42e17ca46512ce4a1cefff29f60727b615a1893d40e7169708627b4ecb4000eb05e146a0af48c8564e1c4fbedc"; + sha512 = "0d977cbd85d7f1360e985844cc8ee433414abc3d10b8a33b2fbb9a03fdddcf3a91018edc12a12d96cc680d2c119e0c020549bd40cc10db9eba4188805e40dea8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/fr/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fr/thunderbird-68.7.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "79e3a612752694162d11ddf3a4c4514341d56d1efe9bfcf997914b9084b3944a87a0276ec6d97ce2145150a3aea61526dc4e252f79a0832d37d144286b36f933"; + sha512 = "dc6d20875579d8e788a236885859faee3ca61d83aa051a48bfe18c484afec986353c1493e7e68181a83fea7a42ee62c29d3f71cc053873743959513dddf6e8ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/fy-NL/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fy-NL/thunderbird-68.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "f54b56da0958198525c61d4c3b4b7f007cd28a3d621fa7a1fc2a85f020c5bf8e6fd66e4be9931543d19fd6b3d9cb0d69b36609c8dec71e0936d05cbbe91ae729"; + sha512 = "add2c509cb15cebc5dc77957c44e26a80ee52eda82f395308303216ebf14d13c09338f7bee14bad46ad0ffa8187008e7f4cc101c712029ff15b3ce14904c0a69"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ga-IE/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ga-IE/thunderbird-68.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "4e3c594578f7667e6f9ba8928a224e180830a9853b89ec60508554d11c9b7e2ca06fa7a9504fcfb3b0b8257bddd136ed8a15632beb7760a5d1ab5c43e30d565b"; + sha512 = "d1771c8282253a80ed62dca8f49797796f202da66e2a607d27dee89a1a8fe556dda440bc03d441b8b63bf732cd9c0960ebf9b9cc047de9c07e901a1051dfc94b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/gd/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gd/thunderbird-68.7.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "98c466383f136f8c104475a8a1d8098f8f0a047b358ecbc93fe4ad6c1e96bffc3de81c61a9026ad8dbfa8e95130b4bf8c82d5d08875dc4c012357291d483ab87"; + sha512 = "ea0f6d6287ef4e771c49b4891a4d9dff8b9766e444087456448e9ebe32c17e41d5cd9c9a17747250c393e389720a6ecb3bc6df98dc5c81f26504fc9cd6ea3e03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/gl/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gl/thunderbird-68.7.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "649f1df44ab7289abc6038deb59fe38258fb31f8d20aa44fee6630d469560dbf212973fb9fd437fcef7456554223f7971a39a00de57b543e7e71d6f857ca0d34"; + sha512 = "487af69af4e9844a97d72e14a9de8f8aaf8f45efee6f72ad0d5b310019d6fe73c74288b3e4c7d2a83f6e30cb5b3fbeab2d2200d406814e6e25936ccefdbb5f14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/he/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/he/thunderbird-68.7.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "70e97215a9b91ddb832f85194e3c8c385a7fbda9edd31d2273f472f6bf7ab12d8055e9bd535aeea5fc822588aa0efa2dbe4e66425a8eed16f2c8e321da9e6223"; + sha512 = "13f43a849b765ed9743947c9e03fe9cb7bffcf120446ec80e8622ae1ecc7994497617464e7597a1e883520598f5de2404e2901b8d30cc91fad78dfe58763da20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hr/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hr/thunderbird-68.7.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "e44d1ea44dbcde82ac630bf6a34802adde9d4948f7036275a9ea424b70de44a2198d016db6d2ab860fa0bc6f74262db7b57d53cabb4ca03c6237fdd5cbfd584e"; + sha512 = "bbcb86e67a1975920a3e0fd4298b817103fbf88eea05e822eeb89f60f4690164c90940e32082cbcc19fb9222f53c30b32c39eb041a768b1f8cdf61ae866abd13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hsb/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hsb/thunderbird-68.7.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "326f0a15c4ef03243c89cffe8cf5092fe0f1714f43afb835bc0b9b9711fb597effcc488eca3eacbd2f3777c6f355469a2164a6bc0c850984d554949002484026"; + sha512 = "23c9d885024b178a37de1f968def6e338fb1e44d2414f01d6b8757e3be082ab4b5950ca6bfb0cfb93093ebcf57d061cfeb2c7c8c46ac56274ff495b83a7754e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hu/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hu/thunderbird-68.7.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "af5dc78b7e413c94aa3ef2a7e9a036d984c0519e762449178b3e404803ea375f0a1e92f0a24087d21cf2806d73100b5b161b67f587045e5f829f397d97143d14"; + sha512 = "8076d47c0b15fb565ecda807c789d5eba41b1209df356fe2184d4550a115b7ea986bb51fb6e9e8a4a279ed6025b7acb8f5c7ca88e5ccd72e4556fdaaf95619fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/hy-AM/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hy-AM/thunderbird-68.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "ab274b064c3fdf65f96f65ae0f582013603093be63ea38ebdd85b325f7be0e517301e22e954968dac83e8460a8f348e3b9ac4165cebf8ef540b4ba4095b23707"; + sha512 = "825f0066a329fc3e35c6a2c9038a28c1e673b93767a020a6f4297dff5b769882d6550eb2cd293b232123223fbbb0f0e0d54893c98ae9f2e35072071a26171967"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/id/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/id/thunderbird-68.7.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "1de1c0eeacb51814ca5de25b1b088072cb4c703068aef160534b339dcc0fa3a541400bc8a7c374595cd67c53708eefe2a264b3e8178a4ecca77b7da10b44524b"; + sha512 = "253cc87eee92b10d9b74e7885e43d5d9b146694bed63ebbb1b5e63730b18feeef53de4581ae824ded77a5770c45fce8b46d90621212d4b0e1ab32ba5fc7df1b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/is/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/is/thunderbird-68.7.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "ac72b529293288e938d5a0b0a594c9fd47b0ed5a3173299b22afe7d11c34c347adf9e5b715ea3654561f4fc13ee0f81b8ba1b9504c96be71bd04b9c7d1eb719d"; + sha512 = "0e0784865fa1f0b57f5287674c94993263a03b8876fa6a053cb9bd52cef89a93a07dace1d2425ad669656ebc86a083e37faa456ee52481844e8e8e7fe87f3c85"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/it/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/it/thunderbird-68.7.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "734c29ba833f05711bab8ae3548ce33a4633b48dedfddcc84ef6dbe4fd208eb6736f6f62f2ff74a8cb4864ceae1abde570b56669d199ae8162de5f02b79c44a6"; + sha512 = "0eca59d5adf138f2be6b9c2cd11e51252e550b711f3f6584e6971ec3564630eebb7f1774dfed4f79c6b38f3218420825300bb447b0bddd0e16379aa787edd0f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ja/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ja/thunderbird-68.7.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "922026013615642cb55a4bebe647b99d84386a04ae2c6b3f5996a060ed62ceb921818439cafedbbf25486181cc4e2fb57058a0ac5d276a7960c70f6214ca81b0"; + sha512 = "6a112e7ae24616115f6b5dadc72bd30d8dd046b8df16ebae1d609199d9467259f83b354659a1358d70d2e1ad8c52e71db9991f95aff6f2864649d539b9f0f139"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ka/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ka/thunderbird-68.7.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "4804caeacf6aa2dbf14c88ae36f670ef06382ee98c71be6e341a620c8230222c413784b0b640dabf01266271debfb1eb59d4c2b80e596b092995d2327eec839d"; + sha512 = "e2c71035f910648cc83d92af69bd96f3a7668be2ac4ddfcd40c97762a1fa4e94c7d67b9ff588b27783ff943330ee07940fe0f8bf1671dfd87dd34a23b78b55cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/kab/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kab/thunderbird-68.7.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f5cdfa7596ebd37cd0b4e7a31b5b2ad1d4e336c52681560a2183a3aae7dfd8be01312b5b342f1f0c1962cbfa13c8c2da188642dd16efcca30944bf30f71b7017"; + sha512 = "4e1a72147657fc0706f3cd4c4511fc22949fdb5e90e5d17a080b5c814240451d030ccb4c287ec6901d1dfd8a7ebfd74d59e617ca73530fd20c0b4fad539f9154"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/kk/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kk/thunderbird-68.7.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "ca87066bb2f8e945299c984189a5e01a620d3ca04b1f96a85fe99fb629c7a9721b289f702299aecfa5a67515d3f45827f8930ead8fa4a9187e0610a55d64e790"; + sha512 = "61cbaa5aa674a4b6a34869f271d93234d874fdf49231b0ebf3c882863b294a0e2e0447bc81c8980c7f27c5dda4e8c29ace091c7097870d4109aa1f4718379099"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ko/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ko/thunderbird-68.7.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "89869ca565d972065b8e87d6d8febfcdfd7269b158f7afcd5747933759c6345deb979235139aa86cecb021c2abad30b5683b76de9c606a1dcbfc7dbccede98c5"; + sha512 = "b2d3be58c8af63b3a94888e8365cd7253858733686ee30776c61ccbb8e05db57882158ad3a9aa5af6e319c875e870bb52dae9dd8c834ea5643e811dd948b6fd2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/lt/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/lt/thunderbird-68.7.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "93a417401249b24d25000c05970cec3c1a5f6f292a944ab2cc306fa076052228c354d746d180ee7c4fc75baf70b241cc743ad7e3a2ad31ceccc44bdb1485bd26"; + sha512 = "e878eefffd3ada9d49c3a692fe1a968159d8fd23ec8660cb71ce8019034e10c905f1acb79c6122384c7b18f3da3d1e6b91e31807c9d88ae799175fae2ef18005"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ms/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ms/thunderbird-68.7.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "f0c8dcb9431889bafeab7964a48e377a00e04acff18cfb2955b41845c765ffd1d9ab77b6d4ae8a87dc0a7b7f2dffe3c5502fb4b6fda5ca042aeac1e445ba85bb"; + sha512 = "1d6094b7ea3fbdd40d278a60684b2e2357c1608e3403037a761038460dd1c89149f3f010a9f93d795f3f408acb81c3b6fa2b5ce206f5550352db6391895fb0f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/nb-NO/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nb-NO/thunderbird-68.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e3638c127d26636cfedd5c7024b58c04140b00da59c67afc3d93cdd7c359467b32113259af6fdedebb9d13d46005f50306a774731d90e65238f018fdf90adaa2"; + sha512 = "0deb1e4fb220c9b17bd68ddec7bf4569ee8425528a6586f5cdadd17f7c1948f933070700d36d7c6cc9442c172d6bb302d2681716abac131c9777d8b57d4f0a4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/nl/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nl/thunderbird-68.7.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "0289e32a70c952288248f3b3c5bddf7fbd77927d944f5b1b08c8e0268d20aac4bcfa21e246fc04ec10f47134b4f40498c0bde6af419145822165898d5f972119"; + sha512 = "24c5100339da2ea1df96d515c1529f02b0132385e141520d7a2c94d194ca71a634310eb26f3a88ea0cd6a8ad0a56f33ce5055bce19c68e3465037afe33a85550"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/nn-NO/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nn-NO/thunderbird-68.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ce1c64501cf2f3b599a7e0614d6845cdd3d3d37e876926ff0b5280c829f18b2746f0b4c43a46f1f0308d39f3a9fceda29a47374aa343ff4569d6af01c508ba08"; + sha512 = "525675451d274d17d3b5dbd1d3b75d3475b3c29f32b5d0813c71d5cff6c8002f35038ee7801c245d0b2cefa596ba4288c4287a6fed66905b6497591cca96be61"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/pl/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pl/thunderbird-68.7.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "86cddfefab791d313f271f91f209be19f3475a7e92801da6163078b62531da345156a048ca6036f3b32a663de06cd3eb719fc9c07b19effe104d86b010ea7180"; + sha512 = "3ef251ebd90637c11cb64f00f429611a2621fc5841e91fa51d7a3ba97d1244ddcf383c8b0011abb009935a59bab58a3bba52e3c4db05483b28c400dbd500ba42"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/pt-BR/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-BR/thunderbird-68.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "613d75a4fb7affb990550d6a9a61af145a7bfa9dfe2b5385d6be06762a0624d78a3ef1ee7940d0d4b76fe9e5b728f55dd9b804d136ee3d16f71415d1597a733d"; + sha512 = "fe80b879e307d6ca192bae16e13df892bc837e0e216562c4a4ddf7ae3c526e2967cdf8f8291e53a450f70759025303b2195f7e2acf683cca9d8620a00d8ed69f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/pt-PT/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-PT/thunderbird-68.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "1d2c2582ee452557ebd600fa61bd89c6162d78ccaf4884567557ac4efae43c604288ac401fdd0ef1c9aafc32c913593fd6d69795e215b762556478245150ecb1"; + sha512 = "437e5390889424f126a1a229bf8c66881ac4a98d300f6308e242c5f2386d443c1977c52f78fe9e2b620952d181c14c35692718ff447d267c000e1ccc8cdafd5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/rm/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/rm/thunderbird-68.7.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "c2c25f143b1421dd44180b55fe4263bc250c4f52b4748c133a38a9b7ecc7f491e492f2dd8e02ce7ff1a6cf61300eec939c0156740a2cb0ed2d37cca3a3570561"; + sha512 = "d76f9f0e992da2e28e69b20a1ae532c8e98415825d41ee5716c34639abd1a3bb456d8645a108d17423bfac848f8e8a340358ccfc2635794cc703764d6f8de0a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ro/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ro/thunderbird-68.7.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "ef52beef9fa5de764fbc40c746fb6d95e5726174237432a5fe690d67c9e56a0138f6ed3fd0531a27fecc14c79e7d42ce84837e9cfd0df3db2a0134acb7460132"; + sha512 = "0485cdcdf247ed4bd67420fe7919f7f9d845e3c369c80960d92e448c48e3ce7e55c03ddbce16aed6de84da70a5e7610d8be5f55c5f53dc4568ac712b92a7153c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/ru/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ru/thunderbird-68.7.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "7fece3278eea40b2f4dc9a369cbed40ea04c9d499a1a5c23ec38e57a452c9b4b81e2e18b369cee8abbe15832d9ee87346821164e1556e8b812f30475f90cc980"; + sha512 = "96b28866dd1e4b68846cd88adee09e4edb60af8d506f42838f3f5f1dadd59ef5339e8c331b2a8b6ed0d1ff482ed48d83861b9db174b28dce5ce90b619b3a237d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/si/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/si/thunderbird-68.7.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "564350c67c0b826a0e77c972774fb509b7a162d65cbe93873c1f0b62eb1a2c314ac09f3f9edc816ceb6b56d74fbaeaa576972ab7fb35f4dc5c9808a001b916f5"; + sha512 = "0ea525527ab09277fce4202f488778d838090d2d59fcb2f049b1869ff0a6d50f54eb22449dbd1063aa6b15d5e559dc119e36dbf97d8a7bbf22e9ac4971393a1e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sk/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sk/thunderbird-68.7.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "a013c634324efc8f2dc2e3ac4c4df222d7bc37e99820fa87a89d66a1099208623550a54a8660ccb9161f6cee7d2a2f1e96bda5299c57aa6c31e0c9830ba40029"; + sha512 = "26280b266d2a7956321854ec57737d8cd4ff6ecc938ca07304431e6f351f73ea43e2213e28797d0bc994e0174da41108421a957054a00adca97cc630c107e4b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sl/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sl/thunderbird-68.7.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "855fca581e4b2caa41bd52c0f3a991e54ff8f038d0c757c0b3012c1c0cba0fe7b224b99a7ec9dc632a5e9d6c946cd2ebe871040129cbeb19ba260d47d3629935"; + sha512 = "3cf380bb8bab8917e3643eaa337e8382e73802d725ca6134e73fc9d991d9e137b6681fb2aaa86aa83cf6766c3f536406298a4962b97175cf63bbf81142b75618"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sq/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sq/thunderbird-68.7.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "96076bfe74dcf439c39445d22196e0b1a09bcf3a844db8c6054bf709f861b4f1f8365bf3c7bdc4f23fa94861590819041d5dbd9bd04f1c828715ffeac108d8d3"; + sha512 = "daeeb1a66f65e2da8ef2a6e3c59eb07bc341bebd19a79cce606d787d16f674e2d52decb17ae12125a7df78ecdb7c7a693644b17aa726ce1fd424fd30bb05ae43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sr/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sr/thunderbird-68.7.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "b88a2b84cb2d4d5e9a6682dbb9873b94b24dd89cb26480544d1982a5f3090d9d02345bf3b6ddbae7c5f41f32f81f0c40d32e496e03baec13efa661d258a55035"; + sha512 = "01a71c036d95587adb010cdd0f0641c4559af557c3596b16e43d11accddf64290d06ed5b35ab8d0b640b9242157b04a899ded266a47ad7bf2a07e3b923bc6fb7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/sv-SE/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sv-SE/thunderbird-68.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "f5ac338a7a44492ce470c767df410a0f5c0cd80a20015cdf86fcf3c0da3ef3c88885cba7263e73bcd16bc989fc6ac99b8593b634c38743ad5748ff24afe1a16c"; + sha512 = "28abf6b95fc03abd0f8d5008a1a3ba5b46138a616750b20e8f7be08fc2307cc75ef0e1ac3b8e29e37542553de502d07c092a771cc94c9b794da6a5bd268e3c6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/tr/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/tr/thunderbird-68.7.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "971e7505f57604b6073f8e1bfd7aada8c4a16cd52b003719dd6b3689734205361c9e9e5ab67a7fee21b6a6dcd52ff96bb2b801730a446ffc33798639e91a4a80"; + sha512 = "a7cb235bf1db3dfc5f7bed0fb92c327fedeb2f319c602bc13727b3c452305345a053405f77895611d294578a96eb8dfe7c7e9f008c531fa2acddfc81679391b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/uk/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uk/thunderbird-68.7.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d1a7a2822a30a9542d055f530c13b172025cd50c4291bd2b70cb0da48872a1b24c684199daef47f39c669a76eea5eeaa5d975e05d5cd4b0b2783523c5417dcb7"; + sha512 = "0fd2ea32ce4ef03150db5234561546f45724e399fb12967a4ecde42149a81f4609505bd1da5cf85ae745e71768b93738c2885c4c7ace9b7b0063d6ace566bbb5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/uz/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uz/thunderbird-68.7.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "53b0c0fed9a5c5efaef627a677c4a6b832e79391e265368928e9243091319cac7c1ce6756036385f8ce2fae9f12bdf14125b75230f17ec5cf9c56edc7d5c9908"; + sha512 = "4394e70e02ef67428b74af0b1d35ea06964b71a23d5a0d73afa2e6fdbe8d23286abde651b17a48a2353a1ac762d5a8b169f8e699a79644f00340b05e204f05c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/vi/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/vi/thunderbird-68.7.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "f5bb40ecaa0ada3f48020a18f64e02aacd31c216db0c02f426a8c4dda3cb9b7740cca00c63ddb179424e37fe29badc846b4e8f2e87751f98e15430bbf8aab96a"; + sha512 = "e1eeb7b46a9ece66fc40d2d58d2781fea4cca320a97b6cfeddd02f3f6907b44539f4400390467a794cbadde50c8ffe350fb08d8012f207db60d36a61d205a368"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/zh-CN/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-CN/thunderbird-68.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "50f39f460f412412c5b97f3223f854d865fa526be05c5c5c60835ce8ac974dbfbe3b36abf5ac5f3698aed712560307e17ddf26606b09134360bde9e8c70fdeda"; + sha512 = "ab6839f46e41c14fbc588a59044496feb3e8a35aaaa1f0777212636e9b4dc5a6640b34a3f1e833239d5597f468960a947c0591373938306dd8bedd6c6e13283e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-x86_64/zh-TW/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-TW/thunderbird-68.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "eb463fe925431d9c5150eb0e3f6c6f907e96a547e02613b8a65803021761761011e3054dad8d18a93a1d0ae950846eefb9fd95c7744db86febbe60856562bed2"; + sha512 = "4923f6c790335820811bad56494d24a5899c1586ab2344b3e2fc81a91651d9de5b378ec6ac0ec68597ee83a8dc0f24ef084a41bfcd98dbde128cf4831646db70"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ar/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ar/thunderbird-68.7.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "7e5a68cd2eb58dea99cf940ba8b212b7f6fcbd66e6ecfc9b476ea0aa33566f4ccb010d2056ca84000cedbb42072ce943fc955d4fd8a1cbb0b2faf30bb45f8867"; + sha512 = "91b19e61a360062d71e090d7eb8dd78b1ff73fd3e7733573ff1ce6ef4e98c13fb297c219fda8c43c9d80299625ea8bf9566e25a5546f28d010737a399488f3fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ast/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ast/thunderbird-68.7.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "25a4fdae0021af4ce67560ef213b9dd18590d0850d0703f347b16206b4e48abd32b2f6f1bedb39812d0db04586169d095f104e82dbd4916a0f276b4f943d6fe5"; + sha512 = "2edcc3b6d7c51c79b1539fe8fa4da53003af0379727ed658ca7523d608c96c251e8be6fea004098609d5b854ebfe6cc8b81830f8e1d359386edd2593f3eff6c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/be/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/be/thunderbird-68.7.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "60ada0a93b1b9eab7e2aadb78ef8433487868f1e1f2e04a6a91996263dca0f034949858e8e0b8da1b35e0a812af689e31a6b3e2620a4177db9e19da155e43868"; + sha512 = "84a76ba8031d25f6b097f66e4b0c74359ac313f25016c3b82e547d8e973814d8398697572014590f23ea094aad7941c13cb4130b618a776f6c4973356cccb30a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/bg/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/bg/thunderbird-68.7.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "3cd159fdf5bd9d7b2ad021335b77326d234273e9f247be54d1c58b8dfc3cc2b855f1d5a31a096f8a93ec28c0255dc8b85d5c49e3b2928e170a78a68d7553a366"; + sha512 = "b489ff67e47eb1d431f5b2f59f0d6b8cfcded889e167cea3a2d602057264a402769e44191ac015e15930faacf7acd9f1fccb87abbd438e3629db7b795b8fe43d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/br/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/br/thunderbird-68.7.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "59b6cd33c5db88ed0c9ece2d88091f5769848b582200f79ef7178071afa5631781044a6a1cf30c27f3f3d81ac215c9b2095cc186766878486898935ef24b93a4"; + sha512 = "3ffa33885f86bbf13f4c2a2bb15b864aec851b5558eba88e7a64e8b8b111169bf4e163e590491702465ec8436274ee72dd140a0bda2c9ba39754145de5501388"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ca/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ca/thunderbird-68.7.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "13e30705a506d0f34b95b1c22bc7770491f265268f9cbb6d7d4d7e4dc275ed81d46efa86d44f2acc8c475ab6b53589b6c4733067221d1ec604794bade2a9864e"; + sha512 = "fad5eeda16877f0bfa5edfec10fd8fe5baf16a112aaf56c908c718159b0bb6b72ac314b93584536ca369d054059612fbf86c396d076158b6efc7a9d9cd2fff93"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/cak/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cak/thunderbird-68.7.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "6db7346815bc9fd9adb7896291015794477b05379635ee2c3b4b475b393b594c806efd309d5f46d996aa9e95b58fd13f65a70facc4d2c8ec74be8e3443507a3d"; + sha512 = "f4a0605533cfd5b0806c8412514de4478c520f52903a07c809df136b443ff0734be917444cec2d4c73301d0821d77e585c96bf314ab17deec4b4bd5036e83a97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/cs/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cs/thunderbird-68.7.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "aa407d20e7ec83e433d225dedb28d68eb8c9a1d295f2a37871048ea90930828c67674fe5059e8167fd9b0c573fc84d17fe3ce31ac7676a54b2786b38e10f58da"; + sha512 = "319f3a63a352a2f7831bb6d2d046d238db4c136cdc256934ac19fd4e8421344c98b4900c57a12f49af77d1844ffc8e8c7129c4ab9557d590affd59aaa0229ba4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/cy/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cy/thunderbird-68.7.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8e2e3136674041408daf6ec3dc194b5115aab6c254ca8da035b1f6900eb07d34ca57ab00f8776313f038a87acae3bfe454a6118f4b532e9f364ea411d685ca7e"; + sha512 = "4aa1974543b568168d06ec8c0004127cabab481fa798a67878a9bd5c1955d98d14d770383ef5e6af35dadc106fb20da46a1744a7156b3bfc582e416a32df1673"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/da/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/da/thunderbird-68.7.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "22062cc37c2563b98516b16f9adb210528ffdb8791df39170bac66351d86a3e491c54787c3c6dd866f6ce806029694e11868a3d5c3b9b9ad4faa1bb621a89a08"; + sha512 = "c587a13d45f5a5e94108252d8dc98548583ac7f27b35f3fc28100df0a15f696c04c68a4f786d7b9c3ee461db6120c14aef2b6ee14cfcabbe855f16ed00660861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/de/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/de/thunderbird-68.7.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "6228aca78b3577031aeae1f0c7ce7fe6eea41c232c46b8d6fc7ffdbbf4f0468a0e8c2ef77927bfe5c65380223d43cc67e6dcb0bcdeeb096f89794cbfee769a5b"; + sha512 = "5c425faa2c44d30b695ce6713b59e5720bbd8294aea20d1c7431f26173da0f6ca85b1cdb9f178e54ff670e109bc6c30abf21110df0c7029b5d5a01373c8b1510"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/dsb/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/dsb/thunderbird-68.7.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "43a51d0b294a53878c630de5da04f417b2d929036b8a689e93c7f72c6b738cecd4105f216d7955d2937e9a4998bf9a96ace66771c75ee46f9ac2e96fe6674fb5"; + sha512 = "6ad04e1e43d0a7e4821c584a78b476262e77aa5f6c7d170806eb02d74b0d831f53e66568917837d11c11cb5ed19b796c23ba6d496573ca1da7029fb1eedbad9f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/el/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/el/thunderbird-68.7.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "28b0aab8c2480d7deb48edd2c46468dda7489ba768a2293da43367d623464973527bf47ec6264443cf2febab667dcac39f1459117af97c3436100d8e9b3cb124"; + sha512 = "e9c7d89bbc736527ea9918151886705fec533969582ff37fe8e1acec3b6c1938fb33da4285c02ea92c2a87df1c6700c9c2223ca391ba342eb2e4e1fad8e06f8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/en-GB/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-GB/thunderbird-68.7.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "af4c726daeb0951552c55331f7c4d3aef54078b7fcfb98ab32293f39c945e58cb43ed224c5f50ab56bd804629b8db2a9719186749501d76c9f6d26aa6fe7bcf8"; + sha512 = "ead179d699feabcf14373aa4e02ec96f52e96f8a1413294f690d70608f2cf83fdfbccd1031f0430a0f3805bb230943d8aea269195d0f092334040d0c092cf9b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/en-US/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-US/thunderbird-68.7.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "2a93646dfe69131d51d600511450f3cce267f11e51bcbba8a648baf1af1ebea57d43ae63c05cb138e74fac574cd76b55e07a86b98e7cb27e26575a777ad80934"; + sha512 = "18309ddef56d0e7e50f3b5895e1c21c206b432da141c7517f9220686ada6523f7b0181e98a6722205bfe09d9023c4d2beeeb11ad60a7b6ec4242441bd60afcd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/es-AR/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-AR/thunderbird-68.7.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "1750821128688b0bfc2cf005be120740b5ffe953daaad0cb6a1fc8821347324dd90ef0541676ac9613fde8b7026a1085449e14c4bd23414153bd415f4d860460"; + sha512 = "d0a1ce2264c3663a529df667f800bb7e7ae446e09a5b0b09934e00ca18e523baca3943edf1bc2e3269a1b41399a47bd989b487e8650a0ce9a66b94b8bcb37726"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/es-ES/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-ES/thunderbird-68.7.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "ecb1ec114a5728083773ae74cbcfb2488fbe902e2862dada06b9bbec3b1f6baf9d41bf78a12ffe803471a3b8d47feb7537ab9d80cdd02e720c55da22e2147b06"; + sha512 = "5dc04a48b1997e0291265533351818b1912d73b9b002c8978f729006f7b406c03c27edf736a99d898ad9cb8328b40d732b27ca51e3f621740146b81968f87d8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/et/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/et/thunderbird-68.7.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "388b8a7249a82aa9078e9aa07dd56bf683f3f98c114c48e856f29ac5cb49f6baf6f7aaa55c1af490c8da03190cd30896fb45e24c40fce5b58d4b4babd1f547f8"; + sha512 = "8fdb9911b0da646fca7256fc0e004530339f6631fe3a91e1c0857b52d3d7f786a6fb8bf83cfea9e3c4e0faf6093d0b3afcd46a0dd1ce5c1357a40ff217393d6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/eu/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/eu/thunderbird-68.7.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "c68a5024cad0b85d73534277099e4a4dc0ced6b9ae62b3e3c1ee50634d0a495685a393fe464b670a912b075dda072718316fc0bcc6e09956b655975ced31c13c"; + sha512 = "788cee146a94621d373e8d815daef246d58b46ab1e935b01dee3955fe695af43e7a482f287d611e98a376b137b5bcd5b92baed5ab322a39ef30d8815abff6640"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/fi/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fi/thunderbird-68.7.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "d005766665f6399e0e84a79a84f5220a0a29fd176c9a90e8b087c2be2dfee88f36c7cf08ce50c79798865c6bbf4818d4628ed384c53f555466b4a900fbbd776d"; + sha512 = "b65e042905882d1c7fbc88bffb512b32fc91475b99c3b1bf6a4e10ed355f9bb3223a3c709273b0ad84c30ad3c6c405c07cb3e04eeb8a4938ec22bae3af4dfbe5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/fr/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fr/thunderbird-68.7.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "f7a46c960bd9c07b6f48ede2b1940f5177029eed8afd03e520db019013dee74b87818b92d8a106a95f5522c4f06e76ce6aed3031e0e0596c9f8e3a30d221ed94"; + sha512 = "a85af36139d6f7ab6028acaba61a8dd47c2fd6ef9114b5ae8783c78c85e16c606d72b05c15a299d1a0beb518301aeb65d3493d518b270bfb97f22c88d23bbc0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/fy-NL/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fy-NL/thunderbird-68.7.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "25c3033f4bd890a6d8bca47114cf0bacb5aaa97c882e4aac306e790879516e26761615de2b73f2bf3229dfd36e86796a3c009daebd031b588595797a33ae55ee"; + sha512 = "60cc189b7eedc72327d3fce18809403014cc6b2c4dc53617cc8cd589dade6be25ade584416f9be18830f3c7a6060fad3e19bb930a591f17fdb3437b4597f48a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ga-IE/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ga-IE/thunderbird-68.7.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "6c8847f57225df57ec874879a9e62b0d16edee49419a69412a6710cd1a094570d0090cc2ddfa6a380d7c34623d5e6a7b740937cac43e9720640bd13d41ab5b75"; + sha512 = "95b337d681a5292c0343bb545232b666268e5fbea0afd6b96122ff00e504da0a5628126a11495ba54d4e8500615d35b34de13851ad43f180bd9b5b1f584c7ec9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/gd/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gd/thunderbird-68.7.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "1f846022be0400ea2f7bb0bd2c56286021692c152565311fb9b4cf439a1b1c06656efacddfbd68ae6669f9435afc89fd4aba47cec768e0d5025b289a58bdd088"; + sha512 = "483a1bcc1a0066a962ed91c8f4c6f948623e3555d2977c593a473c5c08e12baf05fc4c043ef5db1fc839fb9f550764abe457f2d33e23ffc748ea6aa50d675101"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/gl/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gl/thunderbird-68.7.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "444ade430be00b1b60bbc937f693544402cdb626ece1a0706f274a3bc1b417a88a26eba3364c8d0faba34c6eeecdcbdf4b79225a286412425e2d4b8a183cb8b9"; + sha512 = "0a88fc59510fa06757dd1b6994be0ceb8a0ad2cd1246077838756a0d65d6c01a64f8c48fc8ac87690686bdfea8c7d0b44e5fd96feca4c3aa59d6fb43eaeed3f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/he/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/he/thunderbird-68.7.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "5432eed239fa34699504fddfb80c167bfc078d1d3e9e0aea18081d6898da3f966a475059de6aee013f312579e7c6a62a9ae388cf0b103c2fdf0f3a3f410585ac"; + sha512 = "9c2ae42cf2d43e4ae9d0dad829871b44321b2cf49cde1f17568f96c4d6a69793d78c9b7a72cb29b71c108718906ab749f006f7c727d6f3892efa3d56d0852449"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hr/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hr/thunderbird-68.7.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "7c8a9a1e92db564b3eb2ab3b782d06798eb8a2c88502dba1965e5b6a1b004df4aa0423acd3244e56a507ae4b46bcd5012616973ed2d6196439f78e87c448d04e"; + sha512 = "9e9a949fe54c23a0f73bcb05a4fe2b212c6701cbd1d68ae10dba2b62de07fcc5dad5210de0ec3c3f684f06828f8fd1c420712396e5132da6053de42f319d6454"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hsb/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hsb/thunderbird-68.7.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "d95e899f19f599270cb45a8a90cf6c616bba9af6e62a889d4cd6ffdf3019bc455c3910271f95e2b463ffb3da2bd806843a4f335951e800fab49ea764a07fec90"; + sha512 = "0d3c5ca3ce6a9becaad63b2d7bf3e1d4491cad18201e1ddb634ad80d4d9d9d26c95b02034888f24ce50c5390b1197fe3bbd69525bcffd5192d95ed35203515de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hu/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hu/thunderbird-68.7.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "b99171d4dbb965423fede825468ea740c4c86d666cb5efa457f71a79cbd226f01162b536aa53a6f19019e0ee14c9d3cb11957ca3ef453424eb3851393f1bc6e5"; + sha512 = "4519acbc2d00cb1f97d73f17b37db4625fd16f7f25e628d5309bdddee2012feb2133ce599bc69eabb22a18f015a00c8e98d6804140ea1ae41d66f59164355f32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/hy-AM/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hy-AM/thunderbird-68.7.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "78df360fc50d4e80e73fffb3a39e109ea84a629edf6c7260eb1783ace5a93a460065da1e23d6cc201e918daa813db475cd2a4a38c0d4e9cb242b78f2e5a88952"; + sha512 = "f60cca5cef19516a5c6e4b22962567c0c0d22035ee7583b0d93a4db0db7f625ed0cfaddc78f56621371d0a8b6341948cbf9171debe81c222d170af2c759eef36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/id/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/id/thunderbird-68.7.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "81a0c9ef733ceadb814e69bee0d748d211147ddcc559b5fcca200cf24d67308bf440b601d60ea99cf1a71b9cb090c489d424bfe6af545cdaf039fe6f10b1ee5f"; + sha512 = "75adaedcce7dae3998a063794552d3e5fd69e037422e44fafcc7871a05cabcb592c9ddb637c1f7b0639e03f6d0d99b262679087df2d6806fe2a202121cdb5563"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/is/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/is/thunderbird-68.7.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "d25970c2c4ffac96252e4e5d8c33608f6147254fa8c9879a0e809b940aa4a0425477ce56456191ad24fe8c0bd94e68ccabbd70982a4665f4c9f09166c06510fc"; + sha512 = "b80488a594bebecaa139a2bbac76e3daa0d3a9f3257cfdc2f6954f8cbf427c3b3ec1db3d1f55b9c5e8c37242778e53904b92adff1cb7e1907142008e69607ee8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/it/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/it/thunderbird-68.7.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "693bcd512a5ca343d389a3f3ca85c75a52df5fe101eef09ff6c68ed4a4a92c30b760969e2db54b8b87a50e9be28931dec0292dd5904e8526dc7aa8296036a03e"; + sha512 = "c8a0f75f6467f6428103c98e97afce1690a0d986ea6466dbfbaa2eba2853d8f7a1e65c568d10884d6d4412fcbab39e8743d3e3233ac16f69ab57a5f698c3ac5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ja/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ja/thunderbird-68.7.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "d20d59d7abe85dcf660c89190c9761777bfad8b7276fdeaae74ef7a5eeb68f6aea6890aae53654849618459e74c58d5e46b07888c990b2ef6578ce6a96e5cfa1"; + sha512 = "b1abc4fb9e7af1695ca2a4fe88d2198876212923ae10977b0caedffc96dadd891fe6068fd8d53c7cb7667854523197d1378791fb71c12eb817dd9b6e338eb3a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ka/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ka/thunderbird-68.7.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "29aed1a98a6a4f2c30d98bd549461d32a229cd373145bc8f33426db3e518c4857b21446cd59cb03207eb60a432a69be6b0103df4467b33f49c3cb1097d96764c"; + sha512 = "11e56137a0e5f9f6cc4b24e02861e6ee4c451280076e9efc46e1f28066862b3bd494ff7388f6be736be3dcf6412c5dbd141546dd37d6351aed54790deff841f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/kab/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kab/thunderbird-68.7.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "347334edc3a87face8cc2efb2096cf8e07feacd0d7cf8b1e501778d67385730362d4718ea26d85a768988e05296eccdc4bdb08d50030128123903bed3cb1f7c9"; + sha512 = "b930bd22990497a66cc9aff96f0c9bbfae4396fd9b4397893db9c72b59b602b45f6ab7388b8899890e151bf8dd1e0b788d668cdad607f4326794825508d36ebd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/kk/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kk/thunderbird-68.7.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "b2be10cc25f6d93113463b2f8614d00b2b52e9b376f9e939825f8c2b0a4976584b11a96022538496a242cc3e3d7cbbbb832fa1c698ef91cd30e28dbeebb6b3e5"; + sha512 = "17b7ec790013cdbad015d3045ec8d4c5ee6d92b1ea9be18e2b9a5d7776f53c7b621193e7dec418f86be25e3d876e4a9cf9c8ceef0cac4051461afc1a51498353"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ko/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ko/thunderbird-68.7.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "2247b46fbcdac7067c03525374ac842a6f7699c6ba7bed4d16ae9f9e3717d5e8fd92cc9d1cc7c24dd2bd61a7f55ec68abd464fabe11e00f30778d9852c89698b"; + sha512 = "1030a289a2e0793553ec3bfa8ac1b3ff3bfac3766318f5ffd9e6eff1979481b327a90a2207a5c16ca33719675c65e20d58ea8074fbd5fe9877fd334114e9b5f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/lt/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/lt/thunderbird-68.7.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "7435ac8db0c185c492ed30cb1310e67f8c30d1b9a3593f9b7c31f524b13e22d2c2d77ba66f5be99321f28c90fe7810f1e77d2714166e20728d968ab4cd69ae8c"; + sha512 = "e433d8933c1d4a41e70ae2a8bdb6f1a502d478aad1308e1f0e8489149371893deea61fe8339717eb22996d844a5a6bbef916ec6c468a57cfbb7a54751bee2408"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ms/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ms/thunderbird-68.7.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "2931092def64e4f6985b4a8d93c82843b0e90f3ed644dc0c7605709068d6b4bf01d30d2b55c45ef29197d5fc542932294e56e924d9d5db9b3efd04095581957c"; + sha512 = "31343703e214decf4f25d724507dc706cb6c47d6247989cc2019841175099a0c328fca562fbd257f0003ec6a6fc8cdcd632c141de13e910a6a7b9c75733998bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/nb-NO/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nb-NO/thunderbird-68.7.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "ad2021b90d1a420661cb4d71fcfde6bbedb97c84a6f1a5d66e04c4fecfdf6836a1001bd6f4350b89d169b7fcf9c80230384063e1974bff53dfb11bad6fc1a49a"; + sha512 = "e79708c309dd16d23bba5bc0e29a4f5b426a7dcb7dcd56b86c40875abd0d7fa532d9ca8c8b5019552fa0d07e5c4686a66f0a4173e2fdbf8865d3921c8b29f327"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/nl/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nl/thunderbird-68.7.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "46f2507b16558151f46cae7cc88189ec581694ee50212fd0f8d2a9dd006d6685a8c49ad7d24e2117ae4a2bc55a88621ab900af7dfdbc5a08511e6374361241fc"; + sha512 = "8c268bbe04c30a3dbef069add7b6e47fc576a60d0709020d0aee03b0be634f0fbfd4928489fe7b984a8c54fb1ad9ae951b9dd0c0ba04483b35a242bbbe3bbc19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/nn-NO/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nn-NO/thunderbird-68.7.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "b6afb0adeb9ac4ad5ae0f7ba396ff8d9643d1341016d389947007e8ff40710e3fcb25e612ffff787d1fe8ba5424c17a2fbef96e10e288ad1bbb79ae337cbf505"; + sha512 = "9c73e09e4680f3c258e7d25691dffaf805ca6946335c9c30ef091a739d7f87e0f36f5328875ceb2b7f0f2cee2bf16fe1401411f11f4e5e45ca86837c4e207d79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/pl/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pl/thunderbird-68.7.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "bd015ffab2e9fb6f416194d3d8cfa1181d220dffce30060e12a665918ec0ebbe7c78c4536dab8b5f67af790350a7675f733fda5e60e640a363c757ea26b6e88e"; + sha512 = "6dcb19a95e0bd8dd783a420c3f06e0980c5706c065397d4ee424969bd84daf783752d55153808df5811f656d28adeb15f826b1d4f2b9e356846c6b1c01b89a04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/pt-BR/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-BR/thunderbird-68.7.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "fdce0362b597a82692f95236d8ff29ff442e7e9565cb44cf5ce1e526c80ee1571ed0d670a9cfa199c716507af21e02c2bc3f9ea26041fec2187ecaff8b70a6fe"; + sha512 = "99deb6fe54bf1f9bb1858f2c454e44246b34bca6aaeb5322db57d048acdea5de853d439d4f079c3e2587174364ecb05861cac461a34dfba495eb747bb8fc98ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/pt-PT/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-PT/thunderbird-68.7.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "9f0004b1f662945d35d8eec6800005116d40ca64575c66b471f2d09f8326ee359e9a429ee8684b28d4dafea9e5b708145831eadbbedcd44f0ce7a57390665a99"; + sha512 = "fd0fe715c0e816e6a92b9cb6a2afea50952851161cdd217f764cdafdc529f7cf0c5a6913546b81fc1d9532de74eecf13517c6eb8380ab5f920487df4c26d331b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/rm/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/rm/thunderbird-68.7.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "f72bbb0d18193c1cc0296f1717d2d1652a0317aafe05f16bbf7bb944bf554b6d4333c3a6e6327957f146f5cbabd174967e7c7147e1dc1a11420fc0906a59cc75"; + sha512 = "5ff0306c7c6f88976f3080d34690e4607a74730509f9f43a0ba56fb9e5b9cdea8e85a4137333c150110fa110ab6d98cbbf265ea07ca439f199841a82af500152"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ro/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ro/thunderbird-68.7.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "8ebdf16bc98c261eeaa0845a88bf03782c340871c0bbfce1e404dac459bd465a9c25eecba6a3b040ae8f6422537f474f6842f722be2c7698a1f70920d20f2ff0"; + sha512 = "9240e285135f27f82402cd0d3374f28d293a29c904a503297014802554e8257bf95c8d0cbcf18841c44d1012e0d3d8067ab24186317cb4f42f96dfeeb65255b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/ru/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ru/thunderbird-68.7.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "92da68f204338f3dc5adfddf8a1332d4fb8e78901ed00eec00ff48b857861ffc98748755edb4b5580d46ffe25e183fdf1f29418104525b6edce201e273169cdc"; + sha512 = "0c90806ecfe1e4b2e4d17ba01a5945bf5c0d3a0e7b5caaecd36456286f5a1ea597b743743acfbaef585cdc4bada86e6f194608ebe9dd2308f24d093fbba49fa5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/si/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/si/thunderbird-68.7.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "72887d5bc23331e228f91477dd71631f66021055c5c989abdd3ae7f35d27d67c48c3a6983eada438ba47982b1b82655de60cc6a11a3f87cad2edc59e5b4c8706"; + sha512 = "a10ab6a050df683057d4532c0c1ebfbed80de96f6831ae60e53f4e4fe95a342ce97b545c7a658fa092a7b9d4c2196f4bb296e4af9b0c7e4183f112ab50b464e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sk/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sk/thunderbird-68.7.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "844e533e41f87169d08176c9aa3f3ca355838837f9a8ee723991b65e1cd037cc7a7ccb03692394a63de91314117c6e158a48cef70b5ae803390fa99fbf7183d2"; + sha512 = "1aa04c5702a89099645616f7aee86a507cc5c54f3a62696eaef17d6ca161ded644285d77782ff940c2ab128d2ff9f4c5b385999da9de678837ecf91d00f88f16"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sl/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sl/thunderbird-68.7.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "41b57fd7d7f2f7690dca2e22028f09c66fd93e4a7abed1a1b1d791b3953c4129d89737d918e47090631e543229e5e8bbd7f516e05d57781abba23a9379831d14"; + sha512 = "afacff8423baa933c6e4b2282fc112636876dd97e607e9a63675fc5232907bf7b06dc50e1377aeedd3cc56dded6f3d71b47aa774dbea12217f6243c6182a2bf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sq/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sq/thunderbird-68.7.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "671b70e2a1c6d54841e84864bdefa8989954771780c0a5e8732baccae18ae261b349435adcdda58197354f60d89d1b205b0dd3b98ea020279160dc4b104c5d25"; + sha512 = "6036f12337b129025c34906b8df0663ae210294d3914cceb9f97be907f058e9eaeafad2aa2e2c2ee79f83be3659a242ab2135cf7f240b34eee24dcf555aef40f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sr/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sr/thunderbird-68.7.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5e9fc54b0abd21d2bc5ac4dd4895a5b2c961204f57175fa6051e0e23eee6b4af97ca00c9c595c8c64d29a3badbd7191baf364a9099db662aa2e6a3e7e0a570f0"; + sha512 = "c48be7ba5b42ebd244c59a6188be08236974fabdf7cc30f3473add6b215c6c7ea80fd4ad4d739d7e62fe2f1043afb288d2a6f7e838bf0e17fcc68b5340806e45"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/sv-SE/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sv-SE/thunderbird-68.7.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "42a4a55209a94df2a2bf1c2c144b0db17a99cf63d2750f0e1bec8cfcccf8fccd38ae5742d7f3c037923311e4388d582801857c648ae9ebadf332edc26ecb7607"; + sha512 = "c943304a7f40e715d1fb1194ba7f306538b917788306f02be10a86e1d01baf091b1bc58b417aad7775fba58cf90ddd8412a56cfbcf2f12e4f7581be34c328205"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/tr/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/tr/thunderbird-68.7.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "fb061df16bd3e44e1315797418c7568433ed24b0dc4dd91517c7562ab2ef999cc5e147a7aaa07d29446c5db09e5c76f3e96fe3d25453a4ef82d191d98903c785"; + sha512 = "53d5c9d7db4a44ea3858c55377c0ab8f8d359440f86634a0ff5eefdaf0553dd2c7a9ca66112a2cd4fe3a8e6094cf9c1f16fe01119ab11f1a039f471fcba37609"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/uk/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uk/thunderbird-68.7.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "4e70211298c788f874f47c1ce1eb291bf16df1c1316f51dde833bb983032ab50aa725fdd4453bd360f4fddb93215f01ecb75b2922c28b7b7abbef4a3a19c87cb"; + sha512 = "8204e0ca96902f16b92a6e02c09a788362359af3a6566f8246055727d5a74736d0b9f8570a4671a1f69233a993e25676c730001dfef9a92d034edcb8b12a5f7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/uz/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uz/thunderbird-68.7.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "7b6cedb38bc18da9902df19070cdb66c49d288591af3346e369c09b84dcc8803b6b06870165cb99e3faab33b95c9d115bdb648a1eb9be3ad28d17b84a69e35ee"; + sha512 = "496d82507602cff8e48f43b9c63a696d24020b804ffda45f2027103c5f3768543db0f03051ef062e0076c16b78b31759f7d4a4878a45e7dfac1cc0e4e9d046cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/vi/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/vi/thunderbird-68.7.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "eaaaf5002ccd31685b1f96fff6b63c9ab17d4ed3ec4c88cc368e60935b794e08a1fb56626d772f579fe0381b1381f3335de4739eaaf5b0dcfb31833c593b093c"; + sha512 = "f360794ecb21ed3f90552797269ab6e89024591903eb53dcf6216b25bb4dbcdf94c2526672b94ba979717f90cce5bfb6329efb3b5a2b9bec7c3d4d06d339ac9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/zh-CN/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-CN/thunderbird-68.7.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "89341195b5cd0d9833fee836acfea6091e9ebff3f675a02b74a2f6d6424df910d6ea4866f97832ba5bc798694d02b12d13c14c27bfff20df4ba967581c23ffcb"; + sha512 = "ec7274b2870206647fd853c30db4e30b3856896ce9c89d5d825363e9d4327d23a230c899abbb740036a8e060f1532007ba5936af010feea85318bdeb18f29e0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.6.0/linux-i686/zh-TW/thunderbird-68.6.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-TW/thunderbird-68.7.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "3a63cf99d67f0a0e79692caa2ded310284fd876b1d150cdbdc3a2bc3b1266250a90f05117c00521c1b589beaf825b8a091b7e40627d8c2127faf1b06f4c6b746"; + sha512 = "f0fb6deda0813516753386ae69ddb7b6dce95ce89c6dfba3ba5828d80d9fe92e3eaf014e89ab56c4548d39932bbfe12d4b9c6c8ff66b77a9ebe4f7476a9f6be9"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index ef943518c77..797d7b17ec2 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.6.0"; + version = "68.7.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0z2r93inj4k0sg4ghq8nz209ayklvh9dxgbsimg6dgil5ibcmyapks30gva7r9jxi07mzmb6i2mj4wazgkyi6i124svzvllnm1cq0im"; + "0glskn3djf739v2dphs663a2lfg5b0lbk1vlwwbzwfj9wfshvk7l07ijp84143bamvgb0lhhh0c9zx4gy5jj3x1j4196m3s1c1n7rzs"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index bfd177cda7a..e8b7645db87 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -2,6 +2,7 @@ , pkgconfig , python3 , fetchhg +, fetchpatch , gtk3 , glib , gdbm @@ -20,11 +21,19 @@ stdenv.mkDerivation rec { version = "0.0.19.1"; src = fetchhg { - url = https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui; + url = "https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui"; rev = "version ${version}"; sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; }; + patches = [ + # Fix docs build + (fetchpatch { + url = "https://bitbucket.org/linuxonly/modem-manager-gui/commits/68fb09c12413b7de9b7477cbf4241c3527568325/raw"; + sha256 = "58XIT/RTZ9sjUK2e47h+SqpRWhQ2vbKb2h9MKiHNdgw="; + }) + ]; + nativeBuildInputs = [ pkgconfig python3 @@ -55,7 +64,7 @@ stdenv.mkDerivation rec { functions. You can check balance of your SIM card, send or receive SMS messages, control mobile traffic consumption and more. ''; - homepage = https://linuxonly.ru/page/modem-manager-gui; + homepage = "https://linuxonly.ru/page/modem-manager-gui"; license = licenses.gpl3; maintainers = with maintainers; [ ahuzik ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index dce1934febf..b0f6859e69c 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "POP3 mail retrieval agent"; - homepage = https://marlam.de/mpop; + homepage = "https://marlam.de/mpop"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 486b34ecb30..cd394d1ac53 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig +{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo , netcat-gnu, gnutls, gsasl, libidn2, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin Security ++ stdenv.lib.optional withKeyring libsecret; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig texinfo ]; configureFlags = [ "--sysconfdir=/etc" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ]; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and easy to use SMTP client with excellent sendmail compatibility"; - homepage = https://marlam.de/msmtp/; + homepage = "https://marlam.de/msmtp/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 3b7de8360d7..1e25b01259d 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,7 +1,7 @@ { stdenv, makeWrapper, fetchurl, dpkg , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3 -, xorg, autoPatchelfHook, systemd, libnotify +, xorg, autoPatchelfHook, systemd, libnotify, libappindicator }: let deps = [ @@ -18,6 +18,7 @@ let deps = [ gnome2.GConf pango gtk3 + libappindicator libnotify xorg.libX11 xorg.libXScrnSaver @@ -40,11 +41,11 @@ in stdenv.mkDerivation rec { pname = "mullvad-vpn"; - version = "2020.2"; + version = "2020.3"; src = fetchurl { url = "https://www.mullvad.net/media/app/MullvadVPN-${version}_amd64.deb"; - sha256 = "4f5970714684a86fba44b742d77f9bbe1147a111330e487d160d9844f34ae3d5"; + sha256 = "fac3896db78cc2ddac81abec8bc0aa324e66b453126ed35a501e422ce64b1362"; }; nativeBuildInputs = [ @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; - runtimeDependencies = [ systemd.lib libnotify ]; + runtimeDependencies = [ systemd.lib libnotify libappindicator ]; installPhase = '' runHook preInstall @@ -74,6 +75,7 @@ stdenv.mkDerivation rec { ln -s $out/share/mullvad/mullvad-{gui,vpn} $out/bin/ ln -s $out/share/mullvad/resources/mullvad-daemon $out/bin/mullvad-daemon + ln -sf $out/share/mullvad/resources/mullvad-problem-report $out/bin/mullvad-problem-report runHook postInstall ''; diff --git a/pkgs/applications/networking/ndppd/default.nix b/pkgs/applications/networking/ndppd/default.nix index 42950f23a84..93145362481 100644 --- a/pkgs/applications/networking/ndppd/default.nix +++ b/pkgs/applications/networking/ndppd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A daemon that proxies NDP (Neighbor Discovery Protocol) messages between interfaces"; - homepage = https://github.com/DanielAdolfsson/ndppd; + homepage = "https://github.com/DanielAdolfsson/ndppd"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ fadenb globin ]; diff --git a/pkgs/applications/networking/netperf/default.nix b/pkgs/applications/networking/netperf/default.nix index c2a84971bc2..c2e51ee743b 100644 --- a/pkgs/applications/networking/netperf/default.nix +++ b/pkgs/applications/networking/netperf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Benchmark to measure the performance of many different types of networking"; - homepage = http://www.netperf.org/netperf/; + homepage = "http://www.netperf.org/netperf/"; license = "Hewlett-Packard BSD-like license"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index 6352922e33e..f1e8905089c 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GTK-based news feed aggregator"; - homepage = http://lzone.de/liferea/; + homepage = "http://lzone.de/liferea/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ vcunat romildo ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index f50d9516167..454e19fd897 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { description = "A GTK-based Usenet newsreader good at both text and binaries"; - homepage = http://pan.rebelbase.com/; + homepage = "http://pan.rebelbase.com/"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 2333d47d820..6fa4dc19799 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { QuiteRSS is a open-source cross-platform RSS/Atom news feeds reader written on Qt/C++ ''; - homepage = https://quiterss.org; + homepage = "https://quiterss.org"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index e8fff0deddf..1cc9c39c991 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The slrn (S-Lang read news) newsreader"; - homepage = http://slrn.sourceforge.net/index.html; + homepage = "http://slrn.sourceforge.net/index.html"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index 7e096ca94e3..2560bc806ea 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -58,7 +58,7 @@ mkDerivation rec { meta = with lib; { description = "Nextcloud themed desktop client"; - homepage = https://nextcloud.com; + homepage = "https://nextcloud.com"; license = licenses.gpl2; maintainers = with maintainers; [ caugner ma27 ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/nload/default.nix b/pkgs/applications/networking/nload/default.nix index 16cc0e3d50a..85a39f7e656 100644 --- a/pkgs/applications/networking/nload/default.nix +++ b/pkgs/applications/networking/nload/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { using two graphs and provides additional info like total amount of transfered data and min/max network usage. ''; - homepage = http://www.roland-riegel.de/nload/index.html; + homepage = "http://www.roland-riegel.de/nload/index.html"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix index 96bdc0b1dfa..3986f2b67cb 100644 --- a/pkgs/applications/networking/nntp-proxy/default.nix +++ b/pkgs/applications/networking/nntp-proxy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Simple NNTP proxy with SSL support"; - homepage = https://github.com/nieluj/nntp-proxy; + homepage = "https://github.com/nieluj/nntp-proxy"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.fadenb ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/networking/offrss/default.nix b/pkgs/applications/networking/offrss/default.nix index d91bfbae501..679e966373b 100644 --- a/pkgs/applications/networking/offrss/default.nix +++ b/pkgs/applications/networking/offrss/default.nix @@ -22,12 +22,12 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.3.tar.gz; + url = "http://vicerveza.homeunix.net/~viric/soft/offrss/offrss-1.3.tar.gz"; sha256 = "1akw1x84jj2m9z60cvlvmz21qwlaywmw18pl7lgp3bj5nw6250p6"; }; meta = { - homepage = http://vicerveza.homeunix.net/~viric/cgi-bin/offrss; + homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss"; description = "Offline RSS/Atom reader"; license="AGPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index 3f48601d96f..aa9d94ad5b6 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A packet traffic generator and analyzer"; - homepage = https://ostinato.org; + homepage = "https://ostinato.org"; license = licenses.gpl3; maintainers = with maintainers; [ rick68 ]; platforms = with platforms; linux ++ darwin ++ cygwin; diff --git a/pkgs/applications/networking/owamp/default.nix b/pkgs/applications/networking/owamp/default.nix index 4dad5f4d6bd..3608ef982a9 100644 --- a/pkgs/applications/networking/owamp/default.nix +++ b/pkgs/applications/networking/owamp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://software.internet2.edu/owamp/; + homepage = "http://software.internet2.edu/owamp/"; description = ''A tool for performing one-way active measurements''; platforms = platforms.linux; maintainers = [maintainers.teto]; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 998944838e8..3fc9fedc413 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -21,7 +21,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Synchronise your ownCloud with your computer using this desktop client"; - homepage = https://owncloud.org; + homepage = "https://owncloud.org"; maintainers = [ maintainers.qknight ]; platforms = platforms.unix; license = licenses.gpl2Plus; diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index 63218f1c2ff..cafba65c788 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://deluge-torrent.org; + homepage = "https://deluge-torrent.org"; description = "Torrent client"; license = licenses.gpl3Plus; maintainers = with maintainers; [ domenkozar ebzzry ]; diff --git a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 2692e5360ce..9355bfa5b8d 100644 --- a/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform program that uses the Direct Connect and ADC protocols"; - homepage = https://github.com/eiskaltdcpp/eiskaltdcpp; + homepage = "https://github.com/eiskaltdcpp/eiskaltdcpp"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index 24435288488..017f059ff6c 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -2,7 +2,7 @@ let freenet_ext = fetchurl { - url = https://downloads.freenetproject.org/latest/freenet-ext.jar; + url = "https://downloads.freenetproject.org/latest/freenet-ext.jar"; sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij"; }; @@ -12,7 +12,7 @@ let sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk"; }; seednodes = fetchurl { - url = https://downloads.freenetproject.org/alpha/opennet/seednodes.fref; + url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; }; version = "build01475"; @@ -72,7 +72,7 @@ in stdenv.mkDerivation { meta = { description = "Decentralised and censorship-resistant network"; - homepage = https://freenetproject.org/; + homepage = "https://freenetproject.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.doublec ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/p2p/frostwire/default.nix b/pkgs/applications/networking/p2p/frostwire/default.nix index 0449540eaff..65e2165f64e 100644 --- a/pkgs/applications/networking/p2p/frostwire/default.nix +++ b/pkgs/applications/networking/p2p/frostwire/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.frostwire.com/; + homepage = "https://www.frostwire.com/"; description = "BitTorrent Client and Cloud File Downloader"; license = licenses.gpl2; maintainers = with maintainers; [ gavin ]; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index e4b306453a4..5abee0108ec 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { network are rewarded with better service. ''; - homepage = https://gnunet.org/; + homepage = "https://gnunet.org/"; license = licenses.agpl3Plus; maintainers = with maintainers; [ vrthra ]; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/applications/networking/p2p/gnunet/git.nix b/pkgs/applications/networking/p2p/gnunet/git.nix index e8f209239bf..b3d455599bf 100644 --- a/pkgs/applications/networking/p2p/gnunet/git.nix +++ b/pkgs/applications/networking/p2p/gnunet/git.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { name = "gnunet-git-${rev}"; src = fetchgit { - url = https://gnunet.org/git/gnunet.git; + url = "https://gnunet.org/git/gnunet.git"; inherit rev; sha256 = "0gbw920m9v4b3425c0d1h7drgl2m1fni1bwjn4fwqnyz7kdqzsgl"; }; @@ -82,7 +82,7 @@ stdenv.mkDerivation { network are rewarded with better service. ''; - homepage = https://gnunet.org/; + homepage = "https://gnunet.org/"; license = licenses.agpl3Plus; diff --git a/pkgs/applications/networking/p2p/ktorrent/default.nix b/pkgs/applications/networking/p2p/ktorrent/default.nix index e38378d09b3..19be24bd1b1 100644 --- a/pkgs/applications/networking/p2p/ktorrent/default.nix +++ b/pkgs/applications/networking/p2p/ktorrent/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { meta = with lib; { description = "KDE integrated BtTorrent client"; - homepage = https://www.kde.org/applications/internet/ktorrent/; + homepage = "https://www.kde.org/applications/internet/ktorrent/"; license = licenses.gpl2; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/magnetico/default.nix b/pkgs/applications/networking/p2p/magnetico/default.nix index f07db173dbc..da7713d7bc6 100644 --- a/pkgs/applications/networking/p2p/magnetico/default.nix +++ b/pkgs/applications/networking/p2p/magnetico/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { meta = with lib; { description = "Autonomous (self-hosted) BitTorrent DHT search engine suite."; - homepage = https://github.com/boramalper/magnetico; + homepage = "https://github.com/boramalper/magnetico"; license = licenses.agpl3; badPlatforms = platforms.darwin; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 0ead4b7e3ec..786ba434b92 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation ({ name = "mldonkey-3.1.6"; src = fetchurl { - url = https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2; + url = "https://github.com/ygrek/mldonkey/releases/download/release-3-1-6/mldonkey-3.1.6.tar.bz2"; sha256 = "0g84islkj72ymp0zzppcj9n4r21h0vlghnq87hv2wg580mybadhv"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation ({ meta = { description = "Client for many p2p networks, with multiple frontends"; - homepage = http://mldonkey.sourceforge.net/; + homepage = "http://mldonkey.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/networking/p2p/ncdc/default.nix b/pkgs/applications/networking/p2p/ncdc/default.nix index b28074a2fd6..c956f26b116 100644 --- a/pkgs/applications/networking/p2p/ncdc/default.nix +++ b/pkgs/applications/networking/p2p/ncdc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern and lightweight direct connect client with a friendly ncurses interface"; - homepage = https://dev.yorhel.nl/ncdc; + homepage = "https://dev.yorhel.nl/ncdc"; license = licenses.mit; platforms = platforms.linux; # arbitrary maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 46c482818f8..ed44ff24fec 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://erdgeist.org/arts/software/opentracker/; + homepage = "https://erdgeist.org/arts/software/opentracker/"; license = licenses.beerware; platforms = platforms.linux; description = "Bittorrent tracker project which aims for minimal resource usage and is intended to run at your wlan router."; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index 8ab83c8a4ba..39740f53475 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,13 +10,13 @@ with lib; mkDerivation rec { pname = "qbittorrent"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "qbittorrent"; repo = "qbittorrent"; rev = "release-${version}"; - sha256 = "0bz4l7awkx4qf3gh9c8gj8fab989439zj8qy4x9r36wxdjg5cxil"; + sha256 = "1iqgwhgwa2kx85zj1rwfnnclr1433a7m2gbs3j7w6rx39vxnzhcc"; }; # NOTE: 2018-05-31: CMake is working but it is not officially supported @@ -39,7 +39,7 @@ mkDerivation rec { meta = { description = "Featureful free software BitTorrent client"; - homepage = https://www.qbittorrent.org/; + homepage = "https://www.qbittorrent.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ Anton-Latukha ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index f10714031ff..ce6d3958c9b 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ""; - homepage = http://retroshare.sourceforge.net/; + homepage = "http://retroshare.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/networking/p2p/soulseekqt/default.nix b/pkgs/applications/networking/p2p/soulseekqt/default.nix index a5e8d85f128..2a8a0622713 100644 --- a/pkgs/applications/networking/p2p/soulseekqt/default.nix +++ b/pkgs/applications/networking/p2p/soulseekqt/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { meta = with lib; { description = "Official Qt SoulSeek client"; - homepage = https://www.slsknet.org; + homepage = "https://www.slsknet.org"; license = licenses.unfree; maintainers = [ maintainers.genesis ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 80b8251f2a3..325dc653e5b 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { --replace "urwidtrees>=1.0.3dev0" "urwidtrees" ''; - buildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ urwid urwidtrees aiohttp @@ -43,8 +43,10 @@ python3.pkgs.buildPythonApplication rec { pytest ]; + # test_string__month_day_hour_minute_second fails on darwin checkPhase = '' - pytest tests + LC_ALL=en_US.utf8 pytest tests \ + --deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second ''; meta = with lib; { diff --git a/pkgs/applications/networking/p2p/synapse-bt/default.nix b/pkgs/applications/networking/p2p/synapse-bt/default.nix index 65cf21c1611..80d90789440 100644 --- a/pkgs/applications/networking/p2p/synapse-bt/default.nix +++ b/pkgs/applications/networking/p2p/synapse-bt/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Flexible and fast BitTorrent daemon"; - homepage = https://synapse-bt.org/; + homepage = "https://synapse-bt.org/"; license = licenses.isc; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 05268bdaead..8691335d129 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Torrent client"; - homepage = http://www.tixati.com; + homepage = "http://www.tixati.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index 01da8a63374..1bf99165858 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS"; - homepage = https://github.com/davidmhewitt/torrential; + homepage = "https://github.com/davidmhewitt/torrential"; maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 51d591995b7..dbe3bb50e6d 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "A cross platform front-end for the Transmission Bit-Torrent client"; - homepage = https://sourceforge.net/p/transgui; + homepage = "https://sourceforge.net/p/transgui"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ ramkromberg ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix index e05ca43eb50..7c6e35752a0 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-cli/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Curses interface for the Transmission BitTorrent daemon"; - homepage = https://github.com/fagga/transmission-remote-cli; + homepage = "https://github.com/fagga/transmission-remote-cli"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 68babaddd1b..8e74b82b69d 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK remote control for the Transmission BitTorrent client"; - homepage = https://github.com/ajf8/transmission-remote-gtk; + homepage = "https://github.com/ajf8/transmission-remote-gtk"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix index 25996953e11..0e80e1397fa 100644 --- a/pkgs/applications/networking/p2p/transmission/default.nix +++ b/pkgs/applications/networking/p2p/transmission/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { * Bluetack (PeerGuardian) blocklists with automatic updates * Full encryption, DHT, and PEX support ''; - homepage = http://www.transmissionbt.com/; + homepage = "http://www.transmissionbt.com/"; license = licenses.gpl2; # parts are under MIT maintainers = with maintainers; [ astsmtl vcunat wizeman ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index 30491470392..03cb381f5eb 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.twister.net.co/; + homepage = "http://www.twister.net.co/"; description = "Peer-to-peer microblogging"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/p2p/vuze/default.nix b/pkgs/applications/networking/p2p/vuze/default.nix index b1d3c73129a..be2421ef4d2 100644 --- a/pkgs/applications/networking/p2p/vuze/default.nix +++ b/pkgs/applications/networking/p2p/vuze/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Torrent client"; - homepage = http://www.vuze.com; + homepage = "http://www.vuze.com"; license = licenses.unfree; platforms = platforms.all; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index 925618bbe99..e69c5dc84f3 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A helpful tool that lets you debug what part of your API is causing you issues"; - homepage = https://github.com/jeremyvaartjes/ping; + homepage = "https://github.com/jeremyvaartjes/ping"; maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index c9df5d3fbe3..6ac2e89cf40 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, openssl, libsamplerate, alsaLib }: +{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib }: stdenv.mkDerivation rec { pname = "pjsip"; - version = "2.9"; + version = "2.10"; - src = fetchurl { - url = "https://www.pjsip.org/release/${version}/pjproject-${version}.tar.bz2"; - sha256 = "0dm6l8fypkimmzvld35zyykbg957cm5zb4ny3lchgv68amwfz1fi"; + src = fetchFromGitHub { + owner = pname; + repo = "pjproject"; + rev = version; + sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0"; }; patches = [ ./fix-aarch64.patch ]; @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; - homepage = https://pjsip.org/; + homepage = "https://pjsip.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [olynch]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix index 8785d2449b3..31b1bd6086a 100644 --- a/pkgs/applications/networking/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -13,7 +13,7 @@ buildPythonApplication { meta = with stdenv.lib; { description = "An ASCII Header Generator for Network Protocols"; - homepage = https://github.com/luismartingarcia/protocol; + homepage = "https://github.com/luismartingarcia/protocol"; license = licenses.gpl3; maintainers = with maintainers; [ teto ]; }; diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix index f426a7c3a58..c48f6c82026 100644 --- a/pkgs/applications/networking/protonvpn-cli/default.nix +++ b/pkgs/applications/networking/protonvpn-cli/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ProtonVPN Command-Line Tool"; - homepage = https://github.com/ProtonVPN/protonvpn-cli; + homepage = "https://github.com/ProtonVPN/protonvpn-cli"; maintainers = with maintainers; [ caugner ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/networking/ps2client/default.nix b/pkgs/applications/networking/ps2client/default.nix index d75f92cb25c..02b14b72c18 100644 --- a/pkgs/applications/networking/ps2client/default.nix +++ b/pkgs/applications/networking/ps2client/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Desktop clients to interact with ps2link and ps2netfs"; - homepage = https://github.com/ps2dev/ps2client; + homepage = "https://github.com/ps2dev/ps2client"; license = licenses.bsd3; maintainers = [ maintainers.genesis ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/pyload/beautifulsoup.nix b/pkgs/applications/networking/pyload/beautifulsoup.nix index 66470bf8f31..8eb0c2298fd 100644 --- a/pkgs/applications/networking/pyload/beautifulsoup.nix +++ b/pkgs/applications/networking/pyload/beautifulsoup.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage { doCheck = false; meta = { - homepage = http://www.crummy.com/software/BeautifulSoup/; + homepage = "http://www.crummy.com/software/BeautifulSoup/"; license = "bsd"; description = "Undemanding HTML/XML parser"; }; diff --git a/pkgs/applications/networking/pyload/default.nix b/pkgs/applications/networking/pyload/default.nix index 3df21d414e0..f173e56abb3 100644 --- a/pkgs/applications/networking/pyload/default.nix +++ b/pkgs/applications/networking/pyload/default.nix @@ -52,7 +52,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Free and open source downloader for 1-click-hosting sites"; - homepage = https://github.com/pyload/pyload; + homepage = "https://github.com/pyload/pyload"; license = licenses.gpl3; maintainers = [ maintainers.mahe ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index f6ec85f3c2c..0936f4e7552 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -38,7 +38,7 @@ let x86hash = "16v3kgavrh62z6vxcbw6mn7h0bfishpl7m92k7g1p2882r1f8vaf"; x64suffix = "60"; x86suffix = "60"; - homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest.html; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-latest.html"; }; "19.8.0" = { @@ -49,7 +49,7 @@ let x86hash = "0afcqirb4q349r3izy88vqkszg6y2wg14iwypk6nrmvwgvcl6jdn"; x64suffix = "20"; x86suffix = "20"; - homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1908.html; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1908.html"; }; "19.10.0" = { @@ -60,7 +60,7 @@ let x86hash = "000zjik8wf8b6fadnsai0p77b4n2l95544zx503iyrb9pv53bj3y"; x64suffix = "15"; x86suffix = "15"; - homepage = https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1910.html; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1910.html"; }; "19.12.0" = { @@ -71,7 +71,7 @@ let x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy"; x64suffix = "19"; x86suffix = "19"; - homepage = https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; + homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 5963c6b6c95..1dbf80f20f5 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) following the Microsoft Open Specifications. ''; - homepage = http://www.freerdp.com/; + homepage = "http://www.freerdp.com/"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 49182ec182f..804a40a614c 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { platforms, along with an xterm terminal emulator. It is written and maintained primarily by Simon Tatham. ''; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/putty/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/putty/"; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; }; diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 9c9abe55daa..02a2c63b439 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { meta = { description = "Open source client for Windows Terminal Services"; - homepage = http://www.rdesktop.org/; + homepage = "http://www.rdesktop.org/"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 6fe77790b74..dbb9d465cc7 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -57,7 +57,7 @@ mkDerivation rec { preferLocalBuild = true; meta = with lib; { - homepage = http://www.teamviewer.com; + homepage = "http://www.teamviewer.com"; license = licenses.unfree; description = "Desktop sharing application, providing remote support and online meetings"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/networking/remote/waypipe/default.nix b/pkgs/applications/networking/remote/waypipe/default.nix index d253e766284..03be60a9948 100644 --- a/pkgs/applications/networking/remote/waypipe/default.nix +++ b/pkgs/applications/networking/remote/waypipe/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { serializes changes to shared memory buffers over a single socket. This makes application forwarding similar to ssh -X feasible. ''; - homepage = https://mstoeckl.com/notes/gsoc/blog.html; + homepage = "https://mstoeckl.com/notes/gsoc/blog.html"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix index 13bcbf9b57e..04745806735 100644 --- a/pkgs/applications/networking/remote/x2goclient/default.nix +++ b/pkgs/applications/networking/remote/x2goclient/default.nix @@ -32,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Graphical NoMachine NX3 remote desktop client"; - homepage = http://x2go.org/; + homepage = "http://x2go.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/remote/xrdp/default.nix b/pkgs/applications/networking/remote/xrdp/default.nix index 5d33f186df7..9941951225c 100644 --- a/pkgs/applications/networking/remote/xrdp/default.nix +++ b/pkgs/applications/networking/remote/xrdp/default.nix @@ -96,7 +96,7 @@ let meta = with stdenv.lib; { description = "An open source RDP server"; - homepage = https://github.com/neutrinolabs/xrdp; + homepage = "https://github.com/neutrinolabs/xrdp"; license = licenses.asl20; maintainers = [ maintainers.volth ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix index 14d418cd2bf..883a152fdf9 100644 --- a/pkgs/applications/networking/resilio-sync/default.nix +++ b/pkgs/applications/networking/resilio-sync/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automatically sync files via secure, distributed technology"; - homepage = https://www.resilio.com/; + homepage = "https://www.resilio.com/"; license = licenses.unfreeRedistributable; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar thoughtpolice cwoac ]; diff --git a/pkgs/applications/networking/sieve-connect/default.nix b/pkgs/applications/networking/sieve-connect/default.nix index dc578dccd19..c81cc78a9b5 100644 --- a/pkgs/applications/networking/sieve-connect/default.nix +++ b/pkgs/applications/networking/sieve-connect/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { as specifed in RFC 5804. Historically, this was MANAGESIEVE as implemented by timsieved in Cyrus IMAP. ''; - homepage = https://github.com/philpennock/sieve-connect; + homepage = "https://github.com/philpennock/sieve-connect"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ das_j ]; diff --git a/pkgs/applications/networking/siproxd/default.nix b/pkgs/applications/networking/siproxd/default.nix index cd697f107b3..e664ee20c23 100644 --- a/pkgs/applications/networking/siproxd/default.nix +++ b/pkgs/applications/networking/siproxd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libosip ]; meta = { - homepage = http://siproxd.sourceforge.net/; + homepage = "http://siproxd.sourceforge.net/"; description = "A masquerading SIP Proxy Server"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index 81c48cff4a0..9c295c27915 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://etherape.sourceforge.net/; + homepage = "http://etherape.sourceforge.net/"; license = stdenv.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 c548098baa7..4af8e526cd2 100644 --- a/pkgs/applications/networking/sniffers/ettercap/default.nix +++ b/pkgs/applications/networking/sniffers/ettercap/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { of many protocols and includes many features for network and host analysis. ''; - homepage = https://www.ettercap-project.org/; + homepage = "https://www.ettercap-project.org/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 0005a5d230d..9775486c156 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless network sniffer"; - homepage = https://www.kismetwireless.net/; + homepage = "https://www.kismetwireless.net/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index fe84787c21a..7602cb5fe6a 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.2.2"; + version = "3.2.3"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0ygdxpz0i4jxp55fg9x4xcan093wycjb66yas073gviz9kpj6naz"; + sha256 = "1fpsfjrap7j84sy728yhcr2gad9nq3n5gq03mwrmxnc6ijwf81zh"; }; cmakeFlags = [ diff --git a/pkgs/applications/networking/soapui/default.nix b/pkgs/applications/networking/soapui/default.nix index 9de525d9324..32a6423243e 100644 --- a/pkgs/applications/networking/soapui/default.nix +++ b/pkgs/applications/networking/soapui/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Most Advanced REST & SOAP Testing Tool in the World"; - homepage = https://www.soapui.org/; + homepage = "https://www.soapui.org/"; license = "SoapUI End User License Agreement"; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix index 158e6c5dad1..d673917af31 100644 --- a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix +++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix @@ -36,7 +36,7 @@ python27Packages.buildPythonApplication { meta = { description = "A graphical client for the SoulSeek peer-to-peer system"; - homepage = https://www.nicotine-plus.org; + homepage = "https://www.nicotine-plus.org"; license = licenses.gpl3; maintainers = with maintainers; [ klntsky ]; platforms = platforms.unix; diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix index 11c8af368b9..90d8ea55331 100644 --- a/pkgs/applications/networking/spideroak/default.nix +++ b/pkgs/applications/networking/spideroak/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ patchelf makeWrapper ]; meta = { - homepage = https://spideroak.com; + homepage = "https://spideroak.com"; description = "Secure online backup and sychronization"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ amorsillo ]; diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix index c5ff090a807..7a70375e42c 100644 --- a/pkgs/applications/networking/super-productivity/default.nix +++ b/pkgs/applications/networking/super-productivity/default.nix @@ -98,7 +98,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "To Do List / Time Tracker with Jira Integration."; - homepage = https://super-productivity.com; + homepage = "https://super-productivity.com"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/applications/networking/sync/acd_cli/default.nix b/pkgs/applications/networking/sync/acd_cli/default.nix index 669ab4d1e3e..c95647c7840 100644 --- a/pkgs/applications/networking/sync/acd_cli/default.nix +++ b/pkgs/applications/networking/sync/acd_cli/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A command line interface and FUSE filesystem for Amazon Cloud Drive"; - homepage = https://github.com/yadayada/acd_cli; + homepage = "https://github.com/yadayada/acd_cli"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index 36c4dd46222..6244cd661d0 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/bit-team/backintime; + homepage = "https://github.com/bit-team/backintime"; description = "Simple backup tool for Linux"; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/networking/sync/casync/default.nix b/pkgs/applications/networking/sync/casync/default.nix index 82a99bf2df1..461de492ae2 100644 --- a/pkgs/applications/networking/sync/casync/default.nix +++ b/pkgs/applications/networking/sync/casync/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Content-Addressable Data Synchronizer"; - homepage = https://github.com/systemd/casync; + homepage = "https://github.com/systemd/casync"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/applications/networking/sync/desync/default.nix b/pkgs/applications/networking/sync/desync/default.nix index d38f8b53dbb..9831ab34b2e 100644 --- a/pkgs/applications/networking/sync/desync/default.nix +++ b/pkgs/applications/networking/sync/desync/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Content-addressed binary distribution system"; longDescription = "An alternate implementation of the casync protocol and storage mechanism with a focus on production-readiness"; - homepage = https://github.com/folbricht/desync; + homepage = "https://github.com/folbricht/desync"; license = licenses.bsd3; platforms = platforms.unix; # *may* work on Windows, but varies between releases. maintainers = [ maintainers.chaduffy ]; diff --git a/pkgs/applications/networking/sync/lsyncd/default.nix b/pkgs/applications/networking/sync/lsyncd/default.nix index 832f7c63f27..9573e1717de 100644 --- a/pkgs/applications/networking/sync/lsyncd/default.nix +++ b/pkgs/applications/networking/sync/lsyncd/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/axkibe/lsyncd; + homepage = "https://github.com/axkibe/lsyncd"; description = "A utility that synchronizes local directories with remote targets"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index d6f37583abe..2f484467450 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Command line program to sync files and directories to and from major cloud storage"; - homepage = https://rclone.org; + homepage = "https://rclone.org"; license = licenses.mit; maintainers = with maintainers; [ danielfullmer ]; platforms = platforms.all; diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix index fc4bc6c0671..a0522dfe820 100644 --- a/pkgs/applications/networking/sync/rsync/base.nix +++ b/pkgs/applications/networking/sync/rsync/base.nix @@ -15,7 +15,7 @@ rec { meta = with stdenv.lib; { description = "Fast incremental file transfer utility"; - homepage = https://rsync.samba.org/; + homepage = "https://rsync.samba.org/"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 9c49b22d944..535757503ca 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (rec { dontStrip = !ocaml.nativeCompilers; meta = { - homepage = https://www.cis.upenn.edu/~bcpierce/unison/; + homepage = "https://www.cis.upenn.edu/~bcpierce/unison/"; description = "Bidirectional file synchronizer"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 920a1c97539..0613a5c5bcd 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://syncplay.pl/; + homepage = "https://syncplay.pl/"; description = "Free software that synchronises media players"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 3e2b7cf67f2..cf1e053dd53 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -57,7 +57,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK3 & python based GUI for Syncthing"; - homepage = https://github.com/syncthing/syncthing-gtk; + homepage = "https://github.com/syncthing/syncthing-gtk"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = syncthing.meta.platforms; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 0fd3a5ca280..31cf76be5ef 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,21 +1,19 @@ -{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, libobjc, CoreServices, Foundation }: +{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }: let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.4.0"; + version = "1.4.2"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "049f9h03qq9a7pa8ngwampwf5xc7kr7mm473zn56yl3nrmv0nid6"; + sha256 = "0pfzpbdir2agwsyfjh1rxlyyd225xmyrr4k2g4vlg5r12kpcjwya"; }; - modSha256 = "1qq0979cm42wd3scy3blyi0hg67mkghis9r5rn2x1lqi2b982wfh"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc CoreServices Foundation ]; + modSha256 = "0qjhb55nd8mlnswbk8bgl2sb9angmv8fnympmmyqj1dqa7lcs87z"; patches = [ ./add-stcli-target.patch @@ -38,7 +36,7 @@ let inherit postInstall; meta = with lib; { - homepage = https://www.syncthing.net/; + homepage = "https://www.syncthing.net/"; description = "Open Source Continuous File Synchronization"; license = licenses.mpl20; maintainers = with maintainers; [ pshendry joko peterhoeg andrew-d ]; diff --git a/pkgs/applications/networking/trebleshot/default.nix b/pkgs/applications/networking/trebleshot/default.nix index 1b049ff2dc7..56ebe1873ae 100644 --- a/pkgs/applications/networking/trebleshot/default.nix +++ b/pkgs/applications/networking/trebleshot/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { meta = with lib; { description = "Android file transferring tool for desktop"; - homepage = https://github.com/genonbeta/TrebleShot-Desktop; + homepage = "https://github.com/genonbeta/TrebleShot-Desktop"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 1a19c8c96b3..d16c1bb944a 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; license = licenses.bsd3; - homepage = https://github.com/umurmur/umurmur; + homepage = "https://github.com/umurmur/umurmur"; platforms = platforms.all; }; } diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix index 44b8a955817..cd0f65d4d45 100644 --- a/pkgs/applications/networking/vnstat/default.nix +++ b/pkgs/applications/networking/vnstat/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { This means that vnStat won't actually be sniffing any traffic and also ensures light use of system resources. ''; - homepage = https://humdi.net/vnstat/; + homepage = "https://humdi.net/vnstat/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock index 86e064347b6..4534beb20c3 100644 --- a/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock +++ b/pkgs/applications/networking/wayback_machine_downloader/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES wayback_machine_downloader! BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 64fef08ceef..9887e34d735 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Know the forecast of the next hours & days"; - homepage = https://gitlab.com/bitseater/meteo; + homepage = "https://gitlab.com/bitseater/meteo"; license = licenses.gpl3Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix index 8d0e92488db..4160e70b9c4 100644 --- a/pkgs/applications/networking/websocketd/default.nix +++ b/pkgs/applications/networking/websocketd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "websocketd"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "18hamj557ln8k3vmvcrpvnydjr1dy7zi9490iacwdldw5vp870xs"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Turn any program that uses STDIN/STDOUT into a WebSocket server"; homepage = "http://websocketd.com/"; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index bf36a6f2bbb..e9c3acdc11d 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced IRC bouncer"; - homepage = https://wiki.znc.in/ZNC; + homepage = "https://wiki.znc.in/ZNC"; maintainers = with maintainers; [ schneefux lnl7 ]; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix index 5e7bdd09b03..3fd447b8b09 100644 --- a/pkgs/applications/networking/znc/modules.nix +++ b/pkgs/applications/networking/znc/modules.nix @@ -31,7 +31,7 @@ in { meta = with stdenv.lib; { description = "Request backlog for IRC channels."; - homepage = https://github.com/fruitiex/znc-backlog/; + homepage = "https://github.com/fruitiex/znc-backlog/"; license = licenses.asl20; maintainers = with maintainers; [ infinisil ]; }; @@ -51,7 +51,7 @@ in { meta = with stdenv.lib; { description = "ZNC module for client specific buffers"; - homepage = https://github.com/jpnurmi/znc-clientbuffer; + homepage = "https://github.com/jpnurmi/znc-clientbuffer"; license = licenses.asl20; maintainers = with maintainers; [ hrdinka ]; }; @@ -71,7 +71,7 @@ in { meta = with stdenv.lib; { description = "ZNC clientaway module"; - homepage = https://github.com/kylef/znc-contrib; + homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; maintainers = with maintainers; [ kiwi ]; }; @@ -92,7 +92,7 @@ in { meta = { description = "ZNC FiSH module"; - homepage = https://github.com/dctrwatson/znc-fish; + homepage = "https://github.com/dctrwatson/znc-fish"; maintainers = [ stdenv.lib.maintainers.offline ]; }; }; @@ -111,7 +111,7 @@ in { meta = with stdenv.lib; { description = "ZNC ignore module"; - homepage = https://github.com/kylef/znc-contrib; + homepage = "https://github.com/kylef/znc-contrib"; license = licenses.gpl2; maintainers = with maintainers; [ kiwi ]; }; @@ -151,7 +151,7 @@ in { meta = with stdenv.lib; { description = "An advanced playback module for ZNC"; - homepage = https://github.com/jpnurmi/znc-playback; + homepage = "https://github.com/jpnurmi/znc-playback"; license = licenses.asl20; maintainers = with maintainers; [ hrdinka ]; }; @@ -171,7 +171,7 @@ in { meta = { description = "ZNC privmsg module"; - homepage = https://github.com/kylef/znc-contrib; + homepage = "https://github.com/kylef/znc-contrib"; }; }; @@ -189,7 +189,7 @@ in { meta = { description = "Push notification service module for ZNC"; - homepage = https://github.com/jreese/znc-push; + homepage = "https://github.com/jreese/znc-push"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ offline schneefux ]; }; diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 0b36b3266ef..4aa3f936b53 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Word processing program, similar to Microsoft Word"; - homepage = https://www.abisource.com/; + homepage = "https://www.abisource.com/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pSub ylwghst sna ]; diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index 23efbf9c9b5..04bbbbc498c 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS"; - homepage = https://github.com/dahenson/agenda; + homepage = "https://github.com/dahenson/agenda"; maintainers = with maintainers; [ kjuvi ] ++ pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index e6c939b277e..0154e21b374 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { installTargets = [ "global_install" ]; meta = { - homepage = http://www.winfield.demon.nl/; + homepage = "http://www.winfield.demon.nl/"; description = "Convert MS Word documents to plain text or PostScript"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 88da2442ecf..cf145de544b 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An integrated family of CLI’s for various Atlassian applications"; - homepage = https://bobswift.atlassian.net/wiki/spaces/ACLI/overview; + homepage = "https://bobswift.atlassian.net/wiki/spaces/ACLI/overview"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ twey ]; inherit (jre.meta) platforms; diff --git a/pkgs/applications/office/autokey/default.nix b/pkgs/applications/office/autokey/default.nix index 31e74ccf23a..441a9a98e97 100644 --- a/pkgs/applications/office/autokey/default.nix +++ b/pkgs/applications/office/autokey/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { dbus-python pyinotify xlib pygobject3 ]; meta = { - homepage = https://github.com/autokey/autokey; + homepage = "https://github.com/autokey/autokey"; description = "Desktop automation utility for Linux and X11"; license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ pneumaticat ]; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index aefd696ae4e..916d13e7a83 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/simon-v/bean-add/; + homepage = "https://github.com/simon-v/bean-add/"; description = "beancount transaction entry assistant"; # The (only) source file states: diff --git a/pkgs/applications/office/bookworm/default.nix b/pkgs/applications/office/bookworm/default.nix index be6fe172e29..f7ec9bf5c60 100644 --- a/pkgs/applications/office/bookworm/default.nix +++ b/pkgs/applications/office/bookworm/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { longDescription = '' Read the books you love without having to worry about different format complexities like epub, pdf, mobi, cbr, etc. ''; - homepage = https://babluboy.github.io/bookworm/; + homepage = "https://babluboy.github.io/bookworm/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 4855fbc63c3..6915be9b6d6 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { Sheets for computations, Plan for planning, and Karbon for vector graphics. ''; - homepage = https://www.calligra.org/; + homepage = "https://www.calligra.org/"; maintainers = with maintainers; [ phreedom ebzzry zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index 0043648146f..f5b8b437249 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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; + homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; maintainers = with maintainers; [ edwtjo ]; license = licenses.gpl3; }; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index abc227e9e39..def44b40e80 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.1.1"; + version = "2.2.14"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "0swj94pqf00wwzsgjap8z19k33gg1wj2b78ba1aj9h791j8lmaim"; + sha256 = "14k5kiknr0d3my17p4v20iiqzifpz3y80gdzj8vdxic8yk2yr1ap"; }; nativeBuildInputs = [ @@ -36,24 +36,16 @@ stdenv.mkDerivation rec { buildInputs = [ evolution-data-server - libical - libgee - json-glib glib - sqlite - libsoup gtk3 + json-glib + libgee + libical + libsoup + pantheon.elementary-icon-theme pantheon.granite + sqlite webkitgtk - pantheon.elementary-icon-theme - ]; - - # Fix version string, remove in next update! - patches = [ - (fetchpatch { - url = "https://github.com/alainm23/planner/pull/194/commits/3d0a2197087b13fe90fa6f85f817ba56798d632c.patch"; - sha256 = "077q5jddi8jaw2ypc6szbd1c50i4x3b21jvmvi3w7g5zhjwpkmf5"; - }) ]; postPatch = '' diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index d62c6c0e4cc..8e1bb0d76d9 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -5,11 +5,11 @@ let in buildPythonApplication rec { pname = "fava"; - version = "1.13"; + version = "1.14"; src = fetchPypi { inherit pname version; - sha256 = "1pjfa5xb2imhcf7q037h8g0bp9nrnj1xyblgqphnjnz6hbr58a59"; + sha256 = "181ypq2p7aaq2b76s55hxxbm1hykzf45mjjgm500h4dsaa167dqy"; }; checkInputs = [ python3.pkgs.pytest ]; @@ -35,7 +35,7 @@ buildPythonApplication rec { ''; meta = { - homepage = https://beancount.github.io/fava; + homepage = "https://beancount.github.io/fava"; description = "Web interface for beancount"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 476b1128b94..d7664b347ee 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "3.8b"; + version = "3.9"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "0dvzm3bib7jcj685sklpzyy9mrak9mxyvih2k9fk4sl3v21wlphg"; + sha256 = "1zxrgrjbs13vgr002rvl734w9f7zzxfq4xxmyhj777dwgkfds0ld"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.gnucash.org/; + homepage = "http://www.gnucash.org/"; maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 710a66c25d8..67618e0e4f9 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNOME Office Spreadsheet"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://projects.gnome.org/gnumeric/; + homepage = "http://projects.gnome.org/gnumeric/"; platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; }; diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 3cda543eda1..1a056e9be81 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free, easy, personal accounting for everyone"; - homepage = http://homebank.free.fr/; + homepage = "http://homebank.free.fr/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix index 372414c1a76..7be7e4467b5 100644 --- a/pkgs/applications/office/ib/controller/default.nix +++ b/pkgs/applications/office/ib/controller/default.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automation Controller for the Trader Work Station of Interactive Brokers"; - homepage = https://github.com/ib-controller/ib-controller; + homepage = "https://github.com/ib-controller/ib-controller"; license = licenses.gpl3; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix index a88f1af02c6..b8b31bed7c5 100644 --- a/pkgs/applications/office/ib/tws/default.nix +++ b/pkgs/applications/office/ib/tws/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Trader Work Station of Interactive Brokers"; - homepage = https://www.interactivebrokers.com; + homepage = "https://www.interactivebrokers.com"; license = licenses.unfree; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index a8c318d690a..ed8cc1dd50a 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation { to make a slideshow with your favorite photos. ''; - homepage = http://impressive.sourceforge.net/; + homepage = "http://impressive.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/office/jabref/default.nix b/pkgs/applications/office/jabref/default.nix index d0a7757e49d..01ba190cf31 100644 --- a/pkgs/applications/office/jabref/default.nix +++ b/pkgs/applications/office/jabref/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source bibliography reference manager"; - homepage = https://www.jabref.org; + homepage = "https://www.jabref.org"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 7b4feed1733..be630920268 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.willuhn.de/products/jameica/; + homepage = "https://www.willuhn.de/products/jameica/"; description = "Free Runtime Environment for Java Applications"; longDescription = '' Runtime Environment for plugins like Hibiscus (HBCI Online Banking), diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index 2e0b3f3fed7..cf1b5125adf 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication { meta = { description = "Note taking application"; - homepage = http://keepnote.org; + homepage = "http://keepnote.org"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/office/kexi/default.nix b/pkgs/applications/office/kexi/default.nix index 8db7068f7cf..4900dafb08e 100644 --- a/pkgs/applications/office/kexi/default.nix +++ b/pkgs/applications/office/kexi/default.nix @@ -49,7 +49,7 @@ mkDerivation rec { All database objects - tables, queries and forms - are stored in the database, making it easy to share data and design. ''; - homepage = http://kexi-project.org/; + homepage = "http://kexi-project.org/"; maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index e672b5c3efd..02c645f3d84 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "khronos"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0s6yx05k0x90bmdmr61hw07nf9a1kyvvk6gwlg8m97zq1n3qc0f3"; + sha256 = "0d5ma1d86lh2apagwrwk0d1v1cm3fifjivhf530nlznb67vi1x80"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 275cd826a69..6137a4dc1ad 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Personal finance manager for KDE"; - homepage = https://kmymoney.org/; + homepage = "https://kmymoney.org/"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 62ac6a80382..00c40255861 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -43,7 +43,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/egh/ledger-autosync; + homepage = "https://github.com/egh/ledger-autosync"; description = "OFX/CSV autosync for ledger and hledger"; license = licenses.gpl3; maintainers = with maintainers; [ eamsden ]; diff --git a/pkgs/applications/office/ledger-web/Gemfile.lock b/pkgs/applications/office/ledger-web/Gemfile.lock index f18460420c5..b12a8600ed2 100644 --- a/pkgs/applications/office/ledger-web/Gemfile.lock +++ b/pkgs/applications/office/ledger-web/Gemfile.lock @@ -58,4 +58,4 @@ DEPENDENCIES ledger_web BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/office/ledger-web/default.nix b/pkgs/applications/office/ledger-web/default.nix index 0a8f68bc096..ce8b401cb6b 100644 --- a/pkgs/applications/office/ledger-web/default.nix +++ b/pkgs/applications/office/ledger-web/default.nix @@ -15,7 +15,7 @@ bundlerApp { meta = with lib; { description = "A web frontend to the Ledger CLI tool"; - homepage = https://github.com/peterkeen/ledger-web; + homepage = "https://github.com/peterkeen/ledger-web"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg manveru nicknovitski ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 99e09a8f36f..05fb0592406 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://ledger-cli.org/; + homepage = "https://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; license = licenses.bsd3; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index a7d8f4c7d40..7625ba3bea8 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -3,8 +3,8 @@ , libxml2, db, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis, fontforge -, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux -, librsvg, gnome_vfs, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient +, openssl, gperf, cppunit, poppler, utillinux +, librsvg, libGLU, libGL, bsh, CoinMP, libwps, libabw, libmysqlclient , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -347,13 +347,13 @@ in (stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip boost cairo clucene_core IOCompress cppunit cups curl db dbus-glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk2 + freetype getopt gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst libXdmcp libpthreadstubs libGLU libGL mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib libmysqlclient - neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler + neon nspr nss openldap openssl pam perl pkgconfig poppler python3 sane-backends unzip vigra which zip zlib mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux @@ -370,7 +370,7 @@ in (stdenv.mkDerivation rec { meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; - homepage = https://libreoffice.org/; + homepage = "https://libreoffice.org/"; license = licenses.lgpl3; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/marp/default.nix b/pkgs/applications/office/marp/default.nix index 7c054ba5204..5b05a9f164b 100644 --- a/pkgs/applications/office/marp/default.nix +++ b/pkgs/applications/office/marp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Markdown presentation writer, powered by Electron"; - homepage = https://yhatt.github.io/marp/; + homepage = "https://yhatt.github.io/marp/"; license = licenses.mit; maintainers = [ maintainers.puffnfresh ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 9fdeecfee36..192585bd4b5 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -137,7 +137,7 @@ mkDerivation { updateScript = import ./update.nix { inherit writeScript runtimeShell; }; meta = with stdenv.lib; { - homepage = https://www.mendeley.com; + homepage = "https://www.mendeley.com"; description = "A reference manager and academic social network"; license = licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/office/minetime/default.nix b/pkgs/applications/office/minetime/default.nix index 42802409e59..8f90973e5f8 100644 --- a/pkgs/applications/office/minetime/default.nix +++ b/pkgs/applications/office/minetime/default.nix @@ -41,7 +41,7 @@ appimageTools.wrapAppImage rec { meta = with lib; { description = "Modern, intuitive and smart calendar application"; - homepage = https://minetime.ai; + homepage = "https://minetime.ai"; license = licenses.unfree; # Should be cross-platform, but for now we just grab the appimage platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/office/mmex/default.nix b/pkgs/applications/office/mmex/default.nix index ed33d121a05..6d430a286bd 100644 --- a/pkgs/applications/office/mmex/default.nix +++ b/pkgs/applications/office/mmex/default.nix @@ -27,7 +27,7 @@ in meta = { description = "Easy-to-use personal finance software"; - homepage = https://www.moneymanagerex.org/; + homepage = "https://www.moneymanagerex.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix index 103288c03c6..85d9715bf39 100644 --- a/pkgs/applications/office/moneyplex/default.nix +++ b/pkgs/applications/office/moneyplex/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; license = licenses.unfree; - downloadPage = http://matrica.de/download/download.html; + downloadPage = "http://matrica.de/download/download.html"; }; } diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix index 050222451cf..45d9e29ebe9 100644 --- a/pkgs/applications/office/mytetra/default.nix +++ b/pkgs/applications/office/mytetra/default.nix @@ -31,7 +31,7 @@ in mkDerivation { meta = with stdenv.lib; { description = "Smart manager for information collecting"; - homepage = https://webhamster.ru/site/page/index/articles/projectcode/138; + homepage = "https://webhamster.ru/site/page/index/articles/projectcode/138"; license = licenses.gpl3; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 1d2e581f3c9..055b3a41d09 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , pantheon , pkgconfig -, vala +, vala_0_46 , cmake , ninja , gtk3 @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja - vala + # fails with newer vala: https://github.com/Philip-Scott/Notes-up/issues/349 + vala_0_46 pkgconfig wrapGAppsHook ]; @@ -59,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Markdown notes editor and manager designed for elementary OS" + stdenv.lib.optionalString withPantheon " - built with Contractor support"; - homepage = https://github.com/Philip-Scott/Notes-up; + homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2; maintainers = with maintainers; [ davidak worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index b1311428c61..c3a7a5da455 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A handy personal organizer"; - homepage = http://clayo.org/osmo/; + homepage = "http://clayo.org/osmo/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/applications/office/paperless/default.nix b/pkgs/applications/office/paperless/default.nix index 1383986cf2e..c549b107c54 100644 --- a/pkgs/applications/office/paperless/default.nix +++ b/pkgs/applications/office/paperless/default.nix @@ -99,7 +99,7 @@ let meta = with lib; { description = "Scan, index, and archive all of your paper documents"; - homepage = https://github.com/the-paperless-project/paperless; + homepage = "https://github.com/the-paperless-project/paperless"; license = licenses.gpl3; maintainers = [ maintainers.earvstedt ]; }; diff --git a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix index 465da386247..c470a56b8a1 100644 --- a/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix +++ b/pkgs/applications/office/paperless/python-modules/django-crispy-forms.nix @@ -29,7 +29,7 @@ buildPythonPackage { meta = with lib; { description = "The best way to have DRY Django forms"; - homepage = https://github.com/maraujop/django-crispy-forms; + homepage = "https://github.com/maraujop/django-crispy-forms"; license = licenses.mit; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/applications/office/paperless/python-modules/django-filter.nix b/pkgs/applications/office/paperless/python-modules/django-filter.nix index ffe94d10d5c..d7f20bd9d37 100644 --- a/pkgs/applications/office/paperless/python-modules/django-filter.nix +++ b/pkgs/applications/office/paperless/python-modules/django-filter.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A reusable Django application for allowing users to filter querysets dynamically."; - homepage = https://github.com/carltongibson/django-filter; + homepage = "https://github.com/carltongibson/django-filter"; license = licenses.bsd3; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/applications/office/paperwork/backend.nix b/pkgs/applications/office/paperwork/backend.nix index c28a4bc916d..af0d4c43059 100644 --- a/pkgs/applications/office/paperwork/backend.nix +++ b/pkgs/applications/office/paperwork/backend.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "Backend part of Paperwork (Python API, no UI)"; - homepage = https://openpaper.work/; + homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; }; diff --git a/pkgs/applications/office/paperwork/default.nix b/pkgs/applications/office/paperwork/default.nix index c3930115365..102c3cd2564 100644 --- a/pkgs/applications/office/paperwork/default.nix +++ b/pkgs/applications/office/paperwork/default.nix @@ -94,7 +94,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A personal document manager for scanned documents"; - homepage = https://openpaper.work/; + homepage = "https://openpaper.work/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ aszlig symphorien ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix index 14756c3557f..ce175d8517f 100644 --- a/pkgs/applications/office/pinpoint/default.nix +++ b/pkgs/applications/office/pinpoint/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cairo clutter-gtk ]; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/Pinpoint; + homepage = "https://wiki.gnome.org/action/show/Apps/Pinpoint"; description = "A tool for making hackers do excellent presentations"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 6189132d0f9..f33946d6b5a 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Planner; + homepage = "https://wiki.gnome.org/Apps/Planner"; description = "Project management application for GNOME"; longDescription = '' Planner is the GNOME project management tool. diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index 769f58785ee..7821b041064 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonPackage rec { meta = { description = "Quick access to Zotero references"; - homepage = http://www.cogsci.nl/software/qnotero; + homepage = "http://www.cogsci.nl/software/qnotero"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/office/qownnotes/default.nix b/pkgs/applications/office/qownnotes/default.nix index fa2c67709fb..99b021429a6 100644 --- a/pkgs/applications/office/qownnotes/default.nix +++ b/pkgs/applications/office/qownnotes/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { meta = with lib; { description = "Plain-text file notepad and todo-list manager with markdown support and ownCloud / Nextcloud integration"; - homepage = https://www.qownnotes.org/; + homepage = "https://www.qownnotes.org/"; platforms = platforms.all; license = licenses.gpl2; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d6b73b07f0e..779a5cb0fea 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = https://www.scribus.net; + homepage = "https://www.scribus.net"; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/applications/office/skanlite/default.nix b/pkgs/applications/office/skanlite/default.nix index d4c1df75709..3c97c145c74 100644 --- a/pkgs/applications/office/skanlite/default.nix +++ b/pkgs/applications/office/skanlite/default.nix @@ -23,7 +23,7 @@ in mkDerivation rec { meta = with stdenv.lib; { description = "KDE simple image scanning application"; - homepage = http://www.kde.org/applications/graphics/skanlite/; + homepage = "http://www.kde.org/applications/graphics/skanlite/"; license = licenses.gpl2; maintainers = with maintainers; [ pshendry ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 1db5ce16fe5..f3e6f622996 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -36,6 +36,6 @@ mkDerivation rec { description = "A personal finances manager, powered by KDE"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ joko ]; - homepage = https://skrooge.org/; + homepage = "https://skrooge.org/"; }; } diff --git a/pkgs/applications/office/softmaker/desktop_items.nix b/pkgs/applications/office/softmaker/desktop_items.nix index 6975da06456..614c6574faa 100644 --- a/pkgs/applications/office/softmaker/desktop_items.nix +++ b/pkgs/applications/office/softmaker/desktop_items.nix @@ -4,10 +4,10 @@ planmaker = makeDesktopItem { name = "${pname}-planmaker"; desktopName = "${suiteName} PlanMaker"; - icon = "${pname}-pml.png"; - categories = "Application;Office;SpreadSheet;"; + icon = "${pname}-pml"; + categories = "Office;"; exec = "${pname}-planmaker %F"; - mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;"; + mimeType = "application/x-pmd;application/x-pmdx;application/x-pmv;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls;application/vnd.ms-excel;application/vnd.stardivision.calc;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.sheet.macroenabled.12;application/vnd.ms-excel.template.macroEnabled.12;application/x-dif;text/spreadsheet;text/csv;application/x-prn;application/vnd.ms-excel.sheet.binary.macroenabled.12;"; extraEntries = '' TryExec=${pname}-planmaker StartupWMClass=pm @@ -17,8 +17,8 @@ presentations = makeDesktopItem { name = "${pname}-presentations"; desktopName = "${suiteName} Presentations"; - icon = "${pname}-prl.png"; - categories = "Application;Office;Presentation;"; + icon = "${pname}-prl"; + categories = "Office;"; exec = "${pname}-presentations %F"; mimeType = "application/x-prdx;application/x-prvx;application/x-prsx;application/x-prd;application/x-prv;application/x-prs;application/ppt;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.ms-powerpoint.slideshow.macroenabled.12;application/vnd.openxmlformats-officedocument.presentationml.slideshow;"; extraEntries = '' @@ -30,8 +30,8 @@ textmaker = makeDesktopItem { name = "${pname}-textmaker"; desktopName = "${suiteName} TextMaker"; - icon = "${pname}-tml.png"; - categories = "Application;Office;WordProcessor;"; + icon = "${pname}-tml"; + categories = "Office;"; exec = "${pname}-textmaker %F"; mimeType = "application/x-tmdx;application/x-tmvx;application/x-tmd;application/x-tmv;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.stardivision.writer;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroenabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroenabled.12;application/x-pocket-word;application/x-dbf;application/msword-template;"; extraEntries = '' diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index b114194d563..d9f901ff463 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "freeoffice"; - version = "974"; + version = "976"; edition = "2018"; suiteName = "FreeOffice"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; - sha256 = "0z7131qmqyv1m9phm7wzvb5z7wkh27h59lsa3zc0zjkykikmjrp2"; + sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl"; }; archive = "freeoffice${edition}.tar.lzma"; diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index ed4903d6474..77634efebe8 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -2,13 +2,13 @@ callPackage ./generic.nix (args // rec { pname = "softmaker-office"; - version = "974"; + version = "976"; edition = "2018"; suiteName = "SoftMaker Office"; src = fetchurl { url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; - sha256 = "0z1g76lhja92s25x6y0h55wmqza2d3pjbshn5b9rn2784gjgj7hn"; + sha256 = "0j6zm0cbxrcgm7glk84hvvbp4z0ys6v8bkwwhl5r7dbphyi72fw8"; }; archive = "office${edition}.tar.lzma"; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 07a3b26a1a8..8afd459c42b 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create simple and beautiful presentations"; - homepage = https://github.com/Philip-Scott/Spice-up; + homepage = "https://github.com/Philip-Scott/Spice-up"; maintainers = with maintainers; [ samdroid-apps kjuvi ] ++ pantheon.maintainers; platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 24542041cc8..d826b9f54f6 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "tagainijisho-1.0.3"; src = fetchurl { - url = https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz; + url = "https://github.com/Gnurou/tagainijisho/releases/download/1.0.3/tagainijisho-1.0.3.tar.gz"; sha256 = "0kmg1940yiqfm4vpifyj680283ids4nsij9s750nrshwxiwwbqvg"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A free, open-source Japanese dictionary and kanji lookup tool"; - homepage = https://www.tagaini.net/; + homepage = "https://www.tagaini.net/"; license = with licenses; [ /* program */ gpl3Plus /* data */ cc-by-sa-30 diff --git a/pkgs/applications/office/timetrap/Gemfile.lock b/pkgs/applications/office/timetrap/Gemfile.lock index 9f2ea82cee0..30e48b7febb 100644 --- a/pkgs/applications/office/timetrap/Gemfile.lock +++ b/pkgs/applications/office/timetrap/Gemfile.lock @@ -2,12 +2,12 @@ GEM remote: https://rubygems.org/ specs: chronic (0.10.2) - sequel (4.43.0) - sqlite3 (1.3.13) - timetrap (1.15.1) + sequel (5.30.0) + sqlite3 (1.4.2) + timetrap (1.15.2) chronic (~> 0.10.2) - sequel (~> 4.43.0) - sqlite3 (~> 1.3.3) + sequel (~> 5.30.0) + sqlite3 (~> 1.4.2) PLATFORMS ruby @@ -16,4 +16,4 @@ DEPENDENCIES timetrap BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/applications/office/timetrap/default.nix b/pkgs/applications/office/timetrap/default.nix index 6d094ecb5dc..579c9e115be 100644 --- a/pkgs/applications/office/timetrap/default.nix +++ b/pkgs/applications/office/timetrap/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A simple command line time tracker written in ruby"; - homepage = https://github.com/samg/timetrap; + homepage = "https://github.com/samg/timetrap"; license = licenses.mit; maintainers = with maintainers; [ jerith666 manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/applications/office/timetrap/gemset.nix b/pkgs/applications/office/timetrap/gemset.nix index 1ea489b92c3..65ab4ade9e0 100644 --- a/pkgs/applications/office/timetrap/gemset.nix +++ b/pkgs/applications/office/timetrap/gemset.nix @@ -14,20 +14,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "121z4sq2m4vsgxwy8hs6d12cc1i4xa5rjiv0nbviyj87jldxapw0"; + sha256 = "0gqqnqrfayhwhkp0vy3frv68sgc7klyd6mfisx1j3djjvlyc7hmr"; type = "gem"; }; - version = "4.43.0"; + version = "5.30.0"; }; sqlite3 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01ifzp8nwzqppda419c9wcvr8n82ysmisrs0hph9pdmv1lpa4f5i"; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; type = "gem"; }; - version = "1.3.13"; + version = "1.4.2"; }; timetrap = { dependencies = ["chronic" "sequel" "sqlite3"]; @@ -35,9 +35,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ylaz9q99hbxnw6h1df6wphmh68fj847d1l4f9jylcx3nzzp5cyd"; + sha256 = "0pfg5c3kmh1jfaaszw253bi93ixa6cznqmsafrcpccrdg9r8j2k8"; type = "gem"; }; - version = "1.15.1"; + version = "1.15.2"; }; } \ No newline at end of file diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index edb2c778a0a..d711440fc34 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation { meta = { description = "Simple plaintext todo list manager"; - homepage = http://todotxt.com; + homepage = "http://todotxt.com"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index 9aeddf1a021..e18a11a7448 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -42,7 +42,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pimutils/todoman; + homepage = "https://github.com/pimutils/todoman"; description = "Standards-based task manager based on iCalendar"; longDescription = '' Todoman is a simple, standards-based, cli todo (aka: task) manager. Todos diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 000fa7ff101..d316d428707 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { planning, requirements gathering, presentation of information, etc. ''; - homepage = http://strlen.com/treesheets/; + homepage = "http://strlen.com/treesheets/"; maintainers = with maintainers; [ obadz avery ]; platforms = platforms.linux; license = licenses.zlib; diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 3794a676d4c..18c512874db 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -13,7 +13,7 @@ let meta = with stdenv.lib; { inherit description; - homepage = https://github.com/zadam/trilium; + homepage = "https://github.com/zadam/trilium"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index b9f1465af17..d0c5eb4e7b2 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -70,7 +70,7 @@ python3Packages.buildPythonApplication rec { It is the core base of a complete business solution providing modularity, scalability and security. ''; - homepage = http://www.tryton.org/; + homepage = "http://www.tryton.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ johbo udono ]; }; diff --git a/pkgs/applications/office/trytond/default.nix b/pkgs/applications/office/trytond/default.nix index dc63acd6db6..c45562a0c8d 100644 --- a/pkgs/applications/office/trytond/default.nix +++ b/pkgs/applications/office/trytond/default.nix @@ -45,7 +45,7 @@ python2Packages.buildPythonApplication rec { It is the core base of a complete business solution providing modularity, scalability and security. ''; - homepage = http://www.tryton.org/; + homepage = "http://www.tryton.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ udono johbo ]; }; diff --git a/pkgs/applications/office/tudu/default.nix b/pkgs/applications/office/tudu/default.nix index a4734f45460..cb3b2111372 100644 --- a/pkgs/applications/office/tudu/default.nix +++ b/pkgs/applications/office/tudu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "ncurses-based hierarchical todo list manager with vim-like keybindings"; - homepage = https://code.meskio.net/tudu/; + homepage = "https://code.meskio.net/tudu/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 7d79d79072a..160e8210083 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ requests click arrow ]; meta = with stdenv.lib; { - homepage = https://tailordev.github.io/Watson/; + homepage = "https://tailordev.github.io/Watson/"; description = "A wonderful CLI to track your time!"; license = licenses.mit; maintainers = with maintainers; [ mguentner nathyong ] ; diff --git a/pkgs/applications/office/wordgrinder/default.nix b/pkgs/applications/office/wordgrinder/default.nix index 199f17afda7..c2ccbabe2f1 100644 --- a/pkgs/applications/office/wordgrinder/default.nix +++ b/pkgs/applications/office/wordgrinder/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Text-based word processor"; - homepage = https://cowlark.com/wordgrinder; + homepage = "https://cowlark.com/wordgrinder"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix index 7032632da88..68ef8f61d66 100644 --- a/pkgs/applications/office/wpsoffice/default.nix +++ b/pkgs/applications/office/wpsoffice/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec{ meta = { description = "Office program originally named Kingsoft Office"; - homepage = http://wps-community.org/; + homepage = "http://wps-community.org/"; platforms = [ "i686-linux" "x86_64-linux" ]; hydraPlatforms = []; license = stdenv.lib.licenses.unfreeRedistributable; @@ -91,4 +91,4 @@ stdenv.mkDerivation rec{ --replace /opt/kingsoft/wps-office $prefix done ''; -} \ No newline at end of file +} diff --git a/pkgs/applications/office/zanshin/default.nix b/pkgs/applications/office/zanshin/default.nix index b4adc947c4d..18e76297496 100644 --- a/pkgs/applications/office/zanshin/default.nix +++ b/pkgs/applications/office/zanshin/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "A powerful yet simple application to manage your day to day actions, getting your mind like water"; - homepage = https://zanshin.kde.org/; + homepage = "https://zanshin.kde.org/"; maintainers = with maintainers; [ zraexy ]; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 075552b1ec4..ba6351da1dd 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -34,7 +34,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A desktop wiki"; - homepage = http://zim-wiki.org; + homepage = "http://zim-wiki.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; broken = stdenv.isDarwin; # https://github.com/NixOS/nixpkgs/pull/52658#issuecomment-449565790 diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 54530cb8dce..8a27dcd3c9f 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -42,10 +42,11 @@ stdenv.mkDerivation rec { sha256 = "1abkwxdi154hnry8nsvxbklvbsnvd7cs2as0041h2kbiz824pv31"; }; - buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme dconf ]; - - phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ]; + nativeBuildInputs = [ wrapGAppsHook ]; + buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome3.adwaita-icon-theme dconf ]; + dontConfigure = true; + dontBuild = true; dontStrip = true; dontPatchELF = true; diff --git a/pkgs/applications/radio/airspy/default.nix b/pkgs/applications/radio/airspy/default.nix index 0a313c35a18..67a59b68cd5 100644 --- a/pkgs/applications/radio/airspy/default.nix +++ b/pkgs/applications/radio/airspy/default.nix @@ -1,36 +1,33 @@ { stdenv, lib, fetchFromGitHub -, cmake , pkgconfig, libusb +, cmake , pkgconfig, libusb1 }: -let +stdenv.mkDerivation rec { + pname = "airspy"; version = "1.0.9"; -in - stdenv.mkDerivation { - pname = "airspy"; - inherit version; - src = fetchFromGitHub { - owner = "airspy"; - repo = "airspyone_host"; - rev = "v${version}"; - sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x"; - }; + src = fetchFromGitHub { + owner = "airspy"; + repo = "airspyone_host"; + rev = "v${version}"; + sha256 = "04kx2p461sqd4q354n1a99zcabg9h29dwcnyhakykq8bpg3mgf1x"; + }; - postPatch = '' - substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d" - ''; + postPatch = '' + substituteInPlace airspy-tools/CMakeLists.txt --replace "/etc/udev/rules.d" "$out/etc/udev/rules.d" + ''; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libusb ]; + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ libusb1 ]; - cmakeFlags = - lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; + cmakeFlags = + lib.optionals stdenv.isLinux [ "-DINSTALL_UDEV_RULES=ON" ]; - meta = with stdenv.lib; { - homepage = https://github.com/airspy/airspyone_host; - description = "Host tools and driver library for the AirSpy SDR"; - license = licenses.bsd3; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ markuskowa ]; - }; - } + meta = with stdenv.lib; { + homepage = "https://github.com/airspy/airspyone_host"; + description = "Host tools and driver library for the AirSpy SDR"; + license = licenses.bsd3; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ markuskowa ]; + }; +} diff --git a/pkgs/applications/radio/aldo/default.nix b/pkgs/applications/radio/aldo/default.nix index fc38f6be4cc..df52531a518 100644 --- a/pkgs/applications/radio/aldo/default.nix +++ b/pkgs/applications/radio/aldo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Morse code training program"; - homepage = http://aldo.nongnu.org/; + homepage = "http://aldo.nongnu.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index f88687b076e..41cad47f246 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -17,7 +17,7 @@ python2.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A free, open-source tool for programming your amateur radio"; - homepage = https://chirp.danplanet.com/; + homepage = "https://chirp.danplanet.com/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.the-kenny ]; diff --git a/pkgs/applications/radio/cubicsdr/default.nix b/pkgs/applications/radio/cubicsdr/default.nix index 14badd6c55c..ef4d68af54c 100644 --- a/pkgs/applications/radio/cubicsdr/default.nix +++ b/pkgs/applications/radio/cubicsdr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON"; meta = with stdenv.lib; { - homepage = https://cubicsdr.com; + homepage = "https://cubicsdr.com"; description = "Software Defined Radio application"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lasandell ]; diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index fba63362ab6..d365596b9c3 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Play DAB/DAB+ from ETI-NI aligned stream"; - homepage = https://github.com/Opendigitalradio/dablin; + homepage = "https://github.com/Opendigitalradio/dablin"; license = with licenses; [ gpl3 lgpl21 ]; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/applications/radio/dmrconfig/default.nix b/pkgs/applications/radio/dmrconfig/default.nix index 68b4cfe8af4..47b72669f8f 100644 --- a/pkgs/applications/radio/dmrconfig/default.nix +++ b/pkgs/applications/radio/dmrconfig/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { longDescription = '' DMRconfig is a utility for programming digital radios via USB programming cable. ''; - homepage = https://github.com/sergev/dmrconfig; + homepage = "https://github.com/sergev/dmrconfig"; license = licenses.asl20; maintainers = [ maintainers.etu ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix index 0a92bea44e8..3ab25d86e75 100644 --- a/pkgs/applications/radio/dump1090/default.nix +++ b/pkgs/applications/radio/dump1090/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , pkgconfig , libbladeRF -, libusb +, libusb1 , ncurses , rtl-sdr }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libbladeRF - libusb + libusb1 ncurses rtl-sdr ]; diff --git a/pkgs/applications/radio/ebook2cw/default.nix b/pkgs/applications/radio/ebook2cw/default.nix index 915d0ba84db..d273594f4c9 100644 --- a/pkgs/applications/radio/ebook2cw/default.nix +++ b/pkgs/applications/radio/ebook2cw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert ebooks to Morse MP3s/OGGs"; - homepage = http://fkurz.net/ham/ebook2cw.html; + homepage = "http://fkurz.net/ham/ebook2cw.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ earldouglas ]; diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index b7705cff026..20cf2cf6286 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.09"; + version = "4.1.11"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1pdwm8na2yq6wj76057sbfxr5cb5avnm26if8spsp5fkfw9yylwp"; + sha256 = "1y62xn1pim38ibaf2mbl8b7aq20jdaac6lgggb9r402w9bj5b196"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/radio/fllog/default.nix b/pkgs/applications/radio/fllog/default.nix index 49149a2d82a..649caae0902 100644 --- a/pkgs/applications/radio/fllog/default.nix +++ b/pkgs/applications/radio/fllog/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem log program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/radio/flmsg/default.nix b/pkgs/applications/radio/flmsg/default.nix index 39fbb0de06c..e437dffa485 100644 --- a/pkgs/applications/radio/flmsg/default.nix +++ b/pkgs/applications/radio/flmsg/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem message program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index 17d579cb45e..968b2fd0df9 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation rec { - version = "1.3.49"; + version = "1.3.50"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "0icfniiw2l7d7gyxrzy87n3ragzvf0ykvq7c10ppf111wl5in295"; + sha256 = "0fzrknzzi8kmzmrcfpc8rxr7v4a4ny6z6z5q5qwh95sp2kn2qzp9"; }; buildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem rig control program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/radio/flwrap/default.nix b/pkgs/applications/radio/flwrap/default.nix index 6bdab0a925d..889c212de4e 100644 --- a/pkgs/applications/radio/flwrap/default.nix +++ b/pkgs/applications/radio/flwrap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Digital modem file transfer program"; - homepage = https://sourceforge.net/projects/fldigi/; + homepage = "https://sourceforge.net/projects/fldigi/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ dysinger ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/radio/gnuradio/ais.nix b/pkgs/applications/radio/gnuradio/ais.nix index c26d3e77c70..30c2638a72f 100644 --- a/pkgs/applications/radio/gnuradio/ais.nix +++ b/pkgs/applications/radio/gnuradio/ais.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio block for ais"; - homepage = https://github.com/bistromath/gr-ais; + homepage = "https://github.com/bistromath/gr-ais"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/radio/gnuradio/default.nix b/pkgs/applications/radio/gnuradio/default.nix index f5c89ae51ce..6d788f77bc3 100644 --- a/pkgs/applications/radio/gnuradio/default.nix +++ b/pkgs/applications/radio/gnuradio/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { environments to support both wireless communications research and real-world radio systems. ''; - homepage = https://www.gnuradio.org; + homepage = "https://www.gnuradio.org"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz ]; diff --git a/pkgs/applications/radio/gnuradio/gsm.nix b/pkgs/applications/radio/gnuradio/gsm.nix index 27cdfc74aab..e0b8d7dd44f 100644 --- a/pkgs/applications/radio/gnuradio/gsm.nix +++ b/pkgs/applications/radio/gnuradio/gsm.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio block for gsm"; - homepage = https://github.com/ptrkrysik/gr-gsm; + homepage = "https://github.com/ptrkrysik/gr-gsm"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/radio/gnuradio/limesdr.nix b/pkgs/applications/radio/gnuradio/limesdr.nix index ec1b802c659..490caaaa7be 100644 --- a/pkgs/applications/radio/gnuradio/limesdr.nix +++ b/pkgs/applications/radio/gnuradio/limesdr.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio source and sink blocks for LimeSDR"; - homepage = https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio; + homepage = "https://wiki.myriadrf.org/Gr-limesdr_Plugin_for_GNURadio"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/applications/radio/gnuradio/nacl.nix b/pkgs/applications/radio/gnuradio/nacl.nix index 3026c81e8ef..e3d851e2e14 100644 --- a/pkgs/applications/radio/gnuradio/nacl.nix +++ b/pkgs/applications/radio/gnuradio/nacl.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Gnuradio block for encryption"; - homepage = https://github.com/stwunsch/gr-nacl; + homepage = "https://github.com/stwunsch/gr-nacl"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/radio/gnuradio/osmosdr.nix b/pkgs/applications/radio/gnuradio/osmosdr.nix index 017e2e1632c..1078cf4df68 100644 --- a/pkgs/applications/radio/gnuradio/osmosdr.nix +++ b/pkgs/applications/radio/gnuradio/osmosdr.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnuradio block for OsmoSDR and rtl-sdr"; - homepage = https://sdr.osmocom.org/trac/wiki/GrOsmoSDR; + homepage = "https://sdr.osmocom.org/trac/wiki/GrOsmoSDR"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor the-kenny ]; diff --git a/pkgs/applications/radio/gnuradio/rds.nix b/pkgs/applications/radio/gnuradio/rds.nix index e4a55fe5098..1f8ed211ef2 100644 --- a/pkgs/applications/radio/gnuradio/rds.nix +++ b/pkgs/applications/radio/gnuradio/rds.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnuradio block for radio data system"; - homepage = https://github.com/bastibl/gr-rds; + homepage = "https://github.com/bastibl/gr-rds"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mog ]; diff --git a/pkgs/applications/radio/gqrx/default.nix b/pkgs/applications/radio/gqrx/default.nix index e95c7d77952..f1a71804e3f 100644 --- a/pkgs/applications/radio/gqrx/default.nix +++ b/pkgs/applications/radio/gqrx/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { including Funcube Dongle Pro/Pro+, rtl-sdr, HackRF, and Universal Software Radio Peripheral (USRP) devices. ''; - homepage = http://gqrx.dk/; + homepage = "https://gqrx.dk/"; # Some of the code comes from the Cutesdr project, with a BSD license, but # it's currently unknown which version of the BSD license that is. license = licenses.gpl3Plus; diff --git a/pkgs/applications/radio/hackrf/default.nix b/pkgs/applications/radio/hackrf/default.nix index 09b4c84c131..9569dd89797 100644 --- a/pkgs/applications/radio/hackrf/default.nix +++ b/pkgs/applications/radio/hackrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb, fftwSinglePrec }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libusb1, fftwSinglePrec }: stdenv.mkDerivation rec { pname = "hackrf"; @@ -11,9 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0idh983xh6gndk9kdgx5nzz76x3mxb42b02c5xvdqahadsfx3b9w"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; + buildInputs = [ - cmake libusb fftwSinglePrec + libusb1 + fftwSinglePrec ]; cmakeFlags = [ "-DUDEV_RULES_GROUP=plugdev" "-DUDEV_RULES_PATH=lib/udev/rules.d" ]; @@ -24,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source SDR platform"; - homepage = http://greatscottgadgets.com/hackrf/; + homepage = "http://greatscottgadgets.com/hackrf/"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ sjmackenzie the-kenny ]; diff --git a/pkgs/applications/radio/kalibrate-hackrf/default.nix b/pkgs/applications/radio/kalibrate-hackrf/default.nix index 3964a8c3737..273d2d8c8e3 100644 --- a/pkgs/applications/radio/kalibrate-hackrf/default.nix +++ b/pkgs/applications/radio/kalibrate-hackrf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { This package is for hackrf devices. ''; - homepage = https://github.com/scateu/kalibrate-hackrf; + homepage = "https://github.com/scateu/kalibrate-hackrf"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.mog ]; diff --git a/pkgs/applications/radio/kalibrate-rtl/default.nix b/pkgs/applications/radio/kalibrate-rtl/default.nix index 879cd6e3aac..38913e827d0 100644 --- a/pkgs/applications/radio/kalibrate-rtl/default.nix +++ b/pkgs/applications/radio/kalibrate-rtl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { This package is for RTL-SDR devices. ''; - homepage = https://github.com/steve-m/kalibrate-rtl; + homepage = "https://github.com/steve-m/kalibrate-rtl"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/radio/limesuite/default.nix b/pkgs/applications/radio/limesuite/default.nix index aae062a87c7..ef36eac28e4 100644 --- a/pkgs/applications/radio/limesuite/default.nix +++ b/pkgs/applications/radio/limesuite/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Driver and GUI for LMS7002M-based SDR platforms"; - homepage = https://github.com/myriadrf/LimeSuite; + homepage = "https://github.com/myriadrf/LimeSuite"; license = licenses.asl20; maintainers = with maintainers; [ markuskowa ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/minimodem/default.nix b/pkgs/applications/radio/minimodem/default.nix index 55cd14cf70d..e94561e46dc 100644 --- a/pkgs/applications/radio/minimodem/default.nix +++ b/pkgs/applications/radio/minimodem/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { standard FSK protocols such as Bell103, Bell202, RTTY, NOAA SAME, and Caller-ID. ''; - homepage = http://www.whence.com/minimodem/; + homepage = "http://www.whence.com/minimodem/"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ relrod ]; diff --git a/pkgs/applications/radio/multimon-ng/default.nix b/pkgs/applications/radio/multimon-ng/default.nix index c0f189686ac..de6b8504091 100644 --- a/pkgs/applications/radio/multimon-ng/default.nix +++ b/pkgs/applications/radio/multimon-ng/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { AFSK2400 AFSK2400_2 AFSK2400_3 HAPN4800 FSK9600 DTMF ZVEI1 ZVEI2 ZVEI3 DZVEI PZVEI EEA EIA CCIR MORSE CW ''; - homepage = https://github.com/EliasOenal/multimon-ng; + homepage = "https://github.com/EliasOenal/multimon-ng"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ the-kenny ]; diff --git a/pkgs/applications/radio/pyradio/default.nix b/pkgs/applications/radio/pyradio/default.nix index 88ce23cd709..f23359688c6 100644 --- a/pkgs/applications/radio/pyradio/default.nix +++ b/pkgs/applications/radio/pyradio/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "pyradio"; - version = "0.8.7.1"; + version = "0.8.7.2"; src = fetchFromGitHub { owner = "coderholic"; repo = pname; rev = version; - sha256 = "1f1dch5vrx2armrff19rh9gpqydspn3nvzc9p9j2jfi6gsxhppyb"; + sha256 = "0h2sxaqpmc1d1kpvpbcs9wymgzhx25x0x9p7dbyfw9r90i6123q1"; }; checkPhase = '' diff --git a/pkgs/applications/radio/qradiolink/default.nix b/pkgs/applications/radio/qradiolink/default.nix index a00ec6c47eb..4c792811dc5 100644 --- a/pkgs/applications/radio/qradiolink/default.nix +++ b/pkgs/applications/radio/qradiolink/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "SDR transceiver application for analog and digital modes"; - homepage = http://qradiolink.org/; + homepage = "http://qradiolink.org/"; license = licenses.agpl3; maintainers = [ maintainers.markuskowa ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/qsstv/default.nix b/pkgs/applications/radio/qsstv/default.nix index a4ef5a2a0d1..d5d12a71403 100644 --- a/pkgs/applications/radio/qsstv/default.nix +++ b/pkgs/applications/radio/qsstv/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Qt-based slow-scan TV and fax"; - homepage = http://users.telenet.be/on4qz/; + homepage = "http://users.telenet.be/on4qz/"; platforms = platforms.linux; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ hax404 ]; diff --git a/pkgs/applications/radio/rtl-sdr/default.nix b/pkgs/applications/radio/rtl-sdr/default.nix index 69c568c3a1b..8fb5154ff78 100644 --- a/pkgs/applications/radio/rtl-sdr/default.nix +++ b/pkgs/applications/radio/rtl-sdr/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Turns your Realtek RTL2832 based DVB dongle into a SDR receiver"; - homepage = http://sdr.osmocom.org/trac/wiki/rtl-sdr; + homepage = "http://sdr.osmocom.org/trac/wiki/rtl-sdr"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/radio/rtl_433/default.nix b/pkgs/applications/radio/rtl_433/default.nix index 5faac96d28f..78d0f8befc9 100644 --- a/pkgs/applications/radio/rtl_433/default.nix +++ b/pkgs/applications/radio/rtl_433/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Decode traffic from devices that broadcast on 433.9 MHz"; - homepage = https://github.com/merbanan/rtl_433; + homepage = "https://github.com/merbanan/rtl_433"; license = licenses.gpl2; maintainers = with maintainers; [ earldouglas ]; platforms = platforms.all; diff --git a/pkgs/applications/radio/soapyairspy/default.nix b/pkgs/applications/radio/soapyairspy/default.nix index eacbe66e5e5..4a69e52741e 100644 --- a/pkgs/applications/radio/soapyairspy/default.nix +++ b/pkgs/applications/radio/soapyairspy/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyAirspy; + homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for Airspy devices"; license = licenses.mit; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapybladerf/default.nix b/pkgs/applications/radio/soapybladerf/default.nix index 0bb05a204da..7e2e17a8455 100644 --- a/pkgs/applications/radio/soapybladerf/default.nix +++ b/pkgs/applications/radio/soapybladerf/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyBladeRF; + homepage = "https://github.com/pothosware/SoapyBladeRF"; description = "SoapySDR plugin for BladeRF devices"; license = licenses.lgpl21; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapyhackrf/default.nix b/pkgs/applications/radio/soapyhackrf/default.nix index 5ab4c3363f4..e472b1cc3ae 100644 --- a/pkgs/applications/radio/soapyhackrf/default.nix +++ b/pkgs/applications/radio/soapyhackrf/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyHackRF; + homepage = "https://github.com/pothosware/SoapyHackRF"; description = "SoapySDR plugin for HackRF devices"; license = licenses.mit; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapyremote/default.nix b/pkgs/applications/radio/soapyremote/default.nix index 2f73403a168..ed94693db41 100644 --- a/pkgs/applications/radio/soapyremote/default.nix +++ b/pkgs/applications/radio/soapyremote/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyRemote; + homepage = "https://github.com/pothosware/SoapyRemote"; description = "SoapySDR plugin for remote access to SDRs"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapyrtlsdr/default.nix b/pkgs/applications/radio/soapyrtlsdr/default.nix index 8bf473cb36a..8f342190ba7 100644 --- a/pkgs/applications/radio/soapyrtlsdr/default.nix +++ b/pkgs/applications/radio/soapyrtlsdr/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DSoapySDR_DIR=${soapysdr}/share/cmake/SoapySDR/" ]; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyRTLSDR; + homepage = "https://github.com/pothosware/SoapyRTLSDR"; description = "SoapySDR plugin for RTL-SDR devices"; license = licenses.mit; maintainers = with maintainers; [ ragge ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index e072ec97b97..36df6ad19d3 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapySDR; + homepage = "https://github.com/pothosware/SoapySDR"; description = "Vendor and platform neutral SDR support library"; license = licenses.boost; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/soapyuhd/default.nix b/pkgs/applications/radio/soapyuhd/default.nix index 9e910584158..a169116c29a 100644 --- a/pkgs/applications/radio/soapyuhd/default.nix +++ b/pkgs/applications/radio/soapyuhd/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/pothosware/SoapyAirspy; + homepage = "https://github.com/pothosware/SoapyAirspy"; description = "SoapySDR plugin for UHD devices"; license = licenses.gpl3; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index 530008702f1..e3fdb9718e4 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { EU SPRINT shortwave contests (single operator) as well as a LOT MORE basic contests, general QSO and DXpedition mode. ''; - homepage = https://tlf.github.io/; + homepage = "https://tlf.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/applications/radio/tqsl/default.nix b/pkgs/applications/radio/tqsl/default.nix index 451a63c3d81..fd5f5505a67 100644 --- a/pkgs/applications/radio/tqsl/default.nix +++ b/pkgs/applications/radio/tqsl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software for using the ARRL Logbook of the World"; - homepage = https://www.arrl.org/tqsl-download; + homepage = "https://www.arrl.org/tqsl-download"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.dpflug ]; diff --git a/pkgs/applications/radio/uhd/default.nix b/pkgs/applications/radio/uhd/default.nix index 76519062f59..e7ddb5787fa 100644 --- a/pkgs/applications/radio/uhd/default.nix +++ b/pkgs/applications/radio/uhd/default.nix @@ -1,57 +1,129 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig -, python, orc, libusb1, boost }: - -# You need these udev rules to not have to run as root (copied from -# ${uhd}/share/uhd/utils/uhd-usrp.rules): -# -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="fffe", ATTRS{idProduct}=="0002", MODE:="0666" -# SUBSYSTEMS=="usb", ATTRS{idVendor}=="2500", ATTRS{idProduct}=="0002", MODE:="0666" +{ stdenv +, fetchurl +, fetchFromGitHub +, cmake +, pkgconfig +# See https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html for dependencies explanations +, boost +, enableLibuhd_C_api ? true +# requires numpy +, enableLibuhd_Python_api ? false +, python3 ? null +, enableExamples ? false +, enableUtils ? false +, enableLiberio ? false +, liberio ? null +, libusb1 ? null +, enableDpdk ? false +, dpdk ? null +# Devices +, enableOctoClock ? true +, enableMpmd ? true +, enableB100 ? true +, enableB200 ? true +, enableUsrp1 ? true +, enableUsrp2 ? true +, enableX300 ? true +, enableN230 ? true +, enableN300 ? true +, enableN320 ? true +, enableE300 ? true +, enableE320 ? true +}: let - uhdVer = "v" + version; + onOffBool = b: if b then "ON" else "OFF"; + inherit (stdenv.lib) optionals; +in +stdenv.mkDerivation rec { + pname = "uhd"; # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz # and xxx.yyy.zzz. Hrmpf... style keeps changing - version = "3.14.0.0"; - - # Firmware images are downloaded (pre-built) from the respective release on Github - uhdImagesSrc = fetchurl { - url = "https://github.com/EttusResearch/uhd/releases/download/${uhdVer}/uhd-images_${version}.tar.xz"; - sha256 = "1fp37wgqkbr14cxg9l7ghfd4r92y2bxwgb7cfjzs96hbpd9s6al0"; - }; - -in stdenv.mkDerivation { - pname = "uhd"; - inherit version; + version = "3.15.0.0"; src = fetchFromGitHub { owner = "EttusResearch"; repo = "uhd"; - rev = uhdVer; - sha256 = "0y1hff4vslfv36vxgvjqajg4862a11d4wgr0vcb0visgh1bi8qgy"; + rev = "v${version}"; + sha256 = "0jknln88a69fh244670nb7qrflbyv0vvdxfddb5g8ncpb6hcg8qf"; + }; + # Firmware images are downloaded (pre-built) from the respective release on Github + uhdImagesSrc = fetchurl { + url = "https://github.com/EttusResearch/uhd/releases/download/v${version}/uhd-images_${version}.tar.xz"; + sha256 = "1fir1a13ac07mqhm4sr34cixiqj2difxq0870qv1wr7a7cbfw6vp"; }; enableParallelBuilding = true; - # 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 + cmakeFlags = [ + "-DENABLE_LIBUHD=ON" + "-DENABLE_USB=ON" + "-DENABLE_TESTS=ON" # This installs tests as well so we delete them via postPhases + "-DENABLE_EXAMPLES=${onOffBool enableExamples}" + "-DENABLE_UTILS=${onOffBool enableUtils}" + "-DENABLE_LIBUHD_C_API=${onOffBool enableLibuhd_C_api}" + "-DENABLE_LIBUHD_PYTHON_API=${onOffBool enableLibuhd_Python_api}" + "-DENABLE_LIBERIO=${onOffBool enableLiberio}" + "-DENABLE_DPDK=${onOffBool enableDpdk}" + # Devices + "-DENABLE_OCTOCLOCK=${onOffBool enableOctoClock}" + "-DENABLE_MPMD=${onOffBool enableMpmd}" + "-DENABLE_B100=${onOffBool enableB100}" + "-DENABLE_B200=${onOffBool enableB200}" + "-DENABLE_USRP1=${onOffBool enableUsrp1}" + "-DENABLE_USRP2=${onOffBool enableUsrp2}" + "-DENABLE_X300=${onOffBool enableX300}" + "-DENABLE_N230=${onOffBool enableN230}" + "-DENABLE_N300=${onOffBool enableN300}" + "-DENABLE_N320=${onOffBool enableN320}" + "-DENABLE_E300=${onOffBool enableE300}" + "-DENABLE_E320=${onOffBool enableE320}" + ] + # 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") ] + ; - cmakeFlags = [ "-DLIBUSB_INCLUDE_DIRS=${libusb1.dev}/include/libusb-1.0"] ++ - [ (stdenv.lib.optionalString stdenv.isAarch32 "-DCMAKE_CXX_FLAGS=-Wno-psabi") ]; + # Python + Mako are always required for the build itself but not necessary for runtime. + pythonEnv = python3.withPackages (ps: with ps; [ Mako ] + ++ optionals (enableLibuhd_Python_api) [ numpy setuptools ] + ++ optionals (enableUtils) [ requests six ] + ); - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + ] + # 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 + # dependency + ++ optionals (!enableLibuhd_Python_api && !enableUtils) [ pythonEnv ] + ; buildInputs = [ - (python.withPackages (ps: with ps; [ Mako six requests ])) - orc - libusb1 boost - ]; + libusb1 + ] + # However, if enableLibuhd_Python_api *or* enableUtils is on, we need + # pythonEnv for runtime as well. The utilities' runtime dependencies are + # handled at the environment + ++ optionals (enableLibuhd_Python_api || enableUtils) [ pythonEnv ] + ++ optionals (enableLiberio) [ liberio ] + ++ optionals (enableDpdk) [ dpdk ] + ; + + doCheck = true; # Build only the host software preConfigure = "cd host"; + # TODO: Check if this still needed, perhaps relevant: + # https://files.ettus.com/manual_archive/v3.15.0.0/html/page_build_guide.html#build_instructions_unix_arm patches = if stdenv.isAarch32 then ./neon.patch else null; - postPhases = [ "installFirmware" ]; + postPhases = [ "installFirmware" "removeInstalledTests" ] + ++ optionals (enableUtils) [ "moveUdevRules" ] + ; # UHD expects images in `$CMAKE_INSTALL_PREFIX/share/uhd/images` installFirmware = '' @@ -59,6 +131,18 @@ in stdenv.mkDerivation { tar --strip-components=1 -xvf "${uhdImagesSrc}" -C "$out/share/uhd/images" ''; + # -DENABLE_TESTS=ON installs the tests, we don't need them in the output + removeInstalledTests = '' + rm -r $out/lib/uhd/tests + ''; + + # Moves the udev rules to the standard location, needed only if utils are + # enabled + moveUdevRules = '' + mkdir -p $out/lib/udev/rules.d + mv $out/lib/uhd/utils/uhd-usrp.rules $out/lib/udev/rules.d/ + ''; + meta = with stdenv.lib; { description = "USRP Hardware Driver (for Software Defined Radio)"; longDescription = '' @@ -68,7 +152,7 @@ in stdenv.mkDerivation { USRP devices are designed and sold by Ettus Research, LLC and its parent company, National Instruments. ''; - homepage = https://uhd.ettus.com/; + homepage = "https://uhd.ettus.com/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz tomberek ]; diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 6c8615fd631..850f73c4922 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.3"; + version = "2.8.5"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "17104livp6fv2zg56sqv90lqb7ywqhq2qfnal1hriwwh1b92glv8"; + sha256 = "060npn0q7yrby2zj9hi8x7raivs91v9hvryvf45k1ipyqh8dgri6"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 66a033fef25..971399c4a22 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -42,7 +42,7 @@ in mkDerivation { meta = with lib; { description = "A DAB/DAB+ Software Radio"; - homepage = https://www.welle.io/; + homepage = "https://www.welle.io/"; maintainers = with maintainers; [ ck3d markuskowa ]; license = licenses.gpl2; platforms = with platforms; [ "x86_64-linux" "i686-linux" ] ++ darwin; diff --git a/pkgs/applications/radio/xlog/default.nix b/pkgs/applications/radio/xlog/default.nix index 2268cdf725d..31bcfa463b9 100644 --- a/pkgs/applications/radio/xlog/default.nix +++ b/pkgs/applications/radio/xlog/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { location in latitude and longitude and distance and heading in kilometers or miles, both for short and long path. ''; - homepage = https://www.nongnu.org/xlog; + homepage = "https://www.nongnu.org/xlog"; maintainers = [ maintainers.mafo ]; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index 32d89866b5a..cb3f3131ea1 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib;{ - homepage = https://www.astrolabeproject.com; + homepage = "https://www.astrolabeproject.com"; description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; license = licenses.gpl3; maintainers = [ maintainers.genesis ]; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index e72354c8658..340641917e4 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { meta = { description = "Free space simulation"; - homepage = https://celestia.space/; + homepage = "https://celestia.space/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/astronomy/gildas/default.nix b/pkgs/applications/science/astronomy/gildas/default.nix index 9908439e10d..38d8e23a811 100644 --- a/pkgs/applications/science/astronomy/gildas/default.nix +++ b/pkgs/applications/science/astronomy/gildas/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { extensible. GILDAS is written in Fortran-90, with a few parts in C/C++ (mainly keyboard interaction, plotting, widgets).''; - homepage = http://www.iram.fr/IRAMFR/GILDAS/gildas.html; + 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; diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index f36431beac1..1ae80c0b0aa 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { ''; license = licenses.gpl2; platforms = platforms.linux; - homepage = http://gpredict.oz9aec.net/; + 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 15f72938eff..0a98563ed0e 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://gravit.slowchop.com; + homepage = "https://gravit.slowchop.com"; description = "Beautiful OpenGL-based gravity simulator"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/science/astronomy/openspace/default.nix b/pkgs/applications/science/astronomy/openspace/default.nix index cfdd320d201..566fd61f1a7 100644 --- a/pkgs/applications/science/astronomy/openspace/default.nix +++ b/pkgs/applications/science/astronomy/openspace/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { WARNING: This build is not very usable for now. ''; - homepage = https://www.openspaceproject.com/; + homepage = "https://www.openspaceproject.com/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; broken = true; # fails to build diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index eca25774c59..a0cd535f362 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.19.3"; + version = "0.20.0"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "175aj4bgi9b6bif6fvjdlpd68brcwij4x3ml0lxk6i51binv233y"; + sha256 = "1732dxkgyqd4xf0ry7v930vcbv60l8iry596869z1d47j2piibs4"; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Free open-source planetarium"; - homepage = http://stellarium.org/; + homepage = "http://stellarium.org/"; license = licenses.gpl2; platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin diff --git a/pkgs/applications/science/astronomy/xplanet/default.nix b/pkgs/applications/science/astronomy/xplanet/default.nix index f306f9265ab..a314678b6ea 100644 --- a/pkgs/applications/science/astronomy/xplanet/default.nix +++ b/pkgs/applications/science/astronomy/xplanet/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Renders an image of the earth or other planets into the X root window"; - homepage = http://xplanet.sourceforge.net; + homepage = "http://xplanet.sourceforge.net"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus sander ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix index 6e1a2a3407e..20eedfaaa16 100644 --- a/pkgs/applications/science/biology/ants/default.nix +++ b/pkgs/applications/science/biology/ants/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ANTsX/ANTs; + homepage = "https://github.com/ANTsX/ANTs"; description = "Advanced normalization toolkit for medical image registration and other processing"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/aragorn/default.nix b/pkgs/applications/science/biology/aragorn/default.nix index a5f0ebc18ab..956e4d88453 100644 --- a/pkgs/applications/science/biology/aragorn/default.nix +++ b/pkgs/applications/science/biology/aragorn/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Detects tRNA, mtRNA, and tmRNA genes in nucleotide sequences"; - homepage = http://mbio-serv2.mbioekol.lu.se/ARAGORN/; + homepage = "http://mbio-serv2.mbioekol.lu.se/ARAGORN/"; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/bcftools/default.nix b/pkgs/applications/science/biology/bcftools/default.nix index 4a6a464de46..b847fd8b5fe 100644 --- a/pkgs/applications/science/biology/bcftools/default.nix +++ b/pkgs/applications/science/biology/bcftools/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for manipulating BCF2/VCF/gVCF format, SNP and short indel sequence variants"; license = licenses.mit; - homepage = http://www.htslib.org/; + homepage = "http://www.htslib.org/"; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; }; diff --git a/pkgs/applications/science/biology/bedtools/default.nix b/pkgs/applications/science/biology/bedtools/default.nix index 9af2ec88c39..332e06ea0cf 100644 --- a/pkgs/applications/science/biology/bedtools/default.nix +++ b/pkgs/applications/science/biology/bedtools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful toolset for genome arithmetic."; license = licenses.gpl2; - homepage = https://bedtools.readthedocs.io/en/latest/; + homepage = "https://bedtools.readthedocs.io/en/latest/"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/biology/bftools/default.nix b/pkgs/applications/science/biology/bftools/default.nix index 29e8bca5262..2ecefee340f 100644 --- a/pkgs/applications/science/biology/bftools/default.nix +++ b/pkgs/applications/science/biology/bftools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "A bundle of scripts for using Bio-Formats on the command line with bioformats_package.jar already included"; license = licenses.gpl2; platforms = platforms.all; - homepage = https://www.openmicroscopy.org/bio-formats/; + homepage = "https://www.openmicroscopy.org/bio-formats/"; maintainers = [ maintainers.tbenst ]; }; } diff --git a/pkgs/applications/science/biology/blast/default.nix b/pkgs/applications/science/biology/blast/default.nix index ad737c6699d..95a1b905e9e 100644 --- a/pkgs/applications/science/biology/blast/default.nix +++ b/pkgs/applications/science/biology/blast/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''Basic Local Alignment Search Tool (BLAST) finds regions of similarity between biological sequences''; - homepage = https://blast.ncbi.nlm.nih.gov/Blast.cgi; + homepage = "https://blast.ncbi.nlm.nih.gov/Blast.cgi"; license = licenses.publicDomain; # Version 2.10.0 fails on Darwin diff --git a/pkgs/applications/science/biology/bowtie2/default.nix b/pkgs/applications/science/biology/bowtie2/default.nix index 962428d67cf..dc818e2fb86 100644 --- a/pkgs/applications/science/biology/bowtie2/default.nix +++ b/pkgs/applications/science/biology/bowtie2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An ultrafast and memory-efficient tool for aligning sequencing reads to long reference sequences"; license = licenses.gpl3; - homepage = http://bowtie-bio.sf.net/bowtie2; + homepage = "http://bowtie-bio.sf.net/bowtie2"; maintainers = with maintainers; [ rybern ]; platforms = platforms.all; broken = stdenv.isAarch64; diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index 5e39320bf83..e478c104ede 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software package for mapping low-divergent sequences against a large reference genome, such as the human genome"; license = licenses.gpl3; - homepage = http://bio-bwa.sourceforge.net/; + homepage = "http://bio-bwa.sourceforge.net/"; maintainers = with maintainers; [ luispedro ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/cd-hit/default.nix b/pkgs/applications/science/biology/cd-hit/default.nix index 1a41a28a19a..0db788b0f74 100644 --- a/pkgs/applications/science/biology/cd-hit/default.nix +++ b/pkgs/applications/science/biology/cd-hit/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Clustering and comparing protein or nucleotide sequences"; - homepage = http://weizhongli-lab.org/cd-hit/; + homepage = "http://weizhongli-lab.org/cd-hit/"; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/clustal-omega/default.nix b/pkgs/applications/science/biology/clustal-omega/default.nix index 00acc25028c..71cf8798537 100644 --- a/pkgs/applications/science/biology/clustal-omega/default.nix +++ b/pkgs/applications/science/biology/clustal-omega/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "General purpose multiple sequence alignment program for protein and DNA/RNA"; - homepage = http://www.clustal.org/omega/; + homepage = "http://www.clustal.org/omega/"; license = licenses.gpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix index 1ebfa2fca57..41805c15aed 100644 --- a/pkgs/applications/science/biology/cmtk/default.nix +++ b/pkgs/applications/science/biology/cmtk/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ tbenst ]; platforms = platforms.all; license = licenses.gpl3; - homepage = https://www.nitrc.org/projects/cmtk/; + homepage = "https://www.nitrc.org/projects/cmtk/"; }; } diff --git a/pkgs/applications/science/biology/conglomerate/default.nix b/pkgs/applications/science/biology/conglomerate/default.nix index 23182fcadc6..971e2f23055 100644 --- a/pkgs/applications/science/biology/conglomerate/default.nix +++ b/pkgs/applications/science/biology/conglomerate/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/BIC-MNI/conglomerate; + homepage = "https://github.com/BIC-MNI/conglomerate"; description = "More command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 7c328034a30..8ea3588fa8c 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { dcm2niix is a designed to convert neuroimaging data from the DICOM format to the NIfTI format. ''; - homepage = https://www.nitrc.org/projects/dcm2nii; + homepage = "https://www.nitrc.org/projects/dcm2nii"; license = licenses.bsd3; maintainers = [ maintainers.ashgillman ]; platforms = platforms.all; diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix index 78a6f483337..8787c96e5b0 100644 --- a/pkgs/applications/science/biology/deeptools/default.nix +++ b/pkgs/applications/science/biology/deeptools/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "deepTools"; - version = "3.3.1"; + version = "3.4.1"; src = fetchPypi { inherit pname version; - sha256 = "08p36p9ncj5s8qf1r7h83x4rnmi63l3yk6mnr3wgpg2qgvwl0hji"; + sha256 = "05zw9gk17hz08hns5lnhn7l13idg9jdz4gdba6m6gbr84yz149gs"; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/science/biology/diamond/default.nix b/pkgs/applications/science/biology/diamond/default.nix index c1d20a11ca9..dd1e13ec716 100644 --- a/pkgs/applications/science/biology/diamond/default.nix +++ b/pkgs/applications/science/biology/diamond/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation { "Fast and sensitive protein alignment using DIAMOND", Nature Methods 12, 59-60 (2015). ''; - homepage = https://github.com/bbuchfink/diamond; + homepage = "https://github.com/bbuchfink/diamond"; license = { fullName = "University of Tuebingen, Benjamin Buchfink"; - url = https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING; + url = "https://raw.githubusercontent.com/bbuchfink/diamond/master/src/COPYING"; }; maintainers = [ maintainers.metabar ]; }; diff --git a/pkgs/applications/science/biology/ecopcr/default.nix b/pkgs/applications/science/biology/ecopcr/default.nix index 9e1b16ff944..2e744c7b2b9 100644 --- a/pkgs/applications/science/biology/ecopcr/default.nix +++ b/pkgs/applications/science/biology/ecopcr/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { coverage and barcode specificity. New barcode primers can be developed using the ecoPrimers software. ''; - homepage = https://git.metabarcoding.org/obitools/ecopcr/wikis/home; + homepage = "https://git.metabarcoding.org/obitools/ecopcr/wikis/home"; license = licenses.cecill20; maintainers = [ maintainers.metabar ]; }; diff --git a/pkgs/applications/science/biology/eggnog-mapper/default.nix b/pkgs/applications/science/biology/eggnog-mapper/default.nix index e11f4ebf77c..3ef52e54393 100644 --- a/pkgs/applications/science/biology/eggnog-mapper/default.nix +++ b/pkgs/applications/science/biology/eggnog-mapper/default.nix @@ -33,7 +33,7 @@ python27Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Fast genome-wide functional annotation through orthology assignment"; license = licenses.gpl2; - homepage = https://github.com/eggnogdb/eggnog-mapper/wiki; + homepage = "https://github.com/eggnogdb/eggnog-mapper/wiki"; maintainers = with maintainers; [ luispedro ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 2110a9bcfab..e2374bcd1e2 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { data in a variety of formats and even allows transparent retrieval of sequence data from the web.''; license = "GPL2"; - homepage = http://emboss.sourceforge.net/; + homepage = "http://emboss.sourceforge.net/"; }; } diff --git a/pkgs/applications/science/biology/est-sfs/default.nix b/pkgs/applications/science/biology/est-sfs/default.nix index dcc72523355..1b15c06c670 100644 --- a/pkgs/applications/science/biology/est-sfs/default.nix +++ b/pkgs/applications/science/biology/est-sfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/est-usfs; + homepage = "https://sourceforge.net/projects/est-usfs"; description = "Estimate the unfolded site frequency spectrum and ancestral states"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; diff --git a/pkgs/applications/science/biology/exonerate/default.nix b/pkgs/applications/science/biology/exonerate/default.nix index 1dd6b44692a..b2c49ab0076 100644 --- a/pkgs/applications/science/biology/exonerate/default.nix +++ b/pkgs/applications/science/biology/exonerate/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generic tool for sequence alignment"; - homepage = https://www.ebi.ac.uk/about/vertebrate-genomics/software/exonerate; + homepage = "https://www.ebi.ac.uk/about/vertebrate-genomics/software/exonerate"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix ; diff --git a/pkgs/applications/science/biology/freebayes/default.nix b/pkgs/applications/science/biology/freebayes/default.nix index 7d0a36e755f..bd80df56cb9 100644 --- a/pkgs/applications/science/biology/freebayes/default.nix +++ b/pkgs/applications/science/biology/freebayes/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bayesian haplotype-based polymorphism discovery and genotyping"; license = licenses.mit; - homepage = https://github.com/ekg/freebayes; + homepage = "https://github.com/ekg/freebayes"; maintainers = with maintainers; [ jdagilliland ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/hisat2/default.nix b/pkgs/applications/science/biology/hisat2/default.nix index 82485630114..fb7f2cba3de 100644 --- a/pkgs/applications/science/biology/hisat2/default.nix +++ b/pkgs/applications/science/biology/hisat2/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graph based aligner"; license = licenses.gpl3; - homepage = https://ccb.jhu.edu/software/hisat2/index.shtml; + homepage = "https://ccb.jhu.edu/software/hisat2/index.shtml"; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" "i686-linux" ]; }; diff --git a/pkgs/applications/science/biology/hmmer/default.nix b/pkgs/applications/science/biology/hmmer/default.nix index 69ecb228697..3786b62f747 100644 --- a/pkgs/applications/science/biology/hmmer/default.nix +++ b/pkgs/applications/science/biology/hmmer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { HMMER is designed to detect remote homologs as sensitively as possible, relying on the strength of its underlying probability models. In the past, this strength came at significant computational expense, but as of the new HMMER3 project, HMMER is now essentially as fast as BLAST. HMMER can be downloaded and installed as a command line tool on your own hardware, and now it is also more widely accessible to the scientific community via new search servers at the European Bioinformatics Institute. ''; - homepage = http://hmmer.org/; + homepage = "http://hmmer.org/"; license = licenses.gpl3; maintainers = [ maintainers.iimog ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index 04699a84b69..aa6c95071b7 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.broadinstitute.org/igv/; + homepage = "https://www.broadinstitute.org/igv/"; description = "A visualization tool for interactive exploration of genomic datasets"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/itsx/default.nix b/pkgs/applications/science/biology/itsx/default.nix index 1ba8cdf22ba..ac534a4ec3c 100644 --- a/pkgs/applications/science/biology/itsx/default.nix +++ b/pkgs/applications/science/biology/itsx/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Improved software detection and extraction of ITS1 and ITS2 from ribosomal ITS sequences of fungi and other eukaryotes for use in environmental sequencing"; - homepage = https://microbiology.se/software/itsx/; + homepage = "https://microbiology.se/software/itsx/"; license = licenses.gpl3; maintainers = [ maintainers.bzizou ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/science/biology/iv/default.nix b/pkgs/applications/science/biology/iv/default.nix index 37abcf39621..82fe3694008 100644 --- a/pkgs/applications/science/biology/iv/default.nix +++ b/pkgs/applications/science/biology/iv/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec meta = with stdenv.lib; { description = "InterViews graphical library for Neuron"; license = licenses.bsd3; - homepage = http://www.neuron.yale.edu/neuron; + homepage = "http://www.neuron.yale.edu/neuron"; platforms = platforms.all; }; } diff --git a/pkgs/applications/science/biology/last/default.nix b/pkgs/applications/science/biology/last/default.nix index b47ce6ac3a9..1a3762f4326 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 = "1047"; + version = "1060"; src = fetchurl { url = "http://last.cbrc.jp/last-${version}.zip"; - sha256 = "06fj4qfw3dd35y3pky3dnr40v1alf43wjx373rbx1vr3hbgzvgf8"; + sha256 = "0h0604rxg0z0h21dykrnxsb4679zfhibg79gss1v2ik5xpdxl8kk"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/science/biology/megahit/default.nix b/pkgs/applications/science/biology/megahit/default.nix index 86414980177..35ef280ed67 100644 --- a/pkgs/applications/science/biology/megahit/default.nix +++ b/pkgs/applications/science/biology/megahit/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph"; license = licenses.gpl3; - homepage = https://github.com/voutcn/megahit; + homepage = "https://github.com/voutcn/megahit"; maintainers = with maintainers; [ luispedro ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/messer-slim/default.nix b/pkgs/applications/science/biology/messer-slim/default.nix index d485666f393..201e38cfc53 100644 --- a/pkgs/applications/science/biology/messer-slim/default.nix +++ b/pkgs/applications/science/biology/messer-slim/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An evolutionary simulation framework"; - homepage = https://messerlab.org/slim/; + homepage = "https://messerlab.org/slim/"; license = with stdenv.lib.licenses; [ gpl3 ]; maintainers = with stdenv.lib.maintainers; [ bzizou ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/science/biology/migrate/default.nix b/pkgs/applications/science/biology/migrate/default.nix index d80e6e7b30d..0e2aa1c1a79 100644 --- a/pkgs/applications/science/biology/migrate/default.nix +++ b/pkgs/applications/science/biology/migrate/default.nix @@ -16,7 +16,7 @@ gccStdenv.mkDerivation rec { meta = with gccStdenv.lib; { description = "Estimates population size, migration, population splitting parameters using genetic/genomic data"; - homepage = https://peterbeerli.com/migrate-html5/index.html; + homepage = "https://peterbeerli.com/migrate-html5/index.html"; license = licenses.mit; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix index 4c8b768a56a..db803ea4922 100644 --- a/pkgs/applications/science/biology/minc-tools/default.nix +++ b/pkgs/applications/science/biology/minc-tools/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/BIC-MNI/minc-tools; + homepage = "https://github.com/BIC-MNI/minc-tools"; description = "Command-line utilities for working with MINC files"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index bff2bcf428b..e33a1753791 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A versatile pairwise aligner for genomic and spliced nucleotide sequences"; - homepage = https://lh3.github.io/minimap2; + homepage = "https://lh3.github.io/minimap2"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.arcadio ]; diff --git a/pkgs/applications/science/biology/mni_autoreg/default.nix b/pkgs/applications/science/biology/mni_autoreg/default.nix index ab22fb7232f..254d874f9d9 100644 --- a/pkgs/applications/science/biology/mni_autoreg/default.nix +++ b/pkgs/applications/science/biology/mni_autoreg/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/BIC-MNI/mni_autoreg; + homepage = "https://github.com/BIC-MNI/mni_autoreg"; description = "Tools for automated registration using the MINC image format"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 717b8c3ab2f..569c63afa7a 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "fast BAM/CRAM depth calculation for WGS, exome, or targeted sequencing."; license = licenses.mit; - homepage = https://github.com/brentp/mosdepth; + homepage = "https://github.com/brentp/mosdepth"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/biology/mrbayes/default.nix b/pkgs/applications/science/biology/mrbayes/default.nix index 1dd92af58eb..8ee7bccf075 100644 --- a/pkgs/applications/science/biology/mrbayes/default.nix +++ b/pkgs/applications/science/biology/mrbayes/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { MCMC) to approximate the posterior probabilities of trees. ''; license = "GPL2"; - homepage = http://mrbayes.csit.fsu.edu/; + homepage = "http://mrbayes.csit.fsu.edu/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/biology/muscle/default.nix b/pkgs/applications/science/biology/muscle/default.nix index 9cbabc7ab37..7ed18349259 100644 --- a/pkgs/applications/science/biology/muscle/default.nix +++ b/pkgs/applications/science/biology/muscle/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multiple sequence alignment method with reduced time and space complexity"; license = licenses.publicDomain; - homepage = https://www.drive5.com/muscle/; + homepage = "https://www.drive5.com/muscle/"; 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 diff --git a/pkgs/applications/science/biology/ncbi-tools/default.nix b/pkgs/applications/science/biology/ncbi-tools/default.nix index 1c24ef09254..cc8ebf7f37d 100644 --- a/pkgs/applications/science/biology/ncbi-tools/default.nix +++ b/pkgs/applications/science/biology/ncbi-tools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { 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/; + 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 4e6d3494c72..8cad5f466c5 100644 --- a/pkgs/applications/science/biology/neuron/default.nix +++ b/pkgs/applications/science/biology/neuron/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { involving many ion-specific channels, ion accumulation, and second messengers"; license = licenses.bsd3; - homepage = http://www.neuron.yale.edu/neuron; + homepage = "http://www.neuron.yale.edu/neuron"; maintainers = [ maintainers.adev ]; # source claims it's only tested for x86 and powerpc platforms = platforms.x86_64 ++ platforms.i686; diff --git a/pkgs/applications/science/biology/niftyreg/default.nix b/pkgs/applications/science/biology/niftyreg/default.nix index 48bd1b21ecd..fd7dc4f1fbb 100644 --- a/pkgs/applications/science/biology/niftyreg/default.nix +++ b/pkgs/applications/science/biology/niftyreg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg; + homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg"; description = "Medical image registration software"; maintainers = with maintainers; [ bcdarwin ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/biology/niftyseg/default.nix b/pkgs/applications/science/biology/niftyseg/default.nix index f70054e9771..38194697223 100644 --- a/pkgs/applications/science/biology/niftyseg/default.nix +++ b/pkgs/applications/science/biology/niftyseg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg; + homepage = "http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg"; description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/biology/paml/default.nix b/pkgs/applications/science/biology/paml/default.nix index 731e31c588f..7a2dc2782ab 100644 --- a/pkgs/applications/science/biology/paml/default.nix +++ b/pkgs/applications/science/biology/paml/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { 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.''; license = "non-commercial"; - homepage = http://abacus.gene.ucl.ac.uk/software/paml.html; + 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 93f66810549..246c9876810 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.22.0"; + version = "2.22.2"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "1qgg8r81xn2z965v78kfj05vycrd2cz48gxk5csr6kvwk3ba286c"; + sha256 = "11mzz483f89pb2s8jmwhl12d0m6k41kmi4xh0i6hq69rxrqi8l4s"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/biology/platypus/default.nix b/pkgs/applications/science/biology/platypus/default.nix index 6907c6e3ec8..30e45d5af0e 100644 --- a/pkgs/applications/science/biology/platypus/default.nix +++ b/pkgs/applications/science/biology/platypus/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Platypus variant caller"; license = licenses.gpl3; - homepage = https://github.com/andyrimmer/Platypus; + homepage = "https://github.com/andyrimmer/Platypus"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.x86_64; }; diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index 52f8f70b779..13f00c53fe6 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A comprehensive update to the PLINK association analysis toolset"; - homepage = https://www.cog-genomics.org/plink2; + homepage = "https://www.cog-genomics.org/plink2"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix index cc48a0cb13a..009e12aa02f 100644 --- a/pkgs/applications/science/biology/plink/default.nix +++ b/pkgs/applications/science/biology/plink/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Whole genome association toolkit"; - homepage = http://pngu.mgh.harvard.edu/~purcell/plink/; + homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; broken = true; diff --git a/pkgs/applications/science/biology/poretools/default.nix b/pkgs/applications/science/biology/poretools/default.nix index 4660a776ab2..a9f3fdb2467 100755 --- a/pkgs/applications/science/biology/poretools/default.nix +++ b/pkgs/applications/science/biology/poretools/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonPackage rec { meta = { description = "a toolkit for working with nanopore sequencing data from Oxford Nanopore"; license = stdenv.lib.licenses.mit; - homepage = https://poretools.readthedocs.io/en/latest/; + homepage = "https://poretools.readthedocs.io/en/latest/"; maintainers = [stdenv.lib.maintainers.rybern]; }; } diff --git a/pkgs/applications/science/biology/prodigal/default.nix b/pkgs/applications/science/biology/prodigal/default.nix index 653f4390488..ba51c93c38c 100644 --- a/pkgs/applications/science/biology/prodigal/default.nix +++ b/pkgs/applications/science/biology/prodigal/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast, reliable protein-coding gene prediction for prokaryotic genomes"; - homepage = https://github.com/hyattpd/Prodigal; + homepage = "https://github.com/hyattpd/Prodigal"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ luispedro ]; diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index d7ee54bfbcf..5c7353af931 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for Phylogenetic Analysis and Post-Analysis of Large Phylogenies"; license = licenses.gpl3; - homepage = https://sco.h-its.org/exelixis/web/software/raxml/; + homepage = "https://sco.h-its.org/exelixis/web/software/raxml/"; maintainers = [ maintainers.unode ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index f2c5e9f25be..e750eea89ac 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; - homepage = http://www.htslib.org/; + homepage = "http://www.htslib.org/"; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; }; diff --git a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix index 72d125ef8b6..d62c2a1fe7b 100644 --- a/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix +++ b/pkgs/applications/science/biology/samtools/samtools_0_1_19.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for manipulating SAM/BAM/CRAM format"; license = licenses.mit; - homepage = http://samtools.sourceforge.net/; + homepage = "http://samtools.sourceforge.net/"; platforms = platforms.unix; maintainers = [ maintainers.unode ]; }; diff --git a/pkgs/applications/science/biology/snpeff/default.nix b/pkgs/applications/science/biology/snpeff/default.nix index d700ee50a9c..c68fcfada33 100644 --- a/pkgs/applications/science/biology/snpeff/default.nix +++ b/pkgs/applications/science/biology/snpeff/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Genetic variant annotation and effect prediction toolbox."; license = licenses.lgpl3; - homepage = http://snpeff.sourceforge.net/; + homepage = "http://snpeff.sourceforge.net/"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/somatic-sniper/default.nix b/pkgs/applications/science/biology/somatic-sniper/default.nix index 1961c71f43b..17d9c3dbb55 100644 --- a/pkgs/applications/science/biology/somatic-sniper/default.nix +++ b/pkgs/applications/science/biology/somatic-sniper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Identify single nucleotide positions that are different between tumor and normal"; license = licenses.mit; - homepage = https://github.com/genome/somatic-sniper; + homepage = "https://github.com/genome/somatic-sniper"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/biology/sortmerna/default.nix b/pkgs/applications/science/biology/sortmerna/default.nix index 4adce4461ed..1f291d1a700 100644 --- a/pkgs/applications/science/biology/sortmerna/default.nix +++ b/pkgs/applications/science/biology/sortmerna/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Tools for filtering, mapping, and OTU-picking from shotgun genomics data"; license = licenses.lgpl3; platforms = platforms.x86_64; - homepage = https://bioinfo.lifl.fr/RNA/sortmerna/; + homepage = "https://bioinfo.lifl.fr/RNA/sortmerna/"; maintainers = with maintainers; [ luispedro ]; }; } diff --git a/pkgs/applications/science/biology/stacks/default.nix b/pkgs/applications/science/biology/stacks/default.nix index e778c3bd52c..93a02a46bd8 100644 --- a/pkgs/applications/science/biology/stacks/default.nix +++ b/pkgs/applications/science/biology/stacks/default.nix @@ -2,17 +2,17 @@ stdenv.mkDerivation rec { pname = "stacks"; - version = "2.41"; + version = "2.52"; src = fetchurl { url = "http://catchenlab.life.illinois.edu/stacks/source/${pname}-${version}.tar.gz"; - sha256 = "0q420rzjb05jfchcls3pysm4hxfgs6xj2jw246isx0il10g93gkq"; + sha256 = "0gq3kbj910jsq591wylzjmd23srjlsssmrckmf46m4ysjqdqd8vm"; }; buildInputs = [ zlib ]; meta = { description = "Software pipeline for building loci from short-read sequences"; - homepage = http://catchenlab.life.illinois.edu/stacks/; + homepage = "http://catchenlab.life.illinois.edu/stacks/"; maintainers = [ stdenv.lib.maintainers.bzizou ]; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/applications/science/biology/strelka/default.nix b/pkgs/applications/science/biology/strelka/default.nix index 184dcb48a0d..a32eddcb1cd 100644 --- a/pkgs/applications/science/biology/strelka/default.nix +++ b/pkgs/applications/science/biology/strelka/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Germline and small variant caller"; license = licenses.gpl3; - homepage = https://github.com/Illumina/strelka; + homepage = "https://github.com/Illumina/strelka"; maintainers = with maintainers; [ jbedo ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/biology/sumatools/default.nix b/pkgs/applications/science/biology/sumatools/default.nix index 5230fcd2eb6..1e3b479d54f 100644 --- a/pkgs/applications/science/biology/sumatools/default.nix +++ b/pkgs/applications/science/biology/sumatools/default.nix @@ -4,7 +4,7 @@ let stdenv = gccStdenv; meta = with stdenv.lib; { description = "Fast and exact comparison and clustering of sequences"; - homepage = https://metabarcoding.org/sumatra; + homepage = "https://metabarcoding.org/sumatra"; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/biology/trimal/default.nix b/pkgs/applications/science/biology/trimal/default.nix index d4e8fee7bc3..8d7e62b6143 100755 --- a/pkgs/applications/science/biology/trimal/default.nix +++ b/pkgs/applications/science/biology/trimal/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A tool for the automated removal of spurious sequences or poorly aligned regions from a multiple sequence alignment"; license = licenses.gpl3; platforms = platforms.linux; - homepage = http://trimal.cgenomics.org; + homepage = "http://trimal.cgenomics.org"; maintainers = [ maintainers.bzizou ]; }; } diff --git a/pkgs/applications/science/biology/varscan/default.nix b/pkgs/applications/science/biology/varscan/default.nix index 697a444193b..e97c8f14451 100644 --- a/pkgs/applications/science/biology/varscan/default.nix +++ b/pkgs/applications/science/biology/varscan/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # through the Office of Technology Management at Washington # University School of Medicine. license = licenses.unfree; - homepage = https://github.com/dkoboldt/varscan; + homepage = "https://github.com/dkoboldt/varscan"; maintainers = with maintainers; [ jbedo ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/biology/vcftools/default.nix b/pkgs/applications/science/biology/vcftools/default.nix index f6c9ad029c1..52957b58bc9 100755 --- a/pkgs/applications/science/biology/vcftools/default.nix +++ b/pkgs/applications/science/biology/vcftools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A set of tools written in Perl and C++ for working with VCF files, such as those generated by the 1000 Genomes Project"; license = licenses.lgpl3; platforms = platforms.linux; - homepage = https://vcftools.github.io/index.html; + homepage = "https://vcftools.github.io/index.html"; maintainers = [ maintainers.rybern ]; }; } diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 6aca678480d..96dea10333b 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch; + url = "https://data.gpo.zugaina.org/fusion809/sci-chemistry/avogadro/files/avogadro-1.1.0-xlibs.patch"; sha256 = "1p113v19z3zwr9gxj2k599f8p97a8rwm93pa4amqvd0snn31mw0k"; }) ]; diff --git a/pkgs/applications/science/chemistry/gwyddion/codegen.patch b/pkgs/applications/science/chemistry/gwyddion/codegen.patch new file mode 100644 index 00000000000..eb306d99f8a --- /dev/null +++ b/pkgs/applications/science/chemistry/gwyddion/codegen.patch @@ -0,0 +1,22 @@ +--- gwyddion-2.55.orig/configure 2019-11-04 01:25:31.000000000 -0800 ++++ gwyddion-2.55/configure 2020-03-20 18:49:43.860452655 -0700 +@@ -18560,7 +18560,7 @@ + fi + if test "x$embed_pygtk" = xno; then + if test "x$PYGTK_CODEGENDIR" = 'x'; then +- PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0` ++ PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0` + fi + else + # Some silly OSes want to remove pygtk2. We can build pygwy without +--- gwyddion-2.55.orig/configure.ac 2019-11-04 01:25:16.000000000 -0800 ++++ gwyddion-2.55/configure.ac 2020-03-20 18:52:55.042724547 -0700 +@@ -270,7 +270,7 @@ + [embed_pygtk=yes; pygwy_warn=" (embedded pygtk2)"]) + if test "x$embed_pygtk" = xno; then + if test "x$PYGTK_CODEGENDIR" = 'x'; then +- PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygtk-2.0` ++ PYGTK_CODEGENDIR=`$PKG_CONFIG --variable=codegendir pygobject-2.0` + fi + else + # Some silly OSes want to remove pygtk2. We can build pygwy without diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 12007c940b3..dec63910f70 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -1,19 +1,71 @@ -{ stdenv, fetchurl, gtk2, pkgconfig }: +{ stdenv, fetchurl, gtk2, pkg-config, fftw, file, + pythonSupport ? false, pythonPackages ? null, + gnome2 ? null, + openexrSupport ? true, openexr ? null, + libzipSupport ? true, libzip ? null, + libxml2Support ? true, libxml2 ? null, + libwebpSupport ? true, libwebp ? null, + # libXmu is not used if libunique is. + libXmuSupport ? false, xorg ? null, + libxsltSupport ? true, libxslt ? null, + fitsSupport ? true, cfitsio ? null, + zlibSupport ? true, zlib ? null, + libuniqueSupport ? true, libunique ? null, + libpngSupport ? true, libpng ? null, + openglSupport ? !stdenv.isDarwin +}: -with stdenv.lib; +assert openexrSupport -> openexr != null; +assert libzipSupport -> libzip != null; +assert libxml2Support -> libxml2 != null; +assert libwebpSupport -> libwebp != null; +assert libXmuSupport -> xorg != null; +assert libxsltSupport -> libxslt != null; +assert fitsSupport -> cfitsio != null; +assert zlibSupport -> zlib != null; +assert libuniqueSupport -> libunique != null; +assert libpngSupport -> libpng != null; +assert openglSupport -> gnome2 != null; +assert pythonSupport -> (pythonPackages != null && gnome2 != null); -let version = "2.48"; in -stdenv.mkDerivation { +let + inherit (pythonPackages) pygtk pygobject2 python; + +in + +stdenv.mkDerivation rec { pname = "gwyddion"; - inherit version; + version = "2.55"; src = fetchurl { - url = "mirror://sourceforge/gwyddion/files/gwyddion/${version}/gwyddion-${version}.tar.xz"; - sha256 = "119iw58ac2wn4cas6js8m7r1n4gmmkga6b1y711xzcyjp9hshgwx"; + url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; + sha256 = "0l00zszvginpriv12idc0y1x28qmicdmrwkqa007srkxvrdgxwdi"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 ]; + + nativeBuildInputs = [ pkg-config file ]; + + buildInputs = with stdenv.lib; + [ gtk2 fftw ] ++ + optional openglSupport gnome2.gtkglext ++ + optional openexrSupport openexr ++ + optional libXmuSupport xorg.libXmu ++ + optional fitsSupport cfitsio ++ + optional libpngSupport libpng ++ + optional libxsltSupport libxslt ++ + optional libxml2Support libxml2 ++ + optional libwebpSupport libwebp ++ + optional zlibSupport zlib ++ + optional libuniqueSupport libunique ++ + optional libzipSupport libzip; + + propagatedBuildInputs = with stdenv.lib; + optionals pythonSupport [ pygtk pygobject2 python gnome2.gtksourceview ]; + + # This patch corrects problems with python support, but should apply cleanly + # regardless of whether python support is enabled, and have no effects if + # it is disabled. + patches = [ ./codegen.patch ]; meta = { - homepage = http://gwyddion.net/; + homepage = "http://gwyddion.net/"; description = "Scanning probe microscopy data visualization and analysis"; @@ -28,6 +80,7 @@ stdenv.mkDerivation { spectrophotometry. ''; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; + maintainers = [ stdenv.lib.maintainers.cge ]; }; } diff --git a/pkgs/applications/science/chemistry/jmol/default.nix b/pkgs/applications/science/chemistry/jmol/default.nix index 7259705bc80..f52621dd71a 100644 --- a/pkgs/applications/science/chemistry/jmol/default.nix +++ b/pkgs/applications/science/chemistry/jmol/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Java 3D viewer for chemical structures"; - homepage = https://sourceforge.net/projects/jmol; + homepage = "https://sourceforge.net/projects/jmol"; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ timokau mounium ]; diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 2c155e4e848..c54fb3444bb 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.6.0"; + version = "20.9.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1vd1hsj36wzghpn6xnppjmva35kdcin7h0xdj3xmi4w5l3qw7fl6"; + sha256 = "1c6q1vb96jsb37g5qbhzcnasd5pdqjyc190yg3caw3gwrd97889q"; }; nativeBuildInputs = [ dpkg makeWrapper ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A chemical modelling, analysis and structure drawing program"; - homepage = https://chemaxon.com/products/marvin; + homepage = "https://chemaxon.com/products/marvin"; maintainers = with maintainers; [ fusion809 ]; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 87dae3b14d9..5e5df85a527 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -31,10 +31,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display and manipulate molecular structures"; - homepage = http://www.cmbi.ru.nl/molden/; + homepage = "http://www.cmbi.ru.nl/molden/"; license = { fullName = "Free for academic/non-profit use"; - url = http://www.cmbi.ru.nl/molden/CopyRight.html; + url = "http://www.cmbi.ru.nl/molden/CopyRight.html"; free = false; }; platforms = platforms.linux; diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index a5abbe2d1de..f8ce3e925fd 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Real-space time dependent density-functional theory code"; - homepage = https://octopus-code.org; + homepage = "https://octopus-code.org"; maintainers = with maintainers; [ markuskowa ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index d73e86d2f57..b1720e105fd 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Advanced quantum chemistry software package"; - homepage = https://gitlab.com/Molcas/OpenMolcas; + homepage = "https://gitlab.com/Molcas/OpenMolcas"; maintainers = [ maintainers.markuskowa ]; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index e8b3b23ddd9..47498690122 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = description; - homepage = https://www.pymol.org/; + homepage = "https://www.pymol.org/"; license = licenses.mit; maintainers = with maintainers; [ samlich ]; }; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index 9d7880f57df..11f3e551431 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { matching the quality of other approaches, such as plane-wave and all-electron methods. ''; - homepage = https://www.quantum-espresso.org/; + homepage = "https://www.quantum-espresso.org/"; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/applications/science/electronics/adms/default.nix b/pkgs/applications/science/electronics/adms/default.nix index 8b95e73b891..f55dd2f0528 100644 --- a/pkgs/applications/science/electronics/adms/default.nix +++ b/pkgs/applications/science/electronics/adms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "automatic device model synthesizer"; - homepage = https://github.com/Qucs/adms; + homepage = "https://github.com/Qucs/adms"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [disassembler]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index c863fe6aea8..861f6cea0b4 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Complete set of free CAD tools and portable libraries for VLSI design"; - homepage = http://www-asim.lip6.fr/recherche/alliance/; + homepage = "http://www-asim.lip6.fr/recherche/alliance/"; license = with licenses; gpl2Plus; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/applications/science/electronics/archimedes/default.nix b/pkgs/applications/science/electronics/archimedes/default.nix index 016760bde02..1377231c152 100644 --- a/pkgs/applications/science/electronics/archimedes/default.nix +++ b/pkgs/applications/science/electronics/archimedes/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU package for semiconductor device simulations"; - homepage = https://www.gnu.org/software/archimedes; + homepage = "https://www.gnu.org/software/archimedes"; license = stdenv.lib.licenses.gpl2Plus; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix index 9101f1fdbe5..acbdeb8cfaa 100644 --- a/pkgs/applications/science/electronics/bitscope/common.nix +++ b/pkgs/applications/science/electronics/bitscope/common.nix @@ -23,7 +23,7 @@ let name = "${toolName}-${version}"; meta = with stdenv.lib; { - homepage = http://bitscope.com/software/; + homepage = "http://bitscope.com/software/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index ff41a498ae7..6f832013e8c 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source EDA software focused on easy of use and portability"; - homepage = http://caneda.org; + homepage = "http://caneda.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix index d188365db1d..4d3acb331d5 100644 --- a/pkgs/applications/science/electronics/dsview/default.nix +++ b/pkgs/applications/science/electronics/dsview/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, libzip, boost, fftw, qtbase, -libusb, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl +libusb1, wrapQtAppsHook, libsigrok4dsl, libsigrokdecode4dsl }: stdenv.mkDerivation rec { @@ -27,14 +27,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ - boost fftw qtbase libusb libzip libsigrokdecode4dsl libsigrok4dsl + boost fftw qtbase libusb1 libzip libsigrokdecode4dsl libsigrok4dsl ]; enableParallelBuilding = true; meta = with stdenv.lib; { description = "A GUI program for supporting various instruments from DreamSourceLab, including logic analyzer, oscilloscope, etc"; - homepage = https://www.dreamsourcelab.com/; + homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bachp ]; diff --git a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix index c2cfc69c50c..7915cb0ba4a 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrok4dsl.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, autoreconfHook, -glib, libzip, libserialport, check, libusb, libftdi, +glib, libzip, libserialport, check, libusb1, libftdi, systemd, alsaLib, dsview }: @@ -15,12 +15,12 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - glib libzip libserialport libusb libftdi systemd check alsaLib + glib libzip libserialport libusb1 libftdi systemd check alsaLib ]; meta = with stdenv.lib; { description = "A fork of the sigrok library for usage with DSView"; - homepage = https://www.dreamsourcelab.com/; + homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bachp ]; diff --git a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix index b7fe5140864..72b2fa1b685 100644 --- a/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix +++ b/pkgs/applications/science/electronics/dsview/libsigrokdecode4dsl.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fork of the sigrokdecode library for usage with DSView"; - homepage = https://www.dreamsourcelab.com/; + homepage = "https://www.dreamsourcelab.com/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.bachp ]; diff --git a/pkgs/applications/science/electronics/eagle/eagle7.nix b/pkgs/applications/science/electronics/eagle/eagle7.nix index a9528b05a31..af0fb675880 100644 --- a/pkgs/applications/science/electronics/eagle/eagle7.nix +++ b/pkgs/applications/science/electronics/eagle/eagle7.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Schematic editor and PCB layout tool from CadSoft"; - homepage = http://www.cadsoftusa.com/; + homepage = "http://www.cadsoftusa.com/"; license = licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/science/electronics/fparser/default.nix b/pkgs/applications/science/electronics/fparser/default.nix new file mode 100644 index 00000000000..55e40ca2b00 --- /dev/null +++ b/pkgs/applications/science/electronics/fparser/default.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "fparser"; + version = "unstable-2015-09-25"; + + src = fetchFromGitHub { + owner = "thliebig"; + repo = "fparser"; + rev = "a59e1f51e32096bfe2a0a2640d5dffc7ae6ba37b"; + sha256 = "0wayml1mlyi922gp6am3fsidhzsilziksdn5kbnpcln01h8555ad"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "C++ Library for Evaluating Mathematical Functions"; + homepage = "https://github.com/thliebig/fparser"; + license = licenses.lgpl3; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/electronics/fped/default.nix b/pkgs/applications/science/electronics/fped/default.nix index f93fddba8cb..9ef47ae2634 100644 --- a/pkgs/applications/science/electronics/fped/default.nix +++ b/pkgs/applications/science/electronics/fped/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = "An editor that allows the interactive creation of footprints electronic components"; - homepage = http://projects.qi-hardware.com/index.php/p/fped/; + homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; license = licenses.gpl2; maintainers = with maintainers; [ expipiplus1 ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index 127e9c05624..a0442db7fed 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source prototyping tool for Arduino-based projects"; - homepage = http://fritzing.org/; + homepage = "http://fritzing.org/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.robberer ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 1aaa5496ff3..54ab7ec57e2 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; - homepage = http://www.geda-project.org/; + homepage = "http://www.geda-project.org/"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index fa5bdbbebdb..b0317551df8 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2015-10-08"; src = fetchgit { - url = git://git.geda-project.org/gerbv.git; + url = "git://git.geda-project.org/gerbv.git"; rev = "76b8b67bfa10823ce98f1c4c3b49a2afcadf7659"; sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Gerber (RS-274X) viewer"; - homepage = http://gerbv.geda-project.org/; + homepage = "http://gerbv.geda-project.org/"; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 694adc4d634..3d75780936e 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "VCD/Waveform viewer for Unix and Win32"; - homepage = http://gtkwave.sourceforge.net; + homepage = "http://gtkwave.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index dacbd948241..7e0894fb337 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -31,7 +31,7 @@ mkDerivation { meta = with lib; { description = "A free EDA software to develop printed circuit boards"; - homepage = https://librepcb.org/; + homepage = "https://librepcb.org/"; maintainers = with maintainers; [ luz ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix index f044f1d88e7..951e5f66f6e 100644 --- a/pkgs/applications/science/electronics/ngspice/default.nix +++ b/pkgs/applications/science/electronics/ngspice/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; - homepage = http://ngspice.sourceforge.net; + homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ "BSD" gpl2 ]; maintainers = with maintainers; [ bgamari rongcuid ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 636c494c340..4309f52e8b1 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Printed Circuit Board editor"; - homepage = http://pcb.geda-project.org/; + homepage = "http://pcb.geda-project.org/"; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/science/electronics/pulseview/default.nix b/pkgs/applications/science/electronics/pulseview/default.nix index ae9afd95518..f43717389b5 100644 --- a/pkgs/applications/science/electronics/pulseview/default.nix +++ b/pkgs/applications/science/electronics/pulseview/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { meta = with lib; { description = "Qt-based LA/scope/MSO GUI for sigrok (a signal analysis software suite)"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 6ca3f80cefd..9b6e75c77ba 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Graphical editor for finite state machines"; - homepage = http://qfsm.sourceforge.net/; + homepage = "http://qfsm.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix index 1bfe6df5ff5..62a9ae8b73b 100644 --- a/pkgs/applications/science/electronics/qucs/default.nix +++ b/pkgs/applications/science/electronics/qucs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Integrated circuit simulator"; - homepage = http://qucs.sourceforge.net; + homepage = "http://qucs.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix index 2c346b0e74a..e6f91261603 100644 --- a/pkgs/applications/science/electronics/tkgate/1.x.nix +++ b/pkgs/applications/science/electronics/tkgate/1.x.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Event driven digital circuit simulator with a TCL/TK-based graphical editor"; - homepage = http://www.tkgate.org/; + homepage = "http://www.tkgate.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.peti ]; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index b707db14160..fa1efe29982 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icarus Verilog compiler"; - repositories.git = https://github.com/steveicarus/iverilog.git; + repositories.git = "https://github.com/steveicarus/iverilog.git"; homepage = "http://iverilog.icarus.com/"; license = licenses.lgpl21; maintainers = with maintainers; [ winden ]; diff --git a/pkgs/applications/science/electronics/xcircuit/default.nix b/pkgs/applications/science/electronics/xcircuit/default.nix index d10b486492e..52fe9b03741 100644 --- a/pkgs/applications/science/electronics/xcircuit/default.nix +++ b/pkgs/applications/science/electronics/xcircuit/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Generic drawing program tailored to circuit diagrams"; - homepage = http://opencircuitdesign.com/xcircuit; + homepage = "http://opencircuitdesign.com/xcircuit"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ spacefrogg thoughtpolice ]; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index 829caacb55c..f8a68f31f46 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Oscilloscope through the sound card"; - homepage = http://xoscope.sourceforge.net; + homepage = "http://xoscope.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index e8ae4d01a6d..7bae3d414cb 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interactive geometry program"; - homepage = https://sourceforge.net/projects/ofset; + homepage = "https://sourceforge.net/projects/ofset"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/science/geometry/tetgen/1.4.nix b/pkgs/applications/science/geometry/tetgen/1.4.nix index 3a2dbf180ee..9dd25473683 100644 --- a/pkgs/applications/science/geometry/tetgen/1.4.nix +++ b/pkgs/applications/science/geometry/tetgen/1.4.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; - homepage = http://tetgen.org/; + homepage = "http://tetgen.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/geometry/tetgen/default.nix b/pkgs/applications/science/geometry/tetgen/default.nix index 0d3a7cc2bc2..d12e8e35844 100644 --- a/pkgs/applications/science/geometry/tetgen/default.nix +++ b/pkgs/applications/science/geometry/tetgen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { inherit version; description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; - homepage = http://tetgen.org/; + homepage = "http://tetgen.org/"; license = stdenv.lib.licenses.agpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/applications/science/logic/abella/default.nix index 7078fd454a0..3d9a2e9bd67 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/applications/science/logic/abella/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { of programming languages and other logical systems which manipulate objects with binding. ''; - homepage = http://abella-prover.org/; + homepage = "http://abella-prover.org/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ bcdarwin ciil ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/acgtk/default.nix b/pkgs/applications/science/logic/acgtk/default.nix index b7dc9571247..ccd08000507 100644 --- a/pkgs/applications/science/logic/acgtk/default.nix +++ b/pkgs/applications/science/logic/acgtk/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "1.5.1"; src = fetchurl { - url = https://acg.loria.fr/software/acg-1.5.1-20191113.tar.gz; + url = "https://acg.loria.fr/software/acg-1.5.1-20191113.tar.gz"; sha256 = "17595qfwhzz5q091ak6i6bg5wlppbn8zfn58x3hmmmjvx2yfajn1"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { inherit (dune) installPhase; meta = with stdenv.lib; { - homepage = https://acg.loria.fr/; + homepage = "https://acg.loria.fr/"; description = "A toolkit for developing ACG signatures and lexicon"; license = licenses.cecill20; inherit (ocamlPackages.ocaml.meta) platforms; diff --git a/pkgs/applications/science/logic/aiger/default.nix b/pkgs/applications/science/logic/aiger/default.nix index 0f65c9b7eae..aa5a59ed298 100644 --- a/pkgs/applications/science/logic/aiger/default.nix +++ b/pkgs/applications/science/logic/aiger/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "And-Inverter Graph (AIG) utilities"; - homepage = http://fmv.jku.at/aiger/; + homepage = "http://fmv.jku.at/aiger/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index ad931c23d53..e396f1c4a91 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,12 +2,11 @@ let pname = "alt-ergo"; - version = "2.3.1"; + version = "2.3.2"; src = fetchurl { - url = "https://alt-ergo.ocamlpro.com/download_manager.php?target=${pname}-${version}.tar.gz"; - name = "${pname}-${version}.tar.gz"; - sha256 = "124n836alqm13245hcnxixzc6a15rip919shfflvxqnl617mkmhg"; + url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-${version}/alt-ergo-${version}.tar.gz"; + sha256 = "130hisjzkaslygipdaaqib92spzx9rapsd45dbh5ssczjn5qnhb9"; }; preConfigure = "patchShebangs ./configure"; @@ -20,7 +19,7 @@ let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; inherit version src preConfigure nativeBuildInputs; configureFlags = pname; - propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex zarith ]; + propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { diff --git a/pkgs/applications/science/logic/aspino/default.nix b/pkgs/applications/science/logic/aspino/default.nix index 82458d7c566..c1cf9034c02 100644 --- a/pkgs/applications/science/logic/aspino/default.nix +++ b/pkgs/applications/science/logic/aspino/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; license = licenses.asl20; - homepage = https://alviano.net/software/maxino/; + homepage = "https://alviano.net/software/maxino/"; # See pkgs/applications/science/logic/glucose/default.nix badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/applications/science/logic/avy/default.nix b/pkgs/applications/science/logic/avy/default.nix index b43e0c6fbf1..78ed641a809 100644 --- a/pkgs/applications/science/logic/avy/default.nix +++ b/pkgs/applications/science/logic/avy/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = { description = "AIGER model checking for Property Directed Reachability"; - homepage = https://arieg.bitbucket.io/avy/; + homepage = "https://arieg.bitbucket.io/avy/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index da0e9bf1c1d..55cee9b7e17 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A functional language for reasoning about formal systems"; - homepage = http://complogic.cs.mcgill.ca/beluga/; + homepage = "http://complogic.cs.mcgill.ca/beluga/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bcdarwin ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 4cf0b0f1ea1..105e911ed4f 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extremely fast SMT solver for bit-vectors and arrays"; - homepage = https://boolector.github.io; + homepage = "https://boolector.github.io"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix new file mode 100644 index 00000000000..5e6c0d55b7d --- /dev/null +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "cadical"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "arminbiere"; + repo = "cadical"; + rev = "rel-${version}"; + hash = "sha256:1a66xkw42ad330fvw8i0sawrmg913m8wrq5c85lw5qandkwvxdi6"; + }; + + dontAddPrefix = true; + installPhase = '' + install -Dm0755 build/cadical "$out/bin/cadical" + install -Dm0755 build/mobical "$out/bin/mobical" + mkdir -p "$out/share/doc/${pname}-${version}/" + install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}-${version}/" + ''; + + meta = with stdenv.lib; { + description = "Simplified Satisfiability Solver"; + maintainers = with maintainers; [ shnarazk ]; + platforms = platforms.unix; + license = licenses.mit; + homepage = "http://fmv.jku.at/cadical"; + }; +} diff --git a/pkgs/applications/science/logic/cedille/default.nix b/pkgs/applications/science/logic/cedille/default.nix index 4cef49788c0..2ac96df66a6 100644 --- a/pkgs/applications/science/logic/cedille/default.nix +++ b/pkgs/applications/science/logic/cedille/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interactive theorem-prover and dependently typed programming language, based on extrinsic (aka Curry-style) type theory"; - homepage = https://cedille.github.io/; + homepage = "https://cedille.github.io/"; license = licenses.mit; maintainers = with maintainers; [ marsam mpickering ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/celf/default.nix b/pkgs/applications/science/logic/celf/default.nix index 708270f772f..9dc20a61a4d 100644 --- a/pkgs/applications/science/logic/celf/default.nix +++ b/pkgs/applications/science/logic/celf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linear logic programming system"; - homepage = https://github.com/clf/celf; + homepage = "https://github.com/clf/celf"; license = licenses.gpl3; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/clprover/clprover.nix b/pkgs/applications/science/logic/clprover/clprover.nix index 0319069660e..e53bbe68837 100644 --- a/pkgs/applications/science/logic/clprover/clprover.nix +++ b/pkgs/applications/science/logic/clprover/clprover.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Resolution-based theorem prover for Coalition Logic implemented in C++"; - homepage = http://cgi.csc.liv.ac.uk/~ullrich/CLProver++/; + homepage = "http://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 85c5d23ffca..315900d42b9 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -33,6 +33,7 @@ let "8.10.1" = "072v2zkjzf7gj48137wpr3c9j0hg9pdhlr5l8jrgrwynld8fp7i4"; "8.10.2" = "0znxmpy71bfw0p6x47i82jf5k7v41zbz9bdpn901ysn3ir8l3wrz"; "8.11.0" = "1rfdic6mp7acx2zfwz7ziqk12g95bl9nyj68z4n20a5bcjv2pxpn"; + "8.11.1" = "0qriy9dy36dajsv5qmli8gd6v55mah02ya334nw49ky19v7518m0"; }.${version}; coq-version = stdenv.lib.versions.majorMinor version; versionAtLeast = stdenv.lib.versionAtLeast coq-version; @@ -160,7 +161,7 @@ self = stdenv.mkDerivation { together with an environment for semi-interactive development of machine-checked proofs. ''; - homepage = http://coq.inria.fr; + homepage = "http://coq.inria.fr"; license = licenses.lgpl21; branch = coq-version; maintainers = with maintainers; [ roconnor thoughtpolice vbgl Zimmi48 ]; diff --git a/pkgs/applications/science/logic/coq2html/default.nix b/pkgs/applications/science/logic/coq2html/default.nix index bebf81b030d..2e56eda893e 100644 --- a/pkgs/applications/science/logic/coq2html/default.nix +++ b/pkgs/applications/science/logic/coq2html/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { initially hidden, but can be revealed one by one by clicking on the "Proof" keyword. ''; - homepage = https://github.com/xavierleroy/coq2html; + homepage = "https://github.com/xavierleroy/coq2html"; license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index b4c4cb7c047..113c6307c40 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An advanced SAT Solver"; - homepage = https://github.com/msoos/cryptominisat; + homepage = "https://github.com/msoos/cryptominisat"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/applications/science/logic/cubicle/default.nix index d198de41f9b..bfb6a57fb33 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/applications/science/logic/cubicle/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source model checker for verifying safety properties of array-based systems"; - homepage = http://cubicle.lri.fr/; + homepage = "http://cubicle.lri.fr/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ dwarfmaster ]; diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index dfb04ad90e9..ff481fd7ab4 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { [ raskin ]; platforms = platforms.linux; license = licenses.free; - homepage = http://www.cs.nyu.edu/acsys/cvc3/index.html; + homepage = "http://www.cs.nyu.edu/acsys/cvc3/index.html"; }; passthru = { updateInfo = { diff --git a/pkgs/applications/science/logic/cvc4/default.nix b/pkgs/applications/science/logic/cvc4/default.nix index c0c7a53ebd4..a6e9bc69a12 100644 --- a/pkgs/applications/science/logic/cvc4/default.nix +++ b/pkgs/applications/science/logic/cvc4/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-performance theorem prover and SMT solver"; - homepage = http://cvc4.cs.stanford.edu/web/; + homepage = "http://cvc4.cs.stanford.edu/web/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl thoughtpolice gebner ]; diff --git a/pkgs/applications/science/logic/drat-trim/default.nix b/pkgs/applications/science/logic/drat-trim/default.nix index 4c4ea0f14ce..4099236e628 100644 --- a/pkgs/applications/science/logic/drat-trim/default.nix +++ b/pkgs/applications/science/logic/drat-trim/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { competing SAT solvers' work when they claim that a SAT instance is unsatisfiable. ''; - homepage = https://www.cs.utexas.edu/~marijn/drat-trim/; + homepage = "https://www.cs.utexas.edu/~marijn/drat-trim/"; license = licenses.mit; maintainers = with maintainers; [ kini ]; platforms = platforms.all; diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 1b021f71607..f19d7e35c3e 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automated theorem prover for full first-order logic with equality"; - homepage = http://www.eprover.org/; + homepage = "http://www.eprover.org/"; license = licenses.gpl2; maintainers = with maintainers; [ raskin gebner ]; platforms = platforms.all; diff --git a/pkgs/applications/science/logic/gappa/default.nix b/pkgs/applications/science/logic/gappa/default.nix index 7522eb4790e..2ca1bcd3098 100644 --- a/pkgs/applications/science/logic/gappa/default.nix +++ b/pkgs/applications/science/logic/gappa/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gappa-1.3.5"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz; + url = "https://gforge.inria.fr/frs/download.php/file/38044/gappa-1.3.5.tar.gz"; sha256 = "0q1wdiwqj6fsbifaayb1zkp20bz8a1my81sqjsail577jmzwi07w"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { installPhase = "./remake install"; meta = { - homepage = http://gappa.gforge.inria.fr/; + 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 ]; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index d6a1eb6cbf7..dbafee7d600 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { implementing combinations of deduction, execution and property checking. ''; - homepage = http://hol.sourceforge.net/; + homepage = "http://hol.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 69ffb87e767..9c3030517e3 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { }; patches = [(fetchpatch { - url = https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch; + url = "https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch"; sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr"; })]; @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Interactive theorem prover based on Higher-Order Logic"; - homepage = http://www.cl.cam.ac.uk/~jrh13/hol-light/; + homepage = "http://www.cl.cam.ac.uk/~jrh13/hol-light/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice maggesi vbgl ]; diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix index c4eb22a7c03..310a95d7e7a 100644 --- a/pkgs/applications/science/logic/iprover/default.nix +++ b/pkgs/applications/science/logic/iprover/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An automated first-order logic theorem prover"; - homepage = http://www.cs.man.ac.uk/~korovink/iprover/; + homepage = "http://www.cs.man.ac.uk/~korovink/iprover/"; maintainers = with maintainers; [ raskin gebner ]; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index 024f2f4e829..d2e49d81783 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { to be expressed in a formal language and provides tools for proving those formulas in a logical calculus. ''; - homepage = http://isabelle.in.tum.de/; + homepage = "http://isabelle.in.tum.de/"; license = "LGPL"; maintainers = [ stdenv.lib.maintainers.jwiegley ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/jonprl/default.nix b/pkgs/applications/science/logic/jonprl/default.nix index e503836098f..3ee05a478bc 100644 --- a/pkgs/applications/science/logic/jonprl/default.nix +++ b/pkgs/applications/science/logic/jonprl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { based on Brouwer-realizability & meaning explanations. Inspired by Nuprl ''; - homepage = https://github.com/jonsterling/JonPRL; + homepage = "https://github.com/jonsterling/JonPRL"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index cfd645a3c73..594f596b5ef 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.7.2"; + version = "3.8.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0d9lz0mbxyaaykkvk2p8w2hcif9cx0ksihgh7qhxf417bz6msgc1"; + sha256 = "0frs2vhxlzdliyydb462c1886dn585zd7yp7hdxzsri2v6gdh89g"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index b50848a1820..b43bfb80135 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.bsd3; - homepage = http://www.leoprover.org/; + homepage = "http://www.leoprover.org/"; }; } diff --git a/pkgs/applications/science/logic/lingeling/default.nix b/pkgs/applications/science/logic/lingeling/default.nix index 94be89d4736..1805f6cdcc8 100644 --- a/pkgs/applications/science/logic/lingeling/default.nix +++ b/pkgs/applications/science/logic/lingeling/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Fast SAT solver"; - homepage = http://fmv.jku.at/lingeling/; + homepage = "http://fmv.jku.at/lingeling/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/science/logic/logisim/default.nix b/pkgs/applications/science/logic/logisim/default.nix index d6a1207b5d6..ce86b252311 100644 --- a/pkgs/applications/science/logic/logisim/default.nix +++ b/pkgs/applications/science/logic/logisim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://ozark.hendrix.edu/~burch/logisim; + 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; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index a479e31e339..eb83eaf79c5 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { that can be used for modelling, validation and verification of concurrent systems and protocols ''; - homepage = https://www.mcrl2.org/; + homepage = "https://www.mcrl2.org/"; license = licenses.boost; maintainers = with maintainers; [ moretea ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix index ed1218c401b..5755abfd907 100644 --- a/pkgs/applications/science/logic/metis-prover/default.nix +++ b/pkgs/applications/science/logic/metis-prover/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Automatic theorem prover for first-order logic with equality"; - homepage = http://www.gilith.com/research/metis/; + homepage = "http://www.gilith.com/research/metis/"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/logic/minisat/default.nix b/pkgs/applications/science/logic/minisat/default.nix index 6b642832b83..df1800e6c31 100644 --- a/pkgs/applications/science/logic/minisat/default.nix +++ b/pkgs/applications/science/logic/minisat/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ gebner raskin ]; platforms = platforms.unix; license = licenses.mit; - homepage = http://minisat.se/; + homepage = "http://minisat.se/"; }; } diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index ba0e787af72..63440213920 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -23,7 +23,7 @@ let patches = [ # Python 3.8 compatibility (fetchpatch { - url = https://github.com/sambayless/monosat/commit/a5079711d0df0451f9840f3a41248e56dbb03967.patch; + url = "https://github.com/sambayless/monosat/commit/a5079711d0df0451f9840f3a41248e56dbb03967.patch"; sha256 = "1p2y0jw8hb9c90nbffhn86k1dxd6f6hk5v70dfmpzka3y6g1ksal"; }) ]; @@ -50,7 +50,7 @@ let description = "SMT solver for Monotonic Theories"; platforms = platforms.unix; license = if includeGplCode then licenses.gpl2 else licenses.mit; - homepage = https://github.com/sambayless/monosat; + homepage = "https://github.com/sambayless/monosat"; maintainers = [ maintainers.acairncross ]; }; }; diff --git a/pkgs/applications/science/logic/open-wbo/default.nix b/pkgs/applications/science/logic/open-wbo/default.nix index 32ce9fde0c3..c314127e74b 100644 --- a/pkgs/applications/science/logic/open-wbo/default.nix +++ b/pkgs/applications/science/logic/open-wbo/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; license = licenses.mit; - homepage = http://sat.inesc-id.pt/open-wbo/; + homepage = "http://sat.inesc-id.pt/open-wbo/"; }; } diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 9e5ebe008b8..03b3ce4ff0b 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = http://code.google.com/p/opensmt/; + homepage = "http://code.google.com/p/opensmt/"; broken = true; downloadPage = "http://code.google.com/p/opensmt/downloads/list"; }; diff --git a/pkgs/applications/science/logic/ott/default.nix b/pkgs/applications/science/logic/ott/default.nix index fa7c3dd5e95..fa2ad9c4abc 100644 --- a/pkgs/applications/science/logic/ott/default.nix +++ b/pkgs/applications/science/logic/ott/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { terms of the defined language, parsing them and replacing them by target-system terms. ''; - homepage = http://www.cl.cam.ac.uk/~pes20/ott; + 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; diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix index 547bd31e8b4..b13d871580c 100644 --- a/pkgs/applications/science/logic/picosat/default.nix +++ b/pkgs/applications/science/logic/picosat/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "SAT solver with proof and core support"; - homepage = http://fmv.jku.at/picosat/; + homepage = "http://fmv.jku.at/picosat/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ roconnor thoughtpolice ]; diff --git a/pkgs/applications/science/logic/poly/default.nix b/pkgs/applications/science/logic/poly/default.nix index c833b22e49b..ee50a2d8504 100644 --- a/pkgs/applications/science/logic/poly/default.nix +++ b/pkgs/applications/science/logic/poly/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "libpoly"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "SRI-CSL"; repo = "libpoly"; - rev = "v${version}"; - sha256 = "0i5ar4lhs88glk0rvkmag656ii434i6i1q5dspx6d0kyg78fii64"; + # they've pushed to the release branch, use explicit tag + rev = "refs/tags/v${version}"; + sha256 = "1n3gijksnl2ybznq4lkwm2428f82423sxq18gnb2g1kiwqlzdaa3"; }; nativeBuildInputs = [ cmake ]; @@ -16,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp python ]; meta = with stdenv.lib; { - homepage = https://github.com/SRI-CSL/libpoly; + homepage = "https://github.com/SRI-CSL/libpoly"; description = "C library for manipulating polynomials"; license = licenses.lgpl3; platforms = platforms.all; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index d4feb5c9e28..98313e48cb2 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { below the tree (on single click) or in a separate window (on double or shift-click). ''; - homepage = http://askra.de/software/prooftree; + homepage = "http://askra.de/software/prooftree"; platforms = platforms.unix; maintainers = [ maintainers.jwiegley ]; license = licenses.gpl3; diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix index 9528a5942a4..fcdff855848 100644 --- a/pkgs/applications/science/logic/prover9/default.nix +++ b/pkgs/applications/science/logic/prover9/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "prover9-2009-11a"; src = fetchurl { - url = https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz; + url = "https://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz"; sha256 = "1l2i3d3h5z7nnbzilb6z92r0rbx0kh6yaxn2c5qhn3000xcfsay3"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.cs.unm.edu/~mccune/mace4/; + homepage = "https://www.cs.unm.edu/~mccune/mace4/"; license = "GPL"; description = "Automated theorem prover for first-order and equational logic"; longDescription = '' diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix index 9da2647d113..49245c73f2c 100644 --- a/pkgs/applications/science/logic/redprl/default.nix +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { description = "A proof assistant for Nominal Computational Type Theory"; - homepage = http://www.redprl.org/; + homepage = "http://www.redprl.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.acowley ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/sad/default.nix b/pkgs/applications/science/logic/sad/default.nix index 8e94356f376..f9b82b5d733 100644 --- a/pkgs/applications/science/logic/sad/default.nix +++ b/pkgs/applications/science/logic/sad/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.schmitthenner ]; - homepage = http://nevidal.org/sad.en.html; + homepage = "http://nevidal.org/sad.en.html"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix index d3ceeadbf9a..6c2b03b5b37 100644 --- a/pkgs/applications/science/logic/satallax/default.nix +++ b/pkgs/applications/science/logic/satallax/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.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; + homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php"; updateWalker = true; }; } diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 9b87b8c899e..857aba5a260 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -18,7 +18,7 @@ let inherit pname version src; license = lib.licenses.gpl3; - homepage = https://tamarin-prover.github.io; + homepage = "https://tamarin-prover.github.io"; description = "Security protocol verification in the symbolic model"; maintainers = [ lib.maintainers.thoughtpolice ]; }; diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index b1c72d7c5ee..3476b5ea9d9 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "An algorithm specification language with model checking tools"; - homepage = http://lamport.azurewebsites.net/tla/tla.html; + homepage = "http://lamport.azurewebsites.net/tla/tla.html"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/applications/science/logic/tlaplus/tlaps.nix b/pkgs/applications/science/logic/tlaplus/tlaps.nix index 7c8389688d9..cbca37ea53d 100644 --- a/pkgs/applications/science/logic/tlaplus/tlaps.nix +++ b/pkgs/applications/science/logic/tlaplus/tlaps.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { and scalable to large system specifications. It provides a consistent abstraction over the various “backend” verifiers. ''; - homepage = https://tla.msr-inria.inria.fr/tlaps/content/Home.html; + homepage = "https://tla.msr-inria.inria.fr/tlaps/content/Home.html"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.badi ]; diff --git a/pkgs/applications/science/logic/tlaplus/toolbox.nix b/pkgs/applications/science/logic/tlaplus/toolbox.nix index 91666e85d92..f326d62f8f0 100644 --- a/pkgs/applications/science/logic/tlaplus/toolbox.nix +++ b/pkgs/applications/science/logic/tlaplus/toolbox.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://research.microsoft.com/en-us/um/people/lamport/tla/toolbox.html; + homepage = "http://research.microsoft.com/en-us/um/people/lamport/tla/toolbox.html"; description = "IDE for the TLA+ tools"; longDescription = '' Integrated development environment for the TLA+ tools, based on Eclipse. You can use it diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index 161da6e4b23..975b989bd94 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { a foundational proof-carrying-code system, and a type safety proof for Standard ML. ''; - homepage = http://twelf.org/wiki/Main_Page; + homepage = "http://twelf.org/wiki/Main_Page"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/science/logic/vampire/default.nix b/pkgs/applications/science/logic/vampire/default.nix index 42963fe5f9c..e5941a35fd5 100644 --- a/pkgs/applications/science/logic/vampire/default.nix +++ b/pkgs/applications/science/logic/vampire/default.nix @@ -19,19 +19,19 @@ stdenv.mkDerivation rec { # https://github.com/vprover/vampire/pull/54 (fetchpatch { name = "fix-apple-cygwin-defines.patch"; - url = https://github.com/vprover/vampire/pull/54.patch; + url = "https://github.com/vprover/vampire/pull/54.patch"; sha256 = "0i6nrc50wlg1dqxq38lkpx4rmfb3lf7s8f95l4jkvqp0nxa20cza"; }) # https://github.com/vprover/vampire/pull/55 (fetchpatch { name = "fix-wait-any.patch"; - url = https://github.com/vprover/vampire/pull/55.patch; + url = "https://github.com/vprover/vampire/pull/55.patch"; sha256 = "1pwfpwpl23bqsgkmmvw6bnniyvp5j9v8l3z9s9pllfabnfcrcz9l"; }) # https://github.com/vprover/vampire/pull/56 (fetchpatch { name = "fenv.patch"; - url = https://github.com/vprover/vampire/pull/56.patch; + url = "https://github.com/vprover/vampire/pull/56.patch"; sha256 = "0xl3jcyqmk146mg3qj5hdd0pbja6wbq3250zmfhbxqrjh40mm40g"; }) ]; diff --git a/pkgs/applications/science/logic/verit/default.nix b/pkgs/applications/science/logic/verit/default.nix index 2c68191b800..f20a8324157 100644 --- a/pkgs/applications/science/logic/verit/default.nix +++ b/pkgs/applications/science/logic/verit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An open, trustable and efficient SMT-solver"; - homepage = http://www.verit-solver.org/; + homepage = "http://www.verit-solver.org/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index e5764461819..51cb2a456c1 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "1.2.1"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/38185/why3-1.2.1.tar.gz; + url = "https://gforge.inria.fr/frs/download.php/file/38185/why3-1.2.1.tar.gz"; sha256 = "014gkwisjp05x3342zxkryb729p02ngx1hcjjsrplpa53jzgz647"; }; diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/applications/science/machine-learning/fasttext/default.nix index 0de54572862..2ae5e0eeddc 100644 --- a/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for text classification and representation learning"; - homepage = https://fasttext.cc/; + homepage = "https://fasttext.cc/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.danieldk ]; diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index b1c89d29950..a952fb559ce 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -18,7 +18,7 @@ ''; meta = with stdenv.lib; { description = "LabelImg is a graphical image annotation tool and label object bounding boxes in images"; - homepage = https://github.com/tzutalin/labelImg; + homepage = "https://github.com/tzutalin/labelImg"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.cmcdragonkai ]; diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index c7bdf0f12a4..3856b8ec841 100644 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://streamlit.io/; + homepage = "https://streamlit.io/"; description = "The fastest way to build custom ML tools"; maintainers = with maintainers; [ yrashk ]; license = licenses.asl20; diff --git a/pkgs/applications/science/math/LiE/default.nix b/pkgs/applications/science/math/LiE/default.nix index d59ec57c1a8..f5f3bb0a42b 100644 --- a/pkgs/applications/science/math/LiE/default.nix +++ b/pkgs/applications/science/math/LiE/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { meta = { description = "A Computer algebra package for Lie group computations"; - homepage = http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/; + homepage = "http://wwwmathlabo.univ-poitiers.fr/~maavl/LiE/"; license = stdenv.lib.licenses.lgpl3; # see the website longDescription = '' diff --git a/pkgs/applications/science/math/almonds/default.nix b/pkgs/applications/science/math/almonds/default.nix index b5d9632c551..9edb0747b31 100644 --- a/pkgs/applications/science/math/almonds/default.nix +++ b/pkgs/applications/science/math/almonds/default.nix @@ -19,7 +19,7 @@ with python3.pkgs; buildPythonApplication rec { meta = with stdenv.lib; { description = "Terminal Mandelbrot fractal viewer"; - homepage = https://github.com/Tenchi2xh/Almonds; + homepage = "https://github.com/Tenchi2xh/Almonds"; license = licenses.mit; maintainers = with maintainers; [ infinisil ]; }; diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index 74adcab4e70..18b6e051b3f 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Storage conversion and expression calculator"; - homepage = https://github.com/jarun/bcal; + homepage = "https://github.com/jarun/bcal"; license = licenses.gpl3; platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/math/bliss/default.nix b/pkgs/applications/science/math/bliss/default.nix index 37504fceb14..361b0884662 100644 --- a/pkgs/applications/science/math/bliss/default.nix +++ b/pkgs/applications/science/math/bliss/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "bliss is an open source tool for computing automorphism groups and canonical forms of graphs. It has both a command line user interface as well as C++ and C programming language APIs."; - homepage = http://www.tcs.hut.fi/Software/bliss/; + homepage = "http://www.tcs.hut.fi/Software/bliss/"; license = licenses.lgpl3; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 5068abbf307..ea87c4953ee 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { modularity in mind. It is developed by the Berkeley Vision and Learning Center (BVLC) and by community contributors. ''; - homepage = http://caffe.berkeleyvision.org/; + homepage = "http://caffe.berkeleyvision.org/"; maintainers = with maintainers; [ jb55 ]; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index 0d149eca3b6..8e50f48b286 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C-style arbitrary precision calculator"; - homepage = http://www.isthe.com/chongo/tech/comp/calc/; + homepage = "http://www.isthe.com/chongo/tech/comp/calc/"; license = licenses.lgpl21; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index e68ceb379b0..b75f3d3f786 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # FIXME: move share/coin/Data to a separate output? meta = { - homepage = https://projects.coin-or.org/Cbc; + homepage = "https://projects.coin-or.org/Cbc"; license = lib.licenses.epl10; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix new file mode 100644 index 00000000000..f91e5be5170 --- /dev/null +++ b/pkgs/applications/science/math/cemu/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub +, stdenv +, mkDerivation +, SDL2 +, libGL +, libarchive +, libusb +, qtbase +, qmake +, git +, libpng_apng +, pkgconfig +}: + +mkDerivation rec { + pname = "CEmu"; + version = "1.3"; + src = fetchFromGitHub { + owner = "CE-Programming"; + repo = "CEmu"; + rev = "v${version}"; + sha256 = "1wcdnzcqscawj6jfdj5wwmw9g9vsd6a1rx0rrramakxzf8b7g47r"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + qmake + git + pkgconfig + ]; + + buildInputs = [ + SDL2 + libGL + libarchive + libusb + qtbase + libpng_apng + ]; + + qmakeFlags = [ + "gui/qt" + ]; + + meta = with stdenv.lib; { + changelog = "https://github.com/CE-Programming/CEmu/releases/tag/v${version}"; + description = "Third-party TI-84 Plus CE / TI-83 Premium CE emulator, focused on developer features"; + homepage = "https://ce-programming.github.io/CEmu"; + license = licenses.gpl3; + maintainers = with maintainers; [ luc65r ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index ceb87b25ba8..e2db40a402e 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -95,7 +95,7 @@ in stdenv.mkDerivation rec { # Newer cub is included with cudatoolkit now and it breaks the build. # https://github.com/Microsoft/CNTK/issues/3191 broken = cudaSupport; - homepage = https://github.com/Microsoft/CNTK; + homepage = "https://github.com/Microsoft/CNTK"; description = "An open source deep-learning toolkit"; license = if onebitSGDSupport then licenses.unfreeRedistributable else licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index 9b402fe0ac9..eef60829f8e 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://projects.coin-or.org/Csdp; + homepage = "https://projects.coin-or.org/Csdp"; license = lib.licenses.cpl10; maintainers = [ lib.maintainers.roconnor ]; description = "A C Library for Semidefinite Programming"; diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 7b768f7077e..3e8e5879950 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Elliptic Curve Method for Integer Factorization"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://ecm.gforge.inria.fr/; + homepage = "http://ecm.gforge.inria.fr/"; maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index 6d1c778d1e0..879ad96a936 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Geometry Drawing Language"; - homepage = http://www.eukleides.org/; + homepage = "http://www.eukleides.org/"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/math/form/default.nix b/pkgs/applications/science/math/form/default.nix index 0dbafebf2c0..09137279290 100644 --- a/pkgs/applications/science/math/form/default.nix +++ b/pkgs/applications/science/math/form/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The FORM project for symbolic manipulation of very big expressions"; - homepage = https://www.nikhef.nl/~form/; + homepage = "https://www.nikhef.nl/~form/"; license = licenses.gpl3; maintainers = [ maintainers.veprbl ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 7d1f738641a..39ca53c47e6 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = http://fricas.sourceforge.net/; + homepage = "http://fricas.sourceforge.net/"; description = "An advanced computer algebra system"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/applications/science/math/gap/default.nix b/pkgs/applications/science/math/gap/default.nix index 7eb10d1f952..87f4fa12038 100644 --- a/pkgs/applications/science/math/gap/default.nix +++ b/pkgs/applications/science/math/gap/default.nix @@ -175,6 +175,6 @@ stdenv.mkDerivation rec { # is reasonable and that way the binary cache doesn't get overloaded. hydraPlatforms = lib.optionals (!keepAllPackages) meta.platforms; license = licenses.gpl2; - homepage = http://gap-system.org/; + homepage = "http://gap-system.org/"; }; } diff --git a/pkgs/applications/science/math/geogebra/default.nix b/pkgs/applications/science/math/geogebra/default.nix index bba26610a07..1dd92267a83 100644 --- a/pkgs/applications/science/math/geogebra/default.nix +++ b/pkgs/applications/science/math/geogebra/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { together geometry, algebra, spreadsheets, graphing, statistics and calculus in one easy-to-use package. ''; - homepage = https://www.geogebra.org/; + homepage = "https://www.geogebra.org/"; maintainers = with maintainers; [ ma27 ]; license = with licenses; [ gpl3 cc-by-nc-sa-30 geogebra ]; platforms = platforms.all; diff --git a/pkgs/applications/science/math/gfan/default.nix b/pkgs/applications/science/math/gfan/default.nix index 33b003b2b56..72d1a548c53 100644 --- a/pkgs/applications/science/math/gfan/default.nix +++ b/pkgs/applications/science/math/gfan/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = http://home.math.au.dk/jensen/software/gfan/gfan.html; + homepage = "http://home.math.au.dk/jensen/software/gfan/gfan.html"; }; } diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index 79f20f06b29..1e4fd6288ce 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GiNaC is Not a CAS"; - homepage = http://www.ginac.de/; + homepage = "http://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 c11110e4bc4..09d0d524168 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://raffalli.eu/~christophe/glsurf/; + homepage = "https://raffalli.eu/~christophe/glsurf/"; description = "A program to draw implicit surfaces and curves"; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index e65cf52d581..2c4d5f254da 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gmsh"; - version = "4.5.4"; + version = "4.5.6"; src = fetchurl { url = "http://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "1k9f7qxlwja9i40qy55070sjnr21bl165677mdqw7qyb8d7wgy6c"; + sha256 = "0gs65bgr1ph5lz7r6manqj8cra30s7c94pxilkd2z0p5vq6fpsj6"; }; buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL diff --git a/pkgs/applications/science/math/gurobi/default.nix b/pkgs/applications/science/math/gurobi/default.nix index 4ac7c411c2d..1aa7bce07c5 100644 --- a/pkgs/applications/science/math/gurobi/default.nix +++ b/pkgs/applications/science/math/gurobi/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimization solver for mathematical programming"; - homepage = https://www.gurobi.com; + homepage = "https://www.gurobi.com"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/math/hmetis/default.nix b/pkgs/applications/science/math/hmetis/default.nix index 45a13d02889..b5e99a8dd75 100644 --- a/pkgs/applications/science/math/hmetis/default.nix +++ b/pkgs/applications/science/math/hmetis/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "hMETIS is a set of programs for partitioning hypergraphs"; - homepage = http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview; + homepage = "http://glaros.dtc.umn.edu/gkhome/metis/hmetis/overview"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 1d1fb96a473..5ac1594e19a 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Just Another Gibbs Sampler"; license = licenses.gpl2; - homepage = http://mcmc-jags.sourceforge.net; + homepage = "http://mcmc-jags.sourceforge.net"; maintainers = [ maintainers.andres ]; platforms = platforms.unix; }; diff --git a/pkgs/applications/science/math/lrcalc/default.nix b/pkgs/applications/science/math/lrcalc/default.nix index f407358d8f2..438a84c0e0b 100644 --- a/pkgs/applications/science/math/lrcalc/default.nix +++ b/pkgs/applications/science/math/lrcalc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Littlewood-Richardson calculator"; - homepage = http://math.rutgers.edu/~asbuch/lrcalc/; + homepage = "http://math.rutgers.edu/~asbuch/lrcalc/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index 4204b139913..c7da7b16da8 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; - homepage = http://www.wolfram.com/mathematica/; + homepage = "http://www.wolfram.com/mathematica/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index 521cb70099b..898d6a48635 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; - homepage = http://www.wolfram.com/mathematica/; + homepage = "http://www.wolfram.com/mathematica/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index aaa1c02ec0a..617ac865713 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = { description = "Wolfram Mathematica computational software system"; - homepage = http://www.wolfram.com/mathematica/; + homepage = "http://www.wolfram.com/mathematica/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 7cd1b2eb99f..7831640b124 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -9,6 +9,7 @@ , freetype , gcc , glib +, libssh2 , ncurses , opencv , openssl @@ -44,9 +45,11 @@ stdenv.mkDerivation rec { gcc.cc gcc.libc glib + libssh2 ncurses opencv openssl + stdenv.cc.cc.lib unixODBC xkeyboard_config libxml2 @@ -93,7 +96,7 @@ stdenv.mkDerivation rec { # Fix library paths cd $out/libexec/Mathematica/Executables for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do - sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}\n" $path + sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:${stdenv.cc.cc.lib}/lib:${libssh2}/lib:\''${LD_LIBRARY_PATH}\n" $path done # Fix xkeyboard config path for Qt @@ -102,7 +105,7 @@ stdenv.mkDerivation rec { done # Remove some broken libraries - rm $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so* + rm -f $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so* ''; preFixup = '' @@ -145,7 +148,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wolfram Mathematica computational software system"; - homepage = http://www.wolfram.com/mathematica/; + homepage = "http://www.wolfram.com/mathematica/"; license = licenses.unfree; maintainers = with maintainers; [ herberteuler ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index 51fb489be7e..c75c91be059 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -8,6 +8,12 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { + version = "12.1.0"; + lang = "en"; + language = "English"; + sha256 = "15m9l20jvkxh5w6mbp81ys7mx2lx5j8acw5gz0il89lklclgb8z7"; + } + { version = "12.0.0"; lang = "en"; language = "English"; diff --git a/pkgs/applications/science/math/maxima/5.41.nix b/pkgs/applications/science/math/maxima/5.41.nix index 583391d08dd..829dffc6116 100644 --- a/pkgs/applications/science/math/maxima/5.41.nix +++ b/pkgs/applications/science/math/maxima/5.41.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation ({ meta = { description = "Computer algebra system"; - homepage = http://maxima.sourceforge.net; + homepage = "http://maxima.sourceforge.net"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 5843f38a74a..49ff0d5d5a0 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation ({ meta = { description = "Computer algebra system"; - homepage = http://maxima.sourceforge.net; + homepage = "http://maxima.sourceforge.net"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/math/msieve/default.nix b/pkgs/applications/science/math/msieve/default.nix index 643d990feb8..db7a1c14906 100644 --- a/pkgs/applications/science/math/msieve/default.nix +++ b/pkgs/applications/science/math/msieve/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "msieve-1.53"; src = fetchurl { - url = mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz; + url = "mirror://sourceforge/msieve/msieve/Msieve%20v1.53/msieve153_src.tar.gz"; sha256 = "1d1vv7j4rh3nnxsmvafi73qy7lw7n3akjlm5pjl3m936yapvmz65"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A C library implementing a suite of algorithms to factor large integers"; license = stdenv.lib.licenses.publicDomain; - homepage = http://msieve.sourceforge.net/; + homepage = "http://msieve.sourceforge.net/"; maintainers = [ stdenv.lib.maintainers.roconnor ]; platforms = [ "x86_64-linux" ] ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index bd4725ce73c..5b7688f6051 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight, Portable, Flexible Distributed/Mobile Deep Learning with Dynamic, Mutation-aware Dataflow Dep Scheduler"; - homepage = https://mxnet.incubator.apache.org/; + homepage = "https://mxnet.incubator.apache.org/"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index a4921785956..3fbcfecab06 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { answers in to future equations and if that answer changes, so does the equations it’s used in. ''; - homepage = https://github.com/parnold-x/nasc; + homepage = "https://github.com/parnold-x/nasc"; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index 986610eea60..64cc4a9aa00 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { license = licenses.asl20; maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.unix; - homepage = http://pallini.di.uniroma1.it/; + homepage = "http://pallini.di.uniroma1.it/"; }; } diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index e9fd21b46d8..4912b82d158 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -4,10 +4,12 @@ , doSymlink ? true # symlink the executables to the default location (without dimension postfix) }: +let + dim = toString dimensions; +in stdenv.mkDerivation rec { + pname = "palp"; version = "2.1"; - dim = toString dimensions; - name = "palp-${dim}d-${version}"; src = fetchurl { url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"; @@ -75,7 +77,7 @@ stdenv.mkDerivation rec { algorithms work in any dimension and our key routine for vertex and facet enumeration compares well with existing packages. ''; - homepage = http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html; + homepage = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; # Just a link on the website pointing to gpl -- now gplv3. When the last # version was released that pointed to gplv2 however, so thats probably # the right license. diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 8f2f740f248..8b5176c94f6 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -81,8 +81,8 @@ stdenv.mkDerivation rec { run 3 or 4 times faster.) gp2c currently only understands a subset of the GP language. ''; - homepage = http://pari.math.u-bordeaux.fr; - downloadPage = http://pari.math.u-bordeaux.fr/download.html; + homepage = "http://pari.math.u-bordeaux.fr"; + downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes raskin AndersonTorres timokau ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/applications/science/math/pcalc/default.nix b/pkgs/applications/science/math/pcalc/default.nix index 51c93f197e4..f372357fe7d 100644 --- a/pkgs/applications/science/math/pcalc/default.nix +++ b/pkgs/applications/science/math/pcalc/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "20141224"; src = fetchgit { - url = git://git.code.sf.net/p/pcalc/code; + url = "git://git.code.sf.net/p/pcalc/code"; rev = "181d60d3c880da4344fef7138065943eb3b9255f"; sha256 = "1hd5bh20j5xzvv6qa0fmzmv0h8sf38r7zgi7y0b6nk17pjq33v90"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ bison flex ]; meta = { - homepage = http://pcalc.sourceforge.net/; + homepage = "http://pcalc.sourceforge.net/"; description = "Programmer's calculator"; license = licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ftrvxmtrx ]; diff --git a/pkgs/applications/science/math/perseus/default.nix b/pkgs/applications/science/math/perseus/default.nix index 2d150d0c30e..55293e6c8a7 100644 --- a/pkgs/applications/science/math/perseus/default.nix +++ b/pkgs/applications/science/math/perseus/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { around datasets arising from point samples, images, distance matrices and so forth. ''; - homepage = http://www.sas.upenn.edu/~vnanda/perseus/index.html; + 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; diff --git a/pkgs/applications/science/math/pspp/default.nix b/pkgs/applications/science/math/pspp/default.nix index af338c74fd4..95c2c3931b3 100644 --- a/pkgs/applications/science/math/pspp/default.nix +++ b/pkgs/applications/science/math/pspp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.gnu.org/software/pspp/; + 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; diff --git a/pkgs/applications/science/math/pynac/default.nix b/pkgs/applications/science/math/pynac/default.nix index 4022383dbc7..82e33121671 100644 --- a/pkgs/applications/science/math/pynac/default.nix +++ b/pkgs/applications/science/math/pynac/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { It is a lite version of GiNaC as well, not implementing all the features of the full GiNaC, and it is *only* meant to be used as a Python library. ''; - homepage = http://pynac.org; + homepage = "http://pynac.org"; license = licenses.gpl3; maintainers = with maintainers; [ timokau ]; platforms = platforms.unix; diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index c23debdd7a4..e393111590a 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.8.0"; + version = "3.8.0a"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "0nsg6dzg5r7rzqr671nvrf1c50rjwpz7bxv5f20i4s7agizgv840"; + sha256 = "0bjd61bbc5b2i09kz3ss01c0xmxrhmiv5wpbhhplkp3yhw2qrf3m"; }; patchPhase = '' diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix index 71d16fb626c..fb205a69f03 100644 --- a/pkgs/applications/science/math/ratpoints/default.nix +++ b/pkgs/applications/science/math/ratpoints/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = http://www.mathe2.uni-bayreuth.de/stoll/programs/; + homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/"; updateWalker = true; }; } diff --git a/pkgs/applications/science/math/ries/default.nix b/pkgs/applications/science/math/ries/default.nix index b244ee75b30..4adf3ef2096 100644 --- a/pkgs/applications/science/math/ries/default.nix +++ b/pkgs/applications/science/math/ries/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://mrob.com/pub/ries/; + homepage = "https://mrob.com/pub/ries/"; description = "Tool to produce a list of equations that approximately solve to a given number"; platforms = platforms.all; maintainers = with maintainers; [ symphorien ]; diff --git a/pkgs/applications/science/math/ripser/default.nix b/pkgs/applications/science/math/ripser/default.nix index a42a5b710ce..1c8ced5ed22 100644 --- a/pkgs/applications/science/math/ripser/default.nix +++ b/pkgs/applications/science/math/ripser/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { #Patch from dev branch to make compilation work. #Will be removed when it gets merged into master. patches = [(fetchurl { - url = https://github.com/Ripser/ripser/commit/dc78d8ce73ee35f3828f0aad67a4e53620277ebf.patch; + url = "https://github.com/Ripser/ripser/commit/dc78d8ce73ee35f3828f0aad67a4e53620277ebf.patch"; sha256 = "1y93aqpqz8fm1cxxrf90dhh67im3ndkr8dnxgbw5y96296n4r924"; })]; @@ -59,7 +59,7 @@ stdenv.mkDerivation { meta = { description = "A lean C++ code for the computation of Vietoris–Rips persistence barcodes"; - homepage = https://github.com/Ripser/ripser; + homepage = "https://github.com/Ripser/ripser"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [erikryb]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch b/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch new file mode 100644 index 00000000000..197d1347d53 --- /dev/null +++ b/pkgs/applications/science/math/rofi-calc/0001-Patch-plugindir-to-output.patch @@ -0,0 +1,25 @@ +From 0eaef67b683683fb423fcb2d5096b3cdf9a4a9cd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com> +Date: Sun, 22 Mar 2020 12:26:10 +0100 +Subject: [PATCH] Patch plugindir to output + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 50edb74..639ee86 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -50,7 +50,7 @@ PKG_CHECK_MODULES([glib], [glib-2.0 >= 2.40 gio-unix-2.0 gmodule-2.0 ]) + PKG_CHECK_MODULES([cairo], [cairo]) + PKG_CHECK_MODULES([rofi], [rofi >= 1.5.4]) + +-[rofi_PLUGIN_INSTALL_DIR]="`$PKG_CONFIG --variable=pluginsdir rofi`" ++[rofi_PLUGIN_INSTALL_DIR]="`echo $out/lib/rofi`" + AC_SUBST([rofi_PLUGIN_INSTALL_DIR]) + + LT_INIT([disable-static]) +-- +2.25.1 + diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix new file mode 100644 index 00000000000..842265cf3d5 --- /dev/null +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkgconfig +, rofi-unwrapped +, libqalculate +, glib +, cairo +, gobject-introspection +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "rofi-calc"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "svenstaro"; + repo = pname; + rev = "v${version}"; + sha256 = "00pz0s99pihjdjy8pl4ckg2qciyp32k439lmjb5iazwck512ar92"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + rofi-unwrapped + libqalculate + glib + cairo + ]; + + patches = [ + ./0001-Patch-plugindir-to-output.patch + ]; + + postPatch = '' + sed "s|qalc_binary = \"qalc\"|qalc_binary = \"${libqalculate}/bin/qalc\"|" -i src/calc.c + ''; + + meta = with stdenv.lib; { + description = "Do live calculations in rofi!"; + homepage = "https://github.com/svenstaro/rofi-calc"; + license = licenses.mit; + maintainers = with maintainers; [ luc65r albakham ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + }; +} + diff --git a/pkgs/applications/science/math/sage/flask-oldsessions.nix b/pkgs/applications/science/math/sage/flask-oldsessions.nix index 0899c93602b..403dc8708fa 100644 --- a/pkgs/applications/science/math/sage/flask-oldsessions.nix +++ b/pkgs/applications/science/math/sage/flask-oldsessions.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { description = "Provides a session class that works like the one in Flask before 0.10."; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/mitsuhiko/flask-oldsessions; + homepage = "https://github.com/mitsuhiko/flask-oldsessions"; }; } diff --git a/pkgs/applications/science/math/sage/flask-openid.nix b/pkgs/applications/science/math/sage/flask-openid.nix index 9043fabd9b4..527173dec80 100644 --- a/pkgs/applications/science/math/sage/flask-openid.nix +++ b/pkgs/applications/science/math/sage/flask-openid.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Adds openid support to flask applications"; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = https://pythonhosted.org/Flask-OpenID/; + homepage = "https://pythonhosted.org/Flask-OpenID/"; }; } diff --git a/pkgs/applications/science/math/sage/python-openid.nix b/pkgs/applications/science/math/sage/python-openid.nix index 1bfe02f50df..4c7fdadadaf 100644 --- a/pkgs/applications/science/math/sage/python-openid.nix +++ b/pkgs/applications/science/math/sage/python-openid.nix @@ -35,6 +35,6 @@ buildPythonPackage rec { description = "OpenID library for Python"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/openid/python-openid/; + homepage = "https://github.com/openid/python-openid/"; }; } diff --git a/pkgs/applications/science/math/scilab-bin/default.nix b/pkgs/applications/science/math/scilab-bin/default.nix index 8e85cece9b2..f9abdee2d14 100644 --- a/pkgs/applications/science/math/scilab-bin/default.nix +++ b/pkgs/applications/science/math/scilab-bin/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.scilab.org/; + homepage = "http://www.scilab.org/"; description = "Scientific software package for numerical computations (Matlab lookalike)"; # see http://www.scilab.org/legal_notice license = "Scilab"; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 02f1f4e58a9..24b3feef51e 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { makeFlags = [ "all" ]; meta = { - homepage = http://www.scilab.org/; + homepage = "http://www.scilab.org/"; description = "Scientific software package for numerical computations (Matlab lookalike)"; # see http://www.scilab.org/legal license = "SciLab"; diff --git a/pkgs/applications/science/math/scotch/default.nix b/pkgs/applications/science/math/scotch/default.nix index 610f1ef05c0..75a6b2dba68 100644 --- a/pkgs/applications/science/math/scotch/default.nix +++ b/pkgs/applications/science/math/scotch/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { 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; + homepage = "http://www.labri.fr/perso/pelegrin/scotch"; license = stdenv.lib.licenses.cecill-c; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index fccd1489e11..a8c4f6bb9a0 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { # 32 bit x86 fails with some link error: `undefined reference to `__divmoddi4@GCC_7.0.0'` platforms = subtractLists platforms.i686 platforms.unix; license = licenses.gpl3; # Or GPLv2 at your option - but not GPLv4 - homepage = http://www.singular.uni-kl.de; + homepage = "http://www.singular.uni-kl.de"; downloadPage = "http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/"; }; } diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix index 67561658eb2..4bb39ab73f5 100644 --- a/pkgs/applications/science/math/speedcrunch/default.nix +++ b/pkgs/applications/science/math/speedcrunch/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { ''; meta = with lib; { - homepage = http://speedcrunch.org; + homepage = "http://speedcrunch.org"; license = licenses.gpl2Plus; description = "A fast power user calculator"; longDescription = '' diff --git a/pkgs/applications/science/math/weka/default.nix b/pkgs/applications/science/math/weka/default.nix index ec9ea0b8533..c4fc19d6c6b 100644 --- a/pkgs/applications/science/math/weka/default.nix +++ b/pkgs/applications/science/math/weka/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.cs.waikato.ac.nz/ml/weka/; + 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 ]; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index ed680b1b4cd..c19d8f0fbc1 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Easy to use, general purpose Computer Algebra System"; - homepage = http://www.yacas.org/; + homepage = "http://www.yacas.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index e135534d1ac..279f602e3fd 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Medical imaging software with 2D, 3D and 4D capabilities"; - homepage = https://www.aliza-dicom-viewer.com; + homepage = "https://www.aliza-dicom-viewer.com"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ mounium ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 38b9b8ec66d..802abae80e1 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Free software for distributed and grid computing"; - homepage = https://boinc.berkeley.edu/; + homepage = "https://boinc.berkeley.edu/"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; # arbitrary choice }; diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index da118f6bca5..02adb689e20 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { COLMAP is a general-purpose Structure-from-Motion (SfM) and Multi-View Stereo (MVS) pipeline with a graphical and command-line interface. ''; - homepage = https://colmap.github.io/index.html; + homepage = "https://colmap.github.io/index.html"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ lebastr ]; diff --git a/pkgs/applications/science/misc/cytoscape/default.nix b/pkgs/applications/science/misc/cytoscape/default.nix index 8ed3deed804..b4e4adbfa6f 100644 --- a/pkgs/applications/science/misc/cytoscape/default.nix +++ b/pkgs/applications/science/misc/cytoscape/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.cytoscape.org; + 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]; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index 8d0336f5828..18def1d24e2 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Curve fitting and peak fitting software"; license = stdenv.lib.licenses.gpl2; - homepage = http://fityk.nieto.pl/; + homepage = "http://fityk.nieto.pl/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/misc/gephi/default.nix b/pkgs/applications/science/misc/gephi/default.nix index 577c8ecfa05..b6b53013cb4 100644 --- a/pkgs/applications/science/misc/gephi/default.nix +++ b/pkgs/applications/science/misc/gephi/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A platform for visualizing and manipulating large graphs"; - homepage = https://gephi.org; + homepage = "https://gephi.org"; license = licenses.gpl3; maintainers = [ maintainers.taeer ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index 9b510d432fb..592e36370e0 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Desktop software for the interactive visualisation of plate-tectonics"; - homepage = https://www.gplates.org; + homepage = "https://www.gplates.org"; license = licenses.gpl2; platforms = platforms.all; broken = true; diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/applications/science/misc/megam/default.nix index 6cdc86d20eb..8bb64932f20 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/applications/science/misc/megam/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { than the iterative scaling techniques used in almost every other maxent package out there. ''; - homepage = http://www.umiacs.umd.edu/~hal/megam; + homepage = "http://www.umiacs.umd.edu/~hal/megam"; license = "non-commercial"; diff --git a/pkgs/applications/science/misc/netlogo/default.nix b/pkgs/applications/science/misc/netlogo/default.nix index 9b0279bd4d0..af892441a47 100644 --- a/pkgs/applications/science/misc/netlogo/default.nix +++ b/pkgs/applications/science/misc/netlogo/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { NetLogo is a multi-agent programmable modeling environment. It is used by many tens of thousands of students, teachers and researchers worldwide. ''; - homepage = https://ccl.northwestern.edu/netlogo/index.shtml; + homepage = "https://ccl.northwestern.edu/netlogo/index.shtml"; license = licenses.gpl2; maintainers = [ maintainers.dpaetzel ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/misc/openmvg/default.nix b/pkgs/applications/science/misc/openmvg/default.nix index 121e953f43a..aea376301ab 100644 --- a/pkgs/applications/science/misc/openmvg/default.nix +++ b/pkgs/applications/science/misc/openmvg/default.nix @@ -42,7 +42,7 @@ 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/; + homepage = "https://openmvg.readthedocs.io/en/latest/"; license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ mdaiter ]; diff --git a/pkgs/applications/science/misc/openmvs/default.nix b/pkgs/applications/science/misc/openmvs/default.nix index bb067fbca7a..efdd86f0ab2 100644 --- a/pkgs/applications/science/misc/openmvs/default.nix +++ b/pkgs/applications/science/misc/openmvs/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library for computer-vision scientists and especially targeted to the Multi-View Stereo reconstruction community"; - homepage = http://cdcseacave.github.io/openMVS/; + homepage = "http://cdcseacave.github.io/openMVS/"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ mdaiter ]; diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 1bb74ec17a3..839fc8f9546 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -16,8 +16,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0shlh0m9k0iqxpv9zmiw7a6v197swrvpz9x6qzhximzkdwni9gz9"; - buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ openssl gmp ncurses ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl gmp ncurses ]; # Some tests fail and/or attempt to use internet servers. doCheck = false; diff --git a/pkgs/applications/science/misc/root/5.nix b/pkgs/applications/science/misc/root/5.nix index 8422eb8752b..fd06d721ebd 100644 --- a/pkgs/applications/science/misc/root/5.nix +++ b/pkgs/applications/science/misc/root/5.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = https://root.cern.ch/; + homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index b901e40a194..990952e21ac 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = https://root.cern.ch/; + homepage = "https://root.cern.ch/"; description = "A data analysis framework"; platforms = platforms.unix; maintainers = [ maintainers.veprbl ]; diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index ed6fa3ae886..bbbe80eb656 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -67,7 +67,7 @@ python.pkgs.buildPythonApplication rec { patches = [ ./pyparsing-fix.patch ./local_config.patch ]; meta = with lib; { - homepage = https://www.sasview.org; + homepage = "https://www.sasview.org"; description = "Fitting and data analysis for small angle scattering data"; maintainers = with maintainers; [ rprospero ]; license = licenses.bsd3; diff --git a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix index 8eff2057928..42b9560d9b8 100644 --- a/pkgs/applications/science/misc/sasview/xhtml2pdf.nix +++ b/pkgs/applications/science/misc/sasview/xhtml2pdf.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "A pdf converter for the ReportLab Toolkit"; - homepage = https://github.com/xhtml2pdf/xhtml2pdf; + homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ rprospero ]; }; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index b8aef4bd53f..0ba1cd0d2fa 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { scheduling on distributed computing platforms ranging from simple network of workstations to Computational Grids. ''; - homepage = https://simgrid.org/; + homepage = "https://simgrid.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ mickours mpoquet ]; platforms = ["x86_64-linux"]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 27bf47e890a..34bdaf6bacf 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.10.0"; + version = "5.13.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0n8d5c8sc90kfdw740ad9ffbkg1ic3k1pmlnk68qr4w4vc98pym3"; + sha256 = "11snr7sgv70d3y63s5svijfx8f4xpggh96g8chr6lccl4mi1s9x9"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json meta = with stdenv.lib; { - homepage = http://snakemake.bitbucket.io; + homepage = "http://snakemake.bitbucket.io"; license = licenses.mit; description = "Python-based execution environment for make-like workflows"; longDescription = '' diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 3f83f2f30a6..f29cd41169d 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { data that can be tailored to the problems he or she is addressing. ''; - homepage = http://tulip.labri.fr/; + homepage = "http://tulip.labri.fr/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 3e7c7a42eb8..0d749bb9be4 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { parallel or distributed applications. ''; - homepage = http://vite.gforge.inria.fr/; + homepage = "http://vite.gforge.inria.fr/"; license = stdenv.lib.licenses.cecill20; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix index b0ed5e94637..51978e95766 100644 --- a/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix +++ b/pkgs/applications/science/molecular-dynamics/dl-poly-classic/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.ccp5.ac.uk/DL_POLY_C; + homepage = "https://www.ccp5.ac.uk/DL_POLY_C"; description = "DL_POLY Classic is a general purpose molecular dynamics simulation package"; license = licenses.bsdOriginal; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index 234bbdab315..ab706a88931 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { funding from the DOE. It is an open-source code, distributed freely under the terms of the GNU Public License (GPL). ''; - homepage = http://lammps.sandia.gov; + homepage = "http://lammps.sandia.gov"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/applications/science/physics/quantomatic/default.nix b/pkgs/applications/science/physics/quantomatic/default.nix index b22b9d412fd..a9c83310b2f 100644 --- a/pkgs/applications/science/physics/quantomatic/default.nix +++ b/pkgs/applications/science/physics/quantomatic/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A piece of software for reasoning about monoidal theories; in particular, quantum information processing"; license = licenses.gpl3; - homepage = https://quantomatic.github.io/; + homepage = "https://quantomatic.github.io/"; maintainers = with maintainers; [ nickhu ]; platforms = platforms.all; }; diff --git a/pkgs/applications/science/physics/sacrifice/default.nix b/pkgs/applications/science/physics/sacrifice/default.nix index 80417f0fcc1..609fea9f7dc 100644 --- a/pkgs/applications/science/physics/sacrifice/default.nix +++ b/pkgs/applications/science/physics/sacrifice/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { description = "A standalone contribution to AGILe for steering Pythia 8"; license = stdenv.lib.licenses.gpl2; - homepage = https://agile.hepforge.org/trac/wiki/Sacrifice; + homepage = "https://agile.hepforge.org/trac/wiki/Sacrifice"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 04115399c1a..85b2ddd4d07 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; license = stdenv.lib.licenses.gpl2; - homepage = https://gitlab.com/sherpa-team/sherpa; + homepage = "https://gitlab.com/sherpa-team/sherpa"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index 818bea7d0ff..f4d70e79079 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The xFitter project is an open source QCD fit framework ready to extract PDFs and assess the impact of new data"; license = licenses.gpl3; - homepage = https://www.xfitter.org/xFitter; + homepage = "https://www.xfitter.org/xFitter"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix index 2c0bb84c801..4eeca5c1759 100644 --- a/pkgs/applications/science/programming/fdr/default.nix +++ b/pkgs/applications/science/programming/fdr/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "fdr-4.2.3"; src = fetchurl { - url = https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz; + url = "https://www.cs.ox.ac.uk/projects/fdr/downloads/fdr-3789-linux-x86_64.tar.gz"; sha256 = "0n2yqichym5xdawlgk3r7yha88k7ycnx6585jfrcm7043sls1i88"; }; @@ -59,7 +59,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.cs.ox.ac.uk/projects/fdr/; + homepage = "https://www.cs.ox.ac.uk/projects/fdr/"; description = "The CSP refinement checker"; license = licenses.unfreeRedistributable; platforms = platforms.linux; diff --git a/pkgs/applications/science/programming/groove/default.nix b/pkgs/applications/science/programming/groove/default.nix index e854f20d39a..87b7b02317a 100644 --- a/pkgs/applications/science/programming/groove/default.nix +++ b/pkgs/applications/science/programming/groove/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GRaphs for Object-Oriented VErification"; - homepage = http://groove.cs.utwente.nl/; + homepage = "http://groove.cs.utwente.nl/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/applications/science/programming/scyther/default.nix b/pkgs/applications/science/programming/scyther/default.nix index b4daae1afc0..5cfe081072a 100644 --- a/pkgs/applications/science/programming/scyther/default.nix +++ b/pkgs/applications/science/programming/scyther/default.nix @@ -14,7 +14,7 @@ let meta = with lib; { description = "Scyther is a tool for the automatic verification of security protocols."; - homepage = https://www.cs.ox.ac.uk/people/cas.cremers/scyther/; + homepage = "https://www.cs.ox.ac.uk/people/cas.cremers/scyther/"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/apmplanner2/default.nix b/pkgs/applications/science/robotics/apmplanner2/default.nix index 0bc58c50335..ede698e2b0b 100644 --- a/pkgs/applications/science/robotics/apmplanner2/default.nix +++ b/pkgs/applications/science/robotics/apmplanner2/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { A GUI ground control station for autonomous vehicles using the MAVLink protocol. Includes support for the APM and PX4 based controllers. ''; - homepage = https://ardupilot.org/planner2/; + homepage = "https://ardupilot.org/planner2/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ wucke13 ]; }; diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index 31295114375..4684ba8c193 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { 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; + homepage = "https://github.com/betaflight/betaflight/wiki"; license = licenses.gpl3; maintainers = with maintainers; [ wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index a3ebda463b9..aea298b6548 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ++ optional withHdf5Support hdf5; meta = with stdenv.lib; { - homepage = http://gazebosim.org/; + homepage = "http://gazebosim.org/"; description = "Multi-robot simulator for outdoor environments"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/applications/science/robotics/yarp/default.nix b/pkgs/applications/science/robotics/yarp/default.nix index d14c0bb0fe8..df2c569a31c 100644 --- a/pkgs/applications/science/robotics/yarp/default.nix +++ b/pkgs/applications/science/robotics/yarp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Yet Another Robot Platform"; - homepage = http://yarp.it; + homepage = "http://yarp.it"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/applications/search/doodle/default.nix b/pkgs/applications/search/doodle/default.nix index 9d1da21492a..9bf00801600 100644 --- a/pkgs/applications/search/doodle/default.nix +++ b/pkgs/applications/search/doodle/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://grothoff.org/christian/doodle/; + 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]; diff --git a/pkgs/applications/search/grepcidr/default.nix b/pkgs/applications/search/grepcidr/default.nix index 06b2aee0392..125e67938ec 100644 --- a/pkgs/applications/search/grepcidr/default.nix +++ b/pkgs/applications/search/grepcidr/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Filter IPv4 and IPv6 addresses matching CIDR patterns"; - homepage = http://www.pc-tools.net/unix/grepcidr/; + homepage = "http://www.pc-tools.net/unix/grepcidr/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.fadenb ]; diff --git a/pkgs/applications/search/grepm/default.nix b/pkgs/applications/search/grepm/default.nix index bad8d35623c..d03d26d0000 100644 --- a/pkgs/applications/search/grepm/default.nix +++ b/pkgs/applications/search/grepm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Wrapper for grepmail utilizing mutt"; - homepage = http://www.barsnick.net/sw/grepm.html; + homepage = "http://www.barsnick.net/sw/grepm.html"; license = licenses.free; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 06f3733c8f7..425e82000b7 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { Recoll is an Xapian frontend that can search through files, archive members, email attachments. ''; - homepage = https://www.lesbonscomptes.com/recoll/; + homepage = "https://www.lesbonscomptes.com/recoll/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.jcumming ]; diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix index bc62004065b..2108afc5106 100644 --- a/pkgs/applications/version-management/arch/default.nix +++ b/pkgs/applications/version-management/arch/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Arch (aka. `tla'), a distributed revision control system"; - homepage = https://www.gnu.org/software/gnu-arch/; + homepage = "https://www.gnu.org/software/gnu-arch/"; license = "GPL"; }; } diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 097c1e86a89..fa0009d3ef0 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -28,7 +28,7 @@ python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://bazaar-vcs.org/; + homepage = "http://bazaar-vcs.org/"; description = "A distributed version control system that Just Works"; platforms = platforms.unix; license = licenses.gpl2Plus; diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix index 0dfa1988202..d76260ad4be 100644 --- a/pkgs/applications/version-management/bazaar/tools.nix +++ b/pkgs/applications/version-management/bazaar/tools.nix @@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Bazaar plugins"; - homepage = http://wiki.bazaar.canonical.com/BzrTools; + homepage = "http://wiki.bazaar.canonical.com/BzrTools"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/applications/version-management/bitkeeper/default.nix b/pkgs/applications/version-management/bitkeeper/default.nix index e092a604142..78f62ebcf25 100644 --- a/pkgs/applications/version-management/bitkeeper/default.nix +++ b/pkgs/applications/version-management/bitkeeper/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { BitKeeper is a fast, enterprise-ready, distributed SCM that scales up to very large projects and down to tiny ones. ''; - homepage = https://www.bitkeeper.org/; + homepage = "https://www.bitkeeper.org/"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ wscott thoughtpolice ]; diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index fd4c9793d38..1556f26d135 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -11,7 +11,7 @@ mkDerivation rec { description = "Export an RCS or CVS history as a fast-import stream"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dfoxfranke ]; - homepage = http://www.catb.org/esr/cvs-fast-export/; + homepage = "http://www.catb.org/esr/cvs-fast-export/"; platforms = platforms.all; }; diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix index 2063149dd78..07a6b7c993c 100644 --- a/pkgs/applications/version-management/cvs/default.nix +++ b/pkgs/applications/version-management/cvs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cvs-1.12.13"; src = fetchurl { - url = mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2; + url = "mirror://savannah/cvs/source/feature/1.12.13/cvs-1.12.13.tar.bz2"; sha256 = "0pjir8cwn0087mxszzbsi1gyfc6373vif96cw4q3m1x6p49kd1bq"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { doCheck = false; # fails 1 of 1 tests meta = with stdenv.lib; { - homepage = http://cvs.nongnu.org; + homepage = "http://cvs.nongnu.org"; description = "Concurrent Versions System - a source control system"; license = licenses.gpl2; # library is GPLv2, main is GPLv1 platforms = platforms.all; diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 4c818060d22..68c4e72e531 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -29,7 +29,7 @@ python2Packages.buildPythonApplication rec { meta = with lib; { description = "A tool to convert CVS repositories to Subversion repositories"; - homepage = http://cvs2svn.tigris.org/; + homepage = "http://cvs2svn.tigris.org/"; maintainers = [ maintainers.makefu ]; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix index 71130a2e283..133d8d7cbb4 100644 --- a/pkgs/applications/version-management/cvsps/default.nix +++ b/pkgs/applications/version-management/cvsps/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { changes made to a collection of files, and all committed at the same time (using a single "cvs commit" command). ''; - homepage = http://www.cobite.com/cvsps/; + homepage = "http://www.cobite.com/cvsps/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/version-management/cvsq/default.nix b/pkgs/applications/version-management/cvsq/default.nix index c030d8b0878..a39c9ede524 100644 --- a/pkgs/applications/version-management/cvsq/default.nix +++ b/pkgs/applications/version-management/cvsq/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { repository. This is useful for commands like log, diff, etc; however it cannot be used for commits (that's what cvsq is for). ''; - homepage = https://www.linta.de/~aehlig/cvsq/; + homepage = "https://www.linta.de/~aehlig/cvsq/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ clkamp ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index fe10551771c..b9ac8b139cb 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -59,7 +59,7 @@ buildPythonApplication rec { meta = with lib; { description = "Version Control System for Machine Learning Projects"; license = licenses.asl20; - homepage = https://dvc.org; + homepage = "https://dvc.org"; maintainers = with maintainers; [ cmcdragonkai ]; }; } diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 8a41221a267..fa715884b60 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { many such systems in use today. Fossil strives to distinguish itself from the others by being extremely simple to setup and operate. ''; - homepage = http://www.fossil-scm.org/; + homepage = "http://www.fossil-scm.org/"; license = stdenv.lib.licenses.bsd2; platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 1aa7afcd98b..4382a638893 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.1.2"; + version = "3.1.4"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "01hak4gqaqn40a0qvmg8a89ai3ndnjls5v64m8awig8j1yysz5vl"; + sha256 = "1pi4252hsx1zcmarzzimds1pw34x3fwi96nh9xvxqvv2cjjlr2c1"; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix index 0d772968416..b225782f286 100644 --- a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -27,7 +27,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://rtyley.github.io/bfg-repo-cleaner/; + homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; longDescription = '' diff --git a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock index 61159eb3ee9..27a6e2c8dd0 100644 --- a/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock +++ b/pkgs/applications/version-management/git-and-tools/bitbucket-server-cli/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES atlassian-stash BUNDLED WITH - 1.13.6 + 2.1.4 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 fda89e33180..68edb8503bf 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 @@ -13,7 +13,7 @@ bundlerEnv rec { meta = with lib; { description = "A command line interface to interact with BitBucket Server (formerly Atlassian Stash)"; - homepage = https://bitbucket.org/atlassian/bitbucket-server-cli; + homepage = "https://bitbucket.org/atlassian/bitbucket-server-cli"; license = licenses.mit; maintainers = with maintainers; [ jgertm nicknovitski ]; platforms = platforms.unix; 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 20392655062..121a6cf64ea 100644 --- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix @@ -76,8 +76,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://git.zx2c4.com/cgit/about/; - repositories.git = git://git.zx2c4.com/cgit; + 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; 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 454458cdec6..22d289d549a 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 @@ -73,7 +73,7 @@ stdenv.mkDerivation { meta = { description = "Converts a Darcs repository into a Git repository"; - homepage = http://www.sanityinc.com/articles/converting-darcs-repositories-to-git; + homepage = "http://www.sanityinc.com/articles/converting-darcs-repositories-to-git"; license = stdenv.lib.licenses.mit; platforms = stdenv.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 index c4a99cf1858..8f46d9550f8 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -30,13 +30,9 @@ let diff-so-fancy = callPackage ./diff-so-fancy { }; - gh = callPackage ./gh { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gh = callPackage ./gh { }; - ghq = callPackage ./ghq { - inherit (darwin.apple_sdk.frameworks) Security; - }; + ghq = callPackage ./ghq { }; git = appendToName "minimal" gitBase; @@ -67,13 +63,13 @@ let git-appraise = callPackage ./git-appraise {}; - git-bug = callPackage ./git-bug { - inherit (darwin.apple_sdk.frameworks) Security; - }; + git-bug = callPackage ./git-bug { }; # support for bugzilla git-bz = callPackage ./git-bz { }; + git-cinnabar = callPackage ./git-cinnabar { }; + git-codeowners = callPackage ./git-codeowners { }; git-codereview = callPackage ./git-codereview { }; @@ -140,9 +136,7 @@ let git-subrepo = callPackage ./git-subrepo { }; - git-subtrac = callPackage ./git-subtrac { - inherit (darwin.apple_sdk.frameworks) Security; - }; + git-subtrac = callPackage ./git-subtrac { }; git-sync = callPackage ./git-sync { }; @@ -183,13 +177,11 @@ let inherit (darwin) Security; }; - lab = callPackage ./lab { - inherit (darwin.apple_sdk.frameworks) Security; - }; + lab = callPackage ./lab { }; - lefthook = callPackage ./lefthook { - inherit (darwin.apple_sdk.frameworks) Security; - }; + lefthook = callPackage ./lefthook { }; + + legit = callPackage ./legit { }; pass-git-helper = python3Packages.callPackage ./pass-git-helper { }; @@ -197,6 +189,8 @@ let qgit = qt5.callPackage ./qgit { }; + scmpuff = callPackage ./scmpuff { }; + stgit = callPackage ./stgit { }; subgit = callPackage ./subgit { }; diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index 96216e76fd3..ae064cb7b5e 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/so-fancy/diff-so-fancy; + homepage = "https://github.com/so-fancy/diff-so-fancy"; description = "Good-looking diffs filter for git"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index c9fd33312d7..22009f10d44 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "190107"; src = fetchgit { - url = git://repo.or.cz/fast-export.git; + url = "git://repo.or.cz/fast-export.git"; rev = "v${version}"; sha256 = "14azfps9jd5anivcvfwflgsvqdyy6gm9jy284kzx2ng9f7871d14"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Import mercurial into git"; - homepage = https://repo.or.cz/w/fast-export.git; + homepage = "https://repo.or.cz/w/fast-export.git"; license = licenses.gpl2; maintainers = [ maintainers.koral ]; platforms = platforms.unix; 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 e655813d340..acd09f0d0c0 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, Security }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: buildGoModule rec { pname = "gh"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "10vylfsc8lldmr1l6r882sx87pgxl687k419c19faq90vd403i14"; + sha256 = "0na8zfvcmdy968i47x6qd1jwfaphy5h18ff7ym5sxyia9a27yhf8"; }; - modSha256 = "03m193ny5z77yy586cwh099ypi1lmhb5vdj7d4kphxycnvpndr66"; + modSha256 = "102v30wr9wmd6n20qdvgs5mp2s639pwbqqd71r8q52f42p694bi1"; buildFlagsArray = [ "-ldflags=-X github.com/cli/cli/command.Version=${version}" @@ -20,7 +20,6 @@ buildGoModule rec { subPackages = [ "cmd/gh" ]; nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; postInstall = '' for shell in bash fish zsh; do $out/bin/gh completion -s $shell > gh.$shell @@ -28,7 +27,7 @@ buildGoModule rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "GitHub CLI tool"; homepage = "https://cli.github.com/"; license = licenses.mit; 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 34829c14b7b..f9d8eab8e55 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, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ghq"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0hlbhky3c6zva9khn73n6xgq57k5p8anskxy3g2m0wzhr72cyc41"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = '' -ldflags= -X=main.Version=${version} @@ -27,7 +25,7 @@ buildGoModule rec { meta = { description = "Remote repository management made easy"; - homepage = https://github.com/x-motemen/ghq; + homepage = "https://github.com/x-motemen/ghq"; maintainers = with stdenv.lib.maintainers; [ sigma ]; license = stdenv.lib.licenses.mit; }; 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 3118eaab19b..ad07a3dba3c 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 @@ -18,7 +18,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyqt5 git-annex-adapter ]; meta = with stdenv.lib; { - homepage = https://github.com/alpernebbi/git-annex-metadata-gui; + homepage = "https://github.com/alpernebbi/git-annex-metadata-gui"; description = "Graphical interface for git-annex metadata commands"; maintainers = with maintainers; [ dotlambda ]; license = licenses.gpl3Plus; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix index 8dd44287b50..addfd1f5041 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-dbx/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { meta = with lib; { description = "A git-annex special remote for Dropbox"; - homepage = https://pypi.org/project/git-annex-remote-dbx/; + homepage = "https://pypi.org/project/git-annex-remote-dbx/"; license = licenses.mit; }; } 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 5d4d9b86d83..260e8024a8c 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 @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/DanielDent/git-annex-remote-rclone; + homepage = "https://github.com/DanielDent/git-annex-remote-rclone"; description = "Use rclone supported cloud storage providers with git-annex"; license = licenses.gpl3; maintainers = [ maintainers.montag451 ]; 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 08134195703..bcfc33e55e4 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 @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "git-annex-utils"; version = "0.04-3-g531bb33"; src = fetchgit { - url = http://git.mysteryvortex.com/repositories/git-annex-utils.git; + url = "http://git.mysteryvortex.com/repositories/git-annex-utils.git"; rev = "531bb33"; sha256 = "1sv7s2ykc840cjwbfn7ayy743643x9i1lvk4cd55w9l052xvzj65"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { This is a set of utilities that are handy to use with git-annex repositories. Currently there is only one utility gadu, a du like utility for annexed files. ''; - homepage = http://git-annex.mysteryvortex.com/git-annex-utils.html; + 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; 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 daa0af43879..7796f08c8a4 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 @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "Distributed code review system for Git repos"; - homepage = https://github.com/google/git-appraise; + homepage = "https://github.com/google/git-appraise"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.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 32b9c8a980d..cd35c98a969 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 @@ -22,7 +22,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Tool for visualization of Git repositories"; - homepage = https://github.com/esc/git-big-picture; + homepage = "https://github.com/esc/git-big-picture"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.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 fdb5a6c53fd..37adcecd62f 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 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-bug"; @@ -15,8 +15,6 @@ buildGoModule rec { modSha256 = "1cfn49cijiarzzczrpd28x1k7ib98xyzlvn3zghwk2ngfgiah3ld"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = '' -ldflags= -X ${goPackagePath}/commands.GitCommit=${rev} @@ -32,7 +30,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Distributed bug tracker embedded in Git"; - homepage = https://github.com/MichaelMure/git-bug; + homepage = "https://github.com/MichaelMure/git-bug"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ royneary ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix index 5edf9a7b5a5..7f199894924 100644 --- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { Chromium on Linux. ''; license = licenses.gpl2Plus; - homepage = http://git.fishsoup.net/cgit/git-bz/; + homepage = "http://git.fishsoup.net/cgit/git-bz/"; platforms = platforms.linux; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix new file mode 100644 index 00000000000..679e8dbdf50 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-cinnabar/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchFromGitHub, autoconf, makeWrapper +, curl, libiconv, mercurial, zlib +}: + +let + python3 = mercurial.python; +in + +stdenv.mkDerivation rec { + pname = "git-cinnabar"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "glandium"; + repo = "git-cinnabar"; + rev = version; + sha256 = "1cjn2cc6mj4m736wxab9s6qx83p5n5ha8cr3x84s9ra6rxs8d7pi"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ autoconf makeWrapper ]; + buildInputs = [ curl zlib ] ++ lib.optional stdenv.isDarwin libiconv; + + # Ignore submodule status failing due to no git in environment. + makeFlags = [ "SUBMODULE_STATUS=yes" ]; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p $out/bin $out/libexec + install git-cinnabar-helper $out/bin + install git-cinnabar git-remote-hg $out/libexec + cp -r cinnabar mercurial $out/libexec + + for pythonBin in git-cinnabar git-remote-hg; do + makeWrapper $out/libexec/$pythonBin $out/bin/$pythonBin \ + --prefix PATH : ${lib.getBin python3}/bin \ + --prefix GIT_CINNABAR_EXPERIMENTS , python3 \ + --set PYTHONPATH ${mercurial}/${python3.sitePackages} + done + ''; + + meta = with lib; { + homepage = "https://github.com/glandium/git-cinnabar"; + description = "git remote helper to interact with mercurial repositories"; + license = licenses.gpl2; + maintainers = with maintainers; [ qyliss ]; + platforms = platforms.all; + }; +} 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 5d1a06e0397..858383f9664 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 @@ -27,7 +27,7 @@ in buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/git-cola/git-cola; + homepage = "https://github.com/git-cola/git-cola"; description = "A sleek and powerful Git GUI"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index df0b1e78d27..487f9b9625f 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.agwa.name/projects/git-crypt; + homepage = "https://www.agwa.name/projects/git-crypt"; description = "Transparent file encryption in git"; longDescription = '' git-crypt enables transparent encryption and decryption of files in a git diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index cfdcd80f38b..f2afdd941fe 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tj/git-extras; + homepage = "https://github.com/tj/git-extras"; description = "GIT utilities -- repo summary, repl, changelog population, author commit percentages and more"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock index 0ac7907fe55..12c58d72103 100644 --- a/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock +++ b/pkgs/applications/version-management/git-and-tools/git-fame/Gemfile.lock @@ -23,4 +23,4 @@ DEPENDENCIES git_fame BUNDLED WITH - 1.14.6 + 2.1.4 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 f4aa4878f62..782579c7044 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 @@ -13,7 +13,7 @@ bundlerEnv { description = '' A command-line tool that helps you summarize and pretty-print collaborators based on contributions ''; - homepage = http://oleander.io/git-fame-rb; + homepage = "http://oleander.io/git-fame-rb"; license = licenses.mit; maintainers = with maintainers; [ expipiplus1 nicknovitski ]; platforms = platforms.unix; 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 d8125f604bf..5c3b27ad614 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 @@ -29,7 +29,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "Quickly and easily fetch .gitignore templates from gitignore.io"; - homepage = https://github.com/sondr3/git-ignore; + homepage = "https://github.com/sondr3/git-ignore"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.sondr3 ]; diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix index 528a96c9903..721a7784e9c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=" "DESTDIR=$(out)" ] ; meta = with stdenv.lib; { - homepage = https://github.com/mhagger/git-imerge; + homepage = "https://github.com/mhagger/git-imerge"; description = "Perform a merge between two branches incrementally"; license = licenses.gpl2; platforms = platforms.all; 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 40da9045b81..42be3f7d354 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 @@ -24,7 +24,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/VirtusLab/git-machete; + homepage = "https://github.com/VirtusLab/git-machete"; description = "Git repository organizer and rebase/merge workflow automation tool"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-my/default.nix b/pkgs/applications/version-management/git-and-tools/git-my/default.nix index 8a5ec250932..2a8a262bf30 100644 --- a/pkgs/applications/version-management/git-and-tools/git-my/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-my/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "List remote branches if they're merged and/or available locally"; - homepage = https://github.com/davidosomething/git-my; + homepage = "https://github.com/davidosomething/git-my"; license = licenses.free; maintainers = with maintainers; [ bb010g ]; platforms = platforms.all; 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 a7abd1eeaf4..d5278d9d241 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 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://github.com/lesfurets/git-octopus; + homepage = "https://github.com/lesfurets/git-octopus"; description = "The continuous merge workflow"; license = licenses.lgpl3; platforms = platforms.unix; 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 1cc3f365ea8..10f221b6388 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 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/paulirish/git-open; + homepage = "https://github.com/paulirish/git-open"; description = "Open the GitHub page or website for a repository in your browser"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix index 9fb9d4de6e3..fc4b5850f5c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/michaeldfallen/git-radar; + homepage = "https://github.com/michaeldfallen/git-radar"; license = licenses.mit; description = "A tool you can add to your prompt to provide at-a-glance information on your git repo"; platforms = with platforms; linux ++ darwin; 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 628c7dbac7f..99b64e012ea 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 @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/paulirish/git-recent; + homepage = "https://github.com/paulirish/git-recent"; description = "See your latest local git branches, formatted real fancy"; license = licenses.mit; platforms = platforms.all; 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 4e6e450657d..04787b0ce25 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 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://spwhitton.name/tech/code/git-remote-gcrypt; + homepage = "https://spwhitton.name/tech/code/git-remote-gcrypt"; description = "A git remote helper for GPG-encrypted remotes"; license = licenses.gpl3; maintainers = with maintainers; [ ellis montag451 ]; 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 28e63c4f166..37c06d3a85e 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 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/mnauw/git-remote-hg; + homepage = "https://github.com/mnauw/git-remote-hg"; description = "Semi-official Mercurial bridge from Git project"; license = licenses.gpl2; maintainers = [ ]; 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 8477dfac585..140c2647be2 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 @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = { description = "A bash-tool to store your private data inside a git repository"; - homepage = https://git-secret.io; + homepage = "https://git-secret.io"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.lo1tuma ]; platforms = stdenv.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 1da8f2a4a5e..1beff2a118d 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 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Prevents you from committing secrets and credentials into git repositories"; - homepage = https://github.com/awslabs/git-secrets; + homepage = "https://github.com/awslabs/git-secrets"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix index ae40e011f85..dc636571acc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A better Git subtree helper command"; - homepage = http://deliciousinsights.github.io/git-stree; + homepage = "http://deliciousinsights.github.io/git-stree"; license = licenses.mit; maintainers = [ maintainers.benley ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix index 54543bb4841..708014e4af8 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subrepo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ingydotnet/git-subrepo; + homepage = "https://github.com/ingydotnet/git-subrepo"; description = "Git submodule alternative"; license = licenses.mit; platforms = platforms.unix ++ platforms.darwin; diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 9ccf3c606a2..07c63ea0119 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "git-subtrac"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Keep the content for your git submodules all in one place: the parent repo"; homepage = "https://github.com/apenwarr/git-subtrac"; license = licenses.asl20; 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 7fa15c66809..bba35509555 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 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to automatically synchronize a git repository"; - homepage = https://github.com/simonthum/git-sync; + homepage = "https://github.com/simonthum/git-sync"; maintainers = with stdenv.lib.maintainers; [ imalison ]; license = stdenv.lib.licenses.cc0; platforms = with stdenv.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 e55799c2752..27f9bcffa34 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 @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Test your commits"; - homepage = https://github.com/spotify/git-test; + homepage = "https://github.com/spotify/git-test"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; platforms = platforms.all; 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 5ccd5c9c59e..6169c2d0296 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -95,7 +95,15 @@ stdenv.mkDerivation { ++ stdenv.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 withpcre2 "USE_LIBPCRE2=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 + # then ensure that git-gui uses tcl/tk from nixpkgs, which is an + # acceptable version. + # + # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 + ++ stdenv.lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; postBuild = '' @@ -232,7 +240,6 @@ stdenv.mkDerivation { for prog in bin/gitk libexec/git-core/{git-gui,git-citool,git-gui--askpass}; do sed -i -e "s|exec 'wish'|exec '${tk}/bin/wish'|g" \ -e "s|exec wish|exec '${tk}/bin/wish'|g" \ - -e "s|exec \"[^\"]*/MacOS/Wish\"|exec '${tk}/bin/wish'|g" \ "$out/$prog" done ln -s $out/share/git/contrib/completion/git-completion.bash $out/share/bash-completion/completions/gitk @@ -323,7 +330,7 @@ stdenv.mkDerivation { meta = { - homepage = https://git-scm.com/; + homepage = "https://git-scm.com/"; description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2; 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 036f8b4114e..34417cfaa8c 100644 --- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://savannah.nongnu.org/projects/git2cl; + homepage = "https://savannah.nongnu.org/projects/git2cl"; description = "Convert git logs to GNU style ChangeLog files"; platforms = stdenv.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 22bd0e66c15..c9d188e10e5 100644 --- a/pkgs/applications/version-management/git-and-tools/gita/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gita/default.nix @@ -6,12 +6,12 @@ }: buildPythonApplication rec { - version = "0.9.9"; + version = "0.10.5"; pname = "gita"; src = fetchPypi { inherit pname version; - sha256 = "1si2f9nyisbrvv8cvrjxj8r4cbrgc97ic0wdlbf34gvp020dsmgv"; + sha256 = "1xggslmrrfszpl190klkc97fnl88gml1bnkmkzp6aimdch66g4jg"; }; propagatedBuildInputs = [ @@ -21,7 +21,7 @@ buildPythonApplication rec { meta = with lib; { description = "A command-line tool to manage multiple git repos"; - homepage = https://github.com/nosarthur/gita; + homepage = "https://github.com/nosarthur/gita"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; }; 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 57af13f597a..1307573990a 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/petervanderdoes/gitflow; + homepage = "https://github.com/petervanderdoes/gitflow"; description = "Extend git with the Gitflow branching model"; longDescription = '' A set of scripts that provide high-level repository operations diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index a444ab05039..26b736b8b6f 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "10x faster implementation of `git status` command"; - homepage = https://github.com/romkatv/gitstatus; + homepage = "https://github.com/romkatv/gitstatus"; license = [ licenses.gpl3 ]; maintainers = with maintainers; [ mmlb hexa ]; 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 e6b746233fe..8c915762b6e 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -1,13 +1,14 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }: +{ stdenv, buildGoPackage, fetchFromGitHub, curl, ncurses, pkgconfig, readline +, cmake }: let - version = "0.3.1"; + version = "0.3.2"; in buildGoPackage { pname = "grv"; inherit version; - buildInputs = [ ncurses readline curl libgit2 ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ ncurses readline curl ]; + nativeBuildInputs = [ pkgconfig cmake ]; goPackagePath = "github.com/rgburke/grv"; @@ -15,7 +16,7 @@ buildGoPackage { owner = "rgburke"; repo = "grv"; rev = "v${version}"; - sha256 = "16ylapsibqrqwx45l4ypr3av07rd1haf10v838mjqsakf8l1xc0b"; + sha256 = "0bpjsk35rlp56z8149z890adnhmxyh743vsls3q86j4682b83kyf"; fetchSubmodules = true; }; @@ -23,11 +24,25 @@ buildGoPackage { rm util/update_latest_release.go ''; - buildFlagsArray = [ "-ldflags=" "-X main.version=${version}" ]; + postConfigure = '' + cd $NIX_BUILD_TOP/go/src/$goPackagePath + ''; + + buildPhase = '' + runHook preBuild + make build-only + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -D grv $bin/bin/grv + runHook postInstall + ''; meta = with stdenv.lib; { description = "GRV is a terminal interface for viewing Git repositories"; - homepage = https://github.com/rgburke/grv; + homepage = "https://github.com/rgburke/grv"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ andir ]; 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 f868c6b3c8f..30c5ca8b770 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -37,7 +37,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Command-line wrapper for git that makes you better at GitHub"; license = licenses.mit; - homepage = https://hub.github.com/; + homepage = "https://hub.github.com/"; maintainers = with maintainers; [ the-kenny globin ]; platforms = with platforms; unix; }; 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 8780ce4a220..5a00d6b1f86 100644 --- a/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lab"; @@ -15,8 +15,6 @@ buildGoModule rec { modSha256 = "03fqa7s6729g0a6ffiyc61dkldpi7vg8pvvpqak4c0mqi1dycivd"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; postInstall = '' @@ -28,7 +26,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; - homepage = https://zaquestion.github.io/lab; + homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; maintainers = with maintainers; [ marsam dtzWill ]; platforms = platforms.all; 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 c80cff15265..9fc89d520ae 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 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "lefthook"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0ih11gw2y9dhv3zw1fzjmdfjln5h6zg1bj7sl68cglf6743siqnq"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Fast and powerful Git hooks manager for any type of projects"; homepage = "https://github.com/Arkweid/lefthook"; diff --git a/pkgs/applications/version-management/git-and-tools/legit/default.nix b/pkgs/applications/version-management/git-and-tools/legit/default.nix new file mode 100644 index 00000000000..7dbdd6071a5 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/legit/default.nix @@ -0,0 +1,30 @@ +{ lib, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "legit"; + version = "1.2.0"; + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "0ngh3ar6v15516f52j21k6qz7hykmxfjadhb2rakvl27b5xvjy1c"; + }; + + propagatedBuildInputs = with python3Packages; [ + click + clint + crayons + GitPython + six + ]; + + # Prevent tests from trying to create configuration in /homeless-shelter. + preCheck = '' + export HOME=$PWD/test-home + ''; + + meta = with lib; { + homepage = "https://github.com/frostming/legit"; + description = "Git for Humans, Inspired by GitHub for Mac"; + license = licenses.bsd3; + maintainers = with maintainers; [ ryneeverett ]; + }; +} 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 74fad30b8a9..24743b21a4d 100644 --- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { meta = with lib; { license = licenses.gpl2; - homepage = https://github.com/tibirna/qgit; + homepage = "https://github.com/tibirna/qgit"; description = "Graphical front-end to Git"; maintainers = with maintainers; [ peterhoeg markuskowa ]; inherit (qtbase.meta) platforms; diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix new file mode 100644 index 00000000000..de8cb396b7f --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/scmpuff/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "scmpuff"; + version = "0.3.0"; + goPackagePath = "github.com/mroth/scmpuff"; + + goDeps = ./deps.nix; + + src = fetchFromGitHub { + owner = "mroth"; + repo = pname; + rev = "56dc2041f2c45ab15d41e63058c1c44fff905e81"; + sha256 = "0zrzzcs0i13pfwcqh8qb0sji54vh37rdr7qasg57y56cqpx16vl3"; + }; + + meta = with stdenv.lib; { + description = "Add numbered shortcuts to common git commands"; + homepage = "https://github.com/mroth/scmpuff"; + license = licenses.mit; + maintainers = with maintainers; [ cpcloud ]; + platforms = concatLists (with platforms; [ linux darwin windows ]); + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/scmpuff/deps.nix b/pkgs/applications/version-management/git-and-tools/scmpuff/deps.nix new file mode 100644 index 00000000000..da9052f9bb7 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/scmpuff/deps.nix @@ -0,0 +1,273 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "eb2c6b5be1b6"; + sha256 = "1j6fdr1sg36qy4n4xjl7brq739fpm5npq98cmvklzjc9qrx98nk9"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "v3.3.10"; + sha256 = "1x2ii1hj8jraba8rbxz6dmc03y3sjxdnzipdvg6fywnlq1f3l3wl"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "v2.0.0"; + sha256 = "1xb34hzaa1lkbq5vkzy9vcz6gqwj7hp6cdbvyack2bf28dwn33jj"; + }; + } + { + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "v0.2.0"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "v1.0.10"; + sha256 = "1bqkf2bvy1dns9zd24k81mh2p1zxsx2nhq5cj8dz2vgkv1xkh60i"; + }; + } + { + 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/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "v1.0.0"; + sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "v1.8.0"; + sha256 = "1a10362wv8a8qwb818wygn2z48lgzch940hvpv81hv8gc747ajxn"; + }; + } + { + 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/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "v1.1.2"; + sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.2.0"; + sha256 = "1fjzpcjng60mc3a4b2ql5a00d5gah84wj740dabv9kq67mpg8fxy"; + }; + } + { + 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/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "v1.5.2"; + sha256 = "0jzbfzcywqcrnym4gxlz6nphmm1grg6wsl4f0r9x384rn83wkj7c"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "v1.1.2"; + sha256 = "0miv4faf5ihjfifb1zv6aia6f6ik7h1s4954kcb8n6ixzhx9ck6k"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "v1.3.0"; + sha256 = "0xq1ffqj8y8h7dcnm0m9lfrh0ga7pssnn2c1dnr09chqbpn4bdc5"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "v0.0.4"; + sha256 = "1k7dq78fjz94lzifsprkmiv93swwzwcbg1vd64v20wvnga8v254b"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "v1.0.0"; + sha256 = "093fmmvavv84pv4q84hav7ph3fmrq87bvspjj899q0qsx37yvdr8"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.3"; + sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "v1.3.2"; + sha256 = "1829hvf805kda65l59r17wvid7y0vr390s23zfhf4w7vdb4wp3zh"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "d75b2dcb6bc8"; + sha256 = "0di1k35gpq9bp958ywranpbskx2vdwlb38s22vl9rybm3wa5g3ps"; + }; + } + { + goPackagePath = "github.com/xordataexchange/crypt"; + fetch = { + type = "git"; + url = "https://github.com/xordataexchange/crypt"; + rev = "b2862e3d0a77"; + sha256 = "04q3856anpzl4gdfgmg7pbp9cx231nkz3ymq2xp27rnmmwhfxr8y"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "505ab145d0a9"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a5c9d58dba9a"; + sha256 = "02qv5i7yps35p7fa81345qz7k8i73gkigj69anwmpw9rhpmzayf9"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + 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.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } +] 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 ac11e7469e5..1fd70aab461 100644 --- a/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { meta = { 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; + homepage = "http://subgit.com"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.all; }; 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 92d7fd4e3da..fc33478964f 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 @@ -26,7 +26,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-lsvn_fs-1"; meta = with stdenv.lib; { - homepage = https://github.com/svn-all-fast-export/svn2git; + homepage = "https://github.com/svn-all-fast-export/svn2git"; description = "A fast-import based converter for an svn repo to git repos"; license = licenses.gpl3; platforms = platforms.all; 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 821ecf3e3d8..1683a9bea13 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/nirvdrum/svn2git; + homepage = "https://github.com/nirvdrum/svn2git"; description = "Tool for importing Subversion repositories into git"; license = stdenv.lib.licenses.mit; 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 424694d7262..20d88b399c5 100644 --- a/pkgs/applications/version-management/git-and-tools/tig/default.nix +++ b/pkgs/applications/version-management/git-and-tools/tig/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, fetchpatch +{ stdenv, fetchFromGitHub, ncurses, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45 , readline, makeWrapper, git, libiconv, autoreconfHook, findXMLCatalogs, pkgconfig }: stdenv.mkDerivation rec { pname = "tig"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "jonas"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1lrzgnq8ywq28qd4xyd0y5qfv3j25ra81lcbdqqfywasl8lwz3lf"; + sha256 = "0wxcbfqsk8p84zizy6lf3gp5j122wrf8c7xlipki6nhcfhksn33b"; }; nativeBuildInputs = [ makeWrapper autoreconfHook asciidoc xmlto docbook_xsl docbook_xml_dtd_45 findXMLCatalogs pkgconfig ]; @@ -25,14 +25,6 @@ stdenv.mkDerivation rec { rm -f contrib/config.make-* ''; - patches = [ - # Fix memory leak. Remove with the next release - (fetchpatch { - url = "https://github.com/jonas/tig/commit/6202c6032f17438a2facb23f02e330b9d0566d9d.patch"; - sha256 = "15zn8hw9y7bqa1np4mj0qnm2z86nif7qwh7wc4vgy2rwxdil85bd"; - }) - ]; - enableParallelBuilding = true; installPhase = '' @@ -51,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://jonas.github.io/tig/; + homepage = "https://jonas.github.io/tig/"; description = "Text-mode interface for git"; maintainers = with maintainers; [ bjornfor domenkozar qknight globin ]; license = licenses.gpl2; 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 3b8affb57ed..589d53b3cfa 100644 --- a/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/transcrypt/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { encryption password can safely commit changes to the repository's non-encrypted files. ''; - homepage = https://github.com/elasticdog/transcrypt; + homepage = "https://github.com/elasticdog/transcrypt"; license = licenses.mit; maintainers = [ maintainers.elasticdog ]; platforms = platforms.all; diff --git a/pkgs/applications/version-management/git-crecord/default.nix b/pkgs/applications/version-management/git-crecord/default.nix index ec03c5bed5b..9481f3ebd92 100644 --- a/pkgs/applications/version-management/git-crecord/default.nix +++ b/pkgs/applications/version-management/git-crecord/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = with pythonPackages; [ docutils ]; meta = { - homepage = https://github.com/andrewshadura/git-crecord; + homepage = "https://github.com/andrewshadura/git-crecord"; description = "Git subcommand to interactively select changes to commit or stage"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index e3190667259..0e0d75b0919 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -28,7 +28,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { description = "Git extension for versioning large files"; - homepage = https://git-lfs.github.com/; + homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; maintainers = [ maintainers.twey ]; }; diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index f2d87fd69dd..eca841350de 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,28 +1,23 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "git-lfs"; - version = "2.8.0"; + version = "2.10.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "17x9q4g1acf51bxr9lfmd2ym7w740n4ghdi0ncmma77kwabw9d3x"; + sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; }; - goPackagePath = "github.com/git-lfs/git-lfs"; + modSha256 = "1rvvgyg4gqbli4pwfnmyz59gf14k7925mdqj6ykp542gwnsjgjp2"; subPackages = [ "." ]; - preBuild = '' - cd go/src/${goPackagePath} - go generate ./commands - ''; - meta = with stdenv.lib; { description = "Git extension for versioning large files"; - homepage = https://git-lfs.github.com/; + homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; maintainers = [ maintainers.twey ]; }; diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 93fb65d1031..98f88afcdbe 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { parts of the development workflow. Repo is not meant to replace Git, only to make it easier to work with Git. ''; - homepage = https://android.googlesource.com/tools/repo; + homepage = "https://android.googlesource.com/tools/repo"; license = licenses.asl20; maintainers = [ maintainers.primeos ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index c48f455a64a..c7702cfa195 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = { - homepage = https://github.com/openstack-infra/git-review; + homepage = "https://github.com/openstack-infra/git-review"; description = "Tool to submit code to Gerrit"; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 5812ff8c1d1..faed3d25a8a 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/msiemens/PyGitUp; + homepage = "https://github.com/msiemens/PyGitUp"; description = "A git pull replacement that rebases all local branches when pulling."; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index fef92f6e367..570fb2ce56f 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; buildGoPackage rec { pname = "gitea"; - version = "1.11.3"; + version = "1.11.4"; src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "1v0i7cppdqb02d73qq0bxzz8yydn17jh0g83y3cq3k48awlk22sx"; + sha256 = "18k6kcdq0ijpzgay2aq1w95qkgfvrn1dgh4cxyj9c4i0pwb3ar7f"; }; unpackPhase = '' diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 4467e9746ce..ac967060155 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/ejwa/gitinspector; + homepage = "https://github.com/ejwa/gitinspector"; description = "Statistical analysis tool for git repositories"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index d83c646be20..c8b906c055a 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.gitkraken.com/; + homepage = "https://www.gitkraken.com/"; description = "The downright luxurious and most popular Git client for Windows, Mac & Linux"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 58844657298..8da56229a02 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.8.7", - "repo_hash": "15dw8v5184500jm823wv920li3ishwk8k2dhxl1w8209x53nbqgj", + "version": "12.8.8", + "repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.7-ee", + "rev": "v12.8.8-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.7", + "GITALY_SERVER_VERSION": "12.8.8", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", - "GITLAB_WORKHORSE_VERSION": "8.21.0" + "GITLAB_WORKHORSE_VERSION": "8.21.1" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index 36859892e8c..f3ecc6df640 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -174,7 +174,7 @@ stdenv.mkDerivation { }; meta = with lib; { - homepage = http://www.gitlab.com/; + homepage = "http://www.gitlab.com/"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin krav talyz ]; } // (if gitlabEnterprise then diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index e3f7865226a..b41c78f3a3d 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -242,4 +242,4 @@ DEPENDENCIES webmock (~> 3.4.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 37721319554..45e7db5be8e 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.7"; + version = "12.8.8"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "1sb11xavckzm70m27xcwbv4a1iaicxkh1hv2zi4brlcj5ia2rky4"; + sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv"; }; # Fix a check which assumes that hook files are writeable by their @@ -68,7 +68,7 @@ in buildGoPackage rec { outputs = [ "bin" "out" "ruby" ]; meta = with stdenv.lib; { - homepage = https://gitlab.com/gitlab-org/gitaly; + homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "A Git RPC service for handling all the git calls made by GitLab"; platforms = platforms.linux; maintainers = with maintainers; [ roblabla globin fpletz talyz ]; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 7327f7e02a8..40860b13e4d 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "SSH access and repository management app for GitLab"; - homepage = http://www.gitlab.com/; + homepage = "http://www.gitlab.com/"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 937c3576fc3..491dd868dd9 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.21.0"; + version = "8.21.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "04vhshm9lwnx77q9l7znxwkvvwm3gxgxw12y1xwahfilj352xr7q"; + sha256 = "1d384xw7hfrph4i61z9z315sik7ja9hgrvmhljirwxrch1fyx3m4"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; @@ -28,7 +28,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.gitlab.com/; + homepage = "http://www.gitlab.com/"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin talyz ]; license = licenses.mit; diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index aa33bd4cd68..a808e85e433 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -652,7 +652,7 @@ GEM netrc (0.11.0) nio4r (2.5.2) no_proxy_fix (0.1.2) - nokogiri (1.10.7) + nokogiri (1.10.8) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -1404,4 +1404,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index efba20ab082..f92b72361df 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -2927,10 +2927,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "1yi8j8hwrlc3rg5v3w52gxndmwifyk7m732q9yfbal0qajqbh1h8"; type = "gem"; }; - version = "1.10.7"; + version = "1.10.8"; }; nokogumbo = { dependencies = ["nokogiri"]; diff --git a/pkgs/applications/version-management/gitless/default.nix b/pkgs/applications/version-management/gitless/default.nix index fe1cce9ba84..0cead50f032 100644 --- a/pkgs/applications/version-management/gitless/default.nix +++ b/pkgs/applications/version-management/gitless/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://gitless.com/; + homepage = "https://gitless.com/"; description = "A version control system built on top of Git"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 9f298e0129e..60fed6954dc 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Finely-grained git repository hosting"; - homepage = https://gitolite.com/gitolite/index.html; + homepage = "https://gitolite.com/gitolite/index.html"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.thoughtpolice maintainers.lassulus maintainers.tomberek ]; diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix index 5d29c8fcb6c..b7432385a23 100644 --- a/pkgs/applications/version-management/gitstats/default.nix +++ b/pkgs/applications/version-management/gitstats/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://gitstats.sourceforge.net/; + homepage = "http://gitstats.sourceforge.net/"; description = "Git history statistics generator"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index 487026d8e3f..a35778ac023 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -48,7 +48,7 @@ buildGoPackage rec { meta = { description = "A painless self-hosted Git service"; - homepage = https://gogs.io; + homepage = "https://gogs.io"; license = licenses.mit; maintainers = [ maintainers.schneefux ]; }; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 2ce855d3a7f..683ad8711bf 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://gource.io/; + homepage = "https://gource.io/"; description = "A Software version control visualization tool"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index 92bc9f51cac..1ff1030150f 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = "Qt4 based GUI for monotone"; - homepage = https://guitone.thomaskeller.biz; - downloadPage = https://code.monotone.ca/p/guitone/; + homepage = "https://guitone.thomaskeller.biz"; + downloadPage = "https://code.monotone.ca/p/guitone/"; license = stdenv.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 be1e8ff841d..3c46db6352e 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Visual diff and merge tool"; - homepage = http://meldmerge.org/; + homepage = "http://meldmerge.org/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ jtojnar mimame ]; diff --git a/pkgs/applications/version-management/mercurial/4.9.nix b/pkgs/applications/version-management/mercurial/4.9.nix index b8fc767bd3a..f0918ab69a6 100644 --- a/pkgs/applications/version-management/mercurial/4.9.nix +++ b/pkgs/applications/version-management/mercurial/4.9.nix @@ -60,8 +60,8 @@ in python2Packages.buildPythonApplication { meta = { inherit (mercurialSrc.meta) version; description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = https://www.mercurial-scm.org; - downloadPage = https://www.mercurial-scm.org/release/; + homepage = "https://www.mercurial-scm.org"; + downloadPage = "https://www.mercurial-scm.org/release/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eraserhd ]; updateWalker = true; diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 3edfe399434..85c54614748 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -56,8 +56,8 @@ in python3Packages.buildPythonApplication rec { meta = { inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; - homepage = https://www.mercurial-scm.org; - downloadPage = https://www.mercurial-scm.org/release/; + homepage = "https://www.mercurial-scm.org"; + downloadPage = "https://www.mercurial-scm.org/release/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.eelco ]; updateWalker = true; diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix index c23feec6f43..03b98694eaf 100644 --- a/pkgs/applications/version-management/monotone-viz/default.nix +++ b/pkgs/applications/version-management/monotone-viz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper +{ stdenv, fetchurl, ocamlPackages, gnome2, pkgconfig, makeWrapper, glib , libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw }: # We need an old version of Graphviz for format compatibility reasons. @@ -7,7 +7,7 @@ let graphviz_2_0 = import ./graphviz-2.0.nix { inherit stdenv fetchurl pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd libwebp; }; in -let inherit (gnome2) libgnomecanvas glib; in +let inherit (gnome2) libgnomecanvas; in let inherit (ocamlPackages) ocaml lablgtk camlp4; in stdenv.mkDerivation rec { version = "1.0.2"; 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 73acc3a6b36..816bfcde67f 100644 --- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix +++ b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "A program for visualising graphs"; - homepage = http://www.graphviz.org/; + homepage = "http://www.graphviz.org/"; branch = "2.0"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 66e63fcc375..05ef7021f16 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { bzr, darcs, fossil and veracity repositories, and support for other version control systems can easily be added. ''; - homepage = http://myrepos.branchable.com/; + homepage = "http://myrepos.branchable.com/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ antono henrytill ]; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index 6668631ca9a..07f9b442a74 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { meta = { inherit version; description = "Strip output from Jupyter and IPython notebooks"; - homepage = https://github.com/kynan/nbstripout; + homepage = "https://github.com/kynan/nbstripout"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/applications/version-management/nitpick/default.nix b/pkgs/applications/version-management/nitpick/default.nix index db9afdc0a74..bcb16ea8678 100644 --- a/pkgs/applications/version-management/nitpick/default.nix +++ b/pkgs/applications/version-management/nitpick/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { should pick. It's intended to be used with source code such that the issues can follow the code via whatever VCS or distribution mechanism. ''; - homepage = http://travisbrown.ca/projects/nitpick/docs/nitpick.html; + homepage = "http://travisbrown.ca/projects/nitpick/docs/nitpick.html"; license = with stdenv.lib.licenses; gpl2; maintainers = []; }; diff --git a/pkgs/applications/version-management/p4v/default.nix b/pkgs/applications/version-management/p4v/default.nix index 317cbfde85b..148f122f7c8 100644 --- a/pkgs/applications/version-management/p4v/default.nix +++ b/pkgs/applications/version-management/p4v/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Perforce Visual Client"; - homepage = https://www.perforce.com; + homepage = "https://www.perforce.com"; license = stdenv.lib.licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with stdenv.lib.maintainers; [ nathyong nioncode ]; diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix index ea34617dc8b..4cf2a2e864c 100644 --- a/pkgs/applications/version-management/peru/default.nix +++ b/pkgs/applications/version-management/peru/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/buildinspace/peru; + homepage = "https://github.com/buildinspace/peru"; description = "A tool for including other people's code in your projects"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index c6c0f0a52f4..74b793f0e77 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -57,7 +57,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A distributed version control system"; - homepage = https://pijul.org; + homepage = "https://pijul.org"; license = with licenses; [ gpl2Plus ]; maintainers = [ maintainers.gal_bolle ]; platforms = platforms.all; diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index e9950c32549..2c58e15c443 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -34,7 +34,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Graphical tools for working with version control systems"; - homepage = http://rabbitvcs.org/; + homepage = "http://rabbitvcs.org/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.mathnerd314 ]; diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix index 60486e20116..fc6a8adc2ad 100644 --- a/pkgs/applications/version-management/rapidsvn/default.nix +++ b/pkgs/applications/version-management/rapidsvn/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Multi-platform GUI front-end for the Subversion revision system"; - homepage = http://rapidsvn.tigris.org/; + homepage = "http://rapidsvn.tigris.org/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.viric ]; }; diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index 3283a3c046a..404d6ae09bc 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { hardeningDisable = stdenv.lib.optional stdenv.cc.isClang "format"; meta = { - homepage = https://www.gnu.org/software/rcs/; + homepage = "https://www.gnu.org/software/rcs/"; description = "Revision control system"; longDescription = '' The GNU Revision Control System (RCS) manages multiple revisions of diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 806847a298e..66326b28235 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -225,4 +225,4 @@ DEPENDENCIES yard BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index a133a9a6a2a..8a85f192163 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -36,7 +36,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://www.redmine.org/; + homepage = "https://www.redmine.org/"; platforms = platforms.linux; maintainers = [ maintainers.aanderse ]; license = licenses.gpl2; diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 8dd46405d31..fb5b72be4eb 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -13,7 +13,7 @@ in mkDerivation rec { description = "A tool for editing version-control repository history"; version = "3.44"; license = licenses.bsd3; - homepage = http://www.catb.org/esr/reposurgeon/; + homepage = "http://www.catb.org/esr/reposurgeon/"; maintainers = with maintainers; [ dfoxfranke ]; platforms = platforms.all; }; diff --git a/pkgs/applications/version-management/sit/default.nix b/pkgs/applications/version-management/sit/default.nix index aa2cdfab82a..67bda7a4fdd 100644 --- a/pkgs/applications/version-management/sit/default.nix +++ b/pkgs/applications/version-management/sit/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Serverless Information Tracker"; - homepage = https://sit.fyi/; + homepage = "https://sit.fyi/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ dywedir yrashk ]; platforms = platforms.all; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index df55f20783f..51fe70d3952 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GUI for Git, Mercurial, Subversion"; - homepage = https://www.syntevo.com/smartgit/; + homepage = "https://www.syntevo.com/smartgit/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 07935336c1e..79aa586007d 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -52,7 +52,7 @@ in buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/builds.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; description = "Continuous integration service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 8a6c3e6feb4..abc2955e271 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/srht; + homepage = "https://git.sr.ht/~sircmpwn/srht"; description = "Core modules for sr.ht"; license = licenses.bsd3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index a078c5acb4f..2ca40c31408 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht; + homepage = "https://dispatch.sr.ht/~sircmpwn/dispatch.sr.ht"; description = "Task dispatcher and service integration tool for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 93ab499e14e..09cdd061b38 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -73,7 +73,7 @@ in buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/git.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht"; description = "Git repository hosting service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 2d57012d071..040d7783d47 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/hg.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/hg.sr.ht"; description = "Mercurial repository hosting service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index a7915a917ba..dc2573bd245 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/lists.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; description = "Mailing list service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 7ed4c6a5a24..753ba46d6c3 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/man.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/man.sr.ht"; description = "Wiki service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 17b4c91446f..a2a23367a33 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/meta.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; description = "Account management service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index b629ca9bca3..bd5a9ef5fc6 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/paste.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; description = "Ad-hoc text file hosting service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index add791da284..f2ba55951e5 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { - homepage = https://git.sr.ht/~sircmpwn/git.sr.ht; + homepage = "https://git.sr.ht/~sircmpwn/git.sr.ht"; description = "Shared support code for sr.ht source control services."; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 572c2919b16..506b287bc92 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { - homepage = https://todo.sr.ht/~sircmpwn/todo.sr.ht; + homepage = "https://todo.sr.ht/~sircmpwn/todo.sr.ht"; description = "Ticket tracking service for the sr.ht network"; license = licenses.agpl3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/applications/version-management/srcml/default.nix b/pkgs/applications/version-management/srcml/default.nix index 693af89d978..6deca94fc15 100644 --- a/pkgs/applications/version-management/srcml/default.nix +++ b/pkgs/applications/version-management/srcml/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Infrastructure for exploration, analysis, and manipulation of source code"; - homepage = https://www.srcml.org; + homepage = "https://www.srcml.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index c095aa49eaf..173333fb75c 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -109,7 +109,7 @@ in stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "Git client from the makers of Sublime Text"; - homepage = https://www.sublimemerge.com; + homepage = "https://www.sublimemerge.com"; maintainers = with maintainers; [ zookatron ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/version-management/tkcvs/default.nix b/pkgs/applications/version-management/tkcvs/default.nix index 48558c15dc1..d2a7299bcd9 100644 --- a/pkgs/applications/version-management/tkcvs/default.nix +++ b/pkgs/applications/version-management/tkcvs/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation name = "tkcvs-8.2.1"; src = fetchurl { - url = mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz; + url = "mirror://sourceforge/tkcvs/tkcvs_8_2_1.tar.gz"; sha256 = "0kvj6rcx1153wq0n1lmd8imbrki6xy5wxghwzlb9i15l65sclg3i"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation ''; meta = { - homepage = https://tkcvs.sourceforge.io; + homepage = "https://tkcvs.sourceforge.io"; description = "TCL/TK GUI for cvs and subversion"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 653db11ab5d..2743d4f827f 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -44,7 +44,7 @@ in python3Packages.buildPythonApplication { meta = { description = "Qt based graphical tool for working with Mercurial"; - homepage = https://tortoisehg.bitbucket.io/; + homepage = "https://tortoisehg.bitbucket.io/"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ danbst ]; diff --git a/pkgs/applications/version-management/vcprompt/default.nix b/pkgs/applications/version-management/vcprompt/default.nix index 2ad6b6f2f62..85fe83996da 100644 --- a/pkgs/applications/version-management/vcprompt/default.nix +++ b/pkgs/applications/version-management/vcprompt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { A little C program that prints a short string with barebones information about the current working directory for various version control systems ''; - homepage = http://hg.gerg.ca/vcprompt; + homepage = "http://hg.gerg.ca/vcprompt"; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; license = licenses.gpl2Plus; diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 8a014a63393..c4af492dece 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Version Control System for $HOME"; - homepage = https://github.com/RichiH/vcsh; + homepage = "https://github.com/RichiH/vcsh"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ttuegel ]; platforms = platforms.unix; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index aab47ed1327..fab89d663fa 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/TheLocehiliosan/yadm; + homepage = "https://github.com/TheLocehiliosan/yadm"; description = "Yet Another Dotfiles Manager"; longDescription = '' yadm is a dotfile management tool with 3 main features: diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 00bdb370aae..9374d2dbc79 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://fixounet.free.fr/avidemux/; + homepage = "http://fixounet.free.fr/avidemux/"; description = "Free video editor designed for simple video editing tasks"; maintainers = with maintainers; [ abbradar ma27 ]; # "CPU not supported" errors on AArch64 diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index f16f655b95d..2cccbae43d2 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A script system that allows advanced non-linear editing"; - homepage = https://github.com/avxsynth/avxsynth; + homepage = "https://github.com/avxsynth/avxsynth"; license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/bino3d/default.nix b/pkgs/applications/video/bino3d/default.nix index c3f5d7d796d..4554bea6157 100644 --- a/pkgs/applications/video/bino3d/default.nix +++ b/pkgs/applications/video/bino3d/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { meta = with lib; { description = "Stereoscopic 3D and multi-display video player"; - homepage = https://bino3d.org/; + homepage = "https://bino3d.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/bombono/default.nix b/pkgs/applications/video/bombono/default.nix index 1cba1d0e949..f9a82af2f79 100644 --- a/pkgs/applications/video/bombono/default.nix +++ b/pkgs/applications/video/bombono/default.nix @@ -17,7 +17,13 @@ stdenv.mkDerivation rec { sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9"; }; - patches = map fetchPatchFromAur [ + patches = [ + (fetchpatch { + name = "bombono-dvd-1.2.4-scons3.patch"; + url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457"; + sha256 = "081116d0if6s2r1rgqfr1n5gl3kpvzk01pf4v2k7gg2rnid83qp4"; + }) + ] ++ (map fetchPatchFromAur [ {name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";} {name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";} {name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";} @@ -26,7 +32,7 @@ stdenv.mkDerivation rec { {name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";} {name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";} {name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";} - ]; + ]); nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ]; diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index a9d98a9a2a4..7ba37936c68 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Powerful and easy-to-use multimedia player"; - homepage = https://bomi-player.github.io/; + homepage = "https://bomi-player.github.io/"; license = licenses.gpl2Plus; maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 10685a72f10..f5d40a5c34c 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "byzanz"; src = fetchgit { - url = git://github.com/GNOME/byzanz; + url = "git://github.com/GNOME/byzanz"; rev = "1875a7f6a3903b83f6b1d666965800f47db9286a"; sha256 = "0a72fw2mxl8vdcdnzy0bwis4jk28pd7nc8qgr4vhyw5pd48dynvh"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser"; - homepage = https://github.com/GNOME/byzanz; + homepage = "https://github.com/GNOME/byzanz"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 22fac11b018..208cbb7f4e6 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.18"; + version = "0.19"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - sha256 = "1j8z75y98liirr41rlcn89cshvp1xp71cspcclm6wx455i7q2cg1"; + sha256 = "1jdmwljckajqb3ys8azd1nyy49nvq9kb2knrrqdcfnvzq0m5lpqr"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/cinelerra/default.nix b/pkgs/applications/video/cinelerra/default.nix index 36ad39bd37c..22533b182a0 100644 --- a/pkgs/applications/video/cinelerra/default.nix +++ b/pkgs/applications/video/cinelerra/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { description = "Video Editor"; - homepage = http://www.cinelerra.org; + homepage = "http://www.cinelerra.org"; maintainers = [ stdenv.lib.maintainers.marcweber ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/video/clickshare-csc1/default.nix b/pkgs/applications/video/clickshare-csc1/default.nix index 53d257dd9d0..e4e72704fb0 100644 --- a/pkgs/applications/video/clickshare-csc1/default.nix +++ b/pkgs/applications/video/clickshare-csc1/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "01.07.00.033"; src = fetchurl { name = "clickshare-csc1-${version}.zip"; - url = https://www.barco.com/services/website/de/TdeFiles/Download?FileNumber=R33050020&TdeType=3&MajorVersion=01&MinorVersion=07&PatchVersion=00&BuildVersion=033; + url = "https://www.barco.com/services/website/de/TdeFiles/Download?FileNumber=R33050020&TdeType=3&MajorVersion=01&MinorVersion=07&PatchVersion=00&BuildVersion=033"; sha256 = "0h4jqidqvk4xkaky5bizi7ilz4qzl2mh68401j21y3djnzx09br3"; }; @@ -106,8 +106,8 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.barco.com/de/support/clickshare-csc-1/drivers; - downloadPage = https://www.barco.com/de/Support/software/R33050020; + homepage = "https://www.barco.com/de/support/clickshare-csc-1/drivers"; + downloadPage = "https://www.barco.com/de/Support/software/R33050020"; platforms = [ "i686-linux" "x86_64-linux" ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.yarny ]; diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index a2de52468f2..a094bfd904a 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { - homepage = https://damien.douxchamps.net/ieee1394/coriander/; + 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]; diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index aee6fab77a2..2ec2f68d128 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -46,7 +46,7 @@ in buildPythonApplication { meta = with stdenv.lib; { description = "DVD Creator for Linux"; - homepage = http://www.rastersoft.com/programas/devede.html; + homepage = "http://www.rastersoft.com/programas/devede.html"; license = licenses.gpl3; maintainers = [ maintainers.bdimcheff ]; }; diff --git a/pkgs/applications/video/dvb-apps/default.nix b/pkgs/applications/video/dvb-apps/default.nix index a032ef654aa..8fa88e32449 100644 --- a/pkgs/applications/video/dvb-apps/default.nix +++ b/pkgs/applications/video/dvb-apps/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Linux DVB API applications and utilities"; - homepage = https://linuxtv.org/; + homepage = "https://linuxtv.org/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; broken = true; # 2018-04-10 diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 61894bd22f8..f6e336240d3 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -64,7 +64,7 @@ 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; + homepage = "http://dvd-slideshow.sourceforge.net/wiki/Main_Page"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.robbinch ]; diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index c15a892e698..6be1d8a1633 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Tools for generating DVD files to be played on standalone DVD players"; - homepage = http://dvdauthor.sourceforge.net/; + homepage = "http://dvdauthor.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/applications/video/dvdbackup/default.nix b/pkgs/applications/video/dvdbackup/default.nix index 54be20d5faf..e129031fd49 100644 --- a/pkgs/applications/video/dvdbackup/default.nix +++ b/pkgs/applications/video/dvdbackup/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool to rip video DVDs from the command line"; - homepage = http://dvdbackup.sourceforge.net/; + homepage = "http://dvdbackup.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bradediger ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/video/dvdstyler/default.nix b/pkgs/applications/video/dvdstyler/default.nix index 495501e0c18..b78f9ed816b 100644 --- a/pkgs/applications/video/dvdstyler/default.nix +++ b/pkgs/applications/video/dvdstyler/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { - copy any menu object or whole menu - customize navigation using DVD scripting ''; - homepage = http://www.dvdstyler.org/; + homepage = "http://www.dvdstyler.org/"; license = with licenses; gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index d992e42ebff..4fad80c27ab 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.15.7"; + version = "1.15.8"; src = fetchPypi { inherit pname version; - sha256 = "0161939f864e973b11d50170c657baf3e1433147f46c74a74ed5025a822e9a2d"; + sha256 = "01lx1ki1iglg1dz6x99ciqx5zqlbj7hvfb12ga9m68ypjm0fcphl"; }; propagatedBuildInputs = [ ffmpeg tqdm ]; diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 3e26b4d68c2..3bd7785f201 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome MPlayer, a simple GUI for MPlayer"; - homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; license = licenses.gpl2; maintainers = with maintainers; []; platforms = platforms.linux; diff --git a/pkgs/applications/video/gnomecast/default.nix b/pkgs/applications/video/gnomecast/default.nix index d840f43163c..3b7e8913c5d 100644 --- a/pkgs/applications/video/gnomecast/default.nix +++ b/pkgs/applications/video/gnomecast/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { meta = with lib; { description = "A native Linux GUI for Chromecasting local files"; - homepage = https://github.com/keredson/gnomecast; + homepage = "https://github.com/keredson/gnomecast"; license = with licenses; [ gpl3 ]; }; } diff --git a/pkgs/applications/video/gpac/default.nix b/pkgs/applications/video/gpac/default.nix index f81f394ed0b..e587a599905 100644 --- a/pkgs/applications/video/gpac/default.nix +++ b/pkgs/applications/video/gpac/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { A multimedia packager, called MP4Box, And some server tools included in MP4Box and MP42TS applications. ''; - homepage = https://gpac.wp.imt.fr; + homepage = "https://gpac.wp.imt.fr"; license = licenses.lgpl21; maintainers = with maintainers; [ bluescreen303 mgdelacroix ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index ab708020663..9b51746b14c 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://handbrake.fr/; + homepage = "http://handbrake.fr/"; description = "A tool for converting video files and ripping DVDs"; longDescription = '' Tool for converting and remuxing video files diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/applications/video/jellyfin-mpv-shim/default.nix index 7842c48a78a..de931074091 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/applications/video/jellyfin-mpv-shim/default.nix @@ -4,13 +4,13 @@ buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "195vplq4182pq62sn6ci0a8p57k6zv8pk1gmifmwdv69wzaph043"; + sha256 = "1cnii5wj0pgqg3dqk5cm6slpbs3730x8ippps4cjbsxcsrmqjpx6"; fetchSubmodules = true; # needed for display_mirror css file }; diff --git a/pkgs/applications/video/k9copy/default.nix b/pkgs/applications/video/k9copy/default.nix index 037331cad9e..317505185d0 100644 --- a/pkgs/applications/video/k9copy/default.nix +++ b/pkgs/applications/video/k9copy/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = { description = "DVD backup and DVD authoring program"; - homepage = http://k9copy-reloaded.sourceforge.net/; + homepage = "http://k9copy-reloaded.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ flosse ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index f38046cf8e1..0cdd3db8525 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { }) # https://github.com/hzbd/kazam/pull/21 (fetchpatch { - url = https://github.com/hzbd/kazam/commit/37e53a5aa61f4223a9ea03ceeda26eeba2b9d37b.patch; + url = "https://github.com/hzbd/kazam/commit/37e53a5aa61f4223a9ea03ceeda26eeba2b9d37b.patch"; sha256 = "1q5dpmdm6cvgzw8xa7bwclnqa05xc73ja1lszwmwv5glyik0fk4z"; }) ]; @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A screencasting program created with design in mind"; - homepage = https://code.launchpad.net/kazam; + homepage = "https://code.launchpad.net/kazam"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 2a0af3ed59e..3f41e73dfa7 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { name = "kino-1.3.4"; src = fetchurl { - url = mirror://sourceforge/kino/kino-1.3.4.tar.gz; + url = "mirror://sourceforge/kino/kino-1.3.4.tar.gz"; sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i"; }; @@ -88,7 +88,7 @@ stdenv.mkDerivation { meta = { description = "Non-linear DV editor for GNU/Linux"; - homepage = http://www.kinodv.org/; + homepage = "http://www.kinodv.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 33ff1821640..274ff7cdeab 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -42,7 +42,7 @@ mkDerivation rec { meta = with lib; { description = "MPlayer front-end for KDE"; license = with licenses; [ gpl2 lgpl2 fdl12 ]; - homepage = https://kmplayer.kde.org/; + homepage = "https://kmplayer.kde.org/"; maintainers = with maintainers; [ sander zraexy ]; }; } diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 875ef8d52dd..d13dd3201a3 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -31,6 +31,7 @@ , vdpauSupport ? true, libvdpau ? null , useWayland ? false, wayland ? null, wayland-protocols ? null , waylandpp ? null, libxkbcommon ? null +, useGbm ? false, mesa ? null, libinput ? null }: assert dbusSupport -> dbus != null; @@ -185,6 +186,11 @@ in stdenv.mkDerivation { wayland waylandpp # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise libxkbcommon.dev + ] + ++ lib.optional useGbm [ + libxkbcommon.dev + mesa.dev + libinput.dev ]; nativeBuildInputs = [ @@ -207,6 +213,9 @@ in stdenv.mkDerivation { ] ++ lib.optional useWayland [ "-DCORE_PLATFORM_NAME=wayland" "-DWAYLAND_RENDER_SYSTEM=gl" + ] ++ lib.optional useGbm [ + "-DCORE_PLATFORM_NAME=gbm" + "-DGBM_RENDER_SYSTEM=gles" ]; enableParallelBuilding = true; @@ -242,7 +251,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Media center"; - homepage = https://kodi.tv/; + homepage = "https://kodi.tv/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar titanous edwtjo peterhoeg sephalon ]; diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix index 41e5a7c5c75..64521d75e4d 100644 --- a/pkgs/applications/video/kodi/plugins.nix +++ b/pkgs/applications/video/kodi/plugins.nix @@ -1,6 +1,6 @@ { stdenv, callPackage, fetchFromGitHub , cmake, kodiPlain, libcec_platform, tinyxml, rapidxml -, steam, libusb, pcre-cpp, jsoncpp, libhdhomerun, zlib +, steam, udev, libusb1, jsoncpp, libhdhomerun, zlib , python2Packages, expat, glib, nspr, nss, openssl , libssh, libarchive, lzma, bzip2, lz4, lzo }: @@ -109,7 +109,7 @@ let self = rec { }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=85724; + homepage = "https://forum.kodi.tv/showthread.php?tid=85724"; description = "A program launcher for Kodi"; longDescription = '' Advanced Launcher allows you to start any Linux, Windows and @@ -139,7 +139,7 @@ let self = rec { }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=287826; + homepage = "https://forum.kodi.tv/showthread.php?tid=287826"; description = "A program launcher for Kodi"; longDescription = '' Advanced Emulator Launcher is a multi-emulator front-end for Kodi @@ -200,7 +200,7 @@ let self = rec { sha256 = "1dvff24fbas25k5kvca4ssks9l1g5rfa3hl8lqxczkaqi3pp41j5"; }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=258159; + homepage = "https://forum.kodi.tv/showthread.php?tid=258159"; description = "A ROM launcher for Kodi that uses HyperSpin assets."; maintainers = with maintainers; [ edwtjo ]; }; @@ -236,8 +236,7 @@ let self = rec { maintainers = with maintainers; [ edwtjo ]; }; - extraBuildInputs = [ libusb pcre-cpp ]; - + extraBuildInputs = [ udev ]; }; simpleplugin = mkKodiPlugin rec { @@ -274,7 +273,7 @@ let self = rec { }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=67110; + homepage = "https://forum.kodi.tv/showthread.php?tid=67110"; description = "Watch content from SVT Play"; longDescription = '' With this addon you can stream content from SVT Play @@ -300,7 +299,7 @@ let self = rec { sha256 = "1hbd8fdvn7xkr9csz1g9wah78nhnq1rkazl4zwa31y70830k3279"; }; - extraBuildInputs = [ libusb ]; + extraBuildInputs = [ libusb1 ]; meta = { description = "Binary addon for steam controller."; @@ -326,7 +325,7 @@ let self = rec { propagatedBuildInputs = [ steam ]; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=157499; + homepage = "https://forum.kodi.tv/showthread.php?tid=157499"; description = "Launch Steam in Big Picture Mode from Kodi"; longDescription = '' This add-on will close/minimise Kodi, launch Steam in Big @@ -353,7 +352,7 @@ let self = rec { }; meta = { - homepage = https://forum.kodi.tv/showthread.php?tid=187421; + homepage = "https://forum.kodi.tv/showthread.php?tid=187421"; description = "A comic book reader"; maintainers = with maintainers; [ edwtjo ]; }; @@ -373,7 +372,7 @@ let self = rec { }; meta = { - homepage = https://github.com/kodi-pvr/pvr.hts; + homepage = "https://github.com/kodi-pvr/pvr.hts"; description = "Kodi's Tvheadend HTSP client addon"; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; @@ -395,7 +394,7 @@ let self = rec { }; meta = { - homepage = https://github.com/kodi-pvr/pvr.hdhomerun; + homepage = "https://github.com/kodi-pvr/pvr.hdhomerun"; description = "Kodi's HDHomeRun PVR client addon"; platforms = platforms.all; maintainers = with maintainers; [ titanous ]; @@ -419,7 +418,7 @@ let self = rec { }; meta = { - homepage = https://github.com/kodi-pvr/pvr.iptvsimple; + homepage = "https://github.com/kodi-pvr/pvr.iptvsimple"; description = "Kodi's IPTV Simple client addon"; platforms = platforms.all; maintainers = with maintainers; [ ]; @@ -443,7 +442,7 @@ let self = rec { }; meta = { - homepage = https://github.com/osmc/skin.osmc; + homepage = "https://github.com/osmc/skin.osmc"; description = "The default skin for OSMC"; platforms = platforms.all; maintainers = with maintainers; [ worldofpeace ]; @@ -500,7 +499,7 @@ let self = rec { ''; meta = { - homepage = https://github.com/peak3d/inputstream.adaptive; + homepage = "https://github.com/peak3d/inputstream.adaptive"; description = "Kodi inputstream addon for several manifest types"; platforms = platforms.all; maintainers = with maintainers; [ sephalon ]; @@ -531,14 +530,14 @@ let self = rec { vfs-libarchive = mkKodiABIPlugin rec { namespace = "vfs.libarchive"; - version = "1.0.5"; + version = "1.0.6"; plugin = namespace; src = fetchFromGitHub { owner = "xbmc"; repo = namespace; rev = "${version}-${rel}"; - sha256 = "0l1f1fijflr1ia30r0dcz1x2zn35c4lxy30az1cqxdf8nipza0b8"; + sha256 = "1gz39i97n8xgbja8miqligmhxsvmqimlxx75xr9v0r9lfxp7135f"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/linuxstopmotion/default.nix b/pkgs/applications/video/linuxstopmotion/default.nix index 0a422bb7f50..3a2d1b79e9e 100644 --- a/pkgs/applications/video/linuxstopmotion/default.nix +++ b/pkgs/applications/video/linuxstopmotion/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create stop-motion animation movies"; - homepage = http://linuxstopmotion.org/; + homepage = "http://linuxstopmotion.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/applications/video/lxdvdrip/default.nix b/pkgs/applications/video/lxdvdrip/default.nix index 8287a176ce6..16ade40f0b5 100644 --- a/pkgs/applications/video/lxdvdrip/default.nix +++ b/pkgs/applications/video/lxdvdrip/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line tool to make a copy from a video DVD for private use"; - homepage = https://sourceforge.net/projects/lxdvdrip; + homepage = "https://sourceforge.net/projects/lxdvdrip"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 5423ffcb142..4816f17618b 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -53,7 +53,7 @@ in mkDerivation { expiration date. ''; license = licenses.unfree; - homepage = http://makemkv.com; + homepage = "http://makemkv.com"; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.titanous ]; }; diff --git a/pkgs/applications/video/manim/default.nix b/pkgs/applications/video/manim/default.nix index 0d263f402b3..470908377b5 100644 --- a/pkgs/applications/video/manim/default.nix +++ b/pkgs/applications/video/manim/default.nix @@ -57,7 +57,7 @@ buildPythonApplication rec { create precise animations programmatically, as seen in the videos of 3Blue1Brown on YouTube. ''; - homepage = https://github.com/3b1b/manim; + homepage = "https://github.com/3b1b/manim"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ johnazoidberg ]; }; diff --git a/pkgs/applications/video/mapmap/default.nix b/pkgs/applications/video/mapmap/default.nix index c302ae1730f..20ab4d75032 100644 --- a/pkgs/applications/video/mapmap/default.nix +++ b/pkgs/applications/video/mapmap/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Open source video mapping software"; - homepage = https://github.com/mapmapteam/mapmap; + homepage = "https://github.com/mapmapteam/mapmap"; license = licenses.gpl3; maintainers = [ maintainers.erictapen ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/mediathekview/default.nix b/pkgs/applications/video/mediathekview/default.nix index 9554105f20c..7c7ceb914ae 100644 --- a/pkgs/applications/video/mediathekview/default.nix +++ b/pkgs/applications/video/mediathekview/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Offers access to the Mediathek of different tv stations (ARD, ZDF, Arte, etc.)"; - homepage = https://mediathekview.de/; + homepage = "https://mediathekview.de/"; license = licenses.gpl3; maintainers = with maintainers; [ moredread ]; platforms = platforms.all; diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 635779187a8..690b8355340 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { you an endless video stream. Minitube is not about cloning the YouTube website, it aims to create a new TV-like experience. ''; - homepage = https://flavio.tordini.org/minitube; + homepage = "https://flavio.tordini.org/minitube"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index c5eafe94c78..2e97505f3f1 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "44.0.0"; + version = "45.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "072sw51svaizqi9f6kscic23wxcjarwgb7nv52yd5si5w8s0qh9r"; + sha256 = "1m9ih6bgl3nrjgr0rxvfbvw8s9ska7ps1ypc2ynvyxba4gjkkyyf"; }; nativeBuildInputs = [ @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform tools for Matroska"; - homepage = http://www.bunkus.org/videotools/mkvtoolnix/; + homepage = "http://www.bunkus.org/videotools/mkvtoolnix/"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel rnhmjoj ]; platforms = platforms.linux diff --git a/pkgs/applications/video/motion/default.nix b/pkgs/applications/video/motion/default.nix index dafc6abdb0a..dd0510f70c3 100644 --- a/pkgs/applications/video/motion/default.nix +++ b/pkgs/applications/video/motion/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Monitors the video signal from cameras"; - homepage = https://motion-project.github.io/; + homepage = "https://motion-project.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ puffnfresh veprbl ]; }; diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index efa495a45af..ff7df19bec1 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Media Player Classic Qute Theater"; - homepage = https://github.com/cmdrkotori/mpc-qt; + homepage = "https://github.com/cmdrkotori/mpc-qt"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index f5559e3fb6c..5a72fe91ddd 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -58,7 +58,7 @@ let codecs_src = let - dir = http://www.mplayerhq.hu/MPlayer/releases/codecs/; + dir = "http://www.mplayerhq.hu/MPlayer/releases/codecs/"; version = "20071007"; in if stdenv.hostPlatform.system == "i686-linux" then fetchurl { @@ -217,7 +217,7 @@ stdenv.mkDerivation rec { meta = { description = "A movie player that supports many video formats"; - homepage = http://mplayerhq.hu; + homepage = "http://mplayerhq.hu"; license = "GPL"; maintainers = [ stdenv.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 f1713fe29d4..d5ceeb65a9e 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper +{ config, stdenv, fetchurl, fetchFromGitHub, makeWrapper, fetchpatch , addOpenGLRunpath, docutils, perl, pkgconfig, python3, wafHook, which , ffmpeg_4, freefont_ttf, freetype, libass, libpthreadstubs, mujs , nv-codec-headers, lua, libuchardet, libiconv ? null @@ -191,6 +191,14 @@ in stdenv.mkDerivation rec { --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" ''; + patches = stdenv.lib.optionals stdenv.isDarwin [ + # Fix cocoa backend. Remove with the next release + (fetchpatch { + url = "https://github.com/mpv-player/mpv/commit/188169854313b99d01da8f69fe129f0a487eb7c4.patch"; + sha256 = "062sz4666prb2wg1rn5q8brqkzlq6lxn8sxic78a8lb0125c01f7"; + }) + ]; + postInstall = '' # Use a standard font mkdir -p $out/share/mpv @@ -217,7 +225,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A media player that supports many video formats (MPlayer and mplayer2 fork)"; - homepage = https://mpv.io; + homepage = "https://mpv.io"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fpletz globin ma27 tadeokondrak ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index faa21326fc0..a89b4ec0889 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Convert parts of a video while you are watching it in mpv"; - homepage = https://gist.github.com/Zehkul/25ea7ae77b30af959be0; + homepage = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; maintainers = [ lib.maintainers.Profpatsch ]; longDescription = '' When this script is loaded into mpv, you can hit Alt+W to mark the beginning diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index e383823f2cc..e318c7afa67 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mpv-mpris-${version}.so"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; rev = version; - sha256 = "02lqsgp296s8wr0yh6wm8h7nhn53rj254zahpzbwdv15apgy0z17"; + sha256 = "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MPRIS plugin for mpv"; - homepage = https://github.com/hoyon/mpv-mpris; + homepage = "https://github.com/hoyon/mpv-mpris"; license = licenses.mit; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 2c73d3e734c..2f1d3a3a1c9 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { ++ stdenv.lib.optionals (!enableXnvctrl) [ "--disable-xnvctrl" ]; meta = with stdenv.lib; { - homepage = https://www.mythtv.org/; + homepage = "https://www.mythtv.org/"; description = "Open Source DVR"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 4617d1d17dc..4e6c9f7ea5a 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -35,15 +35,15 @@ let ''; }; lodepngcpp = fetchurl { - url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.cpp; + url = "https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.cpp"; sha256 = "1dxkkr4jbmvlwfr7m16i1mgcj1pqxg9s1a7y3aavs9rrk0ki8ys2"; }; lodepngh = fetchurl { - url = https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h; + url = "https://raw.githubusercontent.com/lvandeve/lodepng/a70c086077c0eaecbae3845e4da4424de5f43361/lodepng.h"; sha256 = "14drdikd0vws3wwpyqq7zzm5z3kg98svv4q4w0hr45q6zh6hs0bq"; }; CImgh = fetchurl { - url = https://raw.githubusercontent.com/dtschump/CImg/572c12d82b2f59ece21be8f52645c38f1dd407e6/CImg.h; + url = "https://raw.githubusercontent.com/dtschump/CImg/572c12d82b2f59ece21be8f52645c38f1dd407e6/CImg.h"; sha256 = "0n4qfxj8j6rmj4svf68gg2pzg8d1pb74bnphidnf8i2paj6lwniz"; }; plugins = map buildPlugin [ @@ -120,7 +120,7 @@ stdenv.mkDerivation { Node-graph based, open-source compositing software. Similar in functionalities to Adobe After Effects and Nuke by The Foundry. ''; - homepage = https://natron.fr/; + homepage = "https://natron.fr/"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index fd292304cfe..be2a323943d 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -37,13 +37,13 @@ let inherit (stdenv.lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; - version = "25.0.2"; + version = "25.0.3"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "12c2p179fijz5606h3bp4g88479gwgr7d5f8vk6j2n0rlzs76nsn"; + sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/video/obs-studio/linuxbrowser.nix b/pkgs/applications/video/obs-studio/linuxbrowser.nix index 134e0cb8a9e..a33383937fb 100644 --- a/pkgs/applications/video/obs-studio/linuxbrowser.nix +++ b/pkgs/applications/video/obs-studio/linuxbrowser.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Browser source plugin for obs-studio based on Chromium Embedded Framework"; - homepage = https://github.com/bazukas/obs-linuxbrowser; + homepage = "https://github.com/bazukas/obs-linuxbrowser"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix index 452793f442e..79f38fa8fe4 100644 --- a/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network A/V plugin for OBS Studio"; - homepage = https://github.com/Palakis/obs-ndi; + homepage = "https://github.com/Palakis/obs-ndi"; maintainers = with maintainers; [ peti ]; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix index 05b826c9cef..77ef09d3c24 100644 --- a/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/wlrobs.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An obs-studio plugin that allows you to screen capture on wlroots based wayland compositors"; - homepage = https://hg.sr.ht/~scoopta/wlrobs; + homepage = "https://hg.sr.ht/~scoopta/wlrobs"; maintainers = with maintainers; [ grahamc ]; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/video/ogmtools/default.nix b/pkgs/applications/video/ogmtools/default.nix index 221f4fc0e5c..c9c5190dc53 100644 --- a/pkgs/applications/video/ogmtools/default.nix +++ b/pkgs/applications/video/ogmtools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { (ogmdemux) or creation of (ogmmerge) OGG media streams. Includes dvdxchap tool for extracting chapter information from DVD. ''; - homepage = https://www.bunkus.org/videotools/ogmtools/; + homepage = "https://www.bunkus.org/videotools/ogmtools/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/olive-editor/default.nix b/pkgs/applications/video/olive-editor/default.nix index 1285422a2f9..55c6149e7d0 100644 --- a/pkgs/applications/video/olive-editor/default.nix +++ b/pkgs/applications/video/olive-editor/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "olive-editor"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "olive-editor"; repo = "olive"; rev = version; - sha256 = "15q4qwf5rc3adssywl72jrhkpqk55ihpd5h5wf07baw0s47vv5kq"; + sha256 = "151g6jwhipgbq4llwib92sq23p1s9hm6avr7j4qq3bvykzrm8z1a"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/omxplayer/default.nix b/pkgs/applications/video/omxplayer/default.nix index 7a130bbdb41..28df8ead0c8 100644 --- a/pkgs/applications/video/omxplayer/default.nix +++ b/pkgs/applications/video/omxplayer/default.nix @@ -55,7 +55,7 @@ let enableParallelBuilding = true; meta = { - homepage = http://www.ffmpeg.org/; + homepage = "http://www.ffmpeg.org/"; description = "A complete, cross-platform solution to record, convert and stream audio and video"; }; }; @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { name = "omxplayer-20130328-fbee325dc2"; src = fetchurl { - url = https://github.com/huceke/omxplayer/tarball/fbee325dc2; + url = "https://github.com/huceke/omxplayer/tarball/fbee325dc2"; name = "${name}.tar.gz"; sha256 = "0fkvv8il7ffqxki2gp8cxa5shh6sz9jsy5vv3f4025g4gss6afkg"; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { buildInputs = [ raspberrypifw ffmpeg pcre boost freetype zlib ]; meta = { - homepage = https://github.com/huceke/omxplayer; + homepage = "https://github.com/huceke/omxplayer"; description = "Commandline OMX player for the Raspberry Pi"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.arm; diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index e8a348b4328..cd3176249f8 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -36,7 +36,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://openshot.org/; + homepage = "http://openshot.org/"; description = "Free, open-source video editor"; longDescription = '' OpenShot Video Editor is a free, open-source video editor for Linux. diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 253ef15a600..d1a368b43ba 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - homepage = http://openshot.org/; + homepage = "http://openshot.org/"; description = "High-quality sound editing library"; longDescription = '' OpenShot Audio Library (libopenshot-audio) is a program that allows the diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 19852664a9f..861ac456029 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DENABLE_RUBY=OFF" ]; meta = { - homepage = http://openshot.org/; + homepage = "http://openshot.org/"; description = "Free, open-source video editor library"; longDescription = '' OpenShot Library (libopenshot) is an open-source project dedicated to diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index d9eef7f4cd8..219954ff9f2 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A point to point color terminal video chat"; - homepage = https://github.com/mofarrell/p2pvc; + homepage = "https://github.com/mofarrell/p2pvc"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ trino ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index bef9537b806..276c2fa787f 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -68,7 +68,7 @@ in python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Non-Linear video editor utilizing the power of GStreamer"; - homepage = http://pitivi.org/; + homepage = "http://pitivi.org/"; longDescription = '' Pitivi is a video editor built upon the GStreamer Editing Services. It aims to be an intuitive and flexible application diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index a4f9d6222aa..8b7aa3b551c 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -65,6 +65,6 @@ in mkDerivation rec { description = "Streaming media player for Plex"; license = licenses.gpl2; maintainers = with maintainers; [ kylewlacy ]; - homepage = https://plex.tv; + homepage = "https://plex.tv"; }; } diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index 019d080f973..df72e200e62 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.7.12"; + version = "1.7.14"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "0l13g4vkvcd1q4lkdkbgv4hgkx5pql6ym2fap35581z7rzy9jhkq"; + sha256 = "1rjifqvs59w2aacfird02myqfd34qadhacj9zpy5xjz25x410zza"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; diff --git a/pkgs/applications/video/pyca/default.nix b/pkgs/applications/video/pyca/default.nix index af9ef4c1cd5..0fed17bb999 100644 --- a/pkgs/applications/video/pyca/default.nix +++ b/pkgs/applications/video/pyca/default.nix @@ -22,7 +22,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A fully functional Opencast capture agent written in Python"; - homepage = https://github.com/opencast/pyCA; + homepage = "https://github.com/opencast/pyCA"; license = licenses.lgpl3; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index cd6416032da..26b3153019f 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -5,7 +5,7 @@ let in mkDerivation { name = "qarte-4.6.0"; src = fetchbzr { - url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4; + url = "http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/qarte-4"; rev = "22"; sha256 = "0v4zpj8w67ydvnmanxbl8pwvn0cfv70c0mlw36a1r4n0rvgxffcn"; }; @@ -33,7 +33,7 @@ in mkDerivation { ''; meta = { - homepage = https://launchpad.net/qarte; + homepage = "https://launchpad.net/qarte"; description = "A recorder for Arte TV Guide and Arte Concert"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 327a2034265..e2243797a3b 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.qstopmotion.org; + homepage = "http://www.qstopmotion.org"; description = "Create stopmotion animation with a (web)camera"; longDescription = '' Qstopmotion is a tool to create stopmotion diff --git a/pkgs/applications/video/quvi/library.nix b/pkgs/applications/video/quvi/library.nix index 8f9e3131d8a..c4926bedd72 100644 --- a/pkgs/applications/video/quvi/library.nix +++ b/pkgs/applications/video/quvi/library.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; - homepage = http://quvi.sf.net; + homepage = "http://quvi.sf.net"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/video/quvi/scripts.nix b/pkgs/applications/video/quvi/scripts.nix index e54fc0eae4b..462c2df9962 100644 --- a/pkgs/applications/video/quvi/scripts.nix +++ b/pkgs/applications/video/quvi/scripts.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; - homepage = http://quvi.sf.net; + homepage = "http://quvi.sf.net"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/video/quvi/tool.nix b/pkgs/applications/video/quvi/tool.nix index 972e08bb61b..b2746ef8233 100644 --- a/pkgs/applications/video/quvi/tool.nix +++ b/pkgs/applications/video/quvi/tool.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Web video downloader"; - homepage = http://quvi.sf.net; + homepage = "http://quvi.sf.net"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/applications/video/screenkey/default.nix b/pkgs/applications/video/screenkey/default.nix index 56b1134b2b8..7e2bc3a3ec0 100644 --- a/pkgs/applications/video/screenkey/default.nix +++ b/pkgs/applications/video/screenkey/default.nix @@ -49,7 +49,7 @@ buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = https://www.thregr.org/~wavexx/software/screenkey/; + homepage = "https://www.thregr.org/~wavexx/software/screenkey/"; description = "A screencast tool to display your keys inspired by Screenflick"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index f0959284d66..b3c05818638 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.18.0"; mkDerivation rec { pname = "shotcut"; - version = "20.02.17"; + version = "20.04.01"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "0nsqlbapqgxccb7mnvxqw4hdddj944d4z5jxafpv0cwj7s3z8wj0"; + sha256 = "10svbhsd5q8z1k055kcfibil97qifwzn3xmnf5b9sxa7ky4bkmqr"; }; patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ]; @@ -60,7 +60,7 @@ mkDerivation rec { nixpkgs maintainer(s). If you wish to report any bugs upstream, please use the official build from shotcut.org instead. ''; - homepage = https://shotcut.org; + homepage = "https://shotcut.org"; license = licenses.gpl3; maintainers = with maintainers; [ goibhniu woffs peti ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index b06f0fcd962..f97d1ee0037 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A screen recorder for Linux"; - homepage = https://www.maartenbaert.be/simplescreenrecorder; + homepage = "https://www.maartenbaert.be/simplescreenrecorder"; license = licenses.gpl3; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 65a7f358d6f..aba6af7359a 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { meta = { description = "A complete front-end for MPlayer"; longDescription = "Either mplayer or mpv should also be installed for smplayer to play medias"; - homepage = https://www.smplayer.info; + homepage = "https://www.smplayer.info"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index df262fa9797..1cd6fb693e8 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -20,7 +20,7 @@ mkDerivation rec { meta = with lib; { description = "Play and download Youtube videos"; - homepage = http://smplayer.sourceforge.net/smtube.php; + homepage = "http://smplayer.sourceforge.net/smtube.php"; license = licenses.gpl2Plus; maintainers = with maintainers; [ vbgl ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index cf10bd223a1..a12d0845890 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -16,7 +16,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = (with pythonPackages; [ pycryptodome requests iso-639 iso3166 websocket_client isodate ]) ++ [ rtmpdump ffmpeg ]; meta = with stdenv.lib; { - homepage = https://github.com/streamlink/streamlink; + homepage = "https://github.com/streamlink/streamlink"; description = "CLI for extracting streams from various websites to video player of your choosing"; longDescription = '' Streamlink is a CLI utility that pipes flash videos from online diff --git a/pkgs/applications/video/subdl/default.nix b/pkgs/applications/video/subdl/default.nix index 36a92f0f1af..b2b020a20d2 100644 --- a/pkgs/applications/video/subdl/default.nix +++ b/pkgs/applications/video/subdl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://github.com/alexanderwink/subdl; + 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; diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index f628c3b214e..29e2de6b6c0 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices. ''; - homepage = http://kitone.github.io/subtitleeditor/; + homepage = "http://kitone.github.io/subtitleeditor/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.plcplc ]; diff --git a/pkgs/applications/video/tivodecode/default.nix b/pkgs/applications/video/tivodecode/default.nix index bc6561a0bbd..33e04b77c4b 100644 --- a/pkgs/applications/video/tivodecode/default.nix +++ b/pkgs/applications/video/tivodecode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Converts a .TiVo file (produced by TiVoToGo) to a normal MPEG file"; - homepage = http://tivodecode.sourceforge.net; + homepage = "http://tivodecode.sourceforge.net"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index bcffb8585b3..d025554835e 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -46,7 +46,7 @@ outputs = [ "out" "dev" "man" ]; meta = with lib; { - homepage = http://www.tvdr.de/; + homepage = "http://www.tvdr.de/"; description = "Video Disc Recorder"; maintainers = [ maintainers.ck3d ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 2ee196baccc..6c1e79c42de 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -38,7 +38,7 @@ in { makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.saunalahti.fi/~rahrenbe/vdr/femon/; + homepage = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/"; description = "DVB Frontend Status Monitor plugin for VDR"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -72,7 +72,7 @@ in { }; meta = with stdenv.lib; { - homepage = https://github.com/pesintta/vdr-plugin-vaapidevice; + homepage = "https://github.com/pesintta/vdr-plugin-vaapidevice"; description = "VDR SoftHDDevice Plug-in (with VA-API VPP additions)"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -118,7 +118,7 @@ in { installFlags = buildFlags; meta = with stdenv.lib; { - homepage = https://projects.vdr-developer.org/projects/plg-markad; + homepage = "https://projects.vdr-developer.org/projects/plg-markad"; description = "Ein Programm zum automatischen Setzen von Schnittmarken bei Werbeeinblendungen während einer Sendung."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -165,7 +165,7 @@ in { outputs = [ "out" "man" ]; meta = with stdenv.lib; { - homepage = http://winni.vdr-developer.org/epgsearch; + homepage = "http://winni.vdr-developer.org/epgsearch"; description = "Searchtimer and replacement of the VDR program menu"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -192,7 +192,7 @@ in { }; meta = with stdenv.lib; { - homepage = https://github.com/FernetMenta/vdr-plugin-vnsiserver; + homepage = "https://github.com/FernetMenta/vdr-plugin-vnsiserver"; description = "VDR plugin to handle KODI clients."; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -227,7 +227,7 @@ in { installPhase = ":"; meta = with stdenv.lib; { - homepage = https://projects.vdr-developer.org/projects/plg-text2skin; + homepage = "https://projects.vdr-developer.org/projects/plg-text2skin"; description = "VDR Text2Skin Plugin"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; @@ -328,7 +328,7 @@ in { installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/jowi24/vdr-fritz; + homepage = "https://github.com/jowi24/vdr-fritz"; description = "A plugin for VDR to access AVMs Fritz Box routers"; maintainers = [ maintainers.ck3d ]; license = licenses.gpl2; diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 2396a224d45..229eeffe8f7 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform media player and streaming server"; - homepage = http://www.videolan.org/vlc/; + homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix index a38a9056c85..94d0de20ccf 100644 --- a/pkgs/applications/video/vokoscreen/default.nix +++ b/pkgs/applications/video/vokoscreen/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Simple GUI screencast recorder, using ffmpeg"; - homepage = "http://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"; + homepage = "https://linuxecke.volkoh.de/vokoscreen/vokoscreen.html"; longDescription = '' vokoscreen is an easy to use screencast creator to record educational videos, live recordings of browser, installation, diff --git a/pkgs/applications/video/w_scan/default.nix b/pkgs/applications/video/w_scan/default.nix index 3c4f607c6af..7710c7d67a3 100644 --- a/pkgs/applications/video/w_scan/default.nix +++ b/pkgs/applications/video/w_scan/default.nix @@ -11,7 +11,7 @@ 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; + 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; diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix index 8258f858309..24c17daa759 100644 --- a/pkgs/applications/video/webtorrent_desktop/default.nix +++ b/pkgs/applications/video/webtorrent_desktop/default.nix @@ -78,7 +78,7 @@ meta = with stdenv.lib; { description = "Streaming torrent app for Mac, Windows, and Linux."; - homepage = https://webtorrent.io/desktop; + homepage = "https://webtorrent.io/desktop"; license = licenses.mit; maintainers = [ maintainers.flokli ]; platforms = [ diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix index 176d9a87aed..32712d5b9b0 100644 --- a/pkgs/applications/video/wxcam/default.nix +++ b/pkgs/applications/video/wxcam/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { It supports both video4linux 1 and 2 drivers, so it should work on a very large number of devices. ''; - homepage = http://wxcam.sourceforge.net/; + homepage = "http://wxcam.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/video/xawtv/default.nix b/pkgs/applications/video/xawtv/default.nix index 676c218776c..38cce053edf 100644 --- a/pkgs/applications/video/xawtv/default.nix +++ b/pkgs/applications/video/xawtv/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "TV application for Linux with apps and tools such as a teletext browser"; license = stdenv.lib.licenses.gpl2; - homepage = https://www.kraxel.org/blog/linux/xawtv/; + homepage = "https://www.kraxel.org/blog/linux/xawtv/"; maintainers = with stdenv.lib.maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/video/xine-ui/default.nix b/pkgs/applications/video/xine-ui/default.nix index e92d7384591..f52db04928a 100644 --- a/pkgs/applications/video/xine-ui/default.nix +++ b/pkgs/applications/video/xine-ui/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { #NIX_LDFLAGS = "-lXext -lgcc_s"; meta = with stdenv.lib; { - homepage = http://www.xine-project.org/; + homepage = "http://www.xine-project.org/"; description = "Xlib-based interface to Xine, a video player"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/video/xscast/default.nix b/pkgs/applications/video/xscast/default.nix index 3c4c59a0ee8..dec8bdd67fc 100644 --- a/pkgs/applications/video/xscast/default.nix +++ b/pkgs/applications/video/xscast/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/KeyboardFire/xscast; + homepage = "https://github.com/KeyboardFire/xscast"; license = licenses.mit; description = "Screencasts of windows with list of keystrokes overlayed"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 6e07fbb105b..20d4d84741c 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xvidcap-1.1.7"; src = fetchurl { - url = mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz; + url = "mirror://sourceforge/xvidcap/xvidcap-1.1.7.tar.gz"; sha256 = "0p8rhpyhxgy37crf1xk1046z4p663jg7ww776jw92pld3s024ihm"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Screencast video catpuring tool"; - homepage = http://xvidcap.sourceforge.net/; + homepage = "http://xvidcap.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/8086tiny/default.nix b/pkgs/applications/virtualization/8086tiny/default.nix index e16fcb84b05..464ea053cc4 100644 --- a/pkgs/applications/virtualization/8086tiny/default.nix +++ b/pkgs/applications/virtualization/8086tiny/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { 8086tiny is based on an IOCCC 2013 winning entry. In fact that is the "unobfuscated" version :) ''; - homepage = http://www.megalith.co.uk/8086tiny/index.html; + homepage = "http://www.megalith.co.uk/8086tiny/index.html"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index e475c4ed78a..310d41df36d 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -55,7 +55,7 @@ edk2.mkDerivation projectDscPath { meta = { description = "Sample UEFI firmware for QEMU and KVM"; - homepage = https://github.com/tianocore/tianocore.github.io/wiki/OVMF; + homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = stdenv.lib.licenses.bsd2; platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; }; diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index 02fb256b38c..f98b8eefd78 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A virtual machine manager GUI for qemu"; - homepage = https://github.com/tobimensch/aqemu; + homepage = "https://github.com/tobimensch/aqemu"; license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; diff --git a/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch b/pkgs/applications/virtualization/bochs/bochs-2.6.11-glibc-2.26.patch index e662913574d..e662913574d 100644 --- a/pkgs/applications/virtualization/bochs/bochs-2.6.10-glibc-2.26.patch +++ b/pkgs/applications/virtualization/bochs/bochs-2.6.11-glibc-2.26.patch diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index f6e202ac499..e9982d61391 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -19,14 +19,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "bochs"; - version = "2.6.10"; + version = "2.6.11"; src = fetchurl { url = "mirror://sourceforge/project/bochs/bochs/${version}/${pname}-${version}.tar.gz"; - sha256 = "1c3mw4b8wrjf8z44fvhycs95j1wd1c0b4khcv63giiia5j5q0gvj"; + sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3"; }; - patches = [ ./bochs-2.6.10-glibc-2.26.patch ]; + 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 ] diff --git a/pkgs/applications/virtualization/bochs/fix-build-smp.patch b/pkgs/applications/virtualization/bochs/fix-build-smp.patch new file mode 100644 index 00000000000..faa2acfa512 --- /dev/null +++ b/pkgs/applications/virtualization/bochs/fix-build-smp.patch @@ -0,0 +1,21 @@ +Description: A fix for SMP-enable configurations +Inspired in: https://sourceforge.net/p/bochs/code/13778/ + +============ +diff -Naur bochs-2.6.11-old/bx_debug/dbg_main.cc bochs-2.6.11-new/bx_debug/dbg_main.cc +--- bochs-2.6.11-old/bx_debug/dbg_main.cc 2019-12-20 04:57:59.818924000 -0300 ++++ bochs-2.6.11-new/bx_debug/dbg_main.cc 2020-03-30 23:20:29.402195707 -0300 +@@ -1494,11 +1494,11 @@ + { + char cpu_param_name[16]; + +- Bit32u index = BX_ITLB_INDEX_OF(laddr); ++ Bit32u index = BX_CPU(dbg_cpu)->ITLB.get_index_of(laddr); + sprintf(cpu_param_name, "ITLB.entry%d", index); + bx_dbg_show_param_command(cpu_param_name, 0); + +- index = BX_DTLB_INDEX_OF(laddr, 0); ++ index = BX_CPU(dbg_cpu)->DTLB.get_index_of(laddr); + sprintf(cpu_param_name, "DTLB.entry%d", index); + bx_dbg_show_param_command(cpu_param_name, 0); + } diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index a0694b7efbe..a316952a010 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { while maintaining access to the performance and functionality already on offer. ''; - homepage = https://hpc.github.io/charliecloud; + homepage = "https://hpc.github.io/charliecloud"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/virtualization/cntr/default.nix b/pkgs/applications/virtualization/cntr/default.nix index f046e0e44b2..e3ab1c6c2f8 100644 --- a/pkgs/applications/virtualization/cntr/default.nix +++ b/pkgs/applications/virtualization/cntr/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A container debugging tool based on FUSE"; - homepage = https://github.com/Mic92/cntr; + homepage = "https://github.com/Mic92/cntr"; license = licenses.mit; # aarch64 support will be fixed soon platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 449d06430a5..b09911cf6e5 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "conmon"; - version = "2.0.14"; + version = "2.0.15"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "1h5mxs8wrsm1q48fmd7slpa0j6g6kjbm1mcizyhk7xz1xrbnicc1"; + sha256 = "1fshcmnfqzbagzcrh5nxw7pi0dd60xpq47a2lzfghklqhl1h0b5i"; }; nativeBuildInputs = [ pkg-config ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/containers/conmon"; description = "An OCI container runtime monitor"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester saschagrunert ]; + maintainers = with maintainers; [ ] ++ teams.podman.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 7b48d8c1934..7ce4390ba30 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -48,7 +48,7 @@ buildGoPackage rec { ''; meta = { - homepage = https://containerd.io/; + homepage = "https://containerd.io/"; description = "A daemon to control runC"; license = licenses.asl20; maintainers = with maintainers; [ offline vdemeester ]; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 274468334ee..21d88d7dffa 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -20,7 +20,7 @@ let buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; in buildGoPackage rec { project = "cri-o"; - version = "1.17.0"; + version = "1.17.1"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -29,7 +29,7 @@ in buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "0xjmylf0ww23qqcg7kw008px6608r4qq6q57pfqis0661kp6f24j"; + sha256 = "0zipigjcnhcnn0w69dkd8312qb6z98l65ir175wp3jfvj4cx3g28"; }; outputs = [ "bin" "out" ]; @@ -53,7 +53,7 @@ in buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://cri-o.io; + homepage = "https://cri-o.io"; description = ''Open Container Initiative-based implementation of the Kubernetes Container Runtime Interface''; license = licenses.asl20; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 35b88d7e447..ded793449fc 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -67,5 +67,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.linux; inherit (src.meta) homepage; + maintainers = with maintainers; [ ] ++ teams.podman.members; }; } diff --git a/pkgs/applications/virtualization/docker-compose/default.nix b/pkgs/applications/virtualization/docker-compose/default.nix index 0bd5d69466b..fb641bc1a55 100644 --- a/pkgs/applications/virtualization/docker-compose/default.nix +++ b/pkgs/applications/virtualization/docker-compose/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://docs.docker.com/compose/; + homepage = "https://docs.docker.com/compose/"; description = "Multi-container orchestration for Docker"; license = licenses.asl20; maintainers = with maintainers; [ Frostman ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 7f7b3a227e8..131d6d7675e 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -182,7 +182,7 @@ rec { ''; meta = { - homepage = https://www.docker.com/; + homepage = "https://www.docker.com/"; description = "An open source project to pack, ship and run any application as a lightweight container"; license = licenses.asl20; maintainers = with maintainers; [ nequissimus offline tailhook vdemeester periklis ]; diff --git a/pkgs/applications/virtualization/docker/gc.nix b/pkgs/applications/virtualization/docker/gc.nix index dcac628e367..08cfba59918 100644 --- a/pkgs/applications/virtualization/docker/gc.nix +++ b/pkgs/applications/virtualization/docker/gc.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Docker garbage collection of containers and images"; license = licenses.asl20; - homepage = https://github.com/spotify/docker-gc; + homepage = "https://github.com/spotify/docker-gc"; maintainers = with maintainers; [offline]; platforms = docker.meta.platforms; }; diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index 3b2e1f45ae6..dde0b481497 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Docker proxy binary to forward traffic between host and containers"; license = licenses.asl20; - homepage = https://github.com/docker/libnetwork; + homepage = "https://github.com/docker/libnetwork"; maintainers = with maintainers; [vdemeester]; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix index 069d5836a42..faa1076e299 100644 --- a/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-pvdrivers/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Xen Subproject: Windows PV Driver"; - homepage = http://xenproject.org/downloads/windows-pv-drivers.html; + homepage = "http://xenproject.org/downloads/windows-pv-drivers.html"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/applications/virtualization/driver/win-qemu/default.nix b/pkgs/applications/virtualization/driver/win-qemu/default.nix index 1fa3e76d18f..97a1f0b3039 100644 --- a/pkgs/applications/virtualization/driver/win-qemu/default.nix +++ b/pkgs/applications/virtualization/driver/win-qemu/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Windows QEMU Drivers"; - homepage = https://fedoraproject.org/wiki/Windows_Virtio_Drivers; + homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix index 39ca93d4e1a..c4684a20914 100644 --- a/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix +++ b/pkgs/applications/virtualization/driver/win-signed-gplpv-drivers/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { The drivers are signed by Univention with a Software Publishers Certificate obtained from the VeriSign CA. ''; - homepage = http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers; + homepage = "http://wiki.univention.de/index.php?title=Installing-signed-GPLPV-drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 2b2d8568a5b..f327512b128 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Windows SPICE Drivers"; - homepage = https://www.spice-space.org/; + homepage = "https://www.spice-space.org/"; license = [ licenses.asl20 ]; # See https://github.com/vrozenfe/qxl-dod maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/applications/virtualization/driver/win-virtio/default.nix index 351353ceb96..f8a52f5b898 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/applications/virtualization/driver/win-virtio/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Windows VirtIO Drivers"; - homepage = https://fedoraproject.org/wiki/Windows_Virtio_Drivers; + homepage = "https://fedoraproject.org/wiki/Windows_Virtio_Drivers"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix index 220d26c116f..cb8cc7ee1de 100644 --- a/pkgs/applications/virtualization/firecracker/default.nix +++ b/pkgs/applications/virtualization/firecracker/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Secure, fast, minimal micro-container virtualization"; - homepage = http://firecracker-microvm.io; + homepage = "http://firecracker-microvm.io"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/applications/virtualization/firectl/default.nix b/pkgs/applications/virtualization/firectl/default.nix index 1f74318f2dd..f91cc6d5ed3 100644 --- a/pkgs/applications/virtualization/firectl/default.nix +++ b/pkgs/applications/virtualization/firectl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "A command-line tool to run Firecracker microVMs"; - homepage = https://github.com/firecracker-microvm/firectl; + homepage = "https://github.com/firecracker-microvm/firectl"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; diff --git a/pkgs/applications/virtualization/gvisor/containerd-shim.nix b/pkgs/applications/virtualization/gvisor/containerd-shim.nix index d30897df79e..702aeaded3e 100644 --- a/pkgs/applications/virtualization/gvisor/containerd-shim.nix +++ b/pkgs/applications/virtualization/gvisor/containerd-shim.nix @@ -28,7 +28,7 @@ buildGoModule rec { meta = with lib; { description = "containerd shim for gVisor"; - homepage = https://github.com/google/gvisor-containerd-shim; + homepage = "https://github.com/google/gvisor-containerd-shim"; license = licenses.asl20; maintainers = with maintainers; [ andrew-d ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/gvisor/default.nix b/pkgs/applications/virtualization/gvisor/default.nix index 3d0ae35f560..e157ca825af 100644 --- a/pkgs/applications/virtualization/gvisor/default.nix +++ b/pkgs/applications/virtualization/gvisor/default.nix @@ -93,7 +93,7 @@ in buildBazelPackage rec { meta = with stdenv.lib; { description = "Container Runtime Sandbox"; - homepage = https://github.com/google/gvisor; + homepage = "https://github.com/google/gvisor"; license = licenses.asl20; maintainers = with maintainers; [ andrew-d ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/lkl/default.nix b/pkgs/applications/virtualization/lkl/default.nix index d56318555e5..7a6ccc67bb5 100644 --- a/pkgs/applications/virtualization/lkl/default.nix +++ b/pkgs/applications/virtualization/lkl/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { extensively as possible with minimal effort and reduced maintenance overhead ''; - homepage = https://github.com/lkl/linux/; + homepage = "https://github.com/lkl/linux/"; platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; # Darwin probably works too but I haven't tested it license = licenses.gpl2; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/applications/virtualization/looking-glass-client/default.nix b/pkgs/applications/virtualization/looking-glass-client/default.nix index 0f53a5c4f14..a0ec55dd895 100644 --- a/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { step required to move away from dual booting with other operating systems for legacy programs that require high performance graphics. ''; - homepage = https://looking-glass.hostfission.com/; + homepage = "https://looking-glass.hostfission.com/"; license = licenses.gpl2Plus; maintainers = [ maintainers.alexbakker ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/nvidia-docker/default.nix b/pkgs/applications/virtualization/nvidia-docker/default.nix index e11ca04f6b3..b56b88cf87e 100644 --- a/pkgs/applications/virtualization/nvidia-docker/default.nix +++ b/pkgs/applications/virtualization/nvidia-docker/default.nix @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/NVIDIA/nvidia-docker; + homepage = "https://github.com/NVIDIA/nvidia-docker"; description = "NVIDIA container runtime for Docker"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index 71c02ab4de5..f2c9eda75fc 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libelf libcap libseccomp ]; meta = { - homepage = https://github.com/NVIDIA/libnvidia-container; + homepage = "https://github.com/NVIDIA/libnvidia-container"; description = "NVIDIA container runtime library"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/open-vm-tools/default.nix b/pkgs/applications/virtualization/open-vm-tools/default.nix index 87ec2e52f13..84f74ef6dd0 100644 --- a/pkgs/applications/virtualization/open-vm-tools/default.nix +++ b/pkgs/applications/virtualization/open-vm-tools/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/vmware/open-vm-tools; + homepage = "https://github.com/vmware/open-vm-tools"; description = "Set of tools for VMWare guests to improve host-guest interaction"; longDescription = '' A set of services and modules that enable several features in VMware products for diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 288cac27b21..cd78c12bdc5 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -41,7 +41,7 @@ buildGoPackage rec { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; license = licenses.asl20; - maintainers = with maintainers; [ vdemeester saschagrunert marsam ]; + maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; }; } diff --git a/pkgs/applications/virtualization/qboot/default.nix b/pkgs/applications/virtualization/qboot/default.nix index 0678591fc2a..d770308239f 100644 --- a/pkgs/applications/virtualization/qboot/default.nix +++ b/pkgs/applications/virtualization/qboot/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A simple x86 firmware for booting Linux"; - homepage = https://github.com/bonzini/qboot; + homepage = "https://github.com/bonzini/qboot"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; platforms = ["x86_64-linux" "i686-linux"]; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 203ee1c7cc0..d6611e20a9c 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -118,16 +118,16 @@ stdenv.mkDerivation rec { ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { - url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch; + url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/xattr_size_max.patch"; sha256 = "1xfdjs1jlvs99hpf670yianb8c3qz2ars8syzyz8f2c2cp5y4bxb"; }) (fetchpatch { - url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch; + url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch"; sha256 = "1gm67v41gw6apzgz7jr3zv9z80wvkv0jaxd2w4d16hmipa8bhs0k"; }) ./sigrtminmax.patch (fetchpatch { - url = https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch; + url = "https://raw.githubusercontent.com/alpinelinux/aports/2bb133986e8fa90e2e76d53369f03861a87a74ef/main/qemu/fix-sigevent-and-sigval_t.patch"; sha256 = "0wk0rrcqywhrw9hygy6ap0lfg314m9z1wr2hn8338r5gfcw75mav"; }) ]; @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.qemu.org/; + homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco ]; diff --git a/pkgs/applications/virtualization/railcar/default.nix b/pkgs/applications/virtualization/railcar/default.nix index 7b56da0f7bc..fda95b41ab5 100644 --- a/pkgs/applications/virtualization/railcar/default.nix +++ b/pkgs/applications/virtualization/railcar/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Rust implementation of the Open Containers Initiative oci-runtime"; - homepage = https://github.com/oracle/railcar; + homepage = "https://github.com/oracle/railcar"; license = with licenses; [ asl20 /* or */ upl ]; maintainers = [ maintainers.spacekookie ]; platforms = platforms.all; diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index 58710365b6e..dcc5efb6504 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VirtualBox client with remote management"; - homepage = http://remotebox.knobgoblin.org.uk/; + homepage = "http://remotebox.knobgoblin.org.uk/"; license = licenses.gpl2Plus; longDescription = '' VirtualBox is traditionally considered to be a virtualization solution diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index bacd175197d..f3b68e5c227 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A fast, composable, and secure App Container runtime for Linux"; - homepage = https://github.com/coreos/rkt; + homepage = "https://github.com/coreos/rkt"; license = licenses.asl20; maintainers = with maintainers; [ ragge steveej ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index e7713d45f2f..7c5f2922d5d 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -50,10 +50,10 @@ buildGoPackage rec { ''; meta = { - homepage = https://runc.io/; + homepage = "https://runc.io/"; description = "A CLI tool for spawning and running containers according to the OCI specification"; license = licenses.asl20; - maintainers = with maintainers; [ offline vdemeester saschagrunert ]; + maintainers = with maintainers; [ offline ] ++ teams.podman.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/virtualization/seabios/default.nix b/pkgs/applications/virtualization/seabios/default.nix index 32528627a3c..d95f759783d 100644 --- a/pkgs/applications/virtualization/seabios/default.nix +++ b/pkgs/applications/virtualization/seabios/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "seabios"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "http://code.coreboot.org/p/seabios/downloads/get/${pname}-${version}.tar.gz"; - sha256 = "1xwvp77djxbxbxg82hzj26pv6zka3556vkdcp09hnfwapcp46av2"; + url = "https://www.seabios.org/downloads/${pname}-${version}.tar.gz"; + sha256 = "00z7vdahpxa37irlf8ld350dp6z9qfyfb56vbfqr319hsv13srrp"; }; buildInputs = [ iasl python ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { It can run in an emulator or it can run natively on X86 hardware with the use of coreboot. SeaBIOS is the default BIOS for QEMU and KVM. ''; - homepage = http://www.seabios.org; + homepage = "http://www.seabios.org"; license = licenses.lgpl3; maintainers = [ maintainers.tstrobel ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 930afa31722..4477e7c7b1d 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -67,7 +67,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.sylabs.io/; + homepage = "http://www.sylabs.io/"; description = "Application containers for linux"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 6f5cbeb7ed4..22aa31a6dea 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -2,10 +2,10 @@ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus, libdrm, systemd}: stdenv.mkDerivation rec { - name = "spice-vdagent-0.19.0"; + name = "spice-vdagent-0.20.0"; src = fetchurl { url = "https://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0r9gjx1vcgb4f7g85b1ib045kqa3dqjk12m7342i5y443ihpr9v3"; + sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf"; }; NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; postPatch = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { to the client resolution * Multiple displays ''; - homepage = https://www.spice-space.org/; + homepage = "https://www.spice-space.org/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.aboseley ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index fcc599b451f..e3e6bae6cfe 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiny but valid init for containers"; - homepage = https://github.com/krallin/tini; + homepage = "https://github.com/krallin/tini"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/applications/virtualization/tinyemu/default.nix b/pkgs/applications/virtualization/tinyemu/default.nix index 224f77ed32d..2c9098993d8 100644 --- a/pkgs/applications/virtualization/tinyemu/default.nix +++ b/pkgs/applications/virtualization/tinyemu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" ''; meta = { - homepage = https://bellard.org/tinyemu/; + 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 ]; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 99d20477a12..952a30b139c 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://virt-manager.org; + homepage = "http://virt-manager.org"; description = "Desktop user interface for managing virtual machines"; longDescription = '' The virt-manager application is a desktop user interface for managing diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix index 5b2b33d6adf..85bc7c428ff 100644 --- a/pkgs/applications/virtualization/virt-manager/qt.nix +++ b/pkgs/applications/virtualization/virt-manager/qt.nix @@ -29,7 +29,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig qttools ]; meta = with lib; { - homepage = https://f1ash.github.io/qt-virt-manager; + homepage = "https://f1ash.github.io/qt-virt-manager"; description = "Desktop user interface for managing virtual machines (QT)"; longDescription = '' The virt-manager application is a desktop user interface for managing diff --git a/pkgs/applications/virtualization/virt-top/default.nix b/pkgs/applications/virtualization/virt-top/default.nix index f32a2a6ce1c..7ad60405f1b 100644 --- a/pkgs/applications/virtualization/virt-top/default.nix +++ b/pkgs/applications/virtualization/virt-top/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { version = "1.0.9"; src = fetchgit { - url = git://git.annexia.org/virt-top.git; + url = "git://git.annexia.org/virt-top.git"; rev = "v${version}"; sha256 = "0m7pm8lzlpngsj0vjv0hg8l9ck3gvwpva7r472f8f03xpjffwiga"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt ocaml_gettext curses csv xml-light ]; + buildInputs = with ocamlPackages; [ ocaml findlib ocaml_extlib ocaml_libvirt gettext-stub curses csv xml-light ]; buildPhase = "make opt"; meta = with stdenv.lib; { description = "A top-like utility for showing stats of virtualized domains"; - homepage = https://people.redhat.com/~rjones/virt-top/; + homepage = "https://people.redhat.com/~rjones/virt-top/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.linux; diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 6931e492e99..4d8987d6ed7 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://virt-manager.org; + homepage = "http://virt-manager.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; description = "Command line tool which provides an easy way to provision operating systems into virtual machines"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 5d3044bdbc7..9d784d88a4f 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -221,7 +221,7 @@ in stdenv.mkDerivation { meta = { description = "PC emulator"; license = licenses.gpl2; - homepage = https://www.virtualbox.org/; + homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index ba8407e4a73..d50d3b59e24 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -18,7 +18,7 @@ fetchurl rec { meta = { description = "Oracle Extension pack for VirtualBox"; license = licenses.virtualbox-puel; - homepage = https://www.virtualbox.org/; + homepage = "https://www.virtualbox.org/"; maintainers = with maintainers; [ sander cdepillabout ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/virtualization/x11docker/default.nix b/pkgs/applications/virtualization/x11docker/default.nix index add16fd98f9..7ef91e6f609 100644 --- a/pkgs/applications/virtualization/x11docker/default.nix +++ b/pkgs/applications/virtualization/x11docker/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, makeWrapper, nx-libs, xorg, getopt, gnugrep, gawk, ps, mount, iproute }: stdenv.mkDerivation rec { pname = "x11docker"; - version = "6.6.0"; + version = "6.6.1"; src = fetchFromGitHub { owner = "mviereck"; repo = "x11docker"; rev = "v${version}"; - sha256 = "0a7fggyaybfppsvqyll1gsh19pp41nkly4x1sgy5pk1d9j1lblgx"; + sha256 = "0p1ypgy45ngxxjczd986pkfh4cn5bs45cwzlfv9fm2p58fkx3aar"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/virtualization/xen/4.10.nix b/pkgs/applications/virtualization/xen/4.10.nix index f15a7ef0f9d..7e3c73fb11d 100644 --- a/pkgs/applications/virtualization/xen/4.10.nix +++ b/pkgs/applications/virtualization/xen/4.10.nix @@ -27,7 +27,7 @@ let qemuMemfdBuildFix = fetchpatch { name = "xen-4.8-memfd-build-fix.patch"; - url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"; sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; }; @@ -49,7 +49,7 @@ callPackage (import ./generic.nix (rec { xenfiles = optionalAttrs withInternalQemu { qemu-xen = { src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen.git; + url = "https://xenbits.xen.org/git-http/qemu-xen.git"; # rev = "refs/tags/qemu-xen-${version}"; # use revision hash - reproducible but must be updated with each new version rev = "qemu-xen-${version}"; @@ -66,7 +66,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalTraditionalQemu { qemu-xen-traditional = { src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; + url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git"; # rev = "refs/tags/xen-${version}"; # use revision hash - reproducible but must be updated with each new version rev = "c8ea0457495342c417c3dc033bba25148b279f60"; @@ -84,7 +84,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalSeabios { "firmware/seabios-dir-remote" = { src = fetchgit { - url = https://xenbits.xen.org/git-http/seabios.git; + url = "https://xenbits.xen.org/git-http/seabios.git"; rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df"; sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm"; }; @@ -94,7 +94,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalOVMF { "firmware/ovmf-dir-remote" = { src = fetchgit { - url = https://xenbits.xen.org/git-http/ovmf.git; + url = "https://xenbits.xen.org/git-http/ovmf.git"; rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8"; sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr"; }; @@ -104,7 +104,7 @@ callPackage (import ./generic.nix (rec { # TODO: patch Xen to make this optional? "firmware/etherboot/ipxe.git" = { src = fetchgit { - url = https://git.ipxe.org/ipxe.git; + url = "https://git.ipxe.org/ipxe.git"; rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d"; sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09"; }; @@ -114,7 +114,7 @@ callPackage (import ./generic.nix (rec { xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; - url = https://github.com/michalpalka/xen-libhvm; + url = "https://github.com/michalpalka/xen-libhvm"; rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c"; sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd"; }; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 8cc9c23d2bf..6fa30462df0 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -39,7 +39,7 @@ let qemuMemfdBuildFix = fetchpatch { name = "xen-4.8-memfd-build-fix.patch"; - url = https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch; + url = "https://github.com/qemu/qemu/commit/75e5b70e6b5dcc4f2219992d7cffa462aa406af0.patch"; sha256 = "0gaz93kb33qc0jx6iphvny0yrd17i8zhcl3a9ky5ylc2idz0wiwa"; }; @@ -66,7 +66,7 @@ callPackage (import ./generic.nix (rec { xenfiles = optionalAttrs withInternalQemu { qemu-xen = { src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen.git; + url = "https://xenbits.xen.org/git-http/qemu-xen.git"; rev = "refs/tags/qemu-xen-${version}"; sha256 = "0lb7zd5nvr6znx47z93nbq4gj8xfb3622s8r2cvmpqmwnmlc3nd4"; }; @@ -80,7 +80,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalTraditionalQemu { qemu-xen-traditional = { src = fetchgit { - url = https://xenbits.xen.org/git-http/qemu-xen-traditional.git; + url = "https://xenbits.xen.org/git-http/qemu-xen-traditional.git"; rev = "refs/tags/xen-${version}"; sha256 = "0mryap5y53r09m7qc0b821f717ghwm654r8c3ik1w7adzxr0l5qk"; }; @@ -96,7 +96,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalSeabios { "firmware/seabios-dir-remote" = { src = fetchgit { - url = https://xenbits.xen.org/git-http/seabios.git; + url = "https://xenbits.xen.org/git-http/seabios.git"; rev = "f0cdc36d2f2424f6b40438f7ee7cc502c0eff4df"; sha256 = "1wq5pjkjrfzqnq3wyr15mcn1l4c563m65gdyf8jm97kgb13pwwfm"; }; @@ -106,7 +106,7 @@ callPackage (import ./generic.nix (rec { } // optionalAttrs withInternalOVMF { "firmware/ovmf-dir-remote" = { src = fetchgit { - url = https://xenbits.xen.org/git-http/ovmf.git; + url = "https://xenbits.xen.org/git-http/ovmf.git"; rev = "173bf5c847e3ca8b42c11796ce048d8e2e916ff8"; sha256 = "07zmdj90zjrzip74fvd4ss8n8njk6cim85s58mc6snxmqqv7gmcr"; }; @@ -116,7 +116,7 @@ callPackage (import ./generic.nix (rec { # TODO: patch Xen to make this optional? "firmware/etherboot/ipxe.git" = { src = fetchgit { - url = https://git.ipxe.org/ipxe.git; + url = "https://git.ipxe.org/ipxe.git"; rev = "356f6c1b64d7a97746d1816cef8ca22bdd8d0b5d"; sha256 = "15n400vm3id5r8y3k6lrp9ab2911a9vh9856f5gvphkazfnmns09"; }; @@ -126,7 +126,7 @@ callPackage (import ./generic.nix (rec { xen-libhvm-dir-remote = { src = fetchgit { name = "xen-libhvm"; - url = https://github.com/michalpalka/xen-libhvm; + url = "https://github.com/michalpalka/xen-libhvm"; rev = "83065d36b36d6d527c2a4e0f5aaf0a09ee83122c"; sha256 = "1jzv479wvgjkazprqdzcdjy199azmx2xl3pnxli39kc5mvjz3lzd"; }; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 5a8814fb9e2..854debc458a 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -226,7 +226,7 @@ stdenv.mkDerivation (rec { # TODO(@oxij): Stop referencing args here meta = { - homepage = http://www.xen.org/; + homepage = "http://www.xen.org/"; description = "Xen hypervisor and related components" + optionalString (args ? meta && args.meta ? description) " (${args.meta.description})"; diff --git a/pkgs/applications/virtualization/xhyve/default.nix b/pkgs/applications/virtualization/xhyve/default.nix index e39877df829..921a54b11a2 100644 --- a/pkgs/applications/virtualization/xhyve/default.nix +++ b/pkgs/applications/virtualization/xhyve/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight Virtualization on macOS Based on bhyve"; - homepage = https://github.com/mist64/xhyve; + homepage = "https://github.com/mist64/xhyve"; maintainers = [ lib.maintainers.lnl7 ]; platforms = lib.platforms.darwin; }; diff --git a/pkgs/applications/window-managers/2bwm/default.nix b/pkgs/applications/window-managers/2bwm/default.nix index cd1a3a4baf7..0a2dd63130e 100644 --- a/pkgs/applications/window-managers/2bwm/default.nix +++ b/pkgs/applications/window-managers/2bwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = "make install DESTDIR=$out PREFIX=\"\""; meta = with stdenv.lib; { - homepage = https://github.com/venam/2bwm; + homepage = "https://github.com/venam/2bwm"; description = "A fast floating WM written over the XCB library and derived from mcwm"; license = licenses.mit; maintainers = [ maintainers.sternenseemann ]; diff --git a/pkgs/applications/window-managers/afterstep/default.nix b/pkgs/applications/window-managers/afterstep/default.nix index 7e68de8393f..001e624e1be 100644 --- a/pkgs/applications/window-managers/afterstep/default.nix +++ b/pkgs/applications/window-managers/afterstep/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { for flexibility of desktop configuration, improving aestetics, and efficient use of system resources. ''; - homepage = http://www.afterstep.org/; + homepage = "http://www.afterstep.org/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 54244d4dc8d..609723b42d4 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Highly configurable, dynamic window manager for X"; - homepage = https://awesomewm.org/; + homepage = "https://awesomewm.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lovek323 rasendubi ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index e863a382470..52f52281043 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tiling window manager based on binary space partitioning"; - homepage = https://github.com/baskerville/bspwm; + homepage = "https://github.com/baskerville/bspwm"; maintainers = with maintainers; [ meisternu epitrochoid rvolosatovs ]; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/bspwm/unstable.nix b/pkgs/applications/window-managers/bspwm/unstable.nix index eeadfa248d7..e52e33ec544 100644 --- a/pkgs/applications/window-managers/bspwm/unstable.nix +++ b/pkgs/applications/window-managers/bspwm/unstable.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A tiling window manager based on binary space partitioning (git version)"; - homepage = https://github.com/baskerville/bspwm; + 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; diff --git a/pkgs/applications/window-managers/btops/default.nix b/pkgs/applications/window-managers/btops/default.nix index cf90b1fad63..132e2ba6ddd 100644 --- a/pkgs/applications/window-managers/btops/default.nix +++ b/pkgs/applications/window-managers/btops/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "bspwm desktop management that supports dymanic appending, removing, and renaming"; - homepage = https://github.com/cmschuetz/btops; + homepage = "https://github.com/cmschuetz/btops"; maintainers = with maintainers; [ mnacamura ]; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/cage/default.nix b/pkgs/applications/window-managers/cage/default.nix index fe5e9c4e2e3..0d9e3335f2c 100644 --- a/pkgs/applications/window-managers/cage/default.nix +++ b/pkgs/applications/window-managers/cage/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sha256 = "1gkqx26pvlw00b3fgx6sh87yyjfzyj51jwxvbf9k117npkrf4b2g"; }; - nativeBuildInputs = [ meson ninja pkgconfig makeWrapper ]; + nativeBuildInputs = [ meson ninja pkgconfig makeWrapper wayland ]; buildInputs = [ wlroots wayland wayland-protocols pixman libxkbcommon @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Wayland kiosk"; - homepage = https://www.hjdskes.nl/projects/cage/; + homepage = "https://www.hjdskes.nl/projects/cage/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/window-managers/clfswm/default.nix b/pkgs/applications/window-managers/clfswm/default.nix index e2c39887a32..e3864319f7b 100644 --- a/pkgs/applications/window-managers/clfswm/default.nix +++ b/pkgs/applications/window-managers/clfswm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A(nother) Common Lisp FullScreen Window Manager"; - homepage = https://common-lisp.net/project/clfswm/; + homepage = "https://common-lisp.net/project/clfswm/"; license = licenses.gpl3; maintainers = with maintainers; [ robgssp ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix index af2c9af900d..8f9c28c7851 100644 --- a/pkgs/applications/window-managers/dwm/default.nix +++ b/pkgs/applications/window-managers/dwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildPhase = " make "; meta = { - homepage = https://suckless.org/; + homepage = "https://suckless.org/"; description = "Dynamic window manager for X"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 69337976f88..01887b3bcf1 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Highly performant and configurable DWM status service"; - homepage = https://github.com/Gerschtli/dwm-status; + homepage = "https://github.com/Gerschtli/dwm-status"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/dwm/git.nix b/pkgs/applications/window-managers/dwm/git.nix index aaa32dd6b11..3751a8de69f 100644 --- a/pkgs/applications/window-managers/dwm/git.nix +++ b/pkgs/applications/window-managers/dwm/git.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { buildPhase = "make"; meta = with stdenv.lib; { - homepage = https://suckless.org/; + homepage = "https://suckless.org/"; description = "Dynamic window manager for X, development version"; license = licenses.mit; maintainers = with maintainers; [xeji]; diff --git a/pkgs/applications/window-managers/dzen2/default.nix b/pkgs/applications/window-managers/dzen2/default.nix index 96dcfb93800..367c78ec5ca 100644 --- a/pkgs/applications/window-managers/dzen2/default.nix +++ b/pkgs/applications/window-managers/dzen2/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/robm/dzen; + homepage = "https://github.com/robm/dzen"; license = stdenv.lib.licenses.mit; description = "X notification utility"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 1907fbb68f9..64dc784e812 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { inherit patches; meta = with stdenv.lib; { - homepage = http://www.6809.org.uk/evilwm/; + homepage = "http://www.6809.org.uk/evilwm/"; description = "Minimalist window manager for the X Window System"; license = { shortName = "evilwm"; fullName = "Custom, inherited from aewm and 9wm"; - url = http://www.6809.org.uk/evilwm/; + url = "http://www.6809.org.uk/evilwm/"; free = true; }; # like BSD/MIT, but Share-Alike'y; See README. diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index 404044fa3fa..b1a11d7153c 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { fast, desktop experience. It is written in C++ and licensed under MIT license. ''; - homepage = http://fluxbox.org/; + homepage = "http://fluxbox.org/"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix index cc503b2db4f..6b3f4029755 100644 --- a/pkgs/applications/window-managers/fvwm/default.nix +++ b/pkgs/applications/window-managers/fvwm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional gestures libstroke; meta = { - homepage = http://fvwm.org; + homepage = "http://fvwm.org"; description = "A multiple large virtual desktop window manager"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index ca64786475f..8c4f6e452f4 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A manual tiling window manager for X"; - homepage = http://herbstluftwm.org/; + homepage = "http://herbstluftwm.org/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/applications/window-managers/i3/blocks-gaps.nix b/pkgs/applications/window-managers/i3/blocks-gaps.nix index acfd06235ac..4a91865feca 100644 --- a/pkgs/applications/window-managers/i3/blocks-gaps.nix +++ b/pkgs/applications/window-managers/i3/blocks-gaps.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A flexible scheduler for your i3bar blocks -- this is a fork to use with i3-gaps"; - homepage = https://github.com/Airblader/i3blocks-gaps; + homepage = "https://github.com/Airblader/i3blocks-gaps"; license = licenses.gpl3; maintainers = with maintainers; [ carlsverre ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix index 8c3101f8eb9..bfd76b44437 100644 --- a/pkgs/applications/window-managers/i3/blocks.nix +++ b/pkgs/applications/window-managers/i3/blocks.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { # XDG_CONFIG_DIRS can contain multiple elements separated by colons, which should be searched in order. (fetchpatch { # https://github.com/vivien/i3blocks/pull/405 - url = https://github.com/edef1c/i3blocks/commit/d57b32f9a364aeaf36869efdd54240433c737e57.patch; + url = "https://github.com/edef1c/i3blocks/commit/d57b32f9a364aeaf36869efdd54240433c737e57.patch"; sha256 = "102xb0ax0hmg82dz2gzfag470dkckzf2yizai0izacvrz0d3ngj1"; }) ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A flexible scheduler for your i3bar blocks"; - homepage = https://github.com/vivien/i3blocks; + homepage = "https://github.com/vivien/i3blocks"; license = licenses.gpl3; platforms = with platforms; freebsd ++ linux; }; diff --git a/pkgs/applications/window-managers/i3/easyfocus.nix b/pkgs/applications/window-managers/i3/easyfocus.nix index 9ce5486557a..5c7a22eb769 100644 --- a/pkgs/applications/window-managers/i3/easyfocus.nix +++ b/pkgs/applications/window-managers/i3/easyfocus.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Focus and select windows in i3"; - homepage = https://github.com/cornerman/i3-easyfocus; + homepage = "https://github.com/cornerman/i3-easyfocus"; maintainers = with maintainers; [teto]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/i3ipc-glib.nix b/pkgs/applications/window-managers/i3/i3ipc-glib.nix index 33aac1cf4b6..7e6a18c93c5 100644 --- a/pkgs/applications/window-managers/i3/i3ipc-glib.nix +++ b/pkgs/applications/window-managers/i3/i3ipc-glib.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C interface library to i3wm"; - homepage = https://github.com/acrisci/i3ipc-glib; + homepage = "https://github.com/acrisci/i3ipc-glib"; maintainers = with maintainers; [teto]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/layout-manager.nix b/pkgs/applications/window-managers/i3/layout-manager.nix index c7454981400..f4c2a53b7a2 100644 --- a/pkgs/applications/window-managers/i3/layout-manager.nix +++ b/pkgs/applications/window-managers/i3/layout-manager.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/klaxalk/i3-layout-manager; + homepage = "https://github.com/klaxalk/i3-layout-manager"; description = "Saving, loading and managing layouts for i3wm."; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/lock-fancy.nix b/pkgs/applications/window-managers/i3/lock-fancy.nix index b6b354021d9..9b9b2dea132 100644 --- a/pkgs/applications/window-managers/i3/lock-fancy.nix +++ b/pkgs/applications/window-managers/i3/lock-fancy.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "i3lock is a bash script that takes a screenshot of the desktop, blurs the background and adds a lock icon and text."; - homepage = https://github.com/meskarune/i3lock-fancy; + homepage = "https://github.com/meskarune/i3lock-fancy"; maintainers = with maintainers; [ ]; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/lock.nix b/pkgs/applications/window-managers/i3/lock.nix index 619345d1b96..2bca01eeefa 100644 --- a/pkgs/applications/window-managers/i3/lock.nix +++ b/pkgs/applications/window-managers/i3/lock.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { a configurable image is shown, and a ring-shaped unlock-indicator gives feedback for every keystroke. After entering your password, the screen is unlocked again. ''; - homepage = https://i3wm.org/i3lock/; + homepage = "https://i3wm.org/i3lock/"; maintainers = with maintainers; [ malyn domenkozar ]; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix index 20ea0dd03cc..29bda8e4e2b 100644 --- a/pkgs/applications/window-managers/i3/pystatus.nix +++ b/pkgs/applications/window-managers/i3/pystatus.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/enkore/i3pystatus; + homepage = "https://github.com/enkore/i3pystatus"; description = "A complete replacement for i3status"; longDescription = '' i3pystatus is a growing collection of python scripts for status output compatible diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index b28c95e6bfb..62389e1230a 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Very resource-friendly and feature-rich replacement for i3status"; - homepage = https://github.com/greshake/i3status-rust; + homepage = "https://github.com/greshake/i3status-rust"; license = licenses.gpl3; maintainers = with maintainers; [ backuitist globin ma27 ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix index e963259b624..6005ca3ab3a 100644 --- a/pkgs/applications/window-managers/i3/status.nix +++ b/pkgs/applications/window-managers/i3/status.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Generates a status line for i3bar, dzen2, xmobar or lemonbar"; - homepage = https://i3wm.org; + homepage = "https://i3wm.org"; maintainers = [ ]; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/applications/window-managers/i3/wk-switch.nix b/pkgs/applications/window-managers/i3/wk-switch.nix index 98855517303..51881975266 100644 --- a/pkgs/applications/window-managers/i3/wk-switch.nix +++ b/pkgs/applications/window-managers/i3/wk-switch.nix @@ -26,6 +26,6 @@ python3Packages.buildPythonApplication rec { maintainers = with maintainers; [ synthetica ]; platforms = platforms.linux; license = licenses.mit; - homepage = https://travisf.net/i3-wk-switcher; + homepage = "https://travisf.net/i3-wk-switcher"; }; } diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix index 58fa0d194e1..651669bebe5 100644 --- a/pkgs/applications/window-managers/icewm/default.nix +++ b/pkgs/applications/window-managers/icewm/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "icewm"; - version = "1.6.3"; + version = "1.6.5"; src = fetchFromGitHub { owner = "bbidulock"; repo = "icewm"; rev = version; - sha256 = "0h3w718x28fd4sz36ka9wpgcb98scna6qpycxzls4cjji3rjgm0l"; + sha256 = "1glzpkpl0vl5sjn1d9jlvwd9ch16dvxvsf2n310kb0ycpfkl84vs"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { IceWM is a window manager for the X Window System. The goal of IceWM is speed, simplicity, and not getting in the user's way. ''; - homepage = http://www.icewm.org/; + homepage = "http://www.icewm.org/"; license = licenses.lgpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/ion-3/default.nix b/pkgs/applications/window-managers/ion-3/default.nix index 073af3bfd05..57c91c2cfb7 100644 --- a/pkgs/applications/window-managers/ion-3/default.nix +++ b/pkgs/applications/window-managers/ion-3/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "ion-3-20090110"; meta = { description = "Tiling tabbed window manager designed with keyboard users in mind"; - homepage = http://modeemi.fi/~tuomov/ion; + homepage = "http://modeemi.fi/~tuomov/ion"; platforms = with stdenv.lib.platforms; linux; license = stdenv.lib.licenses.lgpl21; }; src = fetchurl { - url = http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz; + url = "http://tuomov.iki.fi/software/dl/ion-3-20090110.tar.gz"; sha256 = "1nkks5a95986nyfkxvg2rik6zmwx0lh7szd5fji7yizccwzc9xns"; }; buildInputs = [ xlibsWrapper lua gettext groff ]; diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix index 3668b344be5..601cf3cded6 100644 --- a/pkgs/applications/window-managers/jwm/default.nix +++ b/pkgs/applications/window-managers/jwm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = http://joewing.net/projects/jwm/; + 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; diff --git a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix index db33b27ddd8..d6fe5b4200c 100644 --- a/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix +++ b/pkgs/applications/window-managers/jwm/jwm-settings-manager.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A full configuration manager for JWM"; - homepage = https://joewing.net/projects/jwm; + homepage = "https://joewing.net/projects/jwm"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix index bcfcbe3c5f5..de1a68a56bf 100644 --- a/pkgs/applications/window-managers/kbdd/default.nix +++ b/pkgs/applications/window-managers/kbdd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Simple daemon and library to make per window layout using XKB"; - homepage = https://github.com/qnikst/kbdd; + homepage = "https://github.com/qnikst/kbdd"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.wedens ]; diff --git a/pkgs/applications/window-managers/larswm/default.nix b/pkgs/applications/window-managers/larswm/default.nix index f6f3132178c..b918c28938c 100644 --- a/pkgs/applications/window-managers/larswm/default.nix +++ b/pkgs/applications/window-managers/larswm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "larswm-7.5.3"; src = fetchurl { - url = mirror://sourceforge/larswm/larswm-7.5.3.tar.gz; + url = "mirror://sourceforge/larswm/larswm-7.5.3.tar.gz"; sha256 = "1xmlx9g1nhklxjrg0wvsya01s4k5b9fphnpl9zdwp29mm484ni3v"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install.man" ]; meta = { - homepage = http://www.fnurt.net/larswm; + homepage = "http://www.fnurt.net/larswm"; description = "9wm-like tiling window manager"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 9d6e0f27f93..89b4fecc206 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A lightweight xcb based bar"; - homepage = https://github.com/LemonBoy/bar; + homepage = "https://github.com/LemonBoy/bar"; maintainers = [ maintainers.meisternu ]; license = "Custom"; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index ff34f1dfee7..a70e5a4dc5c 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "A lightweight xcb based bar with XFT-support"; - homepage = https://github.com/krypt-n/bar; + homepage = "https://github.com/krypt-n/bar"; license = "Custom"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/neocomp/default.nix b/pkgs/applications/window-managers/neocomp/default.nix index 026ee2e1287..57968922c39 100644 --- a/pkgs/applications/window-managers/neocomp/default.nix +++ b/pkgs/applications/window-managers/neocomp/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/DelusionalLogic/NeoComp; + homepage = "https://github.com/DelusionalLogic/NeoComp"; license = licenses.gpl3; maintainers = with maintainers; [ twey ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/notion/default.nix b/pkgs/applications/window-managers/notion/default.nix index 2b9e8237a04..ac4f00f4545 100644 --- a/pkgs/applications/window-managers/notion/default.nix +++ b/pkgs/applications/window-managers/notion/default.nix @@ -7,22 +7,22 @@ stdenv.mkDerivation rec{ pname = "notion"; - version = "3-2019050101"; + version = "4.0.0"; src = fetchFromGitHub { owner = "raboof"; repo = pname; rev = version; - sha256 = "09kvgqyw0gnj3jhz9gmwq81ak8qy32vyanx1hw79r6m181aysspz"; + sha256 = "0rqfvwkj0j862hf6i4wsmb6185xibsskfj9kwy896qcpcg8w4kk7"; }; nativeBuildInputs = [ pkgconfig makeWrapper groff ]; buildInputs = [ lua gettext which readline fontconfig libX11 libXext libSM libXinerama libXrandr libXft xlibsWrapper ]; - buildFlags = [ "CC=cc" "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ]; + buildFlags = [ "LUA_DIR=${lua}" "X11_PREFIX=/no-such-path" ]; - makeFlags = [ "PREFIX=\${out}" ]; + makeFlags = [ "NOTION_RELEASE=${version}" "PREFIX=\${out}" ]; postInstall = '' wrapProgram $out/bin/notion \ @@ -30,10 +30,10 @@ stdenv.mkDerivation rec{ ''; meta = with stdenv.lib; { - description = "Tiling tabbed window manager, follow-on to the Ion"; - homepage = "https://notionwm.net/"; + description = "Tiling tabbed window manager"; + homepage = "https://notionwm.net"; license = licenses.lgpl21; - maintainers = with maintainers; [ jfb AndersonTorres ]; + maintainers = with maintainers; [ jfb AndersonTorres raboof ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index c8d526b6d28..a4ec6d067dc 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "X window manager for non-desktop embedded systems"; - homepage = http://openbox.org/; + homepage = "http://openbox.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix index d449fc91c0d..21b18a4917b 100644 --- a/pkgs/applications/window-managers/oroborus/default.nix +++ b/pkgs/applications/window-managers/oroborus/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A really minimalistic X window manager"; - homepage = https://www.oroborus.org/; + homepage = "https://www.oroborus.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/pekwm/default.nix b/pkgs/applications/window-managers/pekwm/default.nix index 38255dce722..da2c11c873b 100644 --- a/pkgs/applications/window-managers/pekwm/default.nix +++ b/pkgs/applications/window-managers/pekwm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { appear as they should when starting applications. - Chainable Keygrabber, usability for everyone. ''; - homepage = http://www.pekwm.org; + homepage = "http://www.pekwm.org"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 6d0e6bdac45..eb56e9c1639 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -44,7 +44,7 @@ python37Packages.buildPythonApplication rec { doCheck = false; # Requires X server. meta = with stdenv.lib; { - homepage = http://www.qtile.org/; + homepage = "http://www.qtile.org/"; license = licenses.mit; description = "A small, flexible, scriptable tiling window manager written in Python"; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 11a69020ee6..4c7cdf1069f 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.nongnu.org/ratpoison/; + homepage = "https://www.nongnu.org/ratpoison/"; description = "Simple mouse-free tiling window manager"; license = licenses.gpl2Plus; diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix index f9bcb28e455..18c3d22f944 100644 --- a/pkgs/applications/window-managers/sawfish/default.nix +++ b/pkgs/applications/window-managers/sawfish/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { All high-level WM functions are implemented in Lisp for future extensibility or redefinition. ''; - homepage = http://sawfish.wikia.com; + homepage = "http://sawfish.wikia.com"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/applications/window-managers/stalonetray/default.nix b/pkgs/applications/window-managers/stalonetray/default.nix index f0f724d6cf0..ad0baeb97dd 100644 --- a/pkgs/applications/window-managers/stalonetray/default.nix +++ b/pkgs/applications/window-managers/stalonetray/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stand alone tray"; - homepage = http://stalonetray.sourceforge.net; + homepage = "http://stalonetray.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/applications/window-managers/stumpish/default.nix b/pkgs/applications/window-managers/stumpish/default.nix index 00f4b95b3f2..c76a9ba762e 100644 --- a/pkgs/applications/window-managers/stumpish/default.nix +++ b/pkgs/applications/window-managers/stumpish/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/stumpwm/stumpwm-contrib; + homepage = "https://github.com/stumpwm/stumpwm-contrib"; description = "STUMPwm Interactive SHell"; license = licenses.gpl2; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/applications/window-managers/stumpwm/default.nix b/pkgs/applications/window-managers/stumpwm/default.nix index 69b2e6ceb50..3ee50bf16ec 100644 --- a/pkgs/applications/window-managers/stumpwm/default.nix +++ b/pkgs/applications/window-managers/stumpwm/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tiling window manager for X11"; - homepage = https://github.com/stumpwm/; + homepage = "https://github.com/stumpwm/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ the-kenny ]; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index a020c10a348..66596d9de04 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "i3-compatible tiling Wayland compositor"; - homepage = https://swaywm.org; + homepage = "https://swaywm.org"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos synthetica ma27 ]; diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix new file mode 100644 index 00000000000..e07080497f4 --- /dev/null +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, + meson, ninja, pkgconfig, scdoc, + wayland, wayland-protocols, libxkbcommon, + cairo, gdk-pixbuf, pam +}: + +stdenv.mkDerivation rec { + pname = "swaylock-effects"; + version = "v1.6-0"; + + src = fetchFromGitHub { + owner = "mortie"; + repo = "swaylock-effects"; + rev = version; + sha256 = "15lshqq3qj9m3yfac65hjcciaf9zdfh3ir7hgh0ach7gpi3rbk13"; + + }; + + postPatch = '' + sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build + ''; + + nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; + + mesonFlags = [ + "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled" + ]; + + meta = with stdenv.lib; { + description = "Screen locker for Wayland"; + longDescription = '' + swaylock-effects is a screen locking utility for Wayland compositors. + ''; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ gnxlxnxx ]; + }; +} diff --git a/pkgs/applications/window-managers/tabbed/default.nix b/pkgs/applications/window-managers/tabbed/default.nix index c391532376e..f0a427e6839 100644 --- a/pkgs/applications/window-managers/tabbed/default.nix +++ b/pkgs/applications/window-managers/tabbed/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "tabbed-20180310"; src = fetchgit { - url = https://git.suckless.org/tabbed; + url = "https://git.suckless.org/tabbed"; rev = "b5f9ec647aae2d9a1d3bd586eb7523a4e0a329a3"; sha256 = "0frj2yjaf0mfjwgyfappksfir52mx2xxd3cdg5533m5d88vbmxss"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://tools.suckless.org/tabbed; + homepage = "https://tools.suckless.org/tabbed"; description = "Simple generic tabbed fronted to xembed aware applications"; license = licenses.mit; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index 5705ae8256c..5c3d8710e35 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/sargon/trayer-srg; + homepage = "https://github.com/sargon/trayer-srg"; license = licenses.mit; description = "A lightweight GTK2-based systray for UNIX desktop"; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/vwm/default.nix b/pkgs/applications/window-managers/vwm/default.nix index 3423b0e181d..8eb42bb9a97 100644 --- a/pkgs/applications/window-managers/vwm/default.nix +++ b/pkgs/applications/window-managers/vwm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses glib libviper libpseudo gpm libvterm ]; meta = with stdenv.lib; { - homepage = http://vwm.sourceforge.net/; + homepage = "http://vwm.sourceforge.net/"; description = "Dynamic window manager for the console"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 51da999aff0..4a09cac9344 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Reference implementation of a Wayland compositor"; - homepage = https://wayland.freedesktop.org/; + homepage = "https://wayland.freedesktop.org/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/window-managers/windowmaker/default.nix b/pkgs/applications/window-managers/windowmaker/default.nix index 8ad63999289..64783ac5fbe 100644 --- a/pkgs/applications/window-managers/windowmaker/default.nix +++ b/pkgs/applications/window-managers/windowmaker/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://windowmaker.org/; + homepage = "http://windowmaker.org/"; description = "NeXTSTEP-like window manager"; longDescription = '' Window Maker is an X11 window manager originally designed to diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix index e708682e303..4e1256399e7 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/alsamixer.app.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "alsamixer.app-0.2.1"; src = fetchgit { - url = git://repo.or.cz/dockapps.git; + url = "git://repo.or.cz/dockapps.git"; rev = "38c74350b02f35824554ce0c4f0f251d71762040"; sha256 = "0g9cwhlqg065fbhav4g4n16a4cqkk9jykl3y0zwbn5whhacfqyhl"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Alsa mixer application for Windowmaker"; - homepage = http://windowmaker.org/dockapps/?name=AlsaMixer.app; + homepage = "http://windowmaker.org/dockapps/?name=AlsaMixer.app"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; }; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix index e2f17d11f64..48f4753d674 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmcalclock.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "wmCalClock-1.25"; src = fetchurl { - url = http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz; + url = "http://www.cs.mun.ca/~gstarkes/wmaker/dockapps/files/wmCalClock-1.25.tar.gz"; sha256 = "4b42b55bb7c1d7c58b5ee1f0058c683d3e4f3e3380d3a69c54a50b983c7c1b3f"; }; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix index 3e8b3f7f158..ad255414a69 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsm.app.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "wmsm.app-0.2.1"; src = fetchurl { - url = http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2; + url = "http://linux-bsd-unix.strefa.pl/wmsm.app-0.2.1.tar.bz2"; sha256 = "369a8f2e5673c6b7ab0cf85166f38fbf553dd966c3c1cfeec0e32837defd32c7"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "System monitor for Windowmaker"; - homepage = http://linux-bsd-unix.strefa.pl; + homepage = "http://linux-bsd-unix.strefa.pl"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; }; diff --git a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix index e5eb2fc559d..3e073cd8e91 100644 --- a/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix +++ b/pkgs/applications/window-managers/windowmaker/dockapps/wmsystemtray.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "wmsystemtray-1.4"; src = fetchurl { - url = mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz; + url = "mirror://sourceforge/project/wmsystemtray/wmsystemtray/wmsystemtray-1.4.tar.gz"; sha256 = "8edef43691e9fff071000e29166c7c1ad420c0956e9068151061e881c8ac97e9"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Systemtray for Windowmaker"; - homepage = http://wmsystemtray.sourceforge.net; + homepage = "http://wmsystemtray.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bstrik ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/window-managers/wmii-hg/default.nix b/pkgs/applications/window-managers/wmii-hg/default.nix index 426fcfe8efc..721e618b1d4 100644 --- a/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/pkgs/applications/window-managers/wmii-hg/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "wmii"; src = fetchurl { - url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip; + url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/wmii/source-archive.zip"; sha256 = "1wmkq14zvmfrmydl8752xz852cy7agrx3qp4fy2cc5asb2r9abaz"; }; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { makeFlags = [ "WMII_HGVERSION=hg${rev}" ]; meta = { - homepage = https://suckless.org/; # https://wmii.suckless.org/ does not exist anymore + 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; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index f7ccda27389..7c6041b576e 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBXFCE4PANEL_1_0_LIBDIR = "$(out)/lib"; meta = with stdenv.lib; { - homepage = https://github.com/kalj/xmonad-log-applet; + homepage = "https://github.com/kalj/xmonad-log-applet"; license = licenses.bsd3; description = "An applet that will display XMonad log information (${desktopSupport} version)"; platforms = platforms.linux; diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix index f7867882d22..10806ba78cf 100644 --- a/pkgs/applications/window-managers/yabar/build.nix +++ b/pkgs/applications/window-managers/yabar/build.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A modern and lightweight status bar for X window managers"; - homepage = https://github.com/geommer/yabar; + homepage = "https://github.com/geommer/yabar"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index a1030e3b34f..f43205f24c5 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -1,9 +1,11 @@ -{ stdenv, php, autoreconfHook, fetchurl, re2c }: +{ stdenv, lib, php, autoreconfHook, fetchurl, re2c }: { pname , version +, internalDeps ? [] , buildInputs ? [] , nativeBuildInputs ? [] +, postPhpize ? "" , makeFlags ? [] , src ? fetchurl { url = "http://pecl.php.net/get/${pname}-${version}.tgz"; @@ -22,5 +24,11 @@ stdenv.mkDerivation (args // { makeFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" ] ++ makeFlags; - autoreconfPhase = "phpize"; + autoreconfPhase = '' + phpize + ${postPhpize} + ${lib.concatMapStringsSep "\n" + (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") + internalDeps} + ''; }) diff --git a/pkgs/build-support/emacs/setup-hook.sh b/pkgs/build-support/emacs/setup-hook.sh index 8f074e0b406..83e995631b3 100644 --- a/pkgs/build-support/emacs/setup-hook.sh +++ b/pkgs/build-support/emacs/setup-hook.sh @@ -1,15 +1,23 @@ +addToEmacsLoadPath() { + local lispDir="$1" + if [[ -d $lispDir && ${EMACSLOADPATH-} != *"$lispDir":* ]] ; then + # It turns out, that the trailing : is actually required + # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html + export EMACSLOADPATH="$lispDir:${EMACSLOADPATH-}" + fi +} + addEmacsVars () { + addToEmacsLoadPath "$1/share/emacs/site-lisp" + + # Add sub paths to the Emacs load path if it is a directory + # containing .el files. This is necessary to build some packages, + # e.g., using trivialBuild. for lispDir in \ - "$1/share/emacs/site-lisp" \ "$1/share/emacs/site-lisp/"* \ "$1/share/emacs/site-lisp/elpa/"*; do - # Add the path to the Emacs load path if it is a directory - # containing .el files and it has not already been added to the - # load path. - if [[ -d $lispDir && "$(echo "$lispDir"/*.el)" && ${EMACSLOADPATH-} != *"$lispDir":* ]] ; then - # It turns out, that the trailing : is actually required - # see https://www.gnu.org/software/emacs/manual/html_node/elisp/Library-Search.html - export EMACSLOADPATH="$lispDir:${EMACSLOADPATH-}" + if [[ -d $lispDir && "$(echo "$lispDir"/*.el)" ]] ; then + addToEmacsLoadPath "$lispDir" fi done } diff --git a/pkgs/build-support/fetchmavenartifact/default.nix b/pkgs/build-support/fetchmavenartifact/default.nix index dc48a312fb3..d7ad406943b 100644 --- a/pkgs/build-support/fetchmavenartifact/default.nix +++ b/pkgs/build-support/fetchmavenartifact/default.nix @@ -3,10 +3,10 @@ { fetchurl, stdenv }: let defaultRepos = [ - http://central.maven.org/maven2 - http://oss.sonatype.org/content/repositories/releases - http://oss.sonatype.org/content/repositories/public - http://repo.typesafe.com/typesafe/releases + "http://central.maven.org/maven2" + "http://oss.sonatype.org/content/repositories/releases" + "http://oss.sonatype.org/content/repositories/public" + "http://repo.typesafe.com/typesafe/releases" ]; in diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index a0a61f7cc50..4e8b0aa99a8 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -2,316 +2,316 @@ # Content-addressable Nix mirrors. hashedMirrors = [ - http://tarballs.nixos.org + "http://tarballs.nixos.org" ]; # Mirrors for mirror://site/filename URIs, where "site" is # "sourceforge", "gnu", etc. luarocks = [ - https://luarocks.org - https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ - http://luafr.org/moonrocks - http://luarocks.logiceditor.com/rocks + "https://luarocks.org" + "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/" + "http://luafr.org/moonrocks" + "http://luarocks.logiceditor.com/rocks" ]; # SourceForge. sourceforge = [ - https://downloads.sourceforge.net/ - https://prdownloads.sourceforge.net/ - https://heanet.dl.sourceforge.net/sourceforge/ - https://surfnet.dl.sourceforge.net/sourceforge/ - https://dfn.dl.sourceforge.net/sourceforge/ - https://osdn.dl.sourceforge.net/sourceforge/ - https://kent.dl.sourceforge.net/sourceforge/ + "https://downloads.sourceforge.net/" + "https://prdownloads.sourceforge.net/" + "https://heanet.dl.sourceforge.net/sourceforge/" + "https://surfnet.dl.sourceforge.net/sourceforge/" + "https://dfn.dl.sourceforge.net/sourceforge/" + "https://osdn.dl.sourceforge.net/sourceforge/" + "https://kent.dl.sourceforge.net/sourceforge/" ]; # OSDN (formerly SourceForge.jp). osdn = [ - https://osdn.dl.osdn.jp/ - https://osdn.mirror.constant.com/ - https://mirrors.gigenet.com/OSDN/ - https://osdn.dl.sourceforge.jp/ - https://jaist.dl.sourceforge.jp/ + "https://osdn.dl.osdn.jp/" + "https://osdn.mirror.constant.com/" + "https://mirrors.gigenet.com/OSDN/" + "https://osdn.dl.sourceforge.jp/" + "https://jaist.dl.sourceforge.jp/" ]; # GNU (https://www.gnu.org/prep/ftp.html). gnu = [ # This one redirects to a (supposedly) nearby and (supposedly) up-to-date # mirror. - https://ftpmirror.gnu.org/ + "https://ftpmirror.gnu.org/" - http://ftp.nluug.nl/pub/gnu/ - http://mirrors.kernel.org/gnu/ - ftp://mirror.cict.fr/gnu/ - ftp://ftp.cs.tu-berlin.de/pub/gnu/ - ftp://ftp.chg.ru/pub/gnu/ - ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/ + "http://ftp.nluug.nl/pub/gnu/" + "http://mirrors.kernel.org/gnu/" + "ftp://mirror.cict.fr/gnu/" + "ftp://ftp.cs.tu-berlin.de/pub/gnu/" + "ftp://ftp.chg.ru/pub/gnu/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/" # This one is the master repository, and thus it's always up-to-date. - http://ftp.gnu.org/pub/gnu/ + "http://ftp.gnu.org/pub/gnu/" ]; # GCC. gcc = [ - https://bigsearcher.com/mirrors/gcc/ - http://mirror.koddos.net/gcc/ - ftp://ftp.nluug.nl/mirror/languages/gcc/ - ftp://ftp.fu-berlin.de/unix/languages/gcc/ - ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/ - ftp://gcc.gnu.org/pub/gcc/ + "https://bigsearcher.com/mirrors/gcc/" + "http://mirror.koddos.net/gcc/" + "ftp://ftp.nluug.nl/mirror/languages/gcc/" + "ftp://ftp.fu-berlin.de/unix/languages/gcc/" + "ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/" + "ftp://gcc.gnu.org/pub/gcc/" ]; # GnuPG. gnupg = [ - https://gnupg.org/ftp/gcrypt/ - http://www.ring.gr.jp/pub/net/ - http://gd.tuwien.ac.at/privacy/ - http://mirrors.dotsrc.org/gcrypt/ - http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ - http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/ + "https://gnupg.org/ftp/gcrypt/" + "http://www.ring.gr.jp/pub/net/" + "http://gd.tuwien.ac.at/privacy/" + "http://mirrors.dotsrc.org/gcrypt/" + "http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/" + "http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/" ]; # kernel.org's /pub (/pub/{linux,software}) tree. kernel = [ - http://cdn.kernel.org/pub/ - http://www.all.kernel.org/pub/ - http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/ - http://linux-kernel.uio.no/pub/ - http://kernel.osuosl.org/pub/ - ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/ + "http://cdn.kernel.org/pub/" + "http://www.all.kernel.org/pub/" + "http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/" + "http://linux-kernel.uio.no/pub/" + "http://kernel.osuosl.org/pub/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/" ]; # Mirrors from https://download.kde.org/extra/download-mirrors.html kde = [ "https://download.kde.org/download.php?url=" - https://ftp.gwdg.de/pub/linux/kde/ - https://mirrors.ocf.berkeley.edu/kde/ - http://mirrors.mit.edu/kde/ - https://mirrors.ustc.edu.cn/kde/ - http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/ - ftp://ftp.kde.org/pub/kde/ + "https://ftp.gwdg.de/pub/linux/kde/" + "https://mirrors.ocf.berkeley.edu/kde/" + "http://mirrors.mit.edu/kde/" + "https://mirrors.ustc.edu.cn/kde/" + "http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/" + "ftp://ftp.kde.org/pub/kde/" ]; # Gentoo files. gentoo = [ - http://ftp.snt.utwente.nl/pub/os/linux/gentoo/ - http://distfiles.gentoo.org/ - ftp://mirrors.kernel.org/gentoo/ + "http://ftp.snt.utwente.nl/pub/os/linux/gentoo/" + "http://distfiles.gentoo.org/" + "ftp://mirrors.kernel.org/gentoo/" ]; savannah = [ # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html - http://mirror.easyname.at/nongnu/ - http://mirror2.klaus-uwe.me/nongnu/ - http://savannah.c3sl.ufpr.br/ - http://mirror.csclub.uwaterloo.ca/nongnu/ - http://mirror.cedia.org.ec/nongnu/ - http://ftp.igh.cnrs.fr/pub/nongnu/ - http://mirror6.layerjet.com/nongnu - http://mirror.netcologne.de/savannah/ - http://ftp.cc.uoc.gr/mirrors/nongnu.org/ - http://nongnu.uib.no/ - http://mirrors.fe.up.pt/pub/nongnu/ - http://mirror.lihnidos.org/GNU/savannah/ - http://savannah.mirror.si/ - http://ftp.acc.umu.se/mirror/gnu.org/savannah/ - http://ftp.twaren.net/Unix/NonGNU/ - http://ftp.yzu.edu.tw/pub/nongnu/ - http://mirror.rackdc.com/savannah/ - http://savannah-nongnu-org.ip-connect.vn.ua/ - http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/ - http://savannah.spinellicreations.com/ - http://gnu.mirrors.pair.com/savannah/savannah/ - ftp://mirror.easyname.at/nongnu/ - ftp://mirror2.klaus-uwe.me/nongnu/ - ftp://savannah.c3sl.ufpr.br/savannah-nongnu/ - ftp://mirror.csclub.uwaterloo.ca/nongnu/ - ftp://mirror.cedia.org.ec/nongnu - ftp://ftp.igh.cnrs.fr/pub/nongnu/ - ftp://mirror6.layerjet.com/nongnu/ - ftp://mirror.netcologne.de/savannah/ - ftp://nongnu.uib.no/pub/nongnu/ - ftp://mirrors.fe.up.pt/pub/nongnu/ - ftp://savannah.mirror.si/savannah/ - ftp://ftp.twaren.net/Unix/NonGNU/ - ftp://ftp.yzu.edu.tw/pub/nongnu/ - ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/ - ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/ - ftp://spinellicreations.com/gnu_dot_org_savannah_mirror/ + "http://mirror.easyname.at/nongnu/" + "http://mirror2.klaus-uwe.me/nongnu/" + "http://savannah.c3sl.ufpr.br/" + "http://mirror.csclub.uwaterloo.ca/nongnu/" + "http://mirror.cedia.org.ec/nongnu/" + "http://ftp.igh.cnrs.fr/pub/nongnu/" + "http://mirror6.layerjet.com/nongnu" + "http://mirror.netcologne.de/savannah/" + "http://ftp.cc.uoc.gr/mirrors/nongnu.org/" + "http://nongnu.uib.no/" + "http://mirrors.fe.up.pt/pub/nongnu/" + "http://mirror.lihnidos.org/GNU/savannah/" + "http://savannah.mirror.si/" + "http://ftp.acc.umu.se/mirror/gnu.org/savannah/" + "http://ftp.twaren.net/Unix/NonGNU/" + "http://ftp.yzu.edu.tw/pub/nongnu/" + "http://mirror.rackdc.com/savannah/" + "http://savannah-nongnu-org.ip-connect.vn.ua/" + "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/" + "http://savannah.spinellicreations.com/" + "http://gnu.mirrors.pair.com/savannah/savannah/" + "ftp://mirror.easyname.at/nongnu/" + "ftp://mirror2.klaus-uwe.me/nongnu/" + "ftp://savannah.c3sl.ufpr.br/savannah-nongnu/" + "ftp://mirror.csclub.uwaterloo.ca/nongnu/" + "ftp://mirror.cedia.org.ec/nongnu" + "ftp://ftp.igh.cnrs.fr/pub/nongnu/" + "ftp://mirror6.layerjet.com/nongnu/" + "ftp://mirror.netcologne.de/savannah/" + "ftp://nongnu.uib.no/pub/nongnu/" + "ftp://mirrors.fe.up.pt/pub/nongnu/" + "ftp://savannah.mirror.si/savannah/" + "ftp://ftp.twaren.net/Unix/NonGNU/" + "ftp://ftp.yzu.edu.tw/pub/nongnu/" + "ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/" + "ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/" + "ftp://spinellicreations.com/gnu_dot_org_savannah_mirror/" ]; samba = [ - https://www.samba.org/ftp/ - http://www.samba.org/ftp/ + "https://www.samba.org/ftp/" + "http://www.samba.org/ftp/" ]; # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html . bitlbee = [ - http://get.bitlbee.org/ - http://get.bitlbee.be/ - http://get.us.bitlbee.org/ - http://ftp.snt.utwente.nl/pub/software/bitlbee/ - http://bitlbee.intergenia.de/ + "http://get.bitlbee.org/" + "http://get.bitlbee.be/" + "http://get.us.bitlbee.org/" + "http://ftp.snt.utwente.nl/pub/software/bitlbee/" + "http://bitlbee.intergenia.de/" ]; # ImageMagick mirrors, see https://www.imagemagick.org/script/mirror.php imagemagick = [ - https://www.imagemagick.org/download/ - https://mirror.checkdomain.de/imagemagick/ - https://ftp.nluug.nl/ImageMagick/ - ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ # also contains older versions removed from most mirrors - http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ - ftp://ftp.imagemagick.org/pub/ImageMagick/ - http://ftp.fifi.org/ImageMagick/ - ftp://ftp.fifi.org/ImageMagick/ - http://imagemagick.mirrorcatalogs.com/ - ftp://imagemagick.mirrorcatalogs.com/imagemagick + "https://www.imagemagick.org/download/" + "https://mirror.checkdomain.de/imagemagick/" + "https://ftp.nluug.nl/ImageMagick/" + "ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/" # also contains older versions removed from most mirrors + "http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/" + "ftp://ftp.imagemagick.org/pub/ImageMagick/" + "http://ftp.fifi.org/ImageMagick/" + "ftp://ftp.fifi.org/ImageMagick/" + "http://imagemagick.mirrorcatalogs.com/" + "ftp://imagemagick.mirrorcatalogs.com/imagemagick" ]; # CPAN mirrors. cpan = [ - https://cpan.metacpan.org/ - https://cpan.perl.org/ - http://backpan.perl.org/ # for old releases + "https://cpan.metacpan.org/" + "https://cpan.perl.org/" + "http://backpan.perl.org/" # for old releases ]; # CentOS. centos = [ - http://mirror.centos.org/centos/ + "http://mirror.centos.org/centos/" # For old releases - http://vault.centos.org/ - https://archive.kernel.org/centos-vault/ - http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/ - http://mirrors.aliyun.com/centos-vault/ - https://mirror.chpc.utah.edu/pub/vault.centos.org/ - https://mirror.its.sfu.ca/mirror/CentOS-vault/ - https://mirror.math.princeton.edu/pub/centos-vault/ - https://mirrors.tripadvisor.com/centos-vault/ + "http://vault.centos.org/" + "https://archive.kernel.org/centos-vault/" + "http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/" + "http://mirrors.aliyun.com/centos-vault/" + "https://mirror.chpc.utah.edu/pub/vault.centos.org/" + "https://mirror.its.sfu.ca/mirror/CentOS-vault/" + "https://mirror.math.princeton.edu/pub/centos-vault/" + "https://mirrors.tripadvisor.com/centos-vault/" ]; # Debian. debian = [ - http://httpredir.debian.org/debian/ - ftp://ftp.au.debian.org/debian/ - ftp://ftp.de.debian.org/debian/ - ftp://ftp.es.debian.org/debian/ - ftp://ftp.fr.debian.org/debian/ - ftp://ftp.it.debian.org/debian/ - ftp://ftp.nl.debian.org/debian/ - ftp://ftp.ru.debian.org/debian/ - ftp://ftp.debian.org/debian/ - http://ftp.debian.org/debian/ - http://archive.debian.org/debian-archive/debian/ - ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/ + "http://httpredir.debian.org/debian/" + "ftp://ftp.au.debian.org/debian/" + "ftp://ftp.de.debian.org/debian/" + "ftp://ftp.es.debian.org/debian/" + "ftp://ftp.fr.debian.org/debian/" + "ftp://ftp.it.debian.org/debian/" + "ftp://ftp.nl.debian.org/debian/" + "ftp://ftp.ru.debian.org/debian/" + "ftp://ftp.debian.org/debian/" + "http://ftp.debian.org/debian/" + "http://archive.debian.org/debian-archive/debian/" + "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/" ]; # Ubuntu. ubuntu = [ - http://nl.archive.ubuntu.com/ubuntu/ - http://de.archive.ubuntu.com/ubuntu/ - http://archive.ubuntu.com/ubuntu/ - http://old-releases.ubuntu.com/ubuntu/ + "http://nl.archive.ubuntu.com/ubuntu/" + "http://de.archive.ubuntu.com/ubuntu/" + "http://archive.ubuntu.com/ubuntu/" + "http://old-releases.ubuntu.com/ubuntu/" ]; # Fedora (please only add full mirrors that carry old Fedora distributions as well). # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content). fedora = [ - http://archives.fedoraproject.org/pub/fedora/ - http://fedora.osuosl.org/ - http://ftp.nluug.nl/pub/os/Linux/distr/fedora/ - http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/ - http://fedora.bhs.mirrors.ovh.net/ - http://mirror.csclub.uwaterloo.ca/fedora/ - http://ftp.linux.cz/pub/linux/fedora/ - http://ftp.heanet.ie/pub/fedora/ - http://mirror.1000mbps.com/fedora/ - http://archives.fedoraproject.org/pub/archive/fedora/ + "http://archives.fedoraproject.org/pub/fedora/" + "http://fedora.osuosl.org/" + "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/" + "http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/" + "http://fedora.bhs.mirrors.ovh.net/" + "http://mirror.csclub.uwaterloo.ca/fedora/" + "http://ftp.linux.cz/pub/linux/fedora/" + "http://ftp.heanet.ie/pub/fedora/" + "http://mirror.1000mbps.com/fedora/" + "http://archives.fedoraproject.org/pub/archive/fedora/" ]; # Old SUSE distributions. Unfortunately there is no master site, # since SUSE actually delete their old distributions (see # ftp://ftp.suse.com/pub/suse/discontinued/deleted-20070817/README.txt). oldsuse = [ - ftp://ftp.gmd.de/ftp.suse.com-discontinued/ + "ftp://ftp.gmd.de/ftp.suse.com-discontinued/" ]; # openSUSE. opensuse = [ - http://opensuse.hro.nl/opensuse/distribution/ - http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/ - http://ftp.belnet.be/mirror/ftp.opensuse.org/distribution/ - http://ftp.uni-kassel.de/opensuse/distribution/ - http://ftp.opensuse.org/pub/opensuse/distribution/ - http://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/ - http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/ - http://opensuse.mirror.server4you.net/distribution/ - http://ftp.nsysu.edu.tw/Linux/OpenSuSE/distribution/ + "http://opensuse.hro.nl/opensuse/distribution/" + "http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/" + "http://ftp.belnet.be/mirror/ftp.opensuse.org/distribution/" + "http://ftp.uni-kassel.de/opensuse/distribution/" + "http://ftp.opensuse.org/pub/opensuse/distribution/" + "http://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/" + "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/" + "http://opensuse.mirror.server4you.net/distribution/" + "http://ftp.nsysu.edu.tw/Linux/OpenSuSE/distribution/" ]; # Gnome (see http://ftp.gnome.org/pub/GNOME/MIRRORS). gnome = [ # This one redirects to some mirror closeby, so it should be all you need. - http://download.gnome.org/ + "http://download.gnome.org/" - http://ftp.unina.it/pub/linux/GNOME/ - http://fr2.rpmfind.net/linux/gnome.org/ - ftp://ftp.dit.upm.es/pub/GNOME/ - ftp://ftp.no.gnome.org/pub/GNOME/ - http://ftp.acc.umu.se/pub/GNOME/ - http://ftp.belnet.be/mirror/ftp.gnome.org/ - http://ftp.df.lth.se/pub/gnome/ - http://linorg.usp.br/gnome/ - http://mirror.aarnet.edu.au/pub/GNOME/ - ftp://ftp.cse.buffalo.edu/pub/Gnome/ - ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/ + "http://ftp.unina.it/pub/linux/GNOME/" + "http://fr2.rpmfind.net/linux/gnome.org/" + "ftp://ftp.dit.upm.es/pub/GNOME/" + "ftp://ftp.no.gnome.org/pub/GNOME/" + "http://ftp.acc.umu.se/pub/GNOME/" + "http://ftp.belnet.be/mirror/ftp.gnome.org/" + "http://ftp.df.lth.se/pub/gnome/" + "http://linorg.usp.br/gnome/" + "http://mirror.aarnet.edu.au/pub/GNOME/" + "ftp://ftp.cse.buffalo.edu/pub/Gnome/" + "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/" ]; xfce = [ - http://archive.xfce.org/ - http://mirror.netcologne.de/xfce/ - http://archive.se.xfce.org/xfce/ - http://archive.be.xfce.org/xfce/ - http://mirror.perldude.de/archive.xfce.org/ - http://archive.be2.xfce.org/ - http://ftp.udc.es/xfce/ - http://archive.al-us.xfce.org/ - http://mirror.yongbok.net/X11/xfce-mirror/ - http://mirrors.tummy.com/pub/archive.xfce.org/ - http://xfce.mirror.uber.com.au/ + "http://archive.xfce.org/" + "http://mirror.netcologne.de/xfce/" + "http://archive.se.xfce.org/xfce/" + "http://archive.be.xfce.org/xfce/" + "http://mirror.perldude.de/archive.xfce.org/" + "http://archive.be2.xfce.org/" + "http://ftp.udc.es/xfce/" + "http://archive.al-us.xfce.org/" + "http://mirror.yongbok.net/X11/xfce-mirror/" + "http://mirrors.tummy.com/pub/archive.xfce.org/" + "http://xfce.mirror.uber.com.au/" ]; # X.org. xorg = [ - https://xorg.freedesktop.org/releases/ - https://ftp.x.org/archive/ + "https://xorg.freedesktop.org/releases/" + "https://ftp.x.org/archive/" ]; # Apache mirrors (see http://www.apache.org/mirrors/). apache = [ - https://www-eu.apache.org/dist/ - https://www-us.apache.org/dist/ - http://www.eu.apache.org/dist/ - ftp://ftp.fu-berlin.de/unix/www/apache/ - http://ftp.tudelft.nl/apache/ - http://mirror.cc.columbia.edu/pub/software/apache/ - https://www.apache.org/dist/ - https://archive.apache.org/dist/ # fallback for old releases - ftp://ftp.funet.fi/pub/mirrors/apache.org/ - http://apache.cs.uu.nl/ - http://apache.cs.utah.edu/ + "https://www-eu.apache.org/dist/" + "https://www-us.apache.org/dist/" + "http://www.eu.apache.org/dist/" + "ftp://ftp.fu-berlin.de/unix/www/apache/" + "http://ftp.tudelft.nl/apache/" + "http://mirror.cc.columbia.edu/pub/software/apache/" + "https://www.apache.org/dist/" + "https://archive.apache.org/dist/" # fallback for old releases + "ftp://ftp.funet.fi/pub/mirrors/apache.org/" + "http://apache.cs.uu.nl/" + "http://apache.cs.utah.edu/" ]; postgresql = [ - http://ftp.postgresql.org/pub/ - ftp://ftp.postgresql.org/pub/ - ftp://ftp-archives.postgresql.org/pub/ + "http://ftp.postgresql.org/pub/" + "ftp://ftp.postgresql.org/pub/" + "ftp://ftp-archives.postgresql.org/pub/" ]; metalab = [ - ftp://mirrors.kernel.org/metalab/ - ftp://ftp.gwdg.de/pub/linux/metalab/ - ftp://ftp.xemacs.org/sites/metalab.unc.edu/ + "ftp://mirrors.kernel.org/metalab/" + "ftp://ftp.gwdg.de/pub/linux/metalab/" + "ftp://ftp.xemacs.org/sites/metalab.unc.edu/" ]; # Bioconductor mirrors (from http://bioconductor.org/about/mirrors) @@ -323,118 +323,118 @@ # http://bioconductor.fmrp.usp.br/ # http://mirror.aarnet.edu.au/pub/bioconductor/ # http://watson.nci.nih.gov/bioc_mirror/ - http://bioconductor.jp/packages/ - http://bioconductor.statistik.tu-dortmund.de/packages/ - http://mirrors.ebi.ac.uk/bioconductor/packages/ - http://mirrors.ustc.edu.cn/bioc/ + "http://bioconductor.jp/packages/" + "http://bioconductor.statistik.tu-dortmund.de/packages/" + "http://mirrors.ebi.ac.uk/bioconductor/packages/" + "http://mirrors.ustc.edu.cn/bioc/" ]; # Hackage mirrors hackage = [ - http://hackage.haskell.org/package/ - http://hdiff.luite.com/packages/archive/package/ - http://hackage.fpcomplete.com/package/ - http://objects-us-east-1.dream.io/hackage-mirror/package/ + "http://hackage.haskell.org/package/" + "http://hdiff.luite.com/packages/archive/package/" + "http://hackage.fpcomplete.com/package/" + "http://objects-us-east-1.dream.io/hackage-mirror/package/" ]; # Roy marples mirrors roy = [ - http://roy.marples.name/downloads/ - http://roy.aydogan.net/ - http://cflags.cc/roy/ + "http://roy.marples.name/downloads/" + "http://roy.aydogan.net/" + "http://cflags.cc/roy/" ]; # Sage mirrors (http://www.sagemath.org/mirrors.html) sageupstream = [ # Africa - http://sagemath.polytechnic.edu.na/spkg/upstream/ - ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/ - http://sagemath.mirror.ac.za/spkg/upstream/ - https://ftp.leg.uct.ac.za/pub/packages/sage/spkg/upstream/ - http://mirror.ufs.ac.za/sagemath/spkg/upstream/ + "http://sagemath.polytechnic.edu.na/spkg/upstream/" + "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/" + "http://sagemath.mirror.ac.za/spkg/upstream/" + "https://ftp.leg.uct.ac.za/pub/packages/sage/spkg/upstream/" + "http://mirror.ufs.ac.za/sagemath/spkg/upstream/" # America, North - http://mirrors-usa.go-parts.com/sage/sagemath/spkg/upstream/ - http://mirrors.mit.edu/sage/spkg/upstream/ - http://www.cecm.sfu.ca/sage/spkg/upstream/ - http://files.sagemath.org/spkg/upstream/ - http://mirror.clibre.uqam.ca/sage/spkg/upstream/ - https://mirrors.xmission.com/sage/spkg/upstream/ + "http://mirrors-usa.go-parts.com/sage/sagemath/spkg/upstream/" + "http://mirrors.mit.edu/sage/spkg/upstream/" + "http://www.cecm.sfu.ca/sage/spkg/upstream/" + "http://files.sagemath.org/spkg/upstream/" + "http://mirror.clibre.uqam.ca/sage/spkg/upstream/" + "https://mirrors.xmission.com/sage/spkg/upstream/" # America, South - http://sagemath.c3sl.ufpr.br/spkg/upstream/ - http://linorg.usp.br/sage/spkg/upstream + "http://sagemath.c3sl.ufpr.br/spkg/upstream/" + "http://linorg.usp.br/sage/spkg/upstream" # Asia - http://sage.asis.io/spkg/upstream/ - http://mirror.hust.edu.cn/sagemath/spkg/upstream/ - https://ftp.iitm.ac.in/sage/spkg/upstream/ - http://ftp.kaist.ac.kr/sage/spkg/upstream/ - http://ftp.riken.jp/sagemath/spkg/upstream/ - https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/ - https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/ - http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/ - http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/ - https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/ + "http://sage.asis.io/spkg/upstream/" + "http://mirror.hust.edu.cn/sagemath/spkg/upstream/" + "https://ftp.iitm.ac.in/sage/spkg/upstream/" + "http://ftp.kaist.ac.kr/sage/spkg/upstream/" + "http://ftp.riken.jp/sagemath/spkg/upstream/" + "https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/" + "https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/" + "http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/" + "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/" + "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/" # Australia - http://echidna.maths.usyd.edu.au/sage/spkg/upstream/ + "http://echidna.maths.usyd.edu.au/sage/spkg/upstream/" # Europe - http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/ - http://sunsite.rediris.es/mirror/sagemath/spkg/upstream/ - http://mirror.switch.ch/mirror/sagemath/spkg/upstream/ - http://mirrors.fe.up.pt/pub/sage/spkg/upstream/ - http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/ - http://ftp.ntua.gr/pub/sagemath/spkg/upstream/ + "http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/" + "http://sunsite.rediris.es/mirror/sagemath/spkg/upstream/" + "http://mirror.switch.ch/mirror/sagemath/spkg/upstream/" + "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/" + "http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/" + "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/" ]; # MySQL mirrors mysql = [ - http://cdn.mysql.com/Downloads/ + "http://cdn.mysql.com/Downloads/" ]; # OpenBSD mirrors openbsd = [ - http://ftp.openbsd.org/pub/OpenBSD/ - ftp://ftp.nluug.nl/pub/OpenBSD/ - ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/ - ftp://ftp.halifax.rwth-aachen.de/pub/OpenBSD/ - ftp://mirror.switch.ch/pub/OpenBSD/ + "http://ftp.openbsd.org/pub/OpenBSD/" + "ftp://ftp.nluug.nl/pub/OpenBSD/" + "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/" + "ftp://ftp.halifax.rwth-aachen.de/pub/OpenBSD/" + "ftp://mirror.switch.ch/pub/OpenBSD/" ]; # Steam Runtime mirrors steamrt = [ - http://repo.steampowered.com/steamrt/ - https://public.abbradar.moe/steamrt/ + "http://repo.steampowered.com/steamrt/" + "https://public.abbradar.moe/steamrt/" ]; # Python PyPI mirrors pypi = [ - https://files.pythonhosted.org/packages/source/ + "https://files.pythonhosted.org/packages/source/" # pypi.io is a more semantic link, but atm it’s referencing # files.pythonhosted.org over two redirects - https://pypi.io/packages/source/ + "https://pypi.io/packages/source/" ]; # Mozilla projects. mozilla = [ - http://download.cdn.mozilla.net/pub/mozilla.org/ - https://archive.mozilla.org/pub/ + "http://download.cdn.mozilla.net/pub/mozilla.org/" + "https://archive.mozilla.org/pub/" ]; # Maven Central maven = [ - https://repo1.maven.org/maven2/ - https://central.maven.org/maven2/ + "https://repo1.maven.org/maven2/" + "https://central.maven.org/maven2/" ]; # Alsa Project alsa = [ - https://www.alsa-project.org/files/pub/ - ftp://ftp.alsa-project.org/pub/ - http://alsa.cybermirror.org/ - http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/ - http://alsa.mirror.fr/ + "https://www.alsa-project.org/files/pub/" + "ftp://ftp.alsa-project.org/pub/" + "http://alsa.cybermirror.org/" + "http://www.mirrorservice.org/sites/ftp.alsa-project.org/pub/" + "http://alsa.mirror.fr/" ]; } diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix index 67b82fd66db..8355a5ad29b 100644 --- a/pkgs/build-support/make-desktopitem/default.nix +++ b/pkgs/build-support/make-desktopitem/default.nix @@ -1,4 +1,5 @@ -{ lib, runCommandLocal }: +{ lib, runCommandLocal, desktop-file-utils }: + { name , type ? "Application" , exec @@ -8,9 +9,10 @@ , desktopName , genericName ? null , mimeType ? null -, categories ? "Application;Other;" +, categories ? null , startupNotify ? null , extraEntries ? null +, fileValidation ? true # whether to validate resulting desktop file. }: let @@ -18,6 +20,7 @@ let {k="Comment"; v=comment;} {k="GenericName"; v=genericName;} {k="MimeType"; v=mimeType;} + {k="Categories"; v=categories;} {k="StartupNotify"; v=startupNotify;}]; valueNotNull = {k, v}: v != null; @@ -28,16 +31,20 @@ let in runCommandLocal "${name}.desktop" {} '' - mkdir -p $out/share/applications - cat > $out/share/applications/${name}.desktop <<EOF + mkdir -p "$out/share/applications" + cat > "$out/share/applications/${name}.desktop" <<EOF [Desktop Entry] Type=${type} Exec=${exec} Terminal=${terminal} Name=${desktopName} - Categories=${categories} ${optionalEntriesString} ${if extraEntries == null then ''EOF'' else '' ${extraEntries} EOF''} + + ${lib.optionalString fileValidation '' + echo "Running desktop-file validation" + ${desktop-file-utils}/bin/desktop-file-validate "$out/share/applications/${name}.desktop" + ''} '' diff --git a/pkgs/build-support/release/binary-tarball.nix b/pkgs/build-support/release/binary-tarball.nix index dad65a0e7eb..168343c8082 100644 --- a/pkgs/build-support/release/binary-tarball.nix +++ b/pkgs/build-support/release/binary-tarball.nix @@ -51,29 +51,24 @@ stdenv.mkDerivation ( configureFlags="--prefix=$prefix $configureFlags" dontAddPrefix=1 prefix=$TMPDIR/inst$prefix - ''; # */ - + ''; doDist = true; - distPhase = - '' - mkdir -p $out/tarballs - tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst . - ''; - - - finalPhase = - '' - for i in $out/tarballs/*; do - echo "file binary-dist $i" >> $out/nix-support/hydra-build-products - done + distPhase = '' + mkdir -p $out/tarballs + tar cvfj $out/tarballs/''${releaseName:-binary-dist}.tar.bz2 -C $TMPDIR/inst . + ''; - # Propagate the release name of the source tarball. This is - # to get nice package names in channels. - test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name) - ''; + finalPhase = '' + for i in $out/tarballs/*; do + echo "file binary-dist $i" >> $out/nix-support/hydra-build-products + done + # Propagate the release name of the source tarball. This is + # to get nice package names in channels. + test -n "$releaseName" && (echo "$releaseName" >> $out/nix-support/hydra-release-name) + ''; meta = (if args ? meta then args.meta else {}) // { description = "Build of a generic binary distribution"; diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix index 354d929c9b6..dfa896a86a6 100644 --- a/pkgs/build-support/release/debian-build.nix +++ b/pkgs/build-support/release/debian-build.nix @@ -88,7 +88,7 @@ vmTools.runInLinuxImage (stdenv.mkDerivation ( done eval "$postInstall" - ''; # */ + ''; meta = (if args ? meta then args.meta else {}) // { description = "Deb package for ${diskImage.fullName}"; diff --git a/pkgs/build-support/release/default.nix b/pkgs/build-support/release/default.nix index 5e3eb751b81..6b9aa9a8c4a 100644 --- a/pkgs/build-support/release/default.nix +++ b/pkgs/build-support/release/default.nix @@ -1,4 +1,4 @@ -{pkgs}: +{ pkgs }: with pkgs; @@ -77,7 +77,7 @@ rec { its contituents. Channel jobs are a special type of jobs that are listed in the channel tab of Hydra and that can be suscribed. A tarball of the src attribute is distributed via the channel. - + - constituents: a list of derivations on which the channel success depends. - name: the channel name that will be used in the hydra interface. - src: should point to the root folder of the nix-expressions used by the @@ -88,7 +88,7 @@ rec { name = "my-channel"; src = ./.; }; - + */ channel = { name, src, constituents ? [], meta ? {}, isNixOS ? true, ... }@args: diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index 71eb63b850d..eaa47647287 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -11,12 +11,12 @@ , ... } @ args : -let +let mvnFlags = "-Dmaven.repo.local=$M2_REPO ${if doTest then "" else "-Dmaven.test.skip.exec=true"} ${extraMvnFlags}"; in stdenv.mkDerivation ( { - inherit name src; + inherit name src; phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase"; setupPhase = '' @@ -32,15 +32,15 @@ stdenv.mkDerivation ( { mvnCompile = '' mvn compile ${mvnFlags} - ''; + ''; mvnTestCompile = '' mvn test-compile ${mvnFlags} - ''; + ''; mvnTestJar = '' mvn jar:test-jar ${mvnFlags} - ''; + ''; mvnTest = '' mvn test ${mvnFlags} @@ -53,21 +53,21 @@ stdenv.mkDerivation ( { mvn surefire-report:report-only echo "report coverage $out/site/surefire-report.html" >> $out/nix-support/hydra-build-products fi - ''; + ''; mvnJavadoc = '' mvn javadoc:javadoc ${mvnFlags} echo "report javadoc $out/site/apidocs" >> $out/nix-support/hydra-build-products - ''; + ''; mvnCheckstyle = '' mvn checkstyle:checkstyle ${mvnFlags} echo "report checkstyle $out/site/checkstyle.html" >> $out/nix-support/hydra-build-products - ''; + ''; mvnJar = '' mvn jar:jar ${mvnFlags} - ''; + ''; mvnAssembly = '' mvn assembly:assembly -Dmaven.test.skip=true ${mvnFlags} @@ -80,13 +80,13 @@ stdenv.mkDerivation ( { releaseName=$(basename $zip .zip) releaseName="$releaseName-r${toString src.rev or "0"}" cp $zip $out/release/$releaseName.zip - + echo "$releaseName" > $out/nix-support/hydra-release-name ${if doRelease then '' echo "file zip $out/release/$releaseName.zip" >> $out/nix-support/hydra-build-products '' else ""} - ''; + ''; finalPhase = '' if [ -d target/site ] ; then @@ -94,5 +94,5 @@ stdenv.mkDerivation ( { echo "report site $out/site" >> $out/nix-support/hydra-build-products fi ''; -} // args +} // args ) diff --git a/pkgs/build-support/release/rpm-build.nix b/pkgs/build-support/release/rpm-build.nix index 194bbc60534..47c01f2e66b 100644 --- a/pkgs/build-support/release/rpm-build.nix +++ b/pkgs/build-support/release/rpm-build.nix @@ -44,7 +44,7 @@ vmTools.buildRPM ( for rpmdir in $extraRPMs ; do echo "file rpm-extra $(ls $rpmdir/rpms/*/*.rpm | grep -v 'src\.rpm' | sort | head -1)" >> $out/nix-support/hydra-build-products done - ''; # */ + ''; meta = (if args ? meta then args.meta else {}) // { description = "RPM package for ${diskImage.fullName}"; diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 61c39c6b21c..ed810053709 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -172,7 +172,7 @@ in '' set +e EXTRA_BUILD=$(sed -n "s/^cargo:rustc-flags=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) EXTRA_FEATURES=$(sed -n "s/^cargo:rustc-cfg=\(.*\)/--cfg \1/p" target/build/${crateName}.opt | tr '\n' ' ') - EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) + EXTRA_LINK=$(sed -n "s/^cargo:rustc-link-lib=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ') EXTRA_LINK_SEARCH=$(sed -n "s/^cargo:rustc-link-search=\(.*\)/\1/p" target/build/${crateName}.opt | tr '\n' ' ' | sort -u) for env in $(sed -n "s/^cargo:rustc-env=\(.*\)/\1/p" target/build/${crateName}.opt); do diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 70d48bef8c9..a175ba9d7f6 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (rec { ); crateFeatures = lib.optionalString (crate ? features) - (lib.concatMapStringsSep " " (f: "--cfg feature=\\\"${f}\\\"") (crate.features ++ features)); + (lib.concatMapStringsSep " " (f: ''--cfg feature=\"${f}\"'') (crate.features ++ features)); libName = if crate ? libName then crate.libName else crate.crateName; libPath = if crate ? libPath then crate.libPath else ""; diff --git a/pkgs/build-support/rust/build-rust-crate/install-crate.nix b/pkgs/build-support/rust/build-rust-crate/install-crate.nix index 5ba7b69bedc..f4a4dcdb0d9 100644 --- a/pkgs/build-support/rust/build-rust-crate/install-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/install-crate.nix @@ -14,7 +14,7 @@ if !buildTests then '' fi if [[ "$(ls -A target/lib)" ]]; then mkdir -p $lib/lib - cp target/lib/* $lib/lib #*/ + cp -r target/lib/* $lib/lib #*/ for library in $lib/lib/*.so $lib/lib/*.dylib; do #*/ ln -s $library $(echo $library | sed -e "s/-${metadata}//") done @@ -26,7 +26,7 @@ if !buildTests then '' if [[ -d target/bin ]]; then if [[ "$(ls -A target/bin)" ]]; then mkdir -p $out/bin - cp -P target/bin/* $out/bin # */ + cp -rP target/bin/* $out/bin # */ fi fi runHook postInstall diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 5843ee98b0d..3bf1992cecd 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -14,7 +14,6 @@ build_lib() { --crate-name $CRATE_NAME \ $lib_src \ --out-dir target/lib \ - --emit=dep-info,link \ -L dependency=target/deps \ --cap-lints allow \ $LIB_RUSTC_OPTS \ @@ -45,7 +44,6 @@ build_bin() { --crate-type bin \ $BIN_RUSTC_OPTS \ --out-dir target/bin \ - --emit=dep-info,link \ -L dependency=target/deps \ $LINK \ $EXTRA_LIB \ @@ -105,11 +103,6 @@ setup_link_paths() { done if [[ -e target/link ]]; then - sort -u target/link.final > target/link.final.sorted - mv target/link.final.sorted target/link.final - sort -u target/link > target/link.sorted - mv target/link.sorted target/link - tr '\n' ' ' < target/link > target/link_ LINK=$(cat target/link_) fi diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index f24583c41fc..fba938f6237 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -1,4 +1,14 @@ -{ lib, buildRustCrate, runCommand, writeTextFile, symlinkJoin, callPackage, releaseTools }: +{ lib +, buildRustCrate +, callPackage +, releaseTools +, runCommand +, runCommandCC +, stdenv +, symlinkJoin +, writeTextFile +}: + let mkCrate = args: let p = { @@ -94,6 +104,58 @@ let '' ); + /* Returns a derivation that asserts that the crate specified by `crateArgs` + has the specified files as output. + + `name` is used as part of the derivation name that performs the checking. + + `crateArgs` is passed to `mkCrate` to build the crate with `buildRustCrate`. + + `expectedFiles` contains a list of expected file paths in the output. E.g. + `[ "./bin/my_binary" ]`. + + `output` specifies the name of the output to use. By default, the default + output is used but e.g. `output = "lib";` will cause the lib output + to be checked instead. You do not need to specify any directories. + */ + assertOutputs = { name, crateArgs, expectedFiles, output? null }: + assert (builtins.isString name); + assert (builtins.isAttrs crateArgs); + assert (builtins.isList expectedFiles); + + let + crate = mkCrate (builtins.removeAttrs crateArgs ["expectedTestOutput"]); + crateOutput = if output == null then crate else crate."${output}"; + expectedFilesFile = writeTextFile { + name = "expected-files-${name}"; + text = + let sorted = builtins.sort (a: b: a<b) expectedFiles; + concatenated = builtins.concatStringsSep "\n" sorted; + in "${concatenated}\n"; + }; + in + runCommand "assert-outputs-${name}" { + } '' + local actualFiles=$(mktemp) + + cd "${crateOutput}" + find . -type f | sort >$actualFiles + diff -q ${expectedFilesFile} $actualFiles >/dev/null || { + echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2 + echo === Got: + sed -e 's/^/ /' $actualFiles + echo === Expected: + sed -e 's/^/ /' ${expectedFilesFile} + echo === Diff: + diff -u ${expectedFilesFile} $actualFiles |\ + tail -n +3 |\ + sed -e 's/^/ /' + exit 1 + } + touch $out + '' + ; + in rec { tests = let @@ -258,6 +320,64 @@ let ]; }; }; + # Regression test for https://github.com/NixOS/nixpkgs/pull/83379 + # link flag order should be preserved + linkOrder = { + src = symlinkJoin { + name = "buildrs-out-dir-overlay"; + paths = [ + (mkFile "build.rs" '' + fn main() { + // in the other order, linkage will fail + println!("cargo:rustc-link-lib=b"); + println!("cargo:rustc-link-lib=a"); + } + '') + (mkFile "src/main.rs" '' + extern "C" { + fn hello_world(); + } + fn main() { + unsafe { + hello_world(); + } + } + '') + ]; + }; + buildInputs = let + compile = name: text: let + src = writeTextFile { + name = "${name}-src.c"; + inherit text; + }; + in runCommandCC name {} '' + mkdir -p $out/lib + # Note: On darwin (which defaults to clang) we have to add + # `-undefined dynamic_lookup` as otherwise the compilation fails. + cc -shared \ + ${lib.optionalString stdenv.isDarwin "-undefined dynamic_lookup"} \ + -o $out/lib/${name}${stdenv.hostPlatform.extensions.sharedLibrary} ${src} + ''; + b = compile "libb" '' + #include <stdio.h> + + void hello(); + + void hello_world() { + hello(); + printf(" world!\n"); + } + ''; + a = compile "liba" '' + #include <stdio.h> + + void hello() { + printf("hello"); + } + ''; + in [ a b ]; + }; rustCargoTomlInSubDir = { # The "workspace_member" can be set to the sub directory with the crate to build. # By default ".", meaning the top level directory is assumed. @@ -294,7 +414,80 @@ let }; }; brotliCrates = (callPackage ./brotli-crates.nix {}); - in lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases // { + tests = lib.mapAttrs (key: value: mkTest (value // lib.optionalAttrs (!value?crateName) { crateName = key; })) cases; + in tests // rec { + + crateBinWithPathOutputs = assertOutputs { + name="crateBinWithPath"; + crateArgs = { + crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }]; + src = mkBin "src/foobar.rs"; + }; + expectedFiles = [ + "./bin/test_binary1" + ]; + }; + + crateBinWithPathOutputsDebug = assertOutputs { + name="crateBinWithPath"; + crateArgs = { + release = false; + crateBin = [{ name = "test_binary1"; path = "src/foobar.rs"; }]; + src = mkBin "src/foobar.rs"; + }; + expectedFiles = [ + "./bin/test_binary1" + ] ++ lib.optionals stdenv.isDarwin [ + # On Darwin, the debug symbols are in a seperate directory. + "./bin/test_binary1.dSYM/Contents/Info.plist" + "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1" + ]; + }; + + crateBinNoPath1Outputs = assertOutputs { + name="crateBinNoPath1"; + crateArgs = { + crateBin = [{ name = "my-binary2"; }]; + src = mkBin "src/my_binary2.rs"; + }; + expectedFiles = [ + "./bin/my-binary2" + ]; + }; + + crateLibOutputs = assertOutputs { + name="crateLib"; + output="lib"; + crateArgs = { + libName = "test_lib"; + type = [ "rlib" ]; + libPath = "src/lib.rs"; + src = mkLib "src/lib.rs"; + }; + expectedFiles = [ + "./nix-support/propagated-build-inputs" + "./lib/libtest_lib-042a1fdbef.rlib" + "./lib/link" + ]; + }; + + crateLibOutputsDebug = assertOutputs { + name="crateLib"; + output="lib"; + crateArgs = { + release = false; + libName = "test_lib"; + type = [ "rlib" ]; + libPath = "src/lib.rs"; + src = mkLib "src/lib.rs"; + }; + expectedFiles = [ + "./nix-support/propagated-build-inputs" + "./lib/libtest_lib-042a1fdbef.rlib" + "./lib/link" + ]; + }; + brotliTest = let pkg = brotliCrates.brotli_2_5_0 {}; in runCommand "run-brotli-test-cmd" { diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 7cfd03a4e26..93770d71a10 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -181,6 +181,8 @@ stdenv.mkDerivation (args // { doCheck = args.doCheck or true; + strictDeps = true; + inherit releaseDir; installPhase = args.installPhase or '' diff --git a/pkgs/build-support/setup-hooks/patch-shebangs.sh b/pkgs/build-support/setup-hooks/patch-shebangs.sh index 29fed7ad794..b48b0c50f57 100644 --- a/pkgs/build-support/setup-hooks/patch-shebangs.sh +++ b/pkgs/build-support/setup-hooks/patch-shebangs.sh @@ -42,7 +42,7 @@ patchShebangs() { local newInterpreterLine if [ $# -eq 0 ]; then - echo "No arguments supplied to patchShebangs" >0 + echo "No arguments supplied to patchShebangs" >&2 return 0 fi @@ -66,7 +66,7 @@ patchShebangs() { # - options: something starting with a '-' # - environment variables: foo=bar if $(echo "$arg0" | grep -q -- "^-.*\|.*=.*"); then - echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >0 + echo "$f: unsupported interpreter directive \"$oldInterpreterLine\" (set dontPatchShebangs=1 and handle shebang patching yourself)" >&2 exit 1 fi diff --git a/pkgs/build-support/skaware/build-skaware-package.nix b/pkgs/build-support/skaware/build-skaware-package.nix index 9e4456a3a15..e6e2e35789b 100644 --- a/pkgs/build-support/skaware/build-skaware-package.nix +++ b/pkgs/build-support/skaware/build-skaware-package.nix @@ -18,15 +18,12 @@ in { , configureFlags # mostly for moving and deleting files from the build directory # : lines -, postInstall ? "" - # : lines -, postFixup ? "" +, postInstall # : list Maintainer , maintainers ? [] - # : attrs -, meta ? {} -, ... -} @ args: + + +}: let @@ -53,17 +50,24 @@ let "README.*" ]; -in stdenv.mkDerivation ({ +in stdenv.mkDerivation { + inherit pname version; + src = fetchurl { url = "https://skarnet.org/software/${pname}/${pname}-${version}.tar.gz"; inherit sha256; }; + inherit outputs; + dontDisableStatic = true; enableParallelBuilding = true; configureFlags = configureFlags ++ [ "--enable-absolute-paths" + # We assume every nix-based cross target has urandom. + # This might not hold for e.g. BSD. + "--with-sysdep-devurandom=yes" (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") @@ -83,11 +87,13 @@ in stdenv.mkDerivation ({ noiseFiles = commonNoiseFiles; docFiles = commonMetaFiles; }} $doc/share/doc/${pname} - '' + postInstall; + + ${postInstall} + ''; postFixup = '' ${cleanPackaging.checkForRemainingFiles} - '' + postFixup; + ''; meta = { homepage = "https://skarnet.org/software/${pname}/"; @@ -95,9 +101,6 @@ in stdenv.mkDerivation ({ license = stdenv.lib.licenses.isc; maintainers = with lib.maintainers; [ pmahoney Profpatsch ] ++ maintainers; - } // meta; + }; -} // builtins.removeAttrs args [ - "sha256" "configureFlags" "postInstall" "postFixup" - "meta" "description" "platforms" "maintainers" -]) +} diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 488c7f2ce2c..f86e3371384 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -831,15 +831,15 @@ rec { fullName = "Ubuntu 12.04 Precise (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2; + url = "mirror://ubuntu/dists/precise/main/binary-i386/Packages.bz2"; sha256 = "18ns9h4qhvjfcip9z55grzi371racxavgqkp6b5kfkdq2wwwax2d"; }) (fetchurl { - url = mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2; + url = "mirror://ubuntu/dists/precise/universe/binary-i386/Packages.bz2"; sha256 = "085lkzbnzkc74kfdmwdc32sfqyfz8dr0rbiifk8kx9jih3xjw2jk"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" ]; }; @@ -848,15 +848,15 @@ rec { fullName = "Ubuntu 12.04 Precise (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2; + url = "mirror://ubuntu/dists/precise/main/binary-amd64/Packages.bz2"; sha256 = "1aabpn0hdih6cbabyn87yvhccqj44q9k03mqmjsb920iqlckl3fc"; }) (fetchurl { - url = mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2; + url = "mirror://ubuntu/dists/precise/universe/binary-amd64/Packages.bz2"; sha256 = "0x4hz5aplximgb7gnpvrhkw8m7a40s80rkm5b8hil0afblwlg4vr"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" ]; }; @@ -865,15 +865,15 @@ rec { fullName = "Ubuntu 14.04 Trusty (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2; + url = "mirror://ubuntu/dists/trusty/main/binary-i386/Packages.bz2"; sha256 = "1d5y3v3v079gdq45hc07ja0bjlmzqfwdwwlq0brwxi8m75k3iz7x"; }) (fetchurl { - url = mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2; + url = "mirror://ubuntu/dists/trusty/universe/binary-i386/Packages.bz2"; sha256 = "03x9w92by320rfklrqhcl3qpwmnxds9c8ijl5zhcb21d6dcz5z1a"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -882,15 +882,15 @@ rec { fullName = "Ubuntu 14.04 Trusty (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2; + url = "mirror://ubuntu/dists/trusty/main/binary-amd64/Packages.bz2"; sha256 = "1hhzbyqfr5i0swahwnl5gfp5l9p9hspywb1vpihr3b74p1z935bh"; }) (fetchurl { - url = mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2; + url = "mirror://ubuntu/dists/trusty/universe/binary-amd64/Packages.bz2"; sha256 = "04560ba8s4z4v5iawknagrkn9q1nzvpn081ycmqvhh73p3p3g1jm"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -899,15 +899,15 @@ rec { fullName = "Ubuntu 16.04 Xenial (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/xenial/main/binary-i386/Packages.xz"; sha256 = "13r75sp4slqy8w32y5dnr7pp7p3cfvavyr1g7gwnlkyrq4zx4ahy"; }) (fetchurl { - url = mirror://ubuntu/dists/xenial/universe/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/xenial/universe/binary-i386/Packages.xz"; sha256 = "14fid1rqm3sc0wlygcvn0yx5aljf51c2jpd4x0zxij4019316hsh"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -916,15 +916,15 @@ rec { fullName = "Ubuntu 16.04 Xenial (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/xenial/main/binary-amd64/Packages.xz"; sha256 = "110qnkhjkkwm316fbig3aivm2595ydz6zskc4ld5cr8ngcrqm1bn"; }) (fetchurl { - url = mirror://ubuntu/dists/xenial/universe/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/xenial/universe/binary-amd64/Packages.xz"; sha256 = "0mm7gj491yi6q4v0n4qkbsm94s59bvqir6fk60j73w7y4la8rg68"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -933,15 +933,15 @@ rec { fullName = "Ubuntu 17.10 Artful (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/artful/main/binary-i386/Packages.xz"; sha256 = "18yrj4kqdzm39q0527m97h5ing58hkm9yq9iyj636zh2rclym3c8"; }) (fetchurl { - url = mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/artful/universe/binary-i386/Packages.xz"; sha256 = "1v0njw2w80xfmxi7by76cs8hyxlla5h3gqajlpdw5srjgx2qrm2g"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -950,15 +950,15 @@ rec { fullName = "Ubuntu 17.10 Artful (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/artful/main/binary-amd64/Packages.xz"; sha256 = "104g57j1l3vi8wb5f7rgjvjhf82ccs0vwhc59jfc4ynd51z7fqjk"; }) (fetchurl { - url = mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/artful/universe/binary-amd64/Packages.xz"; sha256 = "1qzs95wfy9inaskfx9cf1l5yd3aaqwzy72zzi9xyvkxi75k5gcn4"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -967,15 +967,15 @@ rec { fullName = "Ubuntu 18.04 Bionic (i386)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/bionic/main/binary-i386/Packages.xz"; sha256 = "0f0v4131kwf7m7f8j3288rlqdxk1k3vqy74b7fcfd6jz9j8d840i"; }) (fetchurl { - url = mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz; + url = "mirror://ubuntu/dists/bionic/universe/binary-i386/Packages.xz"; sha256 = "1v75c0dqr0wp0dqd4hnci92qqs4hll8frqdbpswadgxm5chn91bw"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -984,15 +984,15 @@ rec { fullName = "Ubuntu 18.04 Bionic (amd64)"; packagesLists = [ (fetchurl { - url = mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/bionic/main/binary-amd64/Packages.xz"; sha256 = "1ls81bjyvmfz6i919kszl7xks1ibrh1xqhsk6698ackndkm0wp39"; }) (fetchurl { - url = mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz; + url = "mirror://ubuntu/dists/bionic/universe/binary-amd64/Packages.xz"; sha256 = "1832nqpn4ap95b3sj870xqayrza9in4kih9jkmjax27pq6x15v1r"; }) ]; - urlPrefix = mirror://ubuntu; + urlPrefix = "mirror://ubuntu"; packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; @@ -1000,10 +1000,10 @@ rec { name = "debian-8.11-jessie-i386"; fullName = "Debian 8.11 Jessie (i386)"; packagesList = fetchurl { - url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; + url = "mirror://debian/dists/jessie/main/binary-i386/Packages.xz"; sha256 = "0adblarhx50yga900il6m25ng0csa81i3wid1dxxmydbdmri7v7d"; }; - urlPrefix = mirror://debian; + urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; @@ -1011,10 +1011,10 @@ rec { name = "debian-8.11-jessie-amd64"; fullName = "Debian 8.11 Jessie (amd64)"; packagesList = fetchurl { - url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; + url = "mirror://debian/dists/jessie/main/binary-amd64/Packages.xz"; sha256 = "09y1mv4kqllhxpk1ibjsyl5jig5bp0qxw6pp4sn56rglrpygmn5x"; }; - urlPrefix = mirror://debian; + urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; @@ -1022,10 +1022,10 @@ rec { name = "debian-9.8-stretch-i386"; fullName = "Debian 9.8 Stretch (i386)"; packagesList = fetchurl { - url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-i386/Packages.xz; - sha256 = "1dr3skl35iyj85qlc33lq4whippbqf327vnbcyfqqrv6h86k68mw"; + url = "http://snapshot.debian.org/archive/debian/20200301T030401Z/dists/stretch/main/binary-i386/Packages.xz"; + sha256 = "1jglr1d1jys3xddp8f7w9j05db39fah8xy4gfkpqbd1b5d2caslz"; }; - urlPrefix = mirror://debian; + urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; @@ -1033,10 +1033,10 @@ rec { name = "debian-9.8-stretch-amd64"; fullName = "Debian 9.8 Stretch (amd64)"; packagesList = fetchurl { - url = http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-amd64/Packages.xz; + url = "http://snapshot.debian.org/archive/debian/20190503T090946Z/dists/stretch/main/binary-amd64/Packages.xz"; sha256 = "01q00nl47p12n7wx0xclx59wf3zlkzrgj3zxpshyvb91xdnw5sh6"; }; - urlPrefix = mirror://debian; + urlPrefix = "mirror://debian"; packages = commonDebianPackages; }; diff --git a/pkgs/data/documentation/bgnet/default.nix b/pkgs/data/documentation/bgnet/default.nix index 7297d18df27..f5ac07f1b7f 100644 --- a/pkgs/data/documentation/bgnet/default.nix +++ b/pkgs/data/documentation/bgnet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "3.0.21"; src = fetchurl { - url = https://beej.us/guide/bgnet/bgnet.tgz; + url = "https://beej.us/guide/bgnet/bgnet.tgz"; sha256 = "00ggr5prc5i3w9gaaw2sadfq6haq7lmh0vdilaxx8xz9z5znxvyv"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Beej’s Guide to Network Programming"; - homepage = https://beej.us/guide/bgnet/; + homepage = "https://beej.us/guide/bgnet/"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ Profpatsch ]; diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index a47ec9ea790..07381a13e80 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.34.1"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11m9fv8k2hynrcgah4jvbm6yczg0s1ly302mipysbwpn6gbdkvf2"; + sha256 = "0vnwya5g7fg0jhdrg9drxnx83lhk8qa2nvcrmd1sdfanlz4qfhjf"; }; nativeBuildInputs = [ diff --git a/pkgs/data/documentation/man-pages-posix/default.nix b/pkgs/data/documentation/man-pages-posix/default.nix index b45edf7947b..8a76bcb2c44 100644 --- a/pkgs/data/documentation/man-pages-posix/default.nix +++ b/pkgs/data/documentation/man-pages-posix/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "POSIX man-pages (0p, 1p, 3p)"; - homepage = https://www.kernel.org/doc/man-pages/; + homepage = "https://www.kernel.org/doc/man-pages/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index c57526d307a..b557118ddc2 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux development manual pages"; - homepage = https://www.kernel.org/doc/man-pages/; - repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages; + homepage = "https://www.kernel.org/doc/man-pages/"; + repositories.git = "http://git.kernel.org/pub/scm/docs/man-pages/man-pages"; license = licenses.gpl2Plus; platforms = with platforms; unix; priority = 30; # if a package comes with its own man page, prefer it diff --git a/pkgs/data/documentation/mustache-spec/default.nix b/pkgs/data/documentation/mustache-spec/default.nix index b2a6eaa1535..ce611c192f6 100644 --- a/pkgs/data/documentation/mustache-spec/default.nix +++ b/pkgs/data/documentation/mustache-spec/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { For a list of implementations and tips, see ${homepage}. ''; - homepage = http://mustache.github.io/; + homepage = "http://mustache.github.io/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Profpatsch ]; platforms = lib.platforms.all; diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix index bd38389eb47..3443846c83c 100644 --- a/pkgs/data/documentation/rnrs/common.nix +++ b/pkgs/data/documentation/rnrs/common.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { Algorithmic Language Scheme. ''; - homepage = http://swiss.csail.mit.edu/~jaffer/Scheme; + homepage = "http://swiss.csail.mit.edu/~jaffer/Scheme"; broken = true; }; diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index b3b2b956de8..a2f9f005eb9 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "std-man-pages-4.4.0"; src = fetchurl { - url = mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2; + url = "mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2"; sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v"; }; diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 66f1a5033eb..de50f612861 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { files from cppreference and generates groff-formatted manual pages for Unix-based systems. The goal is to provide excellent formatting for easy readability."; - homepage = https://github.com/jeaye/stdman; + homepage = "https://github.com/jeaye/stdman"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.twey ]; diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 2566b162d65..7bfe918030e 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { Zeal is a simple offline API documentation browser inspired by Dash (macOS app), available for Linux and Windows. ''; - homepage = https://zealdocs.org/; + homepage = "https://zealdocs.org/"; license = licenses.gpl3; maintainers = with maintainers; [ skeidel peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index 1fffbd9dcb1..585ab6b4292 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -17,7 +17,7 @@ in fetchurl { meta = with lib; { description = "truetype monospaced typeface designed for X environments"; - homepage = https://b.agaric.net/page/agave; + homepage = "https://b.agaric.net/page/agave"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 0f20b9c46cf..700680a54b2 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "andagii-${version}"; - url = http://www.i18nguy.com/unicode/andagii.zip; + url = "http://www.i18nguy.com/unicode/andagii.zip"; curlOpts = "--user-agent 'Mozilla/5.0'"; postFetch = '' unzip $downloadedFile @@ -18,7 +18,7 @@ in fetchzip { # package; but I cannot find the original source, so use it on your # own risk Debian claims it is GPL - good enough for me. meta = with lib; { - homepage = http://www.i18nguy.com/unicode/unicode-font.html; + homepage = "http://www.i18nguy.com/unicode/unicode-font.html"; description = "Unicode Plane 1 Osmanya script font"; maintainers = with maintainers; [ raskin rycee ]; license = "unknown"; diff --git a/pkgs/data/fonts/andika/default.nix b/pkgs/data/fonts/andika/default.nix index e03a800b3ad..5fa2f1b2710 100644 --- a/pkgs/data/fonts/andika/default.nix +++ b/pkgs/data/fonts/andika/default.nix @@ -17,7 +17,7 @@ in sha256 = "1jy9vpcprpd1k48p20wh6jhyn909ibia8lr5i747p41l0s8a7lqy"; meta = with lib; { - homepage = https://software.sil.org/andika; + homepage = "https://software.sil.org/andika"; description = "A family designed especially for literacy use taking into account the needs of beginning readers"; longDescription = '' Andika is a sans serif, Unicode-compliant font designed especially for literacy use, taking into account the needs of beginning readers. The focus is on clear, easy-to-perceive letterforms that will not be readily confused with one another. diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix index 0b6340d1ba9..655c780129d 100644 --- a/pkgs/data/fonts/ankacoder/condensed.nix +++ b/pkgs/data/fonts/ankacoder/condensed.nix @@ -15,7 +15,7 @@ fetchzip { meta = with lib; { description = "Anka/Coder Condensed font"; - homepage = https://code.google.com/archive/p/anka-coder-fonts; + homepage = "https://code.google.com/archive/p/anka-coder-fonts"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index 3a57d08dbc2..fbf587c7c6c 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -15,7 +15,7 @@ fetchzip { meta = with lib; { description = "Anka/Coder fonts"; - homepage = https://code.google.com/archive/p/anka-coder-fonts; + homepage = "https://code.google.com/archive/p/anka-coder-fonts"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix index 4aeda64377e..0f8289fe18a 100644 --- a/pkgs/data/fonts/anonymous-pro/default.nix +++ b/pkgs/data/fonts/anonymous-pro/default.nix @@ -14,7 +14,7 @@ in fetchzip rec { sha256 = "05rgzag38qc77b31sm5i2vwwrxbrvwzfsqh3slv11skx36pz337f"; meta = with lib; { - homepage = https://www.marksimonson.com/fonts/view/anonymous-pro; + homepage = "https://www.marksimonson.com/fonts/view/anonymous-pro"; description = "TrueType font set intended for source code"; longDescription = '' Anonymous Pro (2009) is a family of four fixed-width fonts diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix index 1e52ea301af..714af585d25 100644 --- a/pkgs/data/fonts/arphic/default.nix +++ b/pkgs/data/fonts/arphic/default.nix @@ -20,7 +20,7 @@ in { meta = with lib; { description = "CJK Unicode font Kai style"; - homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; license = licenses.arphicpl; maintainers = [ maintainers.changlinli ]; @@ -45,7 +45,7 @@ in { meta = with lib; { description = "CJK Unicode font Ming style"; - homepage = https://www.freedesktop.org/wiki/Software/CJKUnifonts/; + homepage = "https://www.freedesktop.org/wiki/Software/CJKUnifonts/"; license = licenses.arphicpl; maintainers = [ maintainers.changlinli ]; diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index a87be94acd0..50f456373c6 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -14,7 +14,7 @@ fetchFromGitHub rec { meta = { description = "Aurulent Sans"; longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; - homepage = http://delubrum.org/; + homepage = "http://delubrum.org/"; maintainers = with lib.maintainers; [ deepfire ]; license = lib.licenses.ofl; platforms = lib.platforms.all; diff --git a/pkgs/data/fonts/b612/default.nix b/pkgs/data/fonts/b612/default.nix index 1c2d7f53bad..bf97ff30c6d 100644 --- a/pkgs/data/fonts/b612/default.nix +++ b/pkgs/data/fonts/b612/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0r3lana1q9w3siv8czb3p9rrb5d9svp628yfbvvmnj7qvjrmfsiq"; meta = with lib; { - homepage = http://b612-font.com/; + homepage = "http://b612-font.com/"; description = "Highly legible font family for use on aircraft cockpit screens"; longDescription = '' B612 is the result of a research project initiated by Airbus. The font diff --git a/pkgs/data/fonts/babelstone-han/default.nix b/pkgs/data/fonts/babelstone-han/default.nix index da2d67c084f..7f2898db9f1 100644 --- a/pkgs/data/fonts/babelstone-han/default.nix +++ b/pkgs/data/fonts/babelstone-han/default.nix @@ -6,7 +6,7 @@ in fetchzip { name = "babelstone-han-${version}"; # upstream download links are unversioned, so hash changes - url = https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip; + url = "https://web.archive.org/web/20200210125314/https://www.babelstone.co.uk/Fonts/Download/BabelStoneHan.zip"; postFetch = '' mkdir -p $out/share/fonts/truetype unzip $downloadedFile '*.ttf' -d $out/share/fonts/truetype @@ -15,7 +15,7 @@ in fetchzip { meta = with lib; { description = "Unicode CJK font with over 36000 Han characters"; - homepage = https://www.babelstone.co.uk/Fonts/Han.html; + homepage = "https://www.babelstone.co.uk/Fonts/Han.html"; license = licenses.free; platforms = platforms.all; diff --git a/pkgs/data/fonts/baekmuk-ttf/default.nix b/pkgs/data/fonts/baekmuk-ttf/default.nix index 583a7457e2d..92f7401b32d 100644 --- a/pkgs/data/fonts/baekmuk-ttf/default.nix +++ b/pkgs/data/fonts/baekmuk-ttf/default.nix @@ -13,7 +13,7 @@ fetchzip rec { meta = { description = "Korean font"; - homepage = http://kldp.net/projects/baekmuk/; + homepage = "http://kldp.net/projects/baekmuk/"; license = "BSD-like"; }; } diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index 70074a58d96..a8c01b41e67 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "bakoma-ttf"; - url = http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km; + url = "http://tarballs.nixos.org/sha256/1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; postFetch = '' tar xjvf $downloadedFile --strip-components=1 @@ -15,6 +15,6 @@ fetchzip { meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; - homepage = http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/; + homepage = "http://www.ctan.org/tex-archive/fonts/cm/ps-type1/bakoma/ttf/"; }; } diff --git a/pkgs/data/fonts/behdad-fonts/default.nix b/pkgs/data/fonts/behdad-fonts/default.nix index a0fcd5f7bbf..d5d0b2a3c1d 100644 --- a/pkgs/data/fonts/behdad-fonts/default.nix +++ b/pkgs/data/fonts/behdad-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0c57232462cv1jrfn0m2bl7jzcfkacirrdd2qimrc8iqhkz0ajfz"; meta = with lib; { - homepage = https://github.com/font-store/BehdadFont; + homepage = "https://github.com/font-store/BehdadFont"; description = "A Persian/Arabic Open Source Font"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix index 0a8168cdf9e..e68d429db2e 100644 --- a/pkgs/data/fonts/cabin/default.nix +++ b/pkgs/data/fonts/cabin/default.nix @@ -29,7 +29,7 @@ fetchFromGitHub rec { adjusted. The curved stem endings have a 10 degree angle. E and F have shorter center arms. M is splashed. ''; - homepage = http://www.impallari.com/cabin; + homepage = "http://www.impallari.com/cabin"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/caladea/default.nix b/pkgs/data/fonts/caladea/default.nix index b1f9312a7e9..14a8de1b0d9 100644 --- a/pkgs/data/fonts/caladea/default.nix +++ b/pkgs/data/fonts/caladea/default.nix @@ -18,7 +18,7 @@ in fetchzip { meta = with lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. - homepage = http://openfontlibrary.org/en/font/caladea; + homepage = "http://openfontlibrary.org/en/font/caladea"; description = "A serif font metric-compatible with Microsoft Cambria"; longDescription = '' Caladea is a free font that is metric-compatible with the diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix index 98175373ebd..3db1f672818 100644 --- a/pkgs/data/fonts/camingo-code/default.nix +++ b/pkgs/data/fonts/camingo-code/default.nix @@ -5,7 +5,7 @@ let in fetchzip rec { name = "camingo-code-${version}"; - url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip; + url = "https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip"; postFetch = '' unzip $downloadedFile install -m444 -Dt $out/share/fonts/truetype fonts/camingo-code/*.ttf @@ -14,7 +14,7 @@ in fetchzip rec { sha256 = "16iqjwwa7pnswvcc4w8nglkd0m0fz50qsz96i1kcpqip3nwwvw7y"; meta = with lib; { - homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/; + homepage = "https://www.myfonts.com/fonts/jan-fromm/camingo-code/"; description = "A monospaced typeface designed for source-code editors"; platforms = platforms.all; license = licenses.cc-by-nd-30; diff --git a/pkgs/data/fonts/carlito/default.nix b/pkgs/data/fonts/carlito/default.nix index 79913bb8398..1de2e9afc0f 100644 --- a/pkgs/data/fonts/carlito/default.nix +++ b/pkgs/data/fonts/carlito/default.nix @@ -20,7 +20,7 @@ in fetchzip { meta = with lib; { # This font doesn't appear to have any official web site but this # one provides some good information and samples. - homepage = http://openfontlibrary.org/en/font/carlito; + homepage = "http://openfontlibrary.org/en/font/carlito"; description = "A sans-serif font metric-compatible with Microsoft Calibri"; longDescription = '' Carlito is a free font that is metric-compatible with the diff --git a/pkgs/data/fonts/charis-sil/default.nix b/pkgs/data/fonts/charis-sil/default.nix index e28a718fad1..44b40c72b58 100644 --- a/pkgs/data/fonts/charis-sil/default.nix +++ b/pkgs/data/fonts/charis-sil/default.nix @@ -17,7 +17,7 @@ in sha256 = "1a220s8n0flvcdkazqf5g10v6r55s2an308slvvarynpj6l7x27n"; meta = with lib; { - homepage = https://software.sil.org/charis; + homepage = "https://software.sil.org/charis"; description = "A family of highly readable fonts for broad multilingual use"; longDescription = '' This Charis SIL font is essentially the same design as the SIL Charis font first released by SIL in 1997. Charis is similar to Bitstream Charter, one of the first fonts designed specifically for laser printers. It is highly readable and holds up well in less-than-ideal reproduction environments. It also has a full set of styles – regular, italic, bold, bold italic. Charis is a serif, proportionally-spaced font optimized for readability in long printed documents. diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix index 00a8a2f61fc..a69aa3684ab 100644 --- a/pkgs/data/fonts/cherry/default.nix +++ b/pkgs/data/fonts/cherry/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "cherry font"; - homepage = https://github.com/turquoise-hexagon/cherry; + homepage = "https://github.com/turquoise-hexagon/cherry"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index c058f07ed51..d7437c3231d 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "1rzz7yhqq3lljyqxbg46jfzfd09qgpgx865lijr4sgc94riy1ypn"; meta = with lib; { - homepage = http://canopus.iacp.dvo.ru/~panov/cm-unicode/; + homepage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/"; description = "Computer Modern Unicode fonts"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/comfortaa/default.nix b/pkgs/data/fonts/comfortaa/default.nix index 6e4c0bb08e7..525c2920dbe 100644 --- a/pkgs/data/fonts/comfortaa/default.nix +++ b/pkgs/data/fonts/comfortaa/default.nix @@ -14,7 +14,7 @@ in fetchzip rec { sha256 = "0z7xr0cnn6ghwivrm5b5awq9bzhnay3y99qq6dkdgfkfdsaz0n9h"; meta = with lib; { - homepage = http://aajohan.deviantart.com/art/Comfortaa-font-105395949; + homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949"; description = "A clean and modern font suitable for headings and logos"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix index 6dcefe90055..709d93dc2c9 100644 --- a/pkgs/data/fonts/comic-neue/default.nix +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -20,7 +20,7 @@ in fetchzip rec { sha256 = "1gs4vhys0m3qsw06qaxzyi81f06w5v66kbyl64yw3pq2rb656779"; meta = with lib; { - homepage = http://comicneue.com/; + homepage = "http://comicneue.com/"; description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; longDescription = '' It is inspired by Comic Sans but more regular. The font was diff --git a/pkgs/data/fonts/comic-relief/default.nix b/pkgs/data/fonts/comic-relief/default.nix index d51c915b844..1f5ce7f642f 100644 --- a/pkgs/data/fonts/comic-relief/default.nix +++ b/pkgs/data/fonts/comic-relief/default.nix @@ -19,7 +19,7 @@ in fetchzip rec { sha256 = "0dz0y7w6mq4hcmmxv6fn4mp6jkln9mzr4s96vsg68wrl5b7k9yff"; meta = with lib; { - homepage = http://loudifier.com/comic-relief/; + homepage = "http://loudifier.com/comic-relief/"; description = "A font metric-compatible with Microsoft Comic Sans"; longDescription = '' Comic Relief is a typeface designed to be metrically equivalent diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/data/fonts/cooper-hewitt/default.nix index e1635c560d6..8783b112173 100644 --- a/pkgs/data/fonts/cooper-hewitt/default.nix +++ b/pkgs/data/fonts/cooper-hewitt/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "cooper-hewitt-2014-06-09"; - url = https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip; + url = "https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip"; postFetch = '' mkdir -p $out/share/fonts/opentype @@ -13,7 +13,7 @@ fetchzip { sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd"; meta = with lib; { - homepage = https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/; + homepage = "https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/"; description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/corefonts/default.nix b/pkgs/data/fonts/corefonts/default.nix index 5e06a34b6f0..e4107cd4b99 100644 --- a/pkgs/data/fonts/corefonts/default.nix +++ b/pkgs/data/fonts/corefonts/default.nix @@ -18,7 +18,7 @@ let ]; eula = fetchurl { - url = http://corefonts.sourceforge.net/eula.htm; + url = "http://corefonts.sourceforge.net/eula.htm"; sha256 = "1aqbcnl032g2hd7iy56cs022g47scb0jxxp3mm206x1yqc90vs1c"; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation { outputHash = "0baadsrgpqj15fgjmcn0aim0k0nk7mvivcxinw1zwg61kkcwhalx"; meta = with stdenv.lib; { - homepage = http://corefonts.sourceforge.net/; + homepage = "http://corefonts.sourceforge.net/"; description = "Microsoft's TrueType core fonts for the Web"; platforms = platforms.all; license = licenses.unfreeRedistributable; diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix index 90b0d19ae99..2e66ac468b0 100644 --- a/pkgs/data/fonts/creep/default.nix +++ b/pkgs/data/fonts/creep/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pretty sweet 4px wide pixel font"; - homepage = https://github.com/romeovs/creep; + homepage = "https://github.com/romeovs/creep"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/data/fonts/crimson/default.nix b/pkgs/data/fonts/crimson/default.nix index a3f24985fd9..b8ff43a1128 100644 --- a/pkgs/data/fonts/crimson/default.nix +++ b/pkgs/data/fonts/crimson/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "0mg65f0ydyfmb43jqr1f34njpd10w8npw15cbb7z0nxmy4nkl842"; meta = with lib; { - homepage = https://aldusleaf.org/crimson.html; + homepage = "https://aldusleaf.org/crimson.html"; description = "A font family inspired by beautiful oldstyle typefaces"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/culmus/default.nix b/pkgs/data/fonts/culmus/default.nix index 5aad7ff236f..00c472d7fe3 100644 --- a/pkgs/data/fonts/culmus/default.nix +++ b/pkgs/data/fonts/culmus/default.nix @@ -22,7 +22,7 @@ in fetchzip { longDescription = "The Culmus project aims at providing the Hebrew-speaking GNU/Linux and Unix community with a basic collection of Hebrew fonts for X Windows."; platforms = lib.platforms.all; license = lib.licenses.gpl2; - homepage = http://culmus.sourceforge.net/; - downloadPage = http://culmus.sourceforge.net/download.html; + homepage = "http://culmus.sourceforge.net/"; + downloadPage = "http://culmus.sourceforge.net/download.html"; }; } diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix index b73da9a504b..25d92fc0f9e 100644 --- a/pkgs/data/fonts/d2coding/default.nix +++ b/pkgs/data/fonts/d2coding/default.nix @@ -24,7 +24,7 @@ in fetchzip { Since verion 1.3, D2Coding font is officially supported by the font creator, with symbols for Powerline. ''; - homepage = https://github.com/naver/d2codingfont; + homepage = "https://github.com/naver/d2codingfont"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index b14ba6479d9..839cb80a6b9 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -12,7 +12,7 @@ let This package includes DejaVu Sans, DejaVu Serif, DejaVu Sans Mono, and the TeX Gyre DejaVu Math font. ''; - homepage = http://dejavu-fonts.org/wiki/Main_Page; + homepage = "http://dejavu-fonts.org/wiki/Main_Page"; # Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 8bc1af60ab4..49c21947820 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -58,8 +58,8 @@ stdenv.mkDerivation { relatively compact to allow a lot of code on screen, while (hopefully) clear enough to remain readable even at high resolutions. ''; - homepage = https://www.donationcoder.com/Software/Jibz/Dina/; - downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/; + homepage = "https://www.donationcoder.com/Software/Jibz/Dina/"; + downloadPage = "https://www.donationcoder.com/Software/Jibz/Dina/"; license = licenses.free; maintainers = [ maintainers.prikhi ]; }; diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix index 48b170e2e1b..918996c5f64 100644 --- a/pkgs/data/fonts/dosis/default.nix +++ b/pkgs/data/fonts/dosis/default.nix @@ -28,7 +28,7 @@ fetchFromGitHub rec { It comes in 7 incremental weights: ExtraLight, Light, Book, Medium, Semibold, Bold & ExtraBold ''; - homepage = http://www.impallari.com/dosis; + homepage = "http://www.impallari.com/dosis"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/doulos-sil/default.nix b/pkgs/data/fonts/doulos-sil/default.nix index 59371593f79..3de4cfc0cae 100644 --- a/pkgs/data/fonts/doulos-sil/default.nix +++ b/pkgs/data/fonts/doulos-sil/default.nix @@ -17,7 +17,7 @@ in sha256 = "04a9cr7jbw7d8llcj8xsqp9rp8w6gcgbd9sdwvi02kz7jhqa0vad"; meta = with lib; { - homepage = https://software.sil.org/doulos; + homepage = "https://software.sil.org/doulos"; description = "A font that provides complete support for the International Phonetic Alphabet"; longDescription = '' This Doulos SIL font is essentially the same design as the SIL Doulos font first released by SIL in 1992. The design has been changed from the original in that it has been scaled down to be a better match with contemporary digital fonts, such as Times New Roman®. This current release is a regular typeface, with no bold or italic version available or planned. It is intended for use alongside other Times-like fonts where a range of styles (italic, bold) are not needed. Therefore, just one font is included in the Doulos SIL release: Doulos SIL Regular. diff --git a/pkgs/data/fonts/eb-garamond/default.nix b/pkgs/data/fonts/eb-garamond/default.nix index 14233268991..869d889ef3c 100644 --- a/pkgs/data/fonts/eb-garamond/default.nix +++ b/pkgs/data/fonts/eb-garamond/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "04jq4mpln85zzbla8ybsjw7vn9qr3r0snmk5zykrm24imq7ripv3"; meta = with lib; { - homepage = http://www.georgduffner.at/ebgaramond/; + homepage = "http://www.georgduffner.at/ebgaramond/"; description = "Digitization of the Garamond shown on the Egenolff-Berner specimen"; maintainers = with maintainers; [ relrod rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix index e7981f63baf..e9c646d32d0 100644 --- a/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix +++ b/pkgs/data/fonts/emacs-all-the-icons-fonts/default.nix @@ -21,7 +21,7 @@ in fetchzip { presentation of information in emacs. This package provides the fonts needed to make the package work properly. ''; - homepage = https://github.com/domtronn/all-the-icons.el; + homepage = "https://github.com/domtronn/all-the-icons.el"; /* The fonts come under a mixture of licenses - the MIT license, diff --git a/pkgs/data/fonts/emojione/default.nix b/pkgs/data/fonts/emojione/default.nix index 171ec10c8f1..6f5168e90d5 100644 --- a/pkgs/data/fonts/emojione/default.nix +++ b/pkgs/data/fonts/emojione/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source emoji set"; - homepage = http://emojione.com/; + homepage = "http://emojione.com/"; license = licenses.cc-by-40; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix index 787a83f9561..c6bb23b4326 100644 --- a/pkgs/data/fonts/encode-sans/default.nix +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -3,7 +3,7 @@ fetchzip rec { name = "encode-sans-1.002"; - url = https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip; + url = "https://github.com/impallari/Encode-Sans/archive/11162b46892d20f55bd42a00b48cbf06b5871f75.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -23,7 +23,7 @@ fetchzip rec { Designed by Pablo Impallari and Andres Torresi. ''; - homepage = http://www.impallari.com/projects/overview/encode; + homepage = "http://www.impallari.com/projects/overview/encode"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/eunomia/default.nix b/pkgs/data/fonts/eunomia/default.nix index de68b17d6eb..e68f528ff38 100644 --- a/pkgs/data/fonts/eunomia/default.nix +++ b/pkgs/data/fonts/eunomia/default.nix @@ -18,7 +18,7 @@ fetchzip { ''; meta = with lib; { - homepage = http://dotcolon.net/font/eunomia/; + homepage = "http://dotcolon.net/font/eunomia/"; description = "A futuristic decorative font."; platforms = platforms.all; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/data/fonts/fantasque-sans-mono/default.nix b/pkgs/data/fonts/fantasque-sans-mono/default.nix index 156db5d214c..e8068d7faea 100644 --- a/pkgs/data/fonts/fantasque-sans-mono/default.nix +++ b/pkgs/data/fonts/fantasque-sans-mono/default.nix @@ -18,7 +18,7 @@ fetchzip rec { sha256 = "07y2w6xzkbaj6vr95fvvnmwq1pw9jib4z02xf8937dx812yic9ni"; meta = with lib; { - homepage = https://github.com/belluzj/fantasque-sans; + homepage = "https://github.com/belluzj/fantasque-sans"; description = "A font family with a great monospaced variant for programmers"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 46149b0781b..71057639f97 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "2"; + version = "3"; in fetchzip { name = "fira-code-${version}"; @@ -13,10 +13,10 @@ in fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "0kg9lrrjr6wrd4r96y0rnslnaw2276558a369qdvalwb3q1gi8d2"; + sha256 = "19kcqqd6c61v137q88zsvf2ra154n009sbqh6zs7l8f7r5bbipj2"; meta = with stdenv.lib; { - homepage = https://github.com/tonsky/FiraCode; + homepage = "https://github.com/tonsky/FiraCode"; description = "Monospace font with programming ligatures"; longDescription = '' Fira Code is a monospace font extending the Fira Mono font with diff --git a/pkgs/data/fonts/fira-mono/default.nix b/pkgs/data/fonts/fira-mono/default.nix index 2f50a83a70b..d29d6304cee 100644 --- a/pkgs/data/fonts/fira-mono/default.nix +++ b/pkgs/data/fonts/fira-mono/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "fira-mono-3.206"; - url = https://github.com/mozilla/Fira/archive/4.106.zip; + url = "https://github.com/mozilla/Fira/archive/4.106.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ fetchzip { sha256 = "1ci3fxhdwabvfj4nl16pwcgqnh7s2slp8vblribk8zkpx8cbp1dj"; meta = with stdenv.lib; { - homepage = https://mozilla.github.io/Fira/; + homepage = "https://mozilla.github.io/Fira/"; description = "Monospace font for Firefox OS"; longDescription = '' Fira Mono is a monospace font designed by Erik Spiekermann, diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index fe27ac2cd5d..23baee7cb9d 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -18,7 +18,7 @@ in fetchFromGitHub { sha256 = "0c97nmihcq0ki7ywj8zn048a2bgrszc61lb9p0djfi65ar52jab4"; meta = with lib; { - homepage = https://mozilla.github.io/Fira/; + homepage = "https://mozilla.github.io/Fira/"; description = "Sans-serif font for Firefox OS"; longDescription = '' Fira Sans is a sans-serif font designed by Erik Spiekermann, diff --git a/pkgs/data/fonts/fixedsys-excelsior/default.nix b/pkgs/data/fonts/fixedsys-excelsior/default.nix index 14232edee0c..c8d2d1c2a9e 100644 --- a/pkgs/data/fonts/fixedsys-excelsior/default.nix +++ b/pkgs/data/fonts/fixedsys-excelsior/default.nix @@ -8,9 +8,9 @@ in fetchurl rec { name = "fixedsys-excelsior-${version}"; urls = [ - http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf - https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf - http://tarballs.nixos.org/sha256/6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d + "http://www.fixedsysexcelsior.com/fonts/FSEX300.ttf" + "https://raw.githubusercontent.com/chrissimpkins/codeface/master/fonts/fixed-sys-excelsior/FSEX300.ttf" + "http://tarballs.nixos.org/sha256/6ee0f3573bc5e33e93b616ef6282f49bc0e227a31aa753ac76ed2e3f3d02056d" ]; downloadToTemp = true; recursiveHash = true; @@ -22,7 +22,7 @@ in fetchurl rec { meta = { description = "Pan-unicode version of Fixedsys, a classic DOS font."; - homepage = http://www.fixedsysexcelsior.com/; + homepage = "http://www.fixedsysexcelsior.com/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.publicDomain; maintainers = [ stdenv.lib.maintainers.ninjatrappeur ]; diff --git a/pkgs/data/fonts/fontconfig-penultimate/default.nix b/pkgs/data/fonts/fontconfig-penultimate/default.nix index 601146d99a9..5216cf0e3d8 100644 --- a/pkgs/data/fonts/fontconfig-penultimate/default.nix +++ b/pkgs/data/fonts/fontconfig-penultimate/default.nix @@ -15,7 +15,7 @@ fetchzip { ''; meta = with lib; { - homepage = https://github.com/ttuegel/fontconfig-penultimate; + homepage = "https://github.com/ttuegel/fontconfig-penultimate"; description = "Sensible defaults for Fontconfig"; license = licenses.asl20; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index c5e19edea26..5934ec3589a 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -19,7 +19,7 @@ fetchzip rec { (PostScript Type0, TrueType, OpenType...) fonts covering the ISO 10646/Unicode UCS (Universal Character Set). ''; - homepage = https://www.gnu.org/software/freefont/; + homepage = "https://www.gnu.org/software/freefont/"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; maintainers = []; diff --git a/pkgs/data/fonts/gandom-fonts/default.nix b/pkgs/data/fonts/gandom-fonts/default.nix index 4d925b269cd..54e0020ae68 100644 --- a/pkgs/data/fonts/gandom-fonts/default.nix +++ b/pkgs/data/fonts/gandom-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0zsq6s9ziyb5jz0v8aj00dlxd1aly0ibxgszd05dfvykmgz051lc"; meta = with lib; { - homepage = https://github.com/rastikerdar/gandom-font; + homepage = "https://github.com/rastikerdar/gandom-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی گندم"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/gdouros/default.nix b/pkgs/data/fonts/gdouros/default.nix index afe73aa1caf..eb6635ec3a3 100644 --- a/pkgs/data/fonts/gdouros/default.nix +++ b/pkgs/data/fonts/gdouros/default.nix @@ -31,7 +31,7 @@ let # no redistribution, "a single instantiation and no # network installation" license = lib.licenses.unfree; - homepage = http://users.teilar.gr/~g1951d/; + homepage = "http://users.teilar.gr/~g1951d/"; }; }; in diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix index 505b273c2d2..2e14795ebd1 100644 --- a/pkgs/data/fonts/gentium-book-basic/default.nix +++ b/pkgs/data/fonts/gentium-book-basic/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "0598zr5f7d6ll48pbfbmmkrybhhdks9b2g3m2g67wm40070ffzmd"; meta = with lib; { - homepage = https://software.sil.org/gentium/; + homepage = "https://software.sil.org/gentium/"; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; maintainers = with maintainers; [ ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/gentium/default.nix b/pkgs/data/fonts/gentium/default.nix index a60a39f4f01..3622e1c3b3c 100644 --- a/pkgs/data/fonts/gentium/default.nix +++ b/pkgs/data/fonts/gentium/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "1qr2wjdmm93167b0w9cidlf3wwsyjx4838ja9jmm4jkyian5whhp"; meta = with lib; { - homepage = https://software.sil.org/gentium/; + homepage = "https://software.sil.org/gentium/"; description = "A high-quality typeface family for Latin, Cyrillic, and Greek"; longDescription = '' Gentium is a typeface family designed to enable the diverse ethnic groups diff --git a/pkgs/data/fonts/go-font/default.nix b/pkgs/data/fonts/go-font/default.nix index bb28d3be67f..e887f0ffef1 100644 --- a/pkgs/data/fonts/go-font/default.nix +++ b/pkgs/data/fonts/go-font/default.nix @@ -18,7 +18,7 @@ in (fetchgit { sha256 = "1488426ya2nzmwjas947fx9h5wzxrp9wasn8nkjqf0y0mpd4f1xz"; }) // { meta = with stdenv.lib; { - homepage = https://blog.golang.org/go-fonts; + homepage = "https://blog.golang.org/go-fonts"; description = "The Go font family"; license = licenses.bsd3; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index b331edf7aa1..e2361ef8163 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { description = '' A monospace bitmap font well suited for programming and terminal use ''; - homepage = https://font.gohu.org/; + homepage = "https://font.gohu.org/"; license = licenses.wtfpl; maintainers = with maintainers; [ epitrochoid rnhmjoj ]; }; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 7c1af485a98..7a3b488212d 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://fonts.google.com; + homepage = "https://fonts.google.com"; description = "Font files available from Google Fonts"; license = with licenses; [ asl20 ofl ufl ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 3c49bf7f565..0427cf36429 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -23,7 +23,7 @@ in fetchzip { The face has been re-designed with a larger glyph set, modifications of the original glyph shapes, and meticulous attention to metrics. ''; - homepage = https://sourcefoundry.org/hack/; + homepage = "https://sourcefoundry.org/hack/"; /* "The font binaries are released under a license that permits unlimited diff --git a/pkgs/data/fonts/hasklig/default.nix b/pkgs/data/fonts/hasklig/default.nix index 6286cf8a1df..d9deef80c0d 100644 --- a/pkgs/data/fonts/hasklig/default.nix +++ b/pkgs/data/fonts/hasklig/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "0xxyx0nkapviqaqmf3b610nq17k20afirvc72l32pfspsbxz8ybq"; meta = with lib; { - homepage = https://github.com/i-tu/Hasklig; + homepage = "https://github.com/i-tu/Hasklig"; description = "A font with ligatures for Haskell code based off Source Code Pro"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix index 23f6fb29be0..275b0d8f871 100644 --- a/pkgs/data/fonts/helvetica-neue-lt-std/default.nix +++ b/pkgs/data/fonts/helvetica-neue-lt-std/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "0ampp9vf9xw0sdppl4lb9i9h75ywljhdcqmzh45mx2x9m7h6xgg9"; meta = { - homepage = http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html; + homepage = "http://www.ephifonts.com/free-helvetica-font-helvetica-neue-lt-std.html"; description = "Helvetica Neue LT Std font"; longDescription = '' Helvetica Neue Lt Std is one of the most highly rated and complete diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix index f641b36a1b0..3ff5dd36829 100644 --- a/pkgs/data/fonts/hermit/default.nix +++ b/pkgs/data/fonts/hermit/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { meta = with lib; { description = "monospace font designed to be clear, pragmatic and very readable"; - homepage = https://pcaro.es/p/hermit; + homepage = "https://pcaro.es/p/hermit"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/hyperscrypt/default.nix b/pkgs/data/fonts/hyperscrypt/default.nix index 726fbab95bd..09bcc2464ba 100644 --- a/pkgs/data/fonts/hyperscrypt/default.nix +++ b/pkgs/data/fonts/hyperscrypt/default.nix @@ -16,7 +16,7 @@ fetchzip { ''; meta = with lib; { - homepage = http://velvetyne.fr/fonts/hyper-scrypt/; + homepage = "http://velvetyne.fr/fonts/hyper-scrypt/"; description = "A modern stencil typeface inspired by stained glass technique"; longDescription = '' The Hyper Scrypt typeface was designed for the Hyper Chapelle diff --git a/pkgs/data/fonts/ia-writer-duospace/default.nix b/pkgs/data/fonts/ia-writer-duospace/default.nix index 1d910ed54a4..6da80a1bf83 100644 --- a/pkgs/data/fonts/ia-writer-duospace/default.nix +++ b/pkgs/data/fonts/ia-writer-duospace/default.nix @@ -18,7 +18,7 @@ in fetchFromGitHub { meta = with lib; { description = "iA Writer Duospace Typeface"; - homepage = https://ia.net/topics/in-search-of-the-perfect-writing-font; + homepage = "https://ia.net/topics/in-search-of-the-perfect-writing-font"; license = licenses.ofl; platforms = platforms.all; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/data/fonts/ibm-plex/default.nix b/pkgs/data/fonts/ibm-plex/default.nix index ffd6a49be5c..3e507047166 100644 --- a/pkgs/data/fonts/ibm-plex/default.nix +++ b/pkgs/data/fonts/ibm-plex/default.nix @@ -13,7 +13,7 @@ in fetchzip { meta = with lib; { description = "IBM Plex Typeface"; - homepage = https://www.ibm.com/plex/; + homepage = "https://www.ibm.com/plex/"; license = licenses.ofl; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/fonts/inconsolata-nerdfont/default.nix b/pkgs/data/fonts/inconsolata-nerdfont/default.nix deleted file mode 100644 index b4356e73d5c..00000000000 --- a/pkgs/data/fonts/inconsolata-nerdfont/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchzip }: - -let - version = "2.0.0"; -in fetchzip { - name = "inconsolata-nerdfont-${version}"; - - url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Inconsolata.zip"; - - postFetch = '' - mkdir -p $out/share/fonts/inconsolata-nerdfont - unzip -j $downloadedFile -d $out/share/fonts/inconsolata-nerdfont - ''; - - sha256 = "06i1akjblqd038cn5lvz67lwp6afpv31vqcfdihp66qisgbgm4w9"; - - meta = with lib; { - description = '' - Nerd Fonts is a project that attempts to patch as many developer targeted - and/or used fonts as possible. The patch is to specifically add a high - number of additional glyphs from popular 'iconic fonts' such as Font - Awesome, Devicons, Octicons, and others. - ''; - homepage = https://github.com/ryanoasis/nerd-fonts; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/fonts/inconsolata/default.nix b/pkgs/data/fonts/inconsolata/default.nix index a170a0780a4..10568073e4b 100644 --- a/pkgs/data/fonts/inconsolata/default.nix +++ b/pkgs/data/fonts/inconsolata/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.levien.com/type/myfonts/inconsolata.html; + homepage = "https://www.levien.com/type/myfonts/inconsolata.html"; description = "A monospace font for both screen and print"; maintainers = with maintainers; [ mikoim raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix index aec48b12086..e69e6e02a22 100644 --- a/pkgs/data/fonts/inconsolata/lgc.nix +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # See `License.txt' for details. license = licenses.ofl; - homepage = https://github.com/MihailJP/Inconsolata-LGC; + homepage = "https://github.com/MihailJP/Inconsolata-LGC"; maintainers = with maintainers; [ avnik rht ]; }; } diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix index c3d3bf4aa6a..2db7e259a35 100644 --- a/pkgs/data/fonts/input-fonts/default.nix +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { generous spacing, large punctuation, and easily distinguishable characters — but without the limitations of a fixed width. ''; - homepage = https://input.fontbureau.com; + homepage = "https://input.fontbureau.com"; license = licenses.unfree; maintainers = with maintainers; [ romildo ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/inriafonts/default.nix b/pkgs/data/fonts/inriafonts/default.nix index 5a8e3476bf8..d8127b85127 100644 --- a/pkgs/data/fonts/inriafonts/default.nix +++ b/pkgs/data/fonts/inriafonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0wrwcyycyzvgvgnlmwi1ncdvwb8f6bbclynd1105rsyxgrz5dd70"; meta = with lib; { - homepage = https://black-foundry.com/work/inria; + homepage = "https://black-foundry.com/work/inria"; description = "Inria Sans and Inria Serif"; longDescription = '' Inria Sans and Inria Serif are the two members of a type family diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix index d9ef6684faa..37b48f7ceb2 100644 --- a/pkgs/data/fonts/inter-ui/default.nix +++ b/pkgs/data/fonts/inter-ui/default.nix @@ -19,7 +19,7 @@ in fetchzip { sha256 = "01d2ql803jrhss6g60djvs08x9xl7z6b3snkn03vqnrajdgifcl4"; meta = with lib; { - homepage = https://rsms.me/inter/; + homepage = "https://rsms.me/inter/"; description = "A typeface specially designed for user interfaces"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index 83779e7618e..9c7ef62c769 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "1bk4q478jy84ylgm1mmh23n8cw1cd3k7gvfih77sd7ya1zv26vl1"; meta = with lib; { - homepage = https://rsms.me/inter/; + homepage = "https://rsms.me/inter/"; description = "A typeface specially designed for user interfaces"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index cbe4b25bd36..b801451c7be 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "1dfm1888rii5kfmkxp5hnx8ycji57cbs5gazpgkxg1mnmn7i35wl"; meta = with stdenv.lib; { - homepage = https://be5invis.github.io/Iosevka/; + homepage = "https://be5invis.github.io/Iosevka/"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; description = '' Slender monospace sans-serif and slab-serif typeface inspired by Pragmata diff --git a/pkgs/data/fonts/ipaexfont/default.nix b/pkgs/data/fonts/ipaexfont/default.nix index 4d7e2fa380e..ef914d14484 100644 --- a/pkgs/data/fonts/ipaexfont/default.nix +++ b/pkgs/data/fonts/ipaexfont/default.nix @@ -21,7 +21,7 @@ fetchzip { This is the successor to the IPA fonts. ''; - homepage = http://ipafont.ipa.go.jp/; + homepage = "http://ipafont.ipa.go.jp/"; license = licenses.ipa; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/data/fonts/ipafont/default.nix b/pkgs/data/fonts/ipafont/default.nix index d1cb0070883..eec28db883a 100644 --- a/pkgs/data/fonts/ipafont/default.nix +++ b/pkgs/data/fonts/ipafont/default.nix @@ -19,7 +19,7 @@ fetchzip { Promotion Agency of Japan. It provides both Mincho and Gothic fonts, suitable for both display and printing. ''; - homepage = http://ipafont.ipa.go.jp/ipafont/; + homepage = "http://ipafont.ipa.go.jp/ipafont/"; license = lib.licenses.ipa; maintainers = [ lib.maintainers.auntie ]; }; diff --git a/pkgs/data/fonts/ir-standard-fonts/default.nix b/pkgs/data/fonts/ir-standard-fonts/default.nix index eef3883506e..25ec1e5d11d 100644 --- a/pkgs/data/fonts/ir-standard-fonts/default.nix +++ b/pkgs/data/fonts/ir-standard-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0i2vzhwk77pm6fx5z5gxl026z9f35rhh3cvl003mry2lcg1x5rhp"; meta = with lib; { - homepage = https://github.com/morealaz/ir-standard-fonts; + homepage = "https://github.com/morealaz/ir-standard-fonts"; description = "Iran Supreme Council of Information and Communication Technology (SCICT) standard Persian fonts series"; # License information is unavailable. license = licenses.unfree; diff --git a/pkgs/data/fonts/iwona/default.nix b/pkgs/data/fonts/iwona/default.nix index afa59b737a5..7333c5abe35 100644 --- a/pkgs/data/fonts/iwona/default.nix +++ b/pkgs/data/fonts/iwona/default.nix @@ -14,7 +14,7 @@ in fetchzip { meta = with lib; { description = "A two-element sans-serif typeface, created by Małgorzata Budyta"; - homepage = http://jmn.pl/en/kurier-i-iwona/; + homepage = "http://jmn.pl/en/kurier-i-iwona/"; # "[...] GUST Font License (GFL), which is a free license, legally # equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or # later." - GUST website diff --git a/pkgs/data/fonts/jost/default.nix b/pkgs/data/fonts/jost/default.nix index 3c1403da263..fc06a7e9843 100644 --- a/pkgs/data/fonts/jost/default.nix +++ b/pkgs/data/fonts/jost/default.nix @@ -14,7 +14,7 @@ in fetchzip { sha256="0l78vhmbsyfmrva5wc76pskhxqryyg8q5xddpj9g5wqsddy525dq"; meta = with stdenv.lib; { - homepage = https://github.com/indestructible-type/Jost; + homepage = "https://github.com/indestructible-type/Jost"; description = "A sans serif font by Indestructible Type"; license = licenses.ofl; maintainers = [ maintainers.ar1a ]; diff --git a/pkgs/data/fonts/joypixels/default.nix b/pkgs/data/fonts/joypixels/default.nix index fc6481e9a89..fb9b76b0efc 100644 --- a/pkgs/data/fonts/joypixels/default.nix +++ b/pkgs/data/fonts/joypixels/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "joypixels"; - version = "5.0.2"; + version = "5.5.0"; src = fetchurl { url = "https://cdn.joypixels.com/arch-linux/font/${version}/joypixels-android.ttf"; - sha256 = "0javgnfsh2nfddr5flf4yzi81ar8wx2z8w1q7h4fvdng5fsrgici"; + sha256 = "S0Y/yAps11W69poz2c3xJSX9Augexm82ZzbbCSgoeXA="; }; dontUnpack = true; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Emoji as a Service (formerly EmojiOne)"; - homepage = https://www.joypixels.com/; + homepage = "https://www.joypixels.com/"; license = licenses.unfree; maintainers = with maintainers; [ jtojnar ]; }; diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 1cfe1d5d4b0..19502cdf78f 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -1,20 +1,24 @@ { lib, fetchzip }: -fetchzip { - name = "junicode-0.7.8"; +let + pname = "junicode"; + version = "1.002"; +in fetchzip { + name = "${pname}-${version}"; - url = mirror://sourceforge/junicode/junicode/junicode-0-7-8/junicode-0-7-8.zip; + url = "mirror://sourceforge/junicode/junicode/junicode-${version}/junicode-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts unzip -j $downloadedFile \*.ttf -d $out/share/fonts/junicode-ttf ''; - sha256 = "0q4si9pnbif36154sv49kzc7ygivgflv81nzmblpz3b2p77g9956"; + sha256 = "1n170gw41lr0zr5958z5cgpg6i1aa7kj7iq9s6gdh1cqq7hhgd08"; meta = { - homepage = http://junicode.sourceforge.net/; + homepage = "http://junicode.sourceforge.net/"; description = "A Unicode font for medievalists"; - license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ ivan-timokhin ]; + license = lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/kawkab-mono/default.nix b/pkgs/data/fonts/kawkab-mono/default.nix index f6a031c7faf..1e07123badc 100644 --- a/pkgs/data/fonts/kawkab-mono/default.nix +++ b/pkgs/data/fonts/kawkab-mono/default.nix @@ -14,7 +14,7 @@ fetchzip { meta = { description = "An arab fixed-width font"; - homepage = https://makkuk.com/kawkab-mono/; + homepage = "https://makkuk.com/kawkab-mono/"; license = lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/lalezar-fonts/default.nix b/pkgs/data/fonts/lalezar-fonts/default.nix index 2cd33e9fe1b..01e9d209a31 100644 --- a/pkgs/data/fonts/lalezar-fonts/default.nix +++ b/pkgs/data/fonts/lalezar-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0jmwhr2dqgj3vn0v26jh6c0id6n3wd6as3bq39xa870zlk7v307b"; meta = with lib; { - homepage = https://github.com/BornaIz/Lalezar; + homepage = "https://github.com/BornaIz/Lalezar"; description = "A multi-script display typeface for popular culture"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix index ea9d1837ef5..2b9f6c1114f 100644 --- a/pkgs/data/fonts/lato/default.nix +++ b/pkgs/data/fonts/lato/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "lato-2.0"; - url = http://www.latofonts.com/download/Lato2OFL.zip; + url = "http://www.latofonts.com/download/Lato2OFL.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ fetchzip { sha256 = "1amwn6vcaggxrd2s4zw21s2pr47zmzdf2xfy4x9lxa2cd9bkhvg5"; meta = with lib; { - homepage = http://www.latofonts.com/; + homepage = "http://www.latofonts.com/"; description = '' Sans-serif typeface family designed in Summer 2010 by Łukasz Dziedzic diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix index 5657b8380a9..9a80b9a43df 100644 --- a/pkgs/data/fonts/league-of-moveable-type/default.nix +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { open-source, @font-face ready fonts. ''; - homepage = https://www.theleagueofmoveabletype.com/; + homepage = "https://www.theleagueofmoveabletype.com/"; license = stdenv.lib.licenses.ofl; diff --git a/pkgs/data/fonts/liberastika/default.nix b/pkgs/data/fonts/liberastika/default.nix index 1bc3b9b2092..c42bc9f7563 100644 --- a/pkgs/data/fonts/liberastika/default.nix +++ b/pkgs/data/fonts/liberastika/default.nix @@ -17,7 +17,7 @@ in fetchzip rec { meta = with lib; { description = "Liberation Sans fork with improved cyrillic support"; - homepage = https://sourceforge.net/projects/lib-ka/; + homepage = "https://sourceforge.net/projects/lib-ka/"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/data/fonts/liberation-sans-narrow/default.nix b/pkgs/data/fonts/liberation-sans-narrow/default.nix index 51af6a20bae..373704f25f5 100644 --- a/pkgs/data/fonts/liberation-sans-narrow/default.nix +++ b/pkgs/data/fonts/liberation-sans-narrow/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2; - homepage = https://github.com/liberationfonts; + homepage = "https://github.com/liberationfonts"; maintainers = [ maintainers.leenaars ]; }; } diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix index eb0a47e13d9..bd47998b924 100644 --- a/pkgs/data/fonts/libertine/default.nix +++ b/pkgs/data/fonts/libertine/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "linux-libertine-5.3.0"; src = fetchurl { - url = mirror://sourceforge/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz; + url = "mirror://sourceforge/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz"; sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v"; }; @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Linux Libertine Fonts"; - homepage = http://linuxlibertine.sf.net; + homepage = "http://linuxlibertine.sf.net"; maintainers = [ maintainers.volth ]; license = licenses.ofl; }; diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 62aad87c902..7d95b6a26ff 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -23,7 +23,7 @@ in fetchFromGitHub rec { that started as an OpenType math companion of the Libertine font family, but grown as a full fork to address some of the bugs in the fonts. ''; - homepage = https://github.com/alif-type/libertinus; + homepage = "https://github.com/alif-type/libertinus"; license = licenses.ofl; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix index f5e6083f944..a4be7b5b3e6 100644 --- a/pkgs/data/fonts/libre-baskerville/default.nix +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -23,7 +23,7 @@ fetchFromGitHub rec { counters and less contrast that allow it to work on small sizes in any screen. ''; - homepage = http://www.impallari.com/projects/overview/libre-baskerville; + homepage = "http://www.impallari.com/projects/overview/libre-baskerville"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix index e55d5030741..63bbf8eba72 100644 --- a/pkgs/data/fonts/libre-bodoni/default.nix +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -28,7 +28,7 @@ fetchFromGitHub rec { Libre Bodoni currently features four styles: Regular, Italic, Bold and Bold Italic. ''; - homepage = https://github.com/impallari/Libre-Bodoni; + homepage = "https://github.com/impallari/Libre-Bodoni"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix index 7a68c9deb5a..1b5e5b1be69 100644 --- a/pkgs/data/fonts/libre-caslon/default.nix +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; - homepage = http://www.impallari.com/librecaslon; + homepage = "http://www.impallari.com/librecaslon"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix index 97832ab5651..b41ae8878cc 100644 --- a/pkgs/data/fonts/libre-franklin/default.nix +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -17,7 +17,7 @@ fetchFromGitHub rec { meta = with lib; { description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; - homepage = https://github.com/impallari/Libre-Franklin; + homepage = "https://github.com/impallari/Libre-Franklin"; license = licenses.ofl; maintainers = with maintainers; [ cmfwyp ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/lmmath/default.nix b/pkgs/data/fonts/lmmath/default.nix index c971a699b2a..a66bd48c897 100644 --- a/pkgs/data/fonts/lmmath/default.nix +++ b/pkgs/data/fonts/lmmath/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { meta = with lib; { description = "The Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth."; - homepage = http://www.gust.org.pl/projects/e-foundry/lm-math; + homepage = "http://www.gust.org.pl/projects/e-foundry/lm-math"; # "The Latin Modern Math font is licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or later." - GUST website diff --git a/pkgs/data/fonts/lmodern/default.nix b/pkgs/data/fonts/lmodern/default.nix index 1b277a0691c..53fc456d758 100644 --- a/pkgs/data/fonts/lmodern/default.nix +++ b/pkgs/data/fonts/lmodern/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "lmodern-2.004.5"; - url = mirror://debian/pool/main/l/lmodern/lmodern_2.004.5.orig.tar.gz; + url = "mirror://debian/pool/main/l/lmodern/lmodern_2.004.5.orig.tar.gz"; postFetch = '' tar xzvf $downloadedFile diff --git a/pkgs/data/fonts/lobster-two/default.nix b/pkgs/data/fonts/lobster-two/default.nix index 773b53c8892..d5a46b43fb4 100644 --- a/pkgs/data/fonts/lobster-two/default.nix +++ b/pkgs/data/fonts/lobster-two/default.nix @@ -70,7 +70,7 @@ in outputHash = "0if9l8pzwgfnbdjg5yblcy08dwn9yj3wzz29l0fycia46xlzd4ym"; meta = with stdenv.lib; { - homepage = https://github.com/librefonts/lobstertwo; + homepage = "https://github.com/librefonts/lobstertwo"; description = "Script font with many ligatures"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/lohit-fonts/default.nix b/pkgs/data/fonts/lohit-fonts/default.nix index 0e8b1f8fe4d..64ae831767b 100644 --- a/pkgs/data/fonts/lohit-fonts/default.nix +++ b/pkgs/data/fonts/lohit-fonts/default.nix @@ -46,7 +46,7 @@ let meta = { inherit license; description = "Free and open source fonts for Indian languages (" + label + ")"; - homepage = https://pagure.io/lohit; + homepage = "https://pagure.io/lohit"; maintainers = [ lib.maintainers.mathnerd314 lib.maintainers.ttuegel ]; # Set a non-zero priority to allow easy overriding of the # fontconfig configuration files. diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix index 7e5a69a2c1f..9d61931db36 100644 --- a/pkgs/data/fonts/luculent/default.nix +++ b/pkgs/data/fonts/luculent/default.nix @@ -3,7 +3,7 @@ let version = "2.0.0"; in fetchzip { name = "luculent-${version}"; - url = http://www.eastfarthing.com/luculent/luculent.tar.xz; + url = "http://www.eastfarthing.com/luculent/luculent.tar.xz"; postFetch = '' tar -xJf $downloadedFile --strip-components=1 @@ -15,7 +15,7 @@ fetchzip { meta = with lib; { description = "luculent font"; - homepage = http://www.eastfarthing.com/luculent/; + homepage = "http://www.eastfarthing.com/luculent/"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix index 9dce73a28aa..9bf4f32caeb 100644 --- a/pkgs/data/fonts/manrope/default.nix +++ b/pkgs/data/fonts/manrope/default.nix @@ -15,7 +15,7 @@ in fetchFromGitHub { ''; meta = with lib; { description = "Open-source modern sans-serif font family"; - homepage = https://github.com/sharanda/manrope; + homepage = "https://github.com/sharanda/manrope"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index 60c77dddc8d..724d975e53a 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "0wq4w79x8r5w6ikm9amcmapf0jcdgifs9zf1pbnw3fk4ncz5s551"; meta = with lib; { - homepage = https://github.com/MihailJP/MarathiCursive; + homepage = "https://github.com/MihailJP/MarathiCursive"; description = "Modi script font with Graphite and OpenType support"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.mit; # It's the M+ license, M+ is MIT(-ish) diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix index 201b0dfe417..72dc5fe6313 100644 --- a/pkgs/data/fonts/material-design-icons/default.nix +++ b/pkgs/data/fonts/material-design-icons/default.nix @@ -25,7 +25,7 @@ in fetchFromGitHub { developers targeting various platforms to download icons in the format, color and size they need for any project. ''; - homepage = https://materialdesignicons.com; + homepage = "https://materialdesignicons.com"; license = with licenses; [ asl20 # for icons from: https://github.com/google/material-design-icons ofl diff --git a/pkgs/data/fonts/material-icons/default.nix b/pkgs/data/fonts/material-icons/default.nix index 0126fbac225..656be1b153e 100644 --- a/pkgs/data/fonts/material-icons/default.nix +++ b/pkgs/data/fonts/material-icons/default.nix @@ -18,7 +18,7 @@ in fetchFromGitHub { meta = with lib; { description = "System status icons by Google, featuring material design"; - homepage = https://material.io/icons; + homepage = "https://material.io/icons"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ mpcsh ]; diff --git a/pkgs/data/fonts/meslo-lg/default.nix b/pkgs/data/fonts/meslo-lg/default.nix index a041f9ce907..2837e488389 100644 --- a/pkgs/data/fonts/meslo-lg/default.nix +++ b/pkgs/data/fonts/meslo-lg/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A customized version of Apple’s Menlo-Regular font"; - homepage = https://github.com/andreberg/Meslo-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; diff --git a/pkgs/data/fonts/migmix/default.nix b/pkgs/data/fonts/migmix/default.nix index 8a089ea9e79..1b3313d4e02 100644 --- a/pkgs/data/fonts/migmix/default.nix +++ b/pkgs/data/fonts/migmix/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-quality Japanese font based on M+ fonts and IPA fonts"; - homepage = http://mix-mplus-ipa.osdn.jp/migmix; + homepage = "http://mix-mplus-ipa.osdn.jp/migmix"; license = licenses.ipa; maintainers = [ maintainers.mikoim ]; }; diff --git a/pkgs/data/fonts/migu/default.nix b/pkgs/data/fonts/migu/default.nix index 775d1766894..530fd4f543f 100644 --- a/pkgs/data/fonts/migu/default.nix +++ b/pkgs/data/fonts/migu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-quality Japanese font based on modified M+ fonts and IPA fonts"; - homepage = http://mix-mplus-ipa.osdn.jp/migu/; + homepage = "http://mix-mplus-ipa.osdn.jp/migu/"; license = licenses.ipa; maintainers = [ maintainers.mikoim ]; }; diff --git a/pkgs/data/fonts/mno16/default.nix b/pkgs/data/fonts/mno16/default.nix index 2a700be113a..1b311d2c25a 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/monoid/default.nix b/pkgs/data/fonts/monoid/default.nix index 22714170fa4..f62f4961fc7 100644 --- a/pkgs/data/fonts/monoid/default.nix +++ b/pkgs/data/fonts/monoid/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://larsenwork.com/monoid; + homepage = "http://larsenwork.com/monoid"; description = "Customisable coding font with alternates, ligatures and contextual positioning"; license = [ licenses.ofl licenses.mit ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/mononoki/default.nix b/pkgs/data/fonts/mononoki/default.nix index 658c3bdf20a..195c39c0e81 100644 --- a/pkgs/data/fonts/mononoki/default.nix +++ b/pkgs/data/fonts/mononoki/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "19y4xg7ilm21h9yynyrwcafdqn05zknpmmjrb37qim6p0cy2glff"; meta = with lib; { - homepage = https://github.com/madmalik/mononoki; + homepage = "https://github.com/madmalik/mononoki"; description = "A font for programming and code review"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 4230e63360b..10a8dc38d95 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "MPH-2B-Damase-2"; - url = http://www.wazu.jp/downloads/damase_v.2.zip; + url = "http://www.wazu.jp/downloads/damase_v.2.zip"; postFetch = '' mkdir -p $out/share/fonts diff --git a/pkgs/data/fonts/mro-unicode/default.nix b/pkgs/data/fonts/mro-unicode/default.nix index bb5a1ed8a9f..9f4eda63d0f 100644 --- a/pkgs/data/fonts/mro-unicode/default.nix +++ b/pkgs/data/fonts/mro-unicode/default.nix @@ -10,7 +10,7 @@ fetchzip { sha256 = "1i71bjd9gdyn8ladfncbfhz6xz1h8xx8yf876j1z8lh719410c8g"; meta = with lib; { - homepage = https://github.com/phjamr/MroUnicode; + homepage = "https://github.com/phjamr/MroUnicode"; description = "Unicode-compliant Mro font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/myrica/default.nix b/pkgs/data/fonts/myrica/default.nix index 444d526f5ae..aa5ee0ff1c3 100644 --- a/pkgs/data/fonts/myrica/default.nix +++ b/pkgs/data/fonts/myrica/default.nix @@ -15,7 +15,7 @@ fetchFromGitHub { ''; meta = with lib; { - homepage = https://myrica.estable.jp/; + homepage = "https://myrica.estable.jp/"; license = licenses.ofl; maintainers = with maintainers; [ mikoim ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index d2aaadc4279..11e1ccb5645 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { Al-Hussaini (Nafees Raqam) one of the finest calligraphers of Pakistan ''; - homepage = http://www.cle.org.pk/software/localization.htm; + homepage = "http://www.cle.org.pk/software/localization.htm"; # Used to be GPLv2. The license distributed with the fonts looks # more like a modified BSD, but still contains the GPLv2 embedded diff --git a/pkgs/data/fonts/nahid-fonts/default.nix b/pkgs/data/fonts/nahid-fonts/default.nix index b9d9025b2c0..0e08bebea09 100644 --- a/pkgs/data/fonts/nahid-fonts/default.nix +++ b/pkgs/data/fonts/nahid-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "0df169sibq14j2mj727sq86c00jm1nz8565v85hkvh4zgz2plb7c"; meta = with lib; { - homepage = https://github.com/rastikerdar/nahid-font; + homepage = "https://github.com/rastikerdar/nahid-font"; description = "A Persian (Farsi) Font - قلم (فونت) فارسی ناهید"; license = licenses.free; platforms = platforms.all; diff --git a/pkgs/data/fonts/nanum-gothic-coding/default.nix b/pkgs/data/fonts/nanum-gothic-coding/default.nix index 7d908b62cc6..4785c1386a6 100644 --- a/pkgs/data/fonts/nanum-gothic-coding/default.nix +++ b/pkgs/data/fonts/nanum-gothic-coding/default.nix @@ -17,7 +17,7 @@ in fetchzip { meta = with lib; { description = "A contemporary monospaced sans-serif typeface with a warm touch"; - homepage = https://github.com/naver/nanumfont; + homepage = "https://github.com/naver/nanumfont"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ linarcx ]; diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix index bc8fc8041a8..8ed251de53d 100644 --- a/pkgs/data/fonts/national-park/default.nix +++ b/pkgs/data/fonts/national-park/default.nix @@ -17,7 +17,7 @@ in fetchzip { meta = with lib; { description = ''Typeface designed to mimic the national park service signs that are carved using a router bit''; - homepage = https://nationalparktypeface.com/; + homepage = "https://nationalparktypeface.com/"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/data/fonts/nerdfonts/default.nix b/pkgs/data/fonts/nerdfonts/default.nix index 8ffd0e3e43f..35f43c14df4 100644 --- a/pkgs/data/fonts/nerdfonts/default.nix +++ b/pkgs/data/fonts/nerdfonts/default.nix @@ -1,35 +1,68 @@ -{ stdenv, fetchFromGitHub, which, withFont ? "" }: +{ stdenv +, fetchurl +, lib +, unzip +# To select only certain fonts, put a list of strings to `fonts`: every key in +# ./shas.nix is an optional font +, fonts ? [] +}: + +let + # both of these files are generated via ./update.sh + version = import ./version.nix; + fontsShas = import ./shas.nix; + knownFonts = builtins.attrNames fontsShas; + selectedFonts = if (fonts == []) then + knownFonts + else + let unknown = lib.subtractLists knownFonts fonts; in + if (unknown != []) then + throw "Unknown font(s): ${lib.concatStringsSep " " unknown}" + else + fonts + ; + selectedFontsShas = lib.attrsets.genAttrs selectedFonts ( + fName: + fontsShas."${fName}" + ); + srcs = lib.attrsets.mapAttrsToList ( + fName: + fSha: + (fetchurl { + url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/${fName}.zip"; + sha256 = fSha; + }) + ) selectedFontsShas; +in stdenv.mkDerivation rec { - version = "2.1.0"; + inherit version; + inherit srcs; pname = "nerdfonts"; - src = fetchFromGitHub { - owner = "ryanoasis"; - repo = "nerd-fonts"; - rev = version; - sha256 = "1la79y16k9rwcl2zsxk73c0kgdms2ma43kpjfqnq5jlbfdj0niwg"; - }; - dontPatchShebangs = true; - buildInputs = [ which ]; - patchPhase = '' - patchShebangs install.sh - sed -i -e 's|font_dir="\$HOME/.local/share/fonts|font_dir="$out/share/fonts/truetype|g' install.sh + nativeBuildInputs = [ + unzip + ]; + sourceRoot = "."; + buildPhase = '' + echo "selected fonts are ${toString selectedFonts}" + ls *.otf *.ttf ''; installPhase = '' - mkdir -p $out/share/fonts/truetype - ./install.sh ${withFont} + find -name \*.otf -exec mkdir -p $out/share/fonts/opentype/NerdFonts \; -exec mv {} $out/share/fonts/opentype/NerdFonts \; + find -name \*.ttf -exec mkdir -p $out/share/fonts/truetype/NerdFonts \; -exec mv {} $out/share/fonts/truetype/NerdFonts \; ''; meta = with stdenv.lib; { - description = '' + description = "Iconic font aggregator, collection, & patcher. 3,600+ icons, 50+ patched fonts"; + longDescription = '' Nerd Fonts is a project that attempts to patch as many developer targeted and/or used fonts as possible. The patch is to specifically add a high number of additional glyphs from popular 'iconic fonts' such as Font Awesome, Devicons, Octicons, and others. ''; - homepage = https://github.com/ryanoasis/nerd-fonts; + homepage = "https://nerdfonts.com/"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ doronbehar ]; hydraPlatforms = []; # 'Output limit exceeded' on Hydra }; } diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix new file mode 100644 index 00000000000..3436042f5f6 --- /dev/null +++ b/pkgs/data/fonts/nerdfonts/shas.nix @@ -0,0 +1,49 @@ +{ + "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"; + "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"; + "VictorMono" = "18z92kwggfqwrd5m09yda55hcb4b159278lps6f9hr8icwki6v9q"; +} diff --git a/pkgs/data/fonts/nerdfonts/update.sh b/pkgs/data/fonts/nerdfonts/update.sh new file mode 100755 index 00000000000..e3d0c27933e --- /dev/null +++ b/pkgs/data/fonts/nerdfonts/update.sh @@ -0,0 +1,73 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p rsstail nix-prefetch + +# NOTE: Before running this script, please make sure this list is up-to-date - +# meaning there are no new fonts they provide at https://github.com/ryanoasis/nerd-fonts/releases/ +fonts=( + "3270" + Agave + AnonymousPro + Arimo + AurulentSansMono + BigBlueTerminal + BitstreamVeraSansMono + CascadiaCode + CodeNewRoman + Cousine + DaddyTimeMono + DejaVuSansMono + DroidSansMono + FantasqueSansMono + FiraCode + FiraMono + Go-Mono + Gohu + Hack + Hasklig + HeavyData + Hermit + iA-Writer + IBMPlexMono + Inconsolata + Iosevka + JetBrainsMono + Lekton + LiberationMono + Meslo + Monofur + Monoid + Mononoki + MPlus + Noto + OpenDyslexic + Overpass + ProFont + ProggyClean + RobotoMono + ShareTechMono + SourceCodePro + SpaceMono + Terminus + Tinos + Ubuntu + VictorMono +) + +releases_url="https://github.com/ryanoasis/nerd-fonts/releases.atom" + +version="$(rsstail -1 -u "$releases_url" -H -l -r | sed -e '/^Title: /d' -e 's:.*/::' -e 's/^v//g' | sort -V | tail -1)" + +echo Using version "$version" + +dirname="$(dirname "$0")" +echo \""$version"\" > "$dirname/version.nix" + +base_url="https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}" + +printf '{\n' > "$dirname/shas.nix" + +for font in "${fonts[@]}"; do + printf '\t"%s" = "%s";\n' "$font" "$(nix-prefetch-url "${base_url}/${font}.zip")" >> "$dirname/shas.nix" +done + +printf '}\n' >> "$dirname/shas.nix" diff --git a/pkgs/data/fonts/nerdfonts/version.nix b/pkgs/data/fonts/nerdfonts/version.nix new file mode 100644 index 00000000000..8320adbf025 --- /dev/null +++ b/pkgs/data/fonts/nerdfonts/version.nix @@ -0,0 +1 @@ +"2.1.0" diff --git a/pkgs/data/fonts/nika-fonts/default.nix b/pkgs/data/fonts/nika-fonts/default.nix index 3f58bc5f933..5db9bb2a951 100644 --- a/pkgs/data/fonts/nika-fonts/default.nix +++ b/pkgs/data/fonts/nika-fonts/default.nix @@ -16,7 +16,7 @@ in fetchFromGitHub { sha256 = "1x34b2dqn1dymi1vmj5vrjcy2z8s0f3rr6cniyrz85plvid6x40i"; meta = with lib; { - homepage = https://github.com/font-store/NikaFont/; + homepage = "https://github.com/font-store/NikaFont/"; description = "Persian/Arabic Open Source Font"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/norwester/default.nix b/pkgs/data/fonts/norwester/default.nix index ae70c74c3e4..d4e4cf1ee0f 100644 --- a/pkgs/data/fonts/norwester/default.nix +++ b/pkgs/data/fonts/norwester/default.nix @@ -16,7 +16,7 @@ in fetchzip { sha256 = "1npsaiiz9g5z6315lnmynwcnrfl37fyxc7w1mhkw1xbzcnv74z4r"; meta = with lib; { - homepage = http://jamiewilson.io/norwester; + homepage = "http://jamiewilson.io/norwester"; description = "A condensed geometric sans serif by Jamie Wilson"; maintainers = with maintainers; [ leenaars ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 9681bb50efa..f4a6dba3029 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -40,7 +40,7 @@ let meta = with lib; { description = "Beautiful and free fonts for many languages"; - homepage = https://www.google.com/get/noto/; + homepage = "https://www.google.com/get/noto/"; longDescription = '' When text is rendered by a computer, sometimes characters are @@ -89,7 +89,7 @@ in meta = with lib; { description = "Beautiful and free fonts for CJK languages"; - homepage = https://www.google.com/get/noto/help/cjk/; + homepage = "https://www.google.com/get/noto/help/cjk/"; longDescription = '' Noto Sans CJK is a sans serif typeface designed as an intermediate style @@ -140,7 +140,7 @@ in meta = with lib; { inherit version; description = "Color and Black-and-White emoji fonts"; - homepage = https://github.com/googlei18n/noto-emoji; + homepage = "https://github.com/googlei18n/noto-emoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ mathnerd314 ]; diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index d91ace35e2c..3cc1570161e 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { patches = lib.optionals isPy3k [ # Additional Python 3 compat https://github.com/googlefonts/nototools/pull/497 (fetchpatch { - url = https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch; + url = "https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch"; sha256 = "0bn0rlbddxicw0h1dnl0cibgj6xjalja2qcm563y7kk3z5cdwhgq"; }) ]; @@ -43,6 +43,6 @@ buildPythonPackage rec { meta = { description = "Noto fonts support tools and scripts plus web site generation"; license = lib.licenses.asl20; - homepage = https://github.com/googlefonts/nototools; + homepage = "https://github.com/googlefonts/nototools"; }; } diff --git a/pkgs/data/fonts/office-code-pro/default.nix b/pkgs/data/fonts/office-code-pro/default.nix index 4354725c90c..0513baf4868 100644 --- a/pkgs/data/fonts/office-code-pro/default.nix +++ b/pkgs/data/fonts/office-code-pro/default.nix @@ -25,7 +25,7 @@ in fetchFromGitHub rec { Incorporated. The customizations were made specifically for text editors and coding environments, but are still very usable in other applications. ''; - homepage = https://github.com/nathco/Office-Code-Pro; + homepage = "https://github.com/nathco/Office-Code-Pro"; license = licenses.ofl; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index c2ea6a7180b..fbca0283d23 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -17,7 +17,7 @@ in fetchzip rec { sha256 = "0d4l9cg2vmh2pvnqsla8mgcwvc7wjxzcabhlli6633h3ifj2yp7b"; meta = with lib; { - homepage = https://github.com/MihailJP/oldsindhi; + homepage = "https://github.com/MihailJP/oldsindhi"; description = "Free Sindhi Khudabadi font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.bsd2; diff --git a/pkgs/data/fonts/oldstandard/default.nix b/pkgs/data/fonts/oldstandard/default.nix index cd0d0063efb..5284ec7e119 100644 --- a/pkgs/data/fonts/oldstandard/default.nix +++ b/pkgs/data/fonts/oldstandard/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "1qwfsyp51grr56jcnkkmnrnl3r20pmhp9zh9g88kp64m026cah6n"; meta = with lib; { - homepage = https://github.com/akryukov/oldstand; + homepage = "https://github.com/akryukov/oldstand"; description = "An attempt to revive a specific type of Modern style of serif typefaces"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/open-dyslexic/default.nix b/pkgs/data/fonts/open-dyslexic/default.nix index 8519c346891..f22ce9f882f 100644 --- a/pkgs/data/fonts/open-dyslexic/default.nix +++ b/pkgs/data/fonts/open-dyslexic/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "open-dyslexic-${version}"; - url = https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip; + url = "https://github.com/antijingoist/open-dyslexic/archive/20160623-Stable.zip"; postFetch = '' mkdir -p $out/share/{doc,fonts} @@ -16,7 +16,7 @@ in fetchzip { sha256 = "1vl8z5rknh2hpr2f0v4b2qgs5kclx5pzyk8al7243k5db82a2cyi"; meta = with lib; { - homepage = https://opendyslexic.org/; + homepage = "https://opendyslexic.org/"; description = "Font created to increase readability for readers with dyslexia"; license = "Bitstream Vera License (https://www.gnome.org/fonts/#Final_Bitstream_Vera_Fonts)"; platforms = platforms.all; diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix index 0c1293ebda3..e92f7580252 100644 --- a/pkgs/data/fonts/open-sans/default.nix +++ b/pkgs/data/fonts/open-sans/default.nix @@ -23,7 +23,7 @@ in fetchFromGitLab { Open Sans is a humanist sans serif typeface designed by Steve Matteson, Type Director of Ascender Corp. ''; - homepage = https://www.opensans.com; + homepage = "https://www.opensans.com"; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.worldofpeace ]; diff --git a/pkgs/data/fonts/orbitron/default.nix b/pkgs/data/fonts/orbitron/default.nix index 699345f753e..4c00b086e10 100644 --- a/pkgs/data/fonts/orbitron/default.nix +++ b/pkgs/data/fonts/orbitron/default.nix @@ -18,7 +18,7 @@ in fetchFromGitHub { sha256 = "1y9yzvpqs2v3ssnqk2iiglrh8amgsscnk8vmfgnqgqi9f4dhdvnv"; meta = with lib; { - homepage = https://www.theleagueofmoveabletype.com/orbitron; + homepage = "https://www.theleagueofmoveabletype.com/orbitron"; downloadPage = "https://www.theleagueofmoveabletype.com/orbitron/download"; description = '' Geometric sans-serif for display purposes by Matt McInerney''; diff --git a/pkgs/data/fonts/parastoo-fonts/default.nix b/pkgs/data/fonts/parastoo-fonts/default.nix index d297baddc4d..7c713576a21 100644 --- a/pkgs/data/fonts/parastoo-fonts/default.nix +++ b/pkgs/data/fonts/parastoo-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "10jbii6rskcy4akjl5yfcqv4mfwk3nqnx36l6sbxks43va9l04f4"; meta = with lib; { - homepage = https://github.com/rastikerdar/parastoo-font; + homepage = "https://github.com/rastikerdar/parastoo-font"; description = "A Persian (Farsi) Font - فونت ( قلم ) فارسی پرستو"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/paratype-pt/mono.nix b/pkgs/data/fonts/paratype-pt/mono.nix index 6b619d23201..54dbe3abf4e 100644 --- a/pkgs/data/fonts/paratype-pt/mono.nix +++ b/pkgs/data/fonts/paratype-pt/mono.nix @@ -4,8 +4,8 @@ fetchzip { name = "paratype-pt-mono"; url = [ - https://company.paratype.com/system/attachments/631/original/ptmono.zip - http://rus.paratype.ru/system/attachments/631/original/ptmono.zip + "https://company.paratype.com/system/attachments/631/original/ptmono.zip" + "http://rus.paratype.ru/system/attachments/631/original/ptmono.zip" ]; postFetch = '' @@ -17,7 +17,7 @@ fetchzip { sha256 = "07kl82ngby55khvzsvn831ddpc0q8djgz2y6gsjixkyjfdk2xjjm"; meta = with stdenv.lib; { - homepage = http://www.paratype.ru/public/; + homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; license = "Open Paratype license"; diff --git a/pkgs/data/fonts/paratype-pt/sans.nix b/pkgs/data/fonts/paratype-pt/sans.nix index a3692809026..afaba6804f8 100644 --- a/pkgs/data/fonts/paratype-pt/sans.nix +++ b/pkgs/data/fonts/paratype-pt/sans.nix @@ -4,8 +4,8 @@ fetchzip { name = "paratype-pt-sans"; url = [ - https://company.paratype.com/system/attachments/629/original/ptsans.zip - http://rus.paratype.ru/system/attachments/629/original/ptsans.zip + "https://company.paratype.com/system/attachments/629/original/ptsans.zip" + "http://rus.paratype.ru/system/attachments/629/original/ptsans.zip" ]; postFetch = '' @@ -17,7 +17,7 @@ fetchzip { sha256 = "01fkd417gv98jf3a6zyfi9w2dkqsbddy1vacga2672yf0kh1z1r0"; meta = with stdenv.lib; { - homepage = http://www.paratype.ru/public/; + homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; license = "Open Paratype license"; diff --git a/pkgs/data/fonts/paratype-pt/serif.nix b/pkgs/data/fonts/paratype-pt/serif.nix index d74295571e0..a6f21e425f8 100644 --- a/pkgs/data/fonts/paratype-pt/serif.nix +++ b/pkgs/data/fonts/paratype-pt/serif.nix @@ -4,8 +4,8 @@ fetchzip { name = "paratype-pt-serif"; url = [ - https://company.paratype.com/system/attachments/634/original/ptserif.zip - http://rus.paratype.ru/system/attachments/634/original/ptserif.zip + "https://company.paratype.com/system/attachments/634/original/ptserif.zip" + "http://rus.paratype.ru/system/attachments/634/original/ptserif.zip" ]; postFetch = '' @@ -17,7 +17,7 @@ fetchzip { sha256 = "1iw5qi4ag3yp1lwmi91lb18gr768bqwl46xskaqnkhr9i9qp0v6d"; meta = with stdenv.lib; { - homepage = http://www.paratype.ru/public/; + homepage = "http://www.paratype.ru/public/"; description = "An open Paratype font"; license = "Open Paratype license"; diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index 1fc252421de..f0bdbc3ea00 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -20,7 +20,7 @@ fetchurl { sha256 = "0pwm20f38lcbfkdqkpa2ydpc9kvmdg0ifc4h2dmipsnwbcb5rfwm"; meta = with lib; { - homepage = http://pecita.eu/police-en.php; + homepage = "http://pecita.eu/police-en.php"; description = "Handwritten font with connected glyphs"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 24155f2ea54..05b411a5ba3 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { line. Poly is a Unicode typeface family that supports Open Type features and languages that use the Latin script and its variants. ''; - homepage = http://www.fontsquirrel.com/fonts/poly; + homepage = "http://www.fontsquirrel.com/fonts/poly"; license = stdenv.lib.licenses.ofl; maintainers = with stdenv.lib.maintainers; [ relrod ]; }; diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index f051ef76c9c..3a2ae92c1e5 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -19,7 +19,7 @@ fetchFromGitHub { sha256 = "0r8p4z3db17f5p8jr7sv80nglmjxhg83ncfvwg1dszldswr0dhvr"; meta = with lib; { - homepage = https://github.com/powerline/fonts; + homepage = "https://github.com/powerline/fonts"; description = "Patched fonts for Powerline users"; longDescription = '' Pre-patched and adjusted fonts for usage with the Powerline plugin. diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index d1f2cd9c5af..cba08309fac 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { outputs = [ "out" "otb" ]; meta = with stdenv.lib; { - homepage = https://tobiasjung.name/profont/; + homepage = "https://tobiasjung.name/profont/"; description = "A monospaced font created to be a most readable font for programming"; maintainers = with maintainers; [ myrl ]; license = licenses.mit; diff --git a/pkgs/data/fonts/proggyfonts/default.nix b/pkgs/data/fonts/proggyfonts/default.nix index 51165ceac13..7ddfd69aeeb 100644 --- a/pkgs/data/fonts/proggyfonts/default.nix +++ b/pkgs/data/fonts/proggyfonts/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { outputHash = "1x196rp3wqjd7m57bgp5kfy5jmj97qncxi1vwibs925ji7dqzfgf"; meta = with stdenv.lib; { - homepage = http://upperbounds.net; + homepage = "http://upperbounds.net"; description = "A set of fixed-width screen fonts that are designed for code listings"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index 13eb4a4da5f..7d7a81ec7e7 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -20,7 +20,7 @@ in fetchzip { meta = with lib; { description = "A strong, neutral, principles-driven, open source typeface for text or display"; - homepage = https://public-sans.digital.gov/; + homepage = "https://public-sans.digital.gov/"; license = licenses.ofl; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/quattrocento-sans/default.nix b/pkgs/data/fonts/quattrocento-sans/default.nix index 429cd80c2fc..ed0411ceb9f 100644 --- a/pkgs/data/fonts/quattrocento-sans/default.nix +++ b/pkgs/data/fonts/quattrocento-sans/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "0g8hnn92ks4y0jbizwj7yfa097lk887wqkqpqjdmc09sd2n44343"; meta = with lib; { - homepage = http://www.impallari.com/quattrocentosans/; + homepage = "http://www.impallari.com/quattrocentosans/"; description = "A classic, elegant and sober sans-serif typeface"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/quattrocento/default.nix b/pkgs/data/fonts/quattrocento/default.nix index 7e268182eef..3d11321cd4b 100644 --- a/pkgs/data/fonts/quattrocento/default.nix +++ b/pkgs/data/fonts/quattrocento/default.nix @@ -16,7 +16,7 @@ in fetchzip rec { sha256 = "0f8l19y61y20sszn8ni8h9kgl0zy1gyzychg22z5k93ip4h7kfd0"; meta = with lib; { - homepage = http://www.impallari.com/quattrocento/; + homepage = "http://www.impallari.com/quattrocento/"; description = "A classic, elegant, sober and strong serif typeface"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/raleway/default.nix b/pkgs/data/fonts/raleway/default.nix index 7fd6b80b714..ddded71a6fa 100644 --- a/pkgs/data/fonts/raleway/default.nix +++ b/pkgs/data/fonts/raleway/default.nix @@ -34,7 +34,7 @@ in fetchFromGitHub { It also has a sister display family, Raleway Dots. ''; - homepage = https://github.com/impallari/Raleway; + homepage = "https://github.com/impallari/Raleway"; license = lib.licenses.ofl; maintainers = with lib.maintainers; [ Profpatsch ]; diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 8aab8c0cd72..015b084aed7 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,7 +1,7 @@ { lib, fetchzip }: let - version = "1.043"; + version = "1.047"; in fetchzip { name = "recursive-${version}"; @@ -14,7 +14,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "0y7wg3ssr4j0r8dyxd0i0ji8bjvipzsqf0l6wznl5sfxk41mvjvd"; + sha256 = "0v50m6hiv19f7i4idi987j1six6493y6hj3r9djifg075v9adxx9"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index 6d075424bc5..1cb0eb349e4 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -42,7 +42,7 @@ let ''; license = licenses.ofl; - homepage = https://github.com/liberationfonts; + homepage = "https://github.com/liberationfonts"; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 33321a2c7fe..44eea3774ff 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -13,7 +13,7 @@ fetchzip { sha256 = "0yb6shgq6jrv3kq9faky66qpdbv4g580c3jl942844grwyngymyj"; meta = with lib; { - homepage = https://github.com/RedHatOfficial/RedHatFont; + homepage = "https://github.com/RedHatOfficial/RedHatFont"; description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/ricty/default.nix b/pkgs/data/fonts/ricty/default.nix index a248bb9d494..13cb056dc45 100644 --- a/pkgs/data/fonts/ricty/default.nix +++ b/pkgs/data/fonts/ricty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-quality Japanese font based on Inconsolata and Migu 1M"; - homepage = http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html; + homepage = "http://www.yusa.lab.uec.ac.jp/~yusa/ricty.html"; license = licenses.unfree; maintainers = [ maintainers.mikoim ]; }; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index cfd4e3808aa..9bb65526801 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -1,53 +1,53 @@ { stdenv, fetchurl }: let - # last commit on the directory containing the fonts in the upstream repository - commit = "883939708704a19a295e0652036369d22469e8dc"; + # Latest commit touching the robotomono tree + commit = "5338537ef835a3d9ccf8faf386399f13a30605e2"; in stdenv.mkDerivation { pname = "roboto-mono"; - version = "2016-01-11"; + version = "2.002-20190125"; srcs = [ (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Regular.ttf"; - sha256 = "0r6g1xydy824xbbjilq6pvrv8611ga3q1702v5jj1ly5np6gpddz"; + sha256 = "1f96r4by67hzqpr4p2wkrfnpj9b7x9qrmwns0312w2l2rnp2qajx"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Bold.ttf"; - sha256 = "0x9qnrbd7hin873wjzrl6798bvakixd86qdw0z5b4sm56f7fjl32"; + sha256 = "10wg4dchdq4s89r9pd4h8y5l1bf8mix32pksph2wafyr3815kfnm"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Italic.ttf"; - sha256 = "17aia6hgpjvvrl79y0f67ncr5y1nhyxj0dzqwdg3dycsa4kij59q"; + sha256 = "1cayhm3wj36q748xd0zdgrhm4pz7wnrskrlf7khxx2s41m3win5b"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-BoldItalic.ttf"; - sha256 = "05gqfnps6qzxgyxrrmkmw0by3j88lf88v67n8jgi2chhhm0sw40q"; + sha256 = "04238dxizdlhnnnyzhnqckxf8ciwlnwyzxby6qgpyg232abx0n2z"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Medium.ttf"; - sha256 = "0ww96qd0cyj3waxf7a98hyd4cp8snajjvjmbhr66zilql8ylfzk0"; + sha256 = "00rh49d0dbycbkjgd2883w7iqzd6hcry08ycjipsvk091p5nq6qy"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-MediumItalic.ttf"; - sha256 = "1n2cvvcpwm68lazfh3s3xhj4mrc01x84mi2ackwf8ahd95fk9p5y"; + sha256 = "0fxl6lblj7anhqmhplnpvjwckjh4g8m6r9jykxdrvpl5hk8mr65b"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Light.ttf"; - sha256 = "0na2sxz3n1km1ryz002spfa65d91fm48x0qcda2ac0rly7dgaqjf"; + sha256 = "1h8rbc2p70fabkplsafzah1wcwy92qc1wzkmc1cnb4yq28gxah4a"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-LightItalic.ttf"; - sha256 = "171fr8wsbmvfllsbmb9pcdax2qfzhbqzyxfn5bcrz9kx5k9x6198"; + sha256 = "08y2qngwy61mc22f8i00gshgmcf7hwmfxh1f4j824svy4n16zhsc"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-Thin.ttf"; - sha256 = "0pv54afyprajb16ksm5vklc1q76iv72v427wgamqzrzyvxgn6ymj"; + sha256 = "0fmij9zlfjiyf0vb8n8gvrwi35l830zpmkbhcy1xgx0m8za6mmmy"; }) (fetchurl { url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotomono/RobotoMono-ThinItalic.ttf"; - sha256 = "1ziyysl09z24l735y940g92rqhn9v4npwqzajj9m1kn0xz21r1aw"; + sha256 = "0mpwdhjnsk8311nw8fqzy1b7v0wzb4pw639ply1j38a0vibrsmn7"; }) ]; @@ -65,10 +65,10 @@ stdenv.mkDerivation { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1rd3qql779dn9nl940hf988lvv4gfy5llgrlfqq0db0c22b2yfng"; + outputHash = "0fkx2z97k29n1392bf76iwdyz44yp86hmqah7ai6bikzlia38qa0"; - meta = { - homepage = https://www.google.com/fonts/specimen/Roboto+Mono; + meta = with stdenv.lib; { + homepage = "https://www.google.com/fonts/specimen/Roboto+Mono"; description = "Google Roboto Mono fonts"; longDescription = '' Roboto Mono is a monospaced addition to the Roboto type family. Like @@ -81,8 +81,8 @@ stdenv.mkDerivation { wider glyphs are adjusted for weight. Curved caps like 'C' and 'O' take on the straighter sides from Roboto Condensed. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.all; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index f9f6ec342e9..1fec03b46fe 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -1,51 +1,28 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: -let - # last commit on the directory containing the fonts in the upstream repository - commit = "883939708704a19a295e0652036369d22469e8dc"; -in stdenv.mkDerivation { pname = "roboto-slab"; - version = "2016-01-11"; + version = "2.000"; - srcs = [ - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Regular.ttf"; - sha256 = "04180b5zk2nzll1rrgx8f1i1za66pk6pbrp0iww2xypjqra5zahk"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Bold.ttf"; - sha256 = "0ayl2hf5j33vixxfa7051hzjjxnx8zhag3rr0mmmnxpsn7md44ms"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Light.ttf"; - sha256 = "09riqgj9ixqjdb3mkzbs799cgmnp3ja3d6izlqkhpkfm52sgafqm"; - }) - (fetchurl { - url = "https://raw.githubusercontent.com/google/fonts/${commit}/apache/robotoslab/RobotoSlab-Thin.ttf"; - sha256 = "1hd0m7lxhr261a4s2nb572ari6v53w2yd8yjr9i534iqfl4jcbsf"; - }) - ]; - - sourceRoot = "./"; - - unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc)) - cp $curSrc ./$ttfName - ''; + src = fetchFromGitHub { + owner = "googlefonts"; + repo = "robotoslab"; + rev = "baeeba45e0c3ccdcfb6a70dc564785941aafef5d"; + sha256 = "1v6z0a2xgwgf9dyj62sriy8ckwpbwlxkki6gfax1f4h4livvzpdn"; + }; installPhase = '' mkdir -p $out/share/fonts/truetype - cp -a *.ttf $out/share/fonts/truetype/ + cp -a fonts/static/*.ttf $out/share/fonts/truetype/ ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "0imhvisjzi0rvn32hn04kngca4szx0j39h4c4zs7ryb4wdca76q9"; + outputHash = "0g663npi5lkvwcqafd4cjrm90ph0nv1lig7d19xzfymnj47qpj8x"; - meta = { - homepage = https://www.google.com/fonts/specimen/Roboto+Slab; - description = "Google Roboto Slab fonts"; + meta = with stdenv.lib; { + homepage = "https://www.google.com/fonts/specimen/Roboto+Slab"; + description = "Roboto Slab Typeface by Google"; longDescription = '' Roboto has a dual nature. It has a mechanical skeleton and the forms are largely geometric. At the same time, the font features friendly @@ -57,8 +34,8 @@ stdenv.mkDerivation { This is the Roboto Slab family, which can be used alongside the normal Roboto family and the Roboto Condensed family. ''; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.romildo ]; - platforms = stdenv.lib.platforms.all; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/data/fonts/roboto/default.nix b/pkgs/data/fonts/roboto/default.nix index 50629c5f977..fe13fdf89d1 100644 --- a/pkgs/data/fonts/roboto/default.nix +++ b/pkgs/data/fonts/roboto/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "1s3c48wwvvwd3p4w3hfkri5v2c54j2bdxmd3bjv54klc5mrlh6z3"; meta = { - homepage = https://github.com/google/roboto; + homepage = "https://github.com/google/roboto"; description = "The Roboto family of fonts"; longDescription = '' Google’s signature family of fonts, the default font on Android and diff --git a/pkgs/data/fonts/rounded-mgenplus/default.nix b/pkgs/data/fonts/rounded-mgenplus/default.nix index 43198702492..eccbddd1851 100644 --- a/pkgs/data/fonts/rounded-mgenplus/default.nix +++ b/pkgs/data/fonts/rounded-mgenplus/default.nix @@ -15,7 +15,7 @@ in fetchzip rec { meta = with lib; { description = "A Japanese font based on Rounded M+ and Noto Sans Japanese"; - homepage = http://jikasei.me/font/rounded-mgenplus/; + homepage = "http://jikasei.me/font/rounded-mgenplus/"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ mnacamura ]; diff --git a/pkgs/data/fonts/sahel-fonts/default.nix b/pkgs/data/fonts/sahel-fonts/default.nix index 029ed33611f..ff86338c26d 100644 --- a/pkgs/data/fonts/sahel-fonts/default.nix +++ b/pkgs/data/fonts/sahel-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0vj8ydv50rjanb0favd7rh4r9rv5fl39vqwvzkpgfdcdawn0xjm7"; meta = with lib; { - homepage = https://github.com/rastikerdar/sahel-font; + homepage = "https://github.com/rastikerdar/sahel-font"; description = "A Persian (farsi) Font - فونت (قلم) فارسی ساحل"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/samim-fonts/default.nix b/pkgs/data/fonts/samim-fonts/default.nix index d8d3d0d3b5a..e10249a1afd 100644 --- a/pkgs/data/fonts/samim-fonts/default.nix +++ b/pkgs/data/fonts/samim-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0mmhncqg48dp0d7l725dv909zswbkk22dlqzcdfh6k6cgk2gn08q"; meta = with lib; { - homepage = https://github.com/rastikerdar/samim-font; + homepage = "https://github.com/rastikerdar/samim-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی صمیم"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/sampradaya/default.nix b/pkgs/data/fonts/sampradaya/default.nix index 90b32f251ef..749abb71dbd 100644 --- a/pkgs/data/fonts/sampradaya/default.nix +++ b/pkgs/data/fonts/sampradaya/default.nix @@ -10,7 +10,7 @@ fetchzip { sha256 = "1pqyj5r5jc7dk8yyzl7i6qq2m9zvahcjj49a66wwzdby5zyw8dqv"; meta = with lib; { - homepage = https://bitbucket.org/OorNaattaan/sampradaya/; + homepage = "https://bitbucket.org/OorNaattaan/sampradaya/"; description = "Unicode-compliant Grantha font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; # See font metadata diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix index 7e073bf56d3..1be4835e20c 100644 --- a/pkgs/data/fonts/sarasa-gothic/default.nix +++ b/pkgs/data/fonts/sarasa-gothic/default.nix @@ -17,7 +17,7 @@ in fetchurl { meta = with lib; { description = "SARASA GOTHIC is a Chinese & Japanese programming font based on Iosevka and Source Han Sans"; - homepage = https://github.com/be5invis/Sarasa-Gothic; + homepage = "https://github.com/be5invis/Sarasa-Gothic"; license = licenses.ofl; maintainers = [ maintainers.ChengCat ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/scheherazade/default.nix b/pkgs/data/fonts/scheherazade/default.nix index 062b29c9039..e7651f22d6a 100644 --- a/pkgs/data/fonts/scheherazade/default.nix +++ b/pkgs/data/fonts/scheherazade/default.nix @@ -18,7 +18,7 @@ in fetchzip rec { sha256 = "1g5f5f9gzamkq3kqyf7vbzvl4rdj3wmjf6chdrbxksrm3rnb926z"; meta = with lib; { - homepage = https://software.sil.org/scheherazade/; + homepage = "https://software.sil.org/scheherazade/"; description = "A font designed in a similar style to traditional Naskh typefaces"; longDescription = '' Scheherazade, named after the heroine of the classic Arabian Nights tale, diff --git a/pkgs/data/fonts/shabnam-fonts/default.nix b/pkgs/data/fonts/shabnam-fonts/default.nix index 5834b797eea..5cf54697fdf 100644 --- a/pkgs/data/fonts/shabnam-fonts/default.nix +++ b/pkgs/data/fonts/shabnam-fonts/default.nix @@ -17,7 +17,7 @@ in fetchFromGitHub { sha256 = "0wfyaaj2pq2knz12l7rsc4wc703cbz0r8gkcya5x69p0aixch8ba"; meta = with lib; { - homepage = https://github.com/rastikerdar/shabnam-font; + homepage = "https://github.com/rastikerdar/shabnam-font"; description = "A Persian (Farsi) Font - فونت (قلم) فارسی شبنم"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/shrikhand/default.nix b/pkgs/data/fonts/shrikhand/default.nix index a00036510f5..684f3d0395e 100644 --- a/pkgs/data/fonts/shrikhand/default.nix +++ b/pkgs/data/fonts/shrikhand/default.nix @@ -5,14 +5,14 @@ let in fetchzip { name = "shrikhand-${version}"; - url = https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf; + url = "https://github.com/jonpinhorn/shrikhand/raw/c11c9b0720fba977fad7cb4f339ebacdba1d1394/build/Shrikhand-Regular.ttf"; postFetch = "install -D -m644 $downloadedFile $out/share/fonts/truetype/Shrikhand-Regular.ttf"; sha256 = "0s54k9cs1g2yz6lwg5gakqb12vg5qkfdz3pc8mh7mib2s6q926hs"; meta = with lib; { - homepage = https://jonpinhorn.github.io/shrikhand/; + homepage = "https://jonpinhorn.github.io/shrikhand/"; description = "A vibrant and playful typeface for both Latin and Gujarati writing systems"; maintainers = with maintainers; [ sternenseemann ]; platforms = platforms.all; diff --git a/pkgs/data/fonts/signwriting/default.nix b/pkgs/data/fonts/signwriting/default.nix index 883e43b4381..ae5f0bb0fb9 100644 --- a/pkgs/data/fonts/signwriting/default.nix +++ b/pkgs/data/fonts/signwriting/default.nix @@ -18,7 +18,7 @@ runCommand "signwriting-1.1.4" { outputHash = "0cn37s3lc7gbr8036l7ia2869qmxglkmgllh3r9q5j54g3sfjc7q"; meta = with lib; { - homepage = https://github.com/Slevinski/signwriting_2010_fonts; + homepage = "https://github.com/Slevinski/signwriting_2010_fonts"; description = "Typeface for written sign languages"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index 336fe48f54d..d1e53bbb757 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2016-05-13"; src = fetchzip { - url = https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip; + url = "https://github.com/stark/siji/archive/95369afac3e661cb6d3329ade5219992c88688c1.zip"; sha256 = "1408g4nxwdd682vjqpmgv0cp0bfnzzzwls62cjs9zrds16xa9dpf"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "bdf" "otb" ]; meta = with stdenv.lib; { - homepage = https://github.com/stark/siji; + homepage = "https://github.com/stark/siji"; description = "An iconic bitmap font based on Stlarch with additional glyphs"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/data/fonts/source-code-pro/default.nix b/pkgs/data/fonts/source-code-pro/default.nix index be4d045815c..c9518b78a65 100644 --- a/pkgs/data/fonts/source-code-pro/default.nix +++ b/pkgs/data/fonts/source-code-pro/default.nix @@ -5,7 +5,7 @@ let in fetchzip { name = "source-code-pro-${version}"; - url = https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip; + url = "https://github.com/adobe-fonts/source-code-pro/archive/2.030R-ro/1.050R-it.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -18,7 +18,7 @@ in fetchzip { description = "A set of monospaced OpenType fonts designed for coding environments"; maintainers = with lib.maintainers; [ relrod ]; platforms = with lib.platforms; all; - homepage = https://adobe-fonts.github.io/source-code-pro/; + homepage = "https://adobe-fonts.github.io/source-code-pro/"; license = lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/source-han-code-jp/default.nix b/pkgs/data/fonts/source-han-code-jp/default.nix index 85f5cddd2ea..5960e4fb6ea 100644 --- a/pkgs/data/fonts/source-han-code-jp/default.nix +++ b/pkgs/data/fonts/source-han-code-jp/default.nix @@ -19,7 +19,7 @@ in fetchzip { description = "A monospaced Latin font suitable for coding"; maintainers = with lib.maintainers; [ mt-caret ]; platforms = with lib.platforms; all; - homepage = https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html; + homepage = "https://blogs.adobe.com/CCJKType/2015/06/source-han-code-jp.html"; license = lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/source-sans-pro/default.nix b/pkgs/data/fonts/source-sans-pro/default.nix index 5186b9fe4a5..7d5c7679ad8 100644 --- a/pkgs/data/fonts/source-sans-pro/default.nix +++ b/pkgs/data/fonts/source-sans-pro/default.nix @@ -17,7 +17,7 @@ in fetchzip { sha256 = "11jd50cqiq2s0z39rclg73iiw2j5yzgs1glfs9psw5wbbisgysmr"; meta = with lib; { - homepage = https://adobe-fonts.github.io/source-sans-pro/; + homepage = "https://adobe-fonts.github.io/source-sans-pro/"; description = "A set of OpenType fonts designed by Adobe for UIs"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/source-serif-pro/default.nix b/pkgs/data/fonts/source-serif-pro/default.nix index eb776a3df26..86a45b80efd 100644 --- a/pkgs/data/fonts/source-serif-pro/default.nix +++ b/pkgs/data/fonts/source-serif-pro/default.nix @@ -17,7 +17,7 @@ in fetchzip { sha256 = "06yp8y79mqk02qzp81h8zkmzqqlhicgrkwmzkd0bm338xh8grsiz"; meta = with lib; { - homepage = https://adobe-fonts.github.io/source-serif-pro/; + homepage = "https://adobe-fonts.github.io/source-serif-pro/"; description = "A set of OpenType fonts to complement Source Sans Pro"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index c3cfec244e3..6994b7d4a72 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -23,7 +23,7 @@ in fetchurl { meta = with lib; { description = "Monospaced bitmap fonts"; - homepage = https://www.cambus.net/spleen-monospaced-bitmap-fonts; + homepage = "https://www.cambus.net/spleen-monospaced-bitmap-fonts"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/data/fonts/stix-otf/default.nix b/pkgs/data/fonts/stix-otf/default.nix index f3ff9600f5d..894fd22c36f 100644 --- a/pkgs/data/fonts/stix-otf/default.nix +++ b/pkgs/data/fonts/stix-otf/default.nix @@ -15,7 +15,7 @@ in fetchzip { sha256 = "04d4qxq3i9fyapsmxk6d9v1xirjam8c74fyxs6n24d3gf2945zmw"; meta = with lib; { - homepage = http://www.stixfonts.org/; + homepage = "http://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/stix-two/default.nix b/pkgs/data/fonts/stix-two/default.nix index c71b51ad75d..e6e4009020a 100644 --- a/pkgs/data/fonts/stix-two/default.nix +++ b/pkgs/data/fonts/stix-two/default.nix @@ -19,7 +19,7 @@ in fetchFromGitHub { sha256 = "1ah8s0cb67yv4ll8zfs01mdh9m5i2lbkrfbmkhi1xdid6pxsk32x"; meta = with stdenv.lib; { - homepage = http://www.stixfonts.org/; + homepage = "http://www.stixfonts.org/"; description = "Fonts for Scientific and Technical Information eXchange"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/data/fonts/tai-languages/default.nix b/pkgs/data/fonts/tai-languages/default.nix index 7778c4a98b8..71ca170afb1 100644 --- a/pkgs/data/fonts/tai-languages/default.nix +++ b/pkgs/data/fonts/tai-languages/default.nix @@ -11,7 +11,7 @@ tai-ahom = fetchzip { sha256 = "03h8ql9d5bzq4j521j0cz08ddf717bzim1nszh2aar6kn0xqnp9q"; meta = with lib; { - homepage = https://github.com/enabling-languages/tai-languages; + homepage = "https://github.com/enabling-languages/tai-languages"; description = "Unicode-compliant Tai Ahom font"; maintainers = with maintainers; [ mathnerd314 ]; license = licenses.ofl; # See font metadata diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index 10f96b2b17a..2738925478f 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -45,8 +45,8 @@ in stdenv.mkDerivation { font was further inspired by Gohufont, Terminus, Dina, Proggy, Fixedsys, and Consolas. ''; - homepage = http://www.fial.com/~scott/tamsyn-font/; - downloadPage = http://www.fial.com/~scott/tamsyn-font/download; + homepage = "http://www.fial.com/~scott/tamsyn-font/"; + downloadPage = "http://www.fial.com/~scott/tamsyn-font/download"; license = licenses.free; maintainers = [ maintainers.rps ]; }; diff --git a/pkgs/data/fonts/tempora-lgc/default.nix b/pkgs/data/fonts/tempora-lgc/default.nix index f06a5bfee27..d20acad663c 100644 --- a/pkgs/data/fonts/tempora-lgc/default.nix +++ b/pkgs/data/fonts/tempora-lgc/default.nix @@ -2,19 +2,19 @@ let srcs = [ (fetchurl { - url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf; + url = "http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold-italic.otf"; sha256 = "1yfbi62j6gjmzglxz29m6x6lxqpxghcqjjh916qn8in74ba5v0gq"; }) (fetchurl { - url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf; + url = "http://www.ttfotf.com/download-font/tempora-lgc-unicode-bold.otf"; sha256 = "0bfbl1h9h1022km2rg1zwl9lpabhnwdsvzdp0bwmf0wbm62550cp"; }) (fetchurl { - url = http://www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf; + url = "http://www.ttfotf.com/download-font/tempora-lgc-unicode-italic.otf"; sha256 = "10m9j4bvr6c4zp691wxm4hvzhph2zlfsxk1nmbsb9vn1i6vfgz04"; }) (fetchurl { - url = http://www.ttfotf.com/download-font/tempora-lgc-unicode.otf; + url = "http://www.ttfotf.com/download-font/tempora-lgc-unicode.otf"; sha256 = "0iwa8wyydcpjss6d1jy4jibqxpvzph4vmaxwwmndpsqy1fz64y9i"; }) ]; diff --git a/pkgs/data/fonts/terminus-font-ttf/default.nix b/pkgs/data/fonts/terminus-font-ttf/default.nix index bdd0fd7762b..f9d25a0128e 100644 --- a/pkgs/data/fonts/terminus-font-ttf/default.nix +++ b/pkgs/data/fonts/terminus-font-ttf/default.nix @@ -26,7 +26,7 @@ in fetchzip { Monospaced bitmap font designed for long work with computers (TTF version, mainly for Java applications) ''; - homepage = http://files.ax86.net/terminus-ttf; + homepage = "http://files.ax86.net/terminus-ttf"; license = licenses.ofl; maintainers = with maintainers; [ okasu ]; }; diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 88ae9ac72c2..4c7f5d85e86 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { 16x32. The styles are normal and bold (except for 6x12), plus EGA/VGA-bold for 8x14 and 8x16. ''; - homepage = http://terminus-font.sourceforge.net/; + homepage = "http://terminus-font.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ astsmtl ]; }; diff --git a/pkgs/data/fonts/terminus-nerdfont/default.nix b/pkgs/data/fonts/terminus-nerdfont/default.nix deleted file mode 100644 index 3c1730146b3..00000000000 --- a/pkgs/data/fonts/terminus-nerdfont/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, fetchzip }: - -let - version = "2.0.0"; -in fetchzip { - name = "terminus-nerdfont-${version}"; - - url = "https://github.com/ryanoasis/nerd-fonts/releases/download/v${version}/Terminus.zip"; - - postFetch = '' - mkdir -p $out/share/fonts/terminus-nerdfont - unzip -j $downloadedFile -d $out/share/fonts/terminus-nerdfont - ''; - - sha256 = "036i1qwwrb0r8hvcjf3h34w0g7mbsmngvrjic98jgikbz3i2f46c"; - - meta = with lib; { - description = '' - Nerd Fonts is a project that attempts to patch as many developer targeted - and/or used fonts as possible. The patch is to specifically add a high - number of additional glyphs from popular 'iconic fonts' such as Font - Awesome, Devicons, Octicons, and others. - ''; - homepage = https://github.com/ryanoasis/nerd-fonts; - license = licenses.mit; - platforms = platforms.all; - }; -} diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index 6245032246c..7b67c1dd52d 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { particularily useful while programming, to fit a lot of code on your screen. ''; - homepage = https://github.com/lucy/tewi-font; + homepage = "https://github.com/lucy/tewi-font"; license = { fullName = "GNU General Public License with a font exception"; url = "https://www.gnu.org/licenses/gpl-faq.html#FontException"; diff --git a/pkgs/data/fonts/tex-gyre-math/default.nix b/pkgs/data/fonts/tex-gyre-math/default.nix index 8e1d2743174..cd3c3ab00b1 100644 --- a/pkgs/data/fonts/tex-gyre-math/default.nix +++ b/pkgs/data/fonts/tex-gyre-math/default.nix @@ -54,7 +54,7 @@ let ${displayName} family of fonts (see http://www.gust.org.pl/projects/e-foundry/tex-gyre/) in the OpenType format. ''; - homepage = http://www.gust.org.pl/projects/e-foundry/tg-math; + homepage = "http://www.gust.org.pl/projects/e-foundry/tg-math"; # "The TeX Gyre Math fonts are licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or later." - GUST website diff --git a/pkgs/data/fonts/tex-gyre/default.nix b/pkgs/data/fonts/tex-gyre/default.nix index 7e55a70c71a..197d14c3f03 100644 --- a/pkgs/data/fonts/tex-gyre/default.nix +++ b/pkgs/data/fonts/tex-gyre/default.nix @@ -23,7 +23,7 @@ let inherit outputHash; meta = with stdenv.lib; { - homepage = http://www.gust.org.pl/projects/e-foundry/tex-gyre; + homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre"; # "The TeX Gyre fonts are licensed under the GUST Font License (GFL), # which is a free license, legally equivalent to the LaTeX Project Public # License (LPPL), version 1.3c or later." - GUST website diff --git a/pkgs/data/fonts/theano/default.nix b/pkgs/data/fonts/theano/default.nix index 82563205454..360d32f3e62 100644 --- a/pkgs/data/fonts/theano/default.nix +++ b/pkgs/data/fonts/theano/default.nix @@ -17,7 +17,7 @@ in fetchzip rec { sha256 = "1my1symb7k80ys33iphsxvmf6432wx6vjdnxhzhkgrang1rhx1h8"; meta = with lib; { - homepage = https://github.com/akryukov/theano; + homepage = "https://github.com/akryukov/theano"; description = "An old-style font designed from historic samples"; maintainers = with maintainers; [ raskin rycee ]; license = licenses.ofl; diff --git a/pkgs/data/fonts/tlwg/default.nix b/pkgs/data/fonts/tlwg/default.nix index 78700992831..2e3a0a95c05 100644 --- a/pkgs/data/fonts/tlwg/default.nix +++ b/pkgs/data/fonts/tlwg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of Thai scalable fonts available under free licenses"; - homepage = https://linux.thai.net/projects/fonts-tlwg; + homepage = "https://linux.thai.net/projects/fonts-tlwg"; license = with licenses; [ gpl2 publicDomain lppl13c free ]; maintainers = [ maintainers.yrashk ]; }; diff --git a/pkgs/data/fonts/ttf-envy-code-r/default.nix b/pkgs/data/fonts/ttf-envy-code-r/default.nix index 0f670f106fd..4da4aa1823b 100644 --- a/pkgs/data/fonts/ttf-envy-code-r/default.nix +++ b/pkgs/data/fonts/ttf-envy-code-r/default.nix @@ -17,7 +17,7 @@ in fetchzip { sha256 = "0x0r07nax68cmz7490x2crzzgdg4j8fg63wppcmjqm0230bggq2z"; meta = with lib; { - homepage = https://damieng.com/blog/tag/envy-code-r; + homepage = "https://damieng.com/blog/tag/envy-code-r"; description = "Free scalable coding font by DamienG"; license = licenses.unfree; maintainers = [ maintainers.lyt ]; diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 7c90c16d4d1..0f1d5b5a4cc 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -18,7 +18,7 @@ fetchzip { created to complement the Ubuntu tone of voice. It has a contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; - homepage = http://font.ubuntu.com/; + homepage = "http://font.ubuntu.com/"; license = lib.licenses.free; platforms = lib.platforms.all; maintainers = [ lib.maintainers.antono ]; diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index d363f01309b..7168607ce09 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -8,15 +8,15 @@ stdenv.mkDerivation { srcs = [ (fetchurl { - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz; + url = "http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz"; sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh"; }) (fetchurl { - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz; + url = "http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz"; sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51"; }) (fetchurl { - url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz; + url = "http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz"; sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh"; }) ]; diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index c98936b8096..4c13a297c6f 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -3,7 +3,7 @@ fetchzip rec { name = "undefined-medium-1.0"; - url = https://github.com/andirueckel/undefined-medium/archive/v1.0.zip; + url = "https://github.com/andirueckel/undefined-medium/archive/v1.0.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ fetchzip rec { sha256 = "1wa04jzbffshwcxm705yb5wja8wakn8j7fvim1mlih2z1sqw0njk"; meta = with lib; { - homepage = https://undefined-medium.com/; + homepage = "https://undefined-medium.com/"; description = "A pixel grid-based monospace typeface"; longDescription = '' undefined medium is a free and open-source pixel grid-based diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 9cc0fb9adcc..58a5dbcfdbc 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "uni-vga"; src = fetchurl { - url = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz; + url = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz"; sha256 = "05sns8h5yspa7xkl81ri7y1yxf5icgsnl497f3xnaryhx11s2rv6"; }; @@ -55,7 +55,7 @@ stdenv.mkDerivation { meta = { description = "Unicode VGA font"; maintainers = [ maintainers.ftrvxmtrx ]; - homepage = http://www.inp.nsk.su/~bolkhov/files/fonts/univga/; + homepage = "http://www.inp.nsk.su/~bolkhov/files/fonts/univga/"; license = licenses.mit; }; } diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index fc41263fee7..460efc2c581 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -4,16 +4,16 @@ stdenv.mkDerivation rec { pname = "unifont"; - version = "12.1.03"; + version = "13.0.01"; ttf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.ttf"; - sha256 = "10igjlf05d97h3vcggr2ahxmq9ljby4ypja2g4s9bvxs2w1si51p"; + sha256 = "0y5bd7i5hp9ks6d3qq0bshywba7g90i3074wckpn9m8shh98ngcg"; }; pcf = fetchurl { url = "mirror://gnu/unifont/${pname}-${version}/${pname}-${version}.pcf.gz"; - sha256 = "1cd1fnk3m7giqp099kynnjj4m7q00lqm4ybqb1vzd2wi3j4a1awf"; + sha256 = "05zgz00n514cijqh9qcvr4iz0bla4hd028cvi1jlh0ic6fkafix8"; }; nativeBuildInputs = [ libfaketime fonttosfnt mkfontscale ]; @@ -45,10 +45,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; - homepage = http://unifoundry.com/unifont.html; + homepage = "http://unifoundry.com/unifont.html"; # Basically GPL2+ with font exception. - license = http://unifoundry.com/LICENSE.txt; + license = "http://unifoundry.com/LICENSE.txt"; maintainers = [ maintainers.rycee maintainers.vrthra ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/unifont_upper/default.nix b/pkgs/data/fonts/unifont_upper/default.nix index 21d31914479..153c6272ca2 100644 --- a/pkgs/data/fonts/unifont_upper/default.nix +++ b/pkgs/data/fonts/unifont_upper/default.nix @@ -13,10 +13,10 @@ in fetchzip rec { meta = with lib; { description = "Unicode font for glyphs above the Unicode Basic Multilingual Plane"; - homepage = http://unifoundry.com/unifont.html; + homepage = "http://unifoundry.com/unifont.html"; # Basically GPL2+ with font exception. - license = http://unifoundry.com/LICENSE.txt; + license = "http://unifoundry.com/LICENSE.txt"; maintainers = [ maintainers.mathnerd314 maintainers.vrthra ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/unscii/default.nix b/pkgs/data/fonts/unscii/default.nix index 93fe8cdfb74..724d015a7c3 100644 --- a/pkgs/data/fonts/unscii/default.nix +++ b/pkgs/data/fonts/unscii/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { 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; + license = "http://unifoundry.com/LICENSE.txt"; maintainers = [ stdenv.lib.maintainers.raskin ]; - homepage = http://pelulamu.net/unscii/; + homepage = "http://pelulamu.net/unscii/"; }; } diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/data/fonts/uw-ttyp0/default.nix index 1d63b3fa54c..96cde444d2b 100644 --- a/pkgs/data/fonts/uw-ttyp0/default.nix +++ b/pkgs/data/fonts/uw-ttyp0/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Monospace bitmap screen fonts for X11"; - homepage = https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/; + homepage = "https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/"; license = with licenses; [ free mit ]; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index fd74897077f..4b280df5644 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "vdrsymbols-20100612"; - url = http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz; + url = "http://andreas.vdr-developer.org/fonts/download/vdrsymbols-ttf-20100612.tgz"; sha256 = "0wpxns8zqic98c84j18dr4zmj092v07yq07vwwgzblr0rw9n6gzr"; @@ -14,7 +14,7 @@ fetchzip { meta = with lib; { description = "DejaVu fonts with additional symbols used by VDR"; - homepage = http://andreas.vdr-developer.org/fonts/; + homepage = "http://andreas.vdr-developer.org/fonts/"; platforms = platforms.all; maintainers = with maintainers; [ ck3d ]; diff --git a/pkgs/data/fonts/vegur/default.nix b/pkgs/data/fonts/vegur/default.nix index a269f17bf0e..af6c00e32c8 100644 --- a/pkgs/data/fonts/vegur/default.nix +++ b/pkgs/data/fonts/vegur/default.nix @@ -17,7 +17,7 @@ in fetchzip { sha256 = "0iisi2scq72lyj7pc1f36fhfjnm676n5byl4zaavhbxpdrbc6d1v"; meta = with lib; { - homepage = http://dotcolon.net/font/vegur/; + homepage = "http://dotcolon.net/font/vegur/"; description = "A humanist sans serif font."; platforms = platforms.all; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/data/fonts/vista-fonts-chs/default.nix b/pkgs/data/fonts/vista-fonts-chs/default.nix index 6a7cc71133a..5902356703a 100644 --- a/pkgs/data/fonts/vista-fonts-chs/default.nix +++ b/pkgs/data/fonts/vista-fonts-chs/default.nix @@ -5,7 +5,7 @@ fetchzip { name = "vista-fonts-chs-1"; - url = http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE; + url = "http://download.microsoft.com/download/d/6/e/d6e2ff26-5821-4f35-a18b-78c963b1535d/VistaFont_CHS.EXE"; postFetch = '' ${buildPackages.cabextract}/bin/cabextract --lowercase --filter '*.TTF' $downloadedFile @@ -24,7 +24,7 @@ fetchzip { meta = { description = "TrueType fonts from Microsoft Windows Vista For Simplified Chinese (Microsoft YaHei)"; - homepage = https://www.microsoft.com/typography/fonts/family.aspx?FID=350; + homepage = "https://www.microsoft.com/typography/fonts/family.aspx?FID=350"; license = lib.licenses.unfree; maintainers = [ lib.maintainers.ChengCat ]; diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index 59cff1b0f47..df7a6e5383b 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "vista-fonts-1"; - url = https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe; + url = "https://web.archive.org/web/20171225132744/http://download.microsoft.com/download/E/6/7/E675FFFC-2A6D-4AB0-B3EB-27C9F8C8F696/PowerPointViewer.exe"; postFetch = '' ${cabextract}/bin/cabextract --lowercase --filter ppviewer.cab $downloadedFile @@ -25,7 +25,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; + 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... # Set a non-zero priority to allow easy overriding of the diff --git a/pkgs/data/fonts/weather-icons/default.nix b/pkgs/data/fonts/weather-icons/default.nix index 17227367120..cf45152178e 100644 --- a/pkgs/data/fonts/weather-icons/default.nix +++ b/pkgs/data/fonts/weather-icons/default.nix @@ -21,7 +21,7 @@ in fetchzip { ready to be dropped right into Bootstrap, or any project that needs high quality weather, maritime, and meteorological based icons! ''; - homepage = https://erikflowers.github.io/weather-icons/; + homepage = "https://erikflowers.github.io/weather-icons/"; license = licenses.ofl; platforms = platforms.all; maintainers = with maintainers; [ pnelson ]; diff --git a/pkgs/data/fonts/wqy-microhei/default.nix b/pkgs/data/fonts/wqy-microhei/default.nix index dc87e6b634f..f7d3b0333c5 100644 --- a/pkgs/data/fonts/wqy-microhei/default.nix +++ b/pkgs/data/fonts/wqy-microhei/default.nix @@ -14,7 +14,7 @@ fetchzip rec { meta = { description = "A (mainly) Chinese Unicode font"; - homepage = http://wenq.org; + homepage = "http://wenq.org"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.pkmx ]; platforms = lib.platforms.all; diff --git a/pkgs/data/fonts/wqy-zenhei/default.nix b/pkgs/data/fonts/wqy-zenhei/default.nix index 7df1e5aeb2a..5d461d0f5b0 100644 --- a/pkgs/data/fonts/wqy-zenhei/default.nix +++ b/pkgs/data/fonts/wqy-zenhei/default.nix @@ -17,7 +17,7 @@ in fetchzip rec { meta = { description = "A (mainly) Chinese Unicode font"; - homepage = http://wenq.org; + homepage = "http://wenq.org"; license = lib.licenses.gpl2; # with font embedding exceptions maintainers = [ lib.maintainers.pkmx ]; platforms = lib.platforms.all; diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix index e5dd11db72a..af740e40898 100644 --- a/pkgs/data/fonts/xkcd-font/default.nix +++ b/pkgs/data/fonts/xkcd-font/default.nix @@ -19,7 +19,7 @@ in fetchFromGitHub { meta = with lib; { description = "The xkcd font"; - homepage = https://github.com/ipython/xkcd-font; + homepage = "https://github.com/ipython/xkcd-font"; license = licenses.cc-by-nc-30; platforms = platforms.all; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/data/fonts/yanone-kaffeesatz/default.nix b/pkgs/data/fonts/yanone-kaffeesatz/default.nix index e713f4d64a3..bd610938154 100644 --- a/pkgs/data/fonts/yanone-kaffeesatz/default.nix +++ b/pkgs/data/fonts/yanone-kaffeesatz/default.nix @@ -3,7 +3,7 @@ fetchzip { name = "yanone-kaffeesatz-2004"; - url = https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip; + url = "https://yanone.de/2015/data/UIdownloads/Yanone%20Kaffeesatz.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -16,7 +16,7 @@ fetchzip { description = "The free font classic"; maintainers = with lib.maintainers; [ mt-caret ]; platforms = with lib.platforms; all; - homepage = https://yanone.de/fonts/kaffeesatz/; + homepage = "https://yanone.de/fonts/kaffeesatz/"; license = lib.licenses.ofl; }; } diff --git a/pkgs/data/fonts/zilla-slab/default.nix b/pkgs/data/fonts/zilla-slab/default.nix index 369fb53e6ab..a244c04a65c 100644 --- a/pkgs/data/fonts/zilla-slab/default.nix +++ b/pkgs/data/fonts/zilla-slab/default.nix @@ -14,7 +14,7 @@ in fetchzip { sha256 = "1b1ys28hyjcl4qwbnsyi6527nj01g3d6id9jl23fv6f8fjm4ph0f"; meta = with lib; { - homepage = https://github.com/mozilla/zilla-slab; + homepage = "https://github.com/mozilla/zilla-slab"; description = "Zilla Slab fonts"; longDescription = '' Zilla Slab is Mozilla's core typeface, used diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index b0a8a05fc68..a26064cdfa3 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Arc icon theme"; - homepage = https://github.com/horst3180/arc-icon-theme; + homepage = "https://github.com/horst3180/arc-icon-theme"; license = licenses.gpl3; # moka-icon-theme dependency is restricted to linux platforms = platforms.linux; diff --git a/pkgs/data/icons/bibata-cursors/default.nix b/pkgs/data/icons/bibata-cursors/default.nix index d2e35136a8b..66ed71f1f9e 100644 --- a/pkgs/data/icons/bibata-cursors/default.nix +++ b/pkgs/data/icons/bibata-cursors/default.nix @@ -43,7 +43,7 @@ in stdenvNoCC.mkDerivation rec { meta = with stdenvNoCC.lib; { description = "Material Based Cursor"; - homepage = https://github.com/KaizIqbal/Bibata_Cursor; + homepage = "https://github.com/KaizIqbal/Bibata_Cursor"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ rawkode ]; diff --git a/pkgs/data/icons/bibata-cursors/extra.nix b/pkgs/data/icons/bibata-cursors/extra.nix index b9d4c22f878..7977566cb61 100644 --- a/pkgs/data/icons/bibata-cursors/extra.nix +++ b/pkgs/data/icons/bibata-cursors/extra.nix @@ -43,7 +43,7 @@ in stdenvNoCC.mkDerivation rec { meta = with stdenvNoCC.lib; { description = "Cursors Based on Bibata"; - homepage = https://github.com/KaizIqbal/Bibata_Extra_Cursor; + homepage = "https://github.com/KaizIqbal/Bibata_Extra_Cursor"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index d5b541317b5..90e1102e124 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec { meta = with stdenvNoCC.lib; { description = "Translucent Varient of the Material Based Cursor"; - homepage = https://github.com/Silicasandwhich/Bibata_Cursor_Translucent; + homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index efce0a16e13..e1e070c58be 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A sexy and modern icon theme with Tango influences"; - homepage = https://snwh.org/moka; + homepage = "https://snwh.org/moka"; license = with licenses; [ cc-by-sa-40 gpl3 ]; platforms = platforms.all; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 96bd4031150..19d58eeff6f 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The full set of Faba monochrome panel icons"; - homepage = https://snwh.org/moka; + homepage = "https://snwh.org/moka"; license = licenses.gpl3; # moka-icon-theme dependency is restricted to linux platforms = platforms.linux; diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index 53732c61106..90c14ef7d05 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; - version = "20191122"; + version = "20200116"; src = fetchFromGitHub { owner = "daniruiz"; repo = "flat-remix"; rev = version; - sha256 = "1rv35r52l7xxjpajwli0md07k3xl7xplbw919vjmsb1hhrzavzzg"; + sha256 = "14n5wydhd5ifmsbj770s2qg2ksd3xa3m61qxydid6jq39k0lxbd8"; }; nativeBuildInputs = [ gtk3 ]; @@ -26,10 +26,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat remix is a pretty simple icon theme inspired on material design"; - homepage = https://drasite.com/flat-remix; + homepage = "https://drasite.com/flat-remix"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; maintainers = with maintainers; [ mschneider ]; }; -} - +} \ No newline at end of file diff --git a/pkgs/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix new file mode 100644 index 00000000000..30dacbae740 --- /dev/null +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchurl, pkgconfig, 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"; + sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + iconnamingutils + gtk2 + ]; + + dontDropIconThemeCache = true; + + postInstall = '' + # remove a tree of dirs with no files within + rm -r "$out/share/locale" + ''; + + meta = with stdenv.lib; { + description = "Collection of icons for the GNOME 2 desktop"; + homepage = "https://download.gnome.org/sources/gnome-icon-theme/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/icons/hicolor-icon-theme/default.nix b/pkgs/data/icons/hicolor-icon-theme/default.nix index 2c0872188e0..5eefce81a12 100644 --- a/pkgs/data/icons/hicolor-icon-theme/default.nix +++ b/pkgs/data/icons/hicolor-icon-theme/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Default fallback theme used by implementations of the icon theme specification"; - homepage = https://icon-theme.freedesktop.org/releases/; + homepage = "https://icon-theme.freedesktop.org/releases/"; platforms = platforms.unix; }; } diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix new file mode 100644 index 00000000000..1b42c1af612 --- /dev/null +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: + +stdenv.mkDerivation rec { + pname = "iconpack-jade"; + version = "1.22"; + + src = fetchFromGitHub { + owner = "madmaxms"; + repo = pname; + rev = "v${version}"; + sha256 = "1piypv8wdxnfiy6kgh7i3wi52m4fh4x874kh01qjmymssyirn17x"; + }; + + nativeBuildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ hicolor-icon-theme ]; + + dontDropIconThemeCache = true; + + installPhase = '' + mkdir -p $out/share/icons + cp -a Jade* $out/share/icons + ''; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Icon pack based upon Faenza and Mint-X"; + homepage = "https://github.com/madmaxms/iconpack-jade"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index 20bc8dc0a58..fbde3a428c0 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Icons based on Breeze and Super Flat Remix"; - homepage = https://gitlab.manjaro.org/artwork/themes/maia; + homepage = "https://gitlab.manjaro.org/artwork/themes/maia"; license = licenses.lgpl3; maintainers = with maintainers; [ mounium ]; platforms = platforms.all; diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 539dfaa2d10..33798f7b01d 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An icon theme designed with a minimal flat style using simple geometry and bright colours"; - homepage = https://snwh.org/moka; + homepage = "https://snwh.org/moka"; license = with licenses; [ cc-by-sa-40 gpl3 ]; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-cursor-theme/default.nix b/pkgs/data/icons/numix-cursor-theme/default.nix index 8e5a317082e..d0411a8c569 100644 --- a/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/pkgs/data/icons/numix-cursor-theme/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix cursor theme"; - homepage = https://numixproject.github.io; + homepage = "https://numixproject.github.io"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 96ad0e2c2b8..a22b97ec1e7 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; - homepage = https://numixproject.github.io; + homepage = "https://numixproject.github.io"; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 644d20cccfd..92a3ce9091a 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme (square version)"; - homepage = https://numixproject.github.io; + homepage = "https://numixproject.github.io"; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index d3bcdb12d3d..46c61d861a3 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme"; - version = "19.09.20"; + version = "20.03.20"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0pn3x0mmsph777lwhg890ck366p31bjl3755h4pv161ym08d4z9w"; + sha256 = "092f8k38xf9yz898nrangm0ia211d41z8kx0v6njfqfgpiad1s7q"; }; nativeBuildInputs = [ gtk3 ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Numix icon theme"; - homepage = https://numixproject.github.io; + homepage = "https://numixproject.github.io"; license = licenses.gpl3; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 477960972a7..1531bdf2af8 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern icon theme designed around bold colours and simple geometric shapes"; - homepage = https://snwh.org/paper; + homepage = "https://snwh.org/paper"; license = with licenses; [ cc-by-sa-40 lgpl3 ]; # darwin cannot deal with file names differing only in case platforms = platforms.linux; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index 8055b19ad63..d01410f28da 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 = "20200301"; + version = "20200405"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "1hknprylmd5zciaz4nkysmbb03am41r9dgnzm3r9l8qg2548js9v"; + sha256 = "0qv4340avm5s0640r8aznbfwjzvm6k64840qggyg9jfcy6223pdy"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix index e15e64c2101..a90182cc8d7 100644 --- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Manjaro variation of Papirus icon theme"; - homepage = https://github.com/Ste74/papirus-maia-icon-theme; + homepage = "https://github.com/Ste74/papirus-maia-icon-theme"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index a4a7237f974..fe749598495 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "A basic set of icons"; - homepage = http://tango.freedesktop.org/Tango_Icon_Library; + homepage = "http://tango.freedesktop.org/Tango_Icon_Library"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix index f271d7a44e6..c92a8052700 100644 --- a/pkgs/data/icons/vanilla-dmz/default.nix +++ b/pkgs/data/icons/vanilla-dmz/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { install -Dm644 DMZ-Black/index.theme $out/share/icons/Vanilla-DMZ-AA/index.theme ''; meta = with lib; { - homepage = http://jimmac.musichall.cz; + homepage = "http://jimmac.musichall.cz"; description = "A style neutral scalable cursor theme"; platforms = platforms.all; license = licenses.cc-by-nc-sa-30; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index c3670a6f58c..9014819fba5 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icon pack flat with light colors"; - homepage = https://github.com/zayronxio/Zafiro-icons; + homepage = "https://github.com/zayronxio/Zafiro-icons"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/data/machine-learning/mnist/default.nix b/pkgs/data/machine-learning/mnist/default.nix index fe9e83492e4..44a70ac5d1e 100644 --- a/pkgs/data/machine-learning/mnist/default.nix +++ b/pkgs/data/machine-learning/mnist/default.nix @@ -37,7 +37,7 @@ in Technology database) is a large database of handwritten digits that is commonly used for training various image processing systems. ''; - homepage = http://yann.lecun.com/exdb/mnist/index.html; + homepage = "http://yann.lecun.com/exdb/mnist/index.html"; license = licenses.cc-by-sa-30; platforms = platforms.all; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/data/misc/brise/default.nix b/pkgs/data/misc/brise/default.nix index f1e0604acf8..4f5b2e972e1 100644 --- a/pkgs/data/misc/brise/default.nix +++ b/pkgs/data/misc/brise/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { to support various Chinese input methods, including those based on modern dialects or historical diasystems of the Chinese language. ''; - homepage = https://rime.im; + homepage = "https://rime.im"; # Note that individual packages in this collection # may be released under different licenses license = licenses.gpl3; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 34dd48b897f..27aa60ac09f 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = https://curl.haxx.se/docs/caextract.html; + homepage = "https://curl.haxx.se/docs/caextract.html"; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/pkgs/data/misc/cldr-emoji-annotation/default.nix index 4279cf8aec4..289f6d66340 100644 --- a/pkgs/data/misc/cldr-emoji-annotation/default.nix +++ b/pkgs/data/misc/cldr-emoji-annotation/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Emoji annotation files in CLDR"; homepage = "https://www.unicode.org/"; - license = licenses.free; # https://www.unicode.org/license.html + license = licenses.unicode-dfs-2016; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 3cadb477ae8..d0d18d47335 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitor database for DDCcontrol"; - homepage = https://github.com/ddccontrol/ddccontrol-db; + homepage = "https://github.com/ddccontrol/ddccontrol-db"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/pkgs/data/misc/freepats/default.nix b/pkgs/data/misc/freepats/default.nix index e48470a67bb..a1fa49bae27 100644 --- a/pkgs/data/misc/freepats/default.nix +++ b/pkgs/data/misc/freepats/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { Freepats is a project to create a free and open set of instrument patches, in any format, that can be used with softsynths. ''; - homepage = http://freepats.zenvoid.org/; + homepage = "http://freepats.zenvoid.org/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix index 8cbd526f3d3..4fcbe8d0283 100644 --- a/pkgs/data/misc/geolite-legacy/default.nix +++ b/pkgs/data/misc/geolite-legacy/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "GeoLite Legacy IP geolocation databases"; - homepage = https://geolite.maxmind.com/download/geoip; + homepage = "https://geolite.maxmind.com/download/geoip"; license = licenses.cc-by-sa-30; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 96617bb0f27..960d1aef121 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/fcb0ed924c8504d54870d6dc2092b9dab8305732.tar.gz"; - sha256 = "0b7dxgj40y9svddrx14scnxls20ww4f717zhz3lwigb16dm4crpi"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/90b24a91103dca4f0df6cb28cecb205a7d7ab650.tar.gz"; + sha256 = "1zfj8c6s9icqg83ycfvd150s4jd07ccbjg2w2mn10rx5ng76mn53"; } diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index 3124b57ac2b..d7d6c062e0c 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -13,7 +13,7 @@ in fetchzip { ''; meta = with stdenv.lib; { - homepage = https://github.com/Mic92/iana-etc; + homepage = "https://github.com/Mic92/iana-etc"; description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/data/misc/libkkc-data/default.nix b/pkgs/data/misc/libkkc-data/default.nix index cb446e9b0bc..aeb15057abf 100644 --- a/pkgs/data/misc/libkkc-data/default.nix +++ b/pkgs/data/misc/libkkc-data/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Language model data package for libkkc"; - homepage = https://github.com/ueno/libkkc; + homepage = "https://github.com/ueno/libkkc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vanzef ]; platforms = platforms.linux; diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix index 0ac5dc51d6b..0307bf8d0ed 100644 --- a/pkgs/data/misc/media-player-info/default.nix +++ b/pkgs/data/misc/media-player-info/default.nix @@ -23,7 +23,7 @@ in meta = with stdenv.lib; { description = "A repository of data files describing media player capabilities"; - homepage = https://www.freedesktop.org/wiki/Software/media-player-info/; + homepage = "https://www.freedesktop.org/wiki/Software/media-player-info/"; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; linux; diff --git a/pkgs/data/misc/mime-types/default.nix b/pkgs/data/misc/mime-types/default.nix index 65ad964736d..b18b66a227e 100644 --- a/pkgs/data/misc/mime-types/default.nix +++ b/pkgs/data/misc/mime-types/default.nix @@ -13,7 +13,7 @@ in fetchzip rec { meta = with stdenv.lib; { description = "A database of common mappings of file extensions to MIME types"; - homepage = https://packages.gentoo.org/packages/app-misc/mime-types; + homepage = "https://packages.gentoo.org/packages/app-misc/mime-types"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index 4e1d1e02a2f..3d1caf9ae51 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/miscfiles/; + homepage = "https://www.gnu.org/software/miscfiles/"; license = licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index a2df56c0898..c9f24c9e85e 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mobile broadband service provider database"; - homepage = https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders; + homepage = "https://wiki.gnome.org/Projects/NetworkManager/MobileBroadband/ServiceProviders"; license = licenses.publicDomain; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/data/misc/nixos-artwork/grub2-theme.nix b/pkgs/data/misc/nixos-artwork/grub2-theme.nix index 8bc6c8adc13..0a5717ba3b2 100644 --- a/pkgs/data/misc/nixos-artwork/grub2-theme.nix +++ b/pkgs/data/misc/nixos-artwork/grub2-theme.nix @@ -1,5 +1,5 @@ {fetchzip}: fetchzip { - url = https://github.com/NixOS/nixos-artwork/releases/download/bootloader-18.09-pre/grub2-installer.tar.bz2; + url = "https://github.com/NixOS/nixos-artwork/releases/download/bootloader-18.09-pre/grub2-installer.tar.bz2"; sha256 = "0rhh061m1hpgadm7587inw3fxfacnd53xjc53w3vzghlck56djq5"; } diff --git a/pkgs/data/misc/nixos-artwork/icons.nix b/pkgs/data/misc/nixos-artwork/icons.nix index 1c14bcc9f98..caab674393a 100644 --- a/pkgs/data/misc/nixos-artwork/icons.nix +++ b/pkgs/data/misc/nixos-artwork/icons.nix @@ -9,5 +9,5 @@ stdenv.mkDerivation { sha256 = "0wp08b1gh2chs1xri43wziznyjcplx0clpsrb13wzyscv290ay5a"; }; makeFlags = [ "DESTDIR=$(out)" "prefix=" ]; - buildInputs = [ imagemagick ]; + nativeBuildInputs = [ imagemagick ]; } diff --git a/pkgs/data/misc/nixos-artwork/wallpapers.nix b/pkgs/data/misc/nixos-artwork/wallpapers.nix index 3983869a452..a6a368e26e0 100644 --- a/pkgs/data/misc/nixos-artwork/wallpapers.nix +++ b/pkgs/data/misc/nixos-artwork/wallpapers.nix @@ -24,7 +24,7 @@ _EOF meta = with stdenv.lib; { inherit description; - homepage = https://github.com/NixOS/nixos-artwork; + homepage = "https://github.com/NixOS/nixos-artwork"; license = licenses.free; platforms = platforms.all; }; @@ -40,7 +40,7 @@ rec { name = "mosaic-blue-2016-02-19"; description = "Mosaic blue background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-mosaic-blue.png"; sha256 = "1cbcssa8qi0giza0k240w5yy4yb2bhc1p1r7pw8qmziprcmwv5n5"; }; }; @@ -49,7 +49,7 @@ rec { name = "simple-blue-2016-02-19"; description = "Simple blue background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-blue.png"; sha256 = "1llr175m454aqixxwbp3kb5qml2hi1kn7ia6lm7829ny6y7xrnms"; }; }; @@ -58,7 +58,7 @@ rec { name = "simple-dark-gray-2016-02-19"; description = "Simple dark gray background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-dark-gray.png"; sha256 = "1282cnqc5qynp0q9gdll7bgpw23yp5bhvaqpar59ibkh3iscg8i5"; }; }; @@ -67,7 +67,7 @@ rec { name = "simple-dark-gray-bootloader-2018-08-28"; description = "Simple dark gray background for NixOS, specifically bootloaders."; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/9d1f11f652ed5ffe460b6c602fbfe2e7e9a08dff/bootloader/nix-wallpaper-simple-dark-gray_bootloader.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/9d1f11f652ed5ffe460b6c602fbfe2e7e9a08dff/bootloader/nix-wallpaper-simple-dark-gray_bootloader.png"; sha256 = "0v26kfydn7alr81f2qpgsqdiq2zk7yrwlgibx2j7k91z9h47dpj9"; }; }; @@ -76,7 +76,7 @@ rec { name = "simple-dark-gray-2018-08-28"; description = "Simple dark gray background for NixOS, specifically bootloaders and graphical login."; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/783c38b22de09f6ee33aacc817470a4513392d83/wallpapers/nix-wallpaper-simple-dark-gray_bottom.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/783c38b22de09f6ee33aacc817470a4513392d83/wallpapers/nix-wallpaper-simple-dark-gray_bottom.png"; sha256 = "13hi4jwp5ga06dpdw5l03b4znwn58fdjlkqjkg824isqsxzv6k15"; }; }; @@ -85,7 +85,7 @@ rec { name = "simple-light-gray-2016-02-19"; description = "Simple light gray background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-light-gray.png"; sha256 = "0i6d0xv1nzrv7na9hjrgzl3jrwn81vnprnq2pxyznlxbjcgkjnk2"; }; }; @@ -94,7 +94,7 @@ rec { name = "simple-red-2016-02-19"; description = "Simple red background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-simple-red.png"; sha256 = "16drprsi3q8xbxx3bxp54yld04c4lq6jankw8ww1irg7z61a6wjs"; }; }; @@ -103,7 +103,7 @@ rec { name = "stripes-logo-2016-02-19"; description = "Stripes logo background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes-logo.png"; sha256 = "0cqjkgp30428c1yy8s4418k4qz0ycr6fzcg4rdi41wkh5g1hzjnl"; }; }; @@ -112,7 +112,7 @@ rec { name = "stripes-2016-02-19"; description = "Stripes background for Nix"; src = fetchurl { - url = https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png; + url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/766f10e0c93cb1236a85925a089d861b52ed2905/wallpapers/nix-wallpaper-stripes.png"; sha256 = "116337wv81xfg0g0bsylzzq2b7nbj6hjyh795jfc9mvzarnalwd3"; }; }; diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix index 9afe4a9e400..7fb2aa2f811 100644 --- a/pkgs/data/misc/osinfo-db/default.nix +++ b/pkgs/data/misc/osinfo-db/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Osinfo database of information about operating systems for virtualization provisioning tools"; - homepage = "https://libosinfo.org/"; + homepage = "https://gitlab.com/libosinfo/osinfo-db/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/data/misc/pari-galdata/default.nix b/pkgs/data/misc/pari-galdata/default.nix index 2535e8cfc25..b07be5a0c05 100644 --- a/pkgs/data/misc/pari-galdata/default.nix +++ b/pkgs/data/misc/pari-galdata/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "PARI database needed to compute Galois group in degrees 8 through 11"; - homepage = http://pari.math.u-bordeaux.fr/; + homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/data/misc/pari-seadata-small/default.nix b/pkgs/data/misc/pari-seadata-small/default.nix index 3470a0804f7..01ffd6db64f 100644 --- a/pkgs/data/misc/pari-seadata-small/default.nix +++ b/pkgs/data/misc/pari-seadata-small/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "PARI database needed by ellap for large primes"; - homepage = http://pari.math.u-bordeaux.fr/; + homepage = "http://pari.math.u-bordeaux.fr/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/data/misc/poppler-data/default.nix b/pkgs/data/misc/poppler-data/default.nix index d14ccdec2ea..c06e63d3e69 100644 --- a/pkgs/data/misc/poppler-data/default.nix +++ b/pkgs/data/misc/poppler-data/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; meta = with stdenv.lib; { - homepage = https://poppler.freedesktop.org/; + homepage = "https://poppler.freedesktop.org/"; description = "Encoding files for Poppler, a PDF rendering library"; platforms = platforms.all; license = licenses.free; # more free licenses combined diff --git a/pkgs/data/misc/scowl/default.nix b/pkgs/data/misc/scowl/default.nix index f15a7534e26..686582b48ce 100644 --- a/pkgs/data/misc/scowl/default.nix +++ b/pkgs/data/misc/scowl/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "scowl"; - version = "2018.04.16"; + version = "2019.10.06"; src = fetchFromGitHub { owner = "en-wl"; repo = "wordlist"; rev = "rel-${version}"; - sha256 = "0p0hgg5y88bb802z210cdk1c4fjwlpxxkci6yph3fk7g6s9xc73g"; + sha256 = "1daag7h63gdijp1lv3v93bx5kmcb5zsyydsd57kv0a6kk3vs819x"; }; postPatch = '' diff --git a/pkgs/data/misc/shared-desktop-ontologies/default.nix b/pkgs/data/misc/shared-desktop-ontologies/default.nix index 72895653479..7e628567b6e 100644 --- a/pkgs/data/misc/shared-desktop-ontologies/default.nix +++ b/pkgs/data/misc/shared-desktop-ontologies/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://oscaf.sourceforge.net/; + homepage = "http://oscaf.sourceforge.net/"; description = "Ontologies necessary for the Nepomuk semantic desktop"; longDescription = '' The shared-desktop-ontologies package brings the semantic web to the diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix index 4594ffc2392..4d286ad0f0a 100644 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A database of common MIME types"; - homepage = http://freedesktop.org/wiki/Software/shared-mime-info; + homepage = "http://freedesktop.org/wiki/Software/shared-mime-info"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix index 355a2c2c577..90829006194 100644 --- a/pkgs/data/misc/sound-theme-freedesktop/default.nix +++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Freedesktop reference sound theme"; - homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec; + homepage = "http://freedesktop.org/wiki/Specifications/sound-theme-spec"; # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS: license = with licenses; [ cc-by-30 cc-by-sa-25 gpl2 gpl2Plus ]; platforms = with platforms; unix; diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix index 3227d9a7623..367ee06390c 100644 --- a/pkgs/data/misc/tzdata/default.nix +++ b/pkgs/data/misc/tzdata/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { setupHook = ./tzdata-setup-hook.sh; meta = with stdenv.lib; { - homepage = http://www.iana.org/time-zones; + homepage = "http://www.iana.org/time-zones"; description = "Database of current and historical time zones"; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/data/misc/unicode-character-database/default.nix b/pkgs/data/misc/unicode-character-database/default.nix index 1eda25fbe2b..e52f21713ed 100644 --- a/pkgs/data/misc/unicode-character-database/default.nix +++ b/pkgs/data/misc/unicode-character-database/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unicode Character Database"; homepage = "https://www.unicode.org/"; - license = licenses.free; # https://www.unicode.org/license.html + license = licenses.unicode-dfs-2016; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/unicode-emoji/default.nix b/pkgs/data/misc/unicode-emoji/default.nix index 05472b26d88..b7705d7ee5b 100644 --- a/pkgs/data/misc/unicode-emoji/default.nix +++ b/pkgs/data/misc/unicode-emoji/default.nix @@ -53,7 +53,7 @@ symlinkJoin rec { meta = with stdenv.lib; { description = "Unicode Emoji Data Files"; homepage = "https://home.unicode.org/emoji/"; - license = licenses.free; # https://www.unicode.org/license.html + license = licenses.unicode-dfs-2016; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/unihan-database/default.nix b/pkgs/data/misc/unihan-database/default.nix index 77da77242a9..d5d62403cc3 100644 --- a/pkgs/data/misc/unihan-database/default.nix +++ b/pkgs/data/misc/unihan-database/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unicode Han Database"; homepage = "https://www.unicode.org/"; - license = licenses.free; # https://www.unicode.org/license.html + license = licenses.unicode-dfs-2016; platforms = platforms.all; }; } diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix index 43847b4b3b6..45ff07b8efc 100644 --- a/pkgs/data/misc/wireless-regdb/default.nix +++ b/pkgs/data/misc/wireless-regdb/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless regulatory database for CRDA"; - homepage = http://wireless.kernel.org/en/developers/Regulatory/; + homepage = "http://wireless.kernel.org/en/developers/Regulatory/"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/data/misc/xorg-rgb/default.nix b/pkgs/data/misc/xorg-rgb/default.nix index 12acc424b9d..e976fe1358d 100644 --- a/pkgs/data/misc/xorg-rgb/default.nix +++ b/pkgs/data/misc/xorg-rgb/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://xorg.freedesktop.org/; + homepage = "http://xorg.freedesktop.org/"; }; } diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index 17303e682b9..68bc6101d03 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation"; - homepage = https://docbook.org/xml/5.0/; + homepage = "https://docbook.org/xml/5.0/"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; }; 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 9728b2f96c4..0faad5b594f 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 @@ -3,12 +3,12 @@ let src = fetchurl { - url = http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip; + url = "http://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip"; sha256 = "0f25ch7bywwhdxb1qa0hl28mgq1blqdap3rxzamm585rf4kis9i0"; }; isoents = fetchurl { - url = http://www.oasis-open.org/cover/ISOEnts.zip; + url = "http://www.oasis-open.org/cover/ISOEnts.zip"; sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"; }; 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 78b99081504..4b0ced9daae 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 @@ -3,12 +3,12 @@ let src = fetchurl { - url = http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip; + url = "http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip"; sha256 = "04b3gp4zkh9c5g9kvnywdkdfkcqx3kjc04j4mpkr4xk7lgqgrany"; }; isoents = fetchurl { - url = http://www.oasis-open.org/cover/ISOEnts.zip; + url = "http://www.oasis-open.org/cover/ISOEnts.zip"; sha256 = "1clrkaqnvc1ja4lj8blr0rdlphngkcda3snm7b9jzvcn76d3br6w"; }; 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 3d8e16443db..a3b7067b2a4 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 @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "docbook-xml-ebnf-1.2b1"; dtd = fetchurl { - url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd; + url = "http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd"; sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; 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 35e69641f11..de126da9f90 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 @@ -5,7 +5,7 @@ let # Urgh, DocBook 4.1.2 doesn't come with an XML catalog. Use the one # from 4.2. docbook42catalog = fetchurl { - url = http://www.docbook.org/xml/4.2/catalog.xml; + url = "http://www.docbook.org/xml/4.2/catalog.xml"; sha256 = "18lhp6q2l0753s855r638shkbdwq9blm6akdjsc9nrik24k38j17"; }; @@ -15,7 +15,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.1.2"; src = fetchurl { - url = http://www.docbook.org/xml/4.1.2/docbkx412.zip; + url = "http://www.docbook.org/xml/4.1.2/docbkx412.zip"; sha256 = "0wkp5rvnqj0ghxia0558mnn4c7s3n501j99q2isp3sp0ci069w1h"; }; postInstall = " 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 f8c827e826d..f894db24827 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 @@ -4,7 +4,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.2"; src = fetchurl { - url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; + url = "http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip"; sha256 = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2"; }; meta = { 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 2c253a1029d..dc2ec36ccef 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 @@ -4,7 +4,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.3"; src = fetchurl { - url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; + url = "http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip"; sha256 = "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"; }; meta = { 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 d051d205808..93b03d85457 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 @@ -4,7 +4,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.4"; src = fetchurl { - url = http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip; + url = "http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip"; sha256 = "141h4zsyc71sfi2zzd89v4bb4qqq9ca1ri9ix2als9f4i3mmkw82"; }; meta = { 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 156ee653bbe..5bdb63e69da 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 @@ -4,7 +4,7 @@ import ./generic.nix { inherit stdenv unzip findXMLCatalogs; name = "docbook-xml-4.5"; src = fetchurl { - url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip; + url = "http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip"; sha256 = "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf"; }; meta = { 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 54ef5225d2f..383a8750f1f 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/xhtml1/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xhtml1-20020801"; src = fetchurl { - url = http://www.w3.org/TR/xhtml1/xhtml1.tgz; + url = "http://www.w3.org/TR/xhtml1/xhtml1.tgz"; sha256 = "0rr0d89i0z75qvjbm8il93bippx09hbmjwy0y2sj44n9np69x3hl"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; # */ meta = { - homepage = http://www.w3.org/TR/xhtml1/; + homepage = "http://www.w3.org/TR/xhtml1/"; description = "DTDs for XHTML 1.0, the Extensible HyperText Markup Language"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 8aa1f0b6330..28737253af5 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -17,7 +17,7 @@ let # Prevent a potential stack overflow # https://github.com/docbook/xslt10-stylesheets/pull/37 (fetchpatch { - url = https://src.fedoraproject.org/rpms/docbook-style-xsl/raw/e3ae7a97ed1d185594dd35954e1a02196afb205a/f/docbook-style-xsl-non-recursive-string-subst.patch; + url = "https://src.fedoraproject.org/rpms/docbook-style-xsl/raw/e3ae7a97ed1d185594dd35954e1a02196afb205a/f/docbook-style-xsl-non-recursive-string-subst.patch"; sha256 = "0lrjjg5kpwwmbhkxzz6i5zmimb6lsvrrdhzc2qgjmb3r6jnsmii3"; stripLen = "1"; }) @@ -63,7 +63,7 @@ let ''; meta = { - homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets; + homepage = "http://wiki.docbook.org/topic/DocBookXslStylesheets"; description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.all; diff --git a/pkgs/data/soundfonts/fluid/default.nix b/pkgs/data/soundfonts/fluid/default.nix index 18c4160014f..c1c318383a0 100644 --- a/pkgs/data/soundfonts/fluid/default.nix +++ b/pkgs/data/soundfonts/fluid/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Frank Wen's pro-quality GM/GS soundfont"; - homepage = http://www.hammersound.net/; + homepage = "http://www.hammersound.net/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix index 47740aa6762..fed16da929c 100644 --- a/pkgs/data/themes/adapta-kde/default.nix +++ b/pkgs/data/themes/adapta-kde/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the Adapta theme for Plasma"; - homepage = https://git.io/adapta-kde; + homepage = "https://git.io/adapta-kde"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.tadfisher ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index 02812b1f939..ca8e908009f 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An adaptive GTK theme based on Material Design Guidelines"; - homepage = https://github.com/adapta-project/adapta-gtk-theme; + homepage = "https://github.com/adapta-project/adapta-gtk-theme"; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/data/themes/adementary/default.nix index 1cb7ac53432..4c8362b346b 100644 --- a/pkgs/data/themes/adementary/default.nix +++ b/pkgs/data/themes/adementary/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme"; - homepage = https://github.com/hrdwrrsk/adementary-theme; + homepage = "https://github.com/hrdwrrsk/adementary-theme"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index 7428b5fab2f..9d5334bc79b 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -34,7 +34,7 @@ mkDerivation rec { meta = with lib; { description = "A style to bend Qt applications to look like they belong into GNOME Shell"; - homepage = https://github.com/FedoraQt/adwaita-qt; + homepage = "https://github.com/FedoraQt/adwaita-qt"; license = licenses.gpl2Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/albatross/default.nix b/pkgs/data/themes/albatross/default.nix index 870b348cc32..1baa977d101 100644 --- a/pkgs/data/themes/albatross/default.nix +++ b/pkgs/data/themes/albatross/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A desktop Suite for Xfce"; - homepage = https://github.com/shimmerproject/Albatross; + homepage = "https://github.com/shimmerproject/Albatross"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index 4937a99daec..c0db85105d5 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the arc theme for Plasma"; - homepage = https://git.io/arc-kde; + homepage = "https://git.io/arc-kde"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.nixy ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 8dcfacadb49..c08d4c57786 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-gnome-shell=${stdenv.lib.versions.majorMinor gnome3.gnome-shell.version}" + "--disable-gnome-shell" # 3.36 not supported "--disable-unity" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; - homepage = https://github.com/arc-design/arc-theme; + homepage = "https://github.com/arc-design/arc-theme"; license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/blackbird/default.nix b/pkgs/data/themes/blackbird/default.nix index 7ffefb1d67f..f4a2fbb7bbe 100644 --- a/pkgs/data/themes/blackbird/default.nix +++ b/pkgs/data/themes/blackbird/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Dark Desktop Suite for Gtk, Xfce and Metacity"; - homepage = https://github.com/shimmerproject/Blackbird; + 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 ]; diff --git a/pkgs/data/themes/clearlooks-phenix/default.nix b/pkgs/data/themes/clearlooks-phenix/default.nix index 2f701b9b765..4de923da9cf 100644 --- a/pkgs/data/themes/clearlooks-phenix/default.nix +++ b/pkgs/data/themes/clearlooks-phenix/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { the default theme for Gnome 2. Style is also included for GTK2, Unity and for Metacity, Openbox and Xfwm4 window managers. ''; - homepage = https://github.com/jpfleury/clearlooks-phenix; - downloadPage = https://github.com/jpfleury/clearlooks-phenix/releases; + homepage = "https://github.com/jpfleury/clearlooks-phenix"; + downloadPage = "https://github.com/jpfleury/clearlooks-phenix/releases"; license = licenses.gpl3; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/e17gtk/default.nix b/pkgs/data/themes/e17gtk/default.nix index 74f0a54ccef..c666cc5d0aa 100644 --- a/pkgs/data/themes/e17gtk/default.nix +++ b/pkgs/data/themes/e17gtk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An Enlightenment-like GTK theme with sharp corners"; - homepage = https://github.com/tsujan/E17gtk; + homepage = "https://github.com/tsujan/E17gtk"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/data/themes/gnome-breeze/default.nix b/pkgs/data/themes/gnome-breeze/default.nix index 200cc4bae05..25d6d60d652 100644 --- a/pkgs/data/themes/gnome-breeze/default.nix +++ b/pkgs/data/themes/gnome-breeze/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "A GTK theme built to match KDE's breeze theme"; - homepage = https://github.com/dirruk1/gnome-breeze; + homepage = "https://github.com/dirruk1/gnome-breeze"; license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ bennofs ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/data/themes/jade1/default.nix b/pkgs/data/themes/jade1/default.nix index cba38cb297a..7398c417933 100644 --- a/pkgs/data/themes/jade1/default.nix +++ b/pkgs/data/themes/jade1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-jade1"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-jade-1"; rev = "v${version}"; - sha256 = "1lnajrsikw6dljf6dvgmj8aqwywmgdp34h3xsc0xiyq07arhp606"; + sha256 = "19vg95bf0ylmfhg0frs2k0k7c0wfn933h06wrklb9p5qy84hfig3"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications"; + description = "Based on Linux Mint theme with dark menus and more intensive green"; homepage = "https://github.com/madmaxms/theme-jade-1"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix index 15ec68b0757..cda1a4e7d0b 100644 --- a/pkgs/data/themes/lounge/default.nix +++ b/pkgs/data/themes/lounge/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple and clean GTK theme with vintage scrollbars, inspired by Absolute, based on Adwaita"; - homepage = https://github.com/monday15/lounge-gtk-theme; + homepage = "https://github.com/monday15/lounge-gtk-theme"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix index ecf508a61b3..75d31acb83f 100644 --- a/pkgs/data/themes/matcha/default.nix +++ b/pkgs/data/themes/matcha/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "matcha"; - version = "2020-03-24"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "13lcv2cihb24zjsdzhh188kd1rga49mzfa2sddqd63pqxxph188z"; + sha256 = "0arnc12zsbypv550dv5j22z4hkc58yncxqhc03xcmxjw1h8lzrwv"; }; buildInputs = [ gdk-pixbuf librsvg ]; diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index 4a1458ee7a5..a93c242d2da 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Material Design theme for GNOME/GTK based desktop environments"; - homepage = https://github.com/nana-4/materia-theme; + homepage = "https://github.com/nana-4/materia-theme"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.mounium ]; diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix index 0bd71b46c0d..751dd690d11 100644 --- a/pkgs/data/themes/mojave/default.nix +++ b/pkgs/data/themes/mojave/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mac OSX Mojave like theme for GTK based desktop environments"; - homepage = https://github.com/vinceliuice/Mojave-gtk-theme; + homepage = "https://github.com/vinceliuice/Mojave-gtk-theme"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/numix-solarized/default.nix b/pkgs/data/themes/numix-solarized/default.nix index 0596141da80..ae8a1d7145e 100644 --- a/pkgs/data/themes/numix-solarized/default.nix +++ b/pkgs/data/themes/numix-solarized/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { and icons to use the solarized theme with a solarized green accent color. This theme supports both the dark and light theme, just as Numix proper. ''; - homepage = https://github.com/Ferdi265/numix-solarized-gtk-theme; - downloadPage = https://github.com/Ferdi265/numix-solarized-gtk-theme/releases; + homepage = "https://github.com/Ferdi265/numix-solarized-gtk-theme"; + downloadPage = "https://github.com/Ferdi265/numix-solarized-gtk-theme/releases"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.offline ]; diff --git a/pkgs/data/themes/numix-sx/default.nix b/pkgs/data/themes/numix-sx/default.nix index 72e87e2e274..7c8cf77dfc4 100644 --- a/pkgs/data/themes/numix-sx/default.nix +++ b/pkgs/data/themes/numix-sx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Gray variation of Numix theme"; - homepage = https://www.gnome-look.org/p/1117412/; + homepage = "https://www.gnome-look.org/p/1117412/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.sauyon ]; diff --git a/pkgs/data/themes/numix/default.nix b/pkgs/data/themes/numix/default.nix index e01f8174e9e..879a1356153 100644 --- a/pkgs/data/themes/numix/default.nix +++ b/pkgs/data/themes/numix/default.nix @@ -24,7 +24,7 @@ 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; + homepage = "https://numixproject.github.io"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/data/themes/obsidian2/default.nix b/pkgs/data/themes/obsidian2/default.nix index 452ee0f8897..25d6218e4bf 100644 --- a/pkgs/data/themes/obsidian2/default.nix +++ b/pkgs/data/themes/obsidian2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "madmaxms"; repo = "theme-obsidian-2"; rev = "v${version}"; - sha256 = "123f6hpz0h5xfmas44xa1ci68w8f3lcjj54jpnrqhsww66c9vs0i"; + sha256 = "0n64cml2h8dw2m2m6j90d515saqapqzjz6xcv4kr544ibv62hn61"; }; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome theme, based upon Adwaita-Maia dark skin"; - homepage = https://github.com/madmaxms/theme-obsidian-2; + homepage = "https://github.com/madmaxms/theme-obsidian-2"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/onestepback/default.nix b/pkgs/data/themes/onestepback/default.nix index 64ead2f75f4..0385ca90f61 100644 --- a/pkgs/data/themes/onestepback/default.nix +++ b/pkgs/data/themes/onestepback/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gtk theme inspired by the NextStep look"; - homepage = http://www.vide.memoire.free.fr/perso/OneStepBack; + homepage = "http://www.vide.memoire.free.fr/perso/OneStepBack"; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/orion/default.nix b/pkgs/data/themes/orion/default.nix index 9ba8cd368cf..b44cc857c62 100644 --- a/pkgs/data/themes/orion/default.nix +++ b/pkgs/data/themes/orion/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/shimmerproject/Orion; + homepage = "https://github.com/shimmerproject/Orion"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/data/themes/paper-gtk/default.nix b/pkgs/data/themes/paper-gtk/default.nix index e7235a900cf..6f6c8b7851f 100644 --- a/pkgs/data/themes/paper-gtk/default.nix +++ b/pkgs/data/themes/paper-gtk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A modern desktop theme suite featuring a mostly flat with a minimal use of shadows for depth"; - homepage = https://snwh.org/paper; + homepage = "https://snwh.org/paper"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.simonvandel maintainers.romildo ]; diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix index c949965cb87..719b1ce1a48 100644 --- a/pkgs/data/themes/qtcurve/default.nix +++ b/pkgs/data/themes/qtcurve/default.nix @@ -53,7 +53,7 @@ in mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/QtCurve/qtcurve; + homepage = "https://github.com/QtCurve/qtcurve"; description = "Widget styles for Qt5/Plasma 5 and gtk2"; platforms = platforms.linux; license = licenses.lgpl21Plus; diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix index 0c9cef9e097..470010eb54a 100644 --- a/pkgs/data/themes/sierra/default.nix +++ b/pkgs/data/themes/sierra/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Mac OSX like theme for GTK based desktop environments"; - homepage = https://github.com/vinceliuice/Sierra-gtk-theme; + homepage = "https://github.com/vinceliuice/Sierra-gtk-theme"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/data/themes/solarc/default.nix b/pkgs/data/themes/solarc/default.nix index 96843e8d78b..b8e937564a5 100644 --- a/pkgs/data/themes/solarc/default.nix +++ b/pkgs/data/themes/solarc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Solarized version of the Arc theme"; - homepage = https://github.com/schemar/solarc-theme; + homepage = "https://github.com/schemar/solarc-theme"; license = licenses.gpl3; maintainers = [ maintainers.bricewge ]; platforms = platforms.linux; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 27a879af184..9e56326b2eb 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ubuntu community theme 'yaru' - default Ubuntu theme since 18.10"; - homepage = https://github.com/ubuntu/yaru; + homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.jD91mZM2 ]; diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index aa3e3f78b91..60ea33ca6ba 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -70,7 +70,7 @@ EOF meta = with stdenv.lib; { description = "Common Desktop Environment"; - homepage = https://sourceforge.net/projects/cdesktopenv/; + homepage = "https://sourceforge.net/projects/cdesktopenv/"; license = licenses.lgpl2; maintainers = [ maintainers.gnidorah ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch b/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch new file mode 100644 index 00000000000..156573c30e9 --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-session/0001-Add-dbus_glib-dependency.patch @@ -0,0 +1,38 @@ +From ddc2c4faeec36675654a2f8f04c3011b807fdf79 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com> +Date: Sun, 22 Mar 2020 07:36:25 +0100 +Subject: [PATCH] Add dbus_glib dependency + +--- + cinnamon-session/meson.build | 2 +- + meson.build | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/cinnamon-session/meson.build b/cinnamon-session/meson.build +index ee8916f..9dd9283 100644 +--- a/cinnamon-session/meson.build ++++ b/cinnamon-session/meson.build +@@ -74,7 +74,7 @@ executable('cinnamon-session', + xext, + xrender, + xtest, +- # elogind, ++ dbus_glib, + ], + link_with: [ + libegg, +diff --git a/meson.build b/meson.build +index 231a448..db306dc 100644 +--- a/meson.build ++++ b/meson.build +@@ -48,6 +48,7 @@ else + gconf = dependency('', required: false) + endif + conf.set('HAVE_GCONF', gconf.found()) ++dbus_glib = dependency('dbus-glib-1') + + + gio_unix = dependency('gio-unix-2.0', required: false) +-- +2.25.1 + diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix new file mode 100644 index 00000000000..56ff4b106e3 --- /dev/null +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -0,0 +1,105 @@ +{ fetchFromGitHub +, cinnamon-desktop +, cinnamon-settings-daemon +, dbus-glib +, docbook_xsl +, docbook_xml_dtd_412 +, glib +, gsettings-desktop-schemas +, gtk3 +, libcanberra +, libxslt +, makeWrapper +, meson +, ninja +, pkgconfig +, python3 +, stdenv +, systemd +, wrapGAppsHook +, xapps +, xmlto +, xorg +, cmake +, libexecinfo +, pango +}: + +stdenv.mkDerivation rec { + pname = "cinnamon-session"; + version = "4.4.0"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = version; + sha256 = "0hplck17rksfgqm2z58ajvz4p2m4zg6ksdpbc27ki20iv4fv620s"; + }; + + patches = [ + ./0001-Add-dbus_glib-dependency.patch + ]; + + buildInputs = [ + # meson.build + gtk3 + glib + libcanberra + pango + xorg.libX11 + xorg.libXext + xapps + xorg.libXau + xorg.libXcomposite + + systemd + + xorg.libXtst + xorg.libXrender + xorg.xtrans + + # other (not meson.build) + + cinnamon-desktop + cinnamon-settings-daemon + dbus-glib + glib + gsettings-desktop-schemas + ]; + + nativeBuildInputs = [ + meson + ninja + wrapGAppsHook + libexecinfo + docbook_xsl + docbook_xml_dtd_412 + python3 + pkgconfig + libxslt + xmlto + ]; + + # TODO: https://github.com/NixOS/nixpkgs/issues/36468 + mesonFlags = [ "-Dc_args=-I${glib.dev}/include/gio-unix-2.0" "-Dgconf=false" "-DENABLE_IPV6=true" ]; + + postPatch = '' + chmod +x data/meson_install_schemas.py # patchShebangs requires executable file + patchShebangs data/meson_install_schemas.py + ''; + + preFixup = '' + gappsWrapperArgs+=( + --prefix XDG_DATA_DIRS : "${cinnamon-desktop}/share" + --prefix XDG_CONFIG_DIRS : "${cinnamon-settings-daemon}/etc/xdg" + ) + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/cinnamon-session"; + description = "The Cinnamon session manager"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix b/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix index 87f670c8c09..7fb983d6136 100644 --- a/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix +++ b/pkgs/desktops/cinnamon/cjs/spidermonkey_52.nix @@ -27,11 +27,11 @@ in stdenv.mkDerivation { # needed to build gnome3.gjs (fetchpatch { name = "mozjs52-disable-mozglue.patch"; - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/mozjs52-disable-mozglue.patch?h=packages/js52&id=4279d2e18d9a44f6375f584911f63d13de7704be"; sha256 = "18wkss0agdyff107p5lfflk72qiz350xqw2yqc353alkx4fsfpz0"; }) (fetchpatch { - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/no-error.diff?h=packages/js52; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/no-error.diff?h=packages/js52"; sha256 = "1vsw6558lxiy0r1mg6y49cgddan1mfqvqlkyv734bgxyg6n3pb9i"; }) ./fix-werror.patch @@ -79,7 +79,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; diff --git a/pkgs/desktops/cinnamon/default.nix b/pkgs/desktops/cinnamon/default.nix index 6cdda991436..b08c9e468f8 100644 --- a/pkgs/desktops/cinnamon/default.nix +++ b/pkgs/desktops/cinnamon/default.nix @@ -5,10 +5,12 @@ lib.makeScope pkgs.newScope (self: with self; { cinnamon-desktop = callPackage ./cinnamon-desktop { }; cinnamon-menus = callPackage ./cinnamon-menus { }; cinnamon-translations = callPackage ./cinnamon-translations { }; + cinnamon-session = callPackage ./cinnamon-session { }; cinnamon-settings-daemon = callPackage ./cinnamon-settings-daemon { }; cjs = callPackage ./cjs { }; nemo = callPackage ./nemo { }; mint-themes = callPackage ./mint-themes { }; + mint-y-icons = callPackage ./mint-y-icons { }; muffin = callPackage ./muffin { }; xapps = callPackage ./xapps { }; }) diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix new file mode 100644 index 00000000000..d4415c4bf04 --- /dev/null +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -0,0 +1,46 @@ +{ fetchFromGitHub +, stdenv +, gnome3 +, hicolor-icon-theme +, gtk3 +}: + +stdenv.mkDerivation rec { + pname = "mint-y-icons"; + version = "unstable-2020-03-21"; + + src = fetchFromGitHub { + owner = "linuxmint"; + repo = pname; + rev = "f169a617bc344cb0b480b2b72f54cdd06af05255"; + sha256 = "1c2a79ylk363i982czwwqcwc7cw6dyzlqphcypqm6nll7xlafq8s"; + }; + + propagatedUserEnvPkgs = [ + gnome3.adwaita-icon-theme + hicolor-icon-theme + ]; + + nativeBuildInputs = [ + gtk3 + ]; + + postFixup = '' + gtk-update-icon-cache $out/share/icons/* + ''; + + dontDropIconThemeCache = true; + + installPhase = '' + mkdir -p $out + mv usr/share $out + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/linuxmint/mint-y-icons"; + description = "The Mint-Y icon theme"; + license = licenses.gpl3; # from debian/copyright + platforms = platforms.linux; + maintainers = [ maintainers.mkg20001 ]; + }; +} diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index 9f7b0e478e1..df780009152 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; - homepage = https://github.com/linuxdeepin/dbus-factory; + homepage = "https://github.com/linuxdeepin/dbus-factory"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index c4082ce454c..9fb18d04df8 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -43,28 +43,31 @@ buildGoPackage rec { pkgconfig deepin-gettext-tools # build dbus-factory # build - go-dbus-factory # needed - go-gir-generator # needed - go-lib # build deepin.setupHook - ]; - buildInputs = [ - alsaLib # needed + # TODO: using $PATH to find run time executable does not work with cross compiling bc # run (to adjust grub theme?) blur-effect # run (is it really needed?) coreutils # run (is it really needed?) fontconfig # run (is it really needed?) - #glib # ? arch + rfkill # run + xcur2png # run grub2 # run (is it really needed?) + ]; + + buildInputs = [ + go-dbus-factory # needed + go-gir-generator # needed + go-lib # build + + alsaLib # needed + #glib # ? arch gtk3 # build run libcanberra # build run libgudev # needed librsvg # build run poppler # build run pulseaudio # needed - rfkill # run - xcur2png # run #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?) ]; @@ -117,7 +120,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; - homepage = https://github.com/linuxdeepin/dde-api; + homepage = "https://github.com/linuxdeepin/dde-api"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index 5460a932962..e148df51a87 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-calendar; + homepage = "https://github.com/linuxdeepin/dde-calendar"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index a644da2e9a9..adc05e1ea7e 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -111,7 +111,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Control panel of Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-control-center; + homepage = "https://github.com/linuxdeepin/dde-control-center"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo worldofpeace ]; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index b5460029f78..fdbb7856b06 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -1,6 +1,6 @@ { stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, dbus-factory, go-dbus-factory, go-gir-generator, go-lib, - deepin-gettext-tools, dde-api, deepin-desktop-schemas, + deepin-gettext-tools, gettext, dde-api, deepin-desktop-schemas, deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3, libgudev, libinput, libnl, librsvg, linux-pam, networkmanager, pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go, @@ -22,7 +22,7 @@ buildGoPackage rec { patches = [ # https://github.com/linuxdeepin/dde-daemon/issues/51 (fetchpatch { - url = https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch; + url = "https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch"; sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh"; }) ]; @@ -34,11 +34,8 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig dbus-factory - go-dbus-factory - go-gir-generator - go-lib deepin-gettext-tools - linux-pam + gettext networkmanager networkmanager.dev python3 @@ -48,6 +45,11 @@ buildGoPackage rec { ]; buildInputs = [ + go-dbus-factory + go-gir-generator + go-lib + linux-pam + alsaLib dde-api deepin-desktop-base @@ -125,7 +127,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; - homepage = https://github.com/linuxdeepin/dde-daemon; + homepage = "https://github.com/linuxdeepin/dde-daemon"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index 62d5622340c..f2edb83537d 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -80,7 +80,7 @@ unwrapped = mkDerivation rec { meta = with stdenv.lib; { description = "Dock for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-dock; + homepage = "https://github.com/linuxdeepin/dde-dock"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index 62931dfcd81..a952a82dfca 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -251,7 +251,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "File manager and desktop module for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-file-manager; + homepage = "https://github.com/linuxdeepin/dde-file-manager"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index eae074381f3..a1561f5c092 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -76,7 +76,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Deepin Desktop Environment launcher module"; - homepage = https://github.com/linuxdeepin/dde-launcher; + homepage = "https://github.com/linuxdeepin/dde-launcher"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index 778481fc651..1550987cc73 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -45,7 +45,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Deepin network utils"; - homepage = https://github.com/linuxdeepin/dde-network-utils; + homepage = "https://github.com/linuxdeepin/dde-network-utils"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index 7aaddf53872..e00ee30ca92 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -42,7 +42,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/dde-polkit-agent; + homepage = "https://github.com/linuxdeepin/dde-polkit-agent"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index ba237bcf755..7e645473f02 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; - homepage = https://github.com/linuxdeepin/dde-qt-dbus-factory; + homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; license = with licenses; [ gpl3Plus lgpl2Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index a664defae56..ddb12511c27 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -125,7 +125,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; - homepage = https://github.com/linuxdeepin/dde-session-ui; + homepage = "https://github.com/linuxdeepin/dde-session-ui"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index 184153a3981..7697c23ae14 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -55,7 +55,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Deepin file search tool"; - homepage = https://github.com/linuxdeepin/deepin-anything; + homepage = "https://github.com/linuxdeepin/deepin-anything"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 26f2b99612e..38aed9cbe63 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -40,7 +40,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Easy to use calculator for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-calculator; + homepage = "https://github.com/linuxdeepin/deepin-calculator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 0ca42a88761..335c5727e91 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { - login screen background image - language information ''; - homepage = https://github.com/linuxdeepin/deepin-desktop-base; + homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index 579ceb442be..2105926f682 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; - homepage = https://github.com/linuxdeepin/deepin-desktop-schemas; + homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/pkgs/desktops/deepin/deepin-editor/default.nix index 0aea9558ec0..9bff5b88268 100644 --- a/pkgs/desktops/deepin/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/deepin-editor/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple editor for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-editor; + homepage = "https://github.com/linuxdeepin/deepin-editor"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo worldofpeace ]; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index 915cb8c6ac7..c1aff5ed4dc 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; - homepage = https://github.com/linuxdeepin/deepin-gettext-tools; + homepage = "https://github.com/linuxdeepin/deepin-gettext-tools"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 7c10e873209..53735791846 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Deepin GTK Theme"; - homepage = https://github.com/linuxdeepin/deepin-gtk-theme; + homepage = "https://github.com/linuxdeepin/deepin-gtk-theme"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index b6b9feb410b..5845e77f57c 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-icon-theme; + homepage = "https://github.com/linuxdeepin/deepin-icon-theme"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index aa13eb76055..bedc809b2f5 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -45,7 +45,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-image-viewer; + homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; license = licenses.gpl3Plus; platforms = platforms.linux; badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189 diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index b23a7491aaf..92153b84d51 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Deepin menu service"; - homepage = https://github.com/linuxdeepin/deepin-menu; + homepage = "https://github.com/linuxdeepin/deepin-menu"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index b3930c8e399..b95a76a3972 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Deepin movie player"; - homepage = https://github.com/linuxdeepin/deepin-movie-reborn; + homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 374af8be2be..9b5d47d8542 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/linuxdeepin/deepin-screenshot/pull/52/commits/e14508b223fd9965854ed41c944cea2ea19e6e0c.patch; + url = "https://github.com/linuxdeepin/deepin-screenshot/pull/52/commits/e14508b223fd9965854ed41c944cea2ea19e6e0c.patch"; sha256 = "18zvz98z3hr8pcdyb706za6h2nwx23zsjb1hgyp21ycinhzr9j9h"; }) ]; @@ -52,7 +52,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-screenshot; + homepage = "https://github.com/linuxdeepin/deepin-screenshot"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo flokli ]; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index a8d143ff8b0..479f2c86d30 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; - homepage = https://github.com/linuxdeepin/deepin-shortcut-viewer; + homepage = "https://github.com/linuxdeepin/deepin-shortcut-viewer"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index 378945ac1dd..a868b072506 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Deepin sound theme"; - homepage = https://github.com/linuxdeepin/deepin-sound-theme; + homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 049c856419d..e51927142eb 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_40, +{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_40, fetchpatch, gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2, @@ -15,6 +15,14 @@ stdenv.mkDerivation rec { sha256 = "1929saj828b438d07caw3cjhqq60v6gni7mi3fqrg9wdjz81xwv7"; }; + patches = [ + # Fix build with VTE 0.60 + (fetchpatch { + url = "https://github.com/linuxdeepin/deepin-terminal/commit/542d1035b609698ee81aa7971d20ca8e5930743d.patch"; + sha256 = "1pihiy70yc25fm5fx7i7v9gmi65v4mhldvi7xwv8rgr2z6hbfj41"; + }) + ]; + nativeBuildInputs = [ pkgconfig cmake @@ -70,7 +78,7 @@ stdenv.mkDerivation rec { It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features. ''; - homepage = https://github.com/linuxdeepin/deepin-terminal; + homepage = "https://github.com/linuxdeepin/deepin-terminal"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index 3aa6003592b..f34997f5179 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A daemon that helps to launch applications faster"; - homepage = https://github.com/linuxdeepin/deepin-turbo; + homepage = "https://github.com/linuxdeepin/deepin-turbo"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index 6baee0eda11..82f7214471f 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/deepin-wallpapers; + homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix index 3ce2adba098..a1db0673a46 100644 --- a/pkgs/desktops/deepin/disomaster/default.nix +++ b/pkgs/desktops/deepin/disomaster/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A libisoburn wrapper for Qt"; - homepage = https://github.com/linuxdeepin/disomaster; + homepage = "https://github.com/linuxdeepin/disomaster"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo worldofpeace ]; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix index ed01cd92c7c..970e48941d4 100644 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME keyring extension for dde-polkit-agent"; - homepage = https://github.com/linuxdeepin/dpa-ext-gnomekeyring; + homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 8ae1c6f0952..90b02a6d930 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Deepin tool kit core library"; - homepage = https://github.com/linuxdeepin/dtkcore; + homepage = "https://github.com/linuxdeepin/dtkcore"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 751fe02562f..5a3869a2db9 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Deepin graphical user interface library"; - homepage = https://github.com/linuxdeepin/dtkwidget; + homepage = "https://github.com/linuxdeepin/dtkwidget"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index ead96fe2533..ecc11feb749 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Deepin graphical user interface library"; - homepage = https://github.com/linuxdeepin/dtkwm; + homepage = "https://github.com/linuxdeepin/dtkwm"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index 0b7c6cfdc91..52bf8e62f1d 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; - homepage = https://github.com/linuxdeepin/go-dbus-factory; + homepage = "https://github.com/linuxdeepin/go-dbus-factory"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index fed8b6f2c6a..481f7eb2bc2 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; - homepage = https://github.com/linuxdeepin/go-dbus-generator; + homepage = "https://github.com/linuxdeepin/go-dbus-generator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index 5a10efa1932..f57bae89711 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, go, gobject-introspection, +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, go, gobject-introspection, libgudev, deepin }: stdenv.mkDerivation rec { @@ -12,6 +12,15 @@ stdenv.mkDerivation rec { sha256 = "1ydzll8zlk897iqcihvv6p046p0rzr4qqz2drmz2nx95njp8n03a"; }; + patches = [ + # Fix compatibility with glib 2.63+ + # https://github.com/linuxdeepin/go-gir-generator/pull/11 + (fetchpatch { + url = "https://github.com/linuxdeepin/go-gir-generator/commit/7dea15a1a491f28d2ac8c411068ccefeba01aae3.patch"; + sha256 = "7bn/mtruCcK+AIXMzhN2e3o7CuzuJ3mtTz0HOTEYTaA="; + }) + ]; + nativeBuildInputs = [ pkgconfig go @@ -35,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; - homepage = https://github.com/linuxdeepin/go-gir-generator; + homepage = "https://github.com/linuxdeepin/go-gir-generator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 730412a58f3..43fddf78f11 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; - homepage = https://github.com/linuxdeepin/go-lib; + homepage = "https://github.com/linuxdeepin/go-lib"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index 38ca4f3b676..3b7207379c7 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -94,7 +94,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Qt5 binding of Chromium Embedded Framework"; - homepage = https://github.com/linuxdeepin/qcef; + homepage = "https://github.com/linuxdeepin/qcef"; license = licenses.lgpl3; platforms = platforms.linux; badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 6b1f212716c..1bf069821f5 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; - homepage = https://github.com/linuxdeepin/qt5dxcb-plugin; + homepage = "https://github.com/linuxdeepin/qt5dxcb-plugin"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 5de46f8a1dd..ad89957ef1b 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -44,7 +44,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; - homepage = https://github.com/linuxdeepin/qt5integration; + homepage = "https://github.com/linuxdeepin/qt5integration"; license = with licenses; [ gpl3 lgpl2Plus bsd2 ]; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 137b3f690a6..3050e7b9e13 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -27,16 +27,16 @@ buildGoPackage rec { nativeBuildInputs = [ pkgconfig dbus-factory - dde-api - go-dbus-factory - go-gir-generator - go-lib jq wrapGAppsHook deepin.setupHook ]; buildInputs = [ + dde-api + go-dbus-factory + go-gir-generator + go-lib alsaLib dde-daemon dde-dock @@ -128,7 +128,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Starter of deepin desktop environment"; - homepage = https://github.com/linuxdeepin/startdde; + homepage = "https://github.com/linuxdeepin/startdde"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index 7972d8f9a3f..d13460a4bd5 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "UDisks2 D-Bus interfaces binding for Qt5"; - homepage = https://github.com/linuxdeepin/udisks2-qt5; + homepage = "https://github.com/linuxdeepin/udisks2-qt5"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 9aca09a510a..dfe294ef5c6 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A user interface for the connman network connection manager"; - homepage = https://enlightenment.org/; + homepage = "https://enlightenment.org/"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index b4b271fb38f..7bf280cb99b 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { meta = { description = "Enlightenment foundation libraries"; - homepage = https://enlightenment.org/; + homepage = "https://enlightenment.org/"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index 0fb249135a2..8ba0dffc8a4 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Compositing Window Manager and Desktop Shell"; - homepage = https://www.enlightenment.org; + homepage = "https://www.enlightenment.org"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index b00b3d7a846..36719200c76 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Image viewer and editor written using the Enlightenment Foundation Libraries"; - homepage = https://smhouston.us/projects/ephoto/; + homepage = "https://smhouston.us/projects/ephoto/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index f0a9799e5b4..3c4de19fa91 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Video + Audio player along the lines of mplayer"; - homepage = https://enlightenment.org/; + homepage = "https://enlightenment.org/"; maintainers = with stdenv.lib.maintainers; [ matejc ftrvxmtrx romildo ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd2; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index ee140e09150..205d133e1d2 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Powerful terminal emulator based on EFL"; - homepage = https://www.enlightenment.org/about-terminology; + 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 ]; 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 7d8365337aa..bf811961226 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.pygtk.org; + homepage = "http://www.pygtk.org"; description = "Python bindings for GNOME desktop packages"; license = licenses.lgpl21; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index 37bd631adbc..455e3fe2673 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pygtk.org/; + homepage = "http://pygtk.org/"; description = "Python wrapper for GNOME libraries"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index d0a7a890355..4212fa68bd4 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -60,8 +60,6 @@ lib.makeScope pkgs.newScope (self: with self; { gtksourceview = callPackage ./desktop/gtksourceview { }; - gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { }; - vte = callPackage ./desktop/vte { }; #### BINDINGS @@ -87,6 +85,8 @@ lib.makeScope pkgs.newScope (self: with self; { startup_notification = pkgs.libstartup_notification; startupnotification = pkgs.libstartup_notification; gnomedocutils = pkgs.gnome-doc-utils; - gnomeicontheme = self.gnome_icon_theme; + gnome-icon-theme = pkgs.gnome-icon-theme; + gnome_icon_theme = self.gnome-icon-theme; + gnomeicontheme = self.gnome-icon-theme; gnome_common = gnome-common; }) diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix deleted file mode 100644 index 0f2a98c61f6..00000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }: - -stdenv.mkDerivation rec { - name = "gnome-icon-theme-2.91.93"; - - src = fetchurl { - #url = "mirror://gnome/sources/gnome-icon-theme/3.4/${name}.tar.xz"; - url = "mirror://gnome/sources/gnome-icon-theme/2.91/${name}.tar.bz2"; - sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6"; - }; - - nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk2 ]; - - # remove a tree of dirs with no files within - postInstall = '' rm -r "$out/share/locale" ''; - - meta = { - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index c12d50d792f..68c1b3b5da4 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 @@ -{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: stdenv.mkDerivation rec { rev = "9ae8768"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor-icon-theme tango-icon-theme ]; + buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin 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 = '' sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tray status icon, which notifies us when new email arrives"; - homepage = https://www.nongnu.org/mailnotify/; + homepage = "https://www.nongnu.org/mailnotify/"; license = with licenses; [ gpl3 ]; platforms = platforms.unix; maintainers = [ maintainers.eleanor ]; diff --git a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix index 7c713cb9122..e5892c0659f 100644 --- a/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix +++ b/pkgs/desktops/gnome-2/desktop/scrollkeeper/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "scrollkeeper-0.3.14"; src = fetchurl { - url = mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2; + url = "mirror://gnome/sources/scrollkeeper/0.3/scrollkeeper-0.3.14.tar.bz2"; sha256 = "08n1xgj1f53zahwm0wpn3jid3rfbhi3iwby0ilaaldnid5qriqgc"; }; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index 606ba93d3fc..81330218d49 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -18,12 +18,12 @@ in stdenv.mkDerivation rec { # fixed in upstream version 0.32.2 (fetchpatch{ name = "CVE-2012-2738-1.patch"; - url = https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch; + url = "https://gitlab.gnome.org/GNOME/vte/commit/feeee4b5832b17641e505b7083e0d299fdae318e.patch"; sha256 = "1455i6zxcx4rj2cz639s8qdc04z2nshprwl7k00mcsw49gv3hk5n"; }) (fetchpatch{ name = "CVE-2012-2738-2.patch"; - url = https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch; + url = "https://gitlab.gnome.org/GNOME/vte/commit/98ce2f265f986fb88c38d508286bb5e3716b9e74.patch"; sha256 = "0n24vw49h89w085ggq23iwlnnb6ajllfh2dg4vsar21d82jxc0sn"; }) ]; @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.gnome.org/; + homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index f13ff571242..9d3e3a9be20 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://projects.gnome.org/gconf/; + homepage = "https://projects.gnome.org/gconf/"; description = "Deprecated system for storing application preferences"; platforms = platforms.unix; }; diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index ef18f0783ce..f30c48b08e9 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://projects.gnome.org/ORBit2/; + homepage = "https://projects.gnome.org/ORBit2/"; description = "A CORBA 2.4-compliant Object Request Broker"; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix index c3aee9024a2..e50ddeb9411 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-mime-data/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "gnome-mime-data-2.18.0"; src = fetchurl { - url = mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2; + url = "mirror://gnome/sources/gnome-mime-data/2.18/gnome-mime-data-2.18.0.tar.bz2"; sha256 = "1mvg8glb2a40yilmyabmb7fkbzlqd3i3d31kbkabqnq86xdnn69p"; }; buildInputs = [ intltool ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index 522c5ce6b06..193ae1f3c22 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://projects.gnome.org/gtkglext/; + homepage = "https://projects.gnome.org/gtkglext/"; description = "GtkGLExt, an OpenGL extension to GTK"; longDescription = '' GtkGLExt is an OpenGL extension to GTK. It provides additional GDK diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 33c2abef0fa..f4d6cb534bc 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool -, GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }: +, GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }: stdenv.mkDerivation rec { version = "4.10.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; }; - propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ]; + propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ]; nativeBuildInputs = [ pkgconfig ]; 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 3c89f9ff0fc..57a000351cf 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, intltool, -GConf, enchant, isocodes, gnome_icon_theme }: +GConf, enchant, isocodes, gnome-icon-theme }: stdenv.mkDerivation rec { name = "gtkhtml-3.32.2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./01_remove-disable-deprecated.patch ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 intltool GConf enchant isocodes gnome_icon_theme ]; + buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ]; NIX_LDFLAGS = "-lgthread-2.0"; } diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index d51cccf7906..aa7e3b938c8 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "libglade-2.6.4"; src = fetchurl { - url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2; + url = "mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2"; sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix index d2539889fdb..b3ac327f8c3 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvasmm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libgnomecanvasmm-2.26.0"; src = fetchurl { - url = mirror://gnome/sources/libgnomecanvasmm/2.26/libgnomecanvasmm-2.26.0.tar.bz2; + url = "mirror://gnome/sources/libgnomecanvasmm/2.26/libgnomecanvasmm-2.26.0.tar.bz2"; sha256 = "996577f97f459a574919e15ba7fee6af8cda38a87a98289e9a4f54752d83e918"; }; diff --git a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix index 215c9eb3e5e..e535fe832d5 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix @@ -1,13 +1,13 @@ -{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome_icon_theme}: +{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}: stdenv.mkDerivation { name = "libgnomeprintui-2.18.6"; src = fetchurl { - url = mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2; + url = "mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2"; sha256 = "0spl8vinb5n6n1krnfnr61dwaxidg67h8j94z9p59k2xdsvfashm"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome_icon_theme]; + 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 838e5133745..d248ad37d02 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "0001-gnome-scores.h-Convert-to-UTF-8.patch"; - url = https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff; + url = "https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff"; sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk"; }) ]; diff --git a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix index cf34c7e7c68..0d362a28519 100644 --- a/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgtkhtml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libgtkhtml-2.11.1"; src = fetchurl { - url = mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2; + url = "mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2"; sha256 = "0msajafd42545dxzyr5zqka990cjrxw2yz09ajv4zs8m1w6pm9rw"; }; diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 41b40244f57..05c5b96242c 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.34.4"; + version = "3.36.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0f1dixq5hc55dl3y0fr85bkrc2zk08n4dacqcjifij1dys4ks3z1"; + sha256 = "1iwi7mnayw1f90s439flh0zkgmj4qx10dzgj38nd5f3wvqmhabk3"; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Accerciser; + homepage = "https://wiki.gnome.org/Apps/Accerciser"; description = "Interactive Python accessibility explorer"; maintainers = gnome3.maintainers; license = licenses.bsd3; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index b3bb1e1093c..8143532a5f2 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Cheese; + homepage = "https://wiki.gnome.org/Apps/Cheese"; description = "Take photos and videos with your webcam, with fun graphical effects"; maintainers = gnome3.maintainers; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 60c7fc3872b..8429b060bea 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.34.4"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "136vpaq94ymyn8pf3a3z1w45xlk1xbvwjdnzasq0d7iwbac0jwks"; + sha256 = "1f3cwc05gw75yqficcxns95r96lv7an4aih6d7hng3n3pqfwyfl7"; }; nativeBuildInputs = [ @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBEDATASERVERUI_1_2_UIMODULEDIR = "${placeholder "out"}/lib/evolution-data-server/ui-modules"; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evolution; + homepage = "https://wiki.gnome.org/Apps/Evolution"; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; maintainers = gnome3.maintainers; license = licenses.lgpl2Plus; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 57c7a93a533..9e8dcf2a547 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.32.4"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05s046br4fcli1d3wngh4jmwi0aikpfkl1px1cahskj4rfzjqfqv"; + sha256 = "0p22jxcagamvp08xfglz4cz1sp8w4p101npw0ggrkhh7vm8yb9bh"; }; LANG = "en_US.UTF-8"; # postinstall.py @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/FileRoller; + homepage = "https://wiki.gnome.org/Apps/FileRoller"; description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 6ea04910d23..dd73f6b11ed 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -1,20 +1,21 @@ { stdenv, meson, fetchurl, python3 , pkgconfig, gtk3, glib, adwaita-icon-theme , libpeas, gtksourceview4, gsettings-desktop-schemas -, wrapGAppsHook, ninja, libsoup, libxml2 -, gnome3, gspell, perl, itstool, desktop-file-utils }: +, wrapGAppsHook, ninja, libsoup, tepl +, gnome3, gspell, perl, itstool, desktop-file-utils +}: stdenv.mkDerivation rec { pname = "gedit"; - version = "3.34.1"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1inm50sdfw63by1lf4f1swb59mpyxlly0g5rdg99j5l3357fzygb"; + sha256 = "11z3lhc5i3z0gqw0qmprsm4rmvhbbm4gz6wy0f73c73x4bd8xhvd"; }; nativeBuildInputs = [ - pkgconfig wrapGAppsHook meson ninja libxml2 + pkgconfig wrapGAppsHook meson ninja python3 perl itstool desktop-file-utils ]; @@ -23,6 +24,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme libsoup libpeas gtksourceview4 gsettings-desktop-schemas gspell + tepl ]; postPatch = '' @@ -43,10 +45,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gedit; + homepage = "https://wiki.gnome.org/Apps/Gedit"; description = "Official text editor of the GNOME desktop environment"; maintainers = gnome3.maintainers; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 0998dbd069d..4a3b6068c13 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Ghex; + homepage = "https://wiki.gnome.org/Apps/Ghex"; description = "Hex editor for GNOME desktop environment"; platforms = platforms.unix; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 367bcdef472..7449e22d69d 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt gobject-introspection + pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection ]; buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index 628442c3075..448c352fe0d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Books; + homepage = "https://wiki.gnome.org/Apps/Books"; description = "An e-book manager application for GNOME"; maintainers = gnome3.maintainers; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 4b76679f9ee..396ce9aad93 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -34,7 +34,7 @@ , mtools , cdrkit , libcdio -, libusb +, libusb1 , libarchive , acl , libgudev @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.34.4"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bqrl36nngbd8jpj31ipnywg2k0rg2j3bcgnyvn8r86ysh1gnm0f"; + sha256 = "01hjlz9hljk2skrwfqxpy3934wjs6figs71sw8bm8g2vnyaqwq7a"; }; doCheck = true; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { librsvg libsecret libsoup - libusb + libusb1 libvirt libvirt-glib libxml2 @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple GNOME 3 application to access remote or virtual systems"; - homepage = https://wiki.gnome.org/Apps/Boxes; + homepage = "https://wiki.gnome.org/Apps/Boxes"; license = licenses.gpl3; platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index b00045cf9e9..5db617b76af 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, libdazzle, libgweather, geoclue2, geocode-glib, python3 , gettext, libxml2, gnome3, gtk3, evolution-data-server, libsoup -, glib, gnome-online-accounts, gsettings-desktop-schemas }: +, glib, gnome-online-accounts, gsettings-desktop-schemas, libhandy }: let pname = "gnome-calendar"; - version = "3.34.2"; + version = "3.36.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1bnmd191044zn2kr6f5vg7sm5q59qf7z652awll1f7s6ahijr8rw"; + sha256 = "1cxy4qf83s8w1ys94rcc4ksf7ywi0hkkpfs0szkkip2v8g3j6kq2"; }; passthru = { @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext libxml2 wrapGAppsHook python3 ]; buildInputs = [ gtk3 evolution-data-server libsoup glib gnome-online-accounts libdazzle libgweather geoclue2 geocode-glib - gsettings-desktop-schemas gnome3.adwaita-icon-theme + gsettings-desktop-schemas gnome3.adwaita-icon-theme libhandy ]; postPatch = '' @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Calendar; + homepage = "https://wiki.gnome.org/Apps/Calendar"; description = "Simple and beautiful calendar application for GNOME"; maintainers = gnome3.maintainers; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index a99e775b26b..3cd3c3146d9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -1,16 +1,37 @@ -{ stdenv, fetchurl -, meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils -, vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop -, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib -, gnome3, gdk-pixbuf, geoclue2, libgweather }: +{ stdenv +, fetchurl +, meson +, ninja +, gettext +, pkgconfig +, wrapGAppsHook +, itstool +, desktop-file-utils +, vala +, gobject-introspection +, libxml2 +, gtk3 +, glib +, gsound +, sound-theme-freedesktop +, gsettings-desktop-schemas +, adwaita-icon-theme +, gnome-desktop +, geocode-glib +, gnome3 +, gdk-pixbuf +, geoclue2 +, libgweather +, libhandy +}: stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0g7hjk55smhkd09hwa9kag3h5a12l494wj89w9smpdk3ghsmy6b1"; + sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc"; }; passthru = { @@ -23,12 +44,29 @@ stdenv.mkDerivation rec { doCheck = true; nativeBuildInputs = [ - vala meson ninja pkgconfig gettext itstool wrapGAppsHook desktop-file-utils libxml2 + vala + meson + ninja + pkgconfig + gettext + itstool + wrapGAppsHook + desktop-file-utils + libxml2 gobject-introspection # for finding vapi files ]; buildInputs = [ - gtk3 glib gsettings-desktop-schemas gdk-pixbuf adwaita-icon-theme - gnome-desktop geocode-glib geoclue2 libgweather gsound + gtk3 + glib + gsettings-desktop-schemas + gdk-pixbuf + adwaita-icon-theme + gnome-desktop + geocode-glib + geoclue2 + libgweather + gsound + libhandy ]; preFixup = '' @@ -39,7 +77,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Clocks; + homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; maintainers = gnome3.maintainers; license = licenses.gpl2; 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 f5261011d11..2e0b1593b91 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 @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; - version = "3.34.1"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "00in6yc02pdalyx8g0fncmch0l7nr819587ngjm83ara9qa8z6fa"; + sha256 = "09bf9r6brmll14z87ljgivw0nr0nggcgjpbx6lg2835zq36vfmi9"; }; passthru = { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool itstool libxml2 ]; meta = with stdenv.lib; { - homepage = https://live.gnome.org/DocumentationProject; + homepage = "https://live.gnome.org/DocumentationProject"; description = "Help a new user get started in GNOME"; maintainers = gnome3.maintainers; license = licenses.cc-by-sa-30; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c80238740e5..c254c1d6060 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Logs; + homepage = "https://wiki.gnome.org/Apps/Logs"; description = "A log viewer for the systemd journal"; maintainers = gnome3.maintainers; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 784b0142f46..18251cad242 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.34.3"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1p58il8dqj96nlv41gf926y8nw6ya15vmv9yr52025sizxaqzydw"; + sha256 = "1yajq2pxd4fbzngwhn92h55rn02psxih8bbdcdxgg66qdbcyychs"; }; doCheck = true; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Maps; + homepage = "https://wiki.gnome.org/Apps/Maps"; description = "A map application for GNOME 3"; maintainers = gnome3.maintainers; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 26c46b1f7b9..2a4c5026ed2 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -16,6 +16,7 @@ , grilo-plugins , pkgconfig , gtk3 +, pango , glib , desktop-file-utils , appstream-glib @@ -29,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.34.4"; + version = "3.36.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l2jaf5jfdkqqpjxwahsjslb3sa2vlhjgpi1ib51is04ln729xb6"; + sha256 = "0cn33r9v2raizq1b8s7s0kb506y91iarc0knm0sljcsqs4qgd03v"; }; nativeBuildInputs = [ @@ -53,6 +54,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ gtk3 + pango glib libmediaart gnome-online-accounts diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 7137ec7180e..5ae1ed1220b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -1,18 +1,37 @@ -{ stdenv, meson, ninja, gettext, fetchurl, pkgconfig -, wrapGAppsHook, itstool, desktop-file-utils, python3 -, glib, gtk3, evolution-data-server, gnome-online-accounts -, libuuid, webkitgtk, zeitgeist -, gnome3, libxml2, gsettings-desktop-schemas, tracker }: +{ stdenv +, meson +, ninja +, gettext +, fetchurl +, pkgconfig +, wrapGAppsHook +, itstool +, desktop-file-utils +, python3 +, glib +, gtk3 +, evolution-data-server +, gnome-online-accounts +, libuuid +, libhandy +, webkitgtk +, zeitgeist +, gnome3 +, libxml2 +, gsettings-desktop-schemas +, tracker +}: let - version = "3.34.2"; -in stdenv.mkDerivation { + version = "3.36.1"; +in +stdenv.mkDerivation { pname = "gnome-notes"; inherit version; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; - sha256 = "0kmhivgamnv2kk5kywrwm4af4s7663rjwh2wdri8iy1n2gmc9qpv"; + sha256 = "0421g9czdahk2w2kv7zg4gd9b4q8g1hl483jsfrxy5y7saincbr1"; }; doCheck = true; @@ -23,12 +42,26 @@ in stdenv.mkDerivation { ''; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxml2 desktop-file-utils python3 wrapGAppsHook + meson + ninja + pkgconfig + gettext + itstool + libxml2 + desktop-file-utils + python3 + wrapGAppsHook ]; buildInputs = [ - glib gtk3 libuuid webkitgtk tracker - gnome-online-accounts zeitgeist + glib + gtk3 + libuuid + libhandy + webkitgtk + tracker + gnome-online-accounts + zeitgeist gsettings-desktop-schemas evolution-data-server gnome3.adwaita-icon-theme @@ -48,7 +81,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Note editor designed to remain simple to use"; - homepage = https://wiki.gnome.org/Apps/Notes; + homepage = "https://wiki.gnome.org/Apps/Notes"; license = licenses.gpl3; maintainers = gnome3.maintainers; platforms = platforms.linux; 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 fd47f54eb89..141eb79e5f0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://projects-old.gnome.org/gnome-power-manager/; + homepage = "https://projects-old.gnome.org/gnome-power-manager/"; description = "View battery and power statistics provided by UPower"; maintainers = gnome3.maintainers; license = licenses.gpl2Plus; 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 3996a2e7564..354fc75004e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple and modern sound recorder"; - homepage = https://wiki.gnome.org/Apps/SoundRecorder; + homepage = "https://wiki.gnome.org/Apps/SoundRecorder"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index f5c4eedc48d..a26f328b45f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Personal task manager for GNOME"; - homepage = https://wiki.gnome.org/Apps/Todo; + homepage = "https://wiki.gnome.org/Apps/Todo"; license = licenses.gpl3Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index c71baa146d1..989521d95dc 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1g63xzs17i36if923b36k9fwbk0nqa5vz6zh1k6q2axrzhhpx1i4"; + sha256 = "15ahfgqj0rz16y2bdxb7sa4b3b3larg8hn3b41pc5ddnwf9x63zi"; }; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Weather; + homepage = "https://wiki.gnome.org/Apps/Weather"; description = "Access current weather conditions and forecasts"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 02b476c2eea..0f5326ea005 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,19 +1,26 @@ { 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, gobject-introspection, appstream-glib +, pkgconfig, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib , gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: let pname = "polari"; - version = "3.34.1"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0wcfkib673fpys7hcpi5cqc0zgqzqmqvpzjzx4wwmim8lb121x5w"; + sha256 = "1rmmq74g22qrmsg0mjvpzk5403kkpfw0iznvnwxfqbi0dfkamhn4"; }; + patches = [ + # Upstream runs the thumbnailer by passing it to gjs. + # If we wrap it in a shell script, gjs can no longer run it. + # Let’s change the code to run the script directly by making it executable and having gjs in shebang. + ./make-thumbnailer-wrappable.patch + ]; + propagatedUserEnvPkgs = [ telepathy-idle telepathy-logger ]; nativeBuildInputs = [ @@ -23,9 +30,13 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk3 glib adwaita-icon-theme gsettings-desktop-schemas - telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup + telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup webkitgtk ]; + postFixup = '' + wrapGApp "$out/share/polari/thumbnailer.js" + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -34,7 +45,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Polari; + homepage = "https://wiki.gnome.org/Apps/Polari"; description = "IRC chat client designed to integrate with the GNOME desktop"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch b/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch new file mode 100644 index 00000000000..0fb09eb154a --- /dev/null +++ b/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch @@ -0,0 +1,24 @@ +diff --git a/src/thumbnailer.js b/src/thumbnailer.js +old mode 100644 +new mode 100755 +index e2ad0a5..7ebf08a +--- a/src/thumbnailer.js ++++ b/src/thumbnailer.js +@@ -1,3 +1,4 @@ ++#!/usr/bin/env gjs + imports.gi.versions.Gdk = '3.0'; + imports.gi.versions.Gtk = '3.0'; + +diff --git a/src/urlPreview.js b/src/urlPreview.js +index f17e0be..ccffc32 100644 +--- a/src/urlPreview.js ++++ b/src/urlPreview.js +@@ -44,7 +44,7 @@ class Thumbnailer { + _generateThumbnail(data) { + let { filename, uri } = data; + this._subProc = Gio.Subprocess.new( +- ['gjs', `${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], ++ [`${pkg.pkgdatadir}/thumbnailer.js`, uri, filename], + Gio.SubprocessFlags.NONE); + this._subProc.wait_async(null, (o, res) => { + try { diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 315968fde65..6789aded2e5 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -22,15 +22,16 @@ , p11-kit , openssh , gsettings-desktop-schemas +, libhandy }: stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.34.1"; + version = "3.36"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19c2zylwgycb5q9hal8rmflc2sywc5c2grpsfsq3rf37i9lfwynw"; + sha256 = "1nqn4a6dr4l1fpzj3mv4swhpnvhjcqlwsyhwm59sdzqgdfx4hbwr"; }; doCheck = true; @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { openssh openldap libpwquality + libhandy ]; postPatch = '' @@ -74,7 +76,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Seahorse; + homepage = "https://wiki.gnome.org/Apps/Seahorse"; description = "Application for managing encryption keys and passwords in the GnomeKeyring"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index c5377157ef0..18e180305fc 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Remote desktop viewer for GNOME"; - homepage = https://wiki.gnome.org/Apps/Vinagre; + homepage = "https://wiki.gnome.org/Apps/Vinagre"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; 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 4900717898f..1fe5b6fb897 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "3.34.3"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "025rj1fskw1y448hiar4a9icyzpyr242nlh9xhsmyp8jb71dihp7"; + sha256 = "066m3vd6k6xf3ap1ahrbw5hnx2322wf0qsnywcxjsj6snq9225qs"; }; # For convenience, we can specify adwaita-icon-theme only in packages diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 5817d8ff942..a33a7cd55cc 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical application to analyse disk usage in any GNOME environment"; - homepage = https://wiki.gnome.org/Apps/DiskUsageAnalyzer; + homepage = "https://wiki.gnome.org/Apps/DiskUsageAnalyzer"; license = licenses.gpl2; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index bad06bae405..5a44cac3fdf 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { # Fix crash in GNOME Flashback # https://bugzilla.gnome.org/show_bug.cgi?id=791001 (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=364774; + url = "https://bugzilla.gnome.org/attachment.cgi?id=364774"; sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; }) ]; @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An input assistive technology intended for switch and pointer users"; - homepage = https://wiki.gnome.org/Projects/Caribou; + homepage = "https://wiki.gnome.org/Projects/Caribou"; license = licenses.lgpl21; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 19d2255ab5f..45c3185bc29 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -3,13 +3,13 @@ let pname = "dconf-editor"; - version = "3.34.4"; + version = "3.36.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "129a2klywvnrj49rz6p5camwsamajldqpsfkl1rgpm6nw0q2lnyy"; + sha256 = "14q678bwgmhzmi7565xhhw51y8b0pv3cqh0f411qwzwif1bd1vkj"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 06777252462..fed6c747f19 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -138,7 +138,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Empathy; + homepage = "https://wiki.gnome.org/Apps/Empathy"; description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; maintainers = gnome3.maintainers; license = [ licenses.gpl2 ]; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 80ef1f4659f..65fefbd23c3 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.34.2"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1lx96nn8q61ajk2m5454s9b5v5wyn7jbz2sf3k1irv8waiq0aavg"; + sha256 = "15cwghcbx9x1xmv1dwmwcdxplnhf25w6f4dhx8hk6fjymaks2m74"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME image viewer"; - homepage = https://wiki.gnome.org/Apps/EyeOfGnome; + homepage = "https://wiki.gnome.org/Apps/EyeOfGnome"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index be917b64452..33fdb05172f 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -30,15 +30,16 @@ , json-glib , libdazzle , libhandy +, buildPackages }: stdenv.mkDerivation rec { pname = "epiphany"; - version = "3.34.4"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "13ar3s40cds1rplwbzx0fzigf120w0rydiv05r3k6zpc0zy91qb0"; + sha256 = "1dpgp1fqkn6azdrkw9imbrxi5d6mznrhfisrsiv88cf68gxk7wpn"; }; # Tests need an X display @@ -56,6 +57,7 @@ stdenv.mkDerivation rec { pkgconfig python3 wrapGAppsHook + buildPackages.glib ]; buildInputs = [ @@ -99,7 +101,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Epiphany; + homepage = "https://wiki.gnome.org/Apps/Epiphany"; description = "WebKit based web browser for GNOME"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index bab84eeb78c..40bee972fe5 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "evince"; - version = "3.34.2"; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/evince/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05q6v9lssd21623mnj2p49clj9v9csw9kay7n4nklki025grbh1w"; + sha256 = "1a7v534sqbg7rlrvg9x1rffdf6p9n37blp3wix6anyfl6i99n7c5"; }; postPatch = '' @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Evince; + homepage = "https://wiki.gnome.org/Apps/Evince"; description = "GNOME's document viewer"; longDescription = '' 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 ff4e499204c..1a511cc9d39 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.34.4"; + version = "3.36.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wz8mizblmvficxap6z9w62ymjwa8x99spnaljcwjl1wc55lnp4q"; + sha256 = "15k7k225jfv5a45hmjk94xq90np2r9f5v8yj0xi3166vvlp2n4hk"; }; patches = [ @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; - homepage = https://wiki.gnome.org/Apps/Evolution; + homepage = "https://wiki.gnome.org/Apps/Evolution"; license = licenses.lgpl2; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch index c499bac4552..4e345c3cb3c 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch @@ -423,10 +423,10 @@ diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e- index f89cd4a5c..06cca9b5f 100644 --- a/src/libedataserverui/e-reminders-widget.c +++ b/src/libedataserverui/e-reminders-widget.c -@@ -1642,7 +1642,21 @@ static void +@@ -1650,7 +1650,21 @@ static void e_reminders_widget_init (ERemindersWidget *reminders) { - reminders->priv = G_TYPE_INSTANCE_GET_PRIVATE (reminders, E_TYPE_REMINDERS_WIDGET, ERemindersWidgetPrivate); + reminders->priv = e_reminders_widget_get_instance_private (reminders); - reminders->priv->settings = g_settings_new ("org.gnome.evolution-data-server.calendar"); + { + GSettingsSchemaSource *schema_source; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index ba660a64418..5ead4539ff1 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program that manages graphical display servers and handles graphical user logins"; - homepage = https://wiki.gnome.org/Projects/GDM; + homepage = "https://wiki.gnome.org/Projects/GDM"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 4b91b3219be..518b86adf7f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-backgrounds"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zxlwy55fz7i582hch2wnj8zy1kzikssgaix0l2y41ccp5nzpdy2"; + sha256 = "02xvfwfi3133mjljl731z2hj9hfmjas3a1jl4fxmy24xrzj83jxq"; }; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index b52161f90ae..79c2505de7b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -6,14 +6,14 @@ let pname = "gnome-bluetooth"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "3.34.0"; + version = "3.34.1"; # TODO: split out "lib" outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1bvbxcsjkyl0givy8nfm7112bq3c0vn1v89fdk2pip714dsfcrz8"; + sha256 = "11nk8nvz5yrbx7wp75vsiaf4rniv7ik2g3nwmgwx2b42q9v11j9y"; }; nativeBuildInputs = [ @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; + homepage = "https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en"; description = "Application that let you manage Bluetooth in the GNOME destkop"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index cabe7c9ca74..7705f43aae9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-calculator"; - version = "3.34.1"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0lbh87255zzggqzai6543qg920y52bl4vs5m5h5087ghzg14hlsd"; + sha256 = "1cqd4b25qp1i0p04m669jssg1l5sdapc1mniv9jssvw5r7wk1s52"; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Calculator; + homepage = "https://wiki.gnome.org/Apps/Calculator"; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; maintainers = gnome3.maintainers; license = licenses.gpl3; 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 200d038d0fb..341fd13bfa7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -1,21 +1,54 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, desktop-file-utils, gnome3, glib, gtk3, libexif, libtiff, colord, colord-gtk, libcanberra-gtk3, lcms2, vte, exiv2 }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, itstool +, desktop-file-utils +, gnome3 +, glib +, gtk3 +, libexif +, libtiff +, colord +, colord-gtk +, libcanberra-gtk3 +, lcms2 +, vte +, exiv2 +}: -let +stdenv.mkDerivation rec { pname = "gnome-color-manager"; version = "3.32.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool desktop-file-utils + meson + ninja + pkgconfig + gettext + itstool + desktop-file-utils ]; - buildInputs = [ glib gtk3 libexif libtiff colord colord-gtk libcanberra-gtk3 lcms2 vte exiv2 ]; + buildInputs = [ + glib + gtk3 + libexif + libtiff + colord + colord-gtk + libcanberra-gtk3 + lcms2 + vte + exiv2 + ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index d2375b5341b..ac51b33fee8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -1,18 +1,18 @@ { stdenv, gettext, fetchurl, evolution-data-server, fetchpatch , pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts -, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib -, vala, meson, ninja, libhandy, gsettings-desktop-schemas }: +, wrapGAppsHook, folks, libxml2, gnome3 +, vala, meson, ninja, libhandy, gsettings-desktop-schemas +# , telepathy-glib +}: -let - version = "3.34.1"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "gnome-contacts"; - inherit version; + version = "3.36"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jqw5yrypvjxzgg70vjbryylwx06amg6sg85mqi14a97xbccg0qa"; + sha256 = "0yvgsfmqm8dxbhay12m20xp6qi9v31wwyv1gz4fx7j4kklhd5jzf"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; @@ -23,16 +23,15 @@ in stdenv.mkDerivation rec { buildInputs = [ gtk3 glib evolution-data-server gsettings-desktop-schemas - folks gnome-desktop telepathy-glib libhandy + folks gnome-desktop libhandy libxml2 gnome-online-accounts cheese gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib + # telepathy-glib 3.35.90 fails to build with telepathy ]; mesonFlags = [ - "-Dtelepathy=true" - ]; - - patches = [ + # Upstream does not seem to maintain this properly: https://gitlab.gnome.org/GNOME/gnome-contacts/issues/103 + "-Dtelepathy=false" ]; postPatch = '' @@ -56,7 +55,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Contacts; + homepage = "https://wiki.gnome.org/Apps/Contacts"; description = "GNOME’s integrated address book"; maintainers = gnome3.maintainers; license = licenses.gpl2; 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 4e66a16bf7c..00f5ff5cd7a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -60,20 +60,19 @@ , tzdata , udisks2 , upower -, vino +, epoxy , gnome-user-share , gnome-remote-desktop -, shadow , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.34.4"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bi7lsmr5hcf0v17brsa8j33p6i0wnh620bzwycmxryfp6s6vshp"; + sha256 = "1466swjyw5vjym001qda94x6sisd4xhpyb6vq91grhkyzwf2vqzk"; }; nativeBuildInputs = [ @@ -133,14 +132,13 @@ stdenv.mkDerivation rec { tracker udisks2 upower - vino + epoxy ]; patches = [ (substituteAll { src = ./paths.patch; gcm = gnome-color-manager; - usermod = "${shadow}/bin/usermod"; gnome_desktop = gnome-desktop; inherit glibc libgnomekbd tzdata; inherit cups networkmanagerapplet; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch index 63ca038d802..361972f2635 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch @@ -54,14 +54,14 @@ index 96b25140c..1ad704d4a 100644 typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; -diff --git a/panels/info/cc-info-overview-panel.c b/panels/info/cc-info-overview-panel.c -index 7fce8691e..b839f8b69 100644 ---- a/panels/info/cc-info-overview-panel.c -+++ b/panels/info/cc-info-overview-panel.c -@@ -187,7 +187,7 @@ load_gnome_version (char **version, +diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c +index 4541986db..da7826bfe 100644 +--- a/panels/info-overview/cc-info-overview-panel.c ++++ b/panels/info-overview/cc-info-overview-panel.c +@@ -169,7 +169,7 @@ load_gnome_version (char **version, gsize length; g_autoptr(VersionData) data = NULL; - + - if (!g_file_get_contents (DATADIR "/gnome/gnome-version.xml", + if (!g_file_get_contents ("@gnome_desktop@/share/gnome/gnome-version.xml", &contents, @@ -71,44 +71,69 @@ diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/n index 9390a3308..d30b4a68e 100644 --- a/panels/network/connection-editor/net-connection-editor.c +++ b/panels/network/connection-editor/net-connection-editor.c -@@ -247,9 +247,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *editor, const gchar *typ - GError *error = NULL; - - if (editor->is_new_connection) { +@@ -278,9 +278,9 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type) + g_autoptr(GError) error = NULL; + + if (self->is_new_connection) { - cmdline = g_strdup_printf ("nm-connection-editor --type='%s' --create", type); + cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --type='%s' --create", type); } else { - cmdline = g_strdup_printf ("nm-connection-editor --edit='%s'", + cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit='%s'", - nm_connection_get_uuid (editor->connection)); + nm_connection_get_uuid (self->connection)); } -diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c -index dd99a7485..4baa88a4e 100644 ---- a/panels/network/net-device-wifi.c -+++ b/panels/network/net-device-wifi.c -@@ -1445,7 +1445,7 @@ device_wifi_edit (NetObject *object) - return; - } - uuid = nm_connection_get_uuid (NM_CONNECTION (connection)); +diff --git a/panels/network/net-device-bluetooth.c b/panels/network/net-device-bluetooth.c +--- a/panels/network/net-device-bluetooth.c ++++ b/panels/network/net-device-bluetooth.c +@@ -90,7 +90,7 @@ nm_device_bluetooth_refresh_ui (NetDeviceBluetooth *self) + update_off_switch_from_device_state (self->device_off_switch, state, self); + + /* set up the Options button */ +- path = g_find_program_in_path ("nm-connection-editor"); ++ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); + gtk_widget_set_visible (GTK_WIDGET (self->options_button), state != NM_DEVICE_STATE_UNMANAGED && path != NULL); + } + +@@ -141,7 +141,7 @@ options_button_clicked_cb (NetDeviceBluetooth *self) + + connection = net_device_get_find_connection (self->client, self->device); + uuid = nm_connection_get_uuid (connection); - cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); + cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); g_debug ("Launching '%s'\n", cmdline); - if (!g_spawn_command_line_async (cmdline, &error)) { + if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); -diff --git a/panels/network/net-device.c b/panels/network/net-device.c -index d73b537b9..e2ee54294 100644 ---- a/panels/network/net-device.c -+++ b/panels/network/net-device.c -@@ -197,7 +197,7 @@ net_device_edit (NetObject *object) - - connection = net_device_get_find_connection (device); +@@ -185,7 +185,7 @@ net_device_bluetooth_init (NetDeviceBluetooth *self) + + gtk_widget_init_template (GTK_WIDGET (self)); + +- path = g_find_program_in_path ("nm-connection-editor"); ++ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); + gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); + } + +diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c +--- a/panels/network/net-device-mobile.c ++++ b/panels/network/net-device-mobile.c +@@ -484,7 +484,7 @@ options_button_clicked_cb (NetDeviceMobile *self) + + connection = net_device_get_find_connection (self->client, self->device); uuid = nm_connection_get_uuid (connection); - cmdline = g_strdup_printf ("nm-connection-editor --edit %s", uuid); + cmdline = g_strdup_printf ("@networkmanagerapplet@/bin/nm-connection-editor --edit %s", uuid); g_debug ("Launching '%s'\n", cmdline); - if (!g_spawn_command_line_async (cmdline, &error)) { + if (!g_spawn_command_line_async (cmdline, &error)) g_warning ("Failed to launch nm-connection-editor: %s", error->message); +@@ -776,7 +776,7 @@ net_device_mobile_init (NetDeviceMobile *self) + + self->cancellable = g_cancellable_new (); + +- path = g_find_program_in_path ("nm-connection-editor"); ++ path = g_find_program_in_path ("@networkmanagerapplet@/bin/nm-connection-editor"); + gtk_widget_set_visible (GTK_WIDGET (self->options_button), path != NULL); + } + diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c index f53ba217e..d24bcaeb9 100644 --- a/panels/printers/pp-host.c @@ -123,10 +148,10 @@ index f53ba217e..d24bcaeb9 100644 /* Use SNMP to get printer's informations */ diff --git a/panels/region/cc-region-panel.c b/panels/region/cc-region-panel.c -index e0604b8c3..fc323c1b2 100644 +index 35859526d..21486c917 100644 --- a/panels/region/cc-region-panel.c +++ b/panels/region/cc-region-panel.c -@@ -763,10 +763,10 @@ row_layout_cb (CcRegionPanel *self, +@@ -755,10 +755,10 @@ row_layout_cb (CcRegionPanel *self, layout_variant = cc_input_source_get_layout_variant (source); if (layout_variant && layout_variant[0]) @@ -140,7 +165,7 @@ index e0604b8c3..fc323c1b2 100644 g_spawn_command_line_async (commandline, NULL); diff --git a/panels/user-accounts/run-passwd.c b/panels/user-accounts/run-passwd.c -index 19934f186..9f41a9620 100644 +index 00239ce0f..617c98870 100644 --- a/panels/user-accounts/run-passwd.c +++ b/panels/user-accounts/run-passwd.c @@ -150,7 +150,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error) @@ -152,19 +177,6 @@ index 19934f186..9f41a9620 100644 argv[1] = NULL; envp = g_get_environ (); -diff --git a/panels/user-accounts/user-utils.c b/panels/user-accounts/user-utils.c -index 83d4cd091..e8784c722 100644 ---- a/panels/user-accounts/user-utils.c -+++ b/panels/user-accounts/user-utils.c -@@ -486,7 +486,7 @@ is_valid_username_async (const gchar *username, - * future, so it would be nice to have some official way for this - * instead of relying on the current "--login" implementation. - */ -- argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "@usermod@"; - argv[1] = "--login"; - argv[2] = data->username; - argv[3] = "--"; diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c index 9cb92007a..84d2f0fa3 100644 --- a/tests/datetime/test-endianess.c diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 1717bfc7fde..213cb890ef6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl, fetchpatch, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib +{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.34.4"; + version = "3.36.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1g0cvsx0gk65kfa91knkqg7l2isrnlpvqwjbzpr3a5f2girp4gn5"; + sha256 = "1058h1ndl6pmlh8rmbqq5lw15glws3anin88cm7lw4vzasgfavwc"; }; nativeBuildInputs = [ pkgconfig meson ninja gettext libxslt libxml2 gobject-introspection - gtk-doc docbook_xsl + gtk-doc docbook_xsl glib ]; buildInputs = [ libX11 bubblewrap xkeyboard_config isocodes wayland @@ -30,14 +30,6 @@ stdenv.mkDerivation rec { bubblewrap_bin = "${bubblewrap}/bin/bwrap"; inherit (builtins) storeDir; }) - - # honor $XKB_CONFIG_ROOT - # addresses #76590: services.xserver.extraLayouts aren't honored by GNOME3 - # NOTE: should be merged upstream in 3.36. - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-desktop/commit/450446b5353e8231edded4d5b5db90a67a9fa9b7.diff"; - sha256 = "07y989x7mbgn3rsm2qfdi8qkkc8i60k28hw87l744nlkydn78kq5"; - }) ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index f43f98bdd9b..5869adeca71 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Dictionary; + homepage = "https://wiki.gnome.org/Apps/Dictionary"; description = "Dictionary is the GNOME application to look up definitions"; maintainers = gnome3.maintainers; license = licenses.gpl2; 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 15be3e3178c..13261aece48 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-disk-utility"; - version = "3.34.4"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p7pifmihg1vpsvym4qabdjqdp96yx9b4cbc6cnmf5i055js7i8y"; + sha256 = "055l29z99f4ybgf2plz3biz1bwhlpsjpr0zk3aa6vg5w67r1h6vr"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://en.wikipedia.org/wiki/GNOME_Disks; + homepage = "https://en.wikipedia.org/wiki/GNOME_Disks"; description = "A udisks graphical front-end"; maintainers = gnome3.maintainers; license = licenses.gpl2; 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 47d06ddac31..67d5c11ae9f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.34.3"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1dc87mcvr7vdhfx4q0c44q37lf7ls2qvnc34dm66802qssrcxy9k"; + sha256 = "1sfn6bdz8snc2qmi3nzb07vlkdhy9s1ipwxxj0v2i36a7n0gv6ci"; }; nativeBuildInputs = [ @@ -85,10 +85,9 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dregion-page=true" "-Dcheese=disabled" - "-Dsoftware-sources=disabled" "-Dibus=disabled" + "-Dparental_controls=disabled" "-Dvendor-conf-file=${./vendor.conf}" ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index fa960087f9b..49fba3cf659 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-keyring"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0hqrsh5g9q9lm190f0m85q4nki8k4ng7wphl6qbccdry59aakkg9"; + sha256 = "11sgffrrpss5cmv3b717pqlbhgq17l1xd33fsvqgsw8simxbar52"; }; outputs = [ "out" "dev" ]; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; - homepage = https://wiki.gnome.org/Projects/GnomeKeyring; + homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = licenses.gpl2; maintainers = gnome3.maintainers; platforms = platforms.linux; 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 b21e3f6f68a..f238b695990 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; + homepage = "https://wiki.gnome.org/Projects/GnomeOnlineMiners"; description = "A set of crawlers that go through your online content and index them locally in Tracker"; maintainers = gnome3.maintainers; license = licenses.gpl2; 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 fd507acc009..42e029e72d4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jadahl"; repo = "gnome-remote-desktop"; rev = version; - sha256 = "0gmazc8ww0lyhx9iclhi982bkpjsnflrzv4qfm3q6hcy0il21fsc"; + sha256 = "1wcvk0w4p0wnqnrjkbwvqcby9dd4nj0cm9cz0fqna31qfjrvb913"; }; nativeBuildInputs = [ meson ninja pkgconfig python3 wrapGAppsHook ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Mutter/RemoteDesktop; + homepage = "https://wiki.gnome.org/Projects/Mutter/RemoteDesktop"; description = "GNOME Remote Desktop server"; maintainers = gnome3.maintainers; license = licenses.gpl2Plus; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 34ff8793224..66dd5ad5eff 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-screenshot"; - version = "3.34.0"; + version = "3.36.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rmiq890j7gfn5mcz31xy6jfnnxgc17dq67bhn2k9m5ylbvza2n8"; + sha256 = "0rhj6fkpxfm26jv3vsn7yb2ybkc2k86ggy23nxa945q74y4msj9k"; }; doCheck = true; @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; + homepage = "https://en.wikipedia.org/wiki/GNOME_Screenshot"; description = "Utility used in the GNOME desktop environment for taking screenshots"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 3df78b88090..697919991ee 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-session"; - version = "3.34.2"; + version = "3.36.0"; outputs = ["out" "sessions"]; src = fetchurl { url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qgqp97f8k2zi2ydvhds14zsjzfj7cv521r6wx5sw0qacn0p7dwb"; + sha256 = "0ymvf1bap35348rpjqp63qwnwnnawdwi4snch95zc4n832w3hjym"; }; patches = [ @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME session manager"; - homepage = https://wiki.gnome.org/Projects/SessionManagement; + homepage = "https://wiki.gnome.org/Projects/SessionManagement"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; 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 c388c4f7211..c4b1ab867c7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -13,7 +13,6 @@ , libgnomekbd , lcms2 , libpulseaudio -, mousetweaks , alsaLib , libcanberra-gtk3 , upower @@ -41,19 +40,18 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.34.2"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1vfpgbdxkhh9xwvb3ja174jk3gpzj4n3jzcy9ygbjlvy45zfdflz"; + sha256 = "0jddz8f2j4ps7csgq9b694h9hjxsyhlimik6rb2f8nbcxhrg0bzs"; }; patches = [ (substituteAll { src = ./fix-paths.patch; - inherit tzdata mousetweaks; + inherit tzdata; }) - ./global-backlight-helper.patch ]; nativeBuildInputs = [ @@ -103,11 +101,6 @@ stdenv.mkDerivation rec { # we're using plain NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; - # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper - postFixup = '' - mkdir -p $out/bin/gnome-settings-daemon - ln -s $out/libexec/gsd-backlight-helper $out/bin/gnome-settings-daemon/gsd-backlight-helper - ''; postPatch = '' for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do 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 44c9e3eff44..319f684c4bd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_60, glib +{ stdenv, fetchurl, meson, ninja, gettext, pkgconfig, spidermonkey_68, glib , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.34.2"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1f5l35l3kdkzrv49xmg1sh11vwmgjbg7hx3gb91i39bfl1snxqd1"; + sha256 = "1rmi6ccqfdisvmmzaiqr2r031r0f3h8qxgw5qwq62x859nbrzcmm"; }; passthru = { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = true; # 60 is required for tests # https://gitlab.gnome.org/GNOME/gnome-shell-extensions/blob/3.34.0/meson.build#L23 - checkInputs = [ spidermonkey_60 ]; + checkInputs = [ spidermonkey_68 ]; nativeBuildInputs = [ meson ninja pkgconfig gettext glib ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; + homepage = "https://wiki.gnome.org/Projects/GnomeShell/Extensions"; description = "Modify and extend GNOME Shell functionality and behavior"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 26e96b5a338..4bde6c63745 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -1,8 +1,8 @@ -{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, libcroco, gettext, libsecret +{ fetchurl, fetchpatch, substituteAll, stdenv, meson, ninja, pkgconfig, gnome3, json-glib, gettext, libsecret , python3, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at-spi2-core , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils -, libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr +, libpulseaudio, libical, gobject-introspection, wrapGAppsHook, libxslt, gcr , accountsservice, gdk-pixbuf, gdm, upower, ibus, libnma, libgnomekbd, gnome-desktop , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.34.4"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0rm32h7lv4vyadi9x32sb6fwxslarwk70yzmvzjxbq872cazp779"; + sha256 = "1phkkkwrrigchz58xs324vf6snd1fm7mxa2iaqwwj526vh5c1s2q"; }; LANG = "en_US.UTF-8"; @@ -31,45 +31,79 @@ in stdenv.mkDerivation rec { buildInputs = [ systemd gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice - libcroco libsecret libsoup polkit gdk-pixbuf librsvg - clutter networkmanager libstartup_notification telepathy-glib + libsecret libsoup polkit gdk-pixbuf librsvg + networkmanager libstartup_notification telepathy-glib libXtst gjs mutter libpulseaudio evolution-data-server - libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2 + libical gtk3 gdm libcanberra-gtk3 geoclue2 adwaita-icon-theme gnome-bluetooth gnome-clocks # schemas needed at-spi2-core upower ibus gnome-desktop telepathy-logger gnome-settings-daemon - gst_all_1.gst-plugins-good # recording gobject-introspection gnome-autoar + # recording + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + # not declared at build time, but typelib is needed at runtime libgweather libnma ]; patches = [ + # Fix dependencies. + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1114 (fetchpatch { name = "0001-build-Add-missing-dependency-to-run-js-test.patch"; - url = https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016; + url = "https://bug787864.bugzilla-attachments.gnome.org/attachment.cgi?id=360016"; sha256 = "1dmahd8ysbzh33rxglba0fbq127aw9h14cl2a2bw9913vjxhxijm"; }) + + # Hardcode paths to various dependencies so that they can be found at runtime. (substituteAll { src = ./fix-paths.patch; inherit libgnomekbd unzip; gsettings = "${glib.bin}/bin/gsettings"; }) + + # Fix ibus launching regression. + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1080 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/94f6976ddd6337593203fdcdd2e3644774408dfa.patch"; + sha256 = "PGmFQhqqd3gK+3kp0dlmlYd2G5ZTIQpfE++Q03Ghkx0="; + }) + + # Fix typing regression with ibus. + # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1084 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/b18469427e5c19402111de5fe9888bceec0eaacd.patch"; + sha256 = "1M+3kjt7K61BFgk1Zf9XfK1ziilQGa60PD8xtVjnQec="; + }) + + # Fix theming breakage after Shell restart on X11. + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2329 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/72c4f148ef88b4bffb2106b99434da5c05c0bb64.patch"; + sha256 = "RBA+JHz4ZvmbJZMnGNieD6D5LONRgFU4iOFIMQQ2kHQ="; + }) + + # Fix Telepathy chat integration. + # https://gitlab.gnome.org/GNOME/gnome-shell/issues/2449 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/766288eec1bd3bd50dfc4ddf410c2b507187e603.patch"; + sha256 = "Cp6xLohCM0gmMxtyYjSukS2oV60Khmxf4iQd9EDAlIc="; + }) ]; postPatch = '' patchShebangs src/data-to-c.pl + chmod +x meson/postinstall.py + patchShebangs meson/postinstall.py substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python" ''; - postInstall = '' - glib-compile-schemas $out/share/glib-2.0/schemas - ''; - preFixup = '' gappsWrapperArgs+=( # Until glib’s xdgmime is patched @@ -88,7 +122,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Core user interface for the GNOME 3 desktop"; - homepage = https://wiki.gnome.org/Projects/GnomeShell; + homepage = "https://wiki.gnome.org/Projects/GnomeShell"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 051f0e4b432..acf6210d916 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -11,11 +11,11 @@ in stdenv.mkDerivation rec { pname = "gnome-software"; - version = "3.34.2"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zhi6zkphq0wfm9z2d1rp1ym8x52c7as4r8h2nrcd34mmv02xnm7"; + sha256 = "0b5b1k0a531c2jyf4g59dw7lblga8xrba38mzfdl57dnknbvbafs"; }; patches = [ @@ -42,6 +42,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dubuntu_reviews=false" "-Dgudev=false" + # FIXME: package malcontent parental controls + "-Dmalcontent=false" ] ++ stdenv.lib.optionals (!withFwupd) [ "-Dfwupd=false" ]; @@ -55,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software store that lets you install and update applications and system extensions"; - homepage = https://wiki.gnome.org/Apps/Software; + homepage = "https://wiki.gnome.org/Apps/Software"; license = licenses.gpl2; maintainers = gnome3.maintainers; 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 a9f8367a548..63df741b9eb 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,21 +1,20 @@ -{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit +{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2 , bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { pname = "gnome-system-monitor"; - version = "3.32.1"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8"; + sha256 = "1gipjaw708lv1zj1c9g09x4h4226kawam2kzdhdd6zjkzfghp9s0"; }; doCheck = true; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook meson ninja python3 - polkit # for ITS file ]; buildInputs = [ bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/SystemMonitor; + homepage = "https://wiki.gnome.org/Apps/SystemMonitor"; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 31f125e9720..720976091bd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libxml2, gnome3, dconf, nautilus -, gtk3, gsettings-desktop-schemas, vte, intltool, which, libuuid, vala +, gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook, glib, pcre2 }: stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.34.2"; + version = "3.36.1.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gc004f9b5k94gkdanmqjz3wqgnpny0l3nqm8zd19h4f0ps27mrv"; + sha256 = "0xm3g3kanfhs1q3xh3x58r55v8906806wvqjbg4c2xvdwyhhimzk"; }; buildInputs = [ @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - pkgconfig intltool itstool which libxml2 + pkgconfig gettext itstool which libxml2 vala desktop-file-utils wrapGAppsHook pcre2 ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNOME Terminal Emulator"; - homepage = https://wiki.gnome.org/Apps/Terminal; + homepage = "https://wiki.gnome.org/Apps/Terminal"; platforms = platforms.linux; license = licenses.gpl3Plus; maintainers = gnome3.maintainers; 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 6207dd42a61..9e7f5bb6319 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patches = [ # fix gio-unix-2.0 lookup (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch; + url = "https://gitlab.gnome.org/GNOME/gnome-user-share/commit/8772980d4732c15505b15dccff2ca3c97e96d49d.patch"; sha256 = "03clzhrx72pq1cbmg2y24hvw4i1xsvrg9ip113fi5bc3w4gcji7p"; }) ]; @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://help.gnome.org/users/gnome-user-share/3.8; + homepage = "https://help.gnome.org/users/gnome-user-share/3.8"; description = "Service that exports the contents of the Public folder in your home directory on the local network"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix index bc0f5683a75..0b9aacf0ddf 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Framework for managing passwords and other secrets"; - homepage = https://wiki.gnome.org/Projects/GnomeKeyring; + homepage = "https://wiki.gnome.org/Projects/GnomeKeyring"; license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; inherit (glib.meta) platforms maintainers; diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch b/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch deleted file mode 100644 index 0e1c33773b0..00000000000 --- a/pkgs/desktops/gnome-3/core/mutter/0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 76477def5c103f10d62e604305802d7f5506afd4 Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Sun, 15 Sep 2019 20:14:16 -0400 -Subject: [PATCH] Revert "ClutterActor: Preserve valid paint volumes till the - next relayout/repaint" - -This causes issues for users of mutter like in gala[0]. - -Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 -[0]: https://github.com/elementary/gala/issues/605 ---- - clutter/clutter/clutter-actor.c | 35 +++++---------------------------- - 1 file changed, 5 insertions(+), 30 deletions(-) - -diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c -index e70892308..8cb60fa07 100644 ---- a/clutter/clutter/clutter-actor.c -+++ b/clutter/clutter/clutter-actor.c -@@ -24,7 +24,7 @@ - - /** - * SECTION:clutter-actor -- * @short_description: The basic element of the scene graph -+ * @short_description: The basic element of the scene graph - * - * The ClutterActor class is the basic element of the scene graph in Clutter, - * and it encapsulates the position, size, and transformations of a node in -@@ -840,7 +840,6 @@ struct _ClutterActorPrivate - guint needs_compute_expand : 1; - guint needs_x_expand : 1; - guint needs_y_expand : 1; -- guint needs_paint_volume_update : 1; - guint had_effects_on_last_paint_volume_update : 1; - }; - -@@ -1511,8 +1510,6 @@ clutter_actor_real_map (ClutterActor *self) - - CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED); - -- self->priv->needs_paint_volume_update = TRUE; -- - stage = _clutter_actor_get_stage_internal (self); - priv->pick_id = _clutter_stage_acquire_pick_id (CLUTTER_STAGE (stage), self); - -@@ -2746,7 +2743,6 @@ clutter_actor_real_queue_relayout (ClutterActor *self) - priv->needs_width_request = TRUE; - priv->needs_height_request = TRUE; - priv->needs_allocation = TRUE; -- priv->needs_paint_volume_update = TRUE; - - /* reset the cached size requests */ - memset (priv->width_requests, 0, -@@ -4742,7 +4738,7 @@ clutter_actor_set_rotation_center_internal (ClutterActor *self, - ClutterRotateAxis axis, - const ClutterVertex *center) - { -- ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO; -+ ClutterVertex v = CLUTTER_VERTEX_INIT_ZERO; - GObject *obj = G_OBJECT (self); - ClutterTransformInfo *info; - -@@ -8531,7 +8527,6 @@ clutter_actor_init (ClutterActor *self) - priv->needs_width_request = TRUE; - priv->needs_height_request = TRUE; - priv->needs_allocation = TRUE; -- priv->needs_paint_volume_update = TRUE; - - priv->cached_width_age = 1; - priv->cached_height_age = 1; -@@ -10098,9 +10093,6 @@ clutter_actor_allocate (ClutterActor *self, - return; - } - -- if (CLUTTER_ACTOR_IS_MAPPED (self)) -- self->priv->needs_paint_volume_update = TRUE; -- - if (!stage_allocation_changed) - { - /* If the actor didn't move but needs_allocation is set, we just -@@ -12992,9 +12984,6 @@ clutter_actor_add_child_internal (ClutterActor *self, - child->priv->needs_height_request = TRUE; - child->priv->needs_allocation = TRUE; - -- if (CLUTTER_ACTOR_IS_MAPPED (child)) -- child->priv->needs_paint_volume_update = TRUE; -- - /* we only queue a relayout here, because any possible - * redraw has already been queued either by show() or - * by our call to queue_redraw() above -@@ -14130,7 +14119,7 @@ clutter_actor_get_anchor_point_gravity (ClutterActor *self) - * - * Since: 0.6 - * -- * Deprecated: 1.12: Use #ClutterActor:pivot-point and -+ * Deprecated: 1.12: Use #ClutterActor:pivot-point and - * clutter_actor_set_translation() instead. - */ - void -@@ -14178,7 +14167,7 @@ clutter_actor_move_anchor_point (ClutterActor *self, - * - * Since: 0.6 - * -- * Deprecated: 1.12: Use #ClutterActor:pivot-point and -+ * Deprecated: 1.12: Use #ClutterActor:pivot-point and - * clutter_actor_set_translation() instead. - */ - void -@@ -14230,7 +14219,7 @@ clutter_actor_move_anchor_point_from_gravity (ClutterActor *self, - * - * Since: 0.6 - * -- * Deprecated: 1.12: Use #ClutterActor:pivot-point and -+ * Deprecated: 1.12: Use #ClutterActor:pivot-point and - * clutter_actor_set_translation() instead. E.g. For %CLUTTER_GRAVITY_CENTER set - * pivot_point to (0.5,0.5) and the translation to (width/2,height/2). - */ -@@ -17567,19 +17556,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) - - if (priv->paint_volume_valid) - { -- /* If effects are applied, the actor paint volume -- * needs to be recomputed on each paint, since those -- * paint volumes could change over the duration of the -- * effect. -- * -- * We also need to update the paint volume if we went -- * from having effects to not having effects on the last -- * paint volume update. */ -- if (!priv->needs_paint_volume_update && -- priv->current_effect == NULL && -- !has_paint_volume_override_effects && -- !priv->had_effects_on_last_paint_volume_update) -- return &priv->paint_volume; - clutter_paint_volume_free (&priv->paint_volume); - } - -@@ -17588,7 +17564,6 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) - if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) - { - priv->paint_volume_valid = TRUE; -- priv->needs_paint_volume_update = FALSE; - return &priv->paint_volume; - } - else --- -2.22.1 - diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix deleted file mode 100644 index 85208163415..00000000000 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ fetchFromGitLab, stdenv, substituteAll, pkgconfig, gnome3, intltool, gobject-introspection, upower, cairo -, glib, gtk3, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3, fetchpatch -, gsettings-desktop-schemas, gnome-desktop, wrapGAppsHook -, libtool, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput -, geocode-glib, libgudev, libwacom, xwayland, autoreconfHook }: - -stdenv.mkDerivation rec { - pname = "mutter"; - version = "3.28.4"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = pname; - rev = "74e3126b77eb5f27c0ae3f53b0aff2d2eebc15af"; # patches of tip from gnome-3-28 branch - sha256 = "0gw1n1w3i040w5mv30kkg7g8a59ymjlc5yaklip0ngg8xv76g0zi"; - }; - - patches = [ - (substituteAll { - src = ./fix-paths-328.patch; - inherit zenity; - }) - - # https://bugzilla.redhat.com/show_bug.cgi?id=1700337 - # https://gitlab.gnome.org/GNOME/mutter/merge_requests/133 - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0070-clutter-Add-API-to-retrieve-the-physical-size-of-abs.patch"; - sha256 = "11xg0clrqwvssy2r6hv4iya8g87z2v5f47fimd2b4hha6ki3g1is"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0071-backends-Add-MetaInputMapper.patch"; - sha256 = "1kcp42hg8sy1q21w5586gdgmi95nf36829kkfswbah61h6bkb518"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0072-backends-Delegate-on-MetaInputMapper-for-unmapped-di.patch"; - sha256 = "0zf4yxhq5s3dnzmn15mx4yb978g27ij4vmq055my9p7xgh6h9ga8"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0073-backends-Add-MetaInputMapper-method-to-lookup-device.patch"; - sha256 = "0dnb2hqx5in6x9ar6wnr1hy3bg2wdcl3wbdx4jn66c7bi7s1k5zd"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0074-backends-Turn-builtin-touchscreen-on-off-together-wi.patch"; - sha256 = "17fvs7j5ws4sz6fkch93gjlik0nm4z426w4n348gyw5llh0r76pg"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/mutter328/raw/fff28bebda02111b4c534952465ff967ba7efced/f/0075-backends-Update-to-new-output-setting-for-tablets-to.patch"; - sha256 = "141p3an83s042f67fw2fqmr79i5g634ndrbpd8cs47fd4wwiwpj5"; - }) - # https://gitlab.gnome.org/GNOME/mutter/merge_requests/670 - # Needed for gala redorder workspace - (fetchpatch { - url = "https://github.com/elementary/os-patches/commit/d636a44885c5be662997f8e19f7dcd26670b3219.patch"; - sha256 = "12pbxk6f39a09jxjam5a5hxl4whp3cifzpck2m7fpp0n98nc63qh"; - }) - # See patch commit message - ./0001-Revert-ClutterActor-Preserve-valid-paint-volumes-til.patch - # Fix build with libglvnd provided headers - ./libglvnd-328.patch - ]; - - configureFlags = [ - "--with-x" - "--enable-shape" - "--enable-sm" - "--enable-startup-notification" - "--enable-xsync" - "--enable-verbose-mode" - "--with-libcanberra" - "--with-xwayland-path=${xwayland}/bin/Xwayland" - "--enable-compile-warnings=maximum" - ]; - - propagatedBuildInputs = [ - # required for pkgconfig to detect mutter-clutter - libXtst - ]; - - nativeBuildInputs = [ autoreconfHook pkgconfig intltool libtool wrapGAppsHook ]; - - buildInputs = [ - glib gobject-introspection gtk3 gsettings-desktop-schemas upower - gnome-desktop cairo pango cogl clutter zenity libstartup_notification - geocode-glib libinput libgudev libwacom - libcanberra-gtk3 zenity xkeyboard_config libxkbfile - libxkbcommon - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - }; -} diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch new file mode 100644 index 00000000000..7be00b33bba --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/0001-Fix-glitches-in-gala.patch @@ -0,0 +1,29 @@ +From e10186284103d3ad8e425980b096eac813cae631 Mon Sep 17 00:00:00 2001 +From: worldofpeace <worldofpeace@protonmail.ch> +Date: Sun, 5 Apr 2020 23:06:03 -0400 +Subject: [PATCH] Fix glitches in gala + +This fixes issues for users of mutter like in gala[0]. + +Upstream report: https://gitlab.gnome.org/GNOME/mutter/issues/536 +[0]: https://github.com/elementary/gala/issues/605 +--- + clutter/clutter/clutter-actor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c +index ecf9a597d..07b8b7155 100644 +--- a/clutter/clutter/clutter-actor.c ++++ b/clutter/clutter/clutter-actor.c +@@ -17831,7 +17831,7 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self) + if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume)) + { + priv->paint_volume_valid = TRUE; +- priv->needs_paint_volume_update = FALSE; ++ //priv->needs_paint_volume_update = FALSE; + return &priv->paint_volume; + } + else +-- +2.25.1 + diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix new file mode 100644 index 00000000000..51d3c4115d9 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -0,0 +1,159 @@ +{ fetchurl +, fetchpatch +, substituteAll +, stdenv +, pkgconfig +, gnome3 +, pantheon +, gettext +, gobject-introspection +, upower +, cairo +, pango +, cogl +, json-glib +, libstartup_notification +, zenity +, libcanberra-gtk3 +, ninja +, xkeyboard_config +, libxkbfile +, libxkbcommon +, libXtst +, libinput +, gsettings-desktop-schemas +, glib +, gtk3 +, gnome-desktop +, geocode-glib +, pipewire_0_2 +, libgudev +, libwacom +, xwayland +, meson +, gnome-settings-daemon +, xorgserver +, python3 +, wrapGAppsHook +, sysprof +, desktop-file-utils +, libcap_ng +, egl-wayland +}: + +stdenv.mkDerivation rec { + pname = "mutter"; + version = "3.34.4"; + + outputs = [ "out" "dev" "man" ]; + + src = fetchurl { + url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01"; + }; + + mesonFlags = [ + "-Degl_device=true" + "-Dinstalled_tests=false" # TODO: enable these + "-Dwayland_eglstream=true" + "-Dxwayland-path=${xwayland}/bin/Xwayland" + ]; + + propagatedBuildInputs = [ + # required for pkgconfig to detect mutter-clutter + json-glib + libXtst + libcap_ng + ]; + + nativeBuildInputs = [ + desktop-file-utils + gettext + meson + ninja + pkgconfig + python3 + wrapGAppsHook + xorgserver # for cvt command + ]; + + buildInputs = [ + cairo + cogl + egl-wayland + geocode-glib + glib + gnome-desktop + gnome-settings-daemon + gobject-introspection + gsettings-desktop-schemas + gtk3 + libcanberra-gtk3 + libgudev + libinput + libstartup_notification + libwacom + libxkbcommon + libxkbfile + pango + pipewire_0_2 # TODO: backport pipewire 0.3 support + sysprof + upower + xkeyboard_config + xwayland + zenity + ]; + + patches = [ + # Fix build with libglvnd provided headers + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; + sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; + }) + + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking + # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 + ./drop-inheritable.patch + + # See commit message for details + ./0001-Fix-glitches-in-gala.patch + + # https://gitlab.gnome.org/GNOME/mutter/merge_requests/1094 + # https://gitlab.gnome.org/GNOME/mutter/merge_requests/957 + ./fix-sysprof.patch + + # profiler: track changes in GLib and Sysprof + # https://gitlab.gnome.org/GNOME/mutter/merge_requests/908 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/605171291993460f31d470a8143d6438d0c6169c.patch"; + sha256 = "10fxzj0lmic2sp57w26w3r0bv1szngjjs50p3ka22wr9pxqmzl7l"; + }) + + # Fixes https://github.com/elementary/wingpanel/issues/305 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/9d390ee49fb1f6300336e82ae94cc8061c6bae12.patch"; + sha256 = "12hmi07rvspwhp8h1y1vmcvmvbh8fihcrb07ja5g0qnh28ip5qfi"; + }) + + (substituteAll { + src = ./fix-paths.patch; + inherit zenity; + }) + ]; + + postPatch = '' + patchShebangs src/backends/native/gen-default-modes.py + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + meta = with stdenv.lib; { + description = "A window manager for GNOME"; + homepage = "https://gitlab.gnome.org/GNOME/mutter"; + license = licenses.gpl2; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch new file mode 100644 index 00000000000..0f60be3a121 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/drop-inheritable.patch @@ -0,0 +1,132 @@ +From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com> +Date: Sat, 19 Oct 2019 13:26:05 +0200 +Subject: [PATCH] drop inheritable + +Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 + +We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. + +--- + config.h.meson | 3 +++ + meson.build | 5 +++++ + meson_options.txt | 6 ++++++ + src/core/main.c | 11 +++++++++++ + src/meson.build | 1 + + 5 files changed, 26 insertions(+) + +diff --git a/config.h.meson b/config.h.meson +index 0bab71848..202fb7ed1 100644 +--- a/config.h.meson ++++ b/config.h.meson +@@ -58,6 +58,9 @@ + /* Xwayland applications allowed to issue keyboard grabs */ + #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES + ++/* Defined if libcap-ng is available */ ++#mesondefine HAVE_LIBCAPNG ++ + /* XKB base prefix */ + #mesondefine XKB_BASE + +diff --git a/meson.build b/meson.build +index 3322bd3b1..01c8020fa 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' + libcanberra_req = '>= 0.26' + libwacom_req = '>= 0.13' + atk_req = '>= 2.5.3' ++libcapng_req = '>= 0.7.9' + + # optional version requirements + udev_req = '>= 228' +@@ -125,6 +126,7 @@ xau_dep = dependency('xau') + ice_dep = dependency('ice') + atk_dep = dependency('atk', version: atk_req) + libcanberra_dep = dependency('libcanberra', version: libcanberra_req) ++libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) + + # For now always require X11 support + have_x11 = true +@@ -256,6 +258,7 @@ have_core_tests = false + have_cogl_tests = false + have_clutter_tests = false + have_installed_tests = false ++have_libcapng = libcapng_dep.found() + + if have_tests + have_core_tests = get_option('core_tests') +@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) + cdata.set('HAVE_SM', have_sm) + cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) + cdata.set('HAVE_INTROSPECTION', have_introspection) ++cdata.set('HAVE_LIBCAPNG', have_libcapng) + cdata.set('HAVE_PROFILER', have_profiler) + + xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') +@@ -443,6 +447,7 @@ output = [ + ' Startup notification..... ' + have_startup_notification.to_string(), + ' Introspection............ ' + have_introspection.to_string(), + ' Profiler................. ' + have_profiler.to_string(), ++ ' libcap-ng................ ' + have_libcapng.to_string(), + '', + ' Tests:', + '', +diff --git a/meson_options.txt b/meson_options.txt +index 73aa7adde..8bfaacd9a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', + value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', + description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' + ) ++ ++option('libcapng', ++ type: 'feature', ++ value: 'auto', ++ description: 'Enable libcap-ng support' ++) +diff --git a/src/core/main.c b/src/core/main.c +index 7f4f666d2..b27968f13 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -66,6 +66,10 @@ + #include <girepository.h> + #endif + ++#ifdef HAVE_LIBCAPNG ++#include <cap-ng.h> ++#endif ++ + #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) + #include <systemd/sd-login.h> + #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ +@@ -673,6 +677,12 @@ meta_run (void) + if (!meta_display_open ()) + meta_exit (META_EXIT_ERROR); + ++#ifdef HAVE_LIBCAPNG ++ capng_clear(CAPNG_SELECT_BOTH); ++ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); ++ capng_apply(CAPNG_SELECT_BOTH); ++#endif ++ + g_main_loop_run (meta_main_loop); + + meta_finalize (); +diff --git a/src/meson.build b/src/meson.build +index 90d80734f..a9fffa2c2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -18,6 +18,7 @@ mutter_pkg_deps = [ + glib_dep, + gsettings_desktop_schemas_dep, + gtk3_dep, ++ libcapng_dep, + pango_dep, + ] + +-- +2.23.0 + diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch index 6c40624a55d..1986c65e8f4 100644 --- a/pkgs/desktops/gnome-3/core/mutter/fix-paths-328.patch +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/core/util.c b/src/core/util.c -index 5b8de18c7..546352a95 100644 +index 57b73747d..f424cc81c 100644 --- a/src/core/util.c +++ b/src/core/util.c -@@ -635,7 +635,7 @@ meta_show_dialog (const char *type, +@@ -636,7 +636,7 @@ meta_show_dialog (const char *type, args = g_ptr_array_new (); diff --git a/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch index 2df70ff9646..481a0ab89cb 100644 --- a/pkgs/desktops/gnome-3/core/mutter/0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/fix-sysprof.patch @@ -14,12 +14,12 @@ index 182f7f5f5..43060865b 100644 @@ -710,7 +710,7 @@ if have_profiler 'backends/meta-profiler.h', ] - + - dbus_interfaces_dir = join_paths(datadir, 'dbus-1', 'interfaces') + dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('prefix'), 'share', 'dbus-1', 'interfaces') sysprof3_dbus_file = join_paths(dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml') - + dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler', --- +-- 2.22.1 diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 8ed00edf6c5..3c8a139d3e1 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -38,24 +38,30 @@ , desktop-file-utils , libcap_ng , egl-wayland +, graphene +, wayland-protocols }: stdenv.mkDerivation rec { pname = "mutter"; - version = "3.34.4"; + version = "3.36.0"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01"; + sha256 = "18lvj158w6gwc6xpvn699v8ykh1r5szry7sqascl6f1i8g628v2x"; }; mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these "-Dwayland_eglstream=true" - "-Dxwayland-path=${xwayland}/bin/Xwayland" + "-Dprofiler=true" + "-Dxwayland_path=${xwayland}/bin/Xwayland" + # This should be auto detected, but it looks like it manages a false + # positive. + "-Dxwayland_initfd=disabled" ]; propagatedBuildInputs = [ @@ -63,6 +69,7 @@ stdenv.mkDerivation rec { json-glib libXtst libcap_ng + graphene ]; nativeBuildInputs = [ @@ -102,26 +109,25 @@ stdenv.mkDerivation rec { xwayland zenity zenity + wayland-protocols ]; patches = [ - # Fix build with libglvnd provided headers - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/mutter/commit/a444a4c5f58ea516ad3cd9d6ddc0056c3ca9bc90.patch"; - sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; - }) - # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 ./drop-inheritable.patch - # TODO: submit upstream - ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch - (substituteAll { src = ./fix-paths.patch; inherit zenity; }) + + # Fix crash when opening submenus from «always on visible workspace» windows + # https://gitlab.gnome.org/GNOME/mutter/issues/1083 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/commit/7e32cc05ce2e5b3931ddcf46ce9ead603a0de39e.patch"; + sha256 = "5ZzOMizucfrSnHNYjHIUObLHCvAIjrE6fY/CxLp4c7k="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch index 574ed572561..1600db1e705 100644 --- a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch +++ b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch @@ -41,12 +41,12 @@ index 3322bd3b1..01c8020fa 100644 # optional version requirements udev_req = '>= 228' -@@ -125,6 +126,7 @@ xau_dep = dependency('xau') - ice_dep = dependency('ice') +@@ -131,6 +131,7 @@ ice_dep = dependency('ice') atk_dep = dependency('atk', version: atk_req) libcanberra_dep = dependency('libcanberra', version: libcanberra_req) + dbus_dep = dependency('dbus-1') +libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) - + # For now always require X11 support have_x11 = true @@ -256,6 +258,7 @@ have_core_tests = false @@ -65,10 +65,10 @@ index 3322bd3b1..01c8020fa 100644 cdata.set('HAVE_PROFILER', have_profiler) xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') -@@ -443,6 +447,7 @@ output = [ - ' Startup notification..... ' + have_startup_notification.to_string(), +@@ -465,6 +465,7 @@ output = [ ' Introspection............ ' + have_introspection.to_string(), ' Profiler................. ' + have_profiler.to_string(), + ' Xwayland initfd.......... ' + have_xwayland_initfd.to_string(), + ' libcap-ng................ ' + have_libcapng.to_string(), '', ' Tests:', diff --git a/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch b/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch deleted file mode 100644 index 96e27559828..00000000000 --- a/pkgs/desktops/gnome-3/core/mutter/libglvnd-328.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/cogl/configure.ac b/cogl/configure.ac -index 3be282f..d338cd1 100644 ---- a/cogl/configure.ac -+++ b/cogl/configure.ac -@@ -490,6 +490,11 @@ AS_IF([test "x$enable_gles1" = "xyes"], - #include <EGL/eglext.h>"], - [], - [$COGL_EGL_INCLUDES]) -+ AC_CHECK_HEADERS([EGL/eglmesaext.h], -+ [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE -+#include <EGL/eglmesaext.h>"], -+ [], -+ [$COGL_EGL_INCLUDES]) - - # Check for a GLES 1.x Common Profile library with/without EGL. - # -@@ -759,7 +764,9 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], - ) - - COGL_EGL_INCLUDES="#include <EGL/egl.h> --#include <EGL/eglext.h>" -+#include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> -+" - AC_SUBST([COGL_EGL_INCLUDES]) - ]) - -diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h -index 8705e7d..db0b74f 100644 ---- a/src/backends/meta-egl-ext.h -+++ b/src/backends/meta-egl-ext.h -@@ -29,6 +29,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - /* - * This is a little different to the tests shipped with EGL implementations, -diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c -index 755ec49..bd253c9 100644 ---- a/src/backends/meta-egl.c -+++ b/src/backends/meta-egl.c -@@ -31,6 +31,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <gio/gio.h> - #include <glib.h> - #include <glib-object.h> -diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h -index 060c7cd..2fef264 100644 ---- a/src/backends/meta-egl.h -+++ b/src/backends/meta-egl.h -@@ -27,6 +27,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <glib-object.h> - - #define META_EGL_ERROR meta_egl_error_quark () diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index e55bf19f528..db7460ce60d 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.34.2"; + version = "3.36.1.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "19zqwq4qyyncc5wq3xls0f7rsavnw741k336p2h7kx35p4kf41mv"; + sha256 = "1pkvxyfm2fl06fpyq2jr147hhpc91y4rgdlxlilg7n8ih982y9gr"; }; nativeBuildInputs = [ @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The file manager for GNOME"; - homepage = https://wiki.gnome.org/Apps/Files; + homepage = "https://wiki.gnome.org/Apps/Files"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 415974d0c2b..f36bf5a6c28 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; - homepage = https://wiki.gnome.org/Projects/Rygel; + homepage = "https://wiki.gnome.org/Projects/Rygel"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 9b28ca7cf91..8af50847010 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.34.4"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xvy672zyl6jsdlnxma8nc2aqsx9k92jhp6wfxs0msj9ppp1nd3z"; + sha256 = "0bprm9gfnlrs0k8jvy9pqm1rjq47z5pgahqjjj1i7q2k4a8g09vl"; }; buildInputs = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { XSANE uses. This means that all existing scanners will work and the interface is well tested. ''; - homepage = https://gitlab.gnome.org/GNOME/simple-scan; + homepage = "https://gitlab.gnome.org/GNOME/simple-scan"; license = licenses.gpl3Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 50e30d2717e..efe11c967bb 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; + homepage = "https://wiki.gnome.org/Apps/Videos"; description = "Movie player for the GNOME desktop based on GStreamer"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/core/vino/default.nix b/pkgs/desktops/gnome-3/core/vino/default.nix deleted file mode 100644 index abfe8b2e039..00000000000 --- a/pkgs/desktops/gnome-3/core/vino/default.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ stdenv -, fetchFromGitLab -, wrapGAppsHook -, pkgconfig -, gnome3 -, gtk3 -, glib -, intltool -, libXtst -, libnotify -, libsoup -, libsecret -, gnutls -, libgcrypt -, avahi -, zlib -, libjpeg -, libXdamage -, libXfixes -, libXext -, networkmanager -, gnome-common -, libtool -, automake -, autoconf -, telepathySupport ? false -, dbus-glib ? null -, telepathy-glib ? null -}: - -stdenv.mkDerivation { - pname = "vino"; - version = "unstable-2019-07-08"; - - src = fetchFromGitLab { - domain = "gitlab.gnome.org"; - owner = "GNOME"; - repo = "vino"; - rev = "aed81a798558c8127b765cd4fb4dc726d10f1e21"; - sha256 = "16r4cj5nsygmd9v97nq6d1yhynzak9hdnaprcdbmwfhh0c9w8jv3"; - }; - - doCheck = true; - - nativeBuildInputs = [ - autoconf - automake - gnome-common - intltool - libtool - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - avahi - glib - gnome3.adwaita-icon-theme - gnutls - gtk3 - libXdamage - libXext - libXfixes - libXtst - libgcrypt - libjpeg - libnotify - libsecret - libsoup - networkmanager - zlib - ] - ++ stdenv.lib.optionals telepathySupport [ dbus-glib telepathy-glib ] - ; - - preConfigure = '' - NOCONFIGURE=1 ./autogen.sh - ''; - - postInstall = stdenv.lib.optionalString (!telepathySupport) '' - rm -f $out/share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service - ''; - - passthru = { - # updateScript = gnome3.updateScript { - # packageName = "vino"; - # attrPath = "gnome3.vino"; - # }; - }; - - meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Vino; - description = "GNOME desktop sharing server"; - maintainers = gnome3.maintainers; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 34f6accdd5f..05699586f82 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "yelp-xsl"; - version = "3.34.2"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc"; + sha256 = "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag"; }; nativeBuildInputs = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; + homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "Yelp's universal stylesheets for Mallard and DocBook"; maintainers = gnome3.maintainers; license = [licenses.gpl2 licenses.lgpl2]; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 438c71c4ad3..2c9f6e5a243 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "yelp"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ifhgdxff2xx2damaj72gpjln5k36grg2chvi4335mv3b5y55mp3"; + sha256 = "097djjyl096zmicjpxlb858yz6rd5cj813xc8azbxlhsscikwjzx"; }; nativeBuildInputs = [ pkgconfig gettext itstool wrapGAppsHook ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp; + homepage = "https://wiki.gnome.org/Apps/Yelp"; description = "The help viewer in Gnome"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index f2d3182c337..25a8ba6573a 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -107,10 +107,9 @@ lib.makeScope pkgs.newScope (self: with self; { mutter = callPackage ./core/mutter { }; - # Needed for elementary's gala and greeter until they get around to adapting to all the API breaking changes in libmutter-3 - # A more detailed explaination can be seen here https://decathorpe.com/2018/09/04/call-for-help-pantheon-on-fedora-29.html - # See Also: https://github.com/elementary/gala/issues/303 - mutter328 = callPackage ./core/mutter/3.28.nix { }; + # Needed for elementary's gala and greeter until 3.36 support has more bugfixes + # https://github.com/elementary/gala/issues/763 + mutter334 = callPackage ./core/mutter/3.34 { }; nautilus = callPackage ./core/nautilus { }; @@ -146,8 +145,6 @@ lib.makeScope pkgs.newScope (self: with self; { totem = callPackage ./core/totem { }; - vino = callPackage ./core/vino { }; - yelp = callPackage ./core/yelp { }; yelp-xsl = callPackage ./core/yelp-xsl { }; @@ -271,8 +268,6 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-panel = callPackage ./misc/gnome-panel { }; - gnome-screensaver = callPackage ./misc/gnome-screensaver { }; - gnome-tweaks = callPackage ./misc/gnome-tweaks { }; gpaste = callPackage ./misc/gpaste { }; @@ -324,7 +319,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 inherit (pkgs) gnome-video-effects; # added 2019-08-19 inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 @@ -358,4 +353,10 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) dconf; # added 2019-11-30 inherit (pkgs) networkmanagerapplet; # added 2019-12-12 + + vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 + + gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 + + mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; }) diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index 4f5562bbffa..efd36d4d4af 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software development studio"; - homepage = http://anjuta.org/; + homepage = "http://anjuta.org/"; license = licenses.gpl2; maintainers = with maintainers; []; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 080a332d7df..1a6acbd4613 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "3.34.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0zpmn6fgkgiayvn4diia5df0s6s7dqrdnp3nrvpavsmgn0vhb4pg"; + sha256 = "0gcakbq2fci6cf5z8lakydqnynasp74djfy53bh7jjmw0a9yry2c"; }; nativeBuildInputs = [ 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 81f63941729..0bb1fbc79ff 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool itstool libxml2 ]; meta = with stdenv.lib; { - homepage = https://github.com/GNOME/gnome-devel-docs; + homepage = "https://github.com/GNOME/gnome-devel-docs"; description = "Developer documentation for GNOME"; maintainers = gnome3.maintainers; license = licenses.fdl12; diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 6ec7dee1722..cf9ca9999d7 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; - version = "32"; + version = "33"; src = fetchFromGitHub { owner = "Ubuntu"; repo = "gnome-shell-extension-appindicator"; rev = "v${version}"; - sha256 = "1qv9ll4iwkinwk5mf2jppj4fbk8rfncix6q4hhrwnqmhmsbiz6n2"; + sha256 = "B039bgg5b63oaHp1Z36k9Dh5FLr8fmfxI25ZgIA+p2I="; }; # This package has a Makefile, but it's used for building a zip for diff --git a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix index f85b91d354d..db1741e72bb 100644 --- a/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix +++ b/pkgs/desktops/gnome-3/extensions/arc-menu/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-arc-menu"; - version = "33"; + version = "43"; src = fetchFromGitLab { owner = "LinxGem33"; repo = "Arc-Menu"; rev = "v${version}-Stable"; - sha256 = "0ncb19jlwy2y9jcj8g6cdbasdv6n7hm96qv9l251z6qgrmg28x4z"; + sha256 = "1rspl89bxqy0wla8cj0h1d29gp38xg1vmvhc1qg7bl46ank4yp5q"; }; patches = [ @@ -22,12 +22,12 @@ stdenv.mkDerivation rec { glib gettext ]; - makeFlags = [ "INSTALL_BASE=${placeholder "out"}/share/gnome-shell/extensions" ]; + makeFlags = [ "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" ]; meta = with stdenv.lib; { description = "Gnome shell extension designed to replace the standard menu found in Gnome 3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ dkabot ]; - homepage = https://gitlab.com/LinxGem33/Arc-Menu; + homepage = "https://gitlab.com/LinxGem33/Arc-Menu"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix index b7bde83915c..44b3f04f79d 100644 --- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; broken = true; # not compatable with latest GNOME maintainers = with maintainers; [ jonafato ]; - homepage = https://github.com/milliburn/gnome-shell-extension-battery_status; + homepage = "https://github.com/milliburn/gnome-shell-extension-battery_status"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index 1761887f8fb..608d44a2892 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }: stdenv.mkDerivation rec { - pname = "gnome-shell-extension-caffeine"; - version = "33"; + pname = "gnome-shell-extension-caffeine-unstable"; + version = "2020-03-13"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "gnome-shell-extension-caffeine"; - rev = "v${version}"; - sha256 = "1v74xfk7csgc4kw1fg75brmhk2aby3d453ksnmj4k8ivyxkzxmfg"; + rev = "f25fa5cd586271f080c2304d0ad1273b55e864f5"; + sha256 = "12a76g1ydw677pjnj00r3vw31k4xybc63ynqzx3s4g0wi6lipng7"; }; uuid = "caffeine@patapon.info"; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { description = "Fill the cup to inhibit auto suspend and screensaver"; license = licenses.gpl2; maintainers = with maintainers; [ eperuffo ]; - homepage = https://github.com/eonpatapon/gnome-shell-extension-caffeine; + homepage = "https://github.com/eonpatapon/gnome-shell-extension-caffeine"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index f04999a449c..edaced3579d 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME Shell integration for Chrome"; - homepage = https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome; + homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"; longDescription = '' To use the integration, install the <link xlink:href="https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome/Installation">browser extension</link>, and then set <option>services.gnome3.chrome-gnome-shell.enable</option> to <literal>true</literal>. ''; diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index 5277cb08cbb..1cc06be6ec9 100644 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gnome3 }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clipboard-indicator"; @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ jonafato ]; platforms = platforms.linux; - homepage = https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator; - broken = versionAtLeast gnome3.gnome-shell.version "3.26"; + homepage = "https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 6ac82c539a2..5af3ae8fe19 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - pname = "gnome-shell-dash-to-dock"; - version = "67"; + pname = "gnome-shell-dash-to-dock-unstable"; + version = "2020-03-19"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; - rev = "extensions.gnome.org-v" + version; - sha256 = "1746xm0iyvyzj6m3pvjx11smh9w1s7naz426ki0dlr5l7jh3mpy5"; + # rev = "extensions.gnome.org-v" + version; + rev = "c58004802b2eedfde96966a4ec0151fea2a1bd98"; + sha256 = "IjunykPFP2CbGcd8XVqhPuNUOUOOgDAQFIytLaoyqRg="; }; nativeBuildInputs = [ @@ -21,6 +22,6 @@ stdenv.mkDerivation rec { description = "A dock for the Gnome Shell"; license = licenses.gpl2; maintainers = with maintainers; [ eperuffo ]; - homepage = https://micheleg.github.io/dash-to-dock/; + homepage = "https://micheleg.github.io/dash-to-dock/"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 33261472487..84662505a37 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-panel"; - version = "26"; + version = "31"; src = fetchFromGitHub { owner = "home-sweet-gnome"; repo = "dash-to-panel"; rev = "v${version}"; - sha256 = "1phfx2pblygpcvsppsqqqflm7qnz46mqkw29hj0nv2dn69hf4xbc"; + sha256 = "A8Ft+tLNv8KlTnVUzrWGavBWpP0u2rhkuG5LZls1A24="; }; buildInputs = [ @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "An icon taskbar for Gnome Shell"; license = licenses.gpl2; maintainers = with maintainers; [ mounium ]; - homepage = https://github.com/jderose9/dash-to-panel; + homepage = "https://github.com/jderose9/dash-to-panel"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix index 4e7fa17d495..fb713201594 100644 --- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, substituteAll, gjs, vte }: +{ stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-drop-down-terminal"; - version = "24"; + version = "unstable-2020-03-25"; src = fetchFromGitHub { owner = "zzrough"; repo = "gs-extensions-drop-down-terminal"; - rev = "v${version}"; - sha256 = "1gda56xzwsa5pgmgpb7lhb3i3gqishvn84282inwvqm86afks73r"; + rev = "a59669afdb395b3315619f62c1f740f8b2f0690d"; + sha256 = "0igfxgrjdqq6z6xg4rsawxn261pk25g5dw2pm3bhwz5sqsy4bq3i"; }; uuid = "drop-down-terminal@gs-extensions.zzrough.org"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Configurable drop down terminal shell"; license = licenses.gpl3; maintainers = with maintainers; [ ericdallo ]; - homepage = https://github.com/zzrough/gs-extensions-drop-down-terminal; + homepage = "https://github.com/zzrough/gs-extensions-drop-down-terminal"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index 26d7f157240..baaca39a4c4 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-gsconnect"; - version = "31"; + version = "35"; src = fetchFromGitHub { owner = "andyholmes"; repo = "gnome-shell-extension-gsconnect"; rev = "v${version}"; - sha256 = "0nricm31jh4akncs0rkkilmq9afg7kgbj5cy7w26pfqb3l4nhifg"; + sha256 = "GqM2S9FIOHw+8AK2K7fpEBq34JqgKRCsW8I9Ve6c6IM="; }; patches = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "KDE Connect implementation for Gnome Shell"; - homepage = https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki; + homepage = "https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki"; license = licenses.gpl2; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index 8bfd681625f..efaef03f3b1 100644 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ jonafato ]; platforms = gnome3.gnome-shell.meta.platforms; - homepage = https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider; + homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome-3/extensions/impatience/default.nix index c3ca1b62121..230498f5d7b 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience/default.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "gnome-shell-impatience"; - version = "0.4.5"; + version = "unstable-2019-09-23"; src = fetchFromGitHub { owner = "timbertson"; repo = "gnome-shell-impatience"; - rev = "version-${version}"; + rev = "43e4e0a1e0eeb334a2da5224ce3ab4fdddf4f1b2"; sha256 = "0kvdhlz41fjyqdgcfw6mrr9nali6wg2qwji3dvykzfi0aypljzpx"; }; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Speed up builtin gnome-shell animations"; license = licenses.gpl3Plus; maintainers = with maintainers; [ timbertson tiramiseb ]; - homepage = http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml; + homepage = "http://gfxmonk.net/dist/0install/gnome-shell-impatience.xml"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix index dca346c6cce..c16f7bc4209 100644 --- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ b/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-mpris-indicator-button-unstable"; - version = "2019-09-29"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "JasonLG1979"; repo = "gnome-shell-extension-mpris-indicator-button"; - rev = "6cdc28a8bde98f25618b27ee48280996e2b4a0f8"; - sha256 = "1n3sh3phpa75y3vpc09wnzhis0m92zli1m46amzsdbvmk6gkifif"; + rev = "de54160e7d905b8c48c0fe30a437f7c51efc1aa3"; + sha256 = "k/NLmDrlaOsMkwLye7YGQhaQvOMNfhCsDVh2F0qnuFg="; }; uuid = "mprisindicatorbutton@JasonLG1979.github.io"; 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 8d3a775e949..be6c1916ab4 100644 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix @@ -1,21 +1,31 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitLab }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; - version = "2.1"; + version = "19"; - src = fetchgit { - url = "https://git.romainvigier.fr/Romain/nightthemeswitcher-gnome-shell-extension"; + src = fetchFromGitLab { + owner = "rmnvgr"; + repo = "nightthemeswitcher-gnome-shell-extension"; rev = "v${version}"; - sha256 = "1md44vmc83cp35riszhdvysnvl8pmkcpf5j6n4i2b3wwcjwxqwfy"; + sha256 = "1ll0yf1skf51wa10mlrajd1dy459w33kx0i3vhfcx2pdk7mw5a3c"; }; - makeFlags = [ "GSEXT_DIR_LOCAL=${placeholder "out"}/share/gnome-shell/extensions" ]; + # makefile tries to do install in home directory using + # `gnome-extensions install` + dontBuild = true; + + uuid = "nightthemeswitcher@romainvigier.fr"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/ + cp -r src/ $out/share/gnome-shell/extensions/${uuid} + ''; meta = with stdenv.lib; { description = "Automatically change the GTK theme to dark variant when Night Light activates"; license = licenses.gpl3; maintainers = with maintainers; [ jonafato ]; - homepage = https://git.romainvigier.fr/Romain/nightthemeswitcher-gnome-shell-extension; + homepage = "https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension/"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index f9f72bd77f0..c876b22c12c 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Integrates maximized windows with the top panel"; - homepage = https://github.com/franglais125/no-title-bar; + homepage = "https://github.com/franglais125/no-title-bar"; license = licenses.gpl2; broken = true; # https://github.com/franglais125/no-title-bar/issues/114 maintainers = with maintainers; [ jonafato svsdep ]; diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix index cffe96894cc..dbc65044c1b 100644 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/muffinmad/pidgin-im-gnome-shell-extension; + homepage = "https://github.com/muffinmad/pidgin-im-gnome-shell-extension"; description = "Make Pidgin IM conversations appear in the Gnome Shell message tray"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index fbbd56f1c0f..acb0e362429 100644 --- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Remove dropdown arrows from GNOME Shell Menus"; license = licenses.gpl3; maintainers = with maintainers; [ jonafato ]; - homepage = https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows; + homepage = "https://github.com/mpdeimos/gnome-shell-remove-dropdown-arrows"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix index cc1c2deeef9..6fa1840bbb1 100644 --- a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-sound-output-device-chooser"; - version = "25"; + version = "28"; src = fetchFromGitHub { owner = "kgshank"; repo = "gse-sound-output-device-chooser"; rev = version; - sha256 = "16xaa4r01575ix9lrvww8n6pird8r3ml1j037b3sm6dfrf8kvzxs"; + sha256 = "JmDUi6xTMbkMzW+hYJuKtjQj4ERctaiHr6eLsl5Fru4="; }; patches = [ diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index d14dbd1c411..489a4c5587f 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }: +{ stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; @@ -40,6 +40,9 @@ stdenv.mkDerivation rec { description = "Display system informations in gnome shell status bar"; license = licenses.gpl3Plus; maintainers = with maintainers; [ tiramiseb ]; - homepage = https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet; + homepage = "https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet"; + # 3.36 support not yet ready + # https://github.com/paradoxxxzero/gnome-shell-system-monitor-applet/pull/564 + broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.34"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index 1e44cd4de5c..b4b690c3007 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { description = "GNOME Shell TaskWarrior GUI"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jonafato ]; - homepage = https://github.com/cinatic/taskwhisperer; + homepage = "https://github.com/cinatic/taskwhisperer"; broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesnt't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix index 22f857a7809..60ca1dcbef3 100644 --- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Tiling window management for GNOME Shell"; license = licenses.gpl2; maintainers = with maintainers; [ benley ]; - homepage = https://github.com/rliang/gnome-shell-extension-tilingnome; + homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome"; platforms = gnome3.gnome-shell.meta.platforms; }; } diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index 04e98d51b0c..6ac9a4a0331 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A todo.txt manager, time tracker, timer, stopwatch, pomodoro, and alarms gnome-shell extension."; - homepage = https://github.com/zagortenay333/timepp__gnome; + homepage = "https://github.com/zagortenay333/timepp__gnome"; license = licenses.gpl3; maintainers = with maintainers; [ svsdep ]; broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Dosen't support 3.34 https://github.com/zagortenay333/timepp__gnome/issues/113 diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index f0f6279fe2e..6a1c87abf93 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, glib, gettext }: +{ stdenv, fetchFromGitHub, glib, gnome3, gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-topicons-plus"; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { description = "Brings all icons back to the top panel, so that it's easier to keep track of apps running in the backround"; license = licenses.gpl2; maintainers = with maintainers; [ eperuffo ]; - homepage = https://github.com/phocean/TopIcons-plus; + 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"; }; } 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 7d5de1062b1..44402fc6e13 100644 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-corner-preview"; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { description = "GNOME Shell extension showing a video preview on the corner of the screen"; license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; - homepage = https://github.com/medenagan/window-corner-preview; + homepage = "https://github.com/medenagan/window-corner-preview"; + broken = stdenv.lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix index ca4b72111c6..adcaf3126f3 100644 --- a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix +++ b/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-workspace-matrix"; - version = "3.0.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "mzur"; repo = "gnome-shell-wsmatrix"; rev = "v${version}"; - sha256 = "1fgyzmd16kklcca7600bwg8w8pbb4klmapqsvmahlwa99vmkhfkn"; + sha256 = "LTDkKSKvReJxBzAERE+vV+uJBNZw6UyhiB7kN48BZCo="; }; uuid = "wsmatrix@martin.zurowietz.de"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { description = "Arrange workspaces in a two dimensional grid with workspace thumbnails"; license = licenses.gpl3Plus; maintainers = with maintainers; [ chkno ]; - homepage = https://github.com/mzur/gnome-shell-wsmatrix; + homepage = "https://github.com/mzur/gnome-shell-wsmatrix"; }; } diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 474c49fb584..ff463b104e2 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Aisleriot; + homepage = "https://wiki.gnome.org/Apps/Aisleriot"; description = "A collection of patience games written in guile scheme"; maintainers = gnome3.maintainers; license = licenses.gpl3Plus; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index ec9895b3bf5..688aa0832cd 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Puzzle game where you move atoms to build a molecule"; - homepage = https://wiki.gnome.org/Apps/Atomix; + homepage = "https://wiki.gnome.org/Apps/Atomix"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; 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 4d0512f1adb..9bb1286c8d9 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "five-or-more"; - version = "3.32.1"; + version = "3.32.2"; src = fetchurl { url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xw05dd2dwi9vsph9h158b4n89s5k07xrh6bjz1icm0pdmjwhpgk"; + sha256 = "19pf8wzbf3ciqf2k4bj9sddvyhckfd62x86pnqr6s8h4vn9jc6ii"; }; nativeBuildInputs = [ 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 94466b38e22..66d174b25c4 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 @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "four-in-a-row"; - version = "3.34.4"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1gw54llbmbv4w2rxmmkzq2wq6sacnpj99maw06zpn071cga0g4z5"; + sha256 = "1bl63npcbr5ymka2y06wps612qynxa4hsqlzn7bvwpz2v53pai1z"; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Four-in-a-row; + homepage = "https://wiki.gnome.org/Apps/Four-in-a-row"; description = "Make lines of the same color to win"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index 72c4bdf1d29..c1d9a137aac 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-chess"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1n1vjg6xhwppmddrmqmkk6b3jkgphshp06rjbv5h3270k520a135"; + sha256 = "1a9fgi749gy1f60vbcyrqqkab9vqs42hji70q73k1xx8rv0agmg0"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gettext itstool libxml2 python3 wrapGAppsHook gobject-introspection ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Chess; + homepage = "https://wiki.gnome.org/Apps/Chess"; description = "Play the classic two-player boardgame of chess"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index f7a7a75533d..f46f4b98cb2 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-klotski"; - version = "3.34.4"; + version = "3.36.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1bg7hl64lmjryzvp51qfak5jqs7vbqfmj0s7h1g3c7snscca7rx6"; + sha256 = "06gsg3s8hyhhsk11f1ld2anzv1czg1429483gbv9lr2p7fnq7pyy"; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Klotski; + homepage = "https://wiki.gnome.org/Apps/Klotski"; description = "Slide blocks to solve the puzzle"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index aa7824a0317..f20f4c5f2c0 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-mahjongg"; - version = "3.34.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0qyi3jkg112jysrsy5p330b7b92sl09mr8zsimq06q68kj1wzkz5"; + sha256 = "1a5h55amr0pab36y2iqm6ynv6mmb8al1b92rfk18wzfcfz7mhxzd"; }; passthru = { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mahjongg; + homepage = "https://wiki.gnome.org/Apps/Mahjongg"; description = "Disassemble a pile of tiles by removing matching pairs"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 8c620fdd0d1..6e135409359 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-mines"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1spxa6qr1y8s5rrsvpciywpvhk812ngn95s1apaxaigwy2g1iw54"; + sha256 = "0m53ymxbgr3rb3yv13fzjwqh6shsfr51abkm47rchsy2jryqkzja"; }; # gobject-introspection for finding vapi files @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Mines; + homepage = "https://wiki.gnome.org/Apps/Mines"; description = "Clear hidden mines from a minefield"; maintainers = gnome3.maintainers; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 94bc8a56b39..ddac0775fa8 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-nibbles"; - version = "3.34.2"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0sl54ns1b5cff6vrls6716xb73krgd1sp36k94gc2lza5laixyh0"; + sha256 = "01vzcjys2x95wnanwq25x0a7x6cc4j6g8gk69c5yc9ild48rr9c1"; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Guide a worm around a maze"; - homepage = https://wiki.gnome.org/Apps/Nibbles; + homepage = "https://wiki.gnome.org/Apps/Nibbles"; license = licenses.gpl2; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 484110cfaa9..0f85e10511c 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-robots"; - version = "3.34.1"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ncghkv06x9qqfr5zyh6hdv28d0i6v9z4z365k05x9ji5pyzxiny"; + sha256 = "0qmdwrl70ccs3blgwmpcf3sg9k8mcvsl1dr1gds4ba3fq9ca8ipb"; }; passthru = { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Robots; + homepage = "https://wiki.gnome.org/Apps/Robots"; description = "Avoid the robots and make them crash into each other"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 53cd073af34..890fea6ad9b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-sudoku"; - version = "3.34.1"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "025y85r4qqardivvwiwhbmgarziykdy224m8zlrq8b79zv82793b"; + sha256 = "17a1r2jk5yygrxil1dycmamxyvyi64mr29mbyfgcx5hm2fylxxwm"; }; nativeBuildInputs = [ meson ninja vala pkgconfig gobject-introspection gettext itstool libxml2 python3 desktop-file-utils wrapGAppsHook ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Sudoku; + homepage = "https://wiki.gnome.org/Apps/Sudoku"; description = "Test your logic skills in this number grid puzzle"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 623572f980b..449b4ec71fe 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.34.4"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0s8gsgaj1mxldg5yaq6k9anfha9bc4n16wms66kbbpqi8k5hcm40"; + sha256 = "16ss2d8s6glb3k0wnb5ihmbqvk9i1yi18wv9hzgxfyhs1rvk496f"; }; passthru = { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Taquin; + homepage = "https://wiki.gnome.org/Apps/Taquin"; description = "Move tiles so that they reach their places"; maintainers = gnome3.maintainers; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 843211822f9..5c98acf9229 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.34.4"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sm90nkpig02hwk7bh5bnf65awgssxl63bvvh2a7gmlaln8x99iy"; + sha256 = "1xbd0flh77v3x0dh4dsfspykwb6rwvga7kqwn1fq7gk421mq6n52"; }; passthru = { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tetravex; + homepage = "https://wiki.gnome.org/Apps/Tetravex"; description = "Complete the puzzle by matching numbered tiles"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index cf83527432f..c0c9cac3906 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "hitori"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/hitori/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1612hq6d2mnggppy949dkb8lz9886n0rlg68z7qmjjizz1l41lb5"; + sha256 = "0mq1jv8rbmvksnhbm1d25kcvcfr9lq58qipcacn7wa26xpx7cvs5"; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Hitori; + homepage = "https://wiki.gnome.org/Apps/Hitori"; description = "GTK application to generate and let you play games of Hitori"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 028684114ec..d6d88b688d0 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.34.5"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05qywjcar29vk29yvbxwlddxhwlrvllgjw7srmlz5811hc5m0a1m"; + sha256 = "0ysb021mf5sy1ywicys35rn5c9v355rffjrlhxmr3z6yplrljm5b"; }; nativeBuildInputs = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Iagno; + homepage = "https://wiki.gnome.org/Apps/Iagno"; description = "Computer version of the game Reversi, more popularly called Othello"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 0a236d0425a..3ce928f2ce5 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lightsoff"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1yyq0962fv16rab3alq5saf4gpii9xvcfy5vbq85hhhgjpbqrfns"; + sha256 = "0qvafpciqbqmpan9i8ans3lqs29v02zblz6k0hzj4p3qq4sch3a3"; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Lightsoff; + homepage = "https://wiki.gnome.org/Apps/Lightsoff"; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 2ac4c4c96f7..9c757cef85f 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "quadrapassel"; - version = "3.34.1"; + version = "3.36.00"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1qh6hx90lqag2hby94jc68xnz4i6b2a253x4yp6xz025fpacv6mk"; + sha256 = "1xk9x1pp71armj47vxja7fsj6gs116kcjkd8xgwf8wi4zr4kgx7g"; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Classic falling-block game, Tetris"; - homepage = https://wiki.gnome.org/Apps/Quadrapassel; + homepage = "https://wiki.gnome.org/Apps/Quadrapassel"; license = licenses.gpl2; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 02a61d46c73..85272c39de5 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Swell%20Foop; + homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; description = "Puzzle game, previously known as Same GNOME"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index f196ada3850..6af84b59b9a 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "3.32.1"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0na7sswfh63wj44aibcnqdsbb24yfngcwgi07lv8rky6rry0kqgz"; + sha256 = "1klnxk49rr1m2lr4zj1wvfl0iaxzdh2k8ngrcmfmcq39vlxnn94y"; }; passthru = { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Tali; + homepage = "https://wiki.gnome.org/Apps/Tali"; description = "Sort of poker with dice and less money"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 7e2a8050b41..748f5597797 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, pkgconfig, gtk3, vala, enchant2, wrapGAppsHook, meson, ninja , desktop-file-utils, gnome-online-accounts, gsettings-desktop-schemas, adwaita-icon-theme -, libcanberra-gtk3, libsecret, gmime, isocodes, libxml2, gettext, fetchpatch +, libpeas, libsecret, gmime3, isocodes, libxml2, gettext, fetchpatch , sqlite, gcr, json-glib, itstool, libgee, gnome3, webkitgtk, python3 -, xvfb_run, dbus, shared-mime-info, libunwind, libunity, folks, glib-networking +, xvfb_run, dbus, shared-mime-info, libunwind, folks, glib-networking , gobject-introspection, gspell, appstream-glib, libytnef, libhandy }: stdenv.mkDerivation rec { pname = "geary"; - version = "3.34.2"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a6j70pzr57ga7m4nypqdkqwlzk2dablpz93yaympgrlqpf5zkvm"; + sha256 = "07rhmzznfa4asx5gbmvnfpybd5czy7xmzk75xrk4r1qcnr24ml03"; }; nativeBuildInputs = [ @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - adwaita-icon-theme enchant2 gcr gmime gnome-online-accounts - gsettings-desktop-schemas gtk3 isocodes json-glib libcanberra-gtk3 + adwaita-icon-theme enchant2 gcr gmime3 gnome-online-accounts + gsettings-desktop-schemas gtk3 isocodes json-glib libpeas libgee libsecret sqlite webkitgtk glib-networking - libunwind libunity folks gspell libytnef libhandy + libunwind folks gspell libytnef libhandy ]; checkInputs = [ xvfb_run dbus ]; @@ -41,14 +41,21 @@ stdenv.mkDerivation rec { }) ]; + # NOTE: Remove `build-auxyaml_to_json.py` when no longer needed, see: + # https://gitlab.gnome.org/GNOME/geary/commit/f7f72143e0f00ca5e0e6a798691805c53976ae31#0cc1139e3347f573ae1feee5b73dbc8a8a21fcfa postPatch = '' chmod +x build-aux/post_install.py build-aux/git_version.py + patchShebangs build-aux/post_install.py build-aux/git_version.py + chmod +x build-aux/yaml_to_json.py + patchShebangs build-aux/yaml_to_json.py + chmod +x desktop/geary-attach ''; - doCheck = true; + # FIXME: fix tests + doCheck = false; checkPhase = '' NO_AT_BRIDGE=1 \ @@ -71,7 +78,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Geary; + homepage = "https://wiki.gnome.org/Apps/Geary"; description = "Mail client for GNOME 3"; maintainers = gnome3.maintainers; license = licenses.lgpl21Plus; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome-3/misc/gitg/default.nix index d5617ee493d..c4849f00d3b 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/misc/gitg/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Gitg; + homepage = "https://wiki.gnome.org/Apps/Gitg"; description = "GNOME GUI client to view git repositories"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index fff328c608d..a212d4112c8 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -12,7 +12,6 @@ , libgtop , libnotify , upower -, dbus-glib , wirelesstools , linuxPackages , adwaita-icon-theme @@ -25,13 +24,13 @@ let pname = "gnome-applets"; - version = "3.34.0"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1mbhykqwzq18zpvfkdcdkbb4zhijmxqa2i6502an78yap87vq74i"; + sha256 = "1hlblnajjkvlcd45lxfdxscx7j51nwyvri5jci6ylgpaxlwwm1s8"; }; nativeBuildInputs = [ @@ -51,7 +50,6 @@ in stdenv.mkDerivation rec { libgtop libnotify upower - dbus-glib adwaita-icon-theme libgweather gucharmap @@ -78,7 +76,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Applets for use with the GNOME panel"; - homepage = https://wiki.gnome.org/Projects/GnomeApplets; + homepage = "https://wiki.gnome.org/Projects/GnomeApplets"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index c1791ee5bbd..0920d2f2df3 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -17,7 +17,10 @@ , libxml2 , pkgconfig , polkit +, gdm +, systemd , upower +, pam , wrapGAppsHook , writeTextFile , writeShellScriptBin @@ -27,14 +30,38 @@ let pname = "gnome-flashback"; - version = "3.34.2"; - requiredComponents = wmName: "RequiredComponents=${wmName};gnome-flashback;gnome-panel;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.ScreensaverProxy;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings;"; + version = "3.36.1"; + + # From data/sessions/Makefile.am + requiredComponentsCommon = [ + "gnome-flashback" + "gnome-panel" + ]; + requiredComponentsGsd = [ + "org.gnome.SettingsDaemon.A11ySettings" + "org.gnome.SettingsDaemon.Color" + "org.gnome.SettingsDaemon.Datetime" + "org.gnome.SettingsDaemon.Housekeeping" + "org.gnome.SettingsDaemon.Keyboard" + "org.gnome.SettingsDaemon.MediaKeys" + "org.gnome.SettingsDaemon.Power" + "org.gnome.SettingsDaemon.PrintNotifications" + "org.gnome.SettingsDaemon.Rfkill" + "org.gnome.SettingsDaemon.ScreensaverProxy" + "org.gnome.SettingsDaemon.Sharing" + "org.gnome.SettingsDaemon.Smartcard" + "org.gnome.SettingsDaemon.Sound" + "org.gnome.SettingsDaemon.UsbProtection" + "org.gnome.SettingsDaemon.Wacom" + "org.gnome.SettingsDaemon.XSettings" + ]; + requiredComponents = wmName: "RequiredComponents=${stdenv.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"; - sha256 = "1726xcm2q94nfvb055d3m61m20s0xy3xl1fc3ds3k3rcrn457riv"; + sha256 = "16gknn5mj29i8svlncarj92qi0swdlziggxpg9rryqslsy896a2x"; }; # make .desktop Execs absolute @@ -76,7 +103,11 @@ let libpulseaudio libxkbfile polkit + gdm + gnome-panel + systemd upower + pam xkeyboard_config ]; @@ -84,6 +115,9 @@ let enableParallelBuilding = true; + PKG_CONFIG_LIBGNOME_PANEL_LAYOUTSDIR = "${placeholder "out"}/share/gnome-panel/layouts"; + PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -155,7 +189,7 @@ let meta = with stdenv.lib; { description = "GNOME 2.x-like session for GNOME 3"; - homepage = https://wiki.gnome.org/Projects/GnomeFlashback; + homepage = "https://wiki.gnome.org/Projects/GnomeFlashback"; license = licenses.gpl2; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index ce6d943c39f..5e8348ee0af 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/software/PackageKit/; + homepage = "https://www.freedesktop.org/software/PackageKit/"; platforms = platforms.linux; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index 423a393eb77..80e75561e3c 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -7,7 +7,6 @@ , gettext , glib , gnome-desktop -, gnome-flashback , gnome-menus , gnome3 , gtk3 @@ -23,7 +22,7 @@ let pname = "gnome-panel"; - version = "3.34.1"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -31,7 +30,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "03dr54njdh2szy6yrib2q0agjscbj3bmzrfb9fb4psrf4mah5g56"; + sha256 = "1lxba8syy9gb50zxdk13gr1f62dfphwbb7njg6p26x9rvlkbf88y"; }; # make .desktop Exec absolute @@ -46,8 +45,8 @@ in stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome-menus}/share:${gnome-flashback}/share" - --prefix XDG_CONFIG_DIRS : "${gnome-menus}/etc/xdg:${gnome-flashback}/etc/xdg" + --prefix XDG_DATA_DIRS : "${gnome-menus}/share" + --prefix XDG_CONFIG_DIRS : "${gnome-menus}/etc/xdg" ) ''; @@ -92,7 +91,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; - homepage = https://wiki.gnome.org/Projects/GnomePanel; + homepage = "https://wiki.gnome.org/Projects/GnomePanel"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix b/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix deleted file mode 100644 index 4a530e54de7..00000000000 --- a/pkgs/desktops/gnome-3/misc/gnome-screensaver/default.nix +++ /dev/null @@ -1,96 +0,0 @@ -{ stdenv -, fetchgit -, autoreconfHook -, dbus-glib -, glib -, gnome-common -, gnome-desktop -, gnome3 -, gtk3 -, pkgconfig -, intltool -, pam -, systemd -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "gnome-screensaver"; - version = "3.6.1"; - - # the original package is deprecated and the Ubuntu version has a number of useful patches - src = fetchgit { - url = "https://git.launchpad.net/ubuntu/+source/gnome-screensaver"; - rev = "4f7b666131dec060a5aac9117f395ac522a627b4"; - sha256 = "15xqgcpm825cy3rm8pj00qlblq66svmh06lcw8qi74a3g0xcir87"; - }; - - # from debian/patches/series - patches = map (patch: "debian/patches/${patch}") [ - "00git_logind_check.patch" - "01_no_autostart.patch" - "03_fix_ltsp-fading.patch" - "05_dbus_service.patch" - "10_legacy_scrsvr_inhibit.patch" - "13_nvidia_gamma_fade_fallback.patch" - "14_no_fade_on_user_switch.patch" - "15_dont_crash_on_no_fade.patch" - "16_dont_crash_in_kvm.patch" - "17_remove_top_panel.patch" - "18_unity_dialog_layout.patch" - "24_use_user_settings.patch" - "25_fix_lock_command.patch" - "27_lightdm_switch_user.patch" - "28_blocking_return.patch" - "29_handle_expired_creds.patch" - # these two patches are ubuntu-specific - # "30_ubuntu-lock-on-suspend_gsetting.patch" - # "31_lock_screen_on_suspend.patch" - "32_input_sources_switcher.patch" - "move-not-nuke.patch" - "allow-replacement" - "libsystemd.patch" - "0001-gs-lock-plug-Disconnect-signal-handler-from-right-ob.patch" - "33_budgie_support.patch" - ] ++ [ ./fix-dbus-service-dir.patch ]; - - nativeBuildInputs = [ - autoreconfHook - intltool - wrapGAppsHook - gnome-common - pkgconfig - ]; - - buildInputs = [ - glib - gtk3 - gnome-desktop - dbus-glib - pam - systemd - ]; - - NIX_CFLAGS_COMPILE = [ "-Wno-error=return-type" ]; - - configureFlags = [ "--enable-locking" "--with-systemd=yes" ]; - - enableParallelBuilding = true; - - doCheck = true; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - description = "Component of Gnome Flashback that provides screen locking"; - homepage = https://wiki.gnome.org/Projects/GnomeScreensaver; - license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index f40911577c1..0cd8301e199 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; + homepage = "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool"; description = "A tool to customize advanced GNOME 3 options"; maintainers = gnome3.maintainers; license = licenses.gpl3; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 00e21e30a29..1ee9e5b933b 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -18,30 +18,17 @@ }: stdenv.mkDerivation rec { - version = "3.34.1"; + version = "3.36.3"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "1jcj0kgxhad8rblyqhwa2yhkf0010k80w9bm2rajanad2c3bqaxa"; + sha256 = "sR7/NdCaidP03xE64nqQc1M+xAIipOuKp5OWBJ4VN9w="; }; patches = [ - # Meson fixes - # https://github.com/Keruspe/GPaste/pull/283 - # install systemd units - (fetchpatch { - url = "https://github.com/Keruspe/GPaste/commit/a474d8c1f2bd600476ba52dc19f517787845533b.patch"; - sha256 = "19m1ar61l2n0vb5a5qfhdny8giivqlyq04l3j9i8llv16vx80rg2"; - }) - # apply symbol versioning - (fetchpatch { - url = "https://github.com/Keruspe/GPaste/commit/08047752e8dba9363673ddefd422c43075f08006.patch"; - sha256 = "0jvcs1a17sijvb2wqyn3y8shdxrhv4kwzxs39kmh9y8nyx2dzhpf"; - }) - ./fix-paths.patch ]; 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 d591fb6033d..dae6046c19e 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, gettext, gnome3 -, libintl }: +{ stdenv, fetchurl, pkgconfig, glib, gtk3, libgee, gettext, vala, gnome3 +, libintl, meson, ninja }: let pname = "libgnome-games-support"; - version = "1.4.4"; + version = "1.6.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1zkbmnrn161p74qg6jhsn9f66yjjzxfm13pl1klv9av8k1bax9pq"; + sha256 = "1gq8p38k92lsr6dbav6pgmw0adnzzhcs06jqdkr37p145vv6ls7v"; }; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext vala ]; buildInputs = [ libintl ]; propagatedBuildInputs = [ # Required by libgnome-games-support-1.pc @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; - homepage = https://wiki.gnome.org/Apps/Games; + homepage = "https://wiki.gnome.org/Apps/Games"; license = licenses.lgpl3; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index 8355051fa85..ed21f00878c 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -16,13 +16,13 @@ let pname = "metacity"; - version = "3.34.1"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0ga57b71i2gbd723gbs3pxy1jnf44q5mnwq5yhxzn2irbh2d3iri"; + sha256 = "08xkq5i6czvms0ygbj7ywzl70q1l0z44nfh6b43q8rmjwa9pdw0i"; }; patches = [ @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Window manager used in Gnome Flashback"; - homepage = https://wiki.gnome.org/Projects/Metacity; + homepage = "https://wiki.gnome.org/Projects/Metacity"; license = licenses.gpl2; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index 4c2a551b1c7..96731e87cfd 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Python bindings for the Nautilus Extension API"; - homepage = https://wiki.gnome.org/Projects/NautilusPython; + homepage = "https://wiki.gnome.org/Projects/NautilusPython"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index 1dbd9ce5bfe..fce6b71c4c8 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://gnomepomodoro.org/; + homepage = "https://gnomepomodoro.org/"; description = "Time management utility for GNOME based on the pomodoro technique"; longDescription = '' This GNOME utility helps to manage time according to Pomodoro Technique. diff --git a/pkgs/desktops/gnustep/libobjc2/default.nix b/pkgs/desktops/gnustep/libobjc2/default.nix index b058bd87989..10c10c33a95 100644 --- a/pkgs/desktops/gnustep/libobjc2/default.nix +++ b/pkgs/desktops/gnustep/libobjc2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Objective-C runtime for use with GNUstep"; - homepage = http://gnustep.org/; + homepage = "http://gnustep.org/"; license = licenses.mit; maintainers = with maintainers; [ ashalkhakov matthewbauer ]; platforms = platforms.unix; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 64e9332a306..9b8692f0da5 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { description = "A build manager for GNUstep"; - homepage = http://gnustep.org/; + homepage = "http://gnustep.org/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ ashalkhakov matthewbauer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix index 7bb287c3fa5..580fbdc5d88 100644 --- a/pkgs/desktops/gnustep/make/gsmakeDerivation.nix +++ b/pkgs/desktops/gnustep/make/gsmakeDerivation.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (args // { GNUSTEP_MAKEFILES = "${make}/share/GNUstep/Makefiles"; meta = { - homepage = http://gnustep.org/; + homepage = "http://gnustep.org/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/desktops/lumina/lumina-calculator/default.nix b/pkgs/desktops/lumina/lumina-calculator/default.nix index 70e0f2e3511..aa74be8d5f3 100644 --- a/pkgs/desktops/lumina/lumina-calculator/default.nix +++ b/pkgs/desktops/lumina/lumina-calculator/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scientific calculator for the Lumina Desktop"; - homepage = https://github.com/lumina-desktop/lumina-calculator; + homepage = "https://github.com/lumina-desktop/lumina-calculator"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/lumina/lumina-pdf/default.nix b/pkgs/desktops/lumina/lumina-pdf/default.nix index 62d59d18cc5..af9d469e1be 100644 --- a/pkgs/desktops/lumina/lumina-pdf/default.nix +++ b/pkgs/desktops/lumina/lumina-pdf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF viewer for the Lumina Desktop"; - homepage = https://github.com/lumina-desktop/lumina-pdf; + homepage = "https://github.com/lumina-desktop/lumina-pdf"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/lumina/lumina/default.nix b/pkgs/desktops/lumina/lumina/default.nix index c758fc38a1b..048b559c34a 100644 --- a/pkgs/desktops/lumina/lumina/default.nix +++ b/pkgs/desktops/lumina/lumina/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { that is designed for use on any Unix-like operating system. It is based on QT5. ''; - homepage = https://lumina-desktop.org; + homepage = "https://lumina-desktop.org"; license = licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/desktops/lxde/core/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix index c06a99eb36c..ea64b75214f 100644 --- a/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; - homepage = https://lxde.org/; + homepage = "https://lxde.org/"; maintainers = [ stdenv.lib.maintainers.hinton ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index 550e98c9dcc..572d86b652e 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool ]; meta = { - homepage = https://lxde.org/; + homepage = "https://lxde.org/"; license = stdenv.lib.licenses.gpl2; description = "Freedesktop.org desktop menus for LXDE"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix index a24a33c2e76..20b5a35fc30 100644 --- a/pkgs/desktops/lxde/core/lxpanel/default.nix +++ b/pkgs/desktops/lxde/core/lxpanel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight X11 desktop panel for LXDE"; - homepage = https://lxde.org/; + homepage = "https://lxde.org/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.ryneeverett ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxrandr/default.nix b/pkgs/desktops/lxde/core/lxrandr/default.nix index 0866fd104d2..421c999ea2f 100644 --- a/pkgs/desktops/lxde/core/lxrandr/default.nix +++ b/pkgs/desktops/lxde/core/lxrandr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LXRandR is the standard screen manager of LXDE."; - homepage = https://lxde.org/; + homepage = "https://lxde.org/"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ rawkode ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index 0646078d825..2bb281494bd 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { Desktop Environment, it's totally desktop independent and only requires pure GTK. ''; - homepage = https://wiki.lxde.org/en/LXTask; + homepage = "https://wiki.lxde.org/en/LXTask"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.romildo ]; diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index e639996f7c6..fe44b707f76 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { meta = with lib; { description = "GUI configuration tool for compton X composite manager"; - homepage = https://github.com/lxqt/compton-conf; + homepage = "https://github.com/lxqt/compton-conf"; license = licenses.lgpl21; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index 39cece7724e..d383b46a9ae 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { meta = with lib; { description = "Core library of PCManFM-Qt (Qt binding for libfm)"; - homepage = https://github.com/lxqt/libfm-qt; + homepage = "https://github.com/lxqt/libfm-qt"; license = licenses.lgpl21; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index f5ab9c9ae8e..ec7fe0a7665 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { meta = with lib; { description = "Core utility library for all LXQt components"; - homepage = https://github.com/lxqt/liblxqt; + homepage = "https://github.com/lxqt/liblxqt"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 5f7485fc63b..14bb21e1469 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = with lib; { description = "Qt implementation of freedesktop.org xdg specs"; - homepage = https://github.com/lxqt/libqtxdg; + homepage = "https://github.com/lxqt/libqtxdg"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index dc2ce54d6ae..0e63d32c746 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { meta = with lib; { description = "Library used to query system info and statistics"; - homepage = https://github.com/lxqt/libsysstat; + homepage = "https://github.com/lxqt/libsysstat"; license = licenses.lgpl21Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 33e6a1f99e5..e47a9ec1b48 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { meta = with lib; { description = "The image viewer and screenshot tool for lxqt"; - homepage = https://github.com/lxqt/lximage-qt; + homepage = "https://github.com/lxqt/lximage-qt"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 5fa074120ff..19a06925b3e 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { meta = with lib; { description = "Dialogue window providing information about LXQt and the system it's running on"; - homepage = https://github.com/lxqt/lxqt-about; + homepage = "https://github.com/lxqt/lxqt-about"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 9f0b22bf6cc..0a9ef8cfb84 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { meta = with lib; { description = "LXQt system administration tool"; - homepage = https://github.com/lxqt/lxqt-admin; + homepage = "https://github.com/lxqt/lxqt-admin"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 205ea2fd201..2c4d040a432 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { meta = with lib; { description = "Archive tool for the LXQt desktop environment"; - homepage = https://github.com/lxqt/lxqt-archiver/; + homepage = "https://github.com/lxqt/lxqt-archiver/"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ jchw ]; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 626c99fcf9c..d06cb7be928 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { meta = with lib; { description = "Various packaging tools and scripts for LXQt applications"; - homepage = https://github.com/lxqt/lxqt-build-tools; + homepage = "https://github.com/lxqt/lxqt-build-tools"; license = licenses.lgpl21; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index d34c419ae66..41fe965161d 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -43,7 +43,7 @@ mkDerivation rec { meta = with lib; { description = "Tools to configure LXQt and the underlying operating system"; - homepage = https://github.com/lxqt/lxqt-config; + homepage = "https://github.com/lxqt/lxqt-config"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index 9f844b4676b..ca760d2a090 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "LXQt service for global keyboard shortcuts registration"; - homepage = https://github.com/lxqt/lxqt-globalkeys; + homepage = "https://github.com/lxqt/lxqt-globalkeys"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index af64f523d48..5790be3c77f 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "The LXQt notification daemon"; - homepage = https://github.com/lxqt/lxqt-notificationd; + homepage = "https://github.com/lxqt/lxqt-notificationd"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 5f270b8efc9..26730f57b43 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "GUI to query passwords on behalf of SSH agents"; - homepage = https://github.com/lxqt/lxqt-openssh-askpass; + homepage = "https://github.com/lxqt/lxqt-openssh-askpass"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 8310ae95f09..57938a5f521 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { meta = with lib; { description = "The LXQt desktop panel"; - homepage = https://github.com/lxqt/lxqt-panel; + homepage = "https://github.com/lxqt/lxqt-panel"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index a64d682bf1c..33a2d517fa4 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -35,7 +35,7 @@ mkDerivation rec { meta = with lib; { description = "The LXQt PolicyKit agent"; - homepage = https://github.com/lxqt/lxqt-policykit; + homepage = "https://github.com/lxqt/lxqt-policykit"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index d415cb618cc..997a9cda3d9 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { description = "Power management module for LXQt"; - homepage = https://github.com/lxqt/lxqt-powermanagement; + homepage = "https://github.com/lxqt/lxqt-powermanagement"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index a67efaee37a..abb09aae838 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { meta = with lib; { description = "LXQt Qt platform integration plugin"; - homepage = https://github.com/lxqt/lxqt-qtplugin; + homepage = "https://github.com/lxqt/lxqt-qtplugin"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index db05d803891..e4f39184ffd 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -34,7 +34,7 @@ mkDerivation rec { meta = with lib; { description = "Tool used to launch programs quickly by typing their names"; - homepage = https://github.com/lxqt/lxqt-runner; + homepage = "https://github.com/lxqt/lxqt-runner"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 458a5080bcf..0493dd9fbb1 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { meta = with lib; { description = "An alternative session manager ported from the original razor-session"; - homepage = https://github.com/lxqt/lxqt-session; + homepage = "https://github.com/lxqt/lxqt-session"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index c0e7443d3dd..9c76f0383b5 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { meta = with lib; { description = "GUI frontend for sudo/su"; - homepage = https://github.com/lxqt/lxqt-sudo; + homepage = "https://github.com/lxqt/lxqt-sudo"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index f4648188140..1cc56d62a06 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { meta = with lib; { description = "Themes, graphics and icons for LXQt"; - homepage = https://github.com/lxqt/lxqt-themes; + homepage = "https://github.com/lxqt/lxqt-themes"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 1333d027fca..1b1e2e92b0f 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -31,7 +31,7 @@ mkDerivation rec { meta = with lib; { description = "The Qt port of obconf, the Openbox configuration tool"; - homepage = https://github.com/lxqt/obconf-qt; + homepage = "https://github.com/lxqt/obconf-qt"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 7b7d7290320..308077bc099 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -28,7 +28,7 @@ mkDerivation rec { meta = with lib; { description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; - homepage = https://github.com/lxqt/pavucontrol-qt; + homepage = "https://github.com/lxqt/pavucontrol-qt"; license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 168b7f35ad2..b294cdf52ab 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; - homepage = https://github.com/lxqt/pcmanfm-qt; + homepage = "https://github.com/lxqt/pcmanfm-qt"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index df717debbae..d5da4737f8f 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { meta = with lib; { description = "Cross-platform clipboard history applet"; - homepage = https://github.com/pvanek/qlipper; + homepage = "https://github.com/pvanek/qlipper"; license = licenses.gpl2Plus; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index cb8e5b2569c..cba01522de0 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { meta = with lib; { description = "Qt based process manager"; - homepage = https://github.com/lxqt/qps; + homepage = "https://github.com/lxqt/qps"; license = licenses.gpl2; platforms = with platforms; linux; # does not build on darwin maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 10f525eb9e6..2b4844654b0 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { meta = with lib; { description = "A lightweight Qt-based terminal emulator"; - homepage = https://github.com/lxqt/qterminal; + homepage = "https://github.com/lxqt/qterminal"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo globin ]; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index e61360f6a3b..d20d4445c25 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { meta = with lib; { description = "A terminal emulator widget for Qt 5"; - homepage = https://github.com/lxqt/qtermwidget; + homepage = "https://github.com/lxqt/qtermwidget"; license = licenses.gpl2; platforms = with platforms; unix; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index d2bd073e4a2..f8896ae0c2c 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mate-common"; - version = "1.24.0"; + version = "1.24.1"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06w25mk2w7rfnkwpnav8pcrvip1zdd0zd1qc6d975ksmg66r1vz7"; + sha256 = "1dgp6k2l6dz7x2lnqk4y5xfkld376726hda3mrc777f821kk99nr"; }; enableParallelBuilding = true; diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix index aaf9986fbb2..fc48514ff01 100644 --- a/pkgs/desktops/maxx/default.nix +++ b/pkgs/desktops/maxx/default.nix @@ -61,10 +61,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A replica of IRIX Interactive Desktop"; - homepage = https://www.facebook.com/maxxdesktop/; + homepage = "https://www.facebook.com/maxxdesktop/"; license = { fullName = "The MaXX Interactive Desktop for Linux License Agreement"; - url = http://maxxdesktop.arcadedaydream.com/Indigo-Releases/docs/license.html; + url = "http://maxxdesktop.arcadedaydream.com/Indigo-Releases/docs/license.html"; free = false; # redistribution is only allowed to *some* hardware, etc. }; maintainers = [ maintainers.gnidorah ]; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 3f4f04377ed..cb86c7fb9fa 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0aqslkig7vs95z719mp3xrl1zp65ypp2lq9aikvsis6nssadn2cd"; + sha256 = "12gql86vn12zbkw368blxk0cl9fgs22dyj02xnimjc8b6s80yib4"; }; passthru = { @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/elementary/appcenter; + homepage = "https://github.com/elementary/appcenter"; description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index 1876020a8fe..f2f6faedc5a 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "elementary-calculator"; - version = "1.5.4"; + version = "1.5.5"; repoName = "calculator"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0053bdzn5viqlni6qg6q39nma6bsddmhnafa0mzggiv8l4qasbrx"; + sha256 = "1csxsr2c8qvl97xz9ahwn91z095nzgr0i1mbcb1spljll2sr9lkj"; }; passthru = { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/elementary/calculator; + homepage = "https://github.com/elementary/calculator"; description = "Calculator app designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index 5a70fa94c5e..ec11ae7516b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pname = "elementary-calendar"; - version = "5.0.3"; + version = "5.0.4"; repoName = "calendar"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1dqcmh585fjib4m8bs7qy23fv429s7q9nbcqnn0vvmy1n36fic4m"; + sha256 = "0ywk9w6d6nw7ir3f11xc13fr08ifvzpavq1c3x48kmmf69ywprdk"; }; passthru = { @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Desktop calendar app designed for elementary OS"; - homepage = https://github.com/elementary/calendar; + homepage = "https://github.com/elementary/calendar"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 7c95d88053d..712f2bec8d5 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { pname = "elementary-camera"; - version = "1.0.5"; + version = "1.0.6"; repoName = "camera"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "05amcljvc3w77a1b0c76y6rha8g0zm6lqflvg1g7jzz00jchx9d4"; + sha256 = "13jg224h2436swd6kdkfs22icg0ja9lshvxwg5bqnb5fshspkjba"; }; passthru = { @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Camera app designed for elementary OS"; - homepage = https://github.com/elementary/camera; + homepage = "https://github.com/elementary/camera"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 148b82fd84a..82036c8b8e2 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "3.3.0"; + version = "3.4.0"; repoName = "code"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0v544zw99wjcy0bflaci9fssx4sibz4b05bxs3a7j8hrpl102r4w"; + sha256 = "0b1vdgb1xvh5lqbral3r0qaq05zd5q5ywxw02fggpyy8nyxs3z8f"; }; passthru = { @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Code editor designed for elementary OS"; - homepage = https://github.com/elementary/code; + homepage = "https://github.com/elementary/code"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix new file mode 100644 index 00000000000..ee9df9955f4 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -0,0 +1,78 @@ +{ stdenv +, fetchFromGitHub +, vala +, atk +, cairo +, dconf +, glib +, gtk3 +, libwnck3 +, libX11 +, libXfixes +, libXi +, pango +, gettext +, pkgconfig +, libxml2 +, bamf +, gdk-pixbuf +, libdbusmenu-gtk3 +, gnome-menus +, libgee +, wrapGAppsHook +, pantheon +, meson +, ninja +}: + +stdenv.mkDerivation rec { + pname = "elementary-dock"; + version = "unstable-2020-02-28"; + + outputs = [ "out" "dev" ]; + + repoName = "dock"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = repoName; + rev = "ac87d9063dc9c81d90f42f3002ad9c5b49460a82"; + sha256 = "0lhjzd370fza488dav8n155ss486wqv6y7ldkahwg0c3zvlsvha7"; + }; + + nativeBuildInputs = [ + gettext + meson + ninja + libxml2 # xmllint + pkgconfig + vala + wrapGAppsHook + ]; + + buildInputs = [ + atk + bamf + cairo + gdk-pixbuf + glib + gnome-menus + dconf + gtk3 + libX11 + libXfixes + libXi + libdbusmenu-gtk3 + libgee + libwnck3 + pango + ]; + + meta = with stdenv.lib; { + description = "Elegant, simple, clean dock"; + homepage = "https://github.com/elementary/dock"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + }; +} diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index fb56b3d1b33..e54841275f6 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GitHub Issue Reporter designed for elementary OS"; - homepage = https://github.com/elementary/feedback; + homepage = "https://github.com/elementary/feedback"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index d83510c49f6..ed557da5449 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "4.4.1"; + version = "4.4.2"; repoName = "files"; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0s874qnqbx20vyp2z2rhz3z8py0dm21v26xc0h6hyc2gfz4s3jcg"; + sha256 = "1n18b3m3vgvmmgpfbgnfnz0z98bkgbfrfkx25jqbwsdnwrlb4li6"; }; passthru = { @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File browser designed for elementary OS"; - homepage = https://github.com/elementary/files; + homepage = "https://github.com/elementary/files"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index ea74686e504..c4001d5ed09 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Photo viewer and organizer designed for elementary OS"; - homepage = https://github.com/elementary/photos; + homepage = "https://github.com/elementary/photos"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix index befa2bbbb02..078d496bf0d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot-tool/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Screenshot tool designed for elementary OS"; - homepage = https://github.com/elementary/screenshot; + homepage = "https://github.com/elementary/screenshot"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 27bcb21a006..f9f81c37a4b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , pantheon , pkgconfig , meson @@ -15,12 +16,13 @@ , libgee , elementary-icon-theme , appstream +, pcre2 , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "elementary-terminal"; - version = "5.5.1"; + version = "5.5.2"; repoName = "terminal"; @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "1b8fzs9s7djhwp02l3fwjpwxylklpbnw7x46mv7c8ksbp0m75iyj"; + sha256 = "119iwmzbpkj4nmxinqfsh73lx23g8gbl6ha6wc4mc4fq9hpnc9c2"; }; passthru = { @@ -55,6 +57,7 @@ stdenv.mkDerivation rec { gtk3 libgee libnotify + pcre2 vte ]; @@ -72,7 +75,7 @@ stdenv.mkDerivation rec { A super lightweight, beautiful, and simple terminal. Comes with sane defaults, browser-class tabs, sudo paste protection, smart copy/paste, and little to no configuration. ''; - homepage = https://github.com/elementary/terminal; + homepage = "https://github.com/elementary/terminal"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index c8bde494399..8af63df0f86 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Video player and library app designed for elementary OS"; - homepage = https://github.com/elementary/videos; + homepage = "https://github.com/elementary/videos"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index efe34da7b26..01048d881d5 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "sideload"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0camg34skiisfbf9s9awfkdkq72s9jhl4ipmax7dqr33n8a86hic"; + sha256 = "1nnaq4vc0aag6pckxhrma5qv8al7i00rrlg95ac4iqqmivja7i92"; }; passthru = { @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/elementary/sideload; + homepage = "https://github.com/elementary/sideload"; description = "Flatpak installer, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 5cd5d365ed9..6348f7c93a3 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-a11y"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1wh46lrsliii5bbvfc4xnzgnii2v7sqxnbn43ylmyqppfv9mk1wd"; + sha256 = "0g8lhdwv9g16kjn7yxnl6x4rscjl2206ljfnghpxc4b5lwhqxxnw"; }; patches = [ @@ -51,11 +51,9 @@ stdenv.mkDerivation rec { switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - meta = with stdenv.lib; { description = "Switchboard Universal Access Plug"; - homepage = https://github.com/elementary/switchboard-plug-a11y; + homepage = "https://github.com/elementary/switchboard-plug-a11y"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index d501cba7c06..72842d1dcce 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard About Plug"; - homepage = https://github.com/elementary/switchboard-plug-about; + homepage = "https://github.com/elementary/switchboard-plug-about"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 0d0a7507afe..402ede1307d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Applications Plug"; - homepage = https://github.com/elementary/switchboard-plug-applications; + homepage = "https://github.com/elementary/switchboard-plug-applications"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index b5adf7c97e2..8ceaee93bdb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Bluetooth Plug"; - homepage = https://github.com/elementary/switchboard-plug-bluetooth; + homepage = "https://github.com/elementary/switchboard-plug-bluetooth"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index 501059896f2..adb6e187915 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-datetime"; - version = "2.1.6"; + version = "2.1.7"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "09734c3qc0296zf14rdhl4p6ppga015rz9hhsvlcc3nvyw7kdqkc"; + sha256 = "0lpmxl42r5vn6mddwppn6zwmai0yabs3n467w027vkzw4axdi6bf"; }; passthru = { @@ -46,18 +46,9 @@ stdenv.mkDerivation rec { switchboard ]; - patches = [ - (substituteAll { - src = ./timezone.patch; - tzdata = "${tzdata}/share/zoneinfo/zone.tab"; - }) - ]; - - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - meta = with stdenv.lib; { description = "Switchboard Date & Time Plug"; - homepage = https://github.com/elementary/switchboard-plug-datetime; + homepage = "https://github.com/elementary/switchboard-plug-datetime"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch deleted file mode 100644 index 35f73d36599..00000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/timezone.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Parser.vala b/src/Parser.vala -index faccb64..432a362 100644 ---- a/src/Parser.vala -+++ b/src/Parser.vala -@@ -28,7 +28,7 @@ public class DateTime.Parser : GLib.Object { - return parser; - } - private Parser () { -- var file = File.new_for_path ("/usr/share/zoneinfo/zone.tab"); -+ var file = File.new_for_path ("@tzdata@"); - if (!file.query_exists ()) { - critical ("/usr/share/zoneinfo/zone.tab doesn't exist !"); - return; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index bd9669e2499..35bca3e2670 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Displays Plug"; - homepage = https://github.com/elementary/switchboard-plug-display; + homepage = "https://github.com/elementary/switchboard-plug-display"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 81a694f2ea9..10468cdc553 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-keyboard"; - version = "2.3.5"; + version = "2.3.6"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "17iijb7imxw5zv7vkrbc1vsp87k900yqgyv7ycz1gw37xb4klsyp"; + sha256 = "08zpw7ygrqmwwznvxkf4xbrgwbjkbwc95sw1ikikg3143ql9qclp"; }; passthru = { @@ -51,23 +51,9 @@ stdenv.mkDerivation rec { switchboard ]; - patches = [ - (substituteAll { - src = ./xkb.patch; - config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"; - }) - # Fix build with latest vala. - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-keyboard/commit/28fa960f607f0b1d67f2864965a079bdfc23e3a8.patch"; - sha256 = "0121qcg8n7gkz7gpwrxc1cx0nnypj02zy2jmp3cks5r9sc0yi0hw"; - }) - ]; - - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - meta = with stdenv.lib; { description = "Switchboard Keyboard Plug"; - homepage = https://github.com/elementary/switchboard-plug-keyboard; + homepage = "https://github.com/elementary/switchboard-plug-keyboard"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch deleted file mode 100644 index 33237d9c939..00000000000 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/xkb.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/Layout/Handler.vala b/src/Layout/Handler.vala -index 297314b..b36509a 100644 ---- a/src/Layout/Handler.vala -+++ b/src/Layout/Handler.vala -@@ -29,7 +29,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object { - } - - private void parse_layouts () { -- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml"); -+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@"); - if (doc == null) { - critical ("'evdev.xml' not found or permissions missing\n"); - return; -@@ -76,7 +76,7 @@ public class Pantheon.Keyboard.LayoutPage.LayoutHandler : GLib.Object { - public HashTable<string, string> get_variants_for_language (string language) { - var returned_table = new HashTable<string, string> (str_hash, str_equal); - returned_table.set ("", _("Default")); -- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml"); -+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@"); - if (doc == null) { - critical ("'evdev.xml' not found or permissions incorrect\n"); - return returned_table; 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 5a4eaf79b38..19251f96efa 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Mouse & Touchpad Plug"; - homepage = https://github.com/elementary/switchboard-plug-mouse-touchpad; + homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 1ff1068119b..04763c3dc3f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-network"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0zg4bxrrw1nmm91yp8ymji7mha2wcjrwljcnpcvxq7lf8f2k0145"; + sha256 = "0pqkr7swjgla8klcjdcwgk2fipiwvylk8m71l1fymazvzwxrbxw6"; }; passthru = { @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Networking Plug"; - homepage = https://github.com/elementary/switchboard-plug-network; + homepage = "https://github.com/elementary/switchboard-plug-network"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch index e2d7a6d4970..b99f59fb268 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/Views/VPNPage.vala b/src/Views/VPNPage.vala -index 82e7826..cf00145 100644 +index ba9dc22..a12871a 100644 --- a/src/Views/VPNPage.vala +++ b/src/Views/VPNPage.vala -@@ -265,7 +265,7 @@ public class Network.VPNPage : Network.Widgets.Page { +@@ -264,7 +264,7 @@ public class Network.VPNPage : Network.Widgets.Page { private void try_connection_editor (string args) { try { var appinfo = AppInfo.create_from_commandline ( @@ -12,24 +12,15 @@ index 82e7826..cf00145 100644 GLib.AppInfoCreateFlags.NONE ); diff --git a/src/Widgets/SettingsButton.vala b/src/Widgets/SettingsButton.vala -index ed36b38..bc71c0c 100644 +index 5849b69..7bbd172 100644 --- a/src/Widgets/SettingsButton.vala +++ b/src/Widgets/SettingsButton.vala -@@ -24,7 +24,7 @@ - clicked.connect (() => { - try { - var appinfo = AppInfo.create_from_commandline ( -- "nm-connection-editor", -+ "@networkmanagerapplet@/bin/nm-connection-editor", - null, - AppInfoCreateFlags.NONE - ); -@@ -71,7 +71,7 @@ - private void edit_connection_uuid (string uuid) { +@@ -55,7 +55,7 @@ public class Network.Widgets.SettingsButton : Gtk.Button { + clicked.connect (() => { try { var appinfo = AppInfo.create_from_commandline ( -- "nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE -+ "@networkmanagerapplet@/bin/nm-connection-editor --edit=%s".printf (uuid), null, AppInfoCreateFlags.NONE +- "nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE ++ "@networkmanagerapplet@/bin/nm-connection-editor %s".printf (args), null, AppInfoCreateFlags.NONE ); appinfo.launch (null, null); diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index bd7fee51d8d..b4564abd770 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , pantheon , meson , ninja @@ -9,19 +10,29 @@ , granite , gtk3 , switchboard +, elementary-notifications }: stdenv.mkDerivation rec { pname = "switchboard-plug-notifications"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0p0aj3bbjrh6x8wajqqb5yqm2iqfnj7kp16zf4hdr4siw0sx5p8n"; + sha256 = "1ikq058svdan0whg4ks35m50apvbmzcz7h2wznxdbsimczzvj5sz"; }; + patches = [ + # Fix do not disturb on NixOS + # https://github.com/elementary/switchboard-plug-notifications/pull/66 + (fetchpatch { + url = "https://github.com/elementary/switchboard-plug-notifications/commit/c306366b39c3199f0b64eda73419005fcb5e29b8.patch"; + sha256 = "0m018rfw5iv582sw6qgwc8lzn0j32ix1w47fvlfmx0kw04irl2x3"; + }) + ]; + passthru = { updateScript = pantheon.updateScript { attrPath = "pantheon.${pname}"; @@ -36,17 +47,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + elementary-notifications granite gtk3 libgee switchboard ]; - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - meta = with stdenv.lib; { description = "Switchboard Notifications Plug"; - homepage = https://github.com/elementary/switchboard-plug-notifications; + homepage = "https://github.com/elementary/switchboard-plug-notifications"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index fdd3f4f5765..902703bc75e 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 @@ , meson , ninja , pkgconfig -, vala +, vala_0_46 , libgee , granite , gtk3 @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig - vala + vala_0_46 ]; buildInputs = [ @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Online Accounts Plug"; - homepage = https://github.com/elementary/switchboard-plug-onlineaccounts; + homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; 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 ab9ecbc5a33..3f1789eb5c5 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Desktop Plug"; - homepage = https://github.com/elementary/switchboard-plug-pantheon-shell; + homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index a8513f0b29b..58c135d9c66 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-power"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1b25slfh8166v9z2zmb25k64pcj0lh001qh04qhfilzfcbh54krj"; + sha256 = "0hmchx0sfdm2c2f9khjvlaqcxmvzarn2vmwcdb3h5ifbj32vydzw"; }; passthru = { @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Power Plug"; - homepage = https://github.com/elementary/switchboard-plug-power; + homepage = "https://github.com/elementary/switchboard-plug-power"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index b21fc1c099f..1d71ae1f7cc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-printers"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "03r67q6my10i4hl8d0q3d6fhqm9abs9kn9j92hk6ykqb4ybxw1z1"; + sha256 = "0nnzwpfxkvgsw3g329926c3m7vci6vyb60qib7b9mpgicmsqnkvz"; }; passthru = { @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Printers Plug"; - homepage = https://github.com/elementary/switchboard-plug-printers; + homepage = "https://github.com/elementary/switchboard-plug-printers"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; 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 9d457aedc96..840a4a6074d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Security & Privacy Plug"; - homepage = https://github.com/elementary/switchboard-plug-security-privacy; + homepage = "https://github.com/elementary/switchboard-plug-security-privacy"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index 3d240fc6221..55ed654f75f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sharing"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1yi6aga9i18wwn22zwmfbhsk16f92fka837is5r8xghqb7a50hyh"; + sha256 = "1awkz16nydlgi8a2dd6agfnd3qwl2qsvv6wnn8bhaz1kbv1v9kpw"; }; passthru = { @@ -43,19 +43,9 @@ stdenv.mkDerivation rec { switchboard ]; - patches = [ - # Fix build with latest vala - (fetchpatch { - url = "https://github.com/elementary/switchboard-plug-sharing/commit/22c9d52577a2e8c36c840a99009420266a39e1fe.patch"; - sha256 = "0rbf1yxhc7k44cwikd45mv2g6slzw0rkwn5s38q3yxai9jnpvqch"; - }) - ]; - - PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder "out"}/lib/switchboard"; - meta = with stdenv.lib; { description = "Switchboard Sharing Plug"; - homepage = https://github.com/elementary/switchboard-plug-sharing; + homepage = "https://github.com/elementary/switchboard-plug-sharing"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index 8d8cd1c940a..df553a515ea 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-sound"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1aa9wgaz34glrrnilnqis3k0bnx2a2ir38j493y4d0klkjkwyn5k"; + sha256 = "1vpw06ldhy26xs5vp2gx5s8wbl42dznycp3jsnm5qp8iid8wl6l6"; }; passthru = { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switchboard Sound Plug"; - homepage = https://github.com/elementary/switchboard-plug-sound; + homepage = "https://github.com/elementary/switchboard-plug-sound"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 28ec4e65f52..6b451931a46 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "switchboard"; - version = "2.3.8"; + version = "2.3.9"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1y254irl07fp70228zm268w20zd7risz0sk9i9wz59yynxwjshbx"; + sha256 = "0gq2gi14ywmhhlq3vablzqjzxq2ms60l9b10splzsf3zd7k2dqz2"; }; passthru = { @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extensible System Settings app for Pantheon"; - homepage = https://github.com/elementary/switchboard; + homepage = "https://github.com/elementary/switchboard"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index c1af68e8d5b..9deee9c9abe 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK theme designed to be smooth, attractive, fast, and usable"; - homepage = https://github.com/elementary/stylesheet; + homepage = "https://github.com/elementary/stylesheet"; license = licenses.gpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index 291977349bd..3d448954cca 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { longDescription = '' An original set of vector icons designed specifically for elementary OS and its desktop environment: Pantheon. ''; - homepage = https://github.com/elementary/icons; + homepage = "https://github.com/elementary/icons"; license = licenses.gpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index df2475ce82a..50a45588516 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Font for concealing text"; - homepage = https://github.com/png2378/redacted-elementary; + homepage = "https://github.com/png2378/redacted-elementary"; license = licenses.ofl; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index c19a465e9b1..f95e6815305 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of system sounds for elementary"; - homepage = https://github.com/elementary/sound-theme; + homepage = "https://github.com/elementary/sound-theme"; license = licenses.unlicense; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index 2f3b0ee059f..82f45c95d61 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of wallpapers for elementary"; - homepage = https://github.com/elementary/wallpapers; + homepage = "https://github.com/elementary/wallpapers"; license = licenses.publicDomain; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index d4e6b192f20..edcda887754 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -29,7 +29,7 @@ lib.makeScope pkgs.newScope (self: with self; { maintainers = with pkgs.stdenv.lib.maintainers; [ worldofpeace ]; - mutter = pkgs.gnome3.mutter328; + mutter = pkgs.gnome3.mutter334; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; @@ -47,6 +47,8 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-code = callPackage ./apps/elementary-code { }; + elementary-dock = callPackage ./apps/elementary-dock { }; + elementary-files = callPackage ./apps/elementary-files { }; elementary-feedback = callPackage ./apps/elementary-feedback { }; @@ -99,18 +101,20 @@ lib.makeScope pkgs.newScope (self: with self; { #### SERVICES - cerbere = callPackage ./services/cerbere { }; - contractor = callPackage ./services/contractor { }; elementary-capnet-assist = callPackage ./services/elementary-capnet-assist { }; elementary-dpms-helper = callPackage ./services/elementary-dpms-helper { }; + elementary-notifications = callPackage ./services/elementary-notifications { }; + # We're using ubuntu and elementary's patchset due to reasons # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 # Take note of "I am holding off on "fixing" this bug for as long as possible." - elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { }; + elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { + inherit (gnome3) gnome-desktop; + }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; @@ -200,4 +204,6 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) vala; # added 2019-10-10 + cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; + }) diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index be97c5903eb..4e8d8bfeb15 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -10,6 +10,7 @@ , polkit , accountsservice , python3 +, fetchpatch }: stdenv.mkDerivation rec { @@ -32,6 +33,18 @@ stdenv.mkDerivation rec { }; patches = [ + # Use new notifications + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/0658bb75b9f49f58b35746d05fb6c4b811f125e9.patch"; + sha256 = "0wa7iq0vfp2av5v23w94a5844ddj4g48d4wk3yrp745dyrimg739"; + }) + + # Fix media key syntax + (fetchpatch { + url = "https://github.com/elementary/default-settings/commit/332aefe1883be5dfe90920e165c39e331a53b2ea.patch"; + sha256 = "0ypcaga55pw58l30srq3ga1mhz2w6hkwanv41jjr6g3ia9jvq69n"; + }) + # https://github.com/elementary/default-settings/pull/119 ./0001-Build-with-Meson.patch ]; @@ -84,7 +97,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Default settings and configuration files for elementary"; - homepage = https://github.com/elementary/default-settings; + homepage = "https://github.com/elementary/default-settings"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 21698bed22d..432f7c3ac5f 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { pname = "elementary-greeter"; - version = "5.0.2"; + version = "5.0.3"; repoName = "greeter"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "0557lr8czqwjrm39ykfacqw5x7nng7fmf1gxkif70xg7dk3lc7gd"; + sha256 = "1zbfcdgjn57r8pz01xrz6kk8rmviq133snz9f1vqhjdsznk82w5i"; }; passthru = { @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LightDM Greeter for Pantheon"; - homepage = https://github.com/elementary/greeter; + homepage = "https://github.com/elementary/greeter"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 38e57539de4..2580907a592 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -36,7 +36,8 @@ runCommand "elementary-gsettings-desktop-schemas" {} schema_dir=$out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas mkdir -p $schema_dir - cp -rf ${glib.getSchemaPath gsettings-desktop-schemas}/*.xml $schema_dir + + cp -rf ${glib.getSchemaPath gala}/*.gschema.override $schema_dir ${concatMapStrings (pkg: "cp -rf ${glib.getSchemaPath pkg}/*.xml $schema_dir\n") gsettingsOverridePackages} diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 06b5183c1e0..02a87159aef 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "elementary-onboarding"; - version = "1.1.0"; + version = "1.2.0"; repoName = "onboarding"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "17fw95qg7j0mvam90jrvr77hw2ipxb2lkw0xxql1lzwvdx1h0r2k"; + sha256 = "0yxafz7jlzj8gsbp6m72q4zbcvm1ch2y4fibj9cymjvz2i0izhba"; }; passthru = { @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Onboarding app for new users designed for elementary OS"; - homepage = https://github.com/elementary/onboarding; + homepage = "https://github.com/elementary/onboarding"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index e79a85bee95..e8ea57b8bb9 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple shim for printing support via Contractor"; - homepage = https://github.com/elementary/print; + homepage = "https://github.com/elementary/print"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index 58acdd12147..089c9188d6c 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , substituteAll , writeScript , pantheon @@ -15,7 +16,7 @@ , writeText , meson , ninja -, git +, pkg-config }: let @@ -69,24 +70,34 @@ in stdenv.mkDerivation rec { pname = "elementary-session-settings"; - version = "5.0.3"; + version = "unstable-2019-11-12"; repoName = "session-settings"; src = fetchFromGitHub { owner = "elementary"; repo = repoName; - rev = version; - sha256 = "1vrjm7bklkfv0dyafm312v4hxzy6lb7p1ny4ijkn48kr719gc71k"; + rev = "f9d5afed16ce447cf6ae3c2d1c1db5eece84daca"; + sha256 = "0n1m41aapr58rb1ffvfkjq6c6w3f0ynjzzhja50s4di98p4m7y0q"; }; - postPatch = '' - ${git}/bin/git apply --verbose ${./meson.patch} - ''; + patches = [ + # Map Pantheon required components by g-s-d versions + # https://github.com/elementary/session-settings/pull/23 + (fetchpatch { + url = "https://github.com/elementary/session-settings/commit/39918f4ec64fa9ed5affa109d6a692b97ae4ff01.patch"; + sha256 = "0v2kqcsibymnslnnw4v67yh098znsrhrcycgxkw8vymvwlinc502"; + }) + ]; nativeBuildInputs = [ meson ninja + pkg-config + ]; + + buildInputs = [ + elementary-settings-daemon ]; mesonFlags = [ @@ -135,7 +146,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Session settings for elementary"; - homepage = https://github.com/elementary/session-settings; + homepage = "https://github.com/elementary/session-settings"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch b/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch deleted file mode 100644 index 39d15565661..00000000000 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/meson.patch +++ /dev/null @@ -1,272 +0,0 @@ -From 0a20ad6a31c74f4f96e9ed3613ec6c16a94ede39 Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Thu, 8 Aug 2019 11:25:37 -0400 -Subject: [PATCH] Build with Meson (#13) - ---- - applications/meson.build | 4 ++++ - ...ettingsDaemon.A11ySettings-pantheon.desktop | 0 - ...e.SettingsDaemon.Clipboard-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Color-pantheon.desktop | 0 - ...me.SettingsDaemon.Datetime-pantheon.desktop | 0 - ...ettingsDaemon.Housekeeping-pantheon.desktop | 0 - ...me.SettingsDaemon.Keyboard-pantheon.desktop | 0 - ...e.SettingsDaemon.MediaKeys-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Mouse-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Power-pantheon.desktop | 0 - ...sDaemon.PrintNotifications-pantheon.desktop | 0 - ...nome.SettingsDaemon.Rfkill-pantheon.desktop | 0 - ...ome.SettingsDaemon.Sharing-pantheon.desktop | 0 - ...e.SettingsDaemon.Smartcard-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Sound-pantheon.desktop | 0 - ...gnome.SettingsDaemon.Wacom-pantheon.desktop | 0 - ...e.SettingsDaemon.XSettings-pantheon.desktop | 0 - autostart/meson.build | 18 ++++++++++++++++++ - .../gnome-keyring-gpg-pantheon.desktop | 0 - .../gnome-keyring-pkcs11-pantheon.desktop | 0 - .../gnome-keyring-secrets-pantheon.desktop | 0 - .../gnome-keyring-ssh-pantheon.desktop | 0 - .../onboard-autostart-pantheon.desktop | 0 - .../orca-autostart-pantheon.desktop | 0 - .../user-dirs-update-gtk-pantheon.desktop | 0 - gnome-session/meson.build | 11 +++++++++++ - .../{pantheon.session => pantheon.session.in} | 2 +- - meson.build | 14 ++++++++++++++ - meson_options.txt | 11 +++++++++++ - xsessions/meson.build | 4 ++++ - 30 files changed, 63 insertions(+), 1 deletion(-) - create mode 100644 applications/meson.build - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Color-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Datetime-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Mouse-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Power-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Sharing-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Sound-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.Wacom-pantheon.desktop (100%) - rename autostart/{ => gsd}/org.gnome.SettingsDaemon.XSettings-pantheon.desktop (100%) - create mode 100644 autostart/meson.build - rename autostart/{ => ubuntu}/gnome-keyring-gpg-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/gnome-keyring-pkcs11-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/gnome-keyring-secrets-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/gnome-keyring-ssh-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/onboard-autostart-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/orca-autostart-pantheon.desktop (100%) - rename autostart/{ => ubuntu}/user-dirs-update-gtk-pantheon.desktop (100%) - create mode 100644 gnome-session/meson.build - rename gnome-session/{pantheon.session => pantheon.session.in} (94%) - create mode 100644 meson.build - create mode 100644 meson_options.txt - create mode 100644 xsessions/meson.build - -diff --git a/applications/meson.build b/applications/meson.build -new file mode 100644 -index 0000000..d03b92b ---- /dev/null -+++ b/applications/meson.build -@@ -0,0 +1,4 @@ -+install_data( -+ 'defaults.list', -+ install_dir: join_paths(datadir, 'applications') -+) -diff --git a/autostart/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.A11ySettings-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Clipboard-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Color-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Color-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Color-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Datetime-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Datetime-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Datetime-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Housekeeping-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Keyboard-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.MediaKeys-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Mouse-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Mouse-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Mouse-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Power-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Power-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Power-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.PrintNotifications-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Rfkill-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Sharing-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Sharing-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Sharing-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Smartcard-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Sound-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Sound-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Sound-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.Wacom-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.Wacom-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.Wacom-pantheon.desktop -diff --git a/autostart/org.gnome.SettingsDaemon.XSettings-pantheon.desktop b/autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop -similarity index 100% -rename from autostart/org.gnome.SettingsDaemon.XSettings-pantheon.desktop -rename to autostart/gsd/org.gnome.SettingsDaemon.XSettings-pantheon.desktop -diff --git a/autostart/meson.build b/autostart/meson.build -new file mode 100644 -index 0000000..265088b ---- /dev/null -+++ b/autostart/meson.build -@@ -0,0 +1,18 @@ -+autostartdir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart') -+ -+if get_option('patched-gsd-autostarts') -+ install_subdir( -+ 'gsd', -+ install_dir: autostartdir, -+ strip_directory: true -+ ) -+endif -+ -+ -+if get_option('patched-ubuntu-autostarts') -+ install_subdir( -+ 'ubuntu', -+ install_dir: autostartdir, -+ strip_directory: true -+ ) -+endif -diff --git a/autostart/gnome-keyring-gpg-pantheon.desktop b/autostart/ubuntu/gnome-keyring-gpg-pantheon.desktop -similarity index 100% -rename from autostart/gnome-keyring-gpg-pantheon.desktop -rename to autostart/ubuntu/gnome-keyring-gpg-pantheon.desktop -diff --git a/autostart/gnome-keyring-pkcs11-pantheon.desktop b/autostart/ubuntu/gnome-keyring-pkcs11-pantheon.desktop -similarity index 100% -rename from autostart/gnome-keyring-pkcs11-pantheon.desktop -rename to autostart/ubuntu/gnome-keyring-pkcs11-pantheon.desktop -diff --git a/autostart/gnome-keyring-secrets-pantheon.desktop b/autostart/ubuntu/gnome-keyring-secrets-pantheon.desktop -similarity index 100% -rename from autostart/gnome-keyring-secrets-pantheon.desktop -rename to autostart/ubuntu/gnome-keyring-secrets-pantheon.desktop -diff --git a/autostart/gnome-keyring-ssh-pantheon.desktop b/autostart/ubuntu/gnome-keyring-ssh-pantheon.desktop -similarity index 100% -rename from autostart/gnome-keyring-ssh-pantheon.desktop -rename to autostart/ubuntu/gnome-keyring-ssh-pantheon.desktop -diff --git a/autostart/onboard-autostart-pantheon.desktop b/autostart/ubuntu/onboard-autostart-pantheon.desktop -similarity index 100% -rename from autostart/onboard-autostart-pantheon.desktop -rename to autostart/ubuntu/onboard-autostart-pantheon.desktop -diff --git a/autostart/orca-autostart-pantheon.desktop b/autostart/ubuntu/orca-autostart-pantheon.desktop -similarity index 100% -rename from autostart/orca-autostart-pantheon.desktop -rename to autostart/ubuntu/orca-autostart-pantheon.desktop -diff --git a/autostart/user-dirs-update-gtk-pantheon.desktop b/autostart/ubuntu/user-dirs-update-gtk-pantheon.desktop -similarity index 100% -rename from autostart/user-dirs-update-gtk-pantheon.desktop -rename to autostart/ubuntu/user-dirs-update-gtk-pantheon.desktop -diff --git a/gnome-session/meson.build b/gnome-session/meson.build -new file mode 100644 -index 0000000..b9245a1 ---- /dev/null -+++ b/gnome-session/meson.build -@@ -0,0 +1,11 @@ -+fallback_session = get_option('fallback-session') -+ -+session_configuration = configuration_data() -+session_configuration.set('FALLBACK_SESSION', fallback_session) -+ -+pantheon_session = configure_file( -+ input: 'pantheon.session.in', -+ output: '@BASENAME@', -+ configuration: session_configuration, -+ install_dir: join_paths(datadir, 'gnome-session', 'sessions') -+) -diff --git a/gnome-session/pantheon.session b/gnome-session/pantheon.session.in -similarity index 94% -rename from gnome-session/pantheon.session -rename to gnome-session/pantheon.session.in -index 1626393..7bc1814 100644 ---- a/gnome-session/pantheon.session -+++ b/gnome-session/pantheon.session.in -@@ -1,5 +1,5 @@ - [GNOME Session] - Name=Pantheon - RequiredComponents=gala;gala-daemon;org.gnome.SettingsDaemon.A11ySettings;org.gnome.SettingsDaemon.Clipboard;org.gnome.SettingsDaemon.Color;org.gnome.SettingsDaemon.Datetime;org.gnome.SettingsDaemon.Housekeeping;org.gnome.SettingsDaemon.Keyboard;org.gnome.SettingsDaemon.MediaKeys;org.gnome.SettingsDaemon.Mouse;org.gnome.SettingsDaemon.Power;org.gnome.SettingsDaemon.PrintNotifications;org.gnome.SettingsDaemon.Rfkill;org.gnome.SettingsDaemon.Sharing;org.gnome.SettingsDaemon.Smartcard;org.gnome.SettingsDaemon.Sound;org.gnome.SettingsDaemon.Wacom;org.gnome.SettingsDaemon.XSettings; --FallbackSession=ubuntu -+FallbackSession=@FALLBACK_SESSION@ - DesktopName=Pantheon -diff --git a/meson.build b/meson.build -new file mode 100644 -index 0000000..a7d3195 ---- /dev/null -+++ b/meson.build -@@ -0,0 +1,14 @@ -+project('elementary-session-settings', -+ version: '5.0.3', -+ default_options: 'sysconfdir=/etc') -+ -+prefix = get_option('prefix') -+datadir = join_paths(prefix, get_option('datadir')) -+ -+if get_option('defaults-list') -+ subdir('applications') -+endif -+ -+subdir('autostart') -+subdir('gnome-session') -+subdir('xsessions') -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..4c5ac2d ---- /dev/null -+++ b/meson_options.txt -@@ -0,0 +1,11 @@ -+option('defaults-list', type : 'boolean', value: true, -+ description : 'Install defaults.list') -+ -+option('patched-gsd-autostarts', type : 'boolean', value: true, -+ description : 'Install patched GNOME Settings Daemon autostarts') -+ -+option('patched-ubuntu-autostarts', type : 'boolean', value: true, -+ description : 'Install patched Ubuntu autostarts') -+ -+option('fallback-session', type : 'string', value: 'ubuntu', -+ description : 'Fallback session to use for Pantheon') -diff --git a/xsessions/meson.build b/xsessions/meson.build -new file mode 100644 -index 0000000..d144291 ---- /dev/null -+++ b/xsessions/meson.build -@@ -0,0 +1,4 @@ -+install_data( -+ 'pantheon.desktop', -+ install_dir: join_paths(datadir, 'xsessions') -+) diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index 2ba5f4becc1..2cdb2c23507 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "elementary-shortcut-overlay"; - version = "1.1.0"; + version = "1.1.1"; repoName = "shortcut-overlay"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = repoName; rev = version; - sha256 = "10s44x5qln3asrdr6v5b3v92prh8rfhv96dbm73zhifm2jjm22g8"; + sha256 = "03wnc3vfnrkm5i7h370n7h2mbcmaxnhynmjs37q63vq6vq7agldb"; }; passthru = { @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A native OS-wide shortcut overlay to be launched by Gala"; - homepage = https://github.com/elementary/shortcut-overlay; + homepage = "https://github.com/elementary/shortcut-overlay"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix index 8e180ca83a6..bfeda383ea4 100644 --- a/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix +++ b/pkgs/desktops/pantheon/desktop/extra-elementary-contracts/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extra contractor files for elementary"; - homepage = https://github.com/worldofpeace/extra-elementary-contracts; + homepage = "https://github.com/worldofpeace/extra-elementary-contracts"; license = licenses.gpl2; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 5791fb5c58f..9db8baa4e94 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1vf55ls3h20zpf0yxb206cijq8nkf89z2lmhccb4i1g2zajd31ix"; + sha256 = "02g6x190lylng8d07pwx2bqcc71rq48f0dxh30mgndfii6k21qgs"; }; passthru = { @@ -70,6 +70,7 @@ stdenv.mkDerivation rec { patches = [ ./plugins-dir.patch + ./use-new-notifications-default.patch ]; postPatch = '' @@ -79,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A window & compositing manager based on mutter and designed by elementary for use with Pantheon"; - homepage = https://github.com/elementary/gala; + homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch b/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch index e83308ea552..f08652e9f63 100644 --- a/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch +++ b/pkgs/desktops/pantheon/desktop/gala/plugins-dir.patch @@ -1,22 +1,20 @@ diff --git a/meson.build b/meson.build -index 6b20a60..205699b 100644 +index 78113d6..926596c 100644 --- a/meson.build +++ b/meson.build -@@ -38,7 +38,7 @@ conf.set_quoted('PACKAGE_VERSION', gala_version) +@@ -24,13 +24,14 @@ vapi_dir = meson.current_source_dir() / 'vapi' + + data_dir = join_paths(get_option('prefix'), get_option('datadir')) + plugins_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins') ++plugins_dir_for_build = join_paths('/run/current-system/sw/lib/', meson.project_name(), 'plugins') + pkgdata_dir = join_paths(get_option('prefix'), get_option('datadir'), meson.project_name()) + pkglib_dir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name()) + + conf = configuration_data() conf.set_quoted('DATADIR', data_dir) conf.set_quoted('PKGDATADIR', pkgdata_dir) - conf.set_quoted('PKGLIBDIR', pkglib_dir) --conf.set_quoted('PLUGINSDIR', plugins_dir) -+conf.set_quoted('PLUGINSDIR', '/run/current-system/sw/lib/gala/plugins') - conf.set_quoted('RELEASE_NAME', 'Window Manager.') +-conf.set_quoted('PLUGINDIR', plugins_dir) ++conf.set_quoted('PLUGINDIR', plugins_dir_for_build) + conf.set_quoted('RESOURCEPATH', '/org/pantheon/desktop/gala') conf.set_quoted('VERSION', gala_version) - conf.set_quoted('VERSION_INFO', (is_release ? 'Release' : 'Development')) -@@ -83,7 +83,7 @@ add_project_arguments([ - '-DDATADIR="@0@"'.format(data_dir), - '-DPKGDATADIR="@0@"'.format(pkgdata_dir), - '-DPKGLIBDIR="@0@"'.format(pkglib_dir), -- '-DPLUGINDIR="@0@"'.format(plugins_dir), -+ '-DPLUGINDIR="@0@"'.format('/run/current-system/sw/lib/gala/plugins'), - '-DSCHEMA="org.pantheon.desktop.gala"', - '-DRESOURCEPATH="/org/pantheon/desktop/gala"', - + conf.set_quoted('SCHEMA', 'org.pantheon.desktop.gala') diff --git a/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch b/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch new file mode 100644 index 00000000000..dc256bcff3a --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/gala/use-new-notifications-default.patch @@ -0,0 +1,13 @@ +diff --git a/data/gala.gschema.xml b/data/gala.gschema.xml +index 8032583..7f4f03c 100644 +--- a/data/gala.gschema.xml ++++ b/data/gala.gschema.xml +@@ -58,7 +58,7 @@ + <description>If enabled, dropping windows on vertical screen edges maximizes them vertically and resizes them horizontally to cover half of the available area. Dropping windows on the top screen edge maximizes them completely.</description> + </key> + <key type="b" name="use-new-notifications"> +- <default>false</default> ++ <default>true</default> + <summary>If new notifications should be used</summary> + <description>If new notifications UI should be used, requires io.elemenetary.notifications to be present and running</description> + </key> 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 34c29c1b72a..b2313d2778d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight and stylish app launcher for Pantheon"; - homepage = https://github.com/elementary/applications-menu; + homepage = "https://github.com/elementary/applications-menu"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index 93ddb0e1dee..4b4966e7a77 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bluetooth Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-bluetooth; + homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index f6ff962a944..ed70687e050 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,6 +1,5 @@ { stdenv -, fetchFromGitHub -, fetchpatch +, fetchFromGitHub , pantheon , pkgconfig , meson @@ -20,13 +19,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; - version = "2.2.1"; + version = "2.2.2"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0y8lfrrkzcj8nw94jqawbxr4jz41ac0z539kkr3n3x0qmx72md2y"; + sha256 = "0a0pqrpmrdd5pch30lizr9righlc7165z7krmnaxrzd0fvfkbr2h"; }; passthru = { @@ -54,14 +53,6 @@ stdenv.mkDerivation rec { wingpanel ]; - patches = [ - # Add support for libecal-2.0 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/3ccd05d611e6dd5274a03f061ba1b5e13d6fe0cf.patch"; - sha256 = "011q9b4pjmk4fpq5zscl5r8m4n3jiyx464023h4j7zf8r1070jz6"; - }) - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -69,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Date & Time Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-datetime; + homepage = "https://github.com/elementary/wingpanel-indicator-datetime"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index 66f805b9a49..120cf8260a9 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-keyboard"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0jc12xfaj3micpjssxc7m6hzssvyq26ln5az05x5f1j6v8lccbyn"; + sha256 = "0q32qc6jh5w0i1ixkl59pys8r3hxmbig8854q7sxi07vlk9g3i7y"; }; passthru = { @@ -45,21 +45,19 @@ stdenv.mkDerivation rec { gtk3 libgee wingpanel + xorg.xkeyboardconfig ]; patches = [ (substituteAll { src = ./fix-paths.patch; - libgnomekbd_path = "${libgnomekbd}/bin/"; - config = "${xorg.xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"; + gkbd_keyboard_display = "${libgnomekbd}/bin/gkbd-keyboard-display"; }) ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - meta = with stdenv.lib; { description = "Keyboard Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-keyboard; + homepage = "https://github.com/elementary/wingpanel-indicator-keyboard"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch index 58e6853e606..4fb6dfac86d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/fix-paths.patch @@ -1,5 +1,5 @@ diff --git a/src/Indicator.vala b/src/Indicator.vala -index cd7ca49..0bef9c7 100644 +index cd7ca49..7813789 100644 --- a/src/Indicator.vala +++ b/src/Indicator.vala @@ -94,7 +94,7 @@ public class Keyboard.Indicator : Wingpanel.Indicator { @@ -7,20 +7,7 @@ index cd7ca49..0bef9c7 100644 close (); - string command = "gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\""; -+ string command = "@libgnomekbd_path@gkbd-keyboard-display \"--layout=" + layouts.get_current_with_variant () + "\""; ++ string command = "@gkbd_keyboard_display@ \"--layout=" + layouts.get_current_with_variant () + "\""; try { AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE).launch (null, null); -diff --git a/src/LayoutsManager.vala b/src/LayoutsManager.vala -index 1bac80e..67df847 100644 ---- a/src/LayoutsManager.vala -+++ b/src/LayoutsManager.vala -@@ -97,7 +97,7 @@ public class Keyboard.Widgets.LayoutManager : Gtk.ScrolledWindow { - - public string? get_name_for_xkb_layout (string language, string? variant) { - debug ("get_name_for_xkb_layout (%s, %s)", language, variant); -- Xml.Doc* doc = Xml.Parser.parse_file ("/usr/share/X11/xkb/rules/evdev.xml"); -+ Xml.Doc* doc = Xml.Parser.parse_file ("@config@"); - if (doc == null) { - critical ("'evdev.xml' not found or permissions incorrect\n"); - return null; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index cd04e6287b7..0b9d95faf0b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-network"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0fch27imk5x4nfx49cwcylkxd7m289rl9niy1vx5kjplhbhyhdq2"; + sha256 = "17s5fixhwgalgjhrhnb3wh0hdzi17waqcdfw1fx8q4zs78hapjzg"; }; passthru = { @@ -46,11 +46,9 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - meta = with stdenv.lib; { description = "Network Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-network; + homepage = "https://github.com/elementary/wingpanel-indicator-network"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 5a9a28382ca..9ec593afe4a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Night Light Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-nightlight; + homepage = "https://github.com/elementary/wingpanel-indicator-nightlight"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index e5dabead7c5..d8d5f44b82b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -2,6 +2,7 @@ , fetchFromGitHub , pantheon , pkgconfig +, fetchpatch , meson , ninja , vala @@ -9,20 +10,29 @@ , granite , wingpanel , libgee -, libwnck3 +, elementary-notifications }: stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1lx023z7xxlgwh0br48fw5w7xw673p2sqxwl1gz9f54xx7rv81py"; + sha256 = "0qp13iaf2956ss4d6w6vwnzdvb7izqmyh6xrdii7j8gxxwjd4lxm"; }; + patches = [ + # Fix do not disturb on NixOS + # https://github.com/elementary/wingpanel-indicator-notifications/pull/110 + (fetchpatch { + url = "https://github.com/elementary/wingpanel-indicator-notifications/commit/02b1e226c0262c1535fdf2b4f1daba6be9084f67.patch"; + sha256 = "1a5phygygndr28yx8yp0lyk0wxypc5656dpidw1z8x1yd6xysqhy"; + }) + ]; + passthru = { updateScript = pantheon.updateScript { attrPath = "pantheon.${pname}"; @@ -37,16 +47,16 @@ stdenv.mkDerivation rec { ]; buildInputs = [ + elementary-notifications granite gtk3 libgee - libwnck3 wingpanel ]; meta = with stdenv.lib; { description = "Notifications Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-notifications; + homepage = "https://github.com/elementary/wingpanel-indicator-notifications"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 12223644971..907b31d930a 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-power"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "02gp9m9zkmhcl43nz02kjkcim4zm25zab3il8dhwkihh731g1c6j"; + sha256 = "19zhgzyivf3y416r5xaajx81h87zdhvrrcsagli00gp1f2169q5m"; }; passthru = { @@ -50,8 +50,6 @@ stdenv.mkDerivation rec { wingpanel ]; - PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder "out"}/lib/wingpanel"; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py @@ -59,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Power Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-power; + homepage = "https://github.com/elementary/wingpanel-indicator-power"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index af6155037ef..14c87036ec8 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-session"; - version = "2.2.7"; + version = "2.2.8"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0qgb225ldg3qax370z3wvijxmm4bjfqds3r9aqqhlq30599xjhsb"; + sha256 = "02inp8xdxfx8qxjdf2nazw46ahp1gv3skd922ma6kgx5w4wxh5l8"; }; passthru = { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Session Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-session; + homepage = "https://github.com/elementary/wingpanel-indicator-session"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index ccd233e1a3e..cd387a9fca4 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-sound"; - version = "2.1.4"; + version = "2.1.5"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "00r3dqkyp7k34xwn12l0dbzfmz70084lblxchykmk77pgzid2a0b"; + sha256 = "0nla8qgn5gb1g2gn7c47m9zw42sarjd0030x3h5kckapsbaxknhp"; }; passthru = { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound Indicator for Wingpanel"; - homepage = https://github.com/elementary/wingpanel-indicator-sound; + homepage = "https://github.com/elementary/wingpanel-indicator-sound"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 694166a5d64..932c18c5593 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "wingpanel"; - version = "2.2.6"; + version = "unstable-2020-04-04"; src = fetchFromGitHub { owner = "elementary"; repo = pname; - rev = version; - sha256 = "0q5jhg3gpcjfzfi7g33fv8pb916cqsgk6543b82yy97c20902ap9"; + rev = "366f0f6ffa59f7ee2583d000dd334cb764f9a2b8"; + sha256 = "172r1k8m1saq80q6g2hxy4ajks8liaw9pl6lixasrzi2hsnrx53h"; }; passthru = { @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { Wingpanel is an empty container that accepts indicators as extensions, including the applications menu. ''; - homepage = https://github.com/elementary/wingpanel; + homepage = "https://github.com/elementary/wingpanel"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index 198be9f3430..ec40e1e8f72 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "granite"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "1gvrk8gh959bmq8w0kaym7sx13v763lk8x5hck00msgmyrsarfwa"; + sha256 = "12f1n07cjlc7czf642ak6964wl4fsgakc39nnmiba22z5aahfpz9"; }; passthru = { @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { Granite is a companion library for GTK and GLib. Among other things, it provides complex widgets and convenience functions designed for use in apps built for elementary OS. ''; - homepage = https://github.com/elementary/granite; + homepage = "https://github.com/elementary/granite"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/services/cerbere/default.nix b/pkgs/desktops/pantheon/services/cerbere/default.nix deleted file mode 100644 index a911440fa5d..00000000000 --- a/pkgs/desktops/pantheon/services/cerbere/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv -, fetchFromGitHub -, pantheon -, pkgconfig -, meson -, python3 -, ninja -, glib -, libgee -, vala -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "cerbere"; - version = "2.5.0"; - - src = fetchFromGitHub { - owner = "elementary"; - repo = pname; - rev = version; - sha256 = "12y6gg4vyc1rhdm2c7pr7bgmdrah7ddphyh25fgh3way8l9gh7vw"; - }; - - passthru = { - updateScript = pantheon.updateScript { - attrPath = "pantheon.${pname}"; - }; - }; - - nativeBuildInputs = [ - meson - ninja - pkgconfig - python3 - vala - wrapGAppsHook - ]; - - buildInputs = [ - glib - libgee - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - meta = with stdenv.lib; { - description = "A simple service to ensure uptime of essential processes"; - homepage = https://github.com/elementary/cerbere; - license = licenses.gpl2Plus; - platforms = platforms.linux; - maintainers = pantheon.maintainers; - }; - -} diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index d41750f8dfc..b32842c3566 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small WebKit app that assists a user with login when a captive portal is detected"; - homepage = https://github.com/elementary/capnet-assist; + homepage = "https://github.com/elementary/capnet-assist"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix index 4ec1df36bea..7eeb156e028 100644 --- a/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-dpms-helper/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sets DPMS settings found in org.pantheon.dpms"; - homepage = https://github.com/elementary/dpms-helper; + homepage = "https://github.com/elementary/dpms-helper"; license = licenses.gpl2; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix new file mode 100644 index 00000000000..b90f8c86bf1 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -0,0 +1,60 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, vala +, gtk3 +, glib +, granite +, libgee +, libcanberra-gtk3 +, pantheon +, python3 +, wrapGAppsHook +}: + +stdenv.mkDerivation rec { + pname = "elementary-notifications"; + version = "unstable-2020-03-31"; + + repoName = "notifications"; + + src = fetchFromGitHub { + owner = "elementary"; + repo = repoName; + rev = "db552b0c3466ba1099c7737c353b7225ab1896cc"; + sha256 = "1fhf4zx73qka935x5afv6zqsm2l37d1mjbhrbzzzz44dqwa2vp16"; + }; + + nativeBuildInputs = [ + glib # for glib-compile-schemas + meson + ninja + pkg-config + python3 + vala + wrapGAppsHook + ]; + + buildInputs = [ + glib + granite + gtk3 + libcanberra-gtk3 + libgee + ]; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + + meta = with stdenv.lib; { + description = "GTK notification server for Pantheon"; + homepage = "https://github.com/elementary/notifications"; + license = licenses.gpl3Plus; + maintainers = pantheon.maintainers; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 582793ff590..e5aa31ca0fb 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -1,135 +1,105 @@ -{ accountsservice -, alsaLib -, colord -, docbook_xsl -, fetchgit +{ stdenv +, substituteAll , fetchurl -, geoclue2 -, geocode-glib -, gettext -, glib +, fetchgit +, meson +, ninja +, pkgconfig , gnome3 -, gsettings-desktop-schemas +, perl +, gettext , gtk3 +, glib +, libnotify +, libgnomekbd , lcms2 +, libpulseaudio +, alsaLib , libcanberra-gtk3 -, libgnomekbd -, libgudev +, upower +, colord , libgweather -, libnotify -, libpulseaudio +, polkit +, gsettings-desktop-schemas +, geoclue2 +, systemd +, libgudev , libwacom -, libxml2 , libxslt -, meson -, mousetweaks +, libxml2 +, modemmanager , networkmanager -, ninja -, nss -, pantheon -, perl -, pkgconfig -, polkit +, gnome-desktop +, geocode-glib +, docbook_xsl +, accountsservice +, wrapGAppsHook , python3 -, stdenv -, substituteAll -, systemd , tzdata -, upower -, libXtst -, wrapGAppsHook +, nss +, gcr +, pantheon }: stdenv.mkDerivation rec { pname = "elementary-settings-daemon"; - version = "3.30.2"; + version = "3.34.1"; repoName = "gnome-settings-daemon"; - src = fetchurl { - url = "mirror://gnome/sources/${repoName}/${stdenv.lib.versions.majorMinor version}/${repoName}-${version}.tar.xz"; - sha256 = "0c663csa3gnsr6wm0xfll6aani45snkdj7zjwjfzcwfh8w4a3z12"; - }; - - # Source for ubuntu's patchset - src2 = fetchgit { + src = fetchgit { url = "https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/${repoName}"; - rev = "refs/tags/ubuntu/${version}-1ubuntu1"; - sha256 = "02awkhw6jqm7yh812mw0nsdmsljfi8ksz8mvd2qpns5pcv002g2c"; + rev = "refs/tags/ubuntu/${version}-1ubuntu2"; + sha256 = "0w0dsbzif7v0gk61rs9g20ldlimbdwb5yvlfdc568yyx5z643jbv"; }; # We've omitted the 53_sync_input_sources_to_accountsservice patch because it breaks the build. # See: https://gist.github.com/worldofpeace/2f152a20b7c47895bb93239fce1c9f52 # # Also omit ubuntu_calculator_snap.patch as that's obviously not useful here. - patches = let patchPath = "${src2}/debian/patches"; in [ + patches = let patchPath = "${src}/debian/patches"; in [ (substituteAll { src = ./fix-paths.patch; - inherit tzdata mousetweaks; + inherit tzdata; }) ./global-backlight-helper.patch "${patchPath}/45_suppress-printer-may-not-be-connected-notification.patch" + #"${patchPath}/53_sync_input_sources_to_accountsservice.patch" "${patchPath}/64_restore_terminal_keyboard_shortcut_schema.patch" "${patchPath}/correct_logout_action.patch" "${patchPath}/ubuntu-lid-close-suspend.patch" - "${patchPath}/revert-wacom-migration.patch" "${patchPath}/revert-gsettings-removals.patch" "${patchPath}/revert-mediakeys-dbus-interface-drop.patch" - "${patchPath}/ubuntu_ibus_configs.patch" - (fetchurl { - url = "https://github.com/elementary/os-patches/raw/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch"; - sha256 = "0kh508ppiv4nvkg30gmw85cljlfq1bvkzhvf1iaxw0snb0mwgsxi"; - }) + #"${patchPath}/ubuntu_ibus_configs.patch" + # https://github.com/elementary/os-patches/blob/6975d1c254cb6ab913b8e2396877203aea8eaa65/debian/patches/elementary-dpms.patch + ./elementary-dpms.patch ]; - postPatch = '' - for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do - chmod +x $f - patchShebangs $f - done - ''; - - postFixup = '' - for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart) - do - echo "Patching OnlyShowIn to Pantheon in: $autostart" - sed -i "s,OnlyShowIn=GNOME;,OnlyShowIn=Pantheon;," $autostart - done - - # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 - # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) - rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop - - # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper - mkdir -p $out/bin/elementary-settings-daemon - ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper - ''; - nativeBuildInputs = [ - docbook_xsl - gettext - libxml2 - libxslt meson ninja - perl pkgconfig - python3 + perl + gettext + libxml2 + libxslt + docbook_xsl wrapGAppsHook + python3 ]; buildInputs = [ accountsservice alsaLib colord + gcr geoclue2 geocode-glib glib - gnome3.gnome-desktop + gnome-desktop gsettings-desktop-schemas gtk3 lcms2 - libXtst libcanberra-gtk3 libgnomekbd # for org.gnome.libgnomekbd.keyboard schema libgudev @@ -137,6 +107,7 @@ stdenv.mkDerivation rec { libnotify libpulseaudio libwacom + modemmanager networkmanager nss polkit @@ -152,6 +123,29 @@ stdenv.mkDerivation rec { # we're using plain NIX_CFLAGS_COMPILE = "-DG_DISABLE_CAST_CHECKS"; + postPatch = '' + for f in gnome-settings-daemon/codegen.py plugins/power/gsd-power-constants-update.pl meson_post_install.py; do + chmod +x $f + patchShebangs $f + done + ''; + + postFixup = '' + for autostart in $(grep -rl "OnlyShowIn=GNOME;" $out/etc/xdg/autostart) + do + echo "Patching OnlyShowIn to Pantheon in: $autostart" + sed -i "s,OnlyShowIn=GNOME;,OnlyShowIn=Pantheon;," $autostart + done + + # This breaks lightlocker https://github.com/elementary/session-settings/commit/b0e7a2867608c3a3916f9e4e21a68264a20e44f8 + # TODO: shouldn't be neeed for the 5.1 greeter (awaiting release) + rm $out/etc/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop + + # So the polkit policy can reference /run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper + mkdir -p $out/bin/elementary-settings-daemon + ln -s $out/libexec/gsd-backlight-helper $out/bin/elementary-settings-daemon/gsd-backlight-helper + ''; + passthru = { updateScript = gnome3.updateScript { packageName = repoName; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch new file mode 100644 index 00000000000..14d056ceca2 --- /dev/null +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/elementary-dpms.patch @@ -0,0 +1,84 @@ +diff --git a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in +index ec805d8a..cf0d6793 100644 +--- a/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in ++++ b/data/org.gnome.settings-daemon.plugins.power.gschema.xml.in +@@ -11,6 +11,11 @@ + <summary>Activation of this plugin</summary> + <description>Whether this plugin would be activated by unity-settings-daemon or not</description> + </key> ++ <key name="manage-dpms-defaults" type="b"> ++ <default>false</default> ++ <summary>Reset X DPMS values</summary> ++ <description>Whether DPMS values will be adjusted by gnome-settings-daemon</description> ++ </key> + <key name="idle-brightness" type="i"> + <default>30</default> + <summary>The brightness of the screen when idle</summary> +diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c +index a7ca87fb..a56a7cdc 100644 +--- a/plugins/power/gpm-common.c ++++ b/plugins/power/gpm-common.c +@@ -280,6 +280,18 @@ disable_builtin_screensaver (gpointer unused) + return TRUE; + } + ++gboolean ++manage_dpms (void) ++{ ++ GSettings *settings; ++ gboolean manage_dpms_defaults; ++ ++ settings = g_settings_new ("org.gnome.settings-daemon.plugins.power"); ++ manage_dpms_defaults = g_settings_get_boolean (settings, "manage-dpms-defaults"); ++ g_object_unref (settings); ++ return manage_dpms_defaults; ++} ++ + guint + gsd_power_enable_screensaver_watchdog (void) + { +@@ -290,7 +302,7 @@ gsd_power_enable_screensaver_watchdog (void) + * way. The defaults are now applied in Fedora 20 from + * being "0" by default to being "600" by default */ + gdk_x11_display_error_trap_push (gdk_display_get_default ()); +- if (DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) ++ if (manage_dpms () && DPMSQueryExtension(GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &dummy, &dummy)) + DPMSSetTimeouts (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), 0, 0, 0); + gdk_x11_display_error_trap_pop_ignored (gdk_display_get_default ()); + id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT, +diff --git a/plugins/power/gpm-common.h b/plugins/power/gpm-common.h +index 88a8e00e..af106479 100644 +--- a/plugins/power/gpm-common.h ++++ b/plugins/power/gpm-common.h +@@ -34,6 +34,7 @@ gchar *gpm_get_timestring (guint time); + gboolean gsd_power_is_hardware_a_vm (void); + guint gsd_power_enable_screensaver_watchdog (void); + void reset_idletime (void); ++gboolean manage_dpms (void); + + /* Backlight helpers */ + +diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c +index c500fa38..445496ee 100644 +--- a/plugins/power/gsd-power-manager.c ++++ b/plugins/power/gsd-power-manager.c +@@ -1033,6 +1033,9 @@ backlight_enable (GsdPowerManager *manager) + gboolean ret; + GError *error = NULL; + ++ if (!(manage_dpms ())) ++ return; ++ + iio_proxy_claim_light (manager, TRUE); + ret = gnome_rr_screen_set_dpms_mode (manager->rr_screen, + GNOME_RR_DPMS_ON, +@@ -1052,6 +1055,9 @@ backlight_disable (GsdPowerManager *manager) + gboolean ret; + GError *error = NULL; + ++ if (!(manage_dpms ())) ++ return; ++ + iio_proxy_claim_light (manager, FALSE); + ret = gnome_rr_screen_set_dpms_mode (manager->rr_screen, + GNOME_RR_DPMS_OFF, diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch index 272656fae78..2229302cab7 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/fix-paths.patch @@ -13,14 +13,3 @@ typedef struct _TzDB TzDB; typedef struct _TzLocation TzLocation; ---- a/plugins/mouse/gsd-mouse-manager.c -+++ b/plugins/mouse/gsd-mouse-manager.c -@@ -118,7 +118,7 @@ set_mousetweaks_daemon (GsdMouseManager *manager, - gboolean run_daemon = dwell_click_enabled || secondary_click_enabled; - - if (run_daemon || manager->priv->mousetweaks_daemon_running) -- comm = g_strdup_printf ("mousetweaks %s", -+ comm = g_strdup_printf ("@mousetweaks@/bin/mousetweaks %s", - run_daemon ? "" : "-s"); - else - return; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch index c073b23e6b9..dcdc83934ba 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/global-backlight-helper.patch @@ -1,18 +1,18 @@ -diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c -index e83f1549..15890053 100644 ---- a/plugins/power/gpm-common.c -+++ b/plugins/power/gpm-common.c -@@ -452,7 +452,7 @@ run_backlight_helper (enum BacklightHelperCommand command, - gchar *argv[5] = { 0 }; - - argv[0] = "pkexec"; -- argv[1] = LIBEXECDIR "/gsd-backlight-helper"; -+ argv[1] = "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper"; - argv[2] = helper_args[command]; - argv[3] = value; - +diff --git a/plugins/power/gsd-backlight.c b/plugins/power/gsd-backlight.c +index d7d10fd2..5619d6ad 100644 +--- a/plugins/power/gsd-backlight.c ++++ b/plugins/power/gsd-backlight.c +@@ -358,7 +358,7 @@ gsd_backlight_run_set_helper (GsdBacklight *backlight, GTask *task) + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, + &error, + "pkexec", +- LIBEXECDIR "/gsd-backlight-helper", ++ "/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper", + g_udev_device_get_sysfs_path (backlight->udev_device), + data->value_str, NULL); + } else { diff --git a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in -index f16300f8..f19bba3e 100644 +index f16300f8..79d6bd17 100644 --- a/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in +++ b/plugins/power/org.gnome.settings-daemon.plugins.power.policy.in.in @@ -25,7 +25,7 @@ @@ -22,5 +22,5 @@ index f16300f8..f19bba3e 100644 - <annotate key="org.freedesktop.policykit.exec.path">@libexecdir@/gsd-backlight-helper</annotate> + <annotate key="org.freedesktop.policykit.exec.path">/run/current-system/sw/bin/elementary-settings-daemon/gsd-backlight-helper</annotate> </action> - + </policyconfig> diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index 0f919c7c94d..ee3acb2af3c 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pantheon Geoclue2 Agent"; - homepage = https://github.com/elementary/pantheon-agent-geoclue2; + homepage = "https://github.com/elementary/pantheon-agent-geoclue2"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index f244e0e4637..d3618861d72 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Polkit Agent for the Pantheon Desktop"; - homepage = https://github.com/elementary/pantheon-agent-polkit; + homepage = "https://github.com/elementary/pantheon-agent-polkit"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = pantheon.maintainers; diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix index 5b6abddbcda..770e549fc2c 100644 --- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix +++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix @@ -26,8 +26,8 @@ in mkDerivation { name = "breeze-plymouth"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ plymouth ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ]; + nativeBuildInputs = [ extra-cmake-modules ] ++ lib.optionals (logoFile != null) [ imagemagick netpbm perl ]; + buildInputs = [ plymouth ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); cmakeFlags = [] ++ lib.optional (osName != null) "-DDISTRO_NAME=${osName}" diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index a199a4a959d..07b46425814 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -87,7 +87,7 @@ let ]; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; } // (args.meta or {}); in mkDerivation (args // { diff --git a/pkgs/desktops/plasma-5/kscreen-417316.patch b/pkgs/desktops/plasma-5/kscreen-417316.patch new file mode 100644 index 00000000000..92b347e2dbf --- /dev/null +++ b/pkgs/desktops/plasma-5/kscreen-417316.patch @@ -0,0 +1,76 @@ +https://phabricator.kde.org/file/data/dyr2qr4wrhxg4eahkgd3/PHID-FILE-7d4og3zr4mk53u6lzkk2/D27442.diff +https://bugs.kde.org/show_bug.cgi?id=417316 + +diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml kscreen-5.17.5/kcm/package/contents/ui/main.qml +--- kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml 2020-01-07 16:28:39.000000000 +0100 ++++ kscreen-5.17.5/kcm/package/contents/ui/main.qml 2020-04-03 17:54:26.097809557 +0200 +@@ -24,8 +24,8 @@ + KCM.SimpleKCM { + id: root + +- implicitWidth: units.gridUnit * 30 +- implicitHeight: units.gridUnit * 38 ++ implicitWidth: Kirigami.Units.gridUnit * 32 ++ implicitHeight: Kirigami.Units.gridUnit * 38 + + property int selectedOutput: 0 + +@@ -113,7 +113,7 @@ + id: screen + + Layout.alignment: Qt.AlignHCenter +- Layout.preferredWidth: Math.max(root.width * 0.8, units.gridUnit * 26) ++ Layout.preferredWidth: Math.max(root.width * 0.8, Kirigami.Units.gridUnit * 26) + Layout.topMargin: Kirigami.Units.smallSpacing + Layout.bottomMargin: Kirigami.Units.largeSpacing * 2 + +diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml kscreen-5.17.5/kcm/package/contents/ui/Output.qml +--- kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml 2020-01-07 16:28:39.000000000 +0100 ++++ kscreen-5.17.5/kcm/package/contents/ui/Output.qml 2020-04-03 17:53:22.491686708 +0200 +@@ -19,6 +19,7 @@ + import QtQuick.Layouts 1.1 + import QtQuick.Controls 2.3 as Controls + import QtGraphicalEffects 1.0 ++import org.kde.kirigami 2.4 as Kirigami + + Rectangle { + id: output +@@ -77,7 +78,7 @@ + + Controls.Label { + Layout.fillWidth: true +- Layout.margins: units.smallSpacing ++ Layout.margins: Kirigami.Units.smallSpacing + + text: model.display + wrapMode: Text.Wrap +@@ -87,7 +88,7 @@ + + Controls.Label { + Layout.fillWidth: true +- Layout.bottomMargin: units.smallSpacing ++ Layout.bottomMargin: Kirigami.Units.smallSpacing + + text: "(" + model.size.width + "x" + model.size.height + ")" + horizontalAlignment: Text.AlignHCenter +diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml kscreen-5.17.5/kcm/package/contents/ui/Screen.qml +--- kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml 2020-01-07 16:28:39.000000000 +0100 ++++ kscreen-5.17.5/kcm/package/contents/ui/Screen.qml 2020-04-03 17:53:22.491686708 +0200 +@@ -45,7 +45,7 @@ + property int xOffset: (width - totalSize.width / relativeFactor) / 2; + property int yOffset: (height - totalSize.height / relativeFactor) / 2; + +- implicitHeight: Math.max(root.height * 0.4, units.gridUnit * 13) ++ implicitHeight: Math.max(root.height * 0.4, Kirigami.Units.gridUnit * 13) + + Component.onCompleted: background.visible = true; + +@@ -54,7 +54,7 @@ + anchors { + bottom: parent.bottom + horizontalCenter: parent.horizontalCenter +- margins: units.smallSpacing ++ margins: Kirigami.Units.smallSpacing + } + spacing: units.smallSpacing + Controls.Button { diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index d46d48b9c5b..2f37c4212da 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -8,6 +8,7 @@ mkDerivation { name = "kscreen"; + patches = [ ./kscreen-417316.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 7ddd6e2abb7..590c523e9d7 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -7,8 +7,15 @@ mkDerivation { postPatch = '' sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; + + # We get a crash when QT_PLUGIN_PATH is more than 1000 characters. + # pam_kwallet_init passes its environment to kwalletd5, but + # wrapQtApps gives our environment a huge QT_PLUGIN_PATH value. We + # are able to unset it here since kwalletd5 will have its own + # QT_PLUGIN_PATH. postFixup = '' - wrapQtApp $out/libexec/pam_kwallet_init + wrapProgram $out/libexec/pam_kwallet_init --unset QT_PLUGIN_PATH ''; + dontWrapQtApps = true; } diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index b7c40153209..cc7de2168e4 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Fast, lightweight, gtk2 file manager"; - homepage = http://rox.sourceforge.net/desktop; + homepage = "http://rox.sourceforge.net/desktop"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = [ maintainers.eleanor ]; diff --git a/pkgs/desktops/xfce/applications/orage/default.nix b/pkgs/desktops/xfce/applications/orage/default.nix index 4a48cc83dda..ea025fbb33c 100644 --- a/pkgs/desktops/xfce/applications/orage/default.nix +++ b/pkgs/desktops/xfce/applications/orage/default.nix @@ -28,7 +28,7 @@ mkXfceDerivation { # Fix build with libical 3.0 (fetchpatch { name = "fix-libical3.patch"; - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/libical3.patch?h=packages/orage&id=7b1b06c42dda034d538977b9f3550b28e370057f"; sha256 = "1l8s106mcidmbx2p8c2pi8v9ngbv2x3fsgv36j8qk8wyd4qd1jbf"; }) ]; diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix index dafb72582b3..76e89a592b4 100644 --- a/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.xfce.org/projects/xfce4-volumed; # referenced but inactive + homepage = "https://www.xfce.org/projects/xfce4-volumed"; # referenced but inactive description = "A volume keys control daemon for the Xfce desktop environment"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index 6ac601c6685..4f35dff42ff 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool gtk2 ]; meta = { - homepage = https://www.xfce.org/; + homepage = "https://www.xfce.org/"; description = "Icons for Xfce"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/desktops/xfce/art/xfwm4-themes.nix b/pkgs/desktops/xfce/art/xfwm4-themes.nix index 783fbb13c83..1c40b7ec29b 100644 --- a/pkgs/desktops/xfce/art/xfwm4-themes.nix +++ b/pkgs/desktops/xfce/art/xfwm4-themes.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; meta = with stdenv.lib; { - homepage = https://www.xfce.org/; + homepage = "https://www.xfce.org/"; description = "Themes for Xfce"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index ef7f7e58020..321e4792e4b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk2 hicolor-icon-theme ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "CPU graph show for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix index 3abeb74a435..d5982ea3c12 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Dictionary plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix index b33ba7770be..db74da2939d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-dockbarx-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, fetchFromGitHub, python2, bash, vala +{ stdenv, pkgconfig, 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 ]; - buildInputs = [ python2 vala gtk2 pythonPackages.wrapPython ] + buildInputs = [ python2 vala_0_46 gtk2 pythonPackages.wrapPython ] ++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ]) ++ pythonPath; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/TiZ-EX1/xfce4-dockbarx-plugin; + homepage = "https://github.com/TiZ-EX1/xfce4-dockbarx-plugin"; description = "A plugins to embed DockbarX into xfce4-panel"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index e6d1f6da26b..94c26f9e1b2 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Embed arbitrary app windows on Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 03e5a222967..1932a9e9968 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Eyes following you!"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index ee663aa71ca..54bb4817d7e 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Filesystem monitor"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index 193d27af98a..dd9827dcc5a 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Cyclically spawns a command and captures its output"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index 2782decf6c4..40810abfc07 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { version = "1.6.0"; src = fetchurl { - url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${pname}-${version}.tar.bz2"; - sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b"; + url = "https://git.xfce.org/archive/${pname}/snapshot/${pname}-${version}.tar.gz"; + sha256 = "11k7m41jxkaqmpp5njkixw60q517xnw923mz34dnm1llx9ilvfk8"; }; nativeBuildInputs = [ @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; description = "Hardware monitor plugin for the XFCE4 panel"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index e9d2eb590be..058f2591716 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { xfconf gtk2 exo gnutls libgcrypt ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Mailwatch plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index b909540144a..b936d2e441c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { xfconf gtk2 exo ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix index 8c6c91e2519..affc957c51d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-namebar-plugin.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/TiZ-EX1/xfce4-namebar-plugin; + homepage = "https://github.com/TiZ-EX1/xfce4-namebar-plugin"; description = "A plugins which integrates titlebar and window controls into the xfce4-panel"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index 2876c1b1f7d..516d86f56ab 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 libunique ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Sticky notes plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 2e7233e6cdb..56cad888168 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 5575962ab77..95fb9358f94 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk2 ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "System load plugin for Xfce panel"; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index 4eddfe8df57..4070156c223 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "A simple XFCE panel plugin that lets the user run an alarm at a specified time or at the end of a specified countdown period"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index 5ab311ef16f..0914c4cb7d9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Weather plugin for the Xfce desktop environment"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index ef47d37e5ef..884b8ee3a29 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.3.3"; + version = "2.4.3"; rev = "v${version}"; - sha256 = "0agh0a5srsy6vi6r50ak9rb42r7vcnfv6nfvg4qbqi77yc44yqdb"; + sha256 = "1cs3fps1bj0dd5az7fwrvw1xl3y621qk4dma3n73p7rr19j7fpsn"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index 8798851579d..eba7be91ef9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/${p_name}"; description = "Set of two plugins which allows you to put the maximized window title and windows buttons on the panel"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 9849afb2c2d..aa472512d14 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -217,7 +217,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source electronics prototyping platform"; - homepage = http://arduino.cc/; + homepage = "http://arduino.cc/"; license = if withTeensyduino then licenses.unfreeRedistributable else licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ antono auntie robberer bjornfor bergey ]; diff --git a/pkgs/development/arduino/arduino-mk/default.nix b/pkgs/development/arduino/arduino-mk/default.nix index f450d4f850f..ff7b7274ca9 100644 --- a/pkgs/development/arduino/arduino-mk/default.nix +++ b/pkgs/development/arduino/arduino-mk/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Makefile for Arduino sketches"; - homepage = https://github.com/sudar/Arduino-Makefile; + homepage = "https://github.com/sudar/Arduino-Makefile"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.eyjhb ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 83b72488bfd..0e36c22872e 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -38,7 +38,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Command line toolkit for working with Arduino hardware"; - homepage = http://inotool.org/; + homepage = "http://inotool.org/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 7beb2cba9c5..6d96fb44288 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -95,7 +95,7 @@ in buildPythonApplication rec { meta = with stdenv.lib; { broken = stdenv.isAarch64; description = "An open source ecosystem for IoT development"; - homepage = http://platformio.org; + homepage = "http://platformio.org"; license = licenses.asl20; maintainers = with maintainers; [ mog makefu ]; }; diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index e3ff823924e..26070ce73bf 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -46,7 +46,7 @@ let meta = { description = "Package manager for the Erlang VM https://hex.pm"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/hexpm/hex; + homepage = "https://github.com/hexpm/hex"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/beam-modules/pgsql/default.nix b/pkgs/development/beam-modules/pgsql/default.nix index 6edee5d8bc6..c7e7aee1001 100644 --- a/pkgs/development/beam-modules/pgsql/default.nix +++ b/pkgs/development/beam-modules/pgsql/default.nix @@ -22,7 +22,7 @@ let meta = { description = "Erlang PostgreSQL Driver"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/semiocast/pgsql; + homepage = "https://github.com/semiocast/pgsql"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/beam-modules/webdriver/default.nix b/pkgs/development/beam-modules/webdriver/default.nix index d772ad7a3c7..8f06f8ed7a8 100644 --- a/pkgs/development/beam-modules/webdriver/default.nix +++ b/pkgs/development/beam-modules/webdriver/default.nix @@ -28,7 +28,7 @@ let meta = { description = "WebDriver implementation in Erlang"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/Quviq/webdrv; + homepage = "https://github.com/Quviq/webdrv"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; }; diff --git a/pkgs/development/chez-modules/chez-matchable/default.nix b/pkgs/development/chez-modules/chez-matchable/default.nix index 2b3de233f9b..d3f4e3fbe63 100644 --- a/pkgs/development/chez-modules/chez-matchable/default.nix +++ b/pkgs/development/chez-modules/chez-matchable/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "This is a Library for ChezScheme providing the protable hygenic pattern matcher by Alex Shinn"; - homepage = https://github.com/fedeinthemix/chez-matchable/; + homepage = "https://github.com/fedeinthemix/chez-matchable/"; maintainers = [ stdenv.lib.maintainers.jitwit ]; license = stdenv.lib.licenses.publicDomain; }; diff --git a/pkgs/development/chez-modules/chez-mit/default.nix b/pkgs/development/chez-modules/chez-mit/default.nix index 3614e97d9ea..fc2c0f7ba4f 100644 --- a/pkgs/development/chez-modules/chez-mit/default.nix +++ b/pkgs/development/chez-modules/chez-mit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "This is a MIT/GNU Scheme compatibility library for Chez Scheme"; - homepage = https://github.com/fedeinthemix/chez-mit/; + homepage = "https://github.com/fedeinthemix/chez-mit/"; maintainers = [ stdenv.lib.maintainers.jitwit ]; license = stdenv.lib.licenses.free; }; diff --git a/pkgs/development/chez-modules/chez-scmutils/default.nix b/pkgs/development/chez-modules/chez-scmutils/default.nix index ceebef11363..861ff4ff46b 100644 --- a/pkgs/development/chez-modules/chez-scmutils/default.nix +++ b/pkgs/development/chez-modules/chez-scmutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "This is a port of the ‘MIT Scmutils’ library to Chez Scheme"; - homepage = https://github.com/fedeinthemix/chez-scmutils/; + homepage = "https://github.com/fedeinthemix/chez-scmutils/"; maintainers = [ stdenv.lib.maintainers.jitwit ]; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/development/chez-modules/chez-srfi/default.nix b/pkgs/development/chez-modules/chez-srfi/default.nix index 7f88b8fe7b0..f055a14884a 100644 --- a/pkgs/development/chez-modules/chez-srfi/default.nix +++ b/pkgs/development/chez-modules/chez-srfi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "This package provides a collection of SRFI libraries for Chez Scheme"; - homepage = https://github.com/fedeinthemix/chez-srfi/; + homepage = "https://github.com/fedeinthemix/chez-srfi/"; maintainers = [ stdenv.lib.maintainers.jitwit ]; license = stdenv.lib.licenses.free; }; diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 44f72a93c3a..2c9de761778 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://common-lisp.net/project/armedbear/; + homepage = "https://common-lisp.net/project/armedbear/"; }; } diff --git a/pkgs/development/compilers/acme/default.nix b/pkgs/development/compilers/acme/default.nix new file mode 100644 index 00000000000..c5a997ad75b --- /dev/null +++ b/pkgs/development/compilers/acme/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchsvn }: + +stdenv.mkDerivation rec { + pname = "acme"; + version = "120"; + + src = fetchsvn { + url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; + rev = version; + sha256 = "0w17b8f8bis22m6l5bg8qg8nniy20f8yg2xmzjipblmc39vpv6s2"; + }; + + sourceRoot = "code-0-r${src.rev}/src"; + + makeFlags = [ "BINDIR=$(out)/bin" ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace "= gcc" "?= gcc" + ''; + + meta = with stdenv.lib; { + description = "A multi-platform cross assembler for 6502/6510/65816 CPUs."; + homepage = "https://sourceforge.net/projects/acme-crossass/"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ OPNA2608 ]; + }; +} diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index dd03ce0171f..72ed184357c 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { programming language and an implementation of Java Web Start, originally based on the NetX project. ''; - homepage = https://github.com/adoptopenjdk/icedtea-web; + homepage = "https://github.com/adoptopenjdk/icedtea-web"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index 604838e8831..09ccf9510bb 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { # Please become a maintainer to fix this package broken = true; - homepage = http://www.aldor.org/; + homepage = "http://www.aldor.org/"; description = "Programming language with an expressive type system"; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 08d0005c99e..db1a8640753 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; gecodeSrc = fetchurl { - url = http://www.gecode.org/download/gecode-1.3.1.tar.gz; + url = "http://www.gecode.org/download/gecode-1.3.1.tar.gz"; sha256 = "0mgc6llbq166jmlq3alvagqsg3730670zvbwwkdgsqklw70v9355"; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation { extended with rich support for concurrent, distributed, and constraint programming. ''; - homepage = https://www.ps.uni-saarland.de/alice/; + homepage = "https://www.ps.uni-saarland.de/alice/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.doublec ]; broken = true; diff --git a/pkgs/development/compilers/arachne-pnr/default.nix b/pkgs/development/compilers/arachne-pnr/default.nix index 0b5ff381730..613f3fa186a 100644 --- a/pkgs/development/compilers/arachne-pnr/default.nix +++ b/pkgs/development/compilers/arachne-pnr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { is a textual bitstream representation for assembly by the IceStorm [2] icepack command. ''; - homepage = https://github.com/cseed/arachne-pnr; + homepage = "https://github.com/cseed/arachne-pnr"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/asn1c/default.nix b/pkgs/development/compilers/asn1c/default.nix index 3cbb7577f34..230ed36fff5 100644 --- a/pkgs/development/compilers/asn1c/default.nix +++ b/pkgs/development/compilers/asn1c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://lionet.info/asn1c/compiler.html; + homepage = "http://lionet.info/asn1c/compiler.html"; description = "Open Source ASN.1 Compiler"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 4b216761259..94dc813d78a 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [jre]; meta = { - homepage = http://www.eclipse.org/aspectj/; + 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; diff --git a/pkgs/development/compilers/avian/default.nix b/pkgs/development/compilers/avian/default.nix index 34d1e64c484..7c5db45f31b 100644 --- a/pkgs/development/compilers/avian/default.nix +++ b/pkgs/development/compilers/avian/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { to provide a useful subset of Java’s features, suitable for building self-contained applications. ''; - homepage = https://readytalk.github.io/avian/; + homepage = "https://readytalk.github.io/avian/"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.earldouglas ]; diff --git a/pkgs/development/compilers/avra/default.nix b/pkgs/development/compilers/avra/default.nix index 88a34bd6fd6..55ed48e118e 100644 --- a/pkgs/development/compilers/avra/default.nix +++ b/pkgs/development/compilers/avra/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Assembler for the Atmel AVR microcontroller family"; - homepage = http://avra.sourceforge.net/; + homepage = "http://avra.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ the-kenny ]; diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 6e768e65091..32116048a43 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Efficient Scheme compiler"; - homepage = http://www-sop.inria.fr/indes/fp/Bigloo/; + 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 ]; diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index d3723243766..023c567638f 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python3 ]; meta = with stdenv.lib; { - homepage = https://github.com/WebAssembly/binaryen; + homepage = "https://github.com/WebAssembly/binaryen"; description = "Compiler infrastructure and toolchain library for WebAssembly, in C++"; platforms = platforms.all; maintainers = with maintainers; [ asppsa ]; diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 6912cc6e9ff..14347da98b8 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -17,7 +17,7 @@ in }).overrideAttrs (attrs: { meta = with stdenv.lib; { description = "A JavaScript backend for OCaml focused on smooth integration and clean generated code."; - homepage = https://bucklescript.github.io; + homepage = "https://bucklescript.github.io"; license = licenses.lgpl3; maintainers = with maintainers; [ turbomack gamb anmonteiro ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/bupc/default.nix b/pkgs/development/compilers/bupc/default.nix index ad10845e98c..ecdfe8d461a 100644 --- a/pkgs/development/compilers/bupc/default.nix +++ b/pkgs/development/compilers/bupc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { parallelism is fixed at program startup time, typically with a single thread of execution per processor. ''; - homepage = https://upc.lbl.gov/; + homepage = "https://upc.lbl.gov/"; license = licenses.mit; platforms = with platforms; [ linux ]; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index e02880b314e..f6c27436c76 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -38,7 +38,7 @@ haskellPackages.mkDerivation rec { ''; description = "A statically typed lisp, without a GC, for real-time applications"; - homepage = https://github.com/carp-lang/Carp; + homepage = "https://github.com/carp-lang/Carp"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ jluttine ]; diff --git a/pkgs/development/compilers/ccl/default.nix b/pkgs/development/compilers/ccl/default.nix index ec166352267..573d36cd3f6 100644 --- a/pkgs/development/compilers/ccl/default.nix +++ b/pkgs/development/compilers/ccl/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Clozure Common Lisp"; - homepage = https://ccl.clozure.com/; + homepage = "https://ccl.clozure.com/"; maintainers = with maintainers; [ raskin muflax tohl ]; platforms = attrNames options; license = licenses.lgpl21; diff --git a/pkgs/development/compilers/chez/default.nix b/pkgs/development/compilers/chez/default.nix index c0fd742082f..2d2e0df1ec9 100644 --- a/pkgs/development/compilers/chez/default.nix +++ b/pkgs/development/compilers/chez/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "A powerful and incredibly fast R6RS Scheme compiler"; - homepage = https://cisco.github.io/ChezScheme/; + homepage = "https://cisco.github.io/ChezScheme/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/chicken/4/chicken.nix b/pkgs/development/compilers/chicken/4/chicken.nix index 380755bf01e..be7a4530419 100644 --- a/pkgs/development/compilers/chicken/4/chicken.nix +++ b/pkgs/development/compilers/chicken/4/chicken.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion meta = { - homepage = http://www.call-cc.org/; + homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix diff --git a/pkgs/development/compilers/chicken/4/egg2nix.nix b/pkgs/development/compilers/chicken/4/egg2nix.nix index 8f796d09ee5..db91b1648af 100644 --- a/pkgs/development/compilers/chicken/4/egg2nix.nix +++ b/pkgs/development/compilers/chicken/4/egg2nix.nix @@ -19,7 +19,7 @@ eggDerivation { meta = { description = "Generate nix-expression from CHICKEN scheme eggs"; - homepage = https://github.com/the-kenny/egg2nix; + homepage = "https://github.com/the-kenny/egg2nix"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index eefd8e35a27..00d359c96d0 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { # TODO: Assert csi -R files -p '(pathname-file (repository-path))' == binaryVersion meta = { - homepage = http://www.call-cc.org/; + homepage = "http://www.call-cc.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; platforms = stdenv.lib.platforms.linux; # Maybe other non-darwin Unix diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix index 77ed32cafe1..7c73e37272d 100644 --- a/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -21,7 +21,7 @@ eggDerivation { meta = { description = "Generate nix-expression from CHICKEN scheme eggs"; - homepage = https://github.com/the-kenny/egg2nix; + homepage = "https://github.com/the-kenny/egg2nix"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ the-kenny corngood ]; diff --git a/pkgs/development/compilers/clean/default.nix b/pkgs/development/compilers/clean/default.nix index 03a5cec5004..0dfd05030b9 100644 --- a/pkgs/development/compilers/clean/default.nix +++ b/pkgs/development/compilers/clean/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { and generic functions. ''; - homepage = http://wiki.clean.cs.ru.nl/Clean; + homepage = "http://wiki.clean.cs.ru.nl/Clean"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.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 0efdabcde2e..5204932448b 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200224"; + version = "20200315"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0qlnpnd64rrlyz7ybdnp7zk5ns2s0071zs1fcrcq9ba2lnhfbmmb"; + sha256 = "0akif1wgsyyqrfkidkwhw47dsx471h3b4zsjhnh4rf6kv7by3q65"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index edde6af615f..87d3f0ef00c 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { inference with Variational inference (ADVI) and penalized maximum likelihood estimation with Optimization (L-BFGS). ''; - homepage = https://mc-stan.org/interfaces/cmdstan.html; + homepage = "https://mc-stan.org/interfaces/cmdstan.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index 3f93ea9e1ba..480a7e522b5 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ANSI Common Lisp standard. ''; license = stdenv.lib.licenses.free; # public domain - homepage = http://www.cons.org/cmucl/; + homepage = "http://www.cons.org/cmucl/"; maintainers = [stdenv.lib.maintainers.tohl]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix index cc8e9f827b7..06a56dc42ea 100644 --- a/pkgs/development/compilers/colm/default.nix +++ b/pkgs/development/compilers/colm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A programming language for the analysis and transformation of computer languages"; - homepage = http://www.colm.net/open-source/colm; + homepage = "http://www.colm.net/open-source/colm"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 3a6c5e9c2c7..1665061125d 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -12,13 +12,13 @@ let in stdenv.mkDerivation rec { pname = "compcert"; - version = "3.6"; + version = "3.7"; src = fetchFromGitHub { owner = "AbsInt"; repo = "CompCert"; rev = "v${version}"; - sha256 = "1k9xhj7fgllhf7bn7rp3w6zfvs4clglnc4w39zp4678hrwvdcpha"; + sha256 = "1h4zhk9rrqki193nxs9vjvya7nl9yxjcf07hfqb6g77riy1vd2jr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/compilers/computecpp/default.nix b/pkgs/development/compilers/computecpp/default.nix index 65cfcaa7ff6..68d11bdf8b1 100644 --- a/pkgs/development/compilers/computecpp/default.nix +++ b/pkgs/development/compilers/computecpp/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "computecpp"; - version = "1.2.0"; + version = "1.3.0"; src = fetchzip { url = "https://computecpp.codeplay.com/downloads/computecpp-ce/${version}/ubuntu-16.04-64bit.tar.gz"; - sha256 = "191kwvzxfg1sbaq6aw6f84chi7bhsibb2a63zsyz3gz8m0c0syr5"; + sha256 = "1q6gqjpzz4a260gsd6mm1iv4z8ar3vxaypmgdwl8pb4i7kg6ykaz"; stripRoot = true; }; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Accelerate Complex C++ Applications on Heterogeneous Compute Systems using Open Standards"; - homepage = https://www.codeplay.com/products/computesuite/computecpp; + homepage = "https://www.codeplay.com/products/computesuite/computecpp"; license = licenses.unfree; maintainers = with maintainers; [ davidtwco ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix index 00816fca36b..3e8390cf9ea 100644 --- a/pkgs/development/compilers/coreclr/default.nix +++ b/pkgs/development/compilers/coreclr/default.nix @@ -31,12 +31,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { # glibc 2.26 - url = https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch; + url = "https://github.com/dotnet/coreclr/commit/a8f83b615708c529b112898e7d2fbc3f618b26ee.patch"; sha256 = "047ph5gip4z2h7liwdxsmpnlaq0sd3hliaw4nyqjp647m80g3ffq"; }) (fetchpatch { # clang 5 - url = https://github.com/dotnet/coreclr/commit/9b22e1a767dee38f351001c5601f56d78766a43e.patch; + url = "https://github.com/dotnet/coreclr/commit/9b22e1a767dee38f351001c5601f56d78766a43e.patch"; sha256 = "1w1lxw5ryvhq8m5m0kv880c4bh6y9xdgypkr76sqbh3v568yghzg"; }) ]; @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/dotnet/core/; + homepage = "https://github.com/dotnet/core/"; description = ".NET is a general purpose development platform"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kuznero ]; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 89dbda4e2a9..9491a545a78 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -170,7 +170,7 @@ let meta = with lib; { description = "A compiled language with Ruby like syntax and type inference"; - homepage = https://crystal-lang.org/; + homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ manveru david50407 peterhoeg ]; platforms = builtins.attrNames archs; diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 9c70e96a9c0..cbe4e7ec926 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { Dale is a system (no GC) programming language that uses S-expressions for syntax and supports syntactic macros. ''; - homepage = https://github.com/tomhrr/dale; + homepage = "https://github.com/tomhrr/dale"; license = licenses.bsd3; maintainers = with maintainers; [ amiloradovsky ]; platforms = with platforms; [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/dev86/default.nix b/pkgs/development/compilers/dev86/default.nix index 37f79933b77..88b46561241 100644 --- a/pkgs/development/compilers/dev86/default.nix +++ b/pkgs/development/compilers/dev86/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Linux 8086 development environment"; - homepage = http://v3.sk/~lkundrak/dev86/; + homepage = "http://v3.sk/~lkundrak/dev86/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 6cae1fa073b..9281e01ad3e 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Official reference compiler for the D language"; - homepage = http://dlang.org/; + homepage = "http://dlang.org/"; # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; diff --git a/pkgs/development/compilers/dotnet/buildDotnet.nix b/pkgs/development/compilers/dotnet/buildDotnet.nix index 5ba57ed6918..1017c8b4975 100644 --- a/pkgs/development/compilers/dotnet/buildDotnet.nix +++ b/pkgs/development/compilers/dotnet/buildDotnet.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://dotnet.github.io/; + homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kuznero ]; diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 78e5eccbf14..a444dea4430 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Device Tree Compiler"; - homepage = https://git.kernel.org/cgit/utils/dtc/dtc.git; + homepage = "https://git.kernel.org/cgit/utils/dtc/dtc.git"; license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix index 375b38f1dc6..65f6884cd55 100644 --- a/pkgs/development/compilers/ecl/default.nix +++ b/pkgs/development/compilers/ecl/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = "Lisp implementation aiming to be small, fast and easy to embed"; - homepage = https://common-lisp.net/project/ecl/; + homepage = "https://common-lisp.net/project/ecl/"; license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 47aa8e249f8..703ff4fa083 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -40,7 +40,7 @@ edk2 = stdenv.mkDerivation { meta = with stdenv.lib; { description = "Intel EFI development kit"; - homepage = https://sourceforge.net/projects/edk2/; + homepage = "https://sourceforge.net/projects/edk2/"; license = licenses.bsd2; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; }; diff --git a/pkgs/development/compilers/eli/default.nix b/pkgs/development/compilers/eli/default.nix index 90c2b8fd23c..61e5fd70a7c 100644 --- a/pkgs/development/compilers/eli/default.nix +++ b/pkgs/development/compilers/eli/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { construction with extensive libraries implementing common tasks, yet handling arbitrary special cases. Output is the C subset of C++. ''; - homepage = http://eli-project.sourceforge.net/; + homepage = "http://eli-project.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ timokau ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index d0af770a2a4..cd5142acce8 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/emscripten-core/emscripten; + homepage = "https://github.com/emscripten-core/emscripten"; description = "An LLVM-to-JavaScript Compiler"; platforms = platforms.all; maintainers = with maintainers; [ qknight matthewbauer ]; diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix index 91a42f53d28..520a34afe58 100644 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/emscripten-core/emscripten-fastcomp; + homepage = "https://github.com/emscripten-core/emscripten-fastcomp"; description = "Emscripten LLVM"; platforms = platforms.all; maintainers = with maintainers; [ qknight matthewbauer ]; diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index 314a2d0fc52..2c7edb9c170 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4"; src = fetchurl { - url = https://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip; + url = "https://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip"; sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri"; }; @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://factorcode.org; + homepage = "https://factorcode.org"; license = licenses.bsd2; description = "A concatenative, stack-based programming language"; diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index fd3bb8d4c42..02c185eb793 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "x86(-64) macro assembler to binary, MZ, PE, COFF, and ELF"; - homepage = https://flatassembler.net/download.php; + homepage = "https://flatassembler.net/download.php"; license = licenses.bsd2; maintainers = with maintainers; [ orivej ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix new file mode 100644 index 00000000000..afc8fbd7f49 --- /dev/null +++ b/pkgs/development/compilers/flutter/default.nix @@ -0,0 +1,31 @@ +{ callPackage }: + +let + mkFlutter = opts: callPackage (import ./flutter.nix opts) { }; + getPatches = dir: + let files = builtins.attrNames (builtins.readDir dir); + in map (f: dir + ("/" + f)) files; +in { + stable = mkFlutter { + pname = "flutter"; + channel = "stable"; + version = "1.12.13+hotfix.9"; + sha256Hash = "1ql3zvmmk5zk47y30lajxaam04q6vr373dayq15jv4vpc0fzif1y"; + patches = getPatches ./patches/stable; + }; + beta = mkFlutter { + pname = "flutter-beta"; + channel = "beta"; + version = "1.15.17"; + sha256Hash = "0iil6y6y477dhjgzx54ab5m9nj0jg4xl8x4zzd9iwh8m756r7qsd"; + patches = getPatches ./patches/beta; + }; + dev = mkFlutter rec { + pname = "flutter-dev"; + channel = "dev"; + version = "1.17.0-dev.5.0"; + filename = "flutter_linux_${version}-${channel}.tar.xz"; + sha256Hash = "0ks2jf2bd42y2jsc91p33r57q7j3m94d8ihkmlxzwi53x1mwp0pk"; + patches = getPatches ./patches/beta; + }; +} diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix new file mode 100644 index 00000000000..fad2a646a16 --- /dev/null +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -0,0 +1,129 @@ +{ channel, pname, version, sha256Hash, patches +, filename ? "flutter_linux_v${version}-${channel}.tar.xz" }: + +{ bash, buildFHSUserEnv, cacert, coreutils, git, makeWrapper, runCommand, stdenv +, fetchurl, alsaLib, dbus, expat, libpulseaudio, libuuid, libX11, libxcb +, libXcomposite, libXcursor, libXdamage, libXfixes, libGL, nspr, nss, systemd }: + +let + drvName = "flutter-${channel}-${version}"; + flutter = stdenv.mkDerivation { + name = "${drvName}-unwrapped"; + + src = fetchurl { + url = + "https://storage.googleapis.com/flutter_infra/releases/${channel}/linux/${filename}"; + sha256 = sha256Hash; + }; + + buildInputs = [ makeWrapper git ]; + + inherit patches; + + postPatch = '' + patchShebangs --build ./bin/ + find ./bin/ -executable -type f -exec patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) {} \; + ''; + + 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="$FLUTTER_ROOT/bin/cache/dart-sdk" + + DART="$DART_SDK_PATH/bin/dart" + PUB="$DART_SDK_PATH/bin/pub" + + HOME=../.. # required for pub upgrade --offline, ~/.pub-cache + # path is relative otherwise it's replaced by /build/flutter + + (cd "$FLUTTER_TOOLS_DIR" && "$PUB" upgrade --offline) + + local revision="$(cd "$FLUTTER_ROOT"; git rev-parse HEAD)" + "$DART" --snapshot="$SNAPSHOT_PATH" --packages="$FLUTTER_TOOLS_DIR/.packages" "$SCRIPT_PATH" + echo "$revision" > "$STAMP_PATH" + echo -n "${version}" > version + + rm -rf bin/cache/{artifacts,downloads} + rm -f bin/cache/*.stamp + ''; + + installPhase = '' + mkdir -p $out + cp -r . $out + ''; + }; + + # Wrap flutter inside an fhs user env to allow execution of binary, + # like adb from $ANDROID_HOME or java from android-studio. + fhsEnv = buildFHSUserEnv { + name = "${drvName}-fhs-env"; + multiPkgs = pkgs: [ + # Flutter only use these certificates + (runCommand "fedoracert" { } '' + mkdir -p $out/etc/pki/tls/ + ln -s ${cacert}/etc/ssl/certs $out/etc/pki/tls/certs + '') + pkgs.zlib + ]; + targetPkgs = pkgs: + with pkgs; [ + bash + curl + git + unzip + which + xz + + # flutter test requires this lib + libGLU + + # for android emulator + alsaLib + dbus + expat + libpulseaudio + libuuid + libX11 + libxcb + libXcomposite + libXcursor + libXdamage + libXfixes + libGL + nspr + nss + systemd + ]; + }; + +in runCommand drvName { + startScript = '' + #!${bash}/bin/bash + export PUB_CACHE=''${PUB_CACHE:-"$HOME/.pub-cache"} + export ANDROID_EMULATOR_USE_SYSTEM_LIBS=1 + ${fhsEnv}/bin/${drvName}-fhs-env ${flutter}/bin/flutter --no-version-check "$@" + ''; + preferLocalBuild = true; + allowSubstitutes = false; + passthru = { unwrapped = flutter; }; + meta = with stdenv.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, + natively compiled applications for mobile, web, and desktop from a single codebase. + ''; + homepage = "https://flutter.dev"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ babariviere ]; + }; +} '' + mkdir -p $out/bin + + echo -n "$startScript" > $out/bin/${pname} + chmod +x $out/bin/${pname} +'' diff --git a/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch b/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch new file mode 100644 index 00000000000..42c09c805cb --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/beta/disable-auto-update.patch @@ -0,0 +1,31 @@ +diff --git a/bin/flutter b/bin/flutter +index e0c18e235..2c3fb7ddd 100755 +--- a/bin/flutter ++++ b/bin/flutter +@@ -185,8 +185,6 @@ fi + # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" + # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" + +-(upgrade_flutter) 3< "$PROG_NAME" +- + # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as + # separate space-separated args. + "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" +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 99455ae64..f5b0cb59c 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +@@ -301,13 +301,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + } + + _checkFlutterCopy(); +- 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/beta/move-cache.patch b/pkgs/development/compilers/flutter/patches/beta/move-cache.patch new file mode 100644 index 00000000000..4672d4c625d --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/beta/move-cache.patch @@ -0,0 +1,63 @@ +diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart +index 8e511eefd..fbc7d6ac3 100644 +--- a/dev/devicelab/lib/framework/runner.dart ++++ b/dev/devicelab/lib/framework/runner.dart +@@ -126,7 +126,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 79b06949f..9040ba0a8 100644 +--- a/packages/flutter_tools/lib/src/asset.dart ++++ b/packages/flutter_tools/lib/src/asset.dart +@@ -6,6 +6,7 @@ import 'dart:async'; + + import 'package:yaml/yaml.dart'; + ++import 'base/common.dart'; + import 'base/context.dart'; + import 'base/file_system.dart'; + import 'base/utils.dart'; +@@ -325,7 +326,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { + for (final Map<dynamic, dynamic> font in family['fonts']) { + 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, + )); +diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart +index 715189938..5afb2a0db 100644 +--- a/packages/flutter_tools/lib/src/cache.dart ++++ b/packages/flutter_tools/lib/src/cache.dart +@@ -189,8 +189,14 @@ 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) { +@@ -290,7 +296,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/stable/disable-auto-update.patch new file mode 100644 index 00000000000..16fe504595f --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/stable/disable-auto-update.patch @@ -0,0 +1,31 @@ +diff --git a/bin/flutter b/bin/flutter +index 3955f8f39..1e7573d30 100755 +--- a/bin/flutter ++++ b/bin/flutter +@@ -185,8 +185,6 @@ fi + # FLUTTER_TOOL_ARGS="--enable-asserts $FLUTTER_TOOL_ARGS" + # FLUTTER_TOOL_ARGS="$FLUTTER_TOOL_ARGS --observe=65432" + +-(upgrade_flutter) 3< "$PROG_NAME" +- + # FLUTTER_TOOL_ARGS isn't quoted below, because it is meant to be considered as + # separate space-separated args. + "$DART" --packages="$FLUTTER_TOOLS_DIR/.packages" $FLUTTER_TOOL_ARGS "$SNAPSHOT_PATH" "$@" +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 5e45819d9..ab748b059 100644 +--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart ++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart +@@ -377,13 +377,6 @@ class FlutterCommandRunner extends CommandRunner<void> { + } + + _checkFlutterCopy(); +- try { +- await FlutterVersion.instance.ensureVersionFile(); +- } on FileSystemException catch (e) { +- printError('Failed to write the version file to the artifact cache: "$e".'); +- printError('Please ensure you have permissions in the artifact cache directory.'); +- throwToolExit('Failed to write the version file'); +- } + if (topLevelResults.command?.name != 'upgrade' && topLevelResults['version-check'] as bool) { + await FlutterVersion.instance.checkFlutterVersionFreshness(); + } diff --git a/pkgs/development/compilers/flutter/patches/stable/move-cache.patch b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch new file mode 100644 index 00000000000..e5719a2867f --- /dev/null +++ b/pkgs/development/compilers/flutter/patches/stable/move-cache.patch @@ -0,0 +1,63 @@ +diff --git a/dev/devicelab/lib/framework/runner.dart b/dev/devicelab/lib/framework/runner.dart +index 9fae74726..d88d6ecbb 100644 +--- a/dev/devicelab/lib/framework/runner.dart ++++ b/dev/devicelab/lib/framework/runner.dart +@@ -126,7 +126,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(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 e6216c737..5ab497092 100644 +--- a/packages/flutter_tools/lib/src/asset.dart ++++ b/packages/flutter_tools/lib/src/asset.dart +@@ -6,6 +6,7 @@ import 'dart:async'; + + import 'package:yaml/yaml.dart'; + ++import 'base/common.dart'; + import 'base/context.dart'; + import 'base/file_system.dart'; + import 'base/platform.dart'; +@@ -326,7 +327,7 @@ List<_Asset> _getMaterialAssets(String fontSet) { + for (Map<dynamic, dynamic> font in family['fonts']) { + final Uri entryUri = fs.path.toUri(font['asset'] as String); + result.add(_Asset( +- baseDir: fs.path.join(Cache.flutterRoot, 'bin', 'cache', 'artifacts', 'material_fonts'), ++ baseDir: fs.path.join(homeDirPath, '.cache', 'flutter', 'artifacts', 'material_fonts'), + relativeUri: Uri(path: entryUri.pathSegments.last), + entryUri: entryUri, + )); +diff --git a/packages/flutter_tools/lib/src/cache.dart b/packages/flutter_tools/lib/src/cache.dart +index 5e1950b56..45585f9c0 100644 +--- a/packages/flutter_tools/lib/src/cache.dart ++++ b/packages/flutter_tools/lib/src/cache.dart +@@ -164,8 +164,14 @@ class Cache { + return; + } + assert(_lock == null); ++ ++ final Directory dir = fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter')); ++ if (!dir.existsSync()) { ++ dir.createSync(recursive: true); ++ os.chmod(dir, '755'); ++ } + final File lockFile = +- fs.file(fs.path.join(flutterRoot, 'bin', 'cache', 'lockfile')); ++ fs.file(fs.path.join(homeDirPath, '.cache', 'flutter', 'lockfile')); + try { + _lock = lockFile.openSync(mode: FileMode.write); + } on FileSystemException catch (e) { +@@ -239,7 +245,7 @@ class Cache { + if (_rootOverride != null) { + return fs.directory(fs.path.join(_rootOverride.path, 'bin', 'cache')); + } else { +- return fs.directory(fs.path.join(flutterRoot, 'bin', 'cache')); ++ return fs.directory(fs.path.join(homeDirPath, '.cache', 'flutter')); + } + } + diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index cf13ab6f595..f160150d8b5 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "fpc-2.6.0-binary"; + name = "fpc-3.0.0-binary"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.i386-linux.tar"; - sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf"; + url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.i386-linux.tar"; + sha256 = "0h3f1dgs1zsx7vvk9kg67anjvgw5sslfbmjblif7ishbcp3k3g5k"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "mirror://sourceforge/project/freepascal/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar"; - sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx"; + url = "mirror://sourceforge/project/freepascal/Linux/3.0.0/fpc-3.0.0.x86_64-linux.tar"; + sha256 = "1m2xx3nda45cb3zidbjgdr8kddd19zk0khvp7xxdlclszkqscln9"; } else throw "Not supported on ${stdenv.hostPlatform.system}."; diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 7bddafc6ff5..42804677dc0 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -3,20 +3,22 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { - version = "3.0.0"; + version = "3.0.4"; pname = "fpc"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "1v40bjp0kvsi8y0mndqvvhnsqjfssl2w6wpfww51j4rxblfkp4fm"; + sha256 = "0xjyhlhz846jbnp12y68c7nq4xmp4i65akfbrjyf3r62ybk18rgn"; }; buildInputs = [ startFPC gawk ]; + glibc = stdenv.cc.libc.out; preConfigure = if stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux" then '' sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas + sed -e "s@/lib64[^']*@${glibc}/lib@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""; makeFlags = [ "NOGDB=1" "FPC=${startFPC}/bin/fpc" ]; @@ -37,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free Pascal Compiler from a source distribution"; - homepage = https://www.freepascal.org; + homepage = "https://www.freepascal.org"; maintainers = [ maintainers.raskin ]; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 1b3f4d168ee..923d8d34251 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { pname = "lazarus"; - version = "1.8.4"; + version = "2.0.6"; src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"; - sha256 = "1s8hdip973fc1lynklddl0mvg2jd2lzkfk8hzb8jlchs6jn0362s"; + sha256 = "0v1ax6039nm2bksh646znrkah20ak2zmhaz5p3mz2p60y2qazkc2"; }; buildInputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lazarus graphical IDE for FreePascal language"; - homepage = http://www.lazarus.freepascal.org; + homepage = "http://www.lazarus.freepascal.org"; license = licenses.gpl2Plus ; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/compilers/fsharp/default.nix b/pkgs/development/compilers/fsharp/default.nix index bcb95d9ca90..0c60403a6be 100644 --- a/pkgs/development/compilers/fsharp/default.nix +++ b/pkgs/development/compilers/fsharp/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "A functional CLI language"; - homepage = https://fsharp.org/; + homepage = "https://fsharp.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/fsharp41/default.nix b/pkgs/development/compilers/fsharp41/default.nix index e497deb2e87..8a4fa303937 100644 --- a/pkgs/development/compilers/fsharp41/default.nix +++ b/pkgs/development/compilers/fsharp41/default.nix @@ -117,7 +117,7 @@ EOF meta = { description = "A functional CLI language"; - homepage = https://fsharp.org/; + homepage = "https://fsharp.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 533140631a5..b8864584ee6 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ML-like functional programming language aimed at program verification"; - homepage = https://www.fstar-lang.org; + homepage = "https://www.fstar-lang.org"; license = licenses.asl20; platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/compilers/gavrasm/default.nix b/pkgs/development/compilers/gavrasm/default.nix index 92781d79cc7..58e8b45b61a 100644 --- a/pkgs/development/compilers/gavrasm/default.nix +++ b/pkgs/development/compilers/gavrasm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.avr-asm-tutorial.net/gavrasm; + homepage = "http://www.avr-asm-tutorial.net/gavrasm"; description = "AVR Assembler for ATMEL AVR-Processors"; license = licenses.unfree; maintainers = with maintainers; [ mafo ]; diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index ef697b74bbe..7e8870cf2e2 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -89,7 +89,7 @@ let majorVersion = "4"; # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a # binary distribution here to allow the whole chain to be bootstrapped. javaAntlr = fetchurl { - url = https://www.antlr.org/download/antlr-4.4-complete.jar; + url = "https://www.antlr.org/download/antlr-4.4-complete.jar"; sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; }; @@ -278,7 +278,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 270d118f97e..dd448ccbe5f 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -100,7 +100,7 @@ let majorVersion = "4"; # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a # binary distribution here to allow the whole chain to be bootstrapped. javaAntlr = fetchurl { - url = https://www.antlr.org/download/antlr-4.4-complete.jar; + url = "https://www.antlr.org/download/antlr-4.4-complete.jar"; sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; }; @@ -289,7 +289,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index b1a981cfdf7..1adffa8174e 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -82,7 +82,7 @@ let majorVersion = "6"; # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a # binary distribution here to allow the whole chain to be bootstrapped. javaAntlr = fetchurl { - url = https://www.antlr.org/download/antlr-4.4-complete.jar; + url = "https://www.antlr.org/download/antlr-4.4-complete.jar"; sha256 = "02lda2imivsvsis8rnzmbrbp8rh1kb8vmq4i67pqhkwz7lf8y6dz"; }; @@ -302,7 +302,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index 22d772cff6d..2ae2f8e758c 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -260,7 +260,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 58248093d24..c2edba0ba90 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -247,7 +247,7 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index f660a59a790..a6ba8c9c0f6 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -43,7 +43,7 @@ with stdenv.lib; with builtins; let majorVersion = "9"; - version = "${majorVersion}.2.0"; + version = "${majorVersion}.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -76,7 +76,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-${version}.tar.xz"; - sha256 = "01mj3yk7z49i49168hg2cg7qs4bsccrrnv7pjmbdlf8j2a7z0vpa"; + sha256 = "1la2yy27ziasyf0jvzk58y1i5b5bq2h176qil550bxhifs39gqbi"; }; inherit patches; @@ -245,14 +245,8 @@ stdenv.mkDerivation ({ inherit (stdenv) is64bit; - # In this particular combination it stopped creating lib output at all. - # TODO: perhaps find a better fix? (ideally understand what's going on) - postFixup = if crossStageStatic && targetPlatform.isMusl && targetPlatform.is32bit - then ''mkdir "$lib"'' - else null; - meta = { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ description = "GNU Compiler Collection, version ${version}" + (if stripped then "" else " (with debugging info)"); diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index b153687980a..22a21e5b25c 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -201,11 +201,11 @@ postConfigure() { preInstall() { + mkdir -p "$out/${targetConfig}/lib" + mkdir -p "$lib/${targetConfig}/lib" # Make ‘lib64’ symlinks to ‘lib’. if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p "$out/${targetConfig}/lib" ln -s lib "$out/${targetConfig}/lib64" - mkdir -p "$lib/${targetConfig}/lib" ln -s lib "$lib/${targetConfig}/lib64" fi } diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index e3c2d0e09de..a8a1bf9fc1b 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; patches = [(fetchurl { - url = https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-lisp/gcl/files/gcl-2.6.12-gcc5.patch"; sha256 = "00jbsn0qp8ki2w7dx8caha7g2hr9076xa6bg48j3qqqncff93zdh"; })]; diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index e90e0dc3d98..c90666d3dbe 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "The Forth implementation of the GNU project"; - homepage = https://www.gnu.org/software/gforth/; + homepage = "https://www.gnu.org/software/gforth/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index dba715285b1..d449fef8020 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -149,15 +149,21 @@ stdenv.mkDerivation (rec { # TODO(@Ericson2314): Always pass "--target" and always prefix. configurePlatforms = [ "build" "host" ] ++ stdenv.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 (libffi != null) [ + "--with-system-libffi" + "--with-ffi-includes=${targetPackages.libffi.dev}/include" + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" ] ++ stdenv.lib.optionals useLdGold [ @@ -221,7 +227,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 4bebd63956e..7f8e09aa782 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; patches = [(fetchpatch { - url = "https://git.haskell.org/hsc2hs.git/patch/738f3666c878ee9e79c3d5e819ef8b3460288edf"; + url = "https://github.com/haskell/hsc2hs/commit/738f3666c878ee9e79c3d5e819ef8b3460288edf.diff"; sha256 = "0plzsbfaq6vb1023lsarrjglwgr9chld4q3m99rcfzx0yx5mibp3"; extraPrefix = "utils/hsc2hs/"; stripLen = 1; @@ -112,7 +112,7 @@ stdenv.mkDerivation (rec { }) ++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch ++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch { - url = "https://git.haskell.org/ghc.git/patch/d8495549ba9d194815c2d0eaee6797fc7c00756a"; + url = "https://github.com/ghc/ghc/commit/d8495549ba9d194815c2d0eaee6797fc7c00756a.diff"; sha256 = "1yjcma507c609bcim4rnxq0gaj2dg4d001jklmbpbqpzqzxkn5sz"; }); @@ -241,7 +241,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.6.3-binary.nix b/pkgs/development/compilers/ghc/8.6.5-binary.nix index fe576186b0e..97793d91289 100644 --- a/pkgs/development/compilers/ghc/8.6.3-binary.nix +++ b/pkgs/development/compilers/ghc/8.6.5-binary.nix @@ -1,12 +1,15 @@ { stdenv , fetchurl, perl, gcc , ncurses5, gmp, glibc, libiconv +, llvmPackages }: # Prebuilt only does native assert stdenv.targetPlatform == stdenv.hostPlatform; let + useLLVM = !stdenv.targetPlatform.isx86; + libPath = stdenv.lib.makeLibraryPath ([ ncurses5 gmp ] ++ stdenv.lib.optional (stdenv.hostPlatform.isDarwin) libiconv); @@ -24,27 +27,33 @@ let in stdenv.mkDerivation rec { - version = "8.6.3"; + version = "8.6.5"; name = "ghc-${version}-binary"; + # https://downloads.haskell.org/~ghc/8.6.5/ src = fetchurl ({ i686-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb8-linux.tar.xz"; - sha256 = "0bw8a7fxcbskf93rb4m542ff66vrmx5i5kj77qx37cbhijx70w5m"; + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; + sha256 = "1p2h29qghql19ajk755xa0yxkn85slbds8m9n5196ris743vkp8w"; }; x86_64-linux = { - url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb8-linux.tar.xz"; - sha256 = "1m9gaga2pzi2cx5gvasg0rx1dlvr68gmi20l67652kag6xjsa719"; + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-deb9-linux.tar.xz"; + sha256 = "1pqlx6rdjs2110g0y1i9f8x18lmdizibjqd15f5xahcz39hgaxdw"; + }; + aarch64-linux = { + url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-aarch64-ubuntu18.04-linux.tar.xz"; + sha256 = "11n7l2a36i5vxzzp85la2555q4m34l747g0pnmd81cp46y85hlhq"; }; x86_64-darwin = { url = "http://haskell.org/ghc/dist/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "1hbzk57v45176kxcx848p5jn5p1xbp2129ramkbzsk6plyhnkl3r"; + sha256 = "0s9188vhhgf23q3rjarwhbr524z6h2qga5xaaa2pma03sfqvvhfz"; }; }.${stdenv.hostPlatform.system} or (throw "cannot bootstrap GHC on this platform")); nativeBuildInputs = [ perl ]; + propagatedBuildInputs = stdenv.lib.optionals useLLVM [ llvmPackages.llvm ]; # Cannot patchelf beforehand due to relative RPATHs that anticipate # the final install location/ @@ -168,5 +177,5 @@ stdenv.mkDerivation rec { }; meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + 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 e276d9b12b9..ccc10628b53 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -244,7 +244,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index cc9dab51df7..58b1cf46880 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -221,7 +221,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index 0f9fd7731d3..d80ba0d1b90 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -227,7 +227,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index e4ece9b8d8c..e98b805c533 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -227,7 +227,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2dd7d5f30c4..541854e8796 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -231,7 +231,7 @@ stdenv.mkDerivation (rec { }; meta = { - homepage = http://haskell.org/ghc; + homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; inherit (ghc.meta) license platforms; diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/development/compilers/gnu-cobol/default.nix index df5202cb1c2..c5e42c3afe8 100644 --- a/pkgs/development/compilers/gnu-cobol/default.nix +++ b/pkgs/development/compilers/gnu-cobol/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source COBOL compiler"; - homepage = https://sourceforge.net/projects/open-cobol/; + homepage = "https://sourceforge.net/projects/open-cobol/"; license = licenses.gpl3; maintainers = with maintainers; [ ericsagnes the-kenny ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 1035091654a..f48cd6dfa1b 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { course), as well as under Windows. Smalltalk is a dynamic object-oriented language, well-versed to scripting tasks. ''; - homepage = http://smalltalk.gnu.org/; + homepage = "http://smalltalk.gnu.org/"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; maintainers = with maintainers; [ skeidel ]; diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix index 35bcfa36e99..65e97d4e929 100644 --- a/pkgs/development/compilers/go/1.12.nix +++ b/pkgs/development/compilers/go/1.12.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; @@ -239,7 +238,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "1.12"; - homepage = http://golang.org/; + homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs Frostman ]; diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index aa881273032..8fee93cc4ab 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; @@ -236,7 +235,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "1.13"; - homepage = http://golang.org/; + homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index 3651b936116..475f03689ca 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -43,8 +43,7 @@ stdenv.mkDerivation rec { ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; @@ -236,7 +235,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "1.14"; - homepage = http://golang.org/; + homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 0dd852a1ef1..fc3fb0ad0e5 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ pcre ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin Security; + depsTargetTargetPropagated = lib.optional stdenv.isDarwin Security; hardeningDisable = [ "all" ]; @@ -155,7 +155,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "1.4"; - homepage = http://golang.org/; + homepage = "http://golang.org/"; description = "The Go Programming language"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/development/compilers/gprolog/default.nix b/pkgs/development/compilers/gprolog/default.nix index b823bf9bdd4..0a1cc512873 100644 --- a/pkgs/development/compilers/gprolog/default.nix +++ b/pkgs/development/compilers/gprolog/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://www.gnu.org/software/gprolog/; + 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; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index b3066b3098c..960f2926467 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -116,31 +116,31 @@ let }; jvmci8-mxcache = [ - rec { sha1 = "53addc878614171ff0fcbc8f78aed12175c22cdb"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4.jar; } - rec { sha1 = "9bd1fa334d941005bc9ab3ac92478a590f5b7d73"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4-sources.jar; } - rec { sha1 = "e5ca9511493b7e3bc2cabdb8ded92e855f3aac32"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4.jar; } - rec { sha1 = "eb61e479b35b467954f28a565c094c563b790e19"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.sources.jar"; url = mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4-sources.jar; } - rec { sha1 = "869021a6d90cfb008b12e83fccbe42eca29e5355"; name = "JACOCOAGENT_0.8.4_${sha1}/jacocoagent-0.8.4.jar"; url = mirror://maven/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-runtime.jar; } - rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar; } - rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar; } - rec { sha1 = "fa29aa438674ff19d5e1386d2c3527a0267f291e"; name = "ASM_7.1_${sha1}/asm-7.1.jar"; url = mirror://maven/org/ow2/asm/asm/7.1/asm-7.1.jar; } - rec { sha1 = "9d170062d595240da35301362b079e5579c86f49"; name = "ASM_7.1_${sha1}/asm-7.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm/7.1/asm-7.1-sources.jar; } - rec { sha1 = "a3662cf1c1d592893ffe08727f78db35392fa302"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.jar"; url = mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar; } - rec { sha1 = "157238292b551de8680505fa2d19590d136e25b9"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1-sources.jar; } - rec { sha1 = "379e0250f7a4a42c66c5e94e14d4c4491b3c2ed3"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar; } - rec { sha1 = "36789198124eb075f1a5efa18a0a7812fb16f47f"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1-sources.jar; } - rec { sha1 = "431dc677cf5c56660c1c9004870de1ed1ea7ce6c"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.jar"; url = mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar; } - rec { sha1 = "a62ff3ae6e37affda7c6fb7d63b89194c6d006ee"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1-sources.jar; } - rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar; } - rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar; } - rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar; } - rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar; } - rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar; } - rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar; } - rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12.jar; } - rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = mirror://maven/junit/junit/4.12/junit-4.12-sources.jar; } - rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; } - rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar; } + rec { sha1 = "53addc878614171ff0fcbc8f78aed12175c22cdb"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4.jar"; } + rec { sha1 = "9bd1fa334d941005bc9ab3ac92478a590f5b7d73"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.sources.jar"; url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4-sources.jar"; } + rec { sha1 = "e5ca9511493b7e3bc2cabdb8ded92e855f3aac32"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4.jar"; } + rec { sha1 = "eb61e479b35b467954f28a565c094c563b790e19"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.sources.jar"; url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4-sources.jar"; } + rec { sha1 = "869021a6d90cfb008b12e83fccbe42eca29e5355"; name = "JACOCOAGENT_0.8.4_${sha1}/jacocoagent-0.8.4.jar"; url = "mirror://maven/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-runtime.jar"; } + rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar"; url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"; } + rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar"; url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar"; } + rec { sha1 = "fa29aa438674ff19d5e1386d2c3527a0267f291e"; name = "ASM_7.1_${sha1}/asm-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1.jar"; } + rec { sha1 = "9d170062d595240da35301362b079e5579c86f49"; name = "ASM_7.1_${sha1}/asm-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1-sources.jar"; } + rec { sha1 = "a3662cf1c1d592893ffe08727f78db35392fa302"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar"; } + rec { sha1 = "157238292b551de8680505fa2d19590d136e25b9"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1-sources.jar"; } + rec { sha1 = "379e0250f7a4a42c66c5e94e14d4c4491b3c2ed3"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar"; } + rec { sha1 = "36789198124eb075f1a5efa18a0a7812fb16f47f"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1-sources.jar"; } + rec { sha1 = "431dc677cf5c56660c1c9004870de1ed1ea7ce6c"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar"; } + rec { sha1 = "a62ff3ae6e37affda7c6fb7d63b89194c6d006ee"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1-sources.jar"; } + rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar"; url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar"; } + rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar"; url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar"; } + rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar"; } + rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar"; } + rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar"; } + rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar"; } + rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar"; url = "mirror://maven/junit/junit/4.12/junit-4.12.jar"; } + rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar"; url = "mirror://maven/junit/junit/4.12/junit-4.12-sources.jar"; } + rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; } + rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"; } rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } ] ++ lib.optionals stdenv.isLinux [ rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; } @@ -151,59 +151,59 @@ let graal-mxcache = jvmci8-mxcache ++ [ # rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz; } - rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_COMPILER_RT_LINUX_${sha1}/llvm-org-compiler-rt-linux.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz; } - rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar; } - rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar; } - rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar; } - rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar; } + rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_COMPILER_RT_LINUX_${sha1}/llvm-org-compiler-rt-linux.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } + rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar"; } + rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar"; } + rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar"; url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar"; } + rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar"; } rec { sha1 = "702ca2d0ae93841c5ab75e4d119b29780ec0b7d9"; name = "NINJA_SYNTAX_${sha1}/ninja-syntax.tar.gz"; url = "https://pypi.org/packages/source/n/ninja_syntax/ninja_syntax-1.7.2.tar.gz"; } - rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar; } - rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; } - rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar"; url = mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar; } - rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar"; url = mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar; } - rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar; } - rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; } - rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar; } - rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_SOURCES_${sha1}/libffi-sources.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz; } - rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; } - rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar; } - rec { sha1 = "8dc5a90bed5f51d7538d05b8c31c31b7dfddbd66"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20.tar.gz; } - rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar; } - rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar"; url = mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar; } + rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar"; url = "mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar"; } + rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = "mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar"; } + rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar"; url = "mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar"; } + rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar"; url = "mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar"; } + rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar"; url = "mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar"; } + rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = "mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar"; } + rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar"; } + rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_SOURCES_${sha1}/libffi-sources.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz"; } + rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar"; } + rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar"; } + rec { sha1 = "8dc5a90bed5f51d7538d05b8c31c31b7dfddbd66"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20.tar.gz"; } + rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar"; url = "mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar"; } + rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar"; url = "mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar"; } # This duplication of asm with underscore and minus is totally weird - rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar; } - rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar; } - rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar; } - rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar; } - rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar; } - rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar; } - rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar; } - rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar; } + rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar"; } + rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar"; } + rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar"; } + rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar"; } + rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar"; } + rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar"; } + rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar"; } + rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar"; } # From here on the deps are new - rec { sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.jar"; url = mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1.jar; } - rec { sha1 = "c9f7246bf93bb0dc7fe9e7c9eca531a8fb98d252"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.sources.jar"; url = mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1-sources.jar; } - rec { sha1 = "4b52bd03014f6d080ef0528865c1ee50621e35c6"; name = "NETBEANS_PROFILER_${sha1}/netbeans-profiler.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/org-netbeans-lib-profiler-8.2-201609300101.jar; } - rec { sha1 = "b5840706cc8ce639fcafeab1bc61da2d8aa37afd"; name = "NASHORN_INTERNAL_TESTS_${sha1}/nashorn-internal-tests.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/nashorn-internal-tests-700f5e3f5ff2.jar; } - rec { sha1 = "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5"; name = "JACKSON_ANNOTATIONS_${sha1}/jackson-annotations.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-annotations/2.8.6/jackson-annotations-2.8.6.jar; } - rec { sha1 = "2ef7b1cc34de149600f5e75bc2d5bf40de894e60"; name = "JACKSON_CORE_${sha1}/jackson-core.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar; } - rec { sha1 = "c43de61f74ecc61322ef8f402837ba65b0aa2bf4"; name = "JACKSON_DATABIND_${sha1}/jackson-databind.jar"; url = mirror://maven/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar; } - rec { sha1 = "2838952e91baa37ac73ed817451268a193ba440a"; name = "JCODINGS_${sha1}/jcodings.jar"; url = mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40.jar; } - rec { sha1 = "0ed89e096c83d540acac00d6ee3ea935b4c905ff"; name = "JCODINGS_${sha1}/jcodings.sources.jar"; url = mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40-sources.jar; } - rec { sha1 = "5dbb09787a9b8780737b71fbf942235ef59051b9"; name = "JONI_${sha1}/joni.jar"; url = mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25.jar; } - rec { sha1 = "505a09064f6e2209616f38724f6d97d8d889aa92"; name = "JONI_${sha1}/joni.sources.jar"; url = mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25-sources.jar; } - rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar"; url = mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar; } - rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz"; url = http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz; } - rec { sha1 = "90aa8308da72ae610207d8f6ca27736921be692a"; name = "ANTLR4_COMPLETE_${sha1}/antlr4-complete.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7.1-complete.jar; }] ++ + rec { sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.jar"; url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1.jar"; } + rec { sha1 = "c9f7246bf93bb0dc7fe9e7c9eca531a8fb98d252"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.sources.jar"; url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1-sources.jar"; } + rec { sha1 = "4b52bd03014f6d080ef0528865c1ee50621e35c6"; name = "NETBEANS_PROFILER_${sha1}/netbeans-profiler.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/org-netbeans-lib-profiler-8.2-201609300101.jar"; } + rec { sha1 = "b5840706cc8ce639fcafeab1bc61da2d8aa37afd"; name = "NASHORN_INTERNAL_TESTS_${sha1}/nashorn-internal-tests.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/nashorn-internal-tests-700f5e3f5ff2.jar"; } + rec { sha1 = "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5"; name = "JACKSON_ANNOTATIONS_${sha1}/jackson-annotations.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-annotations/2.8.6/jackson-annotations-2.8.6.jar"; } + rec { sha1 = "2ef7b1cc34de149600f5e75bc2d5bf40de894e60"; name = "JACKSON_CORE_${sha1}/jackson-core.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar"; } + rec { sha1 = "c43de61f74ecc61322ef8f402837ba65b0aa2bf4"; name = "JACKSON_DATABIND_${sha1}/jackson-databind.jar"; url = "mirror://maven/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar"; } + rec { sha1 = "2838952e91baa37ac73ed817451268a193ba440a"; name = "JCODINGS_${sha1}/jcodings.jar"; url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40.jar"; } + rec { sha1 = "0ed89e096c83d540acac00d6ee3ea935b4c905ff"; name = "JCODINGS_${sha1}/jcodings.sources.jar"; url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40-sources.jar"; } + rec { sha1 = "5dbb09787a9b8780737b71fbf942235ef59051b9"; name = "JONI_${sha1}/joni.jar"; url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25.jar"; } + rec { sha1 = "505a09064f6e2209616f38724f6d97d8d889aa92"; name = "JONI_${sha1}/joni.sources.jar"; url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25-sources.jar"; } + rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar"; url = "mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar"; } + rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz"; url = "http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz"; } + rec { sha1 = "90aa8308da72ae610207d8f6ca27736921be692a"; name = "ANTLR4_COMPLETE_${sha1}/antlr4-complete.jar"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7.1-complete.jar"; }] ++ lib.optionals stdenv.isLinux [ - rec { sha1 = "df4c1f784294d02a82d78664064248283bfcc297"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz; } - rec { sha1 = "344483aefa15147c121a8fb6fb35a2406768cc5c"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-linux-x86_64.jar; } - rec { sha1 = "fd1a723d62cbbc591041d303e8b151d89f131643"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-linux-amd64.tar.gz; } + rec { sha1 = "df4c1f784294d02a82d78664064248283bfcc297"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } + rec { sha1 = "344483aefa15147c121a8fb6fb35a2406768cc5c"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-linux-x86_64.jar"; } + rec { sha1 = "fd1a723d62cbbc591041d303e8b151d89f131643"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-linux-amd64.tar.gz"; } rec { sha1 = "987234c4ce45505c21302e097c24efef4873325c"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip"; isNinja = true; }] ++ lib.optionals stdenv.isDarwin [ - rec { sha1 = "0fa1af180755fa4cc018ee9be33f2d7d827593c4"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-darwin-amd64.tar.gz; } - rec { sha1 = "57bc74574104a9e0a2dc4d7a71ffcc5731909e57"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-macosx-x86_64.jar; } - rec { sha1 = "ae23bb365930f720acc88c62640bae6852a37d67"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-macosx-x86_64.tar.gz; } + rec { sha1 = "0fa1af180755fa4cc018ee9be33f2d7d827593c4"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-darwin-amd64.tar.gz"; } + rec { sha1 = "57bc74574104a9e0a2dc4d7a71ffcc5731909e57"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-macosx-x86_64.jar"; } + rec { sha1 = "ae23bb365930f720acc88c62640bae6852a37d67"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-macosx-x86_64.tar.gz"; } rec { sha1 = "8142c497f7dfbdb052a1e31960fdfe2c6f9a5ca2"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip"; isNinja = true; }]; @@ -225,7 +225,7 @@ let findbugs = fetchzip { name = "findbugs-3.0.0"; - url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip; + url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip"; sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m"; }; @@ -271,7 +271,7 @@ in rec { --set FINDBUGS_HOME ${findbugs} ''; meta = with stdenv.lib; { - homepage = https://github.com/graalvm/mx; + homepage = "https://github.com/graalvm/mx"; description = "Command-line tool used for the development of Graal projects"; license = licenses.gpl2; platforms = python27.meta.platforms; @@ -528,7 +528,7 @@ in rec { passthru.home = graalvm8; meta = with stdenv.lib; { - homepage = https://github.com/oracle/graal; + homepage = "https://github.com/oracle/graal"; description = "High-Performance Polyglot VM"; license = licenses.gpl2; maintainers = with maintainers; [ volth hlolli ]; diff --git a/pkgs/development/compilers/graalvm/enterprise-edition.nix b/pkgs/development/compilers/graalvm/enterprise-edition.nix index f8271baa588..5a6c9650764 100644 --- a/pkgs/development/compilers/graalvm/enterprise-edition.nix +++ b/pkgs/development/compilers/graalvm/enterprise-edition.nix @@ -160,7 +160,7 @@ let passthru.home = graalvmXXX-ee; meta = with stdenv.lib; { - homepage = https://www.graalvm.org/; + homepage = "https://www.graalvm.org/"; description = "High-Performance Polyglot VM"; license = licenses.unfree; maintainers = with maintainers; [ volth hlolli ]; diff --git a/pkgs/development/compilers/gwt/2.4.0.nix b/pkgs/development/compilers/gwt/2.4.0.nix index f15e1060203..14bf940fadf 100644 --- a/pkgs/development/compilers/gwt/2.4.0.nix +++ b/pkgs/development/compilers/gwt/2.4.0.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.gwtproject.org/; + 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; diff --git a/pkgs/development/compilers/haxe/default.nix b/pkgs/development/compilers/haxe/default.nix index 5329cf59aa3..a3110c0c1af 100644 --- a/pkgs/development/compilers/haxe/default.nix +++ b/pkgs/development/compilers/haxe/default.nix @@ -11,7 +11,7 @@ let buildInputs = [ocaml zlib pcre neko camlp4]; src = fetchgit { - url = https://github.com/HaxeFoundation/haxe.git; + url = "https://github.com/HaxeFoundation/haxe.git"; inherit sha256; fetchSubmodules = true; rev = "refs/tags/${version}"; @@ -76,7 +76,7 @@ let meta = with stdenv.lib; { description = "Programming language targeting JavaScript, Flash, NekoVM, PHP, C++"; - homepage = https://haxe.org; + homepage = "https://haxe.org"; license = with licenses; [ gpl2 bsd2 /*?*/ ]; # -> docs/license.txt maintainers = [ maintainers.marcweber ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/compilers/hop/default.nix b/pkgs/development/compilers/hop/default.nix index 3db916e6003..f63f4169bc3 100644 --- a/pkgs/development/compilers/hop/default.nix +++ b/pkgs/development/compilers/hop/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-tier programming language for the Web 2.0 and the so-called diffuse Web"; - homepage = http://hop.inria.fr/; + homepage = "http://hop.inria.fr/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/compilers/iasl/default.nix b/pkgs/development/compilers/iasl/default.nix index 1e7a46e7807..d68fba1d624 100644 --- a/pkgs/development/compilers/iasl/default.nix +++ b/pkgs/development/compilers/iasl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Intel ACPI Compiler"; - homepage = http://www.acpica.org/; + homepage = "http://www.acpica.org/"; license = stdenv.lib.licenses.iasl; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/inform7/default.nix b/pkgs/development/compilers/inform7/default.nix index 2a6551aad18..62bd0142f32 100644 --- a/pkgs/development/compilers/inform7/default.nix +++ b/pkgs/development/compilers/inform7/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A design system for interactive fiction."; - homepage = http://inform7.com/; + homepage = "http://inform7.com/"; license = licenses.artistic2; maintainers = with maintainers; [ mbbx6spp ]; platforms = platforms.unix; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index 3e10041c5c8..e3dfa8ea324 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.3151"; + version = "1.0.3627"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1c2ll563a2j4sv3r468i4lv158hkzywnyajyk7iyin7bhqhm2vzf"; + sha256 = "1x9fjvf7rbhil09am2v9j2jhwysdvwgshf9zidbirjgfrqn573h8"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/intel-graphics-compiler; + homepage = "https://github.com/intel/intel-graphics-compiler"; description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/compilers/intercal/default.nix b/pkgs/development/compilers/intercal/default.nix index d890dc0fdfa..8b91e3f2c6d 100644 --- a/pkgs/development/compilers/intercal/default.nix +++ b/pkgs/development/compilers/intercal/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { languages. The language largely succeeds in this goal, apart from its use of an assignment statement. ''; - homepage = http://www.catb.org/~esr/intercal/; + homepage = "http://www.catb.org/~esr/intercal/"; license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index c6431363ae6..022651a3c0e 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://ispc.github.io/ ; + homepage = "https://ispc.github.io/"; description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; license = licenses.bsd3; platforms = ["x86_64-linux" "x86_64-darwin"]; # TODO: buildable on more platforms? diff --git a/pkgs/development/compilers/javacard-devkit/default.nix b/pkgs/development/compilers/javacard-devkit/default.nix index f49d3d6e210..5b691530d34 100644 --- a/pkgs/development/compilers/javacard-devkit/default.nix +++ b/pkgs/development/compilers/javacard-devkit/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { converter -applet [AppletAID] [MyApplet] [myPackage] [PackageAID] [Version] For more details, please refer to the documentation by Oracle ''; - homepage = https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html; + homepage = "https://www.oracle.com/technetwork/java/embedded/javacard/overview/index.html"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.ekleog ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix index bc850a53c51..2d28954b221 100644 --- a/pkgs/development/compilers/jsonnet/default.nix +++ b/pkgs/development/compilers/jsonnet/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "Purely-functional configuration language that helps you define JSON data"; maintainers = with lib.maintainers; [ benley copumpkin ]; license = lib.licenses.asl20; - homepage = https://github.com/google/jsonnet; + homepage = "https://github.com/google/jsonnet"; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index 5b1300ba240..48034920e28 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = https://julialang.org/; + homepage = "https://julialang.org/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index c706f2facec..ec1818f9989 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation rec { meta = { description = "High-level performance-oriented dynamical language for technical computing"; - homepage = https://julialang.org/; + homepage = "https://julialang.org/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ raskin rob garrison ]; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/jwasm/default.nix b/pkgs/development/compilers/jwasm/default.nix index a9613de91eb..8ce55c75795 100644 --- a/pkgs/development/compilers/jwasm/default.nix +++ b/pkgs/development/compilers/jwasm/default.nix @@ -2,24 +2,30 @@ , cmake }: with stdenv.lib; -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "jwasm"; - version = "git-2017-11-22"; + version = "2.13"; src = fetchFromGitHub { owner = "JWasm"; repo = "JWasm"; - rev = "26f97c8b5c9d9341ec45538701116fa3649b7766"; + rev = version; sha256 = "0m972pc8vk8s9yv1pi85fsjgm6hj24gab7nalw2q04l0359nqi7w"; }; nativeBuildInputs = [ cmake ]; - installPhase = "mkdir -p $out/bin ; cp jwasm $out/bin/"; + installPhase = '' + install -Dpm755 jwasm -t $out/bin/ + install -Dpm644 $src/History.txt $src/Readme.txt \ + $src/Doc/enh.txt $src/Doc/fixes.txt \ + $src/Doc/gencode.txt $src/Doc/overview.txt \ + -t $out/share/doc/jwasm/ + ''; meta = { description = "A MASM-compatible x86 assembler"; - homepage = http://jwasm.github.io/; + homepage = "http://jwasm.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 9a124ad8477..d4f37d4f5cc 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.70"; + version = "1.3.71"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1iw9pjacjdhhvriaz2kzf677csq2nfx66k5cickk79h7ywppi7bh"; + sha256 = "0jp7z2lys02d0wmycdlfg9c08ji4qvjaz2wzvrxjyvcwv7d7gnvs"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index c397d02038d..19fe2981c83 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata -, python, libconfig, lit, gdb, unzip, darwin, bash +, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , bootstrapVersion ? false , version ? "1.17.0" @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja makeWrapper unzip ] ++ stdenv.lib.optionals (!bootstrapVersion) [ - bootstrapLdc python lit + bootstrapLdc lit lit.python ] ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) # https://github.com/NixOS/nixpkgs/issues/57120 @@ -163,7 +163,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The LLVM-based D compiler"; - homepage = https://github.com/ldc-developers/ldc; + homepage = "https://github.com/ldc-developers/ldc"; # from https://github.com/ldc-developers/ldc/blob/master/LICENSE license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; maintainers = with maintainers; [ ThomasMader ]; diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index dfdc9f74e15..51c0cd9ccc3 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -8,7 +8,7 @@ let pname = "clang"; inherit version; - src = fetch "clang" "0ap63qhz0j6m63l4njwp055xni4s71dsxqi1w5d2p93hbswaiiw2"; + src = fetch "clang" "08fbxa2a0kr3ni35ckppj0kyvlcyaywrhpqwcdrdy0z900mhcnw8"; unpackPhase = '' unpackFile $src @@ -95,7 +95,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index 8c870a610cc..02bbc17c967 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "compiler-rt"; inherit version; - src = fetch pname "1g067yx8qz0bmf00b2xqjqaayqj2xvrjp9smms3a16syj9m0hfri"; + src = fetch pname "0x9c531k6ww21s2mkdwqx1vbdjmx6d4wmfb8gdbj0wqa796sczba"; nativeBuildInputs = [ cmake python3 llvm ]; buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; diff --git a/pkgs/development/compilers/llvm/10/default.nix b/pkgs/development/compilers/llvm/10/default.nix index 574ab5ec4e7..462f246b89d 100644 --- a/pkgs/development/compilers/llvm/10/default.nix +++ b/pkgs/development/compilers/llvm/10/default.nix @@ -6,15 +6,14 @@ let release_version = "10.0.0"; - candidate = "rc5"; - version = "10.0.0${candidate}"; # differentiating these is important for rc's + version = release_version; # differentiating these (variables) is important for rc's fetch = name: sha256: fetchurl { - url = "https://prereleases.llvm.org/${release_version}/${candidate}/${name}-${version}.src.tar.xz"; + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}/${name}-${version}.src.tar.xz"; inherit sha256; }; - clang-tools-extra_src = fetch "clang-tools-extra" "0x23q70c0xcwdhj0d66nisr8rqq69qcshrbb4si9pxfsm0zs9h3i"; + clang-tools-extra_src = fetch "clang-tools-extra" "074ija5s2jsdn0k035r2dzmryjmqxdnyg4xwvaqych2bazv8rpxc"; tools = stdenv.lib.makeExtensible (tools: let callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 18eae91d340..f7064bdc452 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++"; inherit version; - src = fetch "libcxx" "0qw85sy3y1mcdrj8yd1j1gmskh0vs4xdgrx80niigizhr7030vxs"; + src = fetch "libcxx" "1isnj78diknh0nvd73mlq8p8g209f9bab2mbysq826bg2wzql3r7"; postUnpack = '' unpackFile ${libcxxabi.src} @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "http://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; diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix index ba51f0f33f1..b3b90687a2a 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { pname = "libc++abi"; inherit version; - src = fetch "libcxxabi" "15iclzxjqfjynqxjg8dahyr0gfg83blv9dm7z9hq5ipxw8x2sglf"; + src = fetch "libcxxabi" "1q8lrbh68a9v4lr88b8xsjpmwx5z96sa5wnkb92xx7ccm1ssq6z7"; nativeBuildInputs = [ cmake ]; buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "http://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 ]; diff --git a/pkgs/development/compilers/llvm/10/libunwind.nix b/pkgs/development/compilers/llvm/10/libunwind.nix index 6016d0536bf..4e55b28c243 100644 --- a/pkgs/development/compilers/llvm/10/libunwind.nix +++ b/pkgs/development/compilers/llvm/10/libunwind.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libunwind"; inherit version; - src = fetch pname "12c2fh63afav8rfmplfs628r74ksfs8fjls655rwjsrg1hk0gy3l"; + src = fetch pname "09n66dl9cc17d81qflj5h1l4garmhvzfi2lhcb7rx00l8z65xp09"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix index ab2dd8caee8..8c66697c67e 100644 --- a/pkgs/development/compilers/llvm/10/lld.nix +++ b/pkgs/development/compilers/llvm/10/lld.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "lld"; inherit version; - src = fetch pname "08zg546872b432qrx49i7k1c2vdq9yjvc7gnrvy2nywv0d2qf9nc"; + src = fetch pname "026pwcbczcg0j5c9h7hxxrn3ki81ia9m9sfn0sy0bvzffv2xg85r"; nativeBuildInputs = [ cmake ]; buildInputs = [ llvm libxml2 ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "http://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index 12cb43bc504..a4816a635e4 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { pname = "lldb"; inherit version; - src = fetch pname "0swv16n7gm12f399f7hxai1jh89s14h3yg7cci10yaiibpvwk73x"; + src = fetch pname "0ddikvc0kbqlqvsypsm9nhfwmyw4prp4rv49f0bgacyh5ssgq7yx"; patches = [ ./lldb-procfs.patch ]; @@ -71,7 +71,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://lldb.llvm.org; + homepage = "http://lldb.llvm.org"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 0405958070a..f36f58d8203 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -31,8 +31,8 @@ in stdenv.mkDerivation (rec { pname = "llvm"; inherit version; - src = fetch pname "1abfi0zqbcwxf68dk00szpjxkcd44589va243af8sg97hljq6709"; - polly_src = fetch "polly" "1fzg5934km69rwam6vgznk0p4slzhr0icwmj3jibw3p93ppa8k9r"; + src = fetch pname "1pwgm6cr0xr5a0hrbqs1zvsvvjvy0yq1y47c96804wcs795s90yz"; + polly_src = fetch "polly" "15sd3dq0w60jsb76pis09lkagj5iy43h9hg4kd9gx5l8cbnsdyrm"; unpackPhase = '' unpackFile $src @@ -161,7 +161,7 @@ in stdenv.mkDerivation (rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix index 1cdd4cc9bba..940f53f4cf7 100644 --- a/pkgs/development/compilers/llvm/10/openmp.nix +++ b/pkgs/development/compilers/llvm/10/openmp.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "openmp"; inherit version; - src = fetch pname "0swif1plz7drjha6rdw02b60symsz95w62wxpiygbpdwsmhbbgam"; + src = fetch pname "1ymd13gj07x0b0vxziygm0p41vrq6nsgx837jqg9ll6h8ndg57rv"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ llvm ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "http://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index e391ce046db..0317271f003 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -83,7 +83,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index b02e09a83a8..5bd3cde2329 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "http://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; diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 1b891af09ed..e3ffc473c34 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "http://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 ]; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index bfee91d91bf..7ab02c1d35c 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "http://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.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 a91a7e4354e..4a0d678cc2a 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 2ce17765d63..1bf86115bc2 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation ({ requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 559377bcc1b..34e6bc64bfd 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "http://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 9374fc0bda9..7139e15d1dc 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -83,7 +83,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 831c6c9c700..40f91c4d6ae 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "http://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; diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index ac1f4f653e6..f8d0d2e0cee 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "http://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 ]; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 58b9b8060fa..e00b71bc33e 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "http://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 30d72d94426..0445dfed47f 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 80acd3fa2fe..e1e40c8456d 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 447904b9ad5..efc5553b1d6 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "http://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 6e01f4259ee..3a43b6b8aee 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -93,7 +93,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index f2cdd2f6f5f..7c2f1e238ba 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "http://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; diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 9067bf43a8f..608351e0eb9 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "http://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 ]; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index 823e9640cf4..3921e70b3e3 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "http://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index ace6ae812fd..81ad0675839 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index d7fb1fe4b93..0ea517e81f4 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -170,7 +170,7 @@ in stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index 7adc2aa588e..69ee58679c4 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "http://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 81a069e6c01..e549713ceca 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -103,7 +103,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 883d9c8776f..97293464645 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "http://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; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 58a1241d823..d8c64f51ee0 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "http://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 ]; diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index fc52d691d03..da5649ef5a2 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "http://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index 75be5b993df..5df6f760a07 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index a9c4a6b0ba2..9bf835027ae 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -145,7 +145,7 @@ in stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 166e7f68eb3..74ec8076e43 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "http://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index d8df52df553..51399ea4598 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -98,7 +98,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index 9e3525574d5..05aaa9fc8e5 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = "http://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; diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix index fbc9a3731ef..583a47da3ff 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = "http://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 ]; diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix index 775dc2e1905..a746b96f30d 100644 --- a/pkgs/development/compilers/llvm/9/lld.nix +++ b/pkgs/development/compilers/llvm/9/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = "http://lld.llvm.org/"; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix index 506fc1c3e50..1ba0339d639 100644 --- a/pkgs/development/compilers/llvm/9/lldb.nix +++ b/pkgs/development/compilers/llvm/9/lldb.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index 2cdc5a5fd06..49ea3be34da 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -162,7 +162,7 @@ in stdenv.mkDerivation (rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix index 4e0a5535ae3..b5699cd1af0 100644 --- a/pkgs/development/compilers/llvm/9/openmp.nix +++ b/pkgs/development/compilers/llvm/9/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = "http://openmp.llvm.org/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/manticore/default.nix b/pkgs/development/compilers/manticore/default.nix index adfde05e658..8d2ad8e6bbc 100644 --- a/pkgs/development/compilers/manticore/default.nix +++ b/pkgs/development/compilers/manticore/default.nix @@ -50,6 +50,6 @@ in stdenv.mkDerivation { parallel array comprehensions. ''; - homepage = http://manticore.cs.uchicago.edu/; + homepage = "http://manticore.cs.uchicago.edu/"; }; } diff --git a/pkgs/development/compilers/matter-compiler/Gemfile.lock b/pkgs/development/compilers/matter-compiler/Gemfile.lock index ab1833b3cfe..230b99d91a6 100644 --- a/pkgs/development/compilers/matter-compiler/Gemfile.lock +++ b/pkgs/development/compilers/matter-compiler/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES matter_compiler BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/compilers/matter-compiler/default.nix b/pkgs/development/compilers/matter-compiler/default.nix index f415fa8c012..89daf7b27eb 100644 --- a/pkgs/development/compilers/matter-compiler/default.nix +++ b/pkgs/development/compilers/matter-compiler/default.nix @@ -12,7 +12,7 @@ bundlerApp { Matter Compiler is a API Blueprint AST Media Types to API Blueprint conversion tool. It composes an API blueprint from its serialzed AST media-type. ''; - homepage = https://github.com/apiaryio/matter_compiler/; + homepage = "https://github.com/apiaryio/matter_compiler/"; license = licenses.mit; maintainers = with maintainers; [ rvlander manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/compilers/mcpp/default.nix b/pkgs/development/compilers/mcpp/default.nix index d7151147933..bf0db4c1f6c 100644 --- a/pkgs/development/compilers/mcpp/default.nix +++ b/pkgs/development/compilers/mcpp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-mcpplib" ]; meta = with stdenv.lib; { - homepage = http://mcpp.sourceforge.net/; + homepage = "http://mcpp.sourceforge.net/"; description = "A portable c preprocessor"; license = licenses.bsd2; platforms = platforms.unix; 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 3869bdad84f..a5c7054c3a6 100644 --- a/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ b/pkgs/development/compilers/meta-environment/meta-build-env/default.nix @@ -1,7 +1,7 @@ {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 ; + url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz"; sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3"; }; diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index c0b53574713..a90076c9ecc 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://protz.github.io/mezzo/; + 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; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/compilers/microscheme/default.nix b/pkgs/development/compilers/microscheme/default.nix index a18202b9f88..ba3e388c399 100644 --- a/pkgs/development/compilers/microscheme/default.nix +++ b/pkgs/development/compilers/microscheme/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://microscheme.org; + homepage = "http://microscheme.org"; description = "A Scheme subset for Atmel microcontrollers"; longDescription = '' Microscheme is a Scheme subset/variant designed for Atmel diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 78cce113e9b..7f5af5e834b 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -19,7 +19,7 @@ crystal.buildCrystalPackage rec { meta = { description = "A refreshing language for the front-end web"; - homepage = https://mint-lang.com/; + homepage = "https://mint-lang.com/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ manveru ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index ef7ad9b3266..b2fa8fba0dd 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { development cycle. ''; - homepage = https://www.gnu.org/software/mit-scheme/; + homepage = "https://www.gnu.org/software/mit-scheme/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix index 405846343cf..baaf978d298 100644 --- a/pkgs/development/compilers/mkcl/default.nix +++ b/pkgs/development/compilers/mkcl/default.nix @@ -40,7 +40,7 @@ with stdenv.lib; stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; - homepage = https://common-lisp.net/project/mkcl/; + homepage = "https://common-lisp.net/project/mkcl/"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ tohl ]; diff --git a/pkgs/development/compilers/mlton/meta.nix b/pkgs/development/compilers/mlton/meta.nix index c4dc9c430bc..1e4c0aacfc3 100644 --- a/pkgs/development/compilers/mlton/meta.nix +++ b/pkgs/development/compilers/mlton/meta.nix @@ -9,7 +9,7 @@ Description taken from http://en.wikipedia.org/wiki/Mlton . ''; - homepage = http://mlton.org/; + homepage = "http://mlton.org/"; license = "bsd"; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin"]; } diff --git a/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index 85d64de6c23..f22771a35e9 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/pkgs/development/compilers/mono/generic.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { inherit enableParallelBuilding; meta = with stdenv.lib; { - homepage = https://mono-project.com/; + homepage = "https://mono-project.com/"; description = "Cross platform, open source .NET development framework"; platforms = with platforms; darwin ++ linux; maintainers = with maintainers; [ thoughtpolice obadz vrthra ]; diff --git a/pkgs/development/compilers/mono/llvm.nix b/pkgs/development/compilers/mono/llvm.nix index 36a457125fa..d08a4ebef24 100644 --- a/pkgs/development/compilers/mono/llvm.nix +++ b/pkgs/development/compilers/mono/llvm.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { description = "Collection of modular and reusable compiler and toolchain technologies - Mono build"; - homepage = http://llvm.org/; + homepage = "http://llvm.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/mosml/default.nix b/pkgs/development/compilers/mosml/default.nix index 19324593a30..3d94303cbaa 100644 --- a/pkgs/development/compilers/mosml/default.nix +++ b/pkgs/development/compilers/mosml/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { Moscow ML is a light-weight implementation of Standard ML (SML), a strict functional language used in teaching and research. ''; - homepage = https://mosml.org/; + homepage = "https://mosml.org/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ vaibhavsagar ]; diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index 8eb35f1b5f7..66d642dbbbd 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.mozart-oz.org/; + homepage = "http://www.mozart-oz.org/"; description = "Multiplatform implementation of the Oz programming language"; longDescription = '' The Mozart Programming System combines ongoing research in diff --git a/pkgs/development/compilers/mruby/default.nix b/pkgs/development/compilers/mruby/default.nix index e4c756e9c7d..f6a7fc2f143 100644 --- a/pkgs/development/compilers/mruby/default.nix +++ b/pkgs/development/compilers/mruby/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An embeddable implementation of the Ruby language"; - homepage = https://mruby.org; + homepage = "https://mruby.org"; maintainers = [ maintainers.nicknovitski ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index f5645ae0219..67665c3bab1 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-Wno-error=attributes"; meta = with stdenv.lib; { - homepage = https://www.nasm.us/; + homepage = "https://www.nasm.us/"; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; platforms = platforms.unix; maintainers = with maintainers; [ pSub willibutz ]; diff --git a/pkgs/development/compilers/neko/default.nix b/pkgs/development/compilers/neko/default.nix index 79c4aacbed5..705b222a86c 100644 --- a/pkgs/development/compilers/neko/default.nix +++ b/pkgs/development/compilers/neko/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high-level dynamically typed programming language"; - homepage = https://nekovm.org; + homepage = "https://nekovm.org"; license = licenses.lgpl21; maintainers = [ maintainers.marcweber ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index b0fbc2eb8d1..cce22207a36 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -79,7 +79,7 @@ with stdenv; mkDerivation rec { meta = with lib; { description = "Place and route tool for FPGAs"; - homepage = https://github.com/yosyshq/nextpnr; + homepage = "https://github.com/yosyshq/nextpnr"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice emily ]; diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 316ddbfcb60..53854d4fa35 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nim"; - version = "1.0.6"; + version = "1.2.0"; src = fetchurl { url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; - sha256 = "1cv6bxc7w21455c0pv0r2h64ljyzw266jsk1fsgiiyk2rx8mfkhk"; + sha256 = "TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU="; }; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix index fa49bf9dd73..2f7a1c7a964 100644 --- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix +++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://developer.nvidia.com/cg-toolkit; + homepage = "https://developer.nvidia.com/cg-toolkit"; license = lib.licenses.unfreeRedistributable; }; } diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index a6d2bcd875e..8f26790020c 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { ''; meta = { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; license = with stdenv.lib.licenses; [ qpl lgpl2 ]; description = "Most popular variant of the Caml language"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index f582ef9834a..946013562c2 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; license = with licenses; [ qpl /* compiler */ lgpl2 /* library */ diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index 1026b1bd8d7..f90d61744f5 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; branch = "3.12"; license = with licenses; [ qpl /* compiler */ diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index a4b21251bd1..81a8e0034fe 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; branch = "4.00"; license = with licenses; [ qpl /* compiler */ diff --git a/pkgs/development/compilers/ocaml/4.09.nix b/pkgs/development/compilers/ocaml/4.09.nix index 4b56d82eba5..a093a244641 100644 --- a/pkgs/development/compilers/ocaml/4.09.nix +++ b/pkgs/development/compilers/ocaml/4.09.nix @@ -1,6 +1,9 @@ import ./generic.nix { major_version = "4"; minor_version = "09"; - patch_version = "0"; - sha256 = "1v3z5ar326f3hzvpfljg4xj8b9lmbrl53fn57yih1bkbx3gr3yzj"; + patch_version = "1"; + sha256 = "1aq5505lpa39garky2icgfv4c7ylpx3j623cz9bsz5c466d2kqls"; + + # Breaks build with Clang + hardeningDisable = [ "strictoverflow" ]; } diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml.nix b/pkgs/development/compilers/ocaml/ber-metaocaml.nix index bbaee358490..a6ddcd8ce8f 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-Stage Programming extension for OCaml"; - homepage = http://okmij.org/ftp/ML/MetaOCaml.html; + homepage = "http://okmij.org/ftp/ML/MetaOCaml.html"; license = with licenses; [ /* compiler */ qpl /* library */ lgpl2 ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix index 12369ebcc6f..f2b61ab700d 100644 --- a/pkgs/development/compilers/ocaml/generic.nix +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation (args // { }; meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; + homepage = "http://caml.inria.fr/ocaml"; branch = versionNoPatch; license = with licenses; [ qpl /* compiler */ diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 1f53c4f0e78..8459f26367e 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation ({ ''; meta = { - homepage = http://www.metaocaml.org/; + homepage = "http://www.metaocaml.org/"; license = with stdenv.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 da1df6f30bb..c20e0d0ef99 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { web applications using a single technology. Among the the many features of Opa are these: Opa is concise, simple, concurrent, dynamically distributed, and secure. ''; - homepage = http://opalang.org/; + homepage = "http://opalang.org/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index e11bb7251a6..dbe7e44b1d7 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation { name = "opendylan-2013.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2; + url = "https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86_64-linux.tar.bz2"; sha256 = "035brbw3hm7zrs593q4zc42yglj1gmmkw3b1r7zzlw3ks4i2lg7h"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2; + url = "https://opendylan.org/downloads/opendylan/2013.2/opendylan-2013.2-x86-linux.tar.bz2"; sha256 = "0c61ihvblcsjrw6ncr8x8ylhskcrqs8pajs4mg5di36cvqw12nq5"; } else throw "platform ${stdenv.hostPlatform.system} not supported."; @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://opendylan.org; + homepage = "https://opendylan.org"; description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/opendylan/default.nix b/pkgs/development/compilers/opendylan/default.nix index 8e732d7d8bf..5abc40cc3bb 100644 --- a/pkgs/development/compilers/opendylan/default.nix +++ b/pkgs/development/compilers/opendylan/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "opendylan-2016.1pre"; src = fetchgit { - url = https://github.com/dylan-lang/opendylan; + url = "https://github.com/dylan-lang/opendylan"; rev = "cd9a8395586d33cc43a8611c1dc0513e69ee82dd"; sha256 = "00r1dm7mjy5p4hfm13vc4b6qryap40zinia3y15rhvalc3i2np4b"; fetchSubmodules = true; @@ -32,7 +32,7 @@ stdenv.mkDerivation { postInstall = "wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin"; meta = { - homepage = https://opendylan.org; + homepage = "https://opendylan.org"; description = "A multi-paradigm functional and object-oriented programming language"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 2081d339670..ef496f5f7c5 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -132,7 +132,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; + homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 094bd57e6e9..29992fdae68 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -41,7 +41,7 @@ let # so grab the work-around from # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 (fetchurl { - url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch; + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) ] ++ lib.optionals (!headless && enableGnome2) [ @@ -140,7 +140,7 @@ let disallowedReferences = [ openjdk11 ]; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; + homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index f47d7939e48..828df621b6f 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -257,7 +257,7 @@ let disallowedReferences = [ openjdk8-bootstrap ]; meta = with lib; { - homepage = http://openjdk.java.net/; + homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo nequissimus ]; diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 24828f16e7b..b3842ba7cad 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -41,7 +41,7 @@ let # so grab the work-around from # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24 (fetchurl { - url = https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch; + url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch"; sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r"; }) ] ++ lib.optionals (!headless && enableGnome2) [ @@ -140,7 +140,7 @@ let disallowedReferences = [ openjdk13-bootstrap ]; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/; + homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index b5ac58e6c67..7ba04ed50cc 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -104,7 +104,7 @@ in makePackage { passthru.deps = deps; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/projects/openjfx/; + homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/compilers/openjdk/openjfx/13.nix b/pkgs/development/compilers/openjdk/openjfx/13.nix index 632724a9ac0..54267a757b8 100644 --- a/pkgs/development/compilers/openjdk/openjfx/13.nix +++ b/pkgs/development/compilers/openjdk/openjfx/13.nix @@ -107,7 +107,7 @@ in makePackage { passthru.deps = deps; meta = with stdenv.lib; { - homepage = http://openjdk.java.net/projects/openjfx/; + homepage = "http://openjdk.java.net/projects/openjfx/"; license = licenses.gpl2; description = "The next-generation Java client toolkit."; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/compilers/openspin/default.nix b/pkgs/development/compilers/openspin/default.nix index b1e95bb704c..fe10f43abd5 100644 --- a/pkgs/development/compilers/openspin/default.nix +++ b/pkgs/development/compilers/openspin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compiler for SPIN/PASM languages for Parallax Propeller MCU"; - homepage = https://github.com/parallaxinc/OpenSpin; + homepage = "https://github.com/parallaxinc/OpenSpin"; license = licenses.mit; maintainers = [ maintainers.redvers ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index 987c86ba264..34e79945f61 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Oil Runtime Compiler"; - homepage = https://gstreamer.freedesktop.org/projects/orc.html; + homepage = "https://gstreamer.freedesktop.org/projects/orc.html"; # The source code implementing the Marsenne Twister algorithm is licensed # under the 3-clause BSD license. The rest is 2-clause BSD license. license = with licenses; [ bsd3 bsd2 ]; diff --git a/pkgs/development/compilers/osl/default.nix b/pkgs/development/compilers/osl/default.nix index 59c15f7d38f..e9ca1bf35b8 100644 --- a/pkgs/development/compilers/osl/default.nix +++ b/pkgs/development/compilers/osl/default.nix @@ -31,7 +31,7 @@ in clangStdenv.mkDerivation rec { # TODO: How important is partio? CMake doesn't seem to find it meta = with stdenv.lib; { description = "Advanced shading language for production GI renderers"; - homepage = http://opensource.imageworks.com/?p=osl; + homepage = "http://opensource.imageworks.com/?p=osl"; maintainers = with maintainers; [ hodapp ]; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix index 94b6daa888e..0183039b11d 100644 --- a/pkgs/development/compilers/pakcs/default.nix +++ b/pkgs/development/compilers/pakcs/default.nix @@ -77,7 +77,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.informatik.uni-kiel.de/~pakcs/; + 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 67d444428e9..c13d28c6a3b 100644 --- a/pkgs/development/compilers/pforth/default.nix +++ b/pkgs/development/compilers/pforth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Portable ANSI style Forth written in ANSI C"; - homepage = http://www.softsynth.com/pforth/; + homepage = "http://www.softsynth.com/pforth/"; license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ yrashk ]; diff --git a/pkgs/development/compilers/picat/default.nix b/pkgs/development/compilers/picat/default.nix index 87af63c671a..91e29a740c2 100644 --- a/pkgs/development/compilers/picat/default.nix +++ b/pkgs/development/compilers/picat/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2.8-2"; src = fetchurl { - url = http://picat-lang.org/download/picat28_src.tar.gz; + url = "http://picat-lang.org/download/picat28_src.tar.gz"; sha256 = "10hf2fxxbpq28gi39icr8c9wafdiy9ddfkk6l4rx7kkqyrdi7n85"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { Picat is a simple, and yet powerful, logic-based multi-paradigm programming language aimed for general-purpose applications. ''; - homepage = http://picat-lang.org/; + homepage = "http://picat-lang.org/"; license = stdenv.lib.licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.earldouglas ]; diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix index 70a56e6f41e..714adfb0e4c 100644 --- a/pkgs/development/compilers/polyml/5.6.nix +++ b/pkgs/development/compilers/polyml/5.6.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { longDescription = '' Poly/ML is a full implementation of Standard ML. ''; - homepage = https://www.polyml.org/; + homepage = "https://www.polyml.org/"; license = stdenv.lib.licenses.lgpl21; platforms = with stdenv.lib.platforms; linux; maintainers = [ #Add your name here! diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix index 5b2d127f377..ce8c033e4be 100644 --- a/pkgs/development/compilers/polyml/5.7.nix +++ b/pkgs/development/compilers/polyml/5.7.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { longDescription = '' Poly/ML is a full implementation of Standard ML. ''; - homepage = https://www.polyml.org/; + homepage = "https://www.polyml.org/"; license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); maintainers = with maintainers; [ maggesi ]; diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix index dafcdc3d686..65767346537 100644 --- a/pkgs/development/compilers/polyml/default.nix +++ b/pkgs/development/compilers/polyml/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { longDescription = '' Poly/ML is a full implementation of Standard ML. ''; - homepage = https://www.polyml.org/; + homepage = "https://www.polyml.org/"; license = licenses.lgpl21; platforms = with platforms; (linux ++ darwin); maintainers = with maintainers; [ maggesi kovirobi ]; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index 250690cefe8..e48e454a0a4 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation ( rec { meta = with stdenv.lib; { description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language"; - homepage = https://www.ponylang.org; + homepage = "https://www.ponylang.org"; license = licenses.bsd2; maintainers = with maintainers; [ doublec kamilchm patternspandemic ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix index 23e7f3b28f7..0a526023902 100644 --- a/pkgs/development/compilers/ponyc/pony-stable.nix +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple dependency manager for the Pony language."; - homepage = https://www.ponylang.org; + homepage = "https://www.ponylang.org"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ dipinhora kamilchm patternspandemic ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/purescript/psc-package/default.nix b/pkgs/development/compilers/purescript/psc-package/default.nix index 908a8e943e7..0bebd5d2f50 100644 --- a/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/pkgs/development/compilers/purescript/psc-package/default.nix @@ -1,27 +1,61 @@ -{ haskellPackages, mkDerivation, fetchFromGitHub, lib }: +# Based on https://github.com/justinwoo/easy-purescript-nix/blob/master/psc-package-simple.nix +{ stdenv, lib, fetchurl, gmp, zlib, libiconv, darwin, installShellFiles }: -with lib; +let + dynamic-linker = stdenv.cc.bintools.dynamicLinker; + +in +stdenv.mkDerivation rec { + pname = "psc-package-simple"; -mkDerivation rec { - pname = "psc-package"; version = "0.6.2"; - src = fetchFromGitHub { - owner = "purescript"; - repo = pname; - rev = "v${version}"; - sha256 = "0536mijma61khldnpbdviq2vvpfzzz7w8bxr59mvr19i10njdq0y"; + src = if stdenv.isDarwin + then fetchurl { + url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/macos.tar.gz"; + sha256 = "17dh3bc5b6ahfyx0pi6n9qnrhsyi83qdynnca6k1kamxwjimpcq1"; + } + else fetchurl { + url = "https://github.com/purescript/psc-package/releases/download/v0.6.2/linux64.tar.gz"; + sha256 = "1zvay9q3xj6yd76w6qyb9la4jaj9zvpf4dp78xcznfqbnbhm1a54"; }; - isLibrary = false; - isExecutable = true; + buildInputs = [ gmp zlib ]; + nativeBuildInputs = [ installShellFiles ]; + + libPath = lib.makeLibraryPath buildInputs; + + dontStrip = true; + + installPhase = '' + mkdir -p $out/bin - executableHaskellDepends = with haskellPackages; [ - aeson aeson-pretty either errors optparse-applicative - system-filepath turtle - ]; + PSC_PACKAGE=$out/bin/psc-package - description = "A package manager for PureScript based on package sets"; - license = licenses.bsd3; - maintainers = with lib.maintainers; [ Profpatsch ]; + install -D -m555 -T psc-package $PSC_PACKAGE + chmod u+w $PSC_PACKAGE + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool \ + -change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib \ + -change /usr/lib/libiconv.2.dylib ${libiconv}/libiconv.2.dylib \ + $PSC_PACKAGE + '' + lib.optionalString (!stdenv.isDarwin) '' + patchelf --interpreter ${dynamic-linker} --set-rpath ${libPath} $PSC_PACKAGE + '' + '' + chmod u-w $PSC_PACKAGE + + $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash + $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish + $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package + installShellCompletion \ + psc-package.{bash,fish} \ + --zsh _psc-package + ''; + + meta = with lib; { + description = "A package manager for PureScript based on package sets"; + license = licenses.bsd3; + maintainers = with maintainers; [ Profpatsch ]; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; + }; } diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index d1797a448ad..6f61068738a 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A strongly-typed functional programming language that compiles to JavaScript"; - homepage = http://www.purescript.org/; + homepage = "https://www.purescript.org/"; license = licenses.bsd3; maintainers = [ maintainers.justinwoo maintainers.mbbx6spp ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index ef27fc41b07..5c452d69253 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-reason-${version}"; - version = "3.5.4"; + version = "3.6.0"; src = fetchFromGitHub { owner = "facebook"; repo = "reason"; - rev = "e3287476e5c3f0cbcd9dc7ab18d290f81f4afa0c"; - sha256 = "02p5d1x6lr7jp9mvgvsas3nnq3a97chxp5q6rl07n5qm61d5b4dl"; + rev = "2860cc274b1b5b76a71d0e5190bf67a133d6f809"; + sha256 = "05wcg0gfln85spjfgsij818h2sp4y6s8bvdcwmzv0r8jblr8402b"; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://reasonml.github.io/; + homepage = "https://reasonml.github.io/"; description = "Facebook's friendly syntax to OCaml"; license = licenses.mit; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch b/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch new file mode 100644 index 00000000000..0b9359221a7 --- /dev/null +++ b/pkgs/development/compilers/rust/0001-Allow-getting-no_std-from-the-config-file.patch @@ -0,0 +1,52 @@ +From 036c87c82793f1da9f98445e8e27462cc19bbe0a Mon Sep 17 00:00:00 2001 +From: John Ericson <John.Ericson@Obsidian.Systems> +Date: Sat, 22 Feb 2020 14:38:38 -0500 +Subject: [PATCH] Allow getting `no_std` from the config file + +Currently, it is only set correctly in the sanity checking implicit +default fallback code. Having a config file at all will for force +`no_std = false`. +--- + src/bootstrap/config.rs | 3 +++ + src/bootstrap/sanity.rs | 4 +--- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs +index 110c8b844d5..83a6934d477 100644 +--- a/src/bootstrap/config.rs ++++ b/src/bootstrap/config.rs +@@ -350,6 +350,7 @@ struct TomlTarget { + musl_root: Option<String>, + wasi_root: Option<String>, + qemu_rootfs: Option<String>, ++ no_std: Option<bool>, + } + + impl Config { +@@ -610,6 +611,8 @@ impl Config { + target.musl_root = cfg.musl_root.clone().map(PathBuf::from); + target.wasi_root = cfg.wasi_root.clone().map(PathBuf::from); + target.qemu_rootfs = cfg.qemu_rootfs.clone().map(PathBuf::from); ++ target.no_std ++ = cfg.no_std.unwrap_or(triple.contains("-none-") || triple.contains("nvptx")); + + config.target_config.insert(INTERNER.intern_string(triple.clone()), target); + } +diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs +index 8ff7056e628..76e721ed8e3 100644 +--- a/src/bootstrap/sanity.rs ++++ b/src/bootstrap/sanity.rs +@@ -194,9 +194,7 @@ pub fn check(build: &mut Build) { + + if target.contains("-none-") || target.contains("nvptx") { + if build.no_std(*target).is_none() { +- let target = build.config.target_config.entry(target.clone()).or_default(); +- +- target.no_std = true; ++ build.config.target_config.entry(target.clone()).or_default(); + } + + if build.no_std(*target) == Some(false) { +-- +2.24.1 + diff --git a/pkgs/development/compilers/rust/1_41_0.nix b/pkgs/development/compilers/rust/1_41_0.nix deleted file mode 100644 index b73d9b8ef26..00000000000 --- a/pkgs/development/compilers/rust/1_41_0.nix +++ /dev/null @@ -1,48 +0,0 @@ -# New rust versions should first go to staging. -# Things to check after updating: -# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: -# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github -# This testing can be also done by other volunteers as part of the pull -# request review, in case platforms cannot be covered. -# 2. The LLVM version used for building should match with rust upstream. -# 3. Firefox and Thunderbird should still build on x86_64-linux. - -{ stdenv, lib -, buildPackages -, newScope, callPackage -, CoreFoundation, Security -, llvmPackages_5 -, pkgsBuildTarget, pkgsBuildBuild -, fetchpatch -} @ args: - -import ./default.nix { - rustcVersion = "1.41.0"; - rustcSha256 = "0jypz2mrzac41sj0zh07yd1z36g2s2rvgsb8g624sk4l14n84ijm"; - - # Note: the version MUST be one version prior to the version we're - # building - bootstrapVersion = "1.40.0"; - - # fetch hashes by running `print-hashes.sh 1.40.0` - bootstrapHashes = { - i686-unknown-linux-gnu = "d050d3a1c7c45ba9c50817d45bf6d7dd06e1a4d934f633c8096b7db6ae27adc1"; - x86_64-unknown-linux-gnu = "fc91f8b4bd18314e83a617f2389189fc7959146b7177b773370d62592d4b07d0"; - arm-unknown-linux-gnueabihf = "4be9949c4d3c572b69b1df61c3506a3a3ac044851f025d38599612e7caa933c5"; - armv7-unknown-linux-gnueabihf = "ebfe3978e12ffe34276272ee6d0703786249a9be80ca50617709cbfdab557306"; - aarch64-unknown-linux-gnu = "639271f59766d291ebdade6050e7d05d61cb5c822a3ef9a1e2ab185fed68d729"; - i686-apple-darwin = "ea189b1fb0bfda367cde6d43c18863ab4c64ffca04265e5746bf412a186fe1a2"; - x86_64-apple-darwin = "749ca5e0b94550369cc998416b8854c13157f5d11d35e9b3276064b6766bcb83"; - }; - - selectRustPackage = pkgs: pkgs.rust_1_41_0; - - rustcPatches = [ - (fetchpatch { - url = "https://github.com/QuiltOS/rust/commit/f1803452b9e95bfdbc3b8763138b9f92c7d12b46.diff"; - sha256 = "1mzxaj46bq7ll617wg0mqnbnwr1da3hd4pbap8bjwhs3kfqnr7kk"; - }) - ]; -} - -(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/1_42.nix b/pkgs/development/compilers/rust/1_42.nix new file mode 100644 index 00000000000..8717aaf76a2 --- /dev/null +++ b/pkgs/development/compilers/rust/1_42.nix @@ -0,0 +1,44 @@ +# New rust versions should first go to staging. +# Things to check after updating: +# 1. Rustc should produce rust binaries on x86_64-linux, aarch64-linux and x86_64-darwin: +# i.e. nix-shell -p fd or @GrahamcOfBorg build fd on github +# This testing can be also done by other volunteers as part of the pull +# request review, in case platforms cannot be covered. +# 2. The LLVM version used for building should match with rust upstream. +# 3. Firefox and Thunderbird should still build on x86_64-linux. + +{ stdenv, lib +, buildPackages +, newScope, callPackage +, CoreFoundation, Security +, llvmPackages_5 +, pkgsBuildTarget, pkgsBuildBuild +} @ args: + +import ./default.nix { + rustcVersion = "1.42.0"; + rustcSha256 = "0x9lxs82may6c0iln0b908cxyn1cv7h03n5cmbx3j1bas4qzks6j"; + + # Note: the version MUST be one version prior to the version we're + # building + bootstrapVersion = "1.41.0"; + + # fetch hashes by running `print-hashes.sh 1.42.0` + bootstrapHashes = { + i686-unknown-linux-gnu = "a93a34f9cf3d35de2496352cb615b42b792eb09db3149b3a278efd2c58fa7897"; + x86_64-unknown-linux-gnu = "343ba8ef7397eab7b3bb2382e5e4cb08835a87bff5c8074382c0b6930a41948b"; + arm-unknown-linux-gnueabihf = "d0b33fcc97eeb96d716b30573c7e66affdf9077ecdecb30df2498b49f8284047"; + armv7-unknown-linux-gnueabihf = "3c8e787fb4f4f304a065e78c38010f0b5722d809f9dafb0e904084bf0f54f7be"; + aarch64-unknown-linux-gnu = "79ddfb5e2563d0ee09a567fbbe121a2aed3c3bc61255b2787f2dd42183a10f27"; + i686-apple-darwin = "628134b3fbaf5c0e7a25bd9a2b8d25f6e68bb256c8b04a3332ec979f5a1cd339"; + x86_64-apple-darwin = "b6504003ab70b11f278e0243a43ba9d6bf75e8ad6819b4058a2b6e3991cc8d7a"; + }; + + selectRustPackage = pkgs: pkgs.rust_1_42; + + rustcPatches = [ + ./0001-Allow-getting-no_std-from-the-config-file.patch + ]; +} + +(builtins.removeAttrs args [ "fetchpatch" ]) diff --git a/pkgs/development/compilers/rust/binary.nix b/pkgs/development/compilers/rust/binary.nix index 06202901563..9ae7e51e5fe 100644 --- a/pkgs/development/compilers/rust/binary.nix +++ b/pkgs/development/compilers/rust/binary.nix @@ -25,7 +25,7 @@ rec { inherit src; meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; + homepage = "http://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; @@ -71,7 +71,7 @@ rec { inherit src; meta = with stdenv.lib; { - homepage = http://www.rust-lang.org/; + homepage = "http://www.rust-lang.org/"; description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ qknight ]; license = [ licenses.mit licenses.asl20 ]; diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index 6625367262a..65614b9480e 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage { doCheck = false; meta = with stdenv.lib; { - homepage = https://crates.io; + homepage = "https://crates.io"; description = "Downloads your Rust project's dependencies and builds your project"; maintainers = with maintainers; [ retrry ]; license = [ licenses.mit licenses.asl20 ]; diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 6498c34ce8b..40de5f61e03 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python3 -, llvm_9, darwin, git, cmake, rust, rustPlatform +, llvm_9, darwin, cmake, rust, rustPlatform , pkgconfig, openssl , which, libffi , withBundledLLVM ? false @@ -125,7 +125,7 @@ in stdenv.mkDerivation rec { dontUseCmakeConfigure = true; nativeBuildInputs = [ - file python3 rustPlatform.rust.rustc git cmake + file python3 rustPlatform.rust.rustc cmake which libffi removeReferencesTo pkgconfig ]; diff --git a/pkgs/development/compilers/rust/rustfmt.nix b/pkgs/development/compilers/rust/rustfmt.nix index 9793eee1708..f8ed0bce2e0 100644 --- a/pkgs/development/compilers/rust/rustfmt.nix +++ b/pkgs/development/compilers/rust/rustfmt.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; - homepage = https://github.com/rust-lang-nursery/rustfmt; + homepage = "https://github.com/rust-lang-nursery/rustfmt"; license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ globin basvandijk ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/sbcl/bootstrap.nix b/pkgs/development/compilers/sbcl/bootstrap.nix index 9c777cc7572..81afe64ed53 100644 --- a/pkgs/development/compilers/sbcl/bootstrap.nix +++ b/pkgs/development/compilers/sbcl/bootstrap.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lisp compiler"; - homepage = http://www.sbcl.org; + homepage = "http://www.sbcl.org"; license = licenses.publicDomain; # and FreeBSD maintainers = [maintainers.raskin maintainers.tohl]; platforms = attrNames options; diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 16e0389ad03..d41442afaf1 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = https://www.scala-lang.org/; + homepage = "https://www.scala-lang.org/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; branch = "2.10"; diff --git a/pkgs/development/compilers/scala/2.11.nix b/pkgs/development/compilers/scala/2.11.nix index db1a8f4edca..d8fcd3f9a88 100644 --- a/pkgs/development/compilers/scala/2.11.nix +++ b/pkgs/development/compilers/scala/2.11.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = https://www.scala-lang.org/; + homepage = "https://www.scala-lang.org/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; branch = "2.11"; diff --git a/pkgs/development/compilers/scala/2.12.nix b/pkgs/development/compilers/scala/2.12.nix index 3f61669b938..4c9d57624f7 100644 --- a/pkgs/development/compilers/scala/2.12.nix +++ b/pkgs/development/compilers/scala/2.12.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = https://www.scala-lang.org/; + homepage = "https://www.scala-lang.org/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/scala/2.13.nix b/pkgs/development/compilers/scala/2.13.nix index b140d4e2a2d..fb6d663f749 100644 --- a/pkgs/development/compilers/scala/2.13.nix +++ b/pkgs/development/compilers/scala/2.13.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { Code sizes are typically reduced by a factor of two to three when compared to an equivalent Java application. ''; - homepage = https://www.scala-lang.org/; + homepage = "https://www.scala-lang.org/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 675e91b302a..4bfc966bb45 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { and try to boil down Scala’s types into a smaller set of more fundamental constructs. The theory behind these constructs is researched in DOT, a calculus for dependent object types. ''; - homepage = http://dotty.epfl.ch/; + homepage = "http://dotty.epfl.ch/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [maintainers.karolchmist maintainers.virusdave]; diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index e87f758bcde..3d3d43a55e5 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { Rabbit 3000A). Work is in progress on supporting the Microchip PIC16 and PIC18 targets. It can be retargeted for other microprocessors. ''; - homepage = http://sdcc.sourceforge.net/; + homepage = "http://sdcc.sourceforge.net/"; license = with licenses; if (gputils == null) then gpl2 else unfreeRedistributable; maintainers = with maintainers; [ bjornfor yorickvp ]; platforms = platforms.all; diff --git a/pkgs/development/compilers/seexpr/default.nix b/pkgs/development/compilers/seexpr/default.nix index f6b732f02ae..580fc3b761d 100644 --- a/pkgs/development/compilers/seexpr/default.nix +++ b/pkgs/development/compilers/seexpr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ cmake libGLU libpng zlib qt4 pythonPackages.pyqt4 bison flex ]; meta = with stdenv.lib; { description = "Embeddable expression evaluation engine from Disney Animation"; - homepage = https://www.disneyanimation.com/technology/seexpr.html; + homepage = "https://www.disneyanimation.com/technology/seexpr.html"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/compilers/serpent/default.nix b/pkgs/development/compilers/serpent/default.nix index 6f1156897db..2459127f425 100644 --- a/pkgs/development/compilers/serpent/default.nix +++ b/pkgs/development/compilers/serpent/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { style, and at the same time adding special domain-specific features for contract programming. ''; - homepage = https://github.com/ethereum/wiki/wiki/Serpent; + homepage = "https://github.com/ethereum/wiki/wiki/Serpent"; license = with licenses; [ wtfpl ]; maintainers = with maintainers; [ chris-martin ]; platforms = with platforms; linux; diff --git a/pkgs/development/compilers/smlnj/bootstrap.nix b/pkgs/development/compilers/smlnj/bootstrap.nix index e2103fb718f..55d96266ac9 100644 --- a/pkgs/development/compilers/smlnj/bootstrap.nix +++ b/pkgs/development/compilers/smlnj/bootstrap.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Compiler for the Standard ML '97 programming language"; - homepage = http://www.smlnj.org; + homepage = "http://www.smlnj.org"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.darwin; maintainers = [ stdenv.lib.maintainers.jwiegley ]; diff --git a/pkgs/development/compilers/smlnj/default.nix b/pkgs/development/compilers/smlnj/default.nix index a79c9a702c4..18562bc487a 100644 --- a/pkgs/development/compilers/smlnj/default.nix +++ b/pkgs/development/compilers/smlnj/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Standard ML of New Jersey, a compiler"; - homepage = http://smlnj.org; + homepage = "http://smlnj.org"; license = licenses.bsd3; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 0f71ed79e7e..a1cf5b2debd 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -7,7 +7,7 @@ assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0"; assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let - jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz; + jsoncppURL = "https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz"; jsoncpp = fetchzip { url = jsoncppURL; sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler for Ethereum smart contract language Solidity"; - homepage = https://github.com/ethereum/solidity; + homepage = "https://github.com/ethereum/solidity"; license = licenses.gpl3; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 1ee0b9ed0cc..73af5f0c985 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/KhronosGroup/SPIRV-LLVM-Translator; + 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; platforms = platforms.all; diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index c8379fe9090..4687ce86a90 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { capabilities. It also includes a customisable framework for creating dynamic HTTP servers and interactively extensible Web sites. ''; - homepage = http://squeakvm.org/; - downloadPage = http://squeakvm.org/unix/index.html; + homepage = "http://squeakvm.org/"; + downloadPage = "http://squeakvm.org/unix/index.html"; license = with licenses; [ asl20 mit ]; platforms = platforms.linux; }; diff --git a/pkgs/development/compilers/stalin/default.nix b/pkgs/development/compilers/stalin/default.nix index 09045ee2c11..430bc251b4b 100644 --- a/pkgs/development/compilers/stalin/default.nix +++ b/pkgs/development/compilers/stalin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.ece.purdue.edu/~qobi/software.html; + homepage = "http://www.ece.purdue.edu/~qobi/software.html"; license = stdenv.lib.licenses.gpl2Plus; description = "Stalin, an optimizing Scheme compiler"; diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 25accf8c949..0cd1f704421 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -317,7 +317,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Swift Programming Language"; - homepage = https://github.com/apple/swift; + homepage = "https://github.com/apple/swift"; maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; # Swift doesn't support 32bit Linux, unknown on other platforms. diff --git a/pkgs/development/compilers/terra/default.nix b/pkgs/development/compilers/terra/default.nix index 63557d61019..e8478828c1b 100644 --- a/pkgs/development/compilers/terra/default.nix +++ b/pkgs/development/compilers/terra/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A low-level counterpart to Lua"; - homepage = http://terralang.org/; + homepage = "http://terralang.org/"; platforms = platforms.x86_64; maintainers = with maintainers; [ jb55 thoughtpolice ]; license = licenses.mit; diff --git a/pkgs/development/compilers/teyjus/default.nix b/pkgs/development/compilers/teyjus/default.nix index 41cc9b38606..6768d0c1cbe 100644 --- a/pkgs/development/compilers/teyjus/default.nix +++ b/pkgs/development/compilers/teyjus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An efficient implementation of the Lambda Prolog language"; - homepage = https://github.com/teyjus/teyjus; + homepage = "https://github.com/teyjus/teyjus"; license = stdenv.lib.licenses.gpl3; maintainers = [ maintainers.bcdarwin ]; platforms = platforms.linux; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index c24786cd9a0..a8867d31465 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern, statically-typed purely functional language"; - homepage = https://unisonweb.org/; + homepage = "https://unisonweb.org/"; license = with licenses; [ mit bsd3 ]; maintainers = [ maintainers.virusdave ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; diff --git a/pkgs/development/compilers/urn/default.nix b/pkgs/development/compilers/urn/default.nix index f3ff864f81b..812792a125e 100644 --- a/pkgs/development/compilers/urn/default.nix +++ b/pkgs/development/compilers/urn/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://urn-lang.com; + homepage = "https://urn-lang.com"; description = "Yet another Lisp variant which compiles to Lua"; license = licenses.bsd3; maintainers = with maintainers; [ CrazedProgrammer ]; diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index d84503caa60..34e6835fc1f 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -36,6 +36,8 @@ let "0.46" = ./disable-graphviz-0.46.1.patch; + "0.48" = ./disable-graphviz-0.46.1.patch; + }.${lib.versions.majorMinor version} or (throw "no graphviz patch for this version of vala"); disableGraphviz = lib.versionAtLeast version "0.38" && !withGraphviz; @@ -92,7 +94,7 @@ let meta = with stdenv.lib; { description = "Compiler for GObject type system"; - homepage = https://wiki.gnome.org/Projects/Vala; + homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ]; @@ -120,5 +122,10 @@ in rec { sha256 = "07fv895sp9wq74b20qig7hic0r4ynrr5pfaqba02r44xb794fy0s"; }; - vala = vala_0_46; + vala_0_48 = generic { + version = "0.48.1"; + sha256 = "61c5TAqQj/Y2I9F54J+h6dazjTHH61l9MCFInyl+cdQ="; + }; + + vala = vala_0_48; } diff --git a/pkgs/development/compilers/wcc/default.nix b/pkgs/development/compilers/wcc/default.nix index d21d886367f..b6030da49d3 100644 --- a/pkgs/development/compilers/wcc/default.nix +++ b/pkgs/development/compilers/wcc/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/endrazine/wcc; + homepage = "https://github.com/endrazine/wcc"; description = "Witchcraft compiler collection: tools to convert and script ELF files"; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/compilers/wla-dx/default.nix b/pkgs/development/compilers/wla-dx/default.nix index 5f83845a12a..f50d9e0598b 100644 --- a/pkgs/development/compilers/wla-dx/default.nix +++ b/pkgs/development/compilers/wla-dx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://www.villehelin.com/wla.html; + homepage = "http://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; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/compilers/x11basic/default.nix b/pkgs/development/compilers/x11basic/default.nix index 147ec13c555..cc4788e3ce0 100644 --- a/pkgs/development/compilers/x11basic/default.nix +++ b/pkgs/development/compilers/x11basic/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://x11-basic.sourceforge.net/; + homepage = "http://x11-basic.sourceforge.net/"; description = "A Basic interpreter and compiler with graphics capabilities."; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/compilers/yap/default.nix b/pkgs/development/compilers/yap/default.nix index e6fdd03bb67..100fb236c83 100644 --- a/pkgs/development/compilers/yap/default.nix +++ b/pkgs/development/compilers/yap/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { - homepage = http://www.dcc.fc.up.pt/~vsc/Yap/; + homepage = "http://www.dcc.fc.up.pt/~vsc/Yap/"; description = "A ISO-compatible high-performance Prolog compiler"; license = stdenv.lib.licenses.artistic2; diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index 5aea623b91d..923a11c1466 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.tortall.net/projects/yasm/; + homepage = "http://www.tortall.net/projects/yasm/"; description = "Complete rewrite of the NASM assembler"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index 961e28da82e..d547535c54b 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming languaged designed for robustness, optimality, and clarity"; - homepage = https://ziglang.org/; + homepage = "https://ziglang.org/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index d05ec1a682a..ed3d67ff862 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://www.azul.com/products/zulu/; + homepage = "https://www.azul.com/products/zulu/"; license = licenses.gpl2; description = "Certified builds of OpenJDK"; longDescription = '' diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 5fe2473bac6..d13e574a81a 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://www.azul.com/products/zulu/; + homepage = "https://www.azul.com/products/zulu/"; license = licenses.gpl2; description = "Certified builds of OpenJDK"; longDescription = '' diff --git a/pkgs/development/coq-modules/CoLoR/default.nix b/pkgs/development/coq-modules/CoLoR/default.nix index d145586af43..1346ec92fad 100644 --- a/pkgs/development/coq-modules/CoLoR/default.nix +++ b/pkgs/development/coq-modules/CoLoR/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://color.inria.fr/; + homepage = "http://color.inria.fr/"; description = "CoLoR is a library of formal mathematical definitions and proofs of theorems on rewriting theory and termination whose correctness has been mechanically checked by the Coq proof assistant."; maintainers = with maintainers; [ jpas jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/HoTT/default.nix b/pkgs/development/coq-modules/HoTT/default.nix index fb01da8d59c..7b52838505e 100644 --- a/pkgs/development/coq-modules/HoTT/default.nix +++ b/pkgs/development/coq-modules/HoTT/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://homotopytypetheory.org/; + homepage = "http://homotopytypetheory.org/"; description = "Homotopy type theory"; maintainers = with maintainers; [ siddharthist ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index c1894d3666c..7f3c77c75e6 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/QuickChick/QuickChick; + homepage = "https://github.com/QuickChick/QuickChick"; description = "Randomized property-based testing plugin for Coq; a clone of Haskell QuickCheck"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/autosubst/default.nix b/pkgs/development/coq-modules/autosubst/default.nix index ee08af40c51..9507dc6751a 100644 --- a/pkgs/development/coq-modules/autosubst/default.nix +++ b/pkgs/development/coq-modules/autosubst/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "5b40a32e"; src = fetchgit { - url = git://github.com/uds-psl/autosubst.git; + url = "git://github.com/uds-psl/autosubst.git"; rev = "1c3bb3bbf5477e3b33533a0fc090399f45fe3034"; sha256 = "06pcjbngzwqyncvfwzz88j33wvdj9kizxyg5adp7y6186h8an341"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { - homepage = https://www.ps.uni-saarland.de/autosubst/; + homepage = "https://www.ps.uni-saarland.de/autosubst/"; description = "Automation for de Bruijn syntax and substitution in Coq"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/category-theory/default.nix b/pkgs/development/coq-modules/category-theory/default.nix index 025a67a1e70..1178b1558ff 100644 --- a/pkgs/development/coq-modules/category-theory/default.nix +++ b/pkgs/development/coq-modules/category-theory/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { name = "coq${coq.coq-version}-category-theory-${param.version}"; src = fetchgit { - url = git://github.com/jwiegley/category-theory.git; + url = "git://github.com/jwiegley/category-theory.git"; inherit (param) rev sha256; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/jwiegley/category-theory; + homepage = "https://github.com/jwiegley/category-theory"; description = "A formalization of category theory in Coq for personal study and practical work"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/coq-bits/default.nix b/pkgs/development/coq-modules/coq-bits/default.nix index ed6118dbb55..97fd23208f2 100644 --- a/pkgs/development/coq-modules/coq-bits/default.nix +++ b/pkgs/development/coq-modules/coq-bits/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/coq-community/coq-bits; + homepage = "https://github.com/coq-community/coq-bits"; description = "A formalization of bitset operations in Coq"; license = licenses.asl20; maintainers = with maintainers; [ ptival ]; diff --git a/pkgs/development/coq-modules/coq-ext-lib/default.nix b/pkgs/development/coq-modules/coq-ext-lib/default.nix index 8bbf74b6078..17f9c2c4611 100644 --- a/pkgs/development/coq-modules/coq-ext-lib/default.nix +++ b/pkgs/development/coq-modules/coq-ext-lib/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { - homepage = https://github.com/coq-ext-lib/coq-ext-lib; + homepage = "https://github.com/coq-ext-lib/coq-ext-lib"; description = "A collection of theories and plugins that may be useful in other Coq developments"; maintainers = with maintainers; [ jwiegley ptival ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/coq-extensible-records/default.nix b/pkgs/development/coq-modules/coq-extensible-records/default.nix index 3b93b6b2de2..531c1528761 100644 --- a/pkgs/development/coq-modules/coq-extensible-records/default.nix +++ b/pkgs/development/coq-modules/coq-extensible-records/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gmalecha/coq-extensible-records; + homepage = "https://github.com/gmalecha/coq-extensible-records"; description = "Implementation of extensible records in Coq"; license = licenses.mit; maintainers = with maintainers; [ ptival ]; diff --git a/pkgs/development/coq-modules/coq-haskell/default.nix b/pkgs/development/coq-modules/coq-haskell/default.nix index e9263fb2be1..7c86a7d55f3 100644 --- a/pkgs/development/coq-modules/coq-haskell/default.nix +++ b/pkgs/development/coq-modules/coq-haskell/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { name = "coq${coq.coq-version}-coq-haskell-${param.version}"; src = fetchgit { - url = git://github.com/jwiegley/coq-haskell.git; + url = "git://github.com/jwiegley/coq-haskell.git"; inherit (param) rev sha256; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/jwiegley/coq-haskell; + homepage = "https://github.com/jwiegley/coq-haskell"; description = "A library for formalizing Haskell types and functions in Coq"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 83a505017fb..7d9ec5e7312 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -3,17 +3,25 @@ let params = { "8.8" = { + version = "1.1"; sha256 = "0ms086wp4jmrzyglb8wymchzyflflk01nsfsk4r6qv8rrx81nx9h"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.9" = { - sha256 = "0hmqwsry8ldg4g4hhwg4b84dgzibpdrg1wwsajhlyqfx3fb3n3b5"; + version = "1.1.1"; + sha256 = "1knjmz4hr8vlp103j8n4fyb2lfxysnm512gh3m2kp85n6as6fvb9"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; + }; + "8.10" = { + version = "1.1.1"; + sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df"; }; }; param = params.${coq.coq-version}; in stdenv.mkDerivation rec { - version = "1.1"; + inherit (param) version; name = "coq${coq.coq-version}-coqhammer-${version}"; src = fetchFromGitHub { @@ -31,8 +39,8 @@ stdenv.mkDerivation rec { ''; buildInputs = [ coq ] ++ (with coq.ocamlPackages; [ - ocaml findlib camlp5 - ]); + ocaml findlib + ]) ++ (param.buildInputs or []); preInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index 3b916b5e40b..2eb3021ada7 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { installPhase = "./remake install"; meta = { - homepage = http://coquelicot.saclay.inria.fr/; + homepage = "http://coquelicot.saclay.inria.fr/"; description = "A Coq library for Reals"; license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/corn/default.nix b/pkgs/development/coq-modules/corn/default.nix index 97bb884c92e..14ff74506f3 100644 --- a/pkgs/development/coq-modules/corn/default.nix +++ b/pkgs/development/coq-modules/corn/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = { - homepage = http://c-corn.github.io/; + homepage = "http://c-corn.github.io/"; license = stdenv.lib.licenses.gpl2; description = "A Coq library for constructive analysis"; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 300c5a9f448..9e63e7766f0 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = { description = "Build dependency graphs between Coq objects"; license = stdenv.lib.licenses.lgpl21; - homepage = https://github.com/Karmaki/coq-dpdgraph/; + homepage = "https://github.com/Karmaki/coq-dpdgraph/"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index 9ea9ac21671..c1177dc9789 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { - homepage = https://mattam82.github.io/Coq-Equations/; + homepage = "https://mattam82.github.io/Coq-Equations/"; description = "A plugin for Coq to add dependent pattern-matching"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/fiat/HEAD.nix b/pkgs/development/coq-modules/fiat/HEAD.nix index 4abaec6528a..fd3ade0c64b 100644 --- a/pkgs/development/coq-modules/fiat/HEAD.nix +++ b/pkgs/development/coq-modules/fiat/HEAD.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://plv.csail.mit.edu/fiat/; + homepage = "http://plv.csail.mit.edu/fiat/"; description = "A library for the Coq proof assistant for synthesizing efficient correct-by-construction programs from declarative specifications"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index d9ad7d6e3be..e0c32bc430e 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://flocq.gforge.inria.fr/; + homepage = "http://flocq.gforge.inria.fr/"; description = "A floating-point formalization for the Coq system"; license = licenses.lgpl3; maintainers = with maintainers; [ jwiegley ]; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index c610039eeec..c432d2175ec 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "coq${coq.coq-version}-gappalib-1.4.1"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37917/gappalib-coq-1.4.1.tar.gz; + url = "https://gforge.inria.fr/frs/download.php/file/37917/gappalib-coq-1.4.1.tar.gz"; sha256 = "0d3f23a871haglg8hq1jgxz3y5nryiwy12b5xfnfjn279jfqqjw4"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Coq support library for Gappa"; license = stdenv.lib.licenses.lgpl21; - homepage = http://gappa.gforge.inria.fr/; + homepage = "http://gappa.gforge.inria.fr/"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (coq.meta) platforms; }; diff --git a/pkgs/development/coq-modules/heq/default.nix b/pkgs/development/coq-modules/heq/default.nix index 5d3c94c5f5c..d0445c83ca5 100644 --- a/pkgs/development/coq-modules/heq/default.nix +++ b/pkgs/development/coq-modules/heq/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}" ]; meta = with stdenv.lib; { - homepage = https://www.mpi-sws.org/~gil/Heq/; + homepage = "https://www.mpi-sws.org/~gil/Heq/"; description = "Heq : a Coq library for Heterogeneous Equality"; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index 73a0a07f704..9e78a9f3882 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { installPhase = "./remake install"; meta = with stdenv.lib; { - homepage = http://coq-interval.gforge.inria.fr/; + homepage = "http://coq-interval.gforge.inria.fr/"; description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant"; license = licenses.cecill-c; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/coq-modules/math-classes/default.nix b/pkgs/development/coq-modules/math-classes/default.nix index 7aad4261fd3..9ab77418cce 100644 --- a/pkgs/development/coq-modules/math-classes/default.nix +++ b/pkgs/development/coq-modules/math-classes/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; meta = with stdenv.lib; { - homepage = https://math-classes.github.io; + homepage = "https://math-classes.github.io"; description = "A library of abstract interfaces for mathematical structures in Coq."; maintainers = with maintainers; [ siddharthist jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/metalib/default.nix b/pkgs/development/coq-modules/metalib/default.nix index c196bdbcd76..a0268a543a5 100644 --- a/pkgs/development/coq-modules/metalib/default.nix +++ b/pkgs/development/coq-modules/metalib/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "20170713"; src = fetchgit { - url = https://github.com/plclub/metalib.git; + url = "https://github.com/plclub/metalib.git"; rev = "44e40aa082452dd333fc1ca2d2cc55311519bd52"; sha256 = "1pra0nvx69q8d4bvpcvh9ngic1cy6z1chi03x56nisfqnc61b6y9"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "lngen"; version = "0.0.1"; src = fetchgit { - url = https://github.com/plclub/lngen; + url = "https://github.com/plclub/lngen"; rev = "ea73ad315de33afd25f87ca738c71f358f1cd51c"; sha256 = "1a0sj8n3lmsl1wlnqfy176k9lb9s8rl422bvg3ihl2i70ql8wisd"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { isExecutable = true; libraryHaskellDepends = [ base containers mtl parsec syb ]; executableHaskellDepends = [ base ]; - homepage = https://github.com/plclub/lngen; + homepage = "https://github.com/plclub/lngen"; description = "Tool for generating Locally Nameless definitions and proofs in Coq, working together with Ott"; license = stdenv.lib.licenses.mit; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/plclub/metalib; + homepage = "https://github.com/plclub/metalib"; license = licenses.mit; maintainers = [ maintainers.jwiegley ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/paco/default.nix b/pkgs/development/coq-modules/paco/default.nix index 4c0ca467300..9d8a7a315a5 100644 --- a/pkgs/development/coq-modules/paco/default.nix +++ b/pkgs/development/coq-modules/paco/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://plv.mpi-sws.org/paco/; + homepage = "http://plv.mpi-sws.org/paco/"; description = "A Coq library implementing parameterized coinduction"; maintainers = with maintainers; [ jwiegley ptival ]; platforms = coq.meta.platforms; diff --git a/pkgs/development/coq-modules/paramcoq/default.nix b/pkgs/development/coq-modules/paramcoq/default.nix index a57d1bc9088..67e420b4e89 100644 --- a/pkgs/development/coq-modules/paramcoq/default.nix +++ b/pkgs/development/coq-modules/paramcoq/default.nix @@ -3,33 +3,40 @@ let params = { "8.7" = { - version = "1.1.1+coq8.7"; - sha256 = "1i7b5pkx46zf9il2xikbp3rhpnh3wdfbhw5yxcf9yk28ky9s0a0l"; + sha256 = "09n0ky7ldb24by7yf5j3hv410h85x50ksilf7qacl7xglj4gy5hj"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.8" = { - version = "1.1.1"; - sha256 = "0b07zvgm9cx6j2d9631zmqjs6sf30kiqg6k15xk3km7n80d53wfh"; + sha256 = "0rc4lshqvnfdsph98gnscvpmlirs9wx91qcvffggg73xw0p1g9s0"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.9" = { - version = "1.1.1+coq8.9"; - sha256 = "002xabhjlph394vydw3dx8ipv5ry2nq3py4440bk9a18ljx0w6ll"; + sha256 = "1jjzgpff09xjn9kgp7w69r096jkj0x2ksng3pawrmhmn7clwivbk"; + buildInputs = [ coq.ocamlPackages.camlp5 ]; + }; + "8.10" = { + sha256 = "1lq1mw15w4yky79qg3rm0mpzqi2ir51b6ak04ismrdr7ixky49y8"; + }; + "8.11" = { + sha256 = "09c6813988nvq4fpa45s33k70plnhxsblhm7cxxkg0i37mhvigsa"; }; }; param = params.${coq.coq-version}; in stdenv.mkDerivation rec { - inherit (param) version; + version = "1.1.2"; name = "coq${coq.coq-version}-paramcoq-${version}"; src = fetchFromGitHub { owner = "coq-community"; repo = "paramcoq"; - rev = "v${version}"; + rev = "v${version}+coq${coq.coq-version}"; inherit (param) sha256; }; buildInputs = [ coq ] - ++ (with coq.ocamlPackages; [ ocaml findlib camlp5 ]) + ++ (with coq.ocamlPackages; [ ocaml findlib ]) + ++ (param.buildInputs or []) ; installFlags = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 2de234c9a1e..388280a905f 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -214,6 +214,8 @@ let find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; + strictDeps = true; + shellHook = '' d=$(mktemp -d "--suffix=-$name") '' + toString (map (dep: '' diff --git a/pkgs/development/guile-modules/guile-cairo/default.nix b/pkgs/development/guile-modules/guile-cairo/default.nix index 8377dad690f..690fce9da66 100644 --- a/pkgs/development/guile-modules/guile-cairo/default.nix +++ b/pkgs/development/guile-modules/guile-cairo/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { maintained graphics library with all of the benefits of Scheme: memory management, exceptions, macros, and a dynamic programming environment. ''; - homepage = https://www.nongnu.org/guile-cairo/; + homepage = "https://www.nongnu.org/guile-cairo/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; diff --git a/pkgs/development/guile-modules/guile-fibers/default.nix b/pkgs/development/guile-modules/guile-fibers/default.nix index cfb56790221..88ba443b6b8 100644 --- a/pkgs/development/guile-modules/guile-fibers/default.nix +++ b/pkgs/development/guile-modules/guile-fibers/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Concurrent ML-like concurrency for Guile"; - homepage = https://github.com/wingo/fibers; + homepage = "https://github.com/wingo/fibers"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ vyp ]; platforms = platforms.linux; diff --git a/pkgs/development/guile-modules/guile-reader/default.nix b/pkgs/development/guile-modules/guile-reader/default.nix index 6ffcc153ec4..aee74c0ac4d 100644 --- a/pkgs/development/guile-modules/guile-reader/default.nix +++ b/pkgs/development/guile-modules/guile-reader/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "0001-fix-prototypes.patch"; - url = https://aur.archlinux.org/cgit/aur.git/plain/reader_flag.patch?h=guile-reader&id=63ac0413a1aa65eb6a0db57bc16ef4481b70dc31; + url = "https://aur.archlinux.org/cgit/aur.git/plain/reader_flag.patch?h=guile-reader&id=63ac0413a1aa65eb6a0db57bc16ef4481b70dc31"; sha256 = "01ar34xgpxyli8v2bk4kj6876kyrxhxhfpv9v07lx36d254bzrjb"; }) ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { "token readers" of a standard Scheme readers. For example, it is used to implement Skribilo's R5RS-derived document syntax. ''; - homepage = https://www.nongnu.org/guile-reader/; + homepage = "https://www.nongnu.org/guile-reader/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.gnu; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index afa3c533894..002142965c1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -37,9 +37,6 @@ self: super: { # compiled on Linux. We provide the name to avoid evaluation errors. unbuildable = throw "package depends on meta package 'unbuildable'"; - # The test suite depends on old versions of tasty and QuickCheck. - hackage-security = dontCheck super.hackage-security; - # enable using a local hoogle with extra packagages in the database # nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }" # $ hoogle server @@ -86,7 +83,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 = "0y2qcjahi705c6nnypqpa5w3bzyzk4kqvbwfnpiaxzk5vna589gg"; + sha256 = "1jjw6ar8ddcncwzksyx2xky50sm2jg1zjr7iiqk0vn8qq0fn2gwy"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -326,6 +323,7 @@ self: super: { hs2048 = dontCheck super.hs2048; hsbencher = dontCheck super.hsbencher; hsexif = dontCheck super.hsexif; + hspec-core = if pkgs.stdenv.isi686 then dontCheck super.hspec-core else super.hspec-core; # tests rely on `Int` being 64-bit; https://github.com/hspec/hspec/issues/431 hspec-server = dontCheck super.hspec-server; HTF = dontCheck super.HTF; htsn = dontCheck super.htsn; @@ -359,7 +357,6 @@ self: super: { optional = dontCheck super.optional; orgmode-parse = dontCheck super.orgmode-parse; os-release = dontCheck super.os-release; - pandoc-crossref = dontCheck super.pandoc-crossref; # (most likely change when no longer 0.3.2.1) https://github.com/lierdakil/pandoc-crossref/issues/199 persistent-redis = dontCheck super.persistent-redis; pipes-extra = dontCheck super.pipes-extra; pipes-websockets = dontCheck super.pipes-websockets; @@ -701,7 +698,7 @@ self: super: { # Djinn's last release was 2014, incompatible with Semigroup-Monoid Proposal # https://github.com/augustss/djinn/pull/8 djinn = appendPatch super.djinn (pkgs.fetchpatch { - url = https://github.com/augustss/djinn/commit/6cb9433a137fb6b5194afe41d616bd8b62b95630.patch; + url = "https://github.com/augustss/djinn/commit/6cb9433a137fb6b5194afe41d616bd8b62b95630.patch"; sha256 = "0s021y5nzrh74gfp8xpxpxm11ivzfs3jwg6mkrlyry3iy584xqil"; }); @@ -1192,10 +1189,10 @@ self: super: { }); # Remove unecessary constraint: - # https://github.com/agrafix/superbuffer/pull/2 - superbuffer = overrideCabal super.superbuffer (drv: { + # https://github.com/haskell-infra/hackage-trustees/issues/258 + data-accessor-template = overrideCabal super.data-accessor-template (drv: { postPatch = '' - sed -i 's#QuickCheck < 2.10#QuickCheck < 2.13#' superbuffer.cabal + sed -i 's#template-haskell >=2.11 && <2.15#template-haskell#' data-accessor-template.cabal ''; }); @@ -1313,12 +1310,12 @@ self: super: { snap-server = overrideCabal super.snap-server (drv: { patches = [(pkgs.fetchpatch { # allow compilation with network >= 3 - url = https://github.com/snapframework/snap-server/pull/126/commits/4338fe15d68e11e3c7fd0f9862f818864adc1d45.patch; + url = "https://github.com/snapframework/snap-server/pull/126/commits/4338fe15d68e11e3c7fd0f9862f818864adc1d45.patch"; sha256 = "1nlw9lckm3flzkmhkzwc7zxhdh9ns33w8p8ds8nf574nqr5cr8bv"; }) (pkgs.fetchpatch { # prefer fdSocket over unsafeFdSocket - url = https://github.com/snapframework/snap-server/pull/126/commits/410de2df123b1d56b3093720e9c6a1ad79fe9de6.patch; + url = "https://github.com/snapframework/snap-server/pull/126/commits/410de2df123b1d56b3093720e9c6a1ad79fe9de6.patch"; sha256 = "08psvw0xny64q4bw1nwg01pkzh01ak542lw6k1ps7cdcwaxk0n94"; })]; }); @@ -1344,7 +1341,7 @@ self: super: { }); # cabal-fmt requires Cabal3 - cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_0_0_0; }; + cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; }; # Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that @@ -1463,6 +1460,11 @@ self: super: { # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; + # Needs the latest version of vty. + matterhorn = super.matterhorn.overrideScope (self: super: { + vty = self.vty_5_28_2; + }); + persistent-mysql = dontCheck super.persistent-mysql; # Fix EdisonAPI and EdisonCore for GHC 8.8: @@ -1488,4 +1490,16 @@ self: super: { # Needs a version that's newer than LTS-15.x provides. weeder = super.weeder.override { generic-lens = self.generic-lens_2_0_0_0; }; + polysemy-plugin = super.polysemy-plugin.override { + # polysemy-plugin 0.2.5.0 has constraint ghc-tcplugins-extra (==0.3.*) + # This upstream issue is relevant: + # https://github.com/polysemy-research/polysemy/issues/322 + ghc-tcplugins-extra = self.ghc-tcplugins-extra_0_3_2; + # version of Polysemy the plugin goes with + polysemy = self.polysemy_1_3_0_0; + }; + + # Fixed at head, but hasn't cut a release in awhile. + darcs = doJailbreak super.darcs; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 045c5dc1e5b..a607bc0b53b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -44,7 +44,7 @@ self: super: { text = self.text_1_2_4_0; # Needs Cabal 3.0.x. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; }; # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { @@ -63,7 +63,7 @@ self: super: { # https://github.com/jystic/hadoop-tools/issues/31 hadoop-rpc = let patch = pkgs.fetchpatch - { url = https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch; + { url = "https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch"; sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp"; stripLen = 1; }; @@ -73,7 +73,7 @@ self: super: { # https://github.com/NICTA/coordinate/pull/4 coordinate = let patch = pkgs.fetchpatch - { url = https://github.com/NICTA/coordinate/pull/4.patch; + { url = "https://github.com/NICTA/coordinate/pull/4.patch"; sha256 = "06sfxk5cyd8nqgjyb95jkihxxk8m6dw9m3mlv94sm2qwylj86gqy"; }; in appendPatch super.coordinate patch; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index c4c5ed9422f..72c06d6d8ab 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -40,9 +40,9 @@ self: super: { unix = null; xhtml = null; - # Needs Cabal 3.0.x. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; + # Needs Cabal 3.2.x. + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; }; # Restricts aeson to <1.4 # https://github.com/purescript/purescript/pull/3537 @@ -59,7 +59,7 @@ self: super: { # https://github.com/jystic/hadoop-tools/issues/31 hadoop-rpc = let patch = pkgs.fetchpatch - { url = https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch; + { url = "https://github.com/shlevy/hadoop-tools/commit/f03a46cd15ce3796932c3382e48bcbb04a6ee102.patch"; sha256 = "09ls54zy6gx84fmzwgvx18ssgm740cwq6ds70p0p125phi54agcp"; stripLen = 1; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 915f7b3e635..ff69c809288 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -42,8 +42,8 @@ self: super: { xhtml = null; # Needs Cabal 3.0.x. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; }; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; @@ -76,13 +76,10 @@ self: super: { # cabal2nix needs the latest version of Cabal, and the one # hackage-db uses must match, so take the latest - cabal2nix = super.cabal2nix.overrideScope (self: super: { - Cabal = self.Cabal_3_0_0_0; - hackage-db = self.hackage-db_2_1_0; - }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); # cabal2spec needs a recent version of Cabal - cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); + cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); # Builds only with ghc-8.8.x and beyond. policeman = markBroken super.policeman; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 1b5f64bea6b..8b38f8cef74 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,10 +41,13 @@ self: super: { unix = null; xhtml = null; + # These builds need Cabal 3.2.x. + cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; }; + cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + # Ignore overly restrictive upper version bounds. aeson-diff = doJailbreak super.aeson-diff; async = doJailbreak super.async; - cabal-install = doJailbreak super.cabal-install; ChasingBottoms = doJailbreak super.ChasingBottoms; chell = doJailbreak super.chell; cryptohash-sha256 = doJailbreak super.cryptohash-sha256; @@ -72,12 +75,6 @@ self: super: { time-compat = doJailbreak super.time-compat; http-media = doJailbreak super.http-media; servant-server = doJailbreak super.servant-server; - - # These packages don't work and need patching and/or an update. - hackage-security = appendPatch (doJailbreak super.hackage-security) (pkgs.fetchpatch { - url = "https://raw.githubusercontent.com/hvr/head.hackage/master/patches/hackage-security-0.5.3.0.patch"; - sha256 = "0l8x0pbsn18fj5ak5q0g5rva4xw1s9yc4d86a1pfyaz467b9i5a4"; - }); foundation = dontCheck super.foundation; vault = dontHaddock super.vault; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f0717b3514f..2f6a0b8978d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -69,14 +69,10 @@ core-packages: default-package-overrides: # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag - MissingH ==1.4.2.0 - # for cabal-install-3.0.0.0 - - hackage-security >=0.5.2.2 && <0.6 - # pandoc-2.9 does not accept the 0.3 version yet - - doclayout < 0.3 # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.4 + # LTS Haskell 15.6 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -88,7 +84,7 @@ default-package-overrides: - adjunctions ==4.4 - adler32 ==0.1.2.0 - advent-of-code-api ==0.2.7.0 - - aeson ==1.4.6.0 + - aeson ==1.4.7.1 - aeson-attoparsec ==0.0.0 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.2.0.0 @@ -238,7 +234,7 @@ default-package-overrides: - asif ==6.0.4 - asn1-encoding ==0.9.6 - asn1-parse ==0.9.5 - - asn1-types ==0.3.3 + - asn1-types ==0.3.4 - assert-failure ==0.1.2.2 - assoc ==1.0.1 - astro ==0.4.2.1 @@ -250,7 +246,7 @@ default-package-overrides: - atom-basic ==0.2.5 - atomic-primops ==0.8.3 - atomic-write ==0.2.0.7 - - attoparsec ==0.13.2.3 + - attoparsec ==0.13.2.4 - attoparsec-base64 ==0.0.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 @@ -267,7 +263,7 @@ default-package-overrides: - auto-update ==0.1.6 - avers ==0.0.17.1 - avro ==0.4.7.0 - - aws-cloudfront-signed-cookies ==0.2.0.1 + - aws-cloudfront-signed-cookies ==0.2.0.4 - base16-bytestring ==0.1.1.6 - base32string ==0.9.1 - base58string ==0.10.0 @@ -314,7 +310,7 @@ default-package-overrides: - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - bits-extra ==0.0.1.5 - - bitvec ==1.0.2.0 + - bitvec ==1.0.3.0 - blake2 ==0.3.0 - blanks ==0.3.0 - blas-carray ==0.1.0.1 @@ -323,7 +319,7 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.1.0 - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.3 + - blaze-markup ==0.8.2.4 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 @@ -342,10 +338,10 @@ default-package-overrides: - boundingboxes ==0.2.3 - bower-json ==1.0.0.1 - boxes ==0.1.5 - - brick ==0.52 + - brick ==0.52.1 - brittany ==0.12.1.1 - bsb-http-chunked ==0.0.0.4 - - bson ==0.4.0.0 + - bson ==0.4.0.1 - btrfs ==0.2.0.0 - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 @@ -406,10 +402,10 @@ default-package-overrides: - Chart ==1.9.3 - Chart-diagrams ==1.9.3 - chaselev-deque ==0.5.0.5 - - ChasingBottoms ==1.3.1.7 - - checkers ==0.5.4 + - ChasingBottoms ==1.3.1.8 + - checkers ==0.5.5 - checksum ==0.0 - - chimera ==0.3.0.0 + - chimera ==0.3.1.0 - choice ==0.2.2 - chronologique ==0.3.1.1 - chronos ==1.1 @@ -448,6 +444,7 @@ default-package-overrides: - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 - colour ==2.3.5 + - colourista ==0.0.0.0 - combinatorial ==0.1.0.1 - comfort-array ==0.4 - comfort-graph ==0.0.3.1 @@ -466,11 +463,11 @@ default-package-overrides: - concurrent-output ==1.10.11 - concurrent-split ==0.0.1.1 - cond ==0.4.1.1 - - conduit ==1.3.1.2 + - conduit ==1.3.2 - conduit-algorithms ==0.0.11.0 - conduit-combinators ==1.3.0 - conduit-concurrent-map ==0.1.1 - - conduit-extra ==1.3.4 + - conduit-extra ==1.3.5 - conduit-parse ==0.2.1.0 - conduit-zstd ==0.0.1.1 - conferer ==0.2.0.0 @@ -577,7 +574,7 @@ default-package-overrides: - data-tree-print ==0.1.0.2 - dataurl ==0.1.0.0 - DAV ==1.3.4 - - dbus ==1.2.12 + - dbus ==1.2.13 - debian-build ==0.10.2.0 - debug-trace-var ==0.2.0 - dec ==0.0.3 @@ -617,7 +614,7 @@ default-package-overrides: - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - distributive ==0.6.1 - - dl-fedora ==0.7.3 + - dl-fedora ==0.7.4 - dlist ==0.8.0.7 - dlist-instances ==0.1.1.1 - dlist-nonempty ==0.1.1 @@ -625,7 +622,7 @@ default-package-overrides: - dockerfile ==0.2.0 - doclayout ==0.2.0.1 - doctemplates ==0.8 - - doctest ==0.16.2 + - doctest ==0.16.3 - doctest-discover ==0.2.0.0 - doctest-driver-gen ==0.3.0.2 - doldol ==0.4.1.2 @@ -680,12 +677,12 @@ default-package-overrides: - epub-metadata ==4.5 - eq ==4.2 - equal-files ==0.0.5.3 - - equational-reasoning ==0.6.0.1 + - equational-reasoning ==0.6.0.2 - erf ==2.0.0.0 - errors ==2.3.0 - errors-ext ==0.4.2 - ersatz ==0.4.8 - - esqueleto ==3.3.1.1 + - esqueleto ==3.3.3.0 - etc ==0.4.1.0 - eventful-core ==0.2.0 - eventful-test-helpers ==0.2.0 @@ -703,8 +700,8 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.10 - exp-pairs ==0.2.0.0 - - express ==0.1.2 - - extended-reals ==0.2.3.0 + - express ==0.1.3 + - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - extra ==1.6.21 @@ -721,7 +718,7 @@ default-package-overrides: - feature-flags ==0.1.0.1 - fedora-dists ==1.1.2 - fedora-haskell-tools ==0.9 - - feed ==1.3.0.0 + - feed ==1.3.0.1 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 - fgl ==5.7.0.2 @@ -739,9 +736,9 @@ default-package-overrides: - finite-typelits ==0.1.4.2 - first-class-families ==0.7.0.0 - first-class-patterns ==0.3.2.5 - - fitspec ==0.4.7 + - fitspec ==0.4.8 - fixed ==0.3 - - fixed-length ==0.2.1 + - fixed-length ==0.2.2 - fixed-vector ==1.2.0.0 - fixed-vector-hetero ==0.5.0.0 - flac ==0.2.0 @@ -803,10 +800,10 @@ default-package-overrides: - generic-lens ==1.2.0.1 - generic-monoid ==0.1.0.0 - GenericPretty ==1.2.2 - - generic-random ==1.3.0.0 - - generics-sop ==0.5.0.0 - - generics-sop-lens ==0.2 - - genvalidity ==0.10.0.1 + - generic-random ==1.3.0.1 + - generics-sop ==0.5.1.0 + - generics-sop-lens ==0.2.0.1 + - genvalidity ==0.10.0.2 - genvalidity-aeson ==0.3.0.0 - genvalidity-bytestring ==0.5.0.1 - genvalidity-containers ==0.8.0.2 @@ -834,12 +831,12 @@ default-package-overrides: - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-exactprint ==0.6.2 - - ghcid ==0.8.3 + - ghcid ==0.8.5 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - ghc-lib ==8.8.3.20200224 - ghc-lib-parser ==8.8.3.20200224 - - ghc-lib-parser-ex ==8.8.5.6 + - ghc-lib-parser-ex ==8.8.5.8 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.6 - ghc-source-gen ==0.3.0.0 @@ -892,7 +889,7 @@ default-package-overrides: - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - greskell ==1.0.0.1 - - greskell-core ==0.1.3.1 + - greskell-core ==0.1.3.2 - greskell-websocket ==0.1.2.1 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 @@ -918,7 +915,7 @@ default-package-overrides: - haskell-lexer ==1.1 - haskell-lsp ==0.20.0.1 - haskell-lsp-types ==0.20.0.0 - - haskell-names ==0.9.7 + - haskell-names ==0.9.8 - haskell-src ==1.0.3.1 - haskell-src-exts ==1.22.0 - haskell-src-exts-util ==0.2.5 @@ -926,7 +923,7 @@ default-package-overrides: - haskey-btree ==0.3.0.1 - haskoin-core ==0.10.1 - haskoin-node ==0.9.16 - - hasql ==1.4.1 + - hasql ==1.4.2 - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 - hasql-transaction ==1.0.0.1 @@ -934,7 +931,7 @@ default-package-overrides: - HaXml ==1.25.5 - haxr ==3000.11.4 - hdaemonize ==0.5.6 - - headroom ==0.1.2.0 + - headroom ==0.1.3.0 - heap ==1.0.4 - heaps ==0.3.6.1 - heart-core ==0.1.1 @@ -943,7 +940,7 @@ default-package-overrides: - hedgehog-corpus ==0.2.0 - hedgehog-fn ==1.0 - hedgehog-quickcheck ==0.1.1 - - hedis ==0.12.11 + - hedis ==0.12.13 - here ==1.2.13 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.3 @@ -985,7 +982,7 @@ default-package-overrides: - hreader-lens ==0.1.3.0 - hruby ==0.3.8 - hs-bibutils ==6.8.0.0 - - hsc2hs ==0.68.6 + - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - hsebaysdk ==0.4.0.0 @@ -1014,7 +1011,7 @@ default-package-overrides: - hspec-expectations-pretty-diff ==0.7.2.5 - hspec-golden ==0.1.0.1 - hspec-golden-aeson ==0.7.0.0 - - hspec-leancheck ==0.0.3 + - hspec-leancheck ==0.0.4 - hspec-megaparsec ==2.1.0 - hspec-meta ==2.6.0 - hspec-need-env ==0.1.0.4 @@ -1150,7 +1147,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.1.0 - ip ==1.7.1 - ip6addr ==1.0.1 - - iproute ==1.7.8 + - iproute ==1.7.9 - IPv6Addr ==1.1.3 - ipynb ==0.1 - ipython-kernel ==0.10.1.0 @@ -1206,7 +1203,7 @@ default-package-overrides: - language-c-quote ==0.12.2.1 - language-haskell-extract ==0.2.4 - language-java ==0.2.9 - - language-javascript ==0.7.0.0 + - language-javascript ==0.7.1.0 - language-protobuf ==1.0.1 - language-puppet ==1.4.6.2 - lapack-carray ==0.0.3 @@ -1220,7 +1217,7 @@ default-package-overrides: - lazy-csv ==0.5.1 - lazyio ==0.1.0.4 - lca ==0.3.1 - - leancheck ==0.9.1 + - leancheck ==0.9.3 - leancheck-instances ==0.0.3 - leapseconds-announced ==2017.1.0.1 - learn-physics ==0.6.5 @@ -1272,7 +1269,7 @@ default-package-overrides: - loopbreaker ==0.1.1.1 - lrucache ==1.2.0.1 - lrucaching ==0.3.3 - - lsp-test ==0.10.1.0 + - lsp-test ==0.10.2.0 - lucid ==2.9.12 - lucid-extras ==0.2.2 - lzma ==0.0.0.3 @@ -1469,7 +1466,7 @@ default-package-overrides: - once ==0.4 - one-liner ==1.0 - one-liner-instances ==0.1.2.1 - - OneTuple ==0.2.2 + - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - opaleye ==0.6.7004.1 @@ -1654,7 +1651,7 @@ default-package-overrides: - purescript-bridge ==0.13.0.0 - pushbullet-types ==0.4.1.0 - pusher-http-haskell ==1.5.1.11 - - PyF ==0.9.0.0 + - PyF ==0.9.0.1 - qchas ==1.1.0.1 - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.2 @@ -1727,16 +1724,16 @@ default-package-overrides: - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.2 - - relational-schemas ==0.1.7.0 + - relational-schemas ==0.1.8.0 - relude ==0.6.0.0 - renderable ==0.2.0.1 - - replace-attoparsec ==1.2.0.0 + - replace-attoparsec ==1.2.1.0 - replace-megaparsec ==1.2.1.0 - repline ==0.2.2.0 - req ==3.1.0 - req-conduit ==1.0.0 - rerebase ==1.4.1 - - resolv ==0.1.1.3 + - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - resourcet ==1.2.3 - result ==0.2.6.0 @@ -1770,7 +1767,7 @@ default-package-overrides: - safe-json ==1.1.0 - safe-money ==0.9 - SafeSemaphore ==0.10.1 - - salak ==0.3.5.3 + - salak ==0.3.6 - salak-yaml ==0.3.5.3 - saltine ==0.1.1.0 - salve ==1.0.8 @@ -1848,7 +1845,7 @@ default-package-overrides: - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 - - set-cover ==0.1 + - set-cover ==0.1.1 - setenv ==0.1.1.3 - setlocale ==1.0.0.9 - SHA ==1.6.4.4 @@ -1868,7 +1865,7 @@ default-package-overrides: - simple-affine-space ==0.1 - simple-cabal ==0.1.1 - simple-cmd ==0.2.1 - - simple-cmd-args ==0.1.5 + - simple-cmd-args ==0.1.6 - simple-log ==0.9.12 - simple-reflect ==0.3.3 - simple-sendfile ==0.2.30 @@ -1878,7 +1875,7 @@ default-package-overrides: - simplistic-generics ==0.1.0.0 - since ==0.0.0 - singleton-bool ==0.1.5 - - singleton-nats ==0.4.3 + - singleton-nats ==0.4.4 - singletons ==2.6 - singletons-presburger ==0.3.0.0 - siphash ==1.0.3 @@ -1901,7 +1898,7 @@ default-package-overrides: - soap-tls ==0.1.1.4 - socks ==0.6.1 - some ==1.0.1 - - sop-core ==0.5.0.0 + - sop-core ==0.5.0.1 - sort ==1.0.0.0 - sorted-list ==0.2.1.0 - sourcemap ==0.1.6 @@ -1939,7 +1936,7 @@ default-package-overrides: - stm-split ==0.0.2.1 - stopwatch ==0.1.0.6 - storable-complex ==0.2.3.0 - - storable-record ==0.0.4.1 + - storable-record ==0.0.5 - storable-tuple ==0.0.3.3 - storablevector ==0.2.13 - stratosphere ==0.49.0 @@ -2093,7 +2090,7 @@ default-package-overrides: - timezone-series ==0.1.9 - tinylog ==0.15.0 - titlecase ==1.0.1 - - tldr ==0.6.2 + - tldr ==0.6.4 - tls ==1.5.4 - tls-debug ==0.4.8 - tls-session-manager ==0.0.4 @@ -2102,7 +2099,7 @@ default-package-overrides: - tmp-postgres ==1.34.1.0 - tomland ==1.2.1.0 - tonalude ==0.1.1.0 - - topograph ==1 + - topograph ==1.0.0.1 - torsor ==0.1 - tostring ==0.2.1.1 - tracing ==0.0.4.0 @@ -2125,7 +2122,7 @@ default-package-overrides: - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.17 + - turtle ==1.5.18 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 @@ -2179,7 +2176,7 @@ default-package-overrides: - unix-time ==0.4.7 - unliftio ==0.2.12.1 - unliftio-core ==0.1.2.0 - - unliftio-pool ==0.2.1.0 + - unliftio-pool ==0.2.1.1 - unlit ==0.4.0.0 - unordered-containers ==0.2.10.0 - unordered-intmap ==0.1.1 @@ -2194,7 +2191,7 @@ default-package-overrides: - utf8-light ==0.4.2 - utf8-string ==1.0.1.1 - util ==0.1.17.1 - - utility-ht ==0.0.14 + - utility-ht ==0.0.15 - uuid ==1.3.13 - uuid-types ==1.0.3 - validation ==1.1 @@ -2261,7 +2258,7 @@ default-package-overrides: - websockets ==0.12.7.0 - websockets-snap ==0.10.3.1 - weigh ==0.0.16 - - wide-word ==0.1.1.0 + - wide-word ==0.1.1.1 - wikicfp-scraper ==0.1.0.11 - wild-bind ==0.1.2.5 - wild-bind-x11 ==0.2.0.9 @@ -2320,7 +2317,7 @@ default-package-overrides: - xxhash-ffi ==0.2.0.0 - yaml ==0.11.3.0 - yesod ==1.6.0.1 - - yesod-auth ==1.6.9 + - yesod-auth ==1.6.10 - yesod-auth-hashdb ==1.7.1.2 - yesod-bin ==1.6.0.4 - yesod-core ==1.6.17.3 @@ -2373,6 +2370,7 @@ extra-packages: - dhall == 1.29.0 # required for spago 0.14.0. - doctemplates == 0.8 # required by pandoc-2.9.x - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x + - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock == 2.22.* # required on GHC 8.0.x - haddock-api == 2.22.* # required on GHC 7.8.x @@ -2456,7 +2454,10 @@ package-maintainers: # - pipes-mongodb - streaming-wai kiwi: - # - glirc + - glirc + - matterhorn + - mattermost-api + - mattermost-api-qc - Unique psibi: - path-pieces @@ -2466,12 +2467,16 @@ package-maintainers: - shakespeare abbradar: - Agda + roberth: + - arion-compose cdepillabout: - pretty-simple - spago - termonad rkrzr: - icepeak + terlar: + - nix-diff unsupported-platforms: alsa-mixer: [ x86_64-darwin ] @@ -2677,7 +2682,6 @@ broken-packages: - adaptive-containers - adaptive-tuple - adb - - adblock2privoxy - adhoc-network - adict - adobe-swatch-exchange @@ -2733,12 +2737,10 @@ broken-packages: - aivika-distributed - ajhc - AlanDeniseEricLauren - - alarmclock - alerta - alex-prelude - alfred - alga - - algebra-checkers - algebra-dag - algebra-sql - algebraic @@ -2787,7 +2789,6 @@ broken-packages: - animate-frames - animate-preview - animate-sdl2 - - anki-tools - annah - Annotations - anonymous-sums @@ -2860,7 +2861,6 @@ broken-packages: - arguedit - ariadne - arion - - arion-compose - armada - armor - arpa @@ -2879,9 +2879,7 @@ broken-packages: - artery - artifact - asap - - ascetic - ascii - - ascii-cows - ascii-flatten - ascii-string - ascii-table @@ -2979,7 +2977,6 @@ broken-packages: - aws-kinesis-client - aws-kinesis-reshard - aws-lambda - - aws-lambda-haskell-runtime - aws-mfa-credentials - aws-performance-tests - aws-route53 @@ -3019,7 +3016,6 @@ broken-packages: - bamstats - Bang - bank-holiday-usa - - bank-holidays-england - banwords - barchart - barcodes-code128 @@ -3028,7 +3024,6 @@ broken-packages: - barrie - barrier - barrier-monad - - base-compat-migrate - base-feature-macros - base-generics - base-io-access @@ -3109,7 +3104,6 @@ broken-packages: - binary-search - binary-streams - binary-strict - - binary-tagged - binary-typed - bind-marshal - BinderAnn @@ -3361,7 +3355,6 @@ broken-packages: - cabal-dependency-licenses - cabal-dev - cabal-dir - - cabal-file-th - cabal-ghc-dynflags - cabal-ghci - cabal-graphdeps @@ -3380,7 +3373,6 @@ broken-packages: - cabal-sort - cabal-src - cabal-test - - cabal-toolkit - cabal-upload - cabal2arch - cabal2doap @@ -3426,7 +3418,6 @@ broken-packages: - cao - cap - Capabilities - - capability - capnp - capped-list - capri @@ -3440,7 +3431,6 @@ broken-packages: - carte - cartel - Cartesian - - cas-store - casa-abbreviations-and-acronyms - casadi-bindings - casadi-bindings-control @@ -3506,12 +3496,12 @@ broken-packages: - cgrep - chalkboard - chalkboard-viewer - - character-cases - charade - chart-cli - Chart-fltkhs - chart-histogram - Chart-simple + - chart-svg - chart-unit - chatter - chatty-text @@ -3569,8 +3559,6 @@ broken-packages: - clarifai - CLASE - clash - - clash-ghc - - clash-lib - clash-multisignal - Clash-Royale-Hack-Cheats - clash-systemverilog @@ -3595,7 +3583,6 @@ broken-packages: - clckwrks-theme-clckwrks - clckwrks-theme-geo-bootstrap - Clean - - clean-home - clean-unions - cless - clevercss @@ -3657,7 +3644,6 @@ broken-packages: - codemonitor - codepad - codeworld-api - - codex - codo-notation - coin - coinbase-exchange @@ -3740,7 +3726,6 @@ broken-packages: - concurrent-buffer - Concurrent-Cache - concurrent-machines - - concurrent-resource-map - concurrent-state - concurrent-utilities - Concurrential @@ -3767,7 +3752,6 @@ broken-packages: - conferer-provider-dhall - conferer-provider-yaml - conferer-snap - - confetti - conffmt - confide - config-parser @@ -3779,7 +3763,6 @@ broken-packages: - configuration - configuration-tools - configurator-ng - - configurator-pg - confsolve - congruence-relation - conjure @@ -3869,7 +3852,6 @@ broken-packages: - cparsing - CPBrainfuck - cpio-conduit - - cpkg - CPL - cplusplus-th - cprng-aes-effect @@ -3969,7 +3951,6 @@ broken-packages: - Dao - dao - dapi - - darcs - darcs-benchmark - darcs-beta - darcs-buildpackage @@ -3988,14 +3969,12 @@ broken-packages: - dash-haskell - data-accessor-monads-fd - data-accessor-monads-tf - - data-accessor-template - data-aviary - data-base - data-basic - data-category - data-check - data-combinator-gen - - data-compat - data-concurrent-queue - data-construction - data-cycle @@ -4018,8 +3997,6 @@ broken-packages: - data-lens-ixset - data-lens-template - data-map-multikey - - data-msgpack - - data-msgpack-types - data-nat - data-object - data-object-json @@ -4133,7 +4110,6 @@ broken-packages: - dependent-monoidal-map - dependent-state - dependent-sum-aeson-orphans - - dependent-sum-template - depends - dephd - deptrack-core @@ -4146,13 +4122,11 @@ broken-packages: - derive-gadt - derive-IG - derive-monoid - - derive-storable-plugin - derive-topdown - derive-trie - derp-lib - describe - descript-lang - - desert - deterministic-game-engine - detour-via-uom - deunicode @@ -4187,7 +4161,6 @@ broken-packages: - diagrams-wx - dialogflow-fulfillment - dib - - dice - dice-entropy-conduit - dice2tex - dicom @@ -4230,7 +4203,6 @@ broken-packages: - dirtree - discogs-haskell - discord-gateway - - discord-haskell - discord-hs - discord-rest - discord-types @@ -4415,35 +4387,27 @@ broken-packages: - effect-monad - effect-stack - effin - - egison-pattern-src-th-mode - egison-quote - ehaskell - ehs - eibd-client-simple - eigen - Eight-Ball-Pool-Hack-Cheats - - either-list-functions - either-unwrap - EitherT - - ekg - ekg-bosun - ekg-carbon - - ekg-cloudwatch - ekg-elastic - ekg-elasticsearch - - ekg-influxdb - - ekg-json - ekg-log - ekg-push - ekg-rrd - - ekg-statsd - ekg-wai - elerea-examples - elevator - elision - elm-street - elm-websocket - - elsa - elynx-seq - elynx-tools - elynx-tree @@ -4697,14 +4661,12 @@ broken-packages: - fibon - ficketed - fields - - fields-json - FieldTrip - fieldwise - fig - file-collection - file-command-qq - file-location - - file-modules - filediff - FileManip - FileManipCompat @@ -4794,7 +4756,6 @@ broken-packages: - FModExRaw - fmt-for-rio - fn-extra - - Focus - foldl-incremental - foldl-statistics - foldl-transduce @@ -5050,6 +5011,7 @@ broken-packages: - ghc-srcspan-plugin - ghc-syb - ghc-syb-utils + - ghc-tags-core - ghc-tags-plugin - ghc-time-alloc-prof - ghc-usage @@ -5140,7 +5102,6 @@ broken-packages: - gli - glicko - glider-nlp - - glirc - GLMatrix - glob-posix - global @@ -5160,10 +5121,6 @@ broken-packages: - gloss-sodium - glpk-hs - glue - - glue-common - - glue-core - - glue-ekg - - glue-example - GLUtil - gmap - gmndl @@ -5220,8 +5177,6 @@ broken-packages: - gps2htmlReport - GPX - gpx-conduit - - grab - - grab-form - graceful - grafana - graflog @@ -5295,11 +5250,9 @@ broken-packages: - gsl-random-fu - gstorable - gstreamer - - gt-tools - GTALib - gtfs - gtfs-realtime - - gtk-jsinput - gtk-serialized-event - gtk-toy - gtk2hs-hello @@ -5399,7 +5352,6 @@ broken-packages: - hakyll-R - hakyll-series - hakyll-shortcode - - hakyll-shortcut-links - hakyll-typescript - hal - halberd @@ -5487,8 +5439,6 @@ broken-packages: - harvest-api - has - has-th - - hasbolt - - hasbolt-extras - HasCacBDD - hascar - hascas @@ -5510,7 +5460,6 @@ broken-packages: - haskarrow - haskbot-core - haskdeep - - haskdogs - haskeem - haskeline-class - haskelisp @@ -5556,10 +5505,8 @@ broken-packages: - haskell-src-exts-prisms - haskell-src-exts-qq - haskell-src-exts-sc - - haskell-src-exts-simple - haskell-src-meta-mwotton - haskell-stack-trace-plugin - - haskell-to-elm - haskell-token-utils - haskell-tools-ast - haskell-tools-ast-fromghc @@ -5678,7 +5625,6 @@ broken-packages: - haste-lib - haste-markup - haste-prim - - Hastodon - Hate - hatex-guide - HaTeX-meta @@ -5755,7 +5701,6 @@ broken-packages: - HDRUtils - headed-megaparsec - headergen - - headroom - heapsort - heart-app - heart-core @@ -5780,7 +5725,6 @@ broken-packages: - hedis-pile - hedis-simple - hedis-tags - - hedn - hedn-functor - hedra - hein @@ -5992,7 +5936,6 @@ broken-packages: - hmumps - hnetcdf - hnix - - hnix-store-core - hnix-store-remote - HNM - hnormalise @@ -6041,7 +5984,6 @@ broken-packages: - hoodle-types - hoogle-index - hooks-dir - - hookup - hoopl - hoovie - hopencc @@ -6141,7 +6083,6 @@ broken-packages: - hs-re - hs-rs-notify - hs-scrape - - hs-server-starter - hs-snowtify - hs-twitter - hs-twitterarchiver @@ -6150,7 +6091,6 @@ broken-packages: - hs2bf - Hs2lib - hs2ps - - hS3 - hsaml2 - hsay - hsbackup @@ -6201,7 +6141,6 @@ broken-packages: - hsgnutls - hsgnutls-yj - hsgsom - - HSH - HsHaruPDF - HSHHelpers - HsHTSLib @@ -6240,13 +6179,11 @@ broken-packages: - hspec-expectations-pretty - hspec-experimental - hspec-hashable - - hspec-hedgehog - hspec-jenkins - hspec-monad-control - hspec-pg-transact - hspec-setup - hspec-shouldbe - - hspec-snap - hspec-structured-formatter - hspec-test-sandbox - hspec-webdriver @@ -6277,6 +6214,7 @@ broken-packages: - hssqlppp - hssqlppp-th - HsSVN + - hstar - hstatistics - hstats - hstatsd @@ -6298,7 +6236,6 @@ broken-packages: - hsXenCtrl - hsyscall - hsyslog-tcp - - hsyslog-udp - hszephyr - HTab - hTalos @@ -6342,7 +6279,6 @@ broken-packages: - http-response-decoder - http-server - http-shed - - http-trace - http-wget - http2-client - http2-client-exe @@ -6455,7 +6391,6 @@ broken-packages: - identifiers - idiii - idna2008 - - idringen - idris - IDynamic - ieee-utils @@ -6552,7 +6487,6 @@ broken-packages: - InternedData - internetmarke - intero - - interp - interpol - interpolatedstring-qq - interpolatedstring-qq-mwotton @@ -6637,7 +6571,6 @@ broken-packages: - ivy-web - ixdopp - ixmonad - - ixset-typed - ixshader - iyql - j2hs @@ -6693,7 +6626,6 @@ broken-packages: - json-assertions - json-ast-json-encoder - json-ast-quickcheck - - json-autotype - json-b - json-builder - json-bytes-builder @@ -6896,7 +6828,6 @@ broken-packages: - language-csharp - language-css - language-dart - - language-docker - language-dockerfile - language-ecmascript-analysis - language-eiffel @@ -6937,7 +6868,6 @@ broken-packages: - latest-npm-version - latex-formulae-hakyll - latex-formulae-pandoc - - latex-live-snippets - LATS - launchdarkly-server-sdk - launchpad-control @@ -6969,7 +6899,6 @@ broken-packages: - learn - learn-physics-examples - Learning - - learning-hmm - leetify - legion - legion-discovery @@ -7004,7 +6933,6 @@ broken-packages: - lhe - lhs2TeX-hl - lhslatex - - libarchive - LibClang - libconfig - libcspm @@ -7036,7 +6964,6 @@ broken-packages: - libxslt - licensor - lie - - life-sync - lifted-base-tf - lifted-protolude - lifted-stm @@ -7118,6 +7045,7 @@ broken-packages: - llvm-base-types - llvm-base-util - llvm-data-interop + - llvm-dsl - llvm-extension - llvm-extra - llvm-ffi @@ -7137,8 +7065,6 @@ broken-packages: - lmonad-yesod - load-balancing - load-font - - loc - - loc-test - local-address - local-search - localize @@ -7150,7 +7076,6 @@ broken-packages: - log-elasticsearch - log-postgres - log-utils - - log-warper - log2json - logentries - logger @@ -7224,7 +7149,6 @@ broken-packages: - lxd-client - lye - Lykah - - lz4-bytes - lz4-conduit - lzma-enumerator - lzma-streams @@ -7256,7 +7180,6 @@ broken-packages: - mahoro - maid - mail-pool - - mailbox-count - mailchimp - mailchimp-subscribe - MailchimpSimple @@ -7316,14 +7239,10 @@ broken-packages: - math-metric - mathblog - mathflow - - mathista - mathlink - matrix-as-xyz - matrix-market - matsuri - - matterhorn - - mattermost-api - - mattermost-api-qc - maude - maxent - maxent-learner-hw @@ -7336,7 +7255,6 @@ broken-packages: - MazesOfMonad - MBot - mbox-tools - - mbtiles - mbug - MC-Fold-DP - mcl @@ -7424,7 +7342,6 @@ broken-packages: - miku - milena - mime-directory - - min-max-pqueue - minecraft-data - minesweeper - miniforth @@ -7439,7 +7356,6 @@ broken-packages: - minst-idx - mios - mirror-tweet - - misfortune - miso-action-logger - miso-examples - miss @@ -7492,7 +7408,6 @@ broken-packages: - monad-logger-syslog - monad-lrs - monad-mersenne-random - - monad-metrics - monad-metrics-extensible - monad-mock - monad-open @@ -7554,7 +7469,6 @@ broken-packages: - monus - monzo - moo - - moonshine - morfette - morfeusz - morley @@ -7621,7 +7535,6 @@ broken-packages: - multibase - multifocal - multihash - - multihash-cryptonite - multihash-serialise - multilinear - multilinear-io @@ -7689,7 +7602,6 @@ broken-packages: - n-tuple - n2o-protocols - n2o-web - - nagios-perfdata - nagios-plugin-ekg - nakadi-client - named-lock @@ -7722,7 +7634,6 @@ broken-packages: - needle - neet - nehe-tuts - - neil - neither - neko-lib - Neks @@ -7771,7 +7682,6 @@ broken-packages: - network-hans - network-house - network-interfacerequest - - network-messagepack-rpc - network-messagepack-rpc-websocket - network-minihttp - network-msgpack-rpc @@ -7821,7 +7731,6 @@ broken-packages: - nitro - nix-delegate - nix-deploy - - nix-diff - nix-eval - nix-freeze-tree - nix-tools @@ -7990,7 +7899,6 @@ broken-packages: - ordrea - organize-imports - orgmode - - orgstat - origami - orizentic - OrPatterns @@ -8007,7 +7915,6 @@ broken-packages: - OTP - otp-authenticator - ottparse-pretty - - outsort - overload - overloaded-records - overture @@ -8033,7 +7940,6 @@ broken-packages: - pam - pan-os-syslog - panda - - pandoc-crossref - pandoc-emphasize-code - pandoc-filter-graphviz - pandoc-include @@ -8099,13 +8005,10 @@ broken-packages: - parser-helper - parser241 - parsergen - - parsers-megaparsec - parsestar - parsimony - - parsix - partage - partial-lens - - partial-order - partial-records - partial-semigroup - partial-semigroup-hedgehog @@ -8197,7 +8100,6 @@ broken-packages: - persistent-redis - persistent-relational-record - persistent-template-classy - - persistent-typed-db - persistent-vector - persistent-zookeeper - persona @@ -8216,7 +8118,6 @@ broken-packages: - phasechange - phaser - phoityne - - phoityne-vscode - phone-numbers - phone-push - phooey @@ -8258,7 +8159,6 @@ broken-packages: - pipes-conduit - pipes-core - pipes-courier - - pipes-csv - pipes-errors - pipes-extra - pipes-files @@ -8337,11 +8237,9 @@ broken-packages: - polydata - polydata-core - polynomial - - polysemy-plugin - polysemy-RandomFu - polysemy-zoo - polyseq - - polysoup - polytypeable - polytypeable-utils - pomodoro @@ -8647,17 +8545,12 @@ broken-packages: - random-derive - random-eff - random-effin - - random-extras - - random-fu - - random-fu-multivariate - random-hypergeometric - random-stream - RandomDotOrg - - Randometer - Range - range-space - rangemin - - rank-product - rank1dynamic - Ranka - rapid @@ -8746,8 +8639,6 @@ broken-packages: - Referees - references - refh - - refined - - refined-http-api-data - reflection-extras - reflex - reflex-animation @@ -8850,7 +8741,6 @@ broken-packages: - req-conduit - req-oauth2 - req-url-extra - - reqcatcher - request-monad - require - reserve @@ -8874,7 +8764,6 @@ broken-packages: - rest-types - rest-wai - restful-snap - - restless-git - restricted-workers - restyle - rethinkdb @@ -8903,7 +8792,6 @@ broken-packages: - rib - ribbit - RichConditional - - richreports - ridley - ridley-extras - riemann @@ -8989,7 +8877,6 @@ broken-packages: - rungekutta - runmany - runtime-arbitrary - - rvar - rws - RxHaskell - s-expression @@ -9000,10 +8887,8 @@ broken-packages: - safe-failure-cme - safe-freeze - safe-globals - - safe-json - safe-lazy-io - safe-length - - safe-money-xmlbf - safe-plugins - safe-printf - safecopy-migrate @@ -9169,7 +9054,6 @@ broken-packages: - servant-db-postgresql - servant-dhall - servant-ede - - servant-ekg - servant-errors - servant-examples - servant-exceptions @@ -9203,15 +9087,12 @@ broken-packages: - servant-scotty - servant-server-namedargs - servant-smsc-ru - - servant-snap - servant-streaming - servant-streaming-client - servant-streaming-docs - servant-streaming-server - servant-swagger-tags - - servant-to-elm - servant-waargonaut - - servant-xml - servant-zeppelin - servant-zeppelin-client - servant-zeppelin-server @@ -9220,7 +9101,6 @@ broken-packages: - serversession-backend-acid-state - serversession-backend-persistent - serversession-backend-redis - - serversession-frontend-snap - serversession-frontend-yesod - services - ses-html-snaplet @@ -9231,7 +9111,6 @@ broken-packages: - set-of - set-with - setdown - - setgame - setoid - setters - sexp @@ -9356,7 +9235,6 @@ broken-packages: - siphon - siren-json - sirkel - - sitepipe - sixfiguregroup - sized-grid - sized-types @@ -9368,7 +9246,6 @@ broken-packages: - skeletons - skell - skemmtun - - skews - skulk - skylark-client - skylighting-lucid @@ -9377,7 +9254,6 @@ broken-packages: - slack-notify-haskell - slack-web - slave-thread - - slice-cpp-gen - sliceofpy - slidemews - Slides @@ -9440,7 +9316,6 @@ broken-packages: - snaplet-customauth - snaplet-environments - snaplet-fay - - snaplet-ghcjs - snaplet-hasql - snaplet-haxl - snaplet-hdbc @@ -9485,7 +9360,6 @@ broken-packages: - snowflake-server - snowtify - Snusmumrik - - soap-openssl - SoccerFun - SoccerFunGL - socket-activation @@ -9549,7 +9423,6 @@ broken-packages: - spiros - splay - splaytree - - spline3 - splines - split-morphism - splitter @@ -9608,7 +9481,6 @@ broken-packages: - stack-prism - stack-run - stack-run-auto - - stack-tag - stack-type - stack-wrapper - stack2cabal @@ -9639,10 +9511,8 @@ broken-packages: - stateWriter - static-canvas - static-closure - - static-resources - static-tensor - static-text - - staticanalysis - statistics-dirichlet - statistics-fusion - statistics-hypergeometric-genvar @@ -9850,7 +9720,6 @@ broken-packages: - tagsoup-parsec - tagsoup-selection - tagstream-conduit - - tai - tai64 - takahashi - Takusen @@ -9907,7 +9776,6 @@ broken-packages: - template-yj - templateify - templatepg - - tempo - tempodb - temporal-csound - tempus @@ -9957,7 +9825,6 @@ broken-packages: - text-containers - text-format - text-format-heavy - - text-format-simple - text-generic-pretty - text-icu-normalized - text-lens @@ -9969,7 +9836,6 @@ broken-packages: - text-plus - text-position - text-register-machine - - text-replace - text-time - text-trie - text-utf8 @@ -9989,7 +9855,6 @@ broken-packages: - th-dict-discovery - th-fold - th-format - - th-instance-reification - th-instances - th-kinds - th-kinds-fork @@ -10010,7 +9875,6 @@ broken-packages: - Thingie - thorn - threadmanager - - threadscope - threepenny-editors - threepenny-gui-contextmenu - threepenny-gui-flexbox @@ -10056,7 +9920,6 @@ broken-packages: - timeseries - timespan - timeutils - - timezone-olson-th - timezone-unix - tintin - tiny-scheduler @@ -10109,6 +9972,7 @@ broken-packages: - touched - Tournament - toxcore + - toxcore-c - toxiproxy-haskell - toysolver - tpar @@ -10157,17 +10021,6 @@ broken-packages: - treap - tree-monad - tree-render-text - - tree-sitter - - tree-sitter-go - - tree-sitter-haskell - - tree-sitter-java - - tree-sitter-json - - tree-sitter-php - - tree-sitter-python - - tree-sitter-ql - - tree-sitter-ruby - - tree-sitter-tsx - - tree-sitter-typescript - tree-traversals - TreeCounter - treemap-html @@ -10266,7 +10119,6 @@ broken-packages: - type-tree - typeable-th - TypeClass - - typed-spreadsheet - typed-streams - typed-wire - typedflow @@ -10327,7 +10179,6 @@ broken-packages: - uniquely-represented-sets - units-attoparsec - unittyped - - unity-testresult-parser - unitym-yesod - universal-binary - universe-th @@ -10385,7 +10236,6 @@ broken-packages: - usb-id-database - usb-iteratee - usb-safe - - useragents - users-mysql-haskell - users-persistent - utc @@ -10422,7 +10272,6 @@ broken-packages: - validate-input - validated-types - Validation - - validation-selective - validations - validationt - value-supply @@ -10472,7 +10321,6 @@ broken-packages: - verifiable-expressions - verify - verilog - - verismith - versioning - versioning-servant - vflow-types @@ -10548,7 +10396,6 @@ broken-packages: - wai-middleware-etag - wai-middleware-headers - wai-middleware-hmac-client - - wai-middleware-metrics - wai-middleware-preprocessor - wai-middleware-rollbar - wai-middleware-route @@ -10590,7 +10437,6 @@ broken-packages: - weather-api - web-css - web-encodings - - web-fpco - web-inv-route - web-mongrel2 - web-output @@ -10639,7 +10485,6 @@ broken-packages: - whiskers - whitespace - whois - - wholepixels - why3 - WikimediaParser - wikipedia4epub @@ -10670,7 +10515,6 @@ broken-packages: - word2vec-model - WordAlignment - wordify - - wordlist - WordNet - WordNet-ghc74 - wordpass @@ -10697,7 +10541,6 @@ broken-packages: - wsdl - wsedit - wshterm - - wss-client - wtk - wtk-gtk - wu-wei @@ -10764,9 +10607,6 @@ broken-packages: - xml-tydom-core - xml2json - xml2x - - xmlbf - - xmlbf-xeno - - xmlbf-xmlhtml - XmlHtmlWriter - xmltv - XMMS diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ff1c01aa8e8..4aa3327e2b4 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -572,17 +572,34 @@ self: super: builtins.intersectAttrs super { # The test-suite requires a running PostgreSQL server. Frames-beam = dontCheck super.Frames-beam; - futhark = if pkgs.stdenv.isDarwin then super.futhark else with pkgs; - let path = stdenv.lib.makeBinPath [ gcc ]; - in overrideCabal (addBuildTool super.futhark makeWrapper) (_drv: { - postInstall = '' - wrapProgram $out/bin/futhark \ - --prefix PATH : "${path}" \ - --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ - --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ - --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib" - ''; - }); + # * Compile manpages (which are in RST and are compiled with Sphinx). + # + # * Wrap so that binary can find GCC and OpenCL headers (dubious if + # a good idea). + futhark = with pkgs; + let maybeWrap = + if pkgs.stdenv.isDarwin then "" + else + let path = stdenv.lib.makeBinPath [ gcc ]; + in '' + wrapProgram $out/bin/futhark \ + --prefix PATH : "${path}" \ + --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ + --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ + --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib" + ''; + in overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx]) + (_drv: { + postBuild = (_drv.postBuild or "") + '' + make -C docs man + ''; + + postInstall = (_drv.postInstall or "") + '' + mkdir -p $out/share/man/man1 + mv docs/_build/man/*.1 $out/share/man/man1/ + '' + + maybeWrap; + }); git-annex = with pkgs; if (!stdenv.isLinux) then diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index 71ae70335fd..eb98a385034 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -38,7 +38,7 @@ in haskell-src-exts_1_19_1 = appendPatch (doJailbreak super.haskell-src-exts_1_19_1) ( # Adapt to the Semigroup–Monoid Proposal (enables building on GHC >= 8.4) pkgs.fetchpatch { - url = https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch; + url = "https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch"; sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff"; } ); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5d7e04c7135..1a9e75a37cd 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -2722,7 +2722,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Cabal_3_0_0_0" = callPackage + "Cabal_3_2_0_0" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, binary , bytestring, containers, deepseq, Diff, directory, filepath , integer-logarithms, mtl, optparse-applicative, parsec, pretty @@ -2732,8 +2732,8 @@ self: { }: mkDerivation { pname = "Cabal"; - version = "3.0.0.0"; - sha256 = "11yjd0cmqngi1yr7v0dr55n59rq78kk6121sr44abha0swkfqhsi"; + version = "3.2.0.0"; + sha256 = "0vz6bl1ia7wjc62sj5iw5jhigdwfz6yz01mripjcymv4qrbkl1gj"; setupHaskellDepends = [ mtl parsec ]; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -3090,8 +3090,8 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.7"; - sha256 = "0ziiqfsvv1ypdra6kd0bhbsl852i0wqn43jkfii38yl879cdacan"; + version = "1.3.1.8"; + sha256 = "1madbhhxi5awh74q0z2mx1la5jbkvx26zvhl4x8237sjzs0k51wx"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -6108,8 +6108,6 @@ self: { libraryHaskellDepends = [ base MissingH split ]; description = "Tools for focusing in on locations within numbers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Folly" = callPackage @@ -7199,6 +7197,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "Gleam" = callPackage + ({ mkDerivation, base, mtl, split, threepenny-gui }: + mkDerivation { + pname = "Gleam"; + version = "0.1.0.0"; + sha256 = "0j822hblrd0p343w9ds0fa75s3grgpiyv180hsw3ld3pj30fcc8b"; + libraryHaskellDepends = [ base mtl split threepenny-gui ]; + description = "HTML Canvas graphics, animations and simulations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "Glob" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -9129,8 +9138,6 @@ self: { ]; description = "Library to mix shell scripting with Haskell programs"; license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "HSHHelpers" = callPackage @@ -9326,6 +9333,8 @@ self: { pname = "HTTP"; version = "4000.3.14"; sha256 = "0yv8mbjicpl7l2017c4dhm49117lblgwpy1llv368wci1vrxf0m6"; + revision = "1"; + editedCabalFile = "1inz9grpl9605bbymy6n5y4as54mlykbsiw8wpm5gl6qvxgrf69w"; libraryHaskellDepends = [ array base bytestring mtl network network-uri parsec time ]; @@ -9578,8 +9587,8 @@ self: { }: mkDerivation { pname = "HaTeX"; - version = "3.22.1.0"; - sha256 = "1an10gxrhb6kxrp2hgmya6bx06xmr6y4dhvz5wnz6jqavnv2mmwh"; + version = "3.22.2.0"; + sha256 = "0l2csqvyxl399p6jmp8nkabsn8bh4k94wblh7qbn13q8zrmzmmzp"; libraryHaskellDepends = [ base bibtex bytestring containers hashable matrix parsec prettyprinter QuickCheck text transformers @@ -10098,8 +10107,6 @@ self: { ]; description = "mastodon client module for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Hate" = callPackage @@ -10688,6 +10695,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_4_18" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.4.18"; + sha256 = "1nz4d6pwcnv775ncyg85ckx8kkzj2y3h17i40jc0yna8ai7driyx"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -10799,6 +10821,8 @@ self: { pname = "HsYAML"; version = "0.2.1.0"; sha256 = "10qzhsg789h37q22hm9p27dx4rhbykcbxp7p3pvkws8fr7ajgxv0"; + revision = "1"; + editedCabalFile = "0bfwdwwj5wgqrrbw1cwaxwxy9970dzln7w20f21mlg2l374wnqvf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10820,6 +10844,8 @@ self: { pname = "HsYAML-aeson"; version = "0.2.0.0"; sha256 = "12sxww260pc0bbpiyirm7911haxhljdi2f08a9ddpbgw8d5n7ffg"; + revision = "1"; + editedCabalFile = "1454jwcjaala8drxn7x765bqnzivdys99nl95mbd3yv2c6s1173g"; libraryHaskellDepends = [ aeson base bytestring containers HsYAML mtl scientific text unordered-containers vector @@ -11656,8 +11682,8 @@ self: { pname = "JuicyPixels-scale-dct"; version = "0.1.2"; sha256 = "04rhrmjnh12hh2nz04k245avgdcwqfyjnsbpcrz8j9328j41nf7p"; - revision = "4"; - editedCabalFile = "0r6v9iv7fkslznn6fw2132j1gpxk9dyccdg8r5qj2vvsrbp0dpjf"; + revision = "5"; + editedCabalFile = "0aar0h109fiy6pads3rlmhjsaj5528yn4zay5ps0zf8yb9dyd82s"; libraryHaskellDepends = [ base base-compat carray fft JuicyPixels ]; @@ -14720,10 +14746,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "OneTuple"; - version = "0.2.2"; - sha256 = "1p14cvjk3rgfc0xxcn7ffaajd2ii1ljnlayil2yyzgdwhlj70bnq"; - revision = "3"; - editedCabalFile = "0m3a9fj2h0v529q3i1kq1jfbdj68wxsmhq65hgx2rwjpgb8cqf0z"; + version = "0.2.2.1"; + sha256 = "15ls6kkf953288q7rsc49bvw467ll4nq28hvsgbaazdn7hf75ixc"; libraryHaskellDepends = [ base ]; description = "Singleton Tuple"; license = stdenv.lib.licenses.bsd3; @@ -16052,8 +16076,8 @@ self: { }: mkDerivation { pname = "PyF"; - version = "0.9.0.0"; - sha256 = "0jf8nzdq8jpw8pkcvy31fjg44bdlrbjl7ssj9kcqcn314yszanhw"; + version = "0.9.0.1"; + sha256 = "00pmpm2g7161bksc1l5clkghi0sbzh8y0f6xd52gwx9h6zxacns3"; libraryHaskellDepends = [ base containers haskell-src-exts haskell-src-meta megaparsec mtl template-haskell text @@ -16204,6 +16228,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_14" = callPackage + ({ mkDerivation, base, containers, deepseq, process, random + , splitmix, template-haskell, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.14"; + sha256 = "0jiqdk8ma8m68vg6vbxd0s1x0djmfjn1zm06masz7x8rzc3i9gjj"; + libraryHaskellDepends = [ + base containers deepseq random splitmix template-haskell + transformers + ]; + testHaskellDepends = [ base deepseq process ]; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -16679,8 +16721,6 @@ self: { executableHaskellDepends = [ base random-fu ]; description = "Randomness intuition trainer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "Range" = callPackage @@ -16767,6 +16807,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Rasterific_0_7_5_2" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity + , free, JuicyPixels, mtl, primitive, transformers, vector + , vector-algorithms + }: + mkDerivation { + pname = "Rasterific"; + version = "0.7.5.2"; + sha256 = "0f2qskrkxpj728zplrjz3j6h5cxwqvr0qi3614krjgcx69iym3sx"; + libraryHaskellDepends = [ + base bytestring containers dlist FontyFruity free JuicyPixels mtl + primitive transformers vector vector-algorithms + ]; + description = "A pure haskell drawing engine"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ReadArgs" = callPackage ({ mkDerivation, base, hspec, system-filepath, text }: mkDerivation { @@ -20218,8 +20276,8 @@ self: { ({ mkDerivation, base, bytestring, containers, parseargs }: mkDerivation { pname = "WAVE"; - version = "0.1.4"; - sha256 = "1zr2sw3m0pwbn5qfxhgf8195f4pjj3azc2w849l0cdi3znvmlxih"; + version = "0.1.6"; + sha256 = "1jm0zs4v38agy0rinlxkgx5zgdy0qizy2nb73wfzprk5kka5kn37"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -22424,13 +22482,14 @@ self: { }) {}; "acme-dont" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, tasty, tasty-hunit }: mkDerivation { pname = "acme-dont"; - version = "1.1"; - sha256 = "1kj3qjgn1rz093050z49w3js4is9p0g9pk5g7d7wvg28hpzk28n3"; + version = "1.2"; + sha256 = "0pi5xdbsbbrl6g23v41505vgzv5mr6l9r9iwv6l2gg6vzmsk42r7"; libraryHaskellDepends = [ base ]; - description = "A don't construct"; + testHaskellDepends = [ base tasty tasty-hunit ]; + description = "A \"don't\" construct"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -23142,8 +23201,6 @@ self: { ]; description = "Convert adblock config files to privoxy format"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "addLicenseInfo" = callPackage @@ -23424,38 +23481,6 @@ self: { }) {}; "aeson" = callPackage - ({ mkDerivation, attoparsec, base, base-compat, base-orphans - , base16-bytestring, bytestring, containers, deepseq, Diff - , directory, dlist, filepath, generic-deriving, ghc-prim, hashable - , hashable-time, integer-logarithms, primitive, QuickCheck - , quickcheck-instances, scientific, tagged, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, template-haskell, text - , th-abstraction, time, time-compat, unordered-containers - , uuid-types, vector - }: - mkDerivation { - pname = "aeson"; - version = "1.4.6.0"; - sha256 = "12s8nfsady47zlz94f7m978irwwj0l0v2x41hk8w1i14wb3b4gwj"; - libraryHaskellDepends = [ - attoparsec base base-compat bytestring containers deepseq dlist - ghc-prim hashable primitive scientific tagged template-haskell text - th-abstraction time time-compat unordered-containers uuid-types - vector - ]; - testHaskellDepends = [ - attoparsec base base-compat base-orphans base16-bytestring - bytestring containers Diff directory dlist filepath - generic-deriving ghc-prim hashable hashable-time integer-logarithms - QuickCheck quickcheck-instances scientific tagged tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-compat unordered-containers uuid-types vector - ]; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_4_7_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring , bytestring, containers, deepseq, Diff, directory, dlist, filepath @@ -23467,8 +23492,10 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.4.7.0"; - sha256 = "15ykkxa636jnx1zcyq4yxgjz78m5fp315gg0llbjf44jk4fbhndh"; + version = "1.4.7.1"; + sha256 = "1502yjw4y5ggp1gmrx0d3pcgrx3zhwbmcz4jb4fcignrbxjldrq7"; + revision = "1"; + editedCabalFile = "1fih6nmhvg0dvhngk2bjsr9s0804lgng971qz4fjl4mpb7cjz3bd"; libraryHaskellDepends = [ attoparsec base base-compat-batteries bytestring containers deepseq dlist ghc-prim hashable primitive scientific tagged @@ -23485,7 +23512,6 @@ self: { ]; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-applicative" = callPackage @@ -23605,8 +23631,8 @@ self: { pname = "aeson-compat"; version = "0.3.9"; sha256 = "1j13gykv4ryvmr14w5blz0nnpdb4p0hpa27wahw3mhb1lwdr8hz0"; - revision = "2"; - editedCabalFile = "1y07skwfg22z37fvjmqcpcl1yz1kx2zn4zz3n1bfghk7740c4gyd"; + revision = "3"; + editedCabalFile = "1fnahwplqcnv9m4kcf8i588ankafd2125ch71027plciqxxwid70"; libraryHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base base-compat bytestring containers exceptions hashable scientific tagged text time @@ -24163,6 +24189,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-schemas_1_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, first-class-families + , megaparsec, QuickCheck, raw-strings-qq, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, template-haskell, text + , th-test-utils, unordered-containers + }: + mkDerivation { + pname = "aeson-schemas"; + version = "1.1.0"; + sha256 = "1w01mdixja6f8176ra0lrkhbrr68hcsiib7sq8sdfh1rsx3hsn62"; + libraryHaskellDepends = [ + aeson base bytestring first-class-families megaparsec + template-haskell text unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring first-class-families megaparsec QuickCheck + raw-strings-qq tasty tasty-golden tasty-hunit tasty-quickcheck + 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; + }) {}; + "aeson-serialize" = callPackage ({ mkDerivation, aeson, base, cereal, hspec, HUnit }: mkDerivation { @@ -24306,16 +24356,17 @@ self: { }) {}; "aeson-value-parser" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable, mtl - , scientific, text, transformers, unordered-containers, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable + , megaparsec, mtl, scientific, text, text-builder, transformers + , unordered-containers, vector }: mkDerivation { pname = "aeson-value-parser"; - version = "0.18"; - sha256 = "1n288jb8ksjb6psgal4q6p7ad13sdak3llk54nc0gg5w2r20x634"; + version = "0.19"; + sha256 = "1v8s1f0zxhvf0r0cr800x363361g7il2wmbah04kr1vl376ydcjy"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable mtl scientific text - transformers unordered-containers vector + aeson attoparsec base bytestring hashable megaparsec mtl scientific + text text-builder transformers unordered-containers vector ]; description = "API for parsing \"aeson\" JSON tree into Haskell types"; license = stdenv.lib.licenses.mit; @@ -24983,8 +25034,6 @@ self: { ]; description = "Wake up and perform an action at a certain time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "alea" = callPackage @@ -25196,8 +25245,6 @@ self: { ]; description = "Model and test API surfaces algebraically"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "algebra-dag" = callPackage @@ -25913,8 +25960,8 @@ self: { pname = "amazonka"; version = "1.6.1"; sha256 = "104ifvmwdc1w3y42qcbq57v579zcnmlfv3f0bsazbcqdxnvr9dzd"; - revision = "1"; - editedCabalFile = "0xn4wy5gb1h4f4wd2h5ic17nb6ilikmsp1qip6xxc3img5rmaqyq"; + revision = "2"; + editedCabalFile = "171rp3cbgy58lps437c1jfpmi4xsp0z4pral7jh3mybn73l672zm"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions http-client http-conduit http-types ini mmorph @@ -28890,8 +28937,6 @@ self: { executableHaskellDepends = [ base data-default ]; description = "Tools for interacting with Anki database"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "annah" = callPackage @@ -29720,6 +29765,18 @@ self: { broken = true; }) {}; + "aop-prelude" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "aop-prelude"; + version = "0.1.0.0"; + sha256 = "0jgv33h50mb5i0fignmxngijcrv59wnnljnf1idrf7n57kgrrjlg"; + libraryHaskellDepends = [ base ghc-prim ]; + testHaskellDepends = [ base ghc-prim ]; + description = "prelude for Algebra of Programming"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aos-signature" = callPackage ({ mkDerivation, base, bytestring, cryptonite, memory, mtl , protolude, QuickCheck, random, tasty, tasty-hunit @@ -31129,8 +31186,8 @@ self: { }: mkDerivation { pname = "archive-libarchive"; - version = "0.2.2.2"; - sha256 = "12a7rvzbywz5kh403q0q612z1f2arb74jgjx9qk1vdhiyasgwnkh"; + version = "1.0.0.0"; + sha256 = "0pqq76gnk6y71c5wwjhq99y2695v6bfyzjb8gakp6h3jivcpd2gb"; libraryHaskellDepends = [ base bytestring composition-prelude libarchive ]; @@ -31147,8 +31204,8 @@ self: { }: mkDerivation { pname = "archive-sig"; - version = "0.2.3.0"; - sha256 = "0zpi4kqd4g298xlcmsk30kpahmlfgmxany3mny1zpzd8968qn5za"; + version = "1.0.0.0"; + sha256 = "1n8b10l5fq11kvph6j3qysm4ih6yi02167hixx98sa5c6bgba5z5"; libraryHaskellDepends = [ base bytestring composition-prelude dir-traverse ]; @@ -31177,8 +31234,8 @@ self: { }: mkDerivation { pname = "archive-tar-bytestring"; - version = "0.1.0.0"; - sha256 = "0s1x4krnjdf1gq0f1krqdhxjkz4yanl5ayr0mdg6bcprlpzf3ib9"; + version = "1.0.0.0"; + sha256 = "0gda7vpzjxsi8qidzqz1967a3nbap8m52f4ncfj8ph6kwh3pw2zb"; libraryHaskellDepends = [ base bytestring composition-prelude tar-bytestring text unix ]; @@ -31491,8 +31548,8 @@ self: { }: mkDerivation { pname = "arion-compose"; - version = "0.1.1.0"; - sha256 = "0d90m39gir2371wgjkkmb7yrqr92zncjr6naz68r64a9mq38ga90"; + version = "0.1.1.1"; + sha256 = "0qi9mj67j3kq02psm3qa855rk0hpz2pvfa7ggx4jhzqnf60xd9ph"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -31510,8 +31567,7 @@ self: { ]; description = "Run docker-compose with help from Nix/NixOS"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ roberth ]; }) {}; "arith-encode" = callPackage @@ -32078,8 +32134,6 @@ self: { libraryHaskellDepends = [ base MissingH ]; description = "Generic markup builder"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ascii" = callPackage @@ -32126,8 +32180,6 @@ self: { libraryHaskellDepends = [ base random-extras random-fu text ]; description = "A collection of ASCII cows. Moo."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ascii-flatten" = callPackage @@ -32470,8 +32522,8 @@ self: { ({ mkDerivation, base, bytestring, hourglass, memory }: mkDerivation { pname = "asn1-types"; - version = "0.3.3"; - sha256 = "162lacdl9jr42pdhaj9hxqlba6hjxm6g866anna74q6v3cvw5ssp"; + version = "0.3.4"; + sha256 = "1a119qxhxhr0yn37r26dkydm6g5kykdkx98ghb59i4ipa6i95vkq"; libraryHaskellDepends = [ base bytestring hourglass memory ]; description = "ASN.1 types"; license = stdenv.lib.licenses.bsd3; @@ -32495,12 +32547,12 @@ self: { }) {}; "aspell-pipe" = callPackage - ({ mkDerivation, base, process, text }: + ({ mkDerivation, async, base, process, text }: mkDerivation { pname = "aspell-pipe"; - version = "0.3"; - sha256 = "1jl332g0v3zsjx4c340y5cw8rfpi527gki86y14zps6rb9b9nvzi"; - libraryHaskellDepends = [ base process text ]; + version = "0.4"; + sha256 = "0vwav0xdrsb9kww7p1z63wifxd5bfd247vdqscf2amkdgm5k716m"; + libraryHaskellDepends = [ async base process text ]; description = "Pipe-based interface to the Aspell program"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -32619,6 +32671,8 @@ self: { pname = "assoc"; version = "1.0.1"; sha256 = "1m9n4vp190bvn2wcrd4ggfwa9pi93jp0zgx02mdgywn2zfidw020"; + revision = "1"; + editedCabalFile = "1q6sc9v79p2pdm7aa6mfbn824vc01wj267saf2gp86b3wzgp0mrh"; libraryHaskellDepends = [ base bifunctors tagged ]; description = "swap and assoc: Symmetric and Semigroupy Bifunctors"; license = stdenv.lib.licenses.bsd3; @@ -32837,6 +32891,8 @@ self: { pname = "async"; version = "2.2.2"; sha256 = "1zxvfcyy4sg8lmzphi5dgnavksj5pav6rbvd5kc48lf4hanb2jjb"; + revision = "1"; + editedCabalFile = "1kg9xmby0wkx31998h2r43yr8bl1aixk6025zqigz9vdhmkc2y51"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base hashable stm ]; @@ -33611,10 +33667,8 @@ self: { }: mkDerivation { pname = "attoparsec"; - version = "0.13.2.3"; - sha256 = "1ngjn9h5n0vyki0m2jir4mg85875ysswy9hznpmj1r856mqwc6ix"; - revision = "1"; - editedCabalFile = "164n392qrgyb8mg3xxaxym0ffvqyjr4ny4lfrr81y7hk3947yw9q"; + version = "0.13.2.4"; + sha256 = "1cpgxc17lh4lnpblb3cimpq4ka23bf89q6yvd0jwk7klw5nwsrms"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -34641,6 +34695,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "avro_0_5_1_0" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors + , binary, bytestring, containers, data-binary-ieee754, deepseq + , directory, doctest, doctest-discover, extra, fail, gauge + , generic-lens, HasBigDecimal, hashable, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, lens, lens-aeson, mtl + , QuickCheck, random, raw-strings-qq, scientific, semigroups + , tagged, template-haskell, text, tf-random, time, transformers + , unordered-containers, uuid, vector, zlib + }: + mkDerivation { + pname = "avro"; + version = "0.5.1.0"; + sha256 = "0yhv29ahwbj97l30knaid8l6v1n9k3ayv67qfkchd2m6qhzm7ns5"; + libraryHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers data-binary-ieee754 deepseq fail HasBigDecimal hashable + mtl raw-strings-qq scientific semigroups tagged template-haskell + text tf-random time unordered-containers uuid vector zlib + ]; + testHaskellDepends = [ + aeson array base base16-bytestring bifunctors binary bytestring + containers directory doctest doctest-discover extra fail + generic-lens HasBigDecimal hashable hedgehog hspec + hw-hspec-hedgehog lens lens-aeson mtl QuickCheck raw-strings-qq + scientific semigroups tagged text tf-random time transformers + unordered-containers uuid vector zlib + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + aeson base binary bytestring containers deepseq gauge hashable mtl + random raw-strings-qq text transformers unordered-containers vector + ]; + description = "Avro serialization support for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "avro-piper" = callPackage ({ mkDerivation, aeson, avro, base, bytestring, conduit , conduit-combinators, conduit-extra, hedgehog, hspec @@ -34797,31 +34889,6 @@ self: { }: mkDerivation { pname = "aws-cloudfront-signed-cookies"; - version = "0.2.0.1"; - sha256 = "1yk40n6gjs72pyi6yjwhqj0dngqc4b74rpg0ji61852nbb0snl28"; - revision = "3"; - editedCabalFile = "1v0bbyskwbawfhaji3s63hjrzwsi2bb7l8g6yxdp02bp6zb92757"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty asn1-encoding asn1-types base base64-bytestring - bytestring cookie cryptonite lens lens-aeson optparse-applicative - pem text time unordered-containers vector - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog neat-interpolation ]; - description = "Generate signed cookies for AWS CloudFront"; - license = stdenv.lib.licenses.mit; - }) {}; - - "aws-cloudfront-signed-cookies_0_2_0_4" = callPackage - ({ mkDerivation, aeson, aeson-pretty, asn1-encoding, asn1-types - , base, base64-bytestring, bytestring, cookie, cryptonite, hedgehog - , lens, lens-aeson, neat-interpolation, optparse-applicative, pem - , text, time, unordered-containers, vector - }: - mkDerivation { - pname = "aws-cloudfront-signed-cookies"; version = "0.2.0.4"; sha256 = "0j40760k1ackwhsy279ir8jybnvis5m56i5hy3rppjybhjiyyd4v"; isLibrary = true; @@ -34835,7 +34902,6 @@ self: { testHaskellDepends = [ base hedgehog neat-interpolation ]; description = "Generate signed cookies for AWS CloudFront"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-cloudfront-signer" = callPackage @@ -35170,8 +35236,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "2.0.3"; - sha256 = "1ycqwmpgqzdb8kz3w6yzf44id32pc3vin1w3j0klzzg2k51l4nnr"; + version = "2.0.4"; + sha256 = "0gzg1g5669lr7p5sg22r6b952c7pn39rjr9y0ss77jvl7klhykr8"; libraryHaskellDepends = [ aeson base bytestring http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -35179,8 +35245,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "Haskell runtime for AWS Lambda"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aws-lambda-runtime" = callPackage @@ -36170,8 +36234,6 @@ self: { testHaskellDepends = [ base containers hspec QuickCheck time ]; description = "Calculation of bank holidays in England and Wales"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "banwords" = callPackage @@ -36402,16 +36464,14 @@ self: { ({ mkDerivation, base, base-compat }: mkDerivation { pname = "base-compat-migrate"; - version = "0.2.0.0"; - sha256 = "0xc9fjdv4bx5isw39l9aknvwvi46zpc4930wxvsx0v4qa8yhfpaa"; + version = "0.2.0.1"; + sha256 = "18nyacdji89ys6h7hw28b6rz6p9gkasd4c0l7awz79wp0w8a0cdm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat ]; doHaddock = false; description = "Helps migrating projects to base-compat(-batteries)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "base-encoding" = callPackage @@ -36525,8 +36585,8 @@ self: { }: mkDerivation { pname = "base16"; - version = "0.1.2.1"; - sha256 = "1dqkqyyqdym48fh59zz3jyvhbbc70q37fvx2zv80cmysa929d1fr"; + version = "0.2.0.0"; + sha256 = "0j4mk7w8bg3q3ln5lcffdvaz36frizzq82z05l699y5g25abzrx4"; libraryHaskellDepends = [ base bytestring text ]; testHaskellDepends = [ base base16-bytestring bytestring memory random-bytestring tasty @@ -36557,8 +36617,8 @@ self: { }: mkDerivation { pname = "base16-lens"; - version = "0.1.0.0"; - sha256 = "17cckwpl3c7bf6jj8l1jbwpb0hlsqp7iv3mllb59gp38nfdn51rd"; + version = "0.1.2.0"; + sha256 = "1mgy1adhlw2sra8lfc2cklfn9w7jj2f9pilifnnfk2jq6hwalpn8"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base16 bytestring lens text ]; testHaskellDepends = [ base doctest lens ]; @@ -36779,8 +36839,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "3"; - editedCabalFile = "0gqyij803y0shpc5knljbffss6c1pbdanfzwlws01vkl4y10sfja"; + revision = "4"; + editedCabalFile = "0w7pzjyyhan42zbk8mn9dw1hzjcr0nv9nhpi4hs7s16d6cc80qwa"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -38625,6 +38685,8 @@ self: { pname = "bin"; version = "0.1"; sha256 = "008i0yxvg9v05gby6ysq3f7ygh125p9xa5vwrcrbq5xw79igyzq5"; + revision = "2"; + editedCabalFile = "1zmzi566syvrm9bk0mxj3dycd3i4b33018c644qxdqdb00mlvayh"; libraryHaskellDepends = [ base dec deepseq fin hashable QuickCheck ]; @@ -38851,10 +38913,8 @@ self: { }: mkDerivation { pname = "binary-instances"; - version = "1"; - sha256 = "07y9582vsw94ks8whkd3dcmf4wdwlq8riyk2shmxxprkq0gsv3z0"; - revision = "2"; - editedCabalFile = "0yawdwm086gk51y5s5zbybiwiv386cx8xyj6kcgj9wwdidcnaxdi"; + version = "1.0.0.1"; + sha256 = "0f8ilzpwj7gbyvlswlkd48dzpj9m13ipinw55lvjag0ir52idk9a"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable scientific tagged text text-binary time-compat unordered-containers @@ -38906,8 +38966,8 @@ self: { pname = "binary-orphans"; version = "1.0.1"; sha256 = "0gbmn5rpvyxhw5bxjmxwld6918lslv03b2f6hshssaw1il5x86j3"; - revision = "3"; - editedCabalFile = "1s3bk63x2rxwk611jbvpvvgrq1k7k0gd9q105cqxcbcih396ac0s"; + revision = "4"; + editedCabalFile = "07jwyndphnfr20ihagncpl8rr7i62hxf0b9m2bdahyzvz0yzdsl2"; libraryHaskellDepends = [ base binary transformers ]; testHaskellDepends = [ base binary QuickCheck quickcheck-instances tagged tasty @@ -39136,8 +39196,6 @@ self: { ]; description = "Tagged binary serialisation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "binary-tree" = callPackage @@ -41200,8 +41258,8 @@ self: { }: mkDerivation { pname = "bitvec"; - version = "1.0.2.0"; - sha256 = "0ciri2zaifrli1zas0z75vdx97sns1fdvmghx9mlx8pi875f6b85"; + version = "1.0.3.0"; + sha256 = "0s3gdh2rgz9wdnin5h2yhvnr8gy3sgcl9sbb1k4069ap4svrg8hd"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp primitive vector ]; @@ -41849,8 +41907,8 @@ self: { }: mkDerivation { pname = "blaze-markup"; - version = "0.8.2.3"; - sha256 = "1g9m7ansj7fdyzhz1wqkbzn5amjm50vjgjdwkbjc5qqhagnv1y3j"; + version = "0.8.2.4"; + sha256 = "0xb2hd5n6ymax6yw5hyi05lgllq5ldw28mgfxjpljrws9m8i078w"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -43091,6 +43149,8 @@ self: { pname = "boring"; version = "0.1.3"; sha256 = "1fljlkzc5016xbq9jykh0wr1mbyfcikh818pp54djws5vm66hh6d"; + revision = "1"; + editedCabalFile = "1gn2f035fmn2l56a507x080cl1apddszhlsf6lriwyass4v58mfl"; libraryHaskellDepends = [ adjunctions base base-compat bin constraints dec fin generics-sop ral singleton-bool streams tagged transformers transformers-compat @@ -43206,8 +43266,8 @@ self: { pname = "bound-extras"; version = "0.0.1"; sha256 = "0f49yqz5s5h4f3m3i7kpm2fqnd42nl4dbl24lvm6z3nb8qrx6ynq"; - revision = "2"; - editedCabalFile = "1a88bxgz9r1v6lqkab12ljw3vknx7sgi6vi3fsqli8ji2ajfn5k1"; + revision = "3"; + editedCabalFile = "10vv6dsfia3fdclvnhp8q76s3zgmxwzi4bvvii6g6ic8wid6asvg"; libraryHaskellDepends = [ base bound deepseq hashable transformers ]; @@ -43315,23 +43375,24 @@ self: { "box" = callPackage ({ mkDerivation, async, attoparsec, base, concurrency , contravariant, dejafu, doctest, exceptions, foldl, generic-lens - , lens, mtl, pipes, profunctors, random, streaming, text, time - , transformers, transformers-base + , lens, managed, mtl, pipes, profunctors, protolude, random + , streaming, text, time, transformers, transformers-base + , typed-process, websockets }: mkDerivation { pname = "box"; - version = "0.2.0"; - sha256 = "0100vq8fb2lihnas6cqrigrrndzj48icsl56kdyi6vvkr9aclzm2"; + version = "0.3.0"; + sha256 = "1xm4dd2h8fylfadfb4gsw1vs2a5l5ngjz956zh5cnm0rdma63j14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec base concurrency contravariant exceptions foldl lens pipes profunctors streaming text time transformers - transformers-base + transformers-base typed-process ]; executableHaskellDepends = [ - base concurrency dejafu generic-lens lens mtl random streaming text - transformers + base concurrency dejafu generic-lens lens managed mtl protolude + random streaming text transformers websockets ]; testHaskellDepends = [ base doctest ]; description = "boxes"; @@ -43544,8 +43605,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.52"; - sha256 = "10734nqmmix3ddab30a02dn9sma2aywg358q156b392g0nxzv39n"; + version = "0.52.1"; + sha256 = "1jqs75k7r98c6k8d14arhiz49xy7k0jaymlmijx0pma3yrha90pl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -43983,8 +44044,8 @@ self: { pname = "brotli"; version = "0.0.0.0"; sha256 = "1l9qiw5cl0k1rcnqnj9pb7vgj1b06wckkk5i73nqr15ixgcjmr9j"; - revision = "1"; - editedCabalFile = "0fw26rv8i9zz4qyr32paz2y0psdppdaz427jp8mpbanwmg763024"; + revision = "2"; + editedCabalFile = "0iny0gbb5b3a8n8rpriz7620fnhw70c0pgl615s4b1rhrnj87wrb"; libraryHaskellDepends = [ base bytestring transformers ]; libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; testHaskellDepends = [ @@ -44099,8 +44160,8 @@ self: { }: mkDerivation { pname = "bson"; - version = "0.4.0.0"; - sha256 = "0fcwqxzh678j48b04rbk7jwbnpp4859w389fb0fl7d5hvvw9kj19"; + version = "0.4.0.1"; + sha256 = "1xmxhq1f8v00mbq2l1sb7akzhy0gd9wcylkanpizn68wczqkdi3b"; libraryHaskellDepends = [ base binary bytestring cryptohash-md5 data-binary-ieee754 mtl network text time @@ -44400,8 +44461,8 @@ self: { }: mkDerivation { pname = "buffet"; - version = "0.3.0"; - sha256 = "1dsnbx148yrqikqx9qfxivz52szlqaah7q6dg80m87g997x428m7"; + version = "0.4.0"; + sha256 = "04q4k7bfbh41jg869w71wv4idlxbpf48cz2sg5m3ds66wknnhqwq"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ @@ -45825,10 +45886,8 @@ self: { ({ mkDerivation, base, bytestring, composition-prelude, lens }: mkDerivation { pname = "bzip-signature"; - version = "0.1.2.0"; - sha256 = "077bwh3rwig9rml5pz49m4rxbn0j9q6cv7zlc5xlhkmw6plwg4ps"; - revision = "1"; - editedCabalFile = "003197s08saac5azpwc4vqvs65244pvp019j9lhr76my6a98iz0f"; + version = "0.2.0.0"; + sha256 = "1d2k6dv2wakq51z365s37hn1k1zs785z3f01b90x2dcg6y1xgln7"; libraryHaskellDepends = [ base bytestring composition-prelude lens ]; @@ -46227,8 +46286,8 @@ self: { }: mkDerivation { pname = "cabal-cache"; - version = "1.0.1.5"; - sha256 = "0bzxpr1lalj3i4qickxpch3ky5d686k1rdba2aymhcr8g89l4m0m"; + version = "1.0.1.8"; + sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -46410,16 +46469,14 @@ self: { }: mkDerivation { pname = "cabal-file-th"; - version = "0.2.6"; - sha256 = "0kam97xbmsn0alqyw709fpvj7j5dhdi90n98dmg1sfr5i54gh1nw"; + version = "0.2.7"; + sha256 = "1pp8jk7k8nbvhy6vaxsqa7cd321yw1a3685n4fbhgb096hkrldkl"; libraryHaskellDepends = [ base Cabal directory pretty template-haskell ]; 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; - broken = true; }) {}; "cabal-flatpak" = callPackage @@ -46446,6 +46503,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-flatpak_0_1_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, cabal-plan + , containers, cryptohash-sha256, http-client, http-client-tls + , http-types, optparse-applicative, pathtype, shell-utility, tar + , text, utility-ht, zlib + }: + mkDerivation { + pname = "cabal-flatpak"; + version = "0.1.0.1"; + sha256 = "12jyzbh4xhqj6rhg9n2za5r8n4j6zdw3x5ixdh5xvw4wivfxqxq9"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring cabal-plan containers + cryptohash-sha256 http-client http-client-tls http-types + optparse-applicative pathtype shell-utility tar text utility-ht + zlib + ]; + description = "Generate a FlatPak manifest from a Cabal package description"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-fmt" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, mtl, optparse-applicative, parsec, pretty, process @@ -46580,21 +46660,23 @@ self: { ({ mkDerivation, array, async, base, base16-bytestring, binary , bytestring, Cabal, containers, cryptohash-sha256, deepseq , directory, echo, edit-distance, filepath, hackage-security - , hashable, HTTP, mtl, network, network-uri, parsec, pretty - , process, random, resolv, stm, tar, text, time, unix, zlib + , hashable, HTTP, lukko, mtl, network, network-uri, parsec, pretty + , process, random, resolv, stm, tar, text, time, transformers, unix + , zlib }: mkDerivation { pname = "cabal-install"; - version = "3.0.0.0"; - sha256 = "1wda29ifkn50376jidj6ihfk60a64y0bsd7lh3yw15py7a2sfcm4"; + version = "3.2.0.0"; + sha256 = "1c0cc256bha97aj7l0lf76l5swlnmwcqppiz8l4cl5xgba4mwmd0"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ base Cabal filepath process ]; executableHaskellDepends = [ array async base base16-bytestring binary bytestring Cabal containers cryptohash-sha256 deepseq directory echo edit-distance - filepath hackage-security hashable HTTP mtl network network-uri - parsec pretty process random resolv stm tar text time unix zlib + filepath hackage-security hashable HTTP lukko mtl network + network-uri parsec pretty process random resolv stm tar text time + transformers unix zlib ]; doCheck = false; postInstall = '' @@ -47033,15 +47115,13 @@ self: { }: mkDerivation { pname = "cabal-toolkit"; - version = "0.0.6"; - sha256 = "0r42hvlzykmas03smsxz8484gnc1r1pan66rcv8ihibj0zw42qb4"; + version = "0.0.7"; + sha256 = "08im4qqrg3ribbh6rg2rk7jynnjwjgaysfvgbamanjdwqldjwx7f"; libraryHaskellDepends = [ base binary bytestring Cabal containers ghc template-haskell ]; description = "Helper functions for writing custom Setup.hs scripts."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cabal-uninstall" = callPackage @@ -47189,8 +47269,8 @@ self: { }: mkDerivation { pname = "cabal2spec"; - version = "2.5"; - sha256 = "1z6sxjgsbp0gz6rv9camkbmnazj3gn5j4wsxmmwpchv0n6vmcmzw"; + version = "2.6"; + sha256 = "173qiqpzcvihdv0jd0z15wgxzars0kybcyhxprmypk232c9pa48v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal filepath time ]; @@ -48294,8 +48374,6 @@ self: { ]; description = "Extensional capabilities and deriving combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "capataz" = callPackage @@ -48623,8 +48701,6 @@ self: { ]; description = "A content-addressed storage"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "casa-abbreviations-and-acronyms" = callPackage @@ -49162,6 +49238,8 @@ self: { pname = "cassava"; version = "0.5.2.0"; sha256 = "01h1zrdqb313cjd4rqm1107azzx4czqi018c2djf66a5i7ajl3dk"; + revision = "1"; + editedCabalFile = "1ph8rf91z4nf1ryrh9s4gd1kq98jlgk2manwddkpch8k0n9xvfk4"; configureFlags = [ "-f-bytestring--lt-0_10_4" ]; libraryHaskellDepends = [ array attoparsec base bytestring containers deepseq hashable Only @@ -50596,8 +50674,8 @@ self: { }: mkDerivation { pname = "character-cases"; - version = "0.1.0.0"; - sha256 = "1383g5fwy11h43268609n9dmvp0wqwgycn9ly8c7g8h4qpyckh38"; + version = "0.1.0.3"; + sha256 = "05vpi3q44ywljkbxrcx9xqxsw86dxh2ipcsbfmn55d9vkl901hry"; libraryHaskellDepends = [ base containers here megaparsec prettyprinter template-haskell ]; @@ -50605,10 +50683,8 @@ self: { base containers doctest Glob here megaparsec prettyprinter template-haskell ]; - description = "Exposes subspecies types of Char. And naming cases. e.g. meaning of [a-z], [A-Z], [0-9], PascalCase, camelCase, and sneak_case."; + description = "Exposes subspecies types of Char. And naming cases."; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "charade" = callPackage @@ -50709,6 +50785,36 @@ self: { broken = true; }) {}; + "chart-svg" = callPackage + ({ mkDerivation, attoparsec, base, bifunctors, colour, containers + , foldl, generic-lens, javascript-bridge, JuicyPixels, lens, lucid + , lucid-svg, numhask-space, palette, pretty-simple, protolude + , scientific, scotty, tagsoup, text, text-format, time + , transformers, unordered-containers, wai-middleware-static + , web-rep + }: + mkDerivation { + pname = "chart-svg"; + version = "0.0.1"; + sha256 = "1mdvqvj5bj04vgfl7wv64kbx096hrlhwr78jxg2mdnhhzr4xciq6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bifunctors colour foldl generic-lens JuicyPixels + lens lucid lucid-svg numhask-space palette pretty-simple protolude + scientific tagsoup text text-format time transformers web-rep + ]; + executableHaskellDepends = [ + base bifunctors containers generic-lens javascript-bridge lens + lucid-svg numhask-space protolude scotty text transformers + unordered-containers wai-middleware-static web-rep + ]; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "chart-unit" = callPackage ({ mkDerivation, base, colour, data-default, diagrams-lib , diagrams-svg, doctest, foldl, formatting, generic-lens, lens @@ -50878,6 +50984,8 @@ self: { pname = "cheapskate"; version = "0.1.1.2"; sha256 = "17n6laihqrjn62l8qw4565nf77zkvrl68bjmc3vzr4ckqfblhdzd"; + revision = "1"; + editedCabalFile = "15hdlp062gv8x7giwcfbj1kfmhpj1bg7y2w4wr2yl436haxkrbmq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50999,19 +51107,6 @@ self: { ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: mkDerivation { pname = "checkers"; - version = "0.5.4"; - sha256 = "09g1430hjqxy01w0rgp0d03z2y8nw2zjyvfxs0kl9j0gyv57a10v"; - libraryHaskellDepends = [ - array base QuickCheck random semigroupoids - ]; - description = "Check properties on standard classes and data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "checkers_0_5_5" = callPackage - ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: - mkDerivation { - pname = "checkers"; version = "0.5.5"; sha256 = "1g16603803xzz73md1azlcpd6xz7gkwjpy66l638v6lvipdl9hr9"; libraryHaskellDepends = [ @@ -51019,7 +51114,6 @@ self: { ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "checkmate" = callPackage @@ -51202,18 +51296,22 @@ self: { }) {}; "chimera" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, vector + ({ mkDerivation, adjunctions, base, distributive, gauge, mtl + , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck, vector }: mkDerivation { pname = "chimera"; - version = "0.3.0.0"; - sha256 = "0zdfh9vmhy006n6vkpkvycl5m90z1w8060dzvi0p28z7lhffb2ld"; - libraryHaskellDepends = [ base vector ]; + version = "0.3.1.0"; + sha256 = "09dk9x2har2k6apm1wlm2k5k97jf3qxy4rzx94rbfmhs5fhz0i99"; + libraryHaskellDepends = [ + adjunctions base distributive mtl vector + ]; testHaskellDepends = [ base QuickCheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck vector ]; + benchmarkHaskellDepends = [ base gauge mtl random ]; description = "Lazy infinite streams with O(1) indexing"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -51618,6 +51716,8 @@ self: { pname = "chs-cabal"; version = "0.1.1.0"; sha256 = "0zan47md9zivzc1gd1j1g0200n8d0ffx4dcmkd9vriqjsdwhqvl5"; + revision = "1"; + editedCabalFile = "04fh1g2wfm69hz1hjg4ds2c3npdx6z2mgwddlkqr2sdbnngnmv10"; libraryHaskellDepends = [ base Cabal chs-deps ]; description = "Cabal with c2hs dependencies"; license = stdenv.lib.licenses.bsd3; @@ -52516,8 +52616,6 @@ self: { executableHaskellDepends = [ base ]; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "clash-lib" = callPackage @@ -52551,8 +52649,6 @@ self: { ]; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "clash-multisignal" = callPackage @@ -53163,8 +53259,6 @@ self: { ]; description = "Keep your home dir clean by finding old conf files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "clean-unions" = callPackage @@ -54546,8 +54640,8 @@ self: { }: mkDerivation { pname = "cobot"; - version = "0.1.1.0"; - sha256 = "17cl8dh4y7wyas6afslb1d27ibjc2633dcyx6pc6zng2p36m83l9"; + version = "0.1.1.1"; + sha256 = "12bq23am5q0cb58sgifdihc53rwg91m1wvkyr06nkjddh8vgfc3g"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl split template-haskell text @@ -54572,8 +54666,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.2.8"; - sha256 = "1snq2ypf7blknhpv86xq1n7f6a9pifd77yylsirqj358j590c4i6"; + version = "0.1.3.1"; + sha256 = "1b64ixkcagcx8d7y5nym9njllndbbb108cp1k31qr4p6yijyw15m"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -54850,8 +54944,6 @@ self: { ]; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "codo-notation" = callPackage @@ -56780,8 +56872,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "2.0.5.0"; - sha256 = "1iiqv3wkkqijdg9nxmc8c539wflc5yhp9b9d0g5nfkg01s376c98"; + version = "3.0.0.0"; + sha256 = "14dpxpcbpchlppx64k3i7rwq94f1x4vvnd0d6bnwfcpw46hbjlsl"; libraryHaskellDepends = [ base ]; description = "Higher-order function combinators"; license = stdenv.lib.licenses.bsd3; @@ -57471,8 +57563,6 @@ self: { testHaskellDepends = [ base containers random stm ]; description = "Concurrent resource map"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "concurrent-rpc" = callPackage @@ -57728,34 +57818,6 @@ self: { }: mkDerivation { pname = "conduit"; - version = "1.3.1.2"; - sha256 = "12c21vrij63z60y3xd0dkg0da8sdhfq6nj5s3p5qknys5klwpqkq"; - libraryHaskellDepends = [ - base bytestring directory exceptions filepath mono-traversable mtl - primitive resourcet text transformers unix unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring containers directory exceptions filepath hspec - mono-traversable mtl QuickCheck resourcet safe silently split text - transformers unliftio vector - ]; - benchmarkHaskellDepends = [ - base containers deepseq gauge hspec kan-extensions mwc-random - transformers vector - ]; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_3_2" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, directory - , exceptions, filepath, gauge, hspec, kan-extensions - , mono-traversable, mtl, mwc-random, primitive, QuickCheck - , resourcet, safe, silently, split, text, transformers, unix - , unliftio, unliftio-core, vector - }: - mkDerivation { - pname = "conduit"; version = "1.3.2"; sha256 = "0vmcyi3f280b6ll6pcyma4aqrl6m69n6y6x7wplxgsmxz5q7kng3"; libraryHaskellDepends = [ @@ -57773,7 +57835,6 @@ self: { ]; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-algorithms" = callPackage @@ -57972,34 +58033,6 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.3.4"; - sha256 = "1d853d39vj5pb8yxfcsnjwdzqzkm34ixzbnba8bslpihb7182wxi"; - libraryHaskellDepends = [ - async attoparsec base bytestring conduit directory filepath network - primitive process resourcet stm streaming-commons text transformers - typed-process unliftio-core - ]; - testHaskellDepends = [ - async attoparsec base bytestring bytestring-builder conduit - directory exceptions filepath hspec process QuickCheck resourcet - stm streaming-commons text transformers transformers-base - ]; - benchmarkHaskellDepends = [ - base bytestring bytestring-builder conduit gauge transformers - ]; - description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-extra_1_3_5" = callPackage - ({ mkDerivation, async, attoparsec, base, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , gauge, hspec, network, primitive, process, QuickCheck, resourcet - , stm, streaming-commons, text, transformers, transformers-base - , typed-process, unliftio-core - }: - mkDerivation { - pname = "conduit-extra"; version = "1.3.5"; sha256 = "1n8js1y1rdswvp0bkjmmz19fag19bdxgwsrqz93yc09w43p8sr4a"; libraryHaskellDepends = [ @@ -58017,7 +58050,6 @@ self: { ]; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -58564,8 +58596,6 @@ self: { ]; description = "A simple config file swapping tool"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "conffmt" = callPackage @@ -58666,6 +58696,8 @@ self: { pname = "config-schema"; version = "1.2.0.0"; sha256 = "0lz9y2qnjc576mbl3qnhyf4c1y5f71q7f5jgv8rj7vsg855q99hm"; + revision = "1"; + editedCabalFile = "1hlk2syn4z5zzvdc8nr3wprdpbmcjyp77spdzvyma626931m8p3a"; libraryHaskellDepends = [ base config-value containers free kan-extensions pretty semigroupoids text transformers @@ -58698,8 +58730,8 @@ self: { pname = "config-value"; version = "0.7.0.1"; sha256 = "0r7qylqmdvif75ylb0d0zryl2ghxl3ip9a2jhyq70aqxwdjh18g4"; - revision = "1"; - editedCabalFile = "10rdyg984dkd0xq9z54300wkkgl7zfj4l8bi4vlplvw6jh65v36c"; + revision = "2"; + editedCabalFile = "1kwn53qb7hzjgkk9fh8mabyhxjm5rkw9qapk16isx1s4vns8x9l6"; libraryHaskellDepends = [ array base pretty text ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ base text ]; @@ -58713,6 +58745,8 @@ self: { pname = "config-value-getopt"; version = "0.1.1.1"; sha256 = "103afdadsh7vqfam61mixk0l2fxy41m0451bl2hl2djs3acj60b2"; + revision = "1"; + editedCabalFile = "1b5wfbqjjx6y8ll5h3vp2cmcdrcnjd3295y8ykd25yjx6f3swsja"; libraryHaskellDepends = [ base config-value text ]; description = "Interface between config-value and System.GetOpt"; license = stdenv.lib.licenses.mit; @@ -58882,8 +58916,6 @@ self: { ]; description = "Reduced parser for configurator-ng config files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "confsolve" = callPackage @@ -60449,8 +60481,8 @@ self: { }: mkDerivation { pname = "copilot-c99"; - version = "3.1.1"; - sha256 = "0hja6fp7n4zrhm73fvjkisspc7cyp53blhn4maqis8lw27svjq66"; + version = "3.1.2"; + sha256 = "1mxkn9mvcxlycrrha023nppn8005n26mqhklcw2hf8l3aq2ij7mf"; libraryHaskellDepends = [ base containers copilot-core directory filepath language-c99 language-c99-simple language-c99-util mtl pretty @@ -61137,8 +61169,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.4.6"; - sha256 = "0ll0qxn7s29ys8w71dvfz3qy0f5rzihz0q3axg1g73pmhqbxqi2m"; + version = "0.2.5.0"; + sha256 = "0h2h19qld1n26vap7vmcf8fzpjgdryjd09qf0ky5smhcqq81kyrj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61155,8 +61187,6 @@ self: { testHaskellDepends = [ base hspec hspec-megaparsec megaparsec ]; description = "Build tool for C"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "cplex-hs" = callPackage @@ -61224,6 +61254,21 @@ self: { license = "LGPL"; }) {}; + "cpphs_1_20_9_1" = callPackage + ({ mkDerivation, base, directory, polyparse, time }: + mkDerivation { + pname = "cpphs"; + version = "1.20.9.1"; + sha256 = "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory polyparse time ]; + executableHaskellDepends = [ base directory polyparse time ]; + description = "A liberalised re-implementation of cpp, the C pre-processor"; + license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cprng-aes" = callPackage ({ mkDerivation, base, byteable, bytestring, cipher-aes, criterion , crypto-random, mtl @@ -62268,6 +62313,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cron_0_7_0" = callPackage + ({ mkDerivation, attoparsec, base, criterion, data-default-class + , hedgehog, mtl, mtl-compat, old-locale, semigroups, tasty + , tasty-hedgehog, tasty-hunit, text, time, transformers-compat + }: + mkDerivation { + pname = "cron"; + version = "0.7.0"; + sha256 = "0f8jb2pxy89hkdnm20yz88b3j3vgh1a9c1dxiym3150izp34ikd5"; + libraryHaskellDepends = [ + attoparsec base data-default-class mtl mtl-compat old-locale + semigroups text time + ]; + testHaskellDepends = [ + attoparsec base hedgehog semigroups tasty tasty-hedgehog + tasty-hunit text time transformers-compat + ]; + benchmarkHaskellDepends = [ attoparsec base criterion text time ]; + description = "Cron datatypes and Attoparsec parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cron-compat" = callPackage ({ mkDerivation, attoparsec, base, cron, derive, hspec , hspec-expectations, mtl, mtl-compat, old-locale, QuickCheck, text @@ -62333,8 +62401,8 @@ self: { pname = "crypt-sha512"; version = "0"; sha256 = "1wsma9frdrn39i506zydlzlk1ir6jh1pidqfjms8rwqjpx965gn2"; - revision = "3"; - editedCabalFile = "1l8glrv7bhdi0p1m1xq9majlbh8n9agai9d4mldzi5bnp5m5b79q"; + revision = "4"; + editedCabalFile = "0a4282bhh21l7vk79hpgcz7kj9n05r0ilgdksjkimkydg7sxgldb"; libraryHaskellDepends = [ attoparsec base bytestring cryptohash-sha512 ]; @@ -62764,8 +62832,8 @@ self: { }: mkDerivation { pname = "cryptoconditions"; - version = "0.2.4"; - sha256 = "1mbi3h21xfzsripixkvakw4kp36n8jzwsyajjxwllq3nxq3lwgp0"; + version = "0.2.5"; + sha256 = "0p4y5irjqvd79qr1gq5v57pnyg1z4vm9pmlv9dx3v59vakz0yfcf"; libraryHaskellDepends = [ aeson asn1-encoding asn1-parse asn1-types base base64-bytestring bytestring containers cryptonite memory text @@ -62862,8 +62930,8 @@ self: { pname = "cryptohash-sha1"; version = "0.11.100.1"; sha256 = "1aqdxdhxhl9jldh951djpwxx8z7gzaqspxl7iwpl84i5ahrsyy9w"; - revision = "4"; - editedCabalFile = "0qb2wasfc4dpf6f9ahvhlv8njb3p3p9iwblg4032ssi95cg85718"; + revision = "5"; + editedCabalFile = "1qay4qlvmwpllsqn1yd8gyraifx5ydl4chgg3dj4gzgmi36i9n0l"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base base16-bytestring bytestring SHA tasty tasty-hunit @@ -62882,8 +62950,8 @@ self: { pname = "cryptohash-sha256"; version = "0.11.101.0"; sha256 = "1p85vajcgw9hmq8zsz9krzx0vxh7aggwbg5w9ws8w97avcsn8xaj"; - revision = "3"; - editedCabalFile = "1arhz4y792kx439s2zv9x291gvvl2zxcfx9sq0nxsjlz7c3hpyp1"; + revision = "4"; + editedCabalFile = "00p6sx2n1pzykm3my68hjfk8l66g66rh7inrfcnkd5mhilqdcqxr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring ]; @@ -63336,6 +63404,44 @@ self: { broken = true; }) {}; + "css-easings" = callPackage + ({ mkDerivation, aeson, base, blaze-markup, data-default + , QuickCheck, scientific, shakespeare, text + }: + mkDerivation { + pname = "css-easings"; + version = "0.2.0.0"; + sha256 = "0i969cp4j154ddq7x2821p53qh8dnsr7f74rsdi4y9rbbls1fnpv"; + libraryHaskellDepends = [ + aeson base blaze-markup data-default QuickCheck scientific + shakespeare text + ]; + description = "Defining and manipulating css easing strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "css-selectors" = callPackage + ({ mkDerivation, aeson, alex, array, base, blaze-markup + , data-default, Decimal, happy, QuickCheck, shakespeare + , template-haskell, test-framework, test-framework-quickcheck2 + , text + }: + mkDerivation { + pname = "css-selectors"; + version = "0.2.0.0"; + sha256 = "1wyc06f14nj5v5ysjly3jimja3y47pvnm8vm2knlw3sli1h0pgxi"; + libraryHaskellDepends = [ + aeson array base blaze-markup data-default Decimal QuickCheck + shakespeare template-haskell text + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base QuickCheck test-framework test-framework-quickcheck2 text + ]; + description = "Parsing, rendering and manipulating css selectors in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "css-syntax" = callPackage ({ mkDerivation, base, criterion, deepseq, directory, hspec , QuickCheck, scientific, text @@ -64386,8 +64492,8 @@ self: { ({ mkDerivation, base, doctest, template-haskell }: mkDerivation { pname = "d10"; - version = "0.2.1.0"; - sha256 = "0dbz1lil7qm0qnn1y5kakh6nyyc3jkv00125vfp9nk2n25yckb9z"; + version = "0.2.1.2"; + sha256 = "1y1rqx02qycw01921rrgd6daq91hnbzy35cflbl94maylvi3ryjk"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base doctest ]; description = "Digits 0-9"; @@ -64627,8 +64733,6 @@ self: { ''; description = "a distributed, interactive, smart revision control system"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) curl;}; "darcs-benchmark" = callPackage @@ -65072,8 +65176,6 @@ self: { ]; description = "Utilities for accessing and manipulating fields of records"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-accessor-transformers" = callPackage @@ -65228,6 +65330,8 @@ self: { pname = "data-clist"; version = "0.1.2.3"; sha256 = "1mwfhnmvi3vicyjzl33m6pcipi2v887zazyqxygq258ndd010s9m"; + revision = "1"; + editedCabalFile = "13hg7a3d4ky8b765dl03ryxg28lq8iaqj5ky3j51r0i1i4f2a9hy"; libraryHaskellDepends = [ base deepseq QuickCheck ]; description = "Simple functional ring type"; license = stdenv.lib.licenses.bsd3; @@ -65255,8 +65359,6 @@ self: { libraryHaskellDepends = [ base constraints ]; description = "Define Backwards Compatibility Schemes for Arbitrary Data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-concurrent-queue" = callPackage @@ -65579,6 +65681,8 @@ self: { pname = "data-dword"; version = "0.3.1.3"; sha256 = "1l4g8xbsix6xqljadfq49rs39m2lsbrfz4i7l80q0yhafbm4ax8b"; + revision = "1"; + editedCabalFile = "0gz9pqbi47f4dhn2c9v7y9nzgprbkbp9pd2vq5kpzj18hf53bvdm"; libraryHaskellDepends = [ base data-bword ghc-prim hashable template-haskell ]; @@ -66162,8 +66266,6 @@ self: { ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-msgpack-types" = callPackage @@ -66181,8 +66283,6 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "data-named" = callPackage @@ -66876,22 +66976,27 @@ self: { }) {}; "datafix" = callPackage - ({ mkDerivation, base, Cabal, cabal-toolkit, containers, criterion - , deepseq, directory, doctest, filepath, ghc, ghc-paths, Glob - , lattices, pomaps, primitive, QuickCheck, tasty, tasty-hunit - , tasty-smallcheck, text, transformers, turtle, vector + ({ mkDerivation, base, Cabal, cabal-doctest, cabal-toolkit + , containers, criterion, deepseq, directory, doctest, filepath, ghc + , ghc-paths, lattices, pomaps, primitive, QuickCheck, tasty + , tasty-hunit, tasty-smallcheck, text, transformers, turtle, vector }: mkDerivation { pname = "datafix"; - version = "0.0.0.2"; - sha256 = "0z13m81cl3dnkzrl9fym9mf269lhyw4039fkqpijs024pwbvp0ni"; - setupHaskellDepends = [ base Cabal cabal-toolkit ]; + version = "0.0.1.0"; + sha256 = "1rp3lwrqd8ghmjbqk22sb4mfhl13swm3vij28l5ygj2f3sb8x2zi"; + revision = "1"; + editedCabalFile = "0gx0knrmljam25wz2b0zpn33bw2bxfmcwq8ilxr9j8ndqxy36n6n"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest cabal-toolkit ]; libraryHaskellDepends = [ base containers lattices pomaps primitive transformers vector ]; + executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base Cabal cabal-toolkit containers directory doctest filepath ghc - ghc-paths Glob lattices primitive QuickCheck tasty tasty-hunit + ghc-paths lattices primitive QuickCheck tasty tasty-hunit tasty-smallcheck text transformers turtle ]; benchmarkHaskellDepends = [ @@ -67382,8 +67487,8 @@ self: { }: mkDerivation { pname = "dbus"; - version = "1.2.12"; - sha256 = "19gc1cmz8g5fmqks5rj5fwg9ihd5ras180jdv2wfgilrlrjxvx84"; + version = "1.2.13"; + sha256 = "0v5f2n00v1lsfkjz2isgdx4sfyg2cf9ik0nda3j13xh749bgqh38"; libraryHaskellDepends = [ base bytestring cereal conduit containers deepseq exceptions filepath lens network parsec random split template-haskell text @@ -68172,8 +68277,8 @@ self: { pname = "dec"; version = "0.0.3"; sha256 = "1y8bvlm2371dq2v0jv1srki98nbhbz091wh0g2x58wz78h971f6r"; - revision = "1"; - editedCabalFile = "09dkybwqmayf2a1sn94vmmma2xfvf07bw7grhcyjm7lq9jpxv8y0"; + revision = "2"; + editedCabalFile = "1v5f5yby0cld1ziqqgkcx8b50qkpviplspm82a6wl7lw28cjm0hs"; libraryHaskellDepends = [ base ]; description = "Decidable propositions"; license = stdenv.lib.licenses.bsd3; @@ -68982,8 +69087,8 @@ self: { }: mkDerivation { pname = "dependent-map"; - version = "0.3"; - sha256 = "1azy6yrnd0adga4z2mlp9knbp55xhlj4v9c3rb2lr1sd2l8cgf80"; + version = "0.4.0.0"; + sha256 = "0b0zhyl3wkl4kkrxvq7vwjz3gn0ndxjjgyw9cky8a6xyv190pkjk"; libraryHaskellDepends = [ base constraints-extras containers dependent-sum ]; @@ -69024,12 +69129,12 @@ self: { }) {}; "dependent-sum" = callPackage - ({ mkDerivation, base, constraints-extras }: + ({ mkDerivation, base, constraints-extras, some }: mkDerivation { pname = "dependent-sum"; - version = "0.6.2.0"; - sha256 = "17xj5mfrqbhf614z25l2km5grhrxh1rfhb8h8g677sv2xgxrv82d"; - libraryHaskellDepends = [ base constraints-extras ]; + version = "0.7.1.0"; + sha256 = "0aj63gvak0y4mgxndykqfg5w958hf7lp5blml2z647rjgy85bjw1"; + libraryHaskellDepends = [ base constraints-extras some ]; description = "Dependent sum type"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -69058,16 +69163,14 @@ self: { }: mkDerivation { pname = "dependent-sum-template"; - version = "0.1.0.0"; - sha256 = "07z95f27jpdb8y01f904z0fi6kjllsbcm2zg0k1v9y8c6rwavw0f"; + version = "0.1.0.3"; + sha256 = "1px4dj0czdsg4lx4c09v1pil4zifrvpsndhq0hp1hrlrzb9igsy8"; libraryHaskellDepends = [ base dependent-sum template-haskell th-extras ]; testHaskellDepends = [ base constraints-extras dependent-sum ]; description = "Template Haskell code to generate instances of classes in dependent-sum package"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "depends" = callPackage @@ -69323,23 +69426,21 @@ self: { "derive-storable-plugin" = callPackage ({ mkDerivation, base, criterion, deepseq, derive-storable, ghc - , ghc-paths, ghci, hspec, QuickCheck + , ghci, hspec, QuickCheck }: mkDerivation { pname = "derive-storable-plugin"; - version = "0.2.2.0"; - sha256 = "0rpwiwwz24j9bq07d89ndp61f95hjy7am2q72jxb0by7pzpy9xw0"; + version = "0.2.3.0"; + sha256 = "0yr9s33drw5l4ckqipqpmgrsrnm18yr4742mmyjqm3x7wai7d99q"; libraryHaskellDepends = [ base derive-storable ghc ghci ]; testHaskellDepends = [ - base derive-storable ghc ghc-paths ghci hspec QuickCheck + base derive-storable ghc ghci hspec QuickCheck ]; benchmarkHaskellDepends = [ 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; }) {}; "derive-topdown" = callPackage @@ -69575,8 +69676,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "a simple build tool for OCaml projects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "despair" = callPackage @@ -69935,6 +70034,58 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall_1_31_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write + , base, bytestring, case-insensitive, cborg, cborg-json, containers + , contravariant, cryptonite, data-fix, deepseq, Diff, directory + , doctest, dotgen, either, exceptions, filepath, foldl, gauge + , generic-random, hashable, haskeline, http-client, http-client-tls + , http-types, lens-family-core, megaparsec, memory, mockery, mtl + , network-uri, optparse-applicative, parser-combinators, parsers + , pretty-simple, prettyprinter, prettyprinter-ansi-terminal + , profunctors, QuickCheck, quickcheck-instances, repline + , scientific, semigroups, serialise, special-values, spoon, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , template-haskell, text, text-manipulate, th-lift-instances + , transformers, transformers-compat, turtle, unordered-containers + , uri-encode, vector + }: + mkDerivation { + pname = "dhall"; + version = "1.31.1"; + sha256 = "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal atomic-write base bytestring + case-insensitive cborg cborg-json containers contravariant + cryptonite data-fix deepseq Diff directory dotgen either exceptions + filepath hashable haskeline http-client http-client-tls http-types + lens-family-core megaparsec memory mtl network-uri + optparse-applicative parser-combinators parsers pretty-simple + prettyprinter prettyprinter-ansi-terminal profunctors repline + scientific serialise template-haskell text text-manipulate + th-lift-instances transformers transformers-compat + unordered-containers uri-encode vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring cborg containers data-fix deepseq directory doctest + either filepath foldl generic-random lens-family-core megaparsec + mockery prettyprinter QuickCheck quickcheck-instances scientific + semigroups serialise special-values spoon tasty + tasty-expected-failure tasty-hunit tasty-quickcheck + template-haskell text transformers turtle unordered-containers + vector + ]; + benchmarkHaskellDepends = [ + base bytestring containers directory gauge serialise text + ]; + description = "A configuration language guaranteed to terminate"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-bash" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text @@ -69956,6 +70107,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-bash_1_0_29" = callPackage + ({ mkDerivation, base, bytestring, containers, dhall + , neat-interpolation, optparse-generic, shell-escape, text + }: + mkDerivation { + pname = "dhall-bash"; + version = "1.0.29"; + sha256 = "0hmhk2lmqr1szrjx1kqa3zlylcblwigi6lqmkqnh0z1dh3kc1a1w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers dhall neat-interpolation shell-escape + text + ]; + executableHaskellDepends = [ + base bytestring dhall optparse-generic text + ]; + description = "Compile Dhall to Bash"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-check" = callPackage ({ mkDerivation, base, containers, dhall, directory, filepath , fsnotify, text, trifecta @@ -70040,6 +70213,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dhall-json_1_6_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal + , base, bytestring, containers, dhall, exceptions, filepath + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , scientific, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "dhall-json"; + version = "1.6.3"; + sha256 = "1dm6lrn8nd29c8d1sp1l3jnxfxkhhqpvinrgn1hm0lcp3jgzchbb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty aeson-yaml base bytestring containers dhall + exceptions filepath optparse-applicative prettyprinter scientific + text unordered-containers vector + ]; + executableHaskellDepends = [ + aeson aeson-pretty ansi-terminal base bytestring dhall exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + aeson base bytestring dhall tasty tasty-hunit text + ]; + description = "Convert between Dhall and JSON or YAML"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-lex" = callPackage ({ mkDerivation, alex, array, base, bytestring, criterion, deepseq , hspec, hspec-dirstream, scientific @@ -70069,8 +70272,8 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.5"; - sha256 = "1lrx0grpgzi8iv9pskn3dk0ill3x542afmz9v1h96fvb20nmknp8"; + version = "1.0.6"; + sha256 = "1pbxzs9axnbwqfgdz44cbaabq9v10jsk752ix8i0cz1vmwyrcnlv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70096,8 +70299,8 @@ self: { }: mkDerivation { pname = "dhall-nix"; - version = "1.1.12"; - sha256 = "1hpy3nwn1as92v6r1qh4dp6gn9x404a8ynz1gkldcp6izyiri82h"; + version = "1.1.13"; + sha256 = "0sdnrhr9f29ds4zdj2qs123k44vg15r8kn8w2zwkmdabilzlgg9k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70191,6 +70394,36 @@ self: { broken = true; }) {}; + "dhall-yaml_1_0_3" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall + , dhall-json, exceptions, HsYAML, HsYAML-aeson + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , tasty, tasty-expected-failure, tasty-hunit, text, vector + }: + mkDerivation { + pname = "dhall-yaml"; + version = "1.0.3"; + sha256 = "1lnxp2wqbgzg5f2kadhnbd8i5zgwy3g1nz17mmbdqwlx30p4scdn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring dhall dhall-json HsYAML HsYAML-aeson + optparse-applicative text vector + ]; + executableHaskellDepends = [ + aeson ansi-terminal base bytestring dhall dhall-json exceptions + optparse-applicative prettyprinter prettyprinter-ansi-terminal text + ]; + testHaskellDepends = [ + base bytestring dhall dhall-json tasty tasty-expected-failure + tasty-hunit text + ]; + description = "Convert between Dhall and YAML"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dhcp-lease-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty , tasty-hunit, text @@ -70970,8 +71203,6 @@ self: { libraryHaskellDepends = [ base parsec random-fu transformers ]; description = "Simplistic D&D style dice-rolling system"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dice-entropy-conduit" = callPackage @@ -71587,6 +71818,8 @@ self: { pname = "digraph"; version = "0.1.0.2"; sha256 = "1kkvihqg3rhhsqz25yq7np211813kf3xqqi27lpdf1kdmq8vvf80"; + revision = "1"; + editedCabalFile = "0q9q9xr765ym535mwh3ji94y23mr9fxmrcwij439n6rgr4spwqi5"; libraryHaskellDepends = [ base containers deepseq hashable massiv mwc-random streaming transformers unordered-containers @@ -71975,12 +72208,12 @@ self: { broken = true; }) {}; - "directory_1_3_6_0" = callPackage + "directory_1_3_6_1" = callPackage ({ mkDerivation, base, filepath, time, unix }: mkDerivation { pname = "directory"; - version = "1.3.6.0"; - sha256 = "1fxgha63sw3zc3hv4qswk595alxkhl4nikip9ab46ni4m83hyvmf"; + version = "1.3.6.1"; + sha256 = "00cr2sshzjmn57rpvjj8wvgr60x2mk8c7w1nd40wxqs8s9xaa1bi"; libraryHaskellDepends = [ base filepath time unix ]; testHaskellDepends = [ base filepath time unix ]; description = "Platform-agnostic library for filesystem operations"; @@ -72185,8 +72418,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.4.0"; - sha256 = "1011zrn5axjm44zmnj21q3w33pwwkciici2zf2sqz2plvkxn4c1w"; + version = "1.5.0"; + sha256 = "1449ap68c917z1318wg67cv7yk7cmfr61m0ikbf132gzsfyx69kv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72198,8 +72431,6 @@ self: { executableHaskellDepends = [ base text ]; description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "discord-hs" = callPackage @@ -73396,28 +73627,6 @@ self: { }: mkDerivation { pname = "dl-fedora"; - version = "0.7.3"; - sha256 = "095wmsflwm4wqlvk2h7s64nqacha8did10av9n52pj3kcwczqx2i"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring directory 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; - broken = true; - }) {}; - - "dl-fedora_0_7_4" = callPackage - ({ mkDerivation, base, bytestring, directory, 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.4"; sha256 = "092fmla7a0xbnfac6izcj08wsyxbd04n23cjy33c132lqhs5k6w5"; isLibrary = false; @@ -73445,6 +73654,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dlist_0_8_0_8" = callPackage + ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: + mkDerivation { + pname = "dlist"; + version = "0.8.0.8"; + sha256 = "0va9xk8g2iag24x042q3w6z77xdqd91112kh0piq8cwd0qccyabi"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ base Cabal QuickCheck ]; + description = "Difference lists"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dlist-instances" = callPackage ({ mkDerivation, base, dlist, semigroups }: mkDerivation { @@ -73465,8 +73687,8 @@ self: { pname = "dlist-nonempty"; version = "0.1.1"; sha256 = "0csbspdy43pzvasb5mhs5pz2f49ws78pi253cx7pp84wjx6ads20"; - revision = "7"; - editedCabalFile = "0cp5v4zfkx7mz8cc8hgjx0v0a37y4fnld3r59i6mb00ilzrh1nhk"; + revision = "8"; + editedCabalFile = "134fcrv7lmbhzmgp07vp3fdjbbjrkkracvjf6ma5k2fwcw0wfkff"; libraryHaskellDepends = [ base base-compat deepseq dlist semigroupoids ]; @@ -73735,8 +73957,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.15.1.0"; - sha256 = "1r2zwwcbkm07g1lrypdg3aj4qhyy3g7fds042i4l5abs045aqa2l"; + version = "0.22.1.0"; + sha256 = "1mx1q8z5a950ji8nnmw2jcarqadlkm58qszzyz0hh31rni26p1k5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74069,13 +74291,14 @@ self: { "doctest" = callPackage ({ mkDerivation, base, base-compat, code-page, deepseq, directory - , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process - , QuickCheck, setenv, silently, stringbuilder, syb, transformers + , filepath, ghc, ghc-paths, hspec, hspec-core, HUnit, mockery + , process, QuickCheck, setenv, silently, stringbuilder, syb + , transformers }: mkDerivation { pname = "doctest"; - version = "0.16.2"; - sha256 = "0lk4cjfzi5bx2snfzw1zi06li0gvgz3ckfh2kwa98l7nxfdl39ag"; + version = "0.16.3"; + sha256 = "1y1l7aa80qkib1z8lsizgg7fpfdmdwhxvi5m255a42jdkjgn5sfg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74088,7 +74311,7 @@ self: { ]; testHaskellDepends = [ base base-compat code-page deepseq directory filepath ghc ghc-paths - hspec HUnit mockery process QuickCheck setenv silently + hspec hspec-core HUnit mockery process QuickCheck setenv silently stringbuilder syb transformers ]; description = "Test interactive Haskell examples"; @@ -75198,8 +75421,8 @@ self: { }: mkDerivation { pname = "drone"; - version = "1.0.1"; - sha256 = "1qhgikixnzsqyywxnrgl2099klcxk17djbbz23hxvxmibay1pm8w"; + version = "1.1.0"; + sha256 = "0c0xinvr36mmwk9kl970ya53w4z4v6scpxxa9i3lwjjnkcadp9kp"; libraryHaskellDepends = [ base bytestring containers extensible formatting microlens req text ]; @@ -76742,11 +76965,11 @@ self: { }: mkDerivation { pname = "eccrypto"; - version = "0.2.1"; - sha256 = "181c8avf0k8377n0z8qm3v7dnqg01z1gp5zwhcrk8khb3h4d4rp7"; + version = "0.2.2"; + sha256 = "1avzxzzlhldpjp6k14jirx3ws5818bpsip9p0wj6kl1g3ii7ydjz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base bytestring cryptohash-sha512 integer-gmp random + base bytestring cryptohash-sha512 integer-gmp ]; testHaskellDepends = [ base base16-bytestring bytestring Cabal ]; benchmarkHaskellDepends = [ base bytestring criterion random ]; @@ -76758,8 +76981,8 @@ self: { ({ mkDerivation, base, bytestring, eccrypto }: mkDerivation { pname = "eccrypto-ed25519-bindings"; - version = "0.1.1.0"; - sha256 = "1yzalib6a5h7k7bhc9kzr2lqhd928yva3j2mxynx3lmw26jc5r17"; + version = "0.1.2.0"; + sha256 = "1j2h568k2j8kpclvam3hghi13ddyas5d7c8nf469gwr80wmnyqxs"; libraryHaskellDepends = [ base bytestring eccrypto ]; description = "provides \"ed25519\" API using \"eccrypto\""; license = stdenv.lib.licenses.bsd3; @@ -77442,8 +77665,6 @@ 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; - broken = true; }) {}; "egison-quote" = callPackage @@ -77583,6 +77804,8 @@ self: { pname = "either"; version = "5.0.1.1"; sha256 = "09yzki8ss56xhy9vggdw1rls86b2kf55hjl5wi0vbv02d8fxahq2"; + revision = "1"; + editedCabalFile = "03bgnq55lc6f1nx4p662gidfsyyfm3xm4fi84h77wnsppxrpa5j1"; libraryHaskellDepends = [ base bifunctors mtl profunctors semigroupoids ]; @@ -77615,8 +77838,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Functions involving lists of Either"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "either-unwrap" = callPackage @@ -77661,8 +77882,6 @@ self: { ]; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-bosun" = callPackage @@ -77717,8 +77936,6 @@ self: { ]; description = "An ekg backend for Amazon Cloudwatch"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-core" = callPackage @@ -77788,8 +78005,6 @@ self: { ]; description = "An EKG backend to send statistics to influxdb"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-json" = callPackage @@ -77806,8 +78021,6 @@ self: { ]; description = "JSON encoding of ekg metrics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-log" = callPackage @@ -77903,8 +78116,6 @@ self: { ]; description = "Push metrics to statsd"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ekg-wai" = callPackage @@ -78050,6 +78261,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eliminators_0_7" = callPackage + ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats + , singletons, template-haskell, th-abstraction, th-desugar + }: + mkDerivation { + pname = "eliminators"; + version = "0.7"; + sha256 = "1h3h0f7s0gjbza7lij8y2pg5hl6zrf8cqslh5f0hpwnfxh3yls6v"; + libraryHaskellDepends = [ + base extra singleton-nats singletons template-haskell + th-abstraction th-desugar + ]; + testHaskellDepends = [ base hspec singleton-nats singletons ]; + testToolDepends = [ hspec-discover ]; + description = "Dependently typed elimination functions using singletons"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elision" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -78579,8 +78809,6 @@ self: { 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; - broken = true; }) {}; "elynx-seq" = callPackage @@ -79348,8 +79576,8 @@ self: { }: mkDerivation { pname = "enum-text"; - version = "0.5.1.0"; - sha256 = "0v48hmxbpzjpclg1q0avrc1dp4giglbxy2rkqnbj4f0sprp03kff"; + version = "0.5.2.1"; + sha256 = "16wvizrbf6n2i0s4318065i39qhp94p6jy4vappd05mlmmwiccam"; libraryHaskellDepends = [ array base bytestring fmt hashable possibly text time unordered-containers @@ -79931,8 +80159,8 @@ self: { }: mkDerivation { pname = "equational-reasoning"; - version = "0.6.0.1"; - sha256 = "0al3ms7gxd1ws8bs694h7ka2rg9kn3v36qgwrxm2hq4ys80y7r65"; + version = "0.6.0.2"; + sha256 = "0zahv50jnbaaiwa7gy7w901fyqjk816gcd3fx9km0nacsjrgal4v"; libraryHaskellDepends = [ base containers template-haskell th-desugar th-extras void ]; @@ -80562,8 +80790,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.3.1.1"; - sha256 = "1qi28ma8j5kfygjxnixlazxsyrkdqv8ljz3icwqi5dlscsnj6v3v"; + version = "3.3.3.0"; + sha256 = "19zzqmaciski4ara41djkh1df17nzqw2nfwzc81zv6d3pylaznq1"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -81449,8 +81677,8 @@ self: { }: mkDerivation { pname = "eventlog2html"; - version = "0.6.0"; - sha256 = "06v2g84hxcc7w4idhkfdix3c2yk9qdx91ys83abn7z7jjc24x2hs"; + version = "0.7.0"; + sha256 = "045ihz620xv6qhic3vy257g59l1ly2sld6dcnq28xblsf461krv1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -81598,8 +81826,8 @@ self: { }: mkDerivation { pname = "eventstore"; - version = "1.4.0"; - sha256 = "0p7xfvdm4bjdp23f1ikfyq1gbylxav6b3wmbxhmscmzai396al12"; + version = "1.4.1"; + sha256 = "1d8lai7ra0r8mlfwnyvf9bhx7n4y9qzvj1sc96x3fh8xf79qd8mj"; libraryHaskellDepends = [ aeson array base bifunctors bytestring cereal clock connection containers dns dotnet-timespan exceptions fast-logger hashable @@ -81902,6 +82130,8 @@ self: { pname = "exceptions"; version = "0.10.4"; sha256 = "1kw4pmx7j7zwbdwm0dyn9rcs6kp4byfxy48861yxdz6gam1zn2sd"; + revision = "1"; + editedCabalFile = "0b5m01nmaqzvvm1d07b3dnmcn47pmy943lydb2m7ibhilqkfya8p"; libraryHaskellDepends = [ base mtl stm template-haskell transformers ]; @@ -82631,8 +82861,8 @@ self: { ({ mkDerivation, base, leancheck, template-haskell }: mkDerivation { pname = "express"; - version = "0.1.2"; - sha256 = "0i6dh1kpadhh4faanmkszdq1bbsdyl2ngbyrwv7pb8kb3wqc4y6y"; + version = "0.1.3"; + sha256 = "09g7i6x553gv5jkhbn5ffsrxznx8g4b3fcn1gibwyh380pbss8x1"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base leancheck ]; benchmarkHaskellDepends = [ base leancheck ]; @@ -82699,8 +82929,8 @@ self: { }: mkDerivation { pname = "expresso"; - version = "0.1.2.2"; - sha256 = "1fa37bqyw8zlva3z6sj10sp4r7sslh4xakrmr7d5diqynyrgdjax"; + version = "0.1.2.3"; + sha256 = "1kbvwd51whmqgis8c4adl5mdbjpcvzm9ya6jb3ka9w8ciiyh80v8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -82796,10 +83026,8 @@ self: { }: mkDerivation { pname = "extended-reals"; - version = "0.2.3.0"; - sha256 = "170nxxza6lkczh05qi2qxr8nbr3gmdjpfvl1m703gjq9xwrwg2kw"; - revision = "4"; - editedCabalFile = "1gzi55w9kpfg51njyi3a28n7nc64chzgnv76m3xyrz7z0gbri93q"; + version = "0.2.4.0"; + sha256 = "19df7zlm8kisihmnpg3ni5qg4p0vkilsny0ngch0b8b0pr56cb0c"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base deepseq HUnit QuickCheck tasty tasty-hunit tasty-quickcheck @@ -84040,8 +84268,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.24.0.5"; - sha256 = "05wm3zp41xgx0s9p0wmy9rqk9ii6wcxsr3jrcqqrnlpbp90dwfxx"; + version = "0.24.1.0"; + sha256 = "0cihrggbxmjfz34kbf7nbzn20v2sapfjql6hc5m68rbiiysb8jk3"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -84381,8 +84609,8 @@ self: { ({ mkDerivation, base, doctest, first-class-families, Glob }: mkDerivation { pname = "fcf-containers"; - version = "0.4.0"; - sha256 = "1qdcp2mympq8w49j9dfrl5sdkyhiyg3p8nr8568x12ham0jpar9l"; + version = "0.5.0"; + sha256 = "0j4ij4iw5axjp56zhxb3kn6ls1l8m2ckqx6620y1yjhz3ja608f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base first-class-families ]; @@ -84692,8 +84920,8 @@ self: { }: mkDerivation { pname = "feed"; - version = "1.3.0.0"; - sha256 = "19xqkx8ars0sjana18m34d7qg9l0qbg1i3v14a5rqabdppzcfrp2"; + version = "1.3.0.1"; + sha256 = "0fdylvbrjlshgx398xpxx3y7mnrmpi1l2534mcv299afpm91yqcj"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base base-compat bytestring old-locale old-time safe text time @@ -85335,8 +85563,8 @@ self: { pname = "ffunctor"; version = "1.2.0"; sha256 = "0rq60a7ximvqdxqvijw1isd1d5gwqbjagmws91y0jvxlwmsgzf6w"; - revision = "1"; - editedCabalFile = "0biwzy37ig69s7l4x2cp0p71w3fn1azfd81vsj39fzn4kpcrpgld"; + revision = "2"; + editedCabalFile = "1mwddp63jdgfzhdcyqs77nv5lsbaw4gj63gcihimfmj5qxlx7zpk"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ aeson base exceptions generic-lens http-client mtl servant @@ -85503,8 +85731,6 @@ self: { ]; description = "Abusing monadic syntax JSON objects generation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "fieldwise" = callPackage @@ -85590,8 +85816,8 @@ self: { pname = "file-embed-lzma"; version = "0"; sha256 = "0xqcgx4ysyjqrygnfabs169y4w986kwzvsaqh64h7x3wfi7z8v78"; - revision = "4"; - editedCabalFile = "19z355zylpsqsfihldbda6lwrdj5divfhhnc24ryzvi384dw74lx"; + revision = "5"; + editedCabalFile = "1rkya7m491b3asfhpygwz97gzfh46f9h1bi6b4isbslpj50k2h6l"; libraryHaskellDepends = [ base base-compat bytestring directory filepath lzma template-haskell text th-lift-instances transformers @@ -85658,8 +85884,23 @@ self: { ]; description = "Takes a Haskell source-code file and outputs its modules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + }) {}; + + "file-path-th" = callPackage + ({ mkDerivation, base, directory, file-embed, filepath + , template-haskell + }: + mkDerivation { + pname = "file-path-th"; + version = "0.1.0.0"; + sha256 = "15v2jlif4qrzl3xqkicqd71rx7n9916zip44yk0j7gsnyrwrr7p5"; + revision = "1"; + editedCabalFile = "0v1hfgw2sqscbxlzidqzdljz92mihydk765370sq6hmjiw98a5fk"; + libraryHaskellDepends = [ + base directory file-embed filepath template-haskell + ]; + description = "Template Haskell utilities for filepaths"; + license = stdenv.lib.licenses.mit; }) {}; "file-templates" = callPackage @@ -85898,8 +86139,8 @@ self: { pname = "filesystem-abstractions"; version = "0"; sha256 = "1qrxc8q10fqd7b0ss84nykz8vmyjwwxw5ywxp11xabad966shl18"; - revision = "1"; - editedCabalFile = "0qfkiify5jgclzdz2gyml5d7rn0vinilwxgfvk0h7743lj2vj167"; + revision = "2"; + editedCabalFile = "1mj9ipsycs70jdgi722z04cvw7va09cr7fv78w9995pdf2n33gl0"; libraryHaskellDepends = [ base bytestring list-tries posix-paths semigroups ]; @@ -86025,6 +86266,8 @@ self: { pname = "fin"; version = "0.1.1"; sha256 = "0zwc8x2ilbk1bhsk85brf6g300cx4w2j3602gjh6rv900961gqri"; + revision = "2"; + editedCabalFile = "1x446k44pci81dakzd98vrj6amj10xkb05k7g2qwk0ir1hdj5sfz"; libraryHaskellDepends = [ base dec deepseq hashable QuickCheck ]; testHaskellDepends = [ base inspection-testing tagged ]; description = "Nat and Fin: peano naturals and finite numbers"; @@ -86535,8 +86778,8 @@ self: { }: mkDerivation { pname = "fitspec"; - version = "0.4.7"; - sha256 = "0ski62ndgl5ay9kbgx2v590pvfsn0wn0cx9h70fhvcrlsam01p5q"; + version = "0.4.8"; + sha256 = "01xfchs98xy5436kchzysnvwgm00s2srsn5xyxx3r04pzzb5cbd9"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; @@ -86613,8 +86856,8 @@ self: { }: mkDerivation { pname = "fixed-length"; - version = "0.2.1"; - sha256 = "0jabfv9ga94maw35a7xdw5lwi55d7z92nn2zs2c8z3jk0a4bcld1"; + version = "0.2.2"; + sha256 = "1bx46n11k9dpr5hhfhxiwdd5npaqf9xwvqvjd0nlbylfmsmgd14y"; libraryHaskellDepends = [ base non-empty storable-record tfp utility-ht ]; @@ -90192,6 +90435,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "freetype2_0_2_0" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "freetype2"; + version = "0.2.0"; + sha256 = "1fdzhm6lcb6bxgza5z41925a75xdi19lwqw6vas1s2y130x3zfam"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base template-haskell ]; + description = "Haskell bindings for FreeType 2 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "french-cards" = callPackage ({ mkDerivation, base, hspec, HUnit }: mkDerivation { @@ -90362,8 +90620,8 @@ self: { ({ mkDerivation, array, base, containers, fail, mtl, semigroups }: mkDerivation { pname = "frisby"; - version = "0.2.3"; - sha256 = "1bcdrjvd6cpq1361m8ipf1z6yp3gqiaixkl8gxgmg6ky1lsiljhn"; + version = "0.2.4"; + sha256 = "02dywihwkyk80viny3lq213qia2ksaylk7gphjiq0jzx9smswgyb"; libraryHaskellDepends = [ array base containers fail mtl semigroups ]; @@ -90404,8 +90662,8 @@ self: { }: mkDerivation { pname = "front"; - version = "0.0.0.5"; - sha256 = "0gn5lrh817r9ky8j4kzrqdlisiy85gr6v7nyd2sj1psa8syrjfzk"; + version = "0.0.0.6"; + sha256 = "0380d9c9mv8jp04igjm4h9njijgc18x34xg13d5pgm7f5yz8aipk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -91623,6 +91881,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fused-effects-readline" = callPackage + ({ mkDerivation, base, directory, filepath, fused-effects + , haskeline, prettyprinter, prettyprinter-ansi-terminal + , terminal-size, transformers + }: + mkDerivation { + pname = "fused-effects-readline"; + version = "0.0.0.0"; + sha256 = "089f6b3y48ymhd45x1rxmimrwjygkjk3ykhz6nx7cf235d3cg83l"; + libraryHaskellDepends = [ + base directory filepath fused-effects haskeline prettyprinter + prettyprinter-ansi-terminal terminal-size transformers + ]; + testHaskellDepends = [ base ]; + description = "A readline-like effect and carrier for fused-effects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fused-effects-resumable" = callPackage ({ mkDerivation, base, deepseq, fused-effects, transformers }: mkDerivation { @@ -91709,8 +91985,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.15.1"; - sha256 = "181kgqbdqxcim16ld68wx09lr4gh0j9440lnn2lyzrzmn8a9567w"; + version = "0.15.3"; + sha256 = "067hzxvvkkz0d9sg67pswi6k061ri314vw4j979skhjibfb7g0hx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92581,6 +92857,20 @@ self: { broken = true; }) {}; + "gdelt" = callPackage + ({ mkDerivation, base, bytestring, hspec, megaparsec, QuickCheck + , text, time + }: + mkDerivation { + pname = "gdelt"; + version = "0.1.0.0"; + sha256 = "0p19363bqqyqw2lmxym1jwr6l6gr1q4ck1xp776b4xmx6drm5h09"; + 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; + }) {}; + "gdiff" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -93162,21 +93452,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-data_0_8_1_0" = callPackage + "generic-data_0_8_2_0" = callPackage ({ mkDerivation, base, base-orphans, contravariant, criterion - , deepseq, doctest, generic-lens, Glob, one-liner, QuickCheck - , show-combinators, tasty, tasty-hunit + , deepseq, doctest, generic-lens, ghc-boot-th, Glob, one-liner + , QuickCheck, show-combinators, tasty, tasty-hunit }: mkDerivation { pname = "generic-data"; - version = "0.8.1.0"; - sha256 = "0hrrqxvax365yg3y7pv6k6v9x86a7hj3b85kmzky2q6f7vvqfkfb"; + version = "0.8.2.0"; + sha256 = "03ix1zc47baqjvwi3xqsbhbb9wrfiamlbjmahcakp2jbzmx2vy6l"; libraryHaskellDepends = [ - base base-orphans contravariant show-combinators + base base-orphans contravariant ghc-boot-th show-combinators ]; testHaskellDepends = [ - base doctest generic-lens Glob one-liner QuickCheck tasty - tasty-hunit + base doctest generic-lens Glob one-liner QuickCheck + show-combinators tasty tasty-hunit ]; benchmarkHaskellDepends = [ base criterion deepseq ]; description = "Deriving instances with GHC.Generics and related utilities"; @@ -93335,6 +93625,8 @@ self: { pname = "generic-lens-lite"; version = "0.1"; sha256 = "07z00phy6h50bb4axlr57kin9l5fygi4q4j33rj5180ai2cbcpc6"; + revision = "1"; + editedCabalFile = "1gbl0kmc77yjvn63cgdsifhzyd54g1v1qq1pjsrhhn0hb4c8jszz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Monomorphic field lens like with generic-lens"; @@ -93420,6 +93712,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-override" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-override"; + version = "0.0.0.0"; + sha256 = "13v5zrhhzjzm4fib5zjsp4sf1hhgx9450mmy4v12h7bgljz8xfd5"; + libraryHaskellDepends = [ base ]; + description = "Provides functionality for overriding instances for generic derivation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "generic-override-aeson" = callPackage + ({ mkDerivation, aeson, base, generic-override, hspec, text }: + mkDerivation { + pname = "generic-override-aeson"; + version = "0.0.0.0"; + sha256 = "02xwssk7158k7hhh170knxn7f2s7slcp4sy7a4b3w4cn1r016bhz"; + 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; + }) {}; + "generic-pretty" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, containers , tasty, tasty-hunit, text, vector @@ -93441,14 +93756,16 @@ self: { }) {}; "generic-random" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck }: + ({ mkDerivation, base, deepseq, inspection-testing, QuickCheck }: mkDerivation { pname = "generic-random"; - version = "1.3.0.0"; - sha256 = "1z62lvb0zjdy5ass2cvj442w0cbk0zi4cx6n4qm2ai4sbmgh5hzk"; + version = "1.3.0.1"; + sha256 = "0d9w7xcmsb31b95fr9d5jwbsajcl1yi4347dlbw4bybil2vjwd7k"; libraryHaskellDepends = [ base QuickCheck ]; - testHaskellDepends = [ base deepseq QuickCheck ]; - description = "Generic random generators"; + testHaskellDepends = [ + base deepseq inspection-testing QuickCheck + ]; + description = "Generic random generators for QuickCheck"; license = stdenv.lib.licenses.mit; }) {}; @@ -93597,16 +93914,14 @@ self: { "generics-sop" = callPackage ({ mkDerivation, base, criterion, deepseq, ghc-prim, sop-core - , template-haskell + , template-haskell, th-abstraction }: mkDerivation { pname = "generics-sop"; - version = "0.5.0.0"; - sha256 = "18dkdain2g46b1637f3pbv0fkzg4b1a8frm16hfqvhpfk46i7rzc"; - revision = "1"; - editedCabalFile = "10zfjhcipm77zfx32ls7bc8vk3affa5v7cyphwpw93d6sfqc9wym"; + version = "0.5.1.0"; + sha256 = "0g0z0k5bnw3whfj3qswzhadrhg85jfn491s30cgai0ijfjm5gipa"; libraryHaskellDepends = [ - base ghc-prim sop-core template-haskell + base ghc-prim sop-core template-haskell th-abstraction ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ @@ -93620,10 +93935,8 @@ self: { ({ mkDerivation, base, generics-sop, lens }: mkDerivation { pname = "generics-sop-lens"; - version = "0.2"; - sha256 = "0cm3xnz5h1pxhvbgl8mm16fg8y339m6wvm6nlqmsm0jh37gvqc2a"; - revision = "1"; - editedCabalFile = "1ghgh91wd764firxc2s083jzr38w51fg0ry2b7s1wn71mnvzb893"; + version = "0.2.0.1"; + sha256 = "1yl74pz6r2zf9sspzbqg6xvr6k9b5irq3c3pjrf5ih6hfrz4k1ks"; libraryHaskellDepends = [ base generics-sop lens ]; description = "Lenses for types in generics-sop"; license = stdenv.lib.licenses.bsd3; @@ -93812,10 +94125,8 @@ self: { ({ mkDerivation, base, mtl, template-haskell }: mkDerivation { pname = "geniplate-mirror"; - version = "0.7.6"; - sha256 = "1y0m0bw5zpm1y1y6d9qmxj3swl8j8hlw1shxbr5awycf6k884ssb"; - revision = "2"; - editedCabalFile = "03fg4vfm1wgq4mylggawdx0bfvbbjmdn700sqx7v3hk1bx0kjfzh"; + version = "0.7.7"; + sha256 = "08w4rslxzv6z85qzam1yazjb6vrzcr55vsjjyjgsi86pb1a8hr3b"; libraryHaskellDepends = [ base mtl template-haskell ]; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; @@ -93877,27 +94188,12 @@ self: { }: mkDerivation { pname = "genvalidity"; - version = "0.10.0.1"; - sha256 = "0zyg3a0gqcdhdqy8w8ydqpcq7k6vbsb77v2dw31j2yfss1av4q2x"; - libraryHaskellDepends = [ base QuickCheck random validity ]; - testHaskellDepends = [ base hspec hspec-core QuickCheck ]; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity_0_10_0_2" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random - , validity - }: - mkDerivation { - pname = "genvalidity"; version = "0.10.0.2"; sha256 = "1k6pba9zal7385838b9w9ybhk5742jwfy8bqa921zi08mv7vgqlp"; libraryHaskellDepends = [ base QuickCheck random validity ]; testHaskellDepends = [ base hspec hspec-core QuickCheck ]; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-aeson" = callPackage @@ -94512,6 +94808,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "geojson_4_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, deepseq + , hlint, lens, scientific, semigroups, tasty, tasty-hspec + , tasty-quickcheck, text, transformers, validation, vector + }: + mkDerivation { + pname = "geojson"; + version = "4.0.2"; + sha256 = "0csbg4pdh686bxk689968bi94njx78iv1sm5g6lp915pg6cfnd66"; + libraryHaskellDepends = [ + aeson base containers deepseq lens scientific semigroups text + transformers validation vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hlint tasty tasty-hspec + tasty-quickcheck text validation + ]; + description = "A thin GeoJSON Layer above the aeson library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "geojson-types" = callPackage ({ mkDerivation, aeson, base, bson, bytestring, lens, text }: mkDerivation { @@ -94810,12 +95128,12 @@ self: { }: mkDerivation { pname = "ghc-check"; - version = "0.1.0.2"; - sha256 = "0xxx1n3xwzfkpbhn2k6s63h8idqy8s15fvy4hbnfkk5fz6mwgvdz"; + version = "0.1.0.3"; + sha256 = "1zrlnk3gzdb96592is2krk8qpk386bib0bpgw47yqj8qfcxqf76v"; libraryHaskellDepends = [ base ghc ghc-paths template-haskell transformers ]; - description = "detect mismatches between compile-time and run-time versions of the ghc api"; + description = "Detect mismatches between compile-time and run-time versions of the ghc api"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95066,6 +95384,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-exactprint_0_6_3" = callPackage + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb + }: + mkDerivation { + pname = "ghc-exactprint"; + version = "0.6.3"; + sha256 = "0da4gkirill2rpxr9gl4cbcwpp4a16z9bdgyv5nkdps3msh93214"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory filepath free ghc ghc-boot + ghc-paths mtl syb + ]; + testHaskellDepends = [ + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb + ]; + description = "ExactPrint for GHC"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-gc-tune" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -95215,6 +95557,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib_8_10_1_20200324" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy + , hpc, pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib"; + version = "8.10.1.20200324"; + sha256 = "09d0254ic650n9h6j863xl3cvd506ww84369qdszxwkizlzk7gr3"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-lib-parser ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-lib-parser" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty @@ -95234,6 +95596,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-lib-parser_8_10_1_20200324" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty + , process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "8.10.1.20200324"; + sha256 = "0i3ab7a2xq8pjd94kfyrlnp9wnjfkl0qi74zb1m23l6k5zm4g9y8"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory filepath + ghc-prim hpc pretty process time transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-lib-parser-ex" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit @@ -95241,8 +95623,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.8.5.6"; - sha256 = "0jwndkf7idpf09zrj4i4x1vsyfpm0vf85vlh00qp0z3avqcxsf2m"; + version = "8.8.5.8"; + sha256 = "1mw1ym5bn39z7lqmxnhhkfqb0kbxddabkafw025wgs54knsghvmk"; libraryHaskellDepends = [ base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate ]; @@ -95253,20 +95635,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_8_8_5_8" = callPackage + "ghc-lib-parser-ex_8_10_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra - , filepath, ghc, ghc-boot, ghc-boot-th, tasty, tasty-hunit - , uniplate + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.8.5.8"; - sha256 = "1mw1ym5bn39z7lqmxnhhkfqb0kbxddabkafw025wgs54knsghvmk"; + version = "8.10.0.2"; + sha256 = "17khl1ma4q1k16wya96nq8i805b8jkg8spjlrac5273icc550qn2"; libraryHaskellDepends = [ - base bytestring containers extra ghc ghc-boot ghc-boot-th uniplate + base bytestring containers ghc-lib-parser uniplate ]; testHaskellDepends = [ - base directory extra filepath ghc ghc-boot-th tasty tasty-hunit + base directory extra filepath ghc-lib-parser tasty tasty-hunit ]; description = "Algorithms on GHC parse trees"; license = stdenv.lib.licenses.bsd3; @@ -95691,29 +96072,69 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-tags-plugin" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, directory, filelock - , filepath, ghc, lattices, QuickCheck, quickcheck-instances, tasty - , tasty-golden, tasty-quickcheck, text + "ghc-tags-core" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq + , directory, filepath, ghc, lattices, mtl, pipes, pipes-attoparsec + , pipes-bytestring, pipes-text, QuickCheck, quickcheck-instances + , tasty, tasty-golden, tasty-quickcheck, text, transformers }: mkDerivation { - pname = "ghc-tags-plugin"; - version = "0.1.5.0"; - sha256 = "065i5xdf5i0xxj8q2aah2p9n30n65w0r60rfd49bih1iisfk0ljn"; + pname = "ghc-tags-core"; + version = "0.1.0.0"; + sha256 = "0agn5601fwq4nr2k6xya0lmwm4hw63rvmpi4rk0jr362vn7d219n"; libraryHaskellDepends = [ - attoparsec base bytestring directory filelock filepath ghc text + attoparsec base bytestring directory filepath ghc mtl pipes + pipes-attoparsec pipes-bytestring pipes-text text transformers ]; testHaskellDepends = [ - attoparsec base bytestring lattices QuickCheck quickcheck-instances - tasty tasty-golden tasty-quickcheck text + attoparsec base bytestring directory filepath lattices mtl pipes + QuickCheck quickcheck-instances tasty tasty-golden tasty-quickcheck + text ]; - doHaddock = false; - description = "A compiler plugin which generates tags file from GHC syntax tree"; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq mtl pipes pipes-attoparsec + pipes-bytestring pipes-text text + ]; + description = "a library to work with tags created from Haskell parsed tree"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "ghc-tags-plugin" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, ghc + , ghc-tags-core, mtl, optparse-applicative, pipes, pipes-attoparsec + , pipes-bytestring, pipes-safe, pipes-text, text + }: + mkDerivation { + pname = "ghc-tags-plugin"; + version = "0.1.6.0"; + sha256 = "148whav3lpkglgfk51az3f3cfnp50psnznrw0a7mdbqxmkhfb41i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory filepath ghc ghc-tags-core mtl + optparse-applicative pipes pipes-attoparsec pipes-bytestring + pipes-safe pipes-text text + ]; + description = "A compiler plugin which generates tags file from GHC parsed syntax tree"; license = stdenv.lib.licenses.mpl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "ghc-tcplugins-extra_0_3_2" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-tcplugins-extra"; + version = "0.3.2"; + sha256 = "13qhwjbhyi3nrjdvc0fdgxf4kz55my541mz2j3sndpxsmbymqs3m"; + libraryHaskellDepends = [ base ghc ]; + description = "Utilities for writing GHC type-checker plugins"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-tcplugins-extra" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -95914,8 +96335,8 @@ self: { ({ mkDerivation, base, directory, ghc, time }: mkDerivation { pname = "ghcflags"; - version = "1.0.2"; - sha256 = "17j7bkx7ki5vqr0a3vl0f0v4l9cz2q7lm9xpkj3144y9sqmiqzy3"; + version = "1.0.3"; + sha256 = "1xsfznfypgmv67qdxm8zvl8n84hj47akjn9fsdi66b8flbx8c0gm"; libraryHaskellDepends = [ base directory ghc time ]; description = "Dump the ghc flags during compilation"; license = stdenv.lib.licenses.bsd2; @@ -96095,32 +96516,6 @@ self: { }: mkDerivation { pname = "ghcid"; - version = "0.8.3"; - sha256 = "1b8a8mx6z2ridw79gijjv90b2jgk0qrncvg0sjbmvyyyajx1h5f7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs directory extra filepath process time - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_8_5" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; version = "0.8.5"; sha256 = "15zj78wasix4yz8mxx5hl6x1gj364vsbwn5arp7sbq13rywhs2qy"; isLibrary = true; @@ -96138,7 +96533,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcide" = callPackage @@ -97837,8 +98231,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20200309"; - sha256 = "1yjb01jh5rccqg44nqh4iyxmbpkcpm6m82lnw7s0s2vizj8891p5"; + version = "8.20200330"; + sha256 = "0xy0ld7kr4cfdl4g4yzvrzl5r60dcj33cxm28a4qz6nqm2yhd4sv"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -98337,6 +98731,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "githash_0_1_4_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , process, template-haskell, temporary, unliftio + }: + mkDerivation { + pname = "githash"; + version = "0.1.4.0"; + sha256 = "0rsz230srhszwybg5a40vhzzp9z0r4yvdz4xg2hwwwphmbi8pfy3"; + libraryHaskellDepends = [ + base bytestring directory filepath process template-haskell + ]; + testHaskellDepends = [ + base bytestring directory filepath hspec process template-haskell + temporary unliftio + ]; + description = "Compile git revision info into Haskell projects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , binary, binary-instances, bytestring, containers, cryptohash-sha1 @@ -98994,8 +99408,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "gjk"; - version = "0.0.0.1"; - sha256 = "0kqhvich6slcihxg64nwrg1zk9nnpymi7nqrnlmn71flzw6w27ca"; + version = "0.0.0.2"; + sha256 = "11ncqhq0q5bl38a0j813y3hjhijz14r0h6npzy441frk8wg1s8lh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm"; @@ -99383,8 +99797,7 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Console IRC client"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "gll" = callPackage @@ -99816,8 +100229,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-core" = callPackage @@ -99842,8 +100253,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-ekg" = callPackage @@ -99868,8 +100277,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "glue-example" = callPackage @@ -99890,8 +100297,6 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gluturtle" = callPackage @@ -102936,6 +103341,31 @@ self: { broken = true; }) {}; + "gopro-plus" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , filepath, generic-deriving, HUnit, lens, lens-aeson, mtl, random + , retry, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unix, unliftio, unordered-containers, vector, wreq + }: + mkDerivation { + pname = "gopro-plus"; + version = "0.3.0.0"; + sha256 = "16fk23q5qz6c4bjhbm8xcnkdckyk5ziz4gky9x1vndk5wxm2srr1"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions filepath + generic-deriving lens lens-aeson mtl random retry text time + transformers unix unliftio unordered-containers vector wreq + ]; + testHaskellDepends = [ + aeson base bytestring containers exceptions filepath + generic-deriving HUnit lens lens-aeson mtl random retry tasty + tasty-hunit tasty-quickcheck text time transformers unix unliftio + unordered-containers vector wreq + ]; + description = "GoPro Plus Client API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gore-and-ash" = callPackage ({ mkDerivation, base, containers, deepseq, exceptions, hashable , linear, mtl, parallel, profunctors, random, semigroups, time @@ -103326,8 +103756,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Applicative non-linear consumption"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "grab-form" = callPackage @@ -103340,8 +103768,6 @@ self: { testHaskellDepends = [ base containers hedgehog text ]; description = "Applicative parsers for form parameter lists"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "graceful" = callPackage @@ -104464,8 +104890,8 @@ self: { }: mkDerivation { pname = "greskell-core"; - version = "0.1.3.1"; - sha256 = "0jp6xzr601y6ngngbra0z2v99jxgp6y88dq4kb8fh25phyajzlmw"; + version = "0.1.3.2"; + sha256 = "149xqjhjjbwmsikdacpbhcd188c1rg0vj1szwwwrsadcagc793ky"; libraryHaskellDepends = [ aeson base containers hashable scientific semigroups text unordered-containers uuid vector @@ -105308,8 +105734,6 @@ self: { ]; description = "Console and GUI interface for Google Translate service"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gtfs" = callPackage @@ -105387,8 +105811,6 @@ self: { libraryHaskellDepends = [ base gtk json transformers ]; description = "A simple custom form widget for gtk which allows inputing of JSON values"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "gtk-largeTreeStore" = callPackage @@ -106441,8 +106863,6 @@ self: { ]; description = "Interface to Amazon's Simple Storage Service (S3)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hScraper" = callPackage @@ -107227,33 +107647,6 @@ self: { }) {}; "hackage-security" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec - , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, time, transformers, zlib - }: - mkDerivation { - pname = "hackage-security"; - version = "0.5.3.0"; - sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "6"; - editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring Cabal - containers cryptohash-sha256 directory ed25519 filepath ghc-prim - mtl network network-uri parsec pretty tar template-haskell time - transformers zlib - ]; - testHaskellDepends = [ - base bytestring Cabal containers network-uri QuickCheck tar tasty - tasty-hunit tasty-quickcheck temporary time zlib - ]; - description = "Hackage security library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hackage-security_0_6_0_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, Cabal, containers, cryptohash-sha256, directory , ed25519, filepath, ghc-prim, lukko, mtl, network, network-uri @@ -107280,7 +107673,6 @@ self: { ]; description = "Hackage security library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-security-HTTP" = callPackage @@ -107579,8 +107971,8 @@ self: { ({ mkDerivation, base, filepath, haddock-api }: mkDerivation { pname = "haddock"; - version = "2.23.0"; - sha256 = "1f7n4l1kkq1msl8csnvzg2xh3i5a056dzmcf40gib0im91wcwl0x"; + version = "2.23.1"; + sha256 = "129lwai4609f910h7yhmmm1rbqzjla9rcg5dpzqihydsjyw5ii1s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haddock-api ]; @@ -107624,8 +108016,8 @@ self: { }: mkDerivation { pname = "haddock-api"; - version = "2.23.0"; - sha256 = "0fbk458qr7iw1j8vh6455n2819c0pfdw1m3gy1y3fs6fdpj9qbjj"; + version = "2.23.1"; + sha256 = "14dl17ajlr8354rmc49w4fsqxmrn0dl7wps3r4iipms5nhj5bm3d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath ghc @@ -107830,6 +108222,20 @@ self: { broken = true; }) {}; + "hadoop-streaming" = callPackage + ({ mkDerivation, base, conduit, extra, hspec, hspec-discover, text + }: + mkDerivation { + pname = "hadoop-streaming"; + version = "0.1.0.0"; + sha256 = "0nbmq0lb2dydc47x4i3gvbwyy216dzwcvirpsra06dcz2yi3vkmm"; + libraryHaskellDepends = [ base conduit extra text ]; + testHaskellDepends = [ base conduit extra hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "A simple Hadoop streaming library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hadoop-tools" = callPackage ({ mkDerivation, attoparsec, base, boxes, bytestring, clock , configurator, exceptions, filepath, hadoop-rpc, old-locale @@ -108643,8 +109049,6 @@ self: { 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; - broken = true; }) {}; "hakyll-typescript" = callPackage @@ -109097,8 +109501,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.7.1.1"; - sha256 = "1agh5sq0hj9r55w3k529jcar66p4vih54j5w3h28chm34n9k6qa2"; + version = "0.7.2.0"; + sha256 = "0w54ybsd7hkykifw0nsgr3mdss7945y76rbjmlk7zl9lqi780ia7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -109357,14 +109761,14 @@ self: { }: mkDerivation { pname = "hapistrano"; - version = "0.3.10.0"; - sha256 = "0kw98zcqp6b4j0i2nbd487i2icq12r3sqi8w9gjjqj5fhzsa7sja"; + version = "0.4.0.1"; + sha256 = "08zjj506rs9124xvc78y4jm4baxmnyh005sbk6k4gpnnc0qagxz4"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal base filepath formatting gitrev mtl path - process stm time transformers typed-process + process stm time transformers typed-process yaml ]; executableHaskellDepends = [ aeson async base formatting gitrev optparse-applicative path @@ -109372,7 +109776,7 @@ self: { ]; testHaskellDepends = [ base directory filepath hspec mtl path path-io process QuickCheck - silently temporary + silently temporary yaml ]; testToolDepends = [ hspec-discover ]; description = "A deployment library for Haskell applications"; @@ -110580,8 +110984,6 @@ self: { ]; description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasbolt-extras" = callPackage @@ -110607,8 +111009,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Extras for hasbolt library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hascal" = callPackage @@ -110816,6 +111216,8 @@ self: { pname = "hashable"; version = "1.3.0.0"; sha256 = "1d4sn4xjf0swrfg8pl93ipavbj12ch3a9aykhkl6mjnczc9m8bl2"; + revision = "1"; + editedCabalFile = "1c8z7vxlh4whpm1ag4xp6wknnaal28cl4dqdan9rw1c1g10g2w2c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110894,8 +111296,8 @@ self: { pname = "hashable-time"; version = "0.2.0.2"; sha256 = "1q7y4plqqwy5286hhx2fygn12h8lqk0y047b597sbdckskxzfqgs"; - revision = "2"; - editedCabalFile = "006phc5y9rrvsshdcmjmhxzxh8dpgs685mpqbkjm9c40xb1ydjbz"; + revision = "3"; + editedCabalFile = "1dr7ak803ngrhpv43dy25jm18gfzn02gzd3hm31dzcjv3mxsmbrk"; libraryHaskellDepends = [ base hashable time ]; description = "Hashable instances for Data.Time"; license = stdenv.lib.licenses.bsd3; @@ -111287,8 +111689,6 @@ self: { ]; description = "Generate tags file for Haskell project and its nearest deps"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskeem" = callPackage @@ -112111,6 +112511,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp_0_21_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.21.0.0"; + sha256 = "0ic9gn5ww8vxmvidj28msark0nybj7fj1j5xsykiac5cgiy5ysnv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-lsp-client" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , haskell-lsp, lens, process, text, unix @@ -112150,6 +112580,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-lsp-types_0_21_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.21.0.0"; + sha256 = "0x5xhn9vy09r0r76wvmzp6nh23y4p2kgm35p8qqqgvnx6w5cvi92"; + 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; + }) {}; + "haskell-menu" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -112234,8 +112682,8 @@ self: { }: mkDerivation { pname = "haskell-names"; - version = "0.9.7"; - sha256 = "1ad0kdp4a9gq10g9flmmjn0ibfaipq2qnrz5a13r1mgyb6skzc5j"; + version = "0.9.8"; + sha256 = "1s4pyqrjhq9x4zxq0vh02qr86kw5fk854wfwkryqyzkylr83dv4r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers data-lens-light filepath @@ -112736,8 +113184,6 @@ self: { libraryHaskellDepends = [ base haskell-src-exts ]; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-src-exts-util" = callPackage @@ -112847,8 +113293,6 @@ self: { ]; description = "Generate Elm types and JSON encoders and decoders from Haskell types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "haskell-token-utils" = callPackage @@ -115141,8 +115585,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "1.4.1"; - sha256 = "0qypisbyyk9xq3g0av4vphi4k9r0jm8c16crc5wbqvalxaxrj2wc"; + version = "1.4.2"; + sha256 = "0n617bh0achqwybngppz6inj7y5fv42zi0dxlyal3d9zbrgsljfw"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring bytestring-strict-builder contravariant contravariant-extras dlist hashable hashtables @@ -115460,8 +115904,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.5"; - sha256 = "1gc11n2g07cqipcvm779wwm36mfjjbnwg9n1ch7cldlg1wsr6m6n"; + version = "0.4.0.6"; + sha256 = "0s9c2aa0mpxiqsvpaf3l5k2gqchrjv4x9jpjmw7v3ywnv9pcxpkf"; libraryHaskellDepends = [ base bytestring case-insensitive containers contravariant fast-builder foldl hashable hasql headed-megaparsec megaparsec @@ -117235,8 +117679,8 @@ self: { }: mkDerivation { pname = "headroom"; - version = "0.1.2.0"; - sha256 = "0xf657k22bpyx45x0bxljv19adb2qwfv2a5724dsnmvndyvn9kxy"; + version = "0.1.3.0"; + sha256 = "0c680vr2kjlx9l9zh6v22jjfgxrwxh9icg1psjxrjfl9zi9kqfb9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117250,8 +117694,6 @@ self: { ]; description = "License Header Manager"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "heap" = callPackage @@ -117801,18 +118243,19 @@ self: { "hedis" = callPackage ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri - , resource-pool, scanner, stm, test-framework, test-framework-hunit - , text, time, tls, unordered-containers, vector + , deepseq, doctest, errors, exceptions, HTTP, HUnit, mtl, network + , network-uri, resource-pool, scanner, stm, test-framework + , test-framework-hunit, text, time, tls, unordered-containers + , vector }: mkDerivation { pname = "hedis"; - version = "0.12.11"; - sha256 = "1n83zwg011n9w2v1zz4mwpms9jh3c8mk700zya4as1jg83748xww"; + version = "0.12.13"; + sha256 = "1axsv81r1q393m178x89km49pi7w7dci0l48cnjdskdz99jwvywq"; libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq errors HTTP mtl - network network-uri resource-pool scanner stm text time tls - unordered-containers vector + async base bytestring bytestring-lexing deepseq errors exceptions + HTTP mtl network network-uri resource-pool scanner stm text time + tls unordered-containers vector ]; testHaskellDepends = [ async base bytestring doctest HUnit mtl stm test-framework @@ -117943,10 +118386,8 @@ self: { }: mkDerivation { pname = "hedn"; - version = "0.3.0.0"; - sha256 = "1gx8bw2l1qpb4jgh5d1zzgfm2rnwavg5shmp4wq2mqrih11r3f3y"; - revision = "1"; - editedCabalFile = "1bpd4dd8afccj2bakqqbimmd3ja9i21q9k98vmzw37ishbd3xync"; + version = "0.3.0.1"; + sha256 = "02pwwxdgw3kkqwckap9mf015bbd27mgblfz7k4y63v0gppw6fqm7"; libraryHaskellDepends = [ base containers deepseq deriving-compat megaparsec parser-combinators prettyprinter scientific template-haskell text @@ -117957,8 +118398,6 @@ self: { ]; description = "EDN parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hedn-functor" = callPackage @@ -122380,8 +122819,8 @@ self: { ({ mkDerivation, base, Cabal, directory, hspec, libsass }: mkDerivation { pname = "hlibsass"; - version = "0.1.8.1"; - sha256 = "050z6i29v410shjsskr26sna491ldg23if1nr0808xp94xgfif16"; + version = "0.1.9.0"; + sha256 = "14rcg48hlbpz4vjk7ydhf58wgnbgsa61q6s7h0n80ak8ih63jdcx"; configureFlags = [ "-fexternallibsass" ]; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; @@ -123370,8 +123809,6 @@ self: { testToolDepends = [ tasty-discover ]; description = "Core effects for interacting with the Nix store"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hnix-store-remote" = callPackage @@ -123775,8 +124212,8 @@ self: { }: mkDerivation { pname = "hoggl"; - version = "0.2.0.0"; - sha256 = "0kblkirivnw3ylaifdpa8acy2armxxkl9hbqymg2qfiiwnbgg2wh"; + version = "0.2.0.1"; + sha256 = "1l42s17kq78lba60l2gv1ig2sxb8mfywxm0md27jp5v6s4bqc7jy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123785,8 +124222,8 @@ self: { unordered-containers ]; executableHaskellDepends = [ - base either http-client http-client-tls optparse-applicative - servant-client text time transformers + base either formatting http-client http-client-tls + optparse-applicative servant-client text time transformers ]; description = "Bindings to the Toggl.com REST API"; license = stdenv.lib.licenses.bsd3; @@ -124491,13 +124928,13 @@ self: { pname = "hookup"; version = "0.3.1.0"; sha256 = "0dyx0zgxis4viqgdkky25q93vh3z551m7nssjfr15rqj25w8zb5y"; + revision = "1"; + editedCabalFile = "0r92s1dz7bzm2p5wpdqfkmpgzfh3xgyan82b4rkpmq8m888z74w9"; libraryHaskellDepends = [ attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network ]; description = "Abstraction over creating network connections with SOCKS5 and TLS"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hoopl" = callPackage @@ -124726,8 +125163,8 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.7.0"; - sha256 = "0v21a3nwk94ggrk8fyjmlb93rnrsh7s3xbqnk1p236h0gycsh1q3"; + version = "0.7.1"; + sha256 = "1fhqlckfznmd5dhzsxgm40lynm790j8g4srf6y3g632dv7lccjwn"; libraryHaskellDepends = [ base bytestring containers directory filepath haskell-src mtl process temporary text @@ -124755,8 +125192,8 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.7.0"; - sha256 = "0yr73dalwljp23ls9za07cnabs65aypgbrjjv76zhxbsqqcc82a3"; + version = "0.7.1"; + sha256 = "1y7xi347xq60p66avxgjyzxn9q7amjg1s43b9fln4v8f9ca0pwn7"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator @@ -125794,8 +126231,8 @@ self: { }: mkDerivation { pname = "hpqtypes"; - version = "1.8.0.1"; - sha256 = "1zn6qzpxvpdiim12lma7viq96j3jadvlcw188iknjqyn15kri9my"; + version = "1.9.0.0"; + sha256 = "17w916p4gfzflgvd35d5nxzfch82bwyranvlv28j2qz3dvk15ymn"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ aeson async base bytestring containers exceptions lifted-base @@ -127009,8 +127446,6 @@ self: { testHaskellDepends = [ base HUnit network temporary unix ]; description = "Write a server supporting Server::Starter's protocol in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hs-snowtify" = callPackage @@ -127032,15 +127467,17 @@ self: { }) {}; "hs-speedscope" = callPackage - ({ mkDerivation, aeson, base, extra, ghc-events, text, vector }: + ({ mkDerivation, aeson, base, extra, ghc-events + , optparse-applicative, text, vector + }: mkDerivation { pname = "hs-speedscope"; - version = "0.1.1.0"; - sha256 = "0dldhndlags3ig991yvddfaw472cjwfy9dz3i12hq5ny6s9qz8qa"; + version = "0.2"; + sha256 = "119s4da40zjf42s7fyjm4b78vciiv5r2f67l8ki9gqr933ir6mpb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base extra ghc-events text vector + aeson base extra ghc-events optparse-applicative text vector ]; executableHaskellDepends = [ base ]; description = "Convert an eventlog into the speedscope json format"; @@ -127376,6 +127813,8 @@ self: { pname = "hsass"; version = "0.8.0"; sha256 = "1bnjvj6dpmcbpkbi4g5m5hvr0w5rmd7y5zkiwbqc8n9y4l2dkd5g"; + revision = "1"; + editedCabalFile = "0d085g21zvawl2jv6ap5fyk70c9igbjiwknvk1mgdydxbm1kvyq5"; libraryHaskellDepends = [ base bytestring data-default-class filepath hlibsass monad-loops transformers @@ -127532,8 +127971,8 @@ self: { }: mkDerivation { pname = "hsc2hs"; - version = "0.68.6"; - sha256 = "1clj6bgs9vmiv3mjzp82lvyyik5zr5411nxab7hydbrgq94pbk70"; + version = "0.68.7"; + sha256 = "0jl94cr2jhjmvz7l9idpr352vwxlsanyiq7ya1vvrlry3vj1aygx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -128209,8 +128648,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.3.3.6"; - sha256 = "0j2qi1gw7rpb23bkj4557kg2d47b8kgrd8vr2qnld90h9p8jnzqm"; + version = "0.3.3.8"; + sha256 = "01dagwpg70h9af5kzr2f19qsvy4h5cx5rjdrcq0r36fbmdkbza2z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128408,10 +128847,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.1.6"; - sha256 = "0pdm0v3xz308yzdhc646bbkwj156llf9g17c2y74x339xk6i8zhg"; - revision = "1"; - editedCabalFile = "1dgcgsmx0k5p3ibfv3n5k0c5p1is2m5zfsd2s6nc6d0pz34d4wl9"; + version = "0.6.1.8"; + sha256 = "1c44j9qnld5lg8zcw3pyh56fk0r62g76qmma790mcvy4sbrcz102"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -128655,8 +129092,8 @@ self: { }: mkDerivation { pname = "hsinspect"; - version = "0.0.11"; - sha256 = "03537zzxaxrcw6lv9vr5b0j1k6w97xxfavj8n3vv0rxjy3xsj54j"; + version = "0.0.12"; + sha256 = "12s6f5f26wzp5adwdpy15235v1nclw12ypp9ginxrm68a65qy4lk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128865,6 +129302,30 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, lua5_3, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "1.1.0"; + sha256 = "04xf5xp5iyf6y0das661pbzw6z2zx63phidg9mqhwbn79wk2mwwh"; + configureFlags = [ "-fsystem-lua" "-f-use-pkgconfig" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers exceptions mtl QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "Bindings to Lua, an embeddable scripting language"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, hashable, hslua, hspec , HUnit, ieee754, QuickCheck, quickcheck-instances, scientific @@ -129581,8 +130042,6 @@ self: { testHaskellDepends = [ base hedgehog hspec ]; description = "Integrate Hedgehog and Hspec!"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hspec-jenkins" = callPackage @@ -129615,8 +130074,8 @@ self: { ({ mkDerivation, base, hspec, hspec-core, HUnit, leancheck }: mkDerivation { pname = "hspec-leancheck"; - version = "0.0.3"; - sha256 = "0lnqk4dkzqlzrq2hb72yv8xbbnps4bmjqz1qy9q47r8nrac8xpiq"; + version = "0.0.4"; + sha256 = "06amq8467wv2jkx9f4pif0z5rgvj35hdp1yffqkxyxh65148prcb"; libraryHaskellDepends = [ base hspec hspec-core HUnit leancheck ]; testHaskellDepends = [ base hspec leancheck ]; description = "LeanCheck support for the Hspec test framework"; @@ -129860,8 +130319,6 @@ self: { ]; description = "A library for testing with Hspec and the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hspec-stack-rerun" = callPackage @@ -130478,6 +130935,27 @@ self: { broken = true; }) {}; + "hstar" = callPackage + ({ mkDerivation, archive-libarchive, archive-sig, base, bytestring + , bz2, cpphs, lz4-hs, lzlib, lzma, optparse-applicative, zlib, zstd + }: + mkDerivation { + pname = "hstar"; + version = "0.1.0.0"; + sha256 = "0li4bvh92ijw5prwyrhcmrvi989w3b343yfbxjdhzqkwvpbp98ag"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + archive-libarchive archive-sig base bytestring bz2 lz4-hs lzlib + lzma optparse-applicative zlib zstd + ]; + executableToolDepends = [ cpphs ]; + description = "Haskell version of tar CLI utility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hstatistics" = callPackage ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random , vector @@ -130893,8 +131371,6 @@ self: { testHaskellDepends = [ base hspec time ]; description = "Log to syslog over a network via UDP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hszephyr" = callPackage @@ -131578,6 +132054,8 @@ self: { pname = "http-api-data"; version = "0.4.1.1"; sha256 = "1s93m2vh4c1p073xasvknnj3czbf8xsyg48kyznr4jwfhzi17anh"; + revision = "1"; + editedCabalFile = "1dshqb1140nj4h8d750s97gmzb2rk0ppr1rakvqxy1r79mg3m2wr"; libraryHaskellDepends = [ attoparsec attoparsec-iso8601 base base-compat bytestring containers cookie hashable http-types tagged text time-compat @@ -132573,8 +133051,6 @@ self: { executableHaskellDepends = [ base ]; description = "Tracking http redirects"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "http-types" = callPackage @@ -132639,6 +133115,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http2_2_0_4" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base + , base16-bytestring, bytestring, case-insensitive, containers + , directory, doctest, filepath, gauge, Glob, heaps, hspec + , http-types, mwc-random, network, network-byte-order, psqueues + , stm, text, time-manager, unordered-containers, vector + }: + mkDerivation { + pname = "http2"; + version = "2.0.4"; + sha256 = "0rqfx6vvcrlic4sw5xlqzk3xvdsbw13d0ymppx8yjhkkzign6227"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers http-types + network network-byte-order psqueues stm time-manager + ]; + testHaskellDepends = [ + aeson aeson-pretty array base base16-bytestring bytestring + case-insensitive containers directory doctest filepath Glob hspec + http-types network network-byte-order psqueues stm text + time-manager unordered-containers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers gauge heaps + mwc-random network-byte-order psqueues stm + ]; + description = "HTTP/2 library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http2-client" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , http2, lifted-async, lifted-base, mtl, network, stm, time, tls @@ -133374,17 +133882,18 @@ self: { }) {}; "hurl" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, directory - , filepath, http-client, http-client-tls, http-types, network-uri - , process, text + ({ mkDerivation, base, base64-bytestring, bytestring, containers + , directory, filepath, http-client, http-client-tls, http-types + , network-uri, process, text, xml-conduit, zlib }: mkDerivation { pname = "hurl"; - version = "1.2.0.0"; - sha256 = "07abw78ds4fb4y8c7x94fpwcab58b2k613b3dk8hh9qqplhgl8ms"; + version = "1.3.0.0"; + sha256 = "1fb70wsqpy5jq5w8vrd0qszrpg670mfh25kw4ldapiw652az7w69"; libraryHaskellDepends = [ - base base64-bytestring bytestring directory filepath http-client - http-client-tls http-types network-uri process text + base base64-bytestring bytestring containers directory filepath + http-client http-client-tls http-types network-uri process text + xml-conduit zlib ]; description = "Haskell URL resolver"; license = stdenv.lib.licenses.gpl3; @@ -133555,14 +134064,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_7_0_0" = callPackage + "hvega_0_7_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers }: mkDerivation { pname = "hvega"; - version = "0.7.0.0"; - sha256 = "0kj40mm5d809adblk74h0k57qqpk8jxl5bhildasjzjfmmr4spax"; + version = "0.7.0.1"; + sha256 = "16s58m7kk72hr52k9gci17ac5k38r1zy08wll2frzjxissgza4cj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -133869,6 +134378,8 @@ self: { pname = "hw-excess"; version = "0.2.2.3"; sha256 = "1rlw53nbhjdvjqb1f0kacnmiiwhx04az6p4mf0iv5fwxcjh94q2r"; + revision = "1"; + editedCabalFile = "1bll4amizah25w4c6xplndig77hd6jh65q6zjyr5x4vr11vg6xbx"; libraryHaskellDepends = [ base hw-bits hw-prim hw-rankselect-base safe vector ]; @@ -133910,6 +134421,8 @@ self: { pname = "hw-fingertree-strict"; version = "0.1.1.3"; sha256 = "1fy492nl10a7p9a0b0jrqj1yiar8wir2g3qms2mmd814brbfkm80"; + revision = "1"; + editedCabalFile = "1s7fcimgyf0vskkkms371icazjkkmscv9bkz2ysdhx708bza96v5"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck @@ -133976,6 +134489,8 @@ self: { pname = "hw-ip"; version = "2.4.1.0"; sha256 = "1zjl078xzing927fwwpck36ib8z5aggpi7g0z5gnhxd8isgqs6zh"; + revision = "1"; + editedCabalFile = "1dg3aa6wavdr3vh7va3yx3j272pb4zw48rm7r5a6xv6xrrd01a33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134160,8 +134675,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "4.0.1"; - sha256 = "1x0mq3sn05iwrn444kzyl66056xm8203hq0ajx9f8r85faq3v1ir"; + version = "5.0.0"; + sha256 = "1j2al3xmymjzqc6009wm83b3bpddgshsmrlgp5129801bssc8s5w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134305,6 +134820,8 @@ self: { pname = "hw-prim"; version = "0.6.2.40"; sha256 = "0vm5mcnlb5yas2z7rvzd1kzv39d3qw4bkrkfmv0i7vsdg33yb3fd"; + revision = "1"; + editedCabalFile = "04pzny5b3hk8jjzh89bgz01hdc5z3ygn6a8pw81xky4m1gw7jc6b"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim mmap semigroups transformers unliftio-core vector @@ -134354,6 +134871,8 @@ self: { pname = "hw-rankselect"; version = "0.13.3.2"; sha256 = "1p4b5nm8mgxlc7p5gcwh6dy85xgydpbw999zv27755dbfcv9nk4v"; + revision = "1"; + editedCabalFile = "1byrp7zda5pxcd22jwsb16gr6kw1w7j1d7xyyn67c14fm3vym1mr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134388,6 +134907,8 @@ self: { pname = "hw-rankselect-base"; version = "0.3.3.0"; sha256 = "17h4kmi9zcgm4sdpbmqh6rzygz7w0v95lfc6rmhc9a8bmmg30i5b"; + revision = "1"; + editedCabalFile = "03svpzjia8mbgy33lhmjhwpd6yq0n97l3fkmfnpyi3blc3yb3bd0"; libraryHaskellDepends = [ base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse vector @@ -134444,6 +134965,8 @@ self: { pname = "hw-streams"; version = "0.0.0.12"; sha256 = "087sn4gxhf29vg9ydx8sfq33q16cz6cmda5r63k9xdki4ba761m4"; + revision = "1"; + editedCabalFile = "1y5sw9mgkxwvgf91hl22p3q5kxy99phwfmx2lh87339w7d5bjdbw"; libraryHaskellDepends = [ base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups transformers vector @@ -136485,8 +137008,6 @@ self: { testHaskellDepends = [ base hspec ]; description = "A project manage tool for Idris"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "idris" = callPackage @@ -137435,20 +137956,17 @@ self: { ({ mkDerivation, aeson, async, atom-conduit, base-noprelude, binary , blaze-html, blaze-markup, bytestring, case-insensitive, conduit , connection, containers, dhall, directory, fast-logger, filepath - , hashable, HaskellNet, HaskellNet-SSL, http-client - , http-client-tls, http-types, microlens, mime-mail, monad-time - , msgpack, network, opml-conduit, optparse-applicative - , prettyprinter, prettyprinter-ansi-terminal, refined, relude - , rss-conduit, safe-exceptions, stm, stm-chans + , hashable, http-client, http-client-tls, http-types, microlens + , mime-mail, monad-time, msgpack, opml-conduit + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , refined, relude, rss-conduit, safe-exceptions, stm, stm-chans , streaming-bytestring, streaming-with, text, time, timerep, tls , typed-process, uri-bytestring, xml-conduit, xml-types }: mkDerivation { pname = "imm"; - version = "1.7.0.0"; - sha256 = "0slgfg4ay8j1kcvskl60gd2xbwllxcip6104wg36hcmb1symgdf1"; - revision = "1"; - editedCabalFile = "0hy3lbpn839yjplmn8w4ihlgyyirzi4j8qzwih5k5h98bd4d5nzf"; + version = "1.8.0.0"; + sha256 = "09948024zkjhdza100bi441xl2h8sd5b9gzki0l51dsm27phfk23"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -137462,12 +137980,11 @@ self: { executableHaskellDepends = [ aeson async atom-conduit base-noprelude blaze-html blaze-markup bytestring case-insensitive conduit connection containers dhall - directory fast-logger filepath HaskellNet HaskellNet-SSL - http-client http-client-tls mime-mail msgpack network opml-conduit - optparse-applicative prettyprinter prettyprinter-ansi-terminal - refined relude rss-conduit safe-exceptions stm stm-chans - streaming-bytestring streaming-with text time typed-process - uri-bytestring xml-conduit xml-types + directory fast-logger filepath http-client http-client-tls + mime-mail msgpack opml-conduit optparse-applicative prettyprinter + prettyprinter-ansi-terminal refined relude rss-conduit + safe-exceptions stm stm-chans streaming-bytestring streaming-with + text time typed-process uri-bytestring xml-conduit xml-types ]; description = "Execute arbitrary callbacks for each element of RSS/Atom feeds"; license = stdenv.lib.licenses.cc0; @@ -138471,6 +138988,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "influxdb_1_7_1_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal + , cabal-doctest, clock, containers, doctest, foldl, http-client + , http-types, lens, network, optional-args, raw-strings-qq + , scientific, tagged, tasty, tasty-hunit, template-haskell, text + , time, unordered-containers, vector + }: + mkDerivation { + pname = "influxdb"; + version = "1.7.1.3"; + sha256 = "079f8xwhnzbdzjy0kbhsaklplp0d0nb9gxc193g9nl6v299zb8gv"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec base bytestring clock containers foldl http-client + http-types lens network optional-args scientific tagged text time + unordered-containers vector + ]; + testHaskellDepends = [ + base containers doctest raw-strings-qq tasty tasty-hunit + template-haskell time + ]; + description = "Haskell client library for InfluxDB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "informative" = callPackage ({ mkDerivation, base, containers, csv, highlighting-kate , http-conduit, monad-logger, pandoc, persistent @@ -139180,6 +139725,8 @@ self: { pname = "intcode"; version = "0.3.0.0"; sha256 = "0qcws15hn03wnsv1rg93sw9zhwsyvwpiafrmwnyv9v990qap1x8y"; + revision = "1"; + editedCabalFile = "1ad9fm65l8rnkm7236ak7v9j7hvj1jswwdcaw0xcsn9znn4xawl0"; libraryHaskellDepends = [ base containers primitive ]; testHaskellDepends = [ base containers doctest primitive ]; description = "Advent of Code 2019 intcode interpreter"; @@ -139508,8 +140055,6 @@ self: { ]; description = "Tracery-like randomized text interpolation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "interpol" = callPackage @@ -140543,25 +141088,6 @@ self: { }) {}; "iproute" = callPackage - ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec - , network, QuickCheck, safe - }: - mkDerivation { - pname = "iproute"; - version = "1.7.8"; - sha256 = "0k2qzdw36qp9qs2j0bxsn95ymk3wpjvw6s5c1535aw677gw19bad"; - libraryHaskellDepends = [ - appar base byteorder containers network - ]; - testHaskellDepends = [ - appar base byteorder containers doctest hspec network QuickCheck - safe - ]; - description = "IP Routing Table"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "iproute_1_7_9" = callPackage ({ mkDerivation, appar, base, byteorder, bytestring, containers , doctest, hspec, network, QuickCheck, safe }: @@ -140578,7 +141104,6 @@ self: { ]; description = "IP Routing Table"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iptables-helpers" = callPackage @@ -140757,6 +141282,8 @@ self: { pname = "irc-core"; version = "2.7.2"; sha256 = "1gpd28lxhqj2xj75nyyififn9434imvm0vqvx7zdw44fvg75lqyq"; + revision = "1"; + editedCabalFile = "1xkvy5igrx4ri8gmmwzxs2mq7ih57gps8a592ya6bv1crrm45cy2"; libraryHaskellDepends = [ attoparsec base base64-bytestring bytestring hashable primitive text time vector @@ -141966,8 +142493,6 @@ self: { ]; description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ixshader" = callPackage @@ -142688,12 +143213,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "jira-wiki-markup_1_1_3" = callPackage + "jira-wiki-markup_1_2_0" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit, text }: mkDerivation { pname = "jira-wiki-markup"; - version = "1.1.3"; - sha256 = "1hr67awpl1zpwp53x9b6ix4gdfq8r77r9wnm44qc9q91q8i872wv"; + version = "1.2.0"; + sha256 = "10ywmldxwwcl9n5xm5745xc979fbrz6b7vxq08n4vi2yrkkh04nb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec text ]; @@ -143373,15 +143898,15 @@ self: { "json-api-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers - , data-default, hspec, hspec-discover, lens, lens-aeson, text - , unordered-containers, uri-encode + , data-default, deepseq, hspec, hspec-discover, lens, lens-aeson + , text, unordered-containers, uri-encode }: mkDerivation { pname = "json-api-lib"; - version = "0.1.2.0"; - sha256 = "0qq34fw7b6kv4ywv7bzpsahn7b8mdn42cwwkhgqazsdf7wx72qqy"; + version = "0.2.0.0"; + sha256 = "0cay3yrzfbd0vnfq1a2f74nnqwbiwribhnfy90nhvbi6dxxp14a1"; libraryHaskellDepends = [ - aeson base containers data-default lens lens-aeson text + aeson base containers data-default deepseq lens lens-aeson text unordered-containers uri-encode ]; testHaskellDepends = [ @@ -143461,22 +143986,23 @@ self: { }) {}; "json-autotype" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, GenericPretty, hashable, json-alt, lens, mtl - , optparse-applicative, pretty, process, QuickCheck, scientific - , smallcheck, template-haskell, text, uniplate - , unordered-containers, vector, yaml + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , directory, filepath, GenericPretty, hashable, json-alt, lens, mtl + , optparse-applicative, pretty, process, QuickCheck + , run-haskell-module, scientific, smallcheck, template-haskell + , text, uniplate, unordered-containers, vector, yaml }: mkDerivation { pname = "json-autotype"; - version = "3.0.1"; - sha256 = "0nir4nx4wchl10zs753a3ayg9lgixg2ap3liwz9xpz191c8rkbka"; + version = "3.0.5"; + sha256 = "0kvbx4iyhh2r0abnswbvf862xfj08jlgvdd21xiz4zpnp2d1fx0h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base containers filepath GenericPretty hashable json-alt lens - mtl pretty process QuickCheck scientific smallcheck - template-haskell text uniplate unordered-containers vector + aeson base containers data-default filepath GenericPretty hashable + json-alt lens mtl pretty process QuickCheck run-haskell-module + scientific smallcheck template-haskell text uniplate + unordered-containers vector ]; executableHaskellDepends = [ aeson base bytestring containers filepath GenericPretty hashable @@ -143491,8 +144017,6 @@ self: { ]; description = "Automatic type declaration for JSON input data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "json-b" = callPackage @@ -145287,6 +145811,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "katip_0_8_4_0" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-builder + , bytestring, containers, criterion, deepseq, directory, either + , filepath, hostname, microlens, microlens-th, monad-control, mtl + , old-locale, quickcheck-instances, regex-tdfa, resourcet + , safe-exceptions, scientific, semigroups, stm, string-conv, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell + , text, time, time-locale-compat, transformers, transformers-base + , transformers-compat, unix, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "katip"; + version = "0.8.4.0"; + sha256 = "0hkhvkdyk4m5pdr0yj1lbdwqvrfr7sq49jw683mk0lxjlyc39xm6"; + libraryHaskellDepends = [ + aeson async auto-update base bytestring containers either hostname + microlens microlens-th monad-control mtl old-locale resourcet + safe-exceptions scientific semigroups stm string-conv + template-haskell text time transformers transformers-base + transformers-compat unix unliftio-core unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers directory microlens + quickcheck-instances regex-tdfa safe-exceptions stm tasty + tasty-golden tasty-hunit tasty-quickcheck template-haskell text + time time-locale-compat unordered-containers + ]; + benchmarkHaskellDepends = [ + aeson async base blaze-builder criterion deepseq directory filepath + safe-exceptions text time transformers unix + ]; + description = "A structured logging framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "katip-datadog" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , conduit, conduit-extra, connection, containers, katip, network @@ -146577,8 +147137,8 @@ self: { pname = "kleene"; version = "0.1"; sha256 = "00w1gywdhqyy2k3y238gfjs9h2w4pjanmi45bna5lj215n0jb0hg"; - revision = "2"; - editedCabalFile = "1kiaxmxhlv1pczw8bg5vhcbyxgl87qs5bgcdaipd29ml0z7sncsd"; + revision = "3"; + editedCabalFile = "1bx73d86qhki4bvqckhv7nrvn06rha6x231fqjms2a7a9zpv47bm"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers lattices MemoTrie QuickCheck range-set-list regex-applicative semigroupoids @@ -146655,19 +147215,22 @@ self: { }) {}; "knead" = callPackage - ({ mkDerivation, base, bool8, comfort-array, llvm-extra, llvm-tf - , prelude-compat, storable-enum, storable-record, storable-tuple - , tagged, tfp, transformers, utility-ht + ({ mkDerivation, base, bool8, comfort-array, fixed-length, llvm-dsl + , llvm-extra, llvm-tf, prelude-compat, QuickCheck, storable-enum + , storable-record, tagged, tfp, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.4.2"; - sha256 = "03chikfkzlvabz2vmjpmd5mmk0a7gdnkzbgv635w3gdrpdpm8n31"; + version = "0.5"; + sha256 = "07j0sw10qs0zpz5hgxmrhs3rrwhnxf6441jasyagl96724svxq21"; libraryHaskellDepends = [ - base bool8 comfort-array llvm-extra llvm-tf prelude-compat - storable-enum storable-record storable-tuple tagged tfp + base bool8 comfort-array fixed-length llvm-dsl llvm-extra llvm-tf + prelude-compat storable-enum storable-record tagged tfp transformers utility-ht ]; + testHaskellDepends = [ + 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; @@ -147674,8 +148237,8 @@ self: { pname = "lambdabot-core"; version = "5.2"; sha256 = "1wh87wwb8hk3hn2lmdqi1hv77qbdmwqcwjslichygmvac8fjhjss"; - revision = "2"; - editedCabalFile = "1khn1j3z7mkzggp7s35p0dixsj81yljfrf5r9d289dvy1dip8akf"; + revision = "3"; + editedCabalFile = "182bhiwvbpadwwf3h9fpfsjwcsb0fkfzr57fvpl0k6w7msqn32rp"; libraryHaskellDepends = [ base binary bytestring containers dependent-map dependent-sum dependent-sum-template directory edit-distance filepath haskeline @@ -148324,8 +148887,8 @@ self: { }: mkDerivation { pname = "language-ats"; - version = "1.7.10.0"; - sha256 = "1xixsf3n8ld1fjd96qvvvrmrmypd7idyb7syih09f8gq80jkaw5g"; + version = "1.7.10.1"; + sha256 = "19m9qalh9xiaw6n60zbhs8yqhd0acq08bkx42i44vfmm0917jys3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ ansi-wl-pprint array base composition-prelude containers deepseq @@ -148358,6 +148921,25 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "language-avro_0_1_3_1" = callPackage + ({ mkDerivation, avro, base, containers, directory, filepath, hspec + , hspec-megaparsec, megaparsec, text, vector + }: + mkDerivation { + pname = "language-avro"; + version = "0.1.3.1"; + sha256 = "0b54041z1sfrd7fck975i8d69agxij6jml6mxlcr41y7ywvizq0l"; + libraryHaskellDepends = [ + avro base containers directory filepath megaparsec text vector + ]; + testHaskellDepends = [ + avro base hspec hspec-megaparsec megaparsec text vector + ]; + description = "Language definition and parser for AVRO files"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-bash" = callPackage ({ mkDerivation, base, directory, filepath, parsec, prettyprinter , process, QuickCheck, tasty, tasty-expected-failure, tasty-golden @@ -148611,8 +149193,6 @@ self: { ]; description = "Dockerfile parser, pretty-printer and embedded DSL"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "language-dockerfile" = callPackage @@ -148669,8 +149249,8 @@ self: { }: mkDerivation { pname = "language-ecmascript"; - version = "0.19.0.1"; - sha256 = "1jh5ksx5hh2q9b134rfmcpz4i1j6fsfyqzk4yh8yn635kwa86jhr"; + version = "0.19.1.0"; + sha256 = "0kk5zk9lr6kvpkz4ihw8ww4j03m899i0af6yhf4q3r7r4d1yq22s"; libraryHaskellDepends = [ ansi-wl-pprint base charset containers data-default-class Diff mtl parsec QuickCheck template-haskell uniplate @@ -148821,6 +149401,8 @@ self: { pname = "language-haskell-extract"; version = "0.2.4"; sha256 = "1nxcs7g8a1sp91bzpy4cj6s31k5pvc3gvig04cbrggv5cvjidnhl"; + revision = "1"; + editedCabalFile = "1chx4g8ngb1hpyh3r9rbl8rkjkm67klms4wmw3p1g2llg47vvqip"; libraryHaskellDepends = [ base regex-posix template-haskell ]; description = "Module to automatically extract functions from the local code"; license = stdenv.lib.licenses.bsd3; @@ -148897,8 +149479,8 @@ self: { }: mkDerivation { pname = "language-javascript"; - version = "0.7.0.0"; - sha256 = "15bpqpkjf2y3fk8wff9zlnkpsjc63bnbvhlkxrs9alj0bikq17nk"; + version = "0.7.1.0"; + sha256 = "0s6igb54cxm2jywgc3sq53f52gcsc39wd3g78yisfzvl9jm3d86i"; libraryHaskellDepends = [ array base blaze-builder bytestring containers mtl text utf8-string ]; @@ -149841,8 +150423,6 @@ self: { ]; description = "Automatically inline Haskell snippets into LaTeX documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "latex-svg-hakyll" = callPackage @@ -149906,6 +150486,8 @@ self: { pname = "lattices"; version = "2.0.2"; sha256 = "108rhpax72j6xdl0yqdmg7n32l1j805861f3q9wd3jh8nc67avix"; + revision = "2"; + editedCabalFile = "122mrj3b15jv1bjmzc8k37dkc2gy05hg550gia09n7j7n76v0h7i"; libraryHaskellDepends = [ base base-compat containers deepseq hashable integer-logarithms QuickCheck semigroupoids tagged transformers universe-base @@ -149930,8 +150512,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "1.0.2"; - sha256 = "1psm449p7fsh4b5mf7y7dlgh44za1fhf0cbn0qya1j4imy3x673b"; + version = "1.0.3"; + sha256 = "1xiy76ahwl83fmpj522nzrp9i7rvvn9xjjj6wzrl3vhbjdbmq4m5"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -150561,8 +151143,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.9.1"; - sha256 = "03n9apqkfs8vjm0s1ajfpg02zsvdm091di0860gyqa58cd3qbkdb"; + version = "0.9.3"; + sha256 = "14wi7h07pipd56grhaqmhb8wmr52llgd3xb7fm8hi9fb1sfzmvg0"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base ]; description = "Enumerative property-based testing"; @@ -150733,8 +151315,6 @@ self: { ]; description = "Yet another library for hidden Markov models"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "leetify" = callPackage @@ -151342,8 +151922,8 @@ self: { pname = "lens-properties"; version = "4.11.1"; sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; - revision = "3"; - editedCabalFile = "1ll8j0zymxnr2xxp2h1aaqfcwd6ihjdllk5b7q02r5kw2b8a266b"; + revision = "4"; + editedCabalFile = "1ky3xzh3cgam5ncx7n25xbll7vqw3x7vyhprfmxm34pshkxbrjh7"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; @@ -151436,6 +152016,17 @@ self: { broken = true; }) {}; + "lens-th-rewrite" = callPackage + ({ mkDerivation, base, ghc, lens }: + mkDerivation { + pname = "lens-th-rewrite"; + version = "0.1.0.0"; + sha256 = "08nk7fglx1751zak82h8w0ld3lplzaghxraqwqrkvj39gwm4mqgx"; + libraryHaskellDepends = [ base ghc lens ]; + description = "Rewrites Template Haskell splices using the API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lens-time" = callPackage ({ mkDerivation, base, lens, time }: mkDerivation { @@ -151960,8 +152551,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "2.2.4.0"; - sha256 = "05d16ckk6iaj75zarqq6hjjmmb2xdd62hcyidfya3jfkw74zh1rp"; + version = "2.2.5.0"; + sha256 = "0vsrjkg4ijk63rgsl7cqdi1inpnv7ballrg5c5pgrrapwxfb5v4x"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -151979,8 +152570,6 @@ self: { ]; description = "Haskell interface to libarchive"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libarchive;}; "libarchive-conduit" = callPackage @@ -152923,32 +153512,29 @@ self: { }) {}; "life-sync" = callPackage - ({ mkDerivation, ansi-terminal, base-noprelude, bytestring - , containers, exceptions, filepath, fmt, hedgehog - , microlens-platform, optparse-applicative, path, path-io, process - , relude, tasty, tasty-discover, tasty-hedgehog, text, tomland + ({ mkDerivation, base, bytestring, colourista, containers + , exceptions, filepath, hedgehog, hspec, hspec-hedgehog + , optparse-applicative, path, path-io, process, relude, shellmet + , text, tomland, validation-selective }: mkDerivation { pname = "life-sync"; - version = "1.0.1"; - sha256 = "1p7vnbk6xsa2963wc77cjjc5bbnrswzh27nw1zra09405yd21yf0"; + version = "1.1.0.0"; + sha256 = "0l56n4dhg6p4lw7i7jjq747qv7r6fr0k2gdabwkbbb2qhsviw162"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base-noprelude bytestring containers exceptions fmt - microlens-platform path path-io process relude text tomland - ]; - executableHaskellDepends = [ - base-noprelude containers optparse-applicative path + base bytestring colourista containers exceptions + optparse-applicative path path-io process relude shellmet text + tomland validation-selective ]; + executableHaskellDepends = [ base relude ]; testHaskellDepends = [ - base-noprelude containers filepath hedgehog path tasty - tasty-hedgehog + base containers filepath hedgehog hspec hspec-hedgehog path relude + text ]; - testToolDepends = [ tasty-discover ]; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + description = "Synchronize personal configs across multiple machines"; + license = stdenv.lib.licenses.mpl20; }) {}; "lift-generics" = callPackage @@ -153002,6 +153588,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lifted-async_0_10_0_6" = callPackage + ({ mkDerivation, async, base, constraints, criterion, deepseq + , HUnit, lifted-base, monad-control, mtl, tasty + , tasty-expected-failure, tasty-hunit, tasty-th, transformers-base + }: + mkDerivation { + pname = "lifted-async"; + version = "0.10.0.6"; + sha256 = "1nnhb9sdn5ilwzdrzk9hfchcgvk3kb28fciriqhhxzi2qqzmdxbj"; + libraryHaskellDepends = [ + async base constraints lifted-base monad-control transformers-base + ]; + testHaskellDepends = [ + async base HUnit lifted-base monad-control mtl tasty + tasty-expected-failure tasty-hunit tasty-th + ]; + benchmarkHaskellDepends = [ async base criterion deepseq ]; + description = "Run lifted IO operations asynchronously and wait for their results"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lifted-base" = callPackage ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel , test-framework, test-framework-hunit, transformers @@ -153694,8 +154302,8 @@ self: { }: mkDerivation { pname = "linear-tests"; - version = "0.1.1.0"; - sha256 = "0qndn8svhynvis1a69p7sircp8sd56hmk9gd4crcadiy8nf99227"; + version = "0.1.2.0"; + sha256 = "1l87lwbbmzq3qpf20zxq10ss1zdym87gq8kpim3ym0259ak4w89r"; libraryHaskellDepends = [ base lens linear QuickCheck ]; testHaskellDepends = [ base hspec hspec-core lens linear QuickCheck @@ -155169,6 +155777,25 @@ self: { broken = true; }) {}; + "llvm-dsl" = callPackage + ({ mkDerivation, base, bool8, llvm-extra, llvm-tf, numeric-prelude + , prelude-compat, storable-enum, storable-record, tfp, transformers + , utility-ht + }: + mkDerivation { + pname = "llvm-dsl"; + version = "0.0"; + sha256 = "0ij2y3q8c46z731b1hlqcjgrkmzsj066mnb0rpnwkn70caai3vz8"; + libraryHaskellDepends = [ + base bool8 llvm-extra llvm-tf numeric-prelude prelude-compat + 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; + broken = true; + }) {}; + "llvm-extension" = callPackage ({ mkDerivation, base, containers, cpuid, llvm-extra, llvm-tf , non-empty, prelude-compat, tfp, transformers, unsafe, utility-ht @@ -155190,21 +155817,25 @@ self: { }) {}; "llvm-extra" = callPackage - ({ mkDerivation, base, bool8, containers, enumset, llvm-tf - , non-empty, prelude-compat, QuickCheck, storable-enum, tagged, tfp - , transformers, utility-ht + ({ mkDerivation, base, base-orphans, bool8, containers, enumset + , fixed-length, llvm-tf, non-empty, prelude-compat, QuickCheck + , storable-enum, storable-record, tagged, tfp, transformers + , utility-ht }: mkDerivation { pname = "llvm-extra"; - version = "0.9.1"; - sha256 = "0wxs8ki3l5fyijdv7z0xyrikx4whazyxv69ly0x98ag25l5fxwyi"; + version = "0.10"; + sha256 = "0g2872wl1gmdlw3gdimcb1wcdsckjwjlk1ciwz8sy0rx9v3kif1m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bool8 containers enumset llvm-tf non-empty prelude-compat - storable-enum tagged tfp transformers utility-ht + base base-orphans bool8 containers enumset fixed-length llvm-tf + non-empty prelude-compat storable-enum storable-record tagged tfp + transformers utility-ht + ]; + testHaskellDepends = [ + base llvm-tf QuickCheck storable-record tfp utility-ht ]; - testHaskellDepends = [ base llvm-tf QuickCheck tfp utility-ht ]; doHaddock = false; description = "Utility functions for the llvm interface"; license = stdenv.lib.licenses.bsd3; @@ -155216,8 +155847,8 @@ self: { ({ mkDerivation, base, enumset, LLVM }: mkDerivation { pname = "llvm-ffi"; - version = "9.1.0"; - sha256 = "1nfgh56wrlw13w0an9vyp78ahz2lp0yy0v7yqh1zr22a0mnwnq3s"; + version = "9.1.0.1"; + sha256 = "19bj8gkzmzg3khnj1pnksc789p1hls0ji48kvwp72zbhhzgpr75d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base enumset ]; @@ -155477,14 +156108,16 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "9.1.1"; - sha256 = "089pq0n3qj3df74g25jkn64byfb4g9f3di1h2fmps8n0yhr8qz3j"; + version = "9.2"; + sha256 = "1p4r9m1svp6k235r0azx6dkpdarakgy3420z3kk06bdiy1m2jk1s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers enumset fixed-length llvm-ffi non-empty QuickCheck semigroups storable-record tfp transformers utility-ht ]; + 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; @@ -155681,8 +156314,6 @@ self: { testHaskellDepends = [ base containers doctest hedgehog ]; description = "Types representing line and column positions and ranges in text files"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "loc-test" = callPackage @@ -155694,8 +156325,6 @@ self: { libraryHaskellDepends = [ base containers hedgehog loc ]; description = "Test-related utilities related to the /loc/ package"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "local-address" = callPackage @@ -155954,6 +156583,8 @@ self: { pname = "log-base"; version = "0.8.0.0"; sha256 = "15539v6y6s46kgb86ns13rh17c1qnidwdajk26yaxyqky58yx2m6"; + revision = "1"; + editedCabalFile = "0kdkvyw39ywly1qv1l0sq5qzr1akigl8410vr647hy2cn46anva0"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -156125,8 +156756,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Flexible, configurable, monadic and pretty logging"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "log2json" = callPackage @@ -157197,8 +157826,8 @@ self: { pname = "lrucaching"; version = "0.3.3"; sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; - revision = "9"; - editedCabalFile = "0rzrj9ziwly33lhkamf9rkrc3jqhid3adl0dv9621n4zzd6dnkb6"; + revision = "10"; + editedCabalFile = "1yzmwvwzby4dx896jlgznlpigqlsl475a57l1npjz0rimlqr71w6"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -157257,8 +157886,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.10.1.0"; - sha256 = "1f1ab7gn5bgdlhlayrrrhk6d8iyf971pia6hb23jjyqz9j0vl7ac"; + version = "0.10.2.0"; + sha256 = "1khqdgc90k9ya58nxsb6dggyyjdp5q9m4bgxmkg15l6qh6mw9zqp"; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit conduit-parse containers data-default Diff directory filepath @@ -157656,8 +158285,8 @@ self: { }: mkDerivation { pname = "lukko"; - version = "0.1.1.1"; - sha256 = "13wf2vgi3bq48h757qs0zi1sxa6ip9pk8fxfiq7qrrb9p5silcpj"; + version = "0.1.1.2"; + sha256 = "1lh7cv0fqbrn8sf54xz74wq991bl8p67jcyq4ing3khcvh9x2yca"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ async base bytestring filepath singleton-bool tasty @@ -157934,8 +158563,6 @@ self: { ]; description = "Bindings to LZ4"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "lz4-conduit" = callPackage @@ -157969,8 +158596,8 @@ self: { }: mkDerivation { pname = "lz4-hs"; - version = "0.1.3.0"; - sha256 = "0yx1njh0zwk2qk99ip1f2wlcy3ql35piqbvd6dppr2hwnm5bh1mk"; + version = "0.1.4.0"; + sha256 = "1biwiqc43wd2njfinrpfzg7pglsrcb2xjhvrm62ida04djrh8s4y"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; @@ -158020,8 +158647,8 @@ self: { pname = "lzma"; version = "0.0.0.3"; sha256 = "0i416gqi8j55nd1pqbkxvf3f6hn6fjys6gq98lkkxphva71j30xg"; - revision = "4"; - editedCabalFile = "0f3zrjq4zxwacmlc934y873pvlqpmmcmhzhp34d8pvhi5c7dg47j"; + revision = "5"; + editedCabalFile = "1m1a3w8cjqz8h4iibkgykzgmrmkxxgz9sm0zn52dbvczdiqbs5y5"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ lzma ]; testHaskellDepends = [ @@ -158806,8 +159433,6 @@ self: { ]; description = "Count mailboxes in a SQL database"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mailchimp" = callPackage @@ -160126,6 +160751,8 @@ self: { pname = "marshal-contt"; version = "0.2.0.0"; sha256 = "1dv2jl7gm3b3kcchgwz4v6rch5w50ak43gc6fjvpms81xkdjfzmb"; + revision = "1"; + editedCabalFile = "1cfkcb3zpddikzg610zbrwr00vn3y8sakr3m8vis5cw25hxra1c0"; libraryHaskellDepends = [ base bytestring kan-extensions lens mtl ]; @@ -160529,8 +161156,8 @@ self: { }: mkDerivation { pname = "math-grads"; - version = "0.1.6.4"; - sha256 = "018h2pczvdxvmws9sjihmyg396dvgd4a038jmi8z42rp1dgbql1r"; + version = "0.1.6.7"; + sha256 = "15dxw679hxkkqdj3yzv49r32a8jll9xj8s8fqmvnyqwzw4lx50qy"; libraryHaskellDepends = [ aeson array base bimap containers ilist lens linear matrix mtl random vector @@ -160668,8 +161295,6 @@ self: { testHaskellDepends = [ base hspec parsec ]; description = "A small programming language for numerical computing"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mathlink" = callPackage @@ -160822,15 +161447,16 @@ self: { }) {}; "matrix-sized" = callPackage - ({ mkDerivation, base, binary, bytestring, deepseq, primitive - , singletons, vector + ({ mkDerivation, base, primitive, singletons, tasty + , tasty-quickcheck, vector }: mkDerivation { pname = "matrix-sized"; - version = "0.0.2"; - sha256 = "1sp9d3pfkq80klwryvggjf76hm4y9qqair3cppvgnp06kn99k1z1"; - libraryHaskellDepends = [ - base binary bytestring deepseq primitive singletons vector + version = "0.0.3"; + sha256 = "1c43cgcw43y777l1wfkdagkis5sbb79fdwhckzwx11av6br02x5g"; + libraryHaskellDepends = [ base primitive singletons vector ]; + testHaskellDepends = [ + base primitive singletons tasty tasty-quickcheck vector ]; description = "Haskell matrix library with interface to C++ linear algebra libraries"; license = stdenv.lib.licenses.bsd3; @@ -160901,7 +161527,7 @@ self: { , brick, brick-skylighting, bytestring, cheapskate, checkers , config-ini, connection, containers, data-clist, directory , filepath, gitrev, hashable, Hclip, mattermost-api - , mattermost-api-qc, microlens-platform, mtl, process + , mattermost-api-qc, microlens-platform, mtl, network-uri, process , quickcheck-text, random, semigroups, skylighting-core, stm , stm-delay, strict, string-conversions, tasty, tasty-hunit , tasty-quickcheck, temporary, text, text-zipper, time @@ -160911,8 +161537,8 @@ self: { }: mkDerivation { pname = "matterhorn"; - version = "50200.7.0"; - sha256 = "08ynlxqdb2mr7si0q7747pd1x9v9s7jmq2q75bqhzl44rpjhh4dv"; + version = "50200.8.0"; + sha256 = "05fkhizjj5vvrsz7db8s7ig36ym02n6mndwaay0md8s7fghjwfiw"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -160920,10 +161546,11 @@ self: { aeson aspell-pipe async base base-compat brick brick-skylighting bytestring cheapskate config-ini connection containers data-clist directory filepath gitrev hashable Hclip mattermost-api - microlens-platform mtl process random semigroups skylighting-core - stm stm-delay strict temporary text text-zipper time timezone-olson - timezone-series transformers unix unordered-containers utf8-string - uuid vector vty word-wrap xdg-basedir + microlens-platform mtl network-uri process random semigroups + skylighting-core stm stm-delay strict temporary text text-zipper + time timezone-olson timezone-series transformers unix + unordered-containers utf8-string uuid vector vty word-wrap + xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini @@ -160936,28 +161563,28 @@ self: { ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "mattermost-api" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, connection , containers, gitrev, hashable, HTTP, http-media, HUnit, memory - , microlens, microlens-th, mtl, network-uri, pretty-show, process - , resource-pool, split, stm, tasty, tasty-hunit, template-haskell - , text, time, unordered-containers, websockets + , microlens, microlens-th, modern-uri, mtl, network-uri + , pretty-show, process, resource-pool, split, stm, tasty + , tasty-hunit, template-haskell, text, time, unordered-containers + , websockets }: mkDerivation { pname = "mattermost-api"; - version = "50200.4.0"; - sha256 = "0nl3xsw90rg08hmipr0d80h7ss68mlyaawagkiv2gj4qjlb2lqcn"; + version = "50200.5.0"; + sha256 = "0hfwc85qhz1klwr4baabcrv6n7imfj3xz809dddy2hdfav0y9qgg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring connection containers gitrev hashable - HTTP http-media memory microlens microlens-th network-uri - pretty-show process resource-pool split stm template-haskell text - time unordered-containers websockets + HTTP http-media memory microlens microlens-th modern-uri + network-uri pretty-show process resource-pool split stm + template-haskell text time unordered-containers websockets ]; testHaskellDepends = [ aeson base containers HUnit mtl pretty-show stm tasty tasty-hunit @@ -160965,8 +161592,7 @@ self: { ]; description = "Client API for Mattermost chat system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "mattermost-api-qc" = callPackage @@ -160975,15 +161601,14 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "50200.4.0"; - sha256 = "1lxr3xfvc4qg1n1wxqz1bv4ac12xiwnk79i53w2gx2xks6rdpibj"; + version = "50200.5.0"; + sha256 = "0gzjzfzfipvpk61zilxw9a1xsgm10lrsl26rvr4h4gjw6mws7bg8"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; description = "QuickCheck instances for the Mattermost client API library"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ kiwi ]; }) {}; "maude" = callPackage @@ -161207,8 +161832,6 @@ self: { testHaskellDepends = [ base HUnit ]; description = "Haskell MBTiles client"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mbug" = callPackage @@ -161783,6 +162406,8 @@ self: { pname = "megaparsec-tests"; version = "8.0.0"; sha256 = "1l71s16fhl2054myj02fnnjr71pfypjvwxd0hxzf83zwmqnv558f"; + revision = "1"; + editedCabalFile = "1hawpdlx2nwyi5s06vh5lvccyjzsxzns02mhggzy0kb33xb9c818"; libraryHaskellDepends = [ base bytestring containers hspec hspec-expectations hspec-megaparsec megaparsec mtl QuickCheck text transformers @@ -162375,6 +163000,8 @@ self: { pname = "merkle-log"; version = "0.1.0.0"; sha256 = "07q0ifgwq8agwm62k1k83sdrln4zbj6ln90nw9p9g3pgxnp3inia"; + revision = "1"; + editedCabalFile = "1vrzsflvmx0mrsdb7i7pbz4d74k6yjccrb7979yw0r91qhmzlcir"; libraryHaskellDepends = [ base bytestring cryptonite deepseq exceptions memory text ]; @@ -162868,8 +163495,8 @@ self: { pname = "microaeson"; version = "0.1.0.0"; sha256 = "1hbpyz6p9snnd85h2y0pdqp20svxrggavbv0q8z33sc5i4p8b7iz"; - revision = "2"; - editedCabalFile = "1n3jhbwic8c2pa6dcz36a6fgna4b854ml5d5n8qzzhjshb0v60ri"; + revision = "3"; + editedCabalFile = "09fbsmxlhcjazd99r05n1cla9akficbnfylszg9jkpic7g0p5pa3"; libraryHaskellDepends = [ array base bytestring containers deepseq text ]; @@ -162884,6 +163511,18 @@ self: { broken = true; }) {}; + "microbase" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microbase"; + version = "4.14.0.0.2"; + sha256 = "11w2nscia78cw9pccf9ibcn0i3yfykwfvhzhn0x0xy5lav69p01q"; + libraryHaskellDepends = [ base ]; + doHaddock = false; + description = "A minimal base to work around GHC bugs"; + license = stdenv.lib.licenses.mit; + }) {}; + "microbench" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -163172,8 +163811,8 @@ self: { pname = "microstache"; version = "1.0.1.1"; sha256 = "0851sqr1ppdj6m822635pa3j6qzdf25gyrhkjs25zdry6518bsax"; - revision = "5"; - editedCabalFile = "1dr1yqn42j6im1x333rpsqj57nhmagmhwkdfwx832cdsw9ry2gjz"; + revision = "6"; + editedCabalFile = "054ny1rsqz682k4x36dqj6wqbj6arwxp75xpsss8lc7j145d0qn3"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath parsec text transformers unordered-containers vector @@ -163657,8 +164296,6 @@ self: { ]; description = "Double-ended priority queues"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "minecraft" = callPackage @@ -164186,8 +164823,6 @@ self: { executableHaskellDepends = [ monad-loops regex-base regex-pcre ]; description = "fortune-mod clone"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "mismi-core" = callPackage @@ -164314,6 +164949,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "miso_1_5_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, http-api-data + , http-types, lucid, network-uri, servant, servant-lucid, text + , transformers, vector + }: + mkDerivation { + pname = "miso"; + version = "1.5.0.0"; + sha256 = "08843wyd41hs38vrixcfdnmar9vkvayk11323kav4qq85s3yhsd3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers http-api-data http-types lucid + 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; + }) {}; + "miso-action-logger" = callPackage ({ mkDerivation, aeson, base, ghcjs-base, miso }: mkDerivation { @@ -164331,8 +164986,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.3.0.0"; - sha256 = "1nwiznlhvnr7jcaqp1w0l2wwci9jbs56jrdiz79mpxrqq79h1icg"; + version = "1.5.0.0"; + sha256 = "0k0rf7kb65nqckmz8gc27rssnn3ja0nswmrbslfmm0nz7293jaiw"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -164827,15 +165482,17 @@ self: { }) {}; "mmsyn7l" = callPackage - ({ mkDerivation, base, mmsyn2, mmsyn7ukr, vector }: + ({ mkDerivation, base, directory, mmsyn2, mmsyn7ukr, vector }: mkDerivation { pname = "mmsyn7l"; - version = "0.3.2.0"; - sha256 = "0h3j7y6k9zagw0djj8hrnlhfdqg60hb52h9xb3ni326ijshw2qil"; + version = "0.4.2.0"; + sha256 = "1dpilwaffrkihfgbpq7p1095qpx9qgcpzbs8q3kld948hliihix7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mmsyn2 mmsyn7ukr vector ]; - executableHaskellDepends = [ base mmsyn2 mmsyn7ukr vector ]; + libraryHaskellDepends = [ base directory mmsyn2 mmsyn7ukr vector ]; + executableHaskellDepends = [ + base directory mmsyn2 mmsyn7ukr vector + ]; description = "Modifies the amplitudes of the Ukrainian sounds representations created by mmsyn7ukr package"; license = stdenv.lib.licenses.mit; }) {}; @@ -165517,15 +166174,15 @@ self: { }) {}; "monad-choice" = callPackage - ({ mkDerivation, base, invariant, MonadRandom, mtl, transformers }: + ({ mkDerivation, base, contravariant, invariant, MonadRandom, mtl + , primitive, transformers + }: mkDerivation { pname = "monad-choice"; - version = "0.1.0.0"; - sha256 = "0vhfiqrnkfhqkhnh9h4npl3rfam321iikabr3przywfcfd4gap4z"; - revision = "3"; - editedCabalFile = "055zzzz9ag1wb79bjx0wg59plajym156hz0bh0lq4ndvn4k7sxay"; + version = "0.2.0.0"; + sha256 = "1ryakbs6ydgdfvz067jw6a2aqg566pynwyibxl6qi77ywwahqlvk"; libraryHaskellDepends = [ - base invariant MonadRandom mtl transformers + base contravariant invariant MonadRandom mtl primitive transformers ]; description = "Monad, monad transformer, and typeclass representing choices"; license = stdenv.lib.licenses.agpl3; @@ -165539,8 +166196,8 @@ self: { pname = "monad-chronicle"; version = "1"; sha256 = "03x19683pm99zcw7gkipmdkrqwaspcyvy7yv68nlh6g4swl31a0l"; - revision = "1"; - editedCabalFile = "059qa4kb6x3vqw0pahbkp3i6v33cyaiizzkgxd1n36l9ybchwr4l"; + revision = "2"; + editedCabalFile = "0ajjcv8h6104k2xlzlqkhvy7hmv6p4ldca3jdsa9ns38sxy8j6ld"; libraryHaskellDepends = [ base data-default-class mtl semigroupoids these transformers transformers-compat @@ -166081,8 +166738,6 @@ self: { testHaskellDepends = [ base ]; description = "A convenient wrapper around EKG metrics"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "monad-metrics-extensible" = callPackage @@ -167525,8 +168180,6 @@ self: { ]; description = "A web service framework for Haskell, similar in purpose to dropwizard"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "more-containers" = callPackage @@ -168090,31 +168743,25 @@ self: { }) {inherit (pkgs) mpg123;}; "mpi-hs" = callPackage - ({ mkDerivation, base, binary, bytestring, c2hs, cereal, criterion - , monad-loops, openmpi, store - }: + ({ mkDerivation, base, bytestring, c2hs, monad-loops, mpich }: mkDerivation { pname = "mpi-hs"; - version = "0.5.3.0"; - sha256 = "0z2m4xfk0w1zx29jb27xb6hs01xid0ghv93yhqx7zwiw01815krk"; + version = "0.7.1.0"; + sha256 = "1xja12laj9pznwkgllgn2126g0izgv7mp267jv0ihlzy4yv2ps8m"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring cereal monad-loops store - ]; - librarySystemDepends = [ openmpi ]; + libraryHaskellDepends = [ base bytestring monad-loops ]; + librarySystemDepends = [ mpich ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ base binary ]; - executableSystemDepends = [ openmpi ]; + executableHaskellDepends = [ base ]; + executableSystemDepends = [ mpich ]; testHaskellDepends = [ base monad-loops ]; - testSystemDepends = [ openmpi ]; - benchmarkHaskellDepends = [ base criterion ]; - benchmarkSystemDepends = [ openmpi ]; + testSystemDepends = [ mpich ]; description = "MPI bindings for Haskell"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) openmpi;}; + }) {inherit (pkgs) mpich;}; "mplayer-spot" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, conduit @@ -168320,8 +168967,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "mr-env"; - version = "0.1.0.1"; - sha256 = "102m1gqjcscwf620jpaz1i7hg73ikd19an2wjgnfpfrlzw83xgd6"; + version = "0.1.0.2"; + sha256 = "1bw0ga59lf1crhjx4hlmsnzllsf3nfwzzsfcll0xf04fkj0jgxlg"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A simple way to read environment variables in Haskell"; @@ -168443,6 +169090,32 @@ self: { broken = true; }) {}; + "msgpack-binary" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, criterion + , data-binary-ieee754, deepseq, groom, hashable, hspec + , msgpack-types, QuickCheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "msgpack-binary"; + version = "0.0.14"; + sha256 = "1pf0fzxkrd2f1jzm3mkybayd94pxq28a49nvjzx8i2lxrdmynkp6"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring data-binary-ieee754 msgpack-types text + ]; + executableHaskellDepends = [ base bytestring groom ]; + testHaskellDepends = [ + base bytestring containers hashable hspec msgpack-types QuickCheck + text unordered-containers vector + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq QuickCheck + ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "msgpack-idl" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, cmdargs , containers, directory, filepath, hspec, msgpack, peggy @@ -168488,6 +169161,48 @@ self: { broken = true; }) {}; + "msgpack-rpc-conduit" = callPackage + ({ mkDerivation, async, base, binary, binary-conduit, bytestring + , conduit, conduit-extra, data-default-class + , data-default-instances-base, exceptions, hspec, monad-control + , msgpack-binary, msgpack-types, mtl, network, text, unliftio-core + }: + mkDerivation { + pname = "msgpack-rpc-conduit"; + version = "0.0.6"; + sha256 = "000aycbvxac4li8rxqxmj3a020fwl08wnq01fv8jdlx3qg7k57hf"; + libraryHaskellDepends = [ + base binary binary-conduit bytestring conduit conduit-extra + data-default-class data-default-instances-base exceptions + monad-control msgpack-binary msgpack-types mtl network text + unliftio-core + ]; + testHaskellDepends = [ async base bytestring hspec mtl network ]; + description = "A MessagePack-RPC Implementation"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "msgpack-types" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq + , generic-arbitrary, hashable, hspec, QuickCheck, text + , unordered-containers, vector + }: + mkDerivation { + pname = "msgpack-types"; + version = "0.0.4"; + sha256 = "076szvjs80a765c72prjp73416gyq70b4k1319qfl339sa8lz1ky"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashable QuickCheck text + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq generic-arbitrary hashable hspec + QuickCheck text unordered-containers vector + ]; + description = "A Haskell implementation of MessagePack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "msh" = callPackage ({ mkDerivation, base, containers, haskell-src-exts , haskell-src-meta, lens, mtl, parsec, template-haskell, text @@ -169321,8 +170036,6 @@ self: { testHaskellDepends = [ base cryptonite doctest hedgehog ]; description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "multihash-serialise" = callPackage @@ -170153,8 +170866,8 @@ self: { }: mkDerivation { pname = "musicScroll"; - version = "0.2.0.0"; - sha256 = "1iv80yhal5f8klsc095yabq7402w45j8lb0g64avdyp2zy569vmx"; + version = "0.2.2.0"; + sha256 = "1r1n22g98sqi8hnrkwb6cyv805ggq8770iwa4bzwiq7a59x3rlm6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -171228,8 +171941,6 @@ self: { ]; description = "Parse Nagios performance data"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "nagios-plugin-ekg" = callPackage @@ -172163,8 +172874,6 @@ self: { ]; description = "General tools for Neil"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "neither" = callPackage @@ -172511,16 +173220,16 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.1.0"; - sha256 = "09ww6ya4h7j8vd9j18492qx6x0y1aqmis271smrb45mylj4hsaqb"; + version = "0.4.2.0"; + sha256 = "1jpqkwgi13a0hw99andw6f8jsq8isqsqlqjc42bapy97wxba2bii"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative safe-exceptions scientific text time unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring doctest doctest-discover hspec text time - vector + aeson base bytestring doctest doctest-discover greskell hashable + hspec text time vector ]; description = "A graph database middleware to maintain a time-varying graph"; license = stdenv.lib.licenses.bsd3; @@ -173586,8 +174295,6 @@ self: { ]; description = "MessagePack RPC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "network-messagepack-rpc-websocket" = callPackage @@ -174673,19 +175380,20 @@ self: { "ngx-export-tools-extra" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, base64, bytestring - , containers, ede, enclosed-exceptions, http-client, http-types - , ngx-export, ngx-export-tools, snap-core, snap-server - , template-haskell, text, time, unordered-containers + , case-insensitive, containers, ede, enclosed-exceptions + , http-client, http-types, ngx-export, ngx-export-tools, snap-core + , snap-server, template-haskell, text, time, trifecta + , unordered-containers }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.2.1.0"; - sha256 = "0xka55h7c5zqyb8nj1pyq0iq50yfwy4p6fspya1zbi0yjblnxnsa"; + version = "0.3.2.1"; + sha256 = "0dc7g592xcby4ycq7y19879xz83kq1d5vjh7d9ymgfmxa3nl1hrk"; libraryHaskellDepends = [ - aeson ansi-wl-pprint base base64 bytestring containers ede - enclosed-exceptions http-client http-types ngx-export - ngx-export-tools snap-core snap-server template-haskell text time - unordered-containers + aeson ansi-wl-pprint base base64 bytestring case-insensitive + containers ede enclosed-exceptions http-client http-types + ngx-export ngx-export-tools snap-core snap-server template-haskell + text time trifecta unordered-containers ]; description = "More extra tools for Nginx haskell module"; license = stdenv.lib.licenses.bsd3; @@ -175021,8 +175729,7 @@ self: { ]; description = "Explain why two Nix derivations differ"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; + maintainers = with stdenv.lib.maintainers; [ terlar ]; }) {}; "nix-eval" = callPackage @@ -176831,8 +177538,8 @@ self: { }: mkDerivation { pname = "numhask-space"; - version = "0.3.0"; - sha256 = "0j75qig7smx2lnl6drmsj2zs4zg6rw9vvcb1d0cjv47haw9xgz62"; + version = "0.3.1"; + sha256 = "0phvn46cnf2ffia703k3lsxv32n8mzcjx1szm9qic1nd6k8wrnv7"; libraryHaskellDepends = [ adjunctions base containers distributive foldl lattices semigroupoids tdigest text time @@ -177787,8 +178494,8 @@ self: { }: mkDerivation { pname = "oidc-client"; - version = "0.5.0.0"; - sha256 = "09ykb49qzg0hpkjgylmilvy9dkcsxlv1lxrp0mwqamq4vxkm2wz3"; + version = "0.5.1.0"; + sha256 = "1qp69bdfam86y90vrm3z1nlk4kh03pnyzc5k06w9xvaq6i0965z6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -178802,6 +179509,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "openid-connect" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, cookie + , cryptonite, http-client, http-types, jose, lens, memory, mtl + , network-uri, tasty, tasty-hunit, text, time, unordered-containers + }: + mkDerivation { + pname = "openid-connect"; + version = "0.1.0.0"; + sha256 = "12qp155dazycypv0fvw8mbh3rl5j5ybd2vyfga8wi55n16v1w8mv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive cookie cryptonite + http-client http-types jose lens memory mtl network-uri text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive cookie cryptonite + http-client http-types jose lens memory mtl network-uri tasty + tasty-hunit text time unordered-containers + ]; + description = "An OpenID Connect library that does all the heavy lifting for you"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "openpgp" = callPackage ({ mkDerivation, base, binary, bytestring, bzlib, HUnit, QuickCheck , quickcheck-instances, test-framework, test-framework-hunit @@ -179537,6 +180269,8 @@ self: { pname = "optics-core"; version = "0.2"; sha256 = "19hsax8wxxgr28rjz6p9afb06f338xnyvws7salmm1dsik1ghzr8"; + revision = "1"; + editedCabalFile = "1sghrm6xyflzkv350phcm344ljv82wk2vjnwhwyvcqwirkwg8rk9"; libraryHaskellDepends = [ array base containers indexed-profunctors transformers ]; @@ -179770,6 +180504,8 @@ self: { pname = "optparse-applicative"; version = "0.15.1.0"; sha256 = "1ws6y3b3f6hsgv0ff0yp6lw4hba1rps4dnvry3yllng0s5gngcsd"; + revision = "1"; + editedCabalFile = "0zmhqkd96v2z1ilhqdkd9z4jgsnsxb8yi2479ind8m5zm9363zr9"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -180129,8 +180865,8 @@ self: { }: mkDerivation { pname = "org-mode-lucid"; - version = "1.2.0"; - sha256 = "1y7dxm3g7jzq7y45z1d4k1j4rsfjdg4l8gk1ykn5frigwf01vwkf"; + version = "1.3.0"; + sha256 = "0a6iy2x0k9r3072zx0sf4k27xnihwckyd1h2pcqd61sxkgf3qkn3"; libraryHaskellDepends = [ base containers hashable lucid org-mode text ]; @@ -180240,8 +180976,6 @@ self: { ]; description = "Statistics visualizer for org-mode"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "origami" = callPackage @@ -180587,8 +181321,6 @@ self: { ]; description = "External sorting package based on Conduit"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "overhang" = callPackage @@ -181305,50 +182037,53 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_9_2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doclayout, doctemplates, emojis - , exceptions, executable-path, filepath, Glob, haddock-library - , hslua, hslua-module-system, hslua-module-text, HsYAML, HTTP - , http-client, http-client-tls, http-types, ipynb, jira-wiki-markup - , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec - , process, QuickCheck, random, safe, scientific, SHA, skylighting - , skylighting-core, split, syb, tagsoup, tasty, tasty-golden - , tasty-hunit, tasty-lua, tasty-quickcheck, temporary, texmath - , text, text-conversions, time, unicode-transforms, unix - , unordered-containers, vector, weigh, xml, zip-archive, zlib + "pandoc_2_9_2_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base-compat + , base-noprelude, base64-bytestring, binary, blaze-html + , blaze-markup, bytestring, case-insensitive, cmark-gfm, containers + , criterion, data-default, deepseq, Diff, directory, doclayout + , doctemplates, emojis, exceptions, executable-path, filepath, Glob + , haddock-library, hslua, hslua-module-system, hslua-module-text + , HsYAML, HTTP, http-client, http-client-tls, http-types, ipynb + , jira-wiki-markup, JuicyPixels, mtl, network, network-uri + , pandoc-types, parsec, process, QuickCheck, random, safe + , scientific, SHA, skylighting, skylighting-core, split, syb + , tagsoup, tasty, tasty-golden, tasty-hunit, tasty-lua + , tasty-quickcheck, temporary, texmath, text, text-conversions + , time, unicode-transforms, unix, unordered-containers, vector + , weigh, xml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.9.2"; - sha256 = "1f9wbwzv6c3dlsn15iydh921icjqj7kjgrb726kqmj5gmaypc39j"; + version = "2.9.2.1"; + sha256 = "0myz7firqkx4k0vrsd62j443gvm2pk09bi69c8qdbdzq5hvkavf2"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring binary - blaze-html blaze-markup bytestring case-insensitive cmark-gfm - containers data-default deepseq directory doclayout doctemplates - emojis exceptions filepath Glob haddock-library hslua - hslua-module-system hslua-module-text HsYAML HTTP http-client - http-client-tls http-types ipynb jira-wiki-markup JuicyPixels mtl - network network-uri pandoc-types parsec process random safe - scientific SHA skylighting skylighting-core split syb tagsoup - temporary texmath text text-conversions time unicode-transforms - unix unordered-containers vector xml zip-archive zlib + aeson aeson-pretty attoparsec base-compat base-noprelude + base64-bytestring binary blaze-html blaze-markup bytestring + case-insensitive cmark-gfm containers data-default deepseq + directory doclayout doctemplates emojis exceptions filepath Glob + haddock-library hslua hslua-module-system hslua-module-text HsYAML + HTTP http-client http-client-tls http-types ipynb jira-wiki-markup + JuicyPixels mtl network network-uri pandoc-types parsec process + random safe scientific SHA skylighting skylighting-core split syb + tagsoup temporary texmath text text-conversions time + unicode-transforms unix unordered-containers vector xml zip-archive + zlib ]; - executableHaskellDepends = [ base ]; + executableHaskellDepends = [ base-compat base-noprelude ]; testHaskellDepends = [ - base base64-bytestring bytestring containers Diff directory - doctemplates executable-path filepath Glob hslua mtl pandoc-types - process QuickCheck tasty tasty-golden tasty-hunit tasty-lua - tasty-quickcheck temporary text time xml zip-archive + base-compat base-noprelude base64-bytestring bytestring containers + Diff directory doctemplates executable-path filepath Glob hslua mtl + pandoc-types process QuickCheck tasty tasty-golden tasty-hunit + tasty-lua tasty-quickcheck temporary text time xml zip-archive ]; benchmarkHaskellDepends = [ - base bytestring containers criterion mtl text time weigh + base-compat base-noprelude bytestring containers criterion mtl text + time weigh ]; postInstall = '' mkdir -p $out/share/man/man1 @@ -181482,8 +182217,6 @@ self: { ]; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pandoc-csv2table" = callPackage @@ -181679,8 +182412,8 @@ self: { }: mkDerivation { pname = "pandoc-placetable"; - version = "0.5.1"; - sha256 = "0zfqmsq86jvwm4kpjb02whcdxk5xpgaj1sbdh471kr2vz8q4p112"; + version = "0.6"; + sha256 = "0jcnf4lv4sszkbnsbvj21zi0xf9vplbpk9yavhz1b62m61xp76pg"; configureFlags = [ "-finlinemarkdown" ]; isLibrary = false; isExecutable = true; @@ -181878,8 +182611,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.3"; - sha256 = "1sk8hhw3ad0jb2ik787pqjgaprd78k7qc0m0chcji3z5bprxp1cw"; + version = "0.2.5"; + sha256 = "1nj56liyyrgmng4290p19zf89c3lyi6pzqjrqr4bfc0gmmkm4719"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -182690,8 +183423,8 @@ self: { pname = "parallel"; version = "3.2.2.0"; sha256 = "1xkfi96w6yfpppd0nw1rnszdxmvifwzm699ilv6332ra3akm610p"; - revision = "1"; - editedCabalFile = "0a3kn7arck8f2gwm8cwfkplsw4q9v9j6ifbhj1l3bmclmkwcckcj"; + revision = "2"; + editedCabalFile = "0shw96f4fc3vbr2vrnsk794qcsxyv3ra3snhw4wng81rkapp54y6"; libraryHaskellDepends = [ array base containers deepseq ghc-prim ]; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; @@ -183051,6 +183784,8 @@ self: { pname = "parsec"; version = "3.1.14.0"; sha256 = "132waj2cpn892midbhpkfmb74qq83v0zv29v885frlp1gvh94b67"; + revision = "1"; + editedCabalFile = "0dhg5xwqnig83hbkpawqi1k2prrps7jhkj4gb3ccram2drfmb933"; libraryHaskellDepends = [ base bytestring mtl text ]; testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit @@ -183327,6 +184062,8 @@ self: { pname = "parser-combinators-tests"; version = "1.2.1"; sha256 = "0iy4iajpjka1diy660x3mvmh8kldwf3svwdmvlxh26dsqy2s8sx8"; + revision = "1"; + editedCabalFile = "07isz6d136dkbr1aykznfi3dr3dp18x14548af207rd29x51g0di"; isLibrary = false; isExecutable = false; testHaskellDepends = [ @@ -183432,8 +184169,6 @@ self: { ]; description = "`parsers` instances for Megaparsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "parsestar" = callPackage @@ -183492,8 +184227,6 @@ self: { ]; description = "Parser combinators with slicing, error recovery, and syntax highlighting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "partage" = callPackage @@ -183581,8 +184314,6 @@ self: { ]; description = "Provides typeclass suitable for types admitting a partial order"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "partial-records" = callPackage @@ -183602,8 +184333,8 @@ self: { ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.5.1.1"; - sha256 = "1n0nr7yprkg9ca86yd1w8d42zqjjdf6k7bbk818kfwbh72csxl0q"; + version = "0.5.1.4"; + sha256 = "1szzggr0j52cn6n7j288kh5rma6g8vpjr4dwfmwrhz2jsn4ag9hh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest hedgehog ]; description = "A partial binary associative operator"; @@ -183616,8 +184347,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.6.0.1"; - sha256 = "0wn5gdgjza17qhxqmkp8mkj77ky2q39xs1gpjx4nrs5af34pavpy"; + version = "0.6.0.4"; + sha256 = "0ijmaj8zkcqikm2jr749n8pqcbf2g05bqpdmvljd1q18vydwxx6q"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; description = "Property testing for partial semigroups using Hedgehog"; license = stdenv.lib.licenses.asl20; @@ -183928,29 +184659,25 @@ self: { }) {}; "patch-image" = callPackage - ({ mkDerivation, accelerate, accelerate-arithmetic - , accelerate-cufft, accelerate-fourier, accelerate-io - , accelerate-llvm-ptx, accelerate-utility, array, base, bool8 - , bytestring, Cabal, carray, cassava, comfort-array, containers - , dsp, enumset, explicit-exception, fft, filepath, gnuplot - , JuicyPixels, knead, llvm-extra, llvm-tf, non-empty, pqueue - , prelude-compat, semigroups, storable-complex, storable-tuple, tfp - , unordered-containers, utility-ht, vector + ({ mkDerivation, array, base, bool8, bytestring, carray, cassava + , comfort-array, containers, dsp, enumset, explicit-exception, fft + , filepath, JuicyPixels, knead, llvm-extra, llvm-tf, non-empty + , pqueue, prelude-compat, semigroups, shell-utility + , storable-complex, storable-record, tfp, unordered-containers + , utility-ht, vector }: mkDerivation { pname = "patch-image"; - version = "0.3.3"; - sha256 = "0jm723xrbiwpq7sci67z0vilsv8a8i2ndm795ssyqkgqm7g1psby"; + version = "0.3.3.1"; + sha256 = "0nvp2y2f5cb29vzk2a9bvr3mgf17j70ir0nhb648pzfa0h1xj76k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - accelerate accelerate-arithmetic accelerate-cufft - accelerate-fourier accelerate-io accelerate-llvm-ptx - accelerate-utility array base bool8 bytestring Cabal carray cassava - comfort-array containers dsp enumset explicit-exception fft - filepath gnuplot JuicyPixels knead llvm-extra llvm-tf non-empty - pqueue prelude-compat semigroups storable-complex storable-tuple - tfp unordered-containers utility-ht vector + array base bool8 bytestring carray cassava comfort-array containers + dsp enumset explicit-exception fft filepath JuicyPixels knead + llvm-extra llvm-tf non-empty pqueue prelude-compat semigroups + shell-utility storable-complex storable-record tfp + unordered-containers utility-ht vector ]; description = "Compose a big image from overlapping parts"; license = stdenv.lib.licenses.bsd3; @@ -184059,8 +184786,8 @@ self: { ({ mkDerivation, base, bytestring, path, safe-exceptions, text }: mkDerivation { pname = "path-text-utf8"; - version = "0.0.1.2"; - sha256 = "1z8wyjsr7mgl120ayfl520i6p6s961380b1xy63zl7qp4cnnbhpn"; + version = "0.0.1.4"; + sha256 = "1nc9favrfr5xxk45rq77zf574m79p5qv3lrngl8yfxdzhbi4q8ld"; libraryHaskellDepends = [ base bytestring path safe-exceptions text ]; @@ -185405,8 +186132,8 @@ self: { pname = "perfect-vector-shuffle"; version = "0.1.1.1"; sha256 = "1z4iv4sv9ld0gvdfa46ll5bsbxi9lckh69paip1c5ijcg78vy5y0"; - revision = "1"; - editedCabalFile = "1pnxrzncwi5qmmyjimjdjhgh65n9kxs663b356rnpdf7brc5bxa0"; + revision = "3"; + editedCabalFile = "1qqfab4jm304wcqgng2fmbwsckhyfyimkbwldc6nisxp7sfp2pz0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185835,6 +186562,17 @@ self: { broken = true; }) {}; + "persistent-generic" = callPackage + ({ mkDerivation, base, persistent, text }: + mkDerivation { + pname = "persistent-generic"; + version = "0.1.0.0"; + sha256 = "1a9h7dfj9v47di4pwg3fwzwa550fh8wj2ri1w2kd8xbw9xym5kqk"; + libraryHaskellDepends = [ base persistent text ]; + description = "Derive Persistent classes generically"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "persistent-hssqlppp" = callPackage ({ mkDerivation, base, bytestring, hssqlppp, monad-control, mtl , persistent, persistent-template, template-haskell, text, th-lift @@ -185936,8 +186674,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.9.0.2"; - sha256 = "0q78y1ydsvm0jrsi211zq789vy50czhskwq13plv6l2h4860917v"; + version = "2.10.0.0"; + sha256 = "1z895y21raak3x9qw05hgif5qyvr6c7pkc59wzg7irk8mxijyf4n"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -186392,8 +187130,6 @@ self: { ]; description = "Type safe access to multiple database schemata"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "persistent-vector" = callPackage @@ -186919,8 +187655,6 @@ self: { ]; description = "Haskell Debug Adapter for Visual Studio Code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "phone-metadata" = callPackage @@ -188156,8 +188890,6 @@ self: { ]; description = "Fast, streaming csv parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "pipes-errors" = callPackage @@ -189677,8 +190409,8 @@ self: { }: mkDerivation { pname = "ploton"; - version = "1.1.3.0"; - sha256 = "1bq2qnzlms6j6hl7d728h5mc672h0lpbxcxfh2bz327nhhqid3hn"; + version = "1.2.0.0"; + sha256 = "0qzi5vdn8j4s2338x2m7mbw2n10bdplm1ki3q841acwixh9rr4ak"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -190491,6 +191223,8 @@ self: { pname = "polyparse"; version = "1.13"; sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w"; + revision = "1"; + editedCabalFile = "09jcn26py3lkjn3lvxgry86bad8xb8cwl3avxymqmf7b181krfb8"; libraryHaskellDepends = [ base bytestring text ]; description = "A variety of alternative parser combinator libraries"; license = "LGPL"; @@ -190612,8 +191346,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Disambiguate obvious uses of effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "polysemy-zoo" = callPackage @@ -190676,8 +191408,6 @@ self: { ]; description = "Online XML parsing with polyparse and tagsoup"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "polytypeable" = callPackage @@ -190725,8 +191455,8 @@ self: { }: mkDerivation { pname = "pomaps"; - version = "0.1.0.0"; - sha256 = "0vacywl9yg5dyayf34k5sxnf35x0hxwh0dsdglqk243hf9lrd0wz"; + version = "0.2.0.0"; + sha256 = "1a3vf0r69263gpq1aass2x5wcmgrfk16pnsf4wsvrnka5lgnsijp"; libraryHaskellDepends = [ base containers deepseq ghc-prim lattices ]; @@ -191772,8 +192502,8 @@ self: { pname = "postgresql-libpq"; version = "0.9.4.2"; sha256 = "1y86kysakfcf3zq252yl2llrx3765vxvkdwda4q5ql7ikv3m786f"; - revision = "1"; - editedCabalFile = "0hilyfb2gjh471ia2g8mwjs56ykrgl0qd06vpigwhc493ia7a9mv"; + revision = "2"; + editedCabalFile = "1i0z3c0d657050kfggr5z8y4hmcqkckm2x1gn3fjbdzyx3p1rcaa"; setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring unix ]; librarySystemDepends = [ postgresql ]; @@ -191957,8 +192687,8 @@ self: { pname = "postgresql-simple"; version = "0.6.2"; sha256 = "15pkflx48mgv4fjmnagyfh06q065k8m8c98bysc3gm6m4srz5ypv"; - revision = "2"; - editedCabalFile = "1rlawj79mfff915bz5fr62g5ig4pfh77m30xrq8q71s6ql0ly4bj"; + revision = "3"; + editedCabalFile = "0wngpd4187sfz2jhpnnrycfvpd1irz2m798p515mn1ryg1ywmhbr"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-builder case-insensitive containers hashable Only postgresql-libpq @@ -192147,8 +192877,8 @@ self: { pname = "postgresql-simple-url"; version = "0.2.1.0"; sha256 = "1jg9gvpidrfy2hqixwqsym1l1mnkafmxwq58jpbzdmrbvryga1qk"; - revision = "2"; - editedCabalFile = "1nb1ks6hdfn16389f2yhf37qhjqd2y5wjc1dcp9bjhzd787z7ypr"; + revision = "3"; + editedCabalFile = "02l1g5jiw6idnnax7q2lzayjycgi029pv41njdmwdch57k59vai5"; libraryHaskellDepends = [ base network-uri postgresql-simple split ]; @@ -193317,22 +194047,29 @@ self: { "preql" = callPackage ({ mkDerivation, aeson, alex, array, base, binary-parser , bytestring, bytestring-strict-builder, contravariant, free, happy - , mtl, postgresql-binary, postgresql-libpq, postgresql-simple, syb - , template-haskell, text, th-lift-instances, time, transformers - , uuid, vector + , mtl, postgresql-binary, postgresql-libpq, scientific, tasty + , tasty-hunit, template-haskell, text, th-lift-instances, time + , transformers, uuid, vector }: mkDerivation { pname = "preql"; - version = "0.1"; - sha256 = "1a5b45vplknan61l0p68559pg7la89ly97mzbqxb5j6v3cifgmcg"; + version = "0.2"; + sha256 = "062px686v2rlpc2bplva900vk35k7hdvxrpjj9dfkj02knqmjxi7"; libraryHaskellDepends = [ aeson array base binary-parser bytestring bytestring-strict-builder contravariant free mtl postgresql-binary postgresql-libpq - postgresql-simple syb template-haskell text th-lift-instances time + scientific template-haskell text th-lift-instances time transformers uuid vector ]; libraryToolDepends = [ alex happy ]; - description = "experiments with SQL"; + testHaskellDepends = [ + aeson array base binary-parser bytestring bytestring-strict-builder + contravariant free mtl postgresql-binary postgresql-libpq + scientific tasty tasty-hunit template-haskell text + th-lift-instances time transformers uuid vector + ]; + testToolDepends = [ alex happy ]; + description = "safe PostgreSQL queries using Quasiquoters"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -193861,6 +194598,17 @@ self: { broken = true; }) {}; + "prim" = callPackage + ({ mkDerivation, ghc-prim }: + mkDerivation { + pname = "prim"; + version = "0.1.0.1"; + sha256 = "01h93hrlmz3aps1xic8arkh7s28jnch5b47lpn4rxazi0fr8pgdw"; + libraryHaskellDepends = [ ghc-prim ]; + description = "An ergonomic but conservative interface to ghc-prim"; + license = stdenv.lib.licenses.mit; + }) {}; + "prim-array" = callPackage ({ mkDerivation, base, ghc-prim, primitive, semigroups }: mkDerivation { @@ -194872,8 +195620,8 @@ self: { pname = "product-profunctors"; version = "0.10.0.0"; sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; - revision = "3"; - editedCabalFile = "09czbjfn7kwg18726401dhlpkd5gibkk96wzczn9lngpl730jhm9"; + revision = "4"; + editedCabalFile = "0vf9w949qfi6p1nqr0cxb9shxdz15mmrd8r0w4gxid56fjc2kaia"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -195688,21 +196436,22 @@ self: { }) {}; "prosidy" = callPackage - ({ mkDerivation, aeson, aeson-diff, aeson-pretty, base, binary - , bytestring, containers, contravariant, deepseq, directory - , filepath, hashable, megaparsec, profunctors, tagged, tasty - , tasty-ant-xml, tasty-golden, tasty-hunit, tasty-quickcheck, text - , transformers, unordered-containers, vector + ({ mkDerivation, aeson, aeson-diff, aeson-pretty, base + , base-compat-batteries, binary, bytestring, containers, deepseq + , directory, filepath, hashable, megaparsec, prettyprinter + , profunctors, tagged, tasty, tasty-ant-xml, tasty-golden + , tasty-hunit, tasty-quickcheck, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "prosidy"; - version = "1.6.0.1"; - sha256 = "1yd36sjs342may33fbrpzgaghql03wjgprbllkms8pr6d16z8m49"; + version = "1.6.0.2"; + sha256 = "1961zr94cn6vza66ndd3hjh3ksm5c70bc2nr33nhvyna9q9hzs5w"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base binary bytestring containers contravariant deepseq - hashable megaparsec profunctors tagged text transformers - unordered-containers vector + aeson base base-compat-batteries binary bytestring containers + deepseq hashable megaparsec prettyprinter profunctors tagged text + transformers unordered-containers vector ]; testHaskellDepends = [ aeson aeson-diff aeson-pretty base bytestring containers directory @@ -197724,8 +198473,8 @@ self: { }: mkDerivation { pname = "pvar"; - version = "0.1.1.0"; - sha256 = "1fzcv2bzm9hf879a6vcgcsmyjn4fhpl9smz8phi6bq1acfzkg026"; + version = "0.2.0.0"; + sha256 = "183pc9xk4b62rrmchzqxi1wvys8k118zi7060wr0xm2azn7wny6h"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ async base deepseq genvalidity hspec primitive QuickCheck @@ -198438,6 +199187,27 @@ self: { broken = true; }) {}; + "quarantimer" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, directory + , filepath, lucid, process, sandi, servant, servant-client + , servant-lucid, servant-multipart, servant-server, stm, text, time + , uuid, wai, wai-extra, warp, warp-tls + }: + mkDerivation { + pname = "quarantimer"; + version = "1.20200326"; + sha256 = "1q0rraxq1gv86chi64ijxxkx4dm8w9v2610wj58315bap3d3m91c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base bytestring directory filepath lucid process sandi + servant servant-client servant-lucid servant-multipart + 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; + }) {}; + "qudb" = callPackage ({ mkDerivation, alex, array, base, bytestring, directory, happy , mtl, snappy @@ -198853,8 +199623,8 @@ self: { pname = "quickcheck-instances"; version = "0.3.22"; sha256 = "14asr9r7da3w7p4hjj51w2yb002nz8x0np8hdz9z4yjvi60vyrax"; - revision = "2"; - editedCabalFile = "1ia5fjhpg7rz793552v88gv2iqx7hl9mi2g09m0llasy1cpzc9jr"; + revision = "4"; + editedCabalFile = "0wx4jcmiv6f3iwc92wf4l2j9025bv4997rn2ycl08ld585m1xlgv"; libraryHaskellDepends = [ array base base-compat bytestring case-insensitive containers hashable old-time QuickCheck scientific splitmix tagged text time @@ -200130,6 +200900,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rainbox_0_26_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, lens, QuickCheck + , rainbow, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "rainbox"; + version = "0.26.0.0"; + sha256 = "07hh904p0mlc3iww184849yps80kwrhdna9nr840m2qyd81m37d1"; + libraryHaskellDepends = [ + base bytestring containers lens rainbow text + ]; + testHaskellDepends = [ + base bytestring containers lens QuickCheck rainbow tasty + tasty-quickcheck text + ]; + description = "Two-dimensional box pretty printing, with colors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rake" = callPackage ({ mkDerivation, base, containers, text }: mkDerivation { @@ -200225,6 +201015,8 @@ self: { pname = "ral"; version = "0.1"; sha256 = "0h8jqaapagrp9faixq817lib8l4nq4ycjj6ppl1ra8llnfsz5304"; + revision = "2"; + editedCabalFile = "0a3ryzcmjgyp64f8s2pl95pkz8zddq9qsn76dlimg23gczf1cql4"; libraryHaskellDepends = [ adjunctions base bin deepseq distributive fin hashable QuickCheck semigroupoids @@ -200240,6 +201032,8 @@ self: { pname = "ral-lens"; version = "0.1"; sha256 = "0hm8mzj51hdql8rp3v0yvmcvmgha4ys8zsgbbx93mlp2b4rfhzpv"; + revision = "1"; + editedCabalFile = "0j7lxlbj2klhcx12xixp3glhbvc9k1pccaiqm2kqr5l3lkrcnirv"; libraryHaskellDepends = [ base bin fin lens ral ]; description = "Length-indexed random access lists: lens utilities"; license = stdenv.lib.licenses.gpl2Plus; @@ -200510,8 +201304,6 @@ self: { ]; description = "Additional functions for random values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "random-fu" = callPackage @@ -200529,8 +201321,6 @@ self: { ]; description = "Random number generation"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "random-fu-multivariate" = callPackage @@ -200543,8 +201333,6 @@ self: { testHaskellDepends = [ base ]; description = "Multivariate distributions for random-fu"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "random-hypergeometric" = callPackage @@ -200752,6 +201540,8 @@ self: { pname = "range-set-list"; version = "0.1.3.1"; sha256 = "0m8c8qhpk9vaykqfy6gsv1csmvdclm27zv9l56ipv152k75xks0j"; + revision = "1"; + editedCabalFile = "0ma1gxmk2in2fj4rxhwshy2zq690ylw1zz0c9cnyin8mxkp96inc"; libraryHaskellDepends = [ base containers deepseq hashable ]; testHaskellDepends = [ base containers deepseq hashable tasty tasty-quickcheck @@ -200822,8 +201612,6 @@ self: { ]; description = "Find the rank product of a data set"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rank1dynamic" = callPackage @@ -202314,20 +203102,21 @@ self: { }) {}; "readme-lhs" = callPackage - ({ mkDerivation, base, containers, doctest, pandoc, pandoc-types - , protolude, text, transformers + ({ mkDerivation, attoparsec, base, blaze-html, containers, doctest + , foldl, pandoc, pandoc-types, protolude, text, transformers }: mkDerivation { pname = "readme-lhs"; - version = "0.3.0"; - sha256 = "1w113jr7sjmq4wkilwjmcaic6sgxp3vzg67dfs0imbd730xhqda8"; + version = "0.5.0"; + sha256 = "01h1zaa14v1hfj7gzm7y1x1rf8mh2w10h1x8k3z3y05kgsfhaspa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers pandoc pandoc-types protolude text transformers + attoparsec base blaze-html containers foldl pandoc pandoc-types + protolude text transformers ]; - executableHaskellDepends = [ base protolude ]; - testHaskellDepends = [ base doctest protolude ]; + executableHaskellDepends = [ base protolude text ]; + testHaskellDepends = [ base containers doctest ]; description = "See readme.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -202511,7 +203300,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rebase_1_6_0_1" = callPackage + "rebase_1_6_1" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , contravariant, contravariant-extras, deepseq, dlist, either , hashable, mtl, profunctors, scientific, selective, semigroupoids @@ -202520,8 +203309,8 @@ self: { }: mkDerivation { pname = "rebase"; - version = "1.6.0.1"; - sha256 = "0w0vy4y2v09a9v8qjqcxq5nqrdk8c1mw7lak9mwv16j59bcijn0x"; + version = "1.6.1"; + sha256 = "020aw7wlgx8nqbq6ara13szgxw2q0n0hx3vrsn2lfp53b2jdsvax"; libraryHaskellDepends = [ base bifunctors bytestring comonad containers contravariant contravariant-extras deepseq dlist either hashable mtl profunctors @@ -202607,6 +203396,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "record-dot-preprocessor_0_2_3" = callPackage + ({ mkDerivation, base, extra, filepath, ghc, record-hasfield + , uniplate + }: + mkDerivation { + pname = "record-dot-preprocessor"; + version = "0.2.3"; + sha256 = "0pmy59xihjsn31ahq76cjsla779b4vidzf7m9g4j8z88pk65rk7z"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base extra ghc uniplate ]; + executableHaskellDepends = [ base extra ]; + testHaskellDepends = [ base extra filepath record-hasfield ]; + description = "Preprocessor to allow record.field syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "record-encode" = callPackage ({ mkDerivation, base, doctest, generics-sop, hspec, QuickCheck , vector @@ -203308,8 +204115,6 @@ self: { testHaskellDepends = [ base doctest QuickCheck ]; description = "Refinement types with static and runtime checking"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "refined-http-api-data" = callPackage @@ -203321,8 +204126,6 @@ self: { 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; - broken = true; }) {}; "refinery" = callPackage @@ -203399,8 +204202,8 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.6.4.1"; - sha256 = "0zm5jgjn4r59h8r0180mkmfnggqv4mgg52vqfwpnz20dv942wzcb"; + version = "0.7.0.0"; + sha256 = "107xi9mwz20zcn9s941lfdyx79py3yvqn7117yqa2h7lnimda9fm"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts @@ -204174,8 +204977,8 @@ self: { pname = "regex-applicative-text"; version = "0.1.0.1"; sha256 = "1ng2qhk4mvpzl8fx91ig7ldv09v9aqdsvn6yl9yjapc6h0ghb4xh"; - revision = "4"; - editedCabalFile = "0ykzppl1v6k70idjl73m4w161f6lsax89v1gp100y4xgipf3yijj"; + revision = "5"; + editedCabalFile = "1jgmhqhlhj9zhxwikmhiq71fj1900iqiyg6r9l5y7xjk7arwscmi"; libraryHaskellDepends = [ base regex-applicative text ]; description = "regex-applicative on text"; license = stdenv.lib.licenses.bsd3; @@ -204187,6 +204990,8 @@ self: { pname = "regex-base"; version = "0.94.0.0"; sha256 = "055rlq67xnbqv43fgrlw6d7s8nhyavahrp6blihwjmqizksq47y4"; + revision = "1"; + editedCabalFile = "13lnky4ps9as73jqrwz4aqn5sfyrcz2zj2ng52xzz512fv59baj4"; libraryHaskellDepends = [ array base bytestring containers mtl text ]; @@ -204447,6 +205252,8 @@ self: { pname = "regex-posix"; version = "0.96.0.0"; sha256 = "08a584jabmmn5gmaqrcar5wsp3qzk0hklldzp2mr2bmvlvqh04r5"; + revision = "1"; + editedCabalFile = "1cy39n1928wv55i7k4wm7zd3xijk7p54kbrxxlfzfvgax5k163b9"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -204493,6 +205300,8 @@ self: { pname = "regex-tdfa"; version = "1.3.1.0"; sha256 = "1h1fliv2zjxwmddl9wnn7ckxxpgy1049hdfg6fcknyrr7mw7dhqm"; + revision = "1"; + editedCabalFile = "1fhi4g2p29qnnfyb211n62g97qrw3gz1kahca7rlz43all93ihdy"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -205142,18 +205951,19 @@ self: { }) {}; "relation" = callPackage - ({ mkDerivation, base, containers, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog + ({ mkDerivation, base, containers, doctest, doctest-discover + , hedgehog, hspec, hspec-discover, hw-hspec-hedgehog }: mkDerivation { pname = "relation"; - version = "0.5"; - sha256 = "13vzx6hq7ncd9z05ikvls60xp5dc4f7qb926s8df26zll4ayndlb"; + version = "0.5.1.0"; + sha256 = "0hsixpln8wf47cqan8yhx86n1k1vww35l4zzf0bjarqazd060pyv"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ - base containers hedgehog hspec hw-hspec-hedgehog + base containers doctest doctest-discover hedgehog hspec + hw-hspec-hedgehog ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -205292,21 +206102,6 @@ self: { "relational-schemas" = callPackage ({ mkDerivation, base, bytestring, containers, relational-query - , template-haskell, time - }: - mkDerivation { - pname = "relational-schemas"; - version = "0.1.7.0"; - sha256 = "1yhgn2sjq7530s31fyyaxms5vnqwl03pwvsn0sm8f6yyzjvwm38b"; - libraryHaskellDepends = [ - base bytestring containers relational-query template-haskell time - ]; - description = "RDBMSs' schema templates for relational-query"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "relational-schemas_0_1_8_0" = callPackage - ({ mkDerivation, base, bytestring, containers, relational-query , sql-words, template-haskell, time }: mkDerivation { @@ -205319,7 +206114,6 @@ self: { ]; description = "RDBMSs' schema templates for relational-query"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relative-date" = callPackage @@ -205729,8 +206523,8 @@ self: { pname = "repa"; version = "3.4.1.4"; sha256 = "17m3wl4hvf04fxwm4fflhnv41yl9bm263hnbpxc8x6xqwifplq23"; - revision = "3"; - editedCabalFile = "17hxj42cm82sac42by78jgbjjn5r3qv7n4919llaq17a2k1np0sw"; + revision = "4"; + editedCabalFile = "0bay8j0fm7l2nhrbdvy9fvrb6hgkrk5qx9y03az2kakvjdc4gvvh"; libraryHaskellDepends = [ base bytestring ghc-prim QuickCheck template-haskell vector ]; @@ -206056,8 +206850,8 @@ self: { }: mkDerivation { pname = "replace-attoparsec"; - version = "1.2.0.0"; - sha256 = "0b3f3i4vhnn4d71bsjjdrspca20nk52wn8a6dnanf53x408jfkay"; + version = "1.2.1.0"; + sha256 = "0i88mylhbm3hx7rj59ms125xnzinxrcjv98df73xzzz54cjf123j"; libraryHaskellDepends = [ attoparsec base bytestring text ]; testHaskellDepends = [ attoparsec base bytestring Cabal parsers text @@ -206066,6 +206860,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "replace-attoparsec_1_2_2_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, parsers, text + }: + mkDerivation { + pname = "replace-attoparsec"; + version = "1.2.2.0"; + sha256 = "1byrd62j7aafjn959xciam6s17zjvrisfi6q4y6ndvla77rg09cm"; + libraryHaskellDepends = [ attoparsec base bytestring text ]; + testHaskellDepends = [ + attoparsec base bytestring Cabal parsers text + ]; + description = "Find, replace, and edit text patterns with Attoparsec parsers (instead of regex)"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "replace-megaparsec" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: mkDerivation { @@ -206078,15 +206888,15 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "replace-megaparsec_1_3_1_0" = callPackage + "replace-megaparsec_1_3_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, megaparsec, text }: mkDerivation { pname = "replace-megaparsec"; - version = "1.3.1.0"; - sha256 = "074vbw5gc3sg2qsj9zlcjdgzdjc8yxa369dvx2w2adl0jv4dk5ib"; + version = "1.3.2.0"; + sha256 = "0bhxjk2yc0h49i9b8irszhgg5041s63clrrcrd6l58s2nmfr3zw5"; libraryHaskellDepends = [ base bytestring megaparsec text ]; testHaskellDepends = [ base bytestring Cabal megaparsec text ]; - description = "Find, replace, and edit text patterns with Megaparsec parsers"; + description = "Find, replace, and edit text patterns with Megaparsec parsers (instead of regex)"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -206159,6 +206969,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "repline_0_3_0_0" = callPackage + ({ mkDerivation, base, containers, exceptions, haskeline, mtl + , process + }: + mkDerivation { + pname = "repline"; + version = "0.3.0.0"; + sha256 = "0niihfyggg2qisadg7w49cr5k5qyyynia93iip0ng2bbmzwi88g8"; + libraryHaskellDepends = [ + base containers exceptions haskeline mtl process + ]; + testHaskellDepends = [ base containers mtl process ]; + description = "Haskeline wrapper for GHCi-like REPL interfaces"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "repo-based-blog" = callPackage ({ mkDerivation, base, blaze-html, containers, data-default , directory, dyre, filepath, filestore, hspec, hspec-discover @@ -206409,8 +207236,6 @@ self: { ]; description = "A local http server to catch the HTTP redirect"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "request-monad" = callPackage @@ -206467,6 +207292,8 @@ self: { pname = "rere"; version = "0.1"; sha256 = "0hskndalxqmlwscvacqmp7gbp8m75a8hnvbifw0hw7hhszlf0yac"; + revision = "1"; + editedCabalFile = "0k2fcc94dlcf33by0zcqk01i9k2g8x4j8rnlpfmabld9dvf5cjwg"; libraryHaskellDepends = [ base containers fin parsec QuickCheck transformers vec ]; @@ -206493,12 +207320,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rerebase_1_6_0_1" = callPackage + "rerebase_1_6_1" = callPackage ({ mkDerivation, rebase }: mkDerivation { pname = "rerebase"; - version = "1.6.0.1"; - sha256 = "07ddcmm2yx71nvgcbj87skrx5pfzsqhi87dxn7vv41ssibv714fk"; + version = "1.6.1"; + sha256 = "0lyi925jk6jbi3qc5xmv61ag07ff9d3xxmf9hfjlblqw2y9fsy93"; libraryHaskellDepends = [ rebase ]; description = "Reexports from \"base\" with a bunch of other standard libraries"; license = stdenv.lib.licenses.mit; @@ -206622,8 +207449,8 @@ self: { }: mkDerivation { pname = "resolv"; - version = "0.1.1.3"; - sha256 = "10y9x63m2w87qfmx9fxjfliq9881cp1x8zkf94sb0hq52rgxd3r4"; + version = "0.1.2.0"; + sha256 = "0wa6wsh6i52q4ah2z0hgzlks325kigch4yniz0y15nw4skxbm8l1"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -207082,8 +207909,6 @@ self: { ]; description = "Easy Git repository serialization"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "restricted-workers" = callPackage @@ -207248,10 +208073,8 @@ self: { }: mkDerivation { pname = "retrie"; - version = "0.1.0.0"; - sha256 = "0x8mc4w6w1pr8k9cmhnb4wad2brqj37qfhkg1vm47zmv3r5sza3s"; - revision = "1"; - editedCabalFile = "1gxd78fpn7pw30k0p70vgrr82qcbq4397fk41c4i7rb7m0y4kk3j"; + version = "0.1.0.1"; + sha256 = "01giwrn6cxkpcjflarpphyvbz6japjq6xjilpg29wfq40c64nzyn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207976,8 +208799,6 @@ self: { libraryHaskellDepends = [ ascetic base MissingH ]; description = "Integrated pretty-printing and error/static analysis reporting"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ridley" = callPackage @@ -208166,6 +208987,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio_0_1_15_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, microlens, mtl, primitive + , process, QuickCheck, text, time, typed-process, unix, unliftio + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.15.0"; + sha256 = "0171sgxysksyhpcnpqrlawp1zrb279a0lr9bp5j5f4g0ak59h4p6"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens mtl primitive process text time typed-process + unix unliftio unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens mtl primitive process QuickCheck text time + typed-process unix unliftio unliftio-core unordered-containers + vector + ]; + description = "A standard library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rio-orphans" = callPackage ({ mkDerivation, base, exceptions, fast-logger, hspec , monad-control, monad-logger, resourcet, rio, transformers-base @@ -210084,6 +210931,17 @@ self: { broken = true; }) {}; + "run-haskell-module" = callPackage + ({ mkDerivation, base, data-default, filepath, process }: + mkDerivation { + pname = "run-haskell-module"; + version = "0.0.2"; + sha256 = "1ra8rv7cbsj1x8vfd3sbynd7a73v9arfimzcfhg9j6blqcii2i2d"; + libraryHaskellDepends = [ base data-default filepath process ]; + description = "Running newly generated Haskell source module"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "run-st" = callPackage ({ mkDerivation, base, primitive, primitive-unlifted }: mkDerivation { @@ -210198,8 +211056,6 @@ self: { ]; description = "Random Variables"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "rwlock" = callPackage @@ -210492,8 +211348,6 @@ self: { ]; description = "Automatic JSON format versioning"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-lazy-io" = callPackage @@ -210635,8 +211489,6 @@ self: { ]; description = "Instances from the xmlbf library for the safe-money library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "safe-plugins" = callPackage @@ -210906,6 +211758,25 @@ self: { broken = true; }) {}; + "sak" = callPackage + ({ mkDerivation, base, bytestring, bz2, cpphs, directory, filepath + , lz4-hs, lzlib, lzma, optparse-applicative, zlib, zstd + }: + mkDerivation { + pname = "sak"; + version = "0.1.1.0"; + sha256 = "0k40jkdg2029h549zgkq4ciayx162lb280l4lkna47dd3r5mf3xd"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring bz2 directory filepath lz4-hs lzlib lzma + optparse-applicative zlib zstd + ]; + executableToolDepends = [ cpphs ]; + description = "Compression command-line tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sakuraio-platform" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, time , unordered-containers @@ -210934,37 +211805,10 @@ self: { }: mkDerivation { pname = "salak"; - version = "0.3.5.3"; - sha256 = "0k6z2vjxg6za6rfhx1xgjdck7ainnsbhrvzav2ngwpvy8li5g02b"; - revision = "1"; - editedCabalFile = "138c763crbfipcb9ss1lk3wx3482nm2v4zbm3k88h6jszxhmxvav"; - libraryHaskellDepends = [ - base bytestring containers data-default directory dlist exceptions - filepath hashable heaps megaparsec mtl scientific text time - unliftio-core unordered-containers - ]; - testHaskellDepends = [ - base hspec mtl QuickCheck random scientific text - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion data-default mtl text time - ]; - description = "Configuration (re)Loader and Parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "salak_0_3_6" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, directory, dlist, exceptions, filepath, hashable - , heaps, hspec, hspec-discover, megaparsec, mtl, QuickCheck, random - , scientific, text, time, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "salak"; version = "0.3.6"; sha256 = "00qyd09az0ldfidfgcki8z3r9gcpxmss3iyr99as5bky29rlz9n3"; + revision = "1"; + editedCabalFile = "1ra0bbk3xkfsy5p78q57abjwmn95kmfjpvsldm4s1455bg2yhi26"; libraryHaskellDepends = [ base bytestring containers data-default directory dlist exceptions filepath hashable heaps megaparsec mtl scientific text time @@ -210980,7 +211824,6 @@ self: { ]; description = "Configuration (re)Loader and Parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "salak-toml" = callPackage @@ -211015,6 +211858,8 @@ self: { pname = "salak-yaml"; version = "0.3.5.3"; sha256 = "07wcwld58bdr8n5fdfq98x6c1xdr8rrx919y4f9y7abdnc4aj000"; + revision = "1"; + editedCabalFile = "0x1wkd2yqmgd0lxy45d3w8p53ms942am14flc0m2jz6dk9vi3k7a"; libraryHaskellDepends = [ base conduit libyaml salak text ]; testHaskellDepends = [ base conduit exceptions hspec libyaml mtl QuickCheck salak text @@ -212221,15 +213066,17 @@ self: { }) {}; "schema" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: + ({ mkDerivation, base, groom, hspec, msgpack-binary, QuickCheck }: mkDerivation { pname = "schema"; - version = "0.0.1"; - sha256 = "0357j9xn0rw427x2f5pqkzmya9scyqwz3ksn4lyryzvmm9p6lii7"; + version = "0.0.2"; + sha256 = "0wzihrcjx6bha6yibsghcl0l3r3bwcsmnidbm072c16sppbglbqh"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ + base groom hspec msgpack-binary QuickCheck + ]; description = "Encoding-independent schemas for Haskell data types"; - license = stdenv.lib.licenses.agpl3; + license = stdenv.lib.licenses.gpl3; }) {}; "schemas" = callPackage @@ -212434,33 +213281,33 @@ self: { }) {}; "scidb-hquery" = callPackage - ({ mkDerivation, alex, array, base, base-compat, BNFC, bytestring - , Cabal, connection, cryptonite, data-default-class, directory - , exceptions, filepath, happy, haskeline, hostname-validate, HTTP - , http-client, http-client-tls, http-conduit, http-types, memory - , mtl, network, process, regex, safe, split, terminal-size, text - , tls, x509-store + ({ mkDerivation, alex, array, base, BNFC, bytestring, Cabal + , connection, cryptonite, data-default-class, directory, exceptions + , filepath, happy, haskeline, hostname-validate, HTTP, http-client + , http-client-tls, http-conduit, http-types, memory, mtl, network + , process, regex, safe, split, terminal-size, text, tls, x509-store }: mkDerivation { pname = "scidb-hquery"; - version = "2.8.0.436"; - sha256 = "0mkicmfvwc7xg37d46s7xrcsdaff09v7x86npd1bgv1k60m4c8gq"; + version = "2.8.0.437"; + sha256 = "1nxcxfr55rf6ds0hvgbnss5hjf059rdd7y613yc485w8bfmv5cil"; + revision = "1"; + editedCabalFile = "1xbiiaa5rj5nc4if69d97f5spbrsa8jv1mhcrgjkwff6a879274q"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - array base base-compat bytestring connection cryptonite - data-default-class exceptions haskeline hostname-validate HTTP - http-client http-client-tls http-conduit http-types memory mtl - network process regex safe split terminal-size text tls x509-store + array base bytestring connection cryptonite data-default-class + exceptions haskeline hostname-validate HTTP http-client + http-client-tls http-conduit http-types memory mtl network process + regex safe split terminal-size text tls x509-store ]; libraryToolDepends = [ alex BNFC happy ]; executableHaskellDepends = [ - array base base-compat bytestring connection cryptonite - data-default-class directory exceptions filepath haskeline - hostname-validate HTTP http-client http-client-tls http-conduit - http-types memory mtl network process regex safe split - terminal-size text tls x509-store + array base bytestring connection cryptonite data-default-class + directory exceptions filepath haskeline hostname-validate HTTP + http-client http-client-tls http-conduit http-types memory mtl + network process regex safe split terminal-size text tls x509-store ]; description = "Haskell query for SciDB via shim"; license = stdenv.lib.licenses.gpl3; @@ -214009,14 +214856,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "selective_0_4" = callPackage + "selective_0_4_1" = callPackage ({ mkDerivation, base, containers, mtl, QuickCheck, tasty , tasty-expected-failure, tasty-quickcheck, transformers }: mkDerivation { pname = "selective"; - version = "0.4"; - sha256 = "0kwf6s21gc64nl04rvaydz838kjf7b7xgw1vvyvr44mf36ggcv2p"; + version = "0.4.1"; + sha256 = "1pwbfayh4s6afhkgyvyq187m4vcnyvy3frb1zxjs7xjb2sxp9r80"; libraryHaskellDepends = [ base containers transformers ]; testHaskellDepends = [ base containers mtl QuickCheck tasty tasty-expected-failure @@ -214144,8 +214991,8 @@ self: { }: mkDerivation { pname = "semantic-source"; - version = "0.0.2.0"; - sha256 = "072iax2d2nhskpmm754ii28qdfvxrbwpvgix0igrrfaa52pcw286"; + version = "0.1.0.0"; + sha256 = "179rxsn1cyh77yn7vzmii38ipgcjpavlyf5xbx4j8zzgh1jklmc5"; libraryHaskellDepends = [ aeson base bytestring containers deepseq generic-monoid hashable lingo pathtype semilattices text @@ -214219,6 +215066,8 @@ self: { pname = "semialign"; version = "1.1"; sha256 = "1n47w9c6i6azb4w65rzhci00v6p9c0s1w1givd2q3smkgyziiqpk"; + revision = "1"; + editedCabalFile = "0rfnjzbzzclzh2a1m5wpzzsqf8hrkrqnc90pflshb40i7rwkm6xf"; libraryHaskellDepends = [ base base-compat containers hashable semigroupoids tagged these transformers unordered-containers vector @@ -214253,6 +215102,8 @@ self: { pname = "semialign-indexed"; version = "1.1"; sha256 = "1b6amfhwk968ah56w8vala3hbpzf9mfza2ajhdnvzcdiyqyxvwb0"; + revision = "1"; + editedCabalFile = "1g7b15xki938vljmkcwnz1hvqfp77ja39cxnfnwd5j507a0qp800"; libraryHaskellDepends = [ base containers hashable lens semialign these unordered-containers vector @@ -216085,8 +216936,6 @@ self: { ]; description = "Helpers for using ekg with servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-elm" = callPackage @@ -217351,8 +218200,6 @@ self: { ]; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-stache" = callPackage @@ -217717,8 +218564,6 @@ self: { ]; description = "Automatically generate Elm clients for Servant APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-tracing" = callPackage @@ -217812,8 +218657,6 @@ self: { ]; description = "Servant support for the XML Content-Type"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "servant-yaml" = callPackage @@ -218077,8 +218920,6 @@ self: { ]; description = "Snap bindings for serversession"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "serversession-frontend-wai" = callPackage @@ -218274,8 +219115,8 @@ self: { }: mkDerivation { pname = "set-cover"; - version = "0.1"; - sha256 = "1yidgc1nbhbkxpchd96vzfgkk95hdwgpvd9ys2b4xw2m1zyzi1kb"; + version = "0.1.1"; + sha256 = "04jjcmjll0azz24rx91p0dp5b8ya5jc0qacr21764ri1dbkfflgw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -218387,16 +219228,14 @@ self: { pname = "setgame"; version = "1.1"; sha256 = "1hr2kb4d7m22d48gh74h5z8c6shkprincf0qb9wc2fq2hj7c3c1l"; - revision = "1"; - editedCabalFile = "1shkmfmjnvc47gy9ck6knf94571if4qjm92c1p8kji9v0n24yzfw"; + revision = "2"; + editedCabalFile = "0cb1vajyh3fxrkq97cvlkvpskgrnn4zs2gk8al9dcnn3dq0j3v58"; isLibrary = true; isExecutable = true; 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; - broken = true; }) {}; "setlocale" = callPackage @@ -218989,15 +219828,15 @@ self: { }) {}; "shake-bindist" = callPackage - ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, shake - , zlib, zstd + ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, lzma + , shake, zlib, zstd }: mkDerivation { pname = "shake-bindist"; - version = "1.0.0.0"; - sha256 = "0fzq62a8rjh9jc9dc7rfi6ypp0fax7fhlf632a30mrbpk1hqyfz8"; + version = "1.0.1.0"; + sha256 = "0rlbn367czab885l44k698wiyavs0jf1rbzn4hk48mfhqxpcihky"; libraryHaskellDepends = [ - archive-sig base bytestring bz2 lzlib shake zlib zstd + archive-sig base bytestring bz2 lzlib lzma shake zlib zstd ]; description = "Rules for binary distributions"; license = stdenv.lib.licenses.bsd3; @@ -219691,6 +220530,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shell-utility_0_1" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "shell-utility"; + version = "0.1"; + sha256 = "1n15v0avvkxvczmyjc6g4z9axr5c61n8jlpa1cm4xr3qk7spm1mi"; + libraryHaskellDepends = [ base ]; + description = "Utility functions for writing command-line programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shellish" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, mtl , process, strict, time, unix-compat @@ -220159,6 +221010,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "show-combinators_0_2_0_0" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "show-combinators"; + version = "0.2.0.0"; + sha256 = "07ds87ldl9165hj3k5h84iawc6vqlbggni3dg1nhbxww1spxn0n9"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Combinators to write Show instances"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-please" = callPackage ({ mkDerivation, base, mtl, parsec, template-haskell, th-orphans , time @@ -220770,8 +221634,8 @@ self: { ({ mkDerivation, base, optparse-applicative }: mkDerivation { pname = "simple-cmd-args"; - version = "0.1.5"; - sha256 = "097b8qv0755p0iq6bcw6ndvvvv017x9hgf6l2zvb3sgqdg9wlj88"; + version = "0.1.6"; + sha256 = "18dikz7hy61wgrbpgnxmgfp1i485hkhgrdnqbkzl2mrmmjn8p1zd"; libraryHaskellDepends = [ base optparse-applicative ]; description = "Simple command args parsing and execution"; license = stdenv.lib.licenses.bsd3; @@ -221801,8 +222665,8 @@ self: { pname = "singleton-bool"; version = "0.1.5"; sha256 = "17w9vv6arn7vvc7kykqcx81q2364ji43khrryl27r1cjx9yxapa0"; - revision = "1"; - editedCabalFile = "1g2dchvp5clg3hfdrp7hf5pbl9kcyhqhnqxqxd7n861nfd661wqd"; + revision = "2"; + editedCabalFile = "118j0h29nqg2acqbzif2ffqnanjbwnqmv2kch9z7xiwqkz6iq8an"; libraryHaskellDepends = [ base dec ]; description = "Type level booleans"; license = stdenv.lib.licenses.bsd3; @@ -221825,8 +222689,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.4.3"; - sha256 = "0xj5w6dszm832y90qxmwqnyiwpav30q199cjcdbdxr7q1d4klszi"; + version = "0.4.4"; + sha256 = "14am0aggfrnd2w5g8cjljx0vmmrhy6r36xpkfrxpralhkr7h52m8"; libraryHaskellDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -221866,6 +222730,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singletons_2_7" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, deepseq + , directory, filepath, ghc-boot-th, mtl, pretty, process, syb + , tasty, tasty-golden, template-haskell, text, th-desugar + , transformers, turtle + }: + mkDerivation { + pname = "singletons"; + version = "2.7"; + sha256 = "0az22as3rbzkfzv6a4m779qgibwah5r77l0zdgml9x7ajpkdcaz1"; + revision = "1"; + editedCabalFile = "18vd0jnr3skf2fmj13g06gjjzgmw5rnsjqwivsmqs3pkfv9qi3sm"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ + base containers ghc-boot-th mtl pretty syb template-haskell text + th-desugar transformers + ]; + testHaskellDepends = [ + base bytestring deepseq filepath process tasty tasty-golden text + turtle + ]; + description = "A framework for generating singleton types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singletons-presburger" = callPackage ({ mkDerivation, base, ghc, ghc-typelits-presburger, reflection , singletons @@ -222068,8 +222958,6 @@ self: { ]; description = "A simple to understand static site generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sixfiguregroup" = callPackage @@ -222374,8 +223262,6 @@ self: { ]; description = "A very quick-and-dirty WebSocket server"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "skip-list" = callPackage @@ -222459,6 +223345,24 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "skylighting_0_8_3_4" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , skylighting-core + }: + mkDerivation { + pname = "skylighting"; + version = "0.8.3.4"; + sha256 = "1fqjz2s8i9i235mrp4364ycidax2zl7xrgcahsqpbr4cx7vgy9qz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers skylighting-core + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-core" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , base64-bytestring, binary, blaze-html, bytestring @@ -222491,6 +223395,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "skylighting-core_0_8_3_4" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, transformers, utf8-string + }: + mkDerivation { + pname = "skylighting-core"; + version = "0.8.3.4"; + sha256 = "0jcryl83873jjn6lximl1pnshf84nlln1hdvrdcybhrpjyd56qdc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe text transformers + utf8-string + ]; + testHaskellDepends = [ + aeson base bytestring containers Diff directory filepath HUnit + pretty-show QuickCheck random tasty tasty-golden tasty-hunit + tasty-quickcheck text + ]; + benchmarkHaskellDepends = [ + base containers criterion directory filepath text + ]; + description = "syntax highlighting library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "skylighting-extensions" = callPackage ({ mkDerivation, base, containers, skylighting, skylighting-modding , text @@ -222756,8 +223693,6 @@ self: { ]; description = "Generate C++ skeletons from slice files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "sliceofpy" = callPackage @@ -223246,6 +224181,31 @@ self: { broken = true; }) {}; + "smarties" = callPackage + ({ mkDerivation, base, haskeline, hspec, ilist, microlens + , microlens-th, MonadRandom, mtl, QuickCheck, random, text, vector + }: + mkDerivation { + pname = "smarties"; + version = "1.2.1"; + sha256 = "0560d49crj5s9xpj8sk552qdqm19grj87lyqif0dxypc7qpn3dc8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base microlens microlens-th MonadRandom mtl QuickCheck random text + ]; + executableHaskellDepends = [ + base haskeline ilist microlens microlens-th MonadRandom mtl + QuickCheck random text vector + ]; + testHaskellDepends = [ + base hspec microlens microlens-th MonadRandom mtl QuickCheck random + text + ]; + description = "Haskell Behavior Tree Library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smartword" = callPackage ({ mkDerivation, base, haskell98, pretty, unix, utf8-string }: mkDerivation { @@ -224350,8 +225310,6 @@ self: { ]; description = "Serve javascript files compiled with GHCJS"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "snaplet-hasql" = callPackage @@ -225343,8 +226301,6 @@ self: { ]; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "soap-tls" = callPackage @@ -225762,6 +226718,8 @@ self: { pname = "some"; version = "1.0.1"; sha256 = "13dpvxswjcsmic8h2vayp77qzl820gg4g29g5n2xcja8gnzjkkii"; + revision = "1"; + editedCabalFile = "0gpr24rf427l82d8gb3x97yj03vc2v8ky3b6m1gb4j3g4yvvmr96"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; description = "Existential type: Some"; @@ -225794,8 +226752,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "sop-core"; - version = "0.5.0.0"; - sha256 = "12zqdr0g4s3fr6710ngph0fr06lbc12c849izcl4cjj4g9w3v3zz"; + version = "0.5.0.1"; + sha256 = "1c4xk4bw1ij4gpgy35iv08bhcxhv1siy55qnvp2xd6wcc3qnghys"; libraryHaskellDepends = [ base deepseq ]; description = "True Sums of Products"; license = stdenv.lib.licenses.bsd3; @@ -226526,8 +227484,8 @@ self: { }: mkDerivation { pname = "spdx"; - version = "1.0.0.1"; - sha256 = "00j0dqx9hrlpqy1jml85nykg0xl108q45ljan385bzb5nnap36l6"; + version = "1.0.0.2"; + sha256 = "0aydw4gwhvy45jgk038jnzhzgq8ijg16fk48appn67jn1c3yi0xj"; libraryHaskellDepends = [ base Cabal containers transformers ]; testHaskellDepends = [ base base-compat Cabal tasty tasty-quickcheck @@ -227015,8 +227973,6 @@ self: { ]; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "splines" = callPackage @@ -227761,20 +228717,21 @@ self: { , network-uri, pretty, process, process-extras, pureMD5, QuickCheck , random, safecopy, show-combinators, show-please, syb , template-haskell, text, th-lift, th-lift-instances, th-orphans - , time, unix, Unixutils, userid, uuid, uuid-orphans, uuid-types - , zlib + , time, transformers, unexceptionalio-trans, unix, Unixutils + , userid, uuid, uuid-orphans, uuid-types, zlib }: mkDerivation { pname = "sr-extra"; - version = "1.64"; - sha256 = "18yrl19dzjwfp56xam7m4d61wrxl224lz8jhi198j78pq6b4d1vl"; + version = "1.72.3"; + sha256 = "0jm7r0lxcwppc85rpyasq6grqqkcwhxs0clwyasicqklkcx2l5xw"; libraryHaskellDepends = [ base bytestring bzlib Cabal cereal containers Diff directory exceptions fgl filemanip filepath generic-data hslogger HUnit lens ListLike mmorph mtl network-uri pretty process process-extras pureMD5 QuickCheck random safecopy show-combinators show-please syb template-haskell text th-lift th-lift-instances th-orphans time - unix Unixutils userid uuid uuid-orphans uuid-types zlib + transformers unexceptionalio-trans unix Unixutils userid uuid + uuid-orphans uuid-types zlib ]; description = "Module limbo"; license = stdenv.lib.licenses.bsd3; @@ -228489,8 +229446,6 @@ self: { ]; description = "Create etags for Haskell projects based on Stack snapshots"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "stack-templatizer" = callPackage @@ -229405,8 +230360,6 @@ self: { ]; description = "JavaScript and Css files concat for http optimization. Now with LESS support."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "static-tensor" = callPackage @@ -229466,8 +230419,6 @@ self: { libraryHaskellDepends = [ base MissingH ]; description = "Reusable static analysis interfaces and modules"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "statistics" = callPackage @@ -229694,8 +230645,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.3.3"; - sha256 = "1mrd2w1a1nxi4k5lwav6hk8wphfk2j519hwdscj5855a9kk9piba"; + version = "0.2.3.4"; + sha256 = "0b3hkk6m2wpcyj1zkl3az4v2m9cb7djxk7iz00rxz5j13ngxgfci"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229969,8 +230920,8 @@ self: { pname = "step-function"; version = "0.2"; sha256 = "1mg7zqqs32zdh1x1738kk0yydyksbhx3y3x8n31f7byk5fvzqq6j"; - revision = "3"; - editedCabalFile = "0aa7x22n5ylvryd7bm1j9s12k5xcp9fp5fz9qy03hjicxzlhm07a"; + revision = "4"; + editedCabalFile = "0zxjrsa54g65p7kf5mfpjb897d1add2dfp5dm4xfs5321rs31knv"; libraryHaskellDepends = [ base base-compat-batteries containers deepseq QuickCheck ]; @@ -230544,8 +231495,8 @@ self: { ({ mkDerivation, base, semigroups, transformers, utility-ht }: mkDerivation { pname = "storable-record"; - version = "0.0.4.1"; - sha256 = "1waj81810ywbrzizifsrjd0n3803scl8sr248z9nlrc94fz8vg58"; + version = "0.0.5"; + sha256 = "17nf0bx3g169cpslf8prr5h5lvxl389m23rbsyb3kdai45fibpwf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230780,15 +231731,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_50_0" = callPackage + "stratosphere_0_51_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.50.0"; - sha256 = "0nxvrfi3jp0p874gkj25rdlfsb2rskp82bz58c0rply0s5rivlfl"; + version = "0.51.0"; + sha256 = "053q621zw2c0nf08qc232mnh1cn4qxyzshayis6siqabdnjlqnk2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232879,19 +233830,20 @@ self: { }) {}; "stylist" = callPackage - ({ mkDerivation, base, css-syntax, hashable, hspec, network-uri - , QuickCheck, scientific, text, unordered-containers + ({ mkDerivation, async, base, css-syntax, hashable, hspec + , network-uri, QuickCheck, scientific, text, unordered-containers }: mkDerivation { pname = "stylist"; - version = "1.1.1.0"; - sha256 = "0adcw26540a8srlmypjdv41icw5d3j3i2q6i7j92hhssj642bfw4"; + version = "1.2.0.0"; + sha256 = "1b3kz8kp2dda4f0vghbaxc6y29r39k197fzphy4av8p6vxgp2ka0"; libraryHaskellDepends = [ - base css-syntax hashable network-uri text unordered-containers + async base css-syntax hashable network-uri text + unordered-containers ]; testHaskellDepends = [ - base css-syntax hashable hspec network-uri QuickCheck scientific - text unordered-containers + async base css-syntax hashable hspec network-uri QuickCheck + scientific text unordered-containers ]; description = "Apply CSS styles to a document tree"; license = stdenv.lib.licenses.mit; @@ -233263,26 +234215,28 @@ self: { }) {}; "summoner" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , directory, filepath, generic-deriving, gitrev, hedgehog, hspec - , neat-interpolation, optparse-applicative, process, relude - , shellmet, text, time, tomland, tree-diff + ({ mkDerivation, aeson, base, bytestring, colourista, containers + , directory, filepath, generic-data, gitrev, hedgehog, hspec + , hspec-hedgehog, neat-interpolation, optparse-applicative, process + , relude, shellmet, text, time, tomland, tree-diff + , validation-selective }: mkDerivation { pname = "summoner"; - version = "1.4.0.0"; - sha256 = "0niakfpnk86n69n7kazlv2z00g211b9lgp2b8qphlr4xyz3b7fn0"; + version = "2.0.0.0"; + sha256 = "0cphigybxmvh2ff62b100hywqgln6fhsl68yp2049g4wnmvfzgjf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal base bytestring containers directory filepath - generic-deriving gitrev neat-interpolation optparse-applicative - process relude shellmet text time tomland + aeson base bytestring colourista containers directory filepath + generic-data gitrev neat-interpolation optparse-applicative process + relude shellmet text time tomland validation-selective ]; executableHaskellDepends = [ base relude ]; testHaskellDepends = [ - base directory filepath hedgehog hspec neat-interpolation relude - text tomland tree-diff + base directory filepath hedgehog hspec hspec-hedgehog + neat-interpolation relude text tomland tree-diff + validation-selective ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects"; license = stdenv.lib.licenses.mpl20; @@ -233292,17 +234246,17 @@ self: { "summoner-tui" = callPackage ({ mkDerivation, base, brick, directory, filepath, microlens - , microlens-th, relude, summoner, text, vty + , microlens-th, relude, summoner, text, validation-selective, vty }: mkDerivation { pname = "summoner-tui"; - version = "1.4.0.0"; - sha256 = "0vz4nd5wwjdk8n9n1lwa5b8xs863fkkcq56rwy0fifp1xr4184si"; + version = "2.0.0.0"; + sha256 = "1cgwdfbw55xvmw3k8cbwlcf8773mz1rlsvnf1slsk8kn91irhs9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base brick directory filepath microlens microlens-th relude - summoner text vty + summoner text validation-selective vty ]; executableHaskellDepends = [ base relude ]; description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI"; @@ -235224,22 +236178,22 @@ self: { }) {UniqueLogicNP = null;}; "synthesizer-llvm" = callPackage - ({ mkDerivation, base, containers, event-list, llvm-extra, llvm-tf - , midi, non-empty, non-negative, numeric-prelude, pathtype + ({ mkDerivation, base, containers, event-list, llvm-dsl, llvm-extra + , llvm-tf, midi, non-empty, non-negative, numeric-prelude, pathtype , QuickCheck, random, semigroups, sox, storable-record - , storable-tuple, storablevector, synthesizer-core - , synthesizer-midi, tfp, transformers, unsafe, utility-ht, vault + , storablevector, synthesizer-core, synthesizer-midi, tfp + , transformers, unsafe, utility-ht, vault }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.8.3"; - sha256 = "1ff56jrk2a3hppw9s1iv167926vcmd9p51mzav73kkaxni1n6hry"; + version = "0.9"; + sha256 = "0bqncysaq164235792657yyf1ngkr7gm9vkzkbiqy6f7g7a62shd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers event-list llvm-extra llvm-tf midi non-empty - non-negative numeric-prelude pathtype random semigroups sox - storable-record storable-tuple storablevector synthesizer-core + base containers event-list llvm-dsl llvm-extra llvm-tf midi + non-empty non-negative numeric-prelude pathtype random semigroups + sox storable-record storablevector synthesizer-core synthesizer-midi tfp transformers unsafe utility-ht vault ]; testHaskellDepends = [ @@ -236455,8 +237409,6 @@ self: { ]; description = "Support library to enable TAI usage on systems with time kept in UTC"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tai64" = callPackage @@ -236767,8 +237719,8 @@ self: { pname = "tar"; version = "0.5.1.1"; sha256 = "1ppim7cgmn7ng8zbdrwkxhhizc30h15h1c9cdlzamc5jcagl915k"; - revision = "1"; - editedCabalFile = "1ni8zym7k6f1hg6wfvnnf3xcs2ar3z8xaabkgjg8q329arjcm8wp"; + revision = "2"; + editedCabalFile = "131f369a2vjzr26r7f2c2p534xvyw0s7cvgvih2ck56lqha58wbs"; libraryHaskellDepends = [ array base bytestring containers deepseq directory filepath time ]; @@ -236792,8 +237744,8 @@ self: { }: mkDerivation { pname = "tar-bytestring"; - version = "0.6.3.0"; - sha256 = "18c5493zwwbri2m50a2najbxaqnprxwng48kdcap7qppbvdmra66"; + version = "0.6.3.1"; + sha256 = "09hmsgbjsk2ddnl9hfmhq1l274r7ay2fzs4rmqgs6x09q1kc5i5p"; libraryHaskellDepends = [ array base bytestring containers deepseq hpath-directory hpath-filepath hpath-posix safe-exceptions these time unix word8 @@ -237034,6 +237986,8 @@ self: { pname = "taskwarrior"; version = "0.1.2.2"; sha256 = "0iy2fxgxhjdhi62zbd7iwbvblgr9shlqwg4a92k7b3cd9mqwskv6"; + revision = "1"; + editedCabalFile = "0fyidh845imi20r9h5sh4nvhnzylj5wg1rkfp9zpml7ifvpv609v"; libraryHaskellDepends = [ aeson base bytestring process random text time unordered-containers uuid @@ -237146,6 +238100,8 @@ self: { 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; @@ -237608,8 +238564,8 @@ self: { pname = "tasty-test-vector"; version = "0"; sha256 = "1kgz9mp1h391rqj9n78bfvxl8pd3bxanbnwkc5l9gvlygly3fz8j"; - revision = "1"; - editedCabalFile = "13z7fj49hsxs79brh0jrncx5qcqicgzcif9gnbx8y3hbh6qw4bv0"; + revision = "2"; + editedCabalFile = "131ldlbp4ji1m8wayl8h28ykcda29bsvifa3mw8513mnqnndgahc"; libraryHaskellDepends = [ base tasty ]; description = "Test vector support for tasty"; license = stdenv.lib.licenses.bsd3; @@ -238412,8 +239368,6 @@ self: { testHaskellDepends = [ base ]; description = "Command-line tool to log time-tracking information into JIRA Tempo plugin"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tempodb" = callPackage @@ -238868,6 +239822,8 @@ self: { pname = "tensors"; version = "0.1.4"; sha256 = "1wiq38px85ypnfpvbr3hcawrag457z0jvd4jr1bh7jf6qw6jqpfn"; + revision = "1"; + editedCabalFile = "0a96iw75ylygbjdlab5dj3dkkqamd2k1g2nfy6w7ly6j7rq6f84p"; libraryHaskellDepends = [ base deepseq vector ]; testHaskellDepends = [ base deepseq hspec QuickCheck reflection vector @@ -239365,8 +240321,8 @@ self: { pname = "test-framework-quickcheck2"; version = "0.3.0.5"; sha256 = "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"; - revision = "1"; - editedCabalFile = "1vmpk70h1594h9s216d3ngkb399fpny1d3sh4gg0vrc75p4as68d"; + revision = "2"; + editedCabalFile = "1apgf91van2070m6jhj9w3h2xmr42r4kk0da9crq9994hd8zwny2"; libraryHaskellDepends = [ base extensible-exceptions QuickCheck random test-framework ]; @@ -240163,8 +241119,6 @@ self: { libraryHaskellDepends = [ base MissingH ]; description = "Simple text formatting library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "text-generic-pretty" = callPackage @@ -240593,8 +241547,6 @@ self: { 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; - broken = true; }) {}; "text-short" = callPackage @@ -240606,8 +241558,8 @@ self: { pname = "text-short"; version = "0.1.3"; sha256 = "0xyrxlb602z8bc9sr2y1fag0x56a20yj5qrkvy7iwc6hnznrynxz"; - revision = "1"; - editedCabalFile = "0lb4papn54fbgjdqj4ladaf5q12dhlwkg5z2vc5qxlh35x82sw4a"; + revision = "2"; + editedCabalFile = "17cb7p0qywf2dsrq3g8qb3ssknd9wl5k0nc2pxz9gc3l8rxpkw51"; libraryHaskellDepends = [ base binary bytestring deepseq ghc-prim hashable text ]; @@ -240631,6 +241583,8 @@ self: { pname = "text-show"; version = "3.8.5"; sha256 = "0xc2269v0bfcvlwm60l2zs6l6lwljfnq5n05n9kp580qybvynzjg"; + revision = "2"; + editedCabalFile = "13s8jn3vaza5103596bq4gash6h2yykzkm8ixf17d2869xg61x1y"; libraryHaskellDepends = [ array base base-compat-batteries bifunctors bytestring bytestring-builder containers generic-deriving ghc-boot-th ghc-prim @@ -240662,8 +241616,8 @@ self: { pname = "text-show-instances"; version = "3.8.3"; sha256 = "11v335p3wzf9ijqlkls5mk4m16dfak8fckn4gj7mahs8c7l9lm5d"; - revision = "2"; - editedCabalFile = "001xn2aq5k8hhn5iwhmxv1s3mnxyg630klmmdhbp3lxdb2yq8rha"; + revision = "4"; + editedCabalFile = "0qdnzgwnpgizdm0bvmdwhdf0hwg0kabjswkmnhijkac688rkw1m2"; libraryHaskellDepends = [ base base-compat-batteries bifunctors binary containers directory ghc-boot-th haskeline hpc old-locale old-time pretty random @@ -241173,6 +242127,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-desugar_1_11" = callPackage + ({ mkDerivation, base, containers, fail, ghc-prim, hspec, HUnit + , mtl, ordered-containers, semigroups, syb, template-haskell + , th-abstraction, th-lift, th-orphans, transformers-compat + }: + mkDerivation { + pname = "th-desugar"; + version = "1.11"; + sha256 = "0ap8dk1a1wl62ggqkg9rb7vna131drrjcd2hn5dw7mwnbc1rxqhl"; + libraryHaskellDepends = [ + base containers fail ghc-prim mtl ordered-containers semigroups syb + template-haskell th-abstraction th-lift th-orphans + transformers-compat + ]; + testHaskellDepends = [ + base containers hspec HUnit mtl syb template-haskell th-lift + th-orphans + ]; + description = "Functions to desugar Template Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-dict-discovery" = callPackage ({ mkDerivation, base, constraints, template-haskell }: mkDerivation { @@ -241211,6 +242188,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-expand-syns_0_4_6_0" = callPackage + ({ mkDerivation, base, containers, syb, template-haskell }: + mkDerivation { + pname = "th-expand-syns"; + version = "0.4.6.0"; + sha256 = "1dz8bl4yb6sis74knmvqxa21y9yws9l8gafzsi0chaqx15b5asxj"; + libraryHaskellDepends = [ base containers syb template-haskell ]; + testHaskellDepends = [ base template-haskell ]; + description = "Expands type synonyms in Template Haskell ASTs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-extras" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -241271,8 +242261,8 @@ self: { }: mkDerivation { pname = "th-instance-reification"; - version = "0.1.5"; - sha256 = "0ssnd45bvz4k0fajc3xlqy7iq92rm0pjn3wwl4brnvaf7l1180q4"; + version = "0.1.5.1"; + sha256 = "0jafxmd767z52my86dh1dk89h6wx2qf11vx4yk9qw563a7xzv6rm"; libraryHaskellDepends = [ base containers list-extras template-haskell th-expand-syns ]; @@ -241282,8 +242272,6 @@ self: { ]; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "th-instances" = callPackage @@ -241592,8 +242580,8 @@ self: { }: mkDerivation { pname = "th-utilities"; - version = "0.2.3.1"; - sha256 = "1sy3bgwc85zw999cya92xsp9jllclwbzw9fmjmhqi4r5kj2gyk96"; + version = "0.2.4.0"; + sha256 = "1c3idsx9fyh9n4d969mibxsyfb2nmivwm65zap3hyl40bnldc39l"; libraryHaskellDepends = [ base bytestring containers directory filepath primitive syb template-haskell text th-orphans @@ -241783,8 +242771,8 @@ self: { pname = "these"; version = "1.0.1"; sha256 = "1k0pi65g7cm9hzdw6my6bzz2zvddkmj1qs45ymqmi316bpiixk3r"; - revision = "1"; - editedCabalFile = "0923r86fnmgpx0msm68aszirh2n19nn5bccgjxfh2146jw4z7w3z"; + revision = "3"; + editedCabalFile = "1z6aqz41m1cdm5q5y4jj4fl9j1qcvi32d08r2a103x5ndhf8151q"; libraryHaskellDepends = [ aeson assoc base base-compat binary deepseq hashable QuickCheck semigroupoids unordered-containers @@ -241799,8 +242787,8 @@ self: { pname = "these-lens"; version = "1"; sha256 = "144ly13qng95mwnfis8dm7n3843z3w2vp4212qawbpw8hw921c7y"; - revision = "1"; - editedCabalFile = "1lrpq5a8ldddmsi7ckaqinamn2f7kkijq5jq05yzdx818b2563wn"; + revision = "2"; + editedCabalFile = "0krnf1arsr05ygqcpfd7p34k7319fwjbg59fqhilrjl6jzzpyaka"; libraryHaskellDepends = [ base base-compat lens these ]; description = "Lenses for These"; license = stdenv.lib.licenses.bsd3; @@ -242081,8 +243069,6 @@ self: { ]; description = "A graphical tool for profiling parallel Haskell programs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "threefish" = callPackage @@ -242937,8 +243923,8 @@ self: { pname = "time-parsers"; version = "0.1.2.1"; sha256 = "102k6l9888kbgng045jk170qjbmdnwv2lbzlc12ncybfk2yk7wdv"; - revision = "1"; - editedCabalFile = "00063s6a75sy9fjg5507yix0wizdfx5vangn3yfmfvh3wgw8yj8c"; + revision = "2"; + editedCabalFile = "10bawg6cwfwm31fcs63z8imd1cdl1wq8syn669yfkycrk77wfkli"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -243540,8 +244526,6 @@ self: { ]; description = "Load TimeZoneSeries from an Olson file at compile time"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "timezone-series" = callPackage @@ -243926,8 +244910,8 @@ self: { }: mkDerivation { pname = "tldr"; - version = "0.6.2"; - sha256 = "13m88za5pfal00kldqjgag232k563y168ri84acdim8km62b861z"; + version = "0.6.4"; + sha256 = "0gg9zplk8widfiwm5q1pi7fl45hby68c3ljm8p4livrp72s10f9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -244561,8 +245545,8 @@ self: { pname = "toml-parser"; version = "0.1.0.0"; sha256 = "0p1nl3009qlcqn4jjggbm1v719a6bswklkyjb3plm0cz3bsyr0fs"; - revision = "2"; - editedCabalFile = "02vblwkja1in6fi3zbvxmw6k1c0zny9jljiis0krvn94h2rdflwd"; + revision = "3"; + editedCabalFile = "1hls6xw2c7379m1x92da91v7mv1ysdsj6shi1nslfq5xgm53bw14"; libraryHaskellDepends = [ array base text time ]; libraryToolDepends = [ alex happy ]; description = "Parser for the TOML configuration language"; @@ -244910,10 +245894,8 @@ self: { }: mkDerivation { pname = "topograph"; - version = "1"; - sha256 = "0vm7ja5f677lpphfmggx68h144k0fzj0n6r6ypf5474da405xad7"; - revision = "2"; - editedCabalFile = "0sci2p1spsh7as4n7mp1hb4pwiq4wd69p60c71kwx56wpwiglp9i"; + version = "1.0.0.1"; + sha256 = "1sd2gyirkdgwcll76zxw954wdsyxzajn59xa9zk55fbrsm6w24cv"; libraryHaskellDepends = [ base base-compat base-orphans containers vector ]; @@ -245082,6 +246064,33 @@ self: { broken = true; }) {toxcore = null;}; + "toxcore-c" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring + , bytestring-arbitrary, data-default-class, directory, hspec + , QuickCheck, saltine, toxcore + }: + mkDerivation { + pname = "toxcore-c"; + version = "0.2.11"; + sha256 = "1fgz30y867lw9d6pmssi75k1prlfgrlpfa9qzqkm52mra2r5d2mb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring data-default-class ]; + librarySystemDepends = [ toxcore ]; + executableHaskellDepends = [ + base base16-bytestring bytestring directory + ]; + executableSystemDepends = [ toxcore ]; + testHaskellDepends = [ + base base16-bytestring bytestring bytestring-arbitrary + 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; + broken = true; + }) {toxcore = null;}; + "toxiproxy-haskell" = callPackage ({ mkDerivation, aeson, base, containers, hspec, http-client , process, servant, servant-client, silently, text, time @@ -246348,22 +247357,20 @@ self: { "tree-sitter" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, fused-effects, hedgehog, semantic-source, split - , template-haskell, text, unordered-containers + , filepath, fused-effects, hedgehog, split, template-haskell, text + , unordered-containers }: mkDerivation { pname = "tree-sitter"; - version = "0.9.0.0"; - sha256 = "12mjscpibhh15jiqcplnj2m4gxd4ym4xbbji96l5zwpzmd2x4bjb"; + version = "0.9.0.1"; + sha256 = "1khkc2v87i9vgbakc3gh1rmrakz43n4lglx50vvckp192in4svzm"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath fused-effects - semantic-source split template-haskell text unordered-containers + split template-haskell text unordered-containers ]; testHaskellDepends = [ base hedgehog ]; description = "Unstable bindings for the tree-sitter parsing library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-go" = callPackage @@ -246376,8 +247383,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Go"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-haskell" = callPackage @@ -246391,8 +247396,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-java" = callPackage @@ -246405,8 +247408,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Java"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-json" = callPackage @@ -246419,8 +247420,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for JSON"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-php" = callPackage @@ -246433,8 +247432,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for PHP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-python" = callPackage @@ -246447,22 +247444,18 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Python"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-ql" = callPackage ({ mkDerivation, base, tree-sitter }: mkDerivation { pname = "tree-sitter-ql"; - version = "0.1.0.1"; - sha256 = "07k5vxkwy2l49f1gyvqasqva41n1h4xz381rmy1dd0625mshyvs2"; + version = "0.1.0.3"; + sha256 = "0sxfjkdbajk3q5qpy0y51q1srvp3lnch1jvypppcz3ria59svhzx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for QL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-ruby" = callPackage @@ -246475,8 +247468,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for Ruby"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-tsx" = callPackage @@ -246489,8 +247480,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for TSX"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-sitter-typescript" = callPackage @@ -246503,8 +247492,6 @@ self: { libraryHaskellDepends = [ base tree-sitter ]; description = "Tree-sitter grammar/parser for TypeScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tree-traversals" = callPackage @@ -246697,8 +247684,8 @@ self: { pname = "trie-simple"; version = "0.4.1.1"; sha256 = "0h3wfq4fjakkwvrv35l25709xv528h1c08cr754gvk4l8vqnk6k7"; - revision = "1"; - editedCabalFile = "09kzna10hdf2qjialdg6rql0w55si9db7sjd89l661sgidlbq7y0"; + revision = "2"; + editedCabalFile = "1v3aiqn3c91md7y0wqcdvafy1fwjr8hfsg17ykqr1si8ax6hy5j0"; libraryHaskellDepends = [ base containers deepseq mtl ]; testHaskellDepends = [ base containers hspec QuickCheck vector ]; benchmarkHaskellDepends = [ @@ -247701,8 +248688,8 @@ self: { }: mkDerivation { pname = "turtle"; - version = "1.5.17"; - sha256 = "0chj4issjbkdkj1jbcpi8v104784qnzvkq81a4wcdijk09biphq7"; + version = "1.5.18"; + sha256 = "0xdkn6vhmir7sxazi5sxrgvwsi8zqyqbcyvjnqvckz0ac5d8zj68"; libraryHaskellDepends = [ ansi-wl-pprint async base bytestring clock containers directory exceptions foldl hostname managed optional-args @@ -247804,6 +248791,8 @@ self: { pname = "tweet-hs"; version = "1.0.2.1"; sha256 = "0b277whd3jywb6w0gkaijmzadpwabmyxvxyg6fmsysq1kp3isrnm"; + revision = "1"; + editedCabalFile = "0ca923bxx8aj6qzm0nvxvh1zmzqw34jv4xmnrjy1lfyndg0qg9vj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -248304,8 +249293,8 @@ self: { }: mkDerivation { pname = "twitter-types"; - version = "0.10.0"; - sha256 = "0a2wgidg5dk3cxszb0q07cg0sywqgyxl5scswlr91yjvmjmlnkby"; + version = "0.10.1"; + sha256 = "0rz4xq66fckvd6q7qlsz2bgi1df95cs5mksihzjcq9x2axvsz632"; libraryHaskellDepends = [ aeson base text time unordered-containers ]; @@ -249283,8 +250272,6 @@ self: { executableHaskellDepends = [ base diagrams-lib text ]; description = "Typed and composable spreadsheets"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "typed-streams" = callPackage @@ -251269,8 +252256,6 @@ self: { semigroups split text ]; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "unitym" = callPackage @@ -251368,8 +252353,8 @@ self: { pname = "universe-base"; version = "1.1.1"; sha256 = "1a6yyvrzkz7jnjz4lyp8aw0r5hci1nx8c06v3dicgfqs3frk1v8x"; - revision = "1"; - editedCabalFile = "1l6vxapfjhm5mb6w25ah8sl78hdw1ia5s18cf40lm0vzb6ip4bkk"; + revision = "2"; + editedCabalFile = "0601hqv5h2274i11j1ai2yqb7zk2fkqkiqlpwnq5awbgdkwb10i8"; libraryHaskellDepends = [ base containers tagged transformers ]; testHaskellDepends = [ base containers QuickCheck ]; description = "A class for finite and recursively enumerable types"; @@ -251382,8 +252367,8 @@ self: { }: mkDerivation { pname = "universe-dependent-sum"; - version = "1.2"; - sha256 = "1xjw6mhlj1vyw6m4b4j0k81p86hls9031sfv59zgiq5y0ngm1f07"; + version = "1.2.0.1"; + sha256 = "0002wc68z803jys90s7sdh5nzdx1dk2jl49d19sjylk1cf18n5fi"; libraryHaskellDepends = [ base dependent-sum some universe-base universe-some ]; @@ -251412,6 +252397,8 @@ self: { pname = "universe-instances-extended"; version = "1.1.1"; sha256 = "1ppklq2rjcryld9d9kdzz55vfllfpxxgsvvkhpd1jrvhyj51yahh"; + revision = "1"; + editedCabalFile = "0g3qpvgw304yml1n9ly78qrsrrw53f6zpkciyk1xc0nmlm0dkwih"; libraryHaskellDepends = [ adjunctions base comonad containers contravariant universe-base ]; @@ -251438,8 +252425,8 @@ self: { pname = "universe-reverse-instances"; version = "1.1"; sha256 = "0pdmv146ap0dh38mxhjf11jx3fbr9im7mc0zxb3bsnwpfrv1kfqd"; - revision = "2"; - editedCabalFile = "1ls6hss9mrdk535k9ssy4lv01gbw11pbqiikpv2m8sjmh65fjilx"; + revision = "3"; + editedCabalFile = "1zkpcipbzhxricr94pkhn4cqmjcnsxx301kxarx798qr9il37qzw"; libraryHaskellDepends = [ base containers universe-base ]; description = "Instances of standard classes that are made possible by enumerations"; license = stdenv.lib.licenses.bsd3; @@ -251453,6 +252440,8 @@ self: { pname = "universe-some"; version = "1.2"; sha256 = "1c9pdk682xdzscq77c006x052c9jizpgja3xk0ym8n421h0k8zlh"; + revision = "1"; + editedCabalFile = "1rx1cw40clsla3sixm0gzdbni9f13ngncl02fm9fl8kgf23w9q73"; libraryHaskellDepends = [ base some template-haskell th-abstraction transformers universe-base @@ -251753,6 +252742,8 @@ self: { pname = "unliftio-core"; version = "0.2.0.1"; sha256 = "16i97jax8rys57l0g0qswfwxh1cl5bgw2lw525rm6bzajw90v7wi"; + revision = "1"; + editedCabalFile = "16k5fxlm9xpbd0ca861nmhb1j2ahyid02m1vbg1vzb5ckbm48glv"; libraryHaskellDepends = [ base transformers ]; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; license = stdenv.lib.licenses.mit; @@ -251765,21 +252756,6 @@ self: { }: mkDerivation { pname = "unliftio-pool"; - version = "0.2.1.0"; - sha256 = "0qhgiym7slz3n68py4izs52wfhs5d7nyxzwnj8q86rvkvy6lfm5v"; - libraryHaskellDepends = [ - base resource-pool time transformers unliftio-core - ]; - description = "Data.Pool generalized to MonadUnliftIO."; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unliftio-pool_0_2_1_1" = callPackage - ({ mkDerivation, base, resource-pool, time, transformers - , unliftio-core - }: - mkDerivation { - pname = "unliftio-pool"; version = "0.2.1.1"; sha256 = "0hxxngldp4zr55qv67gf62a87yxr1f0xfyh4gfzr45q62mscs8xv"; libraryHaskellDepends = [ @@ -251787,7 +252763,6 @@ self: { ]; description = "Data.Pool generalized to MonadUnliftIO."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unliftio-streams" = callPackage @@ -252943,8 +253918,6 @@ self: { executableHaskellDepends = [ base random-fu text ]; description = "A collection of user agents"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "userid" = callPackage @@ -253262,8 +254235,8 @@ self: { ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "utility-ht"; - version = "0.0.14"; - sha256 = "1a7bgk7wv7sqbxbiv7kankiimr3wij7zdm7s83zwsf886ghyxhk9"; + version = "0.0.15"; + sha256 = "148gdz6pbl1i5qjvjrq5576pg58anmh18xha37n9fncjy36pjp44"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; @@ -253968,8 +254941,6 @@ self: { ]; description = "Lighweight pure data validation based on Applicative and Selective functors"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "validations" = callPackage @@ -254613,6 +255584,8 @@ self: { pname = "vec"; version = "0.3"; sha256 = "0r2jk3jqwn0r4wnpgc8k8i664g3rrs6dkyfsysysn4w10j22j5sr"; + revision = "2"; + editedCabalFile = "0v9m2x1p1395dqf0g2agfgmlx6w1dak2fr50hh6aahjk4y0jp30j"; libraryHaskellDepends = [ adjunctions base deepseq distributive fin hashable QuickCheck semigroupoids transformers @@ -254631,6 +255604,8 @@ self: { pname = "vec-lens"; version = "0.3"; sha256 = "0i08p7rfmivf03mir7hcbkr7rarji95icsyvi6diclav1jd6fa7q"; + revision = "1"; + editedCabalFile = "0grj1abb7gjbzw06672464r75wjnmra9d12yvlmdm1qyj9zya0ph"; libraryHaskellDepends = [ base fin lens vec ]; description = "Vec: length-indexed (sized) list: lens support"; license = stdenv.lib.licenses.bsd3; @@ -254765,8 +255740,8 @@ self: { pname = "vector-binary-instances"; version = "0.2.5.1"; sha256 = "04n5cqm1v95pw1bp68l9drjkxqiy2vswxdq0fy1rqcgxisgvji9r"; - revision = "1"; - editedCabalFile = "1p7cbxdpix0rakvggnnb06kcrb787fyyqlzric6i4s3rn34547q8"; + revision = "2"; + editedCabalFile = "0ia9i7q7jrk3ab3nq2368glr69vl6fwvh42zlwvdmxn4xd861qfx"; libraryHaskellDepends = [ base binary vector ]; testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; benchmarkHaskellDepends = [ @@ -255189,6 +256164,8 @@ self: { pname = "vector-th-unbox"; version = "0.2.1.7"; sha256 = "0q8dqnbv1c2gi7jjdhqj14abj1vik23ki6lq4iz2sz18yc7q69fi"; + revision = "1"; + editedCabalFile = "11qhhir9cdy3x7pd0z0xk8vi4nzr9fn9q3ggwbhhc43jglngw1x7"; libraryHaskellDepends = [ base template-haskell vector ]; testHaskellDepends = [ base data-default vector ]; description = "Deriver for Data.Vector.Unboxed using Template Haskell"; @@ -255447,8 +256424,6 @@ self: { benchmarkHaskellDepends = [ base criterion lens ]; description = "Random verilog generation and simulator testing"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "versioning" = callPackage @@ -256140,6 +257115,17 @@ self: { broken = true; }) {}; + "vitrea" = callPackage + ({ mkDerivation, base, mtl, profunctors }: + mkDerivation { + pname = "vitrea"; + version = "0.1.0.0"; + sha256 = "0f7rwww8gcfg6q0xq6z8c3010gx0vxr0v6yf143qxqjx02f93d1p"; + libraryHaskellDepends = [ base mtl profunctors ]; + description = "Profunctor optics via the profunctor representation theorem"; + license = stdenv.lib.licenses.gpl3Plus; + }) {}; + "vivid" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, hashable, MonadRandom, mtl, network, process, random @@ -256451,7 +257437,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "vty_5_28_1" = callPackage + "vty_5_28_2" = callPackage ({ mkDerivation, ansi-terminal, base, binary, blaze-builder , bytestring, Cabal, containers, deepseq, directory, filepath , hashable, HUnit, microlens, microlens-mtl, microlens-th, mtl @@ -256462,8 +257448,8 @@ self: { }: mkDerivation { pname = "vty"; - version = "5.28.1"; - sha256 = "0hshmpa3n6936527wimxf3vi5v6gddp09kxjjmcxjwq39h9a640y"; + version = "5.28.2"; + sha256 = "0jfiha8hwpdpnz4i7d94dsgcrfd20y0kjp9crn3ds2jx8kln1prv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -256561,12 +257547,18 @@ self: { }) {}; "vulkan" = callPackage - ({ mkDerivation, base, cpphs, vector-sized, vulkan }: + ({ mkDerivation, base, bytestring, transformers, vector + , vector-sized, vulkan + }: mkDerivation { pname = "vulkan"; - version = "2.1.0.0"; - sha256 = "1w19ip6qc5qbscp06a2b58x9yhjc98naaq1gxymk7gs3iagylrzq"; - libraryHaskellDepends = [ base cpphs vector-sized ]; + version = "3.0.0.0"; + sha256 = "1kz0b5kn6dm70i1php7aywjsamjn4ymka87j7c4md93gy9z20ia5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring transformers vector vector-sized + ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = stdenv.lib.licenses.bsd3; @@ -257785,8 +258777,6 @@ self: { ]; description = "A WAI middleware to collect EKG request metrics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wai-middleware-preprocessor" = callPackage @@ -258641,8 +259631,8 @@ self: { }: mkDerivation { pname = "warp-grpc"; - version = "0.4.0.0"; - sha256 = "1isi0xd6vvavvr4m3gfiqj2cmmpa3jn9py61m0ksrarxwmsw8s1g"; + version = "0.4.0.1"; + sha256 = "0dajbs3gxibnllzs134wa7vqclnyfj2r3hc70dci51wgnmi4b7xr"; libraryHaskellDepends = [ async base binary bytestring case-insensitive http-types http2 http2-grpc-types unliftio-core wai warp warp-tls @@ -259043,8 +260033,6 @@ self: { ]; description = "Wrappers for web frameworks to ease usage with the FP Complete environment"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "web-inv-route" = callPackage @@ -259175,16 +260163,16 @@ self: { }: mkDerivation { pname = "web-rep"; - version = "0.3.0"; - sha256 = "1qfgs3jb146a37zpsgcl2vc4k6p9h1mqhhkgrcq386x535v2ivmq"; + version = "0.3.1"; + sha256 = "03rm0qa9y43fd9mbaix4vhrsjk6vdkd6yqji7d5m89q3j0xamm3v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base bifunctors box clay foldl generic-lens interpolatedstring-perl6 javascript-bridge JuicyPixels - language-javascript lens lucid lucid-svg mmorph mtl - optparse-generic scotty streaming text text-format transformers - unordered-containers wai wai-extra wai-middleware-static + language-javascript lens lucid lucid-svg mmorph mtl scotty + streaming text text-format transformers unordered-containers + wai-middleware-static ]; executableHaskellDepends = [ attoparsec base box lens lucid optparse-generic scotty text wai @@ -260481,8 +261469,6 @@ self: { random-fu random-shuffle random-source relude temporary time ]; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "why3" = callPackage @@ -260511,8 +261497,8 @@ self: { }: mkDerivation { pname = "wide-word"; - version = "0.1.1.0"; - sha256 = "101a2irkgsz9264zj9vdwbkycf25phsf1kbhh6nrx8mh9207aaiw"; + version = "0.1.1.1"; + sha256 = "19mxi6mfri4q96lqh3zllmacaln2wdp0ipzmhk7v9xqbphpfjrfj"; libraryHaskellDepends = [ base deepseq primitive ]; testHaskellDepends = [ base bytestring ghc-prim hedgehog primitive QuickCheck @@ -261006,6 +261992,8 @@ self: { pname = "wizards"; version = "1.0.3"; sha256 = "1clvbd1ckhvy29qrbmpkn7bya7300fq6znnps23nn3nxyrxhsr85"; + revision = "1"; + editedCabalFile = "095qd17zrdhqmcvmslbyzfa5sh9glvvsnsvnlz31gzsmi8nnsgim"; libraryHaskellDepends = [ base containers control-monad-free haskeline mtl transformers ]; @@ -261041,8 +262029,8 @@ self: { }: mkDerivation { pname = "wkt-geom"; - version = "0.0.10"; - sha256 = "10hzfa063sp2f4v3ki7322x74iqn8wan0klalhddqfr554j3b1g5"; + version = "0.0.11"; + sha256 = "19mcfs9php03g3kb7pgfxcpilvmq5bxbyfkx59mk41nx6f0jfl0d"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers geojson scientific trifecta utf8-string vector @@ -261519,8 +262507,6 @@ self: { ]; description = "Command-line tool to get random words"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "wordpass" = callPackage @@ -262299,8 +263285,6 @@ 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; - broken = true; }) {}; "wtk" = callPackage @@ -263638,8 +264622,8 @@ self: { }: mkDerivation { pname = "xml-conduit-stylist"; - version = "1.0.1.0"; - sha256 = "1csa940r6a63i01khcm89lvhp7m6dyxpnljn6l6m105z7jfvvy8r"; + version = "1.1.0.0"; + sha256 = "0bj6mcd4k6wlrzizf3j2mnmbbl624k0xcsfrz9c3wpvdxb9iyqsr"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -264171,8 +265155,6 @@ self: { ]; description = "XML back and forth! Parser, renderer, ToXml, FromXml, fixpoints"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xmlbf-xeno" = callPackage @@ -264193,8 +265175,6 @@ self: { ]; description = "xeno backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xmlbf-xmlhtml" = callPackage @@ -264216,8 +265196,6 @@ self: { ]; description = "xmlhtml backend support for the xmlbf library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "xmlgen" = callPackage @@ -266369,8 +267347,8 @@ self: { }: mkDerivation { pname = "yesod-auth"; - version = "1.6.9"; - sha256 = "0x843l5z03a563i8nc2x9c6afw213chblm7ldd7yxn5g110h5ybx"; + version = "1.6.10"; + sha256 = "0nfrq61dqifzbnqx8m62j1q6nmlj04mis864yg2k36mra9njap27"; libraryHaskellDepends = [ aeson authenticate base base16-bytestring base64-bytestring binary blaze-builder blaze-html blaze-markup bytestring conduit @@ -266970,6 +267948,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-core_1_6_18" = callPackage + ({ mkDerivation, aeson, async, auto-update, base, blaze-html + , blaze-markup, bytestring, case-insensitive, cereal, clientsession + , conduit, conduit-extra, containers, cookie, deepseq, fast-logger + , gauge, hspec, hspec-expectations, http-types, HUnit, memory + , monad-logger, mtl, network, parsec, path-pieces, primitive + , random, resourcet, shakespeare, streaming-commons + , template-haskell, text, time, transformers, unix-compat, unliftio + , unordered-containers, vector, wai, wai-extra, wai-logger, warp + , word8 + }: + mkDerivation { + pname = "yesod-core"; + version = "1.6.18"; + sha256 = "1hm0frswqcj34scvapszdryjfmnrqq5fhf5hv7qcz8sj3qf46zkd"; + libraryHaskellDepends = [ + aeson auto-update base blaze-html blaze-markup bytestring + case-insensitive cereal clientsession conduit conduit-extra + containers cookie deepseq fast-logger http-types memory + monad-logger mtl parsec path-pieces primitive random resourcet + shakespeare template-haskell text time transformers unix-compat + unliftio unordered-containers vector wai wai-extra wai-logger warp + word8 + ]; + testHaskellDepends = [ + async base bytestring clientsession conduit conduit-extra + containers cookie hspec hspec-expectations http-types HUnit network + path-pieces random resourcet shakespeare streaming-commons + template-haskell text transformers unliftio wai wai-extra warp + ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring gauge shakespeare text + ]; + description = "Creation of type-safe, RESTful web applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-crud" = callPackage ({ mkDerivation, base, classy-prelude, containers, MissingH , monad-control, persistent, random, safe, stm, uuid, yesod-core @@ -270312,6 +271328,8 @@ self: { pname = "zlib"; version = "0.6.2.1"; sha256 = "1l11jraslcrp9d4wnhwfyhwk4fsiq1aq8i6vj81vcq1m2zzi1y7h"; + revision = "1"; + editedCabalFile = "0i9g71jvdw22bi9bi8dm5khwzcsv6cv8yadmf7afklg4xigxykfk"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ zlib ]; testHaskellDepends = [ diff --git a/pkgs/development/idris-modules/array.nix b/pkgs/development/idris-modules/array.nix index 38d25827d50..faed6443c48 100644 --- a/pkgs/development/idris-modules/array.nix +++ b/pkgs/development/idris-modules/array.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Primitive flat arrays containing Idris values"; - homepage = https://github.com/idris-hackers/idris-array; + homepage = "https://github.com/idris-hackers/idris-array"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/bi.nix b/pkgs/development/idris-modules/bi.nix index 844ce98cd4c..51f6497e182 100644 --- a/pkgs/development/idris-modules/bi.nix +++ b/pkgs/development/idris-modules/bi.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Idris Binary Integer Arithmetic, porting PArith, NArith, and ZArith from Coq"; - homepage = https://github.com/sbp/idris-bi; + homepage = "https://github.com/sbp/idris-bi"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/bifunctors.nix b/pkgs/development/idris-modules/bifunctors.nix index 3a915cd67f4..15c7a6dd013 100644 --- a/pkgs/development/idris-modules/bifunctors.nix +++ b/pkgs/development/idris-modules/bifunctors.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "A small bifunctor library for idris"; - homepage = https://github.com/japesinator/Idris-Bifunctors; + homepage = "https://github.com/japesinator/Idris-Bifunctors"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/bytes.nix b/pkgs/development/idris-modules/bytes.nix index ad63cb28399..eaff512d5d3 100644 --- a/pkgs/development/idris-modules/bytes.nix +++ b/pkgs/development/idris-modules/bytes.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "FFI-based byte buffers for Idris"; - homepage = https://github.com/ziman/idris-bytes; + homepage = "https://github.com/ziman/idris-bytes"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/canvas.nix b/pkgs/development/idris-modules/canvas.nix index 0f6e258ee20..77851c87179 100644 --- a/pkgs/development/idris-modules/canvas.nix +++ b/pkgs/development/idris-modules/canvas.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Idris FFI binding for html5 canvas 2d api"; - homepage = https://github.com/JinWuZhao/idriscanvas; + homepage = "https://github.com/JinWuZhao/idriscanvas"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/categories.nix b/pkgs/development/idris-modules/categories.nix index 91ee174dadf..adbe6d4f8ad 100644 --- a/pkgs/development/idris-modules/categories.nix +++ b/pkgs/development/idris-modules/categories.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Category Theory"; - homepage = https://github.com/danilkolikov/categories; + homepage = "https://github.com/danilkolikov/categories"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/coda.nix b/pkgs/development/idris-modules/coda.nix index c5e33f4594f..ecd7af44368 100644 --- a/pkgs/development/idris-modules/coda.nix +++ b/pkgs/development/idris-modules/coda.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Some Idris libraries including nodejs bindings and ISO8601 Date and Time"; - homepage = https://github.com/ostera/idris-coda; + homepage = "https://github.com/ostera/idris-coda"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/comonad.nix b/pkgs/development/idris-modules/comonad.nix index a47739d52b1..31fd8dbc9aa 100644 --- a/pkgs/development/idris-modules/comonad.nix +++ b/pkgs/development/idris-modules/comonad.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Comonads for Idris"; - homepage = https://github.com/vmchale/comonad; + homepage = "https://github.com/vmchale/comonad"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/composition.nix b/pkgs/development/idris-modules/composition.nix index de93d39395b..5d6d2f891a6 100644 --- a/pkgs/development/idris-modules/composition.nix +++ b/pkgs/development/idris-modules/composition.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Composition extras for Idris"; - homepage = https://github.com/vmchale/composition; + homepage = "https://github.com/vmchale/composition"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/config.nix b/pkgs/development/idris-modules/config.nix index 5c37961b7cb..3771313d178 100644 --- a/pkgs/development/idris-modules/config.nix +++ b/pkgs/development/idris-modules/config.nix @@ -21,7 +21,7 @@ build-idris-package { meta = { description = "Parsers for various configuration files written in Idris."; - homepage = https://github.com/benclifford/idris-config; + homepage = "https://github.com/benclifford/idris-config"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/console.nix b/pkgs/development/idris-modules/console.nix index 71785483ce6..e60ac20f4d4 100644 --- a/pkgs/development/idris-modules/console.nix +++ b/pkgs/development/idris-modules/console.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "An Idris library to interact with the browser console"; - homepage = https://github.com/pierrebeaucamp/idris-console; + homepage = "https://github.com/pierrebeaucamp/idris-console"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/containers.nix b/pkgs/development/idris-modules/containers.nix index 2fe783da448..e98285ca930 100644 --- a/pkgs/development/idris-modules/containers.nix +++ b/pkgs/development/idris-modules/containers.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Various data structures for use in the Idris Language."; - homepage = https://github.com/jfdm/idris-containers; + homepage = "https://github.com/jfdm/idris-containers"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/cube.nix b/pkgs/development/idris-modules/cube.nix index 7ccda5f21c0..8a0f66829d8 100644 --- a/pkgs/development/idris-modules/cube.nix +++ b/pkgs/development/idris-modules/cube.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "An implementation of the Lambda Cube in Idris"; - homepage = https://github.com/aatxe/cube.idr; + homepage = "https://github.com/aatxe/cube.idr"; license = lib.licenses.agpl3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/data.nix b/pkgs/development/idris-modules/data.nix index 1c515ec3975..0517edec2d2 100644 --- a/pkgs/development/idris-modules/data.nix +++ b/pkgs/development/idris-modules/data.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Functional data structures in Idris"; - homepage = https://github.com/jdevuyst/idris-data; + homepage = "https://github.com/jdevuyst/idris-data"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/derive.nix b/pkgs/development/idris-modules/derive.nix index 7f3164f3160..7ab87d71d06 100644 --- a/pkgs/development/idris-modules/derive.nix +++ b/pkgs/development/idris-modules/derive.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Type class deriving with elaboration reflection"; - homepage = https://github.com/davlum/derive-all-the-instances; + homepage = "https://github.com/davlum/derive-all-the-instances"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/descncrunch.nix b/pkgs/development/idris-modules/descncrunch.nix index 8c808447f64..95f49a524bc 100644 --- a/pkgs/development/idris-modules/descncrunch.nix +++ b/pkgs/development/idris-modules/descncrunch.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Descriptions, levitation, and reflecting the elaborator"; - homepage = https://github.com/ahmadsalim/desc-n-crunch; + homepage = "https://github.com/ahmadsalim/desc-n-crunch"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.brainrape ]; broken = true; diff --git a/pkgs/development/idris-modules/dict.nix b/pkgs/development/idris-modules/dict.nix index c17ed9eefa2..24cc7c0359d 100644 --- a/pkgs/development/idris-modules/dict.nix +++ b/pkgs/development/idris-modules/dict.nix @@ -22,7 +22,7 @@ build-idris-package { meta = { description = "Dict k v in Idris"; - homepage = https://github.com/be5invis/idris-dict; + homepage = "https://github.com/be5invis/idris-dict"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/dom.nix b/pkgs/development/idris-modules/dom.nix index e215e069609..f88827fb265 100644 --- a/pkgs/development/idris-modules/dom.nix +++ b/pkgs/development/idris-modules/dom.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Idris library to interact with the DOM"; - homepage = https://github.com/pierrebeaucamp/idris-dom; + homepage = "https://github.com/pierrebeaucamp/idris-dom"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/electron.nix b/pkgs/development/idris-modules/electron.nix index 8b968c9732a..172f1980a90 100644 --- a/pkgs/development/idris-modules/electron.nix +++ b/pkgs/development/idris-modules/electron.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Electron bindings for Idris"; - homepage = https://github.com/jheiling/idris-electron; + homepage = "https://github.com/jheiling/idris-electron"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/eternal.nix b/pkgs/development/idris-modules/eternal.nix index 9e0529628fe..673df485a38 100644 --- a/pkgs/development/idris-modules/eternal.nix +++ b/pkgs/development/idris-modules/eternal.nix @@ -25,7 +25,7 @@ build-idris-package { meta = { description = "Infix pipe operators and some Nat, Float, String conversions"; - homepage = https://github.com/Heather/Control.Eternal.Idris; + homepage = "https://github.com/Heather/Control.Eternal.Idris"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/farrp.nix b/pkgs/development/idris-modules/farrp.nix index bf0e609a610..88f852ba20c 100644 --- a/pkgs/development/idris-modules/farrp.nix +++ b/pkgs/development/idris-modules/farrp.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Arrowized FRP library for Idris with static safety guarantees"; - homepage = https://github.com/lambda-11235/FarRP; + homepage = "https://github.com/lambda-11235/FarRP"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/free.nix b/pkgs/development/idris-modules/free.nix index 06b8ec5e82d..6f7a5f56d4f 100644 --- a/pkgs/development/idris-modules/free.nix +++ b/pkgs/development/idris-modules/free.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Free Monads and useful constructions to work with them"; - homepage = https://github.com/idris-hackers/idris-free; + homepage = "https://github.com/idris-hackers/idris-free"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/fsm.nix b/pkgs/development/idris-modules/fsm.nix index c6d8d8cf913..5da5f01da34 100644 --- a/pkgs/development/idris-modules/fsm.nix +++ b/pkgs/development/idris-modules/fsm.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Comonads for Idris"; - homepage = https://github.com/ctford/flying-spaghetti-monster; + homepage = "https://github.com/ctford/flying-spaghetti-monster"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/glfw.nix b/pkgs/development/idris-modules/glfw.nix index 882058bb185..da23ae18331 100644 --- a/pkgs/development/idris-modules/glfw.nix +++ b/pkgs/development/idris-modules/glfw.nix @@ -27,7 +27,7 @@ build-idris-package { meta = { description = "GLFW bindings for Idris"; - homepage = https://github.com/eckart/glfw-idris; + homepage = "https://github.com/eckart/glfw-idris"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/graphviz.nix b/pkgs/development/idris-modules/graphviz.nix index 47c2ee638c5..650f0e0b99b 100644 --- a/pkgs/development/idris-modules/graphviz.nix +++ b/pkgs/development/idris-modules/graphviz.nix @@ -22,7 +22,7 @@ build-idris-package { meta = { description = "Parser and library for graphviz dot files"; - homepage = https://gitlab.com/mgttlinger/idris-graphviz; + homepage = "https://gitlab.com/mgttlinger/idris-graphviz"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/hamt.nix b/pkgs/development/idris-modules/hamt.nix index 79df925323e..3c6868fcc59 100644 --- a/pkgs/development/idris-modules/hamt.nix +++ b/pkgs/development/idris-modules/hamt.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Idris Hash Array Mapped Trie"; - homepage = https://github.com/bamboo/idris-hamt; + homepage = "https://github.com/bamboo/idris-hamt"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/hezarfen.nix b/pkgs/development/idris-modules/hezarfen.nix index f538cb29850..acbc2770ea5 100644 --- a/pkgs/development/idris-modules/hezarfen.nix +++ b/pkgs/development/idris-modules/hezarfen.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "a theorem prover for intuitionistic propositional logic in Idris, with metaprogramming features"; - homepage = https://github.com/joom/hezarfen; + homepage = "https://github.com/joom/hezarfen"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/hrtime.nix b/pkgs/development/idris-modules/hrtime.nix index 9e9736d2566..7f4d0769cc4 100644 --- a/pkgs/development/idris-modules/hrtime.nix +++ b/pkgs/development/idris-modules/hrtime.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Idris library for high resolution time"; - homepage = https://github.com/pierrebeaucamp/idris-hrtime; + homepage = "https://github.com/pierrebeaucamp/idris-hrtime"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/html.nix b/pkgs/development/idris-modules/html.nix index a44f0e70252..2ab7534936a 100644 --- a/pkgs/development/idris-modules/html.nix +++ b/pkgs/development/idris-modules/html.nix @@ -24,7 +24,7 @@ build-idris-package { meta = { description = "Idris library to interact with HTML"; - homepage = https://github.com/pierrebeaucamp/idris-html; + homepage = "https://github.com/pierrebeaucamp/idris-html"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/http.nix b/pkgs/development/idris-modules/http.nix index beec74a2f65..45e505be056 100644 --- a/pkgs/development/idris-modules/http.nix +++ b/pkgs/development/idris-modules/http.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "An HTTP library for idris"; - homepage = https://github.com/uwap/idris-http; + homepage = "https://github.com/uwap/idris-http"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/http4idris.nix b/pkgs/development/idris-modules/http4idris.nix index 80e95745f03..11e9d62c051 100644 --- a/pkgs/development/idris-modules/http4idris.nix +++ b/pkgs/development/idris-modules/http4idris.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "An experimental HTTP framework for Idris"; - homepage = https://github.com/A1kmm/http4idris; + homepage = "https://github.com/A1kmm/http4idris"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/iaia.nix b/pkgs/development/idris-modules/iaia.nix index f317b980d52..865d533750f 100644 --- a/pkgs/development/idris-modules/iaia.nix +++ b/pkgs/development/idris-modules/iaia.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Recursion scheme library for Idris"; - homepage = https://github.com/sellout/Iaia; + homepage = "https://github.com/sellout/Iaia"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/idrishighlighter.nix b/pkgs/development/idris-modules/idrishighlighter.nix index 5629221d601..6b1ae30ad40 100644 --- a/pkgs/development/idris-modules/idrishighlighter.nix +++ b/pkgs/development/idris-modules/idrishighlighter.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Semantic highlighter for Idris code"; - homepage = https://github.com/david-christiansen/idris-code-highlighter; + homepage = "https://github.com/david-christiansen/idris-code-highlighter"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/idrisscript.nix b/pkgs/development/idris-modules/idrisscript.nix index 4365c588769..805facda84c 100644 --- a/pkgs/development/idris-modules/idrisscript.nix +++ b/pkgs/development/idris-modules/idrisscript.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "FFI Bindings to interact with the unsafe world of JavaScript"; - homepage = https://github.com/idris-hackers/IdrisScript; + homepage = "https://github.com/idris-hackers/IdrisScript"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/ipkgparser.nix b/pkgs/development/idris-modules/ipkgparser.nix index 3a4c0954fe8..6bdcd9e9f55 100644 --- a/pkgs/development/idris-modules/ipkgparser.nix +++ b/pkgs/development/idris-modules/ipkgparser.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Parser for Idris iPkg files written in Idris using Lightyear"; - homepage = https://github.com/emptyflash/idris-ipkg-parser; + homepage = "https://github.com/emptyflash/idris-ipkg-parser"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/jheiling-extras.nix b/pkgs/development/idris-modules/jheiling-extras.nix index 58f8a13864a..ae933b264ae 100644 --- a/pkgs/development/idris-modules/jheiling-extras.nix +++ b/pkgs/development/idris-modules/jheiling-extras.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Some useful functions for Idris"; - homepage = https://github.com/jheiling/idris-extras; + homepage = "https://github.com/jheiling/idris-extras"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/jheiling-js.nix b/pkgs/development/idris-modules/jheiling-js.nix index dae310cda05..b192e8ff1c0 100644 --- a/pkgs/development/idris-modules/jheiling-js.nix +++ b/pkgs/development/idris-modules/jheiling-js.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Js library for Idris"; - homepage = https://github.com/jheiling/idris-js; + homepage = "https://github.com/jheiling/idris-js"; license = lib.licenses.unlicense; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/js.nix b/pkgs/development/idris-modules/js.nix index 55169caaa10..61ce415e605 100644 --- a/pkgs/development/idris-modules/js.nix +++ b/pkgs/development/idris-modules/js.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Js libraries for idris"; - homepage = https://github.com/rbarreiro/idrisjs; + homepage = "https://github.com/rbarreiro/idrisjs"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/lens.nix b/pkgs/development/idris-modules/lens.nix index 490fd7bd2ed..e829309fbc0 100644 --- a/pkgs/development/idris-modules/lens.nix +++ b/pkgs/development/idris-modules/lens.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "van Laarhoven lenses for Idris"; - homepage = https://github.com/HuwCampbell/idris-lens; + homepage = "https://github.com/HuwCampbell/idris-lens"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix index fd014db30ef..34c19eea4ac 100644 --- a/pkgs/development/idris-modules/lightyear.nix +++ b/pkgs/development/idris-modules/lightyear.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Parser combinators for Idris"; - homepage = https://github.com/ziman/lightyear; + homepage = "https://github.com/ziman/lightyear"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ siddharthist brainrape ]; }; diff --git a/pkgs/development/idris-modules/logic.nix b/pkgs/development/idris-modules/logic.nix index 2346c89c48c..35670462dcf 100644 --- a/pkgs/development/idris-modules/logic.nix +++ b/pkgs/development/idris-modules/logic.nix @@ -21,7 +21,7 @@ build-idris-package { meta = { description = "Propositional logic tools, inspired by the Coq standard library"; - homepage = https://github.com/yurrriq/idris-logic; + homepage = "https://github.com/yurrriq/idris-logic"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/mapping.nix b/pkgs/development/idris-modules/mapping.nix index a4ac168dc4f..6f978fccd5e 100644 --- a/pkgs/development/idris-modules/mapping.nix +++ b/pkgs/development/idris-modules/mapping.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Idris mapping library"; - homepage = https://github.com/zaoqi/Mapping.idr; + homepage = "https://github.com/zaoqi/Mapping.idr"; license = lib.licenses.agpl3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/mhd.nix b/pkgs/development/idris-modules/mhd.nix index 197cb1552cb..1ef304bbf1c 100644 --- a/pkgs/development/idris-modules/mhd.nix +++ b/pkgs/development/idris-modules/mhd.nix @@ -23,7 +23,7 @@ build-idris-package { meta = { description = "A binding of the GNU libmicrohttpd library to the Idris C backend"; - homepage = https://github.com/colin-adams/idris-libmicrohttpd; + homepage = "https://github.com/colin-adams/idris-libmicrohttpd"; license = lib.licenses.lgpl21; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/pacman.nix b/pkgs/development/idris-modules/pacman.nix index 4ebffa3e87c..cda3662dce2 100644 --- a/pkgs/development/idris-modules/pacman.nix +++ b/pkgs/development/idris-modules/pacman.nix @@ -23,7 +23,7 @@ build-idris-package { meta = { description = "Proof that Idris is pacman complete"; - homepage = https://github.com/jdublu10/pacman; + homepage = "https://github.com/jdublu10/pacman"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/patricia.nix b/pkgs/development/idris-modules/patricia.nix index 5ce9ad7e915..586c33837d6 100644 --- a/pkgs/development/idris-modules/patricia.nix +++ b/pkgs/development/idris-modules/patricia.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Immutable map from integer keys to values based on patricia tree. Basically persistent array."; - homepage = https://github.com/ChShersh/idris-patricia; + homepage = "https://github.com/ChShersh/idris-patricia"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/permutations.nix b/pkgs/development/idris-modules/permutations.nix index 21b81f4a95c..b11bce39e1e 100644 --- a/pkgs/development/idris-modules/permutations.nix +++ b/pkgs/development/idris-modules/permutations.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Type-safe way of working with permutations in Idris"; - homepage = https://github.com/vmchale/permutations; + homepage = "https://github.com/vmchale/permutations"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/pfds.nix b/pkgs/development/idris-modules/pfds.nix index f9fbd26a0dd..d82ec490185 100644 --- a/pkgs/development/idris-modules/pfds.nix +++ b/pkgs/development/idris-modules/pfds.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Purely functional data structures in Idris"; - homepage = https://github.com/timjb/idris-pfds; + homepage = "https://github.com/timjb/idris-pfds"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/pipes.nix b/pkgs/development/idris-modules/pipes.nix index 0f62d73b9da..69b8d721705 100644 --- a/pkgs/development/idris-modules/pipes.nix +++ b/pkgs/development/idris-modules/pipes.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Composable and effectful production, transformation and consumption of streams of data"; - homepage = https://github.com/QuentinDuval/IdrisPipes; + homepage = "https://github.com/QuentinDuval/IdrisPipes"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/posix.nix b/pkgs/development/idris-modules/posix.nix index 194b60bd298..30bff9eb7e7 100644 --- a/pkgs/development/idris-modules/posix.nix +++ b/pkgs/development/idris-modules/posix.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "System POSIX bindings for Idris."; - homepage = https://github.com/idris-hackers/idris-posix; + homepage = "https://github.com/idris-hackers/idris-posix"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/protobuf.nix b/pkgs/development/idris-modules/protobuf.nix index 1c2a58a6b7c..ebfc3c27508 100644 --- a/pkgs/development/idris-modules/protobuf.nix +++ b/pkgs/development/idris-modules/protobuf.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "A partial implementation of Protocol Buffers in Idris"; - homepage = https://github.com/artagnon/idris-protobuf; + homepage = "https://github.com/artagnon/idris-protobuf"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/quantities.nix b/pkgs/development/idris-modules/quantities.nix index 63cc2184504..8141465d751 100644 --- a/pkgs/development/idris-modules/quantities.nix +++ b/pkgs/development/idris-modules/quantities.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Type-safe physical computations and unit conversions in Idris"; - homepage = https://github.com/timjb/quantities; + homepage = "https://github.com/timjb/quantities"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ imuli ]; }; diff --git a/pkgs/development/idris-modules/rationals.nix b/pkgs/development/idris-modules/rationals.nix index 7ce290c824e..91aa294d1c5 100644 --- a/pkgs/development/idris-modules/rationals.nix +++ b/pkgs/development/idris-modules/rationals.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "An idris rational number type built from paths in the Stern Brocot tree"; - homepage = https://github.com/mcgordonite/idris-binary-rationals; + homepage = "https://github.com/mcgordonite/idris-binary-rationals"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/recursion_schemes.nix b/pkgs/development/idris-modules/recursion_schemes.nix index dab6913ee8b..b326113c635 100644 --- a/pkgs/development/idris-modules/recursion_schemes.nix +++ b/pkgs/development/idris-modules/recursion_schemes.nix @@ -22,7 +22,7 @@ build-idris-package { meta = { description = "Recursion schemes for Idris"; - homepage = https://github.com/vmchale/recursion_schemes; + homepage = "https://github.com/vmchale/recursion_schemes"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/refined.nix b/pkgs/development/idris-modules/refined.nix index 433fdf64769..11fd6b78281 100644 --- a/pkgs/development/idris-modules/refined.nix +++ b/pkgs/development/idris-modules/refined.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Port of Scala/Haskell Refined library to Idris"; - homepage = https://github.com/janschultecom/idris-refined; + homepage = "https://github.com/janschultecom/idris-refined"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/sdl.nix b/pkgs/development/idris-modules/sdl.nix index 4495e60d6bb..105cfdce65b 100644 --- a/pkgs/development/idris-modules/sdl.nix +++ b/pkgs/development/idris-modules/sdl.nix @@ -22,7 +22,7 @@ build-idris-package { meta = { description = "SDL-idris framework for Idris"; - homepage = https://github.com/edwinb/SDL-idris; + homepage = "https://github.com/edwinb/SDL-idris"; maintainers = [ lib.maintainers.brainrape ]; # Can't find file sdlrun.o broken = true; diff --git a/pkgs/development/idris-modules/sdl2.nix b/pkgs/development/idris-modules/sdl2.nix index e4a1fbae562..606b5a38a5f 100644 --- a/pkgs/development/idris-modules/sdl2.nix +++ b/pkgs/development/idris-modules/sdl2.nix @@ -24,12 +24,12 @@ build-idris-package rec { owner = "steshaw"; repo = "idris-sdl2"; rev = version; - sha256 = sha256:1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a; + sha256 = "sha256:1jslnlzyw04dcvcd7xsdjqa7waxzkm5znddv76sv291jc94xhl4a"; }; meta = { description = "SDL2 binding for Idris"; - homepage = https://github.com/steshaw/idris-sdl2; + homepage = "https://github.com/steshaw/idris-sdl2"; maintainers = with lib.maintainers; [ brainrape steshaw diff --git a/pkgs/development/idris-modules/semidirect.nix b/pkgs/development/idris-modules/semidirect.nix index 8e7428665cd..30cc144003e 100644 --- a/pkgs/development/idris-modules/semidirect.nix +++ b/pkgs/development/idris-modules/semidirect.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Semidirect products in Idris"; - homepage = https://github.com/clayrat/idris-semidirect; + homepage = "https://github.com/clayrat/idris-semidirect"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/setoids.nix b/pkgs/development/idris-modules/setoids.nix index 6db49c3c3c9..aa66d847595 100644 --- a/pkgs/development/idris-modules/setoids.nix +++ b/pkgs/development/idris-modules/setoids.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Idris proofs for extensional equalities"; - homepage = https://github.com/danilkolikov/setoids; + homepage = "https://github.com/danilkolikov/setoids"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/smproc.nix b/pkgs/development/idris-modules/smproc.nix index 97ed06d307a..4917f762855 100644 --- a/pkgs/development/idris-modules/smproc.nix +++ b/pkgs/development/idris-modules/smproc.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Well-typed symmetric-monoidal category of concurrent processes"; - homepage = https://github.com/jameshaydon/smproc; + homepage = "https://github.com/jameshaydon/smproc"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/snippets.nix b/pkgs/development/idris-modules/snippets.nix index 6d752fed0f9..2d5473545c5 100644 --- a/pkgs/development/idris-modules/snippets.nix +++ b/pkgs/development/idris-modules/snippets.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Collection of Idris snippets"; - homepage = https://github.com/palladin/idris-snippets; + homepage = "https://github.com/palladin/idris-snippets"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/software_foundations.nix b/pkgs/development/idris-modules/software_foundations.nix index 57748243302..0f45da3ed67 100644 --- a/pkgs/development/idris-modules/software_foundations.nix +++ b/pkgs/development/idris-modules/software_foundations.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Code for Software Foundations in Idris"; - homepage = https://github.com/idris-hackers/software-foundations; + homepage = "https://github.com/idris-hackers/software-foundations"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/specdris.nix b/pkgs/development/idris-modules/specdris.nix index 06982a0b2ba..b20902d7432 100644 --- a/pkgs/development/idris-modules/specdris.nix +++ b/pkgs/development/idris-modules/specdris.nix @@ -21,7 +21,7 @@ build-idris-package { meta = { description = "A testing library for Idris"; - homepage = https://github.com/pheymann/specdris; + homepage = "https://github.com/pheymann/specdris"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/idris-modules/tap.nix b/pkgs/development/idris-modules/tap.nix index 98f4b4ea4d6..9edbbaea359 100644 --- a/pkgs/development/idris-modules/tap.nix +++ b/pkgs/development/idris-modules/tap.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "A simple TAP producer and consumer/reporter for Idris"; - homepage = https://github.com/ostera/tap-idris; + homepage = "https://github.com/ostera/tap-idris"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/test.nix b/pkgs/development/idris-modules/test.nix index ccb575e270c..073b4e20b85 100644 --- a/pkgs/development/idris-modules/test.nix +++ b/pkgs/development/idris-modules/test.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Testing Utilities for Idris programs"; - homepage = https://github.com/jfdm/idris-testing; + homepage = "https://github.com/jfdm/idris-testing"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/tlhydra.nix b/pkgs/development/idris-modules/tlhydra.nix index ffe1e46d86e..e2c07ac5fb7 100644 --- a/pkgs/development/idris-modules/tlhydra.nix +++ b/pkgs/development/idris-modules/tlhydra.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Idris parser and serializer/deserealizer for TL language"; - homepage = https://github.com/Termina1/tlhydra; + homepage = "https://github.com/Termina1/tlhydra"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/tomladris.nix b/pkgs/development/idris-modules/tomladris.nix index 402b5a01b76..64728ab305e 100644 --- a/pkgs/development/idris-modules/tomladris.nix +++ b/pkgs/development/idris-modules/tomladris.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "TOML parser for Idris"; - homepage = https://github.com/emptyflash/tomladris; + homepage = "https://github.com/emptyflash/tomladris"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ siddharthist brainrape ]; }; diff --git a/pkgs/development/idris-modules/tp.nix b/pkgs/development/idris-modules/tp.nix index 1823e76c290..0cfdc78f667 100644 --- a/pkgs/development/idris-modules/tp.nix +++ b/pkgs/development/idris-modules/tp.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Strongly Typed Paths for Idris"; - homepage = https://github.com/superfunc/tp; + homepage = "https://github.com/superfunc/tp"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/tparsec.nix b/pkgs/development/idris-modules/tparsec.nix index 67020898ff3..84f88e1598b 100644 --- a/pkgs/development/idris-modules/tparsec.nix +++ b/pkgs/development/idris-modules/tparsec.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "TParsec - Total Parser Combinators in Idris"; - homepage = https://github.com/gallais/idris-tparsec; + homepage = "https://github.com/gallais/idris-tparsec"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/transducers.nix b/pkgs/development/idris-modules/transducers.nix index 8f10f9bd247..39a4cdf0cc7 100644 --- a/pkgs/development/idris-modules/transducers.nix +++ b/pkgs/development/idris-modules/transducers.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Composable algorithmic transformation"; - homepage = https://github.com/QuentinDuval/IdrisReducers; + homepage = "https://github.com/QuentinDuval/IdrisReducers"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/trees.nix b/pkgs/development/idris-modules/trees.nix index 69042e27d3d..8fda8d138ad 100644 --- a/pkgs/development/idris-modules/trees.nix +++ b/pkgs/development/idris-modules/trees.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Trees in Idris"; - homepage = https://github.com/clayrat/idris-trees; + homepage = "https://github.com/clayrat/idris-trees"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/union_type.nix b/pkgs/development/idris-modules/union_type.nix index 3a6dced48ce..2ad8f280fce 100644 --- a/pkgs/development/idris-modules/union_type.nix +++ b/pkgs/development/idris-modules/union_type.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "UnionType in Idris"; - homepage = https://github.com/berewt/UnionType; + homepage = "https://github.com/berewt/UnionType"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/vdom.nix b/pkgs/development/idris-modules/vdom.nix index f6fdaf7a75e..3ece0056a3f 100644 --- a/pkgs/development/idris-modules/vdom.nix +++ b/pkgs/development/idris-modules/vdom.nix @@ -17,7 +17,7 @@ build-idris-package { meta = { description = "Virtual DOM in pure Idris"; - homepage = https://github.com/brandondyck/idris-vdom; + homepage = "https://github.com/brandondyck/idris-vdom"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/vecspace.nix b/pkgs/development/idris-modules/vecspace.nix index bf7e56cf8c0..2336291338b 100644 --- a/pkgs/development/idris-modules/vecspace.nix +++ b/pkgs/development/idris-modules/vecspace.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Abstract vector spaces in Idris"; - homepage = https://github.com/clayrat/idris-vecspace; + homepage = "https://github.com/clayrat/idris-vecspace"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/idris-modules/webgl.nix b/pkgs/development/idris-modules/webgl.nix index ddd0dec03a4..271501aa529 100644 --- a/pkgs/development/idris-modules/webgl.nix +++ b/pkgs/development/idris-modules/webgl.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Idris library to interact with WebGL"; - homepage = https://github.com/pierrebeaucamp/idris-webgl; + homepage = "https://github.com/pierrebeaucamp/idris-webgl"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index baceb2214e3..a368e0582d8 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -15,7 +15,7 @@ build-idris-package { meta = { description = "Wadler-Leijen pretty-printing library"; - homepage = https://github.com/shayan-najd/wl-pprint; + homepage = "https://github.com/shayan-najd/wl-pprint"; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/idris-modules/wyvern.nix b/pkgs/development/idris-modules/wyvern.nix index 870bf1a6b9b..750b5dd2fd0 100644 --- a/pkgs/development/idris-modules/wyvern.nix +++ b/pkgs/development/idris-modules/wyvern.nix @@ -23,7 +23,7 @@ build-idris-package { meta = { description = "Little web server written in Idris"; - homepage = https://github.com/ericqweinstein/wyvern; + homepage = "https://github.com/ericqweinstein/wyvern"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/xhr.nix b/pkgs/development/idris-modules/xhr.nix index 9e6f40b963f..9c198e28938 100644 --- a/pkgs/development/idris-modules/xhr.nix +++ b/pkgs/development/idris-modules/xhr.nix @@ -18,7 +18,7 @@ build-idris-package { meta = { description = "Idris library to interact with xhr"; - homepage = https://github.com/pierrebeaucamp/idris-xhr; + homepage = "https://github.com/pierrebeaucamp/idris-xhr"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/yaml.nix b/pkgs/development/idris-modules/yaml.nix index 61efb8cd575..b7fffd3953d 100644 --- a/pkgs/development/idris-modules/yaml.nix +++ b/pkgs/development/idris-modules/yaml.nix @@ -20,7 +20,7 @@ build-idris-package { meta = { description = "Idris YAML lib"; - homepage = https://github.com/Heather/Idris.Yaml; + homepage = "https://github.com/Heather/Idris.Yaml"; license = lib.licenses.mit; maintainers = [ lib.maintainers.brainrape ]; }; diff --git a/pkgs/development/idris-modules/yampa.nix b/pkgs/development/idris-modules/yampa.nix index ebe92f46898..33ebacc6d55 100644 --- a/pkgs/development/idris-modules/yampa.nix +++ b/pkgs/development/idris-modules/yampa.nix @@ -19,7 +19,7 @@ build-idris-package { meta = { description = "Idris implementation of Yampa FRP library as described in Reactive Programming through Dependent Types"; - homepage = https://github.com/BartAdv/idris-yampa; + homepage = "https://github.com/BartAdv/idris-yampa"; maintainers = [ lib.maintainers.brainrape ]; }; } diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 8d93492209c..9445d42f24e 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -62,8 +62,8 @@ in stdenv.mkDerivation rec { ACL2 have been removed because it is not currently possible to build them with Nix. ''; - homepage = http://www.cs.utexas.edu/users/moore/acl2/; - downloadPage = https://github.com/acl2-devel/acl2-devel/releases; + homepage = "http://www.cs.utexas.edu/users/moore/acl2/"; + downloadPage = "https://github.com/acl2-devel/acl2-devel/releases"; # There are a bunch of licenses in the community books, but since # they currently get deleted during the build, we don't mention # their licenses here. ACL2 proper is released under a BSD diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 744106bce5d..35672116ca0 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "./install.sh $out"; meta = with stdenv.lib; { - homepage = https://github.com/bats-core/bats-core; + homepage = "https://github.com/bats-core/bats-core"; description = "Bash Automated Testing System"; maintainers = [ maintainers.lnl7 ]; license = licenses.mit; diff --git a/pkgs/development/interpreters/ceptre/default.nix b/pkgs/development/interpreters/ceptre/default.nix index cde9146f78c..de12185b96f 100644 --- a/pkgs/development/interpreters/ceptre/default.nix +++ b/pkgs/development/interpreters/ceptre/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ceptre-2016-11-27"; src = fetchgit { - url = https://github.com/chrisamaphone/interactive-lp; + url = "https://github.com/chrisamaphone/interactive-lp"; rev = "e436fda2ccd44e9c9d226feced9d204311deacf5"; sha256 = "174pxfnw3qyn2w8qxmx45fa68iddf106mkfi0kcmyqxzsc9jprh8"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A linear logic programming language for modeling generative interactive systems"; - homepage = https://github.com/chrisamaphone/interactive-lp; + homepage = "https://github.com/chrisamaphone/interactive-lp"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 2ad0bc0285e..f0de3f64091 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit name; meta = { - homepage = https://github.com/ashinn/chibi-scheme; + 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; diff --git a/pkgs/development/interpreters/clips/default.nix b/pkgs/development/interpreters/clips/default.nix index c70bfd9406e..cf0710f36a1 100644 --- a/pkgs/development/interpreters/clips/default.nix +++ b/pkgs/development/interpreters/clips/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { description = "A Tool for Building Expert Systems"; - homepage = http://www.clipsrules.net/; + homepage = "http://www.clipsrules.net/"; longDescription = '' Developed at NASA's Johnson Space Center from 1985 to 1996, CLIPS is a rule-based programming language useful for creating diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix index 5dcfa42c92f..1b7ff2c8cba 100644 --- a/pkgs/development/interpreters/clisp/default.nix +++ b/pkgs/development/interpreters/clisp/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; - homepage = http://clisp.cons.org; + homepage = "http://clisp.cons.org"; maintainers = with stdenv.lib.maintainers; [raskin tohl]; platforms = stdenv.lib.platforms.unix; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 diff --git a/pkgs/development/interpreters/clisp/hg.nix b/pkgs/development/interpreters/clisp/hg.nix index 550535f30ae..6898f84669f 100644 --- a/pkgs/development/interpreters/clisp/hg.nix +++ b/pkgs/development/interpreters/clisp/hg.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = { description = "ANSI Common Lisp Implementation"; - homepage = http://clisp.cons.org; + homepage = "http://clisp.cons.org"; maintainers = with stdenv.lib.maintainers; [raskin tohl]; # problems on Darwin: https://github.com/NixOS/nixpkgs/issues/20062 platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix new file mode 100644 index 00000000000..db849bb542d --- /dev/null +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -0,0 +1,82 @@ +{ stdenv, fetchurl, graalvm8 }: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "babashka"; + version = "0.0.78"; + + reflectionJson = fetchurl { + name = "reflection.json"; + url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; + sha256 = "1m1nwdxjsc6bkdzkbsll316ly0c3qxaimjzyfph1220irjxnm7xf"; + }; + + src = fetchurl { + url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; + sha256 = "01w990zk5qjrbnc846snh6na002kdyrlrfnqwg03ibx20g3mr7if"; + }; + + dontUnpack = true; + + buildInputs = [ graalvm8 ]; + + buildPhase = '' + native-image \ + -jar ${src} \ + -H:Name=bb \ + -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 \ + --enable-all-security-services \ + -H:+JNI \ + --verbose \ + --no-fallback \ + --no-server \ + --report-unsupported-elements-at-runtime \ + "-J-Xmx3g" + ''; + + installPhase = '' + mkdir -p $out/bin + cp bb $out/bin/bb + ''; + + meta = with stdenv.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 + would be using bash otherwise. + + As one user described it: + + I’m quite at home in Bash most of the time, but there’s a substantial + grey area of things that are too complicated to be simple in bash, but + too simple to be worth writing a clj/s script for. Babashka really + seems to hit the sweet spot for those cases. + + Goals: + + - Low latency Clojure scripting alternative to JVM Clojure. + - Easy installation: grab the self-contained binary and run. No JVM needed. + - Familiarity and portability: + - Scripts should be compatible with JVM Clojure as much as possible + - Scripts should be platform-independent as much as possible. Babashka + offers support for linux, macOS and Windows. + - Allow interop with commonly used classes like java.io.File and System + - Multi-threading support (pmap, future, core.async) + - Batteries included (tools.cli, cheshire, ...) + - Library support via popular tools like the clojure CLI + ''; + homepage = "https://github.com/borkdude/babashka"; + license = licenses.epl10; + platforms = graalvm8.meta.platforms; + maintainers = with maintainers; [ bhougland DerGuteMoritz jlesquembre ]; + }; +} diff --git a/pkgs/development/interpreters/clojure/clooj.nix b/pkgs/development/interpreters/clojure/clooj.nix index 369d84708dc..d51fa76003b 100644 --- a/pkgs/development/interpreters/clojure/clooj.nix +++ b/pkgs/development/interpreters/clojure/clooj.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "A lightweight IDE for Clojure"; - homepage = https://github.com/arthuredelstein/clooj; + homepage = "https://github.com/arthuredelstein/clooj"; license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 01fba17f104..e8c3e7b098a 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "A Lisp dialect for the JVM"; - homepage = https://clojure.org/; + homepage = "https://clojure.org/"; license = licenses.epl10; longDescription = '' Clojure is a dynamic programming language that targets the Java diff --git a/pkgs/development/interpreters/clojurescript/lumo/default.nix b/pkgs/development/interpreters/clojurescript/lumo/default.nix index d6252a7506a..122831e80cc 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/default.nix +++ b/pkgs/development/interpreters/clojurescript/lumo/default.nix @@ -279,7 +279,7 @@ stdenv.mkDerivation { Thanks to V8's custom startup snapshots, Lumo starts up instantaneously, making it the fastest Clojure REPL in existence. ''; - homepage = https://github.com/anmonteiro/lumo; + 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; diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index cff1885e279..eda8e450bba 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = https://www.dartlang.org/; + homepage = "https://www.dartlang.org/"; maintainers = with maintainers; [ grburst ]; description = "Scalable programming language, with robust libraries and runtimes, for building web, server, and mobile apps"; longDescription = '' diff --git a/pkgs/development/interpreters/duktape/default.nix b/pkgs/development/interpreters/duktape/default.nix index 369c3840b87..53cbbad8e55 100644 --- a/pkgs/development/interpreters/duktape/default.nix +++ b/pkgs/development/interpreters/duktape/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An embeddable Javascript engine, with a focus on portability and compact footprint"; - homepage = https://duktape.org/; - downloadPage = https://duktape.org/download.html; + homepage = "https://duktape.org/"; + downloadPage = "https://duktape.org/download.html"; license = licenses.mit; maintainers = [ maintainers.fgaz ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 9da2b0d899d..c848ebc6047 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { checkTarget = "test"; meta = with stdenv.lib; { - homepage = https://www.eff-lang.org; + homepage = "https://www.eff-lang.org"; description = "A functional programming language based on algebraic effects and their handlers"; longDescription = '' Eff is a functional language with handlers of not only exceptions, diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix index 571f39203f8..b46b71485c8 100644 --- a/pkgs/development/interpreters/elixir/generic-builder.nix +++ b/pkgs/development/interpreters/elixir/generic-builder.nix @@ -60,7 +60,7 @@ in pos = builtins.unsafeGetAttrPos "sha256" args; meta = with stdenv.lib; { - homepage = https://elixir-lang.org/; + homepage = "https://elixir-lang.org/"; description = "A functional, meta-programming aware language built on top of the Erlang VM"; longDescription = '' diff --git a/pkgs/development/interpreters/erlang/R16B02-basho.nix b/pkgs/development/interpreters/erlang/R16B02-basho.nix index 11637868ed0..c94528e674f 100644 --- a/pkgs/development/interpreters/erlang/R16B02-basho.nix +++ b/pkgs/development/interpreters/erlang/R16B02-basho.nix @@ -42,7 +42,7 @@ mkDerivation { ''; meta = { - homepage = https://github.com/basho/otp/; + homepage = "https://github.com/basho/otp/"; description = "Programming language used for massively scalable soft real-time systems, Basho fork"; longDescription = '' diff --git a/pkgs/development/interpreters/erlang/R22.nix b/pkgs/development/interpreters/erlang/R22.nix index 88fe21453a8..7596ad9e2f1 100644 --- a/pkgs/development/interpreters/erlang/R22.nix +++ b/pkgs/development/interpreters/erlang/R22.nix @@ -3,8 +3,8 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "22.1.7"; - sha256 = "18aqy2s8nqd82v4lzzxknrwjva8mv1y2hvai9cakz5nkyd3vwq62"; + version = "22.3"; + sha256 = "0srbyncgnr1kp0rrviq14ia3h795b3gk0iws5ishv6rphcq1rs27"; prePatch = '' substituteInPlace make/configure.in --replace '`sw_vers -productVersion`' "''${MACOSX_DEPLOYMENT_TARGET:-10.12}" diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index c0203e5915f..883fa87cbd4 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -108,7 +108,7 @@ in stdenv.mkDerivation ({ setupHook = ./setup-hook.sh; meta = with stdenv.lib; ({ - homepage = https://www.erlang.org/; + 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/gauche/default.nix b/pkgs/development/interpreters/gauche/default.nix index 9b38d1e4ad5..26a30ef2cd3 100644 --- a/pkgs/development/interpreters/gauche/default.nix +++ b/pkgs/development/interpreters/gauche/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "R7RS Scheme scripting engine"; - homepage = https://practical-scheme.net/gauche/; + homepage = "https://practical-scheme.net/gauche/"; maintainers = with maintainers; [ mnacamura ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/gnu-apl/default.nix b/pkgs/development/interpreters/gnu-apl/default.nix index c2a3556cfea..f01cfc2444b 100644 --- a/pkgs/development/interpreters/gnu-apl/default.nix +++ b/pkgs/development/interpreters/gnu-apl/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free interpreter for the APL programming language"; - homepage = https://www.gnu.org/software/apl/; + homepage = "https://www.gnu.org/software/apl/"; license = licenses.gpl3Plus; maintainers = [ maintainers.kovirobi ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index e1d404a6b15..1572f5e4be2 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "10nn04hfky4x75nss33vvslw958pjvhw35lcfb3lxvaifqg23cpl"; + sha256 = "1ddw3fqrmwh4w6z6xgck4jhmq33rwgbmpjw07g12ri1vgw4xks9w"; }; buildInputs = [ unzip makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An agile dynamic language for the Java Platform"; - homepage = http://groovy-lang.org/; + homepage = "http://groovy-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 158987d4e0e..6057480476f 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Embeddable Scheme implementation"; - homepage = https://www.gnu.org/software/guile/; + homepage = "https://www.gnu.org/software/guile/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index af71d5cc80d..b5b83e18025 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -101,7 +101,7 @@ meta = { description = "Embeddable Scheme implementation"; - homepage = https://www.gnu.org/software/guile/; + homepage = "https://www.gnu.org/software/guile/"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/interpreters/hugs/default.nix b/pkgs/development/interpreters/hugs/default.nix index 2177ae22db5..35463b16157 100644 --- a/pkgs/development/interpreters/hugs/default.nix +++ b/pkgs/development/interpreters/hugs/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { name = "hugs98-200609"; src = fetchurl { - url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz; + url = "http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz"; sha256 = "1dj65c39zpy6qqvvrwns2hzj6ipnd4ih655xj7kgyk2nfdvd5x1w"; }; patches = [ (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs; + url = "https://aur.archlinux.org/cgit/aur.git/plain/hsbase_inline.patch?h=hugs"; name = "hsbase_inline.patch"; sha256 = "1h0sp16d17hlm6gj7zdbgwrjwi2l4q02m8p0wd60dp4gn9i9js0v"; }) @@ -40,7 +40,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = https://www.haskell.org/hugs; + homepage = "https://www.haskell.org/hugs"; description = "Haskell interpreter"; maintainers = with maintainers; [ joachifm ]; license = licenses.bsd3; diff --git a/pkgs/development/interpreters/icon-lang/default.nix b/pkgs/development/interpreters/icon-lang/default.nix index d243ae9bc58..d85448a9677 100644 --- a/pkgs/development/interpreters/icon-lang/default.nix +++ b/pkgs/development/interpreters/icon-lang/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ vrthra yurrriq ]; platforms = with platforms; linux ++ darwin; license = licenses.publicDomain; - homepage = https://www.cs.arizona.edu/icon/; + homepage = "https://www.cs.arizona.edu/icon/"; }; } diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index f763274c15d..42af3cc427b 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Io programming language"; - homepage = http://iolanguage.org/; + homepage = "http://iolanguage.org/"; license = licenses.bsd3; maintainers = with maintainers; [ diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 791ac6dd338..f7500c169e6 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin synthetica ]; platforms = with platforms; linux ++ darwin; license = licenses.gpl3Plus; - homepage = http://jsoftware.com/; + homepage = "http://jsoftware.com/"; }; } diff --git a/pkgs/development/interpreters/janet/default.nix b/pkgs/development/interpreters/janet/default.nix index 0fc6928c1ab..828cf3a7244 100644 --- a/pkgs/development/interpreters/janet/default.nix +++ b/pkgs/development/interpreters/janet/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "janet"; - version = "1.7.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "janet-lang"; repo = pname; rev = "v${version}"; - sha256 = "1z7r4ddgwxgxy1pp36p2wchcmzjqfyki3a4kicnr23ldflqv9ycc"; + sha256 = "1v2kgbx6w1ii83a1c9ridm1i52rmcjb0g1d23fhqn7hya5bwrhr6"; }; nativeBuildInputs = [ meson ninja ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Janet programming language"; - homepage = https://janet-lang.org/; + homepage = "https://janet-lang.org/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ andrewchambers ]; diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index 1db2dd60197..b176c55cbfd 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "joker"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "1wi80sr8h9fwh4xipff0y6qdzrliwyk2w1bmi33ncykxd9r2g7nk"; + sha256 = "03lbvxmkn0rr7yv7kj6c4dh4zayiwbhrkqbz2m22dw568rjbp8az"; }; - modSha256 = "0i16vf7n1xfz5kp9w3fvyc9y9wgz4h396glgpdaznpxjr12rb43j"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1mylgim9nm0v5wybgzi74nqzmvzwzws0027wzl86dbj5id83ab9v"; preBuild = '' go generate ./... diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 3784b6ab282..79cb1c7154b 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { pname = "jruby"; - version = "9.2.11.0"; + version = "9.2.11.1"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "01yzpasnpqqm0vfc0ki8vkxbzijjfws135jw8k0r50b5lahjvs4a"; + sha256 = "1p4ml5rqidqllc7z85zn2q4pyyih71j0gb71wl43j4v74p44j17i"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/kona/default.nix b/pkgs/development/interpreters/kona/default.nix index 9b7f36f4c87..041616cc1f6 100644 --- a/pkgs/development/interpreters/kona/default.nix +++ b/pkgs/development/interpreters/kona/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interpreter of K, APL-like programming language"; - homepage = https://github.com/kevinlawler/kona/; + homepage = "https://github.com/kevinlawler/kona/"; maintainers = with maintainers; [ raskin ]; platforms = platforms.all; license = licenses.isc; diff --git a/pkgs/development/interpreters/lolcode/default.nix b/pkgs/development/interpreters/lolcode/default.nix index 3ef239e89a9..bd4b93b835f 100644 --- a/pkgs/development/interpreters/lolcode/default.nix +++ b/pkgs/development/interpreters/lolcode/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { postInstall = "mv $out/bin/lci $out/bin/lolcode-lci"; meta = { - homepage = http://lolcode.org; + homepage = "http://lolcode.org"; description = "An esoteric programming language"; longDescription = '' LOLCODE is a funny esoteric programming language, a bit Pascal-like, diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index e1ca3ded208..dbe3f6fa2df 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { - homepage = http://love2d.org; + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 3bf8aee0d07..6f09c076441 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://love2d.org; + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = stdenv.lib.licenses.zlib; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index a2182f45436..79b83f0643f 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 meta = { - homepage = http://love2d.org; + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = stdenv.lib.licenses.zlib; diff --git a/pkgs/development/interpreters/love/11.1.nix b/pkgs/development/interpreters/love/11.1.nix index 3629345baf6..2ef3a4ca05a 100644 --- a/pkgs/development/interpreters/love/11.1.nix +++ b/pkgs/development/interpreters/love/11.1.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg"; # needed since luajit-2.1.0-beta3 meta = { - homepage = http://love2d.org; + homepage = "http://love2d.org"; description = "A Lua-based 2D game engine/scripting language"; license = stdenv.lib.licenses.zlib; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/lua-5/filesystem.nix b/pkgs/development/interpreters/lua-5/filesystem.nix index 64050ea95f8..a3e633bbab1 100644 --- a/pkgs/development/interpreters/lua-5/filesystem.nix +++ b/pkgs/development/interpreters/lua-5/filesystem.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/keplerproject/luafilesystem; + homepage = "https://github.com/keplerproject/luafilesystem"; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/lua-5/interpreter.nix b/pkgs/development/interpreters/lua-5/interpreter.nix index 6fc2e53b961..98e4684e092 100644 --- a/pkgs/development/interpreters/lua-5/interpreter.nix +++ b/pkgs/development/interpreters/lua-5/interpreter.nix @@ -97,7 +97,7 @@ self = stdenv.mkDerivation rec { }; meta = { - homepage = http://www.lua.org; + homepage = "http://www.lua.org"; description = "Powerful, fast, lightweight, embeddable scripting language"; longDescription = '' Lua combines simple procedural syntax with powerful data diff --git a/pkgs/development/interpreters/lua-5/sockets.nix b/pkgs/development/interpreters/lua-5/sockets.nix index f0eb1becc57..73fbbc3e66a 100644 --- a/pkgs/development/interpreters/lua-5/sockets.nix +++ b/pkgs/development/interpreters/lua-5/sockets.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ lua5 ]; meta = { - homepage = http://w3.impa.br/~diego/software/luasocket/; + homepage = "http://w3.impa.br/~diego/software/luasocket/"; hydraPlatforms = stdenv.lib.platforms.linux; maintainers = [ ]; }; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 08c0564847c..9be368a5902 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance JIT compiler for Lua 5.1"; - homepage = http://luajit.org; + homepage = "http://luajit.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ thoughtpolice smironov vcunat andir ]; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index 721cfe38865..e4e984fc4ac 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; meta = { - homepage = http://maude.cs.illinois.edu/; + homepage = "http://maude.cs.illinois.edu/"; description = "High-level specification language"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 42b95f341ba..680e4106695 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { in the Metamath Proof Explorer, and it generated its web pages. The *.mm ASCII databases (set.mm and others) are also included in this derivation. ''; - homepage = http://us.metamath.org; + homepage = "http://us.metamath.org"; downloadPage = "http://us.metamath.org/#downloads"; license = licenses.gpl2; maintainers = [ maintainers.taneb ]; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index aef23ad6881..2abcec68c86 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://mujs.com/; + homepage = "https://mujs.com/"; description = "A lightweight, embeddable Javascript interpreter"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index bde2f5d9fa9..0c976f2f0b0 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { meta = { description = "Run programs defined in nix expressions"; - homepage = https://github.com/shlevy/nix-exec; + homepage = "https://github.com/shlevy/nix-exec"; license = stdenv.lib.licenses.mit; platforms = nix.meta.platforms; broken = true; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 8f8b63a261e..99a3104b21d 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -162,7 +162,7 @@ let ''; # */ meta = { - homepage = https://www.perl.org/; + homepage = "https://www.perl.org/"; description = "The standard implementation of the Perl 5 programmming language"; license = licenses.artistic1; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 497a1d87f55..1d6576b383c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,13 +1,9 @@ -# pcre functionality is tested in nixos/tests/php-pcre.nix -{ config, lib, stdenv, fetchurl -, autoconf, automake, bison, file, flex, libtool, pkgconfig, re2c -, libxml2, readline, zlib, curl, postgresql, gettext -, openssl, pcre, pcre2, sqlite -, libxslt, bzip2, icu, openldap, cyrus_sasl, unixODBC -, uwimap, pam, gmp, apacheHttpd, libiconv, systemd, libsodium, html-tidy, libargon2 -, gd, freetype, libXpm, libjpeg, libpng, libwebp -, libzip, valgrind, oniguruma, symlinkJoin, writeText -, makeWrapper, callPackage +# We have tests for PCRE and PHP-FPM in nixos/tests/php/ or +# both in the same attribute named nixosTests.php + +{ callPackage, config, fetchurl, lib, makeWrapper, stdenv, symlinkJoin +, writeText , autoconf, automake, bison, flex, libtool, pkgconfig, re2c +, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, valgrind }: let @@ -15,182 +11,83 @@ let { version , sha256 , extraPatches ? [] - , withSystemd ? config.php.systemd or stdenv.isLinux - , imapSupport ? config.php.imap or (!stdenv.isDarwin) - , ldapSupport ? config.php.ldap or true - , mysqlndSupport ? config.php.mysqlnd or true - , mysqliSupport ? (config.php.mysqli or true) && (mysqlndSupport) - , pdo_mysqlSupport ? (config.php.pdo_mysql or true) && (mysqlndSupport) - , libxml2Support ? config.php.libxml2 or true - , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin) - , embedSupport ? config.php.embed or false - , bcmathSupport ? config.php.bcmath or true - , socketsSupport ? config.php.sockets or true - , curlSupport ? config.php.curl or true - , gettextSupport ? config.php.gettext or true - , pcntlSupport ? config.php.pcntl or true - , pdo_odbcSupport ? config.php.pdo_odbc or true - , postgresqlSupport ? config.php.postgresql or true - , pdo_pgsqlSupport ? config.php.pdo_pgsql or true - , readlineSupport ? config.php.readline or true - , sqliteSupport ? config.php.sqlite or true - , soapSupport ? (config.php.soap or true) && (libxml2Support) - , zlibSupport ? config.php.zlib or true - , opensslSupport ? config.php.openssl or true - , mbstringSupport ? config.php.mbstring or true - , gdSupport ? config.php.gd or true - , intlSupport ? config.php.intl or true - , exifSupport ? config.php.exif or true - , xslSupport ? config.php.xsl or false - , bz2Support ? config.php.bz2 or false - , zipSupport ? config.php.zip or true - , ftpSupport ? config.php.ftp or true - , fpmSupport ? config.php.fpm or true - , gmpSupport ? config.php.gmp or true - , ztsSupport ? (config.php.zts or false) || (apxs2Support) - , calendarSupport ? config.php.calendar or true - , sodiumSupport ? (config.php.sodium or true) && (lib.versionAtLeast version "7.2") - , tidySupport ? (config.php.tidy or false) - , argon2Support ? (config.php.argon2 or true) && (lib.versionAtLeast version "7.2") - , libzipSupport ? (config.php.libzip or true) && (lib.versionAtLeast version "7.2") - , phpdbgSupport ? config.php.phpdbg or true + + # Sapi flags , cgiSupport ? config.php.cgi or true , cliSupport ? config.php.cli or true + , fpmSupport ? config.php.fpm or true + , pearSupport ? config.php.pear or true , pharSupport ? config.php.phar or true - , xmlrpcSupport ? (config.php.xmlrpc or false) && (libxml2Support) + , phpdbgSupport ? config.php.phpdbg or true + + + # Misc flags + , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin) + , argon2Support ? config.php.argon2 or true , cgotoSupport ? config.php.cgoto or false - , valgrindSupport ? (config.php.valgrind or true) && (lib.versionAtLeast version "7.2") + , embedSupport ? config.php.embed or false , ipv6Support ? config.php.ipv6 or true - , pearSupport ? (config.php.pear or true) && (libxml2Support) - }: stdenv.mkDerivation { + , systemdSupport ? config.php.systemd or stdenv.isLinux + , valgrindSupport ? config.php.valgrind or true + , ztsSupport ? (config.php.zts or false) || (apxs2Support) + }: let + pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; + in stdenv.mkDerivation { pname = "php"; inherit version; enableParallelBuilding = true; - nativeBuildInputs = [ autoconf automake bison file flex libtool pkgconfig re2c ]; - - buildInputs = [ ] - ++ lib.optional (lib.versionOlder version "7.3") pcre - ++ lib.optional (lib.versionAtLeast version "7.3") pcre2 - ++ lib.optional (lib.versionAtLeast version "7.4") oniguruma - ++ lib.optional withSystemd systemd - ++ lib.optionals imapSupport [ uwimap openssl pam ] - ++ lib.optionals curlSupport [ curl openssl ] - ++ lib.optionals ldapSupport [ openldap openssl ] - ++ lib.optionals gdSupport [ gd freetype libXpm libjpeg libpng libwebp ] - ++ lib.optionals opensslSupport [ openssl openssl.dev ] + nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; + + buildInputs = + # PCRE extension + [ pcre' ] + + # Enable sapis + ++ lib.optional pearSupport [ libxml2.dev ] + + # Misc deps ++ lib.optional apxs2Support apacheHttpd - ++ lib.optional (ldapSupport && stdenv.isLinux) cyrus_sasl - ++ lib.optional zlibSupport zlib - ++ lib.optional libxml2Support libxml2 - ++ lib.optional readlineSupport readline - ++ lib.optional sqliteSupport sqlite - ++ lib.optional postgresqlSupport postgresql - ++ lib.optional pdo_odbcSupport unixODBC - ++ lib.optional pdo_pgsqlSupport postgresql - ++ lib.optional gmpSupport gmp - ++ lib.optional gettextSupport gettext - ++ lib.optional intlSupport icu - ++ lib.optional xslSupport libxslt - ++ lib.optional bz2Support bzip2 - ++ lib.optional sodiumSupport libsodium - ++ lib.optional tidySupport html-tidy ++ lib.optional argon2Support libargon2 - ++ lib.optional libzipSupport libzip - ++ lib.optional valgrindSupport valgrind; + ++ lib.optional systemdSupport systemd + ++ lib.optional valgrindSupport valgrind + ; CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - configureFlags = [ "--with-config-file-scan-dir=/etc/php.d" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre.dev}" "PCRE_LIBDIR=${pcre}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre2.dev}" "PCRE_LIBDIR=${pcre2}" ] - ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}" - ++ lib.optional withSystemd "--with-fpm-systemd" - ++ lib.optionals imapSupport [ - "--with-imap=${uwimap}" - "--with-imap-ssl" - ] - ++ lib.optionals ldapSupport [ - "--with-ldap=/invalid/path" - "LDAP_DIR=${openldap.dev}" - "LDAP_INCDIR=${openldap.dev}/include" - "LDAP_LIBDIR=${openldap.out}/lib" - ] - ++ lib.optional (ldapSupport && stdenv.isLinux) "--with-ldap-sasl=${cyrus_sasl.dev}" - ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" - ++ lib.optional embedSupport "--enable-embed" - ++ lib.optional curlSupport "--with-curl=${curl.dev}" - ++ lib.optional zlibSupport "--with-zlib=${zlib.dev}" - ++ lib.optional (libxml2Support && (lib.versionOlder version "7.4")) "--with-libxml-dir=${libxml2.dev}" - ++ lib.optional (!libxml2Support) [ - "--disable-dom" - (if (lib.versionOlder version "7.4") then "--disable-libxml" else "--without-libxml") - "--disable-simplexml" - "--disable-xml" - "--disable-xmlreader" - "--disable-xmlwriter" - "--without-pear" - ] - ++ lib.optional pcntlSupport "--enable-pcntl" - ++ lib.optional readlineSupport "--with-readline=${readline.dev}" - ++ lib.optional sqliteSupport "--with-pdo-sqlite=${sqlite.dev}" - ++ lib.optional postgresqlSupport "--with-pgsql=${postgresql}" - ++ lib.optional pdo_odbcSupport "--with-pdo-odbc=unixODBC,${unixODBC}" - ++ lib.optional pdo_pgsqlSupport "--with-pdo-pgsql=${postgresql}" - ++ lib.optional (pdo_mysqlSupport && mysqlndSupport) "--with-pdo-mysql=mysqlnd" - ++ lib.optional (mysqliSupport && mysqlndSupport) "--with-mysqli=mysqlnd" - ++ lib.optional (pdo_mysqlSupport || mysqliSupport) "--with-mysql-sock=/run/mysqld/mysqld.sock" - ++ lib.optional bcmathSupport "--enable-bcmath" - ++ lib.optionals (gdSupport && lib.versionAtLeast version "7.4") [ - "--enable-gd" - "--with-external-gd=${gd.dev}" - "--with-webp=${libwebp}" - "--with-jpeg=${libjpeg.dev}" - "--with-xpm=${libXpm.dev}" - "--with-freetype=${freetype.dev}" - "--enable-gd-jis-conv" - ] ++ lib.optionals (gdSupport && lib.versionOlder version "7.4") [ - "--with-gd=${gd.dev}" - "--with-webp-dir=${libwebp}" - "--with-jpeg-dir=${libjpeg.dev}" - "--with-png-dir=${libpng.dev}" - "--with-freetype-dir=${freetype.dev}" - "--with-xpm-dir=${libXpm.dev}" - "--enable-gd-jis-conv" - ] - ++ lib.optional gmpSupport "--with-gmp=${gmp.dev}" - ++ lib.optional soapSupport "--enable-soap" - ++ lib.optional socketsSupport "--enable-sockets" - ++ lib.optional opensslSupport "--with-openssl" - ++ lib.optional mbstringSupport "--enable-mbstring" - ++ lib.optional gettextSupport "--with-gettext=${gettext}" - ++ lib.optional intlSupport "--enable-intl" - ++ lib.optional exifSupport "--enable-exif" - ++ lib.optional xslSupport "--with-xsl=${libxslt.dev}" - ++ lib.optional bz2Support "--with-bz2=${bzip2.dev}" - ++ lib.optional (zipSupport && (lib.versionOlder version "7.4")) "--enable-zip" - ++ lib.optional (zipSupport && (lib.versionAtLeast version "7.4")) "--with-zip" - ++ lib.optional ftpSupport "--enable-ftp" - ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional ztsSupport "--enable-maintainer-zts" - ++ lib.optional calendarSupport "--enable-calendar" - ++ lib.optional sodiumSupport "--with-sodium=${libsodium.dev}" - ++ lib.optional tidySupport "--with-tidy=${html-tidy}" - ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" - ++ lib.optional (libzipSupport && (lib.versionOlder version "7.4")) "--with-libzip=${libzip.dev}" - ++ lib.optional phpdbgSupport "--enable-phpdbg" - ++ lib.optional (!phpdbgSupport) "--disable-phpdbg" + configureFlags = + # Disable all extensions + [ "--disable-all" ] + + # PCRE + ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre'.dev}" ] + ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ [ "PCRE_LIBDIR=${pcre'}" ] + + + # Enable sapis ++ lib.optional (!cgiSupport) "--disable-cgi" ++ lib.optional (!cliSupport) "--disable-cli" - ++ lib.optional (!pharSupport) "--disable-phar" - ++ lib.optional xmlrpcSupport "--with-xmlrpc" + ++ lib.optional fpmSupport "--enable-fpm" + ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] + ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" + ++ lib.optional pharSupport "--enable-phar" + ++ lib.optional phpdbgSupport "--enable-phpdbg" + + + # Misc flags + ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" + ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional embedSupport "--enable-embed" ++ lib.optional (!ipv6Support) "--disable-ipv6" - ++ lib.optional (pearSupport && libxml2Support) "--with-pear=$(out)/lib/php/pear"; + ++ lib.optional systemdSupport "--with-fpm-systemd" + ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional ztsSupport "--enable-maintainer-zts" + ; hardeningDisable = [ "bindnow" ]; @@ -204,8 +101,6 @@ let --replace '@PHP_LDFLAGS@' "" done - substituteInPlace ./build/libtool.m4 --replace /usr/bin/file ${file}/bin/file - export EXTENSION_DIR=$out/lib/php/extensions ./buildconf --copy --force @@ -235,6 +130,12 @@ let inherit sha256; }; + patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + + separateDebugInfo = true; + + outputs = [ "out" "dev" ]; + meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; homepage = "https://www.php.net/"; @@ -243,57 +144,121 @@ let platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; }; + }; - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + generic' = { version, sha256, self, selfWithExtensions, ... }@args: + let + php = generic (builtins.removeAttrs args [ "self" "selfWithExtensions" ]); - stripDebugList = "bin sbin lib modules"; + php-packages = (callPackage ../../../top-level/php-packages.nix { + php = self; + phpWithExtensions = selfWithExtensions; + }); - outputs = [ "out" "dev" ]; - }; + buildEnv = { extensions ? (_: []), extraConfig ? "" }: + let + getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + enabledExtensions = extensions php-packages.extensions; - generic' = { version, sha256, ... }@args: let php = generic args; in php.overrideAttrs (_: { - passthru.buildEnv = { exts ? (_: []), extraConfig ? "" }: let - extraInit = writeText "custom-php.ini" '' - ${extraConfig} - ${lib.concatMapStringsSep "\n" (ext: let - extName = lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; - in '' - ${type}=${ext}/lib/php/extensions/${extName}.so - '') (exts (callPackage ../../../top-level/php-packages.nix { inherit php; }))} - ''; - in symlinkJoin { - name = "php-custom-${version}"; - nativeBuildInputs = [ makeWrapper ]; - paths = [ php ]; - postBuild = '' - wrapProgram $out/bin/php \ - --add-flags "-c ${extraInit}" - wrapProgram $out/bin/php-fpm \ - --add-flags "-c ${extraInit}" - ''; - }; - }); + # Generate extension load configuration snippets from the + # extension parameter. This is an attrset suitable for use + # with textClosureList, which is used to put the strings in + # the right order - if a plugin which is dependent on + # another plugin is placed before its dependency, it will + # fail to load. + extensionTexts = + lib.listToAttrs + (map (ext: + let + extName = getExtName ext; + type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + in + lib.nameValuePair extName { + text = "${type}=${ext}/lib/php/extensions/${extName}.so"; + deps = lib.optionals (ext ? internalDeps) + (map getExtName ext.internalDeps); + }) + enabledExtensions); -in { - php72 = generic' { - version = "7.2.28"; - sha256 = "18sjvl67z5a2x5s2a36g6ls1r3m4hbrsw52hqr2qsgfvg5dkm5bw"; + extNames = map getExtName enabledExtensions; + extraInit = writeText "custom-php.ini" '' + ${lib.concatStringsSep "\n" + (lib.textClosureList extensionTexts extNames)} + ${extraConfig} + ''; + in + symlinkJoin { + name = "php-with-extensions-${version}"; + inherit (php) version; + nativeBuildInputs = [ makeWrapper ]; + passthru = { + inherit buildEnv withExtensions enabledExtensions; + inherit (php-packages) packages extensions; + }; + paths = [ php ]; + postBuild = '' + cp ${extraInit} $out/lib/custom-php.ini + + wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + + if test -e $out/bin/php-fpm; then + wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + fi + ''; + }; + + withExtensions = extensions: buildEnv { inherit extensions; }; + in + php.overrideAttrs (_: { + passthru = { + enabledExtensions = []; + inherit buildEnv withExtensions; + inherit (php-packages) packages extensions; + }; + }); + + php72base = generic' { + version = "7.2.29"; + sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; + self = php72base; + selfWithExtensions = php72; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; }; - php73 = generic' { - version = "7.3.15"; - sha256 = "0g84hws15s8gh8iq4h6q747dyfazx47vh3da3whz8d80x83ibgld"; + php73base = generic' { + version = "7.3.16"; + sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; + self = php73base; + selfWithExtensions = php73; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; }; - php74 = generic' { - version = "7.4.3"; - sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ="; + php74base = generic' { + version = "7.4.4"; + sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; + self = php74base; + selfWithExtensions = php74; }; + + defaultPhpExtensions = extensions: with extensions; ([ + bcmath calendar curl ctype dom exif fileinfo filter ftp gd + gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache + openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql + posix readline session simplexml sockets soap sodium sqlite3 + tokenizer xmlreader xmlwriter zip zlib + ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]); + + defaultPhpExtensionsWithHash = extensions: + (defaultPhpExtensions extensions) ++ [ extensions.hash ]; + + php74 = php74base.withExtensions defaultPhpExtensions; + php73 = php73base.withExtensions defaultPhpExtensionsWithHash; + php72 = php72base.withExtensions defaultPhpExtensionsWithHash; + +in { + inherit php72base php73base php74base php72 php73 php74; } diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 6e57ad250bb..00e77033575 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { very sparing of data space. This means it can work well in small embedded devices. ''; - homepage = https://github.com/zsaleeba/picoc; - downloadPage = https://code.google.com/p/picoc/downloads/list; + homepage = "https://github.com/zsaleeba/picoc"; + downloadPage = "https://code.google.com/p/picoc/downloads/list"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix index 1a0a781b918..c49437717c1 100644 --- a/pkgs/development/interpreters/picolisp/default.nix +++ b/pkgs/development/interpreters/picolisp/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple Lisp with an integrated database"; - homepage = https://picolisp.com/; + homepage = "https://picolisp.com/"; license = licenses.mit; platforms = platforms.all; broken = stdenv.isDarwin; # times out diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 02f6d34a030..9b57e153aa0 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -84,7 +84,7 @@ let ''; meta = { description = "A clojure-like lisp, built with the pypy vm toolkit"; - homepage = https://github.com/pixie-lang/pixie; + homepage = "https://github.com/pixie-lang/pixie"; license = stdenv.lib.licenses.lgpl3; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; maintainers = with stdenv.lib.maintainers; [ bendlas ]; diff --git a/pkgs/development/interpreters/pyrex/0.9.5.nix b/pkgs/development/interpreters/pyrex/0.9.5.nix index 30a601ef8df..40eb1daf49c 100644 --- a/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonPackage { doCheck = false; meta = { - homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; + homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; description = "A language for writing Python extension modules"; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/interpreters/pyrex/0.9.6.nix b/pkgs/development/interpreters/pyrex/0.9.6.nix index 69a93089188..e518edba1b3 100644 --- a/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -14,7 +14,7 @@ python2Packages.buildPythonPackage { doCheck = false; meta = { - homepage = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/; + homepage = "http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"; description = "A language for writing Python extension modules"; license = stdenv.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 77b37c5f5c3..696be2136ec 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -263,7 +263,7 @@ in with passthru; stdenv.mkDerivation ({ doCheck = false; # expensive, and fails meta = { - homepage = http://python.org; + homepage = "http://python.org"; description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index b778b62f908..43d635f3a33 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -28,6 +28,8 @@ , stripTkinter ? false , rebuildBytecode ? true , stripBytecode ? false +, includeSiteCustomize ? true +, static ? false }: assert x11Support -> tcl != null @@ -130,7 +132,7 @@ in with passthru; stdenv.mkDerivation { CPPFLAGS = concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs); LDFLAGS = concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs); LIBS = "${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"; - NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = optionalString (stdenv.isLinux && !stdenv.hostPlatform.isMusl) "-lgcc_s" + optionalString stdenv.hostPlatform.isMusl "-lgcc_eh"; # Determinism: We fix the hashes of str, bytes and datetime objects. PYTHONHASHSEED=0; @@ -169,7 +171,7 @@ in with passthru; stdenv.mkDerivation { # Never even try to use lchmod on linux, # don't rely on detecting glibc-isms. "ac_cv_func_lchmod=no" - ]; + ] ++ optional static "LDFLAGS=-static"; preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity @@ -237,7 +239,7 @@ in with passthru; stdenv.mkDerivation { '' + optionalString stripTests '' # Strip tests rm -R $out/lib/python*/test $out/lib/python*/**/test{,s} - '' + '' + '' + optionalString includeSiteCustomize '' # Include a sitecustomize.py file cp ${../sitecustomize.py} $out/${sitePackages}/sitecustomize.py '' + optionalString rebuildBytecode '' @@ -262,7 +264,7 @@ 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) [ openssl.dev ] + stdenv.lib.optionals (openssl != null && !static) [ openssl.dev ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ # Ensure we don't have references to build-time packages. # These typically end up in shebangs. @@ -274,7 +276,7 @@ in with passthru; stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = http://python.org; + homepage = "http://python.org"; description = "A high-level dynamically-typed programming language"; longDescription = '' Python is a remarkably powerful dynamic programming language that diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix index e27959c05e8..e033858acc0 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-html.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python27-docs-html-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-html.tar.bz2"; sha256 = "1razs1grzhai65ihaiyph8kz6ncjkgp1gsn3c8v7kanf13lqim02"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix index 0226f7cd880..c9a770a6fcf 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-a4.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python27-docs-pdf-a4-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-a4.tar.bz2"; sha256 = "14ml1ynrlbhg43737bdsb8k5y39wsffqj4iwhylhb8n8l5dplfdq"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix index 88d1a693166..e03d031bae4 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-pdf-letter.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python27-docs-pdf-letter-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-pdf-letter.tar.bz2"; sha256 = "019i8n48m71mn31v8d85kkwyqfgcgqnqh506y4a7fcgf656bajs0"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix index ea35e9fb6a3..d19d7be1935 100644 --- a/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/2.7-text.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python27-docs-text-2.7.16"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/2.7.16/python-2.7.16-docs-text.tar.bz2"; sha256 = "1da7swlykvc013684nywycinfz3v8dqkcmv0zj8p7l5lyi5mq03r"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix index 45783eb8263..a83363b5c47 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-html.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python37-docs-html-3.7.2"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-html.tar.bz2"; sha256 = "19wbrawpdam09fmyipfy92sxwn1rl93v8jkfqsfx028qhvzf0422"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix index 998af644c71..e60032f71bf 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-a4.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python37-docs-pdf-a4-3.7.2"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-a4.tar.bz2"; sha256 = "0vdx762m30hjaabn6w88awcj2qpbz0b6z59zn9wmamd35k59lfba"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix index 1c6aea5ee3c..b737a1e3299 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-pdf-letter.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python37-docs-pdf-letter-3.7.2"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-pdf-letter.tar.bz2"; sha256 = "17g57vlyvqx0k916q84q2pcx7y8myw0fda9fvg9kh0ph930c837x"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix index 32388780f6f..2897042ec04 100644 --- a/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix +++ b/pkgs/development/interpreters/python/cpython/docs/3.7-text.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "python37-docs-text-3.7.2"; src = fetchurl { - url = http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2; + url = "http://docs.python.org/ftp/python/doc/3.7.2/python-3.7.2-docs-text.tar.bz2"; sha256 = "0h50rlr8jclwfxa106b42q2vn2ynp219c4zsy5qz65n5m3b7y1g2"; }; installPhase = '' diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 94f04b73f49..099632b1e85 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -96,10 +96,10 @@ in { sourceVersion = { major = "3"; minor = "7"; - patch = "6"; + patch = "7"; suffix = ""; }; - sha256 = "0gskry19ylw91p38pdq36qcgk6h3x5i4ia0ik977kw2943kwr8jm"; + sha256 = "0di1y2cna823qgk6sd2lvpjdm3g2qikdd50i2bjd330dpzqsk806"; inherit (darwin) configd; inherit passthruFun; }; @@ -147,6 +147,7 @@ in { stripTkinter = true; rebuildBytecode = false; stripBytecode = true; + includeSiteCustomize = false; }).overrideAttrs(old: { pname = "python3-minimal"; meta = old.meta // { diff --git a/pkgs/development/interpreters/python/hooks/default.nix b/pkgs/development/interpreters/python/hooks/default.nix index 47690320e81..4d736426f3b 100644 --- a/pkgs/development/interpreters/python/hooks/default.nix +++ b/pkgs/development/interpreters/python/hooks/default.nix @@ -89,6 +89,14 @@ in rec { }; } ./python-imports-check-hook.sh) {}; + pythonNamespacesHook = callPackage ({}: + makeSetupHook { + name = "python-namespaces-hook.sh"; + substitutions = { + inherit pythonSitePackages; + }; + } ./python-namespaces-hook.sh) {}; + pythonRemoveBinBytecodeHook = callPackage ({ }: makeSetupHook { name = "python-remove-bin-bytecode-hook"; diff --git a/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh new file mode 100644 index 00000000000..50f21819d17 --- /dev/null +++ b/pkgs/development/interpreters/python/hooks/python-namespaces-hook.sh @@ -0,0 +1,40 @@ +# Clean up __init__.py's found in namespace directories +echo "Sourcing python-namespaces-hook" + +pythonNamespacesHook() { + echo "Executing pythonNamespacesHook" + + for namespace in ${pythonNamespaces[@]}; do + echo "Enforcing PEP420 namespace: ${namespace}" + + # split namespace into segments. "azure.mgmt" -> "azure mgmt" + IFS='.' read -ra pathSegments <<< $namespace + constructedPath=$out/@pythonSitePackages@ + + # Need to remove the __init__.py at each namespace level + # E.g `azure/__init__.py` and `azure/mgmt/__init__.py` + # The __pycache__ entry also needs to be removed + for pathSegment in ${pathSegments[@]}; do + constructedPath=${constructedPath}/${pathSegment} + pathToRemove=${constructedPath}/__init__.py + pycachePath=${constructedPath}/__pycache__/__init__* + + if [ -f "$pathToRemove" ]; then + echo "Removing $pathToRemove" + rm "$pathToRemove" + fi + + if [ -f "$pycachePath" ]; then + echo "Removing $pycachePath" + rm "$pycachePath" + fi + done + done + + echo "Finished executing pythonNamespacesHook" +} + +if [ -z "${dontUsePythonNamespacesHook-}" -a -n "${pythonNamespaces-}" ]; then + postFixupHooks+=(pythonNamespacesHook) +fi + diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index 180bc63857c..22938a45585 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -16,6 +16,7 @@ , pipInstallHook , pythonCatchConflictsHook , pythonImportsCheckHook +, pythonNamespacesHook , pythonRemoveBinBytecodeHook , pythonRemoveTestsDirHook , setuptoolsBuildHook @@ -131,6 +132,9 @@ let ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ # This is a test, however, it should be ran independent of the checkPhase and checkInputs pythonImportsCheckHook + ] ++ lib.optionals (python.pythonAtLeast "3.3") [ + # Optionally enforce PEP420 for python3 + pythonNamespacesHook ] ++ nativeBuildInputs; buildInputs = buildInputs ++ pythonPath; diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 54400ae3e0a..e782eb2fdee 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -151,7 +151,7 @@ in with passthru; stdenv.mkDerivation rec { enableParallelBuilding = true; # almost no parallelization without STM meta = with stdenv.lib; { - homepage = http://pypy.org/; + homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 7ac8037293f..0ebd3364834 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -117,7 +117,7 @@ in with passthru; stdenv.mkDerivation { inherit passthru; meta = with stdenv.lib; { - homepage = http://pypy.org/; + homepage = "http://pypy.org/"; description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})"; license = licenses.mit; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/interpreters/python/sitecustomize.py b/pkgs/development/interpreters/python/sitecustomize.py index e03b244dbc0..72ce951328f 100644 --- a/pkgs/development/interpreters/python/sitecustomize.py +++ b/pkgs/development/interpreters/python/sitecustomize.py @@ -21,6 +21,19 @@ paths = os.environ.pop('NIX_PYTHONPATH', None) if paths: functools.reduce(lambda k, p: site.addsitedir(p, k), paths.split(':'), site._init_pathinfo()) -executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None) -if 'PYTHONEXECUTABLE' not in os.environ and executable: - sys.executable = executable +# Check whether we are in a venv. +# Note Python 2 does not support base_prefix so we assume we are not in a venv. +in_venv = sys.version_info.major == 3 and sys.prefix != sys.base_prefix + +if not in_venv: + executable = os.environ.pop('NIX_PYTHONEXECUTABLE', None) + prefix = os.environ.pop('NIX_PYTHONPREFIX', None) + + if 'PYTHONEXECUTABLE' not in os.environ and executable is not None: + sys.executable = executable + if prefix is not None: + # Because we cannot check with Python 2 whether we are in a venv, + # creating a venv from a Nix env won't work as well with Python 2. + # Also, note that sysconfig does not like it when sys.prefix is set to None + sys.prefix = sys.exec_prefix = prefix + site.PREFIXES.insert(0, prefix) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 37fbe670114..55065c45d57 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -2,6 +2,7 @@ , runCommand , substituteAll , lib +, callPackage }: let @@ -36,6 +37,7 @@ let is_venv = "True"; is_nixenv = "False"; }; + # Venv built using Python Nix environment (python.buildEnv) # TODO: Cannot create venv from a nix env # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. @@ -49,6 +51,14 @@ let # }; }; + # All PyPy package builds are broken at the moment + integrationTests = lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages + nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { + interpreter = python; + }; + }; + testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ inherit (python) pythonVersion; } // attrs) '' @@ -60,4 +70,4 @@ let touch $out/success ''; -in lib.mapAttrs testfun envs \ No newline at end of file +in lib.mapAttrs testfun envs // integrationTests diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix new file mode 100644 index 00000000000..05798cbaf1b --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/default.nix @@ -0,0 +1,25 @@ +{ interpreter, writeText, runCommandNoCC }: + +let + + python = let + packageOverrides = self: super: { + typeddep = super.callPackage ./typeddep {}; + }; + in interpreter.override {inherit packageOverrides; self = python;}; + + pythonEnv = python.withPackages(ps: [ + ps.typeddep + ps.mypy + ]); + + pythonScript = writeText "myscript.py" '' + from typeddep import util + s: str = util.echo("hello") + print(s) + ''; + +in runCommandNoCC "${interpreter.name}-site-prefix-mypy-test" {} '' + ${pythonEnv}/bin/mypy ${pythonScript} + touch $out +'' diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix new file mode 100644 index 00000000000..06219a69fca --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix @@ -0,0 +1,11 @@ +{ buildPythonPackage }: + + +buildPythonPackage { + + pname = "typeddep"; + version = "1.3.3.7"; + + src = ./.; + +} diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py new file mode 100644 index 00000000000..25bac69ea09 --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/setup.py @@ -0,0 +1,18 @@ +from setuptools import setup + +setup(**{ + 'name': 'typeddep', + 'version': '1.3.3.7', + 'description': 'Minimal repro to test mypy and site prefixes with Nix', + 'long_description': None, + 'author': 'adisbladis', + 'author_email': 'adisbladis@gmail.com', + 'maintainer': None, + 'maintainer_email': None, + 'url': None, + 'packages': ['typeddep'], + 'package_data': {'': ['*']}, + 'install_requires': [], + 'entry_points': {}, + 'python_requires': '>=3.7,<4.0', +}) diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.py b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.py new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/__init__.py diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typed b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typed new file mode 100644 index 00000000000..e69de29bb2d --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/py.typed diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py new file mode 100644 index 00000000000..c1c3ffe7477 --- /dev/null +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/typeddep/util.py @@ -0,0 +1,2 @@ +def echo(s: str) -> str: + return s diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_python.py index f631a172ccc..011978c6254 100644 --- a/pkgs/development/interpreters/python/tests/test_python.py +++ b/pkgs/development/interpreters/python/tests/test_python.py @@ -27,7 +27,7 @@ class TestCasePython(unittest.TestCase): def test_interpreter(self): self.assertEqual(sys.executable, INTERPRETER) - @unittest.skipIf(IS_NIXENV or IS_PYPY, "Prefix is incorrect and needs to be fixed.") + @unittest.skipIf(IS_PYPY, "Prefix is incorrect and needs to be fixed.") def test_prefix(self): self.assertEqual(sys.prefix, ENV) self.assertEqual(sys.prefix, sys.exec_prefix) @@ -35,9 +35,9 @@ class TestCasePython(unittest.TestCase): def test_site_prefix(self): self.assertTrue(sys.prefix in site.PREFIXES) - @unittest.skipIf(sys.version_info.major==2, "Python 2 does not have base_prefix") + @unittest.skipIf(IS_PYPY or sys.version_info.major==2, "Python 2 does not have base_prefix") def test_base_prefix(self): - if IS_VENV: + if IS_VENV or IS_NIXENV: self.assertNotEqual(sys.prefix, sys.base_prefix) else: self.assertEqual(sys.prefix, sys.base_prefix) diff --git a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py index 7e0580ce063..b568ee6751d 100755 --- a/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py +++ b/pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py @@ -315,11 +315,11 @@ def _update(path, target): return False -def _commit(path, pname, old_version, new_version, **kwargs): +def _commit(path, pname, old_version, new_version, pkgs_prefix="python: ", **kwargs): """Commit result. """ - msg = f'python: {pname}: {old_version} -> {new_version}' + msg = f'{pkgs_prefix}{pname}: {old_version} -> {new_version}' try: subprocess.check_call([GIT, 'add', path]) @@ -337,6 +337,7 @@ def main(): parser.add_argument('package', type=str, nargs='+') parser.add_argument('--target', type=str, choices=SEMVER.keys(), default='major') parser.add_argument('--commit', action='store_true', help='Create a commit for each package update') + parser.add_argument('--use-pkgs-prefix', action='store_true', help='Use python3Packages.${pname}: instead of python: ${pname}: when making commits') args = parser.parse_args() target = args.target @@ -347,17 +348,23 @@ def main(): # Use threads to update packages concurrently with Pool() as p: - results = list(p.map(lambda pkg: _update(pkg, target), packages)) + results = list(filter(bool, p.map(lambda pkg: _update(pkg, target), packages))) logging.info("Finished updating packages.") + commit_options = {} + if args.use_pkgs_prefix: + logging.info("Using python3Packages. prefix for commits") + commit_options["pkgs_prefix"] = "python3Packages." + # Commits are created sequentially. if args.commit: logging.info("Committing updates...") - list(map(lambda x: _commit(**x), filter(bool, results))) + # list forces evaluation + list(map(lambda x: _commit(**x, **commit_options), results)) logging.info("Finished committing updates") - count = sum(map(bool, results)) + count = len(results) logging.info("{} package(s) updated".format(count)) diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index b437584024f..dffad6b98f5 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -37,7 +37,7 @@ let if [ -f "$prg" ]; then rm -f "$out/bin/$prg" if [ -x "$prg" ]; then - makeWrapper "$path/bin/$prg" "$out/bin/$prg" --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"''} ${stdenv.lib.concatStringsSep " " makeWrapperArgs} fi fi done diff --git a/pkgs/development/interpreters/qnial/default.nix b/pkgs/development/interpreters/qnial/default.nix index d49886da8f5..1762edbbdb7 100644 --- a/pkgs/development/interpreters/qnial/default.nix +++ b/pkgs/development/interpreters/qnial/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "An array language from Nial Systems"; - homepage = https://github.com/vrthra/qnial; + homepage = "https://github.com/vrthra/qnial"; license = stdenv.lib.licenses.artistic1; maintainers = [ stdenv.lib.maintainers.vrthra ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 8e66bf96e8c..27447319a36 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { libraries support applications from web servers and databases to GUIs and charts. ''; - homepage = https://racket-lang.org/; + homepage = "https://racket-lang.org/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kkallio henrytill vrthra ]; platforms = [ "x86_64-darwin" "x86_64-linux" "aarch64-linux" ]; diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index ca8d2b2b0da..37abbd97746 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.02"; + version = "2020.02.1"; src = fetchurl { - url = "https://github.com/rakudo/rakudo/releases/download/${version}/rakudo-${version}.tar.gz"; - sha256 = "0yhld3ij4mfa42chkfph7lzcl5q9b613hdjmw9rv46appmxvvmrs"; + url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; + sha256 = "1qfaiqfclqd6zz04xl90yiqkvmm610r905nnbd6gszgyq1k77ckv"; }; buildInputs = [ icu zlib gmp perl ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Raku implementation on top of Moar virtual machine"; - homepage = https://www.rakudo.org; + homepage = "https://www.rakudo.org"; license = licenses.artistic2; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice vrthra sgo ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index 3c5c5f2a2f2..ade97b56a64 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.02"; + version = "2020.02.1"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "1kz97yy357lax7xdz4mnnwswn7axhp14nq0dw3n6xbcpap6m82aw"; + sha256 = "0cnnyjyci24pbws2cic80xdr7a5g3qvrsi221c6bpbnpkar81jw2"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index 84a214201a0..f12e60b14f0 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.02"; + version = "2020.02.1"; src = fetchurl { url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0ik3fscywxjx1qxlbjf68msz83alpckzw3myj9jmkalvy8q5v0nk"; + sha256 = "0zw3g7viyq4n4qwy0laww2mzz6wrzkfcq4fm82scy1mh65r7bdgj"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/rascal/default.nix b/pkgs/development/interpreters/rascal/default.nix index 22eee0f6ead..8b802043fe3 100644 --- a/pkgs/development/interpreters/rascal/default.nix +++ b/pkgs/development/interpreters/rascal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.rascal-mpl.org/; + 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 ]; diff --git a/pkgs/development/interpreters/rebol/default.nix b/pkgs/development/interpreters/rebol/default.nix index 274b70b2c79..b26af7f0b1b 100644 --- a/pkgs/development/interpreters/rebol/default.nix +++ b/pkgs/development/interpreters/rebol/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ vrthra ]; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - homepage = http://www.rebol.com/; + homepage = "http://www.rebol.com/"; }; } diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index 2121f54a3b1..e1460ec51a2 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -87,6 +87,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ uralbash ]; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.bsd3; - homepage = https://www.red-lang.org/; + homepage = "https://www.red-lang.org/"; }; } diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 759a44b5760..d09d150bd79 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ren'Py Visual Novel Engine"; - homepage = https://renpy.org/; + homepage = "https://renpy.org/"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index 8ddd19bb40c..1756c13b53d 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -190,7 +190,7 @@ let meta = with stdenv.lib; { description = "The Ruby language"; - homepage = http://www.ruby-lang.org/en/; + homepage = "http://www.ruby-lang.org/en/"; license = licenses.ruby; maintainers = with maintainers; [ vrthra manveru ]; platforms = platforms.all; @@ -224,26 +224,26 @@ let in { ruby_2_5 = generic { - version = rubyVersion "2" "5" "7" ""; + version = rubyVersion "2" "5" "8" ""; sha256 = { - src = "1m6nmnj9shifp8g3yh7aimac01vl035bzcc19x2spdji6ig0sb8b"; - git = "0wppf82c9ccdbnvj30mppr5a3mc7sxm05diahjdw7hhk29n43knp"; + src = "16md4jspjwixjlbhx3pnd5iwpca07p23ghkxkqd82sbchw3xy2vc"; + git = "19gkk3q9l33cwkfsp5k8f8fipq7gkyqkqirm9farbvy425519rv2"; }; }; ruby_2_6 = generic { - version = rubyVersion "2" "6" "5" ""; + version = rubyVersion "2" "6" "6" ""; sha256 = { - src = "0zgdrgylq6avbblf78kpaf0k2xnkpc3jng3wkd7x67ycdrqnp5v6"; - git = "0pay6ic22ag3bnvxffhgwp7z6clkd0p93944a1l4lvc5hxc8v77j"; + src = "1492x795qzgp3zhpl580kd1sdp50n5hfsmpbfhdsq2rnxwyi8jrn"; + git = "1jr9v99a7awssqmw7531afbx4a8i9x5yfqyffha545g7r4s7kj50"; }; }; ruby_2_7 = generic { - version = rubyVersion "2" "7" "0" ""; + version = rubyVersion "2" "7" "1" ""; sha256 = { - src = "1glc3zpnih6h8mrgfcak0aa7cgmi4zyvxfyi6y2brwg2nn9sm6cc"; - git = "11iz64k95czs273mb10195d1j75mmbcgddfdx1vay5876ffw81dq"; + src = "0674x98f542y02r7n2yv2qhmh97blqhi2mvh2dn5f000vlxlh66l"; + git = "0qk729kr5wm67xmwpljpdprwhp5wvn5y4ikqy00p1zcgwlwdcs33"; }; }; } diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix index 4838a1a09e5..b0c26e19e13 100644 --- a/pkgs/development/interpreters/ruby/patchsets.nix +++ b/pkgs/development/interpreters/ruby/patchsets.nix @@ -1,21 +1,19 @@ { patchSet, useRailsExpress, ops, patchLevel, fetchpatch }: { - "2.4.9" = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.4/head/railsexpress/01-skip-broken-tests.patch" - "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch" - "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch" - ]; - "2.5.7" = ops useRailsExpress [ + "2.5.8" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.6.5" = ops useRailsExpress [ + "2.6.6" = ops useRailsExpress [ "${patchSet}/patches/ruby/2.6/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/02-improve-gc-stats.patch" "${patchSet}/patches/ruby/2.6/head/railsexpress/03-more-detailed-stacktrace.patch" ]; - "2.7.0" = ops useRailsExpress [ # no patches yet (2019-12-25) + "2.7.1" = ops useRailsExpress [ + "${patchSet}/patches/ruby/2.7/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/02-improve-gc-stats.patch" + "${patchSet}/patches/ruby/2.7/head/railsexpress/03-more-detailed-stacktrace.patch" ]; } diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix index 3caac2447e2..0bbcadba3f5 100644 --- a/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Package management framework for Ruby"; - homepage = https://rubygems.org/; + homepage = "https://rubygems.org/"; license = with licenses; [ mit /* or */ ruby ]; maintainers = with maintainers; [ qyliss zimbatm ]; }; diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix index 883987683b0..331dda5d050 100644 --- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix +++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix @@ -3,6 +3,6 @@ fetchFromGitHub { owner = "skaes"; repo = "rvm-patchsets"; - rev = "58f72dccc8bb4dc9b1035f6af903d21f2465367a"; - sha256 = "00gbrhvnf05g6zmfim472ld0l1lp100dy4pi3lixm6ry9iw9m4ag"; + rev = "6d8888d34a321198f7fd9253343b78c209efb046"; + sha256 = "0xczl0nng1649km3bcbjn6zrr591l6m2kkwgnknh1fnwmmrdaya7"; } diff --git a/pkgs/development/interpreters/scheme48/default.nix b/pkgs/development/interpreters/scheme48/default.nix index e01aef98303..32dd28bcb20 100644 --- a/pkgs/development/interpreters/scheme48/default.nix +++ b/pkgs/development/interpreters/scheme48/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "scheme48-1.9.2"; meta = { - homepage = http://s48.org/; + homepage = "http://s48.org/"; description = "Scheme 48"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; unix; @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; src = fetchurl { - url = http://s48.org/1.9.2/scheme48-1.9.2.tgz; + url = "http://s48.org/1.9.2/scheme48-1.9.2.tgz"; sha256 = "1x4xfm3lyz2piqcw1h01vbs1iq89zq7wrsfjgh3fxnlm1slj2jcw"; }; } diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 85c9434f081..bb4f418f502 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Scheme shell"; - homepage = http://www.scsh.net/; + homepage = "http://www.scsh.net/"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; platforms = with platforms; unix; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index 43f5758e4c4..ccf85f1d1c4 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; - homepage = http://selflanguage.org/; + homepage = "http://selflanguage.org/"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.doublec ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/interpreters/spidermonkey/1.8.5.nix b/pkgs/development/interpreters/spidermonkey/1.8.5.nix index fe77a27d449..37efeba3f9b 100644 --- a/pkgs/development/interpreters/spidermonkey/1.8.5.nix +++ b/pkgs/development/interpreters/spidermonkey/1.8.5.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/spidermonkey/38.nix b/pkgs/development/interpreters/spidermonkey/38.nix index 89bbd713a5c..d2aabfe64d9 100644 --- a/pkgs/development/interpreters/spidermonkey/38.nix +++ b/pkgs/development/interpreters/spidermonkey/38.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/development/interpreters/spidermonkey/60.nix b/pkgs/development/interpreters/spidermonkey/60.nix index f6a4483edba..42731421d81 100644 --- a/pkgs/development/interpreters/spidermonkey/60.nix +++ b/pkgs/development/interpreters/spidermonkey/60.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Mozilla's JavaScript engine written in C/C++"; - homepage = https://developer.mozilla.org/en/SpiderMonkey; + homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. maintainers = [ maintainers.abbradar ]; platforms = platforms.linux; diff --git a/pkgs/development/interpreters/spidermonkey/68.nix b/pkgs/development/interpreters/spidermonkey/68.nix new file mode 100644 index 00000000000..cad1aabf374 --- /dev/null +++ b/pkgs/development/interpreters/spidermonkey/68.nix @@ -0,0 +1,95 @@ +{ stdenv, fetchurl, fetchpatch, autoconf213, pkgconfig, perl, python2, python3, zip, buildPackages +, which, readline, zlib, icu, cargo, rustc, llvmPackages }: + +with stdenv.lib; + +let + python3Env = buildPackages.python3.withPackages (p: [p.six]); +in stdenv.mkDerivation rec { + pname = "spidermonkey"; + version = "68.4.2"; + + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; + sha256 = "1x1fglg1b85hb0srd6k7n5svl0nlgdm4njc8q13s2750v5ck4ljx"; + }; + + outputs = [ "out" "dev" ]; + setOutputFlags = false; # Configure script only understands --includedir + + nativeBuildInputs = [ + autoconf213 + pkgconfig + perl + which + python2 + zip + cargo + rustc + llvmPackages.llvm + ]; + + buildInputs = [ + readline + zlib + icu + ]; + + preConfigure = '' + export CXXFLAGS="-fpermissive" + export LIBXUL_DIST=$out + export PYTHON3="${python3Env.interpreter}" + + # We can't build in js/src/, so create a build dir + mkdir obj + cd obj/ + configureScript=../js/src/configure + ''; + + configureFlags = [ + # Reccommended by gjs upstream + "--disable-jemalloc" + "--enable-unaligned-private-values" + "--with-intl-api" + "--enable-posix-nspr-emulation" + "--with-system-zlib" + "--with-system-icu" + + "--with-libclang-path=${llvmPackages.libclang}/lib" + "--with-clang-path=${llvmPackages.clang}/bin/clang" + + "--enable-shared-js" + "--enable-readline" + # Fedora and Arch disable optimize, but it doesn't seme to be necessary + # It turns on -O3 which some gcc version had a problem with: + # https://src.fedoraproject.org/rpms/mozjs38/c/761399aba092bcb1299bb4fccfd60f370ab4216e + "--enable-optimize" + "--enable-release" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # Spidermonkey seems to use different host/build terminology for cross + # compilation here. + "--host=${stdenv.buildPlatform.config}" + "--target=${stdenv.hostPlatform.config}" + ]; + + configurePlatforms = []; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + # Remove unnecessary static lib + preFixup = '' + moveToOutput bin/js60-config "$dev" + rm $out/lib/libjs_static.ajs + ln -s $out/bin/js60 $out/bin/js + ''; + + enableParallelBuilding = true; + + meta = with stdenv.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. + maintainers = [ maintainers.abbradar ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/interpreters/tcl/generic.nix b/pkgs/development/interpreters/tcl/generic.nix index fd84d93ba75..9aaf8223837 100644 --- a/pkgs/development/interpreters/tcl/generic.nix +++ b/pkgs/development/interpreters/tcl/generic.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Tcl scripting language"; - homepage = https://www.tcl.tk/; + homepage = "https://www.tcl.tk/"; license = licenses.tcltk; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/interpreters/tinyscheme/default.nix b/pkgs/development/interpreters/tinyscheme/default.nix index ca897ec692c..b49a37a7285 100644 --- a/pkgs/development/interpreters/tinyscheme/default.nix +++ b/pkgs/development/interpreters/tinyscheme/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { TinyScheme is a lightweight Scheme interpreter that implements as large a subset of R5RS as was possible without getting very large and complicated. ''; - homepage = http://tinyscheme.sourceforge.net/; + homepage = "http://tinyscheme.sourceforge.net/"; license = licenses.bsdOriginal; maintainers = [ maintainers.ebzzry ]; platforms = platforms.unix; diff --git a/pkgs/development/interpreters/unicon-lang/default.nix b/pkgs/development/interpreters/unicon-lang/default.nix index bb4a2d01499..d908346f196 100644 --- a/pkgs/development/interpreters/unicon-lang/default.nix +++ b/pkgs/development/interpreters/unicon-lang/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; license = licenses.gpl2; - homepage = http://unicon.org; + homepage = "http://unicon.org"; }; } diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index eaecd1eb89b..6e06406b34f 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; - homepage = https://github.com/CraneStation/wasmtime; + homepage = "https://github.com/CraneStation/wasmtime"; license = licenses.asl20; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.unix; diff --git a/pkgs/development/java-modules/jogl/default.nix b/pkgs/development/java-modules/jogl/default.nix index 80f19ab65f5..574629d8efd 100644 --- a/pkgs/development/java-modules/jogl/default.nix +++ b/pkgs/development/java-modules/jogl/default.nix @@ -6,7 +6,7 @@ version = "2.3.2"; gluegen-src = fetchgit { - url = git://jogamp.org/srv/scm/gluegen.git; + url = "git://jogamp.org/srv/scm/gluegen.git"; rev = "v${version}"; sha256 = "00hybisjwqs88p24dds652bzrwbbmhn2dpx56kp4j6xpadkp33d0"; fetchSubmodules = true; @@ -16,7 +16,7 @@ inherit version; src = fetchgit { - url = git://jogamp.org/srv/scm/jogl.git; + url = "git://jogamp.org/srv/scm/jogl.git"; rev = "v${version}"; sha256 = "0msi2gxiqm2yqwkmxqbh521xdrimw1fly20g890r357rcgj8fsn3"; fetchSubmodules = true; @@ -56,7 +56,7 @@ meta = with stdenv.lib; { description = "Java libraries for 3D Graphics, Multimedia and Processing"; - homepage = https://jogamp.org/; + homepage = "https://jogamp.org/"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/development/java-modules/junit/default.nix b/pkgs/development/java-modules/junit/default.nix index 6f86cede512..dbbce6b6262 100644 --- a/pkgs/development/java-modules/junit/default.nix +++ b/pkgs/development/java-modules/junit/default.nix @@ -19,7 +19,7 @@ in rec { m2Path = "/junit/junit/${version}"; meta = { - homepage = https://junit.org/junit4/; + 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; diff --git a/pkgs/development/java-modules/maven-hello/default.nix b/pkgs/development/java-modules/maven-hello/default.nix index b8e128ac728..b4639d9ee1d 100644 --- a/pkgs/development/java-modules/maven-hello/default.nix +++ b/pkgs/development/java-modules/maven-hello/default.nix @@ -18,7 +18,7 @@ in rec { m2Path = "/com/nequissimus/maven-hello/${version}"; meta = { - homepage = https://github.com/NeQuissimus/maven-hello/; + homepage = "https://github.com/NeQuissimus/maven-hello/"; description = "Maven Hello World"; license = stdenv.lib.licenses.unlicense; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/java-modules/postgresql_jdbc/default.nix b/pkgs/development/java-modules/postgresql_jdbc/default.nix index 69cb24fc0b0..01041d77539 100644 --- a/pkgs/development/java-modules/postgresql_jdbc/default.nix +++ b/pkgs/development/java-modules/postgresql_jdbc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://jdbc.postgresql.org/; + homepage = "https://jdbc.postgresql.org/"; description = "JDBC driver for PostgreSQL allowing Java programs to connect to a PostgreSQL database"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index 1ae6346cbe5..ab9440c3034 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { (compatibility and core profiles), DirectX 9, DirectX 10 or DirectX 11 to interactively tweak parameters on-screen ''; - homepage = http://anttweakbar.sourceforge.net/; + homepage = "http://anttweakbar.sourceforge.net/"; license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.razvan ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/CGAL/4.nix b/pkgs/development/libraries/CGAL/4.nix index 60c244009ce..ad900744f54 100644 --- a/pkgs/development/libraries/CGAL/4.nix +++ b/pkgs/development/libraries/CGAL/4.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Computational Geometry Algorithms Library"; - homepage = http://cgal.org; + homepage = "http://cgal.org"; license = with licenses; [ gpl3Plus lgpl3Plus]; platforms = platforms.all; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index f251d2bed0c..7adb6e6437e 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = https://projects.coin-or.org/CoinMP/; + homepage = "https://projects.coin-or.org/CoinMP/"; description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"; platforms = platforms.unix; license = licenses.epl10; diff --git a/pkgs/development/libraries/LASzip/default.nix b/pkgs/development/libraries/LASzip/default.nix index 418900ddeeb..fb747dc9f33 100644 --- a/pkgs/development/libraries/LASzip/default.nix +++ b/pkgs/development/libraries/LASzip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Turn quickly bulky LAS files into compact LAZ files without information loss"; - homepage = https://laszip.org; + homepage = "https://laszip.org"; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.michelk ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index e02ea05a726..93d708e7d31 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -24,11 +24,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "SDL2"; - version = "2.0.10"; + version = "2.0.12"; src = fetchurl { url = "https://www.libsdl.org/release/${pname}-${version}.tar.gz"; - sha256 = "0mqxp6w5jhbq6y1j690g9r3gpzwjxh4czaglw8x05l7hl49nqrdl"; + sha256 = "0qy8wbqvfkb5ps8kxgaaf2zzpkjqbsw712hlp74znbn0jpv6i4il"; }; outputs = [ "out" "dev" ]; @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform multimedia library"; - homepage = http://www.libsdl.org/; + homepage = "http://www.libsdl.org/"; license = licenses.zlib; platforms = platforms.all; maintainers = with maintainers; [ cpages ]; diff --git a/pkgs/development/libraries/SDL2_gfx/default.nix b/pkgs/development/libraries/SDL2_gfx/default.nix index d57bb6cbc94..1ed56c6750f 100644 --- a/pkgs/development/libraries/SDL2_gfx/default.nix +++ b/pkgs/development/libraries/SDL2_gfx/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/; + homepage = "http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx/"; license = licenses.zlib; maintainers = with maintainers; [ cpages ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix index 326d9d66264..00de774ba6e 100644 --- a/pkgs/development/libraries/SDL2_image/default.nix +++ b/pkgs/development/libraries/SDL2_image/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL image library"; - homepage = http://www.libsdl.org/projects/SDL_image/; + homepage = "http://www.libsdl.org/projects/SDL_image/"; platforms = platforms.unix; license = licenses.zlib; maintainers = with maintainers; [ cpages ]; diff --git a/pkgs/development/libraries/SDL2_mixer/default.nix b/pkgs/development/libraries/SDL2_mixer/default.nix index 58c76e3a3f5..4fa9df617a6 100644 --- a/pkgs/development/libraries/SDL2_mixer/default.nix +++ b/pkgs/development/libraries/SDL2_mixer/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; platforms = platforms.unix; - homepage = https://www.libsdl.org/projects/SDL_mixer/; + homepage = "https://www.libsdl.org/projects/SDL_mixer/"; maintainers = with maintainers; [ MP2E ]; license = licenses.zlib; }; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix index 309102e70b5..0bec12cdb24 100644 --- a/pkgs/development/libraries/SDL2_net/default.nix +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multiplatform networking library"; - homepage = https://www.libsdl.org/projects/SDL_net; + homepage = "https://www.libsdl.org/projects/SDL_net"; license = licenses.zlib; maintainers = with maintainers; [ MP2E ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 50e47bc1d36..571c953a81b 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "SDL TrueType library"; platforms = platforms.unix; license = licenses.zlib; - homepage = https://www.libsdl.org/projects/SDL_ttf/; + homepage = "https://www.libsdl.org/projects/SDL_ttf/"; }; } diff --git a/pkgs/development/libraries/SDL_Pango/default.nix b/pkgs/development/libraries/SDL_Pango/default.nix index e330ccef611..9340b9f7091 100644 --- a/pkgs/development/libraries/SDL_Pango/default.nix +++ b/pkgs/development/libraries/SDL_Pango/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch; + url = "https://sources.debian.org/data/main/s/sdlpango/0.1.2-6/debian/patches/api_additions.patch"; sha256 = "00p5ry5gd3ixm257p9i2c4jg0qj8ipk8nf56l7c9fma8id3zxyld"; }) ./fixes.patch @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Connects the Pango rendering engine to SDL"; license = licenses.lgpl21Plus; platforms = platforms.all; - homepage = http://sdlpango.sourceforge.net/; + homepage = "http://sdlpango.sourceforge.net/"; maintainers = with maintainers; [ puckipedia ]; }; } diff --git a/pkgs/development/libraries/SDL_gfx/default.nix b/pkgs/development/libraries/SDL_gfx/default.nix index 74a31d94687..3696e485ad7 100644 --- a/pkgs/development/libraries/SDL_gfx/default.nix +++ b/pkgs/development/libraries/SDL_gfx/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { code. Its is written in plain C and can be used in C++ code. ''; - homepage = https://sourceforge.net/projects/sdlgfx/; + homepage = "https://sourceforge.net/projects/sdlgfx/"; license = licenses.zlib; maintainers = with maintainers; [ bjg ]; diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 427439f496e..e52273052b5 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SDL multi-channel audio mixer library"; - homepage = http://www.libsdl.org/projects/SDL_mixer/; + homepage = "http://www.libsdl.org/projects/SDL_mixer/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; license = licenses.zlib; diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix index 6ac91a6d129..a24020da015 100644 --- a/pkgs/development/libraries/SDL_net/default.nix +++ b/pkgs/development/libraries/SDL_net/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "SDL networking library"; platforms = platforms.unix; license = licenses.zlib; - homepage = https://www.libsdl.org/projects/SDL_net/release-1.2.html; + homepage = "https://www.libsdl.org/projects/SDL_net/release-1.2.html"; }; } diff --git a/pkgs/development/libraries/SDL_sixel/default.nix b/pkgs/development/libraries/SDL_sixel/default.nix index 66fa8888fd1..8d37124d311 100644 --- a/pkgs/development/libraries/SDL_sixel/default.nix +++ b/pkgs/development/libraries/SDL_sixel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A cross-platform multimedia library, that supports sixel graphics on consoles"; - homepage = https://github.com/saitoha/SDL1.2-SIXEL; + homepage = "https://github.com/saitoha/SDL1.2-SIXEL"; maintainers = with maintainers; [ vrthra ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/SDL_sound/default.nix b/pkgs/development/libraries/SDL_sound/default.nix index 94534ecd699..bdc97e98f34 100644 --- a/pkgs/development/libraries/SDL_sound/default.nix +++ b/pkgs/development/libraries/SDL_sound/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { description = "SDL sound library"; platforms = platforms.unix; license = licenses.lgpl21; - homepage = https://www.icculus.org/SDL_sound/; + homepage = "https://www.icculus.org/SDL_sound/"; }; } diff --git a/pkgs/development/libraries/SDL_stretch/default.nix b/pkgs/development/libraries/SDL_stretch/default.nix index 9695d51ed89..1f068c9e976 100644 --- a/pkgs/development/libraries/SDL_stretch/default.nix +++ b/pkgs/development/libraries/SDL_stretch/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stretch Functions For SDL"; - homepage = http://sdl-stretch.sourceforge.net/; + homepage = "http://sdl-stretch.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix index 96b60b1061f..cd6355c9ce2 100644 --- a/pkgs/development/libraries/SDL_ttf/default.nix +++ b/pkgs/development/libraries/SDL_ttf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "SDL TrueType library"; license = licenses.zlib; platforms = platforms.all; - homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html; + homepage = "https://www.libsdl.org/projects/SDL_ttf/release-1.2.html"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/Xaw3d/default.nix b/pkgs/development/libraries/Xaw3d/default.nix index 3e496b7e981..d26a910638e 100644 --- a/pkgs/development/libraries/Xaw3d/default.nix +++ b/pkgs/development/libraries/Xaw3d/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "Xaw3d-1.6.3"; src = fetchurl { - url = https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2; + url = "https://www.x.org/releases/individual/lib/libXaw3d-1.6.3.tar.bz2"; sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; dontUseImakeConfigure = true; diff --git a/pkgs/development/libraries/a52dec/default.nix b/pkgs/development/libraries/a52dec/default.nix index 5ff5e609723..8ed47b91e5d 100644 --- a/pkgs/development/libraries/a52dec/default.nix +++ b/pkgs/development/libraries/a52dec/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "ATSC A/52 stream decoder"; - homepage = http://liba52.sourceforge.net/; + homepage = "http://liba52.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix index 8b1878b0cc3..94453264419 100644 --- a/pkgs/development/libraries/aalib/default.nix +++ b/pkgs/development/libraries/aalib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "aalib-1.4rc5"; src = fetchurl { - url = mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz; + url = "mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz"; sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv"; }; diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index bd896fb9c65..6b7739b322d 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source collection of C++ code designed to augment the C++ standard library"; - homepage = https://abseil.io/; + homepage = "https://abseil.io/"; license = licenses.asl20; maintainers = [ maintainers.andersk ]; }; diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index bae7b56cb8e..b60d8d07385 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt library for accessing the online accounts database"; - homepage = https://gitlab.com/accounts-sso; + homepage = "https://gitlab.com/accounts-sso"; license = licenses.lgpl21; platforms = with platforms; linux; }; diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index eb48aca80ee..85b23de0c1c 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus interface for user account query and manipulation"; - homepage = https://www.freedesktop.org/wiki/Software/AccountsService; + homepage = "https://www.freedesktop.org/wiki/Software/AccountsService"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix index ea352772b33..372cfbeffff 100644 --- a/pkgs/development/libraries/ace/default.nix +++ b/pkgs/development/libraries/ace/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ADAPTIVE Communication Environment"; - homepage = http://www.dre.vanderbilt.edu/~schmidt/ACE.html; + homepage = "http://www.dre.vanderbilt.edu/~schmidt/ACE.html"; license = licenses.doc; platforms = platforms.linux; maintainers = [ maintainers.nico202 ]; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index c9797b31eaa..2f468c7f4c1 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.chiark.greenend.org.uk/~ian/adns/; + homepage = "http://www.chiark.greenend.org.uk/~ian/adns/"; description = "Asynchronous DNS Resolver Library"; license = stdenv.lib.licenses.lgpl2; diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index f0d87c81133..71651726261 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib curl expat fuse openssl python3 ]; meta = { - homepage = http://afflib.sourceforge.net/; + homepage = "http://afflib.sourceforge.net/"; description = "Advanced forensic format library"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsdOriginal; diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix index 62856157b4b..513b79e6393 100644 --- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix +++ b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix @@ -14,7 +14,7 @@ agda.mkDerivation (self: rec { sourceDirectories = []; meta = { - homepage = https://github.com/jonsterling/Agda-Sheaves; + homepage = "https://github.com/jonsterling/Agda-Sheaves"; description = "Sheaves in Agda"; license = stdenv.lib.licenses.cc-by-40; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix index 344da00d04f..97cceebc1b6 100644 --- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix +++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix @@ -16,7 +16,7 @@ agda.mkDerivation (self: rec { topSourceDirectories = [ "../$sourceRoot" ]; meta = with stdenv.lib; { - homepage = http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html; + homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html"; description = "A monadic parser combinator library which guarantees termination of parsing"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix index 1bc9d0cb882..678b3a28dc7 100644 --- a/pkgs/development/libraries/agda/agda-base/default.nix +++ b/pkgs/development/libraries/agda/agda-base/default.nix @@ -13,7 +13,7 @@ agda.mkDerivation (self: rec { everythingFile = "README.agda"; meta = { - homepage = https://github.com/pcapriotti/agda-base; + homepage = "https://github.com/pcapriotti/agda-base"; description = "Base library for HoTT in Agda"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index 30a03980e44..23013bfbc32 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix @@ -18,7 +18,7 @@ agda.mkDerivation (self: rec { ''; meta = { - homepage = https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/; + homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/"; description = "Agda standard library developed at Iowa"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index bcdad18bede..86f21ad9b19 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -14,7 +14,7 @@ agda.mkDerivation (self: rec { everythingFile = "src/Prelude.agda"; meta = with stdenv.lib; { - homepage = https://github.com/UlfNorell/agda-prelude; + homepage = "https://github.com/UlfNorell/agda-prelude"; description = "Programming library for Agda"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 033ba67f661..6056173c311 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -19,7 +19,7 @@ agda.mkDerivation (self: rec { topSourceDirectories = [ "src" ]; meta = with stdenv.lib; { - homepage = http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary; + homepage = "http://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; diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix index c09702c48d7..bf9798557b1 100644 --- a/pkgs/development/libraries/agda/bitvector/default.nix +++ b/pkgs/development/libraries/agda/bitvector/default.nix @@ -14,7 +14,7 @@ agda.mkDerivation (self: rec { sourceDirectories = [ "Data" ]; meta = { - homepage = https://github.com/copumpkin/bitvector; + homepage = "https://github.com/copumpkin/bitvector"; description = "Sequences of bits and common operations on them"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix index a58afd7e866..fef01ee9be7 100644 --- a/pkgs/development/libraries/agda/categories/default.nix +++ b/pkgs/development/libraries/agda/categories/default.nix @@ -14,7 +14,7 @@ agda.mkDerivation (self: rec { sourceDirectories = [ "Categories" "Graphs" ]; meta = { - homepage = https://github.com/copumpkin/categories; + homepage = "https://github.com/copumpkin/categories"; description = "Categories parametrized by morphism equality, in Agda"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix index ffae1f6f900..de4cfaa6637 100644 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ b/pkgs/development/libraries/agda/pretty/default.nix @@ -16,7 +16,7 @@ agda.mkDerivation (self: rec { topSourceDirectories = [ "../$sourceRoot" ]; meta = with stdenv.lib; { - homepage = http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html; + homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html"; description = "Correct-by-Construction Pretty-Printing"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/agg/default.nix b/pkgs/development/libraries/agg/default.nix index 69517817b59..d65ff369064 100644 --- a/pkgs/development/libraries/agg/default.nix +++ b/pkgs/development/libraries/agg/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.antigrain.com/; + homepage = "http://www.antigrain.com/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index d2021e23b53..fd612170910 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game programming library"; - homepage = https://liballeg.org/; + homepage = "https://liballeg.org/"; license = licenses.zlib; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 64488b25b09..963590d4faf 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game programming library"; - homepage = https://liballeg.org/; + homepage = "https://liballeg.org/"; license = licenses.free; # giftware maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/alure/default.nix b/pkgs/development/libraries/alure/default.nix index a4f3b714e1c..59926f52b07 100644 --- a/pkgs/development/libraries/alure/default.nix +++ b/pkgs/development/libraries/alure/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility library to help manage common tasks with OpenAL applications"; - homepage = https://kcat.strangesoft.net/alure.html; + homepage = "https://kcat.strangesoft.net/alure.html"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/amrnb/default.nix b/pkgs/development/libraries/amrnb/default.nix index bfb72be24fe..aaee86c62ef 100644 --- a/pkgs/development/libraries/amrnb/default.nix +++ b/pkgs/development/libraries/amrnb/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { name = "amrnb-11.0.0.0"; srcAmr = fetchurl { - url = http://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip; + url = "http://www.3gpp.org/ftp/Specs/latest/Rel-11/26_series/26104-b00.zip"; sha256 = "1wf8ih0hk7w20vdlnw7jb7w73v15hbxgbvmq4wq7h2ghn0j8ppr3"; }; src = fetchurl { - url = http://www.penguin.cz/~utx/ftp/amr/amrnb-11.0.0.0.tar.bz2; + url = "http://www.penguin.cz/~utx/ftp/amr/amrnb-11.0.0.0.tar.bz2"; sha256 = "1qgiw02n2a6r32pimnd97v2jkvnw449xrqmaxiivjy2jcr5h141q"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.penguin.cz/~utx/amr; + homepage = "http://www.penguin.cz/~utx/amr"; description = "AMR Narrow-Band Codec"; # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on diff --git a/pkgs/development/libraries/amrwb/default.nix b/pkgs/development/libraries/amrwb/default.nix index 7525b3baab0..e6581d54911 100644 --- a/pkgs/development/libraries/amrwb/default.nix +++ b/pkgs/development/libraries/amrwb/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "11.0.0.0"; srcAmr = fetchurl { - url = http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip; + url = "http://www.3gpp.org/ftp/Specs/archive/26_series/26.204/26204-b00.zip"; sha256 = "1v4zhs6f1mf1xkrzhljh05890in0rpr5d5pcak9h4igxhd2c91f8"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.penguin.cz/~utx/amr; + homepage = "http://www.penguin.cz/~utx/amr"; description = "AMR Wide-Band Codec"; # The wrapper code is free, but not the libraries from 3gpp. # It's a source code reference implementation with patents and licenses on diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index bbb7e98f661..48b23079596 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { passthru.updateScript = gnome3.updateScript { packageName = pname; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Amtk; + homepage = "https://wiki.gnome.org/Projects/Amtk"; description = "Actions, Menus and Toolbars Kit for GTK applications"; maintainers = [ maintainers.manveru ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/apache-activemq/default.nix b/pkgs/development/libraries/apache-activemq/default.nix index 9fc11555b69..b2323d62dfc 100644 --- a/pkgs/development/libraries/apache-activemq/default.nix +++ b/pkgs/development/libraries/apache-activemq/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://activemq.apache.org/; + homepage = "http://activemq.apache.org/"; description = "Messaging and Integration Patterns server written in Java"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 4b803554e66..ceb4c238a7b 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Objects and helper methods to read and write AppStream metadata"; - homepage = https://people.freedesktop.org/~hughsient/appstream-glib/; + homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/"; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ lethalman matthewbauer ]; diff --git a/pkgs/development/libraries/appstream/default.nix b/pkgs/development/libraries/appstream/default.nix index 62d72844386..bffd281d0de 100644 --- a/pkgs/development/libraries/appstream/default.nix +++ b/pkgs/development/libraries/appstream/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software metadata handling library"; - homepage = https://www.freedesktop.org/wiki/Distributions/AppStream/; + homepage = "https://www.freedesktop.org/wiki/Distributions/AppStream/"; longDescription = '' AppStream is a cross-distro effort for building Software-Center applications and enhancing metadata provided by software components. It provides diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 87563d6a9cb..ba12e2d0385 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://apr.apache.org/; + homepage = "http://apr.apache.org/"; description = "A companion library to APR, the Apache Portable Runtime"; maintainers = [ maintainers.eelco ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix index 2ce4b77927f..ce33c0534fa 100644 --- a/pkgs/development/libraries/apr/default.nix +++ b/pkgs/development/libraries/apr/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://apr.apache.org/; + homepage = "http://apr.apache.org/"; description = "The Apache Portable Runtime library"; platforms = platforms.all; license = licenses.asl20; diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 82d11cdc3a4..c206630b57b 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interface to banking tasks, file formats and country information"; - homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1; + homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=03&showall=1"; hydraPlatforms = []; license = licenses.gpl2Plus; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index ee1fffdacdd..4c5192574d8 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OS abstraction functions used by aqbanking and related tools"; - homepage = http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1; + homepage = "http://www2.aquamaniac.de/sites/download/packages.php?package=01&showall=1"; license = licenses.lgpl21; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index eaeddbcad36..40a96553fbe 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk-doc, intltool -, audit, glib, libusb, libxml2 +, audit, glib, libusb1, libxml2 , wrapGAppsHook , gstreamer ? null , gst-plugins-base ? null @@ -53,7 +53,7 @@ in buildInputs = [ glib libxml2 ] - ++ stdenv.lib.optional enableUsb libusb + ++ 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 ]; diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 6c0b3c867a4..f6710d4fc57 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.850.1"; + version = "9.860.1"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "07y0s87srj2wxbywmnxam9bif0x625n6b8np19832mvsb6wqkhyl"; + sha256 = "1ab5y4ll6js2w4p9dabj2dmzzc3f8dja8dqsvy40azrvny58h0qn"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ linear algebra library"; - homepage = http://arma.sourceforge.net; + homepage = "http://arma.sourceforge.net"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ juliendehos knedlsepp ]; diff --git a/pkgs/development/libraries/asio/generic.nix b/pkgs/development/libraries/asio/generic.nix index b8d166507a9..f1ea8a08418 100644 --- a/pkgs/development/libraries/asio/generic.nix +++ b/pkgs/development/libraries/asio/generic.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ openssl ]; meta = { - homepage = http://asio.sourceforge.net/; + homepage = "http://asio.sourceforge.net/"; description = "Cross-platform C++ library for network and low-level I/O programming"; license = licenses.boost; broken = stdenv.isDarwin; # test when updating to >=1.12.1 diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index ad0f910dcbf..19ee39a3b9e 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { patch interfaces/cc/aspell.h < ${./clang.patch} ''; + nativeBuildInputs = [ perl ]; buildInputs = [ perl ]; doCheck = true; @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Spell checker for many languages"; - homepage = http://aspell.net/; + homepage = "http://aspell.net/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ ]; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index 05a1c95c81f..1d7b7a6f98b 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -899,7 +899,7 @@ in rec { fullName = "English Computer Jargon"; src = fetchurl { - url = https://mrsatterly.com/computer.dic; + url = "https://mrsatterly.com/computer.dic"; sha256 = "1vzk7cdvcm9r1c6mgxpabrdcpvghdv9mjmnf6iq5wllcif5nsw2b"; }; @@ -909,7 +909,7 @@ in rec { installPhase = "aspell-install en-computers"; meta = { - homepage = https://mrsatterly.com/spelling.html; + homepage = "https://mrsatterly.com/spelling.html"; }; }; @@ -918,12 +918,12 @@ in rec { fullName = "English Scientific Jargon"; src1 = fetchurl { - url = http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt; + url = "http://jpetrie.net/wp-content/uploads/custom_scientific_US.txt"; sha256 = "1nf4py2mg0mlv9s5a7had2wn29z2v6bcca0fs6rbpdn4nqc4s7dm"; }; src2 = fetchurl { - url = http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt; + url = "http://jpetrie.net/wp-content/uploads/custom_scientific_UK.txt"; sha256 = "0f88il1ds6qazy1ghxviqcwsywrbf6pzl2lmzf4f3qvhdfb6f1y0"; }; @@ -936,7 +936,7 @@ in rec { installPhase = "aspell-install en_US-science en_GB-science"; meta = { - homepage = http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/; + homepage = "http://www.jpetrie.net/scientific-word-list-for-spell-checkersspelling-dictionaries/"; }; }; diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index ca332026982..a6f27f4476b 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to import various 3D model formats"; - homepage = http://assimp.sourceforge.net/; + homepage = "http://assimp.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ ehmry ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index cdb172d0d21..fa7dd13b84f 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "at-spi2-core"; - version = "2.34.0"; + version = "2.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ihixwhh3c16q6253qj9gf69741rb2pi51822a4rylsfcyywsafn"; + sha256 = "0nn0lnf07ayysq8c8irmvc91c2dszn04m5qs6jy60g3y1bg5gnl8"; }; outputs = [ "out" "dev" ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; - homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; + homepage = "https://gitlab.gnome.org/GNOME/at-spi2-core"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 9e80d4fc6ca..400ddd51259 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -4,7 +4,7 @@ let pname = "atk"; - version = "2.34.1"; + version = "2.35.1"; in stdenv.mkDerivation rec { @@ -12,14 +12,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jwp16r6p5z66k4b2v8zlzhyshhwlmyi27ippkrgqr8jsary7w6l"; + sha256 = "111qajn7kxwmh40drc8i6jc3hnril2rp63n207q92pl47zx614xy"; }; outputs = [ "out" "dev" ]; buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; propagatedBuildInputs = [ # Required by atk.pc @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { control running applications. ''; - homepage = http://library.gnome.org/devel/atk/; + homepage = "http://library.gnome.org/devel/atk/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 5338aa683a7..cc45dc5a8d8 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ wrappers for ATK accessibility toolkit"; license = stdenv.lib.licenses.lgpl21Plus; - homepage = https://gtkmm.org; + homepage = "https://gtkmm.org"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix index db5ecf3b016..bd1d86520c0 100644 --- a/pkgs/development/libraries/aubio/default.nix +++ b/pkgs/development/libraries/aubio/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for audio labelling"; - homepage = https://aubio.org/; + homepage = "https://aubio.org/"; license = licenses.gpl2; maintainers = with maintainers; [ goibhniu marcweber fpletz ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/audio/jamomacore/default.nix b/pkgs/development/libraries/audio/jamomacore/default.nix index 02409d6ace0..7c9b3ef67c9 100644 --- a/pkgs/development/libraries/audio/jamomacore/default.nix +++ b/pkgs/development/libraries/audio/jamomacore/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ platform for building dynamic and reflexive systems with an emphasis on audio and media"; - homepage = http://www.jamoma.org; + homepage = "http://www.jamoma.org"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 3552e335fed..84fa46eed27 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -15,7 +15,7 @@ let x86_64-linux = "x64/libbass.so"; }; urlpath = "bass24-linux.zip"; - sha256 = "1nyzs08z0djyvz6jx1y9y99y0ksp4sxz9l2x43k1c9irls24xpfy"; + sha256 = "1z01im0l2ydi608vc0n0c1cfyp1vrh6681zn2zkhg98vvs20y805"; }; bass_fx = { @@ -57,7 +57,7 @@ let meta = with stdenv.lib; { description = "Shareware audio library"; - homepage = https://www.un4seen.com/; + homepage = "https://www.un4seen.com/"; license = licenses.unfreeRedistributable; platforms = builtins.attrNames bass.so; }; diff --git a/pkgs/development/libraries/audio/libbs2b/default.nix b/pkgs/development/libraries/audio/libbs2b/default.nix index 2fde40327e9..bc98dab4ab6 100644 --- a/pkgs/development/libraries/audio/libbs2b/default.nix +++ b/pkgs/development/libraries/audio/libbs2b/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://bs2b.sourceforge.net/; + homepage = "http://bs2b.sourceforge.net/"; description = "Bauer stereophonic-to-binaural DSP library"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/audio/libinstpatch/default.nix b/pkgs/development/libraries/audio/libinstpatch/default.nix index d5c15ad3e38..e5f1080631e 100644 --- a/pkgs/development/libraries/audio/libinstpatch/default.nix +++ b/pkgs/development/libraries/audio/libinstpatch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libinstpatch"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "swami"; repo = pname; rev = "v${version}"; - sha256 = "0ksilyszcm7mwb6m8qyrgalvh4h2vkyz7wzj0xczcqkj15bcl4lw"; + sha256 = "1v7mv43xxwrzi3agrc60agcw46jaidr8ql9kkm1w4jxkf4c6z6dz"; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.swamiproject.org/; + homepage = "http://www.swamiproject.org/"; description = "MIDI instrument patch files support library"; license = licenses.lgpl21; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index a5cbb079475..df0eecfd0be 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reader for AES SOFA files to get better HRTFs"; - homepage = https://github.com/hoene/libmysofa; + homepage = "https://github.com/hoene/libmysofa"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/development/libraries/audio/libsmf/default.nix b/pkgs/development/libraries/audio/libsmf/default.nix index 1c5a5302d71..d521b7e76ab 100644 --- a/pkgs/development/libraries/audio/libsmf/default.nix +++ b/pkgs/development/libraries/audio/libsmf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for reading and writing Standard MIDI Files"; - homepage = https://github.com/stump/libsmf; + homepage = "https://github.com/stump/libsmf"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 233b93d6782..831cd8c2054 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ lv2 ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/lilv; + homepage = "http://drobilla.net/software/lilv"; description = "A C library to make the use of LV2 plugins"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 0f86cd76e2a..ec8c4b81dd1 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libsndfile python3 ]; meta = with stdenv.lib; { - homepage = http://lv2plug.in; + homepage = "http://lv2plug.in"; description = "A plugin standard for audio systems"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 826c36db1a6..d4a0f671e8f 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set C++ wrappers around the LV2 C API"; - homepage = http://lvtoolkit.org; + homepage = "http://lvtoolkit.org"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index c4c931ecade..f039e574d54 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Fork of FLTK 1.3.0 with additional functionality"; version = version; - homepage = http://non.tuxfamily.org/; + homepage = "http://non.tuxfamily.org/"; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ magnetophon nico202 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index de78385e0ab..8acd6d3c666 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C++ utility library primarily aimed at audio/musical applications"; - homepage = http://drobilla.net/software/raul; + homepage = "http://drobilla.net/software/raul"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/audio/rtaudio/default.nix b/pkgs/development/libraries/audio/rtaudio/default.nix index fc14236fe24..53efa598079 100644 --- a/pkgs/development/libraries/audio/rtaudio/default.nix +++ b/pkgs/development/libraries/audio/rtaudio/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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/; + homepage = "http://www.music.mcgill.ca/~gary/rtaudio/"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/audio/rtmidi/default.nix b/pkgs/development/libraries/audio/rtmidi/default.nix index 16527a763c9..d30b1ce6c64 100644 --- a/pkgs/development/libraries/audio/rtmidi/default.nix +++ b/pkgs/development/libraries/audio/rtmidi/default.nix @@ -23,7 +23,7 @@ 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/; + 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; diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index 840b50d788f..cec50290d09 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ lv2 serd sord ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/sratom; + homepage = "http://drobilla.net/software/sratom"; description = "A library for serialising LV2 atoms to/from RDF"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 8bd460ce545..c2496840b7d 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); meta = with stdenv.lib; { - homepage = http://drobilla.net/software/suil; + homepage = "http://drobilla.net/software/suil"; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix new file mode 100644 index 00000000000..f980d42cd7d --- /dev/null +++ b/pkgs/development/libraries/audio/vamp-plugin-sdk/default.nix @@ -0,0 +1,29 @@ +# set VAMP_PATH ? +# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) + +{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: + +stdenv.mkDerivation rec { + pname = "vamp-plugin-sdk"; + version = "2.9"; + + src = fetchFromGitHub { + owner = "c4dm"; + repo = "vamp-plugin-sdk"; + rev = "vamp-plugin-sdk-v${version}"; + sha256 = "1ay12gjqp2wzysg9k2qha3gd8sj5rjlfy4hsl923csi4ssiapsh1"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libsndfile ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; + homepage = "https://vamp-plugins.org/"; + license = licenses.bsd3; + maintainers = [ maintainers.goibhniu maintainers.marcweber ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/development/libraries/audio/vamp/default.nix b/pkgs/development/libraries/audio/vamp/default.nix deleted file mode 100644 index 2ac3115af2a..00000000000 --- a/pkgs/development/libraries/audio/vamp/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -# set VAMP_PATH ? -# plugins availible on sourceforge and http://www.vamp-plugins.org/download.html (various licenses) - -{ stdenv, fetchFromGitHub, pkgconfig, libsndfile }: - -{ - - vampSDK = stdenv.mkDerivation { - name = "vamp-sdk-2.7.1"; - # version = "2.7.1"; - - src = fetchFromGitHub { - owner = "c4dm"; - repo = "vamp-plugin-sdk"; - rev = "vamp-plugin-sdk-v2.7.1"; - sha256 = "1ifd6l6b89pg83ss4gld5i72fr0cczjnl2by44z5jnndsg3sklw4"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsndfile ]; - - meta = with stdenv.lib; { - description = "Audio processing plugin system for plugins that extract descriptive information from audio data"; - homepage = https://sourceforge.net/projects/vamp; - license = licenses.bsd3; - maintainers = [ maintainers.goibhniu maintainers.marcweber ]; - platforms = platforms.linux; - }; - }; - -} diff --git a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix index debe7d56f7b..c819f355e0b 100644 --- a/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix +++ b/pkgs/development/libraries/audio/zita-alsa-pcmi/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = { description = "The successor of clalsadrv, provides easy access to ALSA PCM devices"; version = version; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/zita-convolver/default.nix b/pkgs/development/libraries/audio/zita-convolver/default.nix index 93bd18abaae..2b7d89b30a1 100644 --- a/pkgs/development/libraries/audio/zita-convolver/default.nix +++ b/pkgs/development/libraries/audio/zita-convolver/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Convolution library by Fons Adriaensen"; version = version; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audio/zita-resampler/default.nix b/pkgs/development/libraries/audio/zita-resampler/default.nix index b0b0186af88..2881e566218 100644 --- a/pkgs/development/libraries/audio/zita-resampler/default.nix +++ b/pkgs/development/libraries/audio/zita-resampler/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Resample library by Fons Adriaensen"; version = version; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix index 680b585643b..46c29e2fa12 100644 --- a/pkgs/development/libraries/audiofile/default.nix +++ b/pkgs/development/libraries/audiofile/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for reading and writing audio files in various formats"; - homepage = http://www.68k.org/~michael/audiofile/; + homepage = "http://www.68k.org/~michael/audiofile/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/avahi/default.nix b/pkgs/development/libraries/avahi/default.nix index babfd6849a8..4c7e5321f55 100644 --- a/pkgs/development/libraries/avahi/default.nix +++ b/pkgs/development/libraries/avahi/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ./no-mkdir-localstatedir.patch (fetchpatch { name ="CVE-2017-6519-CVE-2018-100084.patch"; - url = https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch; + url = "https://github.com/lathiat/avahi/commit/e111def44a7df4624a4aa3f85fe98054bffb6b4f.patch"; sha256 = "06n7b7kz6xcc35c7xjfc1kj3k2llyjgi09nhy0ci32l1bhacjw0q"; }) ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "mDNS/DNS-SD implementation"; - homepage = http://avahi.org; + homepage = "http://avahi.org"; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 globin ]; diff --git a/pkgs/development/libraries/avro-c++/default.nix b/pkgs/development/libraries/avro-c++/default.nix index a2fdb66d7e9..3e7bc67d25b 100644 --- a/pkgs/development/libraries/avro-c++/default.nix +++ b/pkgs/development/libraries/avro-c++/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A C++ library which implements parts of the Avro Specification"; - homepage = https://avro.apache.org/; + homepage = "https://avro.apache.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ rasendubi ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/avro-c/default.nix b/pkgs/development/libraries/avro-c/default.nix index 5d7dedd0e07..d96930f37f2 100644 --- a/pkgs/development/libraries/avro-c/default.nix +++ b/pkgs/development/libraries/avro-c/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C library which implements parts of the Avro Specification"; - homepage = https://avro.apache.org/; + homepage = "https://avro.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ lblasc ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index b10797d3d56..b028813558f 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "AWS SDK for C common core"; - homepage = https://github.com/awslabs/aws-c-common; + homepage = "https://github.com/awslabs/aws-c-common"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej eelco ]; diff --git a/pkgs/development/libraries/aws-c-event-stream/default.nix b/pkgs/development/libraries/aws-c-event-stream/default.nix index cc26c29c9d1..ca3203e3a6a 100644 --- a/pkgs/development/libraries/aws-c-event-stream/default.nix +++ b/pkgs/development/libraries/aws-c-event-stream/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C99 implementation of the vnd.amazon.eventstream content-type"; - homepage = https://github.com/awslabs/aws-c-event-stream; + homepage = "https://github.com/awslabs/aws-c-event-stream"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej eelco ]; diff --git a/pkgs/development/libraries/aws-checksums/default.nix b/pkgs/development/libraries/aws-checksums/default.nix index 886383bf961..de664af86e4 100644 --- a/pkgs/development/libraries/aws-checksums/default.nix +++ b/pkgs/development/libraries/aws-checksums/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "HW accelerated CRC32c and CRC32"; - homepage = https://github.com/awslabs/aws-checksums; + homepage = "https://github.com/awslabs/aws-checksums"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ orivej eelco ]; diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 8024f310951..f6878cd9396 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A C++ interface for Amazon Web Services"; - homepage = https://github.com/awslabs/aws-sdk-cpp; + homepage = "https://github.com/awslabs/aws-sdk-cpp"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ eelco orivej ]; diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix index 5a579a0505b..dbf7afd596f 100644 --- a/pkgs/development/libraries/babl/default.nix +++ b/pkgs/development/libraries/babl/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Image pixel format conversion library"; - homepage = http://gegl.org/babl/; + homepage = "http://gegl.org/babl/"; license = licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 60322f53016..d8041304856 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { Removes the headache of applications matching into a simple DBus daemon and c wrapper library. ''; - homepage = https://launchpad.net/bamf; + homepage = "https://launchpad.net/bamf"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; diff --git a/pkgs/development/libraries/bctoolbox/default.nix b/pkgs/development/libraries/bctoolbox/default.nix index 1c81dd608cb..22578dad38d 100644 --- a/pkgs/development/libraries/bctoolbox/default.nix +++ b/pkgs/development/libraries/bctoolbox/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchFromGitHub, cmake, bcunit, mbedtls }: +{ bcunit +, cmake +, fetchFromGitLab +, mbedtls +, stdenv +}: stdenv.mkDerivation rec { pname = "bctoolbox"; - version = "0.6.0"; + version = "4.3.1"; nativeBuildInputs = [ cmake bcunit ]; buildInputs = [ mbedtls ]; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; rev = version; - sha256 = "1cxx243wyzkd4xnvpyqf97n0rjhfckpvw1vhwnbwshq3q6fra909"; + sha256 = "1y91jcrma4kjqpm6w5ahlygjsyvx7l8zjrjvq7g2n39jmw175cvs"; }; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; - meta = { + meta = with stdenv.lib; { inherit version; description = "Utilities library for Linphone"; - homepage = "https://github.com/BelledonneCommunications/bctoolbox"; - license = stdenv.lib.licenses.gpl2Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; + # Still using GPLv2 but as the rest of the Linphone projects have switched + # to GPLv3, this might too, so check this when bumping the version number. + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin jluttine ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/beecrypt/default.nix b/pkgs/development/libraries/beecrypt/default.nix index d7d6ef54516..2433edbfe8f 100644 --- a/pkgs/development/libraries/beecrypt/default.nix +++ b/pkgs/development/libraries/beecrypt/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "beecrypt-4.2.1"; src = fetchurl { - url = mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz; + url = "mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz"; sha256 = "0pf5k1c4nsj77jfq5ip0ra1gzx2q47xaa0s008fnn6hd11b1yvr8"; }; buildInputs = [ m4 ]; diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index af0053519e3..89ef702f4e5 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://cgit.freedesktop.org/beignet/; + homepage = "https://cgit.freedesktop.org/beignet/"; description = "OpenCL Library for Intel Ivy Bridge and newer GPUs"; longDescription = '' The package provides an open source implementation of the OpenCL specification for Intel GPUs. diff --git a/pkgs/development/libraries/belcard/default.nix b/pkgs/development/libraries/belcard/default.nix index aa6cb8513ae..11de0488915 100644 --- a/pkgs/development/libraries/belcard/default.nix +++ b/pkgs/development/libraries/belcard/default.nix @@ -1,24 +1,34 @@ -{ stdenv, cmake, fetchFromGitHub, bctoolbox, belr }: +{ bctoolbox +, belr +, cmake +, fetchFromGitLab +, stdenv +}: stdenv.mkDerivation rec { - baseName = "belcard"; - version = "1.0.2"; - name = "${baseName}-${version}"; + pname = "belcard"; + version = "4.3.1"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; - repo = baseName; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; rev = version; - sha256 = "1pwji83vpsdrfma24rnj3rz1x0a0g6zk3v4xjnip7zf2ys3zcnlk"; + sha256 = "1w6rbp53cwxr00clp957458x27cgc2y9ylwa5mp812qva7zadmfw"; }; buildInputs = [ bctoolbox belr ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib;{ - description = "Belcard is a C++ library to manipulate VCard standard format"; - homepage = https://github.com/BelledonneCommunications/belcard; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + + meta = with stdenv.lib; { + description = "C++ library to manipulate VCard standard format"; + homepage = "https://gitlab.linphone.org/BC/public/belcard"; license = licenses.lgpl21; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/belle-sip/default.nix b/pkgs/development/libraries/belle-sip/default.nix index 0d3df37d8e0..a935372656e 100644 --- a/pkgs/development/libraries/belle-sip/default.nix +++ b/pkgs/development/libraries/belle-sip/default.nix @@ -1,22 +1,36 @@ -{ stdenv, antlr3_4, libantlr3c, jre, mbedtls, fetchFromGitHub - , cmake, zlib, bctoolbox +{ antlr3_4 +, bctoolbox +, cmake +, fetchFromGitLab +, jre +, libantlr3c +, mbedtls +, stdenv +, zlib }: stdenv.mkDerivation rec { pname = "belle-sip"; - version = "1.6.3"; - - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-02-18"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; - rev = version; - sha256 = "0q70db1klvhca1af29bm9paka3gyii5hfbzrj4178gclsg7cj8fk"; + rev = "0dcb13416eae87edf140771b886aedaf6be8cf60"; + sha256 = "0pzxk8mkkg6zsnmj1bwggbdjv864psx89gglfm51h8s501kg11fv"; }; nativeBuildInputs = [ jre cmake ]; buildInputs = [ zlib ]; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" "-Wno-error=format-truncation" @@ -29,9 +43,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = https://linphone.org/technical-corner/belle-sip; + homepage = "https://linphone.org/technical-corner/belle-sip"; description = "Modern library implementing SIP (RFC 3261) transport, transaction and dialog layers"; - license = licenses.gpl2; + license = licenses.gpl3; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/belr/default.nix b/pkgs/development/libraries/belr/default.nix index f0557b0379f..90067e493a1 100644 --- a/pkgs/development/libraries/belr/default.nix +++ b/pkgs/development/libraries/belr/default.nix @@ -1,24 +1,35 @@ -{ stdenv, cmake, fetchFromGitHub, bctoolbox }: +{ bctoolbox +, cmake +, fetchFromGitLab +, stdenv +}: stdenv.mkDerivation rec { - baseName = "belr"; - version = "0.1.3"; - name = "${baseName}-${version}"; + pname = "belr"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-09"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; - repo = baseName; - rev = version; - sha256 = "0mf8lsyq1z3b5p47c00lnwc8n7v9nzs1fd2g9c9hnz6fjd2ka44w"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = "326d030ca9db12525c2a6d2a65f386f36f3c2ed5"; + sha256 = "1cdblb9smncq3al0crqp5651b02k1g6whlw1ib769p61gad0rs3v"; }; buildInputs = [ bctoolbox ]; nativeBuildInputs = [ cmake ]; - meta = with stdenv.lib;{ + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + + meta = with stdenv.lib; { description = "Belr is Belledonne Communications' language recognition library"; - homepage = https://github.com/BelledonneCommunications/belr; - license = licenses.lgpl21; + homepage = "https://gitlab.linphone.org/BC/public/belr"; + license = licenses.gpl3; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 16be4600ec6..bc62f6d47ad 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec{ buildInputs = [ cmake libuuid ]; meta = { - homepage = http://www.crosswire.org/wiki/BibleSync; + homepage = "http://www.crosswire.org/wiki/BibleSync"; description = "A multicast protocol to Bible software shared conavigation"; longDescription = '' BibleSync is a multicast protocol to support Bible software diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix index c7520c89ef5..17f7bbc667c 100644 --- a/pkgs/development/libraries/bobcat/default.nix +++ b/pkgs/development/libraries/bobcat/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brokken's Own Base Classes And Templates"; - homepage = https://fbb-git.github.io/bobcat/; + homepage = "https://fbb-git.github.io/bobcat/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/boehm-gc/7.6.6.nix b/pkgs/development/libraries/boehm-gc/7.6.6.nix index 1cbbee469e6..31997e58577 100644 --- a/pkgs/development/libraries/boehm-gc/7.6.6.nix +++ b/pkgs/development/libraries/boehm-gc/7.6.6.nix @@ -63,10 +63,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = https://hboehm.info/gc/; + homepage = "https://hboehm.info/gc/"; # non-copyleft, X11-style license - license = https://hboehm.info/gc/license.txt; + license = "https://hboehm.info/gc/license.txt"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index f061626a897..1af63a2e426 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -58,10 +58,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = https://hboehm.info/gc/; + homepage = "https://hboehm.info/gc/"; # non-copyleft, X11-style license - license = https://hboehm.info/gc/license.txt; + license = "https://hboehm.info/gc/license.txt"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/boost-process/default.nix b/pkgs/development/libraries/boost-process/default.nix index b90006a5e97..92e02c6ca08 100644 --- a/pkgs/development/libraries/boost-process/default.nix +++ b/pkgs/development/libraries/boost-process/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.highscore.de/boost/process0.5/; + homepage = "http://www.highscore.de/boost/process0.5/"; description = "Library to manage system processes"; license = licenses.boost; platforms = platforms.unix; diff --git a/pkgs/development/libraries/boost/1.67.nix b/pkgs/development/libraries/boost/1.67.nix index a2fe9447c12..31f545ab12b 100644 --- a/pkgs/development/libraries/boost/1.67.nix +++ b/pkgs/development/libraries/boost/1.67.nix @@ -12,20 +12,20 @@ callPackage ./generic.nix (args // { ] ++ stdenv.lib.optionals stdenv.cc.isClang [ # Fixes https://github.com/boostorg/atomic/issues/15 (fetchpatch { - url = https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch; + url = "https://github.com/boostorg/atomic/commit/6e14ca24dab50ad4c1fa8c27c7dd6f1cb791b534.patch"; sha256 = "102g35ygvv8cxagp9651284xk4vybk93q2fm577y4mdxf5k46b7a"; stripLen = 1; }) # Needed for the next patch (fetchpatch { - url = https://github.com/boostorg/asio/commit/38cb19719748ad56b14d73ca1fff5828f36e5894.patch; + url = "https://github.com/boostorg/asio/commit/38cb19719748ad56b14d73ca1fff5828f36e5894.patch"; sha256 = "0cj9cxz9rfbsx8p8f5alxx00dq3r7g0vh23j68bbxbs9gq1arq2n"; stripLen = 1; }) # Fixes https://github.com/boostorg/asio/pull/91 (fetchpatch { - url = https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb.patch; + url = "https://github.com/boostorg/asio/commit/43874d5497414c67655d901e48c939ef01337edb.patch"; sha256 = "1c2ds164s2ygvpb4785p4ncv8ywbpm08cphirb99xp4mqvb693is"; stripLen = 1; }) diff --git a/pkgs/development/libraries/boost/1.72.nix b/pkgs/development/libraries/boost/1.72.nix new file mode 100644 index 00000000000..680afe8bcb8 --- /dev/null +++ b/pkgs/development/libraries/boost/1.72.nix @@ -0,0 +1,16 @@ +{ stdenv, callPackage, fetchurl, fetchpatch, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.72.0"; + + src = fetchurl { + #url = "mirror://sourceforge/boost/boost_1_72_0.tar.bz2"; + urls = [ + "mirror://sourceforge/boost/boost_1_72_0.tar.bz2" + "https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.bz2" + ]; + # SHA256 from http://www.boost.org/users/history/version_1_72_0.html + sha256 = "59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722"; + }; +}) + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 82bcd49592d..828635e10c6 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation { else ./darwin-no-system-python.patch); meta = { - homepage = http://boost.org/; + homepage = "http://boost.org/"; description = "Collection of C++ libraries"; license = licenses.boost; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/development/libraries/bootil/default.nix b/pkgs/development/libraries/bootil/default.nix index 9283f37a8c4..a1924f59a8d 100644 --- a/pkgs/development/libraries/bootil/default.nix +++ b/pkgs/development/libraries/bootil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { meta = { description = "Garry Newman's personal utility library"; - homepage = https://github.com/garrynewman/bootil; + 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 ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; patches = [ (fetchpatch { - url = https://github.com/garrynewman/bootil/pull/22.patch; + url = "https://github.com/garrynewman/bootil/pull/22.patch"; name = "github-pull-request-22.patch"; sha256 = "1qf8wkv00pb9w1aa0dl89c8gm4rmzkxfl7hidj4gz0wpy7a24qa2"; }) ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 64b18f389ac..1672970d505 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "2D physics engine"; - homepage = https://box2d.org/; + homepage = "https://box2d.org/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.zlib; diff --git a/pkgs/development/libraries/brigand/default.nix b/pkgs/development/libraries/brigand/default.nix index 7710747d800..cc5564d4bb7 100644 --- a/pkgs/development/libraries/brigand/default.nix +++ b/pkgs/development/libraries/brigand/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { longDescription = '' Brigand is a light-weight, fully functional, instant-compile time C++ 11 meta-programming library. Everything you were doing with Boost.MPL can be done with Brigand. And if that's not the case, open an issue!''; - homepage = https://github.com/edouarda/brigand; + homepage = "https://github.com/edouarda/brigand"; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/buddy/default.nix b/pkgs/development/libraries/buddy/default.nix index 9b722602a65..d025b8c28ed 100644 --- a/pkgs/development/libraries/buddy/default.nix +++ b/pkgs/development/libraries/buddy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://sourceforge.net/projects/buddy/; + homepage = "https://sourceforge.net/projects/buddy/"; description = "Binary decision diagram package"; license = "as-is"; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 5b4e37eff9f..1c9a10356a4 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. ''; - homepage = http://bulletphysics.org; + homepage = "http://bulletphysics.org"; license = licenses.zlib; maintainers = with maintainers; [ aforemny ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/bullet/roboschool-fork.nix b/pkgs/development/libraries/bullet/roboschool-fork.nix index 34a9ee3b6ee..abb9d3e2ce3 100644 --- a/pkgs/development/libraries/bullet/roboschool-fork.nix +++ b/pkgs/development/libraries/bullet/roboschool-fork.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { Bullet 3D Game Multiphysics Library provides state of the art collision detection, soft body and rigid body dynamics. ''; - homepage = http://bulletphysics.org; + homepage = "http://bulletphysics.org"; license = licenses.zlib; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 0279dc8f5ef..154b8634551 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcl ]; meta = { - homepage = https://sourceforge.net/projects/tcllib; + homepage = "https://sourceforge.net/projects/tcllib"; description = "High-level widget set for Tcl/Tk"; license = stdenv.lib.licenses.tcltk; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/bzrtp/default.nix b/pkgs/development/libraries/bzrtp/default.nix index b2dc295db5b..2eb5a2dfcff 100644 --- a/pkgs/development/libraries/bzrtp/default.nix +++ b/pkgs/development/libraries/bzrtp/default.nix @@ -1,26 +1,38 @@ -{ stdenv, cmake, fetchFromGitHub, bctoolbox, sqlite }: +{ bctoolbox +, cmake +, fetchFromGitLab +, sqlite +, stdenv +}: stdenv.mkDerivation rec { - baseName = "bzrtp"; - version = "1.0.6"; - name = "${baseName}-${version}"; + pname = "bzrtp"; + version = "4.3.1"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; - repo = baseName; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; rev = version; - sha256 = "0438zzxp82bj5fmvqnwlljkgrz9ab5qm5lgpwwgmg1cp78bp2l45"; + sha256 = "14fqp6r9rf7z6j5phbsrdxlbjak03hs8kb94b6jgcrcdxrxhy3fy"; }; buildInputs = [ bctoolbox sqlite ]; nativeBuildInputs = [ cmake ]; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; meta = with stdenv.lib; { description = "BZRTP is an opensource implementation of ZRTP keys exchange protocol"; - homepage = https://github.com/BelledonneCommunications/bzrtp; + homepage = "https://gitlab.linphone.org/BC/public/bzrtp"; + # They have switched to GPLv3 on git HEAD so probably the next release will + # be GPL3. license = licenses.lgpl21; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index 9e38398dfad..02f0872cee3 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for asynchronous DNS requests"; - homepage = https://c-ares.haxx.se; + homepage = "https://c-ares.haxx.se"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index fcc74625b99..d3bb3479911 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A blocking, shuffling and loss-less compression library"; - homepage = https://www.blosc.org; + homepage = "https://www.blosc.org"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix index c1415a2837c..c1a75e7753e 100644 --- a/pkgs/development/libraries/caf/default.nix +++ b/pkgs/development/libraries/caf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source implementation of the actor model in C++"; - homepage = http://actor-framework.org/; + homepage = "http://actor-framework.org/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ bobakker tobim ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 80f8f9498d7..e5e2eba1118 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -112,7 +112,7 @@ in stdenv.mkDerivation rec { when available (e.g., through the X Render Extension). ''; - homepage = http://cairographics.org/; + homepage = "http://cairographics.org/"; license = with licenses; [ lgpl2Plus mpl10 ]; diff --git a/pkgs/development/libraries/catch/default.nix b/pkgs/development/libraries/catch/default.nix index 92e5c04e032..36d4960cdcc 100644 --- a/pkgs/development/libraries/catch/default.nix +++ b/pkgs/development/libraries/catch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-paradigm automated test framework for C++ and Objective-C (and, maybe, C)"; - homepage = http://catch-lib.net; + homepage = "http://catch-lib.net"; license = licenses.boost; maintainers = with maintainers; [ edwtjo knedlsepp ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index cd9d031788a..dba16b19e3b 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the IETF real-time transport protocol (RTP)"; - homepage = https://www.gnu.org/software/ccrtp/; + homepage = "https://www.gnu.org/software/ccrtp/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 5897f84efff..848927776f9 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/google/cctz; + homepage = "https://github.com/google/cctz"; description = "C++ library for translating between absolute and civil times"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/cddlib/default.nix b/pkgs/development/libraries/cddlib/default.nix index d84cda5b750..76b5390fb69 100644 --- a/pkgs/development/libraries/cddlib/default.nix +++ b/pkgs/development/libraries/cddlib/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [raskin timokau]; platforms = platforms.unix; - homepage = https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html; + homepage = "https://www.inf.ethz.ch/personal/fukudak/cdd_home/index.html"; }; } diff --git a/pkgs/development/libraries/cdo/default.nix b/pkgs/development/libraries/cdo/default.nix index 2a3dbc7a2d1..f582be81e86 100644 --- a/pkgs/development/libraries/cdo/default.nix +++ b/pkgs/development/libraries/cdo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG. There are more than 600 operators available. ''; - homepage = https://code.mpimet.mpg.de/projects/cdo/; + homepage = "https://code.mpimet.mpg.de/projects/cdo/"; license = licenses.gpl2; maintainers = [ maintainers.ltavard ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/cegui/default.nix b/pkgs/development/libraries/cegui/default.nix index eaeb6bf8e43..aaa93f19131 100644 --- a/pkgs/development/libraries/cegui/default.nix +++ b/pkgs/development/libraries/cegui/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ogre freetype boost expat ]; meta = with stdenv.lib; { - homepage = http://cegui.org.uk/; + homepage = "http://cegui.org.uk/"; description = "C++ Library for creating GUIs"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/libraries/celt/generic.nix b/pkgs/development/libraries/celt/generic.nix index 3b7e870b4fe..6277c5cd931 100644 --- a/pkgs/development/libraries/celt/generic.nix +++ b/pkgs/development/libraries/celt/generic.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Ultra-low delay audio codec"; - homepage = http://www.celt-codec.org/; + homepage = "http://www.celt-codec.org/"; license = licenses.bsd2; maintainers = with maintainers; [ codyopel raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/cereal/default.nix b/pkgs/development/libraries/cereal/default.nix index 03a1f9b3179..e17b42ea5c1 100644 --- a/pkgs/development/libraries/cereal/default.nix +++ b/pkgs/development/libraries/cereal/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A header-only C++11 serialization library"; - homepage = https://uscilab.github.io/cereal/; + homepage = "https://uscilab.github.io/cereal/"; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/development/libraries/ceres-solver/default.nix b/pkgs/development/libraries/ceres-solver/default.nix index 3ce8c4ef080..26a943791e9 100644 --- a/pkgs/development/libraries/ceres-solver/default.nix +++ b/pkgs/development/libraries/ceres-solver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ library for modeling and solving large, complicated optimization problems"; license = licenses.bsd3; - homepage = http://ceres-solver.org; + homepage = "http://ceres-solver.org"; maintainers = with maintainers; [ giogadi ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 4b84f73a258..1b7dc58c0d6 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://heasarc.gsfc.nasa.gov/fitsio/; + homepage = "https://heasarc.gsfc.nasa.gov/fitsio/"; description = "Library for reading and writing FITS data files"; longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 334a4758f2b..193bdda3445 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { can be used within source code editors and IDEs. ''; - homepage = https://libcheck.github.io/check/; + homepage = "https://libcheck.github.io/check/"; license = licenses.lgpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 5dd9917bc52..017dc1fd9c2 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast and lightweight 2D game physics library"; - homepage = http://chipmunk2d.net/; + homepage = "http://chipmunk2d.net/"; license = licenses.mit; platforms = platforms.unix; # supports Windows and MacOS as well, but those require more work }; diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix index 4f4af87227f..9b95fd26444 100644 --- a/pkgs/development/libraries/chmlib/default.nix +++ b/pkgs/development/libraries/chmlib/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = { - homepage = http://www.jedrea.com/chmlib; + homepage = "http://www.jedrea.com/chmlib"; license = stdenv.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 6ad6a09ec14..475108de596 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; { - homepage = https://acoustid.org/chromaprint; + homepage = "https://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/civetweb/default.nix b/pkgs/development/libraries/civetweb/default.nix index 3f8de005ff8..35f8f5e663a 100644 --- a/pkgs/development/libraries/civetweb/default.nix +++ b/pkgs/development/libraries/civetweb/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Embedded C/C++ web server"; - homepage = https://github.com/civetweb/civetweb; + homepage = "https://github.com/civetweb/civetweb"; license = [ stdenv.lib.licenses.mit ]; }; } diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index 2c8ac5113b1..aad14bead66 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tonyrog/cl; + homepage = "https://github.com/tonyrog/cl"; description = "OpenCL binding for Erlang"; license = licenses.mit; # https://github.com/tonyrog/cl/issues/39 diff --git a/pkgs/development/libraries/classads/default.nix b/pkgs/development/libraries/classads/default.nix index ff8e1ca6759..f2377a59e7b 100644 --- a/pkgs/development/libraries/classads/default.nix +++ b/pkgs/development/libraries/classads/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://www.cs.wisc.edu/condor/classad/; + 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; diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index fd4d8d5ca31..8b79619dff4 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast, powerful, and language-neutral HTML template system"; - homepage = http://www.clearsilver.net/; + homepage = "http://www.clearsilver.net/"; license = licenses.free; }; } diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix index 6627f46c18e..669ce90287b 100644 --- a/pkgs/development/libraries/cln/default.nix +++ b/pkgs/development/libraries/cln/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C/C++ library for numbers, a part of GiNaC"; - homepage = https://www.ginac.de/CLN/; + homepage = "https://www.ginac.de/CLN/"; license = licenses.gpl2; platforms = platforms.unix; # Once had cygwin problems }; diff --git a/pkgs/development/libraries/cloog-ppl/default.nix b/pkgs/development/libraries/cloog-ppl/default.nix index 47037339d41..f7a0bd058e7 100644 --- a/pkgs/development/libraries/cloog-ppl/default.nix +++ b/pkgs/development/libraries/cloog-ppl/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; # CLooG-PPL is actually a port of GLooG from PolyLib to PPL. - homepage = http://www.cloog.org/; + homepage = "http://www.cloog.org/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/cloog/0.18.0.nix b/pkgs/development/libraries/cloog/0.18.0.nix index fa4e19f716a..b0f69d42e8c 100644 --- a/pkgs/development/libraries/cloog/0.18.0.nix +++ b/pkgs/development/libraries/cloog/0.18.0.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { effective code. ''; - homepage = http://www.cloog.org/; + homepage = "http://www.cloog.org/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index 902e0b26687..be506cdee17 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { effective code. ''; - homepage = http://www.cloog.org/; + homepage = "http://www.cloog.org/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/clucene-core/2.x.nix b/pkgs/development/libraries/clucene-core/2.x.nix index 91347813a24..3776f1eac21 100644 --- a/pkgs/development/libraries/clucene-core/2.x.nix +++ b/pkgs/development/libraries/clucene-core/2.x.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; - homepage = http://clucene.sourceforge.net; + homepage = "http://clucene.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ asl20 lgpl2 ]; }; diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix index 8451b085372..d71d01de9e2 100644 --- a/pkgs/development/libraries/clucene-core/default.nix +++ b/pkgs/development/libraries/clucene-core/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { CLucene is a port of the very popular Java Lucene text search engine API. ''; - homepage = http://clucene.sourceforge.net; + homepage = "http://clucene.sourceforge.net"; platforms = platforms.linux; license = with licenses; [ asl20 lgpl2 ]; }; diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 2db4f6bf1ab..1a9644991b6 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "GStreamer bindings for clutter"; - homepage = http://www.clutter-project.org/; + homepage = "http://www.clutter-project.org/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index d59bc5161af..973ae344dc9 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Clutter-GTK"; - homepage = http://www.clutter-project.org/; + 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 diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 32e723671e8..8a70a872b9e 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -5,14 +5,14 @@ let pname = "clutter"; - version = "1.26.2"; + version = "1.26.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7"; + sha256 = "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b"; }; outputs = [ "out" "dev" ]; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; + homepage = "http://www.clutter-project.org/"; maintainers = with stdenv.lib.maintainers; [ lethalman ]; platforms = stdenv.lib.platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/cmark/default.nix b/pkgs/development/libraries/cmark/default.nix index e7c02312b66..b132e958f67 100644 --- a/pkgs/development/libraries/cmark/default.nix +++ b/pkgs/development/libraries/cmark/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CommonMark parsing and rendering library and program in C"; - homepage = https://github.com/jgm/cmark; + homepage = "https://github.com/jgm/cmark"; maintainers = [ maintainers.michelk ]; platforms = platforms.unix; license = licenses.bsd2; diff --git a/pkgs/development/libraries/cminpack/default.nix b/pkgs/development/libraries/cminpack/default.nix index cb4f3e39aef..3b2d748a836 100644 --- a/pkgs/development/libraries/cminpack/default.nix +++ b/pkgs/development/libraries/cminpack/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://devernay.free.fr/hacks/cminpack/cminpack.html; + homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html"; license = stdenv.lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix index ae110846ff0..18c1843623f 100644 --- a/pkgs/development/libraries/cmocka/default.nix +++ b/pkgs/development/libraries/cmocka/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { This is the successor of Google's Cmockery.''; - homepage = https://cmocka.org/; + homepage = "https://cmocka.org/"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix index 11e719b36df..512a289152a 100644 --- a/pkgs/development/libraries/cmrt/default.nix +++ b/pkgs/development/libraries/cmrt/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdrm libva ]; meta = with stdenv.lib; { - homepage = https://01.org/linuxmedia; + homepage = "https://01.org/linuxmedia"; description = "Intel C for Media Runtime"; longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; license = licenses.mit; diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix index 9c31b50c028..1f387f711e7 100644 --- a/pkgs/development/libraries/codec2/default.nix +++ b/pkgs/development/libraries/codec2/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Speech codec designed for communications quality speech at low data rates"; - homepage = http://www.rowetel.com/blog/?page_id=452; + homepage = "http://www.rowetel.com/blog/?page_id=452"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e122c1e7b12..08b3b96784a 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -7,11 +7,11 @@ let pname = "cogl"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.22.4"; + version = "1.22.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1q0drs82a8f6glg1v29bb6g2nf15fw0rvdx3d0rgcgfarfaby5sj"; + sha256 = "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd"; }; patches = [ @@ -21,12 +21,12 @@ in stdenv.mkDerivation rec { # could be merged, but dev can not make a new release. (fetchpatch { - url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589; + url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=359589"; sha256 = "0f0d9iddg8zwy853phh7swikg4yzhxxv71fcag36f8gis0j5p998"; }) (fetchpatch { - url = https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056; + url = "https://bug787443.bugzilla-attachments.gnome.org/attachment.cgi?id=361056"; sha256 = "09fyrdci4727fg6qm5aaapsbv71sf4wgfaqz8jqlyy61dibgg490"; }) diff --git a/pkgs/development/libraries/concurrencykit/default.nix b/pkgs/development/libraries/concurrencykit/default.nix index cc42407433c..a54bc754782 100644 --- a/pkgs/development/libraries/concurrencykit/default.nix +++ b/pkgs/development/libraries/concurrencykit/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library of safe, high-performance concurrent data structures"; - homepage = http://concurrencykit.org; + homepage = "http://concurrencykit.org"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.thoughtpolice ]; diff --git a/pkgs/development/libraries/cpp-ipfs-api/default.nix b/pkgs/development/libraries/cpp-ipfs-api/default.nix index dfebccc88e3..3c5921541a7 100644 --- a/pkgs/development/libraries/cpp-ipfs-api/default.nix +++ b/pkgs/development/libraries/cpp-ipfs-api/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "IPFS C++ API client library"; - homepage = https://github.com/vasild/cpp-ipfs-api; + homepage = "https://github.com/vasild/cpp-ipfs-api"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index 31c4c70dd9d..50c4e05dfa1 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of open-source libraries for high level network programming"; - homepage = https://cpp-netlib.org; + homepage = "https://cpp-netlib.org"; license = licenses.boost; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 93ee2ddc704..6453ff2a3e9 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,25 +7,14 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.2.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "0cghk1a0ki1063ci63imakmggwzkky1hx6lhrvc0wjfv754wsklb"; + sha256 = "1c5rs28pavv8zabprjbd2y1sblgqbbhww07qvairh149rahvxi85"; }; - # See https://github.com/Martchus/cpp-utilities/issues/18 - patches = [ - (fetchpatch { - url = "https://github.com/Martchus/cpp-utilities/commit/b2a2773cdfb2b0017a3fa3d0ed2259a9a5fda666.patch"; - sha256 = "01js90ba4xxljifncm48zbxmg7mwwz1gla1hn87yzbic47d85hfj"; - }) - (fetchpatch { - url = "https://github.com/Martchus/cpp-utilities/commit/4dd2179f191d1ace113f26177944684fa1561dc1.patch"; - sha256 = "0chw33mwsvj7cigd1c4xl2zhpbfsp5rrijdm46qpn78bq70xcz9j"; - }) - ]; nativeBuildInputs = [ cmake ]; checkInputs = [ cppunit ]; diff --git a/pkgs/development/libraries/cppcms/default.nix b/pkgs/development/libraries/cppcms/default.nix index 7bb2bad9689..0063db95770 100644 --- a/pkgs/development/libraries/cppcms/default.nix +++ b/pkgs/development/libraries/cppcms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://cppcms.com; + homepage = "http://cppcms.com"; description = "High Performance C++ Web Framework"; platforms = platforms.linux ; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/cppdb/default.nix b/pkgs/development/libraries/cppdb/default.nix index bb521ba3ec0..fc65dd73920 100644 --- a/pkgs/development/libraries/cppdb/default.nix +++ b/pkgs/development/libraries/cppdb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { - homepage = http://cppcms.com/sql/cppdb/; + homepage = "http://cppcms.com/sql/cppdb/"; description = "C++ Connectivity library that supports MySQL, PostgreSQL, Sqlite3 databases and generic ODBC drivers"; platforms = platforms.linux ; license = licenses.boost; diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix index e663c87f799..5ed06b99f33 100644 --- a/pkgs/development/libraries/cpptest/default.nix +++ b/pkgs/development/libraries/cpptest/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://cpptest.sourceforge.net/; + homepage = "http://cpptest.sourceforge.net/"; description = "Simple C++ unit testing framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix index beaa5721a4d..bf65be71575 100644 --- a/pkgs/development/libraries/cppunit/default.nix +++ b/pkgs/development/libraries/cppunit/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://freedesktop.org/wiki/Software/cppunit/; + homepage = "https://freedesktop.org/wiki/Software/cppunit/"; description = "C++ unit testing framework"; license = licenses.lgpl21; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/cpputest/default.nix b/pkgs/development/libraries/cpputest/default.nix index 28ab31a08cc..52d6ce5214e 100644 --- a/pkgs/development/libraries/cpputest/default.nix +++ b/pkgs/development/libraries/cpputest/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://cpputest.github.io/; + homepage = "http://cpputest.github.io/"; description = "Unit testing and mocking framework for C/C++"; platforms = stdenv.lib.platforms.linux ; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix index 78cefe89e3b..240710b5a50 100644 --- a/pkgs/development/libraries/cppzmq/default.nix +++ b/pkgs/development/libraries/cppzmq/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/zeromq/cppzmq; + homepage = "https://github.com/zeromq/cppzmq"; license = licenses.bsd2; description = "C++ binding for 0MQ"; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index ea3f5e6476b..4f3270d677a 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { installCheckTarget = "test"; meta = with lib; { - homepage = https://github.com/cracklib/cracklib; + homepage = "https://github.com/cracklib/cracklib"; description = "A library for checking the strength of passwords"; license = licenses.lgpl21; # Different license for the wordlist: http://www.openwall.com/wordlists maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/crc32c/default.nix b/pkgs/development/libraries/crc32c/default.nix index a7313c20553..1da2f210c5c 100644 --- a/pkgs/development/libraries/crc32c/default.nix +++ b/pkgs/development/libraries/crc32c/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isAarch64 "-march=armv8-a+crc"; meta = with stdenv.lib; { - homepage = https://github.com/google/crc32c; + homepage = "https://github.com/google/crc32c"; description = "CRC32C implementation with support for CPU-specific acceleration instructions"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ andir ]; diff --git a/pkgs/development/libraries/cre2/default.nix b/pkgs/development/libraries/cre2/default.nix index a4313fa94d3..6f101fb5d47 100644 --- a/pkgs/development/libraries/cre2/default.nix +++ b/pkgs/development/libraries/cre2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://marcomaggi.github.io/docs/cre2.html; + homepage = "http://marcomaggi.github.io/docs/cre2.html"; description = "C Wrapper for RE2"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/croaring/default.nix b/pkgs/development/libraries/croaring/default.nix index 6e6ee2479d4..b9c293edfb8 100644 --- a/pkgs/development/libraries/croaring/default.nix +++ b/pkgs/development/libraries/croaring/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Compressed bitset library for C and C++"; - homepage = http://roaringbitmap.org/; + homepage = "http://roaringbitmap.org/"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/csfml/default.nix b/pkgs/development/libraries/csfml/default.nix index 9bfff5c4aa8..ab63b7a21f2 100644 --- a/pkgs/development/libraries/csfml/default.nix +++ b/pkgs/development/libraries/csfml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DCMAKE_MODULE_PATH=${sfml}/share/SFML/cmake/Modules/" ]; meta = with stdenv.lib; { - homepage = https://www.sfml-dev.org/; + homepage = "https://www.sfml-dev.org/"; description = "Simple and fast multimedia library"; longDescription = '' SFML is a simple, fast, cross-platform and object-oriented multimedia API. diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 5696684e91d..077ac63748c 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; meta = with stdenv.lib; { - homepage = http://ctpl.tuxfamily.org/; + homepage = "http://ctpl.tuxfamily.org/"; description = "Template engine library written in C"; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/development/libraries/ctpp2/default.nix b/pkgs/development/libraries/ctpp2/default.nix index ea2230909a2..82bbdfc2fc1 100644 --- a/pkgs/development/libraries/ctpp2/default.nix +++ b/pkgs/development/libraries/ctpp2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance templating engine"; - homepage = http://ctpp.havoc.ru; + homepage = "http://ctpp.havoc.ru"; maintainers = [ maintainers.robbinch ]; platforms = platforms.linux; license = licenses.bsd2; diff --git a/pkgs/development/libraries/curlcpp/default.nix b/pkgs/development/libraries/curlcpp/default.nix index 6f531414242..274a657cb1a 100644 --- a/pkgs/development/libraries/curlcpp/default.nix +++ b/pkgs/development/libraries/curlcpp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake curl ]; meta = with stdenv.lib; { - homepage = https://josephp91.github.io/curlcpp/; + homepage = "https://josephp91.github.io/curlcpp/"; description = "Object oriented C++ wrapper for CURL"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/development/libraries/curlpp/default.nix b/pkgs/development/libraries/curlpp/default.nix index 490f472a066..810bd3f15da 100644 --- a/pkgs/development/libraries/curlpp/default.nix +++ b/pkgs/development/libraries/curlpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.curlpp.org/; + homepage = "https://www.curlpp.org/"; description = "C++ wrapper around libcURL"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; diff --git a/pkgs/development/libraries/cutee/default.nix b/pkgs/development/libraries/cutee/default.nix index 1c14454af5c..661dc7c816c 100644 --- a/pkgs/development/libraries/cutee/default.nix +++ b/pkgs/development/libraries/cutee/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ Unit Testing Easy Environment"; - homepage = http://www.codesink.org/cutee_unit_testing.html; + homepage = "http://www.codesink.org/cutee_unit_testing.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix index 2cf611eed27..1d24da9f7fe 100644 --- a/pkgs/development/libraries/cutelyst/default.nix +++ b/pkgs/development/libraries/cutelyst/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "C++ Web Framework built on top of Qt"; - homepage = https://cutelyst.org/; + homepage = "https://cutelyst.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index d9a17aff941..353a5ba9061 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux Nintendo Wiimote interface"; - homepage = http://cwiid.org; + homepage = "http://cwiid.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bennofs ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/cxx-prettyprint/default.nix b/pkgs/development/libraries/cxx-prettyprint/default.nix index e668e653477..34dc30abe61 100644 --- a/pkgs/development/libraries/cxx-prettyprint/default.nix +++ b/pkgs/development/libraries/cxx-prettyprint/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Header only C++ library for pretty printing standard containers"; - homepage = https://github.com/louisdx/cxx-prettyprint; + homepage = "https://github.com/louisdx/cxx-prettyprint"; license = stdenv.lib.licenses.boost; platforms = platforms.all; diff --git a/pkgs/development/libraries/cxxtest/default.nix b/pkgs/development/libraries/cxxtest/default.nix index 9b6407715df..00629339e08 100644 --- a/pkgs/development/libraries/cxxtest/default.nix +++ b/pkgs/development/libraries/cxxtest/default.nix @@ -18,7 +18,7 @@ in python2Packages.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = http://cxxtest.com; + homepage = "http://cxxtest.com"; description = "Unit testing framework for C++"; platforms = platforms.unix ; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/cxxtools/default.nix b/pkgs/development/libraries/cxxtools/default.nix index 4c572cf781a..ca3c4871732 100644 --- a/pkgs/development/libraries/cxxtools/default.nix +++ b/pkgs/development/libraries/cxxtools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.tntnet.org/cxxtools.html; + 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; diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix index 68f6a7c5d8b..1ffb5359992 100644 --- a/pkgs/development/libraries/cyrus-sasl/default.nix +++ b/pkgs/development/libraries/cyrus-sasl/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ]; meta = { - homepage = https://www.cyrusimap.org/sasl; + homepage = "https://www.cyrusimap.org/sasl"; description = "Library for adding authentication support to connection-based protocols"; platforms = platforms.unix; license = licenses.bsdOriginal; diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix index 05e499c73d0..bdf4519f9bc 100644 --- a/pkgs/development/libraries/czmq/default.nix +++ b/pkgs/development/libraries/czmq/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zeromq ]; meta = with stdenv.lib; { - homepage = http://czmq.zeromq.org/; + homepage = "http://czmq.zeromq.org/"; description = "High-level C Binding for ZeroMQ"; license = licenses.mpl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index bb501fb9c68..f439113efb3 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (rec { ''; meta = with stdenv.lib; { - homepage = http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html; + homepage = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/index.html"; description = "Berkeley DB"; license = license; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dbus-cplusplus/default.nix b/pkgs/development/libraries/dbus-cplusplus/default.nix index 2609f47b276..1c9f7131172 100644 --- a/pkgs/development/libraries/dbus-cplusplus/default.nix +++ b/pkgs/development/libraries/dbus-cplusplus/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-ecore" "--disable-tests" ]; meta = with stdenv.lib; { - homepage = http://dbus-cplusplus.sourceforge.net; + homepage = "http://dbus-cplusplus.sourceforge.net"; description = "C++ API for D-BUS"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix index c6237795960..b0dd8e91960 100644 --- a/pkgs/development/libraries/dbus-glib/default.nix +++ b/pkgs/development/libraries/dbus-glib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { passthru = { inherit dbus glib; }; meta = { - homepage = https://dbus.freedesktop.org; + homepage = "https://dbus.freedesktop.org"; license = with stdenv.lib.licenses; [ afl21 gpl2 ]; description = "Obsolete glib bindings for D-Bus lightweight IPC mechanism"; maintainers = [ ]; diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 5024ea3ef24..a3e3c4ebd89 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple interprocess messaging system"; - homepage = http://www.freedesktop.org/wiki/Software/dbus/; + homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; license = licenses.gpl2Plus; # most is also under AFL-2.1 maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/dbxml/default.nix b/pkgs/development/libraries/dbxml/default.nix index b940315aed8..4913cfe2847 100644 --- a/pkgs/development/libraries/dbxml/default.nix +++ b/pkgs/development/libraries/dbxml/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.oracle.com/database/berkeley-db/xml.html; + homepage = "https://www.oracle.com/database/berkeley-db/xml.html"; description = "Embeddable XML database based on Berkeley DB"; license = licenses.agpl3; maintainers = with maintainers; [ danieldk ]; diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix index 5a879e04c7d..6b42af05c11 100644 --- a/pkgs/development/libraries/dclib/default.nix +++ b/pkgs/development/libraries/dclib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dclib-0.3.7"; src = fetchurl { - url = ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2; + url = "ftp://ftp.debian.nl/pub/freebsd/ports/distfiles/dclib-0.3.7.tar.bz2"; sha256 = "02jdzm5hqzs1dv2rd596vgpcjaapm55pqqapz5m94l30v4q72rfc"; }; diff --git a/pkgs/development/libraries/dclxvi/default.nix b/pkgs/development/libraries/dclxvi/default.nix index cd78d6d8a6a..802befff14c 100644 --- a/pkgs/development/libraries/dclxvi/default.nix +++ b/pkgs/development/libraries/dclxvi/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/agl/dclxvi; + homepage = "https://github.com/agl/dclxvi"; description = "Naehrig, Niederhagen and Schwabe's pairings code, massaged into a shared library"; platforms = platforms.x86_64; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 5b37088cd95..8c3a2965484 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -1,26 +1,18 @@ { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3 -, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }: +, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }: let pname = "dconf"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "0.34.0"; + version = "0.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll"; + sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz"; }; - patches = [ - # Fix build with Meson 0.52 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/dconf/commit/cc32667c5d7d9ff95e65cc21f59905d8f9218394.patch"; - sha256 = "02gfadn34bg818a7vb3crhsiahskiflcvx9l6iqwf1v269q93mr8"; - }) - ]; - postPatch = '' chmod +x meson_post_install.py tests/test-dconf.py patchShebangs meson_post_install.py @@ -29,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 gtk-doc docbook_xsl docbook_xml_dtd_42 ]; + nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 glib gtk-doc docbook_xsl docbook_xml_dtd_42 ]; buildInputs = [ glib bash-completion dbus ]; mesonFlags = [ @@ -42,12 +34,11 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/dconf; + homepage = "https://wiki.gnome.org/Projects/dconf"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index dd26e5eb8ba..65f9982b42c 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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; + homepage = "https://launchpad.net/dee"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar worldofpeace ]; diff --git a/pkgs/development/libraries/dleyna-connector-dbus/default.nix b/pkgs/development/libraries/dleyna-connector-dbus/default.nix index 643e7d3cc5d..ff81ab72732 100644 --- a/pkgs/development/libraries/dleyna-connector-dbus/default.nix +++ b/pkgs/development/libraries/dleyna-connector-dbus/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A D-Bus API for the dLeyna services"; - homepage = https://01.org/dleyna; + homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-core/default.nix b/pkgs/development/libraries/dleyna-core/default.nix index 9d83812fefb..1f0a9bc7c59 100644 --- a/pkgs/development/libraries/dleyna-core/default.nix +++ b/pkgs/development/libraries/dleyna-core/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { # fix build with gupnp 1.2 # https://github.com/intel/dleyna-core/pull/52 (fetchpatch { - url = https://github.com/intel/dleyna-core/commit/41b2e56f67b6fc9c8c256b86957d281644b9b846.patch; + url = "https://github.com/intel/dleyna-core/commit/41b2e56f67b6fc9c8c256b86957d281644b9b846.patch"; sha256 = "1h758cp65v7qyfpvyqdri7q0gwx85mhdpkb2y8waq735q5q9ib39"; }) ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library of utility functions that are used by the higher level dLeyna"; - homepage = https://01.org/dleyna; + homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-renderer/default.nix b/pkgs/development/libraries/dleyna-renderer/default.nix index 18244d83dee..6b14bbc611a 100644 --- a/pkgs/development/libraries/dleyna-renderer/default.nix +++ b/pkgs/development/libraries/dleyna-renderer/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to discover and manipulate Digital Media Renderers"; - homepage = https://01.org/dleyna; + homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dleyna-server/default.nix b/pkgs/development/libraries/dleyna-server/default.nix index 4730d455950..90c4df8e641 100644 --- a/pkgs/development/libraries/dleyna-server/default.nix +++ b/pkgs/development/libraries/dleyna-server/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # fix build with gupnp 1.2 # https://github.com/intel/dleyna-server/pull/161 (fetchpatch { - url = https://github.com/intel/dleyna-server/commit/96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f.patch; + url = "https://github.com/intel/dleyna-server/commit/96c01c88363d6e5e9b7519bc4e8b5d86cf783e1f.patch"; sha256 = "0p8fn331x2whvn6skxqvfzilx0m0yx2q5mm2wh2625l396m3fzmm"; }) ]; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to discover, browse and manipulate Digital Media Servers"; - homepage = https://01.org/dleyna; + homepage = "https://01.org/dleyna"; maintainers = [ maintainers.jtojnar ]; platforms = platforms.linux; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 6d6bef21f39..e4259e1686c 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A general purpose cross-platform C++ machine learning library"; - homepage = http://www.dlib.net; + homepage = "http://www.dlib.net"; license = licenses.boost; maintainers = with maintainers; [ christopherpoole ma27 ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/docopt_cpp/default.nix b/pkgs/development/libraries/docopt_cpp/default.nix index 59578ef796e..5c4e71a4f87 100644 --- a/pkgs/development/libraries/docopt_cpp/default.nix +++ b/pkgs/development/libraries/docopt_cpp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++11 port of docopt"; - homepage = https://github.com/docopt/docopt.cpp; + homepage = "https://github.com/docopt/docopt.cpp"; license = with licenses; [ mit boost ]; platforms = platforms.all; maintainers = with maintainers; [ knedlsepp ]; diff --git a/pkgs/development/libraries/dotconf/default.nix b/pkgs/development/libraries/dotconf/default.nix index a2b2e08fd62..f6320a64374 100644 --- a/pkgs/development/libraries/dotconf/default.nix +++ b/pkgs/development/libraries/dotconf/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A configuration parser library"; maintainers = with maintainers; [ pSub ]; - homepage = https://github.com/williamh/dotconf; + homepage = "https://github.com/williamh/dotconf"; license = licenses.lgpl21Plus; platforms = with platforms; unix; }; diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 5f84440df45..131c22fccfb 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { Expose a SQLite database over the network and replicate it across a cluster of peers ''; - homepage = https://github.com/CanonicalLtd/dqlite/; + homepage = "https://github.com/CanonicalLtd/dqlite/"; license = licenses.asl20; maintainers = with maintainers; [ joko wucke13 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/drumstick/default.nix b/pkgs/development/libraries/drumstick/default.nix index 92c97436d7a..0d3e2913ce8 100644 --- a/pkgs/development/libraries/drumstick/default.nix +++ b/pkgs/development/libraries/drumstick/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = with maintainers; [ solson ]; description = "MIDI libraries for Qt5/C++"; - homepage = http://drumstick.sourceforge.net/; + homepage = "http://drumstick.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/dyncall/default.nix b/pkgs/development/libraries/dyncall/default.nix index 83c754e2928..e792fe1e051 100644 --- a/pkgs/development/libraries/dyncall/default.nix +++ b/pkgs/development/libraries/dyncall/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.1"; src = fetchurl { - url = https://www.dyncall.org/r1.1/dyncall-1.1.tar.gz; + url = "https://www.dyncall.org/r1.1/dyncall-1.1.tar.gz"; # https://www.dyncall.org/r1.1/SHA256 sha256 = "cf97fa3f142db832ff34235caa4d69a7d5f16716573d446b2d95069126e88795"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Highly dynamic multi-platform foreign function call interface library"; - homepage = https://www.dyncall.org; + homepage = "https://www.dyncall.org"; license = licenses.isc; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/easyloggingpp/default.nix b/pkgs/development/libraries/easyloggingpp/default.nix index 028cd221614..29fdd068959 100644 --- a/pkgs/development/libraries/easyloggingpp/default.nix +++ b/pkgs/development/libraries/easyloggingpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "C++ logging library"; - homepage = https://muflihun.github.io/easyloggingpp/; + homepage = "https://muflihun.github.io/easyloggingpp/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [acowley]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index a9a77f6a9da..e3bed618630 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://confluence.ecmwf.int/display/ECC/; + homepage = "https://confluence.ecmwf.int/display/ECC/"; license = licenses.asl20; maintainers = with maintainers; [ knedlsepp ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/eclib/default.nix b/pkgs/development/libraries/eclib/default.nix index 765e13fffb9..b6dfd429d75 100644 --- a/pkgs/development/libraries/eclib/default.nix +++ b/pkgs/development/libraries/eclib/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = ''Elliptic curve tools''; - homepage = https://github.com/JohnCremona/eclib; + homepage = "https://github.com/JohnCremona/eclib"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index f0c7c7d2064..835258d5bf2 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; meta = with stdenv.lib; { - homepage = http://troglobit.com/editline.html; + homepage = "http://troglobit.com/editline.html"; description = "A readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index fa2c3687ba7..1509db1b80d 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "The EGLStream-based Wayland external platform"; - homepage = https://github.com/NVIDIA/egl-wayland/; + homepage = "https://github.com/NVIDIA/egl-wayland/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ hedning ]; diff --git a/pkgs/development/libraries/elementary-cmake-modules/default.nix b/pkgs/development/libraries/elementary-cmake-modules/default.nix index 13617d67bf5..1fbe6f8893b 100644 --- a/pkgs/development/libraries/elementary-cmake-modules/default.nix +++ b/pkgs/development/libraries/elementary-cmake-modules/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; - homepage = https://github.com/elementary/cmake-modules; + homepage = "https://github.com/elementary/cmake-modules"; license = licenses.gpl3Plus; maintainers = [ maintainers.samdroid-apps ]; }; diff --git a/pkgs/development/libraries/embree/2.x.nix b/pkgs/development/libraries/embree/2.x.nix index e968e09459a..d8e102a0d40 100644 --- a/pkgs/development/libraries/embree/2.x.nix +++ b/pkgs/development/libraries/embree/2.x.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig cmake ispc tbb glfw openimageio libjpeg libpng libX11 libpthreadstubs ]; meta = with stdenv.lib; { description = "High performance ray tracing kernels from Intel"; - homepage = https://embree.github.io/; + homepage = "https://embree.github.io/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/libraries/enchant/1.x.nix b/pkgs/development/libraries/enchant/1.x.nix index ed91f791149..0b7b4c9c8b1 100644 --- a/pkgs/development/libraries/enchant/1.x.nix +++ b/pkgs/development/libraries/enchant/1.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generic spell checking library"; - homepage = https://abiword.github.io/enchant; + homepage = "https://abiword.github.io/enchant"; platforms = platforms.unix; badPlatforms = [ "x86_64-darwin" ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index bf6260ca766..90c312bb7a6 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://enet.bespin.org/; + 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; [ ]; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 1009f7ae708..15e634fe4b5 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for handling OpenGL function pointer management"; - homepage = https://github.com/anholt/libepoxy; + homepage = "https://github.com/anholt/libepoxy"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 5db6c3808e1..3522ff231ab 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; - homepage = https://github.com/ethereum/ethash; + homepage = "https://github.com/ethereum/ethash"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.asl20; diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index 838693ba12d..d80fdb2213d 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { Where you had a simple non-structrured string in syslog() you have a combination of description and tag/value pairs. ''; - homepage = https://www.balabit.com/support/community/products/; + homepage = "https://www.balabit.com/support/community/products/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index dc7610ee178..a192a4c2cab 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitHub +, fetchpatch , zlib , expat , cmake @@ -23,6 +24,16 @@ stdenv.mkDerivation rec { sha256 = "0n8il52yzbmvbkryrl8waz7hd9a2fdkw8zsrmhyh63jlvmmc31gf"; }; + patches = [ + # included in next release + (fetchpatch { + name = "cve-2019-20421.patch"; + url = "https://github.com/Exiv2/exiv2/commit/a82098f4f90cd86297131b5663c3dec6a34470e8.patch"; + sha256 = "16r19qb9l5j43ixm5jqid9sdv5brlkk1wq0w79rm5agxq4kblfyc"; + excludes = [ "tests/bugfixes/github/test_issue_1011.py" "test/data/Jp2Image_readMetadata_loop.poc" ]; + }) + ]; + cmakeFlags = [ "-DEXIV2_BUILD_PO=ON" "-DEXIV2_BUILD_DOC=ON" @@ -99,7 +110,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.exiv2.org/; + homepage = "https://www.exiv2.org/"; description = "A library and command-line utility to manage image metadata"; platforms = platforms.all; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index bb86ac57832..94aee7749ce 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.libexpat.org/; + homepage = "http://www.libexpat.org/"; description = "A stream-oriented XML parser library written in C"; platforms = platforms.all; license = licenses.mit; # expat version diff --git a/pkgs/development/libraries/faac/default.nix b/pkgs/development/libraries/faac/default.nix index 7a5afd8e801..0f3cb9b27b9 100644 --- a/pkgs/development/libraries/faac/default.nix +++ b/pkgs/development/libraries/faac/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source MPEG-4 and MPEG-2 AAC encoder"; - homepage = https://www.audiocoding.com/faac.html; + homepage = "https://www.audiocoding.com/faac.html"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/faad2/default.nix b/pkgs/development/libraries/faad2/default.nix index 29c0252482e..1a6d67ba805 100644 --- a/pkgs/development/libraries/faad2/default.nix +++ b/pkgs/development/libraries/faad2/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source MPEG-4 and MPEG-2 AAC decoder"; - homepage = https://www.audiocoding.com/faad2.html; + homepage = "https://www.audiocoding.com/faad2.html"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix index 75d9146c335..f1bd647b06d 100644 --- a/pkgs/development/libraries/fastjson/default.nix +++ b/pkgs/development/libraries/fastjson/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast json library for C"; - homepage = https://github.com/rsyslog/libfastjson; + homepage = "https://github.com/rsyslog/libfastjson"; license = licenses.mit; maintainers = with maintainers; [ nequissimus ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/fastpbkdf2/default.nix b/pkgs/development/libraries/fastpbkdf2/default.nix index e781e2aab83..59056a9b9a3 100644 --- a/pkgs/development/libraries/fastpbkdf2/default.nix +++ b/pkgs/development/libraries/fastpbkdf2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A fast PBKDF2-HMAC-{SHA1,SHA256,SHA512} implementation in C"; - homepage = https://github.com/ctz/fastpbkdf2; + homepage = "https://github.com/ctz/fastpbkdf2"; license = licenses.cc0; maintainers = with maintainers; [ ledif ]; }; diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index 596de28d2df..f6a7f6c12fb 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.03"; + version = "20.04"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0wlbh1py9074896fxa8lcfvjj3l943zz8wjl2rn7g21xf0ar9kyv"; + sha256 = "0ykc2y1w0wh6s3g9xzk3zqscvdjnf59923zxh2x0whxlcvndab2d"; }; nativeBuildInputs = [cmake]; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 5eb7e3866ce..bde1682e3fc 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,30 +1,23 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "fcgi"; - version = "2.4.0"; + version = "2.4.2"; - src = fetchurl { - url = "https://launchpad.net/debian/+archive/primary/+files/libfcgi_${version}.orig.tar.gz"; - # url = "http://www.fastcgi.com/dist/${name}.tar.gz"; - sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36"; + src = fetchFromGitHub { + owner = "FastCGI-Archives"; + repo = "fcgi2"; + rev = version; + sha256 = "1jhz6jfwv5kawa8kajvg18nfwc1b30f38zc0lggszd1vcmrwqkz1"; }; - patches = [ - ./gcc-4.4.diff - (fetchpatch { - # Fix a stack-smashing bug: - # xhttps://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681591 - url = "https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417/+attachment/2745025/+files/poll.patch"; - sha256 = "0v3gw0smjvrxh1bv3zx9xp633gbv5dd5bcn3ipj6ckqjyv4i6i7m"; - }) - ]; + nativeBuildInputs = [ autoreconfHook ]; postInstall = "ln -s . $out/include/fastcgi"; meta = with stdenv.lib; { description = "A language independent, scalable, open extension to CG"; - homepage = http://www.fastcgi.com/; + homepage = "http://www.fastcgi.com/"; license = "FastCGI see LICENSE.TERMS"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/fcppt/default.nix b/pkgs/development/libraries/fcppt/default.nix index 77e26f6b5dc..21a2b23f414 100644 --- a/pkgs/development/libraries/fcppt/default.nix +++ b/pkgs/development/libraries/fcppt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { programming (which is both efficient and syntactically affordable in C++11). ''; - homepage = https://fcppt.org; + homepage = "https://fcppt.org"; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/fdk-aac/default.nix b/pkgs/development/libraries/fdk-aac/default.nix index 16560f19c86..53967381570 100644 --- a/pkgs/development/libraries/fdk-aac/default.nix +++ b/pkgs/development/libraries/fdk-aac/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A high-quality implementation of the AAC codec from Android"; - homepage = https://sourceforge.net/projects/opencore-amr/; + homepage = "https://sourceforge.net/projects/opencore-amr/"; license = licenses.asl20; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index b7d5d79544e..44267dfeceb 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.unix; - homepage = https://linbox-team.github.io/fflas-ffpack/; + homepage = "https://linbox-team.github.io/fflas-ffpack/"; }; } diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 214da206f56..120a309b656 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -448,7 +448,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = https://www.ffmpeg.org/; + homepage = "https://www.ffmpeg.org/"; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines diff --git a/pkgs/development/libraries/ffmpeg-sixel/default.nix b/pkgs/development/libraries/ffmpeg-sixel/default.nix index f5ef8e850dd..049ef32b72f 100644 --- a/pkgs/development/libraries/ffmpeg-sixel/default.nix +++ b/pkgs/development/libraries/ffmpeg-sixel/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.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/; + homepage = "http://www.ffmpeg.org/"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index bc423dbd7ca..f56447668ea 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -212,7 +212,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = http://www.ffmpeg.org/; + homepage = "http://www.ffmpeg.org/"; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines diff --git a/pkgs/development/libraries/ffmpegthumbnailer/default.nix b/pkgs/development/libraries/ffmpegthumbnailer/default.nix index 6f5b1840c24..82a30337348 100644 --- a/pkgs/development/libraries/ffmpegthumbnailer/default.nix +++ b/pkgs/development/libraries/ffmpegthumbnailer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg libpng libjpeg ]; meta = with stdenv.lib; { - homepage = https://github.com/dirkvdb/ffmpegthumbnailer; + homepage = "https://github.com/dirkvdb/ffmpegthumbnailer"; description = "A lightweight video thumbnailer"; longDescription = "FFmpegthumbnailer is a lightweight video thumbnailer that can be used by file managers to create thumbnails diff --git a/pkgs/development/libraries/ffms/default.nix b/pkgs/development/libraries/ffms/default.nix index 30fb94aa248..5a87402e0d9 100644 --- a/pkgs/development/libraries/ffms/default.nix +++ b/pkgs/development/libraries/ffms/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/FFMS/ffms2/; + homepage = "https://github.com/FFMS/ffms2/"; description = "Libav/ffmpeg based source library for easy frame accurate access"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix index fcbcde74538..ba7e86747a7 100644 --- a/pkgs/development/libraries/fftw/default.nix +++ b/pkgs/development/libraries/fftw/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Fastest Fourier Transform in the West library"; - homepage = http://www.fftw.org/; + homepage = "http://www.fftw.org/"; license = licenses.gpl2Plus; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index a25f3ea04e2..f65d283fd1d 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { buildInputs = [ unzip cmake python ]; meta = { - homepage = http://people.cs.ubc.ca/~mariusm/flann/; + homepage = "http://people.cs.ubc.ca/~mariusm/flann/"; license = stdenv.lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 11e86703616..fecd54e0ef5 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (rec { maintainers = [ stdenv.lib.maintainers.teh ]; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; - homepage = https://google.github.io/flatbuffers/; + homepage = "https://google.github.io/flatbuffers/"; }; } // stdenv.lib.optionalAttrs stdenv.hostPlatform.isMusl { # Remove when updating to the next version. diff --git a/pkgs/development/libraries/flatcc/default.nix b/pkgs/development/libraries/flatcc/default.nix index d49f6d110de..6239dba2836 100644 --- a/pkgs/development/libraries/flatcc/default.nix +++ b/pkgs/development/libraries/flatcc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "FlatBuffers Compiler and Library in C for C "; - homepage = https://github.com/dvidelabs/flatcc; + homepage = "https://github.com/dvidelabs/flatcc"; license = [ stdenv.lib.licenses.asl20 ]; }; } diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index 3788974e124..ceca7e24fb6 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -54,14 +54,14 @@ stdenv.mkDerivation rec { pname = "flatpak"; - version = "1.6.2"; + version = "1.6.3"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ "out" "dev" "man" "doc" "installedTests" ]; src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz"; - sha256 = "02k9p5n60gz2k85n805n9niic4miw0mfh0i7yk1vrc8vaa5h69wd"; + sha256 = "17s8nqdxd4xdy7ag9bw06adxccha78jmlsa3zpqnl3qh92pg0hji"; }; patches = [ diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 462d186c72d..48d7735498c 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = http://www.flintlib.org/; + 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 4ac8150274c..f9e4720f643 100644 --- a/pkgs/development/libraries/flite/default.nix +++ b/pkgs/development/libraries/flite/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A small, fast run-time speech synthesis engine"; - homepage = http://www.festvox.org/flite/; + homepage = "http://www.festvox.org/flite/"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/fltk/1.4.nix b/pkgs/development/libraries/fltk/1.4.nix index 1fe50b402cb..c40a75edc09 100644 --- a/pkgs/development/libraries/fltk/1.4.nix +++ b/pkgs/development/libraries/fltk/1.4.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C++ cross-platform lightweight GUI library"; - homepage = https://www.fltk.org; + homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index fe7de504b4f..ad4736533cf 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C++ cross-platform lightweight GUI library"; - homepage = https://www.fltk.org; + homepage = "https://www.fltk.org"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 6eb6289d376..17aab0c8a34 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { fmt (formerly cppformat) is an open-source formatting library. It can be used as a fast and safe alternative to printf and IOStreams. ''; - homepage = http://fmtlib.net/; - downloadPage = https://github.com/fmtlib/fmt/; + homepage = "http://fmtlib.net/"; + downloadPage = "https://github.com/fmtlib/fmt/"; maintainers = [ maintainers.jdehaas ]; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index 89b7938de1e..ca66e03dfa4 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "folks"; - version = "0.13.2"; + version = "0.14.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0wq14yjs7m3axziy679a854vc7r7fj1l38p9jnyapb21vswdcqq2"; + sha256 = "1f9b52vmwnq7s51vj26w2618dn2ph5g12ibbkbyk6fvxcgd7iryn"; }; mesonFlags = [ @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that aggregates people from multiple sources to create metacontacts"; - homepage = https://wiki.gnome.org/Projects/Folks; + homepage = "https://wiki.gnome.org/Projects/Folks"; license = licenses.lgpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 15f29ce77f5..be648cf5a84 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source C++ library developed and used at Facebook"; - homepage = https://github.com/facebook/folly; + homepage = "https://github.com/facebook/folly"; license = licenses.asl20; # 32bit is not supported: https://github.com/facebook/folly/issues/103 platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix index 635baff796b..f4cc2989245 100644 --- a/pkgs/development/libraries/fontconfig/2.10.nix +++ b/pkgs/development/libraries/fontconfig/2.10.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for font customization and configuration"; - homepage = http://fontconfig.org/; + homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like platforms = platforms.all; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 617e058bd8f..0518cb257ab 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for font customization and configuration"; - homepage = http://fontconfig.org/; + homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like platforms = platforms.all; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index fa4a8c23e2f..5dacf53b259 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. 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; + homepage = "http://fox-toolkit.org"; license = licenses.lgpl3; maintainers = []; broken = stdenv.isDarwin; diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index bb59a34b1cc..208780a450e 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { Initially, it was developed for LINUX, but the scope of this project has in the course of time become somewhat more ambitious. 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; + homepage = "http://fox-toolkit.org"; license = stdenv.lib.licenses.lgpl3; maintainers = []; platforms = stdenv.lib.platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/frame/default.nix b/pkgs/development/libraries/frame/default.nix index feccfd1bfd2..f266f07a631 100644 --- a/pkgs/development/libraries/frame/default.nix +++ b/pkgs/development/libraries/frame/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional enableX11 "--with-x11"; meta = { - homepage = https://launchpad.net/frame; + 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; diff --git a/pkgs/development/libraries/freealut/default.nix b/pkgs/development/libraries/freealut/default.nix index c6ea5bbd23b..2c9a893284b 100644 --- a/pkgs/development/libraries/freealut/default.nix +++ b/pkgs/development/libraries/freealut/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ; meta = { - homepage = http://openal.org/; + homepage = "http://openal.org/"; description = "Free implementation of OpenAL's ALUT standard"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 16c35347bc5..d23147095fc 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { intended to be a full replacement for GLUT, and has only a few differences. ''; - homepage = http://freeglut.sourceforge.net/; + homepage = "http://freeglut.sourceforge.net/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/freeimage/default.nix b/pkgs/development/libraries/freeimage/default.nix index 188543bf7bf..878299f725a 100644 --- a/pkgs/development/libraries/freeimage/default.nix +++ b/pkgs/development/libraries/freeimage/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "freeimage-3.18.0"; src = fetchurl { - url = mirror://sourceforge/freeimage/FreeImage3180.zip; + url = "mirror://sourceforge/freeimage/FreeImage3180.zip"; sha256 = "1z9qwi9mlq69d5jipr3v2jika2g0kszqdzilggm99nls5xl7j4zl"; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "Open Source library for accessing popular graphics image file formats"; - homepage = http://freeimage.sourceforge.net/; + homepage = "http://freeimage.sourceforge.net/"; license = "GPL"; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; unix; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index 17b2a6b7c99..25a53f7601a 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu +{ stdenv, lib, fetchFromGitHub, cmake, libusb1, pkgconfig, freeglut, libGLU, libGL, libXi, libXmu , GLUT, Cocoa }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1963xndbiwgj01q17zv6xbqlsbhfd236dkbdwkbjw4b0gr8kqzq9"; }; - buildInputs = [ libusb freeglut libGLU libGL libXi libXmu ] + buildInputs = [ libusb1 freeglut libGLU libGL libXi libXmu ] ++ lib.optionals stdenv.isDarwin [ GLUT Cocoa ]; nativeBuildInputs = [ cmake pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; inherit version; - homepage = http://openkinect.org; + homepage = "http://openkinect.org"; license = with lib.licenses; [ gpl2 asl20 ]; maintainers = with lib.maintainers; [ bennofs ]; platforms = with lib.platforms; linux ++ darwin ; diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 855ca0385df..89ea40c1c65 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.6"; + version = "1.1.26"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "18rry59npbhxpzjb0l3ib7zlnlzj43srb5adcm65wyklklsh0gn2"; + sha256 = "1nqxcnf6lax7grsxhajq87h92ngm487nzzz87kkmh1nzk33r7dwd"; }; buildInputs = [ @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Libraries to natively talk to Microsoft SQL Server and Sybase databases"; - homepage = https://www.freetds.org; + homepage = "https://www.freetds.org"; license = licenses.lgpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix index 8c6f60b9801..f7a605ea872 100644 --- a/pkgs/development/libraries/freetts/default.nix +++ b/pkgs/development/libraries/freetts/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "freetts-1.2.2"; src = fetchurl { - url = mirror://sourceforge/freetts/freetts-1.2.2-src.zip; + url = "mirror://sourceforge/freetts/freetts-1.2.2-src.zip"; sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7"; }; buildInputs = [ apacheAnt unzip sharutils jdk ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation { Can be used in combination with KDE accessibility. ''; license = "GPL"; - homepage = http://freetts.sourceforge.net; + homepage = "http://freetts.sourceforge.net"; maintainers = [ lib.maintainers.sander ]; }; } diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index 6eaf1bbcc2f..408578d9c93 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { autofit which can be used instead of hinting instructions included in fonts. ''; - homepage = https://www.freetype.org/; + homepage = "https://www.freetype.org/"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) platforms = platforms.all; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/frei0r/default.nix b/pkgs/development/libraries/frei0r/default.nix index 560855c908b..2dc7275559d 100644 --- a/pkgs/development/libraries/frei0r/default.nix +++ b/pkgs/development/libraries/frei0r/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://frei0r.dyne.org; + homepage = "https://frei0r.dyne.org"; description = "Minimalist, cross-platform, shared video plugins"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 3b0b30f573b..35ae4c8e6ca 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { checkInputs = [ python3 ]; meta = with stdenv.lib; { - homepage = https://github.com/fribidi/fribidi; + homepage = "https://github.com/fribidi/fribidi"; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix index 5e8197d5e81..732cd68551b 100644 --- a/pkgs/development/libraries/fstrcmp/default.nix +++ b/pkgs/development/libraries/fstrcmp/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { comparisons of strings and byte arrays, including multi-byte character strings. ''; - homepage = http://fstrcmp.sourceforge.net/; - downloadPage = https://sourceforge.net/projects/fstrcmp/; + homepage = "http://fstrcmp.sourceforge.net/"; + downloadPage = "https://sourceforge.net/projects/fstrcmp/"; license = licenses.gpl3; maintainers = [ maintainers.sephalon ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/fstrm/default.nix b/pkgs/development/libraries/fstrm/default.nix index 40ffe6918a4..7b1adb3e3f0 100644 --- a/pkgs/development/libraries/fstrm/default.nix +++ b/pkgs/development/libraries/fstrm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Frame Streams implementation in C"; - homepage = https://github.com/farsightsec/fstrm; + homepage = "https://github.com/farsightsec/fstrm"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index a99228efcf4..21be623314f 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = https://sourceforge.net/apps/mediawiki/ftgl/; + homepage = "https://sourceforge.net/apps/mediawiki/ftgl/"; description = "Font rendering library for OpenGL applications"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/funambol/default.nix b/pkgs/development/libraries/funambol/default.nix index 04903cc5e9e..064dbb39a2f 100644 --- a/pkgs/development/libraries/funambol/default.nix +++ b/pkgs/development/libraries/funambol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "funambol-client-cpp-9.0.0"; src = fetchurl { - url = mirror://sourceforge/funambol/funambol-client-sdk-9.0.0.zip; + url = "mirror://sourceforge/funambol/funambol-client-sdk-9.0.0.zip"; sha256 = "1667gahz30i5r8kbv7w415z0hbgm6f6pln1137l5skapi1if6r73"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "SyncML client sdk by Funambol project"; - homepage = http://www.funambol.com; + homepage = "http://www.funambol.com"; license = licenses.agpl3; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index 611c9faa851..b1be17abf37 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { - homepage = https://people.gnome.org/~veillard/gamin/; + homepage = "https://people.gnome.org/~veillard/gamin/"; description = "A file and directory monitoring system"; maintainers = with maintainers; [ lovek323 ]; license = licenses.gpl2; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index a883b2c1d10..cf9b0486304 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interactive Gtk canvas widget for graph-based interfaces"; - homepage = http://drobilla.net; + homepage = "http://drobilla.net"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gbenchmark/default.nix b/pkgs/development/libraries/gbenchmark/default.nix index a990da4b010..cafbe116b1c 100644 --- a/pkgs/development/libraries/gbenchmark/default.nix +++ b/pkgs/development/libraries/gbenchmark/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A microbenchmark support library"; - homepage = https://github.com/google/benchmark; + homepage = "https://github.com/google/benchmark"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/gcc/libstdc++/5.nix b/pkgs/development/libraries/gcc/libstdc++/5.nix index 2589b6cfa16..2a11d835a6b 100644 --- a/pkgs/development/libraries/gcc/libstdc++/5.nix +++ b/pkgs/development/libraries/gcc/libstdc++/5.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = licenses.lgpl3Plus; description = "GNU Compiler Collection, version ${version} -- C++ standard library"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index cf0f22fdd40..f3625a0e355 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -1,6 +1,8 @@ { stdenv , fetchurl , pkgconfig +, meson +, ninja , gettext , gnupg , p11-kit @@ -15,30 +17,38 @@ , vala , gnome3 , python3 +, shared-mime-info }: stdenv.mkDerivation rec { pname = "gcr"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0925snsixzkwh49xiayqmj6fcrmklqk8kyy0jkv7m64h9abm1pr9"; + sha256 = "00b6bzpr8rj8mvj66r2273r417wg2y21m6n88mhkq9m22z8bxyda"; }; postPatch = '' patchShebangs build/ gcr/fixtures/ + + chmod +x meson_post_install.py + patchShebangs meson_post_install.py ''; outputs = [ "out" "dev" ]; nativeBuildInputs = [ pkgconfig + meson + python3 + ninja gettext gobject-introspection libxslt makeWrapper vala + shared-mime-info ]; buildInputs = [ @@ -58,6 +68,10 @@ stdenv.mkDerivation rec { python3 ]; + mesonFlags = [ + "-Dgtk_doc=false" + ]; + doCheck = false; # fails 21 out of 603 tests, needs dbus daemon enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 6f57d735980..be1e8f433f3 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 2 tests meta = with stdenv.lib; { - homepage = https://libgd.github.io/; + homepage = "https://libgd.github.io/"; description = "A dynamic image creation library"; license = licenses.free; # some custom license platforms = platforms.unix; diff --git a/pkgs/development/libraries/gdal/2.4.0.nix b/pkgs/development/libraries/gdal/2.4.0.nix index f914a112e10..201bec30e22 100644 --- a/pkgs/development/libraries/gdal/2.4.0.nix +++ b/pkgs/development/libraries/gdal/2.4.0.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; - homepage = https://www.gdal.org/; + homepage = "https://www.gdal.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = with stdenv.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 6a086d9c998..3695407b8f2 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = { description = "Translator library for raster geospatial data formats"; - homepage = https://www.gdal.org/; + homepage = "https://www.gdal.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/gdata-sharp/default.nix b/pkgs/development/libraries/gdata-sharp/default.nix index 58036351a09..893fc4f8d27 100644 --- a/pkgs/development/libraries/gdata-sharp/default.nix +++ b/pkgs/development/libraries/gdata-sharp/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/google-gdata/; + homepage = "https://code.google.com/archive/p/google-gdata/"; description = "The Google Data APIs"; longDescription = '' diff --git a/pkgs/development/libraries/gdbm/default.nix b/pkgs/development/libraries/gdbm/default.nix index 830a311db70..6cee01e799e 100644 --- a/pkgs/development/libraries/gdbm/default.nix +++ b/pkgs/development/libraries/gdbm/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { For compatibility with programs using old UNIX dbm function, the package also provides traditional dbm and ndbm interfaces. ''; - homepage = https://www.gnu.org/software/gdbm/; + homepage = "https://www.gnu.org/software/gdbm/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index a227245f6db..165fe3a2528 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Grassroots DICOM (GDCM) is an implementation of the DICOM standard designed to be open source so that researchers may access clinical data directly. GDCM includes a file format definition and a network communications protocol, both of which should be extended to provide a full set of tools for a researcher or small medical imaging vendor to interface with an existing medical database. ''; - homepage = http://gdcm.sourceforge.net/; + homepage = "http://gdcm.sourceforge.net/"; license = with licenses; [ bsd3 asl20 ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 0ecbb35c167..b45b578eac0 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for image loading and manipulation"; - homepage = http://library.gnome.org/devel/gdk-pixbuf/; + homepage = "http://library.gnome.org/devel/gdk-pixbuf/"; maintainers = [ maintainers.eelco ]; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index c4baaa3fae9..45739de8a9c 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome docking library"; - homepage = https://developer.gnome.org/gdl/; + homepage = "https://developer.gnome.org/gdl/"; maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gdome2/default.nix b/pkgs/development/libraries/gdome2/default.nix index e8982c4b70a..e38cb7535b0 100644 --- a/pkgs/development/libraries/gdome2/default.nix +++ b/pkgs/development/libraries/gdome2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { patches = [ ./xml-document.patch ]; meta = with stdenv.lib; { - homepage = http://gdome2.cs.unibo.it/; + homepage = "http://gdome2.cs.unibo.it/"; description = "DOM C library developed for the Gnome project"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ prikhi roconnor ]; diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index 0d96b9b5a92..545bdd12982 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://www.gecode.org; + homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; platforms = platforms.all; maintainers = [ maintainers.manveru ]; diff --git a/pkgs/development/libraries/gecode/default.nix b/pkgs/development/libraries/gecode/default.nix index 454e811447a..9d37199bff4 100644 --- a/pkgs/development/libraries/gecode/default.nix +++ b/pkgs/development/libraries/gecode/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://www.gecode.org; + homepage = "https://www.gecode.org"; description = "Toolkit for developing constraint-based systems"; platforms = platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 803cf853be1..858596597b1 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graph-based image processing framework"; - homepage = http://www.gegl.org; + homepage = "http://www.gegl.org"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index e90cc257e7e..1b864317217 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Graph-based image processing framework"; - homepage = http://www.gegl.org; + homepage = "http://www.gegl.org"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix index 1b3d5ba4b7c..fd3924fec3e 100644 --- a/pkgs/development/libraries/geis/default.nix +++ b/pkgs/development/libraries/geis/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for input gesture recognition"; - homepage = https://launchpad.net/geis; + homepage = "https://launchpad.net/geis"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index c1d0d7e8a4f..89c00308dd7 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "geocode-glib"; - version = "3.26.1"; + version = "3.26.2"; outputs = [ "out" "dev" "devdoc" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/geocode-glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "076ydfpyc4n5c9dbqmf26i4pilfi5jpw6cjcgrbgrjbndavnmajv"; + sha256 = "1l8g0f13xgkrk335afr9w8k46mziwb2jnyhl07jccl5yl37q9zh1"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext gtk-doc docbook_xsl gobject-introspection ]; diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index e7fce696894..be0edab3155 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.7.3"; + name = "geos-3.8.0"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "0znaby3fs3fy7af5njrnmjnfsa80ac97fvamlnjiywddw3j5l0q2"; + sha256 = "1mb2v9fy1gnbjhcgv0xny11ggfb17vkzsajdyibigwsxr4ylq4cr"; }; enableParallelBuilding = true; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ port of the Java Topology Suite (JTS)"; - homepage = http://geos.refractions.net/; + 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 0e0477cd24d..28bbe61d53d 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; - homepage = http://getdata.sourceforge.net/; + homepage = "http://getdata.sourceforge.net/"; }; } diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index c28afa17418..6adc147c6ac 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { GNU packages produce multi-lingual messages. ''; - homepage = https://www.gnu.org/software/gettext/; + homepage = "https://www.gnu.org/software/gettext/"; maintainers = with maintainers; [ zimbatm vrthra ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 7203f8531c2..670533e7231 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/gexiv2; + homepage = "https://wiki.gnome.org/Projects/gexiv2"; description = "GObject wrapper around the Exiv2 photo metadata library"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gf2x/default.nix b/pkgs/development/libraries/gf2x/default.nix index 4697f28bb9f..2409ee314d6 100644 --- a/pkgs/development/libraries/gf2x/default.nix +++ b/pkgs/development/libraries/gf2x/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = ''Routines for fast arithmetic in GF(2)[x]''; - homepage = http://gf2x.gforge.inria.fr; + homepage = "http://gf2x.gforge.inria.fr"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin timokau ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 235cd195071..465e4fd3b75 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GFBGraph; + homepage = "https://wiki.gnome.org/Projects/GFBGraph"; description = "GLib/GObject wrapper for the Facebook Graph API"; maintainers = gnome3.maintainers; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix index b09936f2924..733a572ac61 100644 --- a/pkgs/development/libraries/gflags/default.nix +++ b/pkgs/development/libraries/gflags/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { As such it's a replacement for getopt(). It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community. ''; - homepage = https://gflags.github.io/gflags/; + homepage = "https://gflags.github.io/gflags/"; license = licenses.bsd3; maintainers = [ maintainers.linquize ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/giblib/default.nix b/pkgs/development/libraries/giblib/default.nix index b166a69043e..2cb7a9dfe54 100644 --- a/pkgs/development/libraries/giblib/default.nix +++ b/pkgs/development/libraries/giblib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://linuxbrit.co.uk/giblib/; + homepage = "http://linuxbrit.co.uk/giblib/"; description = "wrapper library for imlib2, and other stuff"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/giflib/4.1.nix b/pkgs/development/libraries/giflib/4.1.nix index 941a7c27fea..954e508152c 100644 --- a/pkgs/development/libraries/giflib/4.1.nix +++ b/pkgs/development/libraries/giflib/4.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "giflib-4.1.6"; src = fetchurl { - url = mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2; + url = "mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2"; sha256 = "1v9b7ywz7qg8hli0s9vv1b8q9xxb2xvqq2mg1zpr73xwqpcwxhg1"; }; diff --git a/pkgs/development/libraries/giflib/libungif.nix b/pkgs/development/libraries/giflib/libungif.nix index 6336d30aeba..30cfa0db86a 100644 --- a/pkgs/development/libraries/giflib/libungif.nix +++ b/pkgs/development/libraries/giflib/libungif.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libungif-4.1.4"; src = fetchurl { - url = mirror://sourceforge/giflib/libungif-4.1.4.tar.gz; + url = "mirror://sourceforge/giflib/libungif-4.1.4.tar.gz"; sha256 = "5e65e1e5deacd0cde489900dbf54c6c2ee2ebc818199e720dbad685d87abda3d"; }; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index affd57c06bc..d7df4ab7212 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GIO API bindings"; - homepage = https://github.com/mono/gio-sharp; + homepage = "https://github.com/mono/gio-sharp"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 873865cdf83..8d52f190d01 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "libgit2"; - version = "0.99.0"; + version = "1.0.0"; # keep the version in sync with python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "0qxzv49ip378g1n7hrbifb9c6pys2kj1hnxcafmbb94gj3pgd9kg"; + sha256 = "06cwrw93ycpfb5kisnsa5nsy95pm11dbh0vvdjg1jn25h9q5d3vc"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index d63c0698127..171016388c1 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -1,11 +1,14 @@ { fetchurl +, fetchpatch , stdenv +, meson +, ninja , pkgconfig , gnome3 , gtk3 , atk , gobject-introspection -, spidermonkey_60 +, spidermonkey_68 , pango , cairo , readline @@ -14,21 +17,29 @@ , dbus , gdk-pixbuf , makeWrapper +, xvfb_run , nixosTests }: -stdenv.mkDerivation rec { +let + testDeps = [ + gobject-introspection # for Gio and cairo typelibs + gtk3 atk pango.out gdk-pixbuf + ]; +in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.58.5"; + version = "1.64.1"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fm1szmhdawvgbf9fh6vvkv1fdvbn888fciyi2wkhx48kz09jvg7"; + sha256 = "0z4qx4s3174b1w5b0slnn6jwpy2c18s4fvx4xii2kflr7s4q7bsm"; }; outputs = [ "out" "dev" "installedTests" ]; nativeBuildInputs = [ + meson + ninja pkgconfig makeWrapper libxml2 # for xml-stripblanks @@ -38,30 +49,61 @@ stdenv.mkDerivation rec { gobject-introspection cairo readline - spidermonkey_60 + spidermonkey_68 dbus # for dbus-run-session ]; + checkInputs = [ + xvfb_run + ] ++ testDeps; + propagatedBuildInputs = [ glib ]; - configureFlags = [ - "--enable-installed-tests" + mesonFlags = [ + "-Dprofiler=disabled" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + patches = [ + # Hard-code various paths + ./fix-paths.patch + + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch ]; + # Gio test is failing + # https://github.com/NixOS/nixpkgs/pull/81626#issuecomment-599325843 + doCheck = false; + postPatch = '' - for f in installed-tests/*.test.in; do - substituteInPlace "$f" --subst-var-by pkglibexecdir "$installedTests/libexec/gjs" - done + substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console ''; - postInstall = '' - moveToOutput "share/installed-tests" "$installedTests" - moveToOutput "libexec/gjs/installed-tests" "$installedTests" + preCheck = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib $installedTests/libexec/gjs/installed-tests + ln -s $PWD/libgjs.so.0 $out/lib/libgjs.so.0 + ln -s $PWD/installed-tests/js/libgimarshallingtests.so $installedTests/libexec/gjs/installed-tests/libgimarshallingtests.so + ln -s $PWD/installed-tests/js/libregress.so $installedTests/libexec/gjs/installed-tests/libregress.so + ln -s $PWD/installed-tests/js/libwarnlib.so $installedTests/libexec/gjs/installed-tests/libwarnlib.so + ''; + postInstall = '' wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \ - --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk-pixbuf ]}:$installedTests/libexec/gjs/installed-tests" + --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" testDeps}" + ''; + + checkPhase = '' + runHook preCheck + xvfb-run -s '-screen 0 800x600x24' \ + meson test --print-errorlogs + runHook postCheck ''; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/development/libraries/gjs/fix-paths.patch b/pkgs/development/libraries/gjs/fix-paths.patch new file mode 100644 index 00000000000..5ca5372ea94 --- /dev/null +++ b/pkgs/development/libraries/gjs/fix-paths.patch @@ -0,0 +1,13 @@ +diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh +index 0d118490..54c5507e 100755 +--- a/installed-tests/debugger-test.sh ++++ b/installed-tests/debugger-test.sh +@@ -3,7 +3,7 @@ + if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then + gjs="$TOP_BUILDDIR/gjs-console" + else +- gjs=gjs-console ++ gjs=@gjsConsole@ + fi + + echo 1..1 diff --git a/pkgs/development/libraries/gjs/installed-tests-path.patch b/pkgs/development/libraries/gjs/installed-tests-path.patch new file mode 100644 index 00000000000..11a39b2dd9a --- /dev/null +++ b/pkgs/development/libraries/gjs/installed-tests-path.patch @@ -0,0 +1,24 @@ +diff --git a/installed-tests/meson.build b/installed-tests/meson.build +index 294d20c6..1e5029e0 100644 +--- a/installed-tests/meson.build ++++ b/installed-tests/meson.build +@@ -1,7 +1,7 @@ + ### Installed tests ############################################################ + +-installed_tests_execdir = get_option('prefix') / pkglibexecdir / 'installed-tests' +-installed_tests_metadir = abs_datadir / 'installed-tests' / meson.project_name() ++installed_tests_execdir = get_option('installed_test_prefix') / 'libexec' / meson.project_name() / 'installed-tests' ++installed_tests_metadir = get_option('installed_test_prefix') / 'share' / 'installed-tests' / meson.project_name() + + # Simple shell script tests # + +diff --git a/meson_options.txt b/meson_options.txt +index 66f66024..008687cb 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -25,3 +25,5 @@ option('skip_gtk_tests', type: 'boolean', value: false, + description: 'Skip tests that need a display connection') + option('verbose_logs', type: 'boolean', value: false, + description: 'Enable extra log messages that may decrease performance (not allowed in release builds)') ++option('installed_test_prefix', type: 'string', value: '', ++ description: 'Prefix for installed tests') diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 8b522c6e92b..2ed717a49b8 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -2,12 +2,12 @@ , zlib, libGL, libGLU, libpng, freeglut }: stdenv.mkDerivation rec { - version = "1.4.0"; + version = "1.4.1"; pname = "gl2ps"; src = fetchurl { url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; - sha256 = "1qpidkz8x3bxqf69hlhyz1m0jmfi9kq24fxsp7rq6wfqzinmxjq3"; + sha256 = "0fsx5lh9pz1xswr4yng24j4ngiijnanksbgz05bfzkh07m5h6qkk"; }; buildInputs = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://geuz.org/gl2ps; + homepage = "http://geuz.org/gl2ps"; description = "An OpenGL to PostScript printing library"; platforms = platforms.all; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/glbinding/default.nix b/pkgs/development/libraries/glbinding/default.nix index 6498419bc27..9ce5a23f970 100644 --- a/pkgs/development/libraries/glbinding/default.nix +++ b/pkgs/development/libraries/glbinding/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libGLU xlibsWrapper ]; meta = with stdenv.lib; { - homepage = https://github.com/cginternals/glbinding/; + homepage = "https://github.com/cginternals/glbinding/"; description = "A C++ binding for the OpenGL API, generated using the gl.xml specification"; license = licenses.mit; maintainers = [ maintainers.mt-caret ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index b265cfcc016..02737143e0d 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OpenGL extension loading library for C(++)"; - homepage = http://glew.sourceforge.net/; + homepage = "http://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] platforms = platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index ec56c544cac..8f237199a65 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OpenGL extension loading library for C(++)"; - homepage = http://glew.sourceforge.net/; + homepage = "http://glew.sourceforge.net/"; license = licenses.free; # different files under different licenses #["BSD" "GLX" "SGI-B" "GPL2"] platforms = platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index b1118b473b6..e749ca733da 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = http://glfw.sourceforge.net/; + homepage = "http://glfw.sourceforge.net/"; license = licenses.zlib; maintainers = [ stdenv.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 0dfe3cbea2e..1b9fcb9586b 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time"; - homepage = https://www.glfw.org/; + homepage = "https://www.glfw.org/"; license = licenses.zlib; maintainers = with maintainers; [ marcweber twey ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 86f73e23d50..360a72bbc9d 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.62.3"; + version = "2.64.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xvzixzwwh8wk8f79qbm2gl7hp3hj1a7skv281v5qsx74dpzi8cc"; + sha256 = "1fm1462v7z556qivlwflvc3qpz36jwpzqxxvsihh45j7aka2gnjw"; }; patches = [ @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network-related giomodules for glib"; - homepage = https://gitlab.gnome.org/GNOME/glib-networking; + homepage = "https://gitlab.gnome.org/GNOME/glib-networking"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 6bc5a6c2535..d74bd0c4067 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation rec { pname = "glib"; - version = "2.62.5"; + version = "2.64.1"; src = fetchurl { url = "mirror://gnome/sources/glib/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bj5hagvfiqcjd20w543pvbnrlqvs8nbxvqjflyvcn36ljpwvldq"; + sha256 = "1ixvjmsrj45xq9bq3chhj98jhgcsqa08v627mjx6sjxlph1pd5hp"; }; patches = optionals stdenv.isDarwin [ @@ -62,8 +62,6 @@ stdenv.mkDerivation rec { ./gobject_init_on_demand.patch ] ++ [ ./schema-override-variable.patch - # Require substituteInPlace in postPatch - ./fix-gio-launch-desktop-path.patch # GLib contains many binaries used for different purposes; # we will install them to different outputs: @@ -126,9 +124,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # substitute fix-gio-launch-desktop-path.patch - substituteInPlace gio/gdesktopappinfo.c --replace "@bindir@" "$out/bin" - chmod +x gio/tests/gengiotypefuncs.py patchShebangs gio/tests/gengiotypefuncs.py chmod +x docs/reference/gio/concat-files-helper.py @@ -148,11 +143,6 @@ stdenv.mkDerivation rec { # This file is *included* in gtk3 and would introduce runtime reference via __FILE__. sed '1i#line 1 "${pname}-${version}/include/glib-2.0/gobject/gobjectnotifyqueue.c"' \ -i "$dev"/include/glib-2.0/gobject/gobjectnotifyqueue.c - '' + optionalString (!stdenv.isDarwin) '' - # Add gio-launch-desktop to $out so we can refer to it from $lib - mkdir $out/bin - mv "$bin/bin/gio-launch-desktop" "$out/bin/" - ln -s "$out/bin/gio-launch-desktop" "$bin/bin/" '' + optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' cp -r ${buildPackages.glib.devdoc} $devdoc ''; @@ -197,7 +187,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library of programming buildings blocks"; - homepage = https://www.gtk.org/; + homepage = "https://www.gtk.org/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ lovek323 raskin worldofpeace ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch b/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch deleted file mode 100644 index 4fdec2dd7e7..00000000000 --- a/pkgs/development/libraries/glib/fix-gio-launch-desktop-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gio/gdesktopappinfo.c -+++ b/gio/gdesktopappinfo.c -@@ -2725,7 +2725,7 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info, - - /* Fall back on usual searching in $PATH */ - if (tmp == NULL) -- tmp = "gio-launch-desktop"; -+ tmp = "@bindir@/gio-launch-desktop"; - g_once_init_leave (&gio_launch_desktop_path, tmp); - } - diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 50ee5097d1b..0429c7295fb 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -222,7 +222,7 @@ stdenv.mkDerivation ({ doCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/libc/; + homepage = "https://www.gnu.org/software/libc/"; description = "The GNU C Library"; longDescription = diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 18963e31b6e..6dcb6b3296a 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the GLib library"; - homepage = https://gtkmm.org/; + homepage = "https://gtkmm.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/glm/default.nix b/pkgs/development/libraries/glm/default.nix index d39d6f0d7a3..cb0ae47acde 100644 --- a/pkgs/development/libraries/glm/default.nix +++ b/pkgs/development/libraries/glm/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { graphics software based on the OpenGL Shading Language (GLSL) specification and released under the MIT license. ''; - homepage = http://glm.g-truc.net/; + homepage = "http://glm.g-truc.net/"; license = licenses.mit; platforms = platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 9cb5dda507d..564eb00f9b1 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Global Arrays Programming Models"; - homepage = http://hpc.pnl.gov/globalarrays/; + homepage = "http://hpc.pnl.gov/globalarrays/"; maintainers = [ maintainers.markuskowa ]; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/globalplatform/default.nix b/pkgs/development/libraries/globalplatform/default.nix index b3cf36107af..3ab157598a4 100644 --- a/pkgs/development/libraries/globalplatform/default.nix +++ b/pkgs/development/libraries/globalplatform/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; + homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "Library for interacting with smart card devices"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix index e01deea1175..043be9e91b5 100644 --- a/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix +++ b/pkgs/development/libraries/globalplatform/gppcscconnectionplugin.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ globalplatform openssl_1_0_2 pcsclite ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; + homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "GlobalPlatform pcsc connection plugin"; license = [ licenses.lgpl3 licenses.gpl3 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gloox/default.nix b/pkgs/development/libraries/gloox/default.nix index 3343c78bea1..7e5d7e9fa9a 100644 --- a/pkgs/development/libraries/gloox/default.nix +++ b/pkgs/development/libraries/gloox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "A portable high-level Jabber/XMPP library for C++"; - homepage = http://camaya.net/gloox; + homepage = "http://camaya.net/gloox"; license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix index 84a7aff7107..8c5a50c43d1 100644 --- a/pkgs/development/libraries/glpk/default.nix +++ b/pkgs/development/libraries/glpk/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { programming language and organized in the form of a library. ''; - homepage = https://www.gnu.org/software/glpk/; + homepage = "https://www.gnu.org/software/glpk/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ bjg timokau ]; diff --git a/pkgs/development/libraries/gmime/2.nix b/pkgs/development/libraries/gmime/2.nix index 3b4ad1393d0..c902aac23a1 100644 --- a/pkgs/development/libraries/gmime/2.nix +++ b/pkgs/development/libraries/gmime/2.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/jstedfast/gmime/; + homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 754d5aa7411..80753823ff1 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, glib, zlib, gnupg, gpgme, libidn2, libunistring, gobject-introspection +, vala }: stdenv.mkDerivation rec { - version = "3.2.5"; + version = "3.2.6"; pname = "gmime"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; - sha256 = "0ndsg1z1kq4w4caascydvialpyn4rfbjdn7xclzbzhw53x85cxgv"; + sha256 = "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb"; }; outputs = [ "out" "dev" ]; - buildInputs = [ gobject-introspection zlib gpgme libidn2 libunistring ]; + buildInputs = [ vala gobject-introspection zlib gpgme libidn2 libunistring ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glib ]; - configureFlags = [ "--enable-introspection=yes" ]; + configureFlags = [ + "--enable-introspection=yes" + "--enable-vala=yes" + ]; postPatch = '' substituteInPlace tests/testsuite.c \ @@ -28,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/jstedfast/gmime/; + homepage = "https://github.com/jstedfast/gmime/"; description = "A C/C++ library for creating, editing and parsing MIME messages and structures"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/gmm/default.nix b/pkgs/development/libraries/gmm/default.nix index 63d9d8c2762..eb23f5c82c2 100644 --- a/pkgs/development/libraries/gmm/default.nix +++ b/pkgs/development/libraries/gmm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Generic C++ template library for sparse, dense and skyline matrices"; - homepage = http://getfem.org/gmm.html; + homepage = "http://getfem.org/gmm.html"; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index a6035a2b7af..29310aa9f00 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -64,7 +64,7 @@ let self = stdenv.mkDerivation rec { asymptotically faster algorithms. ''; - homepage = https://gmplib.org/; + homepage = "https://gmplib.org/"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 494d9acb6bb..78cfa40d196 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -44,7 +44,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://gmplib.org/; + 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 cbc3faa2cb6..cca0f8d68e1 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -49,7 +49,7 @@ let self = stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://gmplib.org/; + 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 10d584c6ccb..f6516815bb9 100644 --- a/pkgs/development/libraries/gmtk/default.nix +++ b/pkgs/development/libraries/gmtk/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Common functions for gnome-mplayer and gecko-mediaplayer"; - homepage = https://sites.google.com/site/kdekorte2/gnomemplayer; + homepage = "https://sites.google.com/site/kdekorte2/gnomemplayer"; license = licenses.gpl2; maintainers = gnome_mplayer.meta.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index 0b2fb9fef6c..749b021890a 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A network library, written in C, object-oriented, and built upon GLib"; - homepage = https://developer.gnome.org/gnet/; + homepage = "https://developer.gnome.org/gnet/"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index f6ff3a2ea4a..f8e25640f29 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-menus"; - version = "3.32.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0x2blzqrapmbsbfzxjcdcpa3vkw9hq5k96h9kvjmy9kl415wcl68"; + sha256 = "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r"; }; makeFlags = [ diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index adbb714c7b2..8631cdee8cf 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "gnome-online-accounts"; - version = "3.34.1"; + version = "3.36.0"; # https://gitlab.gnome.org/GNOME/gnome-online-accounts/issues/87 src = fetchFromGitLab { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "gnome-online-accounts"; rev = version; - sha256 = "0ry06qw068rqn4y42953kwl6fkxpgfya58y87cd3zink6gj7q0fm"; + sha256 = "15j3xh93rqjphjw56j00g40m684nr4zy3hs7dsngm6a21l87fkfd"; }; outputs = [ "out" "man" "dev" "devdoc" ]; @@ -92,7 +92,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index fa762c3a02e..5926f59cc37 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://www.mono-project.com/docs/gui/gtksharp/; + homepage = "https://www.mono-project.com/docs/gui/gtksharp/"; description = "A .NET language binding for assorted GNOME libraries"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index 03799c1ef7c..04e7a59fdc2 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of GStreamer effects to be used in different GNOME Modules"; - homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; + homepage = "https://wiki.gnome.org/Projects/GnomeVideoEffects"; platforms = platforms.linux; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index 638d483b60e..e45ec957eb9 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Attempt to guess a canonical system name"; - homepage = https://savannah.gnu.org/projects/config; + homepage = "https://savannah.gnu.org/projects/config"; license = licenses.gpl3; # In addition to GPLv3: # As a special exception to the GNU General Public License, if you diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix index b5b8add2db5..402c3585d53 100644 --- a/pkgs/development/libraries/gnu-efi/default.nix +++ b/pkgs/development/libraries/gnu-efi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNU EFI development toolchain"; - homepage = https://sourceforge.net/projects/gnu-efi/; + homepage = "https://sourceforge.net/projects/gnu-efi/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 6079387fc72..90e863760e9 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation { layer. It adds TLS-KDH ciphers: Kerberos + Diffie-Hellman. ''; - homepage = https://github.com/arpa2/gnutls-kdh; + homepage = "https://github.com/arpa2/gnutls-kdh"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index cde8587acc3..f5a0b8a9f31 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation { tampering, or message forgery." ''; - homepage = https://www.gnu.org/software/gnutls/; + homepage = "https://www.gnu.org/software/gnutls/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ eelco fpletz ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 81df734a2ce..b9303bd5731 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -7,17 +7,14 @@ # it may be worth thinking about using multiple derivation outputs # In that case its about 6MB which could be separated -let - pname = "gobject-introspection"; - version = "1.62.0"; -in with stdenv.lib; stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "gobject-introspection"; + version = "1.64.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "18lhglg9v6y83lhqzyifc1z0wrlawzrhzzxx0a3h1g7xaz97xvmi"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "10pwykfnk7pw8k9k8iz3p72phxvyrh5q4d7gr3ysv08w15immh7a"; }; outputs = [ "out" "dev" "man" ]; @@ -32,6 +29,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "--datadir=${placeholder "dev"}/share" + "-Ddoctool=disabled" + "-Dcairo=disabled" ]; # outputs TODO: share/gobject-introspection-1.0/tests is needed during build @@ -56,6 +55,19 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch64; + preBuild = '' + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that we will delete before installation. + mkdir -p $out/lib + ln -s $PWD/tests/scanner/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} + cleanLibregressSymlink() { + rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} + } + preInstallPhases="$preInstallPhases cleanLibregressSymlink" + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -64,7 +76,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A middleware layer between C libraries and language bindings"; - homepage = http://live.gnome.org/GObjectIntrospection; + homepage = "http://live.gnome.org/GObjectIntrospection"; maintainers = with maintainers; [ lovek323 lethalman ]; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 2d5133afab4..de526edf8d9 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GObject to SQLite object mapper"; - homepage = https://wiki.gnome.org/Projects/Gom; + homepage = "https://wiki.gnome.org/Projects/Gom"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/goocanvas/2.x.nix b/pkgs/development/libraries/goocanvas/2.x.nix index 1440d3f6aa0..a744cf314e2 100644 --- a/pkgs/development/libraries/goocanvas/2.x.nix +++ b/pkgs/development/libraries/goocanvas/2.x.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Canvas widget for GTK based on the the Cairo 2D library"; - homepage = https://wiki.gnome.org/Projects/GooCanvas; + homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index b7f56837686..ef593c568a2 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ bindings for GooCanvas"; - homepage = https://wiki.gnome.org/Projects/GooCanvas; + homepage = "https://wiki.gnome.org/Projects/GooCanvas"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/google-cloud-cpp/default.nix b/pkgs/development/libraries/google-cloud-cpp/default.nix index be7132dc845..7eb69d075ca 100644 --- a/pkgs/development/libraries/google-cloud-cpp/default.nix +++ b/pkgs/development/libraries/google-cloud-cpp/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { license = with licenses; [ asl20 ]; - homepage = https://github.com/googleapis/google-cloud-cpp; + homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; maintainers = with maintainers; [ andir flokli ]; }; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 0e985754985..039231c0142 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/gperftools/gperftools; + homepage = "https://github.com/gperftools/gperftools"; description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index ed2b5563bd3..6a31515be3f 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which, ncurses , texinfo , buildPackages @@ -20,6 +20,21 @@ stdenv.mkDerivation rec { sha256 = "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4"; }; + patches = [ + # Fix tests with gnupg > 2.2.19 + # https://dev.gnupg.org/T4820 + (fetchpatch { + name = "cff600f1f65a2164ab25ff2b039cba008776ce62.patch"; + url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=cff600f1f65a2164ab25ff2b039cba008776ce62"; + sha256 = "9vB2aTv3zeAQS3UxCDfkRjqUlng8lkcyJPgMzdm+Qzc="; + }) + (fetchpatch { + name = "c4cf527ea227edb468a84bf9b8ce996807bd6992.patch"; + url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; + sha256 = "pKL1tvUw7PB2w4FHSt2up4SvpFiprBH6TLdgKxYFC3g="; + }) + ]; + outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool @@ -59,7 +74,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://gnupg.org/software/gpgme/index.html; + homepage = "https://gnupg.org/software/gpgme/index.html"; description = "Library for making GnuPG easier to use"; longDescription = '' GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG diff --git a/pkgs/development/libraries/grail/default.nix b/pkgs/development/libraries/grail/default.nix index 722fb79d5d6..6efc1fca39a 100644 --- a/pkgs/development/libraries/grail/default.nix +++ b/pkgs/development/libraries/grail/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional enableX11 "--with-x11"; meta = { - homepage = https://launchpad.net/canonical-multitouch/grail; + homepage = "https://launchpad.net/canonical-multitouch/grail"; description = "Gesture Recognition And Instantiation Library"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 45096e031d3..09bf9222485 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -2,12 +2,12 @@ mkDerivation rec { pname = "grantlee"; - version = "5.1.0"; + version = "5.2.0"; grantleePluginPrefix = "lib/grantlee/${lib.versions.majorMinor version}"; src = fetchurl { url = "https://github.com/steveire/grantlee/archive/v${version}.tar.gz"; - sha256 = "1lf9rkv0i0kd7fvpgg5l8jb87zw8dzcwd1liv6hji7g4wlpmfdiq"; + sha256 = "02lrdbnvaz19hkawbbj2psww1m04qsbhvv172ggpp5bbfkjwx6hk"; name = "${pname}-${version}.tar.gz"; }; @@ -43,7 +43,7 @@ mkDerivation rec { The syntax is intended to follow the syntax of the Django template system, and the design of Django is reused in Grantlee.''; - homepage = http://gitorious.org/grantlee; + homepage = "http://gitorious.org/grantlee"; maintainers = [ maintainers.ttuegel ]; license = licenses.lgpl21; inherit (qtbase.meta) platforms; diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch deleted file mode 100644 index d049d6c96f8..00000000000 --- a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Sat, 20 Jul 2019 17:35:30 +0200 -Subject: [PATCH] Fix compile with newer Qt/cmake combination - -Without this i get huge errors about Qt needing C++11 support ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6d51110..0859788 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,6 +11,9 @@ endif() - - project(Grantlee) - -+set (CMAKE_CXX_STANDARD 11) -+set (CMAKE_CXX_EXTENSIONS OFF) -+ - # Workaround for http://public.kitware.com/Bug/view.php?id=12301 - if (MINGW) - if(NOT CMAKE_BUILD_TYPE) diff --git a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch index d78ef74ce35..64eb11c3f15 100644 --- a/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch +++ b/pkgs/development/libraries/grantlee/5/grantlee-no-canonicalize-filepath.patch @@ -2,17 +2,17 @@ Index: grantlee-5.1.0/templates/lib/templateloader.cpp =================================================================== --- grantlee-5.1.0.orig/templates/lib/templateloader.cpp +++ grantlee-5.1.0/templates/lib/templateloader.cpp -@@ -141,10 +141,6 @@ Template FileSystemTemplateLoader::loadB +@@ -142,10 +142,6 @@ Template FileSystemTemplateLoader::loadByName(const QString &fileName, + QLatin1Char('/') + fileName); const QFileInfo fi(file); - + - if (file.exists() - && !fi.canonicalFilePath().contains( -- QDir(d->m_templateDirs.at(i)).canonicalPath())) +- QDir(d->m_templateDirs.at(i)).canonicalPath())) - return Template(); ++i; } - + @@ -173,11 +169,6 @@ FileSystemTemplateLoader::getMediaUri(co + QLatin1Char('/') + fileName); diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series index 19850b2e7e4..9c4015a1c19 100644 --- a/pkgs/development/libraries/grantlee/5/series +++ b/pkgs/development/libraries/grantlee/5/series @@ -1,3 +1,2 @@ grantlee-nix-profiles.patch grantlee-no-canonicalize-filepath.patch -grantlee-cxx11.patch diff --git a/pkgs/development/libraries/grantlee/default.nix b/pkgs/development/libraries/grantlee/default.nix index 1446e339745..a8e692bdd51 100644 --- a/pkgs/development/libraries/grantlee/default.nix +++ b/pkgs/development/libraries/grantlee/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { The syntax is intended to follow the syntax of the Django template system, and the design of Django is reused in Grantlee.''; - homepage = http://gitorious.org/grantlee; + homepage = "http://gitorious.org/grantlee"; license = stdenv.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 be32a74ea45..0d2b02489ef 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/GrapheneOS/hardened_malloc; + homepage = "https://github.com/GrapheneOS/hardened_malloc"; description = "Hardened allocator designed for modern systems"; longDescription = '' This is a security-focused general purpose memory allocator providing the malloc API diff --git a/pkgs/development/libraries/grib-api/default.nix b/pkgs/development/libraries/grib-api/default.nix index 0c9e4bf3156..5a1620db30c 100644 --- a/pkgs/development/libraries/grib-api/default.nix +++ b/pkgs/development/libraries/grib-api/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { - homepage = https://software.ecmwf.int/wiki/display/GRIB/Home; + homepage = "https://software.ecmwf.int/wiki/display/GRIB/Home"; license = licenses.asl20; platforms = with platforms; linux ++ darwin; description = "ECMWF Library for the GRIB file format -- DEPRECATED"; diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 21530c000da..81adab05e03 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -87,13 +87,12 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Grilo; + homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "A collection of plugins for the Grilo framework"; maintainers = gnome3.maintainers; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index b52ddbb0408..105b860c2b5 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Grilo; + homepage = "https://wiki.gnome.org/Projects/Grilo"; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; maintainers = gnome3.maintainers; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index 815d3becf6f..8549eeffde6 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.27.1"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too + version = "1.28.1"; # N.B: if you change this, change pythonPackages.grpcio and pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1yvmqxv6pwzbxw3si47x3anvl2pp3qy1acspmz4v60pd188c1fnc"; + sha256 = "17p3xwz5izlqg5ijnim4asl40pr8yhg9wrrmws4g0dk37nkn1x6p"; fetchSubmodules = true; }; patches = [ @@ -49,6 +49,8 @@ stdenv.mkDerivation rec { description = "The C based gRPC (C++, Python, Ruby, Objective-C, PHP, C#)"; license = licenses.asl20; maintainers = [ maintainers.lnl7 maintainers.marsam ]; - homepage = https://grpc.io/; + homepage = "https://grpc.io/"; + platforms = platforms.all; + changelog = "https://github.com/grpc/grpc/releases/tag/v${version}"; }; } diff --git a/pkgs/development/libraries/gsasl/default.nix b/pkgs/development/libraries/gsasl/default.nix index c5e1deea6e1..4e22c38e9c8 100644 --- a/pkgs/development/libraries/gsasl/default.nix +++ b/pkgs/development/libraries/gsasl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { (e.g. IMAP, SMTP, etc.) to authenticate peers. ''; - homepage = https://www.gnu.org/software/gsasl/; + homepage = "https://www.gnu.org/software/gsasl/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ shlevy ]; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index ea6e08811af..a23027946a4 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gsettings-desktop-schemas"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bayr76aylawf2fhyjhv9zgk4kpv7ivrrmd80khb0h3h1wk092r8"; + sha256 = "19hfjqzddkmvxg80v23xpbd1my2pzjalx3d56d2k4dk5521vcjkn"; }; passthru = { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobject-introspection ]; - nativeBuildInputs = [ pkgconfig python3 meson ninja ]; + nativeBuildInputs = [ pkgconfig python3 meson ninja glib ]; meta = with stdenv.lib; { maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/gsettings-qt/default.nix b/pkgs/development/libraries/gsettings-qt/default.nix index 8b118fe9483..5f09f437f04 100644 --- a/pkgs/development/libraries/gsettings-qt/default.nix +++ b/pkgs/development/libraries/gsettings-qt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { version = "0.1.20170824"; src = fetchbzr { - url = http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk; + url = "http://bazaar.launchpad.net/~system-settings-touch/gsettings-qt/trunk"; rev = "85"; sha256 = "1kcw0fgdyndx9c0dyha11wkj0gi05spdc1adf1609mrinbb4rnyi"; }; @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Qt/QML bindings for GSettings"; - homepage = https://launchpad.net/gsettings-qt; + homepage = "https://launchpad.net/gsettings-qt"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index 88a4ecb3622..b0db776bd61 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -52,7 +52,7 @@ unwrapped = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D-Bus service which performs user authentication on behalf of its clients"; - homepage = https://gitlab.com/accounts-sso/gsignond; + homepage = "https://gitlab.com/accounts-sso/gsignond"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index ebaf694f04e..b1a383ee591 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials"; - homepage = https://gitlab.com/accounts-sso/gsignond-plugin-lastfm; + homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index c4d23bd834c..4ac6e6a6f9f 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials"; - homepage = https://gitlab.com/accounts-sso/gsignond-plugin-mail; + homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index a140859b693..b4b16a57af4 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.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; + homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index af57950ac65..1a1f34681ce 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol"; - homepage = https://gitlab.com/accounts-sso/gsignond-plugin-sasl; + homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gsl/default.nix b/pkgs/development/libraries/gsl/default.nix index 966d6a8ffd5..4a9208cff32 100644 --- a/pkgs/development/libraries/gsl/default.nix +++ b/pkgs/development/libraries/gsl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; - homepage = https://www.gnu.org/software/gsl/; + homepage = "https://www.gnu.org/software/gsl/"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index ae102ac6030..9a31563c6cc 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "The GNU Scientific Library, a large numerical library"; - homepage = https://www.gnu.org/software/gsl/; + homepage = "https://www.gnu.org/software/gsl/"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 1405d4782ad..e3edbcac1cf 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lossy speech compression codec"; - homepage = http://www.quut.com/gsm/; + homepage = "http://www.quut.com/gsm/"; license = licenses.bsd2; maintainers = with maintainers; [ codyopel raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index a1a0da51017..fd9e327c1bc 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C/C++ toolkit for SOAP web services and XML-based applications"; - homepage = http://www.cs.fsu.edu/~engelen/soap.html; + homepage = "http://www.cs.fsu.edu/~engelen/soap.html"; # gsoap is dual/triple licensed (see homepage for details): # 1. gSOAP Public License 1.3 (based on Mozilla Public License 1.1). # Components NOT covered by the gSOAP Public License are: diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index b1869193a09..9ac296f6f02 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GSound; + homepage = "https://wiki.gnome.org/Projects/GSound"; description = "Small library for playing system sounds"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 71a427eb2a6..0f17a826b8a 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A spell-checking library for GTK applications"; - homepage = https://wiki.gnome.org/Projects/gspell; + homepage = "https://wiki.gnome.org/Projects/gspell"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index a9ee776d441..363e7ba7d10 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/gss/; + homepage = "https://www.gnu.org/software/gss/"; description = "Generic Security Service"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bjg ]; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index e899ad2c648..8ad92eb833a 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GObject-based API for handling resource discovery and announcement over SSDP"; - homepage = http://www.gupnp.org/; + homepage = "http://www.gupnp.org/"; license = licenses.lgpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index da04f0b05ed..ae5fd753132 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , meson , ninja , gettext @@ -96,6 +97,12 @@ in stdenv.mkDerivation rec { }; patches = [ + # Fix build with neon 0.31 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1165 + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/f10b424418e448211e3427a76fcd046e157ef0b7.patch"; + sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p"; + }) ./fix_pkgconfig_includedir.patch ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 178f6a1fe89..79405e5077e 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -37,6 +37,7 @@ , enableGl ? (enableX11 || enableWayland || enableCocoa) , enableCdparanoia ? (!stdenv.isDarwin) , cdparanoia +, glib }: stdenv.mkDerivation rec { @@ -60,13 +61,15 @@ stdenv.mkDerivation rec { pkgconfig python3 gettext + orc + glib gobject-introspection # docs gtk-doc docbook_xsl docbook_xml_dtd_43 - ]; + ] ++ lib.optional enableWayland wayland; buildInputs = [ orc diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 3dd7a547de9..67a0aa9f3f8 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { flex python3 makeWrapper + glib gobject-introspection bash-completion @@ -57,7 +58,9 @@ stdenv.mkDerivation rec { docbook_xml_dtd_43 ]; - buildInputs = lib.optionals stdenv.isLinux [ + buildInputs = [ + bash-completion + ] ++ lib.optionals stdenv.isLinux [ libcap libunwind elfutils diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index 402074a4e5f..804d80b8e1d 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base gstreamer ]; meta = { - homepage = https://gstreamer.freedesktop.org/modules/gnonlin.html; + homepage = "https://gstreamer.freedesktop.org/modules/gnonlin.html"; description = "Gstreamer Non-Linear Multimedia Editing Plugins"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix index 77465645d23..cd37a513184 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-bad/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "‘Bad’ (potentially low quality) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index eed9d423fdb..ad978e903f8 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; meta = with stdenv.lib; { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Base plug-ins for GStreamer"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index 2b78d4daaf3..225bcc7e263 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "`Good' plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix index 2f46016adac..5321fc379cc 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-ugly/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "‘Ugly’ (potentially patent-encumbered) plug-ins for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index c8414a7b681..4c56039bd0a 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ gstreamer python ]; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index e69e584b23d..b78f6148e48 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Library for constructing graphs of media-handling components"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix index 27036ad86ed..24197b04b73 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamermm/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ bindings for the GStreamer streaming multimedia library"; - homepage = https://www.gtkmm.org/; + homepage = "https://www.gtkmm.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ plcplc ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index d0a2d3691b4..b848af6c318 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://foicica.com/gtdialog; + 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 bbc582f581c..62234651aa9 100644 --- a/pkgs/development/libraries/gtest/default.nix +++ b/pkgs/development/libraries/gtest/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google's framework for writing C++ tests"; - homepage = https://github.com/google/googletest; + homepage = "https://github.com/google/googletest"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ zoomulator ivan-tkatchev ]; diff --git a/pkgs/development/libraries/gtk-mac-integration/default.nix b/pkgs/development/libraries/gtk-mac-integration/default.nix index 2281055c62b..188efe6ae99 100644 --- a/pkgs/development/libraries/gtk-mac-integration/default.nix +++ b/pkgs/development/libraries/gtk-mac-integration/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { license = licenses.lgpl21; - homepage = https://wiki.gnome.org/Projects/GTK/OSX/Integration; + homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Integration"; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index 615ea66f4d9..ed53105f758 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical User Interface Toolkit for mono and .Net"; - homepage = https://www.mono-project.com/docs/gui/gtksharp; + homepage = "https://www.mono-project.com/docs/gui/gtksharp"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/gtk/2.x.nix b/pkgs/development/libraries/gtk/2.x.nix index 932527eed09..09cb016dbb6 100644 --- a/pkgs/development/libraries/gtk/2.x.nix +++ b/pkgs/development/libraries/gtk/2.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ./patches/gtk2-theme-paths.patch ] ++ optionals stdenv.isDarwin [ (fetchpatch { - url = https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776; + url = "https://bug557780.bugzilla-attachments.gnome.org/attachment.cgi?id=306776"; sha256 = "0sp8f1r5c4j2nlnbqgv7s7nxa4cfwigvm033hvhb1ld652pjag4r"; }) ./patches/2.0-darwin-x11.patch @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; - homepage = https://www.gtk.org/; + homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 9f381c5ac70..fc3d79891e4 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -70,6 +70,11 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1528 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3c28751dee115e969a58a733f2f19e71062b9d2d.patch"; + sha256 = "1rqrmymwd22dsiy7agjw13mcyic3by6020rxyaw7zslnmyzfiwc3"; + }) # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch ] ++ optionals stdenv.isDarwin [ @@ -198,7 +203,7 @@ stdenv.mkDerivation rec { proprietary software with GTK without any license fees or royalties. ''; - homepage = https://www.gtk.org/; + homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin vcunat lethalman worldofpeace ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index 2cad4a19a0f..a03dc51f00c 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "D binding and OO wrapper for GTK"; - homepage = https://gtkd.org; + homepage = "https://gtkd.org"; license = licenses.lgpl3Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 12b9181a952..0c72f8501cc 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { patches = [ ./gcc-4.3-build-fixes.patch ./gcc-4.4-build-fixes.patch ]; meta = { - homepage = http://helm.cs.unibo.it/mml-widget/; + 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 ]; diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 523c5b50d28..24262d263cb 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { tutorial. ''; - homepage = https://gtkmm.org/; + homepage = "https://gtkmm.org/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index d79e739f80c..5794b2ddf46 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { tutorial. ''; - homepage = https://gtkmm.org/; + homepage = "https://gtkmm.org/"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index 1b35221f066..0ab3bcb90d4 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = "gtksourceview"; - attrPath = "gnome3.gtksourceview"; + attrPath = "gtksourceview3"; }; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GtkSourceView; + homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index d3a7d849062..1ecd1ce2ae5 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gtksourceview"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16k8kqw9w775f1ijsk898hp210an5mv4yfyrmik9m8khxx593nwx"; + sha256 = "11csdnb5xj1gkn1shynp3jdsfhhi7ks3apgmavfan0p6n85f64sc"; }; propagatedBuildInputs = [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GtkSourceView; + homepage = "https://wiki.gnome.org/Projects/GtkSourceView"; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index d60bb29c47a..4299f6e1d0f 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://developer.gnome.org/gtksourceviewmm/; + homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; license = licenses.lgpl2; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 1b66bfd031f..7bf510207ab 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -12,7 +12,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = "gtksourceviewmm"; - attrPath = "gnome3.gtksourceviewmm"; versionPolicy = "none"; }; }; @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://developer.gnome.org/gtksourceviewmm/; + homepage = "https://developer.gnome.org/gtksourceviewmm/"; description = "C++ wrapper for gtksourceview"; license = licenses.lgpl2; maintainers = [ maintainers.juliendehos ]; diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix index b68c814ad54..707acfcd382 100644 --- a/pkgs/development/libraries/gtkspell/3.nix +++ b/pkgs/development/libraries/gtkspell/3.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://gtkspell.sourceforge.net/; + homepage = "http://gtkspell.sourceforge.net/"; description = "Word-processor-style highlighting GtkTextView widget"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index 14676be0dcb..b6ee2c6825d 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gtkspell-2.0.16"; src = fetchurl { - url = mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz; + url = "mirror://sourceforge/gtkspell/gtkspell-2.0.16.tar.gz"; sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Word-processor-style highlighting and replacement of misspelled words"; - homepage = http://gtkspell.sourceforge.net; + homepage = "http://gtkspell.sourceforge.net"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix index 97f1a12c178..b3bca9bd7b6 100644 --- a/pkgs/development/libraries/gtkspellmm/default.nix +++ b/pkgs/development/libraries/gtkspellmm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ binding for the gtkspell library"; - homepage = http://gtkspell.sourceforge.net/; + homepage = "http://gtkspell.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gts/default.nix b/pkgs/development/libraries/gts/default.nix index 18640e923e8..adf914369cf 100644 --- a/pkgs/development/libraries/gts/default.nix +++ b/pkgs/development/libraries/gts/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "permission denied" meta = { - homepage = http://gts.sourceforge.net/; + homepage = "http://gts.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2Plus; description = "GNU Triangulated Surface Library"; diff --git a/pkgs/development/libraries/gumbo/default.nix b/pkgs/development/libraries/gumbo/default.nix index 2db8c1e6739..9acc48ae0b8 100644 --- a/pkgs/development/libraries/gumbo/default.nix +++ b/pkgs/development/libraries/gumbo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C99 HTML parsing algorithm"; - homepage = https://github.com/google/gumbo-parser; + homepage = "https://github.com/google/gumbo-parser"; maintainers = [ maintainers.nico202 ]; platforms = platforms.linux; license = licenses.asl20; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index b764ce2c2e2..80fb9e3afff 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://gupnp.org/; + homepage = "http://gupnp.org/"; description = "A collection of helpers for building AV (audio/video) applications using GUPnP"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index 4dfbaafdc32..8fc001de3d5 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/GUPnP/; + homepage = "https://wiki.gnome.org/Projects/GUPnP/"; description = "Library to ease DLNA-related bits for applications using GUPnP"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 56a274316e8..a8ed1f7cadd 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { patches = [ # Add gupnp-1.2 compatibility (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch; + url = "https://gitlab.gnome.org/GNOME/gupnp-igd/commit/63531558a16ac2334a59f627b2fca5576dcfbb2e.patch"; sha256 = "0s8lkyy9fnnnnkkqwbk6gxb7795bb1kl1swk5ldjnlrzhfcy1ab2"; }) ]; @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to handle UPnP IGD port mapping"; - homepage = http://www.gupnp.org/; + homepage = "http://www.gupnp.org/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index a69df33dd65..153eb681d63 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { # fix deadlock in gupnp-igd tests (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch; + url = "https://gitlab.gnome.org/GNOME/gupnp/commit/d208562657f62b34759896ca9e974bd582d1f963.patch"; sha256 = "02kzsb4glxhgb1npf6qqgafiki0ws75sly5h470431mihc6sgp4f"; }) # fix breakage in gupnp-igd tests (fetchpatch { - url = https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch; + url = "https://gitlab.gnome.org/GNOME/gupnp/commit/0648399acb989473119fe59d0b9f65c923e69483.patch"; sha256 = "0ba0rngk3a4n3z4dmq06wzgh0n3q9la1nr25qdxqbwlszmxfxpjf"; }) ]; @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.gupnp.org/; + homepage = "http://www.gupnp.org/"; description = "An implementation of the UPnP specification"; license = licenses.lgpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index 539a1ffeed9..204c9d8dd74 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GLib libusb wrapper"; - homepage = https://github.com/hughsie/libgusb; + homepage = "https://github.com/hughsie/libgusb"; license = licenses.lgpl21; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f8db6f573d9..1caed4cacf7 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -41,11 +41,11 @@ stdenv.mkDerivation rec { pname = "gvfs"; - version = "1.42.2"; + version = "1.44.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jgrbid8a61hgh05wl8c4f4638x7dffd5vip02jmladxfdszjymm"; + sha256 = "0ipv0jgzim6glsgizmfjkx0m3gd1l9lr242m0jj6cdmhs52k5vsh"; }; postPatch = '' diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 000af7fd74e..8a359314dee 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { command line interface or in a text-oriented interactive interface. ''; license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - homepage = http://hamlib.sourceforge.net; + homepage = "http://hamlib.sourceforge.net"; maintainers = with stdenv.lib.maintainers; [ relrod ]; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 42f68eea83f..c2a924c7e02 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OpenType text shaping engine"; - homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz; + homepage = "http://www.freedesktop.org/wiki/Software/HarfBuzz"; downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/"; maintainers = [ maintainers.eelco ]; license = licenses.mit; diff --git a/pkgs/development/libraries/hawknl/default.nix b/pkgs/development/libraries/hawknl/default.nix index 77c1ca07dc9..e9d5d5d9731 100644 --- a/pkgs/development/libraries/hawknl/default.nix +++ b/pkgs/development/libraries/hawknl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "hawknl-1.68"; src = fetchurl { - url = http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip; + url = "http://urchlay.naptime.net/~urchlay/src/HawkNL168src.zip"; sha256 = "11shn2fbxj3w0j77w0234pqyj1368x686kkgv09q5yqhi1cdp028"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://hawksoft.com/hawknl/; + homepage = "http://hawksoft.com/hawknl/"; description = "Free, open source, game oriented network API"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index ec86db036e9..d3433246b78 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://herqq.org; + homepage = "http://herqq.org"; description = "A software library for building UPnP devices and control points"; platforms = platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/libraries/hiredis-vip/default.nix b/pkgs/development/libraries/hiredis-vip/default.nix index 59e168115a8..a4c7575ac04 100644 --- a/pkgs/development/libraries/hiredis-vip/default.nix +++ b/pkgs/development/libraries/hiredis-vip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A C client library for the Redis database"; - homepage = https://github.com/vipshop/hiredis-vip; + homepage = "https://github.com/vipshop/hiredis-vip"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/libraries/hivex/default.nix b/pkgs/development/libraries/hivex/default.nix index ca547faa2ab..113a49138e1 100644 --- a/pkgs/development/libraries/hivex/default.nix +++ b/pkgs/development/libraries/hivex/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Windows registry hive extraction library"; license = licenses.lgpl2; - homepage = https://github.com/libguestfs/hivex; + homepage = "https://github.com/libguestfs/hivex"; maintainers = with maintainers; [offline]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index 8e3327d880f..3ced1c121c6 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ standard library for concurrency and parallelism"; - homepage = https://github.com/STEllAR-GROUP/hpx; + 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 ]; diff --git a/pkgs/development/libraries/hspell/default.nix b/pkgs/development/libraries/hspell/default.nix index 32743e61797..8501bf88b6d 100644 --- a/pkgs/development/libraries/hspell/default.nix +++ b/pkgs/development/libraries/hspell/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hebrew spell checker"; - homepage = http://hspell.ivrix.org.il/; + homepage = "http://hspell.ivrix.org.il/"; platforms = platforms.all; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix index f0968c47822..ed3171da90f 100644 --- a/pkgs/development/libraries/htmlcxx/default.nix +++ b/pkgs/development/libraries/htmlcxx/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./ptrdiff.patch ]; meta = with stdenv.lib; { - homepage = http://htmlcxx.sourceforge.net/; + homepage = "http://htmlcxx.sourceforge.net/"; description = "A simple non-validating css1 and html parser for C++"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix index 7c3b313dd60..203fcaa19ec 100644 --- a/pkgs/development/libraries/http-parser/default.nix +++ b/pkgs/development/libraries/http-parser/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: let - version = "2.9.3"; + version = "2.9.4"; in stdenv.mkDerivation { pname = "http-parser"; inherit version; @@ -10,7 +10,7 @@ in stdenv.mkDerivation { owner = "nodejs"; repo = "http-parser"; rev = "v${version}"; - sha256 = "189zi61vczqgmqjd2myjcjbbi5icrk7ccs0kn6nj8hxqiv5j3811"; + sha256 = "1vda4dp75pjf5fcph73sy0ifm3xrssrmf927qd1x8g3q46z0cv6c"; }; NIX_CFLAGS_COMPILE = "-Wno-error"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "An HTTP message parser written in C"; - homepage = https://github.com/nodejs/http-parser; + homepage = "https://github.com/nodejs/http-parser"; maintainers = with maintainers; [ matthewbauer ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix index a9b28253171..20acc49bb83 100644 --- a/pkgs/development/libraries/hunspell/default.nix +++ b/pkgs/development/libraries/hunspell/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://hunspell.sourceforge.net; + homepage = "http://hunspell.sourceforge.net"; description = "Spell checker"; longDescription = '' Hunspell is the spell checker of LibreOffice, OpenOffice.org, Mozilla diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 9ec79f51443..a330691c6a5 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -39,7 +39,7 @@ let }; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription} from rla"; - homepage = https://github.com/sbosio/rla-es; + homepage = "https://github.com/sbosio/rla-es"; license = with licenses; [ gpl3 lgpl3 mpl11 ]; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -121,7 +121,7 @@ let meta = with stdenv.lib; { inherit longDescription; description = "Hunspell dictionary for ${shortDescription} from Dicollecte"; - homepage = https://www.dicollecte.org/home.php?prj=fr; + homepage = "https://www.dicollecte.org/home.php?prj=fr"; license = licenses.mpl20; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -150,7 +150,7 @@ let readmeFile = "README_" + dictFileName + ".txt"; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription} from Wordlist"; - homepage = http://wordlist.aspell.net/; + homepage = "http://wordlist.aspell.net/"; license = licenses.bsd3; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -177,7 +177,7 @@ let readmeFile = dictFileName + "_README.txt"; meta = with stdenv.lib; { description = "Hunspell dictionary for ${shortDescription}"; - homepage = https://sourceforge.net/projects/linguistico/; + homepage = "https://sourceforge.net/projects/linguistico/"; license = licenses.gpl3; maintainers = with maintainers; [ renzo ]; platforms = platforms.all; @@ -218,7 +218,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://xuxen.eus/; + homepage = "http://xuxen.eus/"; description = shortDescription; longDescription = longDescription; license = licenses.gpl2; @@ -255,7 +255,7 @@ let ''; meta = with stdenv.lib; { - homepage = https://www.j3e.de/ispell/igerman98/index_en.html; + homepage = "https://www.j3e.de/ispell/igerman98/index_en.html"; description = shortDescription; license = with licenses; [ gpl2 gpl3 ]; maintainers = with maintainers; [ timor ]; @@ -284,7 +284,7 @@ let cp -a ${sourceRoot}/* . ''; meta = with stdenv.lib; { - homepage = https://wiki.documentfoundation.org/Development/Dictionaries; + homepage = "https://wiki.documentfoundation.org/Development/Dictionaries"; description = "Hunspell dictionary for ${shortDescription} from LibreOffice"; license = license; maintainers = with maintainers; [ vlaci ]; @@ -303,7 +303,7 @@ in rec { srcFileName = "en_US"; dictFileName = "en_US"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-2018.04.16.zip"; sha256 = "18hbncvqnckzqarrmnzk58plymjqyi93k4qj98fac5mr71jbmzaf"; }; }; @@ -315,7 +315,7 @@ in rec { srcFileName = "en_US-large"; dictFileName = "en_US"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-large-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_US-large-2018.04.16.zip"; sha256 = "1xm9jgqbivp5cb78ykjxg47vzq1yqj82l7r4q5cjpivrv99s49qc"; }; }; @@ -327,7 +327,7 @@ in rec { srcFileName = "en_CA"; dictFileName = "en_CA"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-2018.04.16.zip"; sha256 = "06yf3s7y1215jmikbs18cn4j8a13csp4763w3jfgah8zlim6vc47"; }; }; @@ -339,7 +339,7 @@ in rec { srcFileName = "en_CA-large"; dictFileName = "en_CA"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-large-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_CA-large-2018.04.16.zip"; sha256 = "1200xxyvv6ni8nk52v3059c367817vnrkm0cdh38rhiigb5flfha"; }; }; @@ -351,7 +351,7 @@ in rec { srcFileName = "en_AU"; dictFileName = "en_AU"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-2018.04.16.zip"; sha256 = "1kp06npl1kd05mm9r52cg2iwc13x02zwqgpibdw15b6x43agg6f5"; }; }; @@ -363,7 +363,7 @@ in rec { srcFileName = "en_AU-large"; dictFileName = "en_AU"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-large-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_AU-large-2018.04.16.zip"; sha256 = "14l1w4dpk0k1js2wwq5ilfil89ni8cigph95n1rh6xi4lzxj7h6g"; }; }; @@ -375,7 +375,7 @@ in rec { srcFileName = "en_GB-ise"; dictFileName = "en_GB"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ise-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ise-2018.04.16.zip"; sha256 = "0ylg1zvfvsawamymcc9ivrqcb9qhlpgpnizm076xc56jz554xc2l"; }; }; @@ -387,7 +387,7 @@ in rec { srcFileName = "en_GB-ize"; dictFileName = "en_GB"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ize-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-ize-2018.04.16.zip"; sha256 = "1rmwy6sxmd400cwjf58az6g14sq28p18f5mlq8ybg8y33q9m42ps"; }; }; @@ -399,7 +399,7 @@ in rec { srcFileName = "en_GB-large"; dictFileName = "en_GB"; src = fetchurl { - url = mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-large-2018.04.16.zip; + url = "mirror://sourceforge/wordlist/speller/2018.04.16/hunspell-en_GB-large-2018.04.16.zip"; sha256 = "1y4d7x5vvi1qh1s3i09m0vvqrpdzzqhsdngr8nsh7hc5bnlm37mi"; }; }; @@ -606,7 +606,7 @@ in rec { dictFileName = "it_IT"; shortDescription = "Hunspell dictionary for 'Italian (Italy)' from Linguistico"; src = fetchurl { - url = mirror://sourceforge/linguistico/italiano_2_4_2007_09_01.zip; + url = "mirror://sourceforge/linguistico/italiano_2_4_2007_09_01.zip"; sha256 = "0m9frz75fx456bczknay5i446gdcp1smm48lc0qfwzhz0j3zcdrd"; }; }; @@ -716,7 +716,7 @@ in rec { meta = with stdenv.lib; { description = "Hunspell dictionary for Ukrainian (Ukraine) from LibreOffice"; - homepage = https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/; + homepage = "https://extensions.libreoffice.org/extensions/ukrainian-spelling-dictionary-and-thesaurus/"; license = licenses.mpl20; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index ffa64858b75..35f8a8484e7 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -7,7 +7,7 @@ assert x11Support -> libX11 != null && cairo != null; with stdenv.lib; let - version = "2.1.0"; + version = "2.2.0"; versmm = versions.major version + "." + versions.minor version; name = "hwloc-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.open-mpi.org/software/hwloc/v${versmm}/downloads/${name}.tar.bz2"; - sha256 = "0qh8s7pphz0m5cwb7liqmc17xzfs23xhz5wn24r6ikvjyx99fhhr"; + sha256 = "0li27a3lnmb77qxpijj0kpblz32wmqd3b386sypq8ar7vy9vhw5f"; }; configureFlags = [ @@ -80,7 +80,7 @@ in stdenv.mkDerivation { # https://www.open-mpi.org/projects/hwloc/license.php license = licenses.bsd3; - homepage = https://www.open-mpi.org/projects/hwloc/; + homepage = "https://www.open-mpi.org/projects/hwloc/"; maintainers = with maintainers; [ fpletz markuskowa ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/icu/63.nix b/pkgs/development/libraries/icu/63.nix index 719318990c6..07684d8db81 100644 --- a/pkgs/development/libraries/icu/63.nix +++ b/pkgs/development/libraries/icu/63.nix @@ -6,7 +6,7 @@ import ./base.nix { patches = [ # https://bugzilla.mozilla.org/show_bug.cgi?id=1499398 (fetchpatch { - url = https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch; + url = "https://github.com/unicode-org/icu/commit/8baff8f03e07d8e02304d0c888d0bb21ad2eeb01.patch"; sha256 = "1awfa98ljcf95a85cssahw6bvdnpbq5brf1kgspy14w4mlmhd0jb"; }) ]; diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index e51224433e8..96b00027e20 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -44,7 +44,7 @@ let meta = with stdenv.lib; { description = "Unicode and globalization support library"; - homepage = http://site.icu-project.org/; + homepage = "http://site.icu-project.org/"; maintainers = with maintainers; [ raskin ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix index ddce76b10f7..6889a9f573a 100644 --- a/pkgs/development/libraries/id3lib/default.nix +++ b/pkgs/development/libraries/id3lib/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ zlib ]; src = fetchurl { - url = mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz; + url = "mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz"; sha256 = "0yfhqwk0w8q2hyv1jib1008jvzmwlpsxvc8qjllhna6p1hycqj97"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library for reading, writing, and manipulating ID3v1 and ID3v2 tags"; - homepage = http://id3lib.sourceforge.net; + homepage = "http://id3lib.sourceforge.net"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/idnkit/default.nix b/pkgs/development/libraries/idnkit/default.nix index 3d00d20f170..da7b9f1f271 100644 --- a/pkgs/development/libraries/idnkit/default.nix +++ b/pkgs/development/libraries/idnkit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libiconv ]; meta = with stdenv.lib; { - homepage = https://www.nic.ad.jp/ja/idn/idnkit; + homepage = "https://www.nic.ad.jp/ja/idn/idnkit"; description = "Provides functionalities about i18n domain name processing"; license = "idnkit-2 license"; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ignition-math/default.nix b/pkgs/development/libraries/ignition-math/default.nix index 3a642c8837a..df4c3230b96 100644 --- a/pkgs/development/libraries/ignition-math/default.nix +++ b/pkgs/development/libraries/ignition-math/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://ignitionrobotics.org/libraries/math; + homepage = "https://ignitionrobotics.org/libraries/math"; description = "Math library by Ingition Robotics, created for the Gazebo project"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/development/libraries/ignition-transport/generic.nix b/pkgs/development/libraries/ignition-transport/generic.nix index 0e7603db585..2573c97aa09 100644 --- a/pkgs/development/libraries/ignition-transport/generic.nix +++ b/pkgs/development/libraries/ignition-transport/generic.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://ignitionrobotics.org/libraries/math; + homepage = "https://ignitionrobotics.org/libraries/math"; description = "Math library by Ingition Robotics, created for the Gazebo project"; license = licenses.asl20; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/development/libraries/igraph/default.nix b/pkgs/development/libraries/igraph/default.nix index f3206700cb8..fcb5e7918d9 100644 --- a/pkgs/development/libraries/igraph/default.nix +++ b/pkgs/development/libraries/igraph/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "The network analysis package"; - homepage = https://igraph.org/; + homepage = "https://igraph.org/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix index 98a34477e4f..46ed422b540 100644 --- a/pkgs/development/libraries/ijs/default.nix +++ b/pkgs/development/libraries/ijs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { configureFlags = [ "--enable-shared" ]; meta = with stdenv.lib; { - homepage = https://www.openprinting.org/download/ijs/; + homepage = "https://www.openprinting.org/download/ijs/"; description = "Raster printer driver architecture"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/iksemel/default.nix b/pkgs/development/libraries/iksemel/default.nix index 6330347cd27..7f7645edc91 100644 --- a/pkgs/development/libraries/iksemel/default.nix +++ b/pkgs/development/libraries/iksemel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML parser for jabber"; - homepage = https://github.com/timothytylee/iksemel-1.4; + homepage = "https://github.com/timothytylee/iksemel-1.4"; license = licenses.gpl2; maintainers = with maintainers; [ disassembler ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ilbc/default.nix b/pkgs/development/libraries/ilbc/default.nix index cb83322ebb6..37885c767bd 100644 --- a/pkgs/development/libraries/ilbc/default.nix +++ b/pkgs/development/libraries/ilbc/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { script = ./extract-cfile.awk; rfc3951 = fetchurl { - url = http://www.ietf.org/rfc/rfc3951.txt; + url = "http://www.ietf.org/rfc/rfc3951.txt"; sha256 = "0zf4mvi3jzx6zjrfl2rbhl2m68pzbzpf1vbdmn7dqbfpcb67jpdy"; }; diff --git a/pkgs/development/libraries/ilixi/default.nix b/pkgs/development/libraries/ilixi/default.nix index bb6e23937c0..6f789174ec0 100644 --- a/pkgs/development/libraries/ilixi/default.nix +++ b/pkgs/development/libraries/ilixi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight C++ GUI toolkit for embedded Linux systems"; - homepage = https://github.com/ilixi/ilixi; + homepage = "https://github.com/ilixi/ilixi"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 00cdda1e570..99e47b0b303 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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/; + homepage = "https://www.openexr.com/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 2b85f12115b..598d7a58ef9 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = https://cs.uwaterloo.ca/~astorjoh/iml.html; + 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 e476bc22eca..b94af22c0a7 100644 --- a/pkgs/development/libraries/imlib/default.nix +++ b/pkgs/development/libraries/imlib/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation { name = "imlib-1.9.15"; src = fetchurl { - url = http://tarballs.nixos.org/imlib-1.9.15.tar.gz; + url = "http://tarballs.nixos.org/imlib-1.9.15.tar.gz"; sha256 = "0ggjxyvgp4pxc0b88v40xj9daz90518ydnycw7qax011gxpr12d3"; }; patches = [ (fetchpatch { name = "CVE-2007-3568.patch"; - url = https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-libs/imlib/files/imlib-1.9.15-bpp16-CVE-2007-3568.patch"; sha256 = "0lxfibi094gki39sq1w4p0hcx25xlk0875agbhjkjngzx862wvbg"; }) ]; diff --git a/pkgs/development/libraries/indicator-application/gtk2.nix b/pkgs/development/libraries/indicator-application/gtk2.nix index 16a21382d85..6ac74988dff 100644 --- a/pkgs/development/libraries/indicator-application/gtk2.nix +++ b/pkgs/development/libraries/indicator-application/gtk2.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Indicator to take menus from applications and place them in the panel (GTK 2 library for Xfce/LXDE)"; - homepage = https://launchpad.net/indicators-gtk2; + homepage = "https://launchpad.net/indicators-gtk2"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/indicator-application/gtk3.nix b/pkgs/development/libraries/indicator-application/gtk3.nix index 02357297635..a523019e78c 100644 --- a/pkgs/development/libraries/indicator-application/gtk3.nix +++ b/pkgs/development/libraries/indicator-application/gtk3.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Indicator to take menus from applications and place them in the panel"; - homepage = https://launchpad.net/indicator-application; + homepage = "https://launchpad.net/indicator-application"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index 5816f044f57..fadd2657b68 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,21 +1,45 @@ -{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova -, curl, libjpeg, gsl }: +{ stdenv +, fetchurl +, cmake +, cfitsio +, libusb1 +, zlib +, boost +, libnova +, curl +, libjpeg +, gsl +}: stdenv.mkDerivation { name = "indilib-1.1.0"; src = fetchurl { - url = mirror://sourceforge/indi/libindi_1.1.0.tar.gz; + url = "mirror://sourceforge/indi/libindi_1.1.0.tar.gz"; sha256 = "1bs6lkwqd4aashg93mqqkc7nrg7fbx9mdw85qs5263jqa6sr780w"; }; - patches = [ ./udev-dir.patch ] ; + patches = [ + ./udev-dir.patch + ]; - buildInputs = [ curl cmake cfitsio libusb zlib boost - libnova libjpeg gsl ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + curl + cfitsio + libusb1 + zlib + boost + libnova + libjpeg + gsl + ]; meta = { - homepage = https://www.indilib.org/; + homepage = "https://www.indilib.org/"; license = stdenv.lib.licenses.lgpl2Plus; description = "Implementaion of the INDI protocol for POSIX operating systems"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index 4637c8c950f..23b26c9a890 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,19 +4,19 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "19.4.1"; + version = "20.1.1"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "167g5rmrmzmfp4y4vghyxqi4schvvkwax3cvqgniqx8q1ib5l346"; + sha256 = "0k130yiq8n34ppddpgl7kwq5w2y7n49jxiyk7x52y773m97xd6y1"; }; nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/gmmlib; + homepage = "https://github.com/intel/gmmlib"; license = licenses.mit; description = "Intel Graphics Memory Management Library"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix index 50ae63f2d0d..8387aa67161 100644 --- a/pkgs/development/libraries/ip2location-c/default.nix +++ b/pkgs/development/libraries/ip2location-c/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { weather, MCC, MNC, mobile brand name, elevation and usage type of any IP address or host name in the IP2Location databases. ''; - homepage = http://www.ip2location.com/developers/c-7; + homepage = "http://www.ip2location.com/developers/c-7"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index f411ecdeea6..efb4c2022c4 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip libGLU libGL libXrandr libX11 libXxf86vm ]; meta = { - homepage = http://irrlicht.sourceforge.net/; + homepage = "http://irrlicht.sourceforge.net/"; license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/irrlicht/mac.nix b/pkgs/development/libraries/irrlicht/mac.nix index beead1f9b85..5f8335efab2 100644 --- a/pkgs/development/libraries/irrlicht/mac.nix +++ b/pkgs/development/libraries/irrlicht/mac.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip OpenGL Cocoa IOKit ]; meta = { - homepage = http://irrlicht.sourceforge.net/; + homepage = "http://irrlicht.sourceforge.net/"; license = stdenv.lib.licenses.zlib; description = "Open source high performance realtime 3D engine written in C++"; platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/development/libraries/isl/0.11.1.nix b/pkgs/development/libraries/isl/0.11.1.nix index 13c71dc8f70..1cac0d369fe 100644 --- a/pkgs/development/libraries/isl/0.11.1.nix +++ b/pkgs/development/libraries/isl/0.11.1.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = https://www.kotnet.org/~skimo/isl/; + homepage = "https://www.kotnet.org/~skimo/isl/"; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.14.1.nix b/pkgs/development/libraries/isl/0.14.1.nix index 1ff4b7ec18a..a97e05b0431 100644 --- a/pkgs/development/libraries/isl/0.14.1.nix +++ b/pkgs/development/libraries/isl/0.14.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.kotnet.org/~skimo/isl/; + homepage = "https://www.kotnet.org/~skimo/isl/"; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.17.1.nix b/pkgs/development/libraries/isl/0.17.1.nix index 59d4d38ce57..018f7085088 100644 --- a/pkgs/development/libraries/isl/0.17.1.nix +++ b/pkgs/development/libraries/isl/0.17.1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.kotnet.org/~skimo/isl/; + homepage = "https://www.kotnet.org/~skimo/isl/"; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/isl/0.20.0.nix b/pkgs/development/libraries/isl/0.20.0.nix index 72ef581725b..3775bdc71e0 100644 --- a/pkgs/development/libraries/isl/0.20.0.nix +++ b/pkgs/development/libraries/isl/0.20.0.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://isl.gforge.inria.fr/; + homepage = "http://isl.gforge.inria.fr/"; license = stdenv.lib.licenses.lgpl21; description = "A library for manipulating sets and relations of integer points bounded by linear constraints"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/iso-codes/default.nix b/pkgs/development/libraries/iso-codes/default.nix index 1766abb2aac..9ab25b410b4 100644 --- a/pkgs/development/libraries/iso-codes/default.nix +++ b/pkgs/development/libraries/iso-codes/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gettext python3 ]; meta = with stdenv.lib; { - homepage = https://salsa.debian.org/iso-codes-team/iso-codes; + homepage = "https://salsa.debian.org/iso-codes-team/iso-codes"; description = "Various ISO codes packaged as XML files"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/itk/4.x.nix b/pkgs/development/libraries/itk/4.x.nix index 7e24ba901e5..833723d4d2d 100644 --- a/pkgs/development/libraries/itk/4.x.nix +++ b/pkgs/development/libraries/itk/4.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "itk-4.13.2"; src = fetchurl { - url = mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz; + url = "mirror://sourceforge/itk/InsightToolkit-4.13.2.tar.xz"; sha256 = "19cgfpd63gqrvc3m27m394gy2d7w79g5y6lvznb5qqr49lihbgns"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Insight Segmentation and Registration Toolkit"; - homepage = http://www.itk.org/; + homepage = "http://www.itk.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 3577e7a8196..d745ff438ce 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Insight Segmentation and Registration Toolkit"; - homepage = http://www.itk.org/; + homepage = "http://www.itk.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/development/libraries/jama/default.nix b/pkgs/development/libraries/jama/default.nix index 26ec06fad7b..5c7473be647 100644 --- a/pkgs/development/libraries/jama/default.nix +++ b/pkgs/development/libraries/jama/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "1.2.5"; src = fetchurl { - url = https://math.nist.gov/tnt/jama125.zip; + url = "https://math.nist.gov/tnt/jama125.zip"; sha256 = "031ns526fvi2nv7jzzv02i7i5sjcyr0gj884i3an67qhsx8vyckl"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://math.nist.gov/tnt/; + homepage = "https://math.nist.gov/tnt/"; description = "JAMA/C++ Linear Algebra Package: Java-like matrix C++ templates"; platforms = platforms.unix; license = licenses.publicDomain; diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index 25b55f00311..c1653ea5d1b 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.digip.org/jansson/; + homepage = "http://www.digip.org/jansson/"; description = "C library for encoding, decoding and manipulating JSON data"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 093fd0c5f28..cd7b1cf4fd1 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.ece.uvic.ca/~frodo/jasper/; + homepage = "https://www.ece.uvic.ca/~frodo/jasper/"; description = "JPEG2000 Library"; platforms = platforms.unix; license = licenses.jasper; diff --git a/pkgs/development/libraries/java/commons/bsf/default.nix b/pkgs/development/libraries/java/commons/bsf/default.nix index e3c464482c7..46bd3c0fd15 100644 --- a/pkgs/development/libraries/java/commons/bsf/default.nix +++ b/pkgs/development/libraries/java/commons/bsf/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "commons-bsf-1.2"; src = fetchurl { - url = mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz; + url = "mirror://apache/commons/bsf/binaries/bsf-bin-2.4.0.tar.gz"; sha256 = "1my3hv4y8cvrd1kr315wvbjqsamzlzswnbqcmsa2m4hqcafddfr8"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Interface to scripting languages, including JSR-223"; - homepage = http://commons.apache.org/proper/commons-bsf/; + homepage = "http://commons.apache.org/proper/commons-bsf/"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index d418145e1b5..a9624ff243c 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://commons.apache.org/proper/commons-compress; + 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; diff --git a/pkgs/development/libraries/java/commons/fileupload/default.nix b/pkgs/development/libraries/java/commons/fileupload/default.nix index 0aca6bf8baa..cd439b50397 100644 --- a/pkgs/development/libraries/java/commons/fileupload/default.nix +++ b/pkgs/development/libraries/java/commons/fileupload/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://commons.apache.org/proper/commons-fileupload; + 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; diff --git a/pkgs/development/libraries/java/commons/lang/default.nix b/pkgs/development/libraries/java/commons/lang/default.nix index 675265ed4e3..96d2a76df01 100644 --- a/pkgs/development/libraries/java/commons/lang/default.nix +++ b/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.9"; + version = "3.10"; pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "0l0q1hnicvpbjmxl81ig3rwc212x5sdfnlg3cniwbmnx8fxjgbki"; + sha256 = "144057jrx1jral6dnnb039h3k8rnrx0nj3ii428s725jfhazg68f"; }; installPhase = '' diff --git a/pkgs/development/libraries/java/commons/logging/default.nix b/pkgs/development/libraries/java/commons/logging/default.nix index 4e3fa265502..7c2192e4952 100644 --- a/pkgs/development/libraries/java/commons/logging/default.nix +++ b/pkgs/development/libraries/java/commons/logging/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "commons-logging-1.2"; src = fetchurl { - url = mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz; + url = "mirror://apache/commons/logging/binaries/commons-logging-1.2-bin.tar.gz"; sha256 = "1gc70pmcv0x6ibl89jglmr22f8zpr63iaifi49nrq399qw2qhx9z"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Wrapper around a variety of logging API implementations"; - homepage = http://commons.apache.org/proper/commons-logging; + homepage = "http://commons.apache.org/proper/commons-logging"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/java/cup/default.nix b/pkgs/development/libraries/java/cup/default.nix index e485eabe1cb..acf8cc9b83d 100644 --- a/pkgs/development/libraries/java/cup/default.nix +++ b/pkgs/development/libraries/java/cup/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www2.cs.tum.edu/projects/cup/; + homepage = "http://www2.cs.tum.edu/projects/cup/"; description = "LALR parser generator for Java"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/java/dbus-java/default.nix b/pkgs/development/libraries/java/dbus-java/default.nix index 5ec10cc7e0d..5e574151650 100644 --- a/pkgs/development/libraries/java/dbus-java/default.nix +++ b/pkgs/development/libraries/java/dbus-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "dbus-java-2.7"; src = fetchurl { - url = https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz; + url = "https://dbus.freedesktop.org/releases/dbus-java/dbus-java-2.7.tar.gz"; sha256 = "0cyaxd8x6sxmi6pklkkx45j311a6w51fxl4jc5j3inc4cailwh5y"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/geoipjava/default.nix b/pkgs/development/libraries/java/geoipjava/default.nix index 6af8885464a..6d4dfbfe61c 100644 --- a/pkgs/development/libraries/java/geoipjava/default.nix +++ b/pkgs/development/libraries/java/geoipjava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "GeoIPJava-1.2.5"; src = fetchurl { - url = https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip; + url = "https://geolite.maxmind.com/download/geoip/api/java/GeoIPJava-1.2.5.zip"; sha256 = "1gb2d0qvvq7xankz7l7ymbr3qprwk9bifpy4hlgw0sq4i6a55ypd"; }; buildInputs = [ jdk unzip ]; diff --git a/pkgs/development/libraries/java/gwt-dragdrop/default.nix b/pkgs/development/libraries/java/gwt-dragdrop/default.nix index e34699d7740..37d7cac0da2 100644 --- a/pkgs/development/libraries/java/gwt-dragdrop/default.nix +++ b/pkgs/development/libraries/java/gwt-dragdrop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar; + url = "http://gwt-dnd.googlecode.com/files/gwt-dnd-2.6.5.jar"; sha256 = "07zdlr8afs499asnw0dcjmw1cnjc646v91lflx5dv4qj374c97fw"; }; diff --git a/pkgs/development/libraries/java/gwt-widgets/default.nix b/pkgs/development/libraries/java/gwt-widgets/default.nix index ec407076906..a968ebc5fd8 100644 --- a/pkgs/development/libraries/java/gwt-widgets/default.nix +++ b/pkgs/development/libraries/java/gwt-widgets/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz; + url = "mirror://sourceforge/gwt-widget/gwt-widgets-0.2.0-bin.tar.gz"; sha256 = "09isj4j6842rj13nv8264irkjjhvmgihmi170ciabc98911bakxb"; }; diff --git a/pkgs/development/libraries/java/httpunit/default.nix b/pkgs/development/libraries/java/httpunit/default.nix index 500c575f73a..34af97605d2 100644 --- a/pkgs/development/libraries/java/httpunit/default.nix +++ b/pkgs/development/libraries/java/httpunit/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/httpunit/httpunit-1.7.zip; + url = "mirror://sourceforge/httpunit/httpunit-1.7.zip"; sha256 = "09gnayqgizd8cjqayvdpkxrc69ipyxawc96aznfrgdhdiwv8l5zf"; }; inherit unzip; meta = with stdenv.lib; { - homepage = http://httpunit.sourceforge.net; + 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 1f2aeda80cf..54e85ec5589 100644 --- a/pkgs/development/libraries/java/hydra-ant-logger/default.nix +++ b/pkgs/development/libraries/java/hydra-ant-logger/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2010.2"; src = fetchgit { - url = https://github.com/NixOS/hydra-ant-logger.git; + url = "https://github.com/NixOS/hydra-ant-logger.git"; rev = "dae3224f4ed42418d3492bdf5bee4f825819006f"; sha256 = "01s7m6007rn9107rw5wcgna7i20x6p6kfzl4f79jrvpkjy6kz176"; }; diff --git a/pkgs/development/libraries/java/jdom/default.nix b/pkgs/development/libraries/java/jdom/default.nix index 16755471acd..60558f72cfc 100644 --- a/pkgs/development/libraries/java/jdom/default.nix +++ b/pkgs/development/libraries/java/jdom/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://www.jdom.org/dist/binary/jdom-1.0.tar.gz; + url = "http://www.jdom.org/dist/binary/jdom-1.0.tar.gz"; sha256 = "1igmxzcy0s25zcy9vmcw0kd13lh60r0b4qg8lnp1jic33f427pxf"; }; meta = with stdenv.lib; { description = "Java-based solution for accessing, manipulating, and outputting XML data from Java code"; - homepage = http://www.jdom.org; + homepage = "http://www.jdom.org"; platforms = platforms.unix; license = licenses.bsdOriginal; }; diff --git a/pkgs/development/libraries/java/junit/default.nix b/pkgs/development/libraries/java/junit/default.nix index 0879f0a6926..c114ddeac27 100644 --- a/pkgs/development/libraries/java/junit/default.nix +++ b/pkgs/development/libraries/java/junit/default.nix @@ -20,7 +20,7 @@ in antBuild { ]; meta = { - homepage = http://www.junit.org/; + homepage = "http://www.junit.org/"; description = "A framework for repeatable tests in Java"; license = stdenv.lib.licenses.epl10; broken = true; diff --git a/pkgs/development/libraries/java/junixsocket/default.nix b/pkgs/development/libraries/java/junixsocket/default.nix index bc34957b9c3..cb88df276a5 100644 --- a/pkgs/development/libraries/java/junixsocket/default.nix +++ b/pkgs/development/libraries/java/junixsocket/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A Java/JNI library for using Unix Domain Sockets from Java"; - homepage = https://github.com/kohlschutter/junixsocket; + homepage = "https://github.com/kohlschutter/junixsocket"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index e25106e22c6..5bc0f15b205 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.zeromq.org; + homepage = "http://www.zeromq.org"; description = "Java bindings for ZeroMQ"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/development/libraries/java/libmatthew-java/default.nix b/pkgs/development/libraries/java/libmatthew-java/default.nix index 98291a7763c..8b8123dff2b 100644 --- a/pkgs/development/libraries/java/libmatthew-java/default.nix +++ b/pkgs/development/libraries/java/libmatthew-java/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmatthew-java-0.8"; src = fetchurl { - url = https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz; + url = "https://src.fedoraproject.org/repo/pkgs/libmatthew-java/libmatthew-java-0.8.tar.gz/8455b8751083ce25c99c2840609271f5/libmatthew-java-0.8.tar.gz"; sha256 = "1yldkhsdzm0a41a0i881bin2jklhp85y3ah245jd6fz3npcx7l85"; }; JAVA_HOME=jdk; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index 09cec463141..f48c4821d92 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A library that can write a lot of boilerplate for your Java project"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mit; - homepage = https://projectlombok.org/; + homepage = "https://projectlombok.org/"; maintainers = [ stdenv.lib.maintainers.CrystalGamma ]; }; } diff --git a/pkgs/development/libraries/java/mockobjects/default.nix b/pkgs/development/libraries/java/mockobjects/default.nix index ae93765ff98..817c861436f 100644 --- a/pkgs/development/libraries/java/mockobjects/default.nix +++ b/pkgs/development/libraries/java/mockobjects/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar; + url = "mirror://sourceforge/mockobjects/mockobjects-bin-0.09.tar"; sha256 = "18rnyqfcyh0s3dwkkaszdd50ssyjx5fa1y3ii309ldqg693lfgnz"; }; diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 0fdce1bceed..d3d10f61b70 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { to provide scripting to end users. ''; - homepage = http://www.mozilla.org/rhino/; + homepage = "http://www.mozilla.org/rhino/"; license = with licenses; [ mpl11 /* or */ gpl2Plus ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/java/saxon/default.nix b/pkgs/development/libraries/java/saxon/default.nix index 687e1e8a1de..ef403be60df 100644 --- a/pkgs/development/libraries/java/saxon/default.nix +++ b/pkgs/development/libraries/java/saxon/default.nix @@ -28,7 +28,7 @@ let meta = with stdenv.lib; { inherit description license; - homepage = http://saxon.sourceforge.net/; + homepage = "http://saxon.sourceforge.net/"; maintainers = with maintainers; [ rvl ]; platforms = platforms.all; }; @@ -39,7 +39,7 @@ in { pname = "saxon"; version = "6.5.3"; src = fetchurl { - url = mirror://sourceforge/saxon/saxon6_5_3.zip; + url = "mirror://sourceforge/saxon/saxon6_5_3.zip"; sha256 = "0l5y3y2z4wqgh80f26dwwxwncs8v3nkz3nidv14z024lmk730vs3"; }; description = "XSLT 1.0 processor"; @@ -52,7 +52,7 @@ in { version = "8.8"; jar = "saxon8"; src = fetchurl { - url = mirror://sourceforge/saxon/saxonb8-8j.zip; + url = "mirror://sourceforge/saxon/saxonb8-8j.zip"; sha256 = "15bzrfyd2f1045rsp9dp4znyhmizh1pm97q8ji2bc0b43q23xsb8"; }; description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0"; @@ -63,7 +63,7 @@ in { version = "9.1.0.8"; jar = "saxon9"; src = fetchurl { - url = mirror://sourceforge/saxon/Saxon-B/9.1.0.8/saxonb9-1-0-8j.zip; + url = "mirror://sourceforge/saxon/Saxon-B/9.1.0.8/saxonb9-1-0-8j.zip"; sha256 = "1d39jdnwr3v3pzswm81zry6yikqlqy9dp2l2wmpqdiw00r5drg4j"; }; description = "Complete and conformant processor of XSLT 2.0, XQuery 1.0, and XPath 2.0"; @@ -75,7 +75,7 @@ in { prog = "saxon-he"; jar = "saxon9he"; src = fetchurl { - url = mirror://sourceforge/saxon/Saxon-HE/9.9/SaxonHE9-9-0-1J.zip; + url = "mirror://sourceforge/saxon/Saxon-HE/9.9/SaxonHE9-9-0-1J.zip"; sha256 = "1inxd7ia7rl9fxfrw8dy9sb7rqv76ipblaki5262688wf2dscs60"; }; description = "Processor for XSLT 3.0, XPath 2.0 and 3.1, and XQuery 3.1"; diff --git a/pkgs/development/libraries/java/smack/default.nix b/pkgs/development/libraries/java/smack/default.nix index d5f8ac217f3..c1d41e7743d 100644 --- a/pkgs/development/libraries/java/smack/default.nix +++ b/pkgs/development/libraries/java/smack/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz; + url = "http://www.igniterealtime.org/downloadServlet?filename=smack/smack_4_1_9.tar.gz"; sha256 = "009x0qcxd4dkvwcjz2nla470pwbabwvg37wc21pslpw42ldi0bzp"; }; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index b0fdca11218..b96c9171324 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.eclipse.org/swt/; + 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; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/jbig2dec/default.nix b/pkgs/development/libraries/jbig2dec/default.nix index 2dff3bafdd3..8cc2ce00871 100644 --- a/pkgs/development/libraries/jbig2dec/default.nix +++ b/pkgs/development/libraries/jbig2dec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://www.jbig2dec.com/; + homepage = "https://www.jbig2dec.com/"; description = "Decoder implementation of the JBIG2 image compression format"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/jbigkit/default.nix b/pkgs/development/libraries/jbigkit/default.nix index 2b2f75abfd1..dbf728e7d82 100644 --- a/pkgs/development/libraries/jbigkit/default.nix +++ b/pkgs/development/libraries/jbigkit/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.cl.cam.ac.uk/~mgk25/jbigkit/; + homepage = "http://www.cl.cam.ac.uk/~mgk25/jbigkit/"; description = "A software implementation of the JBIG1 data compression standard"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/development/libraries/jcal/default.nix b/pkgs/development/libraries/jcal/default.nix index dfb0003cc98..8e7818bf4e5 100644 --- a/pkgs/development/libraries/jcal/default.nix +++ b/pkgs/development/libraries/jcal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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/; + homepage = "http://nongnu.org/jcal/"; license = licenses.gpl3; maintainers = [ maintainers.linarcx ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/jemalloc/common.nix b/pkgs/development/libraries/jemalloc/common.nix index 128910e00f2..fc4f0f2fe6e 100644 --- a/pkgs/development/libraries/jemalloc/common.nix +++ b/pkgs/development/libraries/jemalloc/common.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://jemalloc.net; + homepage = "http://jemalloc.net"; description = "General purpose malloc(3) implementation"; longDescription = '' malloc(3)-compatible memory allocator that emphasizes fragmentation diff --git a/pkgs/development/libraries/jitterentropy/default.nix b/pkgs/development/libraries/jitterentropy/default.nix index 6492077eee4..4cafa7434b1 100644 --- a/pkgs/development/libraries/jitterentropy/default.nix +++ b/pkgs/development/libraries/jitterentropy/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides a noise source using the CPU execution timing jitter"; - homepage = https://github.com/smuellerDD/jitterentropy-library; + 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 ]; diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix index 27d1b701f05..81ebc7baeb0 100644 --- a/pkgs/development/libraries/json-c/default.nix +++ b/pkgs/development/libraries/json-c/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A JSON implementation in C"; - homepage = https://github.com/json-c/json-c/wiki; + homepage = "https://github.com/json-c/json-c/wiki"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 9a18b025fab..4ae4a71091e 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; propagatedBuildInputs = [ glib ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection glib ]; buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; outputs = [ "out" "dev" ]; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library providing (de)serialization support for the JavaScript Object Notation (JSON) format"; - homepage = https://wiki.gnome.org/Projects/JsonGlib; + homepage = "https://wiki.gnome.org/Projects/JsonGlib"; license = licenses.lgpl2; maintainers = with maintainers; [ lethalman ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index 7b06cc8ad4e..aa72aeb0d36 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - homepage = https://github.com/open-source-parsers/jsoncpp; + homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "A C++ library for interacting with JSON."; maintainers = with maintainers; [ ttuegel cpages nand0p ]; license = licenses.mit; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index b1249546721..71bf2d92f8d 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to communicate using the JSON-RPC 2.0 specification"; - homepage = https://gitlab.gnome.org/GNOME/jsonrpc-glib; + homepage = "https://gitlab.gnome.org/GNOME/jsonrpc-glib"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/development/libraries/judy/default.nix b/pkgs/development/libraries/judy/default.nix index 01ba605b506..ad422db3d48 100644 --- a/pkgs/development/libraries/judy/default.nix +++ b/pkgs/development/libraries/judy/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "judy-1.0.5"; src = fetchurl { - url = mirror://sourceforge/judy/Judy-1.0.5.tar.gz; + url = "mirror://sourceforge/judy/Judy-1.0.5.tar.gz"; sha256 = "1sv3990vsx8hrza1mvq3bhvv9m6ff08y4yz7swn6znszz24l0w6j"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://judy.sourceforge.net/; + homepage = "http://judy.sourceforge.net/"; license = stdenv.lib.licenses.lgpl21Plus; description = "State-of-the-art C library that implements a sparse dynamic array"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/jxrlib/default.nix b/pkgs/development/libraries/jxrlib/default.nix index bc5be3172ec..e119c75ff8d 100644 --- a/pkgs/development/libraries/jxrlib/default.nix +++ b/pkgs/development/libraries/jxrlib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of the JPEG XR image codec standard"; - homepage = https://jxrlib.codeplex.com; + homepage = "https://jxrlib.codeplex.com"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ romildo ]; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 7ce3954e286..3d618f09e38 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -73,7 +73,7 @@ let setupHook = args.setupHook or defaultSetupHook; meta = { - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; 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 654eb94b51a..3a3f066ad33 100644 --- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix @@ -13,7 +13,7 @@ mkDerivation { meta = with lib; { platforms = platforms.linux ++ platforms.darwin; - homepage = http://www.kde.org; + homepage = "http://www.kde.org"; license = licenses.bsd2; maintainers = [ maintainers.ttuegel ]; }; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index d4fcf620db6..b7e6d781471 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.66/ ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.68/ ) diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch index 0411755f45a..f966064f929 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch @@ -2,12 +2,12 @@ Index: kcmutils-5.33.0/src/kcmoduleloader.cpp =================================================================== --- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp +++ kcmutils-5.33.0/src/kcmoduleloader.cpp -@@ -96,7 +96,7 @@ KCModule *KCModuleLoader::loadModule(con - KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); - KPluginFactory* factory = loader.factory(); - if (!factory) { -- qWarning() << "Error loading plugin:" << loader.errorString(); -+ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); - } else { - KQuickAddons::ConfigModule *cm = factory->create<KQuickAddons::ConfigModule >(); - if (!cm) { +@@ -95,7 +95,7 @@ KCModule *KCModuleLoader::loadModule(const KCModuleInfo &mod, ErrorReporting rep + KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library())); + KPluginFactory* factory = loader.factory(); + if (!factory) { +- qWarning() << "Couldn't load plugin:" << loader.errorString(); ++ qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString(); + } else { + std::unique_ptr<KQuickAddons::ConfigModule> cm(factory->create<KQuickAddons::ConfigModule>(nullptr, args2)); + if (!cm) { diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 2441ff69359..ffea42c130f 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,661 +1,662 @@ -# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks { fetchurl, mirror }: { attica = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/attica-5.66.0.tar.xz"; - sha256 = "e87ea061d393104804aa65db69ec3489512b472d8fb821c9fc49ffdcb85177fb"; - name = "attica-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/attica-5.68.0.tar.xz"; + sha256 = "9b4001a32831c9bae1d44161247acd5e6d3048ca2ece98c2c756c72a1464b9e9"; + name = "attica-5.68.0.tar.xz"; }; }; baloo = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/baloo-5.66.0.tar.xz"; - sha256 = "9495869eee72f587efadc8a848c3f76b93a1dcb1914c8e818d7084451107a1f8"; - name = "baloo-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/baloo-5.68.0.tar.xz"; + sha256 = "4b599fb279ef92dc4f575847767c370f2633b27e884e372c3f7b92f08917865e"; + name = "baloo-5.68.0.tar.xz"; }; }; bluez-qt = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/bluez-qt-5.66.0.tar.xz"; - sha256 = "cc3f3fcc1df87b61480549d658c1a27690661aaa4f22a65552efe3f6bf41c887"; - name = "bluez-qt-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/bluez-qt-5.68.0.tar.xz"; + sha256 = "99889cac874820e83a32bee938b6cc8e25dca6a3013d4a589ac7b8f5d32b4224"; + name = "bluez-qt-5.68.0.tar.xz"; }; }; breeze-icons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/breeze-icons-5.66.0.tar.xz"; - sha256 = "445a77204c7d9ac398e7f1d1594cd93e719665c85c7fb9ef71fde1ce68cb64d7"; - name = "breeze-icons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/breeze-icons-5.68.0.tar.xz"; + sha256 = "750fff6560abfa85a2243187d14f1b8f1d3d1c4097d84cbf8c58d2f48102fe8d"; + name = "breeze-icons-5.68.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/extra-cmake-modules-5.66.0.tar.xz"; - sha256 = "2ff1a4ede28488ea787e742ab37edaacc5f59bf9188476e48f681ce23300b9c4"; - name = "extra-cmake-modules-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/extra-cmake-modules-5.68.0.tar.xz"; + sha256 = "4d60869ca96a323b56f00b40c4728a70dfebe2132bbae040442a6a2ef90e2d6e"; + name = "extra-cmake-modules-5.68.0.tar.xz"; }; }; frameworkintegration = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/frameworkintegration-5.66.0.tar.xz"; - sha256 = "55c01613436781d74652bef19fc594448cdee4c002d5e1713b583473455f54d8"; - name = "frameworkintegration-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/frameworkintegration-5.68.0.tar.xz"; + sha256 = "5bb3c2e56b2c4c41d8a472363f80445fd3fc28656e6a3163d48ed826a133985a"; + name = "frameworkintegration-5.68.0.tar.xz"; }; }; kactivities = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kactivities-5.66.0.tar.xz"; - sha256 = "7c37c8f189cb3c9f0cacbcef606562d8bc596e685d2a47bc9994deae6e69f41f"; - name = "kactivities-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kactivities-5.68.0.tar.xz"; + sha256 = "1853135feb6adfec252e6fab0b1472450422afd5998a9a31d942e8672fbe7111"; + name = "kactivities-5.68.0.tar.xz"; }; }; kactivities-stats = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kactivities-stats-5.66.0.tar.xz"; - sha256 = "567de599a8fd8b6a5304fc1696e24b069b4eaa7bbc643b1e760293d8c1162b73"; - name = "kactivities-stats-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kactivities-stats-5.68.0.tar.xz"; + sha256 = "fb645db4685113dfd98834f48d8941529fee53d5e26ec5e36cfee8a9bfae97ae"; + name = "kactivities-stats-5.68.0.tar.xz"; }; }; kapidox = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kapidox-5.66.0.tar.xz"; - sha256 = "19af4d93adfa22ff4de832185c1e9191d35039394bb032ee60e33efc5cc456db"; - name = "kapidox-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kapidox-5.68.0.tar.xz"; + sha256 = "4f60582cb0771c38733989f192694636b1c93ecae290bfbe551030dd397e976e"; + name = "kapidox-5.68.0.tar.xz"; }; }; karchive = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/karchive-5.66.0.tar.xz"; - sha256 = "434f315af624d315b06a35ba5e71e570f36ca454af891833d6e896e42edf23d8"; - name = "karchive-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/karchive-5.68.0.tar.xz"; + sha256 = "518f07629d87e5778e1d8ce066f5590941472d9fffa7bd74819759be5c6edf0d"; + name = "karchive-5.68.0.tar.xz"; }; }; kauth = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kauth-5.66.0.tar.xz"; - sha256 = "f167ec8f926caf348a161a39e0c0588f517fe3a49ab4f39c1dfa94f47e104414"; - name = "kauth-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kauth-5.68.0.tar.xz"; + sha256 = "b9a7cd724709ea188852f7656fbeda2dc3cc40cc5d09573049c2680c0edbd41f"; + name = "kauth-5.68.0.tar.xz"; }; }; kbookmarks = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kbookmarks-5.66.0.tar.xz"; - sha256 = "b225463ec0fe2424a1f5e70c83b02e3ece6a3ca80832cd2621732d18d7160a43"; - name = "kbookmarks-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kbookmarks-5.68.0.tar.xz"; + sha256 = "80dc06188a5e1d960d46f527bd82d9b79df75a785164fa29a088a7b705abbf84"; + name = "kbookmarks-5.68.0.tar.xz"; }; }; kcalendarcore = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcalendarcore-5.66.0.tar.xz"; - sha256 = "bbdb48c775ccc1e1bdba962b5ccdc0611a2d14523076d33c4507c05db3ab33d3"; - name = "kcalendarcore-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcalendarcore-5.68.0.tar.xz"; + sha256 = "50ffbe4feb9a602c09e130d6f10f0f260fa7625bc266003697895e1d716d6ba9"; + name = "kcalendarcore-5.68.0.tar.xz"; }; }; kcmutils = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcmutils-5.66.0.tar.xz"; - sha256 = "e02dbf996ed93bdc2813a2a64dcb0ddeb54987dd84bbe787bd890b17d57e4a85"; - name = "kcmutils-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcmutils-5.68.0.tar.xz"; + sha256 = "a688d54286fe11b23e11e2100536a513a332d2a7d784fcbebeaccbfb980d83d1"; + name = "kcmutils-5.68.0.tar.xz"; }; }; kcodecs = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcodecs-5.66.0.tar.xz"; - sha256 = "0dcb684ad75374bbab82b90bda20e914cf656bd51a6dff69bbb1bfc650481a05"; - name = "kcodecs-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcodecs-5.68.0.tar.xz"; + sha256 = "5f1e6ae3a51ca817aa0a5082ce4ce5490cb527388ef1888a642fb374c5e2bb48"; + name = "kcodecs-5.68.0.tar.xz"; }; }; kcompletion = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcompletion-5.66.0.tar.xz"; - sha256 = "be5e272e257b9fe5b951d7c596fef7c75b16886e6b1cd5ebff60d87bd6dd495d"; - name = "kcompletion-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcompletion-5.68.0.tar.xz"; + sha256 = "642d68b4c472e11a8861a61238297633be288bfd72c13547707754f1ae2be33a"; + name = "kcompletion-5.68.0.tar.xz"; }; }; kconfig = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kconfig-5.66.0.tar.xz"; - sha256 = "c0df73bde40162a5ffc20604c2ad343e71a6df852c3f7b05e70e1464f5f63256"; - name = "kconfig-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kconfig-5.68.0.tar.xz"; + sha256 = "c3bf138a7a4d002475f2483987baf40a61cda7d491c3cc292dd2c6da726ee898"; + name = "kconfig-5.68.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kconfigwidgets-5.66.0.tar.xz"; - sha256 = "730834528307c65691d67c901f1c186b49d74ee986ef75e171e867e8751bf10a"; - name = "kconfigwidgets-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kconfigwidgets-5.68.0.tar.xz"; + sha256 = "f50421e9dbb6669e8d7c10605f7779ad03f30ea7c9c4451a70a7be66cd9df995"; + name = "kconfigwidgets-5.68.0.tar.xz"; }; }; kcontacts = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcontacts-5.66.0.tar.xz"; - sha256 = "08086f554eb4718e91a9e96d143ba05fc741289928db9bcc21b21ca7125b0017"; - name = "kcontacts-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcontacts-5.68.0.tar.xz"; + sha256 = "532f1e89c7412e971db8c431d627d38144470ddf5c978a7fa9348e418b6cd3c3"; + name = "kcontacts-5.68.0.tar.xz"; }; }; kcoreaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcoreaddons-5.66.0.tar.xz"; - sha256 = "8a8edf566cb08ad83cb17f942eeb8746993249cd0f7679f7eb810201b85e464b"; - name = "kcoreaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcoreaddons-5.68.0.tar.xz"; + sha256 = "c578ae30b4161e45e672d613d2d9c5575a849d21909d9817f90a441044df65d7"; + name = "kcoreaddons-5.68.0.tar.xz"; }; }; kcrash = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kcrash-5.66.0.tar.xz"; - sha256 = "5a518059de3f3e85ee7b38a0edf348d097993518ce9b17504470f0d8aad3f2e4"; - name = "kcrash-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kcrash-5.68.0.tar.xz"; + sha256 = "60daf2cee87c652619b098b688edce6f993c7960783159cd8be9d9145df29f7f"; + name = "kcrash-5.68.0.tar.xz"; }; }; kdbusaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdbusaddons-5.66.0.tar.xz"; - sha256 = "ee600f15af2fb9a28ad15f7e0689d519211fa63b86f2e6c356bd32530ebdfa46"; - name = "kdbusaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdbusaddons-5.68.0.tar.xz"; + sha256 = "839fe42f9ac8df353f87245110fd7b515a8eb29f0840f54481bd89e5175bf1af"; + name = "kdbusaddons-5.68.0.tar.xz"; }; }; kdeclarative = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdeclarative-5.66.0.tar.xz"; - sha256 = "ed3a334d8bce6d70e68e013d4210bd6e11cb2ebce9ede4c1813f44dada7eca73"; - name = "kdeclarative-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdeclarative-5.68.0.tar.xz"; + sha256 = "96a032bcb360e0ffcfe51d4d2f6153786682c2f967592bffcf15b9e6cd4cd3ae"; + name = "kdeclarative-5.68.0.tar.xz"; }; }; kded = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kded-5.66.0.tar.xz"; - sha256 = "52223e641c4e8e3158220ed7b6c48e4c3f3e67f882603ada0e3757b4136255a4"; - name = "kded-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kded-5.68.0.tar.xz"; + sha256 = "b03afe48fbdbd7d92c46b3b60bdb4b825f77e1a9d00c16a5f236b24a0135e4b7"; + name = "kded-5.68.0.tar.xz"; }; }; kdelibs4support = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kdelibs4support-5.66.0.tar.xz"; - sha256 = "314d0ddb95c024c3d36dd262fcaa9295b462e6430f84b22c82f145029e3b2708"; - name = "kdelibs4support-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kdelibs4support-5.68.0.tar.xz"; + sha256 = "2fca7bf9d31b081e7568631b6b6d2f7847068217261e47ef0dea106470c22df1"; + name = "kdelibs4support-5.68.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kdesignerplugin-5.66.0.tar.xz"; - sha256 = "a7f9c530d8c7d214a176ee381541bd45f3a000a3e86404040b11f1394912d40b"; - name = "kdesignerplugin-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kdesignerplugin-5.68.0.tar.xz"; + sha256 = "ae433e0eeaf0007312b1f32fc4349cf26c34617a5a9951ae4155c5c4e4009b72"; + name = "kdesignerplugin-5.68.0.tar.xz"; }; }; kdesu = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdesu-5.66.0.tar.xz"; - sha256 = "764d30acb0ef1d609c9454ecabb939bd64a814442e01aba769eba0673b56f88a"; - name = "kdesu-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdesu-5.68.0.tar.xz"; + sha256 = "427ba50bcd14308980cbdfdc77a6b7419277942a42d83da72ff3afbc1ec78903"; + name = "kdesu-5.68.0.tar.xz"; }; }; kdewebkit = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kdewebkit-5.66.0.tar.xz"; - sha256 = "f73d2599ce2269eaab45ddc11bdeb49dc887e950ded57454f3fd6499c370a777"; - name = "kdewebkit-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kdewebkit-5.68.0.tar.xz"; + sha256 = "181b14bd80e9f34aa2f896d39aca5be91f65d65bfaaf47660e91fdd98b7f36a2"; + name = "kdewebkit-5.68.0.tar.xz"; }; }; kdnssd = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdnssd-5.66.0.tar.xz"; - sha256 = "e280246212329f2834437ea3e84971fc85f3a3e6824963322e1f5de6aa04709c"; - name = "kdnssd-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdnssd-5.68.0.tar.xz"; + sha256 = "3369da85c0088c375f2123a82132fb84490c46ebc8e9cd1253c795ef45fd4403"; + name = "kdnssd-5.68.0.tar.xz"; }; }; kdoctools = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kdoctools-5.66.0.tar.xz"; - sha256 = "41e4ca7aceab17919ef4a82ad99606f520ebfe57f30205597b4184f7a3730a7a"; - name = "kdoctools-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kdoctools-5.68.0.tar.xz"; + sha256 = "93f5bee9dfaacacacfbeb3e915b192b5e645c1d01057b0cea4081c9ae5285670"; + name = "kdoctools-5.68.0.tar.xz"; }; }; kemoticons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kemoticons-5.66.0.tar.xz"; - sha256 = "dc307192d883108134da104d1507709a3b80c5b5e9984377840bd42d39a431dd"; - name = "kemoticons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kemoticons-5.68.0.tar.xz"; + sha256 = "e03fe81ad34e107dc5fe61f9bf424ecef7716bf8a62f8abb78fd3f6bd6806f56"; + name = "kemoticons-5.68.0.tar.xz"; }; }; kfilemetadata = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kfilemetadata-5.66.0.tar.xz"; - sha256 = "d78c2128887591229e6c61c60e77af8647e407d570b07892f5f06ab682f807b9"; - name = "kfilemetadata-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kfilemetadata-5.68.0.tar.xz"; + sha256 = "c2a8aee8243efa30fc921b7f50b390b47ee2cf83aa83b125a530a25de6d6fe21"; + name = "kfilemetadata-5.68.0.tar.xz"; }; }; kglobalaccel = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kglobalaccel-5.66.0.tar.xz"; - sha256 = "fae805994f946791525da65ca15f93b65b2001241c7539ad04b3aaef937fb1c3"; - name = "kglobalaccel-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kglobalaccel-5.68.0.tar.xz"; + sha256 = "2eb710a3f29cbc8b7875fb3e8315d7c8e3b5bb93867e0a34cd5cdbac690bcbbf"; + name = "kglobalaccel-5.68.0.tar.xz"; }; }; kguiaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kguiaddons-5.66.0.tar.xz"; - sha256 = "379e5ed87b00d344a13e424e39d97d74d494c503400bcd72df132de74c8cc591"; - name = "kguiaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kguiaddons-5.68.0.tar.xz"; + sha256 = "cdbf694e92b47358c2e2c31917bf5f01382042c2cb99b65faf3bc00a0eb52c64"; + name = "kguiaddons-5.68.0.tar.xz"; }; }; kholidays = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kholidays-5.66.0.tar.xz"; - sha256 = "2d9bb70fbcb3a45208409228b5e5a88b0cb00fe8f2621e2e938bc77c2df11f02"; - name = "kholidays-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kholidays-5.68.0.tar.xz"; + sha256 = "067a544c22f5988cf959a475b66ed62e419b975b3ee22810667a076f3d50dbba"; + name = "kholidays-5.68.0.tar.xz"; }; }; khtml = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/khtml-5.66.0.tar.xz"; - sha256 = "ee34b082760262fb9b5e287960955075ec72179585e51567350a08bf0b4b7a10"; - name = "khtml-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/khtml-5.68.0.tar.xz"; + sha256 = "af97da0a5d877c928d98690c3629a8f9788b29b27f583c9e3e26144a6abb9dcc"; + name = "khtml-5.68.0.tar.xz"; }; }; ki18n = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/ki18n-5.66.0.tar.xz"; - sha256 = "9622337a513fcb8f0b5100c218b9fa85617f92024e5d7feada6d071f58a329e3"; - name = "ki18n-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/ki18n-5.68.0.tar.xz"; + sha256 = "2c59dd55d032c95710e338e376a31bf11d799bceba8ebfdb148c8b77067a1e92"; + name = "ki18n-5.68.0.tar.xz"; }; }; kiconthemes = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kiconthemes-5.66.0.tar.xz"; - sha256 = "93fa9b8d0f951c2c9991f366081f98670086f2b66a740d7be95b64c35dff111d"; - name = "kiconthemes-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kiconthemes-5.68.0.tar.xz"; + sha256 = "ac3f322f2644dd0468cd2b07cc0c7f853f1ac4bc714fe532bbe92e88141f6729"; + name = "kiconthemes-5.68.0.tar.xz"; }; }; kidletime = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kidletime-5.66.0.tar.xz"; - sha256 = "66e891b33ed9026ed6fd211cd1ecf3405255b19d3a58199b87af0b22a40d7185"; - name = "kidletime-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kidletime-5.68.0.tar.xz"; + sha256 = "cd6309d403ea36553abc99af4fa7e4ed3f8b3b2c55d14887ef09d68e5627b3e7"; + name = "kidletime-5.68.0.tar.xz"; }; }; kimageformats = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kimageformats-5.66.0.tar.xz"; - sha256 = "c3b02befbb03f25deca0c7ffafea8c8a5eb79e21d8e2e566bf6fddf4f8afe04d"; - name = "kimageformats-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kimageformats-5.68.0.tar.xz"; + sha256 = "498fab29d19f10f2c91c796134f959b2cf3ce8372087b5eeb62f07e62af85949"; + name = "kimageformats-5.68.0.tar.xz"; }; }; kinit = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kinit-5.66.0.tar.xz"; - sha256 = "6d9b6ea1542ff5529fd42f49240be37bbd8a3dfdfe8c45ac980b3c9b3fee650e"; - name = "kinit-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kinit-5.68.0.tar.xz"; + sha256 = "fa136996eaaa7d2adb5a341c2b7a1abe86d8139c6f18999e0b0dc0220e512559"; + name = "kinit-5.68.0.tar.xz"; }; }; kio = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kio-5.66.0.tar.xz"; - sha256 = "c5350e20474b48c4fc02347186b7e4db24cb7580ba8c0f1e120b302e6b8db17d"; - name = "kio-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kio-5.68.0.tar.xz"; + sha256 = "9cc2fb2da84d6661a90eac81eb12c2e37921a5c34cbc1975f48d613e5a9d9eef"; + name = "kio-5.68.0.tar.xz"; }; }; kirigami2 = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kirigami2-5.66.0.tar.xz"; - sha256 = "4e4abfeaa5e997de52076786dd0d314f178bc883b1b48a8b2cf37dd5979ac41b"; - name = "kirigami2-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kirigami2-5.68.0.tar.xz"; + sha256 = "ad5f78afc916e9cb26f23918a6eb1983d4a57aa7e4f7314a8c23fb81e0fcaf4b"; + name = "kirigami2-5.68.0.tar.xz"; }; }; kitemmodels = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kitemmodels-5.66.0.tar.xz"; - sha256 = "5c8bcc36b9c29868ba7fa1ece9b83385379d7fed04937a92454ac94a356b3854"; - name = "kitemmodels-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kitemmodels-5.68.0.tar.xz"; + sha256 = "4f435db4362832cf63e49896229affd07f125567931fc499751d37ac3bafb149"; + name = "kitemmodels-5.68.0.tar.xz"; }; }; kitemviews = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kitemviews-5.66.0.tar.xz"; - sha256 = "026461fa2e3e0237a56eb18a2817453c788514578f27a4aa0832b85fe98a09ab"; - name = "kitemviews-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kitemviews-5.68.0.tar.xz"; + sha256 = "5196885ac42347d67779df61a03d7f9c54f38053ff91348ef6fdc08439b4742f"; + name = "kitemviews-5.68.0.tar.xz"; }; }; kjobwidgets = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kjobwidgets-5.66.0.tar.xz"; - sha256 = "34501be3ec85f0e71dba22669b3c862b297606e9bbff9aae466667c7075b6f8d"; - name = "kjobwidgets-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kjobwidgets-5.68.0.tar.xz"; + sha256 = "a11ba51ed0ab330f9a921cf0a61e604c27d88c1c2ea477a875bc0a0cd228a292"; + name = "kjobwidgets-5.68.0.tar.xz"; }; }; kjs = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kjs-5.66.0.tar.xz"; - sha256 = "9bed62ebf9fba7d986ff7baabf6c4431f02826c9be70beda15cc62c692fb5f7f"; - name = "kjs-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kjs-5.68.0.tar.xz"; + sha256 = "18e3d7c667aec21e9e4d0d4730ad32a10475b7db5a574a674a8b90a6f9e0cd0e"; + name = "kjs-5.68.0.tar.xz"; }; }; kjsembed = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kjsembed-5.66.0.tar.xz"; - sha256 = "58fe647901b69167b7c66a284c3181c2eda9c3b751548eb43bfe0795d10eb0ce"; - name = "kjsembed-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kjsembed-5.68.0.tar.xz"; + sha256 = "e9b9ac63f06447ffc6870806eb1507f0281281bae907fdbae42ee87a2b926db2"; + name = "kjsembed-5.68.0.tar.xz"; }; }; kmediaplayer = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kmediaplayer-5.66.0.tar.xz"; - sha256 = "7ec1fea10a1017a0f32183fdc3b2cca38c11273240423ac0d393626436fd4230"; - name = "kmediaplayer-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kmediaplayer-5.68.0.tar.xz"; + sha256 = "aa07466ea27b2e042e03d76fe3a23c570ba6521f57a2a51dc0ddf32fc8276db0"; + name = "kmediaplayer-5.68.0.tar.xz"; }; }; knewstuff = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/knewstuff-5.66.0.tar.xz"; - sha256 = "acef94661e3a0e42938224c17b90f835d6686d88a25698fe82980d7e1139b1fe"; - name = "knewstuff-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/knewstuff-5.68.0.tar.xz"; + sha256 = "f7c13b133f8b87ceece2d33d3f69215912b3b8c1dbb92ac39a1a6a0a42b7c93a"; + name = "knewstuff-5.68.0.tar.xz"; }; }; knotifications = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/knotifications-5.66.0.tar.xz"; - sha256 = "aad3697a35109fad49fa286b7837d382599478bac33151cd7991c760866c12c1"; - name = "knotifications-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/knotifications-5.68.0.tar.xz"; + sha256 = "646bd3bac073fbf4f19f9047360325c933751d605cf1311f4c922d7457fbda51"; + name = "knotifications-5.68.0.tar.xz"; }; }; knotifyconfig = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/knotifyconfig-5.66.0.tar.xz"; - sha256 = "fd9e09b099f49896b5afa6f5663ef82266531ec413d4edeb03ebc768314a37d8"; - name = "knotifyconfig-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/knotifyconfig-5.68.0.tar.xz"; + sha256 = "36c7c93964f2b9b584d73de1757f75d6ee8bb29ebe860e8fd6905354d2f10145"; + name = "knotifyconfig-5.68.0.tar.xz"; }; }; kpackage = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kpackage-5.66.0.tar.xz"; - sha256 = "ae848a72e789a80d4a9d0346e90cb1038ebc784da6e7ff645411edd878554ab5"; - name = "kpackage-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kpackage-5.68.0.tar.xz"; + sha256 = "49727d89f1ca7ee504397d6e8b5cd25c26cd0061596b26d8ab2b64e3987d2d16"; + name = "kpackage-5.68.0.tar.xz"; }; }; kparts = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kparts-5.66.0.tar.xz"; - sha256 = "6de2395cd6a9993f216f4dc4718f352bc4cbbd8147734c76be0e1e6149f733d0"; - name = "kparts-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kparts-5.68.0.tar.xz"; + sha256 = "fd17d0b0ff41d66c122530bbd8d1187f3271382207f63237ce72147865bf6d29"; + name = "kparts-5.68.0.tar.xz"; }; }; kpeople = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kpeople-5.66.0.tar.xz"; - sha256 = "2728f08a9417ceb62aa9fc5a3340aed291aeb8a852e5f6f46c5a23fcc34168ab"; - name = "kpeople-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kpeople-5.68.0.tar.xz"; + sha256 = "1cae86d527d650d9fa311f6007cc33b5dcd858bcfe4eb7cae65b5402205c4675"; + name = "kpeople-5.68.0.tar.xz"; }; }; kplotting = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kplotting-5.66.0.tar.xz"; - sha256 = "2a4387f748614f005cf67e549b9466c6eed52589ac58297857ba6a0be92c32ee"; - name = "kplotting-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kplotting-5.68.0.tar.xz"; + sha256 = "ccae7f90c016a1c517db820f352bb962f600678efdc4ac6b12e33d2c48f5c268"; + name = "kplotting-5.68.0.tar.xz"; }; }; kpty = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kpty-5.66.0.tar.xz"; - sha256 = "a7fac6ced7504cec13a6776f0f4ba22db9878e44e2bbf85a219a2590e061c859"; - name = "kpty-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kpty-5.68.0.tar.xz"; + sha256 = "35b838cff80311db52d83e1f61bc365277d54929742ee34265f36a12ce7689e3"; + name = "kpty-5.68.0.tar.xz"; }; }; kquickcharts = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kquickcharts-5.66.0.tar.xz"; - sha256 = "70fae10b2af1c504e3b166beb0a342cdef0e0f8eb42e53ba88f0e3b174331624"; - name = "kquickcharts-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kquickcharts-5.68.0.tar.xz"; + sha256 = "2cfb78bc2a7659a8c4ca6b072ff586c44e6da64e10b84a0fb0c5e3f03c944628"; + name = "kquickcharts-5.68.0.tar.xz"; }; }; kross = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/portingAids/kross-5.66.0.tar.xz"; - sha256 = "109159996da54ec52ec8114ff05f88bdee6428e49ca84515ab73c457e0005ebc"; - name = "kross-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/portingAids/kross-5.68.0.tar.xz"; + sha256 = "2f5a79a2097f84bfd2033ca183abdbf6626f6e5dc2c6f781c312f15c97dace33"; + name = "kross-5.68.0.tar.xz"; }; }; krunner = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/krunner-5.66.0.tar.xz"; - sha256 = "b7d67d61c0b0f96128c143e3d2694dc5ced88a7de73db0f4493f084de9dc9701"; - name = "krunner-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/krunner-5.68.0.tar.xz"; + sha256 = "4575ae1d658d32c15f9d57dc30616073e9d143d1a7f9632556906ef10e82e3b8"; + name = "krunner-5.68.0.tar.xz"; }; }; kservice = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kservice-5.66.0.tar.xz"; - sha256 = "f1174576f6e3e562d7de65494efc2c1c3ac569c656b8301ffbe34576ea623a6a"; - name = "kservice-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kservice-5.68.0.tar.xz"; + sha256 = "c774ce1738081c17e6e105e506aa89c22a9db07e73972d4b18ce733ec8ad0a8a"; + name = "kservice-5.68.0.tar.xz"; }; }; ktexteditor = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/ktexteditor-5.66.0.tar.xz"; - sha256 = "9156e5e554b17d73078e4df09ae524a684f6adff8c2bbd40705b67fd30a6cc0b"; - name = "ktexteditor-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/ktexteditor-5.68.0.tar.xz"; + sha256 = "dad373d4c136d113cca1ee6d700753563b7348813ff3229db670eedc63980cd6"; + name = "ktexteditor-5.68.0.tar.xz"; }; }; ktextwidgets = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/ktextwidgets-5.66.0.tar.xz"; - sha256 = "dcc4595ceeecd3f59236ed303f2a0d61915c88eb36ad040a0562b60fb10cb9a1"; - name = "ktextwidgets-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/ktextwidgets-5.68.0.tar.xz"; + sha256 = "23b354469afed21c840ca36e2bb5b2b383ed5c4ec3690bb009e273c39fbe00c0"; + name = "ktextwidgets-5.68.0.tar.xz"; }; }; kunitconversion = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kunitconversion-5.66.0.tar.xz"; - sha256 = "82db51b59ffdb5b2e69bc5c6ea54521acbc49ee5601baaf4e43cba50d12b418c"; - name = "kunitconversion-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kunitconversion-5.68.0.tar.xz"; + sha256 = "39ec06e2439306ce5b5efe5fe972d201e8c8e5fda634652cdc01c58427574adb"; + name = "kunitconversion-5.68.0.tar.xz"; }; }; kwallet = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwallet-5.66.0.tar.xz"; - sha256 = "6e48070e22a822a4003e1f7a739fe1e335bcf46982cbf4909d23a6e40689a827"; - name = "kwallet-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwallet-5.68.0.tar.xz"; + sha256 = "7524eeffdde3166df182f0dbf0f3f461905547bfd7a06387c7c503cd1ab75ecf"; + name = "kwallet-5.68.0.tar.xz"; }; }; kwayland = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwayland-5.66.0.tar.xz"; - sha256 = "f43231f10a5294f7ac3d43d2b903f1cf9649364782ca55831e0c069a54cc170d"; - name = "kwayland-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwayland-5.68.0.tar.xz"; + sha256 = "7c99bfac8f4bff457a5384c846be776c385649ced76be0f48699c6e12de24e7c"; + name = "kwayland-5.68.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwidgetsaddons-5.66.0.tar.xz"; - sha256 = "311d8274469f03b1938da5a4f7ad17c82e3f96bc79ec28624cb748b13403f451"; - name = "kwidgetsaddons-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwidgetsaddons-5.68.0.tar.xz"; + sha256 = "b4ff96b4ec6365e5f9e4da5e651da99be491799a4e6cfd982d0838dda39844ac"; + name = "kwidgetsaddons-5.68.0.tar.xz"; }; }; kwindowsystem = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kwindowsystem-5.66.0.tar.xz"; - sha256 = "416e2ba52a8c95a6b161ca306724525c1971723cb12e7d8ad7fa108e0b820f0c"; - name = "kwindowsystem-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kwindowsystem-5.68.0.tar.xz"; + sha256 = "859c930a04c2588f792bfb9a28ed40b226db632b15c2851b186301b70d4c825a"; + name = "kwindowsystem-5.68.0.tar.xz"; }; }; kxmlgui = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kxmlgui-5.66.0.tar.xz"; - sha256 = "a8f9ed354e30ff1f40306e876d96fcd1fa3a26a8e6acfccdeab8f3437d7231bc"; - name = "kxmlgui-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kxmlgui-5.68.0.tar.xz"; + sha256 = "6310e9a725a982d3b70672367c5858727437fe08c8e409458e48b6015c7bf10e"; + name = "kxmlgui-5.68.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/kxmlrpcclient-5.66.0.tar.xz"; - sha256 = "6b637c138414d93104477034737c9e866d99e43f883a3dfc45d3220df6c21e6c"; - name = "kxmlrpcclient-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/kxmlrpcclient-5.68.0.tar.xz"; + sha256 = "e49f2ab649aafb292e01dacefb7b6f28fc596606764bef61e7ce622b67241324"; + name = "kxmlrpcclient-5.68.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/modemmanager-qt-5.66.0.tar.xz"; - sha256 = "50e24894d0243dbd2fc1a44a1e6368e3bb95a20c1ca56106d26752d5854d8be9"; - name = "modemmanager-qt-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/modemmanager-qt-5.68.0.tar.xz"; + sha256 = "9c0febf18a04b69e47cffdb4563390a79a4a673da856502cbf50d5c7707670ec"; + name = "modemmanager-qt-5.68.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/networkmanager-qt-5.66.0.tar.xz"; - sha256 = "3089951c69845c4f6d1848bbbaf05116a72d4207a9f2d63b063a76c78549bf45"; - name = "networkmanager-qt-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/networkmanager-qt-5.68.0.tar.xz"; + sha256 = "6a9bea5e6d58f5322848114e4e827edadee6b5a890a3549446ff23a568325e2c"; + name = "networkmanager-qt-5.68.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/oxygen-icons5-5.66.0.tar.xz"; - sha256 = "c6275fdcd4883c143adf4f16450a63dcb8651073a205bd14c599ec6ab638e8ef"; - name = "oxygen-icons5-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/oxygen-icons5-5.68.0.tar.xz"; + sha256 = "75a8113e567d8cbba57bda3c8829d116d58ebf6bc5ace88aed7700b28a00c463"; + name = "oxygen-icons5-5.68.0.tar.xz"; }; }; plasma-framework = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/plasma-framework-5.66.0.tar.xz"; - sha256 = "3263ccf95a6fcf8fde087d402d89d64c64c0130d4df62b95b860fada13aad419"; - name = "plasma-framework-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/plasma-framework-5.68.0.tar.xz"; + sha256 = "d27c7a62231784ecad1246f8a81b02fd6db2e9818244a06650fd6c972a69ea74"; + name = "plasma-framework-5.68.0.tar.xz"; }; }; prison = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/prison-5.66.0.tar.xz"; - sha256 = "ff5b4ae32ae44f2aea4b9254afe54af0fc9ea742517116cd2322e1a71a7315ce"; - name = "prison-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/prison-5.68.0.tar.xz"; + sha256 = "22e2b8e9ca06e4fb7ab91afeddbaebe6e2b6792bbcd5ba6c440c6fad0df176b7"; + name = "prison-5.68.0.tar.xz"; }; }; purpose = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/purpose-5.66.0.tar.xz"; - sha256 = "33b8ec6ede6a1deee6c85e45ebe42aca9a3add7884ee68aa8f1a16ed0637b4db"; - name = "purpose-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/purpose-5.68.0.tar.xz"; + sha256 = "c8c8f8244b568e52b4c02b89b71611bb8ba7cd07173645caa022b4bd90b41ab0"; + name = "purpose-5.68.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/qqc2-desktop-style-5.66.0.tar.xz"; - sha256 = "49bb518fc9f3c08cb330b1d82cb5c68d9ea358a562c6e460ea06aaaa13812b87"; - name = "qqc2-desktop-style-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/qqc2-desktop-style-5.68.0.tar.xz"; + sha256 = "0f522861e5757de6a1205c86a2e5f8d2a7375c96eac1ece95d03a35858dc7b03"; + name = "qqc2-desktop-style-5.68.0.tar.xz"; }; }; solid = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/solid-5.66.0.tar.xz"; - sha256 = "78deab8c55c30f2c923795730a9655b4d05a75cd6240bc0caa64104b141a3a39"; - name = "solid-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/solid-5.68.0.tar.xz"; + sha256 = "472c1934b3c9cf917f28ac0e5b0864de442b96852744c301d88d8ab7269d74c3"; + name = "solid-5.68.0.tar.xz"; }; }; sonnet = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/sonnet-5.66.0.tar.xz"; - sha256 = "5ca700e8e9954b380cc5f4cee0f392888ae240ccd2c4d3a37a2f41f8ac9c8294"; - name = "sonnet-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/sonnet-5.68.0.tar.xz"; + sha256 = "079c4f5fcb9fe670e1242b18648e178aaa01eb81dbdfc881805eea1ec585bd67"; + name = "sonnet-5.68.0.tar.xz"; }; }; syndication = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/syndication-5.66.0.tar.xz"; - sha256 = "5e6c90360461b820a48069af2838cffbcbedfe8bcd042535823e1cf1b43cd6b7"; - name = "syndication-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/syndication-5.68.0.tar.xz"; + sha256 = "0715fc1b7312b5081521b781d0878d88cc70dcb77272ee173cecca03cc221fd3"; + name = "syndication-5.68.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/syntax-highlighting-5.66.0.tar.xz"; - sha256 = "e572719cb64524c6abc476eeccca56f54cb0d7352fc747af3036dbe817566c25"; - name = "syntax-highlighting-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/syntax-highlighting-5.68.0.tar.xz"; + sha256 = "a857c743aa60b21eea7e4b986e8b195882aa2c18358412e767e68d93ce35e134"; + name = "syntax-highlighting-5.68.0.tar.xz"; }; }; threadweaver = { - version = "5.66.0"; + version = "5.68.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.66/threadweaver-5.66.0.tar.xz"; - sha256 = "a63db1ef8421e68534f5b9891013286fbad2ef8677f28c15ec733f086ae5cee3"; - name = "threadweaver-5.66.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.68/threadweaver-5.68.0.tar.xz"; + sha256 = "e28c0bfff375b3e1e9e4eec72f0a804f3f41c4ec5fd59af9b951708d229eff64"; + name = "threadweaver-5.68.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch b/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch new file mode 100644 index 00000000000..0f33815b6e9 --- /dev/null +++ b/pkgs/development/libraries/kerberos/krb5-Fix-Linux-build-error-with-musl-libc.patch @@ -0,0 +1,32 @@ +From cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 Mon Sep 17 00:00:00 2001 +From: TBK <tbk@jjtc.eu> +Date: Wed, 26 Feb 2020 21:12:45 +0100 +Subject: [PATCH] Fix Linux build error with musl libc + +Commit bf5953c549a6d279977df69ffe89b2ba51460eaf caused a build failure +on non-glibc Linux build environments. Change the conditionalization +so that __GLIBC_PREREQ will only be used if it is defined. + +[ghudson@mit.edu: simplified conditionals; rewrote commit message] + +ticket: 8880 (new) +tags: pullup +target_version: 1.18-next +--- + src/util/support/plugins.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c +index 3329db7dc3..1644d16fd0 100644 +--- a/src/util/support/plugins.c ++++ b/src/util/support/plugins.c +@@ -62,8 +62,7 @@ + * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects + * anyway. + */ +-#ifdef __linux__ +-#include <features.h> ++#ifdef __GLIBC__PREREQ + #if ! __GLIBC_PREREQ(2, 25) + #define dlclose(x) + #endif diff --git a/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch b/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch new file mode 100644 index 00000000000..f8718606a7f --- /dev/null +++ b/pkgs/development/libraries/kerberos/krb5-Fix-typo-in-musl-build-fix.patch @@ -0,0 +1,28 @@ +From b009cca2026b615ef5386faa4c0230bc27c4161d Mon Sep 17 00:00:00 2001 +From: Greg Hudson <ghudson@mit.edu> +Date: Thu, 12 Mar 2020 00:44:10 -0400 +Subject: [PATCH] Fix typo in musl build fix + +Commit cbdbc8d00d31344fafe00e0fdf984e04e631f7c4 checked for +__GLIBC__PREREQ instead of __GLIBC_PREREQ, thus accidentally reverting +the workaround introduced in commit +bf5953c549a6d279977df69ffe89b2ba51460eaf. Fix the typo. + +ticket: 8880 +--- + src/util/support/plugins.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c +index 1644d16fd0..1ff10c354d 100644 +--- a/src/util/support/plugins.c ++++ b/src/util/support/plugins.c +@@ -62,7 +62,7 @@ + * dlopen() with RTLD_NODELETE, we weren't going to unload the plugin objects + * anyway. + */ +-#ifdef __GLIBC__PREREQ ++#ifdef __GLIBC_PREREQ + #if ! __GLIBC_PREREQ(2, 25) + #define dlclose(x) + #endif diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 42965c0ad07..e5a593a7ff4 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -14,7 +14,7 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - majorVersion = "1.18"; + majorVersion = "1.18"; # remove patches below with next upgrade version = majorVersion; src = fetchurl { @@ -22,6 +22,15 @@ stdenv.mkDerivation rec { sha256 = "121c5xsy3x0i4wdkrpw62yhvji6virbh6n30ypazkp0isws3k4bk"; }; + patches = optionals stdenv.hostPlatform.isMusl [ + # TODO: Remove with next release > 1.18 + # Patches to fix musl build with 1.18. + # Not using `fetchpatch` for these for now to avoid infinite recursion + # errors in downstream projects (unclear if it's a nixpkgs issue so far). + ./krb5-Fix-Linux-build-error-with-musl-libc.patch + ./krb5-Fix-typo-in-musl-build-fix.patch + ]; + outputs = [ "out" "dev" ]; configureFlags = [ "--with-tcl=no" "--localstatedir=/var/lib"] @@ -74,7 +83,7 @@ stdenv.mkDerivation rec { meta = { description = "MIT Kerberos 5"; - homepage = http://web.mit.edu/kerberos/; + homepage = "http://web.mit.edu/kerberos/"; license = licenses.mit; platforms = platforms.unix ++ platforms.windows; }; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 0a130c017c0..e3084b9733e 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { * Python bindings, ``python-keybinder`` * An ``examples`` directory with programs in C, Lua, Python and Vala. ''; - homepage = https://github.com/engla/keybinder/; + homepage = "https://github.com/engla/keybinder/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index ed2dd341f45..1c8dbfdcd81 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for registering global key bindings"; - homepage = https://github.com/kupferlauncher/keybinder/; + homepage = "https://github.com/kupferlauncher/keybinder/"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.cstrahan ]; diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index a57b103b0d9..3704cbb7794 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchFromGitHub, opencl-clhpp, cmake, withTracing ? false }: +{ stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { name = "khronos-ocl-icd-loader-${version}"; - version = "6c03f8b"; + version = "2020.03.13"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; - rev = "6c03f8b58fafd9dd693eaac826749a5cfad515f8"; - sha256 = "00icrlc00dpc87prbd2j1350igi9pbgkz27hc3rf73s5994yn86a"; + rev = "v${version}"; + sha256 = "0zk6fyfrklx8a848613rfcx0y4yn0dsxkxzzl9pgdh9i6qdfjj9k"; }; patches = stdenv.lib.lists.optional withTracing ./tracing.patch; nativeBuildInputs = [ cmake ]; - buildInputs = [ opencl-clhpp ]; + buildInputs = [ opencl-headers ]; meta = with stdenv.lib; { description = "Offical Khronos OpenCL ICD Loader"; - homepage = https://github.com/KhronosGroup/OpenCL-ICD-Loader; + homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ davidtwco ]; diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch index 415a1b1dfe4..cef22457e5a 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch @@ -1,10 +1,10 @@ diff --git a/loader/icd.h b/loader/icd.h -index a1b6969..cf4e272 100644 +index 34751e9..01a33fd 100644 --- a/loader/icd.h +++ b/loader/icd.h -@@ -122,7 +122,7 @@ void khrIcdContextPropertiesGetPlatform( +@@ -123,7 +123,7 @@ void khrIcdContextPropertiesGetPlatform( cl_platform_id *outPlatform); - + // internal tracing macros -#if 0 +#if 1 diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix index 21e3c4d3424..e2b81d77640 100644 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ b/pkgs/development/libraries/kinetic-cpp-client/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/Seagate/kinetic-cpp-client; + homepage = "https://github.com/Seagate/kinetic-cpp-client"; description = "Code for producing C and C++ kinetic clients"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index ac998f30517..740248a7ae8 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++11 library, utilities and python bindings for Linux kernel mode setting"; - homepage = https://github.com/tomba/kmsxx; + homepage = "https://github.com/tomba/kmsxx"; license = licenses.mpl20; maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/kyotocabinet/default.nix b/pkgs/development/libraries/kyotocabinet/default.nix index 897f33953af..9c360ce0531 100644 --- a/pkgs/development/libraries/kyotocabinet/default.nix +++ b/pkgs/development/libraries/kyotocabinet/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; meta = with stdenv.lib; { - homepage = http://fallabs.com/kyotocabinet; + homepage = "http://fallabs.com/kyotocabinet"; description = "A library of routines for managing a database"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix index 374d9c398ef..34dab6bb3ff 100644 --- a/pkgs/development/libraries/l-smash/default.nix +++ b/pkgs/development/libraries/l-smash/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ which ]; meta = with stdenv.lib; { - homepage = http://l-smash.github.io/l-smash/; + homepage = "http://l-smash.github.io/l-smash/"; description = "MP4 container utilities"; license = licenses.isc; maintainers = with maintainers; [ tadeokondrak ]; diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix index 933d51b9575..da3784100ab 100644 --- a/pkgs/development/libraries/lame/default.nix +++ b/pkgs/development/libraries/lame/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = { description = "A high quality MPEG Audio Layer III (MP3) encoder"; - homepage = http://lame.sourceforge.net; + homepage = "http://lame.sourceforge.net"; license = licenses.lgpl2; maintainers = with maintainers; [ codyopel fpletz ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/languagemachines/frog.nix b/pkgs/development/libraries/languagemachines/frog.nix index dcff8c2757e..4829d67de45 100644 --- a/pkgs/development/libraries/languagemachines/frog.nix +++ b/pkgs/development/libraries/languagemachines/frog.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; - homepage = https://languagemachines.github.io/frog; + homepage = "https://languagemachines.github.io/frog"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/frogdata.nix b/pkgs/development/libraries/languagemachines/frogdata.nix index 2c418c1bc5f..196a697d8f6 100644 --- a/pkgs/development/libraries/languagemachines/frogdata.nix +++ b/pkgs/development/libraries/languagemachines/frogdata.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Data for Frog, a Tagger-Lemmatizer-Morphological-Analyzer-Dependency-Parser for Dutch"; - homepage = https://languagemachines.github.io/frog; + homepage = "https://languagemachines.github.io/frog"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/libfolia.nix b/pkgs/development/libraries/languagemachines/libfolia.nix index a00c3be4193..852615cbf3b 100644 --- a/pkgs/development/libraries/languagemachines/libfolia.nix +++ b/pkgs/development/libraries/languagemachines/libfolia.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A C++ API for FoLiA documents; an XML-based linguistic annotation format."; - homepage = https://proycon.github.io/folia/; + homepage = "https://proycon.github.io/folia/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/mbt.nix b/pkgs/development/libraries/languagemachines/mbt.nix index b99cb4f595a..9477abeef3f 100644 --- a/pkgs/development/libraries/languagemachines/mbt.nix +++ b/pkgs/development/libraries/languagemachines/mbt.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Memory Based Tagger"; - homepage = https://languagemachines.github.io/mbt/; + homepage = "https://languagemachines.github.io/mbt/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/ticcutils.nix b/pkgs/development/libraries/languagemachines/ticcutils.nix index 779ec664996..8676e08e417 100644 --- a/pkgs/development/libraries/languagemachines/ticcutils.nix +++ b/pkgs/development/libraries/languagemachines/ticcutils.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "This module contains useful functions for general use in the TiCC software stack and beyond."; - homepage = https://github.com/LanguageMachines/ticcutils; + homepage = "https://github.com/LanguageMachines/ticcutils"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/timbl.nix b/pkgs/development/libraries/languagemachines/timbl.nix index c6c216f5abf..b912ed97bd5 100644 --- a/pkgs/development/libraries/languagemachines/timbl.nix +++ b/pkgs/development/libraries/languagemachines/timbl.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "TiMBL implements several memory-based learning algorithms"; - homepage = https://github.com/LanguageMachines/timbl/; + homepage = "https://github.com/LanguageMachines/timbl/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/timblserver.nix b/pkgs/development/libraries/languagemachines/timblserver.nix index aeadb075953..e0634103a7e 100644 --- a/pkgs/development/libraries/languagemachines/timblserver.nix +++ b/pkgs/development/libraries/languagemachines/timblserver.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "This server for TiMBL implements several memory-based learning algorithms"; - homepage = https://github.com/LanguageMachines/timblserver/; + homepage = "https://github.com/LanguageMachines/timblserver/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/ucto.nix b/pkgs/development/libraries/languagemachines/ucto.nix index ab047d0516e..d60ff5fa246 100644 --- a/pkgs/development/libraries/languagemachines/ucto.nix +++ b/pkgs/development/libraries/languagemachines/ucto.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A rule-based tokenizer for natural language"; - homepage = https://languagemachines.github.io/ucto/; + homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/languagemachines/uctodata.nix b/pkgs/development/libraries/languagemachines/uctodata.nix index 01a78b5b4be..29eaf78b75a 100644 --- a/pkgs/development/libraries/languagemachines/uctodata.nix +++ b/pkgs/development/libraries/languagemachines/uctodata.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A rule-based tokenizer for natural language"; - homepage = https://languagemachines.github.io/ucto/; + homepage = "https://languagemachines.github.io/ucto/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index 5e00ce1037f..b3742514ced 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "SVG and MathML rendering library"; - homepage = https://wiki.gnome.org/Projects/Lasem; + homepage = "https://wiki.gnome.org/Projects/Lasem"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/lasso/default.nix b/pkgs/development/libraries/lasso/default.nix index f401f231de2..eb9dded94b2 100644 --- a/pkgs/development/libraries/lasso/default.nix +++ b/pkgs/development/libraries/lasso/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://lasso.entrouvert.org/; + homepage = "https://lasso.entrouvert.org/"; description = "Liberty Alliance Single Sign-On library"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 63c81822ddf..01ec659a95b 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lcms-1.19"; src = fetchurl { - url = http://www.littlecms.com/lcms-1.19.tar.gz; + url = "http://www.littlecms.com/lcms-1.19.tar.gz"; sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Color management engine"; - homepage = http://www.littlecms.com/; + homepage = "http://www.littlecms.com/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index 5d307dcfa7a..2de11a3bd40 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Color management engine"; - homepage = http://www.littlecms.com/; + homepage = "http://www.littlecms.com/"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/ldacbt/default.nix b/pkgs/development/libraries/ldacbt/default.nix index ae8fc1e22db..36a0c8e1316 100644 --- a/pkgs/development/libraries/ldacbt/default.nix +++ b/pkgs/development/libraries/ldacbt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AOSP libldac dispatcher"; - homepage = https://github.com/EHfive/ldacBT; + homepage = "https://github.com/EHfive/ldacBT"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ adisbladis ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 12f7b176bb7..7ee869b53c3 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -1,49 +1,62 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, tdb, talloc, tevent -, popt, libxslt, docbook_xsl, docbook_xml_dtd_42, cmocka +{ stdenv +, fetchurl +, python3 +, pkg-config +, readline +, tdb +, talloc +, tevent +, popt +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, cmocka +, wafHook }: stdenv.mkDerivation rec { - name = "ldb-1.3.3"; + pname = "ldb"; + version = "2.1.1"; src = fetchurl { - url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "14gsrm7dvyjpbpnc60z75j6fz2p187abm2h353lq95kx2bv70c1b" ; + url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; + sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A="; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - python readline tdb talloc tevent popt - libxslt docbook_xsl docbook_xml_dtd_42 - cmocka + nativeBuildInputs = [ + pkg-config + python3 + wafHook + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 ]; - patches = [ - # CVE-2019-3824 - # downloading the patch from debian as they have ported the patch from samba to ldb but otherwise is identical to - # https://bugzilla.samba.org/attachment.cgi?id=14857 - (fetchurl { - name = "CVE-2019-3824.patch"; - url = "https://sources.debian.org/data/main/l/ldb/2:1.1.27-1+deb9u1/debian/patches/CVE-2019-3824-master-v4-5-02.patch"; - sha256 = "1idnqckvjh18rh9sbq90rr4sxfviha9nd1ca9pd6lai0y6r6q4yd"; - }) + buildInputs = [ + python3 + readline # required to build python + tdb + talloc + tevent + popt + cmocka ]; - preConfigure = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" + "--without-ldb-lmdb" ]; stripDebugList = "bin lib modules"; meta = with stdenv.lib; { description = "A LDAP-like embedded database"; - homepage = https://ldb.samba.org/; + homepage = "https://ldb.samba.org/"; license = licenses.lgpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 74ac59fef28..f64d263901b 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; - homepage = http://www.nlnetlabs.nl/projects/ldns/; + homepage = "http://www.nlnetlabs.nl/projects/ldns/"; platforms = platforms.unix; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 48735c13ed1..1fab7ee28a8 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { - sha256 = "1kvvqvr0djz4gb770rs5h97zqcymvbzrmsw8kz2icvlmcicm7qd8"; + sha256 = "1kp35gnph9myqxdxzyj1871ay19nfajxglzwai1gvsnh5840xnxy"; rev = version; repo = "leatherman"; owner = "puppetlabs"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/puppetlabs/leatherman/; + homepage = "https://github.com/puppetlabs/leatherman/"; description = "A collection of C++ and CMake utility libraries"; license = licenses.asl20; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 6137638222e..830facc5672 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ enzime ]; license = stdenv.lib.licenses.lgpl3; description = "An opensource database of photographic lenses and their characteristics"; - homepage = http://lensfun.sourceforge.net/; + homepage = "http://lensfun.sourceforge.net/"; }; } diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 6d73b00a6d1..456a14f72b1 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Image processing and analysis library"; - homepage = http://www.leptonica.org/; + homepage = "http://www.leptonica.org/"; license = stdenv.lib.licenses.bsd2; # http://www.leptonica.org/about-the-license.html platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix index b678a089386..6e68a9128d0 100644 --- a/pkgs/development/libraries/lesstif/default.nix +++ b/pkgs/development/libraries/lesstif/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source clone of the Motif widget set"; - homepage = http://lesstif.sourceforge.net; + homepage = "http://lesstif.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; }; diff --git a/pkgs/development/libraries/leveldb/default.nix b/pkgs/development/libraries/leveldb/default.nix index 62abc1bd68c..b64b426a640 100644 --- a/pkgs/development/libraries/leveldb/default.nix +++ b/pkgs/development/libraries/leveldb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { "; meta = with stdenv.lib; { - homepage = https://github.com/google/leveldb; + homepage = "https://github.com/google/leveldb"; description = "Fast and lightweight key/value database library by Google"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/levmar/default.nix b/pkgs/development/libraries/levmar/default.nix index 9a933b176d3..e8ef17081c9 100644 --- a/pkgs/development/libraries/levmar/default.nix +++ b/pkgs/development/libraries/levmar/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++"; - homepage = https://www.ics.forth.gr/~lourakis/levmar/; + homepage = "https://www.ics.forth.gr/~lourakis/levmar/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/lib3ds/default.nix b/pkgs/development/libraries/lib3ds/default.nix index 32fecd3d99c..406b61e4393 100644 --- a/pkgs/development/libraries/lib3ds/default.nix +++ b/pkgs/development/libraries/lib3ds/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for managing 3D-Studio Release 3 and 4 \".3DS\" files"; - homepage = http://lib3ds.sourceforge.net/; + homepage = "http://lib3ds.sourceforge.net/"; license = "LGPL"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libHX/default.nix b/pkgs/development/libraries/libHX/default.nix index 39f493d821c..59afede9cae 100644 --- a/pkgs/development/libraries/libHX/default.nix +++ b/pkgs/development/libraries/libHX/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://libhx.sourceforge.net/; + homepage = "http://libhx.sourceforge.net/"; longDescription = '' libHX is a C library (with some C++ bindings available) that provides data structures and functions commonly needed, such as maps, deques, linked lists, string formatting diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index 15ef9ee890a..818e2ad85b0 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset"; - homepage = https://liblas.org; + homepage = "https://liblas.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.michelk ]; diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index bda7d560fcd..2b3ef8c99c8 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1kms92i0c7i1yl659kqjf19lm8172pnpik5lsxp19xphr74vvq27"; + sha256 = "1zhjdcph8sqx7ak35s22kc736icwq135jlypggkp6vqyyygb3xlk"; }; buildInputs = [ libgcrypt libgpgerror ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yacc flex ]; meta = with stdenv.lib; { - homepage = https://www.videolan.org/developers/libaacs.html; + homepage = "https://www.videolan.org/developers/libaacs.html"; description = "Library to access AACS protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix index 87eeac4b4f5..fdfd855470d 100644 --- a/pkgs/development/libraries/libaal/default.nix +++ b/pkgs/development/libraries/libaal/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.namesys.com/; + homepage = "http://www.namesys.com/"; description = "Support library for Reiser4"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/libabw/default.nix b/pkgs/development/libraries/libabw/default.nix index a37d4756cbd..91107ad4cb0 100644 --- a/pkgs/development/libraries/libabw/default.nix +++ b/pkgs/development/libraries/libabw/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost doxygen gperf librevenge libxml2 perl ]; meta = with stdenv.lib; { - homepage = https://wiki.documentfoundation.org/DLP/Libraries/libabw; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libabw"; description = "Library parsing abiword documents"; platforms = platforms.unix; license = licenses.mpl20; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index c0a43efc27e..616879a979c 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Cross-platform GUI toolkit"; - homepage = http://libagar.org/index.html; + homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix index 4295971d5a0..4de113718d4 100644 --- a/pkgs/development/libraries/libagar/libagar_test.nix +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tests for libagar"; - homepage = http://libagar.org/index.html; + homepage = "http://libagar.org/index.html"; license = with licenses; bsd3; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix index 28f0ca2905c..4c3d1d2a213 100644 --- a/pkgs/development/libraries/libantlr3c/default.nix +++ b/pkgs/development/libraries/libantlr3c/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libantlr3c-3.4"; src = fetchurl { - url = https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz; + url = "https://www.antlr3.org/download/C/libantlr3c-3.4.tar.gz"; sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C runtime libraries of ANTLR v3"; - homepage = https://www.antlr3.org/; + homepage = "https://www.antlr3.org/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 2d7edee4041..3ecee2599f6 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { programs to output audio using a simple API on a wide variety of platforms. ''; - homepage = https://xiph.org/ao/; + homepage = "https://xiph.org/ao/"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libaom/default.nix b/pkgs/development/libraries/libaom/default.nix index 2d9a9f18fa2..04b1c810c08 100644 --- a/pkgs/development/libraries/libaom/default.nix +++ b/pkgs/development/libraries/libaom/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AV1 Bitstream and Decoding Library"; - homepage = https://aomedia.org/av1-features/get-started/; + homepage = "https://aomedia.org/av1-features/get-started/"; maintainers = with maintainers; [ kiloreux ]; platforms = platforms.all; license = licenses.bsd2; diff --git a/pkgs/development/libraries/libaosd/default.nix b/pkgs/development/libraries/libaosd/default.nix index 6cf395d7e74..c33f3a873a6 100644 --- a/pkgs/development/libraries/libaosd/default.nix +++ b/pkgs/development/libraries/libaosd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { composited rendering via XComposite, as well as support for rendering Cairo and Pango layouts. ''; - homepage = https://github.com/atheme-legacy/libaosd; + homepage = "https://github.com/atheme-legacy/libaosd"; license = licenses.mit; maintainers = with maintainers; [ unode ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index d09684a0443..dc0542c2126 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = { description = "A library to allow applications to export a menu into the Unity Menu bar"; - homepage = https://launchpad.net/libappindicator; + homepage = "https://launchpad.net/libappindicator"; license = with licenses; [ lgpl21 lgpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 779ddfeb589..0f6b196d150 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { compressions formats including (but not limited to) tar, shar, cpio, zip, and compressed with gzip, bzip2, lzma, xz, ... ''; - homepage = http://libarchive.org; + homepage = "http://libarchive.org"; license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; all; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix index 40158898f3d..561e7e1017d 100644 --- a/pkgs/development/libraries/libasr/default.nix +++ b/pkgs/development/libraries/libasr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libevent openssl ]; meta = with stdenv.lib; { - homepage = https://github.com/OpenSMTPD/libasr; + homepage = "https://github.com/OpenSMTPD/libasr"; description = "Free, simple and portable asynchronous resolver library"; license = licenses.isc; maintainers = [ maintainers.koral ]; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 41406ce18ea..508a57b203d 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -44,10 +44,10 @@ stdenv.mkDerivation rec { meta = { description = "Portable ASS/SSA subtitle renderer"; - homepage = https://github.com/libass/libass; + homepage = "https://github.com/libass/libass"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; - repositories.git = git://github.com/libass/libass.git; + repositories.git = "git://github.com/libass/libass.git"; }; } diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index d55c3816868..e92db2ab87e 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { GnuPG components. Both, server and client side functions are provided. ''; - homepage = http://gnupg.org; + homepage = "http://gnupg.org"; license = licenses.lgpl2Plus; platforms = platforms.all; maintainers = [ maintainers.erictapen ]; diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix index 348cfa9ed5b..dfe2dd76ef7 100644 --- a/pkgs/development/libraries/libast/default.nix +++ b/pkgs/development/libraries/libast/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library of Assorted Spiffy Things"; - homepage = https://www.eterm.org; + homepage = "https://www.eterm.org"; license = licenses.bsd2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index f7805c9f375..d8b4f1d7df2 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://0pointer.de/lennart/projects/libasyncns/; + homepage = "http://0pointer.de/lennart/projects/libasyncns/"; description = "A C library for Linux/Unix for executing name service queries asynchronously"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libaudclient/default.nix b/pkgs/development/libraries/libaudclient/default.nix index eebe667badb..ad33c624b14 100644 --- a/pkgs/development/libraries/libaudclient/default.nix +++ b/pkgs/development/libraries/libaudclient/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Legacy D-Bus client library for Audacious"; - homepage = https://audacious-media-player.org/; + homepage = "https://audacious-media-player.org/"; license = licenses.bsd2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 43cfe2ef251..15b6a275214 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -121,7 +121,7 @@ let passthru = { inherit vdpauSupport; }; meta = with stdenv.lib; { - homepage = https://libav.org/; + 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? else if enableGPL then gpl2Plus else lgpl21Plus; diff --git a/pkgs/development/libraries/libavc1394/default.nix b/pkgs/development/libraries/libavc1394/default.nix index 726e9573d37..01f39052e93 100644 --- a/pkgs/development/libraries/libavc1394/default.nix +++ b/pkgs/development/libraries/libavc1394/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Programming interface for the 1394 Trade Association AV/C (Audio/Video Control) Digital Interface Command Set"; - homepage = https://sourceforge.net/projects/libavc1394/; + homepage = "https://sourceforge.net/projects/libavc1394/"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libb2/default.nix b/pkgs/development/libraries/libb2/default.nix index d39c12d58d5..dad5d40ea53 100644 --- a/pkgs/development/libraries/libb2/default.nix +++ b/pkgs/development/libraries/libb2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The BLAKE2 family of cryptographic hash functions"; - homepage = https://blake2.net/; + homepage = "https://blake2.net/"; platforms = platforms.all; maintainers = with maintainers; [ dfoxfranke dotlambda ]; license = licenses.cc0; diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index 9aedde923f0..09cbafa17bf 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/binaryanalysisplatform/bap-bindings; + homepage = "https://github.com/binaryanalysisplatform/bap-bindings"; description = "A C library for interacting with BAP"; maintainers = [ maintainers.maurer ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix index 3af98a578f2..c9b7bfa3c0e 100644 --- a/pkgs/development/libraries/libbdplus/default.nix +++ b/pkgs/development/libraries/libbdplus/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ]; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbdplus.html; + homepage = "http://www.videolan.org/developers/libbdplus.html"; description = "Library to access BD+ protected Blu-Ray disks"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index 15561677ad5..75db780b7bb 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { It is associated with GNU Binutils, and elsewhere often distributed with it. ''; - homepage = https://www.gnu.org/software/binutils/; + homepage = "https://www.gnu.org/software/binutils/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericson2314 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libbladeRF/default.nix b/pkgs/development/libraries/libbladeRF/default.nix index 043f3500b0c..b2853011b14 100644 --- a/pkgs/development/libraries/libbladeRF/default.nix +++ b/pkgs/development/libraries/libbladeRF/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { hardeningDisable = [ "fortify" ]; meta = with lib; { - homepage = https://nuand.com/libbladeRF-doc; + homepage = "https://nuand.com/libbladeRF-doc"; description = "Supporting library of the BladeRF SDR opensource hardware"; license = licenses.lgpl21; maintainers = with maintainers; [ funfunctor ]; diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix index daa349ca630..7bfd9a8a2d0 100644 --- a/pkgs/development/libraries/libbluray/default.nix +++ b/pkgs/development/libraries/libbluray/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook +{ stdenv, fetchurl, pkgconfig, fontconfig, autoreconfHook, DiskArbitration , withJava ? false, jdk ? null, ant ? null , withAACS ? false, libaacs ? null , withBDplus ? false, libbdplus ? null @@ -19,11 +19,11 @@ assert withFonts -> freetype != null; stdenv.mkDerivation rec { pname = "libbluray"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "http://get.videolan.org/libbluray/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0hhbgkm11fw4pwbrklm76aiy54r6d7hk06yhl2fxq05i74i4bpd3"; + sha256 = "04bcd53ml0zn8b4f9r1grs0yy20rcirji1v3pxzaf4i5zl3flhfd"; }; patches = optional withJava ./BDJ-JARFILE-path.patch; @@ -36,6 +36,7 @@ stdenv.mkDerivation rec { ++ optional withJava jdk ++ optional withMetadata libxml2 ++ optional withFonts freetype + ++ optional stdenv.isDarwin DiskArbitration ; propagatedBuildInputs = optional withAACS libaacs; @@ -56,7 +57,7 @@ stdenv.mkDerivation rec { ; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libbluray.html; + homepage = "http://www.videolan.org/developers/libbluray.html"; description = "Library to access Blu-Ray disks for video playback"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix index e251295a4c7..7aea38bdb58 100644 --- a/pkgs/development/libraries/libbsd/default.nix +++ b/pkgs/development/libraries/libbsd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Common functions found on BSD systems"; - homepage = https://libbsd.freedesktop.org/; + homepage = "https://libbsd.freedesktop.org/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 5bd6b11ac7a..1d2043b20cd 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C Library for parsing, editing, and creating BSON documents"; - homepage = https://github.com/mongodb/libbson; + homepage = "https://github.com/mongodb/libbson"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libburn/default.nix b/pkgs/development/libraries/libburn/default.nix index b6cadf9df18..f436f947d0a 100644 --- a/pkgs/development/libraries/libburn/default.nix +++ b/pkgs/development/libraries/libburn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library by which preformatted data get onto optical media: CD, DVD, BD (Blu-Ray)"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index 7773fe46c0c..84df50e117a 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://libcaca.zoy.org/; + 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; diff --git a/pkgs/development/libraries/libcacard/default.nix b/pkgs/development/libraries/libcacard/default.nix index 2e134c5bb63..474e51e8c46 100644 --- a/pkgs/development/libraries/libcacard/default.nix +++ b/pkgs/development/libraries/libcacard/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Smart card emulation library"; - homepage = https://gitlab.freedesktop.org/spice/libcacard; + homepage = "https://gitlab.freedesktop.org/spice/libcacard"; license = licenses.lgpl21; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix index 6d76c941114..9dea5956d65 100644 --- a/pkgs/development/libraries/libcanberra/default.nix +++ b/pkgs/development/libraries/libcanberra/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch"; - url = http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310; + url = "http://git.0pointer.net/libcanberra.git/patch/?id=c0620e432650e81062c1967cc669829dbd29b310"; sha256 = "0rc7zwn39yxzxp37qh329g7375r5ywcqcaak8ryd0dgvg8m5hcx9"; }) ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { portable. ''; - homepage = http://0pointer.de/lennart/projects/libcanberra/; + homepage = "http://0pointer.de/lennart/projects/libcanberra/"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libcangjie/default.nix b/pkgs/development/libraries/libcangjie/default.nix index 42a49713a0b..b71b630675d 100644 --- a/pkgs/development/libraries/libcangjie/default.nix +++ b/pkgs/development/libraries/libcangjie/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { longDescription = '' libcangjie is a library implementing the Cangjie input method. ''; - homepage = http://cangjians.github.io/projects/libcangjie/; + homepage = "http://cangjians.github.io/projects/libcangjie/"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.linquize ]; diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 4949d657669..7067caa42c0 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CBOR protocol implementation for C and others"; - homepage = https://github.com/PJK/libcbor; + homepage = "https://github.com/PJK/libcbor"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/libcdaudio/default.nix b/pkgs/development/libraries/libcdaudio/default.nix index df7e93de063..abc5f84a0e3 100644 --- a/pkgs/development/libraries/libcdaudio/default.nix +++ b/pkgs/development/libraries/libcdaudio/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libcdaudio-0.99.12p2"; src = fetchurl { - url = mirror://sourceforge/libcdaudio/libcdaudio-0.99.12p2.tar.gz ; + url = "mirror://sourceforge/libcdaudio/libcdaudio-0.99.12p2.tar.gz"; sha256 = "1fsy6dlzxrx177qc877qhajm9l4g28mvh06h2l15rxy4bapzknjz" ; }; diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 591369df83f..26a69fe9fc7 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library to access data on a CDDB server (freedb.org)"; - homepage = http://libcddb.sourceforge.net/; + homepage = "http://libcddb.sourceforge.net/"; license = licenses.lgpl2Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/libcdio-paranoia/default.nix b/pkgs/development/libraries/libcdio-paranoia/default.nix index a539586f067..8ad3231dc36 100644 --- a/pkgs/development/libraries/libcdio-paranoia/default.nix +++ b/pkgs/development/libraries/libcdio-paranoia/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { access. By doing this, cdparanoia runs on platforms other than GNU/Linux. ''; license = licenses.gpl3; - homepage = https://github.com/rocky/libcdio-paranoia; + homepage = "https://github.com/rocky/libcdio-paranoia"; platforms = platforms.linux ++ platforms.darwin; maintainers = [ ]; }; diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 9c3132a3e63..e4522bf00be 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ISO-9660 filesystems (libiso9660), as well as utility programs such as an audio CD player and an extractor. ''; - homepage = https://www.gnu.org/software/libcdio/; + homepage = "https://www.gnu.org/software/libcdio/"; license = licenses.gpl2Plus; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix index cfd768b5272..72996e28996 100644 --- a/pkgs/development/libraries/libcdr/default.nix +++ b/pkgs/development/libraries/libcdr/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "A library providing ability to interpret and import Corel Draw drawings into various applications"; - homepage = http://www.freedesktop.org/wiki/Software/libcdr; + homepage = "http://www.freedesktop.org/wiki/Software/libcdr"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.mpl20; }; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 070cb58149c..2ea55db2247 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.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; + homepage = "http://libcec.pulse-eight.com"; repositories.git = "https://github.com/Pulse-Eight/libcec.git"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcec/platform.nix b/pkgs/development/libraries/libcec/platform.nix index e43cfb10a37..2132cf7a065 100644 --- a/pkgs/development/libraries/libcec/platform.nix +++ b/pkgs/development/libraries/libcec/platform.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Platform library for libcec and Kodi addons"; - homepage = https://github.com/Pulse-Eight/platform; + homepage = "https://github.com/Pulse-Eight/platform"; repositories.git = "https://github.com/Pulse-Eight/platform.git"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index 03cc3b2beb4..4d08c2ba1fb 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple framework for embedding Chromium-based browsers in other applications"; - homepage = http://opensource.spotify.com/cefbuilds/index.html; + homepage = "http://opensource.spotify.com/cefbuilds/index.html"; maintainers = with maintainers; [ puffnfresh ]; license = licenses.bsd3; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index 96c3db6ae43..1ef749c1740 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://libcello.org/; + homepage = "http://libcello.org/"; description = "Higher level programming in C"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libcerf/default.nix b/pkgs/development/libraries/libcerf/default.nix index 0ffb2085967..05f9cc82c73 100644 --- a/pkgs/development/libraries/libcerf/default.nix +++ b/pkgs/development/libraries/libcerf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Complex error (erf), Dawson, Faddeeva, and Voigt function library"; - homepage = https://jugit.fz-juelich.de/mlz/libcerf; + homepage = "https://jugit.fz-juelich.de/mlz/libcerf"; license = licenses.mit; maintainers = with maintainers; [ orivej ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 48446d87b8d..c24fc0eda93 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/libchamplain; + homepage = "https://wiki.gnome.org/Projects/libchamplain"; license = licenses.lgpl2Plus; description = "C library providing a ClutterActor to display maps"; diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix index 11617a0107c..168217678c0 100644 --- a/pkgs/development/libraries/libchardet/default.nix +++ b/pkgs/development/libraries/libchardet/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; - homepage = ftp://ftp.oops.org/pub/oops/libchardet/index.html; + homepage = "ftp://ftp.oops.org/pub/oops/libchardet/index.html"; license = licenses.mpl11; maintainers = [ maintainers.abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libchewing/default.nix b/pkgs/development/libraries/libchewing/default.nix index 3c234d780ef..09d5d40f877 100644 --- a/pkgs/development/libraries/libchewing/default.nix +++ b/pkgs/development/libraries/libchewing/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Intelligent Chinese phonetic input method"; - homepage = http://chewing.im/; + homepage = "http://chewing.im/"; license = licenses.lgpl21; maintainers = [ maintainers.ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index c802bd68ab0..190f122ecfa 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { line. It is written in C and has Guile (Scheme) bindings. ''; - homepage = https://www.nongnu.org/libchop/; + homepage = "https://www.nongnu.org/libchop/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/development/libraries/libclc/default.nix b/pkgs/development/libraries/libclc/default.nix index 9ddf1d4f157..0672e7942cb 100644 --- a/pkgs/development/libraries/libclc/default.nix +++ b/pkgs/development/libraries/libclc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://libclc.llvm.org/; + homepage = "http://libclc.llvm.org/"; description = "Implementation of the library requirements of the OpenCL C programming language"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix index d896cf63733..6cabe1343c4 100644 --- a/pkgs/development/libraries/libcli/default.nix +++ b/pkgs/development/libraries/libcli/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Emulate a Cisco-style telnet command-line interface"; - homepage = http://sites.dparrish.com/libcli; + homepage = "http://sites.dparrish.com/libcli"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libcloudproviders/default.nix b/pkgs/development/libraries/libcloudproviders/default.nix index 2814d6c5c1e..f48ee9e5df0 100644 --- a/pkgs/development/libraries/libcloudproviders/default.nix +++ b/pkgs/development/libraries/libcloudproviders/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DBus API that allows cloud storage sync clients to expose their services"; - homepage = https://gitlab.gnome.org/World/libcloudproviders; + homepage = "https://gitlab.gnome.org/World/libcloudproviders"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libclthreads/default.nix b/pkgs/development/libraries/libclthreads/default.nix index 325afc56ae7..53cff9a19d3 100644 --- a/pkgs/development/libraries/libclthreads/default.nix +++ b/pkgs/development/libraries/libclthreads/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Zita thread library"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = licenses.lgpl21; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libclxclient/default.nix b/pkgs/development/libraries/libclxclient/default.nix index d6e2ad398d7..b086dfc08f6 100644 --- a/pkgs/development/libraries/libclxclient/default.nix +++ b/pkgs/development/libraries/libclxclient/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Zita X11 library"; - homepage = http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html; + homepage = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/index.html"; license = licenses.lgpl21; maintainers = with maintainers; [ magnetophon ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libcmis/default.nix b/pkgs/development/libraries/libcmis/default.nix index 53474190ce9..8b1093ac21f 100644 --- a/pkgs/development/libraries/libcmis/default.nix +++ b/pkgs/development/libraries/libcmis/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ client library for the CMIS interface"; - homepage = https://sourceforge.net/projects/libcmis/; + homepage = "https://sourceforge.net/projects/libcmis/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libcollectdclient/default.nix b/pkgs/development/libraries/libcollectdclient/default.nix index 0f1cbeb2f96..f945434842e 100644 --- a/pkgs/development/libraries/libcollectdclient/default.nix +++ b/pkgs/development/libraries/libcollectdclient/default.nix @@ -14,7 +14,7 @@ collectd.overrideAttrs (oldAttrs: { meta = with stdenv.lib; { description = "C Library for collectd, a daemon which collects system performance statistics periodically"; - homepage = http://collectd.org; + homepage = "http://collectd.org"; license = licenses.gpl2; platforms = platforms.linux; # TODO: collectd may be linux but the C client may be more portable? maintainers = [ maintainers.sheenobu maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix index 8eb7ff303de..3f91c8e579f 100644 --- a/pkgs/development/libraries/libcommuni/default.nix +++ b/pkgs/development/libraries/libcommuni/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform IRC framework written with Qt"; - homepage = https://communi.github.io; + homepage = "https://communi.github.io"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ hrdinka ]; diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix index cdc225c8bf7..7d7f95d757c 100644 --- a/pkgs/development/libraries/libconfig/default.nix +++ b/pkgs/development/libraries/libconfig/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://www.hyperrealm.com/libconfig; + homepage = "http://www.hyperrealm.com/libconfig"; description = "A simple library for processing structured configuration files"; license = licenses.lgpl3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 53ec231dec9..92b000bc4ef 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C client library for Couchbase"; - homepage = https://github.com/couchbase/libcouchbase; + homepage = "https://github.com/couchbase/libcouchbase"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index ba9a6325b07..d91032126eb 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libpcap ]; meta = { - homepage = https://github.com/pellegre/libcrafter; + 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 ]; diff --git a/pkgs/development/libraries/libcredis/default.nix b/pkgs/development/libraries/libcredis/default.nix index bfc7fe1d949..1368cd30adb 100644 --- a/pkgs/development/libraries/libcredis/default.nix +++ b/pkgs/development/libraries/libcredis/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C client library for Redis (key-value database)"; - homepage = https://code.google.com/archive/p/credis/; + homepage = "https://code.google.com/archive/p/credis/"; license = licenses.bsd3; # from homepage platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libcroco/default.nix b/pkgs/development/libraries/libcroco/default.nix deleted file mode 100644 index 90ed8c6d985..00000000000 --- a/pkgs/development/libraries/libcroco/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, 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"; - sha256 = "1m110rbj5d2raxcdp4iz0qp172284945awrsbdlq99ksmqsc4zkn"; - }; - - outputs = [ "out" "dev" ]; - outputBin = "dev"; - - configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libxml2 glib ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - - meta = with stdenv.lib; { - description = "GNOME CSS2 parsing and manipulation toolkit"; - homepage = https://gitlab.gnome.org/GNOME/libcroco; - license = licenses.lgpl2; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix index e5c09675c4b..0d0f06aac37 100644 --- a/pkgs/development/libraries/libcrossguid/default.nix +++ b/pkgs/development/libraries/libcrossguid/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Lightweight cross platform C++ GUID/UUID library"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; - homepage = https://github.com/graeme-hill/crossguid; + homepage = "https://github.com/graeme-hill/crossguid"; platforms = with platforms; linux; }; diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index fef8e7f510d..e3db41c73e1 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interface components for OpenPGP"; - homepage = https://gitlab.gnome.org/GNOME/libcryptui; + homepage = "https://gitlab.gnome.org/GNOME/libcryptui"; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix index 4bf26bde228..fcb5aa2bbfe 100644 --- a/pkgs/development/libraries/libcsptr/default.nix +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Smart pointer constructs for the (GNU) C programming language"; - homepage = https://github.com/Snaipe/libcsptr; + homepage = "https://github.com/Snaipe/libcsptr"; license = licenses.mit; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.fragamus ]; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index f4e2e621c28..35707834c08 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { emphasizes separating logic from presentation: it is impossible to embed application logic in this template language. ''; - homepage = https://github.com/OlafvdSpek/ctemplate; + homepage = "https://github.com/OlafvdSpek/ctemplate"; license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index 8ebab123524..73a110c07f6 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { a file pointer. For handling of the parsed data a convenient API is available. ''; - homepage = https://sourceforge.net/projects/libcue/; + homepage = "https://sourceforge.net/projects/libcue/"; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index 5dc153dd5cc..d906e119dca 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight C library that eases the writing of UNIX daemons"; - homepage = http://0pointer.de/lennart/projects/libdaemon/; + homepage = "http://0pointer.de/lennart/projects/libdaemon/"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix index baf93894420..27084e54a82 100644 --- a/pkgs/development/libraries/libdap/default.nix +++ b/pkgs/development/libraries/libdap/default.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://www.opendap.org/pub/source/${pname}-${version}.tar.gz"; - sha256 = "17j6ca2qsp69a91lm11mwbs4l8q13xqcdz60l94avl5krymrqg47"; + sha256 = "15jysnsmdjs7q4iafb4qzq4b76cfyvmbxgcxnqg4sr0x4bplwfnb"; }; meta = with stdenv.lib; { description = "A C++ SDK which contains an implementation of DAP"; - homepage = https://www.opendap.org/software/libdap; + homepage = "https://www.opendap.org/software/libdap"; license = licenses.lgpl2; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 173ad6d2e85..ebe053920ab 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -3,17 +3,17 @@ stdenv.mkDerivation rec { pname = "libdazzle"; - version = "3.34.1"; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/libdazzle/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01cmcrd75b7ns7j2b4p6h7pv68vjhkcl9zbvzzx7pf4vknxir61x"; + sha256 = "0n6r16a07in82cnzw91vl675pbjzbvazkxwbqxq2kihganzipcw2"; }; - nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run ]; + nativeBuildInputs = [ ninja meson pkgconfig vala gobject-introspection libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 dbus xvfb_run glib ]; buildInputs = [ glib gtk3 ]; mesonFlags = [ @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { for those libraries. In other cases, our design isn't quite generic enough to work for everyone. ''; - homepage = https://wiki.gnome.org/Apps/Builder; + homepage = "https://wiki.gnome.org/Apps/Builder"; license = licenses.gpl3Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix index 52b8a32fab4..d321d7d650a 100644 --- a/pkgs/development/libraries/libdbi-drivers/default.nix +++ b/pkgs/development/libraries/libdbi-drivers/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://libdbi-drivers.sourceforge.net/; + homepage = "http://libdbi-drivers.sourceforge.net/"; description = "Database drivers for libdbi"; platforms = platforms.all; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libdbi/default.nix b/pkgs/development/libraries/libdbi/default.nix index b242bd8613e..64c511503d0 100644 --- a/pkgs/development/libraries/libdbi/default.nix +++ b/pkgs/development/libraries/libdbi/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libdbi.sourceforge.net/; + homepage = "http://libdbi.sourceforge.net/"; description = "DB independent interface to DB"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix index 279dcb6bc83..d7eab296809 100644 --- a/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix +++ b/pkgs/development/libraries/libdbusmenu-qt/qt-5.5.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.3+16"; src = fetchgit { - url = https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt; + url = "https://git.launchpad.net/ubuntu/+source/libdbusmenu-qt"; rev = "import/${version}.04.20160218-1"; sha256 = "039yvklhbmfbcynrbqq9n5ywmj8bjfslnkzcnwpzyhnxdzb6yxlx"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_DOC=OFF" ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/libdbusmenu-qt; + homepage = "https://launchpad.net/libdbusmenu-qt"; description = "Provides a Qt implementation of the DBusMenu spec"; maintainers = [ maintainers.ttuegel ]; inherit (qtbase.meta) platforms; diff --git a/pkgs/development/libraries/libdbusmenu/default.nix b/pkgs/development/libraries/libdbusmenu/default.nix index 770e95472ea..5e11864b1f1 100644 --- a/pkgs/development/libraries/libdbusmenu/default.nix +++ b/pkgs/development/libraries/libdbusmenu/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for passing menu structures across DBus"; - homepage = https://launchpad.net/dbusmenu; + homepage = "https://launchpad.net/dbusmenu"; license = with licenses; [ gpl3 lgpl21 lgpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix index 0f2ba019d3f..8a688ef37c6 100644 --- a/pkgs/development/libraries/libdc1394/default.nix +++ b/pkgs/development/libraries/libdc1394/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isDarwin CoreServices; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/libdc1394/; + homepage = "https://sourceforge.net/projects/libdc1394/"; description = "Capture and control API for IIDC compliant cameras"; license = licenses.lgpl21Plus; maintainers = [ maintainers.viric ]; diff --git a/pkgs/development/libraries/libdeflate/default.nix b/pkgs/development/libraries/libdeflate/default.nix index cc06815bbff..26616078b46 100644 --- a/pkgs/development/libraries/libdeflate/default.nix +++ b/pkgs/development/libraries/libdeflate/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fast DEFLATE/zlib/gzip compressor and decompressor"; license = licenses.mit; - homepage = https://github.com/ebiggers/libdeflate; + homepage = "https://github.com/ebiggers/libdeflate"; platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index afbff3dc0cf..132e1d1dbf5 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ ( fetchurl { - url = http://patch-tracker.debian.org/patch/series/dl/devil/1.7.8-6.1/03_CVE-2009-3994.diff; + url = "http://patch-tracker.debian.org/patch/series/dl/devil/1.7.8-6.1/03_CVE-2009-3994.diff"; sha256 = "0qkx2qfv02igbrmsn6z5a3lbrbwjfh3rb0c2sj54wy0j1f775hbc"; } ) ./ftbfs-libpng15.patch @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://openil.sourceforge.net/; + 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; platforms = platforms.mesaPlatforms; diff --git a/pkgs/development/libraries/libdigidoc/default.nix b/pkgs/development/libraries/libdigidoc/default.nix index 36f6f023a8e..0acab602331 100644 --- a/pkgs/development/libraries/libdigidoc/default.nix +++ b/pkgs/development/libraries/libdigidoc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; - homepage = http://www.id.ee/; + homepage = "http://www.id.ee/"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/libraries/libdigidocpp/default.nix b/pkgs/development/libraries/libdigidocpp/default.nix index a2280bb4b3e..4052f6e45d7 100644 --- a/pkgs/development/libraries/libdigidocpp/default.nix +++ b/pkgs/development/libraries/libdigidocpp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for creating DigiDoc signature files"; - homepage = http://www.id.ee/; + homepage = "http://www.id.ee/"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = [ maintainers.jagajaga ]; diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index d7d88b38386..698aac87b89 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; - homepage = http://musicbrainz.org/doc/libdiscid; + homepage = "http://musicbrainz.org/doc/libdiscid"; maintainers = with maintainers; [ ehmry ]; license = licenses.lgpl21; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix index 5598e6b2fa7..5f9417bd03c 100644 --- a/pkgs/development/libraries/libdivecomputer/default.nix +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libdivecomputer.org; + homepage = "http://www.libdivecomputer.org"; description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; maintainers = [ maintainers.mguentner ]; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libdivsufsort/default.nix b/pkgs/development/libraries/libdivsufsort/default.nix index 01ac56e885d..0d82db7cee4 100644 --- a/pkgs/development/libraries/libdivsufsort/default.nix +++ b/pkgs/development/libraries/libdivsufsort/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://github.com/y-256/libdivsufsort; + homepage = "https://github.com/y-256/libdivsufsort"; license = stdenv.lib.licenses.mit; description = "Library to construct the suffix array and the BW transformed string"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libdmtx/default.nix b/pkgs/development/libraries/libdmtx/default.nix index f5248dfc79e..0bdf3fbe15a 100644 --- a/pkgs/development/libraries/libdmtx/default.nix +++ b/pkgs/development/libraries/libdmtx/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source software for reading and writing Data Matrix barcodes"; - homepage = http://libdmtx.org; + homepage = "http://libdmtx.org"; platforms = stdenv.lib.platforms.all; maintainers = [ ]; license = stdenv.lib.licenses.bsd2; diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 46e264b59ca..176e0a22aba 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; - homepage = https://github.com/dugsong/libdnet; + homepage = "https://github.com/dugsong/libdnet"; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 61ca98e2256..0d6ff189765 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://dri.freedesktop.org/libdrm/; + homepage = "https://dri.freedesktop.org/libdrm/"; description = "Library for accessing the kernel's Direct Rendering Manager"; license = "bsd"; platforms = lib.platforms.unix; diff --git a/pkgs/development/libraries/libdv/default.nix b/pkgs/development/libraries/libdv/default.nix index a5058de597e..ed1e2cd74a3 100644 --- a/pkgs/development/libraries/libdv/default.nix +++ b/pkgs/development/libraries/libdv/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software decoder for DV format video, as defined by the IEC 61834 and SMPTE 314M standards"; - homepage = https://sourceforge.net/projects/libdv/; + homepage = "https://sourceforge.net/projects/libdv/"; license = licenses.lgpl21Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix index 3a83d01353f..327aacb6f37 100644 --- a/pkgs/development/libraries/libdvbpsi/default.nix +++ b/pkgs/development/libraries/libdvbpsi/default.nix @@ -11,7 +11,7 @@ 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 ; + homepage = "http://www.videolan.org/developers/libdvbpsi.html"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index fd89077a256..f097aad702a 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://www.videolan.org/developers/libdvdcss.html; + homepage = "http://www.videolan.org/developers/libdvdcss.html"; description = "A library for decrypting DVDs"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libdvdnav/4.2.1.nix b/pkgs/development/libraries/libdvdnav/4.2.1.nix index 18e2689002e..c8ebf180b31 100644 --- a/pkgs/development/libraries/libdvdnav/4.2.1.nix +++ b/pkgs/development/libraries/libdvdnav/4.2.1.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libdvdnav-4.2.1"; src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz; + url = "http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz"; sha256 = "7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://dvdnav.mplayerhq.hu/; + 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 ]; diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix index 8cca9091734..2afc11c6009 100644 --- a/pkgs/development/libraries/libdvdnav/default.nix +++ b/pkgs/development/libraries/libdvdnav/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "libdvdnav"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0cv7j8irsv1n2dadlnhr6i1b8pann2ah6xpxic41f04my6ba6rp5"; + sha256 = "0nzf1ir27s5vs1jrisdiw9ag2sc160k3gv7nplv9ypppm5gb35zn"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [libdvdread]; meta = { - homepage = http://dvdnav.mplayerhq.hu/; + 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 ]; diff --git a/pkgs/development/libraries/libdvdread/4.9.9.nix b/pkgs/development/libraries/libdvdread/4.9.9.nix index fbe56023a91..33b04b0f7c0 100644 --- a/pkgs/development/libraries/libdvdread/4.9.9.nix +++ b/pkgs/development/libraries/libdvdread/4.9.9.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libdvdread-4.9.9"; src = fetchurl { - url = http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz; + url = "http://dvdnav.mplayerhq.hu/releases/libdvdread-4.9.9.tar.xz"; sha256 = "d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://dvdnav.mplayerhq.hu/; + homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library for reading DVDs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index 8266e0f0b6d..c28ca339a65 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdvdread"; - version = "6.0.2"; + version = "6.1.0"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1c7yqqn67m3y3n7nfrgrnzz034zjaw5caijbwbfrq89v46ph257r"; + sha256 = "033mnhq3mx0qz3z85vw01rz5wzmx5ynadl7q1wm2spvx3ryvs6sh"; }; buildInputs = [libdvdcss]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://dvdnav.mplayerhq.hu/; + homepage = "http://dvdnav.mplayerhq.hu/"; description = "A library for reading DVDs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 352d2b17406..ba4ebaec111 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -10,7 +10,7 @@ let + "5be7f9ee368f1cc8940cea4ddda01ff99d28bbf1fe58"; }; meta = { - homepage = https://www.prevanders.net/dwarf.html; + homepage = "https://www.prevanders.net/dwarf.html"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/libraries/libdwg/default.nix b/pkgs/development/libraries/libdwg/default.nix index 5ee92b46385..9b1aa3132e9 100644 --- a/pkgs/development/libraries/libdwg/default.nix +++ b/pkgs/development/libraries/libdwg/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libdwg-0.6"; src = fetchurl { - url = mirror://sourceforge/libdwg/libdwg-0.6.tar.bz2; + url = "mirror://sourceforge/libdwg/libdwg-0.6.tar.bz2"; sha256 = "0l8ks1x70mkna1q7mzy1fxplinz141bd24qhrm1zkdil74mcsryc"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Library reading dwg files"; - homepage = http://libdwg.sourceforge.net/en/; + homepage = "http://libdwg.sourceforge.net/en/"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libdynd/default.nix b/pkgs/development/libraries/libdynd/default.nix index c02a6f9a502..eec982aeeb0 100644 --- a/pkgs/development/libraries/libdynd/default.nix +++ b/pkgs/development/libraries/libdynd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ dynamic ndarray library, with Python exposure."; - homepage = http://libdynd.org; + homepage = "http://libdynd.org"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index 29ca85cdeb0..aeaa45a7905 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.flamingspork.com/projects/libeatmydata/; + homepage = "https://www.flamingspork.com/projects/libeatmydata/"; license = stdenv.lib.licenses.gpl3Plus; description = "Small LD_PRELOAD library to disable fsync and friends"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 591ad72e4ec..cbfcf5af042 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extensible Binary Meta Language library"; - homepage = https://dl.matroska.org/downloads/libebml/; + homepage = "https://dl.matroska.org/downloads/libebml/"; license = licenses.lgpl21; maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 16624a78079..cb529192298 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of the EBU R128 loudness standard"; - homepage = https://github.com/jiixyj/libebur128; + homepage = "https://github.com/jiixyj/libebur128"; license = licenses.mit; maintainers = [ maintainers.andrewrk ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index b83984e23c8..09bd41dbed0 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.thrysoee.dk/editline/; + homepage = "http://www.thrysoee.dk/editline/"; description = "A port of the NetBSD Editline library (libedit)"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/libee/default.nix b/pkgs/development/libraries/libee/default.nix index 7255b3fece4..36d88f88786 100644 --- a/pkgs/development/libraries/libee/default.nix +++ b/pkgs/development/libraries/libee/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libee-0.4.1"; src = fetchurl { - url = http://www.libee.org/download/files/download/libee-0.4.1.tar.gz; + url = "http://www.libee.org/download/files/download/libee-0.4.1.tar.gz"; sha256 = "09xhgzmsq0g3jsyj24vy67bhzk2fv971w5ixdkhfwgar70cw1nn0"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libestr]; meta = { - homepage = http://www.libee.org/; + homepage = "http://www.libee.org/"; description = "An Event Expression Library inspired by CEE"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libelf-freebsd/default.nix b/pkgs/development/libraries/libelf-freebsd/default.nix index 1835b924ec1..63507051207 100644 --- a/pkgs/development/libraries/libelf-freebsd/default.nix +++ b/pkgs/development/libraries/libelf-freebsd/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { pname = "libelf-freebsd"; src = fetchsvn { - url = svn://svn.code.sf.net/p/elftoolchain/code/trunk; + url = "svn://svn.code.sf.net/p/elftoolchain/code/trunk"; rev = (stdenv.lib.strings.toInt version); name = "elftoolchain-${version}"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation (rec { meta = { description = "Essential compilation tools and libraries for building and analyzing ELF based program images"; - homepage = https://sourceforge.net/p/elftoolchain/wiki/Home/; + homepage = "https://sourceforge.net/p/elftoolchain/wiki/Home/"; license = stdenv.lib.licenses.bsd2; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index b168dd9bb56..4e4afe96d54 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "ELF object file access library"; - homepage = https://github.com/Distrotech/libelf; + homepage = "https://github.com/Distrotech/libelf"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libelfin/default.nix b/pkgs/development/libraries/libelfin/default.nix index 2eb1bd0e4fc..8a8de854fc9 100644 --- a/pkgs/development/libraries/libelfin/default.nix +++ b/pkgs/development/libraries/libelfin/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { - homepage = https://github.com/aclements/libelfin/; + homepage = "https://github.com/aclements/libelfin/"; license = licenses.mit; description = "C++11 ELF/DWARF parser"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 59780699fd1..7b12c39fc70 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Easy Publish and Consume Library"; - homepage = https://wiki.gnome.org/Projects/libepc; + homepage = "https://wiki.gnome.org/Projects/libepc"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/liberio/default.nix b/pkgs/development/libraries/liberio/default.nix new file mode 100644 index 00000000000..b4023d5f36a --- /dev/null +++ b/pkgs/development/libraries/liberio/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook +, systemd +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "liberio"; + version = "unstable-2019-12-11"; + + src = fetchFromGitHub { + owner = "EttusResearch"; + repo = "liberio"; + rev = "81777e500d1c3b88d5048d46643fb5553eb5f786"; + sha256 = "1n40lj5g497mmqh14vahdhy3jwvcry2pkc670p4c9f1pggp6ysgk"; + }; + + nativeBuildInputs = [ + pkg-config + autoreconfHook + ]; + + buildInputs = [ + systemd + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Ettus Research DMA I/O Library"; + homepage = "https://github.com/EttusResearch/liberio"; + license = licenses.gpl2; + maintainers = [ maintainers.doronbehar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libesmtp/default.nix b/pkgs/development/libraries/libesmtp/default.nix index 9650f540fcf..e5a7f5609a3 100644 --- a/pkgs/development/libraries/libesmtp/default.nix +++ b/pkgs/development/libraries/libesmtp/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = http://brianstafford.info/libesmtp/index.html; + 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 b8f62901eed..add7ea00a98 100644 --- a/pkgs/development/libraries/libestr/default.nix +++ b/pkgs/development/libraries/libestr/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://libestr.adiscon.com/; + homepage = "https://libestr.adiscon.com/"; description = "Some essentials for string handling"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index 6756a8dbc56..9050320773a 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An efficient, portable library for different kinds of mail access: IMAP, SMTP, POP, and NNTP"; - homepage = http://www.etpan.org/libetpan.html; + homepage = "http://www.etpan.org/libetpan.html"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libev/default.nix b/pkgs/development/libraries/libev/default.nix index 371c0b1d980..74aa8133a99 100644 --- a/pkgs/development/libraries/libev/default.nix +++ b/pkgs/development/libraries/libev/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libev"; - version="4.31"; + version="4.33"; src = fetchurl { url = "http://dist.schmorp.de/libev/Attic/${pname}-${version}.tar.gz"; - sha256 = "0nkfqv69wfyy2bpga4d53iqydycpik8jp8x6q70353hia8mmv1gd"; + sha256 = "1sjs4324is7fp21an4aas2z4dwsvs6z4xwrmp72vwpq1s6wbfzjh"; }; configureFlags = stdenv.lib.optional (static) "LDFLAGS=-static"; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 1ee03db568b..9b1184f1c0b 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "17pb5375njb1r05xmk0r57a2j986ihglh2n5nqcylbag4rj8mqg7"; }; - buildInputs = [ python3 ]; + nativeBuildInputs = [ python3 ]; meta = with stdenv.lib; { description = "Wrapper library for evdev devices"; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index a94b6d1dc2a..eaa2933505c 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { and then add or remove events dynamically without having to change the event loop. ''; - homepage = http://libevent.org/; + homepage = "http://libevent.org/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index fd1e203ed37..4ebf0835351 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for support of the Expert Witness Compression Format"; - homepage = https://sourceforge.net/projects/libewf/; + homepage = "https://sourceforge.net/projects/libewf/"; license = stdenv.lib.licenses.lgpl3; maintainers = [ stdenv.lib.maintainers.raskin ] ; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index 4519cc7dd74..cc1c4b48e78 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "10-execinfo.patch"; - url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g"; }) (fetchpatch { name = "20-define-gnu-source.patch"; - url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; }) (fetchpatch { name = "30-linux-makefile.patch"; - url = https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf"; }) ]; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility"; license = licenses.bsd2; - homepage = https://www.freshports.org/devel/libexecinfo; + homepage = "https://www.freshports.org/devel/libexecinfo"; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/pkgs/development/libraries/libexif/default.nix b/pkgs/development/libraries/libexif/default.nix index cd35dc4c1db..090c6a2fff3 100644 --- a/pkgs/development/libraries/libexif/default.nix +++ b/pkgs/development/libraries/libexif/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { buildInputs = [ gettext ]; meta = { - homepage = https://libexif.github.io/; + homepage = "https://libexif.github.io/"; description = "A library to read and manipulate EXIF data in digital photographs"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix index 7b3df42c24c..3adb606dd2d 100644 --- a/pkgs/development/libraries/libexttextcat/default.nix +++ b/pkgs/development/libraries/libexttextcat/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An N-Gram-Based Text Categorization library primarily intended for language guessing"; - homepage = https://wiki.documentfoundation.org/Libexttextcat; + homepage = "https://wiki.documentfoundation.org/Libexttextcat"; platforms = platforms.all; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 10a0d179d3e..66b193d4ea8 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libf2c-20160102"; src = fetchurl { - url = http://www.netlib.org/f2c/libf2c.zip; + url = "http://www.netlib.org/f2c/libf2c.zip"; sha256 = "1q78y8j8xpl8zdzdxmn5ablss56hi5a7vz3idam9l2nfx5q40h6a"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "F2c converts Fortran 77 source code to C"; - homepage = http://www.netlib.org/f2c/; + homepage = "http://www.netlib.org/f2c/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libfakekey/default.nix b/pkgs/development/libraries/libfakekey/default.nix index 3c243191543..f95d150cc25 100644 --- a/pkgs/development/libraries/libfakekey/default.nix +++ b/pkgs/development/libraries/libfakekey/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "X virtual keyboard library"; - homepage = https://www.yoctoproject.org/tools-resources/projects/matchbox; + homepage = "https://www.yoctoproject.org/tools-resources/projects/matchbox"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libfann/default.nix b/pkgs/development/libraries/libfann/default.nix index 5e1c985fe2c..590755c3a0f 100644 --- a/pkgs/development/libraries/libfann/default.nix +++ b/pkgs/development/libraries/libfann/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; meta = { - homepage = http://leenissen.dk/fann/wp/; + homepage = "http://leenissen.dk/fann/wp/"; description = "Fast Artificial Neural Network Library"; maintainers = with lib.maintainers; [ fpletz ]; license = lib.licenses.lgpl21; diff --git a/pkgs/development/libraries/libffcall/default.nix b/pkgs/development/libraries/libffcall/default.nix index 8d11cd86c45..7fdc04d116e 100644 --- a/pkgs/development/libraries/libffcall/default.nix +++ b/pkgs/development/libraries/libffcall/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Foreign function call library"; - homepage = https://www.gnu.org/software/libffcall/; + homepage = "https://www.gnu.org/software/libffcall/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix index 183f30e179e..eecffeba23d 100644 --- a/pkgs/development/libraries/libffi/default.nix +++ b/pkgs/development/libraries/libffi/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { interface. A layer must exist above libffi that handles type conversions for values passed between the two languages. ''; - homepage = http://sourceware.org/libffi/; + homepage = "http://sourceware.org/libffi/"; license = licenses.mit; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index d5d2b18e5ed..94f0540ab05 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = '' Provides library functionality for FIDO 2.0, including communication with a device over USB. ''; - homepage = https://github.com/Yubico/libfido2; + homepage = "https://github.com/Yubico/libfido2"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill prusnak ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libfishsound/default.nix b/pkgs/development/libraries/libfishsound/default.nix index fae96c8d3f7..3843f4a97ce 100644 --- a/pkgs/development/libraries/libfishsound/default.nix +++ b/pkgs/development/libraries/libfishsound/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://xiph.org/fishsound/; + homepage = "https://xiph.org/fishsound/"; description = ''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. libfishsound is a wrapper around the existing codec libraries and provides a consistent, higher-level programming interface. It has been designed for use in a wide variety of applications; it has no direct dependencies on Ogg encapsulation, though it is most commonly used in conjunction with liboggz to decode or encode FLAC, Speex or Vorbis audio tracks in Ogg files, including Ogg Theora and Annodex. diff --git a/pkgs/development/libraries/libfive/default.nix b/pkgs/development/libraries/libfive/default.nix index e007ab2f95a..fa275c0d780 100644 --- a/pkgs/development/libraries/libfive/default.nix +++ b/pkgs/development/libraries/libfive/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Infrastructure for solid modeling with F-Reps in C, C++, and Guile"; - homepage = https://libfive.com/; + homepage = "https://libfive.com/"; maintainers = with maintainers; [ hodapp ]; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix index 9c9b6c8034c..4fdb22f8bd4 100644 --- a/pkgs/development/libraries/libfixposix/default.nix +++ b/pkgs/development/libraries/libfixposix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; meta = with stdenv.lib; { - homepage = https://github.com/sionescu/libfixposix; + homepage = "https://github.com/sionescu/libfixposix"; description = "Thin wrapper over POSIX syscalls and some replacement functionality"; license = licenses.boost; maintainers = with maintainers; [ orivej raskin ]; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index a0323481be9..9145d8fd892 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://blog.lxde.org/category/pcmanfm/; + homepage = "https://blog.lxde.org/category/pcmanfm/"; license = licenses.lgpl21Plus; description = "A glib-based library for file management"; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/libraries/libfprint/default.nix b/pkgs/development/libraries/libfprint/default.nix index 9a6db72ae05..e886baa4797 100644 --- a/pkgs/development/libraries/libfprint/default.nix +++ b/pkgs/development/libraries/libfprint/default.nix @@ -5,7 +5,7 @@ , pkgconfig , meson , ninja -, libusb +, libusb1 , pixman , glib , nss @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libusb + libusb1 # drop in 2.0 for gusb pixman glib nss @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://fprint.freedesktop.org/; + homepage = "https://fprint.freedesktop.org/"; description = "A library designed to make it easy to add support for consumer fingerprint readers"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 97df5107409..52c64ed8629 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { '' else null; meta = with stdenv.lib; { - homepage = http://www.imagemagick.org; + homepage = "http://www.imagemagick.org"; description = "A library for manipulating FlashPIX images"; license = "Flashpix"; platforms = platforms.all; diff --git a/pkgs/development/libraries/libfreefare/default.nix b/pkgs/development/libraries/libfreefare/default.nix index 8ddce0aa98c..4af7d44a294 100644 --- a/pkgs/development/libraries/libfreefare/default.nix +++ b/pkgs/development/libraries/libfreefare/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.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; + homepage = "https://github.com/nfc-tools/libfreefare"; maintainers = with maintainers; [bobvanderlinden]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix index 26002725d91..0e2e24d0f3b 100644 --- a/pkgs/development/libraries/libftdi/1.x.nix +++ b/pkgs/development/libraries/libftdi/1.x.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to talk to FTDI chips using libusb"; - homepage = https://www.intra2net.com/en/developer/libftdi/; + homepage = "https://www.intra2net.com/en/developer/libftdi/"; license = with licenses; [ lgpl2 gpl2 ]; platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 3dffbd075e9..d483cc16f08 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -25,7 +25,7 @@ with stdenv; mkDerivation rec { meta = { description = "A library to talk to FTDI chips using libusb"; - homepage = https://www.intra2net.com/en/developer/libftdi/; + homepage = "https://www.intra2net.com/en/developer/libftdi/"; license = lib.licenses.lgpl21; platforms = lib.platforms.all; }; diff --git a/pkgs/development/libraries/libgadu/default.nix b/pkgs/development/libraries/libgadu/default.nix index b039c84b2fb..4e9ce765b96 100644 --- a/pkgs/development/libraries/libgadu/default.nix +++ b/pkgs/development/libraries/libgadu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "libgadu-1.11.2"; src = fetchurl { - url = http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz; + url = "http://toxygen.net/libgadu/files/libgadu-1.11.2.tar.gz"; sha256 = "0kifi9blhbimihqw4kaf6wyqhlx8fpp8nq4s6y280ar9p0il2n3z"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A library to deal with gadu-gadu protocol (most popular polish IM protocol)"; - homepage = http://toxygen.net/libgadu/; + homepage = "http://toxygen.net/libgadu/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libgaminggear/default.nix b/pkgs/development/libraries/libgaminggear/default.nix index d83b43a782e..1b528b98e85 100644 --- a/pkgs/development/libraries/libgaminggear/default.nix +++ b/pkgs/development/libraries/libgaminggear/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides functionality for gaming input devices"; - homepage = https://sourceforge.net/projects/libgaminggear/; + homepage = "https://sourceforge.net/projects/libgaminggear/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix index 80cb6641bfb..9de5cf2d2d1 100644 --- a/pkgs/development/libraries/libgcrypt/1.5.nix +++ b/pkgs/development/libraries/libgcrypt/1.5.nix @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/libgcrypt/; + 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; + repositories.git = "git://git.gnupg.org/libgcrypt.git"; }; } diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index e7a9ec60a6d..a3d515c5047 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -48,11 +48,11 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/libgcrypt/; + homepage = "https://www.gnu.org/software/libgcrypt/"; description = "General-purpose cryptographic library"; license = licenses.lgpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; - repositories.git = git://git.gnupg.org/libgcrypt.git; + repositories.git = "git://git.gnupg.org/libgcrypt.git"; }; } diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index a1871f6b2e6..4f5dede3c14 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -45,7 +45,7 @@ assert postgresSupport -> postgresql != null; meta = with stdenv.lib; { description = "Database access library"; - homepage = https://www.gnome-db.org/; + homepage = "https://www.gnome-db.org/"; license = [ licenses.lgpl2 licenses.gpl2 ]; maintainers = gnome3.maintainers; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index f5cc5efa06a..2f0fb8fd8c8 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ bindings for libgda"; - homepage = https://www.gnome-db.org/; + homepage = "https://www.gnome-db.org/"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 54bf091e5ea..075742e3139 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems"; - homepage = https://www.mono-project.com/docs/gui/libgdiplus/; + homepage = "https://www.mono-project.com/docs/gui/libgdiplus/"; platforms = platforms.unix; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 92c9f214ab4..2a36357f8bb 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; - homepage = https://wiki.gnome.org/Projects/Libgee; + homepage = "https://wiki.gnome.org/Projects/Libgee"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index db75ff1784f..1b973fd5eee 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -28,7 +28,7 @@ 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; + homepage = "https://github.com/OSGeo/libgeotiff"; license = stdenv.lib.licenses.mit; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 27939238278..84d44969a14 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "Gigasampler file access library"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index 24052ea4058..9ead3a97c04 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { user. It provides X authentication facilities for running programs in an X session. ''; - homepage = https://www.nongnu.org/gksu/; + homepage = "https://www.nongnu.org/gksu/"; license = stdenv.lib.licenses.lgpl2; maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 55b801b0b0d..5772e0d24f6 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GL Vendor-Neutral Dispatch library"; - homepage = https://github.com/NVIDIA/libglvnd; + homepage = "https://github.com/NVIDIA/libglvnd"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index c02bc7f0ed3..0b2e7341513 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation (rec { doCheck = true; # not cross meta = with stdenv.lib; { - homepage = https://www.gnupg.org/related_software/libgpg-error/index.html; + homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html"; 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 6203b8c7b71..95bb24ecb58 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.gphoto.org/proj/libgphoto2/; + homepage = "http://www.gphoto.org/proj/libgphoto2/"; description = "A library for accessing digital cameras"; longDescription = '' This is the library backend for gphoto2. It contains the code for PTP, diff --git a/pkgs/development/libraries/libgpiod/default.nix b/pkgs/development/libraries/libgpiod/default.nix index 76887347a18..6d77a28d55f 100644 --- a/pkgs/development/libraries/libgpiod/default.nix +++ b/pkgs/development/libraries/libgpiod/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.5"; + version = "1.5.1"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "1r337ici2nvi9v2h33nf3b7nisirc4s8p31cpv1cg8jbzn3wi15g"; + sha256 = "14iv8iwyvfznyifhkqz1bjh24dvb03gmpjn8v3fs6h734l93vvw5"; }; buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index 5c25a4d5abf..e30e05d44c1 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; meta = { - homepage = https://gtkpod.sourceforge.net/; + 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; diff --git a/pkgs/development/libraries/libgringotts/default.nix b/pkgs/development/libraries/libgringotts/default.nix index 76d7ebcc8cc..323f5af7097 100644 --- a/pkgs/development/libraries/libgringotts/default.nix +++ b/pkgs/development/libraries/libgringotts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small library to encapsulate data in an encrypted structure"; - homepage = http://libgringotts.sourceforge.net/; + homepage = "http://libgringotts.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/libgroove/default.nix b/pkgs/development/libraries/libgroove/default.nix index bea3c85260c..3fea527c450 100644 --- a/pkgs/development/libraries/libgroove/default.nix +++ b/pkgs/development/libraries/libgroove/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Streaming audio processing library"; - homepage = https://github.com/andrewrk/libgroove; + homepage = "https://github.com/andrewrk/libgroove"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ andrewrk ]; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index 8fc44fb6a8d..0945b9219ff 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; - homepage = https://wiki.gnome.org/Projects/Libgrss; + homepage = "https://wiki.gnome.org/Projects/Libgrss"; license = licenses.lgpl3Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index a60d3a16533..aa782ec3339 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME's Structured File Library"; - homepage = https://www.gnome.org/projects/libgsf; + homepage = "https://www.gnome.org/projects/libgsf"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libgssglue/default.nix b/pkgs/development/libraries/libgssglue/default.nix index 0177869d3e3..d13c0940205 100644 --- a/pkgs/development/libraries/libgssglue/default.nix +++ b/pkgs/development/libraries/libgssglue/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.citi.umich.edu/projects/nfsv4/linux/; + homepage = "http://www.citi.umich.edu/projects/nfsv4/linux/"; description = "Exports a gssapi interface which calls other random gssapi libraries"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 8023acb75d2..3fcc549e8ed 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that provides GObject bindings for libudev"; - homepage = https://wiki.gnome.org/Projects/libgudev; + homepage = "https://wiki.gnome.org/Projects/libgudev"; maintainers = [ maintainers.eelco ] ++ gnome3.maintainers; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 8d480c2d882..411ae0a3316 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { systemd fuse yajl libvirt gmp readline file hivex numactl xen libapparmor getopt perlPackages.ModuleBuild ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) - ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt ocaml_gettext ounit ]) + ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) ++ stdenv.lib.optional javaSupport jdk; prePatch = '' diff --git a/pkgs/development/libraries/libgumath/default.nix b/pkgs/development/libraries/libgumath/default.nix index f1483c38c15..27a10507a58 100644 --- a/pkgs/development/libraries/libgumath/default.nix +++ b/pkgs/development/libraries/libgumath/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library supporting function dispatch on general data containers. C base and Python wrapper"; - homepage = https://xnd.io/; + homepage = "https://xnd.io/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index e51a10cfe8a..5b4f4fa5b96 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libgweather"; - version = "3.34.0"; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fgiqswkhiaijanml3mb16ajn5aanrk7x6yiwagp9n9rssam6902"; + sha256 = "0bd30g3facfcgf18y2110xhc7ijly313y49mpwdkvl482z0fxzyj"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext vala gtk-doc docbook_xsl docbook_xml_dtd_43 gobject-introspection python3 ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to access weather information from online services for numerous locations"; - homepage = https://wiki.gnome.org/Projects/LibGWeather; + homepage = "https://wiki.gnome.org/Projects/LibGWeather"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 30e5e247ab2..3a098b00062 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GObject based library for handling and rendering XPS documents"; - homepage = https://wiki.gnome.org/Projects/libgxps; + homepage = "https://wiki.gnome.org/Projects/libgxps"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 6264ff6c1a7..2a5ad06455d 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - meson ninja pkgconfig gobject-introspection vala + meson ninja pkgconfig gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library full of GTK widgets for mobile phones"; - homepage = https://source.puri.sm/Librem5/libhandy; + homepage = "https://source.puri.sm/Librem5/libhandy"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libhangul/default.nix b/pkgs/development/libraries/libhangul/default.nix index 9e72d933433..eb62337c502 100644 --- a/pkgs/development/libraries/libhangul/default.nix +++ b/pkgs/development/libraries/libhangul/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Core algorithm library for Korean input routines"; - homepage = https://github.com/choehwanjin/libhangul; + homepage = "https://github.com/choehwanjin/libhangul"; license = licenses.lgpl21; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libharu/default.nix b/pkgs/development/libraries/libharu/default.nix index 0830b45b308..68dba64618f 100644 --- a/pkgs/development/libraries/libharu/default.nix +++ b/pkgs/development/libraries/libharu/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libharu-2.3.0"; src = fetchzip { - url = https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz; + url = "https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz"; sha256 = "15s9hswnl3qqi7yh29jyrg0hma2n99haxznvcywmsp8kjqlyg75q"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { description = "Cross platform, open source library for generating PDF files"; - homepage = http://libharu.org/; + homepage = "http://libharu.org/"; license = stdenv.lib.licenses.zlib; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 5dc1fb93834..bcab7faa412 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; - homepage = https://github.com/Silicondust/libhdhomerun; + homepage = "https://github.com/Silicondust/libhdhomerun"; repositories.git = "https://github.com/Silicondust/libhdhomerun.git"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index c58812eca58..b138aab8e78 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to use HTTPSEverywhere in desktop applications"; - homepage = https://gitlab.gnome.org/GNOME/libhttpseverywhere; + homepage = "https://gitlab.gnome.org/GNOME/libhttpseverywhere"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ sternenseemann ] ++ gnome3.maintainers; diff --git a/pkgs/development/libraries/libiberty/default.nix b/pkgs/development/libraries/libiberty/default.nix index 08a88bfee45..3d50df3e56c 100644 --- a/pkgs/development/libraries/libiberty/default.nix +++ b/pkgs/development/libraries/libiberty/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://gcc.gnu.org/; + homepage = "https://gcc.gnu.org/"; license = licenses.lgpl2; description = "Collection of subroutines used by various GNU programs"; maintainers = with maintainers; [ abbradar ericson2314 ]; diff --git a/pkgs/development/libraries/libibmad/default.nix b/pkgs/development/libraries/libibmad/default.nix index 00bd7e6eeea..8c46efa9710 100644 --- a/pkgs/development/libraries/libibmad/default.nix +++ b/pkgs/development/libraries/libibmad/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libibumad ]; meta = with stdenv.lib; { - homepage = https://www.openfabrics.org/; + 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 689e9a0be5d..4c37f8564b0 100644 --- a/pkgs/development/libraries/libibumad/default.nix +++ b/pkgs/development/libraries/libibumad/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.openfabrics.org/; + homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix index 27ec8b17c0d..10d68ee3a4e 100644 --- a/pkgs/development/libraries/libicns/default.nix +++ b/pkgs/development/libraries/libicns/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for manipulation of the Mac OS icns resource format"; - homepage = https://icns.sourceforge.io; + homepage = "https://icns.sourceforge.io"; license = with licenses; [ gpl2 lgpl2 lgpl21 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 7dc90d9ae3e..87969d6b2c7 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { applications. ''; - homepage = https://www.gnu.org/software/libiconv/; + homepage = "https://www.gnu.org/software/libiconv/"; license = lib.licenses.lgpl2Plus; maintainers = [ ]; diff --git a/pkgs/development/libraries/libid3tag/default.nix b/pkgs/development/libraries/libid3tag/default.nix index c6d430e10fc..9847312a34a 100644 --- a/pkgs/development/libraries/libid3tag/default.nix +++ b/pkgs/development/libraries/libid3tag/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.15.1b"; src = fetchurl { - url = mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz; + url = "mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz"; sha256 = "63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ID3 tag manipulation library"; - homepage = http://mad.sourceforge.net/; + homepage = "http://mad.sourceforge.net/"; license = licenses.gpl2; maintainers = [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 8291499daf3..a0df28a6699 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/libidn/; + homepage = "https://www.gnu.org/software/libidn/"; description = "Library for internationalized domain names"; longDescription = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { included. ''; - repositories.git = git://git.savannah.gnu.org/libidn.git; + repositories.git = "git://git.savannah.gnu.org/libidn.git"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index c1363d7a928..1fc0bd9b399 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { detailed information. ''; - repositories.git = https://gitlab.com/jas/libidn2; + 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 ]; diff --git a/pkgs/development/libraries/libiec61883/default.nix b/pkgs/development/libraries/libiec61883/default.nix index 936d165a6cf..77b2424bfee 100644 --- a/pkgs/development/libraries/libiec61883/default.nix +++ b/pkgs/development/libraries/libiec61883/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libraw1394 ]; meta = with stdenv.lib; { - homepage = https://www.linux1394.org; + homepage = "https://www.linux1394.org"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libiio/default.nix b/pkgs/development/libraries/libiio/default.nix index 461c6f11164..03a907162b1 100644 --- a/pkgs/development/libraries/libiio/default.nix +++ b/pkgs/development/libraries/libiio/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "API for interfacing with the Linux Industrial I/O Subsystem"; - homepage = https://github.com/analogdevicesinc/libiio; + homepage = "https://github.com/analogdevicesinc/libiio"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix index 950fe3e3718..47408f8cb6f 100644 --- a/pkgs/development/libraries/libimobiledevice/default.nix +++ b/pkgs/development/libraries/libimobiledevice/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/libimobiledevice; + 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 = '' libimobiledevice is a software library that talks the protocols to support diff --git a/pkgs/development/libraries/libindicator/default.nix b/pkgs/development/libraries/libindicator/default.nix index 33691f79a4c..8bb90180300 100644 --- a/pkgs/development/libraries/libindicator/default.nix +++ b/pkgs/development/libraries/libindicator/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "A set of symbols and convenience functions for Ayatana indicators"; - homepage = https://launchpad.net/libindicator; + homepage = "https://launchpad.net/libindicator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.msteen ]; diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 9be58ac537a..e018c1a9f5e 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -43,7 +43,7 @@ let }; meta = { - homepage = http://gobby.0x539.de/; + homepage = "http://gobby.0x539.de/"; description = "An implementation of the Infinote protocol written in GObject-based C"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.phreedom ]; diff --git a/pkgs/development/libraries/libinotify-kqueue/default.nix b/pkgs/development/libraries/libinotify-kqueue/default.nix index 75cd1a00507..074d2954ef1 100644 --- a/pkgs/development/libraries/libinotify-kqueue/default.nix +++ b/pkgs/development/libraries/libinotify-kqueue/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Inotify shim for macOS and BSD"; - homepage = https://github.com/libinotify-kqueue/libinotify-kqueue; + homepage = "https://github.com/libinotify-kqueue/libinotify-kqueue"; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; platforms = with platforms; darwin ++ freebsd ++ netbsd ++ openbsd; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 2c84379aa8e..ad0ca188eb9 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.2"; + version = "1.15.3"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "0ivpb4sghl80cs7jg3xrs53kckif6wy81cny3a8mry94nszky74p"; + sha256 = "0kb9i1xav8hmrl6g0qdq7jii589i9sjjrbh43fsc5284smyl44jv"; }; outputs = [ "bin" "out" "dev" ]; @@ -45,12 +45,12 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ pkgconfig meson ninja ] - ++ optionals documentationSupport [ doxygen graphviz sphinx-build ] - ++ optionals testsSupport [ valgrind ]; + ++ optionals documentationSupport [ doxygen graphviz sphinx-build ]; - buildInputs = [ libevdev mtdev libwacom (python3.withPackages (pkgs: with pkgs; [ evdev ])) ] - ++ optionals eventGUISupport [ cairo glib gtk3 ] - ++ optionals testsSupport [ check ]; + buildInputs = [ libevdev mtdev libwacom ] + ++ optionals eventGUISupport [ cairo glib gtk3 ]; + + checkInputs = [ (python3.withPackages (pkgs: with pkgs; [ evdev ])) check valgrind ]; propagatedBuildInputs = [ udev ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = http://www.freedesktop.org/wiki/Software/libinput; + homepage = "http://www.freedesktop.org/wiki/Software/libinput"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index ad55c6cb18f..c80a9bb1f92 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "iODBC driver manager"; - homepage = http://www.iodbc.org; + homepage = "http://www.iodbc.org"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/libipfix/default.nix b/pkgs/development/libraries/libipfix/default.nix index fccf4b3d50f..1b8aef201af 100644 --- a/pkgs/development/libraries/libipfix/default.nix +++ b/pkgs/development/libraries/libipfix/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0h7v0sxjjdc41hl5vq2x0yhyn04bczl11bqm97825mivrvfymhn6"; }; meta = with stdenv.lib; { - homepage = http://libipfix.sourceforge.net/; + 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; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index 792a74da581..cb4db488dc4 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Intel Processor Trace decoder library"; - homepage = https://github.com/intel/libipt; + homepage = "https://github.com/intel/libipt"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/libiptcdata/default.nix b/pkgs/development/libraries/libiptcdata/default.nix index 8e1ca68a69e..01b23d9e2d2 100644 --- a/pkgs/development/libraries/libiptcdata/default.nix +++ b/pkgs/development/libraries/libiptcdata/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading and writing the IPTC metadata in images and other files"; - homepage = http://libiptcdata.sourceforge.net/; + homepage = "http://libiptcdata.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libircclient/default.nix b/pkgs/development/libraries/libircclient/default.nix index 561a5248278..4bef2de28c0 100644 --- a/pkgs/development/libraries/libircclient/default.nix +++ b/pkgs/development/libraries/libircclient/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small but extremely powerful library which implements the client IRC protocol"; - homepage = http://www.ulduzsoft.com/libircclient/; + homepage = "http://www.ulduzsoft.com/libircclient/"; license = licenses.lgpl3; maintainers = with maintainers; [ obadz ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libirecovery/default.nix b/pkgs/development/libraries/libirecovery/default.nix index bf48e88a4ec..59f09c8d253 100644 --- a/pkgs/development/libraries/libirecovery/default.nix +++ b/pkgs/development/libraries/libirecovery/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, automake, autoconf, libtool, pkgconfig -, libusb +, libusb1 , readline }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - libusb + libusb1 readline ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/libirecovery; + 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 = '' libirecovery is a cross-platform library which implements communication to diff --git a/pkgs/development/libraries/libisoburn/default.nix b/pkgs/development/libraries/libisoburn/default.nix index 633f19cef79..0b4984fc82a 100644 --- a/pkgs/development/libraries/libisoburn/default.nix +++ b/pkgs/development/libraries/libisoburn/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ acl ]; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "Enables creation and expansion of ISO-9660 filesystems on CD/DVD/BD "; license = licenses.gpl2Plus; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/libisofs/default.nix b/pkgs/development/libraries/libisofs/default.nix index 2c1bb3b3b8e..0c01389f0b8 100644 --- a/pkgs/development/libraries/libisofs/default.nix +++ b/pkgs/development/libraries/libisofs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ acl ]; meta = with stdenv.lib; { - homepage = http://libburnia-project.org/; + homepage = "http://libburnia-project.org/"; description = "A library to create an ISO-9660 filesystem with extensions like RockRidge or Joliet"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbradar vrthra ]; diff --git a/pkgs/development/libraries/libivykis/default.nix b/pkgs/development/libraries/libivykis/default.nix index 17cca74c7d2..1226d1c489e 100644 --- a/pkgs/development/libraries/libivykis/default.nix +++ b/pkgs/development/libraries/libivykis/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ file protobufc ]; meta = with stdenv.lib; { - homepage = http://libivykis.sourceforge.net/; + homepage = "http://libivykis.sourceforge.net/"; description = '' A thin wrapper over various OS'es implementation of I/O readiness notification facilities diff --git a/pkgs/development/libraries/libixp-hg/default.nix b/pkgs/development/libraries/libixp-hg/default.nix index 1790f3f68b2..e971136b088 100644 --- a/pkgs/development/libraries/libixp-hg/default.nix +++ b/pkgs/development/libraries/libixp-hg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libixp"; src = fetchurl { - url = https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip; + url = "https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/libixp/source-archive.zip"; sha256 = "0kcdvdcrkw6q39v563ncis6d7ini64xbgn5fd3b4aa95fp9sj3is"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip txt2tags ]; meta = { - homepage = http://repo.cat-v.org/libixp/; # see also https://libs.suckless.org/deprecated/libixp + 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; diff --git a/pkgs/development/libraries/libjpeg-drop/default.nix b/pkgs/development/libraries/libjpeg-drop/default.nix index 8ed1c9bf92f..22cb1b13589 100644 --- a/pkgs/development/libraries/libjpeg-drop/default.nix +++ b/pkgs/development/libraries/libjpeg-drop/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation { srcs = [ (fetchurl { - url = http://www.ijg.org/files/jpegsrc.v9b.tar.gz; + url = "http://www.ijg.org/files/jpegsrc.v9b.tar.gz"; sha256 = "0lnhpahgdwlrkd41lx6cr90r199f8mc6ydlh7jznj5klvacd63r4"; }) (fetchurl { - url = http://jpegclub.org/droppatch.v9b.tar.gz; + url = "http://jpegclub.org/droppatch.v9b.tar.gz"; sha256 = "022bnvpird7w5pwbfqpq7j7pwja5kp6x9k3sdypcy3g2nwwy2wwk"; }) ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" "man" ]; meta = { - homepage = http://jpegclub.org/jpegtran/; + homepage = "http://jpegclub.org/jpegtran/"; description = "Experimental lossless crop 'n' drop (cut & paste) patches for libjpeg"; license = stdenv.lib.licenses.free; }; diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index f05ac6d521b..0f71d941d38 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installCheckTarget = "test"; meta = with stdenv.lib; { - homepage = http://libjpeg-turbo.virtualgl.org/; + homepage = "http://libjpeg-turbo.virtualgl.org/"; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix index abd6c7bbf6c..05fbb7de701 100644 --- a/pkgs/development/libraries/libjpeg/default.nix +++ b/pkgs/development/libraries/libjpeg/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "libjpeg-9d"; src = fetchurl { - url = http://www.ijg.org/files/jpegsrc.v9d.tar.gz; + url = "http://www.ijg.org/files/jpegsrc.v9d.tar.gz"; sha256 = "0clwys9lcqlxqgcw8s1gwfm5ix2zjlqpklmd3mbvqmj5ibj51jwr"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { outputs = [ "bin" "dev" "out" "man" ]; meta = { - homepage = http://www.ijg.org/; + 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; diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix index 9e81c932405..141598839b0 100644 --- a/pkgs/development/libraries/libjreen/default.nix +++ b/pkgs/development/libraries/libjreen/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ Jabber library using Qt framework"; - homepage = https://qutim.org/jreen/; + homepage = "https://qutim.org/jreen/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libjson-rpc-cpp/default.nix b/pkgs/development/libraries/libjson-rpc-cpp/default.nix index a7c9427080d..03d77c11bec 100644 --- a/pkgs/development/libraries/libjson-rpc-cpp/default.nix +++ b/pkgs/development/libraries/libjson-rpc-cpp/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ framework for json-rpc (json remote procedure call)"; - homepage = https://github.com/cinemast/libjson-rpc-cpp; + homepage = "https://github.com/cinemast/libjson-rpc-cpp"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libjson/default.nix b/pkgs/development/libraries/libjson/default.nix index b62f0f116a0..1d6fb1e7289 100644 --- a/pkgs/development/libraries/libjson/default.nix +++ b/pkgs/development/libraries/libjson/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation { preInstall = "mkdir -p $out/lib"; meta = with stdenv.lib; { - homepage = http://libjson.sourceforge.net/; + homepage = "http://libjson.sourceforge.net/"; description = "A JSON reader and writer"; longDescription = '' A JSON reader and writer which is super-efficient and diff --git a/pkgs/development/libraries/libkate/default.nix b/pkgs/development/libraries/libkate/default.nix index 7eff302397a..a999f813fbb 100644 --- a/pkgs/development/libraries/libkate/default.nix +++ b/pkgs/development/libraries/libkate/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { bitstream format. Kate is a karaoke and text codec meant for encapsulation in an Ogg container. It can carry Unicode text, images, and animate them.''; - homepage = https://code.google.com/archive/p/libkate/; + homepage = "https://code.google.com/archive/p/libkate/"; platforms = platforms.unix; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix index 12205a6a63b..b6aa19c442a 100644 --- a/pkgs/development/libraries/libkeyfinder/default.nix +++ b/pkgs/development/libraries/libkeyfinder/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Musical key detection for digital audio (C++ library)"; - homepage = http://www.ibrahimshaath.co.uk/keyfinder/; + homepage = "http://www.ibrahimshaath.co.uk/keyfinder/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libkml/default.nix b/pkgs/development/libraries/libkml/default.nix index eca412fda6c..d619101c233 100644 --- a/pkgs/development/libraries/libkml/default.nix +++ b/pkgs/development/libraries/libkml/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference implementation of OGC KML 2.2"; - homepage = https://github.com/libkml/libkml; + homepage = "https://github.com/libkml/libkml"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index c83a3e40df2..2f0da5edf4e 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnupg.org; + homepage = "https://www.gnupg.org"; description = "CMS and X.509 access library"; platforms = platforms.all; license = licenses.lgpl3; diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix index f155c0d8506..2701cc51359 100644 --- a/pkgs/development/libraries/libksi/default.nix +++ b/pkgs/development/libraries/libksi/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/GuardTime/libksi; + homepage = "https://github.com/GuardTime/libksi"; description = "Keyless Signature Infrastructure API library"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/libktorrent/default.nix b/pkgs/development/libraries/libktorrent/default.nix index 04dabf14100..19c24ec3754 100644 --- a/pkgs/development/libraries/libktorrent/default.nix +++ b/pkgs/development/libraries/libktorrent/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A BitTorrent library used by KTorrent"; - homepage = https://www.kde.org/applications/internet/ktorrent/; + homepage = "https://www.kde.org/applications/internet/ktorrent/"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix index ff1a39fc204..62409bb7f64 100644 --- a/pkgs/development/libraries/liblastfm/default.nix +++ b/pkgs/development/libraries/liblastfm/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration; meta = with stdenv.lib; { - homepage = https://github.com/lastfm/liblastfm; - repositories.git = git://github.com/lastfm/liblastfm.git; + homepage = "https://github.com/lastfm/liblastfm"; + repositories.git = "git://github.com/lastfm/liblastfm.git"; description = "Official LastFM library"; inherit (qt4.meta) platforms; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/development/libraries/liblastfmSF/default.nix b/pkgs/development/libraries/liblastfmSF/default.nix index c51cb9baead..46152e79276 100644 --- a/pkgs/development/libraries/liblastfmSF/default.nix +++ b/pkgs/development/libraries/liblastfmSF/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; meta = { - homepage = http://liblastfm.sourceforge.net; + homepage = "http://liblastfm.sourceforge.net"; description = "Unofficial C lastfm library"; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/development/libraries/liblaxjson/default.nix b/pkgs/development/libraries/liblaxjson/default.nix index f185a44380a..b932f9e928b 100644 --- a/pkgs/development/libraries/liblaxjson/default.nix +++ b/pkgs/development/libraries/liblaxjson/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for parsing JSON config files"; - homepage = https://github.com/andrewrk/liblaxjson; + homepage = "https://github.com/andrewrk/liblaxjson"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/development/libraries/liblcf/default.nix b/pkgs/development/libraries/liblcf/default.nix index fe513d378cd..25762573a1f 100644 --- a/pkgs/development/libraries/liblcf/default.nix +++ b/pkgs/development/libraries/liblcf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to handle RPG Maker 2000/2003 and EasyRPG projects"; - homepage = https://github.com/EasyRPG/liblcf; + homepage = "https://github.com/EasyRPG/liblcf"; license = licenses.mit; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/liblinear/default.nix b/pkgs/development/libraries/liblinear/default.nix index a306eb2ed68..af09b1241de 100644 --- a/pkgs/development/libraries/liblinear/default.nix +++ b/pkgs/development/libraries/liblinear/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for large linear classification"; - homepage = https://www.csie.ntu.edu.tw/~cjlin/liblinear/; + homepage = "https://www.csie.ntu.edu.tw/~cjlin/liblinear/"; license = licenses.bsd3; maintainers = [ maintainers.danieldk ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/liblinphone/default.nix b/pkgs/development/libraries/liblinphone/default.nix new file mode 100644 index 00000000000..c6628e9043c --- /dev/null +++ b/pkgs/development/libraries/liblinphone/default.nix @@ -0,0 +1,150 @@ +{ bcg729 +, bctoolbox +, bcunit +, belcard +, belle-sip +, belr +, bzrtp +, cairo +, cmake +, cyrus_sasl +, doxygen +, fetchFromGitLab +, fetchurl +, ffmpeg +, gdk-pixbuf +, git +, glib +, graphviz +, gtk2 +, intltool +, libexosip +, libmatroska +, libnotify +, libosip +, libsoup +, libupnp +, libX11 +, libxml2 +, lime +, makeWrapper +, mbedtls +, mediastreamer +, mediastreamer-openh264 +, openldap +, ortp +, pango +, pkgconfig +, python +, readline +, soci +, speex +, sqlite +, stdenv +, udev +, xercesc +, xsd +, zlib +}: +let + # Got the following error when building: + # + # Your version of Doxygen (1.8.17) is known to malfunction with some of our + # macro definitions, which causes errors while wrapprers generation. Please + # install an older version of Doxygen (< 1.8.17) or disable documentation + # and wrapper generation. + # + # So, let's then use 1.8.16 version of doxygen in this derivation. Hopefully + # this workaround can be removed with some newer release of liblinphone. + doxygen_1_8_16 = doxygen.overrideAttrs ( + oldAttrs: rec { + name = "doxygen-1.8.16"; + src = fetchurl { + urls = [ + "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. + "http://doxygen.nl/files/${name}.src.tar.gz" + ]; + sha256 = "10iwv8bcz5b5cd85gg8pgn0bmyg04n9hs36xn7ggjjnvynv1z67z"; + }; + buildInputs = oldAttrs.buildInputs ++ [ git ]; + } + ); +in +stdenv.mkDerivation rec { + pname = "liblinphone"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-20"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = "1d762a3e0e304aa579798aed4400d2cee2c1ffa0"; + sha256 = "0ja38payyqbd8z6q5l5w6hi7xarmfj5021gh0qdk0j832br4c6c3"; + }; + + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + + # TODO: Not sure if all these inputs are actually needed. Most of them were + # defined when liblinphone and linphone-desktop weren't separated yet, so some + # of them might not be needed for liblinphone alone. + buildInputs = [ + (python.withPackages (ps: [ ps.pystache ps.six ])) + bcg729 + bctoolbox + belcard + belle-sip + belr + bzrtp + cairo + cyrus_sasl + ffmpeg + gdk-pixbuf + git + glib + gtk2 + libX11 + libexosip + libmatroska + libnotify + libosip + libsoup + libupnp + libxml2 + lime + mbedtls + mediastreamer + openldap + ortp + pango + readline + soci + speex + sqlite + udev + xercesc + xsd + zlib + ]; + + nativeBuildInputs = [ + bcunit + cmake + doxygen_1_8_16 + graphviz + intltool + makeWrapper + pkgconfig + ]; + + meta = with stdenv.lib; { + homepage = "https://www.linphone.org/technical-corner/liblinphone"; + description = "Library for SIP calls and instant messaging"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix index bfc9036abe3..6ed995572ef 100644 --- a/pkgs/development/libraries/liblockfile/default.nix +++ b/pkgs/development/libraries/liblockfile/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared library with NFS-safe locking functions"; - homepage = http://packages.debian.org/unstable/libs/liblockfile1; + homepage = "http://packages.debian.org/unstable/libs/liblockfile1"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/development/libraries/liblogging/default.nix b/pkgs/development/libraries/liblogging/default.nix index d0aaebadbaa..b9b787f4182 100644 --- a/pkgs/development/libraries/liblogging/default.nix +++ b/pkgs/development/libraries/liblogging/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.liblogging.org/; + homepage = "http://www.liblogging.org/"; description = "Lightweight signal-safe logging library"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/liblognorm/default.nix b/pkgs/development/libraries/liblognorm/default.nix index d77b452e3e9..bef1048dde4 100644 --- a/pkgs/development/libraries/liblognorm/default.nix +++ b/pkgs/development/libraries/liblognorm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-regexp" ]; meta = with stdenv.lib; { - homepage = https://www.liblognorm.com/; + 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; platforms = platforms.all; diff --git a/pkgs/development/libraries/liblqr-1/default.nix b/pkgs/development/libraries/liblqr-1/default.nix index aa6922ea342..5f37989c20b 100644 --- a/pkgs/development/libraries/liblqr-1/default.nix +++ b/pkgs/development/libraries/liblqr-1/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; meta = with stdenv.lib; { - homepage = http://liblqr.wikidot.com; + homepage = "http://liblqr.wikidot.com"; description = "Seam-carving C/C++ library called Liquid Rescaling"; platforms = platforms.all; license = with licenses; [ gpl3 lgpl3 ]; diff --git a/pkgs/development/libraries/liblscp/default.nix b/pkgs/development/libraries/liblscp/default.nix index 471f277fb52..101e11deaa5 100644 --- a/pkgs/development/libraries/liblscp/default.nix +++ b/pkgs/development/libraries/liblscp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.linuxsampler.org; + homepage = "http://www.linuxsampler.org"; description = "LinuxSampler Control Protocol (LSCP) wrapper library"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix index d6918ef3044..4513396d7ea 100644 --- a/pkgs/development/libraries/libltc/default.nix +++ b/pkgs/development/libraries/libltc/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "libltc-1.3.1"; src = fetchurl { - url = https://github.com/x42/libltc/releases/download/v1.3.1/libltc-1.3.1.tar.gz; + url = "https://github.com/x42/libltc/releases/download/v1.3.1/libltc-1.3.1.tar.gz"; sha256 = "173h9dgmain3nyrwk6q2d7yl4fnh4vacag4s2p01n5b7nyrkxrjh"; }; meta = with stdenv.lib; { - homepage = http://x42.github.io/libltc/; + homepage = "http://x42.github.io/libltc/"; description = "POSIX-C Library for handling Linear/Logitudinal Time Code (LTC)"; license = licenses.lgpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix index 24de4aa2e4a..84800f309fb 100644 --- a/pkgs/development/libraries/libmad/default.nix +++ b/pkgs/development/libraries/libmad/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { preConfigure = "autoconf"; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/mad/; + homepage = "https://sourceforge.net/projects/mad/"; description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 2f7f46974b0..93bf193a972 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "libmanette"; - version = "0.2.3"; + version = "0.2.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1zxh7jn2zg7hivmal5zxam6fxvjsd1w6hlw0m2kysk76b8anbw60"; + sha256 = "T+Ckvta0w65ySdNBAxwnsy+Nng/7UzfXHLzscWA2LPc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/libmatchbox/default.nix b/pkgs/development/libraries/libmatchbox/default.nix index 98875e48f57..49769359ed3 100644 --- a/pkgs/development/libraries/libmatchbox/default.nix +++ b/pkgs/development/libraries/libmatchbox/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Library of the matchbox X window manager"; - homepage = http://matchbox-project.org/; + homepage = "http://matchbox-project.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libmatheval/default.nix b/pkgs/development/libraries/libmatheval/default.nix index 7f5c8b4c4c2..a24b931c660 100644 --- a/pkgs/development/libraries/libmatheval/default.nix +++ b/pkgs/development/libraries/libmatheval/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { mathematical functions. In addition to parsing and evaluation, libmatheval can also compute symbolic derivatives and output expressions to strings. ''; - homepage = https://www.gnu.org/software/libmatheval/; + homepage = "https://www.gnu.org/software/libmatheval/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index b10a62fd389..2d56a6db766 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to parse Matroska files"; - homepage = https://matroska.org/; + homepage = "https://matroska.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix index 5cf12ea46ba..493f1b5ce61 100644 --- a/pkgs/development/libraries/libmaxminddb/default.nix +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for working with MaxMind geolocation DB files"; - homepage = https://github.com/maxmind/libmaxminddb; + homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; platforms = platforms.all; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index a0751e310d4..9e40133170a 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/wiki/Software/libmbim/; + 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; license = licenses.gpl2; diff --git a/pkgs/development/libraries/libmcrypt/default.nix b/pkgs/development/libraries/libmcrypt/default.nix index 4a4074e2f22..a29fca45a99 100644 --- a/pkgs/development/libraries/libmcrypt/default.nix +++ b/pkgs/development/libraries/libmcrypt/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "libmcrypt-2.5.8"; src = fetchurl { - url = mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz; + url = "mirror://sourceforge/mcrypt/Libmcrypt/2.5.8/libmcrypt-2.5.8.tar.gz"; sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Replacement for the old crypt() package and crypt(1) command, with extensions"; - homepage = http://mcrypt.sourceforge.net; + homepage = "http://mcrypt.sourceforge.net"; license = "GPL"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 92fe81c73f4..ab7bb7e6cb9 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }: stdenv.mkDerivation rec { - version = "19.09"; + version = "20.03"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "13j7by2czapzi6qznxj4nmn3hwiyglcf2ypja4n6zgnz96jf21pz"; + sha256 = "0wkzj5s34m8dvy7hif4h8f90q8ncrzd930gij1zzw3h5nw732j38"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library for mediainfo"; - homepage = https://mediaarea.net/; + homepage = "https://mediaarea.net/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 5655bfe968b..8cbb76377fb 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmemcached-1.0.18"; src = fetchurl { - url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz; + url = "https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz"; sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-fpermissive"; meta = with stdenv.lib; { - homepage = https://libmemcached.org; + homepage = "https://libmemcached.org"; description = "Open source C/C++ client library and tools for the memcached server"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libmesode/default.nix b/pkgs/development/libraries/libmesode/default.nix index de09d142d48..e8fab86f8fc 100644 --- a/pkgs/development/libraries/libmesode/default.nix +++ b/pkgs/development/libraries/libmesode/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { Whilst Profanity will run against libstrophe, libmesode provides extra TLS functionality such as manual SSL certificate verification. ''; - homepage = https://github.com/boothj5/libmesode/; + homepage = "https://github.com/boothj5/libmesode/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/development/libraries/libmhash/default.nix b/pkgs/development/libraries/libmhash/default.nix index 598f0b7f789..2a61c571066 100644 --- a/pkgs/development/libraries/libmhash/default.nix +++ b/pkgs/development/libraries/libmhash/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { following rfc2104 (HMAC). It also includes some key generation algorithms which are based on hash algorithms. ''; - homepage = http://mhash.sourceforge.net; + homepage = "http://mhash.sourceforge.net"; license = "LGPL"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix index 41d81f1f176..51bd69c0edd 100644 --- a/pkgs/development/libraries/libmicrodns/default.nix +++ b/pkgs/development/libraries/libmicrodns/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minimal mDNS resolver library, used by VLC"; - homepage = https://github.com/videolabs/libmicrodns; + homepage = "https://github.com/videolabs/libmicrodns"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.shazow ]; diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index e3bce805d29..c160b678be7 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; - homepage = https://www.gnu.org/software/libmicrohttpd/; + homepage = "https://www.gnu.org/software/libmicrohttpd/"; maintainers = with maintainers; [ eelco vrthra fpletz ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 284d415454d..59967bcba5a 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for playing tracker music module files"; - homepage = https://mikmod.shlomifish.org/; + homepage = "https://mikmod.shlomifish.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ astsmtl lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmkv/default.nix b/pkgs/development/libraries/libmkv/default.nix index 8b659c46792..190c573577a 100644 --- a/pkgs/development/libraries/libmkv/default.nix +++ b/pkgs/development/libraries/libmkv/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.6.5.1"; src = fetchgit { - url = https://github.com/saintdev/libmkv.git; + url = "https://github.com/saintdev/libmkv.git"; rev = "refs/tags/${version}"; sha256 = "0pr9q7yprndl8d15ir7i7cznvmf1yqpvnsyivv763n6wryssq6dl"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Library was meant to be an alternative to the official libmatroska library. It is written in plain C, and intended to be very portable. ''; - homepage = https://github.com/saintdev/libmkv; + homepage = "https://github.com/saintdev/libmkv"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.wmertens ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libmms/default.nix b/pkgs/development/libraries/libmms/default.nix index 7f73fb09cd1..3753101ebf9 100644 --- a/pkgs/development/libraries/libmms/default.nix +++ b/pkgs/development/libraries/libmms/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for downloading (streaming) media files using the mmst and mmsh protocols"; - homepage = http://libmms.sourceforge.net; + homepage = "http://libmms.sourceforge.net"; platforms = platforms.all; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix index 749a5d60e46..e13bda56793 100644 --- a/pkgs/development/libraries/libmng/default.nix +++ b/pkgs/development/libraries/libmng/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics"; - homepage = http://www.libmng.com; + homepage = "http://www.libmng.com"; license = licenses.zlib; maintainers = with maintainers; [ marcweber ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmnl/default.nix b/pkgs/development/libraries/libmnl/default.nix index 7c4b451ae6d..3db6ab0da08 100644 --- a/pkgs/development/libraries/libmnl/default.nix +++ b/pkgs/development/libraries/libmnl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { This library aims to provide simple helpers that allows you to re-use code and to avoid re-inventing the wheel. ''; - homepage = https://netfilter.org/projects/libmnl/index.html; + homepage = "https://netfilter.org/projects/libmnl/index.html"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libmodbus/default.nix b/pkgs/development/libraries/libmodbus/default.nix index e18de4127a4..14f80e9b2e5 100644 --- a/pkgs/development/libraries/libmodbus/default.nix +++ b/pkgs/development/libraries/libmodbus/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to send/receive data according to the Modbus protocol"; - homepage = https://libmodbus.org/; + homepage = "https://libmodbus.org/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libmodule/default.nix b/pkgs/development/libraries/libmodule/default.nix index 26b81d4d412..d608a08d2d9 100644 --- a/pkgs/development/libraries/libmodule/default.nix +++ b/pkgs/development/libraries/libmodule/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C simple and elegant implementation of an actor library"; - homepage = https://github.com/FedeDP/libmodule; + homepage = "https://github.com/FedeDP/libmodule"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ diff --git a/pkgs/development/libraries/libmodulemd/default.nix b/pkgs/development/libraries/libmodulemd/default.nix index ba77c7806b5..f296883b686 100644 --- a/pkgs/development/libraries/libmodulemd/default.nix +++ b/pkgs/development/libraries/libmodulemd/default.nix @@ -1,54 +1,83 @@ { stdenv +, substituteAll , fetchFromGitHub -, pkgconfig +, fetchpatch +, pkg-config , meson , ninja , gobject-introspection , python3 , libyaml +, rpm +, file , gtk-doc -, docbook_xsl +, docbook-xsl-nons +, help2man , docbook_xml_dtd_412 , glib }: stdenv.mkDerivation rec { pname = "libmodulemd"; - version = "2.6.0"; + version = "2.9.2"; - outputs = [ "out" "devdoc" "py" ]; + outputs = [ "bin" "out" "dev" "devdoc" "man" "py" ]; src = fetchFromGitHub { owner = "fedora-modularity"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0gizfmzs6jrzb29lwcimm5dq3027935xbzwgkbvbp67zcmjd3y5i"; + sha256 = "dm0uvzM5v1zDQVkonHbrT9l9ICnXZbCSiLRCMZRxhXY="; }; patches = [ - ./pygobject-dir.patch + # Use proper glib devdoc path. + (substituteAll { + src = ./glib-devdoc.patch; + glib_devdoc = glib.devdoc; + }) + + # Install pygobject overrides to our prefix instead of python3 one. + # https://github.com/fedora-modularity/libmodulemd/pull/469 + (fetchpatch { + url = "https://github.com/fedora-modularity/libmodulemd/commit/f72a4bea092f4d84cfc48a3e820eb10270e828d0.patch"; + sha256 = "7/76N9ZQ7qv/DjsaMCL+YWPDzarH1JWW4Sg5HzBJLuc="; + }) + (fetchpatch { + url = "https://github.com/fedora-modularity/libmodulemd/commit/021ab08006b5cf601ce153174fdf403b910b8273.patch"; + sha256 = "JibEmxMiTmu3ShhWLIWfMCtu3c30UcHqXmX9b+2VZXw="; + }) ]; nativeBuildInputs = [ - pkgconfig + pkg-config meson ninja gtk-doc - docbook_xsl + docbook-xsl-nons + help2man docbook_xml_dtd_412 gobject-introspection ]; buildInputs = [ libyaml + rpm + file # for libmagic glib ]; mesonFlags = [ "-Ddeveloper_build=false" - "-Dpygobject_override_dir=${placeholder "py"}/${python3.sitePackages}/gi/overrides" + "-Dgobject_overrides_dir_py3=${placeholder "py"}/${python3.sitePackages}/gi/overrides" ]; + postFixup = '' + # Python overrides depend our own typelibs and other packages + mkdir -p "$py/nix-support" + echo "$out ${python3.pkgs.pygobject3} ${python3.pkgs.six}" > "$py/nix-support/propagated-build-inputs" + ''; + meta = with stdenv.lib; { description = "C Library for manipulating module metadata files"; homepage = "https://github.com/fedora-modularity/libmodulemd"; diff --git a/pkgs/development/libraries/libmodulemd/glib-devdoc.patch b/pkgs/development/libraries/libmodulemd/glib-devdoc.patch new file mode 100644 index 00000000000..cde42d8e0b2 --- /dev/null +++ b/pkgs/development/libraries/libmodulemd/glib-devdoc.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index a8b02b4..dd31a76 100644 +--- a/meson.build ++++ b/meson.build +@@ -67,7 +67,7 @@ test = find_program('test') + with_docs = get_option('with_docs') + if with_docs + gtkdoc = dependency('gtk-doc') +- glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') ++ glib_docpath = join_paths('@glib_devdoc@', 'share', 'gtk-doc', 'html') + + ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')]) + if ret.returncode() != 0 diff --git a/pkgs/development/libraries/libmodulemd/pygobject-dir.patch b/pkgs/development/libraries/libmodulemd/pygobject-dir.patch deleted file mode 100644 index a367872eec6..00000000000 --- a/pkgs/development/libraries/libmodulemd/pygobject-dir.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/bindings/python/meson.build b/bindings/python/meson.build -index 4358b79..61fd5a5 100644 ---- a/bindings/python/meson.build -+++ b/bindings/python/meson.build -@@ -1,3 +1,5 @@ -+pygobject_override_dir = get_option('pygobject_override_dir') -+ - get_overridedir = ''' - import os - import sysconfig -@@ -21,7 +23,7 @@ print(overridedir) - ''' - - # Python 3 --if (get_option('with_py3_overrides')) -+if (get_option('with_py3_overrides')) and pygobject_override_dir == '' - ret = run_command([python3, '-c', get_overridedir]) - - if ret.returncode() != 0 -@@ -34,7 +36,7 @@ if (get_option('with_py3_overrides')) - endif - - # Python 2 --if (get_option('with_py2_overrides')) -+if (get_option('with_py2_overrides')) and pygobject_override_dir == '' - ret2 = run_command([python2, '-c', get_overridedir]) - - if ret2.returncode() != 0 -@@ -45,3 +47,7 @@ if (get_option('with_py2_overrides')) - - install_data('gi/overrides/Modulemd.py', install_dir: pygobject2_override_dir) - endif -+ -+if pygobject_override_dir != '' -+ install_data('gi/overrides/Modulemd.py', install_dir: pygobject_override_dir) -+endif -diff --git a/meson_options.txt b/meson_options.txt -index 147419f..9071a04 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -18,3 +18,4 @@ option('skip_introspection', type : 'boolean', value : false) - option('python_name', type : 'string') - option('with_py2_overrides', type : 'boolean', value : false) - option('with_py3_overrides', type : 'boolean', value : true) -+option('pygobject_override_dir', type : 'string', value : '', description: 'Path to pygobject overrides directory') diff --git a/pkgs/development/libraries/libmongo-client/default.nix b/pkgs/development/libraries/libmongo-client/default.nix index 30cb8c9df2f..b3231d1af91 100644 --- a/pkgs/development/libraries/libmongo-client/default.nix +++ b/pkgs/development/libraries/libmongo-client/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://algernon.github.io/libmongo-client/; + homepage = "http://algernon.github.io/libmongo-client/"; description = "An alternative C driver for MongoDB"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/libmowgli/default.nix b/pkgs/development/libraries/libmowgli/default.nix index 99f04bc09de..ae3a9efef24 100644 --- a/pkgs/development/libraries/libmowgli/default.nix +++ b/pkgs/development/libraries/libmowgli/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A development framework for C providing high performance and highly flexible algorithms"; - homepage = https://github.com/atheme/libmowgli-2; + homepage = "https://github.com/atheme/libmowgli-2"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libmp3splt/default.nix b/pkgs/development/libraries/libmp3splt/default.nix index 52072000115..237e3f94cfc 100644 --- a/pkgs/development/libraries/libmp3splt/default.nix +++ b/pkgs/development/libraries/libmp3splt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-pcre" ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/mp3splt/; + homepage = "https://sourceforge.net/projects/mp3splt/"; description = "Utility to split mp3, ogg vorbis and FLAC files without decoding"; maintainers = with maintainers; [ bosu ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index e8392f88ac7..cdc45956e7a 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple implementation of msgpack in C"; - homepage = https://github.com/tarruda/libmpack/; + homepage = "https://github.com/tarruda/libmpack/"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix index 9ffbc95b1fd..235474c0ca1 100644 --- a/pkgs/development/libraries/libmpc/default.nix +++ b/pkgs/development/libraries/libmpc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { built upon and follows the same principles as GNU MPFR. ''; - homepage = http://mpc.multiprecision.org/; + homepage = "http://mpc.multiprecision.org/"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index a5a4d68ad96..3ee37e6ae9c 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libmpcdec-1.2.6"; src = fetchurl { - url = https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; + url = "https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2"; sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index 2351ce2b554..d6fb28c0e88 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildFlags = stdenv.lib.optional stdenv.isDarwin "CFLAGS=-std=gnu89"; meta = { - homepage = http://libmpeg2.sourceforge.net/; + 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; [ ]; diff --git a/pkgs/development/libraries/libmrss/default.nix b/pkgs/development/libraries/libmrss/default.nix index f1a061e5ab5..aa70e4c4ddf 100644 --- a/pkgs/development/libraries/libmrss/default.nix +++ b/pkgs/development/libraries/libmrss/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ curl libnxml ]; meta = { - homepage = http://www.autistici.org/bakunin/libmrss/doc; + 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; diff --git a/pkgs/development/libraries/libmspack/default.nix b/pkgs/development/libraries/libmspack/default.nix index 2cb4cd3cd9b..70fdd7e913e 100644 --- a/pkgs/development/libraries/libmspack/default.nix +++ b/pkgs/development/libraries/libmspack/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "A de/compression library for various Microsoft formats"; - homepage = https://www.cabextract.org.uk/libmspack; + homepage = "https://www.cabextract.org.uk/libmspack"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index c8c34eb1c9c..21bde84181b 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-udev=$$bin/lib/udev" ]; meta = with stdenv.lib; { - homepage = http://libmtp.sourceforge.net; + homepage = "http://libmtp.sourceforge.net"; description = "An implementation of Microsoft's Media Transfer Protocol"; longDescription = '' libmtp is an implementation of Microsoft's Media Transfer Protocol (MTP) diff --git a/pkgs/development/libraries/libmusicbrainz/5.x.nix b/pkgs/development/libraries/libmusicbrainz/5.x.nix index 05532df1abd..2fdcdc7d86d 100644 --- a/pkgs/development/libraries/libmusicbrainz/5.x.nix +++ b/pkgs/development/libraries/libmusicbrainz/5.x.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir=true; meta = with stdenv.lib; { - homepage = http://musicbrainz.org/doc/libmusicbrainz; + homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (5.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client diff --git a/pkgs/development/libraries/libmusicbrainz/default.nix b/pkgs/development/libraries/libmusicbrainz/default.nix index 5335b6577f0..0db539a23af 100644 --- a/pkgs/development/libraries/libmusicbrainz/default.nix +++ b/pkgs/development/libraries/libmusicbrainz/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://musicbrainz.org/doc/libmusicbrainz; + homepage = "http://musicbrainz.org/doc/libmusicbrainz"; description = "MusicBrainz Client Library (3.x version)"; longDescription = '' The libmusicbrainz (also known as mb_client or MusicBrainz Client diff --git a/pkgs/development/libraries/libmx/default.nix b/pkgs/development/libraries/libmx/default.nix index 483c5ff1ff7..623c872fa1a 100644 --- a/pkgs/development/libraries/libmx/default.nix +++ b/pkgs/development/libraries/libmx/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.clutter-project.org/; + homepage = "http://www.clutter-project.org/"; description = "A Clutter-based toolkit"; longDescription = ''Mx is a widget toolkit using Clutter that provides a set of standard diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 695d46ba38f..a2aae126359 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLPREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://miniupnp.free.fr/libnatpmp.html; + homepage = "http://miniupnp.free.fr/libnatpmp.html"; description = "NAT-PMP client"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/libnatspec/default.nix b/pkgs/development/libraries/libnatspec/default.nix index db4f6f5d468..8ac2859faed 100644 --- a/pkgs/development/libraries/libnatspec/default.nix +++ b/pkgs/development/libraries/libnatspec/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (rec { buildInputs = [ popt ]; meta = with stdenv.lib; { - homepage = http://natspec.sourceforge.net/ ; + homepage = "http://natspec.sourceforge.net/"; description = "A library intended to smooth national specificities in using of programs"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index 613103db69f..d4469d79f56 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for managing the Linux Non-Volatile Memory Device sub-system"; - homepage = https://github.com/pmem/ndctl; + homepage = "https://github.com/pmem/ndctl"; license = licenses.lgpl21; maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix index 78304246f12..2592b7184f8 100644 --- a/pkgs/development/libraries/libndp/default.nix +++ b/pkgs/development/libraries/libndp/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://libndp.org/; + homepage = "http://libndp.org/"; description = "Library for Neighbor Discovery Protocol"; platforms = platforms.linux; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/development/libraries/libndtypes/default.nix b/pkgs/development/libraries/libndtypes/default.nix index a522c72fc76..ffb2f56d67e 100644 --- a/pkgs/development/libraries/libndtypes/default.nix +++ b/pkgs/development/libraries/libndtypes/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Dynamic types for data description and in-memory computations"; - homepage = https://xnd.io/; + homepage = "https://xnd.io/"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/libraries/libnet/default.nix b/pkgs/development/libraries/libnet/default.nix index 75cea004143..7987fccc06f 100644 --- a/pkgs/development/libraries/libnet/default.nix +++ b/pkgs/development/libraries/libnet/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ ./fix-includes.patch ]; meta = with stdenv.lib; { - homepage = https://github.com/sam-github/libnet; + homepage = "https://github.com/sam-github/libnet"; description = "Portable framework for low-level network packet construction"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libnetfilter_acct/default.nix b/pkgs/development/libraries/libnetfilter_acct/default.nix index 328688612b6..d33782ad7e5 100644 --- a/pkgs/development/libraries/libnetfilter_acct/default.nix +++ b/pkgs/development/libraries/libnetfilter_acct/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl ]; meta = with stdenv.lib; { - homepage = http://www.netfilter.org/projects/libnetfilter_acct/; + homepage = "http://www.netfilter.org/projects/libnetfilter_acct/"; description = "Userspace library providing interface to extended accounting infrastructure."; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index 85fbf458ac2..c93400e474a 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used by conntrack-tools among many other applications ''; - homepage = https://netfilter.org/projects/libnetfilter_conntrack/; + homepage = "https://netfilter.org/projects/libnetfilter_conntrack/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_cthelper/default.nix b/pkgs/development/libraries/libnetfilter_cthelper/default.nix index 563843cca46..ca167198989 100644 --- a/pkgs/development/libraries/libnetfilter_cthelper/default.nix +++ b/pkgs/development/libraries/libnetfilter_cthelper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { library, you register, configure, enable and disable user-space helpers. This library is used by conntrack-tools. ''; - homepage = http://www.netfilter.org/projects/libnetfilter_cthelper/; + homepage = "http://www.netfilter.org/projects/libnetfilter_cthelper/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix index 9f706d619c3..64bcc08ffb9 100644 --- a/pkgs/development/libraries/libnetfilter_cttimeout/default.nix +++ b/pkgs/development/libraries/libnetfilter_cttimeout/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { With this library, you can create, update and delete timeout policies that can be attached to traffic flows. This library is used by conntrack-tools. ''; - homepage = https://netfilter.org/projects/libnetfilter_cttimeout/; + homepage = "https://netfilter.org/projects/libnetfilter_cttimeout/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnetfilter_log/default.nix b/pkgs/development/libraries/libnetfilter_log/default.nix index 2b932bc0809..18346814750 100644 --- a/pkgs/development/libraries/libnetfilter_log/default.nix +++ b/pkgs/development/libraries/libnetfilter_log/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { system that deprecates the old syslog/dmesg based packet logging. This library has been previously known as libnfnetlink_log. ''; - homepage = https://netfilter.org/projects/libnetfilter_log/; + homepage = "https://netfilter.org/projects/libnetfilter_log/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/libnetfilter_queue/default.nix b/pkgs/development/libraries/libnetfilter_queue/default.nix index 5f84bc03f82..556db28f856 100644 --- a/pkgs/development/libraries/libnetfilter_queue/default.nix +++ b/pkgs/development/libraries/libnetfilter_queue/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libmnl libnfnetlink ]; meta = with stdenv.lib; { - homepage = http://www.netfilter.org/projects/libnetfilter_queue/; + homepage = "http://www.netfilter.org/projects/libnetfilter_queue/"; description = "Userspace API to packets queued by the kernel packet filter"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index 3d069d7a168..c3661a233af 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source library libnfc for Near Field Communication"; license = licenses.gpl3; - homepage = https://github.com/nfc-tools/libnfc; + homepage = "https://github.com/nfc-tools/libnfc"; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index fa6461d8691..ecce38ac23e 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { This library is not meant as a public API for application developers. It is only used by other netfilter.org projects, like the aforementioned ones. ''; - homepage = http://www.netfilter.org/projects/libnfnetlink/index.html; + homepage = "http://www.netfilter.org/projects/libnfnetlink/index.html"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix index d2848d9a1e9..03a4dbe02d5 100644 --- a/pkgs/development/libraries/libnfs/default.nix +++ b/pkgs/development/libraries/libnfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NFS client library"; - homepage = https://github.com/sahlberg/libnfs; + homepage = "https://github.com/sahlberg/libnfs"; license = with licenses; [ lgpl2 bsd2 gpl3 ]; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index a4f98eed417..4aac04a4d02 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; - homepage = http://netfilter.org/projects/libnftnl; + homepage = "http://netfilter.org/projects/libnftnl"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libngspice/default.nix b/pkgs/development/libraries/libngspice/default.nix index ffecfcb61d0..3f5ba26d5a4 100644 --- a/pkgs/development/libraries/libngspice/default.nix +++ b/pkgs/development/libraries/libngspice/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Next Generation Spice (Electronic Circuit Simulator)"; - homepage = http://ngspice.sourceforge.net; + homepage = "http://ngspice.sourceforge.net"; license = with licenses; [ bsd3 gpl2Plus lgpl2Plus ]; # See https://sourceforge.net/p/ngspice/ngspice/ci/master/tree/COPYING maintainers = with maintainers; [ bgamari ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 90bdb06bb7f..d2333ac0ca5 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { # Note: upstream is not willing to merge our fix # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35#note_98871 (fetchpatch { - url = https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch; + url = "https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch"; sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg"; }) ]; diff --git a/pkgs/development/libraries/libnih/default.nix b/pkgs/development/libraries/libnih/default.nix index 4049a18145c..0c38a9c17d7 100644 --- a/pkgs/development/libraries/libnih/default.nix +++ b/pkgs/development/libraries/libnih/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "A small library for C application development"; - homepage = https://launchpad.net/libnih; + homepage = "https://launchpad.net/libnih"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index aacadc5ea0a..9bf786c5092 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://developer.gnome.org/notification-spec/; + homepage = "https://developer.gnome.org/notification-spec/"; description = "A library that sends desktop notifications to a notification daemon"; platforms = platforms.unix; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix index cb70d803ac0..413e404ce1d 100644 --- a/pkgs/development/libraries/libnova/default.nix +++ b/pkgs/development/libraries/libnova/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Celestial Mechanics, Astrometry and Astrodynamics Library"; - homepage = http://libnova.sf.net; + homepage = "http://libnova.sf.net"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/development/libraries/libnsl/default.nix b/pkgs/development/libraries/libnsl/default.nix index 79006484743..1e925eb7b47 100644 --- a/pkgs/development/libraries/libnsl/default.nix +++ b/pkgs/development/libraries/libnsl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client interface library for NIS(YP) and NIS+"; - homepage = https://github.com/thkukuk/libnsl; + homepage = "https://github.com/thkukuk/libnsl"; license = licenses.lgpl21; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libnxml/default.nix b/pkgs/development/libraries/libnxml/default.nix index 0a6c58c8a01..dc5e8dfc55e 100644 --- a/pkgs/development/libraries/libnxml/default.nix +++ b/pkgs/development/libraries/libnxml/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ curl ]; meta = { - homepage = https://www.autistici.org/bakunin/libnxml/; + 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; diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 46e3e65ff80..c816bdc90e5 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; description = "C library implementing the OAuth secure authentication protocol"; - homepage = http://liboauth.sourceforge.net/; - repositories.git = https://github.com/x42/liboauth.git; + homepage = "http://liboauth.sourceforge.net/"; + repositories.git = "https://github.com/x42/liboauth.git"; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 7dc23aa1e8a..c2402338034 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ expat curl fftw ]; meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/musicip-libofa/; + homepage = "https://code.google.com/archive/p/musicip-libofa/"; description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio diff --git a/pkgs/development/libraries/libofx/default.nix b/pkgs/development/libraries/libofx/default.nix index 76276f0ce0f..692bddeab7d 100644 --- a/pkgs/development/libraries/libofx/default.nix +++ b/pkgs/development/libraries/libofx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Opensource implementation of the Open Financial eXchange specification"; - homepage = http://libofx.sourceforge.net/; + homepage = "http://libofx.sourceforge.net/"; license = "LGPL"; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix index 4f7c5f38123..50950a15a87 100644 --- a/pkgs/development/libraries/libogg/default.nix +++ b/pkgs/development/libraries/libogg/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { Ogg is flexible file storage and streaming format that supports plethora of codecs. Open format free for anyone to use. ''; - homepage = https://xiph.org/ogg/; + homepage = "https://xiph.org/ogg/"; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/liboggz/default.nix b/pkgs/development/libraries/liboggz/default.nix index d7c3b747924..07613f0564b 100644 --- a/pkgs/development/libraries/liboggz/default.nix +++ b/pkgs/development/libraries/liboggz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://xiph.org/oggz/; + homepage = "https://xiph.org/oggz/"; description = "A C library and tools for manipulating with Ogg files and streams"; longDescription = '' Oggz comprises liboggz and the tool oggz, which provides commands to diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix index fb2dad60525..22adceccecf 100644 --- a/pkgs/development/libraries/liboil/default.nix +++ b/pkgs/development/libraries/liboil/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library of simple functions that are optimized for various CPUs"; - homepage = https://liboil.freedesktop.org; + homepage = "https://liboil.freedesktop.org"; license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libomxil-bellagio/default.nix b/pkgs/development/libraries/libomxil-bellagio/default.nix index 4d45c6872e4..5f583d53abf 100644 --- a/pkgs/development/libraries/libomxil-bellagio/default.nix +++ b/pkgs/development/libraries/libomxil-bellagio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=array-bounds"; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/omxil/; + homepage = "https://sourceforge.net/projects/omxil/"; description = "An opensource implementation of the Khronos OpenMAX Integration Layer API to access multimedia components"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/development/libraries/liboop/default.nix b/pkgs/development/libraries/liboop/default.nix index 73d51ec49ff..6438fd5eb32 100644 --- a/pkgs/development/libraries/liboop/default.nix +++ b/pkgs/development/libraries/liboop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "liboop-1.0"; src = fetchurl { - url = http://download.ofb.net/liboop/liboop.tar.gz; + url = "http://download.ofb.net/liboop/liboop.tar.gz"; sha256 = "34d83c6e0f09ee15cb2bc3131e219747c3b612bb57cf7d25318ab90da9a2d97c"; }; meta = { description = "Event loop library"; - homepage = http://liboop.ofb.net/; + homepage = "http://liboop.ofb.net/"; license = "LGPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libopcodes/default.nix b/pkgs/development/libraries/libopcodes/default.nix index aa307f68ca0..8db034683dc 100644 --- a/pkgs/development/libraries/libopcodes/default.nix +++ b/pkgs/development/libraries/libopcodes/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library from binutils for manipulating machine code"; - homepage = https://www.gnu.org/software/binutils/; + homepage = "https://www.gnu.org/software/binutils/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericson2314 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libopenaptx/default.nix b/pkgs/development/libraries/libopenaptx/default.nix index 4ad1e2b7735..d9ccf77ea92 100644 --- a/pkgs/development/libraries/libopenaptx/default.nix +++ b/pkgs/development/libraries/libopenaptx/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Audio Processing Technology codec (aptX)"; license = licenses.lgpl21Plus; - homepage = https://github.com/pali/libopenaptx; + homepage = "https://github.com/pali/libopenaptx"; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; }; diff --git a/pkgs/development/libraries/liboping/default.nix b/pkgs/development/libraries/liboping/default.nix index b2594d7c1d7..1b2d83b84d0 100644 --- a/pkgs/development/libraries/liboping/default.nix +++ b/pkgs/development/libraries/liboping/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { Included is a sample application, called oping, which demonstrates the library's abilities. ''; - homepage = http://noping.cc/; + homepage = "http://noping.cc/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 01da76749ba..27e9a89fcef 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open, royalty-free, highly versatile audio codec"; license = stdenv.lib.licenses.bsd3; - homepage = http://www.opus-codec.org/; + homepage = "http://www.opus-codec.org/"; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix index 9b91e32f228..f26349bd488 100644 --- a/pkgs/development/libraries/libopusenc/default.nix +++ b/pkgs/development/libraries/libopusenc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library for encoding .opus audio files and live streams"; license = licenses.bsd3; - homepage = http://www.opus-codec.org/; + homepage = "http://www.opus-codec.org/"; platforms = platforms.unix; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix index a040956f553..79bd53ab03b 100644 --- a/pkgs/development/libraries/libosinfo/default.nix +++ b/pkgs/development/libraries/libosinfo/default.nix @@ -1,24 +1,59 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, gobject-introspection, gtk-doc, docbook_xsl -, glib, libsoup, libxml2, libxslt, check, curl, perl, hwdata, osinfo-db, substituteAll +{ stdenv +, fetchurl +, fetchpatch +, pkgconfig +, meson +, ninja +, gettext +, gobject-introspection +, gtk-doc +, docbook_xsl +, glib +, libsoup +, libxml2 +, libxslt +, check +, curl +, perl +, hwdata +, osinfo-db +, substituteAll , vala ? null }: stdenv.mkDerivation rec { pname = "libosinfo"; - version = "1.6.0"; + version = "1.7.1"; src = fetchurl { - url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1iwh35mahch1ls3sgq7wz8kamxrxisrff5ciqzyh2qxlrqf5qf1w"; + url = "https://releases.pagure.org/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1s97sv24bybggjx6hgqba2qdqz3ivfpd4cmkh4zm5y59sim109mv"; }; outputs = [ "out" "dev" "devdoc" ]; nativeBuildInputs = [ - pkgconfig vala gettext gobject-introspection gtk-doc docbook_xsl + pkgconfig + meson + ninja + vala + gettext + gobject-introspection + gtk-doc + docbook_xsl + perl # for pod2man + ]; + buildInputs = [ + glib + libsoup + libxml2 + libxslt + ]; + checkInputs = [ + check + curl + perl ]; - buildInputs = [ glib libsoup libxml2 libxslt ]; - checkInputs = [ check curl perl ]; patches = [ (substituteAll { @@ -27,17 +62,20 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ - "--with-usb-ids-path=${hwdata}/share/hwdata/usb.ids" - "--with-pci-ids-path=${hwdata}/share/hwdata/pci.ids" - "--enable-gtk-doc" + mesonFlags = [ + "-Dwith-usb-ids-path=${hwdata}/share/hwdata/usb.ids" + "-Dwith-pci-ids-path=${hwdata}/share/hwdata/pci.ids" + "-Denable-gtk-doc=true" ]; - doCheck = true; + # FIXME: fails two new tests added in 1.7.1: + # libosinfo:symbols / check-symfile + # 3/24 libosinfo:symbols / check-symsorting + doCheck = false; meta = with stdenv.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/; + homepage = "https://libosinfo.org/"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libosmpbf/default.nix b/pkgs/development/libraries/libosmpbf/default.nix index 416101cad0a..d1f6ea5c2ea 100644 --- a/pkgs/development/libraries/libosmpbf/default.nix +++ b/pkgs/development/libraries/libosmpbf/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { installFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = https://github.com/scrosby/OSM-binary; + 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; diff --git a/pkgs/development/libraries/libossp-uuid/default.nix b/pkgs/development/libraries/libossp-uuid/default.nix index 47d9c4215fd..15b6da0ac5b 100644 --- a/pkgs/development/libraries/libossp-uuid/default.nix +++ b/pkgs/development/libraries/libossp-uuid/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ ./shtool.patch ]; meta = with stdenv.lib; { - homepage = http://www.ossp.org/pkg/lib/uuid/; + 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 db79bad745f..10619f9682b 100644 --- a/pkgs/development/libraries/libotr/default.nix +++ b/pkgs/development/libraries/libotr/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libgcrypt ]; meta = with stdenv.lib; { - homepage = http://www.cypherpunks.ca/otr/; - repositories.git = git://git.code.sf.net/p/otr/libotr; + homepage = "http://www.cypherpunks.ca/otr/"; + repositories.git = "git://git.code.sf.net/p/otr/libotr"; license = licenses.lgpl21; description = "Library for Off-The-Record Messaging"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libow/default.nix b/pkgs/development/libraries/libow/default.nix index b9eedc4cd95..1f67e1fc791 100644 --- a/pkgs/development/libraries/libow/default.nix +++ b/pkgs/development/libraries/libow/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "1-Wire File System full library"; - homepage = https://owfs.org/; + homepage = "https://owfs.org/"; license = licenses.gpl2; maintainers = with maintainers; [ disserman ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libowfat/default.nix b/pkgs/development/libraries/libowfat/default.nix index 73029c76818..5f434a7ae75 100644 --- a/pkgs/development/libraries/libowfat/default.nix +++ b/pkgs/development/libraries/libowfat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GPL reimplementation of libdjb"; - homepage = https://www.fefe.de/libowfat/; + homepage = "https://www.fefe.de/libowfat/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libp11/default.nix b/pkgs/development/libraries/libp11/default.nix index 903aa66ce60..4bf0b020118 100644 --- a/pkgs/development/libraries/libp11/default.nix +++ b/pkgs/development/libraries/libp11/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small layer on top of PKCS#11 API to make PKCS#11 implementations easier"; - homepage = https://github.com/OpenSC/libp11; + homepage = "https://github.com/OpenSC/libp11"; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/libpaper/default.nix b/pkgs/development/libraries/libpaper/default.nix index 3c37cf82495..28c6030a0ff 100644 --- a/pkgs/development/libraries/libpaper/default.nix +++ b/pkgs/development/libraries/libpaper/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for handling paper characteristics"; - homepage = http://packages.debian.org/unstable/source/libpaper; + homepage = "http://packages.debian.org/unstable/source/libpaper"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libpar2/default.nix b/pkgs/development/libraries/libpar2/default.nix index bbdce71bad6..9447b83af17 100644 --- a/pkgs/development/libraries/libpar2/default.nix +++ b/pkgs/development/libraries/libpar2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { - homepage = http://parchive.sourceforge.net/; + homepage = "http://parchive.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "A library for using Parchives (parity archive volume sets)"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libpcap/default.nix b/pkgs/development/libraries/libpcap/default.nix index b704878b164..123c2f2f067 100644 --- a/pkgs/development/libraries/libpcap/default.nix +++ b/pkgs/development/libraries/libpcap/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.tcpdump.org; + homepage = "https://www.tcpdump.org"; description = "Packet Capture Library"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index e73f98cd21d..61b774ac7b7 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libpeas"; - version = "1.24.1"; + version = "1.26.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw"; + sha256 = "0xkk9zhkw8f2fm7g9nb4ry4xxig5n27s7rjmx6l7jr2941zdfxm9"; }; nativeBuildInputs = [ pkgconfig meson ninja gettext gobject-introspection ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A GObject-based plugins engine"; - homepage = https://wiki.gnome.org/Projects/Libpeas; + homepage = "https://wiki.gnome.org/Projects/Libpeas"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index b3dae0c60ea..f262a7da131 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { # configureFlags = optional static "--enable-static --disable-shared"; meta = { - homepage = http://www.libpgf.org/; + homepage = "http://www.libpgf.org/"; description = "Progressive Graphics Format"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index eabf2d2a106..bf80562a0b1 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; meta = with stdenv.lib; { - homepage = http://libpipeline.nongnu.org; + homepage = "http://libpipeline.nongnu.org"; description = "C library for manipulating pipelines of subprocesses in a flexible and convenient way"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/development/libraries/libplist/default.nix b/pkgs/development/libraries/libplist/default.nix index 63599c4352d..6608ccd1abc 100644 --- a/pkgs/development/libraries/libplist/default.nix +++ b/pkgs/development/libraries/libplist/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to handle Apple Property List format in binary or XML"; - homepage = https://github.com/libimobiledevice/libplist; + homepage = "https://github.com/libimobiledevice/libplist"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index 14ae1156087..7199695ae74 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The official reference implementation for the PNG file format"; - homepage = http://www.libpng.org/pub/png/libpng.html; + homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng; maintainers = [ ]; branch = "1.2"; diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 95ef6201346..489007bc417 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; - homepage = http://www.libpng.org/pub/png/libpng.html; + homepage = "http://www.libpng.org/pub/png/libpng.html"; license = licenses.libpng2; platforms = platforms.all; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index f6f2412c818..a710e09a454 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "A C++ library to access PostgreSQL databases"; - homepage = http://pqxx.org/development/libpqxx/; + homepage = "http://pqxx.org/development/libpqxx/"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix index 8d4febcde28..61c25e183bd 100644 --- a/pkgs/development/libraries/libproxy/default.nix +++ b/pkgs/development/libraries/libproxy/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21; - homepage = http://libproxy.github.io/libproxy/; + homepage = "http://libproxy.github.io/libproxy/"; description = "A library that provides automatic proxy configuration management"; }; } diff --git a/pkgs/development/libraries/libpseudo/default.nix b/pkgs/development/libraries/libpseudo/default.nix index c04c8d724d0..e08feaddc60 100644 --- a/pkgs/development/libraries/libpseudo/default.nix +++ b/pkgs/development/libraries/libpseudo/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { - homepage = http://libpseudo.sourceforge.net/; + homepage = "http://libpseudo.sourceforge.net/"; description = "Simple, thread-safe messaging between threads"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index d2012760dcf..fdc352869f0 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { pkgconfig python3 valgrind + libxslt ]; buildInputs = [ diff --git a/pkgs/development/libraries/libpst/default.nix b/pkgs/development/libraries/libpst/default.nix index 24b94827122..e69cc04d6f0 100644 --- a/pkgs/development/libraries/libpst/default.nix +++ b/pkgs/development/libraries/libpst/default.nix @@ -2,11 +2,11 @@ pkgconfig, bzip2, xmlto, gettext, imagemagick, doxygen }: stdenv.mkDerivation rec { - name = "libpst-0.6.74"; + name = "libpst-0.6.75"; src = fetchurl { url = "http://www.five-ten-sg.com/libpst/packages/${name}.tar.gz"; - sha256 = "0dzx8jniz7mczbbp08zfrl46h27hyfrsnjxmka9pi5aawzfdm1zp"; + sha256 = "11wrf47i3brlxg25wsfz17373q7m5fpjxn2lr41dj252ignqzaac"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.five-ten-sg.com/libpst/; + homepage = "https://www.five-ten-sg.com/libpst/"; description = "A library to read PST (MS Outlook Personal Folders) files"; license = licenses.gpl2; maintainers = [maintainers.tohl]; diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index c3ad33173cd..bd45cb529f1 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Password quality checking and random password generation library"; - homepage = https://github.com/libpwquality/libpwquality; + homepage = "https://github.com/libpwquality/libpwquality"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libqb/default.nix b/pkgs/development/libraries/libqb/default.nix index 25b088f99ec..58eb64b0e48 100644 --- a/pkgs/development/libraries/libqb/default.nix +++ b/pkgs/development/libraries/libqb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://github.com/clusterlabs/libqb; + homepage = "https://github.com/clusterlabs/libqb"; description = "A library providing high performance logging, tracing, ipc, and poll"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix index 41a2a1b669d..8027fd46ea8 100644 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ b/pkgs/development/libraries/libqmatrixclient/default.nix @@ -23,7 +23,7 @@ let meta = with stdenv.lib; { description= "A Qt5 library to write cross-platfrom clients for Matrix"; - homepage = https://matrix.org/docs/projects/sdk/libqmatrixclient.html; + homepage = "https://matrix.org/docs/projects/sdk/libqmatrixclient.html"; license = licenses.lgpl21; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index dd6318444e7..8d9cf381ff8 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -43,7 +43,7 @@ mkDerivation rec { description = "A multimedia playback framework based on Qt + FFmpeg"; #license = licenses.lgpl21; # For the libraries / headers only. license = licenses.gpl3; # With the examples (under bin) and most likely some of the optional dependencies used. - homepage = http://www.qtav.org/; + homepage = "http://www.qtav.org/"; maintainers = [ maintainers.jraygauthier ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libr3/default.nix b/pkgs/development/libraries/libr3/default.nix index cf848d02a04..0584203a581 100644 --- a/pkgs/development/libraries/libr3/default.nix +++ b/pkgs/development/libraries/libr3/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A high-performance path dispatching library"; - homepage = https://github.com/c9s/r3; + homepage = "https://github.com/c9s/r3"; license = [ stdenv.lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/libraspberrypi/default.nix b/pkgs/development/libraries/libraspberrypi/default.nix index ec31a29d053..1cd1f5e62ac 100644 --- a/pkgs/development/libraries/libraspberrypi/default.nix +++ b/pkgs/development/libraries/libraspberrypi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { description = "Userland libraries for interfacing with Raspberry Pi hardware"; - homepage = https://github.com/raspberrypi/userland; + homepage = "https://github.com/raspberrypi/userland"; license = licenses.bsd3; platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ tkerber ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 00288e359df..69169c7e9af 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"; - homepage = https://www.libraw.org/; + homepage = "https://www.libraw.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/librdf/raptor.nix b/pkgs/development/libraries/librdf/raptor.nix index 14e3e1891ba..ef194bb0b1e 100644 --- a/pkgs/development/libraries/librdf/raptor.nix +++ b/pkgs/development/libraries/librdf/raptor.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = http://librdf.org/raptor; + homepage = "http://librdf.org/raptor"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/librdf/raptor2.nix b/pkgs/development/libraries/librdf/raptor2.nix index 3f436677123..b4141d4ff07 100644 --- a/pkgs/development/libraries/librdf/raptor2.nix +++ b/pkgs/development/libraries/librdf/raptor2.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "The RDF Parser Toolkit"; - homepage = http://librdf.org/raptor; + homepage = "http://librdf.org/raptor"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/librdf/rasqal.nix b/pkgs/development/libraries/librdf/rasqal.nix index 124fd017818..d9b94a668c6 100644 --- a/pkgs/development/libraries/librdf/rasqal.nix +++ b/pkgs/development/libraries/librdf/rasqal.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Library that handles Resource Description Framework (RDF)"; - homepage = http://librdf.org/rasqal; + homepage = "http://librdf.org/rasqal"; license = with stdenv.lib.licenses; [ lgpl21 asl20 ]; maintainers = with stdenv.lib.maintainers; [ marcweber ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/librdf/redland.nix b/pkgs/development/libraries/librdf/redland.nix index 8835490187d..a85500d2c6e 100644 --- a/pkgs/development/libraries/librdf/redland.nix +++ b/pkgs/development/libraries/librdf/redland.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C libraries that provide support for the Resource Description Framework (RDF)"; - homepage = http://librdf.org/; + homepage = "http://librdf.org/"; platforms = platforms.unix; license = licenses.asl20; }; diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index 05c81e3c73e..a8924ca4782 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.32.1"; + version = "2.33.1"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "1l45hrb3lgjh1kdi4khqhljndc434zf9llzbii6dcv911gxkipjr"; + sha256 = "04macplj3k2sdpf1wdjm6gsghak5dzfhi2pmr47qldh2sy2zz0a3"; }; buildInputs = [ diff --git a/pkgs/development/libraries/librep/default.nix b/pkgs/development/libraries/librep/default.nix index 43f80076328..bed92477a3f 100644 --- a/pkgs/development/libraries/librep/default.nix +++ b/pkgs/development/libraries/librep/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { machine. It can serve as an application extension language but is also suitable for standalone scripts. ''; - homepage = http://sawfish.wikia.com; + homepage = "http://sawfish.wikia.com"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/development/libraries/libresample/default.nix b/pkgs/development/libraries/libresample/default.nix index 3684fd924f7..85d8d5c586b 100644 --- a/pkgs/development/libraries/libresample/default.nix +++ b/pkgs/development/libraries/libresample/default.nix @@ -2,14 +2,14 @@ let patch = fetchurl { - url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz; + url = "mirror://debian/pool/main/libr/libresample/libresample_0.1.3-3.diff.gz"; sha256 = "063w8rqxw87fc89gas47vk0ll7xl8cy7d8g70gm1l62bqkkajklx"; }; in stdenv.mkDerivation { name = "libresample-0.1.3"; src = fetchurl { - url = mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz; + url = "mirror://debian/pool/main/libr/libresample/libresample_0.1.3.orig.tar.gz"; sha256 = "05a8mmh1bw5afqx0kfdqzmph4x2npcs4idx0p0v6q95lwf22l8i0"; }; patches = [ patch ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "A real-time library for sampling rate conversion library"; license = stdenv.lib.licenses.lgpl2Plus; - homepage = https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html; + homepage = "https://ccrma.stanford.edu/~jos/resample/Free_Resampling_Software.html"; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index e70ac9a5362..aee41e37ec6 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Helper library for RESTful services"; - homepage = https://wiki.gnome.org/Projects/Librest; + homepage = "https://wiki.gnome.org/Projects/Librest"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = gnome3.maintainers; diff --git a/pkgs/development/libraries/librevisa/default.nix b/pkgs/development/libraries/librevisa/default.nix index d412e1e8ebb..b49fb3f7ee7 100644 --- a/pkgs/development/libraries/librevisa/default.nix +++ b/pkgs/development/libraries/librevisa/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { We currently support targets connected via USB, exposing the USBTMC interface, and VXI-11 devices. ''; - homepage = http://www.librevisa.org/; + homepage = "http://www.librevisa.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 11c7f3fed84..911286efb7f 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,22 +1,25 @@ -{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3 +{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2 +, bzip2, libintl, darwin, rustc, cargo, gnome3 , vala, gobject-introspection }: let pname = "librsvg"; - version = "2.46.4"; + version = "2.48.0"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0afc82nsxc6kw136xid4vcq9kmq4rmgzzk8bh2pvln2cnvirwnxl"; + sha256 = "19ndf9l99wcrmkwcrk20vd1ggrwgldksfz1kkj786ljcrxv8nd2a"; }; outputs = [ "out" "dev" "installedTests" ]; - buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ]; + buildInputs = [ libxml2 bzip2 pango libintl ] + ++ lib.optionals stdenv.isDarwin [ darwin.libobjc ]; + + NIX_LDFLAGS = if stdenv.isDarwin then "-lobjc" else null; propagatedBuildInputs = [ glib gdk-pixbuf cairo ]; @@ -77,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small library to render SVG images to Cairo surfaces"; - homepage = https://wiki.gnome.org/Projects/LibRsvg; + homepage = "https://wiki.gnome.org/Projects/LibRsvg"; license = licenses.lgpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/development/libraries/librsync/0.9.nix b/pkgs/development/libraries/librsync/0.9.nix index 3ca84ed2ce5..35ccdcdf078 100644 --- a/pkgs/development/libraries/librsync/0.9.nix +++ b/pkgs/development/libraries/librsync/0.9.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "librsync-0.9.7"; src = fetchurl { - url = mirror://sourceforge/librsync/librsync-0.9.7.tar.gz; + url = "mirror://sourceforge/librsync/librsync-0.9.7.tar.gz"; sha256 = "1mj1pj99mgf1a59q9f2mxjli2fzxpnf55233pc1klxk2arhf8cv6"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { - homepage = http://librsync.sourceforge.net/; + homepage = "http://librsync.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 02a8abb7c85..d90106f89d8 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "librsync"; - version = "2.2.1"; + version = "2.3.0"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "08wdlxsa9zg2pyasz1lwg70d5psi4amv81v4yxwffx67ndzb9yp5"; + sha256 = "18wwfbbggsjrd4w3dczxa2gv3zvx0fqp68b8h1zzvdbyn91f16mz"; }; nativeBuildInputs = [ cmake ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = with stdenv.lib; { - homepage = http://librsync.sourceforge.net/; + homepage = "http://librsync.sourceforge.net/"; license = licenses.lgpl2Plus; description = "Implementation of the rsync remote-delta algorithm"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libs3/default.nix b/pkgs/development/libraries/libs3/default.nix index dfec4bc4897..3012263cb41 100644 --- a/pkgs/development/libraries/libs3/default.nix +++ b/pkgs/development/libraries/libs3/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { makeFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/bji/libs3; + homepage = "https://github.com/bji/libs3"; description = "A library for interfacing with amazon s3"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index b23bff415a2..92958f389f0 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sample Rate Converter for audio"; - homepage = http://www.mega-nerd.com/SRC/index.html; + homepage = "http://www.mega-nerd.com/SRC/index.html"; license = licenses.bsd2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 2092d72c9f8..a6756f4e2d5 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C/C++ implementation of a Sass compiler"; - homepage = https://github.com/sass/libsass; + homepage = "https://github.com/sass/libsass"; license = licenses.mit; maintainers = with maintainers; [ codyopel offline ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libscrypt/default.nix b/pkgs/development/libraries/libscrypt/default.nix index 3083136526b..7eaa8f85578 100644 --- a/pkgs/development/libraries/libscrypt/default.nix +++ b/pkgs/development/libraries/libscrypt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library that implements scrypt() functionality"; - homepage = https://lolware.net/2014/04/29/libscrypt.html; + homepage = "https://lolware.net/2014/04/29/libscrypt.html"; license = licenses.bsd2; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsearpc/default.nix b/pkgs/development/libraries/libsearpc/default.nix index 9bf246f556d..c9c105d1b18 100644 --- a/pkgs/development/libraries/libsearpc/default.nix +++ b/pkgs/development/libraries/libsearpc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = with stdenv.lib; { - homepage = https://github.com/haiwen/libsearpc; + 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; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index e4e87eba858..8bac2e711e5 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib ]; nativeBuildInputs = [ pkgconfig gettext libxslt docbook_xsl docbook_xml_dtd_42 libintl - gobject-introspection vala gtk-doc + gobject-introspection vala gtk-doc glib ]; buildInputs = [ libgcrypt ]; # optional: build docs with gtk-doc? (probably needs a flag as well) @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for storing and retrieving passwords and other secrets"; - homepage = https://wiki.gnome.org/Projects/Libsecret; + homepage = "https://wiki.gnome.org/Projects/Libsecret"; license = stdenv.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 2c34c1d8b7b..c7f34362f39 100644 --- a/pkgs/development/libraries/libserialport/default.nix +++ b/pkgs/development/libraries/libserialport/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform shared library for serial port access"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 849c93962f8..23ab4d0b338 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { bad data from getting to the icecast server. ''; - homepage = http://www.icecast.org; + homepage = "http://www.icecast.org"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ jcumming ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/libsidplayfp/default.nix b/pkgs/development/libraries/libsidplayfp/default.nix index 970c4aff246..7acda3c0a8f 100644 --- a/pkgs/development/libraries/libsidplayfp/default.nix +++ b/pkgs/development/libraries/libsidplayfp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to play Commodore 64 music derived from libsidplay2"; - homepage = https://sourceforge.net/projects/sidplay-residfp/; + homepage = "https://sourceforge.net/projects/sidplay-residfp/"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libsieve/default.nix b/pkgs/development/libraries/libsieve/default.nix index bc34318d0a9..e1c6f3efe52 100644 --- a/pkgs/development/libraries/libsieve/default.nix +++ b/pkgs/development/libraries/libsieve/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interpreter for RFC 3028 Sieve and various extensions"; - homepage = http://sodabrew.com/libsieve/; + homepage = "http://sodabrew.com/libsieve/"; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index fa27a80e22e..0fc19d20759 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ m4]; meta = with stdenv.lib; { - homepage = https://libsigcplusplus.github.io/libsigcplusplus/; + homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; branch = "1.2"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index 434dbfb9f72..8f883626d82 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://libsigcplusplus.github.io/libsigcplusplus/; + homepage = "https://libsigcplusplus.github.io/libsigcplusplus/"; description = "A typesafe callback system for standard C++"; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix index f3549d52f69..100dbb3779c 100644 --- a/pkgs/development/libraries/libsignal-protocol-c/default.nix +++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Signal Protocol C Library"; - homepage = https://github.com/signalapp/libsignal-protocol-c; + homepage = "https://github.com/signalapp/libsignal-protocol-c"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index c7f49a6f6dc..77a43872d4e 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for managing single signon credentials which can be used from GLib applications"; - homepage = https://gitlab.com/accounts-sso/libsignon-glib; + homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; license = licenses.lgpl21; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index b50a7c371a7..30921ade4cf 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; # not cross; meta = { - homepage = https://www.gnu.org/software/libsigsegv/; + homepage = "https://www.gnu.org/software/libsigsegv/"; description = "Library to handle page faults in user mode"; longDescription = '' diff --git a/pkgs/development/libraries/libsixel/default.nix b/pkgs/development/libraries/libsixel/default.nix index 3c3beb5f1a7..9e151931e65 100644 --- a/pkgs/development/libraries/libsixel/default.nix +++ b/pkgs/development/libraries/libsixel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The SIXEL library for console graphics, and converter programs"; - homepage = http://saitoha.github.com/libsixel; + homepage = "http://saitoha.github.com/libsixel"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libskk/default.nix b/pkgs/development/libraries/libskk/default.nix index d0f822a23f5..e5fd031b5ff 100644 --- a/pkgs/development/libraries/libskk/default.nix +++ b/pkgs/development/libraries/libskk/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { as well as various dictionary types including: file dictionary (such as SKK-JISYO.[SML]), user dictionary, skkserv, and CDB format dictionary. ''; - homepage = https://github.com/ueno/libskk; + homepage = "https://github.com/ueno/libskk"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libsmi/default.nix b/pkgs/development/libraries/libsmi/default.nix index 208aa6c9d61..881af18d559 100644 --- a/pkgs/development/libraries/libsmi/default.nix +++ b/pkgs/development/libraries/libsmi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Library to Access SMI MIB Information"; - homepage = https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html; + homepage = "https://www.ibr.cs.tu-bs.de/projects/libsmi/index.html"; license = licenses.free; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix index 15d8169f102..227353e0a9f 100644 --- a/pkgs/development/libraries/libsnark/default.nix +++ b/pkgs/development/libraries/libsnark/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ library for zkSNARKs"; - homepage = https://github.com/scipr-lab/libsnark; + homepage = "https://github.com/scipr-lab/libsnark"; license = licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix index b150dd0f59c..7b20120290d 100644 --- a/pkgs/development/libraries/libsndfile/default.nix +++ b/pkgs/development/libraries/libsndfile/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for reading and writing files containing sampled sound"; - homepage = http://www.mega-nerd.com/libsndfile/; + homepage = "http://www.mega-nerd.com/libsndfile/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index a2b6ba6224e..c6381e2a141 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modern and easy-to-use crypto library"; - homepage = http://doc.libsodium.org/; + homepage = "http://doc.libsodium.org/"; license = licenses.isc; maintainers = with maintainers; [ raskin ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix index 62e5601b73c..a4a81af532a 100644 --- a/pkgs/development/libraries/libsoundio/default.nix +++ b/pkgs/development/libraries/libsoundio/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross platform audio input and output"; - homepage = http://libsound.io/; + homepage = "http://libsound.io/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 6925bd2de4b..a497661725b 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsoup"; - version = "2.68.4"; + version = "2.70.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "151j5dc84gbl6a917pxvd0b372lw5za48n63lyv6llfc48lv2l1d"; + sha256 = "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l"; }; postPatch = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ python3 sqlite libpsl brotli ]; - nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala ]; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala glib ]; propagatedBuildInputs = [ glib libxml2 ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index d85c9e94ebd..4b5f7f4b3f1 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Extensible spatial index library in C++"; - homepage = http://libspatialindex.github.io/; + homepage = "http://libspatialindex.github.io/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index 7bd22248d87..bdc4504ad5a 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Extensible spatial index library in C++"; - homepage = https://www.gaia-gis.it/fossil/libspatialite; + homepage = "https://www.gaia-gis.it/fossil/libspatialite"; # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index f1e4169bd48..11400a6a3e2 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://libspectre.freedesktop.org/; + homepage = "http://libspectre.freedesktop.org/"; description = "PostScript rendering library"; longDescription = '' diff --git a/pkgs/development/libraries/libspectrum/default.nix b/pkgs/development/libraries/libspectrum/default.nix index c09a45abf59..24b9b9241c2 100644 --- a/pkgs/development/libraries/libspectrum/default.nix +++ b/pkgs/development/libraries/libspectrum/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://fuse-emulator.sourceforge.net/libspectrum.php; + homepage = "http://fuse-emulator.sourceforge.net/libspectrum.php"; description = "ZX Spectrum input and output support library"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libspf2/default.nix b/pkgs/development/libraries/libspf2/default.nix index d4b11270428..42b39179b20 100644 --- a/pkgs/development/libraries/libspf2/default.nix +++ b/pkgs/development/libraries/libspf2/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Implementation of the Sender Policy Framework for SMTP authorization"; - homepage = https://www.libspf2.org; + homepage = "https://www.libspf2.org"; license = with licenses; [ lgpl21Plus bsd2 ]; maintainers = with maintainers; [ pacien ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index 67251f9430a..0922d3c1730 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that simplifies the drawing of beautiful curves"; - homepage = https://github.com/fontforge/libspiro; + homepage = "https://github.com/fontforge/libspiro"; license = licenses.gpl3Plus; maintainers = [ maintainers.erictapen ]; }; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 1b0953df4e6..69cd24dfd6e 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -84,7 +84,7 @@ else stdenv.mkDerivation { meta = with stdenv.lib; { description = "Spotify API library"; - homepage = https://developer.spotify.com/technologies/libspotify; + homepage = "https://developer.spotify.com/technologies/libspotify"; maintainers = with maintainers; [ lovek323 ]; license = licenses.unfree; }; diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix index f8fc6a446d1..0d186204f92 100644 --- a/pkgs/development/libraries/libsrs2/default.nix +++ b/pkgs/development/libraries/libsrs2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "The next generation SRS library from the original designer of SRS"; license = with lib.licenses; [ gpl2 bsd3 ]; - homepage = https://www.libsrs2.org/; + homepage = "https://www.libsrs2.org/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index 65de6db3b47..bf6e0a491f2 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }: stdenv.mkDerivation rec { - name = "libssh-0.8.7"; + pname = "libssh"; + version = "0.8.8"; src = fetchurl { - url = "https://www.libssh.org/files/0.8/${name}.tar.xz"; - sha256 = "14nmwfnnrhkwcfk5hn7azl905ivbh4wllmsbw5abd80b5yi4qc23"; + url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; + sha256 = "1qk5bm9r6199jbfk54f8w24vkl52051g8s3kmq4z2kdc6vbpy4jb"; }; postPatch = '' @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SSH client library"; + homepage = "https://libssh.org"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ sander ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix index 365c836c9fd..5cc0232e17d 100644 --- a/pkgs/development/libraries/libssh2/default.nix +++ b/pkgs/development/libraries/libssh2/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A client-side C library implementing the SSH2 protocol"; - homepage = https://www.libssh2.org; + homepage = "https://www.libssh2.org"; platforms = platforms.all; license = licenses.bsd3; maintainers = [ ]; diff --git a/pkgs/development/libraries/libstatgrab/default.nix b/pkgs/development/libraries/libstatgrab/default.nix index e10dffa96c1..70a632dd4a7 100644 --- a/pkgs/development/libraries/libstatgrab/default.nix +++ b/pkgs/development/libraries/libstatgrab/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [] ++ stdenv.lib.optional stdenv.isDarwin IOKit; meta = with stdenv.lib; { - homepage = https://www.i-scream.org/libstatgrab/; + homepage = "https://www.i-scream.org/libstatgrab/"; description = "A library that provides cross platforms access to statistics about the running system"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libstroke/default.nix b/pkgs/development/libraries/libstroke/default.nix index 400a107c518..534ad7afc71 100644 --- a/pkgs/development/libraries/libstroke/default.nix +++ b/pkgs/development/libraries/libstroke/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libstroke-0.5.1"; src = fetchurl { - url = https://web.archive.org/web/20161204100704/http://etla.net/libstroke/libstroke-0.5.1.tar.gz; + url = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/libstroke-0.5.1.tar.gz"; sha256 = "0bbpqzsqh9zrc6cg62f6vp1p4dzvv37blsd0gdlzdskgwvyzba8d"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Libstroke, a library for simple gesture recognition"; - homepage = https://web.archive.org/web/20161204100704/http://etla.net/libstroke/; + homepage = "https://web.archive.org/web/20161204100704/http://etla.net/libstroke/"; license = stdenv.lib.licenses.gpl2; longDescription = diff --git a/pkgs/development/libraries/libsvm/default.nix b/pkgs/development/libraries/libsvm/default.nix index 99eccc3436f..0709f3867e4 100644 --- a/pkgs/development/libraries/libsvm/default.nix +++ b/pkgs/development/libraries/libsvm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for support vector machines"; - homepage = https://www.csie.ntu.edu.tw/~cjlin/libsvm/; + homepage = "https://www.csie.ntu.edu.tw/~cjlin/libsvm/"; license = licenses.bsd3; maintainers = [ maintainers.spwhitt ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libsystemtap/default.nix b/pkgs/development/libraries/libsystemtap/default.nix index ecfa3377c99..b46a848a041 100644 --- a/pkgs/development/libraries/libsystemtap/default.nix +++ b/pkgs/development/libraries/libsystemtap/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "3.2"; src = fetchgit { - url = git://sourceware.org/git/systemtap.git; + url = "git://sourceware.org/git/systemtap.git"; rev = "4051c70c9318c837981384cbb23f3e9eb1bd0892"; sha256 = "0sd8n3j3rishks3gyqj2jyqhps7hmlfjyz8i0w8v98cczhhh04rq"; fetchSubmodules = false; diff --git a/pkgs/development/libraries/libtap/default.nix b/pkgs/development/libraries/libtap/default.nix index ca0407bd0aa..a06db32e84f 100644 --- a/pkgs/development/libraries/libtap/default.nix +++ b/pkgs/development/libraries/libtap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec{ C originally created by Nik Clayton. This is a maintenance branch by Shlomi Fish. ''; - homepage = https://www.shlomifish.org/open-source/projects/libtap/; + homepage = "https://www.shlomifish.org/open-source/projects/libtap/"; license = licenses.bsd3; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index c4614103b3f..a31fde0d31d 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for manipulating POSIX tar files"; - homepage = https://repo.or.cz/libtar; + homepage = "https://repo.or.cz/libtar"; license = licenses.bsd3; platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index d266817c5d7..90dde37a416 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { null; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/libtasn1/; + homepage = "https://www.gnu.org/software/libtasn1/"; description = "An ASN.1 library"; longDescription = '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index d81f3f82001..c8c59b15f3a 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "API for roguelike games"; - homepage = http://roguecentral.org/doryen/libtcod/; + homepage = "http://roguecentral.org/doryen/libtcod/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.skeidel ]; diff --git a/pkgs/development/libraries/libtelnet/default.nix b/pkgs/development/libraries/libtelnet/default.nix index 043acee0cfe..df500cd7a41 100644 --- a/pkgs/development/libraries/libtelnet/default.nix +++ b/pkgs/development/libraries/libtelnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Simple RFC-complient TELNET implementation as a C library"; - homepage = https://github.com/seanmiddleditch/libtelnet; + homepage = "https://github.com/seanmiddleditch/libtelnet"; license = stdenv.lib.licenses.publicDomain; maintainers = [ stdenv.lib.maintainers.tomberek ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/libtermkey/default.nix b/pkgs/development/libraries/libtermkey/default.nix index 989d26b64e1..bb2e1b05bce 100644 --- a/pkgs/development/libraries/libtermkey/default.nix +++ b/pkgs/development/libraries/libtermkey/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal keypress reading library"; - homepage = http://www.leonerd.org.uk/code/libtermkey; + homepage = "http://www.leonerd.org.uk/code/libtermkey"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libtgvoip/default.nix b/pkgs/development/libraries/libtgvoip/default.nix index 80c6e7e204e..4055aea5869 100644 --- a/pkgs/development/libraries/libtgvoip/default.nix +++ b/pkgs/development/libraries/libtgvoip/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "VoIP library for Telegram clients"; license = licenses.unlicense; platforms = platforms.linux; - homepage = https://github.com/telegramdesktop/libtgvoip; + homepage = "https://github.com/telegramdesktop/libtgvoip"; maintainers = with maintainers; [ ilya-fedin ]; }; } diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix index 81bd35ff293..656204fb0ce 100644 --- a/pkgs/development/libraries/libtheora/default.nix +++ b/pkgs/development/libraries/libtheora/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.theora.org/; + homepage = "https://www.theora.org/"; description = "Library for Theora, a free and open video compression format"; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt ]; diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 795ed439093..6d410962182 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library and utilities for working with the TIFF image file format"; - homepage = http://download.osgeo.org/libtiff; + homepage = "http://download.osgeo.org/libtiff"; license = licenses.libtiff; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libtiger/default.nix b/pkgs/development/libraries/libtiger/default.nix index 7a72fa2b7a3..fbc726a4519 100644 --- a/pkgs/development/libraries/libtiger/default.nix +++ b/pkgs/development/libraries/libtiger/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.ApplicationServices; meta = { - homepage = https://code.google.com/archive/p/libtiger/; + homepage = "https://code.google.com/archive/p/libtiger/"; description = "A rendering library for Kate streams using Pango and Cairo"; platforms = lib.platforms.unix; license = lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/libtomcrypt/default.nix b/pkgs/development/libraries/libtomcrypt/default.nix index 6520ddd0a9e..d9e9df59324 100644 --- a/pkgs/development/libraries/libtomcrypt/default.nix +++ b/pkgs/development/libraries/libtomcrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.libtom.net/LibTomCrypt/; + homepage = "https://www.libtom.net/LibTomCrypt/"; description = "A fairly comprehensive, modular and portable cryptographic toolkit"; license = with licenses; [ publicDomain wtfpl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libtommath/default.nix b/pkgs/development/libraries/libtommath/default.nix index 0fde422b9aa..9a0a2def4b7 100644 --- a/pkgs/development/libraries/libtommath/default.nix +++ b/pkgs/development/libraries/libtommath/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.libtom.net/LibTomMath/; + homepage = "https://www.libtom.net/LibTomMath/"; description = "A library for integer-based number-theoretic applications"; license = with licenses; [ publicDomain wtfpl ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 26605eb41db..f910964a2ca 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.1.11"; + version = "1.2.5"; formattedVersion = lib.replaceChars ["."] ["_"] version; # Make sure we override python, so the correct version is chosen @@ -17,13 +17,14 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; - rev = "libtorrent_${formattedVersion}"; + rev = "libtorrent-${formattedVersion}"; sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l"; }; enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ]; + preConfigure = "./autotool.sh"; postInstall = '' diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 76362f8f883..996613d5ffc 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -41,7 +41,7 @@ let meta = with stdenv.lib; { description = "P2P FOSS instant messaging application aimed to replace Skype"; - homepage = https://tox.chat; + homepage = "https://tox.chat"; license = licenses.gpl3Plus; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libtsm/default.nix b/pkgs/development/libraries/libtsm/default.nix index 18ceb530229..ebeb927aaa4 100644 --- a/pkgs/development/libraries/libtsm/default.nix +++ b/pkgs/development/libraries/libtsm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Terminal-emulator State Machine"; - homepage = http://www.freedesktop.org/wiki/Software/kmscon/libtsm/; + homepage = "http://www.freedesktop.org/wiki/Software/kmscon/libtsm/"; license = licenses.mit; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 600b1fb510a..4e65e457110 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ libGL libGLU ]; meta = with stdenv.lib; { - homepage = http://dri.freedesktop.org/wiki/S3TC; - repositories.git = git://people.freedesktop.org/~mareko/libtxc_dxtn; + homepage = "http://dri.freedesktop.org/wiki/S3TC"; + repositories.git = "git://people.freedesktop.org/~mareko/libtxc_dxtn"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index f9f44f5a653..bb69c0dec0a 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { meta = { description = "A patent-free S3TC compatible implementation"; - homepage = https://github.com/divVerent/s2tc; - repositories.git = https://github.com/divVerent/s2tc.git; + homepage = "https://github.com/divVerent/s2tc"; + repositories.git = "https://github.com/divVerent/s2tc.git"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.cpages ]; diff --git a/pkgs/development/libraries/libu2f-host/default.nix b/pkgs/development/libraries/libu2f-host/default.nix index 61fefc7d4db..3becd075b25 100644 --- a/pkgs/development/libraries/libu2f-host/default.nix +++ b/pkgs/development/libraries/libu2f-host/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/libu2f-host; + 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 ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libu2f-server/default.nix b/pkgs/development/libraries/libu2f-server/default.nix index 6140c13e493..be5658914d1 100644 --- a/pkgs/development/libraries/libu2f-server/default.nix +++ b/pkgs/development/libraries/libu2f-server/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ json_c openssl check file help2man which gengetopt ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/libu2f-server/; + homepage = "https://developers.yubico.com/libu2f-server/"; description = "A C library that implements the server-side of the U2F protocol"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix index 14704cee01c..7b6a85cec07 100644 --- a/pkgs/development/libraries/libuchardet/default.nix +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mozilla's Universal Charset Detector C/C++ API"; - homepage = https://www.freedesktop.org/wiki/Software/uchardet/; + homepage = "https://www.freedesktop.org/wiki/Software/uchardet/"; license = licenses.mpl11; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix index 7080edcd738..ff6801ef18f 100644 --- a/pkgs/development/libraries/libuecc/default.nix +++ b/pkgs/development/libraries/libuecc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Very small Elliptic Curve Cryptography library"; - homepage = https://git.universe-factory.net/libuecc; + homepage = "https://git.universe-factory.net/libuecc"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 57385d1b410..c009c786672 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/andlabs/libui; + 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; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libunarr/default.nix b/pkgs/development/libraries/libunarr/default.nix index 35ec5dfed7c..3bc5f137091 100644 --- a/pkgs/development/libraries/libunarr/default.nix +++ b/pkgs/development/libraries/libunarr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/selmf/unarr; + 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 7e75954fb45..5b549176889 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://vimgadgets.sourceforge.net/libunibreak/; + homepage = "http://vimgadgets.sourceforge.net/libunibreak/"; description = "A library implementing a line breaking algorithm as described in Unicode 6.0.0 Standard"; license = licenses.zlib; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libuninameslist/default.nix b/pkgs/development/libraries/libuninameslist/default.nix index 5d4cc61fe7a..2e29aafdbdd 100644 --- a/pkgs/development/libraries/libuninameslist/default.nix +++ b/pkgs/development/libraries/libuninameslist/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libuninameslist"; - version = "20190701"; + version = "20200313"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256:034c8clnskvqbwyiq7si4dad1kbngi3jmnrj064i39msqixmpdzb"; + sha256 = "1rs4mrmfcw7864kssnk559ac1sdlpl8yrd10xspxrnfz08ynqxw8"; }; nativeBuildInputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/fontforge/libuninameslist/; + homepage = "https://github.com/fontforge/libuninameslist/"; description = "A Library of Unicode names and annotation data"; license = licenses.bsd3; maintainers = with maintainers; [ erictapen ]; diff --git a/pkgs/development/libraries/libunique/3.x.nix b/pkgs/development/libraries/libunique/3.x.nix index b315d0f16b0..e960117125e 100644 --- a/pkgs/development/libraries/libunique/3.x.nix +++ b/pkgs/development/libraries/libunique/3.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ]; meta = { - homepage = https://wiki.gnome.org/Attic/LibUnique; + homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; license = licenses.lgpl21; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index d6566978a6b..502fd27ebb6 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Attic/LibUnique"; description = "A library for writing single instance applications"; license = stdenv.lib.licenses.lgpl21; - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 2c9a13788c5..f0cc73ba4e9 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = { - homepage = https://www.gnu.org/software/libunistring/; + homepage = "https://www.gnu.org/software/libunistring/"; description = "Unicode string library"; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index daaf3de6bcc..037e84069b4 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library for instrumenting and integrating with all aspects of the Unity shell"; - homepage = https://launchpad.net/libunity; + homepage = "https://launchpad.net/libunity"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ worldofpeace ]; diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index 70e6b698ec5..d6367fbd198 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, xz }: +{ stdenv, lib, fetchurl, autoreconfHook, xz }: stdenv.mkDerivation rec { pname = "libunwind"; @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { patches = [ ./backtrace-only-with-glibc.patch ]; + postPatch = lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace configure.ac --replace "-lgcc_s" "-lgcc_eh" + ''; + nativeBuildInputs = [ autoreconfHook ]; outputs = [ "out" "dev" ]; @@ -26,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with stdenv.lib; { - homepage = https://www.nongnu.org/libunwind; + homepage = "https://www.nongnu.org/libunwind"; description = "A portable and efficient API to determine the call-chain of a program"; maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index 3ed45e788c4..5292ec9d7e0 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace RCU (read-copy-update) library"; - homepage = https://lttng.org/urcu; + homepage = "https://lttng.org/urcu"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index de7d092373b..1b1aa8a4e04 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace library for the Linux io_uring API"; - homepage = https://git.kernel.dk/cgit/liburing/; + homepage = "https://git.kernel.dk/cgit/liburing/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix index 681b2eef456..2830ef28458 100644 --- a/pkgs/development/libraries/libusb/default.nix +++ b/pkgs/development/libraries/libusb/default.nix @@ -1,14 +1,22 @@ -{stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libusb1}: +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, patchelf +, pkgconfig +, libusb1 +}: stdenv.mkDerivation rec { - name = "libusb-compat-${version}"; + pname = "libusb-compat"; version = "0.1.7"; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure outputBin = "dev"; - nativeBuildInputs = [ pkgconfig autoreconfHook ]; - propagatedBuildInputs = [ libusb1 ]; + nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ]; + + buildInputs = [ libusb1 ]; src = fetchFromGitHub { owner = "libusb"; @@ -19,6 +27,12 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; + # without this, libusb-compat is unable to find libusb1 + postFixup = '' + find $out/lib -name \*.so\* -type f -exec \ + patchelf --set-rpath ${lib.makeLibraryPath buildInputs} {} \; + ''; + meta = with stdenv.lib; { homepage = "https://libusb.info/"; repositories.git = "https://github.com/libusb/libusb-compat-0.1"; diff --git a/pkgs/development/libraries/libusbmuxd/default.nix b/pkgs/development/libraries/libusbmuxd/default.nix index debccb9087d..f4c4dbfcf71 100644 --- a/pkgs/development/libraries/libusbmuxd/default.nix +++ b/pkgs/development/libraries/libusbmuxd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A client library to multiplex connections from and to iOS devices"; - homepage = https://github.com/libimobiledevice/libusbmuxd; + homepage = "https://github.com/libimobiledevice/libusbmuxd"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 0b9e394559c..d9f90306584 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.34.2"; + version = "1.35.0"; pname = "libuv"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "14ax49daz7j86lybi242jiry49jrnnvlyc39k6va700n03py4h9n"; + sha256 = "0pd94h10ay38r8fwj0qqgw908rrj83n768n8mbbpnd5w2c7wy9fz"; }; postPatch = let @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A multi-platform support library with a focus on asynchronous I/O"; - homepage = https://github.com/libuv/libuv; + homepage = "https://github.com/libuv/libuv"; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; license = with licenses; [ mit isc bsd2 bsd3 cc-by-40 ]; diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index c604ce71cb7..a3c7cf05cfb 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VAAPI tools: Video Acceleration API"; - homepage = http://www.freedesktop.org/wiki/Software/vaapi; + homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libva/1.0.0.nix b/pkgs/development/libraries/libva/1.0.0.nix index 9b12f83bcb8..1debefed0ad 100644 --- a/pkgs/development/libraries/libva/1.0.0.nix +++ b/pkgs/development/libraries/libva/1.0.0.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ]; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/vaapi; + homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; license = licenses.mit; description = "VAAPI library: Video Acceleration API"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 0d00c9cb253..1c8e78a3a37 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VAAPI library: Video Acceleration API"; - homepage = http://www.freedesktop.org/wiki/Software/vaapi; + homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 039e3308f88..cfc74a8a759 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails. needs DRI access meta = with stdenv.lib; { - homepage = https://github.com/i-rinat/libvdpau-va-gl; + homepage = "https://github.com/i-rinat/libvdpau-va-gl"; description = "VDPAU driver with OpenGL/VAAPI backend"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 977081e0ecf..7b1602523a0 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lX11"; meta = with stdenv.lib; { - homepage = https://people.freedesktop.org/~aplattner/vdpau/; + 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 platforms = platforms.unix; diff --git a/pkgs/development/libraries/libversion/default.nix b/pkgs/development/libraries/libversion/default.nix index 5d1449e3530..e1dc591f8b5 100644 --- a/pkgs/development/libraries/libversion/default.nix +++ b/pkgs/development/libraries/libversion/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced version string comparison library"; - homepage = https://github.com/repology/libversion; + homepage = "https://github.com/repology/libversion"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ryantm ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libviper/default.nix b/pkgs/development/libraries/libviper/default.nix index 6ca3d997e65..f9c695aedf7 100644 --- a/pkgs/development/libraries/libviper/default.nix +++ b/pkgs/development/libraries/libviper/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses gpm]; meta = with stdenv.lib; { - homepage = http://libviper.sourceforge.net/; + homepage = "http://libviper.sourceforge.net/"; description = "Simple window creation and management facilities for the console"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index 7dd874ebc83..bf8d0b373f0 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { - libvirt-gconfig - GObjects for manipulating libvirt XML documents - libvirt-gobject - GObjects for managing libvirt objects ''; - homepage = https://libvirt.org/; + homepage = "https://libvirt.org/"; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libvirt/5.9.0.nix b/pkgs/development/libraries/libvirt/5.9.0.nix new file mode 100644 index 00000000000..514cf24f66e --- /dev/null +++ b/pkgs/development/libraries/libvirt/5.9.0.nix @@ -0,0 +1,136 @@ +{ stdenv, fetchurl, fetchgit +, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch +, coreutils, libxml2, gnutls, perl, python2, attr +, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext +, libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor +, dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages +, curl, libiconv, gmp, zfs, parted, bridge-utils, dmidecode, glib +, enableXen ? false, xen ? null +, enableIscsi ? false, openiscsi +, enableCeph ? false, ceph +}: + +with stdenv.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; +in stdenv.mkDerivation rec { + pname = "libvirt"; + version = "5.9.0"; + + src = + if buildFromTarball then + fetchurl { + url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; + sha256 = "0fc9jxw3v6x5hc10bkd7bbcayn24hbld5adj2gh5s648v7hx55il"; + } + else + fetchgit { + url = "git://libvirt.org/libvirt.git"; + rev = "v${version}"; + sha256 = "0smm77ag8bg24xkbhl4akqikjrsq2pd3wk31nj0hk1avqnl00gmk"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ + libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib + ] ++ optionals (!buildFromTarball) [ + libtool autoconf automake + ] ++ optionals stdenv.isLinux [ + libpciaccess lvm2 utillinux systemd libnl numad zfs + libapparmor libcap_ng numactl attr parted + ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ + xen + ] ++ optionals enableIscsi [ + openiscsi + ] ++ optionals enableCeph [ + ceph + ] ++ optionals stdenv.isDarwin [ + libiconv gmp + ]; + + 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 + # 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 + ''; + + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/var/lib" + "--with-libpcap" + "--with-qemu" + "--with-vmware" + "--with-vbox" + "--with-test" + "--with-esx" + "--with-remote" + ] ++ 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" + "--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" + ] ++ optionals stdenv.isDarwin [ + "--with-init-script=none" + ]; + + installFlags = [ + "localstatedir=$(TMPDIR)/var" + "sysconfdir=$(out)/var/lib" + ]; + + + postInstall = let + binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ 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 + # Added in nixpkgs: + gettext() { "${gettext}/bin/gettext" "$@"; } + ' + '' + optionalString stdenv.isLinux '' + substituteInPlace $out/lib/systemd/system/libvirtd.service --replace /bin/kill ${coreutils}/bin/kill + rm $out/lib/systemd/system/{virtlockd,virtlogd}.* + wrapProgram $out/sbin/libvirtd \ + --prefix PATH : /run/libvirt/nix-emulators:${makeBinPath binPath} + ''; + + enableParallelBuilding = true; + + NIX_CFLAGS_COMPILE = "-fno-stack-protector"; + + meta = { + homepage = "http://libvirt.org/"; + repositories.git = "git://libvirt.org/libvirt.git"; + description = '' + A toolkit to interact with the virtualization capabilities of recent + versions of Linux (and other OSes) + ''; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz globin ]; + }; +} diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 44cdd9edf52..c1b34879eef 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit -, pkgconfig, makeWrapper, libtool, autoconf, automake, fetchpatch -, coreutils, libxml2, gnutls, perl, python2, attr +, pkgconfig, makeWrapper, autoreconfHook, fetchpatch +, coreutils, libxml2, gnutls, perl, python2, attr, glib, docutils , iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext , libtasn1, ebtables, libgcrypt, yajl, pmutils, libcap_ng, libapparmor , dnsmasq, libnl, libpcap, libxslt, xhtml1, numad, numactl, perlPackages @@ -17,52 +17,26 @@ let buildFromTarball = stdenv.isDarwin; in stdenv.mkDerivation rec { pname = "libvirt"; - version = "5.4.0"; + version = "6.2.0"; src = if buildFromTarball then fetchurl { url = "http://libvirt.org/sources/${pname}-${version}.tar.xz"; - sha256 = "0ywf8m9yz2hxnic7fylzlmgy4m353r4vv5zsvp89zq5yh4h81yhw"; + sha256 = "1c8grqf751blsgs15wx2p05wvankdrady6290vwc85v94cgqij5f"; } else fetchgit { - url = git://libvirt.org/libvirt.git; + url = "git://libvirt.org/libvirt.git"; rev = "v${version}"; - sha256 = "1dja1mf295w0sl83zag62c4j55cfbzzfbhdxpkyv2zm3zv0mwdyc"; + sha256 = "1wyihi8bhwsck9b7f3b8yhlz145sjdyyj3ykjiszrqnp0y99xxy2"; fetchSubmodules = true; }; - patches = optionals (!stdenv.isDarwin) [ - (fetchpatch { - name = "5.4.0-CVE-2019-10161.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=aed6a032cead4386472afb24b16196579e239580"; - sha256 = "19k9z9xx68nf03igbgy1imxnlp5ppj7cgdbq9kri3s834hkjcygs"; - }) - ] ++ [ - (fetchpatch { - name = "5.4.0-CVE-2019-10166.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=db0b78457f183e4c7ac45bc94de86044a1e2056a"; - sha256 = "17pd1rab2mxj4q0vg30vi2gh78mf52ik1p5l12wrghb0wjf7swml"; - }) - (fetchpatch { - name = "5.4.0-CVE-2019-10167.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=8afa68bac0cf99d1f8aaa6566685c43c22622f26"; - sha256 = "0hgbwk0y2n6ihzjk8vqabhw914axjqgzcb7c5xx893r86c54c0ml"; - }) - (fetchpatch { - name = "5.4.0-CVE-2019-10168.patch"; - url = "https://libvirt.org/git/?p=libvirt.git;a=patch;h=bf6c2830b6c338b1f5699b095df36f374777b291"; - sha256 = "0s4hc3hsjncx1852ndjas1nng9v23pxf4mi1jxcajsqvhw89la0g"; - }) - ]; - - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ makeWrapper pkgconfig docutils ] ++ optionals (!buildFromTarball) [ autoreconfHook ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap - ] ++ optionals (!buildFromTarball) [ - libtool autoconf automake + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib ] ++ optionals stdenv.isLinux [ libpciaccess lvm2 utillinux systemd libnl numad zfs libapparmor libcap_ng numactl attr parted @@ -77,18 +51,19 @@ 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 - # 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 ''; + configureScript = "../configure"; + + dontAddDisableDepTrack = true; + configureFlags = [ "--localstatedir=/var" "--sysconfdir=/var/lib" @@ -125,7 +100,6 @@ in stdenv.mkDerivation rec { "sysconfdir=$(out)/var/lib" ]; - postInstall = let binPath = [ iptables iproute pmutils numad numactl bridge-utils dmidecode dnsmasq ebtables ] ++ optionals enableIscsi [ openiscsi ]; in '' @@ -150,8 +124,8 @@ in stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fno-stack-protector"; meta = { - homepage = http://libvirt.org/; - repositories.git = git://libvirt.org/libvirt.git; + homepage = "http://libvirt.org/"; + repositories.git = "git://libvirt.org/libvirt.git"; description = '' A toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes) diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix index b807691671f..b84ba92e2bf 100644 --- a/pkgs/development/libraries/libvisio/default.nix +++ b/pkgs/development/libraries/libvisio/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library providing ability to interpret and import visio diagrams into various applications"; - homepage = https://wiki.documentfoundation.org/DLP/Libraries/libvisio; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio"; license = licenses.mpl20; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 6e8e2d95b6b..8880daed88e 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "An abstraction library for audio visualisations"; - homepage = https://sourceforge.net/projects/libvisual/; + homepage = "https://sourceforge.net/projects/libvisual/"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index 263fa0a5216..c867b73c317 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch"; sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x"; - name = "CVE-2017-14160"; + name = "CVE-2017-14160+CVE-2018-10393.patch"; }) (fetchpatch { url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vorbis audio compression reference implementation"; - homepage = https://xiph.org/vorbis/; + homepage = "https://xiph.org/vorbis/"; license = licenses.bsd3; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libvpx/1_8.nix b/pkgs/development/libraries/libvpx/1_8.nix new file mode 100644 index 00000000000..c82b7a674ac --- /dev/null +++ b/pkgs/development/libraries/libvpx/1_8.nix @@ -0,0 +1,183 @@ +{ stdenv, fetchFromGitHub, perl, yasm +, vp8DecoderSupport ? true # VP8 decoder +, vp8EncoderSupport ? true # VP8 encoder +, vp9DecoderSupport ? true # VP9 decoder +, vp9EncoderSupport ? true # VP9 encoder +, extraWarningsSupport ? false # emit non-fatal warnings +, werrorSupport ? false # treat warnings as errors (not available with all compilers) +, debugSupport ? false # debug mode +, gprofSupport ? false # gprof profiling instrumentation +, gcovSupport ? false # gcov coverage instrumentation +, sizeLimitSupport ? true # limit max size to allow in the decoder +, optimizationsSupport ? true # compiler optimization flags +, runtimeCpuDetectSupport ? true # detect cpu capabilities at runtime +, thumbSupport ? false # build arm assembly in thumb mode +, examplesSupport ? true # build examples (vpxdec & vpxenc are part of examples) +, debugLibsSupport ? false # include debug version of each library +, postprocSupport ? true # postprocessing +, multithreadSupport ? true # multithreaded decoding & encoding +, internalStatsSupport ? false # output of encoder internal stats for debug, if supported (encoders) +, spatialResamplingSupport ? true # spatial sampling (scaling) +, realtimeOnlySupport ? false # build for real-time encoding +, ontheflyBitpackingSupport ? false # on-the-fly bitpacking in real-time encoding +, errorConcealmentSupport ? false # decoder conceals losses +, smallSupport ? false # favor smaller binary over speed +, postprocVisualizerSupport ? false # macro block/block level visualizers +, unitTestsSupport ? false, curl ? null, coreutils ? null # unit tests +, webmIOSupport ? true # input from and output to webm container +, libyuvSupport ? true # libyuv +, decodePerfTestsSupport ? false # build decoder perf tests with unit tests +, encodePerfTestsSupport ? false # build encoder perf tests with unit tests +, multiResEncodingSupport ? false # multiple-resolution encoding +, temporalDenoisingSupport ? true # use temporal denoising instead of spatial denoising +, coefficientRangeCheckingSupport ? false # decoder checks if intermediate transform coefficients are in valid range +, vp9HighbitdepthSupport ? true # 10/12 bit color support in VP9 +# Experimental features +, experimentalSpatialSvcSupport ? false # Spatial scalable video coding +, experimentalFpMbStatsSupport ? false +, experimentalEmulateHardwareSupport ? false +}: + +let + inherit (stdenv) is64bit isMips isDarwin isCygwin; + inherit (stdenv.lib) enableFeature optional optionals; +in + +assert vp8DecoderSupport || vp8EncoderSupport || vp9DecoderSupport || vp9EncoderSupport; +assert internalStatsSupport && (vp9DecoderSupport || vp9EncoderSupport) -> postprocSupport; +/* If spatialResamplingSupport not enabled, build will fail with undeclared variable errors. + Variables called in vpx_scale/generic/vpx_scale.c are declared by vpx_scale/vpx_scale_rtcd.pl, + but is only executed if spatialResamplingSupport is enabled */ +assert spatialResamplingSupport; +assert postprocVisualizerSupport -> postprocSupport; +assert unitTestsSupport -> curl != null && coreutils != null; +assert vp9HighbitdepthSupport -> (vp9DecoderSupport || vp9EncoderSupport); +assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; + +stdenv.mkDerivation rec { + pname = "libvpx"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "webmproject"; + repo = "libvpx"; + rev = "v${version}"; + sha256 = "0gyq4fkbd2fv7m1mm9xrvn6rk6f4jsmbv8bnlhingmnrvyncnmnr"; + }; + + patches = [ +# ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch + ]; + + postPatch = ''patchShebangs .''; + + outputs = [ "bin" "dev" "out" ]; + setOutputFlags = false; + + configurePlatforms = []; + configureFlags = [ + (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8") + (enableFeature vp8EncoderSupport "vp8-encoder") + (enableFeature vp8DecoderSupport "vp8-decoder") + (enableFeature (vp9EncoderSupport || vp9DecoderSupport) "vp9") + (enableFeature vp9EncoderSupport "vp9-encoder") + (enableFeature vp9DecoderSupport "vp9-decoder") + (enableFeature extraWarningsSupport "extra-warnings") + (enableFeature werrorSupport "werror") + "--disable-install-docs" + (enableFeature examplesSupport "install-bins") + "--enable-install-libs" + "--disable-install-srcs" + (enableFeature debugSupport "debug") + (enableFeature gprofSupport "gprof") + (enableFeature gcovSupport "gcov") + # Required to build shared libraries + (enableFeature (!isCygwin) "pic") + (enableFeature optimizationsSupport "optimizations") + (enableFeature runtimeCpuDetectSupport "runtime-cpu-detect") + (enableFeature thumbSupport "thumb") + "--enable-libs" + (enableFeature examplesSupport "examples") + "--disable-docs" + "--as=yasm" + # Limit default decoder max to WHXGA + (if sizeLimitSupport then "--size-limit=5120x3200" else null) + "--disable-codec-srcs" + (enableFeature debugLibsSupport "debug-libs") + (enableFeature isMips "dequant-tokens") + (enableFeature isMips "dc-recon") + (enableFeature postprocSupport "postproc") + (enableFeature (postprocSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-postproc") + (enableFeature multithreadSupport "multithread") + (enableFeature internalStatsSupport "internal-stats") + (enableFeature spatialResamplingSupport "spatial-resampling") + (enableFeature realtimeOnlySupport "realtime-only") + (enableFeature ontheflyBitpackingSupport "onthefly-bitpacking") + (enableFeature errorConcealmentSupport "error-concealment") + # Shared libraries are only supported on ELF platforms + (if isDarwin || isCygwin then + "--enable-static --disable-shared" + else + "--enable-shared") + (enableFeature smallSupport "small") + (enableFeature postprocVisualizerSupport "postproc-visualizer") + (enableFeature unitTestsSupport "unit-tests") + (enableFeature webmIOSupport "webm-io") + (enableFeature libyuvSupport "libyuv") + (enableFeature decodePerfTestsSupport "decode-perf-tests") + (enableFeature encodePerfTestsSupport "encode-perf-tests") + (enableFeature multiResEncodingSupport "multi-res-encoding") + (enableFeature temporalDenoisingSupport "temporal-denoising") + (enableFeature (temporalDenoisingSupport && (vp9DecoderSupport || vp9EncoderSupport)) "vp9-temporal-denoising") + (enableFeature coefficientRangeCheckingSupport "coefficient-range-checking") + (enableFeature (vp9HighbitdepthSupport && is64bit) "vp9-highbitdepth") + (enableFeature (experimentalSpatialSvcSupport || + experimentalFpMbStatsSupport || + experimentalEmulateHardwareSupport) "experimental") + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + #"--extra-cflags=" + #"--extra-cxxflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" + # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) + # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure + # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 + "--force-target=${stdenv.hostPlatform.config}${ + if stdenv.hostPlatform.isDarwin then + if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" + else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" + else if stdenv.hostPlatform.osxMinVersion == "10.8" then "12" + else if stdenv.hostPlatform.osxMinVersion == "10.7" then "11" + else if stdenv.hostPlatform.osxMinVersion == "10.6" then "10" + else if stdenv.hostPlatform.osxMinVersion == "10.5" then "9" + else "8" + else ""}-gcc" + (if stdenv.hostPlatform.isCygwin then "--enable-static-msvcrt" else "") + ] # Experimental features + ++ optional experimentalSpatialSvcSupport "--enable-spatial-svc" + ++ optional experimentalFpMbStatsSupport "--enable-fp-mb-stats" + ++ optional experimentalEmulateHardwareSupport "--enable-emulate-hardware"; + + nativeBuildInputs = [ perl yasm ]; + + buildInputs = [ ] + ++ optionals unitTestsSupport [ coreutils curl ]; + + NIX_LDFLAGS = [ + "-lpthread" # fixes linker errors + ]; + + enableParallelBuilding = true; + + postInstall = ''moveToOutput bin "$bin" ''; + + meta = with stdenv.lib; { + description = "WebM VP8/VP9 codec SDK"; + homepage = "https://www.webmproject.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ codyopel ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index ddde03e2876..ca3ec9856c2 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -171,7 +171,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebM VP8/VP9 codec SDK"; - homepage = https://www.webmproject.org/; + homepage = "https://www.webmproject.org/"; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libvterm-neovim/default.nix b/pkgs/development/libraries/libvterm-neovim/default.nix index 0cd1b64c1b9..ca50345f5b2 100644 --- a/pkgs/development/libraries/libvterm-neovim/default.nix +++ b/pkgs/development/libraries/libvterm-neovim/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "VT220/xterm/ECMA-48 terminal emulator library"; - homepage = http://www.leonerd.org.uk/code/libvterm/; + homepage = "http://www.leonerd.org.uk/code/libvterm/"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libvterm/default.nix b/pkgs/development/libraries/libvterm/default.nix index 472539ea24b..40324ec4932 100644 --- a/pkgs/development/libraries/libvterm/default.nix +++ b/pkgs/development/libraries/libvterm/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ncurses ]; meta = with stdenv.lib; { - homepage = http://libvterm.sourceforge.net/; + homepage = "http://libvterm.sourceforge.net/"; description = "Terminal emulator library to mimic both vt100 and rxvt"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 7d7dd94eff4..0b350c15026 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://linuxwacom.github.io/; + homepage = "https://linuxwacom.github.io/"; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; license = licenses.mit; }; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 56c3f638d52..d2a98c4a847 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools and library for the WebP image format"; - homepage = https://developers.google.com/speed/webp/; + homepage = "https://developers.google.com/speed/webp/"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/libwebsockets/default.nix b/pkgs/development/libraries/libwebsockets/default.nix index 732a529c21f..ddafc9bc659 100644 --- a/pkgs/development/libraries/libwebsockets/default.nix +++ b/pkgs/development/libraries/libwebsockets/default.nix @@ -17,6 +17,7 @@ let nativeBuildInputs = [ cmake ]; cmakeFlags = [ "-DLWS_WITH_PLUGINS=ON" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=unused-but-set-variable"; meta = with stdenv.lib; { description = "Light, portable C library for websockets"; @@ -39,9 +40,12 @@ rec { }; libwebsockets_3_2 = generic { - version = "3.2.0"; - sha256 = "0ac5755h3w1pl6cznqbvg63dwkqy544fqlhvqyp7s11hgs7jx6l8"; + version = "3.2.2"; + sha256 = "0m1kn4p167jv63zvwhsvmdn8azx3q7fkk8qc0fclwyps2scz6dna"; }; - libwebsockets = libwebsockets_3_2; + libwebsockets_4_0 = generic { + version = "4.0.1"; + sha256 = "1pf7km0w5q7dqlwcwqizdpfqgg10prfq8g2c093f5nghwsfv8mmf"; + }; } diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 29692c41c93..9f60abd4f59 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -21,26 +21,16 @@ stdenv.mkDerivation rec{ pname = "libwnck"; - version = "3.32.0"; + version = "3.36.0"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1jp3p1lnwnwi6fxl2rz3166cmwzwy9vqz896anpwc3wdy9f875cm"; + sha256 = "0pwjdhca9lz2n1gf9b60xf0m6ipf9snp8rqf9csj4pgdnd882l5w"; }; - patches = [ - # https://gitlab.gnome.org/GNOME/libwnck/issues/139 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/libwnck/commit/0d9ff7db63af568feef8e8c566e249058ccfcb4e.patch; - sha256 = "18f78aayq9jma54v2qz3rm2clmz1cfq5bngxw8p4zba7hplyqsl9"; - }) - # https://gitlab.gnome.org/GNOME/libwnck/merge_requests/12 - ./fix-pc-file.patch - ]; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/development/libraries/libwpd/0.8.nix b/pkgs/development/libraries/libwpd/0.8.nix index 736b1a45fa2..f47208cda44 100644 --- a/pkgs/development/libraries/libwpd/0.8.nix +++ b/pkgs/development/libraries/libwpd/0.8.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for importing WordPerfect documents"; - homepage = http://libwpd.sourceforge.net; + homepage = "http://libwpd.sourceforge.net"; license = with licenses; [ lgpl21 mpl20 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libwpd/default.nix b/pkgs/development/libraries/libwpd/default.nix index 56c598ca7de..3464c55805d 100644 --- a/pkgs/development/libraries/libwpd/default.nix +++ b/pkgs/development/libraries/libwpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for importing and exporting WordPerfect documents"; - homepage = http://libwpd.sourceforge.net/; + homepage = "http://libwpd.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/libwpg/default.nix b/pkgs/development/libraries/libwpg/default.nix index e80cefe16e2..c844daf51f0 100644 --- a/pkgs/development/libraries/libwpg/default.nix +++ b/pkgs/development/libraries/libwpg/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = http://libwpg.sourceforge.net; + homepage = "http://libwpg.sourceforge.net"; description = "C++ library to parse WPG"; license = with licenses; [ lgpl21 mpl20 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix index 61b777a5243..047e3063f79 100644 --- a/pkgs/development/libraries/libwps/default.nix +++ b/pkgs/development/libraries/libwps/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error=implicit-fallthrough"; meta = with stdenv.lib; { - homepage = http://libwps.sourceforge.net/; + homepage = "http://libwps.sourceforge.net/"; description = "Microsoft Works document format import filter library"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index fede13fcd9b..3f687ad26c8 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library of exchange-correlation functionals for density-functional theory"; - homepage = https://octopus-code.org/wiki/Libxc; + homepage = "https://octopus-code.org/wiki/Libxc"; license = licenses.lgpl3; 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 fb1f4b29423..9ecfa0ffd1a 100644 --- a/pkgs/development/libraries/libxcomp/default.nix +++ b/pkgs/development/libraries/libxcomp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NX compression library"; - homepage = http://wiki.x2go.org/doku.php/wiki:libs:nx-libs; + homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libxdg-basedir/default.nix b/pkgs/development/libraries/libxdg-basedir/default.nix index f0e63efc0d1..fdf62e38269 100644 --- a/pkgs/development/libraries/libxdg-basedir/default.nix +++ b/pkgs/development/libraries/libxdg-basedir/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/devnev/libxdg-basedir; + homepage = "https://github.com/devnev/libxdg-basedir"; description = "Implementation of the XDG Base Directory specification"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix index db99107fe35..6ed331a8a6b 100644 --- a/pkgs/development/libraries/libxkbcommon/default.nix +++ b/pkgs/development/libraries/libxkbcommon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; - homepage = https://xkbcommon.org; + homepage = "https://xkbcommon.org"; license = licenses.mit; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix index 510955d0af2..a73fb7cb870 100644 --- a/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix +++ b/pkgs/development/libraries/libxkbcommon/libxkbcommon_7.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to handle keyboard descriptions"; - homepage = https://xkbcommon.org; + homepage = "https://xkbcommon.org"; license = licenses.mit; maintainers = with maintainers; [ ttuegel ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix index b088ba198b2..febe7f7b38c 100644 --- a/pkgs/development/libraries/libxklavier/default.nix +++ b/pkgs/development/libraries/libxklavier/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library providing high-level API for X Keyboard Extension known as XKB"; - homepage = http://freedesktop.org/wiki/Software/LibXklavier; + homepage = "http://freedesktop.org/wiki/Software/LibXklavier"; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libxls/default.nix b/pkgs/development/libraries/libxls/default.nix index c111a13d298..2b28499864a 100644 --- a/pkgs/development/libraries/libxls/default.nix +++ b/pkgs/development/libraries/libxls/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract Cell Data From Excel xls files"; - homepage = https://sourceforge.net/projects/libxls/; + homepage = "https://sourceforge.net/projects/libxls/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index aff5f8ac445..89b96467155 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libxmi-1.2"; src = fetchurl { - url = mirror://gnu/libxmi/libxmi-1.2.tar.gz; + url = "mirror://gnu/libxmi/libxmi-1.2.tar.gz"; sha256 = "03d4ikh29l38rl1wavb0icw7m5pp7yilnv7bb2k8qij1dinsymlx"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Library for rasterizing 2-D vector graphics"; - homepage = https://www.gnu.org/software/libxmi/; + homepage = "https://www.gnu.org/software/libxmi/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index c07a5699f92..7c39d803906 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -32,6 +32,11 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/GNOME/libxml2/commit/0e1a49c8907645d2e155f0d89d4d9895ac5112b5.patch"; sha256 = "0klvaxkzakkpyq0m44l9xrpn5kwaii194sqsivfm6zhnb9hhl15l"; }) + (fetchpatch { + name = "CVE-2019-20388.patch"; + url = "https://gitlab.gnome.org/GNOME/libxml2/commit/6088a74bcf7d0c42e24cff4594d804e1d3c9fbca.patch"; + sha256 = "070s7al2r2k92320h9cdfc2097jy4kk04d0disc98ddc165r80jl"; + }) ]; outputs = [ "bin" "dev" "out" "man" "doc" ] @@ -82,7 +87,7 @@ stdenv.mkDerivation rec { passthru = { inherit version; pythonSupport = pythonSupport; }; meta = { - homepage = http://xmlsoft.org/; + homepage = "http://xmlsoft.org/"; description = "An XML parsing library for C"; license = lib.licenses.mit; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix index 94c2ca09582..be5c019e31e 100644 --- a/pkgs/development/libraries/libxmlxx/v3.nix +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://libxmlplusplus.sourceforge.net/; + homepage = "http://libxmlplusplus.sourceforge.net/"; description = "C++ wrapper for the libxml2 XML parser library, version 3"; license = licenses.lgpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libxnd/default.nix b/pkgs/development/libraries/libxnd/default.nix index eb031eb2a9d..7313b2582be 100644 --- a/pkgs/development/libraries/libxnd/default.nix +++ b/pkgs/development/libraries/libxnd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "C library for managing typed memory blocks and Python container module"; - homepage = https://xnd.io/; + homepage = "https://xnd.io/"; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index 6d12329a7f5..a03fca12581 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -3,9 +3,6 @@ , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform }: -assert pythonSupport -> python != null; -assert pythonSupport -> libxml2.pythonSupport; - with stdenv.lib; stdenv.mkDerivation rec { @@ -48,10 +45,11 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://xmlsoft.org/XSLT/; + homepage = "http://xmlsoft.org/XSLT/"; description = "A C library and tools to do XSL transformations"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.eelco ]; + broken = !(pythonSupport -> libxml2.pythonSupport); # see #73102 for why this is not an assert }; } diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 143555137d7..c555341f993 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://pyyaml.org/; + homepage = "https://pyyaml.org/"; description = "A YAML 1.1 parser and emitter written in C"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index e1bf4fca7b5..ea900477f35 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Yubikey C client library"; - homepage = https://developers.yubico.com/yubico-c-client; + homepage = "https://developers.yubico.com/yubico-c-client"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/libykneomgr/default.nix b/pkgs/development/libraries/libykneomgr/default.nix index be493828486..cb4f3bec011 100644 --- a/pkgs/development/libraries/libykneomgr/default.nix +++ b/pkgs/development/libraries/libykneomgr/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/libykneomgr; + homepage = "https://developers.yubico.com/libykneomgr"; description = "A C library to interact with the CCID-part of the Yubikey NEO"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libyubikey/default.nix b/pkgs/development/libraries/libyubikey/default.nix index 010eecb0fa9..75170d7ff8a 100644 --- a/pkgs/development/libraries/libyubikey/default.nix +++ b/pkgs/development/libraries/libyubikey/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://opensource.yubico.com/yubico-c/; + homepage = "http://opensource.yubico.com/yubico-c/"; description = "C library for manipulating Yubico YubiKey One-Time Passwords (OTPs)"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 215535fb8f1..187c163a6f1 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; - homepage = https://wiki.gnome.org/Projects/Zapojit; + homepage = "https://wiki.gnome.org/Projects/Zapojit"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix index fbbfb5364b0..80a570dd697 100644 --- a/pkgs/development/libraries/libzen/default.nix +++ b/pkgs/development/libraries/libzen/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook }: stdenv.mkDerivation rec { - version = "0.4.37"; + version = "0.4.38"; pname = "libzen"; src = fetchurl { url = "https://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; - sha256 = "1hcsrmn85b0xp0mp33aazk7g071q1v3f163nnhv8b0mv9c4bgsfn"; + sha256 = "1nkygc17sndznpcf71fdrhwpm8z9a3hc9csqlafwswh49axhfkjr"; }; nativeBuildInputs = [ autoreconfHook ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shared library for libmediainfo and mediainfo"; - homepage = https://mediaarea.net/; + homepage = "https://mediaarea.net/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.devhell ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 1a23e91848e..79933d402f7 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libzip"; - version = "1.6.0"; + version = "1.6.1"; src = fetchurl { url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; - sha256 = "1zsspz6cbbqah11jkcc894jgxihlm8gicfh54yvny9gc3lsvpi3h"; + sha256 = "120xgf7cgjmz9d3yp10lks6lhkgxqb4skbmbiiwf46gx868qxsq6"; }; # Fix pkgconfig file paths @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.nih.at/libzip; + homepage = "https://www.nih.at/libzip"; description = "A C library for reading, creating and modifying zip archives"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/libzmf/default.nix b/pkgs/development/libraries/libzmf/default.nix index 85b9308237f..d3cbc430efc 100644 --- a/pkgs/development/libraries/libzmf/default.nix +++ b/pkgs/development/libraries/libzmf/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mpl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = https://wiki.documentfoundation.org/DLP/Libraries/libzmf; + homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libzmf"; downloadPage = "http://dev-www.libreoffice.org/src/libzmf/"; updateWalker = true; }; diff --git a/pkgs/development/libraries/lief/default.nix b/pkgs/development/libraries/lief/default.nix index 410c60bff9f..0854987436e 100644 --- a/pkgs/development/libraries/lief/default.nix +++ b/pkgs/development/libraries/lief/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip }: fetchzip { - url = https://github.com/lief-project/LIEF/releases/download/0.9.0/LIEF-0.9.0-Linux.tar.gz; + 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; { description = "Library to Instrument Executable Formats"; - homepage = https://lief.quarkslab.com/; + homepage = "https://lief.quarkslab.com/"; license = [ licenses.asl20 ]; platforms = platforms.linux; maintainers = [ maintainers.lassulus ]; diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 24d99e691a2..65d0a18cedd 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://www.gnu.org/software/lightning/; + homepage = "https://www.gnu.org/software/lightning/"; description = "Run-time code generation library"; longDescription = '' GNU lightning is a library that generates assembly language code diff --git a/pkgs/development/libraries/lime/default.nix b/pkgs/development/libraries/lime/default.nix new file mode 100644 index 00000000000..3ebcc7ad78a --- /dev/null +++ b/pkgs/development/libraries/lime/default.nix @@ -0,0 +1,36 @@ +{ bctoolbox +, belle-sip +, cmake +, fetchFromGitLab +, soci +, sqlite +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "lime"; + version = "4.3.1"; + + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = version; + sha256 = "1ilpp9ai4sah23ngnxisvmwhrv5jkk5f831yp7smpl225z5nv83g"; + }; + + buildInputs = [ bctoolbox soci belle-sip sqlite ]; + nativeBuildInputs = [ cmake ]; + + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + + meta = with stdenv.lib; { + description = "End-to-end encryption library for instant messaging"; + homepage = "http://www.linphone.org/technical-corner/lime"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 709a237aed9..006c774e9a1 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.timokau]; platforms = stdenv.lib.platforms.unix; - homepage = https://linalg.org/; + homepage = "https://linalg.org/"; }; } diff --git a/pkgs/development/libraries/linenoise-ng/default.nix b/pkgs/development/libraries/linenoise-ng/default.nix index b105aa64bff..0a2dacb48db 100644 --- a/pkgs/development/libraries/linenoise-ng/default.nix +++ b/pkgs/development/libraries/linenoise-ng/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = { - homepage = https://github.com/arangodb/linenoise-ng; + 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; diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix index 0098116563a..3de9f08bf97 100644 --- a/pkgs/development/libraries/linenoise/default.nix +++ b/pkgs/development/libraries/linenoise/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/antirez/linenoise; + 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; diff --git a/pkgs/development/libraries/liquid-dsp/default.nix b/pkgs/development/libraries/liquid-dsp/default.nix index 8c691f77591..b882e233c07 100644 --- a/pkgs/development/libraries/liquid-dsp/default.nix +++ b/pkgs/development/libraries/liquid-dsp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook ]; meta = { - homepage = https://liquidsdr.org/; + homepage = "https://liquidsdr.org/"; description = "Digital signal processing library for software-defined radios"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 74952456e64..1beae81ad16 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; license = stdenv.lib.licenses.bsd2; - homepage = https://google.github.io/liquidfun/; + homepage = "https://google.github.io/liquidfun/"; }; } diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 13fbe2b55b6..30d114122b6 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows to receive and send infrared signals"; - homepage = http://www.lirc.org/; + homepage = "http://www.lirc.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index 25bac68faf6..513e842edfa 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { offering the persistence of standard disk-based databases, and is only limited to the size of the virtual address space. ''; - homepage = http://symas.com/mdb/; + homepage = "http://symas.com/mdb/"; maintainers = with maintainers; [ jb55 vcunat ]; license = licenses.openldap; platforms = platforms.all; diff --git a/pkgs/development/libraries/loadcaffe/default.nix b/pkgs/development/libraries/loadcaffe/default.nix deleted file mode 100644 index c4e55b14407..00000000000 --- a/pkgs/development/libraries/loadcaffe/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchFromGitHub, cmake, torch, protobuf, protobufc}: -stdenv.mkDerivation rec { - pname = "loadcaffe"; - version = "0.0pre2016.08.01"; - buildInputs = [cmake torch protobuf protobufc]; - src = fetchFromGitHub { - owner = "szagoruyko"; - repo = "loadcaffe"; - rev = "9be65cf6fa08e9333eae3553f68a8082debe9978"; - sha256 = "0b22hvd9nvjsan2h93nl6y34kkkbs36d0k1zr3csjfb5l13xz0lh"; - }; - meta = { - inherit version; - description = ''Torch7 loader for Caffe networks''; - license = stdenv.lib.licenses.bsd2 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/log4cplus/default.nix b/pkgs/development/libraries/log4cplus/default.nix index 3a4b182dd94..097ff0c48c9 100644 --- a/pkgs/development/libraries/log4cplus/default.nix +++ b/pkgs/development/libraries/log4cplus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; meta = { - homepage = http://log4cplus.sourceforge.net/; + 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; diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix index 04b91e5d80f..cec0ec9ab28 100644 --- a/pkgs/development/libraries/log4cxx/default.nix +++ b/pkgs/development/libraries/log4cxx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool ]; meta = { - homepage = https://logging.apache.org/log4cxx/index.html; + 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; diff --git a/pkgs/development/libraries/log4shib/default.nix b/pkgs/development/libraries/log4shib/default.nix index ccf246c044e..17046d17b78 100644 --- a/pkgs/development/libraries/log4shib/default.nix +++ b/pkgs/development/libraries/log4shib/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation { description = "A forked version of log4cpp that has been created for the Shibboleth project"; maintainers = [ maintainers.jammerful ]; license = licenses.lgpl21; - homepage = http://log4cpp.sf.net; + homepage = "http://log4cpp.sf.net"; }; } diff --git a/pkgs/development/libraries/loki/default.nix b/pkgs/development/libraries/loki/default.nix index 631233f0ecb..9c7e36113d8 100644 --- a/pkgs/development/libraries/loki/default.nix +++ b/pkgs/development/libraries/loki/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C++ library of designs, containing flexible implementations of common design patterns and idioms"; - homepage = http://loki-lib.sourceforge.net; + homepage = "http://loki-lib.sourceforge.net"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/libraries/lrdf/default.nix b/pkgs/development/libraries/lrdf/default.nix index 264c18b09ee..80c8702b0b9 100644 --- a/pkgs/development/libraries/lrdf/default.nix +++ b/pkgs/development/libraries/lrdf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight RDF library with special support for LADSPA plugins"; - homepage = https://sourceforge.net/projects/lrdf/; + homepage = "https://sourceforge.net/projects/lrdf/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix index 7ca7456f789..eded6b6527f 100644 --- a/pkgs/development/libraries/luabind/default.nix +++ b/pkgs/development/libraries/luabind/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://github.com/luabind/luabind; + 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; diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix index 32eec84e69e..3d54cf5e7c1 100644 --- a/pkgs/development/libraries/lucene++/default.nix +++ b/pkgs/development/libraries/lucene++/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ port of the popular Java Lucene search engine"; - homepage = https://github.com/luceneplusplus/LucenePlusPlus; + homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index c7667b554f4..446f9146414 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { while still decompressing at this very high speed. ''; - homepage = http://www.oberhumer.com/opensource/lzo; + homepage = "http://www.oberhumer.com/opensource/lzo"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix index 7355248b5c5..a896b9261d5 100644 --- a/pkgs/development/libraries/mac/default.nix +++ b/pkgs/development/libraries/mac/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "APE codec and decompressor"; - homepage = http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php; + homepage = "http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix index 04f2208a35d..75e3439db81 100644 --- a/pkgs/development/libraries/mailcore2/default.nix +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP"; - homepage = http://libmailcore.com; + homepage = "http://libmailcore.com"; license = licenses.bsd3; maintainers = with maintainers; [ cstrahan ]; }; diff --git a/pkgs/development/libraries/malcontent/better-separation.patch b/pkgs/development/libraries/malcontent/better-separation.patch new file mode 100644 index 00000000000..cd91760bff5 --- /dev/null +++ b/pkgs/development/libraries/malcontent/better-separation.patch @@ -0,0 +1,35 @@ +diff --git a/meson.build b/meson.build +index a6c477d..f7b2f0a 100644 +--- a/meson.build ++++ b/meson.build +@@ -125,8 +125,8 @@ test_env = [ + 'LC_ALL=C.UTF-8', + ] + +-subdir('accounts-service') + if not get_option('use_system_libmalcontent') ++ subdir('accounts-service') + subdir('libmalcontent') + else + libmalcontent_api_version = '0' +@@ -137,11 +137,17 @@ endif + if get_option('ui').enabled() + subdir('libmalcontent-ui') + endif +-subdir('malcontent-client') ++if not get_option('use_system_libmalcontent') ++ subdir('malcontent-client') ++endif + if get_option('ui').enabled() + subdir('malcontent-control') + endif +-subdir('pam') ++if not get_option('use_system_libmalcontent') ++ subdir('pam') ++endif + subdir('po') + +-meson.add_install_script('build-aux/meson_post_install.py') ++if get_option('ui').enabled() ++ meson.add_install_script('build-aux/meson_post_install.py') ++endif diff --git a/pkgs/development/libraries/malcontent/default.nix b/pkgs/development/libraries/malcontent/default.nix index bd8988390c9..bf2ec772507 100644 --- a/pkgs/development/libraries/malcontent/default.nix +++ b/pkgs/development/libraries/malcontent/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkgconfig @@ -9,10 +10,7 @@ , coreutils , accountsservice , dbus -, flatpak -, gtk3 , pam -, desktop-file-utils , polkit , glib-testing , python3 @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { pname = "malcontent"; - version = "0.6.0"; + version = "0.7.0"; outputs = [ "bin" "out" "dev" "man" "installedTests" ]; @@ -30,16 +28,22 @@ stdenv.mkDerivation rec { owner = "pwithnall"; repo = pname; rev = version; - sha256 = "COh6N3CmLIcxx6tW4jcP0m6TZv0Z1YJUM/nlG0RzYHQ="; + sha256 = "cP2l6nl6cuBQYwkmBj8APu/vH3jTeScXf3ffcuSfqlM="; }; patches = [ # Allow installing installed tests to a separate output. ./installed-tests-path.patch - # This is unnecessary and breaks when submodules are not available. - # https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/3 - ./use-system-dependencies.patch + # Do not build things that are part of malcontent-ui package + ./better-separation.patch + + # Fix pam installed test + # https://gitlab.freedesktop.org/pwithnall/malcontent/merge_requests/50 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pwithnall/malcontent/commit/5d102eeb0604e65fc977ca77d4b249e986e634cc.patch"; + sha256 = "5PD/eJBw/8Uqcia7ena9mu45DgREBFj0zUJpcd0vQ+8="; + }) ]; nativeBuildInputs = [ @@ -47,15 +51,12 @@ stdenv.mkDerivation rec { ninja pkgconfig gobject-introspection - desktop-file-utils wrapGAppsHook ]; buildInputs = [ accountsservice dbus - flatpak - gtk3 pam polkit glib-testing @@ -71,6 +72,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dinstalled_tests=true" "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Dui=disabled" ]; postPatch = '' diff --git a/pkgs/development/libraries/malcontent/installed-tests-path.patch b/pkgs/development/libraries/malcontent/installed-tests-path.patch index ac87ddf6ccb..5d26c0f864f 100644 --- a/pkgs/development/libraries/malcontent/installed-tests-path.patch +++ b/pkgs/development/libraries/malcontent/installed-tests-path.patch @@ -22,12 +22,12 @@ index 610bc35..13e0713 100644 \ No newline at end of file +endforeach diff --git a/meson_options.txt b/meson_options.txt -index 06329d4..72aa505 100644 +index d516c70..583cb94 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -9,3 +9,9 @@ option( - type: 'string', - description: 'directory for PAM modules' +@@ -4,6 +4,12 @@ option( + value: false, + description: 'enable installed tests' ) +option( + 'installed_test_prefix', @@ -35,6 +35,9 @@ index 06329d4..72aa505 100644 + value: '', + description: 'Prefix for installed tests' +) + option( + 'pamlibdir', + type: 'string', diff --git a/pam/tests/meson.build b/pam/tests/meson.build index 0560dcb..a74dab2 100644 --- a/pam/tests/meson.build diff --git a/pkgs/development/libraries/malcontent/ui.nix b/pkgs/development/libraries/malcontent/ui.nix new file mode 100644 index 00000000000..af1fa6b4138 --- /dev/null +++ b/pkgs/development/libraries/malcontent/ui.nix @@ -0,0 +1,70 @@ +{ stdenv +, meson +, ninja +, pkg-config +, gobject-introspection +, wrapGAppsHook +, glib +, accountsservice +, dbus +, flatpak +, malcontent +, gtk3 +, desktop-file-utils +, polkit +, glib-testing +}: + +stdenv.mkDerivation rec { + pname = "malcontent-ui"; + + inherit (malcontent) version src; + + outputs = [ "bin" "out" "dev" ]; + + patches = [ + # Allow installing installed tests to a separate output. + ./installed-tests-path.patch + + # Do not build things that are part of malcontent package + ./better-separation.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gobject-introspection + desktop-file-utils + wrapGAppsHook + ]; + + buildInputs = [ + dbus + polkit + glib-testing + flatpak + ]; + + propagatedBuildInputs = [ + accountsservice + malcontent + glib + gtk3 + ]; + + mesonFlags = [ + "-Dinstalled_tests=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + "-Duse_system_libmalcontent=true" + "-Dui=enabled" + ]; + + meta = with stdenv.lib; { + description = "UI components for parental controls library"; + homepage = "https://gitlab.freedesktop.org/pwithnall/malcontent"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/malcontent/use-system-dependencies.patch b/pkgs/development/libraries/malcontent/use-system-dependencies.patch deleted file mode 100644 index 8920b1f4a99..00000000000 --- a/pkgs/development/libraries/malcontent/use-system-dependencies.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/meson.build b/meson.build -index 3575224..0abea63 100644 ---- a/meson.build -+++ b/meson.build -@@ -40,9 +40,8 @@ polkit_gobject = dependency('polkit-gobject-1') - polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', - define_variable: ['prefix', prefix]) - --libglib_testing = subproject('libglib-testing') - libglib_testing_dep = dependency( -- 'libglib-testing', -+ 'glib-testing-0', - fallback: ['libglib-testing', 'libglib_testing_dep'], - ) - diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 351b38b3345..cf0539fe266 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source toolkit for developing mapping applications"; - homepage = https://mapnik.org; + homepage = "https://mapnik.org"; maintainers = with maintainers; [ hrdinka ]; license = licenses.lgpl21; platforms = platforms.all; diff --git a/pkgs/development/libraries/marisa/default.nix b/pkgs/development/libraries/marisa/default.nix index 4b06c58af5f..9a4d178d3d2 100644 --- a/pkgs/development/libraries/marisa/default.nix +++ b/pkgs/development/libraries/marisa/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/s-yata/marisa-trie; + homepage = "https://github.com/s-yata/marisa-trie"; description = "Static and space-efficient trie data structure library"; license = licenses.bsd3; maintainers = with maintainers; [ sifmelcara ]; diff --git a/pkgs/development/libraries/martyr/default.nix b/pkgs/development/libraries/martyr/default.nix index cec9e5adc29..4254bfe82ea 100644 --- a/pkgs/development/libraries/martyr/default.nix +++ b/pkgs/development/libraries/martyr/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Martyr is a Java framework around the IRC protocol to allow application writers easy manipulation of the protocol and client state"; - homepage = http://martyr.sourceforge.net/; + homepage = "http://martyr.sourceforge.net/"; license = stdenv.lib.licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix index 9f8f34e0a80..e12280a088b 100644 --- a/pkgs/development/libraries/matio/default.nix +++ b/pkgs/development/libraries/matio/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; - homepage = http://matio.sourceforge.net/; + homepage = "http://matio.sourceforge.net/"; }; } diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix index 603b9be610a..f24232ac7ae 100644 --- a/pkgs/development/libraries/mbedtls/default.nix +++ b/pkgs/development/libraries/mbedtls/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DUSE_SHARED_MBEDTLS_LIBRARY=on" ]; meta = with stdenv.lib; { - homepage = https://tls.mbed.org/; + homepage = "https://tls.mbed.org/"; description = "Portable cryptographic and TLS library, formerly known as PolarSSL"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index cdc3dfa5ca0..ce7aeb910d0 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - homepage = https://gitlab.com/mdds/mdds; + homepage = "https://gitlab.com/mdds/mdds"; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index 04ebfced52e..7a5688a1b71 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library to read and write MED files"; - homepage = http://salome-platform.org/; + homepage = "http://salome-platform.org/"; platforms = platforms.linux; license = licenses.lgpl3Plus; }; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 0204223d127..5f7daa83b2f 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,37 +1,97 @@ -{ stdenv, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm -, libopus, ffmpeg, libX11, libXv, libGLU, libGL, glew, libtheora, libvpx, SDL, libupnp -, ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen -, python, libXext, libmatroska, fetchpatch +{ alsaLib +, bctoolbox +, bzrtp +, cmake +, doxygen +, fetchFromGitLab +, fetchpatch +, ffmpeg +, glew +, gsm +, intltool +, libGL +, libGLU +, libX11 +, libXext +, libXv +, libmatroska +, libopus +, libpcap +, libpulseaudio +, libtheora +, libupnp +, libv4l +, libvpx +, ortp +, pkgconfig +, python +, SDL +, speex +, srtp +, stdenv }: stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "2.16.1"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-20"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; - rev = version; - sha256 = "02745bzl2r1jqvdqzyv94fjd4w92zr976la4c4nfvsy52waqah7j"; + rev = "c5eecb72cb44376d142949051dd0cb7c982608fb"; + sha256 = "1vp260jxvjlmrmjdl4p23prg4cjln20a7z6zq8dqvfh4iq3ya033"; }; patches = [ - (fetchpatch { - name = "allow-build-without-git.patch"; - url = "https://github.com/BelledonneCommunications/mediastreamer2/commit/de3a24b795d7a78e78eab6b974e7ec5abf2259ac.patch"; - sha256 = "1zqkrab42n4dha0knfsyj4q0wc229ma125gk9grj67ps7r7ipscy"; - }) + # Plugins directory is normally fixed during compile time. This patch makes + # it possible to set the plugins directory run time with an environment + # variable MEDIASTREAMER_PLUGINS_DIR. This makes it possible to construct a + # plugin directory with desired plugins and wrap executables so that the + # environment variable points to that directory. ./plugins_dir.patch ]; - nativeBuildInputs = [ pkgconfig intltool cmake doxygen python ]; + nativeBuildInputs = [ + cmake + doxygen + intltool + pkgconfig + python + ]; propagatedBuildInputs = [ - alsaLib libpulseaudio speex gsm libopus - ffmpeg libX11 libXv libGLU libGL glew libtheora libvpx SDL libupnp - ortp libv4l libpcap srtp bctoolbox libXext libmatroska + alsaLib + bctoolbox + bzrtp + ffmpeg + glew + gsm + libGL + libGLU + libX11 + libXext + libXv + libmatroska + libopus + libpcap + libpulseaudio + libtheora + libupnp + libv4l + libvpx + ortp + SDL + speex + srtp ]; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = toString [ "-DGIT_VERSION=\"v${version}\"" "-Wno-error=deprecated-declarations" @@ -43,8 +103,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A powerful and lightweight streaming engine specialized for voice/video telephony applications"; - homepage = http://www.linphone.org/technical-corner/mediastreamer2; - license = licenses.gpl2; + homepage = "http://www.linphone.org/technical-corner/mediastreamer2"; + license = licenses.gpl3; platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/mediastreamer/msopenh264.nix b/pkgs/development/libraries/mediastreamer/msopenh264.nix index f1e9fc30151..45b3c83bfe2 100644 --- a/pkgs/development/libraries/mediastreamer/msopenh264.nix +++ b/pkgs/development/libraries/mediastreamer/msopenh264.nix @@ -1,31 +1,49 @@ -{ stdenv, autoreconfHook, pkgconfig, mediastreamer, openh264 -, fetchurl, fetchpatch, cmake +{ autoreconfHook +, cmake +, fetchFromGitLab +, fetchpatch +, mediastreamer +, openh264 +, pkgconfig +, stdenv }: stdenv.mkDerivation rec { - pname = "mediastreamer-openh264"; - version = "1.2.1"; + pname = "msopenh264"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-03"; - src = fetchurl { - url = "https://www.linphone.org/releases/sources/plugins/msopenh264/msopenh264-${version}.tar.gz"; - sha256 = "0rdxgazm52560g52pp6mp3mwx6j1z3h2zyizzfycp8y8zi92fqm8"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = "2c3abf52824ad23a4caae7565ef158ef91767704"; + sha256 = "140hs5lzpshzswvl39klcypankq3v2qck41696j22my7s4wsa0hr"; }; - patches = [ - (fetchpatch { - name = "msopenh264-build-with-openh264-v2.patch"; - url = "https://git.pld-linux.org/?p=packages/mediastreamer-plugin-msopenh264.git;a=blob_plain;f=mediastreamer-plugin-msopenh264-openh264.patch;hb=344b8af379701a7e58b4ffb3cbac1517eff079fd"; - sha256 = "10c24b0afchx78q28176pd8iz7i1nlf57f6v6lyqxpz60fm5nrcc"; - }) - ]; - nativeBuildInputs = [ autoreconfHook cmake pkgconfig ]; buildInputs = [ mediastreamer openh264 ]; + # Do not build static libraries + cmakeFlags = [ + "-DENABLE_STATIC=NO" + "-DCMAKE_SKIP_INSTALL_RPATH=ON" + ]; + + # CMAKE_INSTALL_PREFIX has no effect so let's install manually. See: + # https://gitlab.linphone.org/BC/public/msopenh264/issues/1 + installPhase = '' + mkdir -p $out/lib/mediastreamer/plugins + cp src/libmsopenh264.so $out/lib/mediastreamer/plugins/ + ''; + meta = with stdenv.lib; { description = "H.264 encoder/decoder plugin for mediastreamer2"; homepage = "https://www.linphone.org/technical-corner/mediastreamer2"; license = licenses.gpl2; platforms = platforms.linux; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/mediastreamer/plugins_dir.patch b/pkgs/development/libraries/mediastreamer/plugins_dir.patch index e64bfc5a43a..43e398aafee 100644 --- a/pkgs/development/libraries/mediastreamer/plugins_dir.patch +++ b/pkgs/development/libraries/mediastreamer/plugins_dir.patch @@ -1,24 +1,18 @@ -diff -uNr mediastreamer2/src/base/msfactory.c mediastreamer2-new/src/base/msfactory.c ---- a/src/base/msfactory.c 2015-05-13 16:53:49.801113249 +0200 -+++ b/src/base/msfactory.c 2015-08-26 21:35:44.994724647 +0200 -@@ -630,12 +630,18 @@ +diff --git a/src/base/msfactory.c b/src/base/msfactory.c +index 14f868e3..2e3445a1 100644 +--- a/src/base/msfactory.c ++++ b/src/base/msfactory.c +@@ -770,7 +770,12 @@ void ms_factory_uninit_plugins(MSFactory *factory){ } void ms_factory_init_plugins(MSFactory *obj) { +- if (obj->plugins_dir == NULL) { + char *package_plugins_dir; - if (obj->plugins_dir == NULL) { -+ package_plugins_dir=getenv("MEDIASTREAMER_PLUGINS_DIR"); -+ if (package_plugins_dir!=NULL){ -+ obj->plugins_dir = ms_strdup(package_plugins_dir); -+ } else { - #ifdef PACKAGE_PLUGINS_DIR -- obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR); -+ obj->plugins_dir = ms_strdup(PACKAGE_PLUGINS_DIR); - #else -- obj->plugins_dir = ms_strdup(""); -+ obj->plugins_dir = ms_strdup(""); - #endif -+ } - } - if (strlen(obj->plugins_dir) > 0) { - ms_message("Loading ms plugins from [%s]",obj->plugins_dir); ++ // Force plugin dir from environment variable if set ++ package_plugins_dir = getenv("MEDIASTREAMER_PLUGINS_DIR"); ++ if (package_plugins_dir != NULL) { ++ ms_factory_set_plugins_dir(obj, package_plugins_dir); ++ } else if (obj->plugins_dir == NULL) { + #ifdef __APPLE__ + char *dir = getPluginsDir(); + if (dir != NULL) { diff --git a/pkgs/development/libraries/menu-cache/default.nix b/pkgs/development/libraries/menu-cache/default.nix index d64b7f12312..d7b39c28a42 100644 --- a/pkgs/development/libraries/menu-cache/default.nix +++ b/pkgs/development/libraries/menu-cache/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library to read freedesktop.org menu files"; - homepage = https://blog.lxde.org/tag/menu-cache/; + homepage = "https://blog.lxde.org/tag/menu-cache/"; license = licenses.gpl2Plus; maintainers = [ maintainers.ttuegel ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index dd2091c8a79..adcfeead487 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenGL utility library"; - homepage = https://cgit.freedesktop.org/mesa/glu/; + homepage = "https://cgit.freedesktop.org/mesa/glu/"; license = stdenv.lib.licenses.sgi-b-20; platforms = stdenv.lib.platforms.unix; broken = stdenv.hostPlatform.isAndroid; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 4e95e477173..7eb18dd31c1 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let - version = "19.3.3"; + version = "20.0.2"; branch = versions.major version; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "02czqdqf64i3az5p1allnxycyjad3x35cj0hz0017mi5pc84ikl1"; + sha256 = "0vz8k07d23qdwy67fnna9y0ynnni0m8lgswcmdm60l4mcv5z2m5a"; }; prePatch = "patchShebangs ."; @@ -191,8 +191,18 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - description = "An open source implementation of OpenGL"; - homepage = https://www.mesa3d.org/; + description = "An open source 3D graphics library"; + longDescription = '' + The Mesa project began as an open-source implementation of the OpenGL + specification - a system for rendering interactive 3D graphics. Over the + years the project has grown to implement more graphics APIs, including + OpenGL ES (versions 1, 2, 3), OpenCL, OpenMAX, VDPAU, VA API, XvMC, and + Vulkan. A variety of device drivers allows the Mesa libraries to be used + in many different environments ranging from software emulation to + complete hardware acceleration for modern GPUs. + ''; + homepage = "https://www.mesa3d.org/"; + changelog = "https://www.mesa3d.org/relnotes/${version}.html"; license = licenses.mit; # X11 variant, in most files platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ vcunat ]; diff --git a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index 8ce3473dd32..acf3d827c56 100644 --- a/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,4 +1,4 @@ -From 6d22383149e4cdc646c68e29238f41d895a4705b Mon Sep 17 00:00:00 2001 +From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001 From: David McFarland <corngood@gmail.com> Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key @@ -12,10 +12,10 @@ timestamps in /nix/store are zero. 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index 626baf3..579c15b 100644 +index 1a2dd8ebd12..2ac741af5a6 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -341,6 +341,12 @@ option( +@@ -348,6 +348,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -29,10 +29,10 @@ index 626baf3..579c15b 100644 'I-love-half-baked-turnips', type : 'boolean', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index 0cd92ca..fc1c173 100644 +index d1f14736725..2ed328f292e 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -395,8 +395,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -43,7 +43,7 @@ index 0cd92ca..fc1c173 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -417,6 +419,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -52,13 +52,13 @@ index 0cd92ca..fc1c173 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index f69ebe9..e2bd8e2 100644 +index 9da29cc7390..5f549bb1d99 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -158,7 +158,12 @@ _libmesa_util = static_library( - [files_mesa_util, format_srgb], +@@ -170,7 +170,12 @@ _libmesa_util = static_library( include_directories : inc_common, dependencies : deps_for_libmesa_util, + link_with: libmesa_format, - c_args : [c_msvc_compat_args, c_vis_args], + c_args : [ + c_msvc_compat_args, c_vis_args, @@ -70,5 +70,4 @@ index f69ebe9..e2bd8e2 100644 ) -- -2.24.1 - +2.25.1 diff --git a/pkgs/development/libraries/mesa/missing-includes.patch b/pkgs/development/libraries/mesa/missing-includes.patch index 18e7d5437b1..9685a1619a5 100644 --- a/pkgs/development/libraries/mesa/missing-includes.patch +++ b/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,17 +9,6 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- ./src/gallium/state_trackers/nine/threadpool.h.orig 2015-05-07 14:10:53.443337212 +0200 -+++ ./src/gallium/state_trackers/nine/threadpool.h 2015-05-07 14:11:04.210307653 +0200 -@@ -24,6 +24,8 @@ - #ifndef _THREADPOOL_H_ - #define _THREADPOOL_H_ - -+#include <pthread.h> -+ - #define MAXTHREADS 1 - - struct threadpool { --- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 +++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 @@ -23,7 +23,9 @@ diff --git a/pkgs/development/libraries/mimetic/default.nix b/pkgs/development/libraries/mimetic/default.nix index 5f4dc5eedde..06b6653f4e7 100644 --- a/pkgs/development/libraries/mimetic/default.nix +++ b/pkgs/development/libraries/mimetic/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "MIME handling library"; - homepage = http://www.codesink.org/mimetic_mime_library.html; + homepage = "http://www.codesink.org/mimetic_mime_library.html"; license = licenses.mit; maintainers = with maintainers; [ leenaars]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix index 287241a75c9..d1804b9bf95 100644 --- a/pkgs/development/libraries/miniball/default.nix +++ b/pkgs/development/libraries/miniball/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Smallest Enclosing Balls of Points"; - homepage = https://www.inf.ethz.ch/personal/gaertner/miniball.html; + 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; diff --git a/pkgs/development/libraries/minixml/default.nix b/pkgs/development/libraries/minixml/default.nix index 73b045aa964..ec575aa08fd 100644 --- a/pkgs/development/libraries/minixml/default.nix +++ b/pkgs/development/libraries/minixml/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small XML library"; - homepage = https://www.msweet.org/mxml/; + homepage = "https://www.msweet.org/mxml/"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 07c248fa58a..5b54e0894e1 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = https://www.mltframework.org; + homepage = "https://www.mltframework.org"; license = licenses.gpl3; maintainers = with maintainers; [ tohl peti ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index cb8ee0ce849..f0b45753df0 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source multimedia framework, designed for television broadcasting"; - homepage = https://www.mltframework.org/; + homepage = "https://www.mltframework.org/"; license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 49116c349a8..d011419cea7 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The official C client library for MongoDB"; - homepage = https://github.com/mongodb/mongo-c-driver; + homepage = "https://github.com/mongodb/mongo-c-driver"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/mono-addins/default.nix b/pkgs/development/libraries/mono-addins/default.nix index 2bba61975f9..d9c1636e59b 100644 --- a/pkgs/development/libraries/mono-addins/default.nix +++ b/pkgs/development/libraries/mono-addins/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://www.mono-project.com/archived/monoaddins/; + homepage = "https://www.mono-project.com/archived/monoaddins/"; description = "A generic framework for creating extensible applications"; longDescription = '' Mono.Addins is a generic framework for creating extensible applications, diff --git a/pkgs/development/libraries/motif/default.nix b/pkgs/development/libraries/motif/default.nix index ba61cb8414a..f03ba81e868 100644 --- a/pkgs/development/libraries/motif/default.nix +++ b/pkgs/development/libraries/motif/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://motif.ics.com; + homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; platforms = with platforms; linux ++ darwin; license = with licenses; [ lgpl21 ]; diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index 8162d3bb911..901d299728f 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance, high-quality video filters for the GPU"; - homepage = https://movit.sesse.net; + homepage = "https://movit.sesse.net"; license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mp4v2/default.nix b/pkgs/development/libraries/mp4v2/default.nix index f920f637960..8fe1477aa63 100644 --- a/pkgs/development/libraries/mp4v2/default.nix +++ b/pkgs/development/libraries/mp4v2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { as defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This container format is derived from Apple's QuickTime format. ''; - homepage = https://code.google.com/archive/p/mp4v2/; + homepage = "https://code.google.com/archive/p/mp4v2/"; maintainers = [ lib.maintainers.Anton-Latukha ]; platforms = lib.platforms.unix; license = lib.licenses.mpl11; diff --git a/pkgs/development/libraries/mpfi/default.nix b/pkgs/development/libraries/mpfi/default.nix index fe46336649e..88617e9a740 100644 --- a/pkgs/development/libraries/mpfi/default.nix +++ b/pkgs/development/libraries/mpfi/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A multiple precision interval arithmetic library based on MPFR''; - homepage = https://gforge.inria.fr/projects/mpfi/; + homepage = "https://gforge.inria.fr/projects/mpfi/"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index a91d220be33..ceba71ae06a 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.mpfr.org/; + homepage = "https://www.mpfr.org/"; description = "Library for multiple-precision floating-point arithmetic"; longDescription = '' diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index 21803de5e06..0c1ea8be1c8 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { the Message Passing Interface (MPI) standard, both version 1 and version 2. ''; - homepage = http://www.mcs.anl.gov/mpi/mpich2/; + homepage = "http://www.mcs.anl.gov/mpi/mpich2/"; license = { - url = http://git.mpich.org/mpich.git/blob/a385d6d0d55e83c3709ae851967ce613e892cd21:/COPYRIGHT; + url = "http://git.mpich.org/mpich.git/blob/a385d6d0d55e83c3709ae851967ce613e892cd21:/COPYRIGHT"; fullName = "MPICH license (permissive)"; }; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/libraries/mpir/default.nix b/pkgs/development/libraries/mpir/default.nix index 3b40f02c01c..8da59530ea5 100644 --- a/pkgs/development/libraries/mpir/default.nix +++ b/pkgs/development/libraries/mpir/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; downloadPage = "http://mpir.org/downloads.html"; - homepage = http://mpir.org/; + homepage = "http://mpir.org/"; updateWalker = true; }; } diff --git a/pkgs/development/libraries/msgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix index c8ea3315f8b..4cb743a38f8 100644 --- a/pkgs/development/libraries/msgpack/generic.nix +++ b/pkgs/development/libraries/msgpack/generic.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MessagePack implementation for C and C++"; - homepage = https://msgpack.org; + homepage = "https://msgpack.org"; license = licenses.asl20; maintainers = with maintainers; [ redbaron ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/msgpuck/default.nix b/pkgs/development/libraries/msgpuck/default.nix index 0ce4870272c..26066f1194f 100644 --- a/pkgs/development/libraries/msgpuck/default.nix +++ b/pkgs/development/libraries/msgpuck/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''A simple and efficient MsgPack binary serialization library in a self-contained header file''; - homepage = https://github.com/rtsisyk/msgpuck; + homepage = "https://github.com/rtsisyk/msgpuck"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/development/libraries/mtdev/default.nix b/pkgs/development/libraries/mtdev/default.nix index 7974e14040c..5c04c6a6942 100644 --- a/pkgs/development/libraries/mtdev/default.nix +++ b/pkgs/development/libraries/mtdev/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://bitmath.org/code/mtdev/; + homepage = "http://bitmath.org/code/mtdev/"; description = "Multitouch Protocol Translation Library"; longDescription = '' The mtdev is a stand-alone library which transforms all variants of diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index da41aceeef5..c4d86220081 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client API library for Matrix, built on top of Boost.Asio"; - homepage = https://github.com/Nheko-Reborn/mtxclient; + homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/multipart-parser-c/default.nix b/pkgs/development/libraries/multipart-parser-c/default.nix index 8808ccefeaf..e641b404a86 100644 --- a/pkgs/development/libraries/multipart-parser-c/default.nix +++ b/pkgs/development/libraries/multipart-parser-c/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Http multipart parser implemented in C "; - homepage = https://github.com/iafonov/multipart-parser-c; + homepage = "https://github.com/iafonov/multipart-parser-c"; license = [ stdenv.lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 4d3fe41dff8..8aac20e19d0 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [setfile]; meta = { - homepage = http://muparser.sourceforge.net; + 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; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index 37bfb05c4ee..ae40ab9f895 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { doCheck = true; meta = with stdenv.lib; { - homepage = https://ebassi.github.io/mutest/mutest.md.html; + homepage = "https://ebassi.github.io/mutest/mutest.md.html"; description = "A BDD testing framework for C, inspired by Mocha"; license = licenses.mit; maintainers = with maintainers; [ jtojnar worldofpeace ]; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index c277b7934b9..94c578f6c26 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; meta = with stdenv.lib; { - homepage = http://mygui.info/; + homepage = "http://mygui.info/"; description = "Library for creating GUIs for games and 3D applications"; license = licenses.lgpl3Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/mysocketw/default.nix b/pkgs/development/libraries/mysocketw/default.nix index 8164f4ec972..1e2e3982d55 100644 --- a/pkgs/development/libraries/mysocketw/default.nix +++ b/pkgs/development/libraries/mysocketw/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mysocketw-031026"; src = fetchurl { - url = http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz; + url = "http://www.digitalfanatics.org/cal/socketw/files/SocketW031026.tar.gz"; sha256 = "0crinikhdl7xihzmc3k3k41pgxy16d5ci8m9sza1lbibns7pdwj4"; }; diff --git a/pkgs/development/libraries/mythes/default.nix b/pkgs/development/libraries/mythes/default.nix index 01bf863bbbb..1cd8612c3bb 100644 --- a/pkgs/development/libraries/mythes/default.nix +++ b/pkgs/development/libraries/mythes/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ ncurses pkgconfig perl ]; meta = { - homepage = http://hunspell.sourceforge.net/; + homepage = "http://hunspell.sourceforge.net/"; description = "Thesaurus library from Hunspell project"; license = stdenv.lib.licenses.bsd3; inherit (hunspell.meta) platforms; diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix index 94bc8186f30..7e96d60840d 100644 --- a/pkgs/development/libraries/nanomsg/default.nix +++ b/pkgs/development/libraries/nanomsg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description= "Socket library that provides several common communication patterns"; - homepage = https://nanomsg.org/; + homepage = "https://nanomsg.org/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 8b91246b6fd..0e75bfbd5b5 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { ported to OS/2 Warp! ''; - homepage = https://www.gnu.org/software/ncurses/; + homepage = "https://www.gnu.org/software/ncurses/"; license = lib.licenses.mit; platforms = lib.platforms.all; diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index 7f08d0a7535..d461535ecef 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { "--boost-libs=${boost.out}/lib" ]; meta = with stdenv.lib; { - homepage = http://named-data.net/; + homepage = "http://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 d813d6c519c..c10b396fe0b 100644 --- a/pkgs/development/libraries/ndpi/default.nix +++ b/pkgs/development/libraries/ndpi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { longDescription = '' nDPI is a library for deep-packet inspection based on OpenDPI. ''; - homepage = https://www.ntop.org/products/deep-packet-inspection/ndpi/; + homepage = "https://www.ntop.org/products/deep-packet-inspection/ndpi/"; license = with licenses; lgpl3; maintainers = with maintainers; [ takikawa ]; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/neardal/default.nix b/pkgs/development/libraries/neardal/default.nix index a79c42a1c8f..6f0dbf032a9 100644 --- a/pkgs/development/libraries/neardal/default.nix +++ b/pkgs/development/libraries/neardal/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "C APIs to exchange datas with the NFC daemon 'Neard'"; license = licenses.lgpl2; - homepage = https://01.org/linux-nfc; + homepage = "https://01.org/linux-nfc"; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index fbffb138e96..c60f5e60fb8 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; - homepage = http://www.webdav.org/neon/; + homepage = "http://www.webdav.org/neon/"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix index ffefc8e51c4..c9a2621f440 100644 --- a/pkgs/development/libraries/neon/default.nix +++ b/pkgs/development/libraries/neon/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { - version = "0.30.2"; + version = "0.31.0"; pname = "neon"; src = fetchurl { url = "http://www.webdav.org/neon/${pname}-${version}.tar.gz"; - sha256 = "1jpvczcx658vimqm7c8my2q41fnmjaf1j03g7bsli6rjxk6xh2yv"; + sha256 = "19dx4rsqrck9jl59y4ad9jf115hzh6pz1hcl2dnlfc84hc86ymc0"; }; patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An HTTP and WebDAV client library"; - homepage = http://www.webdav.org/neon/; + homepage = "http://www.webdav.org/neon/"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 665145a92ac..526e02e8907 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ API to manipulate netcdf files"; - homepage = https://www.unidata.ucar.edu/software/netcdf/; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/netcdf-fortran/default.nix b/pkgs/development/libraries/netcdf-fortran/default.nix index c9c52636a5b..ab10c686163 100644 --- a/pkgs/development/libraries/netcdf-fortran/default.nix +++ b/pkgs/development/libraries/netcdf-fortran/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fortran API to manipulate netcdf files"; - homepage = https://www.unidata.ucar.edu/software/netcdf/; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = licenses.free; maintainers = [ maintainers.bzizou ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 1436fb02127..59d6888e2de 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -47,9 +47,9 @@ in stdenv.mkDerivation rec { meta = { description = "Libraries for the Unidata network Common Data Format"; platforms = stdenv.lib.platforms.unix; - homepage = https://www.unidata.ucar.edu/software/netcdf/; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = { - url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html; + 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 9939cbf6067..4c3c6d04ca8 100644 --- a/pkgs/development/libraries/nettle/generic.nix +++ b/pkgs/development/libraries/nettle/generic.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ({ license = licenses.gpl2Plus; - homepage = http://www.lysator.liu.se/~nisse/nettle/; + homepage = "http://www.lysator.liu.se/~nisse/nettle/"; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix index 60dc00a335d..0dade017d08 100644 --- a/pkgs/development/libraries/newt/default.nix +++ b/pkgs/development/libraries/newt/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://fedorahosted.org/newt/; + homepage = "https://fedorahosted.org/newt/"; description = "Library for color text mode, widget based user interfaces"; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 57ed5891275..939f137ac3e 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -9,14 +9,16 @@ , enableGetAssets ? false, libxml2 ? null , enableJemalloc ? false, jemalloc ? null , enableApp ? !stdenv.hostPlatform.isWindows +, enablePython ? false, python ? null, cython ? null, ncurses ? null, setuptools ? null }: assert enableHpack -> jansson != null; assert enableAsioLib -> boost != null; assert enableGetAssets -> libxml2 != null; assert enableJemalloc -> jemalloc != null; +assert enablePython -> python != null && cython != null && ncurses != null && setuptools != null; -let inherit (stdenv.lib) optional; in +let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "nghttp2"; @@ -27,7 +29,8 @@ stdenv.mkDerivation rec { sha256 = "0kyrgd4s2pq51ps5z385kw1hn62m8qp7c4h6im0g4ibrf89qwxc2"; }; - outputs = [ "bin" "out" "dev" "lib" ]; + outputs = [ "bin" "out" "dev" "lib" ] + ++ optional enablePython "python"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ] @@ -37,21 +40,36 @@ stdenv.mkDerivation rec { ++ optional enableHpack jansson ++ optional enableAsioLib boost ++ optional enableGetAssets libxml2 - ++ optional enableJemalloc jemalloc; + ++ optional enableJemalloc jemalloc + ++ optionals enablePython [ python ncurses setuptools ]; enableParallelBuilding = true; configureFlags = [ "--with-spdylay=no" "--disable-examples" - "--disable-python-bindings" (stdenv.lib.enableFeature enableApp "app") - ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib"; + ] ++ optional enableAsioLib "--enable-asio-lib --with-boost-libdir=${boost}/lib" + ++ (if enablePython then [ + "--with-cython=${cython}/bin/cython" + ] else [ + "--disable-python-bindings" + ]); + + preInstall = optionalString enablePython '' + mkdir -p $out/${python.sitePackages} + # convince installer it's ok to install here + export PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}" + ''; + postInstall = optionalString enablePython '' + mkdir -p $python/${python.sitePackages} + mv $out/${python.sitePackages}/* $python/${python.sitePackages} + ''; #doCheck = true; # requires CUnit ; currently failing at test_util_localtime_date in util_test.cc meta = with stdenv.lib; { - homepage = https://nghttp2.org/; + homepage = "https://nghttp2.org/"; description = "A C implementation of HTTP/2"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/ngt/default.nix b/pkgs/development/libraries/ngt/default.nix index c66eceb5e7f..114a438ea1e 100644 --- a/pkgs/development/libraries/ngt/default.nix +++ b/pkgs/development/libraries/ngt/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/yahoojapan/NGT; + homepage = "https://github.com/yahoojapan/NGT"; description = "Nearest Neighbor Search with Neighborhood Graph and Tree for High-dimensional Data"; platforms = platforms.linux ++ platforms.darwin; license = licenses.asl20; diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 442fcf2e761..f7a608d5c0a 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Collection of miscellaneous plugins for the nix expression language"; - homepage = https://github.com/shlevy/nix-plugins; + homepage = "https://github.com/shlevy/nix-plugins"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 43a7cf15c15..a4e76506a22 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Header only C++ library for the JSON file format"; - homepage = https://github.com/nlohmann/json; + homepage = "https://github.com/nlohmann/json"; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/npapi-sdk/default.nix b/pkgs/development/libraries/npapi-sdk/default.nix index 2cbf88633e7..c3ef724501e 100644 --- a/pkgs/development/libraries/npapi-sdk/default.nix +++ b/pkgs/development/libraries/npapi-sdk/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bundle of NPAPI headers by Mozilla"; - homepage = https://bitbucket.org/mgorny/npapi-sdk; # see also https://github.com/mozilla/npapi-sdk + homepage = "https://bitbucket.org/mgorny/npapi-sdk"; # see also https://github.com/mozilla/npapi-sdk license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index c02998184fc..51512a16057 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { compatible to GNU Pth. Experience with a Windows Pth emulation showed that this is a solid way to provide a co-routine based framework. ''; - homepage = http://www.gnupg.org; + homepage = "http://www.gnupg.org"; license = licenses.lgpl3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 5733fd41d6a..31a9f7f20d1 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.mozilla.org/projects/nspr/; + 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; license = licenses.mpl20; diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 3b3f522fdb9..8dbef28804a 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -2,7 +2,7 @@ let nssPEM = fetchurl { - url = http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz; + url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; version = "3.51"; @@ -132,7 +132,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developer.mozilla.org/en-US/docs/NSS; + 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; platforms = platforms.all; diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix index e79ef1a0cde..c03b0944778 100644 --- a/pkgs/development/libraries/nss_wrapper/default.nix +++ b/pkgs/development/libraries/nss_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "nss_wrapper-1.1.10"; + name = "nss_wrapper-1.1.11"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1fifl3allz4hwl331j6fwacc4z2fqwyxdnnkadv518ir8nza3xl8"; + sha256 = "1q5l6w69yc71ly8gcbnkrcbnq6b64cbiiv99m0z5vn5lgwp36igv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/nsss/default.nix b/pkgs/development/libraries/nsss/default.nix index 5c8bf8dedc1..3e3530215bf 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.1"; - sha256 = "1arzl4492wv42rvv6xs8h5d3qpy9nwxv5l84inzabs6s9f9nlxax"; + version = "0.0.2.2"; + sha256 = "0am195wabv63n545ykqnch9gs8cs1g5zw35k2ddxb9dnamhxfi9k"; description = "An implementation of a subset of the pwd.h, group.h and shadow.h family of functions."; diff --git a/pkgs/development/libraries/ntdb/default.nix b/pkgs/development/libraries/ntdb/default.nix index a310d2f2780..de0db887d4b 100644 --- a/pkgs/development/libraries/ntdb/default.nix +++ b/pkgs/development/libraries/ntdb/default.nix @@ -1,32 +1,48 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, gettext, libxslt -, docbook_xsl, docbook_xml_dtd_42 +{ stdenv +, fetchurl +, python3 +, pkg-config +, readline +, gettext +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, wafHook }: stdenv.mkDerivation rec { - name = "ntdb-1.0"; + pname = "ntdb"; + version = "1.0"; src = fetchurl { - url = "mirror://samba/tdb/${name}.tar.gz"; + url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; sha256 = "0jdzgrz5sr25k83yrw7wqb3r0yj1v04z4s3lhsmnr5z6n5ifhyl1"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkg-config + gettext + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 + wafHook + ]; + buildInputs = [ - python readline gettext libxslt docbook_xsl docbook_xml_dtd_42 + python3 + readline # required to build python ]; - preConfigure = '' - patchShebangs buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace,ccan" ]; meta = with stdenv.lib; { description = "The not-so trivial database"; - homepage = https://tdb.samba.org/; + homepage = "https://tdb.samba.org/"; license = licenses.lgpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix index a4d1e275a0a..0d9d39f3958 100644 --- a/pkgs/development/libraries/ntl/default.nix +++ b/pkgs/development/libraries/ntl/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; # Upstream contact: maintainer is victorshoup on GitHub. Alternatively the # email listed on the homepage. - homepage = http://www.shoup.net/ntl/; + homepage = "http://www.shoup.net/ntl/"; # also locally at "${src}/doc/tour-changes.html"; changelog = "https://www.shoup.net/ntl/doc/tour-changes.html"; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index 803906b1343..17a294adc4b 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network Connectivity Tracking library for Desktop Applications"; - homepage = https://launchpad.net/ntrack; + homepage = "https://launchpad.net/ntrack"; platforms = platforms.linux; license = licenses.lgpl3Plus; }; diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index c1f354a1ac9..0cda3d6ac9a 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.0.0"; + version = "3.1.0"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "1cyvvf5f92a777qgh00ja43z43j5nhc9dw5l3wvw9j6j9bqc4i8p"; + sha256 = "19mwjg5mz645i4ijhx93rqbcim14ca6nczymr20p0z0pn5mx5p18"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; diff --git a/pkgs/development/libraries/nvidia-texture-tools/default.nix b/pkgs/development/libraries/nvidia-texture-tools/default.nix index 70c48631981..f9b745e882f 100644 --- a/pkgs/development/libraries/nvidia-texture-tools/default.nix +++ b/pkgs/development/libraries/nvidia-texture-tools/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of cuda-enabled texture tools and compressors"; - homepage = https://github.com/castano/nvidia-texture-tools; + homepage = "https://github.com/castano/nvidia-texture-tools"; license = licenses.mit; platforms = platforms.unix; broken = stdenv.isAarch64; diff --git a/pkgs/development/libraries/nvidia-video-sdk/default.nix b/pkgs/development/libraries/nvidia-video-sdk/default.nix index b7d46cd5537..d08f7185588 100644 --- a/pkgs/development/libraries/nvidia-video-sdk/default.nix +++ b/pkgs/development/libraries/nvidia-video-sdk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The NVIDIA Video Codec SDK"; - homepage = https://developer.nvidia.com/nvidia-video-codec-sdk; + homepage = "https://developer.nvidia.com/nvidia-video-codec-sdk"; license = licenses.unfree; }; } diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 84205253554..30a8790b99a 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OpenCL ICD Loader for ${opencl-headers.name}"; - homepage = https://forge.imag.fr/projects/ocl-icd/; + homepage = "https://forge.imag.fr/projects/ocl-icd/"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/ode/default.nix b/pkgs/development/libraries/ode/default.nix index a540d89ed3b..d6047d1b192 100644 --- a/pkgs/development/libraries/ode/default.nix +++ b/pkgs/development/libraries/ode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Dynamics Engine"; - homepage = https://sourceforge.net/projects/opende; + homepage = "https://sourceforge.net/projects/opende"; platforms = platforms.linux; license = with licenses; [ bsd3 lgpl21 lgpl3 zlib ]; }; diff --git a/pkgs/development/libraries/ogre/1.10.x.nix b/pkgs/development/libraries/ogre/1.10.x.nix index b66759524fa..fe23181cfc6 100644 --- a/pkgs/development/libraries/ogre/1.10.x.nix +++ b/pkgs/development/libraries/ogre/1.10.x.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "A 3D engine"; - homepage = https://www.ogre3d.org/; + homepage = "https://www.ogre3d.org/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index ced01580185..29c83a2962e 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; - homepage = https://www.ogre3d.org/; + homepage = "https://www.ogre3d.org/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index 235da872392..491ff4edddc 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A 3D engine"; - homepage = https://www.ogre3d.org/; + homepage = "https://www.ogre3d.org/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/ogrepaged/default.nix b/pkgs/development/libraries/ogrepaged/default.nix index 0844c44c8a8..e4dc186f389 100644 --- a/pkgs/development/libraries/ogrepaged/default.nix +++ b/pkgs/development/libraries/ogrepaged/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Paged Geometry for Ogre3D"; - homepage = https://github.com/RigsOfRods/ogre-paged; + homepage = "https://github.com/RigsOfRods/ogre-paged"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/ois/default.nix b/pkgs/development/libraries/ois/default.nix index c1b065dbf2b..f750e4a685b 100644 --- a/pkgs/development/libraries/ois/default.nix +++ b/pkgs/development/libraries/ois/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch; + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-games/ois/files/ois-1.3-gcc47.patch"; sha256 = "026jw06n42bcrmg0sbdhzc4cqxsnf7fw30a2z9cigd9x282zhii8"; name = "gcc47.patch"; }) diff --git a/pkgs/development/libraries/olm/default.nix b/pkgs/development/libraries/olm/default.nix index f63d1d30f55..c84e66608f2 100644 --- a/pkgs/development/libraries/olm/default.nix +++ b/pkgs/development/libraries/olm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Implements double cryptographic ratchet and Megolm ratchet"; license = stdenv.lib.licenses.asl20; - homepage = https://matrix.org/git/olm/about; + homepage = "https://matrix.org/git/olm/about"; platforms = with stdenv.lib.platforms; darwin ++ linux; }; } diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index e4cbfc7f0b4..ccbb1e3a665 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/kkos/oniguruma; + homepage = "https://github.com/kkos/oniguruma"; description = "Regular expressions library"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index ace08ef018a..7d0a9342aa7 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "onnxruntime"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "onnxruntime"; rev = "v${version}"; - sha256 = "0chbn2wkl1w3msw0zscajinzlaaahg4w3lrpb2l8xgqdwbln0ckj"; + sha256 = "1alhb7nvlxrr9yf757gs4hkzksbk3mxyv5zcmmpl82ibl65vh55k"; # TODO: use nix-versions of grpc, onnx, eigen, googletest, etc. # submodules increase src size and compile times significantly # not currently feasible due to how integrated cmake build is with git diff --git a/pkgs/development/libraries/opae/default.nix b/pkgs/development/libraries/opae/default.nix index 46b03720d16..683f2c43bdc 100644 --- a/pkgs/development/libraries/opae/default.nix +++ b/pkgs/development/libraries/opae/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Programmable Acceleration Engine SDK"; - homepage = https://01.org/opae; + homepage = "https://01.org/opae"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 20528ac9284..efc5a18f2b0 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenAL alternative"; - homepage = https://kcat.strangesoft.net/openal.html; + homepage = "https://kcat.strangesoft.net/openal.html"; license = licenses.lgpl2; maintainers = with maintainers; [ftrvxmtrx]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openbabel/default.nix b/pkgs/development/libraries/openbabel/default.nix index 3838e1103ba..d074db7d165 100644 --- a/pkgs/development/libraries/openbabel/default.nix +++ b/pkgs/development/libraries/openbabel/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ # ARM / AArch64 fixes. (fetchpatch { - url = https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch; + url = "https://github.com/openbabel/openbabel/commit/ee11c98a655296550710db1207b294f00e168216.patch"; sha256 = "0wjqjrkr4pfirzzicdvlyr591vppydk572ix28jd2sagnfnf566g"; }) ]; diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 4d4505c3e70..1516e675d73 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Open Source Biometric Recognition"; - homepage = http://openbiometrics.org/; + homepage = "http://openbiometrics.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [flosse]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/opencl-clang/default.nix b/pkgs/development/libraries/opencl-clang/default.nix index 50794863def..8b7df317b2b 100644 --- a/pkgs/development/libraries/opencl-clang/default.nix +++ b/pkgs/development/libraries/opencl-clang/default.nix @@ -86,7 +86,7 @@ let ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/opencl-clang/; + 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; platforms = platforms.all; diff --git a/pkgs/development/libraries/opencl-headers/default.nix b/pkgs/development/libraries/opencl-headers/default.nix index d0cc6396b8d..682a547d8f3 100644 --- a/pkgs/development/libraries/opencl-headers/default.nix +++ b/pkgs/development/libraries/opencl-headers/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub -, version # "12" for "1.2", "22" for "2.2" and so on }: -stdenv.mkDerivation { - name = "opencl-headers-${version}-2017-07-18"; +stdenv.mkDerivation rec { + name = "opencl-headers-${version}"; + version = "2020.03.13"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-Headers"; - rev = "f039db6764d52388658ef15c30b2237bbda49803"; - sha256 = "0z04i330zr8czak2624q71aajdcq7ly8mb5bgala5m235qjpsrh7"; + rev = "v${version}"; + sha256 = "1d9ibiwicaj17757h9yyjc9i2hny8d8npn4spbjscins8972z3hw"; }; installPhase = '' mkdir -p $out/include/CL - cp opencl${version}/CL/* $out/include/CL + cp CL/* $out/include/CL ''; meta = with stdenv.lib; { description = "Khronos OpenCL headers version ${version}"; - homepage = https://www.khronos.org/registry/cl/; + homepage = "https://www.khronos.org/registry/cl/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix index 9bd25bfb93a..388c473125b 100644 --- a/pkgs/development/libraries/opencollada/default.nix +++ b/pkgs/development/libraries/opencollada/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A library for handling the COLLADA file format"; - homepage = https://github.com/KhronosGroup/OpenCOLLADA/; + homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 06eff9d17f3..a60051dbd5f 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://opencolorio.org; + homepage = "https://opencolorio.org"; description = "A color management framework for visual effects and animation"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/opencore-amr/default.nix b/pkgs/development/libraries/opencore-amr/default.nix index e2d34ae5f07..4848ef864bf 100644 --- a/pkgs/development/libraries/opencore-amr/default.nix +++ b/pkgs/development/libraries/opencore-amr/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://opencore-amr.sourceforge.io/; + 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. Library of VisualOn implementation of Adaptive Multi Rate Wideband (AMR-WB)"; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index cf46077a56c..00d489508ad 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Constructive Solid Geometry library"; - homepage = http://www.opencsg.org/; + homepage = "http://www.opencsg.org/"; platforms = platforms.unix; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index 5f1c2b5c6f6..f8977c1b59c 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/OpenSC/openct/; + homepage = "https://github.com/OpenSC/openct/"; license = licenses.lgpl21; description = "Drivers for several smart card readers"; platforms = platforms.all; diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index 642facf166a..ed337c7ebfe 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -274,7 +274,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = https://opencv.org/; + homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; maintainers = with maintainers; [mdaiter basvandijk]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index 519d4ecd215..cec8a9aa363 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -288,7 +288,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = https://opencv.org/; + homepage = "https://opencv.org/"; license = with licenses; if enableUnfree then unfree else bsd3; maintainers = with maintainers; [mdaiter basvandijk]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index ad27742d0b4..f637e730179 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = https://opencv.org/; + homepage = "https://opencv.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 6bf5ea6023e..82cfb5c3d06 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -1,26 +1,27 @@ { stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig -, nettle, gnutls, msgpack, readline, libargon2 +, cmake, pkg-config +, asio, nettle, gnutls, msgpack, readline, libargon2 }: stdenv.mkDerivation rec { pname = "opendht"; - version = "1.8.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = version; - sha256 = "1mj3zsywxphh9wcazyqsldwwn14r77xv9cjsmc0nmcybsl2bwnpl"; + sha256 = "1q1fwk8wwk9r6bp0indpr60ql668lsk16ykslacyhrh7kg97kvhr"; }; nativeBuildInputs = - [ autoreconfHook - pkgconfig + [ cmake + pkg-config ]; buildInputs = - [ nettle + [ asio + nettle gnutls msgpack readline @@ -31,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C++11 Kademlia distributed hash table implementation"; - homepage = https://github.com/savoirfairelinux/opendht; + homepage = "https://github.com/savoirfairelinux/opendht"; license = licenses.gpl3Plus; maintainers = with maintainers; [ taeer olynch thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix index 66496af12f9..7cbd85055ef 100644 --- a/pkgs/development/libraries/opendkim/default.nix +++ b/pkgs/development/libraries/opendkim/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C library for producing DKIM-aware applications and an open source milter for providing DKIM service"; - homepage = http://www.opendkim.org/; + homepage = "http://www.opendkim.org/"; maintainers = with maintainers; [ abbradar ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 51ed495a995..49c3c2629c5 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { FSTs have key applications in speech recognition and synthesis, machine translation, optical character recognition, pattern matching, string processing, machine learning, information extraction and retrieval among others ''; - homepage = http://www.openfst.org/twiki/bin/view/FST/WebHome; + homepage = "http://www.openfst.org/twiki/bin/view/FST/WebHome"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.dfordivam ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 64ed6cb58f0..07d7b19ede4 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open-source JPEG 2000 codec written in C language"; - homepage = http://www.openjpeg.org/; + homepage = "http://www.openjpeg.org/"; license = licenses.bsd2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index 4c2052ae791..cc9e44d990d 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.openldap.org/; + homepage = "https://www.openldap.org/"; description = "An open source implementation of the Lightweight Directory Access Protocol"; license = licenses.openldap; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/openpa/default.nix b/pkgs/development/libraries/openpa/default.nix index 6d53d23ae0e..46729f660b1 100644 --- a/pkgs/development/libraries/openpa/default.nix +++ b/pkgs/development/libraries/openpa/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Atomic primitives for high performance, concurrent software"; - homepage = https://trac.mpich.org/projects/openpa; + homepage = "https://trac.mpich.org/projects/openpa"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ leenaars ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/openpam/default.nix b/pkgs/development/libraries/openpam/default.nix index b217527269d..3d1cff05a08 100644 --- a/pkgs/development/libraries/openpam/default.nix +++ b/pkgs/development/libraries/openpam/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = https://www.openpam.org; + homepage = "https://www.openpam.org"; description = "An open source PAM library that focuses on simplicity, correctness, and cleanliness"; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index b12ca67655b..a209c950d48 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A 3D graphics toolkit"; - homepage = http://www.openscenegraph.org/; + homepage = "http://www.openscenegraph.org/"; maintainers = with maintainers; [ aanderse raskin ]; platforms = platforms.linux; license = "OpenSceneGraph Public License - free LGPL-based license"; diff --git a/pkgs/development/libraries/openslp/default.nix b/pkgs/development/libraries/openslp/default.nix index 537b67c5a3c..68cb40abf72 100644 --- a/pkgs/development/libraries/openslp/default.nix +++ b/pkgs/development/libraries/openslp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://www.openslp.org/; + homepage = "http://www.openslp.org/"; description = "An open-source implementation of the IETF Service Location Protocol"; maintainers = with maintainers; [ ttuegel ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix index e2f64114716..b37142082d8 100644 --- a/pkgs/development/libraries/openssl/chacha.nix +++ b/pkgs/development/libraries/openssl/chacha.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.openssl.org/; + 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 ]; diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index a2a0c68c316..322034b9fa7 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -129,7 +129,7 @@ let ''; meta = with stdenv.lib; { - homepage = https://www.openssl.org/; + homepage = "https://www.openssl.org/"; description = "A cryptographic library that implements the SSL and TLS protocols"; license = licenses.openssl; platforms = platforms.all; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 81ef6a3bf5d..1b97863b664 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "An Open-Source subdivision surface library"; - homepage = http://graphics.pixar.com/opensubdiv; + homepage = "http://graphics.pixar.com/opensubdiv"; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.eelco ]; license = lib.licenses.asl20; diff --git a/pkgs/development/libraries/opentracing-cpp/default.nix b/pkgs/development/libraries/opentracing-cpp/default.nix index f29972a64bd..a31350a5f96 100644 --- a/pkgs/development/libraries/opentracing-cpp/default.nix +++ b/pkgs/development/libraries/opentracing-cpp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ implementation of the OpenTracing API"; - homepage = https://opentracing.io; + homepage = "https://opentracing.io"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ rob ]; }; diff --git a/pkgs/development/libraries/openwsman/default.nix b/pkgs/development/libraries/openwsman/default.nix index 5d81bfad5cb..17df9eee84e 100644 --- a/pkgs/development/libraries/openwsman/default.nix +++ b/pkgs/development/libraries/openwsman/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Openwsman server implementation and client API with bindings"; - downloadPage = https://github.com/Openwsman/openwsman/releases; - homepage = https://openwsman.github.io; + downloadPage = "https://github.com/Openwsman/openwsman/releases"; + homepage = "https://openwsman.github.io"; license = licenses.bsd3; maintainers = with maintainers; [ deepfire ]; platforms = platforms.linux; # PAM is not available on Darwin diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 1c30277df12..6ecdb30c1f2 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.6"; + version = "1.0.8"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "0zvp3x9hhpww2ym1inc0z8cwmfqhgqgl2g7csmj6ipp2fqwl6dlj"; + sha256 = "0p5i4360hc5y8rqhgpvg1f1yaxl7kay471868vfzkp44g8dybkvm"; }; nativeBuildInputs = [ cmake python3 ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Khronos OpenXR loader"; - homepage = https://www.khronos.org/openxr; + homepage = "https://www.khronos.org/openxr"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/openzwave/default.nix b/pkgs/development/libraries/openzwave/default.nix index a9dbcf9ffb2..dd7a367652d 100644 --- a/pkgs/development/libraries/openzwave/default.nix +++ b/pkgs/development/libraries/openzwave/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; - homepage = http://www.openzwave.net/; + homepage = "http://www.openzwave.net/"; license = licenses.gpl3; maintainers = with maintainers; [ etu ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ortp/default.nix b/pkgs/development/libraries/ortp/default.nix index 68e890e3368..53636f05b78 100644 --- a/pkgs/development/libraries/ortp/default.nix +++ b/pkgs/development/libraries/ortp/default.nix @@ -1,16 +1,27 @@ -{ stdenv, cmake, fetchFromGitHub, bctoolbox }: +{ bctoolbox +, cmake +, fetchFromGitLab +, stdenv +}: stdenv.mkDerivation rec { pname = "ortp"; - version = "1.0.2"; + # Using master branch for linphone-desktop caused a chain reaction that many + # of its dependencies needed to use master branch too. + version = "unstable-2020-03-17"; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; repo = pname; - rev = version; - sha256 = "12cwv593bsdnxs0zfcp07vwyk7ghlz2wv7vdbs1ksv293w3vj2rv"; + rev = "804dfc4f90d1a4301127c7af10a74fd2935dd5d8"; + sha256 = "1yr8j8am68spyy5d9vna8zcq3qn039mi16cv9jf5n4chs9rxf7xx"; }; + # Do not build static libraries + cmakeFlags = [ "-DENABLE_STATIC=NO" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=stringop-truncation"; buildInputs = [ bctoolbox ]; @@ -18,8 +29,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Real-Time Transport Protocol (RFC3550) stack"; - homepage = https://linphone.org/technical-corner/ortp; - license = licenses.gpl2Plus; + homepage = "https://linphone.org/technical-corner/ortp"; + license = licenses.gpl3; platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; }; } diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index a4a2a51402b..24db4c6609b 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.lgpl21Plus; - homepage = https://www.gnu.org/software/osip/; + 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; diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 14483a12f7e..e34a80e1d4a 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK widget for displaying OpenStreetMap tiles"; - homepage = https://nzjrs.github.io/osm-gps-map; + homepage = "https://nzjrs.github.io/osm-gps-map"; license = licenses.gpl2Plus; maintainers = with maintainers; [ hrdinka ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index d3faa04633e..a13e6746469 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Provides a standard configuration setup for installing PKCS#11 modules in such a way that they're discoverable. ''; - homepage = https://p11-glue.github.io/p11-glue/p11-kit.html; + homepage = "https://p11-glue.github.io/p11-glue/p11-kit.html"; platforms = platforms.all; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index b0c7ac3cab6..4482a9cd312 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv -, Security +, lib }: buildGoModule rec { @@ -17,11 +16,9 @@ buildGoModule rec { subPackages = [ "packr" "v2/packr2" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; - 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 67c4e75c1e1..4723292199d 100644 --- a/pkgs/development/libraries/pagmo2/default.nix +++ b/pkgs/development/libraries/pagmo2/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://esa.github.io/pagmo2/; + homepage = "https://esa.github.io/pagmo2/"; description = "Scientific library for massively parallel optimization"; license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index ecb0f16c72c..358ae3df991 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -23,6 +23,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja + glib # for glib-mkenum pkgconfig gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_43 ]; buildInputs = [ @@ -66,7 +67,7 @@ in stdenv.mkDerivation rec { Pango forms the core of text and font handling for GTK. ''; - homepage = https://www.pango.org/; + homepage = "https://www.pango.org/"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin ]; diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index d788f1eff34..e9f55dd6145 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { integration, and has a flexible real-time plotter for visualising graphical data. ''; - homepage = https://github.com/stevenlovegrove/Pangolin; + homepage = "https://github.com/stevenlovegrove/Pangolin"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.expipiplus1 ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 6cb2c070c94..5651f552dfa 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ interface to the Pango text rendering library"; - homepage = https://www.pango.org/; + homepage = "https://www.pango.org/"; license = with licenses; [ lgpl2 lgpl21 ]; maintainers = with maintainers; [ lovek323 raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pangoxsl/default.nix b/pkgs/development/libraries/pangoxsl/default.nix index b69ded64839..d316250411d 100644 --- a/pkgs/development/libraries/pangoxsl/default.nix +++ b/pkgs/development/libraries/pangoxsl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "pangoxsl-1.6.0.3"; src = fetchurl { - url = mirror://sourceforge/pangopdf/pangoxsl-1.6.0.3.tar.gz; + url = "mirror://sourceforge/pangopdf/pangoxsl-1.6.0.3.tar.gz"; sha256 = "1wcd553nf4nwkrfrh765cyzwj9bsg7zpkndg2hjs8mhwgx04lm8n"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Implements several of the inline properties defined by XSL that are not currently implemented by Pango."; - homepage = https://sourceforge.net/projects/pangopdf; + homepage = "https://sourceforge.net/projects/pangopdf"; platforms = platforms.unix; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/pcaudiolib/default.nix b/pkgs/development/libraries/pcaudiolib/default.nix index 1831d969249..952987447b2 100644 --- a/pkgs/development/libraries/pcaudiolib/default.nix +++ b/pkgs/development/libraries/pcaudiolib/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides a C API to different audio devices"; - homepage = https://github.com/rhdunn/pcaudiolib; + homepage = "https://github.com/rhdunn/pcaudiolib"; license = licenses.gpl3; maintainers = with maintainers; [ aske ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 58fbb26532e..550842e9f9f 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A family of better random number generators"; - homepage = http://www.pcg-random.org/; + homepage = "http://www.pcg-random.org/"; license = stdenv.lib.licenses.asl20; longDescription = '' PCG is a family of simple fast space-efficient statistically good @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; platforms = platforms.unix; maintainers = [ maintainers.linus ]; - repositories.git = git://github.com/imneme/pcg-c.git; + repositories.git = "git://github.com/imneme/pcg-c.git"; broken = stdenv.isi686; # https://github.com/imneme/pcg-c/issues/11 }; } diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index ba903d27ab7..81da7332d0f 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.10.0"; + name = "pcl-1.10.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "1dbfkdk9mgwzadkw9jx3f5vzrcj88qcyv745kjxld7gcv8by9g6g"; + sha256 = "1i4zfcikvdl5z1s3lh0n46fgi42s9vbki4hfmy7656hamajfai0v"; }; enableParallelBuilding = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://pointclouds.org/; + homepage = "http://pointclouds.org/"; description = "Open project for 2D/3D image and point cloud processing"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index dc14ab73dcf..8f19034c924 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://www.pcre.org/; + homepage = "http://www.pcre.org/"; description = "A library for Perl Compatible Regular Expressions"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index b988c4ea02c..6c5d526d523 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Perl Compatible Regular Expressions"; - homepage = http://www.pcre.org/; + homepage = "http://www.pcre.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ttuegel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index c4cb57f3fa2..08d57cda6c1 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pdf2xml"; src = fetchurl { - url = http://tarballs.nixos.org/pdf2xml.tar.gz; + url = "http://tarballs.nixos.org/pdf2xml.tar.gz"; sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w"; }; sourceRoot = "pdf2xml/pdf2xml"; diff --git a/pkgs/development/libraries/phash/default.nix b/pkgs/development/libraries/phash/default.nix index 473fb3bfd48..16d19f570d1 100644 --- a/pkgs/development/libraries/phash/default.nix +++ b/pkgs/development/libraries/phash/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [maintainers.imalsogreg]; platforms = platforms.all; - homepage = http://www.phash.org; + homepage = "http://www.phash.org"; downloadPage = "https://github.com/clearscene/pHash"; updateWalker = true; }; diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix index d79078c2836..5c0901596b0 100644 --- a/pkgs/development/libraries/phonon/backends/gstreamer.nix +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "4.10.0"; meta = with stdenv.lib; { - homepage = https://phonon.kde.org/; + homepage = "https://phonon.kde.org/"; description = "GStreamer backend for Phonon"; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix index 9ed137e4f45..d152afd4534 100644 --- a/pkgs/development/libraries/phonon/backends/vlc.nix +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "0.11.1"; meta = with stdenv.lib; { - homepage = https://phonon.kde.org/; + homepage = "https://phonon.kde.org/"; description = "GStreamer backend for Phonon"; platforms = platforms.linux; license = with licenses; [ bsd3 lgpl2Plus ]; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 86e3caaa148..bb43604db0c 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "4.11.1"; meta = { - homepage = https://phonon.kde.org/; + homepage = "https://phonon.kde.org/"; description = "Multimedia API for Qt"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/physfs/default.nix b/pkgs/development/libraries/physfs/default.nix index cf9e201b3f6..66f2d433ee3 100644 --- a/pkgs/development/libraries/physfs/default.nix +++ b/pkgs/development/libraries/physfs/default.nix @@ -29,7 +29,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://icculus.org/physfs/; + homepage = "http://icculus.org/physfs/"; description = "Library to provide abstract access to various archives"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/development/libraries/physics/apfel/default.nix b/pkgs/development/libraries/physics/apfel/default.nix index 4ebfd6fbfa3..7b201cf9b16 100644 --- a/pkgs/development/libraries/physics/apfel/default.nix +++ b/pkgs/development/libraries/physics/apfel/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PDF Evolution Library"; license = licenses.gpl3; - homepage = https://apfel.mi.infn.it/; + homepage = "https://apfel.mi.infn.it/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/apfelgrid/default.nix b/pkgs/development/libraries/physics/apfelgrid/default.nix index 2ba87024bc5..5c63ce7c4b9 100644 --- a/pkgs/development/libraries/physics/apfelgrid/default.nix +++ b/pkgs/development/libraries/physics/apfelgrid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ultra-fast theory predictions for collider observables"; license = licenses.mit; - homepage = http://nhartland.github.io/APFELgrid/; + homepage = "http://nhartland.github.io/APFELgrid/"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/applgrid/default.nix b/pkgs/development/libraries/physics/applgrid/default.nix index 3e2a53d81dd..6b1bc71c660 100644 --- a/pkgs/development/libraries/physics/applgrid/default.nix +++ b/pkgs/development/libraries/physics/applgrid/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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; + homepage = "http://applgrid.hepforge.org"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/cernlib/default.nix b/pkgs/development/libraries/physics/cernlib/default.nix index bd43ae44204..c6a9835d13b 100644 --- a/pkgs/development/libraries/physics/cernlib/default.nix +++ b/pkgs/development/libraries/physics/cernlib/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = http://cernlib.web.cern.ch; + homepage = "http://cernlib.web.cern.ch"; 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" ]; diff --git a/pkgs/development/libraries/physics/fastjet/default.nix b/pkgs/development/libraries/physics/fastjet/default.nix index 96eb13d11cd..3dfbaa96d31 100644 --- a/pkgs/development/libraries/physics/fastjet/default.nix +++ b/pkgs/development/libraries/physics/fastjet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A software package for jet finding in pp and e+e− collisions"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://fastjet.fr/; + homepage = "http://fastjet.fr/"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/fastnlo/default.nix b/pkgs/development/libraries/physics/fastnlo/default.nix index 5ef446319a8..22251e10a4f 100644 --- a/pkgs/development/libraries/physics/fastnlo/default.nix +++ b/pkgs/development/libraries/physics/fastnlo/default.nix @@ -26,7 +26,7 @@ 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; - homepage = http://fastnlo.hepforge.org; + homepage = "http://fastnlo.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 1897071b125..8c7ff230e01 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { Its areas of application include high energy, nuclear and accelerator physics, as well as studies in medical and space science. The two main reference papers for Geant4 are published in Nuclear Instruments and Methods in Physics Research A 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. ''; - homepage = http://www.geant4.org; + homepage = "http://www.geant4.org"; license = licenses.g4sl; maintainers = with maintainers; [ tmplt omnipotententity ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/physics/geant4/g4py/default.nix b/pkgs/development/libraries/physics/geant4/g4py/default.nix index 69fb5a99738..4937cc0eca9 100644 --- a/pkgs/development/libraries/physics/geant4/g4py/default.nix +++ b/pkgs/development/libraries/physics/geant4/g4py/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { 506 (2003) 250-303, and IEEE Transactions on Nuclear Science 53 No. 1 (2006) 270-278. ''; - homepage = http://www.geant4.org; + homepage = "http://www.geant4.org"; license = stdenv.lib.licenses.g4sl; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/physics/hepmc2/default.nix b/pkgs/development/libraries/physics/hepmc2/default.nix index 665cd417dc0..41908e0383b 100644 --- a/pkgs/development/libraries/physics/hepmc2/default.nix +++ b/pkgs/development/libraries/physics/hepmc2/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "The HepMC package is an object oriented event record written in C++ for High Energy Physics Monte Carlo Generators"; license = stdenv.lib.licenses.gpl2; - homepage = http://hepmc.web.cern.ch/hepmc/; + homepage = "http://hepmc.web.cern.ch/hepmc/"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/herwig/default.nix b/pkgs/development/libraries/physics/herwig/default.nix index d52f92d9639..2ea259c2b71 100644 --- a/pkgs/development/libraries/physics/herwig/default.nix +++ b/pkgs/development/libraries/physics/herwig/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-purpose particle physics event generator"; - homepage = https://herwig.hepforge.org/; + homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/physics/hoppet/default.nix b/pkgs/development/libraries/physics/hoppet/default.nix index 9e68fbd3fc4..6ac3b950be3 100644 --- a/pkgs/development/libraries/physics/hoppet/default.nix +++ b/pkgs/development/libraries/physics/hoppet/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Higher Order Perturbative Parton Evolution Toolkit"; license = licenses.gpl2; - homepage = https://hoppet.hepforge.org; + homepage = "https://hoppet.hepforge.org"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/lhapdf/default.nix b/pkgs/development/libraries/physics/lhapdf/default.nix index dff9fb1c1dd..8d4e91265f5 100644 --- a/pkgs/development/libraries/physics/lhapdf/default.nix +++ b/pkgs/development/libraries/physics/lhapdf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A general purpose interpolator, used for evaluating Parton Distribution Functions from discretised data files"; license = stdenv.lib.licenses.gpl2; - homepage = http://lhapdf.hepforge.org; + homepage = "http://lhapdf.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/mcgrid/default.nix b/pkgs/development/libraries/physics/mcgrid/default.nix index 74b4ba4224e..27d8197a436 100644 --- a/pkgs/development/libraries/physics/mcgrid/default.nix +++ b/pkgs/development/libraries/physics/mcgrid/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A software package that provides access to the APPLgrid and fastNLO interpolation tools for Monte Carlo event generator codes, allowing for fast and flexible variations of scales, coupling parameters and PDFs in cutting edge leading- and next-to-leading-order QCD calculations"; license = stdenv.lib.licenses.gpl3; - homepage = http://mcgrid.hepforge.org; + homepage = "http://mcgrid.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/mela/default.nix b/pkgs/development/libraries/physics/mela/default.nix index 1518c23718a..1e31577026c 100644 --- a/pkgs/development/libraries/physics/mela/default.nix +++ b/pkgs/development/libraries/physics/mela/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a Mellin Evolution LibrAry"; license = licenses.gpl3; - homepage = https://github.com/vbertone/MELA; + homepage = "https://github.com/vbertone/MELA"; platforms = platforms.unix; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index c37d4b9d2f1..c10e81b9a0e 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A program for the generation of high-energy physics events"; license = stdenv.lib.licenses.gpl2; - homepage = http://home.thep.lu.se/~torbjorn/Pythia.html; + homepage = "http://home.thep.lu.se/~torbjorn/Pythia.html"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/qcdnum/default.nix b/pkgs/development/libraries/physics/qcdnum/default.nix index e962303f5f0..c1252622393 100644 --- a/pkgs/development/libraries/physics/qcdnum/default.nix +++ b/pkgs/development/libraries/physics/qcdnum/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "QCDNUM is a very fast QCD evolution program written in FORTRAN77"; license = stdenv.lib.licenses.gpl3; - homepage = https://www.nikhef.nl/~h24/qcdnum/index.html; + homepage = "https://www.nikhef.nl/~h24/qcdnum/index.html"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 7f7260d52c0..9870fadf6ef 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = { description = "A framework for comparison of experimental measurements from high-energy particle colliders to theory predictions"; license = stdenv.lib.licenses.gpl2; - homepage = https://rivet.hepforge.org; + homepage = "https://rivet.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/physics/thepeg/default.nix b/pkgs/development/libraries/physics/thepeg/default.nix index 15c94668581..10a01d00349 100644 --- a/pkgs/development/libraries/physics/thepeg/default.nix +++ b/pkgs/development/libraries/physics/thepeg/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Toolkit for High Energy Physics Event Generation"; - homepage = https://herwig.hepforge.org/; + homepage = "https://herwig.hepforge.org/"; license = licenses.gpl3; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/physics/yoda/default.nix b/pkgs/development/libraries/physics/yoda/default.nix index 8ed0a2c4ae3..ad7bc7f52f5 100644 --- a/pkgs/development/libraries/physics/yoda/default.nix +++ b/pkgs/development/libraries/physics/yoda/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Provides small set of data analysis (specifically histogramming) classes"; license = stdenv.lib.licenses.gpl3; - homepage = https://yoda.hepforge.org; + homepage = "https://yoda.hepforge.org"; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ veprbl ]; }; diff --git a/pkgs/development/libraries/pipewire/2.nix b/pkgs/development/libraries/pipewire/2.nix new file mode 100644 index 00000000000..e9656ee23ec --- /dev/null +++ b/pkgs/development/libraries/pipewire/2.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, doxygen, graphviz, valgrind +, glib, dbus, gst_all_1, alsaLib, ffmpeg, libjack2, udev, libva, xorg +, sbc, SDL2, makeFontsConf +}: + +let + fontsConf = makeFontsConf { + fontDirectories = [ ]; + }; +in stdenv.mkDerivation rec { + pname = "pipewire"; + version = "0.2.7"; + + src = fetchFromGitHub { + owner = "PipeWire"; + repo = "pipewire"; + rev = version; + sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc"; + }; + + outputs = [ "out" "lib" "dev" "doc" ]; + + nativeBuildInputs = [ + meson ninja pkgconfig doxygen graphviz valgrind + ]; + buildInputs = [ + glib dbus gst_all_1.gst-plugins-base gst_all_1.gstreamer + alsaLib ffmpeg libjack2 udev libva xorg.libX11 sbc SDL2 + ]; + + mesonFlags = [ + "-Ddocs=true" + "-Dgstreamer=enabled" + ]; + + PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; + + FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file + + doCheck = true; + + meta = with stdenv.lib; { + description = "Server and user space API to deal with multimedia pipelines"; + homepage = "https://pipewire.org/"; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = with maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 094e90fd500..197282c5ac1 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub +, fetchFromGitLab , meson , ninja , pkgconfig @@ -17,6 +17,11 @@ , xorg , sbc , SDL2 +, libsndfile +, bluez +, vulkan-headers +, vulkan-loader +, libpulseaudio , makeFontsConf }: @@ -27,15 +32,16 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.2.7"; + version = "0.3.2"; outputs = [ "out" "lib" "dev" "doc" ]; - src = fetchFromGitHub { - owner = "PipeWire"; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "1q5wrqnhhs6r49p8yvkw1pl0cnsd4rndxy4h5lvdydwgf1civcwc"; + sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs="; }; nativeBuildInputs = [ @@ -50,33 +56,37 @@ stdenv.mkDerivation rec { buildInputs = [ SDL2 alsaLib + bluez dbus ffmpeg glib gst_all_1.gst-plugins-base gst_all_1.gstreamer libjack2 + libpulseaudio + libsndfile libva sbc udev + vulkan-headers + vulkan-loader xorg.libX11 ]; mesonFlags = [ "-Ddocs=true" - "-Dgstreamer=enabled" + "-Dman=false" # we don't have xmltoman + "-Dgstreamer=true" ]; - PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user"; - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file doCheck = true; meta = with stdenv.lib; { description = "Server and user space API to deal with multimedia pipelines"; - homepage = https://pipewire.org/; - license = licenses.lgpl21; + homepage = "https://pipewire.org/"; + license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ jtojnar ]; }; diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix index 1f9996ec213..d7f5b34e5d7 100644 --- a/pkgs/development/libraries/pixman/default.nix +++ b/pkgs/development/libraries/pixman/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = glib.flattenInclude; meta = with stdenv.lib; { - homepage = http://pixman.org; + homepage = "http://pixman.org"; description = "A low-level library for pixel manipulation"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index 85d300e2376..8366c37e505 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/OpenSC/pkcs11-helper; + homepage = "https://github.com/OpenSC/pkcs11-helper"; license = with licenses; [ bsd3 gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index bbc5eb21c27..2736de0630f 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://plib.sourceforge.net/; + homepage = "http://plib.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pmdk/default.nix b/pkgs/development/libraries/pmdk/default.nix index 27351522789..fe3176f9f76 100644 --- a/pkgs/development/libraries/pmdk/default.nix +++ b/pkgs/development/libraries/pmdk/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Persistent Memory Development Kit"; - homepage = https://github.com/pmem/pmdk; + homepage = "https://github.com/pmem/pmdk"; license = licenses.lgpl21; maintainers = with maintainers; [ thoughtpolice ]; platforms = [ "x86_64-linux" ]; # aarch64 is experimental diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index 8509468f59a..7ae7406c989 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.nongnu.org/pngpp/; + homepage = "https://www.nongnu.org/pngpp/"; description = "C++ wrapper for libpng library"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pocketsphinx/default.nix b/pkgs/development/libraries/pocketsphinx/default.nix index f892540ae5c..0f9be199d95 100644 --- a/pkgs/development/libraries/pocketsphinx/default.nix +++ b/pkgs/development/libraries/pocketsphinx/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Voice recognition library written in C"; - homepage = http://cmusphinx.sourceforge.net; + homepage = "http://cmusphinx.sourceforge.net"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/poco/default.nix b/pkgs/development/libraries/poco/default.nix index ecd20d545d5..72f2952914a 100644 --- a/pkgs/development/libraries/poco/default.nix +++ b/pkgs/development/libraries/poco/default.nix @@ -24,9 +24,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://pocoproject.org/; + homepage = "https://pocoproject.org/"; description = "Cross-platform C++ libraries with a network/internet focus"; license = licenses.boost; maintainers = with maintainers; [ orivej ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index 809159b8c2f..242645ebfdb 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://podofo.sourceforge.net; + homepage = "http://podofo.sourceforge.net"; description = "A library to work with the PDF file format"; platforms = platforms.all; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 17163c2206c..43dc2550b12 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/polkit; + 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; platforms = platforms.unix; diff --git a/pkgs/development/libraries/poppler/0.61.nix b/pkgs/development/libraries/poppler/0.61.nix index cb9cf16531c..0603f49fad4 100644 --- a/pkgs/development/libraries/poppler/0.61.nix +++ b/pkgs/development/libraries/poppler/0.61.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = https://poppler.freedesktop.org/; + homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; longDescription = '' diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index bddb9a32e31..20e49296945 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = https://poppler.freedesktop.org/; + homepage = "https://poppler.freedesktop.org/"; description = "A PDF rendering library"; longDescription = '' diff --git a/pkgs/development/libraries/popt/default.nix b/pkgs/development/libraries/popt/default.nix index 592a1f1470a..b04a2242ab7 100644 --- a/pkgs/development/libraries/popt/default.nix +++ b/pkgs/development/libraries/popt/default.nix @@ -1,10 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "popt-1.16"; + pname = "popt"; + version = "1.16"; src = fetchurl { - url = "http://rpm5.org/files/popt/${name}.tar.gz"; + url = "mirror://debian/pool/main/p/popt/popt_${version}.orig.tar.gz"; sha256 = "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77"; }; diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix index 68daece490f..aa8afb7ac97 100644 --- a/pkgs/development/libraries/portaudio/default.nix +++ b/pkgs/development/libraries/portaudio/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "portaudio-190600-20161030"; src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz; + url = "http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"; sha256 = "04qmin6nj144b8qb9kkd9a52xfvm0qdgm8bg8jbl7s3frmyiv8pm"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Portable cross-platform Audio API"; - homepage = http://www.portaudio.com/; + homepage = "http://www.portaudio.com/"; # Not exactly a bsd license, but alike license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/libraries/portmidi/default.nix b/pkgs/development/libraries/portmidi/default.nix index 37958038601..a0001691302 100644 --- a/pkgs/development/libraries/portmidi/default.nix +++ b/pkgs/development/libraries/portmidi/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://portmedia.sourceforge.net/portmidi/; + homepage = "http://portmedia.sourceforge.net/portmidi/"; description = "Platform independent library for MIDI I/O"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index 7839547ee92..a51db09db86 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { version of the simplex algorithm. ''; - homepage = http://bugseng.com/products/ppl/; + homepage = "http://bugseng.com/products/ppl/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/proj-datumgrid/default.nix b/pkgs/development/libraries/proj-datumgrid/default.nix index f1c13e93aec..c7a25f62171 100644 --- a/pkgs/development/libraries/proj-datumgrid/default.nix +++ b/pkgs/development/libraries/proj-datumgrid/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Repository for proj datum grids"; - homepage = https://proj4.org; + homepage = "https://proj4.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/libraries/proj/5.2.nix b/pkgs/development/libraries/proj/5.2.nix index 8fb4515e70d..7a97491d8ea 100644 --- a/pkgs/development/libraries/proj/5.2.nix +++ b/pkgs/development/libraries/proj/5.2.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "proj-5.2.0"; src = fetchurl { - url = https://download.osgeo.org/proj/proj-5.2.0.tar.gz; + url = "https://download.osgeo.org/proj/proj-5.2.0.tar.gz"; sha256 = "0q3ydh2j8qhwlxmnac72pg69rw2znbi5b6k5wama8qmwzycr94gg"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Cartographic Projections Library"; - homepage = https://proj4.org; + homepage = "https://proj4.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 41b6192a9ed..8618d62e834 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook }: stdenv.mkDerivation rec { - name = "proj"; + pname = "proj"; version = "6.3.1"; src = fetchFromGitHub { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cartographic Projections Library"; - homepage = https://proj4.org; + homepage = "https://proj4.org"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/libraries/prometheus-cpp/default.nix b/pkgs/development/libraries/prometheus-cpp/default.nix index 2ec2426af4a..5377d2b96d0 100644 --- a/pkgs/development/libraries/prometheus-cpp/default.nix +++ b/pkgs/development/libraries/prometheus-cpp/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Prometheus Client Library for Modern C++"; - homepage = https://github.com/jupp0r/prometheus-cpp; + homepage = "https://github.com/jupp0r/prometheus-cpp"; license = [ stdenv.lib.licenses.mit ]; }; diff --git a/pkgs/development/libraries/properties-cpp/default.nix b/pkgs/development/libraries/properties-cpp/default.nix index bd20dc540c0..ce56c464588 100644 --- a/pkgs/development/libraries/properties-cpp/default.nix +++ b/pkgs/development/libraries/properties-cpp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://launchpad.net/properties-cpp; + homepage = "https://launchpad.net/properties-cpp"; description = "A very simple convenience library for handling properties and signals in C++11."; license = licenses.lgpl3; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix index 01f74bc48eb..4166aac7246 100644 --- a/pkgs/development/libraries/protobuf/generic-v3.nix +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -50,7 +50,7 @@ mkProtobufDerivation = buildProtobuf: stdenv: stdenv.mkDerivation { ''; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; - homepage = https://developers.google.com/protocol-buffers/; + homepage = "https://developers.google.com/protocol-buffers/"; }; passthru.version = version; diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix index 3c08537db0b..32d6f70d1eb 100644 --- a/pkgs/development/libraries/protobuf/generic.nix +++ b/pkgs/development/libraries/protobuf/generic.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { almost all of its internal RPC protocols and file formats. ''; license = "mBSD"; - homepage = https://developers.google.com/protocol-buffers/; + homepage = "https://developers.google.com/protocol-buffers/"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/protobufc/generic.nix b/pkgs/development/libraries/protobufc/generic.nix index 838fa7de826..4b0d273ac44 100644 --- a/pkgs/development/libraries/protobufc/generic.nix +++ b/pkgs/development/libraries/protobufc/generic.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ protobuf zlib ]; meta = with stdenv.lib; { - homepage = https://github.com/protobuf-c/protobuf-c/; + homepage = "https://github.com/protobuf-c/protobuf-c/"; description = "C bindings for Google's Protocol Buffers"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/prototypejs/default.nix b/pkgs/development/libraries/prototypejs/default.nix index a56b14384e5..3753dfacac3 100644 --- a/pkgs/development/libraries/prototypejs/default.nix +++ b/pkgs/development/libraries/prototypejs/default.nix @@ -15,8 +15,8 @@ in fetchurl { and provides elegant APIs around the clumsy interfaces of Ajax and the Document Object Model. ''; - homepage = http://prototypejs.org/; - downloadPage = http://prototypejs.org/download/; + homepage = "http://prototypejs.org/"; + downloadPage = "http://prototypejs.org/download/"; license = licenses.mit; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/development/libraries/psqlodbc/default.nix b/pkgs/development/libraries/psqlodbc/default.nix index 2364e0913bc..fdc35f149a3 100644 --- a/pkgs/development/libraries/psqlodbc/default.nix +++ b/pkgs/development/libraries/psqlodbc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-iodbc=${libiodbc}" ]; meta = with stdenv.lib; { - homepage = http://psqlodbc.projects.postgresql.org/; + homepage = "http://psqlodbc.projects.postgresql.org/"; description = "ODBC driver for PostgreSQL"; license = licenses.lgpl2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/pstreams/default.nix b/pkgs/development/libraries/pstreams/default.nix index a734ac1e9fd..e3cb9dd67a3 100644 --- a/pkgs/development/libraries/pstreams/default.nix +++ b/pkgs/development/libraries/pstreams/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.0.1"; src = fetchgit { - url = https://git.code.sf.net/p/pstreams/code; + url = "https://git.code.sf.net/p/pstreams/code"; rev = let dot2Underscore = stdenv.lib.strings.stringAsChars (c: if c == "." then "_" else c); in "RELEASE_${dot2Underscore version}"; sha256 = "0r8aj0nh5mkf8cvnzl8bdy4nm7i74vs83axxfimcd74kjfn0irys"; @@ -31,8 +31,8 @@ stdenv.mkDerivation rec { POSIX.2 functions popen(3) and pclose(3), using C++ iostreams instead of C's stdio library. ''; - homepage = http://pstreams.sourceforge.net/; - downloadPage = http://pstreams.sourceforge.net/download/; + homepage = "http://pstreams.sourceforge.net/"; + downloadPage = "http://pstreams.sourceforge.net/download/"; maintainers = with maintainers; [ arthur ]; license = licenses.boost; platforms = platforms.all; diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix index b2173ec21ee..c64d0b37686 100644 --- a/pkgs/development/libraries/pth/default.nix +++ b/pkgs/development/libraries/pth/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The GNU Portable Threads library"; - homepage = https://www.gnu.org/software/pth; + homepage = "https://www.gnu.org/software/pth"; license = licenses.lgpl21Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix index d1825171596..8bd86154068 100644 --- a/pkgs/development/libraries/pugixml/default.nix +++ b/pkgs/development/libraries/pugixml/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; - homepage = https://pugixml.org; + homepage = "https://pugixml.org"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 66a395801b2..ef131118527 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,18 +1,18 @@ -{ fetchFromGitHub, stdenv, autoreconfHook }: +{ fetchFromGitHub, stdenv, autoreconfHook, pkg-config }: stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.8.4"; + version = "1.12.0"; src = fetchFromGitHub { owner = "mrjimenez"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1daml02z4rs9cxls95p2v24jvwcsp43a0gqv06s84ay5yn6r47wx"; + sha256 = "17jhbzx8khz5vbl0lhcipjzgg897p1k2lp5wcc3hiddcfyh05pdj"; }; outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config ]; hardeningDisable = [ "fortify" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { license = "BSD-style"; - homepage = http://pupnp.sourceforge.net/; + homepage = "http://pupnp.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/pyotherside/default.nix b/pkgs/development/libraries/pyotherside/default.nix index 002208dcc0b..047142c8a5d 100644 --- a/pkgs/development/libraries/pyotherside/default.nix +++ b/pkgs/development/libraries/pyotherside/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Asynchronous Python 3 Bindings for Qt 5"; - homepage = https://thp.io/2011/pyotherside/; + homepage = "https://thp.io/2011/pyotherside/"; license = licenses.isc; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix index 2b630de14b2..a52b3608eb7 100644 --- a/pkgs/development/libraries/python-qt/default.nix +++ b/pkgs/development/libraries/python-qt/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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/; + homepage = "http://pythonqt.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.all; maintainers = with maintainers; [ hlolli ]; diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 79b105a2d1c..77f4e1b9053 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt 5 Cryptographic Architecture"; - homepage = http://delta.affinix.com/qca; + homepage = "http://delta.affinix.com/qca"; maintainers = with maintainers; [ ttuegel ]; license = licenses.lgpl21Plus; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/qca2/default.nix b/pkgs/development/libraries/qca2/default.nix index 4894bee9609..bb89d692681 100644 --- a/pkgs/development/libraries/qca2/default.nix +++ b/pkgs/development/libraries/qca2/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt Cryptographic Architecture"; license = "LGPL"; - homepage = http://delta.affinix.com/qca; + homepage = "http://delta.affinix.com/qca"; maintainers = [ maintainers.sander ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index 3626e15cfc7..434b3ab84f9 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -1,4 +1,16 @@ -{ mkDerivation, lib, fetchFromGitHub, pkgconfig, gtk3, qtbase, qmake, qtx11extras, pantheon }: +{ mkDerivation +, lib +, fetchFromGitHub +, pkgconfig +, gtk3 +, glib +, qtbase +, qmake +, qtx11extras +, pantheon +, substituteAll +, gsettings-desktop-schemas +}: mkDerivation rec { pname = "qgnomeplatform"; @@ -11,12 +23,21 @@ mkDerivation rec { sha256 = "0fb1mzs6sx76bl7f0z2xhc0jq6y1c55jrw1v3na8577is6g5ji0a"; }; + patches = [ + # Hardcode GSettings schema path to avoid crashes from missing schemas + (substituteAll { + src = ./hardcode-gsettings.patch; + gds_gsettings_path = glib.getSchemaPath gsettings-desktop-schemas; + }) + ]; + nativeBuildInputs = [ pkgconfig qmake ]; buildInputs = [ + glib gtk3 qtbase qtx11extras @@ -38,7 +59,7 @@ mkDerivation rec { meta = with lib; { description = "QPlatformTheme for a better Qt application inclusion in GNOME"; - homepage = https://github.com/FedoraQt/QGnomePlatform; + homepage = "https://github.com/FedoraQt/QGnomePlatform"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch b/pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch new file mode 100644 index 00000000000..9b342d7cf83 --- /dev/null +++ b/pkgs/development/libraries/qgnomeplatform/hardcode-gsettings.patch @@ -0,0 +1,24 @@ +diff --git a/common/gnomehintssettings.cpp b/common/gnomehintssettings.cpp +index 9860e57..40fa6ec 100644 +--- a/common/gnomehintssettings.cpp ++++ b/common/gnomehintssettings.cpp +@@ -80,9 +80,17 @@ void gtkMessageHandler(const gchar *log_domain, + GnomeHintsSettings::GnomeHintsSettings() + : QObject(0) + , m_usePortal(checkUsePortalSupport()) +- , m_gnomeDesktopSettings(g_settings_new("org.gnome.desktop.wm.preferences")) +- , m_settings(g_settings_new("org.gnome.desktop.interface")) + { ++ g_autoptr(GSettingsSchemaSource) schemaSource = nullptr; ++ g_autoptr(GSettingsSchema) gnomeDesktopSchema = nullptr; ++ g_autoptr(GSettingsSchema) settingsSchema = nullptr; ++ ++ schemaSource = g_settings_schema_source_new_from_directory("@gds_gsettings_path@", g_settings_schema_source_get_default(), true, nullptr); ++ gnomeDesktopSchema = g_settings_schema_source_lookup(schemaSource, "org.gnome.desktop.wm.preferences", false); ++ m_gnomeDesktopSettings = g_settings_new_full(gnomeDesktopSchema, nullptr, nullptr); ++ settingsSchema = g_settings_schema_source_lookup(schemaSource, "org.gnome.desktop.interface", false); ++ m_settings = g_settings_new_full(settingsSchema, nullptr, nullptr); ++ + gtk_init(nullptr, nullptr); + + // Set log handler to suppress false GtkDialog warnings diff --git a/pkgs/development/libraries/qhull/default.nix b/pkgs/development/libraries/qhull/default.nix index 323171212be..689a4877541 100644 --- a/pkgs/development/libraries/qhull/default.nix +++ b/pkgs/development/libraries/qhull/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://www.qhull.org/; + homepage = "http://www.qhull.org/"; description = "Compute the convex hull, Delaunay triangulation, Voronoi diagram and more"; license = licenses.qhull; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix index 6d84e609127..ab4a96e65ea 100644 --- a/pkgs/development/libraries/qjson/default.nix +++ b/pkgs/development/libraries/qjson/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight data-interchange format"; - homepage = http://qjson.sourceforge.net/; + homepage = "http://qjson.sourceforge.net/"; license = licenses.lgpl21; inherit (qt4.meta) platforms; }; diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix index b156a1cbf99..ac258457311 100644 --- a/pkgs/development/libraries/qmltermwidget/default.nix +++ b/pkgs/development/libraries/qmltermwidget/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "A QML port of qtermwidget"; - homepage = https://github.com/Swordfish90/qmltermwidget; + homepage = "https://github.com/Swordfish90/qmltermwidget"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 83e904e53eb..85682e2c2a2 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "qoauth-2.0.0"; src = fetchurl { - url = https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz; + url = "https://github.com/ayoy/qoauth/archive/v2.0.0.tar.gz"; name = "qoauth-2.0.0.tar.gz"; sha256 = "a28005986410d333e03d077679cdf6c504ec5a33342867dc0f9fb0b74285e333"; }; diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix index c50c62d7794..b324bfed5aa 100644 --- a/pkgs/development/libraries/qpdf/default.nix +++ b/pkgs/development/libraries/qpdf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://qpdf.sourceforge.net/; + 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 maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix index 9e8d9ce239b..83d2db6a26b 100644 --- a/pkgs/development/libraries/qrencode/default.nix +++ b/pkgs/development/libraries/qrencode/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://fukuchi.org/works/qrencode/; + homepage = "https://fukuchi.org/works/qrencode/"; description = "C library for encoding data in a QR Code symbol"; longDescription = '' diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index 3e0dc99f81f..a31cc4e8ed4 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "qrupdate-1.1.2"; src = fetchurl { - url = mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz ; + url = "mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz"; sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library for fast updating of qr and cholesky decompositions"; - homepage = https://sourceforge.net/projects/qrupdate/; + homepage = "https://sourceforge.net/projects/qrupdate/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index a8be20b73b1..323eff6486d 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { proportional fonts, bold and italics, multiple foreground and background colours and multiple fonts. ''; - homepage = https://www.riverbankcomputing.com/software/qscintilla/intro; + homepage = "https://www.riverbankcomputing.com/software/qscintilla/intro"; license = with licenses; [ gpl2 gpl3 ]; # and commercial maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 98519ae294a..f5837717622 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; src = fetchurl { - url = http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2; + url = "http://download.qt.io/archive/qt/3/qt-x11-free-3.3.8.tar.bz2"; sha256 = "0jd4g3bwkgk2s4flbmgisyihm7cam964gzb3pawjlkhas01zghz8"; }; 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 379f5b3d80e..1c972e5440c 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -237,7 +237,7 @@ stdenv.mkDerivation rec { dontStrip = stdenv.hostPlatform != stdenv.buildPlatform; meta = { - homepage = http://qt-project.org/; + homepage = "http://qt-project.org/"; description = "A cross-platform application framework for C++"; license = lib.licenses.lgpl21Plus; # or gpl3 maintainers = with lib.maintainers; [ orivej lovek323 phreedom sander ]; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index c0bba5e5c01..78d711e969b 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -74,6 +74,11 @@ let url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=8a3fde00bf53d99e9e4853e8ab97b0e1bcf74915"; sha256 = "1gpcbdpyazdxnmldvhsf3pfwr2gjvi08x3j6rxf543rq01bp6cpx"; }) + (fetchpatch { + name = "QTBUG-78937.patch"; + url = "https://code.qt.io/cgit/qt/qtbase.git/patch/?id=67a9c600ad14ee44501a6df3509daa8234b97606"; + sha256 = "1jiky1w9j8rka78r4q0yabb8w2l5j6csdjysynz7gs1ry4xjfdxd"; + }) ]; qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; @@ -150,6 +155,7 @@ let qtserialport = callPackage ../modules/qtserialport.nix {}; qtspeech = callPackage ../modules/qtspeech.nix {}; qtsvg = callPackage ../modules/qtsvg.nix {}; + qtscxml = callPackage ../modules/qtscxml.nix {}; qttools = callPackage ../modules/qttools.nix {}; qttranslations = callPackage ../modules/qttranslations.nix {}; qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {}; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 930c59d347b..a4c12793abb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -399,7 +399,7 @@ stdenv.mkDerivation { setupHook = ../hooks/qtbase-setup-hook.sh; meta = with lib; { - homepage = http://www.qt.io; + homepage = "http://www.qt.io"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; diff --git a/pkgs/development/libraries/qt-5/modules/qtscxml.nix b/pkgs/development/libraries/qt-5/modules/qtscxml.nix new file mode 100644 index 00000000000..62b428b0893 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtscxml.nix @@ -0,0 +1,7 @@ +{ qtModule, qtbase, qtdeclarative }: + +qtModule { + name = "qtscxml"; + qtInputs = [ qtbase qtdeclarative ]; + outputs = [ "out" "dev" "bin" ]; +} diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 5003205ef37..0481f000c6c 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -50,7 +50,7 @@ mkDerivation (args // { ''; meta = { - homepage = http://www.qt.io; + homepage = "http://www.qt.io"; description = "A cross-platform application framework for C++"; license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ]; maintainers = with maintainers; [ qknight ttuegel periklis bkchr ]; diff --git a/pkgs/development/libraries/qt-mobility/default.nix b/pkgs/development/libraries/qt-mobility/default.nix index b7857372d1c..ba44a217e3d 100644 --- a/pkgs/development/libraries/qt-mobility/default.nix +++ b/pkgs/development/libraries/qt-mobility/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt Mobility"; - homepage = http://qt.nokia.com/products/qt-addons/mobility; + homepage = "http://qt.nokia.com/products/qt-addons/mobility"; maintainers = [ maintainers.qknight ]; platforms = platforms.linux; license = with licenses; [ bsd3 fdl13 gpl3 lgpl21 ]; diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 5b963255b65..ddfdc2f67d3 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Platform-independent Qt API for storing passwords securely"; - homepage = https://github.com/frankosterfeld/qtkeychain; + homepage = "https://github.com/frankosterfeld/qtkeychain"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/qtscriptgenerator/default.nix b/pkgs/development/libraries/qtscriptgenerator/default.nix index 88591e880de..a6cffd73c3f 100644 --- a/pkgs/development/libraries/qtscriptgenerator/default.nix +++ b/pkgs/development/libraries/qtscriptgenerator/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { description = "QtScript bindings generator"; - homepage = https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/; + homepage = "https://code.qt.io/cgit/qt-labs/qtscriptgenerator.git/"; inherit (qt4.meta) platforms; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix index 50a1e90588c..ac5755f7c3d 100644 --- a/pkgs/development/libraries/qtstyleplugins/default.nix +++ b/pkgs/development/libraries/qtstyleplugins/default.nix @@ -15,7 +15,7 @@ mkDerivation { meta = with stdenv.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/; + homepage = "http://blog.qt.io/blog/2012/10/30/cleaning-up-styles-in-qt5-and-adding-fusion/"; license = licenses.lgpl21; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix index 46a9785739a..d1b921deac0 100644 --- a/pkgs/development/libraries/qtwebkit-plugins/default.nix +++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Spell checking plugin using Hunspell and HTML5 Notifications plugin for QtWebKit"; - homepage = https://github.com/QupZilla/qtwebkit-plugins; + homepage = "https://github.com/QupZilla/qtwebkit-plugins"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index cac861fe224..13e3f15c842 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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/ + homepage = "https://stachenov.github.io/quazip/"; # Migrated from http://quazip.sourceforge.net/ platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index fe24d0fcddf..6aebb7a6511 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { provides Unicode support and is designed to be easily ported to any platform that supports both FreeType and the OpenGL API. ''; - homepage = http://quesoglc.sourceforge.net/; + homepage = "http://quesoglc.sourceforge.net/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ astsmtl ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix index 7e006236080..e5346b42b9f 100644 --- a/pkgs/development/libraries/quickder/default.nix +++ b/pkgs/development/libraries/quickder/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quick (and Easy) DER, a Library for parsing ASN.1"; - homepage = https://github.com/vanrein/quick-der; + homepage = "https://github.com/vanrein/quick-der"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 6e0fa53aa82..54af3f3084a 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }: stdenv.mkDerivation rec { - name = "qwt-6.1.2"; + name = "qwt-6.1.4"; src = fetchurl { url = "mirror://sourceforge/qwt/${name}.tar.bz2"; - sha256 = "031x4hz1jpbirv9k35rqb52bb9mf2w7qav89qv1yfw1r3n6z221b"; + sha256 = "1navkcnmn0qz8kzsyqmk32d929zl72l0b580w1ica7z5559j2a8m"; }; propagatedBuildInputs = [ qtbase qtsvg qttools ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt widgets for technical applications"; - homepage = http://qwt.sourceforge.net/; + homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qwt/6_qt4.nix b/pkgs/development/libraries/qwt/6_qt4.nix index b6e0acb603d..04bc0d7ed22 100644 --- a/pkgs/development/libraries/qwt/6_qt4.nix +++ b/pkgs/development/libraries/qwt/6_qt4.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt widgets for technical applications"; - homepage = http://qwt.sourceforge.net/; + homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/qwt/default.nix b/pkgs/development/libraries/qwt/default.nix index f900de5e578..c206ffdd5db 100644 --- a/pkgs/development/libraries/qwt/default.nix +++ b/pkgs/development/libraries/qwt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Qt widgets for technical applications"; - homepage = http://qwt.sourceforge.net/; + homepage = "http://qwt.sourceforge.net/"; # LGPL 2.1 plus a few exceptions (more liberal) license = stdenv.lib.licenses.qwt; platforms = platforms.unix; diff --git a/pkgs/development/libraries/qxt/default.nix b/pkgs/development/libraries/qxt/default.nix index 79d4d652424..3104aefb9ed 100644 --- a/pkgs/development/libraries/qxt/default.nix +++ b/pkgs/development/libraries/qxt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { prefixKey = "-prefix "; meta = { - homepage = http://libqxt.org; + homepage = "http://libqxt.org"; description = "An extension library for Qt"; longDescription = '' An extension library for Qt providing a suite of cross-platform utility diff --git a/pkgs/development/libraries/rabbitmq-c/default.nix b/pkgs/development/libraries/rabbitmq-c/default.nix index 487de0976bd..d24bce96997 100644 --- a/pkgs/development/libraries/rabbitmq-c/default.nix +++ b/pkgs/development/libraries/rabbitmq-c/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "RabbitMQ C AMQP client library"; - homepage = https://github.com/alanxz/rabbitmq-c; + homepage = "https://github.com/alanxz/rabbitmq-c"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/rabbitmq-java-client/default.nix b/pkgs/development/libraries/rabbitmq-java-client/default.nix index ff8db94288a..e84770ec0f5 100644 --- a/pkgs/development/libraries/rabbitmq-java-client/default.nix +++ b/pkgs/development/libraries/rabbitmq-java-client/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "RabbitMQ Java client library which allows Java code to interface to AMQP servers"; - homepage = https://www.rabbitmq.com/java-client.html; + homepage = "https://www.rabbitmq.com/java-client.html"; license = with licenses; [ mpl11 gpl2 ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/randomx/default.nix b/pkgs/development/libraries/randomx/default.nix index 9e6cdfecb95..5b0c2b8a657 100644 --- a/pkgs/development/libraries/randomx/default.nix +++ b/pkgs/development/libraries/randomx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Proof of work algorithm based on random code execution"; - homepage = https://github.com/tevador/RandomX; + homepage = "https://github.com/tevador/RandomX"; license = licenses.bsd3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index ca2c7d9b70f..024b67721ca 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Experimental range library for C++11/14/17"; - homepage = https://github.com/ericniebler/range-v3; + homepage = "https://github.com/ericniebler/range-v3"; license = licenses.boost; platforms = platforms.all; maintainers = with maintainers; [ primeos xwvvvvwx ]; diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index bd79e3628a1..1a97174380c 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -18,13 +18,12 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; meta = with stdenv.lib; { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; - homepage = https://rarian.freedesktop.org/; + homepage = "https://rarian.freedesktop.org/"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index cb1b176ce35..f955f464d32 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "librdkafka - Apache Kafka C/C++ client library"; - homepage = https://github.com/edenhill/librdkafka; + homepage = "https://github.com/edenhill/librdkafka"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ boothead ]; diff --git a/pkgs/development/libraries/re2/default.nix b/pkgs/development/libraries/re2/default.nix index 2b60c3cbf54..bb41af5ad85 100644 --- a/pkgs/development/libraries/re2/default.nix +++ b/pkgs/development/libraries/re2/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { installCheckTarget = "testinstall"; meta = { - homepage = https://github.com/google/re2; + homepage = "https://github.com/google/re2"; description = "An efficient, principled regular expression library"; license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; all; diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index 84062408d45..5833ca714e4 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "readline-5.2"; src = fetchurl { - url = mirror://gnu/readline/readline-5.2.tar.gz; + url = "mirror://gnu/readline/readline-5.2.tar.gz"; sha256 = "0icz4hqqq8mlkwrpczyaha94kns0am9z0mh3a2913kg2msb8vs0j"; }; diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index af59e50ec5e..3f3ca01961d 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (rec { desire its capabilities. ''; - homepage = https://savannah.gnu.org/projects/readline/; + homepage = "https://savannah.gnu.org/projects/readline/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 1e5d9a0a664..3f3503bb2ba 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { desire its capabilities. ''; - homepage = https://savannah.gnu.org/projects/readline/; + homepage = "https://savannah.gnu.org/projects/readline/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 486c6eaa224..c4bcda0110a 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { desire its capabilities. ''; - homepage = https://savannah.gnu.org/projects/readline/; + homepage = "https://savannah.gnu.org/projects/readline/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readline/8.0.nix b/pkgs/development/libraries/readline/8.0.nix index 9b9f459e4c3..23075abd6f2 100644 --- a/pkgs/development/libraries/readline/8.0.nix +++ b/pkgs/development/libraries/readline/8.0.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { desire its capabilities. ''; - homepage = https://savannah.gnu.org/projects/readline/; + homepage = "https://savannah.gnu.org/projects/readline/"; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 1c777e849a4..8bf3200e295 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -16,7 +16,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; + homepage = "https://www.gaia-gis.it/fossil/readosm"; license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/rep-gtk/default.nix b/pkgs/development/libraries/rep-gtk/default.nix index 7530cc64bf5..0f8caecf808 100644 --- a/pkgs/development/libraries/rep-gtk/default.nix +++ b/pkgs/development/libraries/rep-gtk/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "GTK bindings for librep"; - homepage = http://sawfish.wikia.com; + homepage = "http://sawfish.wikia.com"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; }; diff --git a/pkgs/development/libraries/resolv_wrapper/default.nix b/pkgs/development/libraries/resolv_wrapper/default.nix index e221c82edec..168b82eec16 100644 --- a/pkgs/development/libraries/resolv_wrapper/default.nix +++ b/pkgs/development/libraries/resolv_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "resolv_wrapper-1.1.5"; + name = "resolv_wrapper-1.1.6"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "0v5hw5ipq2rrpraf4ck4r9w9xihmgwzkpf5wgppz7gc52fmgv2g9"; + sha256 = "13k76l4s0v032xyyaf19qw6p4qc81ybx1wynkz2pzjhiljazsdpa"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/rlog/default.nix b/pkgs/development/libraries/rlog/default.nix index f9188e1294b..cbc564fe230 100644 --- a/pkgs/development/libraries/rlog/default.nix +++ b/pkgs/development/libraries/rlog/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://www.arg0.net/rlog; + homepage = "https://www.arg0.net/rlog"; description = "A C++ logging library used in encfs"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/development/libraries/rnnoise/default.nix b/pkgs/development/libraries/rnnoise/default.nix index 7a1f69e86c7..938f64d06ef 100644 --- a/pkgs/development/libraries/rnnoise/default.nix +++ b/pkgs/development/libraries/rnnoise/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { ''; meta = with lib; { - homepage = https://people.xiph.org/~jm/demo/rnnoise/; + homepage = "https://people.xiph.org/~jm/demo/rnnoise/"; description = "Recurrent neural network for audio noise reduction"; license = licenses.bsd3; maintainers = [ maintainers.nh2 ]; diff --git a/pkgs/development/libraries/robin-map/default.nix b/pkgs/development/libraries/robin-map/default.nix index 4aba29c5830..10b7510468e 100644 --- a/pkgs/development/libraries/robin-map/default.nix +++ b/pkgs/development/libraries/robin-map/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/Tessil/robin-map; + 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; maintainers = with maintainers; [ goibhniu jtojnar ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 2d3d1e8d722..6606f57bc4b 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { hardeningDisable = stdenv.lib.optional stdenv.hostPlatform.isWindows "format"; meta = with stdenv.lib; { - homepage = https://rocksdb.org; + homepage = "https://rocksdb.org"; description = "A library that provides an embeddable, persistent key-value store for fast storage"; license = licenses.asl20; maintainers = with maintainers; [ adev magenbluten ]; diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix index 82a2998be1e..5ae66f676d6 100644 --- a/pkgs/development/libraries/rote/default.nix +++ b/pkgs/development/libraries/rote/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ncurses as well so that you may render the virtual screen to the real screen when you need to. ''; - homepage = http://rote.sourceforge.net/; + homepage = "http://rote.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/rttr/default.nix b/pkgs/development/libraries/rttr/default.nix index 74b8e381f93..b4d9204c226 100644 --- a/pkgs/development/libraries/rttr/default.nix +++ b/pkgs/development/libraries/rttr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++ Reflection Library"; - homepage = https://www.rttr.org; + homepage = "https://www.rttr.org"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/rubberband/default.nix b/pkgs/development/libraries/rubberband/default.nix index c9ba339ae0e..13dcd57e2da 100644 --- a/pkgs/development/libraries/rubberband/default.nix +++ b/pkgs/development/libraries/rubberband/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, pkgconfig, libsamplerate, libsndfile, fftw -, vampSDK, ladspaH }: +, vamp-plugin-sdk, ladspaH }: stdenv.mkDerivation { name = "rubberband-1.8.1"; src = fetchurl { - url = http://code.breakfastquay.com/attachments/download/23/rubberband-1.8.1.tar.bz2; + url = "http://code.breakfastquay.com/attachments/download/23/rubberband-1.8.1.tar.bz2"; sha256 = "0x9bm2nqd6w2f35w2sqcp7h5z34i4w7mdg53m0vzjhffnnq6637z"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libsamplerate libsndfile fftw vampSDK ladspaH ]; + buildInputs = [ libsamplerate libsndfile fftw vamp-plugin-sdk ladspaH ]; meta = with stdenv.lib; { description = "High quality software library for audio time-stretching and pitch-shifting"; - homepage = https://www.breakfastquay.com/rubberband/index.html; + homepage = "https://www.breakfastquay.com/rubberband/index.html"; # commercial license available as well, see homepage. You'll get some more optimized routines license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu maintainers.marcweber ]; diff --git a/pkgs/development/libraries/safefile/default.nix b/pkgs/development/libraries/safefile/default.nix index ae5ec222c23..e4a3e586614 100644 --- a/pkgs/development/libraries/safefile/default.nix +++ b/pkgs/development/libraries/safefile/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://research.cs.wisc.edu/mist/safefile/; + 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 ce8db3ee9ea..d3710043e6f 100644 --- a/pkgs/development/libraries/sbc/default.nix +++ b/pkgs/development/libraries/sbc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SubBand Codec Library"; - homepage = http://www.bluez.org/; + homepage = "http://www.bluez.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/sblim-sfcc/default.nix b/pkgs/development/libraries/sblim-sfcc/default.nix index 9ffa2efc376..91baa8d03b8 100644 --- a/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/pkgs/development/libraries/sblim-sfcc/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small Footprint CIM Client Library"; - homepage = https://sourceforge.net/projects/sblim/; + homepage = "https://sourceforge.net/projects/sblim/"; license = licenses.cpl10; maintainers = with maintainers; [ deepfire ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix index 1831161979d..712138b0edf 100644 --- a/pkgs/development/libraries/schroedinger/default.nix +++ b/pkgs/development/libraries/schroedinger/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "schroedinger-1.0.11"; src = fetchurl { - url = https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz; + url = "https://download.videolan.org/contrib/schroedinger-1.0.11.tar.gz"; sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy"; }; diff --git a/pkgs/development/libraries/science/benchmark/papi/default.nix b/pkgs/development/libraries/science/benchmark/papi/default.nix index 53ae70f5bf8..00a6e50aa7f 100644 --- a/pkgs/development/libraries/science/benchmark/papi/default.nix +++ b/pkgs/development/libraries/science/benchmark/papi/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { checkTarget = "test"; meta = with stdenv.lib; { - homepage = https://icl.utk.edu/papi/; + 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; platforms = platforms.linux; diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 4cfc07c1cba..e88e79cdcf4 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ itk ]; meta = with stdenv.lib; { - homepage = http://elastix.isi.uu.nl/; + homepage = "http://elastix.isi.uu.nl/"; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/science/biology/htslib/default.nix b/pkgs/development/libraries/science/biology/htslib/default.nix index cdd56731fa0..7ee63e9bb41 100644 --- a/pkgs/development/libraries/science/biology/htslib/default.nix +++ b/pkgs/development/libraries/science/biology/htslib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C library for reading/writing high-throughput sequencing data"; license = licenses.mit; - homepage = http://www.htslib.org/; + homepage = "http://www.htslib.org/"; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; }; diff --git a/pkgs/development/libraries/science/biology/nifticlib/default.nix b/pkgs/development/libraries/science/biology/nifticlib/default.nix index 8c7da7968f5..37055259e7c 100644 --- a/pkgs/development/libraries/science/biology/nifticlib/default.nix +++ b/pkgs/development/libraries/science/biology/nifticlib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 7 out of 293 tests meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/niftilib; + homepage = "https://sourceforge.net/projects/niftilib"; description = "Medical imaging format C API"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/science/math/QuadProgpp/default.nix b/pkgs/development/libraries/science/math/QuadProgpp/default.nix index 69ccbfc26b4..b5fa5c8825e 100644 --- a/pkgs/development/libraries/science/math/QuadProgpp/default.nix +++ b/pkgs/development/libraries/science/math/QuadProgpp/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = with stdenv.lib; { - homepage = https://github.com/liuq/QuadProgpp; + homepage = "https://github.com/liuq/QuadProgpp"; license = licenses.mit; description = '' A C++ library for Quadratic Programming which implements the diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 89f3aa94247..961a1c544e6 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { - homepage = https://github.com/opencollab/arpack-ng; + homepage = "https://github.com/opencollab/arpack-ng"; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue problems. diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index a14ed4e6a30..c58ac6be23d 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -65,7 +65,7 @@ EOF meta = { description = "Basic Linear Algebra Subprograms"; license = stdenv.lib.licenses.publicDomain; - homepage = http://www.netlib.org/blas/; + homepage = "http://www.netlib.org/blas/"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/science/math/caffe2/default.nix b/pkgs/development/libraries/science/math/caffe2/default.nix index a5c373ecde9..7755efb3065 100644 --- a/pkgs/development/libraries/science/math/caffe2/default.nix +++ b/pkgs/development/libraries/science/math/caffe2/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://caffe2.ai/; + homepage = "https://caffe2.ai/"; description = "A new lightweight, modular, and scalable deep learning framework"; longDescription = '' Caffe2 aims to provide an easy and straightforward way for you to experiment diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix index 52c775c9a0d..0f2d35329c4 100644 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/jluttine/cholmod-extra; + homepage = "https://github.com/jluttine/cholmod-extra"; description = "A set of additional routines for SuiteSparse CHOLMOD Module"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/libraries/science/math/cliquer/default.nix b/pkgs/development/libraries/science/math/cliquer/default.nix index 08f821dcb2c..c473fcedde3 100644 --- a/pkgs/development/libraries/science/math/cliquer/default.nix +++ b/pkgs/development/libraries/science/math/cliquer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://users.aalto.fi/~pat/cliquer.html; + homepage = "https://users.aalto.fi/~pat/cliquer.html"; downloadPage = src.meta.homepage; # autocliquer description = "Routines for clique searching"; longDescription = '' diff --git a/pkgs/development/libraries/science/math/clmagma/default.nix b/pkgs/development/libraries/science/math/clmagma/default.nix index b5c59a83277..2e798a6b83e 100644 --- a/pkgs/development/libraries/science/math/clmagma/default.nix +++ b/pkgs/development/libraries/science/math/clmagma/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Matrix Algebra on GPU and Multicore Architectures, OpenCL port"; license = licenses.bsd3; - homepage = http://icl.cs.utk.edu/magma/index.html; + homepage = "http://icl.cs.utk.edu/magma/index.html"; platforms = platforms.linux; maintainers = with maintainers; [ volhovm ]; }; diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index e70462cd9ef..2abf8e980b8 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -47,7 +47,7 @@ let ''; meta = { description = "Distributed just-in-time shared library building"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; @@ -77,7 +77,7 @@ let ''; meta = { description = "Automatic generation of finite element basis functions"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; @@ -99,7 +99,7 @@ let ''; meta = { description = "A domain-specific language for finite element variational forms"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; @@ -136,7 +136,7 @@ let ''; meta = { description = "A compiler for finite element variational forms"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; @@ -211,7 +211,7 @@ let ''; meta = { description = "The FEniCS Problem Solving Environment in Python and C++"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; license = stdenv.lib.licenses.lgpl3; }; }; @@ -250,7 +250,7 @@ let doCheck = false; # Tries to orte_ess_init and call ssh to localhost meta = { description = "Python bindings for the DOLFIN FEM compiler"; - homepage = https://fenicsproject.org/; + homepage = "https://fenicsproject.org/"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.lgpl3; }; diff --git a/pkgs/development/libraries/science/math/flintqs/default.nix b/pkgs/development/libraries/science/math/flintqs/default.nix index 6fd16535459..327fea3955d 100644 --- a/pkgs/development/libraries/science/math/flintqs/default.nix +++ b/pkgs/development/libraries/science/math/flintqs/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/sagemath/FlintQS; + homepage = "https://github.com/sagemath/FlintQS"; description = "Highly optimized multi-polynomial quadratic sieve for integer factorization"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 1995fb9c85d..a3bc1c380cf 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software package for large-scale nonlinear optimization"; - homepage = https://projects.coin-or.org/Ipopt; + homepage = "https://projects.coin-or.org/Ipopt"; license = licenses.epl10; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix index 0f23f08145e..3f00547efce 100644 --- a/pkgs/development/libraries/science/math/lcalc/default.nix +++ b/pkgs/development/libraries/science/math/lcalc/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html; + homepage = "http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/L.html"; description = "A program for calculating with L-functions"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/libbraiding/default.nix b/pkgs/development/libraries/science/math/libbraiding/default.nix index c8f1138d69f..aac66e4fe05 100644 --- a/pkgs/development/libraries/science/math/libbraiding/default.nix +++ b/pkgs/development/libraries/science/math/libbraiding/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/miguelmarco/libbraiding/; + homepage = "https://github.com/miguelmarco/libbraiding/"; description = "C++ library for computations on braid groups"; longDescription = '' A library to compute several properties of braids, including centralizer and conjugacy check. diff --git a/pkgs/development/libraries/science/math/libhomfly/default.nix b/pkgs/development/libraries/science/math/libhomfly/default.nix index a2c0dd4fa17..d9b50a0fb2d 100644 --- a/pkgs/development/libraries/science/math/libhomfly/default.nix +++ b/pkgs/development/libraries/science/math/libhomfly/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/miguelmarco/libhomfly/; + homepage = "https://github.com/miguelmarco/libhomfly/"; description = "Library to compute the homfly polynomial of knots and links"; license = licenses.unlicense; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index a7d01e22d96..53389935dda 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit version; description = "Linear Algebra PACKage"; - homepage = http://www.netlib.org/lapack/; + homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/science/math/liblbfgs/default.nix b/pkgs/development/libraries/science/math/liblbfgs/default.nix index 33e8baada83..49108e5e330 100644 --- a/pkgs/development/libraries/science/math/liblbfgs/default.nix +++ b/pkgs/development/libraries/science/math/liblbfgs/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { configureFlags = [ "--enable-sse2" ]; src = fetchurl { - url = https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz; + url = "https://github.com/downloads/chokkan/liblbfgs/liblbfgs-1.10.tar.gz"; sha256 = "1kv8d289rbz38wrpswx5dkhr2yh4fg4h6sszkp3fawxm09sann21"; }; meta = { description = "Library of Limited-memory Broyden-Fletcher-Goldfarb-Shanno (L-BFGS)"; - homepage = http://www.chokkan.org/software/liblbfgs/; + homepage = "http://www.chokkan.org/software/liblbfgs/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/science/math/m4ri/default.nix b/pkgs/development/libraries/science/math/m4ri/default.nix index e6c5cac77d2..d8b4cbbffb4 100644 --- a/pkgs/development/libraries/science/math/m4ri/default.nix +++ b/pkgs/development/libraries/science/math/m4ri/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://malb.bitbucket.io/m4ri/; + homepage = "https://malb.bitbucket.io/m4ri/"; description = "Library to do fast arithmetic with dense matrices over F_2"; license = licenses.gpl2Plus; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/m4rie/default.nix b/pkgs/development/libraries/science/math/m4rie/default.nix index 6a7ecdf46fd..e1f86b346d7 100644 --- a/pkgs/development/libraries/science/math/m4rie/default.nix +++ b/pkgs/development/libraries/science/math/m4rie/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://malb.bitbucket.io/m4rie/; + homepage = "https://malb.bitbucket.io/m4rie/"; description = "Library for matrix multiplication, reduction and inversion over GF(2^k) for 2 <= k <= 10"; longDescription = '' M4RIE is a library for fast arithmetic with dense matrices over small finite fields of even characteristic. diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 6a07ebdb862..5e62ce75aa6 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Matrix Algebra on GPU and Multicore Architectures"; license = licenses.bsd3; - homepage = http://icl.cs.utk.edu/magma/index.html; + homepage = "http://icl.cs.utk.edu/magma/index.html"; platforms = platforms.unix; maintainers = with maintainers; [ tbenst ]; }; diff --git a/pkgs/development/libraries/science/math/metis/default.nix b/pkgs/development/libraries/science/math/metis/default.nix index 3ce94f28ac2..8d6381c8d48 100644 --- a/pkgs/development/libraries/science/math/metis/default.nix +++ b/pkgs/development/libraries/science/math/metis/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Serial graph partitioning and fill-reducing matrix ordering"; - homepage = http://glaros.dtc.umn.edu/gkhome/metis/metis/overview; + homepage = "http://glaros.dtc.umn.edu/gkhome/metis/metis/overview"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 604413c96d8..3def5e5b403 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -7,17 +7,18 @@ let # Release notes and download URLs are here: # https://registrationcenter.intel.com/en/products/ version = "${year}.${spot}.${rel}"; - year = "2019"; # Darwin is pinned to 2019.3 because the DMG does not unpack; see here for details: # https://github.com/matthewbauer/undmg/issues/4 - spot = if stdenvNoCC.isDarwin then "3" else "5"; - rel = if stdenvNoCC.isDarwin then "199" else "281"; + year = if stdenvNoCC.isDarwin then "2019" else "2020"; + spot = if stdenvNoCC.isDarwin then "3" else "1"; + rel = if stdenvNoCC.isDarwin then "199" else "217"; rpm-ver = "${year}.${spot}-${rel}-${year}.${spot}-${rel}"; # Intel openmp uses its own versioning, but shares the spot release patch. - openmp-ver = "19.0.${spot}-${rel}-19.0.${spot}-${rel}"; + openmp = if stdenvNoCC.isDarwin then "19.0" else "19.1"; + openmp-ver = "${openmp}.${spot}-${rel}-${openmp}.${spot}-${rel}"; in stdenvNoCC.mkDerivation { pname = "mkl"; @@ -31,8 +32,8 @@ in stdenvNoCC.mkDerivation { }) else (fetchurl { - url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15816/l_mkl_${version}.tgz"; - sha256 = "0zkk4rrq7g44acxaxhpd2053r66w169mww6917an0lxhd52fm5cr"; + url = "https://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16533/l_mkl_${version}.tgz"; + sha256 = "0v86hrqg15mbc78m9qk8dbkaaq3mlwashgbf9n79kxpl1gilnah8"; }); nativeBuildInputs = if stdenvNoCC.isDarwin @@ -136,7 +137,7 @@ in stdenvNoCC.mkDerivation { choice of compilers, languages, operating systems, and linking and threading models. ''; - homepage = https://software.intel.com/en-us/mkl; + homepage = "https://software.intel.com/en-us/mkl"; license = licenses.issl; platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index c9aeb83c469..5f38d45fc4d 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; - homepage = https://developer.nvidia.com/nccl; + homepage = "https://developer.nvidia.com/nccl"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ mdaiter orivej ]; diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 38ad31cc625..23168d741ba 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -3,6 +3,14 @@ # pointer width, but some expect to use 32-bit integers always # (for compatibility with reference BLAS). , blas64 ? null +# Multi-threaded applications must not call a threaded OpenBLAS +# (the only exception is when an application uses OpenMP as its +# *only* form of multi-threading). See +# https://github.com/xianyi/OpenBLAS/wiki/Faq/4bded95e8dc8aadc70ce65267d1093ca7bdefc4c#multi-threaded +# https://github.com/xianyi/OpenBLAS/issues/2543 +# This flag builds a single-threaded OpenBLAS using the flags +# stated in thre. +, singleThreaded ? false , buildPackages # Select a specific optimization target (other than the default) # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt @@ -146,7 +154,12 @@ 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 { + # 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 + USE_OPENMP = false; # openblas will refuse building with both USE_OPENMP=1 and USE_THREAD=0 + })); doCheck = true; checkTarget = "tests"; @@ -168,7 +181,7 @@ EOF meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; license = licenses.bsd3; - homepage = https://github.com/xianyi/OpenBLAS; + homepage = "https://github.com/xianyi/OpenBLAS"; platforms = platforms.unix; maintainers = with maintainers; [ ttuegel ]; }; diff --git a/pkgs/development/libraries/science/math/openlibm/default.nix b/pkgs/development/libraries/science/math/openlibm/default.nix index e4a3241c1f3..7517ca9c6cb 100644 --- a/pkgs/development/libraries/science/math/openlibm/default.nix +++ b/pkgs/development/libraries/science/math/openlibm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "High quality system independent, portable, open source libm implementation"; - homepage = https://www.openlibm.org/; + homepage = "https://www.openlibm.org/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/science/math/openspecfun/default.nix b/pkgs/development/libraries/science/math/openspecfun/default.nix index 3a4c5a78438..3689df60707 100644 --- a/pkgs/development/libraries/science/math/openspecfun/default.nix +++ b/pkgs/development/libraries/science/math/openspecfun/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A collection of special mathematical functions"; - homepage = https://github.com/JuliaLang/openspecfun; + homepage = "https://github.com/JuliaLang/openspecfun"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.ttuegel ]; platforms = stdenv.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 688d1425681..ce6780f0046 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "python" ]; meta = with stdenv.lib; { - homepage = https://github.com/google/or-tools; + homepage = "https://github.com/google/or-tools"; license = licenses.asl20; description = '' Google's software suite for combinatorial optimization. diff --git a/pkgs/development/libraries/science/math/parmetis/default.nix b/pkgs/development/libraries/science/math/parmetis/default.nix index 3a9ef770459..97023d07c7f 100644 --- a/pkgs/development/libraries/science/math/parmetis/default.nix +++ b/pkgs/development/libraries/science/math/parmetis/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ParMETIS is 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; + homepage = "http://glaros.dtc.umn.edu/gkhome/metis/parmetis/overview"; platforms = platforms.all; license = licenses.unfree; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 492ad63f27b..911f0a1cf89 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.12.4"; + version = "3.13.0"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1hw4f12v2xwrs37gjh83dbixhg0yxandqx7s7k5vlfx91l9l3aan"; + sha256 = "0943bydmsq3sjwj3rxhb8hx58b1fm8vymny731557fs10g5zfbyz"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlagsArray=( $configureFlagsArray "--CC=$CC" - "--with-cxx=g++" + "--with-cxx=$CXX" "--with-fc=0" "--with-mpi=0" "--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]" diff --git a/pkgs/development/libraries/science/math/planarity/default.nix b/pkgs/development/libraries/science/math/planarity/default.nix index e7dfaecf1de..7767e23934c 100644 --- a/pkgs/development/libraries/science/math/planarity/default.nix +++ b/pkgs/development/libraries/science/math/planarity/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/graph-algorithms/edge-addition-planarity-suite; + homepage = "https://github.com/graph-algorithms/edge-addition-planarity-suite"; description = "A library for implementing graph algorithms"; license = licenses.bsd3; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix index 3b2ddc6f06c..6eeaddba041 100644 --- a/pkgs/development/libraries/science/math/rubiks/default.nix +++ b/pkgs/development/libraries/science/math/rubiks/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://wiki.sagemath.org/spkg/rubiks; + homepage = "https://wiki.sagemath.org/spkg/rubiks"; description = "Several programs for working with Rubik's cubes"; # The individual websites are no longer available longDescription = '' diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index a226dd2fc63..f0a93c7be64 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.netlib.org/scalapack/; + homepage = "http://www.netlib.org/scalapack/"; description = "Library of high-performance linear algebra routines for parallel distributed memory machines"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 48de128edc5..755a9f5118b 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; + homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 1ce56d1e49f..7f85f8e329e 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation { buildInputs = [ openblas ]; meta = with stdenv.lib; { - homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html; + homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; description = "A suite of sparse matrix algorithms"; license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ]; maintainers = with maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 570c9814485..dc43dc21ea4 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - homepage = http://crd-legacy.lbl.gov/~xiaoye/SuperLU/; - license = http://crd-legacy.lbl.gov/~xiaoye/SuperLU/License.txt; + 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; }; diff --git a/pkgs/development/libraries/science/math/tensorflow/bin.nix b/pkgs/development/libraries/science/math/tensorflow/bin.nix index f9f300883a1..dc0ca5da4cf 100644 --- a/pkgs/development/libraries/science/math/tensorflow/bin.nix +++ b/pkgs/development/libraries/science/math/tensorflow/bin.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { meta = { description = "C API for TensorFlow"; - homepage = https://www.tensorflow.org/install/lang_c; + 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/zn_poly/default.nix b/pkgs/development/libraries/science/math/zn_poly/default.nix index 838fb1f3638..a94a52936e8 100644 --- a/pkgs/development/libraries/science/math/zn_poly/default.nix +++ b/pkgs/development/libraries/science/math/zn_poly/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - homepage = http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/; + homepage = "http://web.maths.unsw.edu.au/~davidharvey/code/zn_poly/"; description = "Polynomial arithmetic over Z/nZ"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/development/libraries/science/robotics/ispike/default.nix b/pkgs/development/libraries/science/robotics/ispike/default.nix index 640eefbd733..39f412e8dd5 100644 --- a/pkgs/development/libraries/science/robotics/ispike/default.nix +++ b/pkgs/development/libraries/science/robotics/ispike/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Spiking neural interface between iCub and a spiking neural simulator"; - homepage = https://sourceforge.net/projects/ispike/; + homepage = "https://sourceforge.net/projects/ispike/"; license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index ff29ae82c5c..5b07482507c 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.scmmicro.com/support/pc-security-support/downloads.html; + 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]; diff --git a/pkgs/development/libraries/scriptaculous/default.nix b/pkgs/development/libraries/scriptaculous/default.nix index eb8d17c6457..f4e5ae37892 100644 --- a/pkgs/development/libraries/scriptaculous/default.nix +++ b/pkgs/development/libraries/scriptaculous/default.nix @@ -22,8 +22,8 @@ interface JavaScript libraries to make your web sites and web applications fly. ''; - homepage = https://script.aculo.us/; - downloadPage = https://script.aculo.us/dist/; + homepage = "https://script.aculo.us/"; + downloadPage = "https://script.aculo.us/dist/"; license = licenses.mit; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/development/libraries/seasocks/default.nix b/pkgs/development/libraries/seasocks/default.nix index 9825c0c4035..144eb56c955 100644 --- a/pkgs/development/libraries/seasocks/default.nix +++ b/pkgs/development/libraries/seasocks/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib python ]; meta = with stdenv.lib; { - homepage = https://github.com/mattgodbolt/seasocks; + homepage = "https://github.com/mattgodbolt/seasocks"; description = "Tiny embeddable C++ HTTP and WebSocket server"; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 63af0d40781..9e83bdae28e 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 wafHook ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/serd; + 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; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 3fd47125bcb..2742ba1577b 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l"; }; - nativeBuildInputs = [ pkgconfig scons ]; + nativeBuildInputs = [ pkgconfig scons.py2 ]; buildInputs = [ apr openssl aprutil zlib libiconv ] ++ stdenv.lib.optional (!stdenv.isCygwin) kerberos; diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix index 4726221a40d..7b5e1dcdb2b 100644 --- a/pkgs/development/libraries/sfml/default.nix +++ b/pkgs/development/libraries/sfml/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { "-DSFML_USE_SYSTEM_DEPS=yes" ]; meta = with stdenv.lib; { - homepage = https://www.sfml-dev.org/; + homepage = "https://www.sfml-dev.org/"; description = "Simple and fast multimedia library"; longDescription = '' SFML is a simple, fast, cross-platform and object-oriented multimedia API. diff --git a/pkgs/development/libraries/sfsexp/default.nix b/pkgs/development/libraries/sfsexp/default.nix index 261658b0547..40009a8b7c3 100644 --- a/pkgs/development/libraries/sfsexp/default.nix +++ b/pkgs/development/libraries/sfsexp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small, fast s-expression library"; - homepage = http://sexpr.sourceforge.net/; + homepage = "http://sexpr.sourceforge.net/"; maintainers = with maintainers; [ jb55 ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/pkgs/development/libraries/shapelib/default.nix b/pkgs/development/libraries/shapelib/default.nix index 9da54a37042..8fd4987ac70 100644 --- a/pkgs/development/libraries/shapelib/default.nix +++ b/pkgs/development/libraries/shapelib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C Library for reading, writing and updating ESRI Shapefiles"; - homepage = http://shapelib.maptools.org/; + homepage = "http://shapelib.maptools.org/"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; }; diff --git a/pkgs/development/libraries/shhmsg/default.nix b/pkgs/development/libraries/shhmsg/default.nix index 2790e181ac1..04b764afc94 100644 --- a/pkgs/development/libraries/shhmsg/default.nix +++ b/pkgs/development/libraries/shhmsg/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for displaying messages"; - homepage = https://shh.thathost.com/pub-unix/; + homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/shhopt/default.nix b/pkgs/development/libraries/shhopt/default.nix index 52ba959b615..45ec31ca4df 100644 --- a/pkgs/development/libraries/shhopt/default.nix +++ b/pkgs/development/libraries/shhopt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for parsing command line options"; - homepage = https://shh.thathost.com/pub-unix/; + homepage = "https://shh.thathost.com/pub-unix/"; license = licenses.artistic1; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index cbb6a4b64f1..d6708b0dfed 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.simpleitk.org; + homepage = "http://www.simpleitk.org"; description = "Simplified interface to ITK"; maintainers = with maintainers; [ bcdarwin ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index e5443c5d53a..d7e0f831385 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.1.0"; - sha256 = "19c6s3f7vxi96l2yqzjk9x9i4xkfg4fdzxhn1jg6bfb2qjph9cnk"; + version = "2.9.2.0"; + sha256 = "1i9d7w031kh338aq6xdsf8vl5amxbwxbny8lnrxlzydqvn8nxhz4"; 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 d1cafbce117..9b7905c180a 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-platform programmer's library designed to allow a developer to create robust software"; - homepage = http://www.jedsoft.org/slang/; + homepage = "http://www.jedsoft.org/slang/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/slib/default.nix b/pkgs/development/libraries/slib/default.nix index 665f025ffcf..401564342b5 100644 --- a/pkgs/development/libraries/slib/default.nix +++ b/pkgs/development/libraries/slib/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Public domain + permissive (non-copyleft) licensing of some files. license = stdenv.lib.licenses.publicDomain; - homepage = http://people.csail.mit.edu/jaffer/SLIB; + homepage = "http://people.csail.mit.edu/jaffer/SLIB"; maintainers = [ ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/smarty3-i18n/default.nix b/pkgs/development/libraries/smarty3-i18n/default.nix index cd1584ac739..d93a59efe6e 100644 --- a/pkgs/development/libraries/smarty3-i18n/default.nix +++ b/pkgs/development/libraries/smarty3-i18n/default.nix @@ -17,7 +17,7 @@ meta = with stdenv.lib; { description = "gettext for the smarty3 framework"; license = licenses.lgpl21; - homepage = https://github.com/kikimosha/smarty3-i18n; + homepage = "https://github.com/kikimosha/smarty3-i18n"; maintainers = with maintainers; [ das_j ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/smarty3/default.nix b/pkgs/development/libraries/smarty3/default.nix index b3214cc01df..1f16e0f4af4 100644 --- a/pkgs/development/libraries/smarty3/default.nix +++ b/pkgs/development/libraries/smarty3/default.nix @@ -22,7 +22,7 @@ logic. This implies that PHP code is application logic, and is separated from the presentation. ''; - homepage = https://www.smarty.net; + homepage = "https://www.smarty.net"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ das_j ]; }; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 4d74ee7ca06..3a34bf54c3c 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "390"; src = fetchsvn { - url = svn://svn.icculus.org/smpeg/trunk; + url = "svn://svn.icculus.org/smpeg/trunk"; rev = version; sha256 = "0ynwn7ih5l2b1kpzpibns9bb9wzfjak7mgrb1ji0dkn2q5pv6lr0"; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lX11"; meta = { - homepage = http://icculus.org/smpeg/; + homepage = "http://icculus.org/smpeg/"; description = "MPEG decoding library"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/smpeg2/default.nix b/pkgs/development/libraries/smpeg2/default.nix index 90043786471..fc42ab989eb 100644 --- a/pkgs/development/libraries/smpeg2/default.nix +++ b/pkgs/development/libraries/smpeg2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "412"; src = fetchsvn { - url = svn://svn.icculus.org/smpeg/trunk; + url = "svn://svn.icculus.org/smpeg/trunk"; rev = version; sha256 = "1irf2d8f150j8cx8lbb0pz1rijap536crsz0mw871xrh6wd2fd96"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://icculus.org/smpeg/; + homepage = "http://icculus.org/smpeg/"; description = "SDL2 MPEG Player Library"; license = licenses.lgpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix index acf10cc497c..7aa7cf3d452 100644 --- a/pkgs/development/libraries/snack/default.nix +++ b/pkgs/development/libraries/snack/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "snack-2.2.10"; src = fetchurl { - url = https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz; + url = "https://www.speech.kth.se/snack/dist/snack2.2.10.tar.gz"; sha256 = "07p89jv9qnjqkszws9sssq93ayvwpdnkcxrvyicbm4mb8x2pdzjb"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "The Snack Sound Toolkit (Tcl)"; - homepage = http://www.speech.kth.se/snack/; + homepage = "http://www.speech.kth.se/snack/"; license = stdenv.lib.licenses.gpl2; broken = true; }; diff --git a/pkgs/development/libraries/soci/default.nix b/pkgs/development/libraries/soci/default.nix new file mode 100644 index 00000000000..1f9b77cc3c9 --- /dev/null +++ b/pkgs/development/libraries/soci/default.nix @@ -0,0 +1,31 @@ +{ cmake +, fetchFromGitHub +, sqlite +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "soci"; + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "SOCI"; + repo = pname; + rev = version; + sha256 = "06faswdxd2frqr9xnx6bxc7zwarlzsbdi3bqpz7kwdxsjvq41rnb"; + }; + + # Do not build static libraries + cmakeFlags = [ "-DSOCI_STATIC=OFF" ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ sqlite ]; + + meta = with stdenv.lib; { + description = "Database access library for C++"; + homepage = "http://soci.sourceforge.net/"; + license = licenses.boost; + platforms = platforms.all; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix index 2903e79f891..e6095ca82c5 100644 --- a/pkgs/development/libraries/socket_wrapper/default.nix +++ b/pkgs/development/libraries/socket_wrapper/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "socket_wrapper-1.2.3"; + name = "socket_wrapper-1.2.4"; src = fetchurl { url = "mirror://samba/cwrap/${name}.tar.gz"; - sha256 = "1jprm8f7xb91b3yrapdbf51l36j6g038n379akz7ds0dicjh0fh7"; + sha256 = "07m0g5sxjl15h8h95ppf42mkilp9h1xc9camryg8l9bw8b2v8m4a"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix index ca2ff666b7a..6758bf7a459 100644 --- a/pkgs/development/libraries/sofia-sip/default.nix +++ b/pkgs/development/libraries/sofia-sip/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification"; - homepage = http://sofia-sip.sourceforge.net/; + homepage = "http://sofia-sip.sourceforge.net/"; platforms = platforms.linux; license = licenses.lgpl2; }; diff --git a/pkgs/development/libraries/soil/default.nix b/pkgs/development/libraries/soil/default.nix index d9fcea767d5..10a60c36987 100644 --- a/pkgs/development/libraries/soil/default.nix +++ b/pkgs/development/libraries/soil/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { SOIL is a tiny C library used primarily for uploading textures into OpenGL. ''; - homepage = https://www.lonesock.net/soil.html; + homepage = "https://www.lonesock.net/soil.html"; license = stdenv.lib.licenses.publicDomain; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/sonic/default.nix b/pkgs/development/libraries/sonic/default.nix index 3e93302f3d7..41b88b7f310 100644 --- a/pkgs/development/libraries/sonic/default.nix +++ b/pkgs/development/libraries/sonic/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple library to speed up or slow down speech"; - homepage = https://github.com/waywardgeek/sonic; + homepage = "https://github.com/waywardgeek/sonic"; license = licenses.asl20; maintainers = with maintainers; [ aske ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/soprano/default.nix b/pkgs/development/libraries/soprano/default.nix index 4739c736397..40ec30c6c85 100644 --- a/pkgs/development/libraries/soprano/default.nix +++ b/pkgs/development/libraries/soprano/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; meta = { - homepage = http://soprano.sourceforge.net/; + homepage = "http://soprano.sourceforge.net/"; description = "An object-oriented C++/Qt4 framework for RDF data"; license = "LGPL"; maintainers = with stdenv.lib.maintainers; [ sander ]; diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index 79084ceda1c..ff7c670ca0d 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig ]; meta = { - homepage = https://bitbucket.org/Coin3D/coin/wiki/Home; + homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; license = stdenv.lib.licenses.gpl2Plus; 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 746054e5939..5258f4d408b 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ serd ]; meta = with stdenv.lib; { - homepage = http://drobilla.net/software/sord; + homepage = "http://drobilla.net/software/sord"; description = "A lightweight C library for storing RDF data in memory"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/development/libraries/soxt/default.nix b/pkgs/development/libraries/soxt/default.nix index 4afb310d49a..fe0d93344c0 100644 --- a/pkgs/development/libraries/soxt/default.nix +++ b/pkgs/development/libraries/soxt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ coin3d motif xlibsWrapper libGLU libGL libXmu ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/Coin3D/coin/wiki/Home; + homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home"; license = licenses.bsd3; description = "A GUI binding for using Open Inventor with Xt/Motif"; maintainers = with maintainers; [ tmplt ]; diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index 95827ba364a..1f9834c08f4 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [audiofile libtiff]; meta = { description = "A portable and modular SIP User-Agent with audio and video support"; - homepage = http://www.creytiv.com/baresip.html; + homepage = "http://www.creytiv.com/baresip.html"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix index f898152d820..6845c616e9c 100644 --- a/pkgs/development/libraries/sparsehash/default.nix +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/sparsehash/sparsehash; + homepage = "https://github.com/sparsehash/sparsehash"; description = "An extremely memory-efficient hash_map implementation"; platforms = platforms.all; license = licenses.bsd3; diff --git a/pkgs/development/libraries/spatialite-tools/default.nix b/pkgs/development/libraries/spatialite-tools/default.nix index 83eef355f2d..939371e9209 100644 --- a/pkgs/development/libraries/spatialite-tools/default.nix +++ b/pkgs/development/libraries/spatialite-tools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A complete sqlite3-compatible CLI front-end for libspatialite"; - homepage = https://www.gaia-gis.it/fossil/spatialite-tools; + homepage = "https://www.gaia-gis.it/fossil/spatialite-tools"; license = with stdenv.lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix index 7bf3a5faa7d..f7c3fc50fd7 100644 --- a/pkgs/development/libraries/speex/default.nix +++ b/pkgs/development/libraries/speex/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.speex.org/; + homepage = "https://www.speex.org/"; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix index 4d74c7e0559..421b3ec08c4 100644 --- a/pkgs/development/libraries/speexdsp/default.nix +++ b/pkgs/development/libraries/speexdsp/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isAarch64 "--disable-neon"; meta = with stdenv.lib; { - homepage = https://www.speex.org/; + homepage = "https://www.speex.org/"; description = "An Open Source/Free Software patent-free audio compression format designed for speech"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/sphinxbase/default.nix b/pkgs/development/libraries/sphinxbase/default.nix index 3e4d64c47ad..008fb608ca0 100644 --- a/pkgs/development/libraries/sphinxbase/default.nix +++ b/pkgs/development/libraries/sphinxbase/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (rec { meta = { description = "Support Library for Pocketsphinx"; - homepage = http://cmusphinx.sourceforge.net; + homepage = "http://cmusphinx.sourceforge.net"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 7ba120d661b..f418ecda89e 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { Python bindings are available too. ''; - homepage = https://www.spice-space.org/; + homepage = "https://www.spice-space.org/"; license = licenses.lgpl21; maintainers = [ maintainers.xeji ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index d2c4ddb8631..2e158b98b58 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { VD-Interfaces. The VD-Interfaces (VDI) enable both ends of the solution to be easily utilized by a third-party component. ''; - homepage = https://www.spice-space.org/; + homepage = "https://www.spice-space.org/"; license = licenses.lgpl21; maintainers = [ maintainers.bluescreen303 ]; diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix index d187187246b..66d30e26a0d 100644 --- a/pkgs/development/libraries/sqlcipher/default.nix +++ b/pkgs/development/libraries/sqlcipher/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails. requires tcl? meta = with stdenv.lib; { - homepage = http://sqlcipher.net/; + homepage = "http://sqlcipher.net/"; description = "Full Database Encryption for SQLite"; platforms = platforms.unix; license = licenses.bsd3; diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 38eb1b158c8..4e37febbe75 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool that shows statistics about SQLite databases"; - downloadPage = http://sqlite.org/download.html; - homepage = https://www.sqlite.org; + downloadPage = "http://sqlite.org/download.html"; + homepage = "https://www.sqlite.org"; license = licenses.publicDomain; maintainers = with maintainers; [ pesterhazy ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index a59325ba6ca..245c55e9ea8 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = { description = "A self-contained, serverless, zero-configuration, transactional SQL database engine"; - downloadPage = https://sqlite.org/download.html; + downloadPage = "https://sqlite.org/download.html"; homepage = "https://www.sqlite.org/"; license = licenses.publicDomain; maintainers = with maintainers; [ eelco np ]; diff --git a/pkgs/development/libraries/sqlite/sqlar.nix b/pkgs/development/libraries/sqlite/sqlar.nix index 739dfc3bc5b..78ac8ba6448 100644 --- a/pkgs/development/libraries/sqlite/sqlar.nix +++ b/pkgs/development/libraries/sqlite/sqlar.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://sqlite.org/sqlar; + homepage = "https://sqlite.org/sqlar"; description = "SQLite Archive utilities"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/development/libraries/srt/default.nix b/pkgs/development/libraries/srt/default.nix index 953ba9484fa..32c3135cd4f 100644 --- a/pkgs/development/libraries/srt/default.nix +++ b/pkgs/development/libraries/srt/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure, Reliable, Transport"; - homepage = https://www.srtalliance.org; + homepage = "https://www.srtalliance.org"; license = licenses.mpl20; maintainers = with maintainers; [ nh2 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix index a906939f529..e8a3ca94434 100644 --- a/pkgs/development/libraries/srtp/default.nix +++ b/pkgs/development/libraries/srtp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/cisco/libsrtp; + homepage = "https://github.com/cisco/libsrtp"; description = "Secure RTP (SRTP) Reference Implementation"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index 82cbce8055e..bf2522ca780 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 libxcb xcbutil ]; meta = { - homepage = http://www.freedesktop.org/software/startup-notification; + homepage = "http://www.freedesktop.org/software/startup-notification"; description = "Application startup notification and feedback library"; license = stdenv.lib.licenses.lgpl2; }; diff --git a/pkgs/development/libraries/stb/default.nix b/pkgs/development/libraries/stb/default.nix index c2353c7b706..8e57222ded0 100644 --- a/pkgs/development/libraries/stb/default.nix +++ b/pkgs/development/libraries/stb/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Single-file public domain libraries for C/C++"; - homepage = https://github.com/nothings/stb; + homepage = "https://github.com/nothings/stb"; license = licenses.publicDomain; platforms = platforms.all; maintainers = with maintainers; [ jfrankenau ]; diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 89261b665f5..b0da3dbfa27 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.clifford.at/stfl/; + 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; diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index ff1a7b57f4a..2d344ab293d 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of the C++ Standard Library"; - homepage = https://sourceforge.net/projects/stlport/; + homepage = "https://sourceforge.net/projects/stlport/"; license = stdenv.lib.licenses.free; # seems BSD-like broken = true; # probably glibc-2.20 -related issue }; diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 8121b7a501f..33a2ae25b12 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://strigi.sourceforge.net; + homepage = "http://strigi.sourceforge.net"; description = "A very fast and efficient crawler to index data on your harddrive"; license = "LGPL"; maintainers = with stdenv.lib.maintainers; [ sander ]; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 5589a5560eb..fead2c8c1a5 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An implementation of the C++ standard template library STL for external memory (out-of-core) computations"; - homepage = https://github.com/stxxl/stxxl; + homepage = "https://github.com/stxxl/stxxl"; license = licenses.boost; maintainers = with maintainers; [ ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/subunit/default.nix b/pkgs/development/libraries/subunit/default.nix index 9a5f4db2deb..bf3b6a9ffd1 100644 --- a/pkgs/development/libraries/subunit/default.nix +++ b/pkgs/development/libraries/subunit/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "subunit"; - version = "1.1.0"; + version = "1.4.0"; src = fetchurl { url = "https://launchpad.net/subunit/trunk/${version}/+download/${pname}-${version}.tar.gz"; - sha256 = "0lcah7p66c05p7xpw6ns1is0i02lh0nq8gq51mv4wyvbr6zaasa8"; + sha256 = "1h7i5ifcx20qkya24j11nbwa829klw7dvnlljdgivgvcx6b20y80"; }; nativeBuildInputs = [ pkgconfig ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A streaming protocol for test results"; - homepage = https://launchpad.net/subunit; + homepage = "https://launchpad.net/subunit"; license = licenses.asl20; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix index 12840b76940..2d8a8f55c67 100644 --- a/pkgs/development/libraries/sundials/2.x.nix +++ b/pkgs/development/libraries/sundials/2.x.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = https://computation.llnl.gov/projects/sundials; + homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; maintainers = with maintainers; [ flokli idontgetoutmuch ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index fb6f773459e..2405b1b6fdc 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Suite of nonlinear differential/algebraic equation solvers"; - homepage = https://computation.llnl.gov/projects/sundials; + homepage = "https://computation.llnl.gov/projects/sundials"; platforms = platforms.all; maintainers = with maintainers; [ flokli idontgetoutmuch ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index c8c60c1f8ea..bdac55fe2ec 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "swiften"; version = "4.0.2"; - nativeBuildInputs = [ scons]; + nativeBuildInputs = [ scons.py2 ]; buildInputs = [ python ]; propagatedBuildInputs = [ openssl boost ]; @@ -29,9 +29,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An XMPP library for C++, used by the Swift client"; - homepage = http://swift.im/swiften.html; + homepage = "http://swift.im/swiften.html"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.twey ]; + broken = true; # Broken since 2019-11-20 (https://hydra.nixos.org/build/114681755) }; } diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 3d146a5a227..bdbed724b20 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software framework that allows research manipulation of Biblical texts"; - homepage = http://www.crosswire.org/sword/; + homepage = "http://www.crosswire.org/sword/"; platforms = platforms.linux; license = licenses.gpl2; maintainers = [ maintainers.piotr maintainers.AndersonTorres ]; diff --git a/pkgs/development/libraries/symengine/default.nix b/pkgs/development/libraries/symengine/default.nix index a41b086016b..524958e51a2 100644 --- a/pkgs/development/libraries/symengine/default.nix +++ b/pkgs/development/libraries/symengine/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SymEngine is a fast symbolic manipulation library"; - homepage = https://github.com/symengine/symengine; + homepage = "https://github.com/symengine/symengine"; platforms = platforms.unix ++ platforms.windows; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index f6d4df2eab3..2419cf55442 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "Compression library that can be used with the hdf5 library"; - homepage = https://www.hdfgroup.org/doc_resource/SZIP/; + homepage = "https://www.hdfgroup.org/doc_resource/SZIP/"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix index 010838efab5..7d42abc6ea1 100644 --- a/pkgs/development/libraries/t1lib/default.nix +++ b/pkgs/development/libraries/t1lib/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A type 1 font rasterizer library for UNIX/X11"; - homepage = http://www.t1lib.org/; + homepage = "http://www.t1lib.org/"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/tachyon/default.nix b/pkgs/development/libraries/tachyon/default.nix index d1d4ee806b8..993cf663121 100644 --- a/pkgs/development/libraries/tachyon/default.nix +++ b/pkgs/development/libraries/tachyon/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.raskin]; platforms = with stdenv.lib.platforms; linux ++ cygwin ++ darwin; - homepage = http://jedi.ks.uiuc.edu/~johns/tachyon/; + homepage = "http://jedi.ks.uiuc.edu/~johns/tachyon/"; }; } diff --git a/pkgs/development/libraries/taglib-sharp/default.nix b/pkgs/development/libraries/taglib-sharp/default.nix index 28ce5c60481..89d676cf3a3 100644 --- a/pkgs/development/libraries/taglib-sharp/default.nix +++ b/pkgs/development/libraries/taglib-sharp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for reading and writing metadata in media files"; - homepage = https://github.com/mono/taglib-sharp; + homepage = "https://github.com/mono/taglib-sharp"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 9e9bc1c804b..f464364e8a0 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42, fixDarwinDylibNames +{ stdenv +, fetchurl +, python +, pkg-config +, readline +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, fixDarwinDylibNames , wafHook }: @@ -12,9 +19,19 @@ stdenv.mkDerivation rec { sha256 = "0xwzgzrqamfdlklwacp9d219pqkah0yfrhxb1j7bxlmgzp924j7g"; }; - nativeBuildInputs = [ pkgconfig fixDarwinDylibNames python wafHook - docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ readline libxslt ]; + nativeBuildInputs = [ + pkg-config + fixDarwinDylibNames + python + wafHook + docbook-xsl-nons + docbook_xml_dtd_42 + ]; + + buildInputs = [ + readline + libxslt + ]; wafPath = "buildtools/bin/waf"; diff --git a/pkgs/development/libraries/tclap/default.nix b/pkgs/development/libraries/tclap/default.nix index 293baa492c5..22fd7b11681 100644 --- a/pkgs/development/libraries/tclap/default.nix +++ b/pkgs/development/libraries/tclap/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://tclap.sourceforge.net/; + homepage = "http://tclap.sourceforge.net/"; description = "Templatized C++ Command Line Parser Library"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/libraries/tcllib/default.nix b/pkgs/development/libraries/tcllib/default.nix index b1add708902..2cb65b9c698 100644 --- a/pkgs/development/libraries/tcllib/default.nix +++ b/pkgs/development/libraries/tcllib/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ tcl ]; meta = { - homepage = https://sourceforge.net/projects/tcllib/; + 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; diff --git a/pkgs/development/libraries/tcltls/default.nix b/pkgs/development/libraries/tcltls/default.nix index f1fd6760c61..c26394f6cd5 100644 --- a/pkgs/development/libraries/tcltls/default.nix +++ b/pkgs/development/libraries/tcltls/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://tls.sourceforge.net/; + homepage = "http://tls.sourceforge.net/"; description = "An OpenSSL / RSA-bsafe Tcl extension"; license = stdenv.lib.licenses.tcltk; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tclx/default.nix b/pkgs/development/libraries/tclx/default.nix index 1cb06377399..5d4727a1831 100644 --- a/pkgs/development/libraries/tclx/default.nix +++ b/pkgs/development/libraries/tclx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-tcl=${tcl}/lib" "--exec-prefix=\${prefix}" ]; meta = { - homepage = http://tclx.sourceforge.net/; + homepage = "http://tclx.sourceforge.net/"; description = "Tcl extensions"; license = stdenv.lib.licenses.tcltk; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 9e90e3d3be4..b8e6552bc7b 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -1,18 +1,34 @@ -{ stdenv, fetchurl, wafHook, pkgconfig, readline, libxslt -, docbook_xsl, docbook_xml_dtd_42 +{ stdenv +, fetchurl +, pkg-config +, wafHook +, python3 +, readline +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "tdb-1.3.18"; + pname = "tdb"; + version = "1.4.3"; src = fetchurl { - url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "1drnsdh1w0px35r0y7l7g59yvyr67mvcsdrli4wab0mwi07b8mn1"; + url = "mirror://samba/tdb/${pname}-${version}.tar.gz"; + sha256 = "06waz0k50c7v3chd08mzp2rv7w4k4q9isbxx3vhlfpx1vy9q61f8"; }; - nativeBuildInputs = [ pkgconfig wafHook ]; + nativeBuildInputs = [ + pkg-config + wafHook + libxslt + docbook-xsl-nons + docbook_xml_dtd_45 + ]; + buildInputs = [ - readline libxslt docbook_xsl docbook_xml_dtd_42 + python3 + readline # required to build python ]; wafPath = "buildtools/bin/waf"; @@ -30,7 +46,7 @@ stdenv.mkDerivation rec { and uses locking internally to keep writers from trampling on each other. TDB is also extremely small. ''; - homepage = https://tdb.samba.org/; + homepage = "https://tdb.samba.org/"; license = licenses.lgpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index e835d1d86fd..93cf0670dc7 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://www.astro.caltech.edu/~mcs/tecla/; + homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; description = "Command-line editing library"; license = "as-is"; diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix index 1247d9ffa84..455c761f6ee 100644 --- a/pkgs/development/libraries/telepathy/farstream/default.nix +++ b/pkgs/development/libraries/telepathy/farstream/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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/; + homepage = "https://telepathy.freedesktop.org/wiki/Components/Telepathy-Farstream/"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 7436da50319..ee2f34776d6 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { passthru.python = python2; meta = with stdenv.lib; { - homepage = https://telepathy.freedesktop.org; + 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 d14010c857e..b8e438819db 100644 --- a/pkgs/development/libraries/telepathy/qt/default.nix +++ b/pkgs/development/libraries/telepathy/qt/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { patches = [ # https://github.com/TelepathyIM/telepathy-qt/issues/25 (fetchpatch { - url = https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch; + url = "https://github.com/TelepathyIM/telepathy-qt/commit/d654dc70dbec7097e96e6d96ca74ab1b5b00ef8c.patch"; sha256 = "1jzd9b9rqh3c8xlq8dr7c0r8aabzf5ywv2gpkk6phh3xwngzrfbh"; }) ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Telepathy Qt bindings"; - homepage = https://telepathy.freedesktop.org/components/telepathy-qt/; + homepage = "https://telepathy.freedesktop.org/components/telepathy-qt/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 070953d0bbc..3fd6be73a70 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A library for template expansion which supports calling into GObject Introspection from templates"; - homepage = https://gitlab.gnome.org/GNOME/template-glib; + homepage = "https://gitlab.gnome.org/GNOME/template-glib"; license = licenses.lgpl21Plus; maintainers = gnome3.maintainers; platforms = platforms.unix; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index 997b874ac5b..008f0f5b424 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl , amtk, gnome3, gtk3, gtksourceview4, libuchardet, libxml2, pkgconfig }: let - version = "4.3.1"; + version = "4.4.0"; pname = "tepl"; in stdenv.mkDerivation { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08y6vss29b65pqzv708cyqmbszgxsqqgw7g0vh6f1389ayi2lvs0"; + sha256 = "0mm2z849hnni7597an05mrv0dckrxjngpf2xfa0g5s17i8x6gxp6"; }; nativeBuildInputs = [ @@ -16,8 +16,11 @@ in stdenv.mkDerivation { ]; buildInputs = [ - amtk libxml2 + ]; + + propagatedBuildInputs = [ + amtk gtksourceview4 libuchardet gtk3 @@ -33,7 +36,7 @@ in stdenv.mkDerivation { passthru.updateScript = gnome3.updateScript { packageName = pname; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tepl; + homepage = "https://wiki.gnome.org/Projects/Tepl"; description = "Text editor product line"; maintainers = [ maintainers.manveru ]; license = licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/termbox/default.nix b/pkgs/development/libraries/termbox/default.nix index 8ebf0156be8..22082f7198f 100644 --- a/pkgs/development/libraries/termbox/default.nix +++ b/pkgs/development/libraries/termbox/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # to make the package buildable on Python 3.7 patches = [ (fetchpatch { - url = https://github.com/nsf/termbox/commit/6fe63ac3ad63dc2c3ac45b770541cc8b7a1d2db7.patch; + url = "https://github.com/nsf/termbox/commit/6fe63ac3ad63dc2c3ac45b770541cc8b7a1d2db7.patch"; sha256 = "1s5747v51sdwvpsg6k9y1j60yn9f63qnylkgy8zrsifjzzd5fzl6"; }) ]; diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 9f94f4f7217..66d65e63951 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -1,32 +1,51 @@ -{ stdenv, fetchurl, python, pkgconfig, readline, talloc -, libxslt, docbook_xsl, docbook_xml_dtd_42 +{ stdenv +, fetchurl +, python3 +, pkg-config +, readline +, talloc +, libxslt +, docbook-xsl-nons +, docbook_xml_dtd_42 +, which +, wafHook }: stdenv.mkDerivation rec { - name = "tevent-0.9.37"; + pname = "tevent"; + version = "0.10.2"; src = fetchurl { - url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "1q77vbjic2bb79li2a54ffscnrnwwww55fbpry2kgh7acpnlb0qn"; + url = "mirror://samba/tevent/${pname}-${version}.tar.gz"; + sha256 = "+EJ4IuWyh4+4so1vUNloSHNPPzEwYS+1dP3S0hSKZpY="; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + pkg-config + which + python3 + libxslt + docbook-xsl-nons + docbook_xml_dtd_42 + wafHook + ]; + buildInputs = [ - python readline talloc libxslt docbook_xsl docbook_xml_dtd_42 + python3 + readline # required to build python + talloc ]; - preConfigure = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,g' buildtools/bin/waf - ''; + wafPath = "buildtools/bin/waf"; - configureFlags = [ + wafConfigureFlags = [ "--bundled-libraries=NONE" "--builtin-libraries=replace" ]; meta = with stdenv.lib; { description = "An event system based on the talloc memory management library"; - homepage = https://tevent.samba.org/; + homepage = "https://tevent.samba.org/"; license = licenses.lgpl3Plus; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 43f1e8b83fe..8bc3c0a6e09 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/libtirpc/; + homepage = "https://sourceforge.net/projects/libtirpc/"; description = "The transport-independent Sun RPC implementation (TI-RPC)"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/ticpp/default.nix b/pkgs/development/libraries/ticpp/default.nix index e46bf2418bc..01fab29b674 100644 --- a/pkgs/development/libraries/ticpp/default.nix +++ b/pkgs/development/libraries/ticpp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = { description = "Interface to TinyXML"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/wxFormBuilder/ticpp; + homepage = "https://github.com/wxFormBuilder/ticpp"; }; } diff --git a/pkgs/development/libraries/tidyp/default.nix b/pkgs/development/libraries/tidyp/default.nix index 51dabbd2beb..f75b8cb0151 100644 --- a/pkgs/development/libraries/tidyp/default.nix +++ b/pkgs/development/libraries/tidyp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program that can validate your HTML, as well as modify it to be more clean and standard"; - homepage = http://tidyp.com/; + homepage = "http://tidyp.com/"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; license = licenses.bsd3; diff --git a/pkgs/development/libraries/tiledb/default.nix b/pkgs/development/libraries/tiledb/default.nix index a20e4383278..3ebfd4ea919 100644 --- a/pkgs/development/libraries/tiledb/default.nix +++ b/pkgs/development/libraries/tiledb/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "0khxd1w5piqkxjiibnfvxcpk9lb8pi5x95zll5qs7vpbznn56b18"; + sha256 = "0vpbyxi8k29c7sjpk86y5w3yyp5fn62q5xvbw061wgp7vrprf8bm"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/tinycdb/default.nix b/pkgs/development/libraries/tinycdb/default.nix index 19b8640f866..71a105f3fd7 100644 --- a/pkgs/development/libraries/tinycdb/default.nix +++ b/pkgs/development/libraries/tinycdb/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { structure is tuned for fast reading. ''; - homepage = https://www.corpit.ru/mjt/tinycdb.html; + homepage = "https://www.corpit.ru/mjt/tinycdb.html"; license = licenses.publicDomain; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/tinyxml-2/default.nix b/pkgs/development/libraries/tinyxml-2/default.nix index 4fc1da1fe0a..310b5a447c7 100644 --- a/pkgs/development/libraries/tinyxml-2/default.nix +++ b/pkgs/development/libraries/tinyxml-2/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple, small, efficient, C++ XML parser"; - homepage = http://www.grinninglizard.com/tinyxml2/index.html; + homepage = "http://www.grinninglizard.com/tinyxml2/index.html"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.zlib; }; diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 0cc4038b64e..664030bc1bc 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation { meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; - homepage = http://www.grinninglizard.com/tinyxml/index.html; + homepage = "http://www.grinninglizard.com/tinyxml/index.html"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/libraries/tix/default.nix b/pkgs/development/libraries/tix/default.nix index 507f2fb275b..f0b460b6f3d 100644 --- a/pkgs/development/libraries/tix/default.nix +++ b/pkgs/development/libraries/tix/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A widget library for Tcl/Tk"; - homepage = http://tix.sourceforge.net/; + homepage = "http://tix.sourceforge.net/"; platforms = platforms.all; license = with licenses; [ bsd2 # tix diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index a65c6053f29..745be0be922 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { meta = with stdenv.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/; + homepage = "https://www.tcl.tk/"; license = licenses.tcltk; platforms = platforms.all; maintainers = with maintainers; [ lovek323 vrthra ]; diff --git a/pkgs/development/libraries/tl-expected/default.nix b/pkgs/development/libraries/tl-expected/default.nix index 9de97229e0b..e91c42c884c 100644 --- a/pkgs/development/libraries/tl-expected/default.nix +++ b/pkgs/development/libraries/tl-expected/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++11/14/17 std::expected with functional-style extensions"; - homepage = https://tl.tartanllama.xyz/en/latest/api/expected.html; + homepage = "https://tl.tartanllama.xyz/en/latest/api/expected.html"; license = licenses.cc0; platforms = platforms.all; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/development/libraries/tnt/default.nix b/pkgs/development/libraries/tnt/default.nix index 13e8f783915..7e8aa2983cf 100644 --- a/pkgs/development/libraries/tnt/default.nix +++ b/pkgs/development/libraries/tnt/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "3.0.12"; src = fetchurl { - url = https://math.nist.gov/tnt/tnt_3_0_12.zip; + url = "https://math.nist.gov/tnt/tnt_3_0_12.zip"; sha256 = "1bzkfdb598584qlc058n8wqq9vbz714gr5r57401rsa9qaxhk5j7"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://math.nist.gov/tnt/; + 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; diff --git a/pkgs/development/libraries/tntdb/default.nix b/pkgs/development/libraries/tntdb/default.nix index 2d6ae3f18ca..ff14c8c3305 100644 --- a/pkgs/development/libraries/tntdb/default.nix +++ b/pkgs/development/libraries/tntdb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.tntnet.org/tntdb.html; + homepage = "http://www.tntnet.org/tntdb.html"; description = "C++ library which makes accessing SQL databases easy and robust"; platforms = platforms.linux ; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/tntnet/default.nix b/pkgs/development/libraries/tntnet/default.nix index 86b0080a824..332750d7694 100644 --- a/pkgs/development/libraries/tntnet/default.nix +++ b/pkgs/development/libraries/tntnet/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.tntnet.org/tntnet.html; + homepage = "http://www.tntnet.org/tntnet.html"; description = "Web server which allows users to develop web applications using C++"; platforms = platforms.linux ; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/tokyo-tyrant/default.nix b/pkgs/development/libraries/tokyo-tyrant/default.nix index 358da431e1c..5b58bf41672 100644 --- a/pkgs/development/libraries/tokyo-tyrant/default.nix +++ b/pkgs/development/libraries/tokyo-tyrant/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { licensed under the GNU Lesser General Public License. ''; - homepage = https://fallabs.com/tokyotyrant/; + homepage = "https://fallabs.com/tokyotyrant/"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/libraries/torch-hdf5/default.nix b/pkgs/development/libraries/torch-hdf5/default.nix deleted file mode 100644 index 6dd51944111..00000000000 --- a/pkgs/development/libraries/torch-hdf5/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{stdenv, fetchFromGitHub, torch, cmake, hdf5}: -stdenv.mkDerivation rec { - pname = "torch-hdf5"; - version = "0.0pre2016-07-01"; - buildInputs = [cmake torch hdf5]; - src = fetchFromGitHub { - owner = "deepmind"; - repo = "torch-hdf5"; - rev = "639bb4e62417ac392bf31a53cdd495d19337642b"; - sha256 = "0x1si2c30d95vmw0xqyq242wghfih3m5i43785vwahlzm7h6n6xz"; - }; - meta = { - inherit version; - description = ''HDF5 format support for Torch''; - license = stdenv.lib.licenses.bsd3; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/torch/default.nix b/pkgs/development/libraries/torch/default.nix deleted file mode 100644 index b5cb0f76e9f..00000000000 --- a/pkgs/development/libraries/torch/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{stdenv, fetchgit, luajit, openblas, imagemagick, cmake, curl, fftw, gnuplot - , libjpeg, zeromq3, ncurses, openssl, libpng, qt4, readline, unzip - , pkgconfig, zlib, libX11, which - }: -stdenv.mkDerivation rec{ - version = "0.0pre20160820"; - pname = "torch"; - buildInputs = [ - luajit openblas imagemagick cmake curl fftw gnuplot unzip qt4 - libjpeg zeromq3 ncurses openssl libpng readline pkgconfig - zlib libX11 which - ]; - - src = fetchgit { - url = "https://github.com/torch/distro"; - rev = "8b6a834f8c8755f6f5f84ef9d8da9cfc79c5ce1f"; - sha256 = "120hnz82d7izinsmv5smyqww71dhpix23pm43s522dfcglpql8xy"; - fetchSubmodules = true; - }; - - buildPhase = '' - cd .. - export PREFIX=$out - - mkdir "$out" - sh install.sh -s - ''; - installPhase = '' - ''; - meta = { - inherit version; - description = ''A scientific computing framework with wide support for machine learning algorithms''; - license = stdenv.lib.licenses.bsd3 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index 08a2df3c02d..2a6c8c28d1a 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "totem-pl-parser"; - version = "3.26.4"; + version = "3.26.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1w34hdr09v3wy1cfvzhcmxc6b5p9ngcabgix59iv7hk739anymy1"; + sha256 = "132jihnf51zs98yjkc6jxyqib4f3dawpjm17g4bj4j78y93dww2k"; }; passthru = { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 ]; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Videos; + homepage = "https://wiki.gnome.org/Apps/Videos"; description = "Simple GObject-based library to parse and save a host of playlist formats"; maintainers = gnome3.maintainers; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix index 6195c80e24b..b264c3bc6c6 100644 --- a/pkgs/development/libraries/tpm2-tss/default.nix +++ b/pkgs/development/libraries/tpm2-tss/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "OSS implementation of the TCG TPM2 Software Stack (TSS2)"; - homepage = https://github.com/tpm2-software/tpm2-tss; + homepage = "https://github.com/tpm2-software/tpm2-tss"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ delroth ]; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index a9d02f0629f..2e69524e9c7 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { pname = "tracker-miners"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1kizavw9gbdjkw4wykgv0fcl2y6fj788nycx9p4byn6ylb1277h6"; + sha256 = "dHKqKNeGJiDTyiu+w7ED31R9cxnBLpWn96qfn23uSxk="; }; nativeBuildInputs = [ @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { }) # https://bugzilla.gnome.org/show_bug.cgi?id=795576 (fetchurl { - url = https://bugzilla.gnome.org/attachment.cgi?id=371427; + url = "https://bugzilla.gnome.org/attachment.cgi?id=371427"; sha256 = "187flswvzymjfxwfrrhizb1cvs780zm39aa3i2vwa5fbllr7kcpf"; }) ]; @@ -125,13 +125,12 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; + homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = gnome3.maintainers; license = licenses.gpl2Plus; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index b34c03d9519..8274a379973 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tracker"; - version = "2.3.2"; + version = "2.3.4"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nzbnvwwsk6kv6kqbxwlz8vk70l9ai6b4r9qypw51vp4qy72ny54"; + sha256 = "V3lSJEq5d8eLC4ji9jxBl+q6FuTWa/9pK39YmT4GUW0="; }; nativeBuildInputs = [ @@ -52,13 +52,12 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; versionPolicy = "none"; }; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/Tracker; + homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = gnome3.maintainers; license = licenses.gpl2; diff --git a/pkgs/development/libraries/tre/default.nix b/pkgs/development/libraries/tre/default.nix index d5ed35694c5..80806848846 100644 --- a/pkgs/development/libraries/tre/default.nix +++ b/pkgs/development/libraries/tre/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://sources.debian.net/data/main/t/tre/0.8.0-6/debian/patches/03-cve-2016-8859; + url = "https://sources.debian.net/data/main/t/tre/0.8.0-6/debian/patches/03-cve-2016-8859"; sha256 = "0navhizym6qxd4gngrsslbij8x9r3s67p1jzzhvsnq6ky49j7w3p"; }) ]; diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index 91b6d2cb167..c2cb8a836bf 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "tremor-unstable-2018-03-16"; src = fetchgit { - url = https://git.xiph.org/tremor.git; + url = "https://git.xiph.org/tremor.git"; rev = "562307a4a7082e24553f3d2c55dab397a17c4b4f"; sha256 = "0m07gq4zfgigsiz8b518xyb19v7qqp76qmp7lb262825vkqzl3zq"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://xiph.org/tremor/; + homepage = "https://xiph.org/tremor/"; description = "Fixed-point version of the Ogg Vorbis decoder"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index d5af39d3f2a..f2018286a3e 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Transparent SOCKS v4 proxying library"; - homepage = http://tsocks.sourceforge.net/; + homepage = "http://tsocks.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ edwtjo phreedom ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index e1284c39aa3..7c44731ef13 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 code and portions of LAME. ''; - homepage = http://www.twolame.org/; + homepage = "http://www.twolame.org/"; license = with licenses; [ lgpl2Plus ]; platforms = with platforms; unix; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/development/libraries/ucl/default.nix b/pkgs/development/libraries/ucl/default.nix index 933a3afef35..f25a6313752 100644 --- a/pkgs/development/libraries/ucl/default.nix +++ b/pkgs/development/libraries/ucl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ucl-1.03"; src = fetchurl { - url = https://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz; + url = "https://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz"; sha256 = "b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-std=c90"; meta = { - homepage = http://www.oberhumer.com/opensource/ucl/; + homepage = "http://www.oberhumer.com/opensource/ucl/"; description = "Portable lossless data compression library"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index 53e10b468ba..1c20ce6d9c8 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ library to facilitate using C++ design patterns"; - homepage = https://www.gnu.org/software/commoncpp/; + homepage = "https://www.gnu.org/software/commoncpp/"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/libraries/ucx/default.nix b/pkgs/development/libraries/ucx/default.nix index d1e3934d882..9ec8ca660cf 100644 --- a/pkgs/development/libraries/ucx/default.nix +++ b/pkgs/development/libraries/ucx/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Unified Communication X library"; - homepage = http://www.openucx.org; + homepage = "http://www.openucx.org"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index 18f270e70db..41fb6e7abff 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { outputDevdoc = "out"; meta = with stdenv.lib; { - homepage = http://www.corpit.ru/mjt/udns.html; + homepage = "http://www.corpit.ru/mjt/udns.html"; description = "Async-capable DNS stub resolver library"; license = licenses.lgpl21Plus; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix index faee73fd393..65e88f8fd8c 100644 --- a/pkgs/development/libraries/udunits/default.nix +++ b/pkgs/development/libraries/udunits/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat ]; meta = with stdenv.lib; { - homepage = https://www.unidata.ucar.edu/software/udunits/; + 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; platforms = platforms.linux; diff --git a/pkgs/development/libraries/uhttpmock/default.nix b/pkgs/development/libraries/uhttpmock/default.nix index 1b5fbe6c2ca..085741a66f8 100644 --- a/pkgs/development/libraries/uhttpmock/default.nix +++ b/pkgs/development/libraries/uhttpmock/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Project for mocking web service APIs which use HTTP or HTTPS"; - homepage = https://gitlab.com/groups/uhttpmock/; + homepage = "https://gitlab.com/groups/uhttpmock/"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 7fa8fe81c11..2c2b814b68d 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Universal video capture API"; - homepage = http://www.unicap-imaging.org/; + homepage = "http://www.unicap-imaging.org/"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/development/libraries/unittest-cpp/default.nix b/pkgs/development/libraries/unittest-cpp/default.nix index 0e5971945f3..7dd8e071567 100644 --- a/pkgs/development/libraries/unittest-cpp/default.nix +++ b/pkgs/development/libraries/unittest-cpp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - homepage = https://github.com/unittest-cpp/unittest-cpp; + homepage = "https://github.com/unittest-cpp/unittest-cpp"; description = "Lightweight unit testing framework for C++"; license = licenses.mit; maintainers = []; diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index 3a51e2c986a..a4fcac2a358 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ODBC driver manager for Unix"; - homepage = http://www.unixodbc.org/; + homepage = "http://www.unixodbc.org/"; license = licenses.lgpl2; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix index da15ece559a..6de0aabe70c 100644 --- a/pkgs/development/libraries/unixODBCDrivers/default.nix +++ b/pkgs/development/libraries/unixODBCDrivers/default.nix @@ -21,7 +21,7 @@ meta = with stdenv.lib; { description = "Official PostgreSQL ODBC Driver"; - homepage = https://odbc.postgresql.org/; + homepage = "https://odbc.postgresql.org/"; license = licenses.lgpl2; platforms = platforms.linux; }; @@ -62,7 +62,7 @@ meta = with stdenv.lib; { description = "MariaDB ODBC database driver"; - homepage = https://downloads.mariadb.org/connector-odbc/; + homepage = "https://downloads.mariadb.org/connector-odbc/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; @@ -90,7 +90,7 @@ meta = with stdenv.lib; { description = "MariaDB ODBC database driver"; - homepage = https://dev.mysql.com/downloads/connector/odbc/; + homepage = "https://dev.mysql.com/downloads/connector/odbc/"; license = licenses.gpl2; platforms = platforms.linux; broken = true; @@ -125,7 +125,7 @@ meta = with stdenv.lib; { description = "ODBC driver for SQLite"; - homepage = http://www.ch-werner.de/sqliteodbc; + homepage = "http://www.ch-werner.de/sqliteodbc"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ vlstill ]; @@ -168,7 +168,7 @@ meta = with stdenv.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; + 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; platforms = platforms.linux; maintainers = with maintainers; [ spencerjanssen ]; diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix index 5e5f4c9e8ca..c96629072f9 100644 --- a/pkgs/development/libraries/uri/default.nix +++ b/pkgs/development/libraries/uri/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "C++ URI library"; - homepage = https://cpp-netlib.org; + homepage = "https://cpp-netlib.org"; license = stdenv.lib.licenses.boost; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 9c48488bff8..971e053d4f6 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; meta = with stdenv.lib; { - homepage = https://uriparser.github.io/; + homepage = "https://uriparser.github.io/"; description = "Strictly RFC 3986 compliant URI parsing library"; longDescription = '' uriparser is a strictly RFC 3986 compliant URI parsing and handling library written in C. diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 8e43135196c..79cac738498 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "USB traffic redirection protocol"; - homepage = http://spice-space.org/page/UsbRedir; + homepage = "http://spice-space.org/page/UsbRedir"; license = licenses.lgpl21; maintainers = [ maintainers.offline ]; diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix index 18eae87e11c..b6bb02d56e4 100644 --- a/pkgs/development/libraries/ustr/default.nix +++ b/pkgs/development/libraries/ustr/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.and.org/ustr/; + homepage = "http://www.and.org/ustr/"; description = "Micro String API for C language"; license = licenses.bsd2; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 91bf7e39378..13a9855b62e 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "utf8proc"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "JuliaStrings"; repo = pname; rev = "v${version}"; - sha256 = "1i42hqwc8znqii9brangwkxk5cyc2lk95ip405fg88zr7z2ncr34"; + sha256 = "1xlkazhdnja4lksn5c9nf4bln5gjqa35a8gwlam5r0728w0h83qq"; }; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index e6cd0827639..d2c5b6ab11d 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A hash table for C structures"; - homepage = http://troydhanson.github.io/uthash; + homepage = "http://troydhanson.github.io/uthash"; license = licenses.bsd2; # it's one-clause, actually, as it's source-only platforms = platforms.all; }; diff --git a/pkgs/development/libraries/utmps/default.nix b/pkgs/development/libraries/utmps/default.nix index 073674f8571..16b4cd563b2 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.1"; - sha256 = "1h4hgjdrai51qkalgcx2ff60drpnw0ich66z90p8wk74am0vgc0h"; + version = "0.0.3.2"; + sha256 = "0zri5pqnva48bm8za4ic5mx0ymv70y4ga16bjh4i5pscs40sj5dh"; description = "A secure utmpx and wtmp implementation"; @@ -29,4 +29,3 @@ buildPackage { mv examples $doc/share/doc/utmps/examples ''; } - diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix index 678d7dd265c..6462bfd5e62 100644 --- a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { patches = [ # driver_init: load libva-x11.so for any ABI version (fetchurl { - url = https://github.com/01org/intel-hybrid-driver/pull/26.diff; + url = "https://github.com/01org/intel-hybrid-driver/pull/26.diff"; sha256 = "1ql4mbi5x1d2a5c8mkjvciaq60zj8nhx912992winbhfkyvpb3gx"; }) ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://01.org/linuxmedia; + homepage = "https://01.org/linuxmedia"; description = "Intel driver for the VAAPI library with partial HW acceleration"; license = licenses.mit; maintainers = with maintainers; [ tadfisher ]; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 1775d5fffc5..c61429324ed 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://01.org/linuxmedia; + homepage = "https://01.org/linuxmedia"; license = licenses.mit; description = "Intel driver for the VAAPI library"; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index 8a2e3af4791..dc2869f3723 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of filters for motion estimation and compensation"; - homepage = https://github.com/dubhater/vapoursynth-mvtools; + homepage = "https://github.com/dubhater/vapoursynth-mvtools"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 0cdbe396a10..46c97e0dae9 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A video processing framework with the future in mind"; - homepage = http://www.vapoursynth.com/; + homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; platforms = platforms.x86_64; maintainers = with maintainers; [ rnhmjoj tadeokondrak ]; diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix index 18b2659cc5d..46a3a3e52f0 100644 --- a/pkgs/development/libraries/vc/0.7.nix +++ b/pkgs/development/libraries/vc/0.7.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; - homepage = https://github.com/VcDevel/Vc; + homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix index 2194c7be38b..49d3f9af719 100644 --- a/pkgs/development/libraries/vc/default.nix +++ b/pkgs/development/libraries/vc/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for multiprecision complex arithmetic with exact rounding"; - homepage = https://github.com/VcDevel/Vc; + homepage = "https://github.com/VcDevel/Vc"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/vcdimager/default.nix b/pkgs/development/libraries/vcdimager/default.nix index 480b8f7bcd7..c7f375c2078 100644 --- a/pkgs/development/libraries/vcdimager/default.nix +++ b/pkgs/development/libraries/vcdimager/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libcdio ]; meta = with lib; { - homepage = https://www.gnu.org/software/vcdimager/; + homepage = "https://www.gnu.org/software/vcdimager/"; description = "Full-featured mastering suite for authoring, disassembling and analyzing Video CDs and Super Video CDs"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix index eb37d14b532..a8a24750744 100644 --- a/pkgs/development/libraries/vcg/default.nix +++ b/pkgs/development/libraries/vcg/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://vcg.isti.cnr.it/vcglib/install.html; + 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; platforms = platforms.linux; diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix index eb88b36a142..e22396f8aa3 100644 --- a/pkgs/development/libraries/vid-stab/default.nix +++ b/pkgs/development/libraries/vid-stab/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Video stabilization library"; - homepage = http://public.hronopik.de/vid.stab/; + homepage = "http://public.hronopik.de/vid.stab/"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index 625ec2cee38..8720a39f301 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; - homepage = https://hci.iwr.uni-heidelberg.de/vigra; + homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; license = licenses.mit; maintainers = [ maintainers.viric ]; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vmime/default.nix b/pkgs/development/libraries/vmime/default.nix index a68880c2f95..e0c58096cfa 100644 --- a/pkgs/development/libraries/vmime/default.nix +++ b/pkgs/development/libraries/vmime/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://www.vmime.org/; + homepage = "https://www.vmime.org/"; description = "Free mail library for C++"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix index b9eb29422c5..21c186a6732 100644 --- a/pkgs/development/libraries/vmmlib/default.nix +++ b/pkgs/development/libraries/vmmlib/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { computations and frustum culling classes, and spatial data structures''; license = licenses.bsd2; - homepage = https://github.com/VMML/vmmlib/; + homepage = "https://github.com/VMML/vmmlib/"; maintainers = [ maintainers.adev ]; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/vo-amrwbenc/default.nix b/pkgs/development/libraries/vo-amrwbenc/default.nix index 1a900c3135c..9f35bf4ad84 100644 --- a/pkgs/development/libraries/vo-amrwbenc/default.nix +++ b/pkgs/development/libraries/vo-amrwbenc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://sourceforge.net/projects/opencore-amr/; + 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 ]; diff --git a/pkgs/development/libraries/volume-key/default.nix b/pkgs/development/libraries/volume-key/default.nix index 2b0a807bfa7..7ac5a437010 100644 --- a/pkgs/development/libraries/volume-key/default.nix +++ b/pkgs/development/libraries/volume-key/default.nix @@ -11,7 +11,7 @@ in stdenv.mkDerivation { inherit version; src = fetchgit { - url = https://pagure.io/volume_key.git; + url = "https://pagure.io/volume_key.git"; rev = "volume_key-${version}"; sha256 = "1sqdbcih1c39bjiv4mm1m7acc3lfh2i2hf2r9i7rk8adfzq8awma"; }; @@ -40,7 +40,7 @@ in stdenv.mkDerivation { meta = with stdenv.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/; + homepage = "https://pagure.io/volume_key/"; license = licenses.gpl2; maintainers = with maintainers; []; platforms = platforms.linux; diff --git a/pkgs/development/libraries/vrb/default.nix b/pkgs/development/libraries/vrb/default.nix index efd60fe66fb..a85e27d42b7 100644 --- a/pkgs/development/libraries/vrb/default.nix +++ b/pkgs/development/libraries/vrb/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A virtual ring buffer library written in C"; license = licenses.lgpl21; - homepage = http://vrb.sourceforge.net/; + homepage = "http://vrb.sourceforge.net/"; maintainers = [ maintainers.bobvanderlinden ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 688dc8d451e..b45c83ab1ae 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { set of physical devices (tracker, etc.) used in a virtual-reality (VR) system. ''; - homepage = https://github.com/vrpn/vrpn; + homepage = "https://github.com/vrpn/vrpn"; license = licenses.boost; # see https://github.com/vrpn/vrpn/wiki/License platforms = platforms.linux; maintainers = with maintainers; [ ludo ]; diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix index fd0e90941b8..e54a4a40af1 100644 --- a/pkgs/development/libraries/vsqlite/default.nix +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://vsqlite.virtuosic-bytes.com/; + homepage = "http://vsqlite.virtuosic-bytes.com/"; description = "C++ wrapper library for sqlite."; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index e091f6a3917..59d0acada13 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnome.org/; + homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index d786bc271cc..901f4fca8e2 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -18,17 +18,19 @@ , pcre2 , fribidi , zlib +, icu +, systemd }: stdenv.mkDerivation rec { pname = "vte"; - version = "0.58.3"; + version = "0.60.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xa9ipwic4jnhhbzlnqbhssz10xkzv61cpkl1ammc6mdq95bbp12"; + sha256 = "1i7h1jvsg115l5djn29n06xsqvygpfagczxy0i9f39zq6dr809ay"; }; passthru = { @@ -51,6 +53,8 @@ stdenv.mkDerivation rec { gnutls pcre2 zlib + icu + systemd ]; propagatedBuildInputs = [ @@ -77,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnome.org/; + homepage = "https://www.gnome.org/"; description = "A library implementing a terminal emulator widget for GTK"; longDescription = '' VTE is a library (libvte) implementing a terminal emulator widget for diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index f79f79a6259..a7e1bc43290 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; - homepage = http://www.vtk.org/; + homepage = "http://www.vtk.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index ee6e58fab28..33926940904 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Vulkan Header files and API registry"; - homepage = https://www.lunarg.com; + homepage = "https://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index b1f2663e7f8..53f492bf8b0 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = https://www.lunarg.com; + homepage = "https://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 17d11d4fb74..58622cb98cb 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "C++ Libraries for Computer Vision Research and Implementation"; - homepage = http://vxl.sourceforge.net/; + homepage = "http://vxl.sourceforge.net/"; license = "VXL License"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix index 808836af1de..329de97d39e 100644 --- a/pkgs/development/libraries/wavpack/default.nix +++ b/pkgs/development/libraries/wavpack/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hybrid audio compression format"; - homepage = http://www.wavpack.com/; + homepage = "http://www.wavpack.com/"; 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 ef88e690067..e3b2941e8ee 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { and other interactions that must go through the compositor (but not rendering). ''; - homepage = https://wayland.freedesktop.org/; + homepage = "https://wayland.freedesktop.org/"; license = lib.licenses.mit; # Expat version platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ primeos codyopel ]; diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix index 41495b1c2e5..66d5d50c9d8 100644 --- a/pkgs/development/libraries/wayland/protocols.nix +++ b/pkgs/development/libraries/wayland/protocols.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { protocol either in Wayland core, or some other protocol in wayland-protocols. ''; - homepage = https://gitlab.freedesktop.org/wayland/wayland-protocols; + homepage = "https://gitlab.freedesktop.org/wayland/wayland-protocols"; license = lib.licenses.mit; # Expat version platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ primeos ]; diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 4fd94a29f9c..06faec558c0 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wayland C++ binding"; - homepage = https://github.com/NilsBrause/waylandpp/; + homepage = "https://github.com/NilsBrause/waylandpp/"; license = with licenses; [ bsd2 hpnd ]; maintainers = with maintainers; [ minijackson ]; }; diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index aa3d874979f..2011e5279d1 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -51,6 +51,7 @@ , xdg-dbus-proxy , substituteAll , gnome3 +, glib }: assert enableGeoLocation -> geoclue2 != null; @@ -61,13 +62,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.26.4"; + version = "2.28.0"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "0gqi9f9njrdn8vad1zvr59b25arwc8r0n8bp25sgkbfz2c3r11j3"; + sha256 = "12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn"; }; patches = optionals stdenv.isLinux [ @@ -78,6 +79,14 @@ stdenv.mkDerivation rec { ./libglvnd-headers.patch ]; + preConfigure = stdenv.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 + # CMAKE_PREFIX_PATH. + cmakeFlags+=" -DCMAKE_IGNORE_PATH=${getBin gettext}/bin" + ''; + nativeBuildInputs = [ bison cmake @@ -89,6 +98,8 @@ stdenv.mkDerivation rec { pkgconfig python3 ruby + glib # for gdbus-codegen + wayland # for wayland-scanner ]; buildInputs = [ @@ -165,7 +176,7 @@ stdenv.mkDerivation rec { meta = { description = "Web content rendering engine, GTK port"; - homepage = https://webkitgtk.org/; + homepage = "https://webkitgtk.org/"; license = licenses.bsd2; platforms = platforms.linux; hydraPlatforms = []; diff --git a/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch b/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch index 17264f3b588..8d7f2477b55 100644 --- a/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch +++ b/pkgs/development/libraries/webkitgtk/libglvnd-headers.patch @@ -1,577 +1,3 @@ -diff --git a/Source/ThirdParty/ANGLE/scripts/generate_loader.py b/Source/ThirdParty/ANGLE/scripts/generate_loader.py -index a408dac4..92ddca90 100644 ---- a/Source/ThirdParty/ANGLE/scripts/generate_loader.py -+++ b/Source/ThirdParty/ANGLE/scripts/generate_loader.py -@@ -201,6 +201,8 @@ def main(): - - libegl_preamble = """#include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> -+#include <EGL/eglmesaext.h> - """ - - util_gles_preamble = """#if defined(GL_GLES_PROTOTYPES) && GL_GLES_PROTOTYPES -@@ -215,6 +217,8 @@ util_egl_preamble = """#include "util/util_export.h" - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> -+#include <EGL/eglmesaext.h> - """ - - util_wgl_preamble = """ -diff --git a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h -index 68c65d8b..0dc9c8e3 100644 ---- a/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h -+++ b/Source/ThirdParty/ANGLE/src/common/PackedEGLEnums_autogen.h -@@ -14,6 +14,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <angle_gl.h> - - #include <cstdint> -diff --git a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h -index cd651150..17719bc2 100644 ---- a/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h -+++ b/Source/ThirdParty/ANGLE/src/common/PackedGLEnums_autogen.h -@@ -14,6 +14,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <angle_gl.h> - - #include <cstdint> -diff --git a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py -index 2f77e725..5ea54f1f 100644 ---- a/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py -+++ b/Source/ThirdParty/ANGLE/src/common/gen_packed_gl_enums.py -@@ -71,6 +71,7 @@ header_template = """// GENERATED FILE - DO NOT EDIT. - #include <angle_gl.h> - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <cstdint> - -diff --git a/Source/ThirdParty/ANGLE/src/common/utilities.h b/Source/ThirdParty/ANGLE/src/common/utilities.h -index 7a1429a4..dd20bcca 100644 ---- a/Source/ThirdParty/ANGLE/src/common/utilities.h -+++ b/Source/ThirdParty/ANGLE/src/common/utilities.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <math.h> - #include <string> -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp -index 4134226d..5dd1065f 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Config.cpp -@@ -15,6 +15,7 @@ - #include <vector> - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include "angle_gl.h" - - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp -index 13ae4e61..b964b755 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Device.cpp -@@ -12,6 +12,7 @@ - #include <iterator> - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <platform/Platform.h> - - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp -index 21064073..a46628bd 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Display.cpp -@@ -17,6 +17,7 @@ - #include <vector> - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <platform/Platform.h> - - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h -index 37df5b0c..b2e3885b 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Error.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Error.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include "angle_gl.h" - #include "common/angleutils.h" - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp -index b7bc84c8..538cb3e0 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.cpp -@@ -10,6 +10,7 @@ - #include "libANGLE/Stream.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <platform/Platform.h> - - #include "common/debug.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h -index 9157aa51..d8e58f2d 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Stream.h -@@ -14,6 +14,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "common/angleutils.h" - #include "libANGLE/AttributeMap.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp -index 6daec4f6..941f34ca 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/Surface.cpp -@@ -11,6 +11,7 @@ - #include "libANGLE/Surface.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "libANGLE/Config.h" - #include "libANGLE/Context.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h -index ea1a0510..db7cf0c8 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/SurfaceImpl.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "common/angleutils.h" - #include "libANGLE/Error.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp -index ba5cf532..43304da5 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DeviceD3D.cpp -@@ -13,6 +13,7 @@ - #include "libANGLE/Display.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace rx - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp -index de60dfff..93b5bdf8 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/DisplayD3D.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/d3d/DisplayD3D.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "libANGLE/Config.h" - #include "libANGLE/Context.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp -index a7255d0d..a7e37777 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/EGLImageD3D.cpp -@@ -20,6 +20,7 @@ - #include "libANGLE/renderer/d3d/TextureStorage.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace rx - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp -index 61dc8ffa..87276514 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SurfaceD3D.cpp -@@ -19,6 +19,7 @@ - #include "libANGLE/renderer/d3d/d3d11/formatutils11.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <tchar.h> - #include <algorithm> - -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h -index 443cadd6..e64bdfc4 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/SwapChainD3D.h -@@ -12,6 +12,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <GLES2/gl2.h> - - #include "common/angleutils.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp -index 33dfa6b0..eb3393d2 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/d3d/d3d11/Renderer11.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <versionhelpers.h> - #include <sstream> - -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp -index fe4def6e..2550b52c 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d11/SwapChain11.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/d3d/d3d11/SwapChain11.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "libANGLE/features.h" - #include "libANGLE/renderer/d3d/DisplayD3D.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp -index f4a4ce43..0cad5540 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/d3d/d3d9/Renderer9.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/d3d/d3d9/Renderer9.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <sstream> - - #include "common/utilities.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp -index a89e1365..0fe4fa98 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/DisplayGL.cpp -@@ -18,6 +18,7 @@ - #include "libANGLE/renderer/gl/SurfaceGL.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace rx - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp -index 10b15594..7ae1ac6b 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/RendererGL.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/gl/RendererGL.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "common/debug.h" - #include "libANGLE/AttributeMap.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h -index 115a7afb..abb200e6 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/FunctionsEGL.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <string> - #include <vector> -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp -index 47ed6ce0..9d11560c 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/egl/ozone/DisplayOzone.cpp -@@ -14,6 +14,7 @@ - #include <unistd.h> - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <drm_fourcc.h> - #include <gbm.h> -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp -index 23b4a5c5..daeb5789 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp -@@ -9,6 +9,7 @@ - #include "libANGLE/renderer/gl/glx/DisplayGLX.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <algorithm> - #include <cstring> - #include <fstream> -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp -index 698b51e2..32e6126f 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp -@@ -27,6 +27,7 @@ - #include "libANGLE/renderer/gl/formatutilsgl.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <algorithm> - #include <sstream> - -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp -index 5b686321..16ae890f 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DXGISwapChainWindowSurfaceWGL.cpp -@@ -18,6 +18,7 @@ - #include "libANGLE/renderer/gl/wgl/FunctionsWGL.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace rx - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp -index 12679ba7..93503812 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/wgl/DisplayWGL.cpp -@@ -28,6 +28,7 @@ - #include "platform/Platform.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <sstream> - #include <string> - -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp -index df900f4d..4385be88 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/vulkan/RendererVk.cpp -@@ -13,6 +13,7 @@ - #include "libANGLE/renderer/vulkan/vk_utils.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "common/debug.h" - #include "common/platform.h" -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp -index 1c0b25f4..64e96f73 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.cpp -@@ -22,6 +22,7 @@ - #include "libANGLE/formatutils.h" - - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace egl - { -diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h -index a671bb0d..248f0ae8 100644 ---- a/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h -+++ b/Source/ThirdParty/ANGLE/src/libANGLE/validationEGL.h -@@ -15,6 +15,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - namespace gl - { -diff --git a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h -index ae4a427c..a802b65d 100644 ---- a/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h -+++ b/Source/ThirdParty/ANGLE/src/libEGL/egl_loader_autogen.h -@@ -13,6 +13,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - extern PFNEGLCHOOSECONFIGPROC EGL_ChooseConfig; - extern PFNEGLCOPYBUFFERSPROC EGL_CopyBuffers; -diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h -index 3c64b290..96201b31 100644 ---- a/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h -+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/entry_points_egl_ext.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <export.h> - - extern "C" { -diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp -index 777b09e1..dbb0bd2f 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp -+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp -@@ -24,6 +24,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "deClock.h" - #include "deMemory.h" -diff --git a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp -index 6b4a25bf..1c4ac864 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp -+++ b/Source/ThirdParty/ANGLE/src/tests/deqp_support/tcuANGLEPlatform.cpp -@@ -22,6 +22,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "egluGLContextFactory.hpp" - #include "tcuANGLENativeDisplayFactory.h" -diff --git a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp -index 90abb931..aea4e153 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp -+++ b/Source/ThirdParty/ANGLE/src/tests/egl_tests/EGLX11VisualTest.cpp -@@ -10,6 +10,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <X11/Xlib.h> - - #include "test_utils/ANGLETest.h" -diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h -index e888a239..71606b8c 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h -+++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests.h -@@ -11,6 +11,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <string> - -diff --git a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp -index 7fdddcc6..e40b8905 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp -+++ b/Source/ThirdParty/ANGLE/src/tests/gles_conformance_tests/gles_conformance_tests_main.cpp -@@ -10,6 +10,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include <map> - #include <string> -diff --git a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h -index 7bc7a027..ebb2827b 100644 ---- a/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h -+++ b/Source/ThirdParty/ANGLE/src/tests/test_utils/angle_test_configs.h -@@ -16,6 +16,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "GLSLANG/ShaderLang.h" - #include "angle_test_instantiate.h" -diff --git a/Source/ThirdParty/ANGLE/util/OSPixmap.h b/Source/ThirdParty/ANGLE/util/OSPixmap.h -index ba6ccf4a..563d2578 100644 ---- a/Source/ThirdParty/ANGLE/util/OSPixmap.h -+++ b/Source/ThirdParty/ANGLE/util/OSPixmap.h -@@ -13,6 +13,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "util/Event.h" - #include "util/util_export.h" -diff --git a/Source/ThirdParty/ANGLE/util/OSWindow.h b/Source/ThirdParty/ANGLE/util/OSWindow.h -index 3cdb458c..3178fa44 100644 ---- a/Source/ThirdParty/ANGLE/util/OSWindow.h -+++ b/Source/ThirdParty/ANGLE/util/OSWindow.h -@@ -15,6 +15,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - #include "util/Event.h" - #include "util/util_export.h" -diff --git a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h -index 5fbec82f..77a30330 100644 ---- a/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h -+++ b/Source/ThirdParty/ANGLE/util/egl_loader_autogen.h -@@ -15,6 +15,7 @@ - - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - - ANGLE_UTIL_EXPORT extern PFNEGLCHOOSECONFIGPROC eglChooseConfig; - ANGLE_UTIL_EXPORT extern PFNEGLCOPYBUFFERSPROC eglCopyBuffers; -diff --git a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp -index a8a82d70..050893a9 100644 ---- a/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp -+++ b/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp -@@ -29,6 +29,7 @@ - #else - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #endif - - #if USE(CAIRO) -diff --git a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp -index 05f92c22..636df34a 100644 ---- a/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp -+++ b/Source/WebCore/platform/graphics/wayland/PlatformDisplayWayland.cpp -@@ -35,6 +35,7 @@ - #include <wayland-egl.h> - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <wtf/Assertions.h> - - namespace WebCore { -diff --git a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -index 8c81119b..bf9ed4bd 100644 ---- a/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -+++ b/Source/WebCore/platform/graphics/x11/PlatformDisplayX11.cpp -@@ -38,6 +38,7 @@ - #if USE(EGL) - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #endif - - namespace WebCore { -diff --git a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp -index 973b3168..5586236a 100644 ---- a/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp -+++ b/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp -@@ -35,6 +35,7 @@ - #include <gdk/gdkwayland.h> - #include <EGL/egl.h> - #include <EGL/eglext.h> -+#include <EGL/eglmesaext.h> - #include <WebCore/CairoUtilities.h> - #include <WebCore/GLContext.h> - diff --git a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp b/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp index 8d848ce4..46d42c11 100644 --- a/Source/WebKit/UIProcess/gtk/WaylandCompositor.cpp diff --git a/pkgs/development/libraries/webrtc-audio-processing/default.nix b/pkgs/development/libraries/webrtc-audio-processing/default.nix index b22d339617c..91d93352da1 100644 --- a/pkgs/development/libraries/webrtc-audio-processing/default.nix +++ b/pkgs/development/libraries/webrtc-audio-processing/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/software/pulseaudio/webrtc-audio-processing; + 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; platforms = platforms.unix; diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 84fbda503ea..6a7b091b536 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://www.zaphoyd.com/websocketpp/; + homepage = "https://www.zaphoyd.com/websocketpp/"; description = "C++/Boost Asio based websocket client/server library"; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix index 3b0a447f737..ea63a73fc92 100644 --- a/pkgs/development/libraries/wildmidi/default.nix +++ b/pkgs/development/libraries/wildmidi/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { WildMIDI is a simple software midi player which has a core softsynth library that can be use with other applications. ''; - homepage = http://wildmidi.sourceforge.net/; + homepage = "http://wildmidi.sourceforge.net/"; # The library is LGPLv3, the wildmidi executable is GPLv3 license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/libraries/wiredtiger/default.nix b/pkgs/development/libraries/wiredtiger/default.nix index 9025abcb3fe..9a7cee6623e 100644 --- a/pkgs/development/libraries/wiredtiger/default.nix +++ b/pkgs/development/libraries/wiredtiger/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://wiredtiger.com/; + homepage = "http://wiredtiger.com/"; description = ""; license = licenses.gpl2; platforms = intersectLists platforms.unix platforms.x86_64; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 2791c97f5ae..d66a628dac7 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { libraries = [ xorg.libXpm xorg.libXt xorg.libX11 xorg.libICE xorg.libSM stdenv.cc.cc ]; meta = { - homepage = http://java.sun.com/products/sjwtoolkit/download.html; + 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; }; diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index f5e34486350..602f3e670dd 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wxSVG is C++ library to create, manipulate and render Scalable Vector Graphics (SVG) files with the wxWidgets toolkit. ''; - homepage = http://wxsvg.sourceforge.net/; + homepage = "http://wxsvg.sourceforge.net/"; license = with licenses; gpl2; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; linux; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index a528166f68a..70b650eecb1 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; meta = with stdenv.lib; { - homepage = https://utelle.github.io/wxsqlite3/ ; + homepage = "https://utelle.github.io/wxsqlite3/"; description = "A C++ wrapper around the public domain SQLite 3.x for wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 9ca15d4977b..6a2e33f9a9f 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://guanlisheng.com/; + homepage = "http://guanlisheng.com/"; description = "A simple SQLite database browser built with wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 73dac47307a..98cf0d58479 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = { platforms = platforms.linux; license = licenses.wxWindows; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 02367e18a95..3812c81a519 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 3bbfb139279..8de7f99fe5f 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/libraries/wxwidgets/3.0/mac.nix b/pkgs/development/libraries/wxwidgets/3.0/mac.nix index 5236996199d..1b4c6702451 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/mac.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/mac.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { platforms = platforms.darwin; license = licenses.wxWindows; maintainers = [ maintainers.lnl7 ]; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; }; diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 0984472e860..99f86974cdb 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { meta = { platforms = with platforms; darwin ++ linux; license = licenses.wxWindows; - homepage = https://www.wxwidgets.org/; + homepage = "https://www.wxwidgets.org/"; description = "a C++ library that lets developers create applications for Windows, macOS, Linux and other platforms with a single code base"; longDescription = "wxWidgets gives you a single, easy-to-use API for writing GUI applications on multiple platforms that still utilize the native platform's controls and utilities. Link with the appropriate library for your platform and compiler, and your application will adopt the look and feel appropriate to that platform. On top of great GUI functionality, wxWidgets gives you: online help, network programming, streams, clipboard and drag and drop, multithreading, image loading and saving in a variety of popular formats, database support, HTML viewing and printing, and much more."; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix index 5c4c64d0e1c..49797b5dd75 100644 --- a/pkgs/development/libraries/x264/default.nix +++ b/pkgs/development/libraries/x264/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for encoding H264/AVC video streams"; - homepage = http://www.videolan.org/developers/x264.html; + homepage = "http://www.videolan.org/developers/x264.html"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ spwhitt tadeokondrak ]; diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index dbf1a098f1f..cfa19e5419f 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for encoding h.265/HEVC video streams"; - homepage = http://x265.org; + homepage = "http://x265.org"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix index 92a932a01a4..30ab7f4496d 100644 --- a/pkgs/development/libraries/xalanc/default.nix +++ b/pkgs/development/libraries/xalanc/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { buildInputs = [ xercesc getopt ]; meta = { - homepage = http://xalan.apache.org/; + 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; diff --git a/pkgs/development/libraries/xapian/tools/omega/default.nix b/pkgs/development/libraries/xapian/tools/omega/default.nix index 6c8eda6358b..a496e3886d8 100644 --- a/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Indexer and CGI search front-end built on Xapian library"; - homepage = https://xapian.org/; + homepage = "https://xapian.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/xavs/default.nix b/pkgs/development/libraries/xavs/default.nix index a5536f70a90..18b10376315 100644 --- a/pkgs/development/libraries/xavs/default.nix +++ b/pkgs/development/libraries/xavs/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AVS encoder and decoder"; - homepage = http://xavs.sourceforge.net/; + homepage = "http://xavs.sourceforge.net/"; license = licenses.lgpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ codyopel ]; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 3dd2cb5b874..ae7ceb18c0a 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xbase-3.1.2"; src = fetchurl { - url = mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz; + url = "mirror://sourceforge/xdb/xbase64-3.1.2.tar.gz"; sha256 = "17287kz1nmmm64y7zp9nhhl7slzlba09h6cc83w4mvsqwd9w882r"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://linux.techass.com/projects/xdb/; + homepage = "http://linux.techass.com/projects/xdb/"; description = "C++ class library formerly known as XDB"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index 4764c1bdb93..5457487edcc 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation { version = "2017-04-05"; src = fetchgit { - url = http://anongit.freedesktop.org/git/xcb/util-cursor.git; + url = "http://anongit.freedesktop.org/git/xcb/util-cursor.git"; rev = "f03cc278c6cce0cf721adf9c3764d3c5fba63392"; sha256 = "127zfmihd8nqlj8jjaja06xb84xdgl263w0av1xnprx05mkbkcyc"; }; meta = with stdenv.lib; { description = "XCB cursor library (libxcursor port)"; - homepage = https://cgit.freedesktop.org/xcb/util-cursor; + homepage = "https://cgit.freedesktop.org/xcb/util-cursor"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix index 1049ce3201a..02c039b8eab 100644 --- a/pkgs/development/libraries/xdg-desktop-portal/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix @@ -6,7 +6,7 @@ , pkgconfig , libxml2 , glib -, pipewire +, pipewire_0_2 , fontconfig , flatpak , gsettings-desktop-schemas @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - pipewire + pipewire_0_2 fontconfig flatpak acl diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix index 704884c23f3..3873fe05e6b 100644 --- a/pkgs/development/libraries/xercesc/default.nix +++ b/pkgs/development/libraries/xercesc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://xerces.apache.org/xerces-c/; + 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; diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index f4687bd46f8..d9d660062a2 100644 --- a/pkgs/development/libraries/xgboost/default.nix +++ b/pkgs/development/libraries/xgboost/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scalable, Portable and Distributed Gradient Boosting (GBDT, GBRT or GBM) Library"; - homepage = https://github.com/dmlc/xgboost; + homepage = "https://github.com/dmlc/xgboost"; license = licenses.asl20; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index adcb2e74b0b..aa9600085c0 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.xine-project.org/; + homepage = "http://www.xine-project.org/"; description = "A high-performance, portable and reusable multimedia playback engine"; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/development/libraries/xlslib/default.nix b/pkgs/development/libraries/xlslib/default.nix index 3d1b4ea74db..ee3942c360b 100644 --- a/pkgs/development/libraries/xlslib/default.nix +++ b/pkgs/development/libraries/xlslib/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C++/C library to construct Excel .xls files in code"; - homepage = https://sourceforge.net/projects/xlslib/; + homepage = "https://sourceforge.net/projects/xlslib/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix index 74846c8306d..3a784a2e38b 100644 --- a/pkgs/development/libraries/xml-security-c/default.nix +++ b/pkgs/development/libraries/xml-security-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ xalanc xercesc openssl ]; meta = { - homepage = http://santuario.apache.org/; + homepage = "http://santuario.apache.org/"; description = "C++ Implementation of W3C security standards for XML"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/xmlrpc-c/default.nix b/pkgs/development/libraries/xmlrpc-c/default.nix index 8a0017109bb..d9786d26a71 100644 --- a/pkgs/development/libraries/xmlrpc-c/default.nix +++ b/pkgs/development/libraries/xmlrpc-c/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight RPC library based on XML and HTTP"; - homepage = http://xmlrpc-c.sourceforge.net/; + homepage = "http://xmlrpc-c.sourceforge.net/"; # <xmlrpc-c>/doc/COPYING also lists "Expat license", # "ABYSS Web Server License" and "Python 1.5.2 License" license = licenses.bsd3; diff --git a/pkgs/development/libraries/xmlsec/default.nix b/pkgs/development/libraries/xmlsec/default.nix index a8c751330b7..1a18dfce85d 100644 --- a/pkgs/development/libraries/xmlsec/default.nix +++ b/pkgs/development/libraries/xmlsec/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.aleksey.com/xmlsec; - downloadPage = https://www.aleksey.com/xmlsec/download.html; + 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; diff --git a/pkgs/development/libraries/xsd/default.nix b/pkgs/development/libraries/xsd/default.nix index bd87d306b96..7541ee42704 100644 --- a/pkgs/development/libraries/xsd/default.nix +++ b/pkgs/development/libraries/xsd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.codesynthesis.com/products/xsd; + 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; diff --git a/pkgs/development/libraries/xvidcore/default.nix b/pkgs/development/libraries/xvidcore/default.nix index 5ec96157a79..ab68693ea5e 100644 --- a/pkgs/development/libraries/xvidcore/default.nix +++ b/pkgs/development/libraries/xvidcore/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "MPEG-4 video codec for PC"; - homepage = https://www.xvid.com/; + homepage = "https://www.xvid.com/"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel lovek323 ]; platforms = platforms.all; diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index 155e46c8f8c..70fee9b9eff 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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/; + homepage = "http://xylib.sourceforge.net/"; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index 947b08e7bc5..62fe652724f 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "yajl-2.1.0"; src = fetchurl { - url = https://github.com/lloyd/yajl/tarball/2.1.0; + url = "https://github.com/lloyd/yajl/tarball/2.1.0"; name = "${name}.tar.gz"; sha256 = "0f6yrjc05aa26wfi7lqn2gslm19m6rm81b30ksllpkappvh162ji"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { YAJL is a small event-driven (SAX-style) JSON parser written in ANSI C, and a small validating JSON generator. ''; - homepage = http://lloyd.github.com/yajl/; + homepage = "http://lloyd.github.com/yajl/"; license = stdenv.lib.licenses.isc; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ maggesi ]; diff --git a/pkgs/development/libraries/yojimbo/default.nix b/pkgs/development/libraries/yojimbo/default.nix index d3df30e03e1..9e6cc37e661 100644 --- a/pkgs/development/libraries/yojimbo/default.nix +++ b/pkgs/development/libraries/yojimbo/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { It's designed around the networking requirements of competitive multiplayer games like first person shooters. As such it provides a time critical networking layer on top of UDP, with a client/server architecture supporting up to 64 players per-dedicated server instance. ''; - homepage = https://github.com/networkprotocol/yojimbo; + homepage = "https://github.com/networkprotocol/yojimbo"; license = licenses.bsd3; platforms = platforms.x86_64; maintainers = with maintainers; [ paddygord ]; diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index e6a3fa9fbe1..60d3defcb1f 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Yubico PAM module"; - homepage = https://developers.yubico.com/yubico-pam; + homepage = "https://developers.yubico.com/yubico-pam"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix index dd983a34f88..7f6c7323fff 100644 --- a/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.zeroc.com/ice.html; + homepage = "http://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 3a5b1690f2d..9c9c5a6b001 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 { ''; meta = with stdenv.lib; { - homepage = http://www.zeroc.com/ice.html; + homepage = "http://www.zeroc.com/ice.html"; description = "The internet communications engine"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/development/libraries/zeromq/3.x.nix b/pkgs/development/libraries/zeromq/3.x.nix index 2fcf8bd9179..29981f358a5 100644 --- a/pkgs/development/libraries/zeromq/3.x.nix +++ b/pkgs/development/libraries/zeromq/3.x.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "3"; - homepage = http://www.zeromq.org; + homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix index 1a8f07a3ae0..8302ebbd1e8 100644 --- a/pkgs/development/libraries/zeromq/4.x.nix +++ b/pkgs/development/libraries/zeromq/4.x.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { branch = "4"; - homepage = http://www.zeromq.org; + homepage = "http://www.zeromq.org"; description = "The Intelligent Transport Layer"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 34a03e56a10..7f5168080fa 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library for reading and writing ZIM files"; - homepage = https://www.openzim.org/wiki/Zimlib; + homepage = "https://www.openzim.org/wiki/Zimlib"; license = licenses.gpl2; maintainers = with maintainers; [ robbinch ]; platforms = platforms.linux; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index 71da686ce48..c4a4c497ced 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -114,7 +114,7 @@ stdenv.mkDerivation (rec { }; meta = with stdenv.lib; { - homepage = https://zlib.net; + homepage = "https://zlib.net"; description = "Lossless data-compression library"; license = licenses.zlib; platforms = platforms.all; diff --git a/pkgs/development/libraries/zlog/default.nix b/pkgs/development/libraries/zlog/default.nix index 5c601575742..4788613a3dc 100644 --- a/pkgs/development/libraries/zlog/default.nix +++ b/pkgs/development/libraries/zlog/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description= "Reliable, high-performance, thread safe, flexible, clear-model, pure C logging library"; - homepage = http://hardysimpson.github.com/zlog; + homepage = "http://hardysimpson.github.com/zlog"; license = licenses.lgpl21; platforms = platforms.linux; # cannot test on something else maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/development/libraries/zookeeper_mt/default.nix b/pkgs/development/libraries/zookeeper_mt/default.nix index 127ea4f7162..b957253eebe 100644 --- a/pkgs/development/libraries/zookeeper_mt/default.nix +++ b/pkgs/development/libraries/zookeeper_mt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zookeeper bash ]; meta = with stdenv.lib; { - homepage = http://zookeeper.apache.org; + homepage = "http://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; maintainers = [ maintainers.boothead ]; diff --git a/pkgs/development/libraries/zxcvbn-c/default.nix b/pkgs/development/libraries/zxcvbn-c/default.nix index 78983f09543..7a524e72318 100644 --- a/pkgs/development/libraries/zxcvbn-c/default.nix +++ b/pkgs/development/libraries/zxcvbn-c/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tsyrogit/zxcvbn-c; + homepage = "https://github.com/tsyrogit/zxcvbn-c"; description = "A C/C++ implementation of the zxcvbn password strength estimation"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/libraries/zziplib/default.nix b/pkgs/development/libraries/zziplib/default.nix index 74bfeb09c0d..8078a3c360c 100644 --- a/pkgs/development/libraries/zziplib/default.nix +++ b/pkgs/development/libraries/zziplib/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl2Plus mpl11 ]; - homepage = http://zziplib.sourceforge.net/; + homepage = "http://zziplib.sourceforge.net/"; maintainers = [ ]; platforms = python2.meta.platforms; diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 33946b7213a..303689dce4a 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -15,7 +15,7 @@ alt-getopt = buildLuarocksPackage { version = "0.8.0-1"; src = fetchurl { - url = https://luarocks.org/alt-getopt-0.8.0-1.src.rock; + url = "https://luarocks.org/alt-getopt-0.8.0-1.src.rock"; sha256 = "1mi97dqb97sf47vb6wrk12yf1yxcaz0asr9gbgwyngr5n1adh5i3"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -35,7 +35,7 @@ ansicolors = buildLuarocksPackage { version = "1.0.2-3"; src = fetchurl { - url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; + url = "https://luarocks.org/ansicolors-1.0.2-3.src.rock"; sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; }; disabled = (luaOlder "5.1"); @@ -54,7 +54,7 @@ argparse = buildLuarocksPackage { version = "0.6.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.6.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/argparse-0.6.0-1.src.rock"; sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -73,12 +73,12 @@ basexx = buildLuarocksPackage { version = "0.4.1-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/basexx-0.4.1-1.rockspec; + url = "https://luarocks.org/basexx-0.4.1-1.rockspec"; sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; }).outPath; src = fetchurl { - url = https://github.com/aiq/basexx/archive/v0.4.1.tar.gz; + url = "https://github.com/aiq/basexx/archive/v0.4.1.tar.gz"; sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; @@ -98,7 +98,7 @@ binaryheap = buildLuarocksPackage { version = "0.4-1"; src = fetchurl { - url = https://luarocks.org/binaryheap-0.4-1.src.rock; + url = "https://luarocks.org/binaryheap-0.4-1.src.rock"; sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; }; disabled = (luaOlder "5.1"); @@ -118,7 +118,7 @@ bit32 = buildLuarocksPackage { version = "5.3.0-1"; src = fetchurl { - url = https://luarocks.org/bit32-5.3.0-1.src.rock; + url = "https://luarocks.org/bit32-5.3.0-1.src.rock"; sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; }; disabled = (luaOlder "5.1"); @@ -138,12 +138,12 @@ busted = buildLuarocksPackage { version = "2.0.rc13-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/busted-2.0.rc13-0.rockspec; + url = "https://luarocks.org/busted-2.0.rc13-0.rockspec"; sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; }).outPath; src = fetchurl { - url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; + url = "https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz"; sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; }; @@ -163,7 +163,7 @@ cassowary = buildLuarocksPackage { version = "2.2-1"; src = fetchurl { - url = mirror://luarocks/cassowary-2.2-1.src.rock; + url = "mirror://luarocks/cassowary-2.2-1.src.rock"; sha256 = "0laghzk5jbap5rfd8sasnrdrbda649sfciarba8rhygm0qni1azy"; }; propagatedBuildInputs = [ lua penlight ]; @@ -180,7 +180,7 @@ cjson = buildLuarocksPackage { version = "2.1.0.6-1"; src = fetchurl { - url = https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock; + url = "https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock"; sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; }; disabled = (luaOlder "5.1"); @@ -199,7 +199,7 @@ compat53 = buildLuarocksPackage { version = "0.7-1"; src = fetchurl { - url = https://luarocks.org/compat53-0.7-1.src.rock; + url = "https://luarocks.org/compat53-0.7-1.src.rock"; sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -219,7 +219,7 @@ cosmo = buildLuarocksPackage { version = "16.06.04-1"; src = fetchurl { - url = mirror://luarocks/cosmo-16.06.04-1.src.rock; + url = "mirror://luarocks/cosmo-16.06.04-1.src.rock"; sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww"; }; propagatedBuildInputs = [ lpeg ]; @@ -236,7 +236,7 @@ coxpcall = buildLuarocksPackage { version = "1.17.0-1"; src = fetchurl { - url = https://luarocks.org/coxpcall-1.17.0-1.src.rock; + url = "https://luarocks.org/coxpcall-1.17.0-1.src.rock"; sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; @@ -253,7 +253,7 @@ cqueues = buildLuarocksPackage { version = "20190731.52-0"; src = fetchurl { - url = https://luarocks.org/cqueues-20190731.52-0.src.rock; + url = "https://luarocks.org/cqueues-20190731.52-0.src.rock"; sha256 = "07rs34amsxf2bc5ccqdad0c63c70737r54316cbd9qh1a2wbvz8s"; }; disabled = (lua.luaversion != "5.2"); @@ -273,7 +273,7 @@ cyrussasl = buildLuarocksPackage { version = "1.1.0-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/cyrussasl-1.1.0-1.rockspec; + url = "https://luarocks.org/cyrussasl-1.1.0-1.rockspec"; sha256 = "0zy9l00l7kr3sq8phdm52jqhlqy35vdv6rdmm8mhjihcbx1fsplc"; }).outPath; @@ -303,7 +303,7 @@ digestif = buildLuarocksPackage { version = "0.2-1"; src = fetchurl { - url = mirror://luarocks/digestif-0.2-1.src.rock; + url = "mirror://luarocks/digestif-0.2-1.src.rock"; sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd"; }; disabled = (luaOlder "5.3"); @@ -322,7 +322,7 @@ dkjson = buildLuarocksPackage { version = "2.5-2"; src = fetchurl { - url = https://luarocks.org/dkjson-2.5-2.src.rock; + url = "https://luarocks.org/dkjson-2.5-2.src.rock"; sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -341,7 +341,7 @@ fifo = buildLuarocksPackage { version = "0.2-0"; src = fetchurl { - url = https://luarocks.org/fifo-0.2-0.src.rock; + url = "https://luarocks.org/fifo-0.2-0.src.rock"; sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; }; propagatedBuildInputs = [ lua ]; @@ -359,7 +359,7 @@ http = buildLuarocksPackage { version = "0.3-0"; src = fetchurl { - url = https://luarocks.org/http-0.3-0.src.rock; + url = "https://luarocks.org/http-0.3-0.src.rock"; sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; }; disabled = (luaOlder "5.1"); @@ -379,7 +379,7 @@ inspect = buildLuarocksPackage { version = "3.1.1-0"; src = fetchurl { - url = https://luarocks.org/inspect-3.1.1-0.src.rock; + url = "https://luarocks.org/inspect-3.1.1-0.src.rock"; sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; disabled = (luaOlder "5.1"); @@ -398,12 +398,12 @@ ldoc = buildLuarocksPackage { version = "1.4.6-2"; knownRockspec = (fetchurl { - url = https://luarocks.org/ldoc-1.4.6-2.rockspec; + url = "https://luarocks.org/ldoc-1.4.6-2.rockspec"; sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm"; }).outPath; src = fetchurl { - url = http://stevedonovan.github.io/files/ldoc-1.4.6.zip; + url = "http://stevedonovan.github.io/files/ldoc-1.4.6.zip"; sha256 = "1fvsmmjwk996ypzizcy565hj82bhj17vdb83ln6ff63mxr3zs1la"; }; @@ -422,7 +422,7 @@ lgi = buildLuarocksPackage { version = "0.9.2-1"; src = fetchurl { - url = https://luarocks.org/lgi-0.9.2-1.src.rock; + url = "https://luarocks.org/lgi-0.9.2-1.src.rock"; sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; }; disabled = (luaOlder "5.1"); @@ -441,12 +441,12 @@ linenoise = buildLuarocksPackage { version = "0.9-1"; knownRockspec = (fetchurl { - url = mirror://luarocks/linenoise-0.9-1.rockspec; + url = "mirror://luarocks/linenoise-0.9-1.rockspec"; sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4"; }).outPath; src = fetchurl { - url = https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz; + url = "https://github.com/hoelzro/lua-linenoise/archive/0.9.tar.gz"; sha256 = "177h6gbq89arwiwxah9943i8hl5gvd9wivnd1nhmdl7d8x0dn76c"; }; @@ -466,7 +466,7 @@ ljsyscall = buildLuarocksPackage { version = "0.12-1"; src = fetchurl { - url = https://luarocks.org/ljsyscall-0.12-1.src.rock; + url = "https://luarocks.org/ljsyscall-0.12-1.src.rock"; sha256 = "12gs81lnzpxi5d409lbrvjfflld5l2xsdkfhkz93xg7v65sfhh2j"; }; disabled = (lua.luaversion != "5.1"); @@ -486,7 +486,7 @@ lpeg = buildLuarocksPackage { version = "1.0.2-1"; src = fetchurl { - url = https://luarocks.org/lpeg-1.0.2-1.src.rock; + url = "https://luarocks.org/lpeg-1.0.2-1.src.rock"; sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; }; disabled = (luaOlder "5.1"); @@ -506,7 +506,7 @@ lpeg_patterns = buildLuarocksPackage { version = "0.5-0"; src = fetchurl { - url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; + url = "https://luarocks.org/lpeg_patterns-0.5-0.src.rock"; sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; propagatedBuildInputs = [ lua lpeg ]; @@ -524,7 +524,7 @@ lpeglabel = buildLuarocksPackage { version = "1.5.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeglabel-1.5.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpeglabel-1.5.0-1.src.rock"; sha256 = "068mwvwwn5n69pdm04qnk354391w9mk34jsczxql0xi5qgmz6w8j"; }; disabled = (luaOlder "5.1"); @@ -543,7 +543,7 @@ lpty = buildLuarocksPackage { version = "1.2.2-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lpty-1.2.2-1.src.rock"; sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; disabled = (luaOlder "5.1"); @@ -562,7 +562,7 @@ lrexlib-gnu = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-gnu-2.9.0-1.src.rock"; sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; }; disabled = (luaOlder "5.1"); @@ -581,7 +581,7 @@ lrexlib-pcre = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-pcre-2.9.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-pcre-2.9.0-1.src.rock"; sha256 = "1nqai27lbd85mcjf5cb05dbdfg460vmp8cr0lmb8dd63ivk8cbvx"; }; disabled = (luaOlder "5.1"); @@ -601,7 +601,7 @@ lrexlib-posix = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lrexlib-posix-2.9.0-1.src.rock"; sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; }; disabled = (luaOlder "5.1"); @@ -620,7 +620,7 @@ ltermbox = buildLuarocksPackage { version = "0.2-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ltermbox-0.2-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/ltermbox-0.2-1.src.rock"; sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; }; disabled = (luaOlder "5.1"); @@ -639,7 +639,7 @@ lua-cmsgpack = buildLuarocksPackage { version = "0.4.0-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; + url = "https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec"; sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; }).outPath; @@ -668,7 +668,7 @@ lua-iconv = buildLuarocksPackage { version = "7-3"; src = fetchurl { - url = https://luarocks.org/lua-iconv-7-3.src.rock; + url = "https://luarocks.org/lua-iconv-7-3.src.rock"; sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; }; disabled = (luaOlder "5.1"); @@ -687,7 +687,7 @@ lua-lsp = buildLuarocksPackage { version = "scm-2"; knownRockspec = (fetchurl { - url = http://luarocks.org/dev/lua-lsp-scm-2.rockspec; + url = "http://luarocks.org/dev/lua-lsp-scm-2.rockspec"; sha256 = "0qk3i6j0km4d1fs61fxhkmnbxmgpq24nygr8wknl6hbj2kya25rb"; }).outPath; @@ -716,7 +716,7 @@ lua-messagepack = buildLuarocksPackage { version = "0.5.1-2"; src = fetchurl { - url = https://luarocks.org/lua-messagepack-0.5.1-2.src.rock; + url = "https://luarocks.org/lua-messagepack-0.5.1-2.src.rock"; sha256 = "0bsdzdd24p9z3j4z1avw7qaqx87baa1pm58v275pw4h6n72z492g"; }; disabled = (luaOlder "5.1"); @@ -735,12 +735,12 @@ lua-term = buildLuarocksPackage { version = "0.7-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/lua-term-0.7-1.rockspec; + url = "https://luarocks.org/lua-term-0.7-1.rockspec"; sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; }).outPath; src = fetchurl { - url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; + url = "https://github.com/hoelzro/lua-term/archive/0.07.tar.gz"; sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; }; @@ -758,7 +758,7 @@ lua-toml = buildLuarocksPackage { version = "2.0-1"; src = fetchurl { - url = https://luarocks.org/lua-toml-2.0-1.src.rock; + url = "https://luarocks.org/lua-toml-2.0-1.src.rock"; sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; }; disabled = (luaOlder "5.1"); @@ -777,7 +777,7 @@ lua-zlib = buildLuarocksPackage { version = "1.2-0"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-zlib-1.2-0.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua-zlib-1.2-0.src.rock"; sha256 = "0qa0vnx45nxdj6fqag6fr627zsnd2bmrr9bdbm8jv6lcnyi6nhs2"; }; disabled = (luaOlder "5.1"); @@ -797,7 +797,7 @@ lua_cliargs = buildLuarocksPackage { version = "3.0-2"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua_cliargs-3.0-2.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/lua_cliargs-3.0-2.src.rock"; sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; }; disabled = (luaOlder "5.1"); @@ -816,7 +816,7 @@ luabitop = buildLuarocksPackage { version = "1.0.2-3"; knownRockspec = (fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luabitop-1.0.2-3.rockspec; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luabitop-1.0.2-3.rockspec"; sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; }).outPath; @@ -845,7 +845,7 @@ luacheck = buildLuarocksPackage { version = "0.23.0-1"; src = fetchurl { - url = https://luarocks.org/luacheck-0.23.0-1.src.rock; + url = "https://luarocks.org/luacheck-0.23.0-1.src.rock"; sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -864,7 +864,7 @@ luacov = buildLuarocksPackage { version = "0.13.0-1"; src = fetchurl { - url = mirror://luarocks/luacov-0.13.0-1.src.rock; + url = "mirror://luarocks/luacov-0.13.0-1.src.rock"; sha256 = "16am0adzr4y64n94f64d4yrz65in8rwa8mmjz1p0k8afm5p5759i"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -883,7 +883,7 @@ luadbi = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = https://luarocks.org/luadbi-0.7.2-1.src.rock; + url = "https://luarocks.org/luadbi-0.7.2-1.src.rock"; sha256 = "0mj9ggyb05l03gs38ds508620mqaw4fkrzz9861n4j0zxbsbmfwy"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -902,7 +902,7 @@ luadbi-mysql = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = https://luarocks.org/luadbi-mysql-0.7.2-1.src.rock; + url = "https://luarocks.org/luadbi-mysql-0.7.2-1.src.rock"; sha256 = "1f8i5p66halws8qsa7g09110hwzg7pv29yi22mkqd8sjgjv42iq4"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -921,7 +921,7 @@ luadbi-postgresql = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = https://luarocks.org/luadbi-postgresql-0.7.2-1.src.rock; + url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.src.rock"; sha256 = "0nmm1hdzl77wk8p6r6al6mpkh2n332a8r3iqsdi6v4nxamykdh28"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -940,7 +940,7 @@ luadbi-sqlite3 = buildLuarocksPackage { version = "0.7.2-1"; src = fetchurl { - url = https://luarocks.org/luadbi-sqlite3-0.7.2-1.src.rock; + url = "https://luarocks.org/luadbi-sqlite3-0.7.2-1.src.rock"; sha256 = "17wd2djzk5x4l4pv2k3c7b8dcvl46s96kqyk8dp3q6ll8gdl7c65"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -959,7 +959,7 @@ luadoc = buildLuarocksPackage { version = "3.0.1-1"; src = fetchurl { - url = mirror://luarocks/luadoc-3.0.1-1.src.rock; + url = "mirror://luarocks/luadoc-3.0.1-1.src.rock"; sha256 = "112zqjbzkrhx3nvavrxx3vhpv2ix85pznzzbpa8fq4piyv5r781i"; }; propagatedBuildInputs = [ lualogging luafilesystem ]; @@ -975,7 +975,7 @@ luaepnf = buildLuarocksPackage { version = "0.3-1"; src = fetchurl { - url = mirror://luarocks/luaepnf-0.3-1.src.rock; + url = "mirror://luarocks/luaepnf-0.3-1.src.rock"; sha256 = "12z7radxk1dkyjqflr85sghywgc82xdg4mzb9mbwbrrqbnjw8mp5"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -992,7 +992,7 @@ luaevent = buildLuarocksPackage { version = "0.4.6-1"; src = fetchurl { - url = https://luarocks.org/luaevent-0.4.6-1.src.rock; + url = "https://luarocks.org/luaevent-0.4.6-1.src.rock"; sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; }; disabled = (luaOlder "5.1"); @@ -1011,7 +1011,7 @@ luaexpat = buildLuarocksPackage { version = "1.3.0-1"; src = fetchurl { - url = https://luarocks.org/luaexpat-1.3.0-1.src.rock; + url = "https://luarocks.org/luaexpat-1.3.0-1.src.rock"; sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; }; disabled = (luaOlder "5.1"); @@ -1031,7 +1031,7 @@ luaffi = buildLuarocksPackage { version = "scm-1"; src = fetchurl { - url = http://luarocks.org/dev/luaffi-scm-1.src.rock; + url = "http://luarocks.org/dev/luaffi-scm-1.src.rock"; sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; }; disabled = (luaOlder "5.1"); @@ -1050,7 +1050,7 @@ luafilesystem = buildLuarocksPackage { version = "1.7.0-2"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luafilesystem-1.7.0-2.src.rock"; sha256 = "0xhmd08zklsgpnpjr9rjipah35fbs8jd4v4va36xd8bpwlvx9rk5"; }; disabled = (luaOlder "5.1"); @@ -1070,7 +1070,7 @@ lualogging = buildLuarocksPackage { version = "1.3.0-1"; src = fetchurl { - url = mirror://luarocks/lualogging-1.3.0-1.src.rock; + url = "mirror://luarocks/lualogging-1.3.0-1.src.rock"; sha256 = "13fm1vlig3zmbfkmlq1vk3xfqhlvv5xf24b0p4k4d08395y858vc"; }; propagatedBuildInputs = [ luasocket ]; @@ -1088,7 +1088,7 @@ luaossl = buildLuarocksPackage { version = "20190731-0"; src = fetchurl { - url = https://luarocks.org/luaossl-20190731-0.src.rock; + url = "https://luarocks.org/luaossl-20190731-0.src.rock"; sha256 = "0gardlh547hah5w4kfsdg05jmxzrxr21macqigcmp5hw1l67jn5m"; }; propagatedBuildInputs = [ lua ]; @@ -1107,7 +1107,7 @@ luaposix = buildLuarocksPackage { version = "34.0.4-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luaposix-34.0.4-1.src.rock"; sha256 = "0yrm5cn2iyd0zjd4liyj27srphvy0gjrjx572swar6zqr4dwjqp2"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1125,12 +1125,12 @@ luarepl = buildLuarocksPackage { version = "0.9-1"; knownRockspec = (fetchurl { - url = mirror://luarocks/luarepl-0.9-1.rockspec; + url = "mirror://luarocks/luarepl-0.9-1.rockspec"; sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z"; }).outPath; src = fetchurl { - url = https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz; + url = "https://github.com/hoelzro/lua-repl/archive/0.9.tar.gz"; sha256 = "04xka7b84d9mrz3gyf8ywhw08xp65v8jrnzs8ry8k9540aqs721w"; }; @@ -1148,7 +1148,7 @@ luasec = buildLuarocksPackage { version = "0.8-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasec-0.8-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasec-0.8-1.src.rock"; sha256 = "063rgz0zdmaizirsm6jbcfijgkpdcrb8a2fvhvg3y2s8ixbaff13"; }; disabled = (luaOlder "5.1"); @@ -1168,7 +1168,7 @@ luasocket = buildLuarocksPackage { version = "3.0rc1-2"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luasocket-3.0rc1-2.src.rock"; sha256 = "1isin9m40ixpqng6ds47skwa4zxrc6w8blza8gmmq566w6hz50iq"; }; disabled = (luaOlder "5.1"); @@ -1187,7 +1187,7 @@ luasql-sqlite3 = buildLuarocksPackage { version = "2.4.0-1"; src = fetchurl { - url = https://luarocks.org/luasql-sqlite3-2.4.0-1.src.rock; + url = "https://luarocks.org/luasql-sqlite3-2.4.0-1.src.rock"; sha256 = "0pdk8c9iw0625imf5wdrhq60484jn475b85rvp0xgh86bsyalbsh"; }; disabled = (luaOlder "5.1"); @@ -1207,12 +1207,12 @@ luassert = buildLuarocksPackage { version = "1.7.11-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/luassert-1.7.11-0.rockspec; + url = "https://luarocks.org/luassert-1.7.11-0.rockspec"; sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; }).outPath; src = fetchurl { - url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; + url = "https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz"; sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; }; @@ -1232,7 +1232,7 @@ luasystem = buildLuarocksPackage { version = "0.2.1-0"; src = fetchurl { - url = https://luarocks.org/luasystem-0.2.1-0.src.rock; + url = "https://luarocks.org/luasystem-0.2.1-0.src.rock"; sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; }; disabled = (luaOlder "5.1"); @@ -1251,7 +1251,7 @@ luautf8 = buildLuarocksPackage { version = "0.1.1-1"; src = fetchurl { - url = https://luarocks.org/luautf8-0.1.1-1.src.rock; + url = "https://luarocks.org/luautf8-0.1.1-1.src.rock"; sha256 = "1832ilrlddh4h7ayx4l9j7z1p8c2hk5yr96cpxjjrmirkld23aji"; }; disabled = (luaOlder "5.1"); @@ -1271,7 +1271,7 @@ luazip = buildLuarocksPackage { version = "1.2.7-1"; src = fetchurl { - url = https://luarocks.org/luazip-1.2.7-1.src.rock; + url = "https://luarocks.org/luazip-1.2.7-1.src.rock"; sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1290,7 +1290,7 @@ lua-yajl = buildLuarocksPackage { version = "2.0-1"; src = fetchurl { - url = https://luarocks.org/lua-yajl-2.0-1.src.rock; + url = "https://luarocks.org/lua-yajl-2.0-1.src.rock"; sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; }; disabled = (luaOlder "5.1"); @@ -1310,7 +1310,7 @@ luuid = buildLuarocksPackage { version = "20120509-2"; src = fetchurl { - url = https://luarocks.org/luuid-20120509-2.src.rock; + url = "https://luarocks.org/luuid-20120509-2.src.rock"; sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; }; disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); @@ -1326,11 +1326,11 @@ luuid = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.34.1-1"; + version = "1.30.0-0"; src = fetchurl { - url = https://luarocks.org/luv-1.34.1-1.src.rock; - sha256 = "044cyp25xn35nj5qp1hx04lfkzrpa6adhqjshq2g7wvbga77p1q0"; + url = "https://luarocks.org/luv-1.30.0-0.src.rock"; + sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; }; disabled = (luaOlder "5.1"); propagatedBuildInputs = [ lua ]; @@ -1348,7 +1348,7 @@ markdown = buildLuarocksPackage { version = "0.33-1"; src = fetchurl { - url = https://luarocks.org/markdown-0.33-1.src.rock; + url = "https://luarocks.org/markdown-0.33-1.src.rock"; sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1367,12 +1367,12 @@ mediator_lua = buildLuarocksPackage { version = "1.1.2-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/mediator_lua-1.1.2-0.rockspec; + url = "https://luarocks.org/mediator_lua-1.1.2-0.rockspec"; sha256 = "0frzvf7i256260a1s8xh92crwa2m42972qxfq29zl05aw3pyn7bm"; }).outPath; src = fetchurl { - url = https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz; + url = "https://github.com/Olivine-Labs/mediator_lua/archive/v1.1.2-0.tar.gz"; sha256 = "16zzzhiy3y35v8advmlkzpryzxv5vji7727vwkly86q8sagqbxgs"; }; @@ -1392,12 +1392,12 @@ mpack = buildLuarocksPackage { version = "1.0.7-0"; knownRockspec = (fetchurl { - url = https://luarocks.org/mpack-1.0.7-0.rockspec; + url = "https://luarocks.org/mpack-1.0.7-0.rockspec"; sha256 = "1sdw8qsni3g3fx9jnc5g64nxfw6v3n1rrw1xa3bkwc9wk815lqnz"; }).outPath; src = fetchurl { - url = https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz; + url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; sha256 = "1s4712ig3l4ds65pmlyg3r5zids2snn1rv8vsmmk27a4lf258mk8"; }; @@ -1415,7 +1415,7 @@ moonscript = buildLuarocksPackage { version = "0.5.0-1"; src = fetchurl { - url = https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/moonscript-0.5.0-1.src.rock; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/moonscript-0.5.0-1.src.rock"; sha256 = "09vv3ayzg94bjnzv5fw50r683ma0x3lb7sym297145zig9aqb9q9"; }; disabled = (luaOlder "5.1"); @@ -1435,7 +1435,7 @@ nvim-client = buildLuarocksPackage { version = "0.2.2-1"; src = fetchurl { - url = https://luarocks.org/nvim-client-0.2.2-1.src.rock; + url = "https://luarocks.org/nvim-client-0.2.2-1.src.rock"; sha256 = "0bgx94ziiq0004zw9lz2zb349xaqs5pminqd8bwdrfdnfjnbp8x0"; }; disabled = (luaOlder "5.1"); @@ -1454,12 +1454,12 @@ penlight = buildLuarocksPackage { version = "1.5.4-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/penlight-1.5.4-1.rockspec; + url = "https://luarocks.org/penlight-1.5.4-1.rockspec"; sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; }).outPath; src = fetchurl { - url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; + url = "http://stevedonovan.github.io/files/penlight-1.5.4.zip"; sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; }; @@ -1478,7 +1478,7 @@ rapidjson = buildLuarocksPackage { version = "0.5.2-1"; src = fetchurl { - url = https://luarocks.org/rapidjson-0.5.2-1.src.rock; + url = "https://luarocks.org/rapidjson-0.5.2-1.src.rock"; sha256 = "17lgbzv9kairx49kwa0m8xwyly95mg6fw60jan2dpqwnnkf2m8y6"; }; disabled = (luaOlder "5.1"); @@ -1497,12 +1497,12 @@ say = buildLuarocksPackage { version = "1.3-1"; knownRockspec = (fetchurl { - url = https://luarocks.org/say-1.3-1.rockspec; + url = "https://luarocks.org/say-1.3-1.rockspec"; sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; }).outPath; src = fetchurl { - url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; + url = "https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz"; sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; }; @@ -1522,7 +1522,7 @@ std__debug = buildLuarocksPackage { version = "1.0.1-1"; src = fetchurl { - url = https://luarocks.org/std._debug-1.0.1-1.src.rock; + url = "https://luarocks.org/std._debug-1.0.1-1.src.rock"; sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -1541,7 +1541,7 @@ std_normalize = buildLuarocksPackage { version = "2.0.2-1"; src = fetchurl { - url = https://luarocks.org/std.normalize-2.0.2-1.src.rock; + url = "https://luarocks.org/std.normalize-2.0.2-1.src.rock"; sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); @@ -1560,7 +1560,7 @@ stdlib = buildLuarocksPackage { version = "41.2.2-1"; src = fetchurl { - url = https://luarocks.org/stdlib-41.2.2-1.src.rock; + url = "https://luarocks.org/stdlib-41.2.2-1.src.rock"; sha256 = "1kricll40xy75j72lrbp2jpyxsj9v8b9d7qjf3m3fq1bpg6dmsk7"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); @@ -1578,7 +1578,7 @@ vstruct = buildLuarocksPackage { version = "2.0.2-1"; src = fetchurl { - url = mirror://luarocks/vstruct-2.0.2-1.src.rock; + url = "mirror://luarocks/vstruct-2.0.2-1.src.rock"; sha256 = "05k1685618wh7vg8av92mh1i1rjqg15x12gifbp9kyqzc2nk3kzq"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix index e93f904b895..236480598b9 100644 --- a/pkgs/development/misc/amdadl-sdk/default.nix +++ b/pkgs/development/misc/amdadl-sdk/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { src = requireFile { name = "ADL_SDK_6.0.zip"; - url = http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/; + url = "http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/"; sha256 = "429f4fd1edebb030d6366f4e0a877cf105e4383f7dd2ccf54e5aef8f2e4242c9"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "API to access display driver functionality for ATI graphics cards"; - homepage = https://developer.amd.com/tools/graphics-development/display-library-adl-sdk/; + homepage = "https://developer.amd.com/tools/graphics-development/display-library-adl-sdk/"; license = licenses.unfree; maintainers = [ maintainers.offline ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index a3a4573c0ae..68109e05e61 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -100,7 +100,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; - homepage = https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/; + homepage = "https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/"; license = licenses.amd; maintainers = [ maintainers.offline ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 48ea088a73c..fdff792648c 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2; + url = "https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2"; sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "a C runtime library for AVR microcontrollers"; - homepage = https://savannah.nongnu.org/projects/avr-libc/; + homepage = "https://savannah.nongnu.org/projects/avr-libc/"; license = licenses.bsd3; platforms = [ "avr-none" ]; maintainers = with maintainers; [ mguentner ]; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index c88b780d164..1a92f8fdd9d 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "avr8-burn-omat-2.1.2"; src = fetchurl { - url = http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip; + url = "http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip"; sha256 = "02k0fd0cd3y1yqip36wr3bkxbywp8913w4y7jdg6qwqxjnii58ln"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "GUI tool for avrdude"; - homepage = http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html; + homepage = "http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html"; license = stdenv.lib.licenses.gpl3; platforms = platforms.all; }; diff --git a/pkgs/development/misc/google-clasp/default.nix b/pkgs/development/misc/google-clasp/default.nix index db6ade1c85a..1e138aaa8f7 100644 --- a/pkgs/development/misc/google-clasp/default.nix +++ b/pkgs/development/misc/google-clasp/default.nix @@ -11,7 +11,7 @@ in ''; meta = { description = "Command Line tool for Google Apps Script Projects"; - homepage = https://developers.google.com/apps-script/guides/clasp; + homepage = "https://developers.google.com/apps-script/guides/clasp"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.michojel ]; priority = 100; diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index ba4ab6bf615..d8b65a7c147 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -16,7 +16,7 @@ buildRustPackage rec { cargoSha256 = "1fgv1kxiif48q9mm60ygn88r5nkxfyiacmvbgwp0jxiacv8r7779"; meta = with stdenv.lib; { - homepage = https://github.com/cgag/loc; + homepage = "https://github.com/cgag/loc"; description = "Count lines of code quickly"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/development/misc/msp430/gcc-support.nix b/pkgs/development/misc/msp430/gcc-support.nix index 36dbce6bdfd..e9ed959c2fd 100644 --- a/pkgs/development/misc/msp430/gcc-support.nix +++ b/pkgs/development/misc/msp430/gcc-support.nix @@ -23,7 +23,7 @@ in stdenvNoCC.mkDerivation rec { description = '' Development headers and linker scripts for TI MSP430 microcontrollers ''; - homepage = https://www.ti.com/tool/msp430-gcc-opensource; + homepage = "https://www.ti.com/tool/msp430-gcc-opensource"; license = licenses.bsd3; platforms = [ "msp430-none" ]; maintainers = with maintainers; [ aerialx ]; diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index b84f358cbee..6bb6b683f55 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A free programmer, debugger, and gdb proxy for MSP430 MCUs"; - homepage = https://dlbeer.co.nz/mspdebug/; + homepage = "https://dlbeer.co.nz/mspdebug/"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ aerialx ]; diff --git a/pkgs/development/misc/rpiboot/unstable.nix b/pkgs/development/misc/rpiboot/unstable.nix index c89d2f11e95..1591a1efd17 100644 --- a/pkgs/development/misc/rpiboot/unstable.nix +++ b/pkgs/development/misc/rpiboot/unstable.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/raspberrypi/usbboot; + homepage = "https://github.com/raspberrypi/usbboot"; description = "Utility to boot a Raspberry Pi CM/CM3/Zero over USB"; maintainers = [ stdenv.lib.maintainers.cartr ]; license = stdenv.lib.licenses.asl20; diff --git a/pkgs/development/misc/stm32/betaflight/default.nix b/pkgs/development/misc/stm32/betaflight/default.nix index ee424d18f15..dee5f51b290 100644 --- a/pkgs/development/misc/stm32/betaflight/default.nix +++ b/pkgs/development/misc/stm32/betaflight/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flight controller software (firmware) used to fly multi-rotor craft and fixed wing craft"; - homepage = https://github.com/betaflight/betaflight; + homepage = "https://github.com/betaflight/betaflight"; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; broken = true; diff --git a/pkgs/development/misc/stm32/inav/default.nix b/pkgs/development/misc/stm32/inav/default.nix index 27e96b067b4..8ff8b45f06d 100644 --- a/pkgs/development/misc/stm32/inav/default.nix +++ b/pkgs/development/misc/stm32/inav/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Navigation-enabled flight control software"; - homepage = https://inavflight.github.io; + homepage = "https://inavflight.github.io"; license = licenses.gpl3; maintainers = with maintainers; [ elitak ]; broken = true; diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index 75754bec7a1..7714ef046b7 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Yelp/Tools; + 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; diff --git a/pkgs/development/mobile/abootimg/default.nix b/pkgs/development/mobile/abootimg/default.nix index eed4b43d6a3..fb74d79e7a7 100644 --- a/pkgs/development/mobile/abootimg/default.nix +++ b/pkgs/development/mobile/abootimg/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ggrandou/abootimg; + homepage = "https://github.com/ggrandou/abootimg"; description = "Manipulate Android Boot Images"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/mobile/adb-sync/default.nix b/pkgs/development/mobile/adb-sync/default.nix index ebba63353da..5c0f0c07c21 100644 --- a/pkgs/development/mobile/adb-sync/default.nix +++ b/pkgs/development/mobile/adb-sync/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool to synchronise files between a PC and an Android devices using ADB (Android Debug Bridge)"; - homepage = https://github.com/google/adb-sync; + homepage = "https://github.com/google/adb-sync"; license = licenses.asl20; platforms = platforms.unix; hydraPlatforms = []; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index fb548bf3f9f..f98547011bd 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,10 +1,10 @@ {requireFile, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: { toolsVersion ? "25.2.5" -, platformToolsVersion ? "28.0.1" +, platformToolsVersion ? "29.0.6" , buildToolsVersions ? [ "28.0.3" ] , includeEmulator ? false -, emulatorVersion ? "28.0.14" +, emulatorVersion ? "30.0.3" , platformVersions ? [] , includeSources ? false , includeDocs ? false diff --git a/pkgs/development/mobile/androidenv/emulate-app.nix b/pkgs/development/mobile/androidenv/emulate-app.nix index fa9a56fadba..6273d75cc38 100644 --- a/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/pkgs/development/mobile/androidenv/emulate-app.nix @@ -8,6 +8,7 @@ let sdkArgs = { + toolsVersion = "26.1.1"; platformVersions = [ platformVersion ]; includeEmulator = true; includeSystemImages = true; @@ -67,12 +68,12 @@ stdenv.mkDerivation { export ANDROID_SERIAL="emulator-$port" # Create a virtual android device for testing if it does not exists - ${sdk}/libexec/android-sdk/tools/android list targets + ${sdk}/libexec/android-sdk/tools/bin/avdmanager list target if [ "$(${sdk}/libexec/android-sdk/tools/android list avd | grep 'Name: device')" = "" ] then # Create a virtual android device - yes "" | ${sdk}/libexec/android-sdk/tools/android create avd -n device -t 1 --abi ${systemImageType}/${abiVersion} $NIX_ANDROID_AVD_FLAGS + yes "" | ${sdk}/libexec/android-sdk/tools/bin/avdmanager create avd -n device -k "system-images;android-${platformVersion};${systemImageType};${abiVersion}" $NIX_ANDROID_AVD_FLAGS ${lib.optionalString enableGPU '' # Enable GPU acceleration diff --git a/pkgs/development/mobile/androidenv/emulator.nix b/pkgs/development/mobile/androidenv/emulator.nix index 7ba74eb900f..2402d5433ed 100644 --- a/pkgs/development/mobile/androidenv/emulator.nix +++ b/pkgs/development/mobile/androidenv/emulator.nix @@ -1,13 +1,39 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686}: +{ deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, pkgs_i686 }: deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper ] - ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.xlibs.libX11 pkgs.xlibs.libXext pkgs.xlibs.libXdamage pkgs.xlibs.libXfixes pkgs.xlibs.libxcb pkgs.libGL pkgs.libpulseaudio pkgs.zlib pkgs.ncurses5 pkgs.stdenv.cc.cc pkgs_i686.glibc ]; + ++ lib.optional (os == "linux") [ + pkgs.glibc + pkgs.xlibs.libX11 + pkgs.xlibs.libXext + pkgs.xlibs.libXdamage + pkgs.xlibs.libXfixes + pkgs.xlibs.libxcb + pkgs.xlibs.libXcomposite + pkgs.xlibs.libXcursor + pkgs.xlibs.libXi + pkgs.xlibs.libXrender + pkgs.xlibs.libXtst + pkgs.libcxx + pkgs.libGL + pkgs.libpulseaudio + pkgs.zlib + pkgs.ncurses5 + pkgs.stdenv.cc.cc + pkgs_i686.glibc + pkgs.expat + pkgs.freetype + pkgs.nss + pkgs.nspr + pkgs.alsaLib + ]; patchInstructions = lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib addAutoPatchelfSearchPath $packageBaseDir/lib64 addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib + # autoPatchelf is not detecting libuuid :( + addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib autoPatchelf $out # Wrap emulator so that it can load libdbus-1.so at runtime and it no longer complains about XKB keymaps diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix index d902b111665..23a55595cce 100644 --- a/pkgs/development/mobile/androidenv/generated/addons.nix +++ b/pkgs/development/mobile/androidenv/generated/addons.nix @@ -12,7 +12,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-10_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-10_r02.zip"; sha1 = "cc0711857c881fa7534f90cf8cc09b8fe985484d"; }; @@ -27,7 +27,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-11_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-11_r01.zip"; sha1 = "5eab5e81addee9f3576d456d205208314b5146a5"; }; @@ -42,7 +42,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-12_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-12_r01.zip"; sha1 = "e9999f4fa978812174dfeceec0721c793a636e5d"; }; @@ -57,7 +57,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-13_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-13_r01.zip"; sha1 = "3b153edd211c27dc736c893c658418a4f9041417"; }; @@ -72,7 +72,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-14_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-14_r02.zip"; sha1 = "f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39"; }; @@ -87,7 +87,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-15_r03.zip; + url = "https://dl.google.com/android/repository/google_apis-15_r03.zip"; sha1 = "d0d2bf26805eb271693570a1aaec33e7dc3f45e9"; }; @@ -102,7 +102,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-16_r04.zip; + url = "https://dl.google.com/android/repository/google_apis-16_r04.zip"; sha1 = "ee6acf1b01020bfa8a8e24725dbc4478bee5e792"; }; @@ -117,7 +117,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-17_r04.zip; + url = "https://dl.google.com/android/repository/google_apis-17_r04.zip"; sha1 = "a076be0677f38df8ca5536b44dfb411a0c808c4f"; }; @@ -132,7 +132,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-18_r04.zip; + url = "https://dl.google.com/android/repository/google_apis-18_r04.zip"; sha1 = "6109603409debdd40854d4d4a92eaf8481462c8b"; }; @@ -147,7 +147,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-19_r20.zip; + url = "https://dl.google.com/android/repository/google_apis-19_r20.zip"; sha1 = "5b933abe830b2f25b4c0f171d45e9e0651e56311"; }; @@ -162,7 +162,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-21_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-21_r01.zip"; sha1 = "66a754efb24e9bb07cc51648426443c7586c9d4a"; }; @@ -177,7 +177,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-22_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-22_r01.zip"; sha1 = "5def0f42160cba8acff51b9c0c7e8be313de84f5"; }; @@ -192,7 +192,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-23_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-23_r01.zip"; sha1 = "04c5cc1a7c88967250ebba9561d81e24104167db"; }; @@ -207,7 +207,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-24_r1.zip; + url = "https://dl.google.com/android/repository/google_apis-24_r1.zip"; sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; }; @@ -222,7 +222,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-3-r03.zip; + url = "https://dl.google.com/android/repository/google_apis-3-r03.zip"; sha1 = "1f92abf3a76be66ae8032257fc7620acbd2b2e3a"; }; @@ -237,7 +237,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-4_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-4_r02.zip"; sha1 = "9b6e86d8568558de4d606a7debc4f6049608dbd0"; }; @@ -252,7 +252,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-5_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-5_r01.zip"; sha1 = "46eaeb56b645ee7ffa24ede8fa17f3df70db0503"; }; @@ -267,7 +267,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-6_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-6_r01.zip"; sha1 = "5ff545d96e031e09580a6cf55713015c7d4936b2"; }; @@ -282,7 +282,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-7_r01.zip; + url = "https://dl.google.com/android/repository/google_apis-7_r01.zip"; sha1 = "2e7f91e0fe34fef7f58aeced973c6ae52361b5ac"; }; @@ -297,7 +297,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-8_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-8_r02.zip"; sha1 = "3079958e7ec87222cac1e6b27bc471b27bf2c352"; }; @@ -312,7 +312,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-9_r02.zip; + url = "https://dl.google.com/android/repository/google_apis-9_r02.zip"; sha1 = "78664645a1e9accea4430814f8694291a7f1ea5d"; }; @@ -327,7 +327,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_tv-12_r02.zip; + url = "https://dl.google.com/android/repository/google_tv-12_r02.zip"; sha1 = "92128a12e7e8b0fb5bac59153d7779b717e7b840"; }; @@ -342,7 +342,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_tv-13_r01.zip; + url = "https://dl.google.com/android/repository/google_tv-13_r01.zip"; sha1 = "b73f7c66011ac8180b44aa4e83b8d78c66ea9a09"; }; @@ -357,7 +357,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_apis-25_r1.zip; + url = "https://dl.google.com/android/repository/google_apis-25_r1.zip"; sha1 = "550e83eea9513ab11c44919ac6da54b36084a9f3"; }; @@ -376,11 +376,11 @@ displayName = "GPU Debugging tools"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/gapid_r01_linux.zip; + url = "https://dl.google.com/android/repository/gapid_r01_linux.zip"; sha1 = "7c9ef7544cf0aea030bcc29bd8e12c04fd53e653"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/gapid_r01_osx.zip; + url = "https://dl.google.com/android/repository/gapid_r01_osx.zip"; sha1 = "597eb271349d890566274861eba2770a84ee4c69"; }; @@ -395,11 +395,11 @@ displayName = "GPU Debugging tools"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/gapid_2994895_linux.zip; + url = "https://dl.google.com/android/repository/gapid_2994895_linux.zip"; sha1 = "e40371ba191f617e4e79bc760d0ab2948ba8cf46"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/gapid_2994895_osx.zip; + url = "https://dl.google.com/android/repository/gapid_2994895_osx.zip"; sha1 = "ad86a2350b7b9908300277bf03d41649659de384"; }; @@ -415,7 +415,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android_m2repository_r47.zip; + url = "https://dl.google.com/android/repository/android_m2repository_r47.zip"; sha1 = "a0d22beacc106a6977321f2b07d692ce4979e96a"; }; @@ -423,6 +423,17 @@ }; + "extras;google;Android_Emulator_Hypervisor_Driver" = { + name = "extras-google-Android_Emulator_Hypervisor_Driver"; + path = "extras/google/Android_Emulator_Hypervisor_Driver"; + revision = "1.4.0"; + displayName = "Android Emulator Hypervisor Driver for AMD Processors (installer)"; + archives = { + + }; + }; + + "extras;google;admob_ads_sdk" = { name = "extras-google-admob_ads_sdk"; path = "extras/google/admob_ads_sdk"; @@ -431,7 +442,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip; + url = "https://dl.google.com/android/repository/GoogleAdMobAdsSdkAndroid-6.4.1.zip"; sha1 = "0102859d9575baa0bf4fd5eb422af2ad0fe6cb82"; }; @@ -447,7 +458,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip; + url = "https://dl.google.com/android/repository/GoogleAnalyticsAndroid_2.0beta5.zip"; sha1 = "dc14026bf0ce78315cb5dd00552607de0894de83"; }; @@ -462,11 +473,11 @@ displayName = "Android Auto Desktop Head Unit emulator"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip; + url = "https://dl.google.com/android/repository/desktop-head-unit-linux_r01.1.zip"; sha1 = "202a6e1b3009a0eb815f8c672d2d5b3717de6169"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip; + url = "https://dl.google.com/android/repository/desktop-head-unit-macosx_r01.1.zip"; sha1 = "8179cbb3914493ebc5eb65b731cba061582f2e84"; }; @@ -482,7 +493,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/gcm_r03.zip; + url = "https://dl.google.com/android/repository/gcm_r03.zip"; sha1 = "ad066fd0dc7fc99d8aadac09c65a3c2519fbc7bf"; }; @@ -498,7 +509,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip; + url = "https://dl.google.com/android/repository/google_play_services_v16_1_rc09.zip"; sha1 = "f95bf19634e2ab0430923247fe2c50246432d2e9"; }; @@ -514,7 +525,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_3265130_r12.zip; + url = "https://dl.google.com/android/repository/google_play_services_3265130_r12.zip"; sha1 = "92558dbc380bba3d55d0ec181167fb05ce7c79d9"; }; @@ -525,13 +536,13 @@ "extras;google;instantapps" = { name = "extras-google-instantapps"; path = "extras/google/instantapps"; - revision = "1.5.0"; + revision = "1.9.0"; displayName = "Google Play Instant Development SDK"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/iasdk-1.5.0-1538000167.zip; - sha1 = "6c282b9c686e819fe7f5ac8f2249d2479acb63b4"; + url = "https://dl.google.com/android/repository/iasdk-1.9.0-1566514721.zip"; + sha1 = "c498367dcd7db30154b3e70c4ddbb1b0ea4b8d20"; }; }; @@ -546,7 +557,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip; + url = "https://dl.google.com/android/repository/google_m2repository_gms_v11_3_rc05_wear_2_0_5.zip"; sha1 = "05086add9e3a0eb1b67111108d7757a4337c3f10"; }; @@ -562,7 +573,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/market_apk_expansion-r03.zip; + url = "https://dl.google.com/android/repository/market_apk_expansion-r03.zip"; sha1 = "5305399dc1a56814e86b8459ce24871916f78b8c"; }; @@ -578,7 +589,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/market_licensing-r02.zip; + url = "https://dl.google.com/android/repository/market_licensing-r02.zip"; sha1 = "355e8dc304a92a5616db235af8ee7bd554356254"; }; @@ -594,7 +605,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/simulator_r01.zip; + url = "https://dl.google.com/android/repository/simulator_r01.zip"; sha1 = "4fb5344e34e8faab4db18af07dace44c50db26a7"; }; @@ -605,7 +616,7 @@ "extras;google;usb_driver" = { name = "extras-google-usb_driver"; path = "extras/google/usb_driver"; - revision = "11"; + revision = "12"; displayName = "Google USB Driver"; archives = { @@ -621,7 +632,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/webdriver_r02.zip; + url = "https://dl.google.com/android/repository/webdriver_r02.zip"; sha1 = "13f3a3b2670a5fc04a7342861644be9a01b07e38"; }; @@ -637,7 +648,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0.zip"; sha1 = "b621b9d5adf273bb0725948589863e60e96eeaf1"; }; @@ -645,38 +656,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha2" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha2"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha2"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha2"; - archives = { - - all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha2.zip; - sha1 = "2e7fd5d8d158f4517ba52af824f84466ffede879"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha3" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha3"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha3"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha3"; - archives = { - - all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha3.zip; - sha1 = "cd1cbbb2621c9034b835e9b69243dc558cdee4dc"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; @@ -685,7 +664,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; @@ -693,48 +672,48 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha5" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha5"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha5"; + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha5"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha5.zip; - sha1 = "7ba6c82c7645ac023cf45c1e27a6ae3added308a"; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; + sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; }; }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha6" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha6"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha6"; + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha6"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha6.zip; - sha1 = "b7e390f940704f4f78e1eaa5f5a5dba3bc3e81ad"; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; + sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; }; }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha7" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha7"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha7"; + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha7"; + displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha7.zip; - sha1 = "f08be3c306bf878de31c465e46a266c52014a13f"; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; + sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; }; }; @@ -749,7 +728,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"; sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; }; @@ -757,16 +736,16 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha9" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha9"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha9"; + "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha9"; + displayName = "Solver for ConstraintLayout 1.0.0-alpha8"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha9.zip; - sha1 = "2c52ddd883d83230a17042b8f4ba03669f0f5f40"; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"; + sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; }; }; @@ -781,7 +760,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta1.zip"; sha1 = "042c25575e7650e96f0f5f5d1d3c54ed38eb821a"; }; @@ -797,7 +776,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta2.zip"; sha1 = "28492fd42b20ae1586591ff906556d459cfdaae8"; }; @@ -813,7 +792,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta3.zip"; sha1 = "268e763fa64bd217d8d830e59ce76be19aaba631"; }; @@ -829,7 +808,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta4.zip"; sha1 = "2213bf37e7a2869db2635895b8e90ca6841e79d2"; }; @@ -845,7 +824,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-beta5.zip"; sha1 = "3918cfef73e64048d0b3e048068e208b414e7e91"; }; @@ -861,7 +840,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.1.zip"; sha1 = "76f8823def9a6da8954a54737762a6820bc1d043"; }; @@ -877,7 +856,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.2.zip"; sha1 = "96d7ff669f0e808e9833b2c2e320702826ccc8be"; }; @@ -893,7 +872,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0.zip"; sha1 = "70acf99689b933bc6735645d5c3d92b91954b6cb"; }; @@ -901,38 +880,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha2" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha2"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha2"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha2"; - archives = { - - all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha2.zip; - sha1 = "2edb4fc33745cc9d69d985f29fd48fefcd0aa9f0"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha3" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha3"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha3"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha3"; - archives = { - - all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha3.zip; - sha1 = "1a26fb79d98421f315ead7ad15be167727533026"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; @@ -941,7 +888,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; @@ -949,48 +896,48 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha5" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha5"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha5"; + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha5"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha5.zip; - sha1 = "24f78daf491dcad74bcb2acfa79ea2d8e906f53b"; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; + sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; }; }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha6" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha6"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha6"; + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha6"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha6.zip; - sha1 = "cb60e9ad4f6d3cc3c5b1b98cd3610c8d3204e651"; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; + sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; }; }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha7" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha7"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha7"; + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha7"; + displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha7.zip; - sha1 = "17ac210c85d24d7e8ace62847f05e4e45b640b73"; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; + sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; }; }; @@ -1005,7 +952,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"; sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; }; @@ -1013,16 +960,16 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha9" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha9"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha9"; + "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { + name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; + path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha9"; + displayName = "ConstraintLayout for Android 1.0.0-alpha8"; archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha9.zip; - sha1 = "89c2bbc005d4731c7a830a4d5aa98dae121a46a4"; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"; + sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; }; }; @@ -1037,7 +984,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta1.zip"; sha1 = "11f2f5cec4ff02986bad75435e5be77b704b4c64"; }; @@ -1053,7 +1000,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta2.zip"; sha1 = "623939865ede2e5c2c975dc55963e0d182bcce95"; }; @@ -1069,7 +1016,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta3.zip"; sha1 = "d78bb6a8ce92005fb1e4ed55d892a65b4258c60b"; }; @@ -1085,7 +1032,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta4.zip"; sha1 = "dc60844aab93a09a54a3c107685a77b18d7c1c39"; }; @@ -1101,7 +1048,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-beta5.zip"; sha1 = "4660f6c7a576ea1364f0c3225db71c29ca660d9a"; }; @@ -1117,7 +1064,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.1.zip"; sha1 = "342b0894b8651fff37586f80f383733e97aba9f9"; }; @@ -1133,7 +1080,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip; + url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.2.zip"; sha1 = "3d9688a50fe0ed7348275f85d1b02278f616d8a4"; }; @@ -1142,4 +1089,4 @@ }; } - \ No newline at end of file + diff --git a/pkgs/development/mobile/androidenv/generated/packages.nix b/pkgs/development/mobile/androidenv/generated/packages.nix index fc9f50e1316..4ac14c419ed 100644 --- a/pkgs/development/mobile/androidenv/generated/packages.nix +++ b/pkgs/development/mobile/androidenv/generated/packages.nix @@ -11,11 +11,11 @@ displayName = "Android SDK Build-Tools 17"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r17-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r17-linux.zip"; sha1 = "2c2872bc3806aabf16a12e3959c2183ddc866e6d"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r17-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r17-macosx.zip"; sha1 = "602ee709be9dbb8f179b1e4075148a57f9419930"; }; @@ -30,11 +30,11 @@ displayName = "Android SDK Build-Tools 18.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip"; sha1 = "f11618492b0d2270c332325d45d752d3656a9640"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.0.1-macosx.zip"; sha1 = "d84f5692fb44d60fc53e5b2507cebf9f24626902"; }; @@ -49,11 +49,11 @@ displayName = "Android SDK Build-Tools 18.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.1-linux.zip"; sha1 = "f314a0599e51397f0886fe888b50dd98f2f050d8"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.1-macosx.zip"; sha1 = "16ddb299b8b43063e5bb3387ec17147c5053dfd8"; }; @@ -68,11 +68,11 @@ displayName = "Android SDK Build-Tools 18.1.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip"; sha1 = "68c9acbfc0cec2d51b19efaed39831a17055d998"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r18.1.1-macosx.zip"; sha1 = "a9d9d37f6ddf859e57abc78802a77aaa166e48d4"; }; @@ -87,11 +87,11 @@ displayName = "Android SDK Build-Tools 19"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19-linux.zip"; sha1 = "55c1a6cf632e7d346f0002b275ec41fd3137fd83"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19-macosx.zip"; sha1 = "86ec1c12db1bc446b7bcaefc5cc14eb361044e90"; }; @@ -106,11 +106,11 @@ displayName = "Android SDK Build-Tools 19.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip"; sha1 = "18d2312dc4368858914213087f4e61445aca4517"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.1-macosx.zip"; sha1 = "efaf50fb19a3edb8d03efbff76f89a249ad2920b"; }; @@ -125,11 +125,11 @@ displayName = "Android SDK Build-Tools 19.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip"; sha1 = "a03a6bdea0091aea32e1b35b90a7294c9f04e3dd"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.2-macosx.zip"; sha1 = "145bc43065d45f756d99d87329d899052b9a9288"; }; @@ -144,11 +144,11 @@ displayName = "Android SDK Build-Tools 19.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip"; sha1 = "c2d6055478e9d2d4fba476ee85f99181ddd1160c"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.0.3-macosx.zip"; sha1 = "651cf8754373b2d52e7f6aab2c52eabffe4e9ea4"; }; @@ -163,11 +163,11 @@ displayName = "Android SDK Build-Tools 19.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.1-linux.zip"; sha1 = "1ff20ac15fa47a75d00346ec12f180d531b3ca89"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r19.1-macosx.zip"; sha1 = "0d11aae3417de1efb4b9a0e0a7855904a61bcec1"; }; @@ -182,11 +182,11 @@ displayName = "Android SDK Build-Tools 20"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r20-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r20-linux.zip"; sha1 = "b688905526a5584d1327a662d871a635ff502758"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r20-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r20-macosx.zip"; sha1 = "1240f629411c108a714c4ddd756937c7fab93f83"; }; @@ -201,11 +201,11 @@ displayName = "Android SDK Build-Tools 21"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21-linux.zip"; sha1 = "4933328fdeecbd554a29528f254f4993468e1cf4"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21-macosx.zip"; sha1 = "9bef7989b51436bd4e5114d8a0330359f077cbfa"; }; @@ -220,11 +220,11 @@ displayName = "Android SDK Build-Tools 21.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip"; sha1 = "e573069eea3e5255e7a65bedeb767f4fd0a5f49a"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.0.1-macosx.zip"; sha1 = "b60c8f9b810c980abafa04896706f3911be1ade7"; }; @@ -239,11 +239,11 @@ displayName = "Android SDK Build-Tools 21.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip"; sha1 = "e1236ab8897b62b57414adcf04c132567b2612a5"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.0.2-macosx.zip"; sha1 = "f17471c154058f3734729ef3cc363399b1cd3de1"; }; @@ -258,11 +258,11 @@ displayName = "Android SDK Build-Tools 21.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1-linux.zip"; sha1 = "b7455e543784d52a8925f960bc880493ed1478cb"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1-macosx.zip"; sha1 = "df619356c2359aa5eacdd48699d15b335d9bd246"; }; @@ -277,11 +277,11 @@ displayName = "Android SDK Build-Tools 21.1.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip"; sha1 = "1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1.1-macosx.zip"; sha1 = "836a146eab0504aa9387a5132e986fe7c7381571"; }; @@ -296,11 +296,11 @@ displayName = "Android SDK Build-Tools 21.1.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip"; sha1 = "5e35259843bf2926113a38368b08458735479658"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r21.1.2-macosx.zip"; sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; }; @@ -315,11 +315,11 @@ displayName = "Android SDK Build-Tools 22"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r22-linux.zip"; sha1 = "a8a1619dd090e44fac957bce6842e62abf87965b"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r22-macosx.zip"; sha1 = "af95429b24088d704bc5db9bd606e34ac1b82c0d"; }; @@ -334,11 +334,11 @@ displayName = "Android SDK Build-Tools 22.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip"; sha1 = "da8b9c5c3ede39298e6cf0283c000c2ee9029646"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r22.0.1-macosx.zip"; sha1 = "53dad7f608e01d53b17176ba11165acbfccc5bbf"; }; @@ -353,11 +353,11 @@ displayName = "Android SDK Build-Tools 23"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r23-linux.zip"; sha1 = "c1d6209212b01469f80fa804e0c1d39a06bc9060"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r23-macosx.zip"; sha1 = "90ba6e716f7703a236cd44b2e71c5ff430855a03"; }; @@ -372,11 +372,11 @@ displayName = "Android SDK Build-Tools 23.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip"; sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.1-macosx.zip"; sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; }; @@ -391,11 +391,11 @@ displayName = "Android SDK Build-Tools 23.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip"; sha1 = "8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.2-macosx.zip"; sha1 = "482c4cbceef8ff58aefd92d8155a38610158fdaf"; }; @@ -410,11 +410,11 @@ displayName = "Android SDK Build-Tools 23.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.3-linux.zip"; sha1 = "368f2600feac7e9b511b82f53d1f2240ae4a91a3"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r23.0.3-macosx.zip"; sha1 = "fbc98cd303fd15a31d472de6c03bd707829f00b0"; }; @@ -429,11 +429,11 @@ displayName = "Android SDK Build-Tools 24"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r24-linux.zip"; sha1 = "c6271c4d78a5612ea6c7150688bcd5b7313de8d1"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r24-macosx.zip"; sha1 = "97fc4ed442f23989cc488d02c1d1de9bdde241de"; }; @@ -448,11 +448,11 @@ displayName = "Android SDK Build-Tools 24.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.1-linux.zip"; sha1 = "84f18c392919a074fcbb9b1d967984e6b2fef8b4"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.1-macosx.zip"; sha1 = "5c6457fcdfa07724fb086d8ff4e8316fc0742848"; }; @@ -467,11 +467,11 @@ displayName = "Android SDK Build-Tools 24.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.2-linux.zip"; sha1 = "f199a7a788c3fefbed102eea34d6007737b803cf"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.2-macosx.zip"; sha1 = "8bb8fc575477491d5957de743089df412de55cda"; }; @@ -486,11 +486,11 @@ displayName = "Android SDK Build-Tools 24.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.3-linux.zip"; sha1 = "9e8cc49d66e03fa1a8ecc1ac3e58f1324f5da304"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r24.0.3-macosx.zip"; sha1 = "a01c15f1b105c34595681075e1895d58b3fff48c"; }; @@ -505,11 +505,11 @@ displayName = "Android SDK Build-Tools 25"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r25-linux.zip"; sha1 = "f2bbda60403e75cabd0f238598c3b4dfca56ea44"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r25-macosx.zip"; sha1 = "273c5c29a65cbed00e44f3aa470bbd7dce556606"; }; @@ -524,11 +524,11 @@ displayName = "Android SDK Build-Tools 25.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.1-linux.zip"; sha1 = "ff063d252ab750d339f5947d06ff782836f22bac"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.1-macosx.zip"; sha1 = "7bf7f22d7d48ef20b6ab0e3d7a2912e5c088340f"; }; @@ -543,11 +543,11 @@ displayName = "Android SDK Build-Tools 25.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.2-linux.zip"; sha1 = "ff953c0177e317618fda40516f3e9d95fd43c7ae"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.2-macosx.zip"; sha1 = "12a5204bb3b6e39437535469fde7ddf42da46b16"; }; @@ -562,11 +562,11 @@ displayName = "Android SDK Build-Tools 25.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.3-linux.zip"; sha1 = "db95f3a0ae376534d4d69f4cdb6fad20649f3509"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r25.0.3-macosx.zip"; sha1 = "160d2fefb5ce68e443427fc30a793a703b63e26e"; }; @@ -581,11 +581,11 @@ displayName = "Android SDK Build-Tools 26"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-linux.zip"; sha1 = "1cbe72929876f8a872ab1f1b1040a9f720261f59"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-macosx.zip"; sha1 = "d01a1aeca03747245f1f5936b3cb01759c66d086"; }; @@ -600,11 +600,11 @@ displayName = "Android SDK Build-Tools 26-rc1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-rc1-linux.zip"; sha1 = "8cd6388dc96db2d7a49d06159cf990d3bbc78d04"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-rc1-macosx.zip"; sha1 = "5c5a1de7d5f4f000d36ae349229fe0be846d6137"; }; @@ -619,11 +619,11 @@ displayName = "Android SDK Build-Tools 26-rc2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-rc2-linux.zip"; sha1 = "629bbd8d2e415bf64871fb0b4c0540fd6d0347a0"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26-rc2-macosx.zip"; sha1 = "cb1eb738a1f7003025af267a9b8cc2d259533c70"; }; @@ -638,11 +638,11 @@ displayName = "Android SDK Build-Tools 26.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.1-linux.zip"; sha1 = "5378c2c78091b414d0eac40a6bd37f2faa31a365"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.1-macosx.zip"; sha1 = "cbde59de198916b390777dd0227921bfa2120832"; }; @@ -657,11 +657,11 @@ displayName = "Android SDK Build-Tools 26.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.2-linux.zip"; sha1 = "5b2b7b66c7bf2151f2af183b5b50a17808850592"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.2-macosx.zip"; sha1 = "d9ed7c7f149ce38be5dc08979aea8acec1459ca0"; }; @@ -676,11 +676,11 @@ displayName = "Android SDK Build-Tools 26.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.3-linux.zip"; sha1 = "8a2e6c1bcd845844523a68aa17e5442f0dce328c"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r26.0.3-macosx.zip"; sha1 = "5bb90ed935d99e5bc90686f43b852e68c5ad40df"; }; @@ -695,11 +695,11 @@ displayName = "Android SDK Build-Tools 27"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r27-linux.zip"; sha1 = "28542332ba97cf4a08c3eddfcf5edd70e3cf1260"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r27-macosx.zip"; sha1 = "fb4e8d7e6b8d29a77090e34024077a80458d5ae1"; }; @@ -714,11 +714,11 @@ displayName = "Android SDK Build-Tools 27.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.1-linux.zip"; sha1 = "7f4eedb1077ef948b848040dcd15de9e8a759f4a"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.1-macosx.zip"; sha1 = "1edd07bfdbadd95652d093040e16d858f7489594"; }; @@ -733,11 +733,11 @@ displayName = "Android SDK Build-Tools 27.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.2-linux.zip"; sha1 = "b687ddf6be84f11607871138aad32cf857d0b837"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.2-macosx.zip"; sha1 = "6d5d9cf2a47877f273f4b742b19e712a051a31be"; }; @@ -752,11 +752,11 @@ displayName = "Android SDK Build-Tools 27.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.3-linux.zip"; sha1 = "d85e7a6320eddffe7eeace3437605079dac938ca"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r27.0.3-macosx.zip"; sha1 = "61d9fb18790c68d66ff73bf1e7ad56bc1f1eef2d"; }; @@ -771,11 +771,11 @@ displayName = "Android SDK Build-Tools 28"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-linux.zip"; sha1 = "d9f8a754d833ccd334f56fcc6089c5925cd82abb"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-macosx.zip"; sha1 = "72088d32d1d82cc3c2cf7cf6618b6130c0c84ade"; }; @@ -790,11 +790,11 @@ displayName = "Android SDK Build-Tools 28-rc1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-rc1-linux.zip"; sha1 = "1601977fae25fd478bcfaa0481ca5ea3c609d840"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-rc1-macosx.zip"; sha1 = "2c77821967a2330b7b227072d0b1c02ef19fe2fc"; }; @@ -809,11 +809,11 @@ displayName = "Android SDK Build-Tools 28-rc2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-rc2-linux.zip"; sha1 = "efe9c0dde0646a07544c864276390ca6e96b24dc"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28-rc2-macosx.zip"; sha1 = "0d0314b353589feb10e528b44c5a685b6658d797"; }; @@ -828,11 +828,11 @@ displayName = "Android SDK Build-Tools 28.0.1"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.1-linux.zip"; sha1 = "ee70dfa1fccb58b37cebc9544830511f36a137a0"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.1-macosx.zip"; sha1 = "aeef42ad953f1630dd6f5d71eefdc0b825211462"; }; @@ -847,11 +847,11 @@ displayName = "Android SDK Build-Tools 28.0.2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.2-linux.zip"; sha1 = "b4492209810a3fd48deaa982f9852fef12433d55"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.2-macosx.zip"; sha1 = "c10dd5a7825578622fb362a8a34f76eb3ba0c0a9"; }; @@ -866,17 +866,169 @@ displayName = "Android SDK Build-Tools 28.0.3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.3-linux.zip"; sha1 = "ea6f2f7103cd9da9ff0bdf6e37fbbba548fa4165"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip; + url = "https://dl.google.com/android/repository/build-tools_r28.0.3-macosx.zip"; sha1 = "f8c333a2991b1ab05a671bc6248b78e00edcd83a"; }; }; }; + "build-tools"."29.0.0" = { + + name = "build-tools"; + path = "build-tools/29.0.0"; + revision = "29.0.0"; + displayName = "Android SDK Build-Tools 29"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29-linux.zip"; + sha1 = "ad314caf1802209c4b00a5f3517af5ceb0d48eae"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29-macosx.zip"; + sha1 = "35dc6bc7a53bd9d206847e72f02cab21cfdaa869"; + }; + + }; + }; + + "build-tools"."29.0.0-rc1" = { + + name = "build-tools"; + path = "build-tools/29.0.0-rc1"; + revision = "29.0.0-rc1"; + displayName = "Android SDK Build-Tools 29-rc1"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29-rc1-linux.zip"; + sha1 = "1c897f5885ac5468613e40e1ea598c21c05d345d"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29-rc1-macosx.zip"; + sha1 = "f066c0d9ea2f0d8a0a9cc7b2ca0a467a570ab034"; + }; + + }; + }; + + "build-tools"."29.0.0-rc2" = { + + name = "build-tools"; + path = "build-tools/29.0.0-rc2"; + revision = "29.0.0-rc2"; + displayName = "Android SDK Build-Tools 29-rc2"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29-rc2-linux.zip"; + sha1 = "b4b41d429c35b42db07b6c65d4aa998ba8c4093c"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29-rc2-macosx.zip"; + sha1 = "7a960367999169ccac5dbc60817e5f1725c4c738"; + }; + + }; + }; + + "build-tools"."29.0.0-rc3" = { + + name = "build-tools"; + path = "build-tools/29.0.0-rc3"; + revision = "29.0.0-rc3"; + displayName = "Android SDK Build-Tools 29-rc3"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29-rc3-linux.zip"; + sha1 = "8b7177f198e8b92da8f9537aaf859f6edf222b01"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29-rc3-macosx.zip"; + sha1 = "643e8d76625f6e2cfcd5494e50bae5e14725ec0c"; + }; + + }; + }; + + "build-tools"."29.0.1" = { + + name = "build-tools"; + path = "build-tools/29.0.1"; + revision = "29.0.1"; + displayName = "Android SDK Build-Tools 29.0.1"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29.0.1-linux.zip"; + sha1 = "fc209e5d91ab2daeac24345a5cb17261940547e4"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29.0.1-macosx.zip"; + sha1 = "46ae9b1d1e2a67241d7da9c2cd8eae42f24cc6cd"; + }; + + }; + }; + + "build-tools"."29.0.2" = { + + name = "build-tools"; + path = "build-tools/29.0.2"; + revision = "29.0.2"; + displayName = "Android SDK Build-Tools 29.0.2"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29.0.2-linux.zip"; + sha1 = "c0fc7e5c37ac96bfd0c611802e8ab36d0e71b398"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29.0.2-macosx.zip"; + sha1 = "f781d9e03d5c2debcf51fed3792ee7a9d066723f"; + }; + + }; + }; + + "build-tools"."29.0.3" = { + + name = "build-tools"; + path = "build-tools/29.0.3"; + revision = "29.0.3"; + displayName = "Android SDK Build-Tools 29.0.3"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29.0.3-linux.zip"; + sha1 = "64efff52165cda5e31848acafa46a05e3f3b4651"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r29.0.3-macosx.zip"; + sha1 = "76520eb7712fb0bb4c023b55c6f65588ee268289"; + }; + + }; + }; + + "build-tools"."30.0.0-rc1" = { + + name = "build-tools"; + path = "build-tools/30.0.0-rc1"; + revision = "30.0.0-rc1"; + displayName = "Android SDK Build-Tools 30-rc1"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r30-rc1-linux.zip"; + sha1 = "afcb370bb6956bbf9e90557230088a3e1417e8a8"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/build-tools_r30-rc1-macosx.zip"; + sha1 = "2761a0ea9466685aaaf93e85bf8bd47575bc91b8"; + }; + + }; + }; + "cmake"."3.10.2" = { name = "cmake"; @@ -885,11 +1037,11 @@ displayName = "CMake 3.10.2.4988404"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/cmake-3.10.2-darwin-x86_64.zip"; sha1 = "f227a85cb53dcb927ac52a5a717f647c4a29bf3b"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/cmake-3.10.2-linux-x86_64.zip"; sha1 = "439e8799bf59f724f104bf62784b2985f1bfe561"; }; @@ -904,17 +1056,36 @@ displayName = "CMake 3.6.4111459"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/cmake-3.6.4111459-darwin-x86_64.zip"; sha1 = "c9b02d630079783c6d67cb91488b622cfcd9765c"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/cmake-3.6.4111459-linux-x86_64.zip"; sha1 = "71c539b9c33f0943e9ad6251fea0b161c0b70782"; }; }; }; + "cmdline-tools"."1.0" = { + + name = "cmdline-tools"; + path = "cmdline-tools/1.0"; + revision = "1.0"; + displayName = "Android SDK Command-line Tools"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/commandlinetools-linux-6200805_latest.zip"; + sha1 = "6ffc5bd72db2c755f9b374ed829202262a6d8aaf"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip"; + sha1 = "23f803c07e392bb769507c88b23c2c7868cc7a6f"; + }; + + }; + }; + "docs"."1" = { name = "docs"; @@ -924,95 +1095,73 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/docs-24_r01.zip; + url = "https://dl.google.com/android/repository/docs-24_r01.zip"; sha1 = "eef58238949ee9544876cb3e002f2d58e4ee7b5d"; }; }; }; - "emulator"."27.3.10".linux = { + "emulator"."30.0.0".macosx = { name = "emulator"; path = "emulator"; - revision = "27.3.10"; - displayName = "Android Emulator"; - archives = { - linux = fetchurl { - url = https://dl.google.com/android/repository/emulator-linux-4969155.zip; - sha1 = "5b037b25bc6567fda3071457f0009c057670d9e8"; - }; - - }; - }; - - "emulator"."27.3.10".macosx = { - - name = "emulator"; - path = "emulator"; - revision = "27.3.10"; + revision = "30.0.0"; displayName = "Android Emulator"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/emulator-darwin-4969155.zip; - sha1 = "28d2b51ee5c84bc544deee433419f33dc9e05b66"; + url = "https://dl.google.com/android/repository/emulator-darwin-6203977.zip"; + sha1 = "3bb965869577be4e62dec053de34c279f5024a12"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/emulator-linux-6203977.zip"; + sha1 = "356cac370c03460ca82166464de7ecd7da1f4a49"; }; }; }; - "emulator"."27.3.10".windows = { + "emulator"."28.0.25".windows = { name = "emulator"; path = "emulator"; - revision = "27.3.10"; + revision = "28.0.25"; displayName = "Android Emulator"; archives = { }; }; - "emulator"."28.0.14".linux = { + "emulator"."30.0.3".linux = { name = "emulator"; path = "emulator"; - revision = "28.0.14"; + revision = "30.0.3"; displayName = "Android Emulator"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/emulator-linux-5092175.zip; - sha1 = "062ef9a1f6759481de897d6c5602d9d66e958a0b"; + url = "https://dl.google.com/android/repository/emulator-linux-6258612.zip"; + sha1 = "a891e1532443a55c3ce9986b484effdabd842f8e"; }; }; }; - "emulator"."28.0.14".macosx = { + "emulator"."30.0.2".macosx = { name = "emulator"; path = "emulator"; - revision = "28.0.14"; + revision = "30.0.2"; displayName = "Android Emulator"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/emulator-darwin-5092175.zip; - sha1 = "6dc13599bddd5c2acdb559b25201c92a801d157c"; + url = "https://dl.google.com/android/repository/emulator-darwin-6237347.zip"; + sha1 = "702b6a050a230b3b45f667867f6fc99b3f973d9a"; }; }; }; - "emulator"."28.0.14".windows = { - - name = "emulator"; - path = "emulator"; - revision = "28.0.14"; - displayName = "Android Emulator"; - archives = { - - }; - }; - "lldb"."2.0.2558144" = { name = "lldb"; @@ -1021,11 +1170,11 @@ displayName = "LLDB 2.0"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.0.2558144-darwin-x86_64.zip"; sha1 = "d92e2f4c8284413eed4f27986e62b167d947033c"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.0.2558144-linux-x86_64.zip"; sha1 = "e7060d9b2ba58b28fd7b1a0ea85a151c8371a326"; }; @@ -1040,11 +1189,11 @@ displayName = "LLDB 2.1"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.1.2852477-darwin-x86_64.zip"; sha1 = "d1e33880a53f1aa8c7e73534adef83a06f091185"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.1.2852477-linux-x86_64.zip"; sha1 = "eb9b96d320210fdfe82495b0597ad43e77f1c240"; }; @@ -1059,11 +1208,11 @@ displayName = "LLDB 2.2"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.2.3271982-darwin-x86_64.zip"; sha1 = "62089f4e35775e6cedb82d1fa377fdc1de898005"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.2.3271982-linux-x86_64.zip"; sha1 = "413649617d97dd9ef163528f64c0500e1b7c4113"; }; @@ -1078,11 +1227,11 @@ displayName = "LLDB 2.3"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.3.3614996-darwin-x86_64.zip"; sha1 = "6b0df112c7b9fa41654497fde2fcce990c831e52"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-2.3.3614996-linux-x86_64.zip"; sha1 = "d7abe655650efe9f6989df31835fa3b3f95c2d13"; }; @@ -1097,11 +1246,11 @@ displayName = "LLDB 3.0"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-3.0.4213617-darwin-x86_64.zip"; sha1 = "2492651690a215317b86c755cd4d584ec9838677"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-3.0.4213617-linux-x86_64.zip"; sha1 = "61d49b6a58953faa61546d631409af5f60d8d9db"; }; @@ -1116,17 +1265,188 @@ displayName = "LLDB 3.1"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-3.1.4508709-darwin-x86_64.zip"; sha1 = "2b37aa55b81a7e5b8a369febf1ac0bad6c7c5d58"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/lldb-3.1.4508709-linux-x86_64.zip"; sha1 = "462711c9ee94fec9ff8be5fa8180afec04d1af6f"; }; }; }; + "ndk-bundle"."21.1.6210238-rc1" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "21.1.6210238-rc1"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip"; + sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip"; + sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd"; + }; + + }; + }; + + "ndk-bundle"."21.0.6113669" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "21.0.6113669"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip"; + sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip"; + sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c"; + }; + + }; + }; + + "ndk-bundle"."21.0.6011959-rc2" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "21.0.6011959-rc2"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip"; + sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip"; + sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44"; + }; + + }; + }; + + "ndk-bundle"."20.1.5948944" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "20.1.5948944"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip"; + sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip"; + sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b"; + }; + + }; + }; + + "ndk-bundle"."20.0.5594570" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "20.0.5594570"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip"; + sha1 = "96d5f1c50452596912d1982439c514194b5751e6"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip"; + sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"; + }; + + }; + }; + + "ndk-bundle"."20.0.5471264-rc3" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "20.0.5471264-rc3"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip"; + sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip"; + sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3"; + }; + + }; + }; + + "ndk-bundle"."20.0.5392854-rc2" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "20.0.5392854-rc2"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip"; + sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip"; + sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02"; + }; + + }; + }; + + "ndk-bundle"."19.2.5345600" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "19.2.5345600"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip"; + sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip"; + sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834"; + }; + + }; + }; + + "ndk-bundle"."19.0.5232133" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "19.0.5232133"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"; + sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip"; + sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac"; + }; + + }; + }; + "ndk-bundle"."18.1.5063045" = { name = "ndk-bundle"; @@ -1135,17 +1455,283 @@ displayName = "NDK"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip"; + sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip"; + sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; + }; + + }; + }; + + "ndk-bundle"."17.2.4988734" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "17.2.4988734"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip"; + sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip"; + sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048"; + }; + + }; + }; + + "ndk-bundle"."16.1.4479499" = { + + name = "ndk-bundle"; + path = "ndk-bundle"; + revision = "16.1.4479499"; + displayName = "NDK"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip"; + sha1 = "e51e615449b98c716cf912057e2682e75d55e2de"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip"; + sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128"; + }; + + }; + }; + + "ndk"."16.1.4479499" = { + + name = "ndk"; + path = "ndk/16.1.4479499"; + revision = "16.1.4479499"; + displayName = "NDK (Side by side) 16.1.4479499"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r16b-darwin-x86_64.zip"; + sha1 = "e51e615449b98c716cf912057e2682e75d55e2de"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip"; + sha1 = "42aa43aae89a50d1c66c3f9fdecd676936da6128"; + }; + + }; + }; + + "ndk"."17.2.4988734" = { + + name = "ndk"; + path = "ndk/17.2.4988734"; + revision = "17.2.4988734"; + displayName = "NDK (Side by side) 17.2.4988734"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r17c-darwin-x86_64.zip"; + sha1 = "f97e3d7711497e3b4faf9e7b3fa0f0da90bb649c"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip"; + sha1 = "12cacc70c3fd2f40574015631c00f41fb8a39048"; + }; + + }; + }; + + "ndk"."18.1.5063045" = { + + name = "ndk"; + path = "ndk/18.1.5063045"; + revision = "18.1.5063045"; + displayName = "NDK (Side by side) 18.1.5063045"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r18b-darwin-x86_64.zip"; sha1 = "98cb9909aa8c2dab32db188bbdc3ac6207e09440"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip; + url = "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip"; sha1 = "500679655da3a86aecf67007e8ab230ea9b4dd7b"; }; }; }; + "ndk"."19.0.5232133" = { + + name = "ndk"; + path = "ndk/19.0.5232133"; + revision = "19.0.5232133"; + displayName = "NDK (Side by side) 19.0.5232133"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r19-darwin-x86_64.zip"; + sha1 = "86c1a962601b23b8a6d3d535c93b4b0bc4f29249"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r19-linux-x86_64.zip"; + sha1 = "f02ad84cb5b6e1ff3eea9e6168037c823408c8ac"; + }; + + }; + }; + + "ndk"."19.2.5345600" = { + + name = "ndk"; + path = "ndk/19.2.5345600"; + revision = "19.2.5345600"; + displayName = "NDK (Side by side) 19.2.5345600"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r19c-darwin-x86_64.zip"; + sha1 = "f46b8193109bba8a58e0461c1a48f4534051fb25"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r19c-linux-x86_64.zip"; + sha1 = "fd94d0be6017c6acbd193eb95e09cf4b6f61b834"; + }; + + }; + }; + + "ndk"."20.0.5392854-rc2" = { + + name = "ndk"; + path = "ndk/20.0.5392854"; + revision = "20.0.5392854-rc2"; + displayName = "NDK (Side by side) 20.0.5392854"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-darwin-x86_64.zip"; + sha1 = "cd94191ace6b31ec9af1cc370173e16934e1cb8b"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-beta2-linux-x86_64.zip"; + sha1 = "8285ae2e24a7232fd0cbfb55e955c8586ef2ee02"; + }; + + }; + }; + + "ndk"."20.0.5471264-rc3" = { + + name = "ndk"; + path = "ndk/20.0.5471264"; + revision = "20.0.5471264-rc3"; + displayName = "NDK (Side by side) 20.0.5471264"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-darwin-x86_64.zip"; + sha1 = "665a035cadb0dd03e6502ba25c18643f6e4ede24"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-beta3-linux-x86_64.zip"; + sha1 = "674d8fb0e0df8e8be1c31fa321eb176548a19ba3"; + }; + + }; + }; + + "ndk"."20.0.5594570" = { + + name = "ndk"; + path = "ndk/20.0.5594570"; + revision = "20.0.5594570"; + displayName = "NDK (Side by side) 20.0.5594570"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-darwin-x86_64.zip"; + sha1 = "96d5f1c50452596912d1982439c514194b5751e6"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20-linux-x86_64.zip"; + sha1 = "8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"; + }; + + }; + }; + + "ndk"."20.1.5948944" = { + + name = "ndk"; + path = "ndk/20.1.5948944"; + revision = "20.1.5948944"; + displayName = "NDK (Side by side) 20.1.5948944"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip"; + sha1 = "b51290ab69cb89de1f0ba108702277bc333b38be"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip"; + sha1 = "d903fdf077039ad9331fb6c3bee78aa46d45527b"; + }; + + }; + }; + + "ndk"."21.0.6011959-rc2" = { + + name = "ndk"; + path = "ndk/21.0.6011959"; + revision = "21.0.6011959-rc2"; + displayName = "NDK (Side by side) 21.0.6011959"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-darwin-x86_64.zip"; + sha1 = "34a46c3867c9d87a80895c0b8a098256052536d2"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21-beta2-linux-x86_64.zip"; + sha1 = "335f30302bee700a9a5fdfe3ae533a4963499c44"; + }; + + }; + }; + + "ndk"."21.0.6113669" = { + + name = "ndk"; + path = "ndk/21.0.6113669"; + revision = "21.0.6113669"; + displayName = "NDK (Side by side) 21.0.6113669"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip"; + sha1 = "0d50636cc0e34ed3ba540d6d5818ea0cf10f16aa"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip"; + sha1 = "afc9c0b9faad222898ac8168c78ad4ccac8a1b5c"; + }; + + }; + }; + + "ndk"."21.1.6210238-rc1" = { + + name = "ndk"; + path = "ndk/21.1.6210238"; + revision = "21.1.6210238-rc1"; + displayName = "NDK (Side by side) 21.1.6210238"; + archives = { + macosx = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-darwin-x86_64.zip"; + sha1 = "971609f9a579ebbcb8d121a5d5aa0cba716b2d1f"; + }; + linux = fetchurl { + url = "https://dl.google.com/android/repository/android-ndk-r21b-beta1-linux-x86_64.zip"; + sha1 = "cf06ed408663c11c8f4824f9370c7a900ec074dd"; + }; + + }; + }; + "patcher"."1" = { name = "patcher"; @@ -1155,27 +1741,27 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip.bak; + url = "https://dl.google.com/android/repository/3534162-studio.sdk-patcher.zip"; sha1 = "046699c5e2716ae11d77e0bad814f7f33fab261e"; }; }; }; - "platform-tools"."28.0.1" = { + "platform-tools"."29.0.6" = { name = "platform-tools"; path = "platform-tools"; - revision = "28.0.1"; + revision = "29.0.6"; displayName = "Android SDK Platform-Tools"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/platform-tools_r28.0.1-darwin.zip; - sha1 = "ed1edad4a48c27655ce98d0a5821e7296e9de145"; + url = "https://dl.google.com/android/repository/platform-tools_r29.0.6-darwin.zip"; + sha1 = "3232179dce22d8a6332018729026ed39f5d5cd0b"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/platform-tools_r28.0.1-linux.zip; - sha1 = "74ff83bc203f01c4f04bd9316ab5a2573f023fd1"; + url = "https://dl.google.com/android/repository/platform-tools_r29.0.6-linux.zip"; + sha1 = "e95ed28330406705d47fe96bafb589be6c1f2f23"; }; }; @@ -1190,7 +1776,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.3_r02.zip; + url = "https://dl.google.com/android/repository/android-2.3.3_r02.zip"; sha1 = "887e37783ec32f541ea33c2c649dda648e8e6fb3"; }; @@ -1206,7 +1792,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-3.0_r02.zip; + url = "https://dl.google.com/android/repository/android-3.0_r02.zip"; sha1 = "2c7d4bd13f276e76f6bbd87315fe27aba351dd37"; }; @@ -1222,7 +1808,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-3.1_r03.zip; + url = "https://dl.google.com/android/repository/android-3.1_r03.zip"; sha1 = "4a50a6679cd95bb68bb5fc032e754cd7c5e2b1bf"; }; @@ -1238,7 +1824,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-3.2_r01.zip; + url = "https://dl.google.com/android/repository/android-3.2_r01.zip"; sha1 = "6189a500a8c44ae73a439604363de93591163cd9"; }; @@ -1254,7 +1840,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-14_r04.zip; + url = "https://dl.google.com/android/repository/android-14_r04.zip"; sha1 = "d4f1d8fbca25225b5f0e7a0adf0d39c3d6e60b3c"; }; @@ -1270,7 +1856,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-15_r05.zip; + url = "https://dl.google.com/android/repository/android-15_r05.zip"; sha1 = "69ab4c443b37184b2883af1fd38cc20cbeffd0f3"; }; @@ -1286,7 +1872,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-16_r05.zip; + url = "https://dl.google.com/android/repository/android-16_r05.zip"; sha1 = "12a5ce6235a76bc30f62c26bda1b680e336abd07"; }; @@ -1302,7 +1888,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-17_r03.zip; + url = "https://dl.google.com/android/repository/android-17_r03.zip"; sha1 = "dbe14101c06e6cdb34e300393e64e64f8c92168a"; }; @@ -1318,7 +1904,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-18_r03.zip; + url = "https://dl.google.com/android/repository/android-18_r03.zip"; sha1 = "e6b09b3505754cbbeb4a5622008b907262ee91cb"; }; @@ -1334,7 +1920,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-19_r04.zip; + url = "https://dl.google.com/android/repository/android-19_r04.zip"; sha1 = "2ff20d89e68f2f5390981342e009db5a2d456aaa"; }; @@ -1349,11 +1935,11 @@ displayName = "Android SDK Platform 2"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-1.1_r1-linux.zip; + url = "https://dl.google.com/android/repository/android-1.1_r1-linux.zip"; sha1 = "c054d25c9b4c6251fa49c2f9c54336998679d3fe"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-1.1_r1-macosx.zip; + url = "https://dl.google.com/android/repository/android-1.1_r1-macosx.zip"; sha1 = "e21dbcff45b7356657449ebb3c7e941be2bb5ebe"; }; @@ -1369,7 +1955,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-20_r02.zip; + url = "https://dl.google.com/android/repository/android-20_r02.zip"; sha1 = "a9251f8a3f313ab05834a07a963000927637e01d"; }; @@ -1385,7 +1971,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-21_r02.zip; + url = "https://dl.google.com/android/repository/android-21_r02.zip"; sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; }; @@ -1401,7 +1987,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-22_r02.zip; + url = "https://dl.google.com/android/repository/android-22_r02.zip"; sha1 = "5d1bd10fea962b216a0dece1247070164760a9fc"; }; @@ -1417,7 +2003,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-23_r03.zip; + url = "https://dl.google.com/android/repository/platform-23_r03.zip"; sha1 = "027fede3de6aa1649115bbd0bffff30ccd51c9a0"; }; @@ -1433,7 +2019,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r02.zip; + url = "https://dl.google.com/android/repository/platform-24_r02.zip"; sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; }; @@ -1449,7 +2035,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-25_r03.zip; + url = "https://dl.google.com/android/repository/platform-25_r03.zip"; sha1 = "00c2c5765e8988504be10a1eb66ed71fcdbd7fe8"; }; @@ -1465,7 +2051,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-26_r02.zip; + url = "https://dl.google.com/android/repository/platform-26_r02.zip"; sha1 = "e4ae5d7aa557a3c827135838ee400da8443ac4ef"; }; @@ -1481,7 +2067,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-27_r03.zip; + url = "https://dl.google.com/android/repository/platform-27_r03.zip"; sha1 = "35f747e7e70b2d16e0e4246876be28d15ea1c353"; }; @@ -1497,7 +2083,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-28_r06.zip; + url = "https://dl.google.com/android/repository/platform-28_r06.zip"; sha1 = "9a4e52b1d55bd2e24216b150aafae2503d3efba6"; }; @@ -1513,14 +2099,13 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/platform-29_r03.zip; - sha1 = "670e2e104333dae90e16ea3b615f0b63da5883ae"; + url = "https://dl.google.com/android/repository/platform-29_r04.zip"; + sha1 = "8d644c39902038e0bd529165d5ba4f5a8607daea"; }; }; }; - - + "platforms"."3" = { name = "platforms"; @@ -1529,11 +2114,11 @@ displayName = "Android SDK Platform 3"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-1.5_r04-linux.zip; + url = "https://dl.google.com/android/repository/android-1.5_r04-linux.zip"; sha1 = "5c134b7df5f4b8bd5b61ba93bdaebada8fa3468c"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-1.5_r04-macosx.zip; + url = "https://dl.google.com/android/repository/android-1.5_r04-macosx.zip"; sha1 = "d3a67c2369afa48b6c3c7624de5031c262018d1e"; }; @@ -1548,11 +2133,11 @@ displayName = "Android SDK Platform 4"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-1.6_r03-linux.zip; + url = "https://dl.google.com/android/repository/android-1.6_r03-linux.zip"; sha1 = "483ed088e45bbdf3444baaf9250c8b02e5383cb0"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-1.6_r03-macosx.zip; + url = "https://dl.google.com/android/repository/android-1.6_r03-macosx.zip"; sha1 = "bdafad44f5df9f127979bdb21a1fdd87ee3cd625"; }; @@ -1567,11 +2152,11 @@ displayName = "Android SDK Platform 5"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-2.0_r01-linux.zip; + url = "https://dl.google.com/android/repository/android-2.0_r01-linux.zip"; sha1 = "be9be6a99ca32875c96ec7f91160ca9fce7e3c7d"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-2.0_r01-macosx.zip; + url = "https://dl.google.com/android/repository/android-2.0_r01-macosx.zip"; sha1 = "2a866d0870dbba18e0503cd41e5fae988a21b314"; }; @@ -1586,11 +2171,11 @@ displayName = "Android SDK Platform 6"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip; + url = "https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip"; sha1 = "ce2c971dce352aa28af06bda92a070116aa5ae1a"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip; + url = "https://dl.google.com/android/repository/android-2.0.1_r01-macosx.zip"; sha1 = "c3096f80d75a6fc8cb38ef8a18aec920e53d42c0"; }; @@ -1606,7 +2191,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-2.1_r03.zip; + url = "https://dl.google.com/android/repository/android-2.1_r03.zip"; sha1 = "5ce51b023ac19f8738500b1007a1da5de2349a1e"; }; @@ -1622,7 +2207,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-2.2_r03.zip; + url = "https://dl.google.com/android/repository/android-2.2_r03.zip"; sha1 = "231262c63eefdff8fd0386e9ccfefeb27a8f9202"; }; @@ -1638,13 +2223,48 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/android-2.3.1_r02.zip; + url = "https://dl.google.com/android/repository/android-2.3.1_r02.zip"; sha1 = "209f8a7a8b2cb093fce858b8b55fed3ba5206773"; }; }; }; + "platforms"."R" = { + + name = "platforms"; + path = "platforms/android-R"; + revision = "R"; + displayName = "Android SDK Platform R"; + archives = { + + all = fetchurl { + url = "https://dl.google.com/android/repository/platform-R_r01.zip"; + sha1 = "f6ce3ef0ec8526550fc3b517bdb29051275bcd1a"; + }; + + }; + }; + + "skiaparser"."1-rc02" = { + + name = "skiaparser"; + path = "skiaparser/1"; + revision = "1-rc02"; + displayName = "Skia Parser Server"; + archives = { + linux = fetchurl { + url = "https://dl.google.com/android/repository/skiaparser-6172737-linux.zip"; + sha1 = "d2eac6deff2c257d47853251bda5528c96a41720"; + }; + macosx = fetchurl { + url = "https://dl.google.com/android/repository/skiaparser-6172737-mac.zip"; + sha1 = "1e3b8da7a4f5e9887479b4e4186db3cb22422c82"; + }; + + }; + }; + "sources"."14" = { name = "sources"; @@ -1654,7 +2274,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-14_r01.zip; + url = "https://dl.google.com/android/repository/sources-14_r01.zip"; sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555"; }; @@ -1670,7 +2290,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-15_r02.zip; + url = "https://dl.google.com/android/repository/sources-15_r02.zip"; sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa"; }; @@ -1686,7 +2306,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-16_r02.zip; + url = "https://dl.google.com/android/repository/sources-16_r02.zip"; sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84"; }; @@ -1702,7 +2322,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-17_r01.zip; + url = "https://dl.google.com/android/repository/sources-17_r01.zip"; sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a"; }; @@ -1718,7 +2338,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-18_r01.zip; + url = "https://dl.google.com/android/repository/sources-18_r01.zip"; sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78"; }; @@ -1734,7 +2354,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-19_r02.zip; + url = "https://dl.google.com/android/repository/sources-19_r02.zip"; sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7"; }; @@ -1750,7 +2370,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-20_r01.zip; + url = "https://dl.google.com/android/repository/sources-20_r01.zip"; sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76"; }; @@ -1766,7 +2386,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-21_r01.zip; + url = "https://dl.google.com/android/repository/sources-21_r01.zip"; sha1 = "137a5044915d32bea297a8c1552684802bbc2e25"; }; @@ -1782,7 +2402,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-22_r01.zip; + url = "https://dl.google.com/android/repository/sources-22_r01.zip"; sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6"; }; @@ -1798,7 +2418,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-23_r01.zip; + url = "https://dl.google.com/android/repository/sources-23_r01.zip"; sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2"; }; @@ -1814,7 +2434,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-24_r01.zip; + url = "https://dl.google.com/android/repository/sources-24_r01.zip"; sha1 = "6b96115830a83d654479f32ce4b724ca9011148b"; }; @@ -1830,7 +2450,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-25_r01.zip; + url = "https://dl.google.com/android/repository/sources-25_r01.zip"; sha1 = "bbc72efd1a9bad87cc507e308f0d29aad438c52c"; }; @@ -1846,7 +2466,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-26_r01.zip; + url = "https://dl.google.com/android/repository/sources-26_r01.zip"; sha1 = "2af701ee3223d580409288540b1d06932fd8f9b9"; }; @@ -1862,7 +2482,7 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-27_r01.zip; + url = "https://dl.google.com/android/repository/sources-27_r01.zip"; sha1 = "7b714670561d08f54751af42aca929867b806596"; }; @@ -1878,13 +2498,29 @@ archives = { all = fetchurl { - url = https://dl.google.com/android/repository/sources-28_r01.zip; + url = "https://dl.google.com/android/repository/sources-28_r01.zip"; sha1 = "5610e0c24235ee3fa343c899ddd551be30315255"; }; }; }; + "sources"."29" = { + + name = "sources"; + path = "sources/android-29"; + revision = "29"; + displayName = "Sources for Android 29"; + archives = { + + all = fetchurl { + url = "https://dl.google.com/android/repository/sources-29_r01.zip"; + sha1 = "d0ad249e152b3a8fe3cb7c4a329453a048be29e4"; + }; + + }; + }; + "tools"."25.2.5" = { name = "tools"; @@ -1893,11 +2529,11 @@ displayName = "Android SDK Tools 25.2.5"; archives = { linux = fetchurl { - url = https://dl.google.com/android/repository/tools_r25.2.5-linux.zip; + url = "https://dl.google.com/android/repository/tools_r25.2.5-linux.zip"; sha1 = "72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1"; }; macosx = fetchurl { - url = https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip; + url = "https://dl.google.com/android/repository/tools_r25.2.5-macosx.zip"; sha1 = "d2168d963ac5b616e3d3ddaf21511d084baf3659"; }; @@ -1912,11 +2548,11 @@ displayName = "Android SDK Tools"; archives = { macosx = fetchurl { - url = https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip; + url = "https://dl.google.com/android/repository/sdk-tools-darwin-4333796.zip"; sha1 = "ed85ea7b59bc3483ce0af4c198523ba044e083ad"; }; linux = fetchurl { - url = https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip; + url = "https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip"; sha1 = "8c7c28554a32318461802c1291d76fccfafde054"; }; @@ -1924,4 +2560,4 @@ }; } - \ No newline at end of file + diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix index 1aa49545254..22da6ee9800 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-tv.nix @@ -1,157 +1,114 @@ - {fetchurl}: { - - - "21".android-tv."x86" = { - name = "system-image-21-android-tv-x86"; - path = "system-images/android-21/android-tv/x86"; - revision = "21-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip; - sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8"; - - }; + "21".android-tv."x86" = { + name = "system-image-21-android-tv-x86"; + path = "system-images/android-21/android-tv/x86"; + revision = "21-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-21_r03.zip"; + sha1 = "2f8a1988188d6abfd6c6395baeb4471a034dc1e8"; + }; }; - - - "21".android-tv."armeabi-v7a" = { - name = "system-image-21-android-tv-armeabi-v7a"; - path = "system-images/android-21/android-tv/armeabi-v7a"; - revision = "21-android-tv-armeabi-v7a"; - displayName = "Android TV ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip; - sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331"; - - }; + "21".android-tv."armeabi-v7a" = { + name = "system-image-21-android-tv-armeabi-v7a"; + path = "system-images/android-21/android-tv/armeabi-v7a"; + revision = "21-android-tv-armeabi-v7a"; + displayName = "Android TV ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-21_r03.zip"; + sha1 = "b63e28a47f11b639dd94981a458b7abfa89ac331"; + }; }; - - - "22".android-tv."x86" = { - name = "system-image-22-android-tv-x86"; - path = "system-images/android-22/android-tv/x86"; - revision = "22-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip; - sha1 = "c78efd5a155622eb490be9d326f5783993375c35"; - - }; + "22".android-tv."x86" = { + name = "system-image-22-android-tv-x86"; + path = "system-images/android-22/android-tv/x86"; + revision = "22-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-22_r03.zip"; + sha1 = "c78efd5a155622eb490be9d326f5783993375c35"; + }; }; - - - "23".android-tv."x86" = { - name = "system-image-23-android-tv-x86"; - path = "system-images/android-23/android-tv/x86"; - revision = "23-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r17.zip; - sha1 = "6d42eb8f07e1c49c000e530fdb7de894144ea19b"; - - }; + "23".android-tv."x86" = { + name = "system-image-23-android-tv-x86"; + path = "system-images/android-23/android-tv/x86"; + revision = "23-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-23_r19.zip"; + sha1 = "47e8d6b08a337a0672f0f105bf907d39ed9457ec"; + }; }; - - - "23".android-tv."armeabi-v7a" = { - name = "system-image-23-android-tv-armeabi-v7a"; - path = "system-images/android-23/android-tv/armeabi-v7a"; - revision = "23-android-tv-armeabi-v7a"; - displayName = "Android TV ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip; - sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52"; - - }; + "23".android-tv."armeabi-v7a" = { + name = "system-image-23-android-tv-armeabi-v7a"; + path = "system-images/android-23/android-tv/armeabi-v7a"; + revision = "23-android-tv-armeabi-v7a"; + displayName = "Android TV ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/armeabi-v7a-23_r12.zip"; + sha1 = "bd84678ae8caf71d584f5210e866b2807e7b4b52"; + }; }; - - - "24".android-tv."x86" = { - name = "system-image-24-android-tv-x86"; - path = "system-images/android-24/android-tv/x86"; - revision = "24-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r19.zip; - sha1 = "478e7073f9fcd588bcce89946aa632fbf302ac6a"; - - }; + "24".android-tv."x86" = { + name = "system-image-24-android-tv-x86"; + path = "system-images/android-24/android-tv/x86"; + revision = "24-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-24_r20.zip"; + sha1 = "0b8cd98dec9ebd04376ce4f6e270193ceae8acea"; + }; }; - - - "25".android-tv."x86" = { - name = "system-image-25-android-tv-x86"; - path = "system-images/android-25/android-tv/x86"; - revision = "25-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r13.zip; - sha1 = "fda1743a87331b43b1ff35cd70f3276ae0b1836d"; - - }; + "25".android-tv."x86" = { + name = "system-image-25-android-tv-x86"; + path = "system-images/android-25/android-tv/x86"; + revision = "25-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-25_r14.zip"; + sha1 = "1c88f11683375c059803c3a7be8e880cc23a6f9a"; + }; }; - - - "26".android-tv."x86" = { - name = "system-image-26-android-tv-x86"; - path = "system-images/android-26/android-tv/x86"; - revision = "26-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r11.zip; - sha1 = "5c4b0b3c0b9d04a3364956a7ba31d30c33ea57e7"; - - }; + "26".android-tv."x86" = { + name = "system-image-26-android-tv-x86"; + path = "system-images/android-26/android-tv/x86"; + revision = "26-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-26_r12.zip"; + sha1 = "d8b12e543925a0454403d2a854996a76410ec374"; + }; }; - - - "27".android-tv."x86" = { - name = "system-image-27-android-tv-x86"; - path = "system-images/android-27/android-tv/x86"; - revision = "27-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r06.zip; - sha1 = "6b69f1e95a3db3d973e19a95ab5da1adc7750d54"; - - }; + "27".android-tv."x86" = { + name = "system-image-27-android-tv-x86"; + path = "system-images/android-27/android-tv/x86"; + revision = "27-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-27_r07.zip"; + sha1 = "5ed40e568c0d8d023c5b6c76634b22a477ed54aa"; + }; }; - - - "28".android-tv."x86" = { - name = "system-image-28-android-tv-x86"; - path = "system-images/android-28/android-tv/x86"; - revision = "28-android-tv-x86"; - displayName = "Android TV Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r07.zip; - sha1 = "3ed7e51036957cf350db7fa128cb485b61cbd061"; - - }; + "28".android-tv."x86" = { + name = "system-image-28-android-tv-x86"; + path = "system-images/android-28/android-tv/x86"; + revision = "28-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-28_r08.zip"; + sha1 = "f5f8f296dfaca7945434992761c8d47d50257c21"; + }; + }; + "Q".android-tv."x86" = { + name = "system-image-Q-android-tv-x86"; + path = "system-images/android-Q/android-tv/x86"; + revision = "Q-android-tv-x86"; + displayName = "Android TV Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-tv/x86-Q_r01.zip"; + sha1 = "80c66ddce0dbe53fe6fedcade230d518112fffb1"; + }; }; - } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix index 372a751f41c..36ff0b01cd6 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear-cn.nix @@ -1,67 +1,44 @@ - {fetchurl}: { - - - "25".android-wear."armeabi-v7a" = { - name = "system-image-25-android-wear-armeabi-v7a"; - path = "system-images/android-25/android-wear-cn/armeabi-v7a"; - revision = "25-android-wear-armeabi-v7a"; - displayName = "China version of Android Wear ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip; - sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41"; - - }; + "25".android-wear."armeabi-v7a" = { + name = "system-image-25-android-wear-armeabi-v7a"; + path = "system-images/android-25/android-wear-cn/armeabi-v7a"; + revision = "25-android-wear-armeabi-v7a"; + displayName = "China version of Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/armeabi-v7a-25_r04.zip"; + sha1 = "02d7bc86df054d1e89fe5856b3af1d2c142cab41"; + }; }; - - - "25".android-wear."x86" = { - name = "system-image-25-android-wear-x86"; - path = "system-images/android-25/android-wear-cn/x86"; - revision = "25-android-wear-x86"; - displayName = "China version of Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip; - sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d"; - - }; + "25".android-wear."x86" = { + name = "system-image-25-android-wear-x86"; + path = "system-images/android-25/android-wear-cn/x86"; + revision = "25-android-wear-x86"; + displayName = "China version of Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-25_r04.zip"; + sha1 = "73eab14c7cf2f6941e1fee61e0038ead7a2c7f4d"; + }; }; - - - "26".android-wear."x86" = { - name = "system-image-26-android-wear-x86"; - path = "system-images/android-26/android-wear-cn/x86"; - revision = "26-android-wear-x86"; - displayName = "China version of Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip; - sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096"; - - }; + "26".android-wear."x86" = { + name = "system-image-26-android-wear-x86"; + path = "system-images/android-26/android-wear-cn/x86"; + revision = "26-android-wear-x86"; + displayName = "China version of Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-26_r04.zip"; + sha1 = "fdc8a313f889a2d6522de1fbc00ee9e13547d096"; + }; }; - - - "28".android-wear."x86" = { - name = "system-image-28-android-wear-x86"; - path = "system-images/android-P/android-wear-cn/x86"; - revision = "28-android-wear-x86"; - displayName = "China version of Wear OS Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-P_r02.zip; - sha1 = "a61a2e453a11f77ab15b3e0bf1e017e0bb9d1bcc"; - - }; + "28".android-wear."x86" = { + name = "system-image-28-android-wear-x86"; + path = "system-images/android-28/android-wear-cn/x86"; + revision = "28-android-wear-x86"; + displayName = "China version of Wear OS Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear-cn/x86-28_r03.zip"; + sha1 = "2099d87709c5e064273925dbf2cf1fd081bf0262"; + }; }; - } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix index 0c45a1162fe..e672c75031f 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android-wear.nix @@ -1,97 +1,64 @@ - {fetchurl}: { - - - "23".android-wear."armeabi-v7a" = { - name = "system-image-23-android-wear-armeabi-v7a"; - path = "system-images/android-23/android-wear/armeabi-v7a"; - revision = "23-android-wear-armeabi-v7a"; - displayName = "Android Wear ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip; - sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71"; - - }; + "23".android-wear."armeabi-v7a" = { + name = "system-image-23-android-wear-armeabi-v7a"; + path = "system-images/android-23/android-wear/armeabi-v7a"; + revision = "23-android-wear-armeabi-v7a"; + displayName = "Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-23_r06.zip"; + sha1 = "0df5d34b1cdaaaa3805a2f06bb889901eabe2e71"; + }; }; - - - "23".android-wear."x86" = { - name = "system-image-23-android-wear-x86"; - path = "system-images/android-23/android-wear/x86"; - revision = "23-android-wear-x86"; - displayName = "Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip; - sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e"; - - }; + "23".android-wear."x86" = { + name = "system-image-23-android-wear-x86"; + path = "system-images/android-23/android-wear/x86"; + revision = "23-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-23_r06.zip"; + sha1 = "3b15c123f3f71459d5b60c1714d49c5d90a5525e"; + }; }; - - - "25".android-wear."armeabi-v7a" = { - name = "system-image-25-android-wear-armeabi-v7a"; - path = "system-images/android-25/android-wear/armeabi-v7a"; - revision = "25-android-wear-armeabi-v7a"; - displayName = "Android Wear ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip; - sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c"; - - }; + "25".android-wear."armeabi-v7a" = { + name = "system-image-25-android-wear-armeabi-v7a"; + path = "system-images/android-25/android-wear/armeabi-v7a"; + revision = "25-android-wear-armeabi-v7a"; + displayName = "Android Wear ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear/armeabi-v7a-25_r03.zip"; + sha1 = "76d3568a4e08023047af7d13025a35c9bf1d7e5c"; + }; }; - - - "25".android-wear."x86" = { - name = "system-image-25-android-wear-x86"; - path = "system-images/android-25/android-wear/x86"; - revision = "25-android-wear-x86"; - displayName = "Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip; - sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6"; - - }; + "25".android-wear."x86" = { + name = "system-image-25-android-wear-x86"; + path = "system-images/android-25/android-wear/x86"; + revision = "25-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-25_r03.zip"; + sha1 = "693fce7b487a65491a4e88e9f740959688c9dbe6"; + }; }; - - - "26".android-wear."x86" = { - name = "system-image-26-android-wear-x86"; - path = "system-images/android-26/android-wear/x86"; - revision = "26-android-wear-x86"; - displayName = "Android Wear Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip; - sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c"; - - }; + "26".android-wear."x86" = { + name = "system-image-26-android-wear-x86"; + path = "system-images/android-26/android-wear/x86"; + revision = "26-android-wear-x86"; + displayName = "Android Wear Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-26_r04.zip"; + sha1 = "fbffa91b936ca18fcc1e0bab2b52a8b0835cbb1c"; + }; }; - - - "28".android-wear."x86" = { - name = "system-image-28-android-wear-x86"; - path = "system-images/android-P/android-wear/x86"; - revision = "28-android-wear-x86"; - displayName = "Wear OS Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android-wear/x86-P_r02.zip; - sha1 = "cd0d3a56e114dbb0a2a77d58942d344db464b514"; - - }; + "28".android-wear."x86" = { + name = "system-image-28-android-wear-x86"; + path = "system-images/android-28/android-wear/x86"; + revision = "28-android-wear-x86"; + displayName = "Wear OS Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android-wear/x86-28_r03.zip"; + sha1 = "b80bd53ab69f19441714bff2e4d55931e6d3f7be"; + }; }; - } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-android.nix b/pkgs/development/mobile/androidenv/generated/system-images-android.nix index 915cceec546..f5863cb0d4e 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-android.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-android.nix @@ -1,547 +1,364 @@ - {fetchurl}: { - - - "10".default."armeabi-v7a" = { - name = "system-image-10-default-armeabi-v7a"; - path = "system-images/android-10/default/armeabi-v7a"; - revision = "10-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armv7-10_r04.zip; - sha1 = "54680383118eb5c95a11e1cc2a14aa572c86ee69"; - - }; - }; - - - "14".default."armeabi-v7a" = { - name = "system-image-14-default-armeabi-v7a"; - path = "system-images/android-14/default/armeabi-v7a"; - revision = "14-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip; - sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; - - }; - }; - - - "15".default."armeabi-v7a" = { - name = "system-image-15-default-armeabi-v7a"; - path = "system-images/android-15/default/armeabi-v7a"; - revision = "15-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r04.zip; - sha1 = "363223bd62f5afc0b2bd760b54ce9d26b31eacf1"; - - }; - }; - - - "16".default."armeabi-v7a" = { - name = "system-image-16-default-armeabi-v7a"; - path = "system-images/android-16/default/armeabi-v7a"; - revision = "16-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-16_r04.zip; - sha1 = "39c093ea755098f0ee79f607be7df9e54ba4943f"; - - }; - }; - - - "17".default."armeabi-v7a" = { - name = "system-image-17-default-armeabi-v7a"; - path = "system-images/android-17/default/armeabi-v7a"; - revision = "17-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r05.zip; - sha1 = "7460e8110f4a87f9644f1bdb5511a66872d50fd9"; - - }; - }; - - - "18".default."armeabi-v7a" = { - name = "system-image-18-default-armeabi-v7a"; - path = "system-images/android-18/default/armeabi-v7a"; - revision = "18-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r04.zip; - sha1 = "0bf34ecf4ddd53f6b1b7fe7dfa12f2887c17e642"; - - }; - }; - - - "19".default."armeabi-v7a" = { - name = "system-image-19-default-armeabi-v7a"; - path = "system-images/android-19/default/armeabi-v7a"; - revision = "19-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip; - sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; - - }; - }; - - - "21".default."armeabi-v7a" = { - name = "system-image-21-default-armeabi-v7a"; - path = "system-images/android-21/default/armeabi-v7a"; - revision = "21-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip; - sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; - - }; - }; - - - "22".default."armeabi-v7a" = { - name = "system-image-22-default-armeabi-v7a"; - path = "system-images/android-22/default/armeabi-v7a"; - revision = "22-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip; - sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; - - }; - }; - - - "23".default."armeabi-v7a" = { - name = "system-image-23-default-armeabi-v7a"; - path = "system-images/android-23/default/armeabi-v7a"; - revision = "23-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip; - sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; - - }; - }; - - - "24".default."armeabi-v7a" = { - name = "system-image-24-default-armeabi-v7a"; - path = "system-images/android-24/default/armeabi-v7a"; - revision = "24-default-armeabi-v7a"; - displayName = "ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; - sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; - - }; - }; - - - "24".default."arm64-v8a" = { - name = "system-image-24-default-arm64-v8a"; - path = "system-images/android-24/default/arm64-v8a"; - revision = "24-default-arm64-v8a"; - displayName = "ARM 64 v8a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; - sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; - - }; - }; - - - "16".default."mips" = { - name = "system-image-16-default-mips"; - path = "system-images/android-16/default/mips"; - revision = "16-default-mips"; - displayName = "MIPS System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip; - sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; - - }; - }; - - - "17".default."mips" = { - name = "system-image-17-default-mips"; - path = "system-images/android-17/default/mips"; - revision = "17-default-mips"; - displayName = "MIPS System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip; - sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; - - }; - }; - - - "10".default."x86" = { - name = "system-image-10-default-x86"; - path = "system-images/android-10/default/x86"; - revision = "10-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-10_r04.zip; - sha1 = "655ffc5cc89dd45a3aca154b254009016e473aeb"; - - }; - }; - - - "15".default."x86" = { - name = "system-image-15-default-x86"; - path = "system-images/android-15/default/x86"; - revision = "15-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-15_r04.zip; - sha1 = "e45c728b64881c0e86529a8f7ea9c103a3cd14c1"; - - }; - }; - - - "16".default."x86" = { - name = "system-image-16-default-x86"; - path = "system-images/android-16/default/x86"; - revision = "16-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip; - sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; - - }; - }; - - - "17".default."x86" = { - name = "system-image-17-default-x86"; - path = "system-images/android-17/default/x86"; - revision = "17-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip; - sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; - - }; - }; - - - "18".default."x86" = { - name = "system-image-18-default-x86"; - path = "system-images/android-18/default/x86"; - revision = "18-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-18_r03.zip; - sha1 = "03a0cb23465c3de15215934a1dbc9715b56e9458"; - - }; - }; - - - "19".default."x86" = { - name = "system-image-19-default-x86"; - path = "system-images/android-19/default/x86"; - revision = "19-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip; - sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; - - }; - }; - - - "21".default."x86" = { - name = "system-image-21-default-x86"; - path = "system-images/android-21/default/x86"; - revision = "21-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip; - sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; - - }; - }; - - - "22".default."x86" = { - name = "system-image-22-default-x86"; - path = "system-images/android-22/default/x86"; - revision = "22-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip; - sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; - - }; - }; - - - "23".default."x86" = { - name = "system-image-23-default-x86"; - path = "system-images/android-23/default/x86"; - revision = "23-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip; - sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; - - }; - }; - - - "24".default."x86" = { - name = "system-image-24-default-x86"; - path = "system-images/android-24/default/x86"; - revision = "24-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip; - sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; - - }; - }; - - - "25".default."x86" = { - name = "system-image-25-default-x86"; - path = "system-images/android-25/default/x86"; - revision = "25-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip; - sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; - - }; - }; - - - "26".default."x86" = { - name = "system-image-26-default-x86"; - path = "system-images/android-26/default/x86"; - revision = "26-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip; - sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; - - }; - }; - - - "27".default."x86" = { - name = "system-image-27-default-x86"; - path = "system-images/android-27/default/x86"; - revision = "27-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip; - sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; - - }; - }; - - - "28".default."x86" = { - name = "system-image-28-default-x86"; - path = "system-images/android-28/default/x86"; - revision = "28-default-x86"; - displayName = "Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip; - sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; - - }; - }; - - - "21".default."x86_64" = { - name = "system-image-21-default-x86_64"; - path = "system-images/android-21/default/x86_64"; - revision = "21-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip; - sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; - - }; - }; - - - "22".default."x86_64" = { - name = "system-image-22-default-x86_64"; - path = "system-images/android-22/default/x86_64"; - revision = "22-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip; - sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; - - }; - }; - - - "23".default."x86_64" = { - name = "system-image-23-default-x86_64"; - path = "system-images/android-23/default/x86_64"; - revision = "23-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip; - sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; - - }; - }; - - - "24".default."x86_64" = { - name = "system-image-24-default-x86_64"; - path = "system-images/android-24/default/x86_64"; - revision = "24-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip; - sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; - - }; - }; - - - "25".default."x86_64" = { - name = "system-image-25-default-x86_64"; - path = "system-images/android-25/default/x86_64"; - revision = "25-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip; - sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; - - }; - }; - - - "26".default."x86_64" = { - name = "system-image-26-default-x86_64"; - path = "system-images/android-26/default/x86_64"; - revision = "26-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip; - sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; - - }; - }; - - - "27".default."x86_64" = { - name = "system-image-27-default-x86_64"; - path = "system-images/android-27/default/x86_64"; - revision = "27-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip; - sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; - - }; - }; - - - "28".default."x86_64" = { - name = "system-image-28-default-x86_64"; - path = "system-images/android-28/default/x86_64"; - revision = "28-default-x86_64"; - displayName = "Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip; - sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; - - }; - }; - + "10".default."armeabi-v7a" = { + name = "system-image-10-default-armeabi-v7a"; + path = "system-images/android-10/default/armeabi-v7a"; + revision = "10-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-10_r05.zip"; + sha1 = "8537616a7add47cce24c60f18bc2429e3dc90ae3"; + }; + }; + "14".default."armeabi-v7a" = { + name = "system-image-14-default-armeabi-v7a"; + path = "system-images/android-14/default/armeabi-v7a"; + revision = "14-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/sysimg_armv7a-14_r02.zip"; + sha1 = "d8991b0c06b18d7d6ed4169d67460ee1add6661b"; + }; + }; + "15".default."armeabi-v7a" = { + name = "system-image-15-default-armeabi-v7a"; + path = "system-images/android-15/default/armeabi-v7a"; + revision = "15-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-15_r05.zip"; + sha1 = "03d7ed95a9d3b107e3f2e5b166d017ea12529e70"; + }; + }; + "16".default."armeabi-v7a" = { + name = "system-image-16-default-armeabi-v7a"; + path = "system-images/android-16/default/armeabi-v7a"; + revision = "16-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-16_r06.zip"; + sha1 = "69b944b0d5a18c8563fa80d7d229af64890f724e"; + }; + }; + "17".default."armeabi-v7a" = { + name = "system-image-17-default-armeabi-v7a"; + path = "system-images/android-17/default/armeabi-v7a"; + revision = "17-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-17_r06.zip"; + sha1 = "a18a3fd0958ec4ef52507f58e414fc5c7dfd59d6"; + }; + }; + "18".default."armeabi-v7a" = { + name = "system-image-18-default-armeabi-v7a"; + path = "system-images/android-18/default/armeabi-v7a"; + revision = "18-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-18_r05.zip"; + sha1 = "580b583720f7de671040d5917c8c9db0c7aa03fd"; + }; + }; + "19".default."armeabi-v7a" = { + name = "system-image-19-default-armeabi-v7a"; + path = "system-images/android-19/default/armeabi-v7a"; + revision = "19-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-19_r05.zip"; + sha1 = "d1a5fd4f2e1c013c3d3d9bfe7e9db908c3ed56fa"; + }; + }; + "21".default."armeabi-v7a" = { + name = "system-image-21-default-armeabi-v7a"; + path = "system-images/android-21/default/armeabi-v7a"; + revision = "21-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-21_r04.zip"; + sha1 = "8c606f81306564b65e41303d2603e4c42ded0d10"; + }; + }; + "22".default."armeabi-v7a" = { + name = "system-image-22-default-armeabi-v7a"; + path = "system-images/android-22/default/armeabi-v7a"; + revision = "22-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-22_r02.zip"; + sha1 = "2114ec015dbf3a16cbcb4f63e8a84a1b206a07a1"; + }; + }; + "23".default."armeabi-v7a" = { + name = "system-image-23-default-armeabi-v7a"; + path = "system-images/android-23/default/armeabi-v7a"; + revision = "23-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-23_r06.zip"; + sha1 = "7cf2ad756e54a3acfd81064b63cb0cb9dff2798d"; + }; + }; + "24".default."armeabi-v7a" = { + name = "system-image-24-default-armeabi-v7a"; + path = "system-images/android-24/default/armeabi-v7a"; + revision = "24-default-armeabi-v7a"; + displayName = "ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip"; + sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; + }; + }; + "24".default."arm64-v8a" = { + name = "system-image-24-default-arm64-v8a"; + path = "system-images/android-24/default/arm64-v8a"; + revision = "24-default-arm64-v8a"; + displayName = "ARM 64 v8a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip"; + sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; + }; + }; + "16".default."mips" = { + name = "system-image-16-default-mips"; + path = "system-images/android-16/default/mips"; + revision = "16-default-mips"; + displayName = "MIPS System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-16_r04.zip"; + sha1 = "67943c54fb3943943ffeb05fdd39c0b753681f6e"; + }; + }; + "17".default."mips" = { + name = "system-image-17-default-mips"; + path = "system-images/android-17/default/mips"; + revision = "17-default-mips"; + displayName = "MIPS System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/sysimg_mips-17_r01.zip"; + sha1 = "f0c6e153bd584c29e51b5c9723cfbf30f996a05d"; + }; + }; + "10".default."x86" = { + name = "system-image-10-default-x86"; + path = "system-images/android-10/default/x86"; + revision = "10-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-10_r05.zip"; + sha1 = "a166d5ccbb165e1dd5464fbfeec30a61f77790d8"; + }; + }; + "15".default."x86" = { + name = "system-image-15-default-x86"; + path = "system-images/android-15/default/x86"; + revision = "15-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-15_r05.zip"; + sha1 = "c387e0efed2cdc610e5944eea67b7b692d03760c"; + }; + }; + "16".default."x86" = { + name = "system-image-16-default-x86"; + path = "system-images/android-16/default/x86"; + revision = "16-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-16_r06.zip"; + sha1 = "bf1bf8c5591346118d2235da1ad20e7be8a3e9cd"; + }; + }; + "17".default."x86" = { + name = "system-image-17-default-x86"; + path = "system-images/android-17/default/x86"; + revision = "17-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-17_r04.zip"; + sha1 = "03c6d022ab2dcbbcf655d78ba5ccb0431cadcaec"; + }; + }; + "18".default."x86" = { + name = "system-image-18-default-x86"; + path = "system-images/android-18/default/x86"; + revision = "18-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-18_r04.zip"; + sha1 = "7a4ced4d9b0ab48047825491b4072dc2eb9b610e"; + }; + }; + "19".default."x86" = { + name = "system-image-19-default-x86"; + path = "system-images/android-19/default/x86"; + revision = "19-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-19_r06.zip"; + sha1 = "2ac82153aae97f7eae4c5a0761224fe04321d03d"; + }; + }; + "21".default."x86" = { + name = "system-image-21-default-x86"; + path = "system-images/android-21/default/x86"; + revision = "21-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-21_r05.zip"; + sha1 = "00f0eb0a1003efe3316347f762e20a85d8749cff"; + }; + }; + "22".default."x86" = { + name = "system-image-22-default-x86"; + path = "system-images/android-22/default/x86"; + revision = "22-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-22_r06.zip"; + sha1 = "e33e2a6cc3f1cc56b2019dbef3917d2eeb26f54e"; + }; + }; + "23".default."x86" = { + name = "system-image-23-default-x86"; + path = "system-images/android-23/default/x86"; + revision = "23-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-23_r10.zip"; + sha1 = "f6c3e3dd7bd951454795aa75c3a145fd05ac25bb"; + }; + }; + "24".default."x86" = { + name = "system-image-24-default-x86"; + path = "system-images/android-24/default/x86"; + revision = "24-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-24_r08.zip"; + sha1 = "c1cae7634b0216c0b5990f2c144eb8ca948e3511"; + }; + }; + "25".default."x86" = { + name = "system-image-25-default-x86"; + path = "system-images/android-25/default/x86"; + revision = "25-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-25_r01.zip"; + sha1 = "78ce7eb1387d598685633b9f7cbb300c3d3aeb5f"; + }; + }; + "26".default."x86" = { + name = "system-image-26-default-x86"; + path = "system-images/android-26/default/x86"; + revision = "26-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-26_r01.zip"; + sha1 = "e613d6e0da668e30daf547f3c6627a6352846f90"; + }; + }; + "27".default."x86" = { + name = "system-image-27-default-x86"; + path = "system-images/android-27/default/x86"; + revision = "27-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-27_r01.zip"; + sha1 = "4ec990fac7b62958decd12e18a4cd389dfe7c582"; + }; + }; + "28".default."x86" = { + name = "system-image-28-default-x86"; + path = "system-images/android-28/default/x86"; + revision = "28-default-x86"; + displayName = "Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86-28_r04.zip"; + sha1 = "ce03c42d80c0fc6dc47f6455dbee7aa275d02780"; + }; + }; + "21".default."x86_64" = { + name = "system-image-21-default-x86_64"; + path = "system-images/android-21/default/x86_64"; + revision = "21-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-21_r05.zip"; + sha1 = "9078a095825a69e5e215713f0866c83cef65a342"; + }; + }; + "22".default."x86_64" = { + name = "system-image-22-default-x86_64"; + path = "system-images/android-22/default/x86_64"; + revision = "22-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-22_r06.zip"; + sha1 = "5db3b27f78cd9c4c5092b1cad5a5dd479fb5b2e4"; + }; + }; + "23".default."x86_64" = { + name = "system-image-23-default-x86_64"; + path = "system-images/android-23/default/x86_64"; + revision = "23-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-23_r10.zip"; + sha1 = "7cbc291483ca07dc67b71268c5f08a5755f50f51"; + }; + }; + "24".default."x86_64" = { + name = "system-image-24-default-x86_64"; + path = "system-images/android-24/default/x86_64"; + revision = "24-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-24_r08.zip"; + sha1 = "f6559e1949a5879f31a9662f4f0e50ad60181684"; + }; + }; + "25".default."x86_64" = { + name = "system-image-25-default-x86_64"; + path = "system-images/android-25/default/x86_64"; + revision = "25-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-25_r01.zip"; + sha1 = "7093d7b39216020226ff430a3b7b81c94d31ad37"; + }; + }; + "26".default."x86_64" = { + name = "system-image-26-default-x86_64"; + path = "system-images/android-26/default/x86_64"; + revision = "26-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-26_r01.zip"; + sha1 = "432f149c048bffce7f9de526ec65b336daf7a0a3"; + }; + }; + "27".default."x86_64" = { + name = "system-image-27-default-x86_64"; + path = "system-images/android-27/default/x86_64"; + revision = "27-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-27_r01.zip"; + sha1 = "2878261011a59ca3de29dc5b457a495fdb268d60"; + }; + }; + "28".default."x86_64" = { + name = "system-image-28-default-x86_64"; + path = "system-images/android-28/default/x86_64"; + revision = "28-default-x86_64"; + displayName = "Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/android/x86_64-28_r04.zip"; + sha1 = "d47a85c8f4e9fd57df97814ad8884eeb0f3a0ef0"; + }; + }; } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix index 3b0303b86b4..a67ce9cfea4 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis.nix @@ -1,502 +1,384 @@ - {fetchurl}: { - - - "10".google_apis."armeabi-v7a" = { - name = "system-image-10-google_apis-armeabi-v7a"; - path = "system-images/android-10/google_apis/armeabi-v7a"; - revision = "10-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r05.zip; - sha1 = "cb60221d4ff6686ae96560970d48d9aa60e80b3f"; - - }; - }; - - - "10".google_apis."x86" = { - name = "system-image-10-google_apis-x86"; - path = "system-images/android-10/google_apis/x86"; - revision = "10-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r05.zip; - sha1 = "b8e8a4ab26890c4a395fb796bf9cb7ceb51c880e"; - - }; - }; - - - "15".google_apis."armeabi-v7a" = { - name = "system-image-15-google_apis-armeabi-v7a"; - path = "system-images/android-15/google_apis/armeabi-v7a"; - revision = "15-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r05.zip; - sha1 = "1ec4e6f9014fcbe694511280f5b497aaf7dd750f"; - - }; - }; - - - "15".google_apis."x86" = { - name = "system-image-15-google_apis-x86"; - path = "system-images/android-15/google_apis/x86"; - revision = "15-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r05.zip; - sha1 = "f2b98baaf847ff5b82b82fdc6c396b229067307b"; - - }; - }; - - - "16".google_apis."x86" = { - name = "system-image-16-google_apis-x86"; - path = "system-images/android-16/google_apis/x86"; - revision = "16-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r05.zip; - sha1 = "7edc5c0836fa32f8d453788c002ca0ee1bc5a0a2"; - - }; - }; - - - "17".google_apis."armeabi-v7a" = { - name = "system-image-17-google_apis-armeabi-v7a"; - path = "system-images/android-17/google_apis/armeabi-v7a"; - revision = "17-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r05.zip; - sha1 = "c990f2a81c24a61f9f1da5d5d205f2924ce548ae"; - - }; - }; - - - "17".google_apis."x86" = { - name = "system-image-17-google_apis-x86"; - path = "system-images/android-17/google_apis/x86"; - revision = "17-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip; - sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6"; - - }; - }; - - - "18".google_apis."armeabi-v7a" = { - name = "system-image-18-google_apis-armeabi-v7a"; - path = "system-images/android-18/google_apis/armeabi-v7a"; - revision = "18-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r05.zip; - sha1 = "c4e69a96d4584f7e311e358fe4ad0e5d1bf1605b"; - - }; - }; - - - "18".google_apis."x86" = { - name = "system-image-18-google_apis-x86"; - path = "system-images/android-18/google_apis/x86"; - revision = "18-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r05.zip; - sha1 = "2b34741693eba9419cb6bf1a467596783234d37a"; - - }; - }; - - - "19".google_apis."x86" = { - name = "system-image-19-google_apis-x86"; - path = "system-images/android-19/google_apis/x86"; - revision = "19-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r37.zip; - sha1 = "f02473420a166b3df7821d8ae5a623524058b4b8"; - - }; - }; - - - "19".google_apis."armeabi-v7a" = { - name = "system-image-19-google_apis-armeabi-v7a"; - path = "system-images/android-19/google_apis/armeabi-v7a"; - revision = "19-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r37.zip; - sha1 = "b388072493ed010fe2ddf607c8c4239f54ce1a0b"; - - }; - }; - - - "21".google_apis."x86" = { - name = "system-image-21-google_apis-x86"; - path = "system-images/android-21/google_apis/x86"; - revision = "21-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r29.zip; - sha1 = "1f5ac49e0ae603b0bfeda0c94cd7e0b850b9b50e"; - - }; - }; - - - "21".google_apis."x86_64" = { - name = "system-image-21-google_apis-x86_64"; - path = "system-images/android-21/google_apis/x86_64"; - revision = "21-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r29.zip; - sha1 = "74ac387aec286fcee01259dcccd4762cbdb4b517"; - - }; - }; - - - "21".google_apis."armeabi-v7a" = { - name = "system-image-21-google_apis-armeabi-v7a"; - path = "system-images/android-21/google_apis/armeabi-v7a"; - revision = "21-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r29.zip; - sha1 = "1d0c428ac7f5eb49c7389ad0beb09f07cb989b45"; - - }; - }; - - - "22".google_apis."x86" = { - name = "system-image-22-google_apis-x86"; - path = "system-images/android-22/google_apis/x86"; - revision = "22-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r23.zip; - sha1 = "4ceda9ffd69d5b827a8cc2f56ccac62e72982b33"; - - }; - }; - - - "22".google_apis."armeabi-v7a" = { - name = "system-image-22-google_apis-armeabi-v7a"; - path = "system-images/android-22/google_apis/armeabi-v7a"; - revision = "22-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r23.zip; - sha1 = "0a11bdffa6132303baf87e4a531987a74d5f0792"; - - }; - }; - - - "22".google_apis."x86_64" = { - name = "system-image-22-google_apis-x86_64"; - path = "system-images/android-22/google_apis/x86_64"; - revision = "22-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r23.zip; - sha1 = "1dfee1c382574c18e3aa2bc2047793169f3ab125"; - - }; - }; - - - "23".google_apis."x86" = { - name = "system-image-23-google_apis-x86"; - path = "system-images/android-23/google_apis/x86"; - revision = "23-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r30.zip; - sha1 = "1b8fd61e7e7c76d8c05a41b19370edfb015ed240"; - - }; - }; - - - "23".google_apis."x86_64" = { - name = "system-image-23-google_apis-x86_64"; - path = "system-images/android-23/google_apis/x86_64"; - revision = "23-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r30.zip; - sha1 = "69a17c23c4e05e81a2820fe49884807fcebba546"; - - }; - }; - - - "23".google_apis."armeabi-v7a" = { - name = "system-image-23-google_apis-armeabi-v7a"; - path = "system-images/android-23/google_apis/armeabi-v7a"; - revision = "23-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r30.zip; - sha1 = "c3966e3a25623a915902d879f90f6d9253dbb619"; - - }; - }; - - - "24".google_apis."x86" = { - name = "system-image-24-google_apis-x86"; - path = "system-images/android-24/google_apis/x86"; - revision = "24-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r24.zip; - sha1 = "7a1adb4aa13946830763644d014fc9c6cc1f921d"; - - }; - }; - - - "24".google_apis."x86_64" = { - name = "system-image-24-google_apis-x86_64"; - path = "system-images/android-24/google_apis/x86_64"; - revision = "24-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r24.zip; - sha1 = "53b26e8868c7cd27dda31c71ee2bcf999d6b9ce2"; - - }; - }; - - - "24".google_apis."armeabi-v7a" = { - name = "system-image-24-google_apis-armeabi-v7a"; - path = "system-images/android-24/google_apis/armeabi-v7a"; - revision = "24-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r24.zip; - sha1 = "85068d55673bbf9417db8d70107ceed0952b5a28"; - - }; - }; - - - "24".google_apis."arm64-v8a" = { - name = "system-image-24-google_apis-arm64-v8a"; - path = "system-images/android-24/google_apis/arm64-v8a"; - revision = "24-google_apis-arm64-v8a"; - displayName = "Google APIs ARM 64 v8a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r24.zip; - sha1 = "93ab33d90fcdbb30ca2e927cd3eea447e933dfd9"; - - }; - }; - - - "25".google_apis."x86" = { - name = "system-image-25-google_apis-x86"; - path = "system-images/android-25/google_apis/x86"; - revision = "25-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r15.zip; - sha1 = "5948473077341265a0b21a53a7e0afc2f980187c"; - - }; - }; - - - "25".google_apis."x86_64" = { - name = "system-image-25-google_apis-x86_64"; - path = "system-images/android-25/google_apis/x86_64"; - revision = "25-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r15.zip; - sha1 = "5a81fc218a7fe82cc6af01f7fae54a8000900443"; - - }; - }; - - - "25".google_apis."armeabi-v7a" = { - name = "system-image-25-google_apis-armeabi-v7a"; - path = "system-images/android-25/google_apis/armeabi-v7a"; - revision = "25-google_apis-armeabi-v7a"; - displayName = "Google APIs ARM EABI v7a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r15.zip; - sha1 = "813e25f9a5f6d775670ed6c5e67a39bffa1411bf"; - - }; - }; - - - "25".google_apis."arm64-v8a" = { - name = "system-image-25-google_apis-arm64-v8a"; - path = "system-images/android-25/google_apis/arm64-v8a"; - revision = "25-google_apis-arm64-v8a"; - displayName = "Google APIs ARM 64 v8a System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r15.zip; - sha1 = "c3049e32f031140757f71acb5b8f0179e6f27303"; - - }; - }; - - - "26".google_apis."x86" = { - name = "system-image-26-google_apis-x86"; - path = "system-images/android-26/google_apis/x86"; - revision = "26-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r12.zip; - sha1 = "167c83bcfd87127c7376ce986b34701f74fe87ff"; - - }; - }; - - - "26".google_apis."x86_64" = { - name = "system-image-26-google_apis-x86_64"; - path = "system-images/android-26/google_apis/x86_64"; - revision = "26-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r12.zip; - sha1 = "fcd46121c3486e2a759d0707c015e0b12bbab9db"; - - }; - }; - - - "27".google_apis."x86" = { - name = "system-image-27-google_apis-x86"; - path = "system-images/android-27/google_apis/x86"; - revision = "27-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r08.zip; - sha1 = "623ee2638713b7dfde8044c91280c2afad5a1ade"; - - }; - }; - - - "28".google_apis."x86" = { - name = "system-image-28-google_apis-x86"; - path = "system-images/android-28/google_apis/x86"; - revision = "28-google_apis-x86"; - displayName = "Google APIs Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r07.zip; - sha1 = "fe5d58355545ae82b0e6a55adc1d41573ac7dec1"; - - }; - }; - - - "28".google_apis."x86_64" = { - name = "system-image-28-google_apis-x86_64"; - path = "system-images/android-28/google_apis/x86_64"; - revision = "28-google_apis-x86_64"; - displayName = "Google APIs Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r07.zip; - sha1 = "068468683a56725326f741f75b6913ee1e7955ff"; - - }; - }; - + "10".google_apis."armeabi-v7a" = { + name = "system-image-10-google_apis-armeabi-v7a"; + path = "system-images/android-10/google_apis/armeabi-v7a"; + revision = "10-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-10_r06.zip"; + sha1 = "970abf3a2a9937a43576afd9bb56e4a8191947f8"; + }; + }; + "10".google_apis."x86" = { + name = "system-image-10-google_apis-x86"; + path = "system-images/android-10/google_apis/x86"; + revision = "10-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-10_r06.zip"; + sha1 = "070a9552e3d358d8e72e8b2042e539e2b7a1b035"; + }; + }; + "15".google_apis."x86" = { + name = "system-image-15-google_apis-x86"; + path = "system-images/android-15/google_apis/x86"; + revision = "15-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-15_r06.zip"; + sha1 = "a7deb32c12396b6c4fd60ad14a62e19f8bdcae20"; + }; + }; + "15".google_apis."armeabi-v7a" = { + name = "system-image-15-google_apis-armeabi-v7a"; + path = "system-images/android-15/google_apis/armeabi-v7a"; + revision = "15-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-15_r06.zip"; + sha1 = "6deb76cf34760a6037cb18d89772c9e986d07497"; + }; + }; + "16".google_apis."armeabi-v7a" = { + name = "system-image-16-google_apis-armeabi-v7a"; + path = "system-images/android-16/google_apis/armeabi-v7a"; + revision = "16-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-16_r06.zip"; + sha1 = "5a5ff097680c6dae473c8719296ce6d7b70edb2d"; + }; + }; + "16".google_apis."x86" = { + name = "system-image-16-google_apis-x86"; + path = "system-images/android-16/google_apis/x86"; + revision = "16-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-16_r06.zip"; + sha1 = "b57adef2f43dd176b8c02c980c16a796021b2071"; + }; + }; + "17".google_apis."armeabi-v7a" = { + name = "system-image-17-google_apis-armeabi-v7a"; + path = "system-images/android-17/google_apis/armeabi-v7a"; + revision = "17-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-17_r06.zip"; + sha1 = "a59f26cb5707da97e869a27d87b83477204ac594"; + }; + }; + "17".google_apis."x86" = { + name = "system-image-17-google_apis-x86"; + path = "system-images/android-17/google_apis/x86"; + revision = "17-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-17_r06.zip"; + sha1 = "7864c34faf0402b8923d8c6e609a5339f74cc8d6"; + }; + }; + "18".google_apis."armeabi-v7a" = { + name = "system-image-18-google_apis-armeabi-v7a"; + path = "system-images/android-18/google_apis/armeabi-v7a"; + revision = "18-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-18_r06.zip"; + sha1 = "7faaccabbcc5f08e410436d3f63eea42521ea974"; + }; + }; + "18".google_apis."x86" = { + name = "system-image-18-google_apis-x86"; + path = "system-images/android-18/google_apis/x86"; + revision = "18-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-18_r06.zip"; + sha1 = "dd674d719cad61602702be4b3d98edccfbfea53e"; + }; + }; + "19".google_apis."x86" = { + name = "system-image-19-google_apis-x86"; + path = "system-images/android-19/google_apis/x86"; + revision = "19-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-19_r38.zip"; + sha1 = "928e4ec82876c61ef53451425d10ccb840cdd0f2"; + }; + }; + "19".google_apis."armeabi-v7a" = { + name = "system-image-19-google_apis-armeabi-v7a"; + path = "system-images/android-19/google_apis/armeabi-v7a"; + revision = "19-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-19_r38.zip"; + sha1 = "434edd2ddc39d1ca083a5fa9721c0db8ab804737"; + }; + }; + "21".google_apis."x86" = { + name = "system-image-21-google_apis-x86"; + path = "system-images/android-21/google_apis/x86"; + revision = "21-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-21_r30.zip"; + sha1 = "37548caae9e2897fb1d2b15f7fcf624c714cb610"; + }; + }; + "21".google_apis."x86_64" = { + name = "system-image-21-google_apis-x86_64"; + path = "system-images/android-21/google_apis/x86_64"; + revision = "21-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-21_r30.zip"; + sha1 = "82d34fdaae2916bd4d48a4f144db51e4e5719aa4"; + }; + }; + "21".google_apis."armeabi-v7a" = { + name = "system-image-21-google_apis-armeabi-v7a"; + path = "system-images/android-21/google_apis/armeabi-v7a"; + revision = "21-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-21_r30.zip"; + sha1 = "bbdbbb3c4387752a8f28718a3190d901c0378058"; + }; + }; + "22".google_apis."x86" = { + name = "system-image-22-google_apis-x86"; + path = "system-images/android-22/google_apis/x86"; + revision = "22-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-22_r24.zip"; + sha1 = "e4cd95b1c0837fc12d6544742e82d8ef344c8758"; + }; + }; + "22".google_apis."armeabi-v7a" = { + name = "system-image-22-google_apis-armeabi-v7a"; + path = "system-images/android-22/google_apis/armeabi-v7a"; + revision = "22-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-22_r24.zip"; + sha1 = "d2b7ca5f8259c6e4b3cfa5a0d77e4a088899cfb0"; + }; + }; + "22".google_apis."x86_64" = { + name = "system-image-22-google_apis-x86_64"; + path = "system-images/android-22/google_apis/x86_64"; + revision = "22-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-22_r24.zip"; + sha1 = "cde738f9353606af69ad7b4e625c957a4d603f27"; + }; + }; + "23".google_apis."x86" = { + name = "system-image-23-google_apis-x86"; + path = "system-images/android-23/google_apis/x86"; + revision = "23-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-23_r31.zip"; + sha1 = "877cf79f5198fa53351eab08ba9ce162dc84f7ba"; + }; + }; + "23".google_apis."x86_64" = { + name = "system-image-23-google_apis-x86_64"; + path = "system-images/android-23/google_apis/x86_64"; + revision = "23-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-23_r31.zip"; + sha1 = "342c39df061804ee0d5bc671147e90dead3d6665"; + }; + }; + "23".google_apis."armeabi-v7a" = { + name = "system-image-23-google_apis-armeabi-v7a"; + path = "system-images/android-23/google_apis/armeabi-v7a"; + revision = "23-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-23_r31.zip"; + sha1 = "da0a07800b4eec53fcdb2e5c3b69a9a5d7a6b8a6"; + }; + }; + "24".google_apis."x86" = { + name = "system-image-24-google_apis-x86"; + path = "system-images/android-24/google_apis/x86"; + revision = "24-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-24_r25.zip"; + sha1 = "53dba25eed8359aba394a1be1c7ccb741a459ec0"; + }; + }; + "24".google_apis."x86_64" = { + name = "system-image-24-google_apis-x86_64"; + path = "system-images/android-24/google_apis/x86_64"; + revision = "24-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-24_r25.zip"; + sha1 = "d757dd13ad9b0ba4dd872660e31b6506f60dcf32"; + }; + }; + "24".google_apis."armeabi-v7a" = { + name = "system-image-24-google_apis-armeabi-v7a"; + path = "system-images/android-24/google_apis/armeabi-v7a"; + revision = "24-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-24_r25.zip"; + sha1 = "9a0ec5e9a239a7a6889364e44e9fa4fcd0052c6b"; + }; + }; + "24".google_apis."arm64-v8a" = { + name = "system-image-24-google_apis-arm64-v8a"; + path = "system-images/android-24/google_apis/arm64-v8a"; + revision = "24-google_apis-arm64-v8a"; + displayName = "Google APIs ARM 64 v8a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-24_r25.zip"; + sha1 = "5ff407d439e3c595ce9221f445a31dcc35df5a86"; + }; + }; + "25".google_apis."x86" = { + name = "system-image-25-google_apis-x86"; + path = "system-images/android-25/google_apis/x86"; + revision = "25-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-25_r16.zip"; + sha1 = "562e3335c6334b8d1947bb9efb90f8d82f2d3e4d"; + }; + }; + "25".google_apis."x86_64" = { + name = "system-image-25-google_apis-x86_64"; + path = "system-images/android-25/google_apis/x86_64"; + revision = "25-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-25_r16.zip"; + sha1 = "e08b94903631d58964467b0b310c93642d85df6c"; + }; + }; + "25".google_apis."armeabi-v7a" = { + name = "system-image-25-google_apis-armeabi-v7a"; + path = "system-images/android-25/google_apis/armeabi-v7a"; + revision = "25-google_apis-armeabi-v7a"; + displayName = "Google APIs ARM EABI v7a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/armeabi-v7a-25_r16.zip"; + sha1 = "4c49e0edb845b0bf1f231cb0e8598b1a9f9aa9c8"; + }; + }; + "25".google_apis."arm64-v8a" = { + name = "system-image-25-google_apis-arm64-v8a"; + path = "system-images/android-25/google_apis/arm64-v8a"; + revision = "25-google_apis-arm64-v8a"; + displayName = "Google APIs ARM 64 v8a System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-25_r16.zip"; + sha1 = "33ffbd335d9a6dc8d9843469d0963091566b3167"; + }; + }; + "26".google_apis."x86" = { + name = "system-image-26-google_apis-x86"; + path = "system-images/android-26/google_apis/x86"; + revision = "26-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-26_r14.zip"; + sha1 = "935da6794d5f64f7ae20a1f352929cb7e3b20cba"; + }; + }; + "26".google_apis."x86_64" = { + name = "system-image-26-google_apis-x86_64"; + path = "system-images/android-26/google_apis/x86_64"; + revision = "26-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-26_r14.zip"; + sha1 = "965631f0554ca9027ac465ba147baa6a6a22fcce"; + }; + }; + "27".google_apis."x86" = { + name = "system-image-27-google_apis-x86"; + path = "system-images/android-27/google_apis/x86"; + revision = "27-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-27_r09.zip"; + sha1 = "ab009fc1308ded01539af4f8233b252d411145bc"; + }; + }; + "28".google_apis."x86" = { + name = "system-image-28-google_apis-x86"; + path = "system-images/android-28/google_apis/x86"; + revision = "28-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-28_r09.zip"; + sha1 = "7c84ba5cbc009132ce38df52830c17b9bffc54bb"; + }; + }; + "28".google_apis."x86_64" = { + name = "system-image-28-google_apis-x86_64"; + path = "system-images/android-28/google_apis/x86_64"; + revision = "28-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-28_r09.zip"; + sha1 = "eeb066346d29194e5b9387a0c0dd0f9e2a570b70"; + }; + }; + "29".google_apis."x86" = { + name = "system-image-29-google_apis-x86"; + path = "system-images/android-29/google_apis/x86"; + revision = "29-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-29_r09.zip"; + sha1 = "33d71d17138ea322dec2dea6d8198aebf4767ab3"; + }; + }; + "29".google_apis."x86_64" = { + name = "system-image-29-google_apis-x86_64"; + path = "system-images/android-29/google_apis/x86_64"; + revision = "29-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-29_r09.zip"; + sha1 = "0aa76b20a7ad30f2e41bc21b897b848d82533d26"; + }; + }; + "R".google_apis."x86" = { + name = "system-image-R-google_apis-x86"; + path = "system-images/android-R/google_apis/x86"; + revision = "R-google_apis-x86"; + displayName = "Google APIs Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86-R_r01.zip"; + sha1 = "4e260bef94760eecba3224b68c1a4fed0fb89485"; + }; + }; + "R".google_apis."x86_64" = { + name = "system-image-R-google_apis-x86_64"; + path = "system-images/android-R/google_apis/x86_64"; + revision = "R-google_apis-x86_64"; + displayName = "Google APIs Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-R_r01.zip"; + sha1 = "ae12e1c3e1b36043a299359850e9315f47262f81"; + }; + }; } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix index a8bea61ff54..554f4b2df99 100644 --- a/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix +++ b/pkgs/development/mobile/androidenv/generated/system-images-google_apis_playstore.nix @@ -1,97 +1,64 @@ - {fetchurl}: { - - - "24".google_apis_playstore."x86" = { - name = "system-image-24-google_apis_playstore-x86"; - path = "system-images/android-24/google_apis_playstore/x86"; - revision = "24-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip; - sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22"; - - }; + "24".google_apis_playstore."x86" = { + name = "system-image-24-google_apis_playstore-x86"; + path = "system-images/android-24/google_apis_playstore/x86"; + revision = "24-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-24_r19.zip"; + sha1 = "b52e9593ffdde65c1a0970256a32e8967c89cc22"; + }; }; - - - "25".google_apis_playstore."x86" = { - name = "system-image-25-google_apis_playstore-x86"; - path = "system-images/android-25/google_apis_playstore/x86"; - revision = "25-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip; - sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c"; - - }; + "25".google_apis_playstore."x86" = { + name = "system-image-25-google_apis_playstore-x86"; + path = "system-images/android-25/google_apis_playstore/x86"; + revision = "25-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-25_r09.zip"; + sha1 = "6f6668954f7fd52f896fe7528aa122028c9b026c"; + }; }; - - - "26".google_apis_playstore."x86" = { - name = "system-image-26-google_apis_playstore-x86"; - path = "system-images/android-26/google_apis_playstore/x86"; - revision = "26-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip; - sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19"; - - }; + "26".google_apis_playstore."x86" = { + name = "system-image-26-google_apis_playstore-x86"; + path = "system-images/android-26/google_apis_playstore/x86"; + revision = "26-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-26_r07.zip"; + sha1 = "2c8bee7b97a309f099941532e63c42a7d4a06e19"; + }; }; - - - "27".google_apis_playstore."x86" = { - name = "system-image-27-google_apis_playstore-x86"; - path = "system-images/android-27/google_apis_playstore/x86"; - revision = "27-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip; - sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d"; - - }; + "27".google_apis_playstore."x86" = { + name = "system-image-27-google_apis_playstore-x86"; + path = "system-images/android-27/google_apis_playstore/x86"; + revision = "27-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-27_r03.zip"; + sha1 = "eb5a944ceb691ca0648d0a6f0d93893a47223b5d"; + }; }; - - - "28".google_apis_playstore."x86" = { - name = "system-image-28-google_apis_playstore-x86"; - path = "system-images/android-28/google_apis_playstore/x86"; - revision = "28-google_apis_playstore-x86"; - displayName = "Google Play Intel x86 Atom System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r05.zip; - sha1 = "4c570d259e93b0b27f97bad1aca2ac47f1e9b51a"; - - }; + "28".google_apis_playstore."x86" = { + name = "system-image-28-google_apis_playstore-x86"; + path = "system-images/android-28/google_apis_playstore/x86"; + revision = "28-google_apis_playstore-x86"; + displayName = "Google Play Intel x86 Atom System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86-28_r08.zip"; + sha1 = "5381f9d52a3bf1967c9c92a25b20012cd68764c8"; + }; }; - - - "28".google_apis_playstore."x86_64" = { - name = "system-image-28-google_apis_playstore-x86_64"; - path = "system-images/android-28/google_apis_playstore/x86_64"; - revision = "28-google_apis_playstore-x86_64"; - displayName = "Google Play Intel x86 Atom_64 System Image"; - archives.all = fetchurl { - - url = - https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r05.zip; - sha1 = "5f6b238e4c7de41fd2a1c66841093bcf517255a1"; - - }; + "28".google_apis_playstore."x86_64" = { + name = "system-image-28-google_apis_playstore-x86_64"; + path = "system-images/android-28/google_apis_playstore/x86_64"; + revision = "28-google_apis_playstore-x86_64"; + displayName = "Google Play Intel x86 Atom_64 System Image"; + archives.all = fetchurl { + url = "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-28_r08.zip"; + sha1 = "a767da996fdea7a1f5632a9206fa5c009d6e580c"; + }; }; - } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index 92f53e5a7c2..f535672d35e 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -8,11 +8,11 @@ if toolsVersion == "26.0.1" then import ./tools/26.nix { revision = "26.0.1"; archives = { linux = requireFile { - url = https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip; + url = "https://dl.google.com/android/repository/sdk-tools-linux-3859397.zip"; sha256 = "185yq7qwxflw24ccm5d6zziwlc9pxmsm3f54pm9p7xm0ik724kj4"; }; macosx = requireFile { - url = https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip; + url = "https://dl.google.com/android/repository/sdk-tools-darwin-3859397.zip"; sha256 = "1ycx9gzdaqaw6n19yvxjawywacavn1jc6sadlz5qikhgfr57b0aa"; }; }; diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 9aa7dfbf230..b8db94ca06a 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -87,4 +87,4 @@ DEPENDENCIES cocoapods! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/mobile/cocoapods/default.nix b/pkgs/development/mobile/cocoapods/default.nix index c235b9e9a12..f0d1a3b89d0 100644 --- a/pkgs/development/mobile/cocoapods/default.nix +++ b/pkgs/development/mobile/cocoapods/default.nix @@ -14,7 +14,7 @@ bundlerApp { meta = with lib; { description = "CocoaPods manages dependencies for your Xcode projects."; - homepage = https://github.com/CocoaPods/CocoaPods; + homepage = "https://github.com/CocoaPods/CocoaPods"; license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index f78a10d8266..84c42c895ce 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.flashtool.net/; + homepage = "http://www.flashtool.net/"; description = "S1 flashing software for Sony phones from X10 to Xperia Z Ultra"; license = stdenv.lib.licenses.unfreeRedistributableFirmware; platforms = [ "i686-linux" ]; diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 0ea74377a5f..72a376d39a8 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { pre-configured Android (x86 with OpenGL hardware acceleration) images, suitable for application testing. ''; - homepage = https://www.genymotion.com/; + homepage = "https://www.genymotion.com/"; license = stdenv.lib.licenses.unfree; platforms = ["x86_64-linux"]; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; diff --git a/pkgs/development/mobile/imgpatchtools/default.nix b/pkgs/development/mobile/imgpatchtools/default.nix index 706fa2c6599..fd14a73e2ce 100644 --- a/pkgs/development/mobile/imgpatchtools/default.nix +++ b/pkgs/development/mobile/imgpatchtools/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { utility. It also includes other, related, but arguably more advanced tools for OTA manipulation. ''; - homepage = https://github.com/erfanoabdi/imgpatchtools; + homepage = "https://github.com/erfanoabdi/imgpatchtools"; license = licenses.gpl3; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.linux; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix index 5c1cd0a265a..f471dc977b3 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix @@ -4,7 +4,7 @@ let # Gradle is a build system that bootstraps itself. This is what it actually # downloads in the bootstrap phase. gradleAllZip = fetchurl { - url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + url = "http://services.gradle.org/distributions/gradle-4.1-all.zip"; sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; }; @@ -55,11 +55,11 @@ in stdenv.mkDerivation { name = "mobilesdk-7.5.1.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-linux.zip; + url = "https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-linux.zip"; sha256 = "1ihyh6szl9a2gbdgv13msd3g7i3xi9ifmgsh6v562hqlfi4lixng"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-osx.zip; + url = "https://builds.appcelerator.com/mobile/7_5_X/mobilesdk-7.5.1.v20190124152315-osx.zip"; sha256 = "1whs1j7fkk2hxr4nxq50d7ic5wj83b1i1jl0p722sqbvkmgxssa2"; } else throw "Platform: ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix index 45523fad908..2af53a63b58 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix @@ -4,7 +4,7 @@ let # Gradle is a build system that bootstraps itself. This is what it actually # downloads in the bootstrap phase. gradleAllZip = fetchurl { - url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + url = "http://services.gradle.org/distributions/gradle-4.1-all.zip"; sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; }; @@ -55,11 +55,11 @@ in stdenv.mkDerivation { name = "mobilesdk-8.2.1.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip; + url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-linux.zip"; sha256 = "1nvcmm6cby6bmwdiacq46n5y4zjpz9qlipakvglw27j3p4rbmkwl"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip; + url = "https://builds.appcelerator.com/mobile/8_2_X/mobilesdk-8.2.1.v20191025070136-osx.zip"; sha256 = "1nxwmyw3vqc5wghj38kpksisy0i808x0x3pa8w3p290w709g311l"; } else throw "Platform: ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix index b8e6b5a2271..b995a566f52 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix @@ -4,7 +4,7 @@ let # Gradle is a build system that bootstraps itself. This is what it actually # downloads in the bootstrap phase. gradleAllZip = fetchurl { - url = http://services.gradle.org/distributions/gradle-4.1-all.zip; + url = "http://services.gradle.org/distributions/gradle-4.1-all.zip"; sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw"; }; @@ -55,11 +55,11 @@ in stdenv.mkDerivation { name = "mobilesdk-8.3.2.GA"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip; + url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-linux.zip"; sha256 = "04pfw21jrx9w259lphynwykqjk4c9hm0zix4d40s7mf8mmh3xdx9"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip; + url = "https://builds.appcelerator.com/mobile/8_3_X/mobilesdk-8.3.2.v20200117111803-osx.zip"; sha256 = "1zflq5hc96lrriw71ya623kkskkisi9yayg8qs03zimi0gksizxw"; } else throw "Platform: ${stdenv.system} not supported!"; diff --git a/pkgs/development/node-packages/generate.sh b/pkgs/development/node-packages/generate.sh index 66a51721ac8..d25671b1a6d 100755 --- a/pkgs/development/node-packages/generate.sh +++ b/pkgs/development/node-packages/generate.sh @@ -1,11 +1,11 @@ -#!/usr/bin/env nix-shell -#! nix-shell -p nodePackages.node2nix -i bash +#!/usr/bin/env bash set -eu -o pipefail DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +node2nix=$(nix-build ../../.. --no-out-link -A nodePackages.node2nix) cd ${DIR} rm -f ./node-env.nix for version in 10 12 13; do - node2nix --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix + "${node2nix}/bin/node2nix" --nodejs-$version -i node-packages-v$version.json -o node-packages-v$version.nix -c composition-v$version.nix done diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index d70b133fd40..01f1ca9420e 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -14969,7 +14969,7 @@ let version = "1.0.1"; src = fetchurl { name = "emitter-1.0.1.tar.gz"; - url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; + url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; @@ -19263,7 +19263,7 @@ let version = "2.0.1"; src = fetchurl { name = "global-2.0.1.tar.gz"; - url = https://codeload.github.com/component/global/tar.gz/v2.0.1; + url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; @@ -31261,7 +31261,7 @@ let version = "0.9.15"; src = fetchurl { name = "oauth-0.9.15.tar.gz"; - url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; + url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"; sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; @@ -48247,7 +48247,7 @@ let version = "1.5.0"; src = fetchurl { name = "xmlhttprequest-1.5.0.tar.gz"; - url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; + url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; }; }; @@ -49264,7 +49264,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for Angular"; - homepage = https://github.com/angular/angular-cli; + homepage = "https://github.com/angular/angular-cli"; license = "MIT"; }; production = true; @@ -49308,7 +49308,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The command line interface for Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org/"; license = "MPL-2.0"; }; production = true; @@ -49637,7 +49637,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org/"; license = "MPL-2.0"; }; production = true; @@ -49800,7 +49800,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A secure and free password manager for all of your devices."; - homepage = https://bitwarden.com/; + homepage = "https://bitwarden.com/"; license = "GPL-3.0"; }; production = true; @@ -51315,7 +51315,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for rapid Vue.js development"; - homepage = https://cli.vuejs.org/; + homepage = "https://cli.vuejs.org/"; license = "MIT"; }; production = true; @@ -51677,7 +51677,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Creating Electron app packages"; - homepage = https://github.com/electron/asar; + homepage = "https://github.com/electron/asar"; license = "MIT"; }; production = true; @@ -51835,7 +51835,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; - homepage = http://bower.io/; + homepage = "http://bower.io/"; license = "MIT"; }; production = true; @@ -51965,7 +51965,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; - homepage = https://github.com/rvl/bower2nix; + homepage = "https://github.com/rvl/bower2nix"; license = "GPL-3.0"; }; production = true; @@ -52577,7 +52577,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A well-tested CSS minifier"; - homepage = https://github.com/jakubpawlowicz/clean-css; + homepage = "https://github.com/jakubpawlowicz/clean-css"; license = "MIT"; }; production = true; @@ -55825,7 +55825,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; + homepage = "http://coffeescript.org/"; license = "MIT"; }; production = true; @@ -57253,7 +57253,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Create React Native apps with no build configuration."; - homepage = https://github.com/react-community/create-react-native-app; + homepage = "https://github.com/react-community/create-react-native-app"; license = "BSD-3-Clause"; }; production = true; @@ -57275,7 +57275,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CSSLint"; - homepage = http://csslint.net/; + homepage = "http://csslint.net/"; license = "MIT"; }; production = true; @@ -57929,7 +57929,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Dat is the package manager for data. Easily share and version control data."; - homepage = https://datproject.org/; + homepage = "https://datproject.org/"; license = "BSD-3-Clause"; }; production = true; @@ -57950,7 +57950,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A DHCP server written in JavaScript"; - homepage = https://github.com/infusion/node-dhcp; + homepage = "https://github.com/infusion/node-dhcp"; license = "MIT OR GPL-2.0"; }; production = true; @@ -58095,7 +58095,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; - homepage = https://github.com/okTurtles/dnschain; + homepage = "https://github.com/okTurtles/dnschain"; license = "MPL-2.0"; }; production = true; @@ -58633,7 +58633,7 @@ in buildInputs = globalBuildInputs; meta = { description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images."; - homepage = https://www.emojione.com/; + homepage = "https://www.emojione.com/"; }; production = true; bypassCache = true; @@ -58809,7 +58809,7 @@ in buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; - homepage = https://eslint.org/; + homepage = "https://eslint.org/"; license = "MIT"; }; production = true; @@ -58991,7 +58991,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Makes eslint the fastest linter on the planet"; - homepage = https://github.com/mantoni/eslint_d.js; + homepage = "https://github.com/mantoni/eslint_d.js"; license = "MIT"; }; production = true; @@ -60012,7 +60012,7 @@ in buildInputs = globalBuildInputs; meta = { description = "git hosting on secure-scuttlebutt (ssb)"; - homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; + homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256"; license = "Fair"; }; production = true; @@ -61864,7 +61864,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The streaming build system."; - homepage = https://gulpjs.com/; + homepage = "https://gulpjs.com/"; license = "MIT"; }; production = true; @@ -62209,7 +62209,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for gulp"; - homepage = http://gulpjs.com/; + homepage = "http://gulpjs.com/"; license = "MIT"; }; production = true; @@ -62240,7 +62240,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = https://kangax.github.io/html-minifier/; + homepage = "https://kangax.github.io/html-minifier/"; license = "MIT"; }; production = true; @@ -62610,7 +62610,7 @@ in buildInputs = globalBuildInputs; meta = { description = "High precision scientific calculator with support for physical units"; - homepage = https://github.com/sharkdp/insect; + homepage = "https://github.com/sharkdp/insect"; license = "MIT"; }; production = true; @@ -62931,7 +62931,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = https://ionicframework.com/; + homepage = "https://ionicframework.com/"; license = "MIT"; }; production = true; @@ -63472,7 +63472,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Implementation of the Language Server Protocol for JavaScript and TypeScript"; - homepage = https://github.com/sourcegraph/javascript-typescript-langserver; + homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; license = "Apache-2.0"; }; production = true; @@ -64317,7 +64317,7 @@ in buildInputs = globalBuildInputs; meta = { description = "beautifier.io for node"; - homepage = https://beautifier.io/; + homepage = "https://beautifier.io/"; license = "MIT"; }; production = true; @@ -64340,7 +64340,7 @@ in buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; - homepage = https://github.com/nodeca/js-yaml; + homepage = "https://github.com/nodeca/js-yaml"; license = "MIT"; }; production = true; @@ -64437,7 +64437,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = http://jshint.com/; + homepage = "http://jshint.com/"; license = "(MIT AND JSON)"; }; production = true; @@ -64480,7 +64480,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JSON diff"; - homepage = https://github.com/andreyvit/json-diff; + homepage = "https://github.com/andreyvit/json-diff"; }; production = true; bypassCache = true; @@ -64535,7 +64535,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; - homepage = https://github.com/whitlockjc/json-refs; + homepage = "https://github.com/whitlockjc/json-refs"; license = "MIT"; }; production = true; @@ -64816,7 +64816,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Get a full fake REST API with zero coding in less than 30 seconds"; - homepage = https://github.com/typicode/json-server; + homepage = "https://github.com/typicode/json-server"; license = "MIT"; }; production = true; @@ -64843,7 +64843,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Validate JSON"; - homepage = http://zaach.github.com/jsonlint/; + homepage = "http://zaach.github.com/jsonlint/"; }; production = true; bypassCache = true; @@ -65030,7 +65030,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = http://karma-runner.github.io/; + homepage = "http://karma-runner.github.io/"; license = "MIT"; }; production = true; @@ -65124,7 +65124,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; - homepage = https://github.com/mweibel/lcov-result-merger; + homepage = "https://github.com/mweibel/lcov-result-merger"; license = "MIT"; }; production = true; @@ -66432,7 +66432,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; license = "Apache-2.0"; }; production = true; @@ -66457,7 +66457,7 @@ in buildInputs = globalBuildInputs; meta = { description = "clean-css plugin for less.js"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; }; production = true; bypassCache = true; @@ -67298,7 +67298,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Live Markdown previews for your favourite editor."; - homepage = https://github.com/shime/livedown; + homepage = "https://github.com/shime/livedown"; license = "MIT"; }; production = true; @@ -68436,7 +68436,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Madoko is a fast scholarly Markdown processor written in Koka"; - homepage = http://madoko.codeplex.com/; + homepage = "http://madoko.codeplex.com/"; }; production = true; bypassCache = true; @@ -68576,7 +68576,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; - homepage = https://bitbucket.org/aahmed/meat; + homepage = "https://bitbucket.org/aahmed/meat"; }; production = true; bypassCache = true; @@ -69436,7 +69436,7 @@ in buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = https://mochajs.org/; + homepage = "https://mochajs.org/"; license = "MIT"; }; production = true; @@ -69560,7 +69560,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Neovim client API and neovim remote plugin provider"; - homepage = https://github.com/neovim/node-client; + homepage = "https://github.com/neovim/node-client"; license = "MIT"; }; production = true; @@ -69719,7 +69719,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/prebuild/node-gyp-build; + homepage = "https://github.com/prebuild/node-gyp-build"; license = "MIT"; }; production = true; @@ -70015,7 +70015,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; + homepage = "http://github.com/node-inspector/node-inspector"; }; production = true; bypassCache = true; @@ -70586,7 +70586,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Low-code programming for event-driven applications"; - homepage = http://nodered.org/; + homepage = "http://nodered.org/"; license = "Apache-2.0"; }; production = true; @@ -70776,7 +70776,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; @@ -70904,7 +70904,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; - homepage = http://nodemon.io/; + homepage = "http://nodemon.io/"; license = "MIT"; }; production = true; @@ -70922,7 +70922,7 @@ in buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; - homepage = https://docs.npmjs.com/; + homepage = "https://docs.npmjs.com/"; license = "Artistic-2.0"; }; production = true; @@ -71214,7 +71214,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; - homepage = https://github.com/tjunnone/npm-check-updates; + homepage = "https://github.com/tjunnone/npm-check-updates"; license = "Apache-2.0"; }; production = true; @@ -71388,7 +71388,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; - homepage = https://github.com/NixOS/npm2nix; + homepage = "https://github.com/NixOS/npm2nix"; }; production = true; bypassCache = true; @@ -71429,7 +71429,7 @@ in buildInputs = globalBuildInputs; meta = { description = "OCaml language server"; - homepage = https://github.com/freebroccolo/ocaml-language-server; + homepage = "https://github.com/freebroccolo/ocaml-language-server"; license = "Apache-2.0"; }; production = true; @@ -72990,7 +72990,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; - homepage = https://github.com/mafintosh/peerflix; + homepage = "https://github.com/mafintosh/peerflix"; license = "MIT"; }; production = true; @@ -73378,7 +73378,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; - homepage = https://pnpm.js.org/; + homepage = "https://pnpm.js.org/"; license = "MIT"; }; production = true; @@ -73396,7 +73396,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Prettier is an opinionated code formatter"; - homepage = https://prettier.io/; + homepage = "https://prettier.io/"; license = "MIT"; }; production = true; @@ -73782,7 +73782,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A build system for PureScript projects"; - homepage = https://github.com/purescript-contrib/pulp; + homepage = "https://github.com/purescript-contrib/pulp"; license = "LGPL-3.0+"; }; production = true; @@ -73947,7 +73947,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; - homepage = https://facebook.github.io/react; + homepage = "https://facebook.github.io/react"; license = "BSD-3-Clause"; }; production = true; @@ -73965,7 +73965,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The HTML Presentation Framework"; - homepage = http://revealjs.com/; + homepage = "http://revealjs.com/"; license = "MIT"; }; production = true; @@ -75076,7 +75076,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; - homepage = https://serverless.com/framework/docs/; + homepage = "https://serverless.com/framework/docs/"; license = "MIT"; }; production = true; @@ -77173,7 +77173,7 @@ in buildInputs = globalBuildInputs; meta = { description = "network protocol layer for secure-scuttlebutt"; - homepage = https://github.com/ssbc/ssb-server; + homepage = "https://github.com/ssbc/ssb-server"; license = "MIT"; }; production = true; @@ -77191,7 +77191,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Send metric data from statsd to Stackdriver"; - homepage = https://www.stackdriver.com/; + homepage = "https://www.stackdriver.com/"; license = "MIT"; }; production = true; @@ -78108,7 +78108,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = https://github.com/svg/svgo; + homepage = "https://github.com/svg/svgo"; license = "MIT"; }; production = true; @@ -79146,7 +79146,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The pluggable linting tool for text and markdown."; - homepage = https://github.com/textlint/textlint/; + homepage = "https://github.com/textlint/textlint/"; license = "MIT"; }; production = true; @@ -79168,7 +79168,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Latex plugin for [textlint](https://github.com/textlint/textlint "textlint")."; - homepage = https://github.com/elzup/textlint-plugin-latex; + homepage = "https://github.com/elzup/textlint-plugin-latex"; license = "MIT"; }; production = true; @@ -79205,7 +79205,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule check that abbreviations within parentheses."; - homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses; + homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses"; license = "MIT"; }; production = true; @@ -79519,7 +79519,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule for alex"; - homepage = https://github.com/textlint-rule/textlint-rule-alex; + homepage = "https://github.com/textlint-rule/textlint-rule-alex"; license = "MIT"; }; production = true; @@ -79544,7 +79544,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check common misspellings"; - homepage = https://github.com/io-monad/textlint-rule-common-misspellings; + homepage = "https://github.com/io-monad/textlint-rule-common-misspellings"; license = "GPL-3.0"; }; production = true; @@ -79566,7 +79566,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to check correct usage of diacritics"; - homepage = https://github.com/sapegin/textlint-rule-diacritics; + homepage = "https://github.com/sapegin/textlint-rule-diacritics"; license = "MIT"; }; production = true; @@ -79603,7 +79603,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that specify the maximum word count of a sentence."; - homepage = https://github.com/azu/textlint-rule-en-max-word-count; + homepage = "https://github.com/azu/textlint-rule-en-max-word-count"; license = "MIT"; }; production = true; @@ -79694,7 +79694,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check no start with duplicated conjunction."; - homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction; + homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction"; license = "MIT"; }; production = true; @@ -79733,7 +79733,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check with or without period in list item."; - homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item; + homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item"; license = "MIT"; }; production = true; @@ -79763,7 +79763,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to find filler words, buzzwords and chiches"; - homepage = https://github.com/sapegin/textlint-rule-stop-words; + homepage = "https://github.com/sapegin/textlint-rule-stop-words"; license = "MIT"; }; production = true; @@ -79793,7 +79793,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TextLint rule to check correct terms spelling"; - homepage = https://github.com/sapegin/textlint-rule-terminology; + homepage = "https://github.com/sapegin/textlint-rule-terminology"; license = "MIT"; }; production = true; @@ -79831,7 +79831,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check unexpanded acronym word."; - homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym; + homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym"; license = "MIT"; }; production = true; @@ -79871,7 +79871,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check your English style with write good"; - homepage = https://github.com/textlint-rule/textlint-rule-write-good; + homepage = "https://github.com/textlint-rule/textlint-rule-write-good"; license = "MIT"; }; production = true; @@ -80306,7 +80306,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The self-hosted Web IRC client"; - homepage = https://thelounge.chat/; + homepage = "https://thelounge.chat/"; license = "MIT"; }; production = true; @@ -80324,7 +80324,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JavaScript 3D library"; - homepage = https://threejs.org/; + homepage = "https://threejs.org/"; license = "MIT"; }; production = true; @@ -80660,7 +80660,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; - homepage = https://github.com/joyent/node-triton; + homepage = "https://github.com/joyent/node-triton"; license = "MPL-2.0"; }; production = true; @@ -80709,7 +80709,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TSUN: a repl for TypeScript Upgraded Node"; - homepage = https://github.com/HerringtonDarkholme/typescript-repl; + homepage = "https://github.com/HerringtonDarkholme/typescript-repl"; license = "MIT"; }; production = true; @@ -80750,7 +80750,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; - homepage = https://www.typescriptlang.org/; + homepage = "https://www.typescriptlang.org/"; license = "Apache-2.0"; }; production = true; @@ -82516,7 +82516,7 @@ in buildInputs = globalBuildInputs; meta = { description = "vue-language-server"; - homepage = https://github.com/vuejs/vetur/tree/master/server; + homepage = "https://github.com/vuejs/vetur/tree/master/server"; license = "MIT"; }; production = true; @@ -83613,7 +83613,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command line tool to help build, run, and test web extensions"; - homepage = https://github.com/mozilla/web-ext; + homepage = "https://github.com/mozilla/web-ext"; license = "MPL-2.0"; }; production = true; @@ -84089,7 +84089,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; - homepage = https://github.com/webpack/webpack; + homepage = "https://github.com/webpack/webpack"; license = "MIT"; }; production = true; @@ -85152,7 +85152,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Copy files && directories with webpack"; - homepage = https://github.com/webpack-contrib/copy-webpack-plugin; + homepage = "https://github.com/webpack-contrib/copy-webpack-plugin"; license = "MIT"; }; production = true; @@ -85449,7 +85449,7 @@ in buildInputs = globalBuildInputs; meta = { description = "WebTorrent, the streaming torrent client. For the command line."; - homepage = https://webtorrent.io/; + homepage = "https://webtorrent.io/"; license = "MIT"; }; production = true; @@ -86339,11 +86339,11 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for running Yeoman generators"; - homepage = http://yeoman.io/; + homepage = "http://yeoman.io/"; license = "BSD-2-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index f2e633300c7..c592fae7f47 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -2475,7 +2475,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; + homepage = "http://coffeescript.org/"; license = "MIT"; }; production = true; @@ -2953,7 +2953,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; @@ -3090,7 +3090,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/prebuild/node-gyp-build; + homepage = "https://github.com/prebuild/node-gyp-build"; license = "MIT"; }; production = true; @@ -3182,4 +3182,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix index f87526382b9..ceeb2f7951f 100644 --- a/pkgs/development/node-packages/node-packages-v13.nix +++ b/pkgs/development/node-packages/node-packages-v13.nix @@ -1441,11 +1441,11 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index 8415dc751d5..d485b997c28 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/mirage/alcotest; + homepage = "https://github.com/mirage/alcotest"; description = "A lightweight and colourful test framework"; license = stdenv.lib.licenses.isc; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index af12ea544cc..1d3157bdbf1 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { doCheck = true; meta = { - homepage = https://github.com/inhabitedtype/angstrom; + homepage = "https://github.com/inhabitedtype/angstrom"; description = "OCaml parser combinators built for speed and memory efficiency"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/apron/default.nix b/pkgs/development/ocaml-modules/apron/default.nix index b462e10979a..7dc87194d6a 100644 --- a/pkgs/development/ocaml-modules/apron/default.nix +++ b/pkgs/development/ocaml-modules/apron/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.lgpl21; - homepage = http://apron.cri.ensmp.fr/library/; + homepage = "http://apron.cri.ensmp.fr/library/"; maintainers = [ stdenv.lib.maintainers.vbgl ]; description = "Numerical abstract domain library"; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 49fcdbd261a..1dceef3bf16 100644 --- a/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { checkPhase = "${topkg.run} test"; meta = { - homepage = https://github.com/mirleft/ocaml-asn1-combinators; + homepage = "https://github.com/mirleft/ocaml-asn1-combinators"; description = "Combinators for expressing ASN.1 grammars in OCaml"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/astring/default.nix b/pkgs/development/ocaml-modules/astring/default.nix index 7410c19b247..b6360160891 100644 --- a/pkgs/development/ocaml-modules/astring/default.nix +++ b/pkgs/development/ocaml-modules/astring/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = { - homepage = https://erratique.ch/software/astring; + homepage = "https://erratique.ch/software/astring"; description = "Alternative String module for OCaml"; longDescription = '' Astring exposes an alternative String module for OCaml. This module tries diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix index 498315f9cbf..230db8189de 100644 --- a/pkgs/development/ocaml-modules/async/default.nix +++ b/pkgs/development/ocaml-modules/async/default.nix @@ -15,7 +15,7 @@ buildOcaml rec { propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra_p4 pa_ounit ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async; + homepage = "https://github.com/janestreet/async"; description = "Jane Street Capital's asynchronous execution library"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index 80addcfc3bb..53be875f4f3 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -18,7 +18,7 @@ buildOcaml rec { fieldslib_p4 herelib pipebang sexplib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_extra; + homepage = "https://github.com/janestreet/async_extra"; description = "Jane Street Capital's asynchronous execution library (extra)"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix index d0e89940433..aa797cdace3 100644 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ b/pkgs/development/ocaml-modules/async_find/default.nix @@ -14,7 +14,7 @@ buildOcaml rec { propagatedBuildInputs = [ async_p4 core_p4 sexplib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_find; + homepage = "https://github.com/janestreet/async_find"; description = "Directory traversal with Async"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix index 43fde1631ac..19b4d6213e4 100644 --- a/pkgs/development/ocaml-modules/async_kernel/default.nix +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -17,7 +17,7 @@ buildOcaml rec { propagatedBuildInputs = [ core_kernel_p4 bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_kernel; + homepage = "https://github.com/janestreet/async_kernel"; description = "Jane Street Capital's asynchronous execution library (core) "; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix index 6b1e772bc7d..62b64a492d6 100644 --- a/pkgs/development/ocaml-modules/async_shell/default.nix +++ b/pkgs/development/ocaml-modules/async_shell/default.nix @@ -14,7 +14,7 @@ buildOcaml rec { propagatedBuildInputs = [ async_p4 core_p4 core_extended_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_shell; + homepage = "https://github.com/janestreet/async_shell"; description = "Shell helpers for Async"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix index 6119bcac876..13dfbcf3790 100644 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -19,7 +19,7 @@ buildOcaml rec { fieldslib_p4 herelib pipebang pa_test sexplib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_unix; + homepage = "https://github.com/janestreet/async_unix"; description = "Jane Street Capital's asynchronous execution library (unix)"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/atd/default.nix b/pkgs/development/ocaml-modules/atd/default.nix index c6047f4ea1b..84b137ada7c 100644 --- a/pkgs/development/ocaml-modules/atd/default.nix +++ b/pkgs/development/ocaml-modules/atd/default.nix @@ -19,7 +19,7 @@ buildDunePackage rec { propagatedBuildInputs = [ easy-format biniou yojson ]; meta = with stdenv.lib; { - homepage = https://github.com/mjambon/atd; + homepage = "https://github.com/mjambon/atd"; description = "Syntax for cross-language type definitions"; license = licenses.bsd3; maintainers = with maintainers; [ aij jwilberding ]; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index a988582ce6c..46fd75f9887 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; - homepage = https://github.com/BinaryAnalysisPlatform/bap/; + homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; maintainers = [ maintainers.maurer ]; license = licenses.mit; }; diff --git a/pkgs/development/ocaml-modules/base64/2.0.nix b/pkgs/development/ocaml-modules/base64/2.0.nix index 4606ebd5172..a49e0e8a778 100644 --- a/pkgs/development/ocaml-modules/base64/2.0.nix +++ b/pkgs/development/ocaml-modules/base64/2.0.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/mirage/ocaml-base64; + homepage = "https://github.com/mirage/ocaml-base64"; platforms = ocaml.meta.platforms or []; description = "Base64 encoding and decoding in OCaml"; license = stdenv.lib.licenses.isc; diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index 2633d43c104..2f53d74c9eb 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -18,7 +18,7 @@ buildDunePackage { doCheck = true; meta = { - homepage = https://github.com/mirage/ocaml-base64; + homepage = "https://github.com/mirage/ocaml-base64"; description = "Base64 encoding and decoding in OCaml"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 263da89d1df..2ed697d42df 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://batteries.forge.ocamlcore.org/; + homepage = "http://batteries.forge.ocamlcore.org/"; description = "OCaml Batteries Included"; longDescription = '' A community-driven effort to standardize on an consistent, documented, diff --git a/pkgs/development/ocaml-modules/benchmark/default.nix b/pkgs/development/ocaml-modules/benchmark/default.nix index de2010275ef..518a8756158 100644 --- a/pkgs/development/ocaml-modules/benchmark/default.nix +++ b/pkgs/development/ocaml-modules/benchmark/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://ocaml-benchmark.forge.ocamlcore.org/; + homepage = "http://ocaml-benchmark.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "Benchmark running times of code"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/bin_prot/default.nix b/pkgs/development/ocaml-modules/bin_prot/default.nix index bc075295cf3..0dddb653e09 100644 --- a/pkgs/development/ocaml-modules/bin_prot/default.nix +++ b/pkgs/development/ocaml-modules/bin_prot/default.nix @@ -20,7 +20,7 @@ buildOcaml rec { hasSharedObjects = true; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/bin_prot; + homepage = "https://github.com/janestreet/bin_prot"; description = "Binary protocol generator "; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/pkgs/development/ocaml-modules/bisect_ppx/default.nix index 9999cd06fca..ce52c427cd0 100644 --- a/pkgs/development/ocaml-modules/bisect_ppx/default.nix +++ b/pkgs/development/ocaml-modules/bisect_ppx/default.nix @@ -19,6 +19,6 @@ buildDunePackage rec { meta = { description = "Code coverage for OCaml"; license = stdenv.lib.licenses.mpl20; - homepage = https://github.com/aantron/bisect_ppx; + homepage = "https://github.com/aantron/bisect_ppx"; }; } diff --git a/pkgs/development/ocaml-modules/bitstring/default.nix b/pkgs/development/ocaml-modules/bitstring/default.nix index 3d1a554b330..2f413d37352 100644 --- a/pkgs/development/ocaml-modules/bitstring/default.nix +++ b/pkgs/development/ocaml-modules/bitstring/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { meta = with stdenv.lib; { description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml"; - homepage = https://github.com/xguerin/bitstring; + homepage = "https://github.com/xguerin/bitstring"; license = licenses.lgpl21Plus; maintainers = [ maintainers.maurer ]; }; diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index 7b8103efac8..f5dc099b140 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/bolt/bolt.1.4/files/opam.patch"; sha256 = "08cl39r98w312sw23cskd5wian6zg20isn9ki41hnbcgkazhi7pb"; }) ]; @@ -51,7 +51,7 @@ EOF checkTarget = "tests"; meta = with stdenv.lib; { - homepage = http://bolt.x9c.fr; + homepage = "http://bolt.x9c.fr"; description = "A logging tool for the OCaml language"; longDescription = '' Bolt is a logging tool for the OCaml language. It is inspired by and diff --git a/pkgs/development/ocaml-modules/bos/default.nix b/pkgs/development/ocaml-modules/bos/default.nix index 6b37cf1aed3..ca6c362b6fa 100644 --- a/pkgs/development/ocaml-modules/bos/default.nix +++ b/pkgs/development/ocaml-modules/bos/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Basic OS interaction for OCaml"; - homepage = https://erratique.ch/software/bos; + homepage = "https://erratique.ch/software/bos"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/calendar/default.nix b/pkgs/development/ocaml-modules/calendar/default.nix index c33deec9c78..f23081a5f19 100644 --- a/pkgs/development/ocaml-modules/calendar/default.nix +++ b/pkgs/development/ocaml-modules/calendar/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml-calendar-2.5"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/915/calendar-2.5.tar.bz2; + url = "https://forge.ocamlcore.org/frs/download.php/915/calendar-2.5.tar.bz2"; sha256 = "04pvhwb664g3s644c7v7419a3kvf5s3pynkhmk5j59dvlfm1yf0f"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://forge.ocamlcore.org/projects/calendar/; + homepage = "https://forge.ocamlcore.org/projects/calendar/"; description = "An Objective Caml library managing dates and times"; license = "LGPL"; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/camlimages/4.0.nix b/pkgs/development/ocaml-modules/camlimages/4.0.nix index 0ec3a26d051..e62acc3cd63 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.0.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.0.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { branch = "4.0"; - homepage = https://bitbucket.org/camlspotter/camlimages; + homepage = "https://bitbucket.org/camlspotter/camlimages"; description = "OCaml image processing library"; license = licenses.lgpl2; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/camlimages/4.1.nix b/pkgs/development/ocaml-modules/camlimages/4.1.nix index 31b4047efc8..d2d626acbfe 100644 --- a/pkgs/development/ocaml-modules/camlimages/4.1.nix +++ b/pkgs/development/ocaml-modules/camlimages/4.1.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://bitbucket.org/camlspotter/camlimages; + homepage = "https://bitbucket.org/camlspotter/camlimages"; description = "OCaml image processing library"; license = licenses.lgpl2; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/camlimages/default.nix b/pkgs/development/ocaml-modules/camlimages/default.nix index 8b0b70cae60..1ea3e78a06b 100644 --- a/pkgs/development/ocaml-modules/camlimages/default.nix +++ b/pkgs/development/ocaml-modules/camlimages/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { meta = with lib; { branch = "5.0"; - homepage = https://bitbucket.org/camlspotter/camlimages; + homepage = "https://bitbucket.org/camlspotter/camlimages"; description = "OCaml image processing library"; license = licenses.gpl2; maintainers = [ maintainers.vbgl maintainers.mt-caret ]; diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index e1e213eca78..fa5ffabedad 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml library for reading, writing and modifying PDF files"; - homepage = https://github.com/johnwhitington/camlpdf; + homepage = "https://github.com/johnwhitington/camlpdf"; license = licenses.lgpl21Plus; maintainers = with maintainers; [vbgl]; }; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.2.nix b/pkgs/development/ocaml-modules/camomile/0.8.2.nix index d206cbf9421..6b18220dc8a 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.2.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.2.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = http://camomile.sourceforge.net/; + homepage = "http://camomile.sourceforge.net/"; description = "A comprehensive Unicode library for OCaml"; license = stdenv.lib.licenses.lgpl21; branch = "0.8.2"; diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix index dc2049769f3..b975482ecf3 100644 --- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix +++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation { version = "0.8.5"; src = fetchurl { - url = https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2; + url = "https://github.com/yoriyuki/Camomile/releases/download/rel-0.8.5/camomile-0.8.5.tar.bz2"; sha256 = "003ikpvpaliy5hblhckfmln34zqz0mk3y2m1fqvbjngh3h2np045"; }; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/camomile/camomile.0.8.5/files/4.05-typing-fix.patch"; sha256 = "167279lia6qx62mdcyc5rjsi4gf4yi52wn9mhgd9y1v3754z7fwb"; })]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/yoriyuki/Camomile/tree/master/Camomile; + homepage = "https://github.com/yoriyuki/Camomile/tree/master/Camomile"; description = "A comprehensive Unicode library for OCaml"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix index 5fbb141b6cc..9903c237e63 100644 --- a/pkgs/development/ocaml-modules/cil/default.nix +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -7,7 +7,7 @@ else stdenv.mkDerivation { name = "ocaml-cil-1.7.3"; src = fetchurl { - url = mirror://sourceforge/cil/cil-1.7.3.tar.gz; + url = "mirror://sourceforge/cil/cil-1.7.3.tar.gz"; sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { prefixKey = "-prefix="; meta = with stdenv.lib; { - homepage = http://kerneis.github.io/cil/; + homepage = "http://kerneis.github.io/cil/"; description = "A front-end for the C programming language that facilitates program analysis and transformation"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 34d57b403b0..7c94dcf5435 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = https://erratique.ch/software/cmdliner; + homepage = "https://erratique.ch/software/cmdliner"; description = "An OCaml module for the declarative definition of command line interfaces"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index 8192fced97b..55787e12392 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -14,7 +14,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/comparelib; + homepage = "https://github.com/janestreet/comparelib"; description = "Syntax extension for deriving \"compare\" functions automatically"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix index 4ca9d4a30e0..724c5b1e2d6 100644 --- a/pkgs/development/ocaml-modules/config-file/default.nix +++ b/pkgs/development/ocaml-modules/config-file/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml-config-file-1.2"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1387/config-file-1.2.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-1.2.tar.gz"; sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://config-file.forge.ocamlcore.org/; + homepage = "http://config-file.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "An OCaml library used to manage the configuration file(s) of an application"; license = stdenv.lib.licenses.lgpl2Plus; diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index b12b6e8c265..16bad5a5ec4 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -23,7 +23,7 @@ buildDunePackage rec { doCheck = true; meta = { - homepage = https://github.com/c-cube/ocaml-containers; + homepage = "https://github.com/c-cube/ocaml-containers"; description = "A modular standard library focused on data structures"; longDescription = '' Containers is a standard library (BSD license) focused on data structures, diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index 4da4d16df7d..a808975d250 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -22,7 +22,7 @@ buildOcaml rec { pipebang sexplib_p4 typerep_p4 variantslib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core; + homepage = "https://github.com/janestreet/core"; description = "Jane Street Capital's standard library overlay"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index fe4fc5d87ab..b657e812fdf 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -25,7 +25,7 @@ buildOcaml rec { pipebang textutils_p4 re2_p4 sexplib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_extended; + homepage = "https://github.com/janestreet/core_extended"; description = "Jane Street Capital's standard library overlay"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix index 75b248a6a5e..f51f60f25f1 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -22,7 +22,7 @@ buildOcaml rec { typerep_p4 variantslib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_kernel; + homepage = "https://github.com/janestreet/core_kernel"; description = "Jane Street Capital's standard library overlay (kernel)"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 5df15316e32..3b68acaee71 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.coherentpdf.com/; + homepage = "https://www.coherentpdf.com/"; platforms = ocaml.meta.platforms or []; description = "PDF Command Line Tools"; license = licenses.unfree; diff --git a/pkgs/development/ocaml-modules/cpuid/default.nix b/pkgs/development/ocaml-modules/cpuid/default.nix index 6c7ecaa4b7a..8adca8b956f 100644 --- a/pkgs/development/ocaml-modules/cpuid/default.nix +++ b/pkgs/development/ocaml-modules/cpuid/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; meta = { - homepage = https://github.com/pqwy/cpuid; + homepage = "https://github.com/pqwy/cpuid"; description = "Detect CPU features from OCaml"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index f6d22100873..2d9ac2a7b19 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://projects.camlcity.org/projects/cryptgps.html; + homepage = "http://projects.camlcity.org/projects/cryptgps.html"; description = "Cryptographic functions for OCaml"; longDescription = '' This library implements the symmetric cryptographic algorithms diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 1c7a0ccb0fa..69f8445e217 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -6,12 +6,12 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { version = "1.14"; - url = https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz; + url = "https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz"; sha256 = "0wkh72idkb7dahiwyl94hhbq27cc7x9fnmxkpnbqli6wi8wd7d05"; inherit zarith; } else { version = "1.10"; - url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz; + url = "http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz"; sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv"; zarith = null; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; meta = { - homepage = http://pauillac.inria.fr/~xleroy/software.html; + homepage = "http://pauillac.inria.fr/~xleroy/software.html"; description = "A library of cryptographic primitives for OCaml"; platforms = ocaml.meta.platforms or []; maintainers = [ diff --git a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix index 0122ec9ff61..1cea58abee2 100644 --- a/pkgs/development/ocaml-modules/cstruct/1.9.0.nix +++ b/pkgs/development/ocaml-modules/cstruct/1.9.0.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { dontStrip = true; meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-cstruct; + homepage = "https://github.com/mirage/ocaml-cstruct"; description = "Map OCaml arrays onto C-like structs"; license = stdenv.lib.licenses.isc; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/csv/1.5.nix b/pkgs/development/ocaml-modules/csv/1.5.nix index a7505f6f51c..9b615269263 100644 --- a/pkgs/development/ocaml-modules/csv/1.5.nix +++ b/pkgs/development/ocaml-modules/csv/1.5.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A pure OCaml library to read and write CSV files"; - homepage = https://github.com/Chris00/ocaml-csv; + homepage = "https://github.com/Chris00/ocaml-csv"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 05a18612804..2d017b9a916 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -13,6 +13,6 @@ buildDunePackage rec { description = "A pure OCaml library to read and write CSV files"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.vbgl ]; - homepage = https://github.com/Chris00/ocaml-csv; + 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 bc76cfcd64c..8a16dcec343 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ctypes-${version}"; - version = "0.15.1"; + version = "0.17.1"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "0adas974bwinn8jidb6chljkpd70s041h2a969dicsj0xsg6wys6"; + sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; }; nativeBuildInputs = [ pkgconfig ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ocamllabs/ocaml-ctypes; + homepage = "https://github.com/ocamllabs/ocaml-ctypes"; description = "Library for binding to C libraries using pure OCaml"; license = licenses.mit; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/curses/default.nix b/pkgs/development/ocaml-modules/curses/default.nix index 9bcf4fc411f..2c989caa3e8 100644 --- a/pkgs/development/ocaml-modules/curses/default.nix +++ b/pkgs/development/ocaml-modules/curses/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml Bindings to curses/ncurses"; - homepage = https://opam.ocaml.org/packages/curses/curses.1.0.4/; + homepage = "https://opam.ocaml.org/packages/curses/curses.1.0.4/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix index 16c31fc3861..8f8a0a5c886 100644 --- a/pkgs/development/ocaml-modules/custom_printf/default.nix +++ b/pkgs/development/ocaml-modules/custom_printf/default.nix @@ -15,7 +15,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv sexplib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/custom_printf; + homepage = "https://github.com/janestreet/custom_printf"; description = "Syntax extension for printf format strings"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 9239d2543ee..f9eef4774f5 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { checkTarget = "test"; meta = { - homepage = https://github.com/UnixJunkie/dolog; + homepage = "https://github.com/UnixJunkie/dolog"; description = "Minimalistic lazy logger in OCaml"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix index 16a9f96798c..b26cbec25ed 100644 --- a/pkgs/development/ocaml-modules/dtoa/default.nix +++ b/pkgs/development/ocaml-modules/dtoa/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; meta = with stdenv.lib; { - homepage = https://github.com/flowtype/ocaml-dtoa; + homepage = "https://github.com/flowtype/ocaml-dtoa"; description = "Converts OCaml floats into strings (doubles to ascii, \"d to a\"), using the efficient Grisu3 algorithm."; license = licenses.mit; maintainers = [ maintainers.eqyiel ]; diff --git a/pkgs/development/ocaml-modules/dum/default.nix b/pkgs/development/ocaml-modules/dum/default.nix index 5e5199c2690..844d06e3038 100644 --- a/pkgs/development/ocaml-modules/dum/default.nix +++ b/pkgs/development/ocaml-modules/dum/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/mjambon/dum; + homepage = "https://github.com/mjambon/dum"; description = "Inspect the runtime representation of arbitrary OCaml values"; license = licenses.lgpl21Plus; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 62e63592566..ead672fa15c 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/usr/share/man/man1" "DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib" ]; meta = { - homepage = http://dypgen.free.fr; + homepage = "http://dypgen.free.fr"; description = "Dypgen GLR self extensible parser generator"; license = stdenv.lib.licenses.cecill-b; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 7ffb7a8880b..559c21cecac 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec setupHook = [ ./setup-hook.sh ]; meta = { - homepage = http://ocsigen.org/eliom/; + homepage = "http://ocsigen.org/eliom/"; description = "OCaml Framework for programming Web sites and client/server Web applications"; longDescription =''Eliom is a framework for programming Web sites diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index 4f0c182726d..22a6d12792c 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "ocaml-enumerate-111.08.00"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/111.08.00/individual/enumerate-111.08.00.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/111.08.00/individual/enumerate-111.08.00.tar.gz"; sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Quotation expanders for enumerating finite types"; license = stdenv.lib.licenses.asl20; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index 35b5c73b578..ebfcbc90a50 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/hannesm/xml; + homepage = "https://github.com/hannesm/xml"; description = "XML Parser for discrete data"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index a6bb75e61c2..e9381a3bce1 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = https://github.com/hannesm/xmpp; + homepage = "https://github.com/hannesm/xmpp"; description = "OCaml based XMPP implementation (fork)"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/estring/default.nix b/pkgs/development/ocaml-modules/estring/default.nix index 9f04dac343c..4cd27f272b3 100644 --- a/pkgs/development/ocaml-modules/estring/default.nix +++ b/pkgs/development/ocaml-modules/estring/default.nix @@ -14,7 +14,7 @@ buildOcaml rec { }; meta = with stdenv.lib; { - homepage = http://estring.forge.ocamlcore.org/; + homepage = "http://estring.forge.ocamlcore.org/"; description = "Extension for string literals"; license = licenses.bsd3; }; diff --git a/pkgs/development/ocaml-modules/expat/0.9.nix b/pkgs/development/ocaml-modules/expat/0.9.nix index 98ab04beb57..886f346012c 100644 --- a/pkgs/development/ocaml-modules/expat/0.9.nix +++ b/pkgs/development/ocaml-modules/expat/0.9.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { checkTarget = "testall"; meta = { - homepage = http://www.xs4all.nl/~mmzeeman/ocaml/; + homepage = "http://www.xs4all.nl/~mmzeeman/ocaml/"; description = "An ocaml wrapper for the Expat XML parsing library"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index df0bd9133d3..546fc904ffc 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-extlib-1.7.6"; src = fetchurl { - url = http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz; + url = "http://ygrek.org.ua/p/release/ocaml-extlib/extlib-1.7.6.tar.gz"; sha256 = "0wfs20v1yj5apdbj7214wdsr17ayh0qqq7ihidndvc8nmmwfa1dz"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { installPhase = "make ${if minimal then "minimal=1" else ""} install"; meta = { - homepage = https://github.com/ygrek/ocaml-extlib; + homepage = "https://github.com/ygrek/ocaml-extlib"; description = "Enhancements to the OCaml Standard Library modules"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index fc1936c2b47..781af8a4c98 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { meta = { description = "An easy interface on top of the Jsonm library"; - homepage = https://github.com/mirage/ezjsonm; + homepage = "https://github.com/mirage/ezjsonm"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/faillib/default.nix b/pkgs/development/ocaml-modules/faillib/default.nix index 9b80433b6d1..2a4d03e87ae 100644 --- a/pkgs/development/ocaml-modules/faillib/default.nix +++ b/pkgs/development/ocaml-modules/faillib/default.nix @@ -20,7 +20,7 @@ buildOcaml rec { checkPhase = "make test"; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for dealing with failure in OCaml"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix index 36c1342e61f..90b75faa54c 100644 --- a/pkgs/development/ocaml-modules/fieldslib/default.nix +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "ocaml-fieldslib-109.20.03"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/109.20.00/individual/fieldslib-109.20.03.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/109.20.00/individual/fieldslib-109.20.03.tar.gz"; sha256 = "1dkzk0wf26rhvji80dz1r56dp6x9zqrnp87wldd4pj56jli94vir"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; license = licenses.asl20; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 8c9aa46d9a0..031680b1e33 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-fileutils-0.5.3"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1728/ocaml-fileutils-0.5.3.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1728/ocaml-fileutils-0.5.3.tar.gz"; sha256 = "1rc4cqlvdhbs55i85zfbfhz938fsy4fj6kwlkfm3ra7bpwn8bmpd"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { preInstall = "make doc"; meta = { - homepage = https://forge.ocamlcore.org/projects/ocaml-fileutils/; + homepage = "https://forge.ocamlcore.org/projects/ocaml-fileutils/"; platforms = ocaml.meta.platforms or []; description = "Library to provide pure OCaml functions to manipulate real file (POSIX like) and filename"; license = stdenv.lib.licenses.lgpl21Plus; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index 76cb6d08844..d1a2b93cee1 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "ocaml-fix-20130611"; src = fetchurl { - url = http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz; + url = "http://gallium.inria.fr/~fpottier/fix/fix-20130611.tar.gz"; sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = http://gallium.inria.fr/~fpottier/fix/; + homepage = "http://gallium.inria.fr/~fpottier/fix/"; description = "A simple OCaml module for computing the least solution of a system of monotone equations"; license = licenses.cecill-c; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix index d136ec092c2..2b1d92c56ed 100644 --- a/pkgs/development/ocaml-modules/fmt/default.nix +++ b/pkgs/development/ocaml-modules/fmt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-fmt-0.8.5"; src = fetchurl { - url = https://erratique.ch/software/fmt/releases/fmt-0.8.5.tbz; + url = "https://erratique.ch/software/fmt/releases/fmt-0.8.5.tbz"; sha256 = "1zj9azcxcn6skmb69ykgmi9z8c50yskwg03wqgh87lypgjdcz060"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = { - homepage = https://erratique.ch/software/fmt; + homepage = "https://erratique.ch/software/fmt"; license = stdenv.lib.licenses.isc; description = "OCaml Format pretty-printer combinators"; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix index bcd877f2be2..02b125642cc 100644 --- a/pkgs/development/ocaml-modules/fpath/default.nix +++ b/pkgs/development/ocaml-modules/fpath/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-fpath-0.7.2"; src = fetchurl { - url = https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz; + url = "https://erratique.ch/software/fpath/releases/fpath-0.7.2.tbz"; sha256 = "1hr05d8bpqmqcfdavn4rjk9rxr7v2zl84866f5knjifrm60sxqic"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml module for handling file system paths with POSIX and Windows conventions"; - homepage = https://erratique.ch/software/fpath; + homepage = "https://erratique.ch/software/fpath"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix index 979c364e496..e68f6a28cb4 100644 --- a/pkgs/development/ocaml-modules/frontc/default.nix +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -2,7 +2,7 @@ let meta_file = fetchurl { - url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/META; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/META"; sha256 = "0s2wsinycldk8y5p09xd0hsgbhckhy7bkghzl63bph6mwv64kq2d"; }; in @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { }; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/opam.patch; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/3c191ae9356ca7b3b628f2707cfcb863db42480f/packages/FrontC/FrontC.3.4.1/files/opam.patch"; sha256 = "0v4f6740jbj1kxg1y03dzfa3x3gsrhv06wpzdj30gl4ki5fvj4hs"; }) ]; diff --git a/pkgs/development/ocaml-modules/functoria/default.nix b/pkgs/development/ocaml-modules/functoria/default.nix index cc99b726e6e..3a4f7d46b6e 100644 --- a/pkgs/development/ocaml-modules/functoria/default.nix +++ b/pkgs/development/ocaml-modules/functoria/default.nix @@ -20,7 +20,7 @@ buildDunePackage rec { meta = with stdenv.lib; { description = "A DSL to organize functor applications"; - homepage = https://github.com/mirage/functoria; + homepage = "https://github.com/mirage/functoria"; license = licenses.isc; maintainers = [ maintainers.vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix index 18b5fb39776..934a88254e2 100644 --- a/pkgs/development/ocaml-modules/functory/default.nix +++ b/pkgs/development/ocaml-modules/functory/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://www.lri.fr/~filliatr/functory/; + homepage = "https://www.lri.fr/~filliatr/functory/"; description = "A distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion"; license = licenses.lgpl21; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 25f5e35492b..20ade26f909 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { meta = { description = "OCaml client for google services"; - homepage = http://gapi-ocaml.forge.ocamlcore.org; + homepage = "http://gapi-ocaml.forge.ocamlcore.org"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ bennofs ]; }; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 626e6321acf..9e37d9b9a2d 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/c-cube/gen; + homepage = "https://github.com/c-cube/gen"; description = "Simple, efficient iterators for OCaml"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index 1d5aabf3004..d47ad8ce859 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [gdome2]; meta = { - homepage = http://gmetadom.sourceforge.net/; + homepage = "http://gmetadom.sourceforge.net/"; description = "A collection of librares, each library providing a DOM implementation"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/ocaml-modules/gnuplot/default.nix b/pkgs/development/ocaml-modules/gnuplot/default.nix index e473273b8da..d939b884e87 100644 --- a/pkgs/development/ocaml-modules/gnuplot/default.nix +++ b/pkgs/development/ocaml-modules/gnuplot/default.nix @@ -1,19 +1,21 @@ -{ stdenv, buildDunePackage, fetchFromBitbucket, gnuplot, core }: +{ lib, buildDunePackage, fetchFromGitHub, gnuplot, iso8601 }: buildDunePackage rec { pname = "gnuplot"; - version = "0.5.3"; + version = "0.7"; - src = fetchFromBitbucket { - owner = "ogu"; - repo = "${pname}-ocaml"; - rev = "release-${version}"; - sha256 = "00sn9g46pj8pfh7faiyxg3pfhq7w9knafyabjr464bh6qz5kiin3"; + minimumOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "ocaml-${pname}"; + rev = "v${version}"; + sha256 = "02pzi3lb57ysrdsba743s3vmnapjbxgq8ynlzpxbbs6cn1jj6ch9"; }; - propagatedBuildInputs = [ core gnuplot ]; + propagatedBuildInputs = [ gnuplot iso8601 ]; - meta = with stdenv.lib; { + meta = with lib; { inherit (src.meta) homepage; description = "Ocaml bindings to Gnuplot"; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/ocaml-modules/gtktop/default.nix b/pkgs/development/ocaml-modules/gtktop/default.nix index 07420693005..b0e17a28e51 100644 --- a/pkgs/development/ocaml-modules/gtktop/default.nix +++ b/pkgs/development/ocaml-modules/gtktop/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://zoggy.github.io/gtktop/; + homepage = "http://zoggy.github.io/gtktop/"; description = "A small OCaml library to ease the creation of graphical toplevels"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index c9a40b61437..a99b6cb711e 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -12,7 +12,7 @@ buildOcaml rec { }; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/herelib; + homepage = "https://github.com/janestreet/herelib"; description = "Syntax extension for inserting the current location"; license = stdenv.lib.licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/hex/default.nix b/pkgs/development/ocaml-modules/hex/default.nix index 11e1b5dc670..8e9dd2db250 100644 --- a/pkgs/development/ocaml-modules/hex/default.nix +++ b/pkgs/development/ocaml-modules/hex/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { meta = { description = "Mininal OCaml library providing hexadecimal converters"; - homepage = https://github.com/mirage/ocaml-hex; + homepage = "https://github.com/mirage/ocaml-hex"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index 93e2b3b8429..ecda6338bee 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml library for syntax highlighting"; - homepage = https://zoggy.github.io/higlo/; + homepage = "https://zoggy.github.io/higlo/"; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/development/ocaml-modules/http/default.nix b/pkgs/development/ocaml-modules/http/default.nix index 4a8b3906336..3936eb13c2f 100644 --- a/pkgs/development/ocaml-modules/http/default.nix +++ b/pkgs/development/ocaml-modules/http/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-http-0.1.5"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/545/ocaml-http-0.1.5.tar.gz"; sha256 = "09q12b0j01iymflssxigsqggbsp8dqh9pfvkm76dv860544mygws"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://ocaml-http.forge.ocamlcore.org/; + homepage = "http://ocaml-http.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = "Do it yourself (OCaml) HTTP daemon"; license = licenses.lgpl2; diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix index 1860e585b59..eeeaab8092f 100644 --- a/pkgs/development/ocaml-modules/inifiles/default.nix +++ b/pkgs/development/ocaml-modules/inifiles/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { 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; + 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; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/master/packages/ocaml-inifiles/ocaml-inifiles.1.2/files/ocaml-inifiles.diff"; sha256 = "037kk3172s187w8vwsykdxlpklxzc7m7np57sapk499d8adzdgwn"; })]; diff --git a/pkgs/development/ocaml-modules/integers/default.nix b/pkgs/development/ocaml-modules/integers/default.nix index 14d6506ad13..a949b339c72 100644 --- a/pkgs/development/ocaml-modules/integers/default.nix +++ b/pkgs/development/ocaml-modules/integers/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { meta = { description = "Various signed and unsigned integer types for OCaml"; license = lib.licenses.mit; - homepage = https://github.com/ocamllabs/ocaml-integers; + homepage = "https://github.com/ocamllabs/ocaml-integers"; maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/io-page/default.nix b/pkgs/development/ocaml-modules/io-page/default.nix index e0f02456962..d9e4c8cdf81 100644 --- a/pkgs/development/ocaml-modules/io-page/default.nix +++ b/pkgs/development/ocaml-modules/io-page/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { propagatedBuildInputs = [ cstruct ]; meta = { - homepage = https://github.com/mirage/io-page; + homepage = "https://github.com/mirage/io-page"; license = stdenv.lib.licenses.isc; description = "IO memory page library for Mirage backends"; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix index cdc273d6ecf..a602393e920 100644 --- a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix +++ b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix @@ -24,7 +24,7 @@ buildOcaml rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mirage/ocaml-ipaddr; + homepage = "https://github.com/mirage/ocaml-ipaddr"; description = "A library for manipulation of IP (and MAC) address representations "; license = licenses.mit; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index be76e413c36..d7009fdf553 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://github.com/mirage/ocaml-ipaddr; + homepage = "https://github.com/mirage/ocaml-ipaddr"; description = "A library for manipulation of IP (and MAC) address representations "; license = licenses.isc; maintainers = with maintainers; [ alexfmpe ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/irmin/1.4.nix b/pkgs/development/ocaml-modules/irmin/1.4.nix index 878160f4b0a..c1d170f78ee 100644 --- a/pkgs/development/ocaml-modules/irmin/1.4.nix +++ b/pkgs/development/ocaml-modules/irmin/1.4.nix @@ -18,7 +18,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://github.com/mirage/irmin; + homepage = "https://github.com/mirage/irmin"; description = "Irmin, a distributed database that follows the same design principles as Git"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 96f0205aa79..2a2953673f9 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://ocaml-community.github.io/ISO8601.ml/; + homepage = "https://ocaml-community.github.io/ISO8601.ml/"; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/iter/default.nix b/pkgs/development/ocaml-modules/iter/default.nix index 964a7c6f5a3..45cfa07e436 100644 --- a/pkgs/development/ocaml-modules/iter/default.nix +++ b/pkgs/development/ocaml-modules/iter/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = { - homepage = https://github.com/c-cube/sequence; + homepage = "https://github.com/c-cube/sequence"; description = "Simple sequence (iterator) datatype and combinators"; longDescription = '' Simple sequence datatype, intended to transfer a finite number of diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix index ff923bbd467..3de02437dd9 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix @@ -9,7 +9,7 @@ buildOcamlJane { fieldslib herelib pipebang sexplib async_rpc_kernel ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_extra; + homepage = "https://github.com/janestreet/async_extra"; description = "Jane Street Capital's asynchronous execution library (extra)"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix index 49f38136c4f..6e8a5cae635 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -8,7 +8,7 @@ buildOcamlJane { propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_kernel; + homepage = "https://github.com/janestreet/async_kernel"; description = "Jane Street Capital's asynchronous execution library (core) "; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix index 83a7e13a5d0..70780ee385f 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -10,7 +10,7 @@ buildOcamlJane { sexplib typerep variantslib ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_rpc_kernel; + homepage = "https://github.com/janestreet/async_rpc_kernel"; description = "Platform-independent core of Async RPC library"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix index 0d0f26134f2..5678d95a131 100644 --- a/pkgs/development/ocaml-modules/janestreet/async-unix.nix +++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -9,7 +9,7 @@ buildOcamlJane { fieldslib herelib pipebang sexplib ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_unix; + homepage = "https://github.com/janestreet/async_unix"; description = "Jane Street Capital's asynchronous execution library (unix)"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix index fe01e47426d..8f15531403a 100644 --- a/pkgs/development/ocaml-modules/janestreet/async.nix +++ b/pkgs/development/ocaml-modules/janestreet/async.nix @@ -8,7 +8,7 @@ buildOcamlJane { propagatedBuildInputs = [ async_kernel async_unix async_extra ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async; + homepage = "https://github.com/janestreet/async"; description = "Jane Street Capital's asynchronous execution library"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix index e8f42ef71d1..c13f9a34fb7 100644 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix @@ -9,7 +9,7 @@ buildOcamlJane { propagatedBuildInputs = [ ctypes async comparelib core fieldslib herelib pipebang sexplib openssl ocaml_oasis ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/async_ssl; + homepage = "https://github.com/janestreet/async_ssl"; description = "Async wrappers for ssl"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix index c47fcd2fea6..1eb6b6a95f8 100644 --- a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -9,7 +9,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/bin_prot; + homepage = "https://github.com/janestreet/bin_prot"; description = "Binary protocol generator "; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix index c7c69beedb7..19550a82327 100644 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -20,7 +20,7 @@ EOF ''; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_extended; + homepage = "https://github.com/janestreet/core_extended"; description = "Jane Street Capital's standard library overlay"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix index f6a7ba5b0db..ac62bc51b07 100644 --- a/pkgs/development/ocaml-modules/janestreet/core.nix +++ b/pkgs/development/ocaml-modules/janestreet/core.nix @@ -11,7 +11,7 @@ buildOcamlJane { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core; + homepage = "https://github.com/janestreet/core"; description = "Jane Street Capital's standard library overlay"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/core_bench.nix b/pkgs/development/ocaml-modules/janestreet/core_bench.nix index b279318dd93..1956a7f3b70 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_bench.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_bench.nix @@ -12,7 +12,7 @@ buildOcamlJane { [ core core_extended textutils ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_bench; + homepage = "https://github.com/janestreet/core_bench"; description = "Micro-benchmarking library for OCaml"; license = licenses.asl20; maintainers = [ maintainers.pmahoney ]; diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix index 53e92a95c23..b2f0661e768 100644 --- a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix +++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -10,7 +10,7 @@ buildOcamlJane { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/core_kernel; + homepage = "https://github.com/janestreet/core_kernel"; description = "Jane Street Capital's standard library overlay (kernel)"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix index 8ce1ca6c505..39aeb704717 100644 --- a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -11,7 +11,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix index 9153d336b22..1157c398080 100644 --- a/pkgs/development/ocaml-modules/janestreet/re2.nix +++ b/pkgs/development/ocaml-modules/janestreet/re2.nix @@ -12,7 +12,7 @@ buildOcamlJane { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/re2; + homepage = "https://github.com/janestreet/re2"; description = "OCaml bindings for RE2"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix index f4a86f80b04..1bb9d489b14 100644 --- a/pkgs/development/ocaml-modules/janestreet/sexplib.nix +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -10,7 +10,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/pkgs/development/ocaml-modules/janestreet/textutils.nix index 6b3dba5aac8..e6d74b52f0b 100644 --- a/pkgs/development/ocaml-modules/janestreet/textutils.nix +++ b/pkgs/development/ocaml-modules/janestreet/textutils.nix @@ -10,7 +10,7 @@ buildOcamlJane { ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/textutils; + homepage = "https://github.com/janestreet/textutils"; description = "Text output utilities"; maintainers = [ maintainers.maurer ]; license = licenses.asl20; diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix index 2e8fcde1d0d..9ed037e5211 100644 --- a/pkgs/development/ocaml-modules/janestreet/typerep.nix +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -11,7 +11,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/typerep; + homepage = "https://github.com/janestreet/typerep"; description = "Runtime types for OCaml (beta version)"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix index 7b3af8a080e..02e63291add 100644 --- a/pkgs/development/ocaml-modules/janestreet/variantslib.nix +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -11,7 +11,7 @@ buildOcamlJane { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/variantslib; + homepage = "https://github.com/janestreet/variantslib"; description = "OCaml variants as first class values"; license = licenses.asl20; maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 91ccbc9ca9e..f7978cf4805 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that parses Java .class files into OCaml data structures"; - homepage = https://javalib-team.github.io/javalib/; + homepage = "https://javalib-team.github.io/javalib/"; license = licenses.lgpl3; maintainers = [ maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index 30aea547cbd..bf1e59c2f22 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/tategakibunko/jingoo; + homepage = "https://github.com/tategakibunko/jingoo"; description = "OCaml template engine almost compatible with jinja2"; license = licenses.mit; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index d1f5cabb32d..e1f09f5a4a2 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml non-blocking streaming codec to decode and encode the JSON data format"; - homepage = https://erratique.ch/software/jsonm; + homepage = "https://erratique.ch/software/jsonm"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix index 4eeb8d975fd..0176daeaf6c 100644 --- a/pkgs/development/ocaml-modules/kafka/default.nix +++ b/pkgs/development/ocaml-modules/kafka/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { propagatedBuildInputs = [ rdkafka zlib ]; meta = with stdenv.lib; { - homepage = https://github.com/didier-wenzek/ocaml-kafka; + homepage = "https://github.com/didier-wenzek/ocaml-kafka"; description = "OCaml bindings for Kafka"; license = licenses.mit; maintainers = [ maintainers.rixed ]; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 847322b1a10..2172135e8d4 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html; + homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html"; description = "OpenGL bindings for ocaml"; license = licenses.gpl2; maintainers = with maintainers; [ pSub vbgl ]; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix index dae81f1df16..1dfc4305022 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/1.4.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml-lablgtk-extras-1.4"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1282/lablgtkextras-1.4.tar.gz; + url = "http://forge.ocamlcore.org/frs/download.php/1282/lablgtkextras-1.4.tar.gz"; sha256 = "09fqxwdib7r9yxynknc9gv3jw2hnhj5cak7q5jngk6m8rzvmhfcc"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - homepage = http://gtk-extras.forge.ocamlcore.org/; + homepage = "http://gtk-extras.forge.ocamlcore.org/"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; license = stdenv.lib.licenses.lgpl2Plus; branch = "1.4"; diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix index 9e6013b9083..de1c1e6ea94 100644 --- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; - homepage = http://gtk-extras.forge.ocamlcore.org/; + homepage = "http://gtk-extras.forge.ocamlcore.org/"; description = "A collection of libraries and modules useful when developing OCaml/LablGtk2 applications"; license = stdenv.lib.licenses.lgpl2Plus; }; diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index e2ebb76397c..eae356462b3 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (rec { stdenv.lib.maintainers.maggesi stdenv.lib.maintainers.roconnor ]; - homepage = http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html; + homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgtk.html"; description = "LablGTK is is an Objective Caml interface to GTK"; license = stdenv.lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 46b76abd268..e9ad3104d3f 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -8,7 +8,7 @@ let param = sha256 = "1qsd9nv96fxddc8zayqiqxw9hcyf29axckqg100fm2brs2prpxci"; } else if check "3.12" then { version = "2.18.5"; - url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz"; sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in @@ -39,7 +39,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ maggesi roconnor vbgl ]; - homepage = http://lablgtk.forge.ocamlcore.org/; + homepage = "http://lablgtk.forge.ocamlcore.org/"; description = "An OCaml interface to GTK"; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index b5bcb0de1ee..b91e9268475 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://helm.cs.unibo.it/mml-widget/; + homepage = "http://helm.cs.unibo.it/mml-widget/"; description = "OCaml bindings for gtkmathview"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index e576fa998c2..41bfb3125e3 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inherit (dune) installPhase; meta = with stdenv.lib; { - homepage = http://mmottl.github.io/lacaml; + homepage = "http://mmottl.github.io/lacaml"; description = "OCaml bindings for BLAS and LAPACK"; license = licenses.lgpl21Plus; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 89009c6d4bc..f02ff4d2996 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -28,7 +28,7 @@ buildDunePackage rec { console applications. ''; - homepage = https://github.com/diml/lambda-term; + homepage = "https://github.com/diml/lambda-term"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.gal_bolle diff --git a/pkgs/development/ocaml-modules/lens/default.nix b/pkgs/development/ocaml-modules/lens/default.nix index 27a753ae81a..4a9706b4ba8 100644 --- a/pkgs/development/ocaml-modules/lens/default.nix +++ b/pkgs/development/ocaml-modules/lens/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { buildInputs = [ ppx_deriving ppxfind ]; meta = with lib; { - homepage = https://github.com/pdonadeo/ocaml-lens; + homepage = "https://github.com/pdonadeo/ocaml-lens"; description = "Functional lenses"; license = licenses.bsd3; maintainers = with maintainers; [ diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index b74501fdd68..24fde437d5c 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ llvm ]; patches = [ (fetchpatch { - url = https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch; + url = "https://raw.githubusercontent.com/ocaml/opam-repository/2bdc193f5a9305ea93bf0f0dfc1fbc327c8b9306/packages/llvm/llvm.7.0.0/files/fix-shared.patch"; sha256 = "1p98j3b1vrryfn1xa7i50m6mmm4dyw5ldafq6kyh9sfmdihz4zsx"; })]; diff --git a/pkgs/development/ocaml-modules/lwt/legacy.nix b/pkgs/development/ocaml-modules/lwt/legacy.nix index c540124d104..795baa0467e 100644 --- a/pkgs/development/ocaml-modules/lwt/legacy.nix +++ b/pkgs/development/ocaml-modules/lwt/legacy.nix @@ -47,7 +47,7 @@ buildOcaml { hasSharedObjects = true; meta = with stdenv.lib; { - homepage = http://ocsigen.org/lwt; + homepage = "http://ocsigen.org/lwt"; description = "Lightweight thread library for Objective Caml"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/lwt_react/default.nix b/pkgs/development/ocaml-modules/lwt_react/default.nix index 41276668ecc..4d82db043e8 100644 --- a/pkgs/development/ocaml-modules/lwt_react/default.nix +++ b/pkgs/development/ocaml-modules/lwt_react/default.nix @@ -4,7 +4,7 @@ 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; + url = "https://github.com/ocsigen/lwt/releases/download/3.0.0/lwt_react-1.0.1.tar.gz"; sha256 = "1bbz7brvdskf4angzn3q2s2s6qdnx7x8m8syayysh23gwv4c7v31"; }; diff --git a/pkgs/development/ocaml-modules/macaddr/default.nix b/pkgs/development/ocaml-modules/macaddr/default.nix index 7061fdf5d5b..1332c541354 100644 --- a/pkgs/development/ocaml-modules/macaddr/default.nix +++ b/pkgs/development/ocaml-modules/macaddr/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { doCheck = false; # ipaddr and macaddr tests are together, which requires mutual dependency meta = with lib; { - homepage = https://github.com/mirage/ocaml-ipaddr; + homepage = "https://github.com/mirage/ocaml-ipaddr"; description = "A library for manipulation of MAC address representations"; license = licenses.isc; maintainers = [ maintainers.alexfmpe ]; diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index 3d015e26275..32acccd54f2 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml-macaque-0.7.2"; src = fetchzip { - url = https://github.com/ocsigen/macaque/archive/0.7.2.tar.gz; + url = "https://github.com/ocsigen/macaque/archive/0.7.2.tar.gz"; sha256 = "14i0a8cndzndjmlkyhf31r451q99cnkndgxcj0id4qjqhdl4bmjv"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Macros for Caml Queries"; - homepage = https://github.com/ocsigen/macaque; + homepage = "https://github.com/ocsigen/macaque"; license = licenses.lgpl2; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 16e37addd45..4f3d21be71a 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/mirage/ocaml-magic-mime; + homepage = "https://github.com/mirage/ocaml-magic-mime"; description = "Convert file extensions to MIME types"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.isc; diff --git a/pkgs/development/ocaml-modules/magick/default.nix b/pkgs/development/ocaml-modules/magick/default.nix index ca6ab458fff..349cbea5607 100644 --- a/pkgs/development/ocaml-modules/magick/default.nix +++ b/pkgs/development/ocaml-modules/magick/default.nix @@ -7,7 +7,7 @@ else stdenv.mkDerivation { name = "ocaml-magick-0.34"; src = fetchurl { - url = http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/OCaml-ImageMagick-0.34.tgz; + url = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/ImageMagick/OCaml-ImageMagick-0.34.tgz"; sha256 = "0gn9l2qdr8gby2x8c2mb59x1kipb2plr45rbq6ymcxyi0wmzfh3q"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { installTargets = [ "find_install" ]; meta = { - homepage = http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/; + homepage = "http://www.linux-nantes.org/~fmonnier/OCaml/ImageMagick/"; description = "ImageMagick Binding for OCaml"; license = stdenv.lib.licenses.mit; platforms = imagemagick.meta.platforms; diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index 2c5c674425b..92daea1a4b6 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/aantron/markup.ml/; + homepage = "https://github.com/aantron/markup.ml/"; description = "A pair of best-effort parsers implementing the HTML5 and XML specifications"; license = licenses.bsd2; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/mdx/default.nix b/pkgs/development/ocaml-modules/mdx/default.nix index 43c6c8e41fa..261374115ff 100644 --- a/pkgs/development/ocaml-modules/mdx/default.nix +++ b/pkgs/development/ocaml-modules/mdx/default.nix @@ -26,7 +26,7 @@ buildDunePackage rec { ''; meta = { - homepage = https://github.com/realworldocaml/mdx; + homepage = "https://github.com/realworldocaml/mdx"; description = "Executable OCaml code blocks inside markdown files"; license = lib.licenses.isc; maintainers = [ lib.maintainers.romildo ]; diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index fad11ccedaa..71561e96cd4 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://pauillac.inria.fr/~fpottier/menhir/; + homepage = "http://pauillac.inria.fr/~fpottier/menhir/"; description = "A LR(1) parser generator for OCaml"; longDescription = '' Menhir is a LR(1) parser generator for the Objective Caml programming diff --git a/pkgs/development/ocaml-modules/minisat/default.nix b/pkgs/development/ocaml-modules/minisat/default.nix index 79820b16e6c..9a02f57cc38 100644 --- a/pkgs/development/ocaml-modules/minisat/default.nix +++ b/pkgs/development/ocaml-modules/minisat/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { }; meta = { - homepage = https://c-cube.github.io/ocaml-minisat/; + homepage = "https://c-cube.github.io/ocaml-minisat/"; description = "Simple bindings to Minisat-C"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ mgttlinger ]; diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index 20455cc6016..c37c5bd7811 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://opam.ocamlpro.com/pkg/mlgmp.20120224.html; + homepage = "http://opam.ocamlpro.com/pkg/mlgmp.20120224.html"; description = "OCaml bindings to GNU MP library"; license = "Free software ?"; }; diff --git a/pkgs/development/ocaml-modules/mlgmpidl/default.nix b/pkgs/development/ocaml-modules/mlgmpidl/default.nix index 674d9ec6412..66672f8ea1a 100644 --- a/pkgs/development/ocaml-modules/mlgmpidl/default.nix +++ b/pkgs/development/ocaml-modules/mlgmpidl/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "OCaml interface to the GMP library"; - homepage = https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/; + homepage = "https://www.inrialpes.fr/pop-art/people/bjeannet/mlxxxidl-forge/mlgmpidl/"; license = stdenv.lib.licenses.lgpl21; inherit (ocaml.meta) platforms; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/mparser/default.nix b/pkgs/development/ocaml-modules/mparser/default.nix index 0e4d593482b..786cc1e27ac 100644 --- a/pkgs/development/ocaml-modules/mparser/default.nix +++ b/pkgs/development/ocaml-modules/mparser/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-mparser-1.2.3"; src = fetchzip { - url = https://github.com/cakeplus/mparser/archive/1.2.3.tar.gz; + url = "https://github.com/cakeplus/mparser/archive/1.2.3.tar.gz"; sha256 = "1f8vpagmv0jdm50pxs2xwh2xcmvgaprx4kw871hlml9ahsflxgnw"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "A simple monadic parser combinator OCaml library"; license = stdenv.lib.licenses.lgpl21Plus; - homepage = https://github.com/cakeplus/mparser; + homepage = "https://github.com/cakeplus/mparser"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix index 02d6380715b..2f8545988d8 100644 --- a/pkgs/development/ocaml-modules/mtime/default.nix +++ b/pkgs/development/ocaml-modules/mtime/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "Monotonic wall-clock time for OCaml"; - homepage = https://erratique.ch/software/mtime; + homepage = "https://erratique.ch/software/mtime"; inherit (ocaml.meta) platforms; maintainers = [ maintainers.vbgl ]; license = licenses.bsd3; diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index 9be5ebf8a7b..f9ebb36f40e 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://ocaml-mysql.forge.ocamlcore.org; + homepage = "http://ocaml-mysql.forge.ocamlcore.org"; description = "Bindings for interacting with MySQL databases from ocaml"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index be4befe9c1c..263fdc0bbda 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { inherit (topkg) installPhase; meta = { - homepage = https://github.com/mirleft/ocaml-nocrypto; + homepage = "https://github.com/mirleft/ocaml-nocrypto"; description = "Simplest possible crypto to support TLS"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index da68c811df1..fdb225ba8e8 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ]; meta = { - homepage = http://cairographics.org/cairo-ocaml; + homepage = "http://cairographics.org/cairo-ocaml"; description = "ocaml bindings for cairo library"; license = stdenv.lib.licenses.gpl2; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix index 014525ef2b4..547fa77ae6e 100644 --- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix @@ -1,38 +1,28 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, ounit, gettext, fileutils, camomile }: +{ lib, fetchurl, buildDunePackage, gettext, fileutils, ounit }: -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-gettext-${version}"; - version = "0.3.8"; +buildDunePackage rec { + pname = "gettext"; + version = "0.4.1"; + + minimumOCamlVersion = "4.03"; src = fetchurl { - url = "https://forge.ocamlcore.org/frs/download.php/1731/ocaml-gettext-${version}.tar.gz"; - sha256 = "05wnpxwzzpn2qinah2wb5wzfh5iz8gyf8jyihdbjxc8mk4hf70qv"; + url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-v${version}.tbz"; + sha256 = "0pwy6ym5fd77mdbgyas8x86vbrri9cgk79g8wxdjplhyi7zhh158"; }; - propagatedBuildInputs = [ gettext fileutils camomile ]; - - buildInputs = [ ocaml findlib camlp4 ounit ]; - - postPatch = stdenv.lib.optionalString (camlp4 != null) '' - substituteInPlace test/test.ml --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace ocaml-gettext/OCamlGettext.ml --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace ocaml-gettext/Makefile --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace ocaml-gettext/Makefile --replace "unix.cma" "" - substituteInPlace libgettext-ocaml/Makefile --replace "+camlp4" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib/camlp4" - substituteInPlace libgettext-ocaml/Makefile --replace "\$(shell ocamlc -where)" "${camlp4}/lib/ocaml/${ocaml.version}/site-lib" - ''; + propagatedBuildInputs = [ gettext fileutils ]; - configureFlags = [ "--disable-doc" ]; + doCheck = true; - createFindlibDestdir = true; + checkInputs = lib.optional doCheck ounit; dontStrip = true; - meta = with stdenv.lib; { + meta = with lib; { description = "OCaml Bindings to gettext"; - homepage = https://forge.ocamlcore.org/projects/ocaml-gettext; - license = licenses.gpl2; + homepage = "https://github.com/gildor478/ocaml-gettext"; + license = licenses.lgpl21; maintainers = [ maintainers.volth ]; - platforms = ocaml.meta.platforms or []; }; } diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix new file mode 100644 index 00000000000..b18c0abc530 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-gettext/stub.nix @@ -0,0 +1,14 @@ +{ lib, buildDunePackage, ocaml_gettext, ounit }: + +buildDunePackage rec { + + pname = "gettext-stub"; + + inherit (ocaml_gettext) src version meta; + + propagatedBuildInputs = [ ocaml_gettext ]; + + doCheck = true; + + checkInputs = lib.optional doCheck ounit; +} diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix index 11405c0ebe5..026aeb220e5 100644 --- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { autoconf ''; - buildPhase = if stdenv.cc.isClang then "make all opt CPPFLAGS=-Wno-error" else "make all opt"; + buildPhase = "make all opt CPPFLAGS=-Wno-error"; installPhase = "make install-opt"; meta = with stdenv.lib; { description = "OCaml bindings for libvirt"; - homepage = https://libvirt.org/ocaml/; + homepage = "https://libvirt.org/ocaml/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocaml-r/default.nix b/pkgs/development/ocaml-modules/ocaml-r/default.nix new file mode 100644 index 00000000000..71e77b24ce4 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-r/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildDunePackage, pkg-config, configurator, stdio, R }: + +buildDunePackage rec { + pname = "ocaml-r"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "pveber"; + repo = pname; + rev = "v${version}"; + sha256 = "09gljccwjsw9693m1hm9hcyvgp3p2fvg3cfn18yyidpc2f81a4fy"; + }; + + # Without the following patch, stub generation fails with: + # > Fatal error: exception (Failure "not supported: osVersion") + preConfigure = '' + substituteInPlace stubgen/stubgen.ml --replace \ + 'failwithf "not supported: %s" name ()' \ + 'sprintf "(* not supported: %s *)" name' + ''; + + buildInputs = [ configurator pkg-config R stdio ]; + + meta = { + description = "OCaml bindings for the R interpreter"; + inherit (src.meta) homepage; + license = lib.licenses.gpl3; + maintainers = [ lib.maintainers.bcdarwin ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix index f6dee5ce3ce..df442009922 100644 --- a/pkgs/development/ocaml-modules/ocaml-result/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/janestreet/result; + homepage = "https://github.com/janestreet/result"; description = "Compatibility Result module"; longDescription = '' Projects that want to use the new result type defined in OCaml >= 4.03 diff --git a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix index 12f1440118a..c7779b098e7 100644 --- a/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-sat-solvers/default.nix @@ -16,7 +16,7 @@ buildOasisPackage rec { propagatedBuildInputs = [ minisat ]; meta = { - homepage = https://github.com/tcsprojects/ocaml-sat-solvers; + homepage = "https://github.com/tcsprojects/ocaml-sat-solvers"; description = "SAT Solvers For OCaml"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mgttlinger ]; diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index e210ffa1152..1dc98c9fdd2 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { - homepage = http://ocaml-text.forge.ocamlcore.org/; + homepage = "http://ocaml-text.forge.ocamlcore.org/"; description = "A library for convenient text manipulation"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index 27442075064..90c449e383f 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = https://sourceforge.net/projects/ocamlfuse; + homepage = "https://sourceforge.net/projects/ocamlfuse"; description = "OCaml bindings for FUSE"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index a39e72d3880..d2a94112eb3 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ocamlgraph.lri.fr/; + homepage = "http://ocamlgraph.lri.fr/"; description = "Graph library for Objective Caml"; license = stdenv.lib.licenses.gpl2Oss; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocamlmake/default.nix b/pkgs/development/ocaml-modules/ocamlmake/default.nix index 8063f284728..b4ee828fcc4 100644 --- a/pkgs/development/ocaml-modules/ocamlmake/default.nix +++ b/pkgs/development/ocaml-modules/ocamlmake/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = http://www.ocaml.info/home/ocaml_sources.html; + homepage = "http://www.ocaml.info/home/ocaml_sources.html"; description = "Generic OCaml Makefile for GNU Make"; license = "LGPL"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index d6281e00fde..e98dc62478e 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "OCaml native toplevel"; - homepage = http://benediktmeurer.de/ocamlnat/; + homepage = "http://benediktmeurer.de/ocamlnat/"; license = stdenv.lib.licenses.qpl; longDescription = '' The ocamlnat project provides a new native code OCaml toplevel diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 8cfe43a5d32..693c4d59fef 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = http://ocamlsdl.sourceforge.net/; + homepage = "http://ocamlsdl.sourceforge.net/"; description = "OCaml bindings for SDL 1.2"; license = stdenv.lib.licenses.lgpl21; }; diff --git a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix index 29fa20d460d..3f551903efa 100644 --- a/pkgs/development/ocaml-modules/ocb-stubblr/default.nix +++ b/pkgs/development/ocaml-modules/ocb-stubblr/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-ocb-stubblr-0.1.0"; src = fetchzip { - url = https://github.com/pqwy/ocb-stubblr/releases/download/v0.1.0/ocb-stubblr-0.1.0.tbz; + url = "https://github.com/pqwy/ocb-stubblr/releases/download/v0.1.0/ocb-stubblr-0.1.0.tbz"; name = "src.tar.bz"; sha256 = "0hpds1lkq4j8wgslv7hnirgfrjmqi36h5rarpw9mwf24gfp5ays2"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "OCamlbuild plugin for C stubs"; - homepage = https://github.com/pqwy/ocb-stubblr; + homepage = "https://github.com/pqwy/ocb-stubblr"; license = stdenv.lib.licenses.isc; inherit (ocaml.meta) platforms; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocf/default.nix b/pkgs/development/ocaml-modules/ocf/default.nix index e90d13de3b3..7cff7b625b5 100644 --- a/pkgs/development/ocaml-modules/ocf/default.nix +++ b/pkgs/development/ocaml-modules/ocf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "OCaml library to read and write configuration options in JSON syntax"; - homepage = https://zoggy.github.io/ocf/; + homepage = "https://zoggy.github.io/ocf/"; license = licenses.lgpl3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ regnat ]; diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix index 6410eb29628..07b6f72e38d 100644 --- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix +++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple tool and library to embed files and directories inside OCaml executables"; license = stdenv.lib.licenses.lgpl3Plus; - homepage = https://www.typerex.org/ocp-ocamlres.html; + homepage = "https://www.typerex.org/ocp-ocamlres.html"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 084d70a8e79..719252dbea8 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Optimised functions to read and write int16/32/64"; - homepage = https://github.com/OCamlPro/ocplib-endian; + homepage = "https://github.com/OCamlPro/ocplib-endian"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix index 50c63ef718a..2cf4b6ddffb 100644 --- a/pkgs/development/ocaml-modules/ocplib-simplex/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-simplex/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "An OCaml library implementing a simplex algorithm, in a functional style, for solving systems of linear inequalities"; - homepage = https://github.com/OCamlPro-Iguernlala/ocplib-simplex; + homepage = "https://github.com/OCamlPro-Iguernlala/ocplib-simplex"; inherit (ocaml.meta) platforms; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix index 0263d3284ff..84bc3ce678b 100644 --- a/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-deriving/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/ocsigen/deriving; + homepage = "https://github.com/ocsigen/deriving"; description = "Extension to OCaml for deriving functions from type declarations"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 9b0b8c433c2..0d56f2c783f 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { - homepage = http://ocsigen.org/ocsigenserver/; + homepage = "http://ocsigen.org/ocsigenserver/"; description = "A full featured Web server"; longDescription ='' A full featured Web server. It implements most features of the HTTP protocol, and has a very powerful extension mechanism that make very easy to plug your own OCaml modules for generating pages. diff --git a/pkgs/development/ocaml-modules/ocsigen-start/default.nix b/pkgs/development/ocaml-modules/ocsigen-start/default.nix index 6d8beb8b07b..cc6650df157 100644 --- a/pkgs/development/ocaml-modules/ocsigen-start/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-start/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://ocsigen.org/ocsigen-start; + homepage = "http://ocsigen.org/ocsigen-start"; description = "Eliom application skeleton"; longDescription ='' An Eliom application skeleton, ready to use to build your own application with users, (pre)registration, notifications, etc. diff --git a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix index 2ac54eb4e3c..4dfca784dfa 100644 --- a/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-toolkit/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = { - homepage = http://ocsigen.org/ocsigen-toolkit/; + homepage = "http://ocsigen.org/ocsigen-toolkit/"; description = " User interface widgets for Ocsigen applications"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.gal_bolle ]; diff --git a/pkgs/development/ocaml-modules/octavius/default.nix b/pkgs/development/ocaml-modules/octavius/default.nix index 72e22e5722d..e0189c90181 100644 --- a/pkgs/development/ocaml-modules/octavius/default.nix +++ b/pkgs/development/ocaml-modules/octavius/default.nix @@ -6,7 +6,7 @@ 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; + url = "https://github.com/ocaml-doc/octavius/releases/download/v0.2.0/octavius-0.2.0.tbz"; sha256 = "02milzzlr4xk5aymg2fjz27f528d5pyscqvld3q0dm41zcpkz5ml"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "Ocamldoc comment syntax parser"; - homepage = https://github.com/ocaml-doc/octavius; + homepage = "https://github.com/ocaml-doc/octavius"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index 62644c1e971..c9e5308f8af 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1310/ocaml-data-notation-0.0.11.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1310/ocaml-data-notation-0.0.11.tar.gz"; sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Store data using OCaml notation"; - homepage = https://forge.ocamlcore.org/projects/odn/; + homepage = "https://forge.ocamlcore.org/projects/odn/"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ diff --git a/pkgs/development/ocaml-modules/omd/default.nix b/pkgs/development/ocaml-modules/omd/default.nix index 874893d6297..cf4abeb7ea6 100644 --- a/pkgs/development/ocaml-modules/omd/default.nix +++ b/pkgs/development/ocaml-modules/omd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Extensible Markdown library and tool in OCaml"; - homepage = https://github.com/ocaml/omd; + homepage = "https://github.com/ocaml/omd"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 5b566137747..c177ef52e15 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; src = fetchurl { - url = https://github.com/diml/optcomp/archive/1.6.tar.gz; + url = "https://github.com/diml/optcomp/archive/1.6.tar.gz"; sha256 = "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/diml/optcomp; + homepage = "https://github.com/diml/optcomp"; description = "Optional compilation for OCaml with cpp-like directives"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/opti/default.nix b/pkgs/development/ocaml-modules/opti/default.nix index f6552d57683..82e2378869f 100644 --- a/pkgs/development/ocaml-modules/opti/default.nix +++ b/pkgs/development/ocaml-modules/opti/default.nix @@ -15,6 +15,6 @@ buildDunePackage rec { description = "DSL to generate fast incremental C code from declarative specifications"; license = licenses.bsd3; maintainers = [ maintainers.jmagnusj ]; - homepage = https://github.com/magnusjonsson/opti; + homepage = "https://github.com/magnusjonsson/opti"; }; } diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index ba192b3c24b..866360856d8 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -17,7 +17,7 @@ buildDunePackage rec { doCheck = true; meta = with lib; { - homepage = https://github.com/hannesm/ocaml-otr; + homepage = "https://github.com/hannesm/ocaml-otr"; description = "Off-the-record messaging protocol, purely in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index 6f4536f2e8b..c0668b81112 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ounit-2.0.0"; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1258/ounit-2.0.0.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1258/ounit-2.0.0.tar.gz"; sha256 = "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://ounit.forge.ocamlcore.org/; + homepage = "http://ounit.forge.ocamlcore.org/"; description = "Unit test framework for OCaml"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/pa_bench/default.nix b/pkgs/development/ocaml-modules/pa_bench/default.nix index 2b821cd6dd6..1027d0fc21a 100644 --- a/pkgs/development/ocaml-modules/pa_bench/default.nix +++ b/pkgs/development/ocaml-modules/pa_bench/default.nix @@ -15,7 +15,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/pa_bench; + homepage = "https://github.com/janestreet/pa_bench"; description = "Syntax extension for inline benchmarks"; license = stdenv.lib.licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/pa_ounit/default.nix b/pkgs/development/ocaml-modules/pa_ounit/default.nix index 2471c855cf5..3bd8baac4b7 100644 --- a/pkgs/development/ocaml-modules/pa_ounit/default.nix +++ b/pkgs/development/ocaml-modules/pa_ounit/default.nix @@ -16,7 +16,7 @@ buildOcaml rec { propagatedBuildInputs = [ ounit ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/pa_ounit; + homepage = "https://github.com/janestreet/pa_ounit"; description = "OCaml inline testing"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix index 5acf931b2ea..6a90561c682 100644 --- a/pkgs/development/ocaml-modules/pa_test/default.nix +++ b/pkgs/development/ocaml-modules/pa_test/default.nix @@ -15,7 +15,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv sexplib_p4 herelib ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/pa_test; + homepage = "https://github.com/janestreet/pa_test"; description = "Syntax to reduce boiler plate in testing"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix index 7559fc35d8e..94af6fce260 100644 --- a/pkgs/development/ocaml-modules/pcre/default.nix +++ b/pkgs/development/ocaml-modules/pcre/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontConfigure = true; # Skip configure phase meta = with stdenv.lib; { - homepage = https://bitbucket.org/mmottl/pcre-ocaml; + homepage = "https://bitbucket.org/mmottl/pcre-ocaml"; description = "An efficient C-library for pattern matching with Perl-style regular expressions in OCaml"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/pgsolver/default.nix b/pkgs/development/ocaml-modules/pgsolver/default.nix index 5045cb6a0ee..a1d6fe6486a 100644 --- a/pkgs/development/ocaml-modules/pgsolver/default.nix +++ b/pkgs/development/ocaml-modules/pgsolver/default.nix @@ -15,7 +15,7 @@ buildOasisPackage rec { propagatedBuildInputs = [ tcslib ocaml-sat-solvers ]; meta = { - homepage = https://github.com/tcsprojects/pgsolver; + homepage = "https://github.com/tcsprojects/pgsolver"; description = "A collection of tools for generating, manipulating and - most of all - solving parity games"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mgttlinger ]; diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 87e88cbf496..916be9b3d38 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,23 +1,23 @@ { stdenv, buildDunePackage, fetchFromGitHub, ppx_deriving -, alcotest, biocaml, gnuplot, lacaml, menhir, owl }: +, alcotest, biocaml, gnuplot, lacaml, menhir, ocaml-r, owl, printbox }: buildDunePackage rec { pname = "phylogenetics"; - version = "unstable-2019-11-15"; + version = "unstable-2020-01-05"; useDune2 = true; src = fetchFromGitHub { owner = "biocaml"; repo = pname; - rev = "91c03834db065cf4a86f33affbb9cfd216defc9f"; - sha256 = "0i9m0633a6a724as35ix8z3p1gj267cl0hmqrpw4qfq39zxmgnxb"; + rev = "b55ef7d7322bd822be26d21339945d45487fb547"; + sha256 = "0hzfjhs5w3a7hlzxs739k5ik3k1xn3dzyzziid765s74f638n4hj"; }; minimumOCamlVersion = "4.08"; # e.g., uses Float.min checkInputs = [ alcotest ]; - propagatedBuildInputs = [ biocaml gnuplot lacaml menhir owl ppx_deriving ]; + propagatedBuildInputs = [ biocaml gnuplot lacaml menhir ocaml-r owl ppx_deriving printbox ]; doCheck = false; # many tests require bppsuite diff --git a/pkgs/development/ocaml-modules/pipebang/default.nix b/pkgs/development/ocaml-modules/pipebang/default.nix index 1ab1c5fa7bc..f62978c0a9c 100644 --- a/pkgs/development/ocaml-modules/pipebang/default.nix +++ b/pkgs/development/ocaml-modules/pipebang/default.nix @@ -12,7 +12,7 @@ buildOcaml rec { }; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/pipebang; + homepage = "https://github.com/janestreet/pipebang"; description = "Syntax extension to transform x |! f into f x"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix index 83d47fbb3af..731a5303ff5 100644 --- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ (fetchpatch { - url = https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch; + url = "https://github.com/alavrik/piqi-ocaml/commit/336e8fdb84e77f4105e9bbb5ab545b8729101308.patch"; sha256 = "071s4xjyr6xx95v6az2lbl2igc87n7z5jqnnbhfq2pidrxakd0la"; })]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = "DESTDIR=$out make install"; meta = with stdenv.lib; { - homepage = http://piqi.org; + homepage = "http://piqi.org"; description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix index fb06820f196..c492035f4f9 100644 --- a/pkgs/development/ocaml-modules/piqi/default.nix +++ b/pkgs/development/ocaml-modules/piqi/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://piqi.org; + homepage = "http://piqi.org"; description = "Universal schema language and a collection of tools built around it"; license = licenses.asl20; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index d618f90e541..0e4f9fea7d9 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { installFlags = [ "-C" "src" ]; meta = with stdenv.lib; { - homepage = http://gallium.inria.fr/~fpottier/pprint/; + homepage = "http://gallium.inria.fr/~fpottier/pprint/"; description = "An OCaml adaptation of Wadler’s and Leijen’s prettier printer"; license = licenses.cecill-c; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ppx_blob/default.nix b/pkgs/development/ocaml-modules/ppx_blob/default.nix index 3b72853e782..b6a451848c9 100644 --- a/pkgs/development/ocaml-modules/ppx_blob/default.nix +++ b/pkgs/development/ocaml-modules/ppx_blob/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/johnwhitington/ppx_blob; + homepage = "https://github.com/johnwhitington/ppx_blob"; description = "OCaml ppx to include binary data from a file as a string"; license = licenses.unlicense; }; diff --git a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix index b09ff9c7f22..32865bed631 100644 --- a/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix +++ b/pkgs/development/ocaml-modules/ppx_gen_rec/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ ocaml-migrate-parsetree ]; meta = with stdenv.lib; { - homepage = https://github.com/flowtype/ocaml-ppx_gen_rec; + homepage = "https://github.com/flowtype/ocaml-ppx_gen_rec"; description = "ocaml preprocessor that generates a recursive module"; license = licenses.mit; maintainers = [ maintainers.frontsideair ]; diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 8173fc87aba..a8d438d3731 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -41,7 +41,7 @@ let src = fetchFromGitHub { pname = "ppx_tools"; meta = with stdenv.lib; { description = "Tools for authors of ppx rewriters"; - homepage = http://www.lexifi.com/ppx_tools; + homepage = "https://www.lexifi.com/ppx_tools"; license = licenses.mit; maintainers = with maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix index de3d940b3bb..e60a8d5a86d 100644 --- a/pkgs/development/ocaml-modules/ptime/default.nix +++ b/pkgs/development/ocaml-modules/ptime/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { inherit (topkg) installPhase; meta = { - homepage = https://erratique.ch/software/ptime; + homepage = "https://erratique.ch/software/ptime"; description = "POSIX time for OCaml"; longDescription = '' Ptime has platform independent POSIX time support in pure OCaml. diff --git a/pkgs/development/ocaml-modules/ptmap/default.nix b/pkgs/development/ocaml-modules/ptmap/default.nix index d6637d23052..f635fadd6d0 100644 --- a/pkgs/development/ocaml-modules/ptmap/default.nix +++ b/pkgs/development/ocaml-modules/ptmap/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.lri.fr/~filliatr/software.en.html; + homepage = "https://www.lri.fr/~filliatr/software.en.html"; platforms = ocaml.meta.platforms or []; description = "Maps over integers implemented as Patricia trees"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/pycaml/default.nix b/pkgs/development/ocaml-modules/pycaml/default.nix index 46453f30d3b..1aa2590f2ae 100644 --- a/pkgs/development/ocaml-modules/pycaml/default.nix +++ b/pkgs/development/ocaml-modules/pycaml/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/chemoelectric/pycaml; + homepage = "https://github.com/chemoelectric/pycaml"; description = "Bindings for python and ocaml"; license = "LGPL"; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index dfe7ec84d63..be625f4d8d7 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-qcheck-0.7"; src = fetchzip { - url = https://github.com/c-cube/qcheck/archive/0.7.tar.gz; + url = "https://github.com/c-cube/qcheck/archive/0.7.tar.gz"; sha256 = "1afy7li74r3ivpvq670gvsj1rmglh5rnvb17p6w8gy5rh30aljah"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "QuickCheck inspired property-based testing for OCaml"; - homepage = https://github.com/c-cube/qcheck/; + homepage = "https://github.com/c-cube/qcheck/"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index ecc1a89a804..51a8e08983c 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; - homepage = https://github.com/vincent-hugot/iTeML; + homepage = "https://github.com/vincent-hugot/iTeML"; platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ vbgl ]; }; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 29fb4fd09b2..2031c469b29 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -16,7 +16,7 @@ buildDunePackage rec { doCheck = true; meta = { - homepage = https://github.com/ocaml/ocaml-re; + homepage = "https://github.com/ocaml/ocaml-re"; description = "Pure OCaml regular expressions, with support for Perl and POSIX-style strings"; license = stdenv.lib.licenses.lgpl2; maintainers = with stdenv.lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index 2b7d9855665..1132d97f74a 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -21,7 +21,7 @@ buildOcaml rec { hasSharedObjects = true; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/re2; + homepage = "https://github.com/janestreet/re2"; description = "OCaml bindings for RE2"; license = stdenv.lib.licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 7baf8b743be..02bba95405d 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml-react-1.2.1"; src = fetchurl { - url = https://erratique.ch/software/react/releases/react-1.2.1.tbz; + url = "https://erratique.ch/software/react/releases/react-1.2.1.tbz"; sha256 = "1aj8w79gdd9xnrbz7s5p8glcb4pmimi8jp9f439dqnf6ih3mqb3v"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { inherit (topkg) buildPhase installPhase; meta = with stdenv.lib; { - homepage = https://erratique.ch/software/react; + homepage = "https://erratique.ch/software/react"; description = "Applicative events and signals for OCaml"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 05bfe2c0934..667c9727604 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -7,7 +7,7 @@ else stdenv.mkDerivation { name = "ocaml${ocaml.version}-reactiveData-0.2.2"; src = fetchurl { - url = https://github.com/ocsigen/reactiveData/archive/0.2.2.tar.gz; + url = "https://github.com/ocsigen/reactiveData/archive/0.2.2.tar.gz"; sha256 = "0jzagyp4zla28wykvcgqwd8df71ir0vb4s8akp02cfacd5v86sng"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OCaml module for functional reactive programming (FRP) based on React"; - homepage = https://github.com/ocsigen/reactiveData; + homepage = "https://github.com/ocsigen/reactiveData"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/rope/default.nix b/pkgs/development/ocaml-modules/rope/default.nix index 0223d4f59ff..41d2d258b97 100644 --- a/pkgs/development/ocaml-modules/rope/default.nix +++ b/pkgs/development/ocaml-modules/rope/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation ({ buildInputs = [ ocaml findlib benchmark ] ++ param.buildInputs; meta = { - homepage = http://rope.forge.ocamlcore.org/; + homepage = "http://rope.forge.ocamlcore.org/"; platforms = ocaml.meta.platforms or []; description = ''Ropes ("heavyweight strings") in OCaml''; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix index 579d3da81e3..cdaa7857398 100644 --- a/pkgs/development/ocaml-modules/rresult/default.nix +++ b/pkgs/development/ocaml-modules/rresult/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.isc; - homepage = https://erratique.ch/software/rresult; + homepage = "https://erratique.ch/software/rresult"; description = "Result value combinators for OCaml"; maintainers = [ stdenv.lib.maintainers.vbgl ]; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 214789e52b4..884bcdebba4 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -4,11 +4,11 @@ let param = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { version = "2.0"; - url = http://forge.ocamlcore.org/frs/download.php/1615/ocaml-safepass-2.0.tgz; + url = "http://forge.ocamlcore.org/frs/download.php/1615/ocaml-safepass-2.0.tgz"; sha256 = "1zxx3wcyzhxxvm5w9c21y7hpa11h67paaaz9mfsyiqk6fs6hcvmw"; } else { version = "1.3"; - url = http://forge.ocamlcore.org/frs/download.php/1432/ocaml-safepass-1.3.tgz; + url = "http://forge.ocamlcore.org/frs/download.php/1432/ocaml-safepass-1.3.tgz"; sha256 = "0lb8xbpyc5d1zml7s7mmcr6y2ipwdp7qz73lkv9asy7dyi6cj15g"; }; in @@ -24,7 +24,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://ocaml-safepass.forge.ocamlcore.org/; + homepage = "http://ocaml-safepass.forge.ocamlcore.org/"; description = "An OCaml library offering facilities for the safe storage of user passwords"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/secp256k1/default.nix b/pkgs/development/ocaml-modules/secp256k1/default.nix index 64f05b26dd8..ed60cb96273 100644 --- a/pkgs/development/ocaml-modules/secp256k1/default.nix +++ b/pkgs/development/ocaml-modules/secp256k1/default.nix @@ -14,7 +14,7 @@ buildDunePackage { buildInputs = [ base stdio configurator secp256k1 ]; meta = with stdenv.lib; { - homepage = https://github.com/dakk/secp256k1-ml; + homepage = "https://github.com/dakk/secp256k1-ml"; description = "Elliptic curve library secp256k1 wrapper for Ocaml"; license = licenses.mit; maintainers = [ maintainers.vyorkin ]; diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index 26c35b98339..7b751ba0303 100644 --- a/pkgs/development/ocaml-modules/sedlex/2.nix +++ b/pkgs/development/ocaml-modules/sedlex/2.nix @@ -53,7 +53,7 @@ buildDunePackage rec { dontStrip = true; meta = { - homepage = https://github.com/ocaml-community/sedlex; + homepage = "https://github.com/ocaml-community/sedlex"; description = "An OCaml lexer generator for Unicode"; license = lib.licenses.mit; maintainers = [ lib.maintainers.marsam ]; diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix index 653f4532585..d34b18bf059 100644 --- a/pkgs/development/ocaml-modules/sedlex/default.nix +++ b/pkgs/development/ocaml-modules/sedlex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned }: +{ stdenv, fetchzip, ocaml, findlib, gen, ppx_tools_versioned, ocaml-migrate-parsetree }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "sedlex is not available for OCaml ${ocaml.version}" @@ -13,9 +13,9 @@ stdenv.mkDerivation rec { sha256 = "0phnqyn6mpv5byr1kkphl24y9q9fb2k3xg9yb457h5816q6ya72n"; }; - buildInputs = [ ocaml findlib ppx_tools_versioned ]; + buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ gen ]; + propagatedBuildInputs = [ gen ocaml-migrate-parsetree ppx_tools_versioned ]; buildFlags = [ "all" "opt" ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = { - homepage = https://github.com/ocaml-community/sedlex; + homepage = "https://github.com/ocaml-community/sedlex"; description = "An OCaml lexer generator for Unicode"; license = stdenv.lib.licenses.mit; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index 685f2afb0b4..349dffcf47b 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-sexplib-108.08.00"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/sexplib-108.08.00.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/sexplib-108.08.00.tar.gz"; sha256 = "11z1k1d7dbb5m957klgalimpr0r602xp5zkkbgbffib1bphasarg"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { branch = "108"; - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix index e98a2ecdb30..adf878bca03 100644 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "ocaml-sexplib-111.25.00"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/111.25.00/individual/sexplib-111.25.00.tar.gz"; sha256 = "0qh0zqp5nakqpmmhh4x7cg03vqj3j2bj4zj0nqdlksai188p9ila"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.vbgl maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix index 24cdb497189..fe7b9020dae 100644 --- a/pkgs/development/ocaml-modules/sexplib/112.24.01.nix +++ b/pkgs/development/ocaml-modules/sexplib/112.24.01.nix @@ -17,7 +17,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv camlp4 ]; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Library for serializing OCaml values to and from S-expressions"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix index 8c8895d4520..ee9b90d4603 100644 --- a/pkgs/development/ocaml-modules/sodium/default.nix +++ b/pkgs/development/ocaml-modules/sodium/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { hardeningDisable = stdenv.lib.optional stdenv.isDarwin "strictoverflow"; meta = with stdenv.lib; { - homepage = https://github.com/dsheets/ocaml-sodium; + homepage = "https://github.com/dsheets/ocaml-sodium"; description = "Binding to libsodium 1.0.9+"; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.rixed ]; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index f47d7d37631..2cc02abbb44 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ sqlite ]; meta = with lib; { - homepage = http://mmottl.github.io/sqlite3-ocaml/; + homepage = "http://mmottl.github.io/sqlite3-ocaml/"; description = "OCaml bindings to the SQLite 3 database access library"; license = licenses.mit; maintainers = with maintainers; [ diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index e8f248ee4a1..a3e26a31a8f 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "ocaml-sqlite3EZ-0.1.0"; src = fetchurl { - url = https://github.com/mlin/ocaml-sqlite3EZ/archive/v0.1.0.tar.gz; + url = "https://github.com/mlin/ocaml-sqlite3EZ/archive/v0.1.0.tar.gz"; sha256 = "8ed2c5d5914a65cbd95589ef11bfb8b38a020eb850cdd49b8adce7ee3a563748"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/mlin/ocaml-sqlite3EZ; + homepage = "https://github.com/mlin/ocaml-sqlite3EZ"; description = "A thin wrapper for sqlite3-ocaml with a simplified interface"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 3086558e3eb..9a574a0457a 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -15,7 +15,7 @@ buildDunePackage rec { propagatedBuildInputs = [openssl]; meta = { - homepage = http://savonet.rastageeks.org/; + homepage = "http://savonet.rastageeks.org/"; description = "OCaml bindings for libssl "; license = "LGPL+link exception"; maintainers = [ diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index c932bc3a46a..bd0187dc5f4 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/rgrinberg/stringext; + homepage = "https://github.com/rgrinberg/stringext"; platforms = ocaml.meta.platforms or []; description = "Extra string functions for OCaml"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/development/ocaml-modules/syslog/default.nix b/pkgs/development/ocaml-modules/syslog/default.nix index 117277fe1b6..2fa032225e7 100644 --- a/pkgs/development/ocaml-modules/syslog/default.nix +++ b/pkgs/development/ocaml-modules/syslog/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://github.com/rixed/ocaml-syslog; + homepage = "https://github.com/rixed/ocaml-syslog"; description = "Simple wrapper to access the system logger from OCaml"; license = licenses.lgpl21Plus; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/tcslib/default.nix b/pkgs/development/ocaml-modules/tcslib/default.nix index 9d1d5a8096c..a8ddea79b77 100644 --- a/pkgs/development/ocaml-modules/tcslib/default.nix +++ b/pkgs/development/ocaml-modules/tcslib/default.nix @@ -17,7 +17,7 @@ buildOasisPackage rec { propagatedBuildInputs = [ ocaml_extlib num ]; meta = { - homepage = https://github.com/tcsprojects/tcslib; + homepage = "https://github.com/tcsprojects/tcslib"; description = "A multi-purpose library for OCaml"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ mgttlinger ]; diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix index 6f35b970228..6f0ca82a453 100644 --- a/pkgs/development/ocaml-modules/textutils/default.nix +++ b/pkgs/development/ocaml-modules/textutils/default.nix @@ -15,7 +15,7 @@ buildOcaml rec { propagatedBuildInputs = [ core_p4 pa_ounit sexplib_p4 ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/textutils; + homepage = "https://github.com/janestreet/textutils"; description = ""; license = stdenv.lib.licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 80d9933f8b6..9343ae5b1ec 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { inherit (topkg) installPhase; meta = with stdenv.lib; { - homepage = https://github.com/mirleft/ocaml-tls; + homepage = "https://github.com/mirleft/ocaml-tls"; description = "TLS in pure OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index edbbec3dcb3..d2327b93a4f 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { passthru = { inherit run; }; meta = { - homepage = https://erratique.ch/software/topkg; + homepage = "https://erratique.ch/software/topkg"; license = stdenv.lib.licenses.isc; maintainers = [ stdenv.lib.maintainers.vbgl ]; description = "A packager for distributing OCaml software"; diff --git a/pkgs/development/ocaml-modules/tuntap/default.nix b/pkgs/development/ocaml-modules/tuntap/default.nix index 3a3e90c9d0f..8e8eaf5fd5e 100644 --- a/pkgs/development/ocaml-modules/tuntap/default.nix +++ b/pkgs/development/ocaml-modules/tuntap/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ocaml-tuntap-1.3.0"; src = fetchzip { - url = https://github.com/mirage/ocaml-tuntap/archive/v1.3.0.tar.gz; + url = "https://github.com/mirage/ocaml-tuntap/archive/v1.3.0.tar.gz"; sha256 = "1cmd4kky875ks02gm2nb8yr80hmlfcnjdfyc63hvkh49acssy3d5"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Bindings to the UNIX tuntap facility"; license = stdenv.lib.licenses.isc; - homepage = https://github.com/mirage/ocaml-tuntap; + homepage = "https://github.com/mirage/ocaml-tuntap"; inherit (ocaml.meta) platforms; }; diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix index 940f6cf5107..235d04ba99b 100644 --- a/pkgs/development/ocaml-modules/twt/default.nix +++ b/pkgs/development/ocaml-modules/twt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-twt-0.94.0"; src = fetchzip { - url = https://github.com/mlin/twt/archive/v0.94.0.tar.gz; + url = "https://github.com/mlin/twt/archive/v0.94.0.tar.gz"; sha256 = "0298gdgzl4cifxnc1d8sbrvz1lkiq5r5ifkq1fparm6gvqywpf65"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { dontStrip = true; meta = with stdenv.lib; { - homepage = http://people.csail.mit.edu/mikelin/ocaml+twt/; + homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/"; description = "“The Whitespace Thing” for OCaml"; license = licenses.mit; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index f2e272ed395..69439c1c265 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-type_conv-108.08.00"; src = fetchurl { - url = https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz; + url = "https://ocaml.janestreet.com/ocaml-core/108.08.00/individual/type_conv-108.08.00.tar.gz"; sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://ocaml.janestreet.com/; + homepage = "https://ocaml.janestreet.com/"; description = "Support library for OCaml preprocessor type conversions"; license = licenses.asl20; branch = "108"; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index 706554bc027..a970091df51 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "ocaml-type_conv-109.60.01"; src = fetchurl { - url = https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz; + url = "https://github.com/janestreet/type_conv/archive/109.60.01.tar.gz"; sha256 = "0lpxri68glgq1z2pp02rp45cb909xywbff8d4idljrf6fzzil2zx"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = http://forge.ocamlcore.org/projects/type-conv/; + homepage = "http://forge.ocamlcore.org/projects/type-conv/"; description = "Support library for OCaml preprocessor type conversions"; license = stdenv.lib.licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix index f6c1ec9ad06..ee0ce0ae0be 100644 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix @@ -12,7 +12,7 @@ buildOcaml rec { }; meta = { - homepage = https://github.com/janestreet/type_conv/; + homepage = "https://github.com/janestreet/type_conv/"; description = "Support library for preprocessor type conversions"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ maggesi ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/typerep/default.nix b/pkgs/development/ocaml-modules/typerep/default.nix index 9500579e245..859bd21b0a7 100644 --- a/pkgs/development/ocaml-modules/typerep/default.nix +++ b/pkgs/development/ocaml-modules/typerep/default.nix @@ -14,7 +14,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/typerep; + homepage = "https://github.com/janestreet/typerep"; description = "Runtime types for OCaml (beta version)"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 94bcdb45f32..0d0d43229f8 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { propagatedBuildInputs = [ uutf re ]; meta = with lib; { - homepage = http://ocsigen.org/tyxml/; + homepage = "http://ocsigen.org/tyxml/"; description = "A library that makes it almost impossible for your OCaml programs to generate wrong XML output, using static typing"; license = licenses.lgpl21; maintainers = with maintainers; [ diff --git a/pkgs/development/ocaml-modules/uchar/default.nix b/pkgs/development/ocaml-modules/uchar/default.nix index b5b2170e56a..819d8527b2a 100644 --- a/pkgs/development/ocaml-modules/uchar/default.nix +++ b/pkgs/development/ocaml-modules/uchar/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-uchar-0.0.2"; src = fetchurl { - url = https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz; + url = "https://github.com/ocaml/uchar/releases/download/v0.0.2/uchar-0.0.2.tbz"; sha256 = "1w2saw7zanf9m9ffvz2lvcxvlm118pws2x1wym526xmydhqpyfa7"; }; diff --git a/pkgs/development/ocaml-modules/uri/legacy.nix b/pkgs/development/ocaml-modules/uri/legacy.nix index f08ee7fc2fc..474ab927885 100644 --- a/pkgs/development/ocaml-modules/uri/legacy.nix +++ b/pkgs/development/ocaml-modules/uri/legacy.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = { - homepage = https://github.com/mirage/ocaml-uri; + homepage = "https://github.com/mirage/ocaml-uri"; platforms = ocaml.meta.platforms or []; description = "RFC3986 URI parsing library for OCaml"; license = stdenv.lib.licenses.isc; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 497b2df88b1..399f147bd0d 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122"; - homepage = https://erratique.ch/software/uuidm; + homepage = "https://erratique.ch/software/uuidm"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.maurer ]; diff --git a/pkgs/development/ocaml-modules/variantslib/default.nix b/pkgs/development/ocaml-modules/variantslib/default.nix index 425383a6485..ebb0857e918 100644 --- a/pkgs/development/ocaml-modules/variantslib/default.nix +++ b/pkgs/development/ocaml-modules/variantslib/default.nix @@ -18,7 +18,7 @@ buildOcaml rec { propagatedBuildInputs = [ type_conv ]; meta = with stdenv.lib; { - homepage = https://github.com/janestreet/variantslib; + homepage = "https://github.com/janestreet/variantslib"; description = "OCaml variants as first class values"; license = licenses.asl20; maintainers = [ maintainers.ericbmerritt ]; diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix index 36205c7c1ff..35cdfc3a9af 100644 --- a/pkgs/development/ocaml-modules/visitors/default.nix +++ b/pkgs/development/ocaml-modules/visitors/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocaml${ocaml.version}-visitors-20190711"; src = fetchurl { - url = http://gallium.inria.fr/~fpottier/visitors/visitors-20190711.tar.gz; + url = "http://gallium.inria.fr/~fpottier/visitors/visitors-20190711.tar.gz"; sha256 = "1h794xczfczf573mpwzm4ah9ir1rbbrkqipbh3aflfpdq2mgsbvg"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = https://gitlab.inria.fr/fpottier/visitors; + homepage = "https://gitlab.inria.fr/fpottier/visitors"; license = licenses.lgpl21; description = "An OCaml syntax extension (technically, a ppx_deriving plugin) which generates object-oriented visitors for traversing and transforming data structures"; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix index fe3d4ea0e86..99f2cf582cb 100644 --- a/pkgs/development/ocaml-modules/wasm/default.nix +++ b/pkgs/development/ocaml-modules/wasm/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "An executable and OCaml library to run, read and write Web Assembly (wasm) files and manipulate their AST"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.vbgl ]; - homepage = https://github.com/WebAssembly/spec/tree/master/interpreter; + homepage = "https://github.com/WebAssembly/spec/tree/master/interpreter"; inherit (ocaml.meta) platforms; }; } diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix index 420cb30bb94..ea09b326d39 100644 --- a/pkgs/development/ocaml-modules/wtf8/default.nix +++ b/pkgs/development/ocaml-modules/wtf8/default.nix @@ -12,7 +12,7 @@ buildDunePackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/flowtype/ocaml-wtf8; + homepage = "https://github.com/flowtype/ocaml-wtf8"; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; license = licenses.mit; maintainers = [ maintainers.eqyiel ]; diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 63ddc6e67bd..22006d0693a 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { doCheck = lib.versionAtLeast ocaml.version "4.06"; meta = with lib; { - homepage = https://github.com/mirleft/ocaml-x509; + homepage = "https://github.com/mirleft/ocaml-x509"; description = "X509 (RFC5280) handling in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ vbgl ]; diff --git a/pkgs/development/ocaml-modules/xml-light/default.nix b/pkgs/development/ocaml-modules/xml-light/default.nix index 83e4451e668..82f635afb68 100644 --- a/pkgs/development/ocaml-modules/xml-light/default.nix +++ b/pkgs/development/ocaml-modules/xml-light/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { entirely written in OCaml, hence it does not require additional C library. ''; - homepage = http://tech.motion-twin.com/xmllight.html; + homepage = "http://tech.motion-twin.com/xmllight.html"; license = stdenv.lib.licenses.lgpl21; maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index f0cb5a59485..1123cc0d2b4 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -7,11 +7,11 @@ let source = if stdenv.lib.versionAtLeast ocaml.version "4.02" then { version = "1.9"; - url = https://github.com/ocaml/Zarith/archive/release-1.9.tar.gz; + url = "https://github.com/ocaml/Zarith/archive/release-1.9.tar.gz"; sha256 = "1xrqcaj5gp52xp4ybpnblw8ciwlgrr0zi7rg7hnk8x83isjkpmwx"; } else { version = "1.3"; - url = http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz; + url = "http://forge.ocamlcore.org/frs/download.php/1471/zarith-1.3.tgz"; sha256 = "1mx3nxcn5h33qhx4gbg0hgvvydwlwdvdhqcnvfwnmf9jy3b8frll"; }; in diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index 9fa42e68c56..66054b33407 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (rec { To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities. ''; - homepage = https://github.com/diml/zed; + homepage = "https://github.com/diml/zed"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ diff --git a/pkgs/development/perl-modules/Percona-Toolkit/default.nix b/pkgs/development/perl-modules/Percona-Toolkit/default.nix index 3b19b64367d..58ccd2bc8be 100644 --- a/pkgs/development/perl-modules/Percona-Toolkit/default.nix +++ b/pkgs/development/perl-modules/Percona-Toolkit/default.nix @@ -13,7 +13,7 @@ buildPerlPackage { buildInputs = [ DBDmysql DBI IOSocketSSL TermReadKey ]; meta = { description = ''Collection of advanced command-line tools to perform a variety of MySQL and system tasks.''; - homepage = http://www.percona.com/software/percona-toolkit; + homepage = "http://www.percona.com/software/percona-toolkit"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ izorkin ]; }; diff --git a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix index 6a3ed466e8f..dc48c9931a8 100644 --- a/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix +++ b/pkgs/development/perl-modules/WWW-YoutubeViewer/default.nix @@ -2,13 +2,13 @@ buildPerlPackage rec { pname = "WWW-YoutubeViewer"; - version = "3.3.0"; + version = "3.7.5"; src = fetchFromGitHub { owner = "trizen"; repo = "youtube-viewer"; rev = version; - sha256 = "15xyrwv08fw8jmpydwzks26ipxnzliwddgyjcfqiaj0p7lwlhmx1"; + sha256 = "1caz56sxy554avz2vdv9gm7gyqcq0gyixzrh5v9ixmg6vxif5d4f"; }; nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; @@ -24,7 +24,7 @@ buildPerlPackage rec { meta = { description = "A lightweight application for searching and streaming videos from YouTube"; - homepage = https://github.com/trizen/youtube-viewer; + homepage = "https://github.com/trizen/youtube-viewer"; maintainers = with stdenv.lib.maintainers; [ woffs ]; license = with stdenv.lib.licenses; [ artistic2 ]; }; diff --git a/pkgs/development/perl-modules/ham/default.nix b/pkgs/development/perl-modules/ham/default.nix index 637e6ac22dd..d1b0d1f18e5 100644 --- a/pkgs/development/perl-modules/ham/default.nix +++ b/pkgs/development/perl-modules/ham/default.nix @@ -34,7 +34,7 @@ buildPerlPackage { meta = { description = "A tool to manage big projects consisting of multiple loosely-coupled git repositories"; - homepage = https://github.com/kernkonzept/ham; + homepage = "https://github.com/kernkonzept/ham"; license = "unknown"; # should be gpl2, but not quite sure maintainers = with lib.maintainers; [ aw ]; platforms = lib.platforms.unix; diff --git a/pkgs/development/perl-modules/maatkit/default.nix b/pkgs/development/perl-modules/maatkit/default.nix index b23b7afa7a3..e0a1a45cd44 100644 --- a/pkgs/development/perl-modules/maatkit/default.nix +++ b/pkgs/development/perl-modules/maatkit/default.nix @@ -5,7 +5,7 @@ buildPerlPackage { version = "7540"; src = fetchurl { - url = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/maatkit-7540.tar.gz; + url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/maatkit/maatkit-7540.tar.gz"; sha256 = "1a7rxrddkrsfxb2wj01ha91ld0vapfkqcy8j9p08l76zz2l8p2v1"; }; @@ -38,6 +38,6 @@ buildPerlPackage { growing variety of other databases and technologies. ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.maatkit.org/; + homepage = "http://www.maatkit.org/"; }; } diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix index 5bccd0946c3..5f6deca863c 100644 --- a/pkgs/development/pharo/launcher/default.nix +++ b/pkgs/development/pharo/launcher/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { access it very rapidly from your OS application launcher. As a result, launching any image is never more than 3 clicks away. ''; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ ]; platforms = pharo.meta.platforms; diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index e76b1802c23..fd6312c7b27 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu packaging (ppa:pharo/stable)' project. ''; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index 38516cc1914..4bc60dde410 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -165,7 +165,7 @@ stdenv.mkDerivation rec { Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu packaging (ppa:pharo/stable)' project. ''; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = licenses.mit; maintainers = [ maintainers.lukego ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix index ec4168508a7..ee7a0494ede 100644 --- a/pkgs/development/pharo/vm/share.nix +++ b/pkgs/development/pharo/vm/share.nix @@ -7,32 +7,32 @@ stdenv.mkDerivation rec { dontUnpack = true; sources10Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV10.sources.zip; + url = "http://files.pharo.org/sources/PharoV10.sources.zip"; sha256 = "0aijhr3w5w3jzmnpl61g6xkwyi2l1mxy0qbvr9k3whz8zlrsijh2"; }; sources20Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV20.sources.zip; + url = "http://files.pharo.org/sources/PharoV20.sources.zip"; sha256 = "1xsc0p361pp8iha5zckppw29sbapd706wbvzvgjnkv2n6n1q5gj7"; }; sources30Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV30.sources.zip; + url = "http://files.pharo.org/sources/PharoV30.sources.zip"; sha256 = "08d9a7gggwpwgrfbp7iv5896jgqz3vgjfrq19y3jw8k10pva98ak"; }; sources40Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV40.sources.zip; + url = "http://files.pharo.org/sources/PharoV40.sources.zip"; sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd"; }; sources50Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV50.sources.zip; + url = "http://files.pharo.org/sources/PharoV50.sources.zip"; sha256 = "1vmcah03zacvj1r2x27vdp63g6rcbz3prjd5sjy1z0a9xsjmqp25"; }; sources60Zip = fetchurl { - url = http://files.pharo.org/sources/PharoV60.sources.zip; + url = "http://files.pharo.org/sources/PharoV60.sources.zip"; sha256 = "0xbdi679ryb2zg412xy6zkh22l20pmbl92m3qhfgzjvgybna8z2a"; }; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "Shared files for Pharo"; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 080da830af6..7b96b5a9139 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -55,7 +55,7 @@ let suffix = if stdenv.is64bit then "64" else "32"; in cog = pharo-vm-build-legacy rec { version = "2016.02.18"; name = "pharo-cog${suffix}"; - base-url = http://files.pharo.org/vm/src/vm-unix-sources/blessed; + base-url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed"; src = fetchurl { url = "${base-url}/pharo-vm-${version}.tar.bz2"; sha256 = "16n2zg7v2s1ml0vvpbhkw6khmgn637sr0d7n2b28qm5yc8pfhcj4"; diff --git a/pkgs/development/pharo/wrapper/default.nix b/pkgs/development/pharo/wrapper/default.nix index 084c46cd5b5..b9b147bf418 100644 --- a/pkgs/development/pharo/wrapper/default.nix +++ b/pkgs/development/pharo/wrapper/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { http://www.mirandabanda.org/cogblog/about-cog/ ''; - homepage = http://pharo.org; + homepage = "http://pharo.org"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.lukego ]; # Pharo VM sources are packaged separately for darwin (OS X) diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index cd1435d6599..e99c87ec706 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A digital audio interface for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-audio.html; + homepage = "http://puredocs.bitbucket.org/pure-audio.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index 8ce33e67efe..4745593cb7f 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A digital audio interface for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-avahi.html; + homepage = "http://puredocs.bitbucket.org/pure-avahi.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index 7524823a5dc..501271df8c0 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Comma Separated Value Interface for the Pure Programming Language"; - homepage = http://puredocs.bitbucket.org/pure-csv.html; + homepage = "http://puredocs.bitbucket.org/pure-csv.html"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index 1a006c9eb8f..c009b23f4ee 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { 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; + homepage = "http://puredocs.bitbucket.org/pure-doc.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index e41110386d7..622ea140f66 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-fastcgi.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index e1c1b4d2d4b..1f5b443fe38 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-faust.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index 4d019b5b699..8518c2cb01f 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-ffi.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 54ac78fd6c4..9956c142daf 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Pure interface generator"; - homepage = http://puredocs.bitbucket.org/pure-gen.html; + homepage = "http://puredocs.bitbucket.org/pure-gen.html"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 34c13f99f92..77173870bca 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { 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; + homepage = "http://puredocs.bitbucket.org/pure-gl.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 838e81b20ba..a70dbbd047a 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "GLPK interface for the Pure Programming Language"; - homepage = http://puredocs.bitbucket.org/pure-glpk.html; + homepage = "http://puredocs.bitbucket.org/pure-glpk.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index c45f51509b7..998c8f1972a 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A pure binding to gnuplot"; - homepage = http://puredocs.bitbucket.org/pure-gplot.html; + homepage = "http://puredocs.bitbucket.org/pure-gplot.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 847fe7538e9..6c6a381f285 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Scientific Library interface for Pure"; - homepage = http://puredocs.bitbucket.org/pure-gsl.html; + homepage = "http://puredocs.bitbucket.org/pure-gsl.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index 1e7957ae382..ff619226a81 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-gtk.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index 94ceef78908..a633ad7c1d7 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-liblo.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index c0f50812946..85a504c9082 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-lilv.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index b4a63eb7020..6e8f38cf2a9 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-lv2.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index e55d4994455..3e2a3993fc1 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A MIDI interface for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-midi.html; + homepage = "http://puredocs.bitbucket.org/pure-midi.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index 59617beb461..13c9eee1bd9 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "This module makes the MPFR multiprecision floats available in Pure"; - homepage = http://puredocs.bitbucket.org/pure-mpfr.html; + homepage = "http://puredocs.bitbucket.org/pure-mpfr.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index e117d04a4cc..d064eeb0d41 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "An Octave module for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-octave.html; + homepage = "http://puredocs.bitbucket.org/pure-octave.html"; license = stdenv.lib.licenses.gpl3Plus; # This is set to none for now because it does not work with the # current stable version of Octave. diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index 69808d1aaf0..e95e1c3d1c1 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple ODBC interface for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-odbc.html; + homepage = "http://puredocs.bitbucket.org/pure-odbc.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index 17a16229b57..fc615690df1 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -21,7 +21,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-pandoc.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index 547610fdf01..be230141a4a 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-rational.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index d145788c552..24f64d94470 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-readline.html"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index aa8245bb12d..e80d66f3ab8 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A Pure interface to the Berkeley socket functions"; - homepage = http://puredocs.bitbucket.org/pure-sockets.html; + homepage = "http://puredocs.bitbucket.org/pure-sockets.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index aa3b2544af0..c658ee0c556 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A SQLite module for the Pure programming language"; - homepage = http://puredocs.bitbucket.org/pure-sql3.html; + homepage = "http://puredocs.bitbucket.org/pure-sql3.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index b248a0084ff..ae28055a2f9 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -23,7 +23,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-stldict.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index d29719891d2..9d35794b190 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -23,7 +23,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-stllib.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index d939a3b3ad4..496da2a20ea 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "A basic interface between Pure and Tcl/Tk"; - homepage = http://puredocs.bitbucket.org/pure-tk.html; + homepage = "http://puredocs.bitbucket.org/pure-tk.html"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index 73753a5d34f..ac4f1f0e6b0 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -17,7 +17,7 @@ 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; + homepage = "http://puredocs.bitbucket.org/pure-xml.html"; license = stdenv.lib.licenses.lgpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ asppsa ]; diff --git a/pkgs/development/python-modules/3to2/default.nix b/pkgs/development/python-modules/3to2/default.nix index 4e6c0f9214c..ff64a6d1a47 100644 --- a/pkgs/development/python-modules/3to2/default.nix +++ b/pkgs/development/python-modules/3to2/default.nix @@ -5,11 +5,12 @@ }: buildPythonPackage rec { - pname = "3to2"; + pname = "py3to2"; version = "1.1.1"; src = fetchPypi { - inherit pname version; + inherit version; + pname = "3to2"; extension = "zip"; sha256 = "fef50b2b881ef743f269946e1090b77567b71bb9a9ce64b7f8e699b562ff685c"; }; @@ -24,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://bitbucket.org/amentajo/lib3to2; + homepage = "https://bitbucket.org/amentajo/lib3to2"; description = "Refactors valid 3.x syntax into valid 2.x syntax, if a syntactical conversion is possible"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mt-caret ]; diff --git a/pkgs/development/python-modules/APScheduler/default.nix b/pkgs/development/python-modules/APScheduler/default.nix index 1f2a89c5e0c..21b8d509646 100644 --- a/pkgs/development/python-modules/APScheduler/default.nix +++ b/pkgs/development/python-modules/APScheduler/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library that lets you schedule your Python code to be executed"; - homepage = https://pypi.python.org/pypi/APScheduler/; + homepage = "https://pypi.python.org/pypi/APScheduler/"; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index d700a07b275..1074d2eef48 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; meta = with lib; { - homepage = http://babel.edgewall.org; + homepage = "http://babel.edgewall.org"; description = "A collection of tools for internationalizing Python applications"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix index aff4e0b62b3..2d987abb3e4 100644 --- a/pkgs/development/python-modules/Cython/default.nix +++ b/pkgs/development/python-modules/Cython/default.nix @@ -68,7 +68,7 @@ in buildPythonPackage rec { meta = { description = "An optimising static compiler for both the Python programming language and the extended Cython programming language"; - homepage = https://cython.org; + homepage = "https://cython.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index b0c81a62e33..c6fb898e070 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic remote execution"; - homepage = https://www.fabfile.org/; + homepage = "https://www.fabfile.org/"; license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/FormEncode/default.nix b/pkgs/development/python-modules/FormEncode/default.nix index 72086a3487f..f79e76b52c4 100644 --- a/pkgs/development/python-modules/FormEncode/default.nix +++ b/pkgs/development/python-modules/FormEncode/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "FormEncode validates and converts nested structures"; - homepage = http://formencode.org; + homepage = "http://formencode.org"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/GeoIP/default.nix b/pkgs/development/python-modules/GeoIP/default.nix index 550fa1da3ed..0e4b66fe962 100644 --- a/pkgs/development/python-modules/GeoIP/default.nix +++ b/pkgs/development/python-modules/GeoIP/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "MaxMind GeoIP Legacy Database - Python API"; - homepage = https://www.maxmind.com/; + homepage = "https://www.maxmind.com/"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/GitPython/default.nix b/pkgs/development/python-modules/GitPython/default.nix index 0487b204581..b15b5ebf344 100644 --- a/pkgs/development/python-modules/GitPython/default.nix +++ b/pkgs/development/python-modules/GitPython/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Python Git Library"; maintainers = [ ]; - homepage = https://github.com/gitpython-developers/GitPython; + homepage = "https://github.com/gitpython-developers/GitPython"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/HTSeq/default.nix b/pkgs/development/python-modules/HTSeq/default.nix index 7cbe523ba1e..8158c675898 100644 --- a/pkgs/development/python-modules/HTSeq/default.nix +++ b/pkgs/development/python-modules/HTSeq/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, cython, numpy, pysam, matplotlib }: buildPythonPackage rec { - version = "0.11.2"; + version = "0.11.4"; pname = "HTSeq"; src = fetchPypi { inherit pname version; - sha256 = "65c4c13968506c7df92e97124df96fdd041c4476c12a548d67350ba8b436bcfc"; + sha256 = "1ncn30yvc18aiv1qsa0bvcbjwqy21s0a0kv3v0vghzsn8vbfzq7h"; }; buildInputs = [ cython numpy pysam ]; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index 22093f0258a..ef034b0f627 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/originell/jpype/; + homepage = "https://github.com/originell/jpype/"; license = licenses.asl20; description = "A Python to Java bridge"; }; diff --git a/pkgs/development/python-modules/JayDeBeApi/default.nix b/pkgs/development/python-modules/JayDeBeApi/default.nix index dd1cc819ad6..738419e8c5c 100644 --- a/pkgs/development/python-modules/JayDeBeApi/default.nix +++ b/pkgs/development/python-modules/JayDeBeApi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/baztian/jaydebeapi; + homepage = "https://github.com/baztian/jaydebeapi"; license = licenses.lgpl2; description = "Use JDBC database drivers from Python 2/3 or Jython with a DB-API"; }; diff --git a/pkgs/development/python-modules/Logbook/default.nix b/pkgs/development/python-modules/Logbook/default.nix index 97befe7190a..fa05a7a6dff 100644 --- a/pkgs/development/python-modules/Logbook/default.nix +++ b/pkgs/development/python-modules/Logbook/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; meta = { - homepage = https://pythonhosted.org/Logbook/; + homepage = "https://pythonhosted.org/Logbook/"; description = "A logging replacement for Python"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/Mako/default.nix b/pkgs/development/python-modules/Mako/default.nix index c7120308204..8d22094526d 100644 --- a/pkgs/development/python-modules/Mako/default.nix +++ b/pkgs/development/python-modules/Mako/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Super-fast templating language"; - homepage = http://www.makotemplates.org; + homepage = "http://www.makotemplates.org"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/Markups/default.nix b/pkgs/development/python-modules/Markups/default.nix index 6fe41e40419..eb802989a5c 100644 --- a/pkgs/development/python-modules/Markups/default.nix +++ b/pkgs/development/python-modules/Markups/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "A wrapper around various text markup languages."; - homepage = https://github.com/retext-project/pymarkups; + homepage = "https://github.com/retext-project/pymarkups"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ klntsky ]; }; diff --git a/pkgs/development/python-modules/MechanicalSoup/default.nix b/pkgs/development/python-modules/MechanicalSoup/default.nix index 7882685df4c..07330ebbca9 100644 --- a/pkgs/development/python-modules/MechanicalSoup/default.nix +++ b/pkgs/development/python-modules/MechanicalSoup/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for automating interaction with websites"; - homepage = https://github.com/hickford/MechanicalSoup; + homepage = "https://github.com/hickford/MechanicalSoup"; license = licenses.mit; maintainers = [ maintainers.jgillich ]; }; diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index d36a47c331c..d3b6fa58750 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://getnikola.com/; + homepage = "https://getnikola.com/"; description = "A modular, fast, simple, static website and blog generator"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/Pmw/default.nix b/pkgs/development/python-modules/Pmw/default.nix index a666cad1fc6..9dfb8de3b2c 100644 --- a/pkgs/development/python-modules/Pmw/default.nix +++ b/pkgs/development/python-modules/Pmw/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "A toolkit for building high-level compound widgets in Python using the Tkinter module"; - homepage = http://pmw.sourceforge.net/; + homepage = "http://pmw.sourceforge.net/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mounium ]; }; diff --git a/pkgs/development/python-modules/PyLD/default.nix b/pkgs/development/python-modules/PyLD/default.nix index df8738ce247..1c7bc2ff93f 100644 --- a/pkgs/development/python-modules/PyLD/default.nix +++ b/pkgs/development/python-modules/PyLD/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python implementation of the JSON-LD API"; - homepage = https://github.com/digitalbazaar/pyld; + homepage = "https://github.com/digitalbazaar/pyld"; license = licenses.bsd3; maintainers = with maintainers; [ apeschar ]; }; diff --git a/pkgs/development/python-modules/Pygments/default.nix b/pkgs/development/python-modules/Pygments/default.nix index ca9181fc068..a0c40550c9a 100644 --- a/pkgs/development/python-modules/Pygments/default.nix +++ b/pkgs/development/python-modules/Pygments/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://pygments.org/; + homepage = "https://pygments.org/"; description = "A generic syntax highlighter"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/development/python-modules/Rtree/default.nix b/pkgs/development/python-modules/Rtree/default.nix index 22f54d08e5c..9adfbb67e62 100644 --- a/pkgs/development/python-modules/Rtree/default.nix +++ b/pkgs/development/python-modules/Rtree/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "R-Tree spatial index for Python GIS"; - homepage = https://toblerity.org/rtree/; + homepage = "https://toblerity.org/rtree/"; license = licenses.lgpl21; maintainers = with maintainers; [ bgamari ]; }; diff --git a/pkgs/development/python-modules/Theano/default.nix b/pkgs/development/python-modules/Theano/default.nix index 67600a6e5fd..88aee76fe5b 100644 --- a/pkgs/development/python-modules/Theano/default.nix +++ b/pkgs/development/python-modules/Theano/default.nix @@ -82,7 +82,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ numpy numpy.blas scipy six libgpuarray_ ]; meta = with stdenv.lib; { - homepage = http://deeplearning.net/software/theano/; + homepage = "http://deeplearning.net/software/theano/"; description = "A Python library for large-scale array computation"; license = licenses.bsd3; maintainers = with maintainers; [ maintainers.bcdarwin ]; diff --git a/pkgs/development/python-modules/TurboCheetah/default.nix b/pkgs/development/python-modules/TurboCheetah/default.nix index 45c42a7b43f..717b2b5f278 100644 --- a/pkgs/development/python-modules/TurboCheetah/default.nix +++ b/pkgs/development/python-modules/TurboCheetah/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "TurboGears plugin to support use of Cheetah templates"; - homepage = http://docs.turbogears.org/TurboCheetah; + homepage = "http://docs.turbogears.org/TurboCheetah"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix index adad2051292..ac04861b41d 100644 --- a/pkgs/development/python-modules/WSME/default.nix +++ b/pkgs/development/python-modules/WSME/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simplify the writing of REST APIs, and extend them with additional protocols"; - homepage = http://git.openstack.org/cgit/openstack/wsme; + homepage = "http://git.openstack.org/cgit/openstack/wsme"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/Wand/default.nix b/pkgs/development/python-modules/Wand/default.nix index 7c8387e48fc..872cda33b59 100644 --- a/pkgs/development/python-modules/Wand/default.nix +++ b/pkgs/development/python-modules/Wand/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Ctypes-based simple MagickWand API binding for Python"; - homepage = http://wand-py.org/; + homepage = "http://wand-py.org/"; license = [ licenses.mit ]; maintainers = with maintainers; [ infinisil ]; }; diff --git a/pkgs/development/python-modules/WazeRouteCalculator/default.nix b/pkgs/development/python-modules/WazeRouteCalculator/default.nix index 34757f0e29c..02519e9dc66 100644 --- a/pkgs/development/python-modules/WazeRouteCalculator/default.nix +++ b/pkgs/development/python-modules/WazeRouteCalculator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Calculate actual route time and distance with Waze API"; - homepage = https://github.com/kovacsbalu/WazeRouteCalculator; + homepage = "https://github.com/kovacsbalu/WazeRouteCalculator"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/XlsxWriter/default.nix b/pkgs/development/python-modules/XlsxWriter/default.nix index d5c24c018b6..e2828b1860d 100644 --- a/pkgs/development/python-modules/XlsxWriter/default.nix +++ b/pkgs/development/python-modules/XlsxWriter/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "A Python module for creating Excel XLSX files"; - homepage = https://xlsxwriter.readthedocs.io/; + homepage = "https://xlsxwriter.readthedocs.io/"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; }; diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix index d75511f8d4c..ed07a60e0a8 100644 --- a/pkgs/development/python-modules/aafigure/default.nix +++ b/pkgs/development/python-modules/aafigure/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "ASCII art to image converter"; - homepage = https://launchpad.net/aafigure/; + homepage = "https://launchpad.net/aafigure/"; license = licenses.bsd2; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/accupy/default.nix b/pkgs/development/python-modules/accupy/default.nix index 07c2bcfeb5e..07805c470c3 100644 --- a/pkgs/development/python-modules/accupy/default.nix +++ b/pkgs/development/python-modules/accupy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Accurate sums and dot products for Python"; - homepage = https://github.com/nschloe/accupy; + homepage = "https://github.com/nschloe/accupy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/acme-tiny/default.nix b/pkgs/development/python-modules/acme-tiny/default.nix index 51b4b15cd18..b9bc11a34c7 100644 --- a/pkgs/development/python-modules/acme-tiny/default.nix +++ b/pkgs/development/python-modules/acme-tiny/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tiny script to issue and renew TLS certs from Let's Encrypt"; - homepage = https://github.com/diafygi/acme-tiny; + homepage = "https://github.com/diafygi/acme-tiny"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/actdiag/default.nix b/pkgs/development/python-modules/actdiag/default.nix index 34d4c2a37a7..00a08b3e7a8 100644 --- a/pkgs/development/python-modules/actdiag/default.nix +++ b/pkgs/development/python-modules/actdiag/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { patches = fetchpatch { name = "drop_test_pep8.py.patch"; - url = https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw; + url = "https://bitbucket.org/blockdiag/actdiag/commits/c1f2ed5947a1e93291f5860e4e30cee098bd635d/raw"; sha256 = "1zxzwb0fvwlc8xgs45fx65341sjhb3h6l2p6rdj6i127vg1hsxb4"; }; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate activity-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; + homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix index a2e4d015b2a..4b8bd814934 100644 --- a/pkgs/development/python-modules/adal/default.nix +++ b/pkgs/development/python-modules/adal/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources"; - homepage = https://github.com/AzureAD/azure-activedirectory-library-for-python; + homepage = "https://github.com/AzureAD/azure-activedirectory-library-for-python"; license = licenses.mit; maintainers = with maintainers; [ phreedom ]; }; diff --git a/pkgs/development/python-modules/adb-homeassistant/default.nix b/pkgs/development/python-modules/adb-homeassistant/default.nix index 4e37d18a9f3..ff49aec1fbb 100644 --- a/pkgs/development/python-modules/adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/adb-homeassistant/default.nix @@ -33,7 +33,7 @@ buildPythonPackage { meta = with lib; { description = "A pure python implementation of the Android ADB and Fastboot protocols"; - homepage = https://github.com/JeffLIrion/python-adb/tree/adb-homeassistant; + homepage = "https://github.com/JeffLIrion/python-adb/tree/adb-homeassistant"; license = licenses.asl20; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/addic7ed-cli/default.nix b/pkgs/development/python-modules/addic7ed-cli/default.nix index b87a084fd8c..bdf6aab3dbf 100644 --- a/pkgs/development/python-modules/addic7ed-cli/default.nix +++ b/pkgs/development/python-modules/addic7ed-cli/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A commandline access to addic7ed subtitles"; - homepage = https://github.com/BenoitZugmeyer/addic7ed-cli; + homepage = "https://github.com/BenoitZugmeyer/addic7ed-cli"; license = licenses.mit; maintainers = with maintainers; [ aethelz ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix index d64bd672ca0..f688c394853 100644 --- a/pkgs/development/python-modules/aenum/default.nix +++ b/pkgs/development/python-modules/aenum/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Advanced Enumerations (compatible with Python's stdlib Enum), NamedTuples, and NamedConstants"; maintainers = with stdenv.lib.maintainers; [ vrthra ]; license = with stdenv.lib.licenses; [ bsd3 ]; - homepage = https://bitbucket.org/stoneleaf/aenum; + homepage = "https://bitbucket.org/stoneleaf/aenum"; }; } diff --git a/pkgs/development/python-modules/affine/default.nix b/pkgs/development/python-modules/affine/default.nix index ba137ed5178..89062cde4d9 100644 --- a/pkgs/development/python-modules/affine/default.nix +++ b/pkgs/development/python-modules/affine/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Matrices describing affine transformation of the plane"; license = licenses.bsd3; - homepage = https://github.com/sgillies/affine; + homepage = "https://github.com/sgillies/affine"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/affinity/default.nix b/pkgs/development/python-modules/affinity/default.nix index 4eaaf56b441..c6eb9543024 100644 --- a/pkgs/development/python-modules/affinity/default.nix +++ b/pkgs/development/python-modules/affinity/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "control processor affinity on windows and linux"; - homepage = http://cheeseshop.python.org/pypi/affinity; + homepage = "http://cheeseshop.python.org/pypi/affinity"; license = with lib.licenses; [ psfl ]; }; } diff --git a/pkgs/development/python-modules/agate-dbf/default.nix b/pkgs/development/python-modules/agate-dbf/default.nix index f070dcb258e..bfb5300a82b 100644 --- a/pkgs/development/python-modules/agate-dbf/default.nix +++ b/pkgs/development/python-modules/agate-dbf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Adds read support for dbf files to agate"; - homepage = https://github.com/wireservice/agate-dbf; + homepage = "https://github.com/wireservice/agate-dbf"; license = with licenses; [ mit ]; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/agate-excel/default.nix b/pkgs/development/python-modules/agate-excel/default.nix index ced0ff28090..af98bbded8c 100644 --- a/pkgs/development/python-modules/agate-excel/default.nix +++ b/pkgs/development/python-modules/agate-excel/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Adds read support for excel files to agate"; - homepage = https://github.com/wireservice/agate-excel; + homepage = "https://github.com/wireservice/agate-excel"; license = licenses.mit; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/agate-sql/default.nix b/pkgs/development/python-modules/agate-sql/default.nix index 82da607b3ef..a458f78f262 100644 --- a/pkgs/development/python-modules/agate-sql/default.nix +++ b/pkgs/development/python-modules/agate-sql/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Adds SQL read/write support to agate."; - homepage = https://github.com/wireservice/agate-sql; + homepage = "https://github.com/wireservice/agate-sql"; license = with licenses; [ mit ]; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/agate/default.nix b/pkgs/development/python-modules/agate/default.nix index b0992141faa..a2b622dd211 100644 --- a/pkgs/development/python-modules/agate/default.nix +++ b/pkgs/development/python-modules/agate/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python data analysis library that is optimized for humans instead of machines"; - homepage = https://github.com/wireservice/agate; + homepage = "https://github.com/wireservice/agate"; license = with licenses; [ mit ]; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 8db47220543..5be5b6a1dd0 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/polyconseil/aioamqp; + homepage = "https://github.com/polyconseil/aioamqp"; description = "AMQP implementation using asyncio"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/aiocontextvars/default.nix b/pkgs/development/python-modules/aiocontextvars/default.nix index 38fdf14164e..728f2b5fa61 100644 --- a/pkgs/development/python-modules/aiocontextvars/default.nix +++ b/pkgs/development/python-modules/aiocontextvars/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio support for PEP-567 contextvars backport"; - homepage = https://github.com/fantix/aiocontextvars; + homepage = "https://github.com/fantix/aiocontextvars"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix index a8287df10f6..694f92577cb 100644 --- a/pkgs/development/python-modules/aiodns/default.nix +++ b/pkgs/development/python-modules/aiodns/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/saghul/aiodns; + homepage = "https://github.com/saghul/aiodns"; license = licenses.mit; description = "Simple DNS resolver for asyncio"; }; diff --git a/pkgs/development/python-modules/aiofiles/default.nix b/pkgs/development/python-modules/aiofiles/default.nix index 4728d819f05..917e3914c10 100644 --- a/pkgs/development/python-modules/aiofiles/default.nix +++ b/pkgs/development/python-modules/aiofiles/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "File support for asyncio"; - homepage = https://github.com/Tinche/aiofiles; + homepage = "https://github.com/Tinche/aiofiles"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 1d2b32a73b9..91dbdc05a9e 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ftp client/server for asyncio"; - homepage = https://github.com/aio-libs/aioftp; + homepage = "https://github.com/aio-libs/aioftp"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aioh2/default.nix b/pkgs/development/python-modules/aioh2/default.nix index fdeb5fb0082..6af4c4230b0 100644 --- a/pkgs/development/python-modules/aioh2/default.nix +++ b/pkgs/development/python-modules/aioh2/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; # https://github.com/decentfox/aioh2/issues/17 meta = with lib; { - homepage = https://github.com/decentfox/aioh2; + homepage = "https://github.com/decentfox/aioh2"; description = "HTTP/2 implementation with hyper-h2 on Python 3 asyncio"; license = licenses.bsd3; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/pkgs/development/python-modules/aiohttp-jinja2/default.nix index 58f62b9b0f3..24804464fae 100644 --- a/pkgs/development/python-modules/aiohttp-jinja2/default.nix +++ b/pkgs/development/python-modules/aiohttp-jinja2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jinja2 support for aiohttp"; - homepage = https://github.com/aio-libs/aiohttp_jinja2; + homepage = "https://github.com/aio-libs/aiohttp_jinja2"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/aiohttp-remotes/default.nix b/pkgs/development/python-modules/aiohttp-remotes/default.nix index 51120d07121..861dbb9bf07 100644 --- a/pkgs/development/python-modules/aiohttp-remotes/default.nix +++ b/pkgs/development/python-modules/aiohttp-remotes/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch; + url = "https://github.com/aio-libs/aiohttp-remotes/commit/188772abcea038c31dae7d607e487eeed44391bc.patch"; sha256 = "0pb1y4jb8ar1szhnjiyj2sdmdk6z9h6c3wrxw59nv9kr3if5igvs"; }) ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/wikibusiness/aiohttp-remotes; + homepage = "https://github.com/wikibusiness/aiohttp-remotes"; description = "A set of useful tools for aiohttp.web server"; license = licenses.mit; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 792db7091d0..392c77036ca 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.6"; + version = "0.3.7"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "0js7p9qj5x6k8i2cby4c6mw6xrp4dy4m82f3n1l8rz00qibmj37j"; + sha256 = "00zqlkhfrp1jczgjppaksriidyfshnj0jvrcryn1x77dmy73m023"; }; propagatedBuildInputs = [ aiohttp attrs ]; diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix index e01e3ce30bc..36b1c235345 100644 --- a/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Swagger API Documentation builder for aiohttp"; - homepage = https://github.com/cr0hn/aiohttp-swagger; + homepage = "https://github.com/cr0hn/aiohttp-swagger"; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 304a2a362e9..7d164cf5e4f 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asynchronous HTTP Client/Server for Python and asyncio"; license = licenses.asl20; - homepage = https://github.com/aio-libs/aiohttp; + homepage = "https://github.com/aio-libs/aiohttp"; maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index ede51da9ef1..91c059497fc 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "asyncio package to talk to Philips Hue"; - homepage = https://github.com/balloob/aiohue; + homepage = "https://github.com/balloob/aiohue"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/aioimaplib/default.nix b/pkgs/development/python-modules/aioimaplib/default.nix index 9003618a0fd..e3f046e10fc 100644 --- a/pkgs/development/python-modules/aioimaplib/default.nix +++ b/pkgs/development/python-modules/aioimaplib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python asyncio IMAP4rev1 client library"; - homepage = https://github.com/bamthomas/aioimaplib; + homepage = "https://github.com/bamthomas/aioimaplib"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/aiokafka/default.nix b/pkgs/development/python-modules/aiokafka/default.nix index b31f83dc136..b83da06c481 100644 --- a/pkgs/development/python-modules/aiokafka/default.nix +++ b/pkgs/development/python-modules/aiokafka/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Kafka integration with asyncio"; - homepage = https://aiokafka.readthedocs.org; + homepage = "https://aiokafka.readthedocs.org"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiolifx-effects/default.nix b/pkgs/development/python-modules/aiolifx-effects/default.nix index bbe2b538ac5..0a06144c65c 100644 --- a/pkgs/development/python-modules/aiolifx-effects/default.nix +++ b/pkgs/development/python-modules/aiolifx-effects/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiolifx ]; meta = with lib; { - homepage = https://github.com/amelchio/aiolifx_effects; + homepage = "https://github.com/amelchio/aiolifx_effects"; license = licenses.mit; description = "Light effects (pulse, colorloop ...) for LIFX lights running on aiolifx"; maintainers = with maintainers; [ netixx ]; diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix index 0afaa65e40c..c40f8d3b447 100644 --- a/pkgs/development/python-modules/aiolifx/default.nix +++ b/pkgs/development/python-modules/aiolifx/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ bitstring ifaddr ]; meta = with lib; { - homepage = https://github.com/frawau/aiolifx; + homepage = "https://github.com/frawau/aiolifx"; license = licenses.mit; description = "API for local communication with LIFX devices over a LAN with asyncio"; maintainers = with maintainers; [ netixx ]; diff --git a/pkgs/development/python-modules/aiomysql/default.nix b/pkgs/development/python-modules/aiomysql/default.nix index 891e9f216ce..acaeb0ba783 100644 --- a/pkgs/development/python-modules/aiomysql/default.nix +++ b/pkgs/development/python-modules/aiomysql/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "MySQL driver for asyncio"; - homepage = https://github.com/aio-libs/aiomysql; + homepage = "https://github.com/aio-libs/aiomysql"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aioprocessing/default.nix b/pkgs/development/python-modules/aioprocessing/default.nix index f2f95911268..938ef94db42 100644 --- a/pkgs/development/python-modules/aioprocessing/default.nix +++ b/pkgs/development/python-modules/aioprocessing/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "A library that integrates the multiprocessing module with asyncio"; - homepage = https://github.com/dano/aioprocessing; + homepage = "https://github.com/dano/aioprocessing"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ uskudnik ]; }; diff --git a/pkgs/development/python-modules/aioredis/default.nix b/pkgs/development/python-modules/aioredis/default.nix index 7769f543754..a199878fc21 100644 --- a/pkgs/development/python-modules/aioredis/default.nix +++ b/pkgs/development/python-modules/aioredis/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Asyncio (PEP 3156) Redis client library"; - homepage = https://github.com/aio-libs/aioredis; + homepage = "https://github.com/aio-libs/aioredis"; license = licenses.mit; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/aioresponses/default.nix b/pkgs/development/python-modules/aioresponses/default.nix index 01c37275fc3..bbeca1c3150 100644 --- a/pkgs/development/python-modules/aioresponses/default.nix +++ b/pkgs/development/python-modules/aioresponses/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "A helper to mock/fake web requests in python aiohttp package"; - homepage = https://github.com/pnuckowski/aioresponses; + homepage = "https://github.com/pnuckowski/aioresponses"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/aiorpcx/default.nix b/pkgs/development/python-modules/aiorpcx/default.nix index eba64f46559..5b270319661 100644 --- a/pkgs/development/python-modules/aiorpcx/default.nix +++ b/pkgs/development/python-modules/aiorpcx/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { meta = { description = "Transport, protocol and framing-independent async RPC client and server implementation"; license = lib.licenses.mit; - homepage = https://github.com/kyuupichan/aiorpcX; + homepage = "https://github.com/kyuupichan/aiorpcX"; }; } diff --git a/pkgs/development/python-modules/aiorun/default.nix b/pkgs/development/python-modules/aiorun/default.nix index 16a8a167fbb..8eda59a9abf 100644 --- a/pkgs/development/python-modules/aiorun/default.nix +++ b/pkgs/development/python-modules/aiorun/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Boilerplate for asyncio applications"; - homepage = https://github.com/cjrh/aiorun; + homepage = "https://github.com/cjrh/aiorun"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiosmtpd/default.nix b/pkgs/development/python-modules/aiosmtpd/default.nix index 77d7cf653d1..7bdddb42d4e 100644 --- a/pkgs/development/python-modules/aiosmtpd/default.nix +++ b/pkgs/development/python-modules/aiosmtpd/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://aiosmtpd.readthedocs.io/en/latest/; + homepage = "https://aiosmtpd.readthedocs.io/en/latest/"; description = "Asyncio based SMTP server"; longDescription = '' This is a server for SMTP and related protocols, similar in utility to the diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix index 1032485e980..e64b2e84ed5 100644 --- a/pkgs/development/python-modules/aiosqlite/default.nix +++ b/pkgs/development/python-modules/aiosqlite/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Asyncio bridge to the standard sqlite3 module"; - homepage = https://github.com/jreese/aiosqlite; + homepage = "https://github.com/jreese/aiosqlite"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index e86fc222eea..e6a9afcc2c9 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "An asynchronous Python library for communicating with Unifi Controller API"; - homepage = https://pypi.python.org/pypi/aiounifi/; + homepage = "https://pypi.python.org/pypi/aiounifi/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/aiounittest/default.nix b/pkgs/development/python-modules/aiounittest/default.nix index 743600a0d3b..eeb0ea0af57 100644 --- a/pkgs/development/python-modules/aiounittest/default.nix +++ b/pkgs/development/python-modules/aiounittest/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test asyncio code more easily"; - homepage = https://github.com/kwarunek/aiounittest; + homepage = "https://github.com/kwarunek/aiounittest"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aiozeroconf/default.nix b/pkgs/development/python-modules/aiozeroconf/default.nix index 78b1c215c2b..b89ba73b0d6 100644 --- a/pkgs/development/python-modules/aiozeroconf/default.nix +++ b/pkgs/development/python-modules/aiozeroconf/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; - homepage = https://github.com/jstasiak/python-zeroconf; + homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; maintainers = with maintainers; [ obadz ]; }; diff --git a/pkgs/development/python-modules/alabaster/default.nix b/pkgs/development/python-modules/alabaster/default.nix index e5aaa9a6c76..d54741b63ea 100644 --- a/pkgs/development/python-modules/alabaster/default.nix +++ b/pkgs/development/python-modules/alabaster/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/bitprophet/alabaster; + homepage = "https://github.com/bitprophet/alabaster"; description = "A Sphinx theme"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/alarmdecoder/default.nix b/pkgs/development/python-modules/alarmdecoder/default.nix new file mode 100644 index 00000000000..ef8b74bb9d7 --- /dev/null +++ b/pkgs/development/python-modules/alarmdecoder/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb +, pyopenssl, nose, isPy3k, pythonOlder, mock }: + +buildPythonPackage rec { + pname = "alarmdecoder"; + version = "1.13.9"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "nutechsoftware"; + repo = "alarmdecoder"; + rev = version; + sha256 = "0plr2h1qn4ryawbaxf29cfna4wailghhaqy1jcm9kxq6q7b9xqqy"; + }; + + propagatedBuildInputs = [ pyserial pyftdi pyusb pyopenssl ]; + + doCheck = !isPy3k; + checkInputs = [ nose mock ]; + pythonImportsCheck = [ "alarmdecoder" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/nutechsoftware/alarmdecoder"; + description = + "Python interface for the Alarm Decoder (AD2) family of alarm devices. (AD2USB, AD2SERIAL and AD2PI)"; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix index 72e7ae6417a..0a22f7aa289 100644 --- a/pkgs/development/python-modules/alembic/default.nix +++ b/pkgs/development/python-modules/alembic/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://bitbucket.org/zzzeek/alembic; + homepage = "https://bitbucket.org/zzzeek/alembic"; description = "A database migration tool for SQLAlchemy"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index 55674b660c0..55d6a5c6bdf 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; meta = with stdenv.lib; { - homepage = https://alerta.io; + homepage = "https://alerta.io"; description = "Alerta Monitoring System server"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index fe44b88bc8a..c75ad2d14f9 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; meta = with stdenv.lib; { - homepage = https://alerta.io; + homepage = "https://alerta.io"; description = "Alerta Monitoring System command-line interface"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/algebraic-data-types/default.nix b/pkgs/development/python-modules/algebraic-data-types/default.nix index 4b4986795ce..8a46d405799 100644 --- a/pkgs/development/python-modules/algebraic-data-types/default.nix +++ b/pkgs/development/python-modules/algebraic-data-types/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Algebraic data types for Python"; - homepage = https://github.com/jspahrsummers/adt; + homepage = "https://github.com/jspahrsummers/adt"; license = licenses.mit; maintainers = with maintainers; [ uri-canva ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/allpairspy/default.nix b/pkgs/development/python-modules/allpairspy/default.nix index 0ab69aef71e..9e1aac84f30 100644 --- a/pkgs/development/python-modules/allpairspy/default.nix +++ b/pkgs/development/python-modules/allpairspy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pairwise test combinations generator"; - homepage = https://github.com/thombashi/allpairspy; + homepage = "https://github.com/thombashi/allpairspy"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 0b869e4228b..d15d1ea0110 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pazz/alot; + homepage = "https://github.com/pazz/alot"; description = "Terminal MUA using notmuch mail"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix index c80af1acdc5..f5076953bf2 100644 --- a/pkgs/development/python-modules/altair/default.nix +++ b/pkgs/development/python-modules/altair/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "altair"; - version = "4.0.1"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "145gjad415zjfp0ciq1b19i97ibavj8fki1vzhjppqz55k4704nk"; + sha256 = "0c99q5dy6f275yg1f137ird08wmwc1z8wmvjickkf2mvyka31p9y"; }; propagatedBuildInputs = [ @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A declarative statistical visualization library for Python."; - homepage = https://github.com/altair-viz/altair; + homepage = "https://github.com/altair-viz/altair"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/amazon_kclpy/default.nix b/pkgs/development/python-modules/amazon_kclpy/default.nix index a405b575b25..f18b5e59e34 100644 --- a/pkgs/development/python-modules/amazon_kclpy/default.nix +++ b/pkgs/development/python-modules/amazon_kclpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Amazon Kinesis Client Library for Python"; - homepage = https://github.com/awslabs/amazon-kinesis-client-python; + homepage = "https://github.com/awslabs/amazon-kinesis-client-python"; license = licenses.amazonsl; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index 8dad26bbb2b..bfd3cd7055e 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/celery/py-amqp; + homepage = "https://github.com/celery/py-amqp"; description = "Python client for the Advanced Message Queuing Procotol (AMQP). This is a fork of amqplib which is maintained by the Celery project"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/amqplib/default.nix b/pkgs/development/python-modules/amqplib/default.nix index 682dee00014..a3e11271ade 100644 --- a/pkgs/development/python-modules/amqplib/default.nix +++ b/pkgs/development/python-modules/amqplib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/barryp/py-amqplib; + homepage = "https://github.com/barryp/py-amqplib"; description = "Python client for the Advanced Message Queuing Procotol (AMQP)"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/androguard/default.nix b/pkgs/development/python-modules/androguard/default.nix index 7525df60575..c7122781111 100644 --- a/pkgs/development/python-modules/androguard/default.nix +++ b/pkgs/development/python-modules/androguard/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Tool and python library to interact with Android Files"; - homepage = https://github.com/androguard/androguard; + homepage = "https://github.com/androguard/androguard"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.pmiddend ]; }; diff --git a/pkgs/development/python-modules/annexremote/default.nix b/pkgs/development/python-modules/annexremote/default.nix index f07f05b9884..bddae5155d7 100644 --- a/pkgs/development/python-modules/annexremote/default.nix +++ b/pkgs/development/python-modules/annexremote/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helper module to easily develop git-annex remotes"; - homepage = https://github.com/Lykos153/AnnexRemote; + homepage = "https://github.com/Lykos153/AnnexRemote"; license = licenses.gpl3; maintainers = with maintainers; [ montag451 ]; }; diff --git a/pkgs/development/python-modules/annoy/default.nix b/pkgs/development/python-modules/annoy/default.nix index 5041ee54e4f..51fd57582f2 100644 --- a/pkgs/development/python-modules/annoy/default.nix +++ b/pkgs/development/python-modules/annoy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Approximate Nearest Neighbors in C++/Python optimized for memory usage and loading/saving to disk"; - homepage = https://github.com/spotify/annoy; + homepage = "https://github.com/spotify/annoy"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/ansi/default.nix b/pkgs/development/python-modules/ansi/default.nix index 77b93ce890e..65f51c17d7d 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.3"; + version = "0.1.5"; src = fetchPypi { inherit pname version; - sha256 = "06y6470bzvlqys3zi2vc68rmk9n05v1ibral14gbfpgfa8fzy7pg"; + sha256 = "02sknsbx55r6nylznslmmzzkfi3rsw7akpyzi6f1bqvr2ila8p0f"; }; checkPhase = '' @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "ANSI cursor movement and graphics"; - homepage = https://github.com/tehmaze/ansi/; + homepage = "https://github.com/tehmaze/ansi/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/ansi2html/default.nix b/pkgs/development/python-modules/ansi2html/default.nix index 18a2b0dde7f..eda67e26045 100644 --- a/pkgs/development/python-modules/ansi2html/default.nix +++ b/pkgs/development/python-modules/ansi2html/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert text with ANSI color codes to HTML"; - homepage = https://github.com/ralphbean/ansi2html; + homepage = "https://github.com/ralphbean/ansi2html"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/ansible-kernel/default.nix b/pkgs/development/python-modules/ansible-kernel/default.nix index 42438b31c21..670b6330eaa 100644 --- a/pkgs/development/python-modules/ansible-kernel/default.nix +++ b/pkgs/development/python-modules/ansible-kernel/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "An Ansible kernel for Jupyter"; - homepage = https://github.com/ansible/ansible-jupyter-kernel; + homepage = "https://github.com/ansible/ansible-jupyter-kernel"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix index 6a71ae9e1d3..27188246b53 100644 --- a/pkgs/development/python-modules/ansible-runner/default.nix +++ b/pkgs/development/python-modules/ansible-runner/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helps when interfacing with Ansible"; - homepage = https://github.com/ansible/ansible-runner; + homepage = "https://github.com/ansible/ansible-runner"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index df9c5e82cd1..bd3e5662e18 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = http://www.ansible.com; + homepage = "http://www.ansible.com"; description = "Radically simple IT automation"; license = [ licenses.gpl3 ] ; maintainers = with maintainers; [ joamaki costrouc ]; diff --git a/pkgs/development/python-modules/ansicolor/default.nix b/pkgs/development/python-modules/ansicolor/default.nix index 5960e7b4133..f9d589e4369 100644 --- a/pkgs/development/python-modules/ansicolor/default.nix +++ b/pkgs/development/python-modules/ansicolor/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/numerodix/ansicolor/; + homepage = "https://github.com/numerodix/ansicolor/"; description = "A library to produce ansi color output and colored highlighting and diffing"; license = licenses.asl20; maintainers = with maintainers; [ andsild ]; diff --git a/pkgs/development/python-modules/ansicolors/default.nix b/pkgs/development/python-modules/ansicolors/default.nix index a737cb06ea2..3ea77384c79 100644 --- a/pkgs/development/python-modules/ansicolors/default.nix +++ b/pkgs/development/python-modules/ansicolors/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/verigak/colors/; + homepage = "https://github.com/verigak/colors/"; description = "ANSI colors for Python"; license = licenses.isc; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix index 08f93134b32..7ad683b8c36 100644 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ b/pkgs/development/python-modules/ansiconv/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A module for converting ANSI coded text and converts it to either plain text or HTML"; - homepage = https://github.com/ansible/ansiconv; + homepage = "https://github.com/ansible/ansiconv"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/ansiwrap/default.nix b/pkgs/development/python-modules/ansiwrap/default.nix index 517083a0621..1af39e970bc 100644 --- a/pkgs/development/python-modules/ansiwrap/default.nix +++ b/pkgs/development/python-modules/ansiwrap/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Textwrap, but savvy to ANSI colors and styles"; - homepage = https://github.com/jonathaneunice/ansiwrap; + homepage = "https://github.com/jonathaneunice/ansiwrap"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/anyjson/default.nix b/pkgs/development/python-modules/anyjson/default.nix index 65476b47f8f..1d0d02988f8 100644 --- a/pkgs/development/python-modules/anyjson/default.nix +++ b/pkgs/development/python-modules/anyjson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; meta = with lib; { - homepage = https://bitbucket.org/runeh/anyjson/; + homepage = "https://bitbucket.org/runeh/anyjson/"; description = "Wrapper that selects the best available JSON implementation"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index 712944568f2..b07b585573d 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Powerful and Lightweight Python Tree Data Structure"; - homepage = https://github.com/c0fec0de/anytree; + homepage = "https://github.com/c0fec0de/anytree"; license = licenses.asl20; maintainers = [ maintainers.worldofpeace ]; }; diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix index 049db8a648f..4943a2e53f7 100644 --- a/pkgs/development/python-modules/apache-airflow/default.nix +++ b/pkgs/development/python-modules/apache-airflow/default.nix @@ -71,13 +71,13 @@ buildPythonPackage rec { # Not yet accepted: https://github.com/apache/airflow/pull/6562 (fetchpatch { name = "avoid-warning-from-abc.collections"; - url = https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6562.patch; + url = "https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6562.patch"; sha256 = "0swpay1qlb7f9kgc56631s1qd9k82w4nw2ggvkm7jvxwf056k61z"; }) # Not yet accepted: https://github.com/apache/airflow/pull/6561 (fetchpatch { name = "pendulum2-compatibility"; - url = https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6561.patch; + url = "https://patch-diff.githubusercontent.com/raw/apache/airflow/pull/6561.patch"; sha256 = "17hw8qyd4zxvib9zwpbn32p99vmrdz294r31gnsbkkcl2y6h9knk"; }) ]; @@ -134,37 +134,37 @@ buildPythonPackage rec { ]; postPatch = '' + substituteInPlace setup.py \ + --replace "flask>=1.1.0, <2.0" "flask" \ + --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ + --replace "pandas>=0.17.1, <1.0.0" "pandas" \ + --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \ + --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ + --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.7.3, <=2.10.0" "jinja2" \ + --replace "colorlog==4.0.2" "colorlog" \ + --replace "funcsigs==1.0.0" "funcsigs" \ + --replace "flask-swagger==0.2.13" "flask-swagger" \ + --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \ + --replace "alembic>=0.9, <1.0" "alembic" \ + --replace "markdown>=2.5.2, <3.0" "markdown" \ + --replace "future>=0.16.0, <0.17" "future" \ + --replace "tenacity==4.12.0" "tenacity" \ + --replace "text-unidecode==1.2" "text-unidecode" \ + --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \ + --replace "sqlalchemy~=1.3" "sqlalchemy" \ + --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \ + --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug" - substituteInPlace setup.py \ - --replace "flask>=1.1.0, <2.0" "flask" \ - --replace "jinja2>=2.10.1, <2.11.0" "jinja2" \ - --replace "pandas>=0.17.1, <1.0.0" "pandas" \ - --replace "flask-caching>=1.3.3, <1.4.0" "flask-caching" \ - --replace "flask-appbuilder>=1.12.5, <2.0.0" "flask-appbuilder" \ - --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.7.3, <=2.10.0" "jinja2" \ - --replace "funcsigs==1.0.0" "funcsigs" \ - --replace "flask-swagger==0.2.13" "flask-swagger" \ - --replace "python-daemon>=2.1.1, <2.2" "python-daemon" \ - --replace "alembic>=0.9, <1.0" "alembic" \ - --replace "markdown>=2.5.2, <3.0" "markdown" \ - --replace "future>=0.16.0, <0.17" "future" \ - --replace "tenacity==4.12.0" "tenacity" \ - --replace "text-unidecode==1.2" "text-unidecode" \ - --replace "tzlocal>=1.4,<2.0.0" "tzlocal" \ - --replace "sqlalchemy~=1.3" "sqlalchemy" \ - --replace "gunicorn>=19.5.0, <20.0" "gunicorn" \ - --replace "werkzeug>=0.14.1, <0.15.0" "werkzeug" + # dumb-init is only needed for CI and Docker, not relevant for NixOS. + substituteInPlace setup.py \ + --replace "'dumb-init>=1.2.2'," "" - # dumb-init is only needed for CI and Docker, not relevant for NixOS. - substituteInPlace setup.py \ - --replace "'dumb-init>=1.2.2'," "" - - substituteInPlace tests/core.py \ - --replace "/bin/bash" "${stdenv.shell}" + substituteInPlace tests/core.py \ + --replace "/bin/bash" "${stdenv.shell}" ''; checkPhase = '' @@ -184,8 +184,8 @@ buildPythonPackage rec { meta = with lib; { description = "Programmatically author, schedule and monitor data pipelines"; - homepage = http://airflow.apache.org/; + homepage = "http://airflow.apache.org/"; license = licenses.asl20; - maintainers = [ maintainers.costrouc maintainers.ingenieroariel ]; + maintainers = with maintainers; [ costrouc ingenieroariel ]; }; } diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index 1ed984fc718..fa8b14853aa 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification"; - homepage = https://github.com/marshmallow-code/apispec; + homepage = "https://github.com/marshmallow-code/apispec"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aplpy/default.nix b/pkgs/development/python-modules/aplpy/default.nix index 9710dc9f9a6..a6eedb3b7a4 100644 --- a/pkgs/development/python-modules/aplpy/default.nix +++ b/pkgs/development/python-modules/aplpy/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with lib; { description = "The Astronomical Plotting Library in Python"; - homepage = http://aplpy.github.io; + homepage = "http://aplpy.github.io"; license = licenses.mit; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/appdirs/default.nix b/pkgs/development/python-modules/appdirs/default.nix index 8716f007b87..2f7f2ae0281 100644 --- a/pkgs/development/python-modules/appdirs/default.nix +++ b/pkgs/development/python-modules/appdirs/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "A python module for determining appropriate platform-specific dirs"; - homepage = https://github.com/ActiveState/appdirs; + homepage = "https://github.com/ActiveState/appdirs"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/application/default.nix b/pkgs/development/python-modules/application/default.nix index 654567cc23f..90b21baafdd 100644 --- a/pkgs/development/python-modules/application/default.nix +++ b/pkgs/development/python-modules/application/default.nix @@ -1,21 +1,26 @@ -{ lib, buildPythonPackage, fetchdarcs, zope_interface, isPy3k }: +{ lib, buildPythonPackage, fetchFromGitHub, zope_interface, isPy3k }: buildPythonPackage rec { pname = "python-application"; - version = "2.7.0"; + version = "2.8.0"; disabled = isPy3k; - src = fetchdarcs { - url = "http://devel.ag-projects.com/repositories/${pname}"; + src = fetchFromGitHub { + owner = "AGProjects"; + repo = pname; rev = "release-${version}"; - sha256 = "1xpyk2v3naxkjhpyris58dxg1lxbraxgjd6f7w1sah5j0sk7psla"; + sha256 = "1xd2gbpmx2ghap9cnr1h6sxjai9419bdp3y9qp5lh67977m0qg30"; }; buildInputs = [ zope_interface ]; + # No tests upstream to run + doCheck = false; + meta = with lib; { description = "Basic building blocks for python applications"; - homepage = https://github.com/AGProjects/python-application; + homepage = "https://github.com/AGProjects/python-application"; + changelog = "https://github.com/AGProjects/python-application/blob/master/ChangeLog"; license = licenses.lgpl2Plus; }; } diff --git a/pkgs/development/python-modules/applicationinsights/default.nix b/pkgs/development/python-modules/applicationinsights/default.nix index 10f66b24d14..9f77d435264 100644 --- a/pkgs/development/python-modules/applicationinsights/default.nix +++ b/pkgs/development/python-modules/applicationinsights/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "This project extends the Application Insights API surface to support Python"; - homepage = https://github.com/Microsoft/ApplicationInsights-Python; + homepage = "https://github.com/Microsoft/ApplicationInsights-Python"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/appnope/default.nix b/pkgs/development/python-modules/appnope/default.nix index 08f6fa529ca..2380fb7d8ad 100644 --- a/pkgs/development/python-modules/appnope/default.nix +++ b/pkgs/development/python-modules/appnope/default.nix @@ -14,8 +14,8 @@ buildPythonPackage rec { meta = { description = "Disable App Nap on macOS"; - homepage = https://pypi.python.org/pypi/appnope; + homepage = "https://pypi.python.org/pypi/appnope"; platforms = lib.platforms.darwin; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/approvaltests/default.nix b/pkgs/development/python-modules/approvaltests/default.nix index 2cf9bf1f177..a7b0b51d8f1 100644 --- a/pkgs/development/python-modules/approvaltests/default.nix +++ b/pkgs/development/python-modules/approvaltests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Assertion/verification library to aid testing"; - homepage = https://github.com/approvals/ApprovalTests.Python; + homepage = "https://github.com/approvals/ApprovalTests.Python"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 186bda86842..9e06abd9a71 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage -, traits, traitsui, configobj +{ lib, fetchPypi, buildPythonPackage +, configobj, six, traitsui , nose, tables, pandas }: buildPythonPackage rec { pname = "apptools"; - version = "4.4.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; - sha256 = "1dw6vvq7lqkj7mgn3s7r5hs937kl4mj5g7jf2qgvhdld9lsc5xbk"; + sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6"; }; - propagatedBuildInputs = [ traits traitsui configobj ]; + propagatedBuildInputs = [ configobj six traitsui ]; checkInputs = [ nose @@ -21,11 +21,12 @@ buildPythonPackage rec { ]; doCheck = true; + checkPhase = ''HOME=$TMP nosetests''; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of packages that Enthought has found useful in creating a number of applications."; - homepage = https://github.com/enthought/apptools; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + homepage = "https://github.com/enthought/apptools"; + maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/apsw/default.nix b/pkgs/development/python-modules/apsw/default.nix index 48e3b20c7c1..cd6e40c119c 100644 --- a/pkgs/development/python-modules/apsw/default.nix +++ b/pkgs/development/python-modules/apsw/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python wrapper for the SQLite embedded relational database engine"; - homepage = https://github.com/rogerbinns/apsw; + homepage = "https://github.com/rogerbinns/apsw"; license = licenses.zlib; }; } diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix index 85033a1846f..a5a78c332ab 100644 --- a/pkgs/development/python-modules/arelle/default.nix +++ b/pkgs/development/python-modules/arelle/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { An open source facility for XBRL, the eXtensible Business Reporting Language supporting various standards, exposed through a Python or REST API'' + lib.optionalString gui " and a graphical user interface"; - homepage = http://arelle.org/; + homepage = "http://arelle.org/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ roberth ]; diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix index 6f978778f7d..b34b878a839 100644 --- a/pkgs/development/python-modules/argcomplete/default.nix +++ b/pkgs/development/python-modules/argcomplete/default.nix @@ -1,25 +1,37 @@ -{ buildPythonPackage, fetchPypi, lib, - dicttoxml, pexpect, prettytable, requests_toolbelt +{ buildPythonPackage, fetchPypi, lib +, dicttoxml +, importlib-metadata +, pexpect +, prettytable +, requests_toolbelt }: buildPythonPackage rec { pname = "argcomplete"; - version = "1.10.3"; + version = "1.11.1"; src = fetchPypi { inherit pname version; - sha256 = "a37f522cf3b6a34abddfedb61c4546f60023b3799b22d1cd971eacdc0861530a"; + sha256 = "0h1przxffrhqvi46k40pzjsvdrq4zc3sl1pc96kkigqppq0vdrss"; }; - doCheck = false; # bash-completion test fails with "compgen: command not found". + doCheck = false; # meant to be ran with interactive interpreter # re-enable if we are able to make testing work - # buildInputs = [ coverage flake8 ]; + # checkInputs = [ bashInteractive coverage flake8 ]; - propagatedBuildInputs = [ dicttoxml pexpect prettytable requests_toolbelt ]; + propagatedBuildInputs = [ + dicttoxml + importlib-metadata + pexpect + prettytable + requests_toolbelt + ]; + + pythonImportsCheck = [ "argcomplete" ]; meta = with lib; { description = "Bash tab completion for argparse"; - homepage = https://argcomplete.readthedocs.io; + homepage = "https://kislyuk.github.io/argcomplete/"; maintainers = [ maintainers.womfoo ]; license = [ licenses.asl20 ]; }; diff --git a/pkgs/development/python-modules/argh/default.nix b/pkgs/development/python-modules/argh/default.nix index 8c6afb099f9..544a66c0582 100644 --- a/pkgs/development/python-modules/argh/default.nix +++ b/pkgs/development/python-modules/argh/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/neithere/argh/; + homepage = "https://github.com/neithere/argh/"; description = "An unobtrusive argparse wrapper with natural syntax"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/argon2_cffi/default.nix b/pkgs/development/python-modules/argon2_cffi/default.nix index 130a2c18917..85c6c4b638a 100644 --- a/pkgs/development/python-modules/argon2_cffi/default.nix +++ b/pkgs/development/python-modules/argon2_cffi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Secure Password Hashes for Python"; - homepage = https://argon2-cffi.readthedocs.io/; + homepage = "https://argon2-cffi.readthedocs.io/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/args/default.nix b/pkgs/development/python-modules/args/default.nix index 943f129031e..ae66713361c 100644 --- a/pkgs/development/python-modules/args/default.nix +++ b/pkgs/development/python-modules/args/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Command Arguments for Humans"; - homepage = https://github.com/kennethreitz/args; + homepage = "https://github.com/kennethreitz/args"; }; } diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index af3e4547628..04295dce261 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.15.4"; + version = "0.15.5"; src = fetchPypi { inherit pname version; - sha256 = "e1a318a4c0b787833ae46302c02488b6eeef413c6a13324b3261ad320f21ec1e"; + sha256 = "0yq2bld2bjxddmg9zg4ll80pb32rkki7xyhgnrqnkxy5w9jf942k"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/arxiv2bib/default.nix b/pkgs/development/python-modules/arxiv2bib/default.nix index 99725bcfa61..4dec50bbc67 100644 --- a/pkgs/development/python-modules/arxiv2bib/default.nix +++ b/pkgs/development/python-modules/arxiv2bib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Get a BibTeX entry from an arXiv id number, using the arxiv.org API"; - homepage = http://nathangrigg.github.io/arxiv2bib/; + homepage = "http://nathangrigg.github.io/arxiv2bib/"; license = licenses.bsd3; maintainers = [ maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 26a667bea4d..7c08cf1acbb 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client library for Asana"; - homepage = https://github.com/asana/python-asana; + homepage = "https://github.com/asana/python-asana"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/asciimatics/default.nix b/pkgs/development/python-modules/asciimatics/default.nix index d71f0b640f9..09bf4e6a3da 100644 --- a/pkgs/development/python-modules/asciimatics/default.nix +++ b/pkgs/development/python-modules/asciimatics/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Helps to create full-screen text UIs (from interactive forms to ASCII animations) on any platform"; - homepage = https://github.com/peterbrittain/asciimatics; + homepage = "https://github.com/peterbrittain/asciimatics"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/development/python-modules/asciitree/default.nix b/pkgs/development/python-modules/asciitree/default.nix index 74b78d4a166..814cf1a3d41 100644 --- a/pkgs/development/python-modules/asciitree/default.nix +++ b/pkgs/development/python-modules/asciitree/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Draws ASCII trees"; - homepage = https://github.com/mbr/asciitree; + homepage = "https://github.com/mbr/asciitree"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ase/3.17.nix b/pkgs/development/python-modules/ase/3.17.nix index 3a466170c77..40b9b405aab 100644 --- a/pkgs/development/python-modules/ase/3.17.nix +++ b/pkgs/development/python-modules/ase/3.17.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Atomic Simulation Environment"; - homepage = https://wiki.fysik.dtu.dk/ase/; + homepage = "https://wiki.fysik.dtu.dk/ase/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/ase/default.nix b/pkgs/development/python-modules/ase/default.nix index 3aa5a432c4b..870f0598e5e 100644 --- a/pkgs/development/python-modules/ase/default.nix +++ b/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.19.0"; + version = "3.19.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a8378ab57e91cfe1ba09b3639d8409bb7fc1a40b59479c7822d206e673ad93f9"; + sha256 = "03xzpmpask2q2609kkq0hfgzsfvkyjpbjws7qx00nnfrbbnjk443"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Atomic Simulation Environment"; - homepage = https://wiki.fysik.dtu.dk/ase/; + homepage = "https://wiki.fysik.dtu.dk/ase/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/asgiref/default.nix b/pkgs/development/python-modules/asgiref/default.nix index 9fa7d8c7c42..56c69bb97ed 100644 --- a/pkgs/development/python-modules/asgiref/default.nix +++ b/pkgs/development/python-modules/asgiref/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, async-timeout, pytest, pytest-asyncio }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.2.7"; pname = "asgiref"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "django"; repo = pname; rev = version; - sha256 = "040g2cghpskp427xiw9jv7c0lfj1sk5fc01dds8pi7grkk0br357"; + sha256 = "1qf29blzhh6sljaj1adc0p8cnyxh9ar6hky9ccdfbgmrk4rw5kwc"; }; propagatedBuildInputs = [ async-timeout ]; diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index dc6df10803f..156f77b4c97 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = { description = "Fast ASN.1 parser and serializer with definitions for private keys, public keys, certificates, CRL, OCSP, CMS, PKCS#3, PKCS#7, PKCS#8, PKCS#12, PKCS#5, X.509 and TSP"; license = lib.licenses.mit; - homepage = https://github.com/wbond/asn1crypto; + homepage = "https://github.com/wbond/asn1crypto"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/aspy.yaml/default.nix b/pkgs/development/python-modules/aspy.yaml/default.nix index 1a910338232..5abe6074274 100644 --- a/pkgs/development/python-modules/aspy.yaml/default.nix +++ b/pkgs/development/python-modules/aspy.yaml/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "A few extensions to pyyaml"; - homepage = https://github.com/asottile/aspy.yaml; + homepage = "https://github.com/asottile/aspy.yaml"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index e8ea8c37cd9..02610d042ce 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for reading, writing and rewriting python AST"; - homepage = https://github.com/berkerpeksag/astor; + homepage = "https://github.com/berkerpeksag/astor"; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/development/python-modules/astral/default.nix b/pkgs/development/python-modules/astral/default.nix index 5338b67b50d..84ce4d1d5b7 100644 --- a/pkgs/development/python-modules/astral/default.nix +++ b/pkgs/development/python-modules/astral/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Calculations for the position of the sun and the moon"; - homepage = https://github.com/sffjunkie/astral/; + homepage = "https://github.com/sffjunkie/astral/"; license = licenses.asl20; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/astroid/1.6.nix b/pkgs/development/python-modules/astroid/1.6.nix index cdbbe547aec..2c763e214e8 100644 --- a/pkgs/development/python-modules/astroid/1.6.nix +++ b/pkgs/development/python-modules/astroid/1.6.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "An abstract syntax tree for Python with inference support"; - homepage = https://github.com/PyCQA/astroid; + homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/astroid/default.nix b/pkgs/development/python-modules/astroid/default.nix index 5d24a05aa54..2084065c8d5 100644 --- a/pkgs/development/python-modules/astroid/default.nix +++ b/pkgs/development/python-modules/astroid/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "An abstract syntax tree for Python with inference support"; - homepage = https://github.com/PyCQA/astroid; + homepage = "https://github.com/PyCQA/astroid"; license = licenses.lgpl2; platforms = platforms.all; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix index 4300165470c..61f49322d3b 100644 --- a/pkgs/development/python-modules/astropy-healpix/default.nix +++ b/pkgs/development/python-modules/astropy-healpix/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "BSD-licensed HEALPix for Astropy"; - homepage = https://github.com/astropy/astropy-healpix; + homepage = "https://github.com/astropy/astropy-healpix"; license = licenses.bsd3; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/astropy-helpers/default.nix b/pkgs/development/python-modules/astropy-helpers/default.nix index 93b2784902f..dd8897ab139 100644 --- a/pkgs/development/python-modules/astropy-helpers/default.nix +++ b/pkgs/development/python-modules/astropy-helpers/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Utilities for building and installing Astropy, Astropy affiliated packages, and their respective documentation"; - homepage = https://github.com/astropy/astropy-helpers; + homepage = "https://github.com/astropy/astropy-helpers"; license = licenses.bsd3; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix index c23c15e1d4d..57a7c35215e 100644 --- a/pkgs/development/python-modules/astropy/default.nix +++ b/pkgs/development/python-modules/astropy/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Astronomy/Astrophysics library for Python"; - homepage = https://www.astropy.org; + homepage = "https://www.astropy.org"; license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ kentjames ]; diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index 8c8a1b76b1a..c6e4f3752ef 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { checkInputs = [ coverage nose ]; meta = with lib; { - homepage = https://github.com/gristlabs/asttokens; + homepage = "https://github.com/gristlabs/asttokens"; description = "Annotate Python AST trees with source text and token information"; license = licenses.asl20; platforms = platforms.all; diff --git a/pkgs/development/python-modules/astunparse/default.nix b/pkgs/development/python-modules/astunparse/default.nix index 56570295dee..0947b3877b5 100644 --- a/pkgs/development/python-modules/astunparse/default.nix +++ b/pkgs/development/python-modules/astunparse/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "This is a factored out version of unparse found in the Python source distribution"; - homepage = https://github.com/simonpercivall/astunparse; + homepage = "https://github.com/simonpercivall/astunparse"; license = licenses.bsd3; maintainers = with maintainers; [ jyp ]; }; diff --git a/pkgs/development/python-modules/async_generator/default.nix b/pkgs/development/python-modules/async_generator/default.nix index b8ec2f54476..dfbd0dbb996 100644 --- a/pkgs/development/python-modules/async_generator/default.nix +++ b/pkgs/development/python-modules/async_generator/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async generators and context managers for Python 3.5+"; - homepage = https://github.com/python-trio/async_generator; + homepage = "https://github.com/python-trio/async_generator"; license = with licenses; [ mit asl20 ]; }; } diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix index aabf30183d5..a1dbb521ce3 100644 --- a/pkgs/development/python-modules/async_timeout/default.nix +++ b/pkgs/development/python-modules/async_timeout/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Timeout context manager for asyncio programs"; - homepage = https://github.com/aio-libs/async_timeout/; + homepage = "https://github.com/aio-libs/async_timeout/"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 14e5b56cb0c..439702e8027 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/MagicStack/asyncpg; + homepage = "https://github.com/MagicStack/asyncpg"; description = "An asyncio PosgtreSQL driver"; longDescription = '' Asyncpg is a database interface library designed specifically for diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 3d225079441..ab647935364 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; - homepage = https://asyncssh.readthedocs.io/en/latest; + homepage = "https://asyncssh.readthedocs.io/en/latest"; license = licenses.epl20; maintainers = with maintainers; [ worldofpeace ]; }; diff --git a/pkgs/development/python-modules/asynctest/default.nix b/pkgs/development/python-modules/asynctest/default.nix index a9c012ba831..d08f4137ba4 100644 --- a/pkgs/development/python-modules/asynctest/default.nix +++ b/pkgs/development/python-modules/asynctest/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enhance the standard unittest package with features for testing asyncio libraries"; - homepage = https://github.com/Martiusweb/asynctest; + homepage = "https://github.com/Martiusweb/asynctest"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 9ef332827eb..e58fa446f81 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "1.15.4"; + version = "1.15.6"; src = fetchPypi { inherit pname version; - sha256 = "0vkq3sr4a23ipk74swsmc3ydg3q91asixb7hzl8mzkfpgnnyvr77"; + sha256 = "0nn3g2sb0pqfacsqcw94n8v9jbn4ip0pvhvczasfvks2w9q9sij7"; }; checkInputs = [ pytestrunner pytest ]; diff --git a/pkgs/development/python-modules/atom/default.nix b/pkgs/development/python-modules/atom/default.nix index fdaebda089f..465681a71f3 100644 --- a/pkgs/development/python-modules/atom/default.nix +++ b/pkgs/development/python-modules/atom/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Memory efficient Python objects"; maintainers = [ maintainers.bhipple ]; - homepage = https://github.com/nucleic/atom; + homepage = "https://github.com/nucleic/atom"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/atomiclong/default.nix b/pkgs/development/python-modules/atomiclong/default.nix index 8f3aae7b19d..670361b9a9e 100644 --- a/pkgs/development/python-modules/atomiclong/default.nix +++ b/pkgs/development/python-modules/atomiclong/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Long data type with atomic operations using CFFI"; - homepage = https://github.com/dreid/atomiclong; + homepage = "https://github.com/dreid/atomiclong"; license = licenses.mit; maintainers = with maintainers; [ robbinch ]; }; diff --git a/pkgs/development/python-modules/atomicwrites/default.nix b/pkgs/development/python-modules/atomicwrites/default.nix index eed9591d7bd..019dcbe9bed 100644 --- a/pkgs/development/python-modules/atomicwrites/default.nix +++ b/pkgs/development/python-modules/atomicwrites/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Atomic file writes on POSIX"; - homepage = https://pypi.python.org/pypi/atomicwrites; + homepage = "https://pypi.python.org/pypi/atomicwrites"; maintainers = with maintainers; [ matthiasbeyer ]; }; } diff --git a/pkgs/development/python-modules/atomman/default.nix b/pkgs/development/python-modules/atomman/default.nix index d873700f32a..9e5eb34da3b 100644 --- a/pkgs/development/python-modules/atomman/default.nix +++ b/pkgs/development/python-modules/atomman/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/usnistgov/atomman/; + homepage = "https://github.com/usnistgov/atomman/"; description = "Atomistic Manipulation Toolkit"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index 6657b41cc78..e2c3e8af6b0 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://public.readthedocs.io/en/latest/; + homepage = "https://public.readthedocs.io/en/latest/"; description = "A decorator and function which populates a module's __all__ and globals"; longDescription = '' This is a very simple decorator and function which populates a module's diff --git a/pkgs/development/python-modules/atsim_potentials/default.nix b/pkgs/development/python-modules/atsim_potentials/default.nix index 5d664e77d29..3bc221d7adc 100644 --- a/pkgs/development/python-modules/atsim_potentials/default.nix +++ b/pkgs/development/python-modules/atsim_potentials/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://bitbucket.org/mjdr/atsim_potentials; + homepage = "https://bitbucket.org/mjdr/atsim_potentials"; description = "Provides tools for working with pair and embedded atom method potential models including tabulation routines for DL_POLY and LAMMPS"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/attrdict/default.nix b/pkgs/development/python-modules/attrdict/default.nix index 29e3ca09cc5..1dfbf32c995 100644 --- a/pkgs/development/python-modules/attrdict/default.nix +++ b/pkgs/development/python-modules/attrdict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A dict with attribute-style access"; - homepage = https://github.com/bcj/AttrDict; + homepage = "https://github.com/bcj/AttrDict"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/attrs/default.nix b/pkgs/development/python-modules/attrs/default.nix index e3691a5dc32..0e0606a3ead 100644 --- a/pkgs/development/python-modules/attrs/default.nix +++ b/pkgs/development/python-modules/attrs/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python attributes without boilerplate"; - homepage = https://github.com/hynek/attrs; + homepage = "https://github.com/hynek/attrs"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/audio-metadata/default.nix b/pkgs/development/python-modules/audio-metadata/default.nix index d1ccef1ece4..d4f97dd4ce5 100644 --- a/pkgs/development/python-modules/audio-metadata/default.nix +++ b/pkgs/development/python-modules/audio-metadata/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "audio-metadata"; - version = "0.6.0"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "7a0c060d05ac59a4ce841a485808fe8a6993fec554f96bee90e57e971c73a2a6"; + sha256 = "1v7ww3csyxrhnpvpynla64hfn1wp37vbw7srh9343n4wc02mh65l"; }; postPatch = '' @@ -37,7 +37,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; meta = with lib; { - homepage = https://github.com/thebigmunch/audio-metadata; + homepage = "https://github.com/thebigmunch/audio-metadata"; description = "A library for reading and, in the future, writing metadata from audio files"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/augeas/default.nix b/pkgs/development/python-modules/augeas/default.nix index 45a05ac85e7..cf1d4544e4a 100644 --- a/pkgs/development/python-modules/augeas/default.nix +++ b/pkgs/development/python-modules/augeas/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure python bindings for augeas"; - homepage = https://github.com/hercules-team/python-augeas; + homepage = "https://github.com/hercules-team/python-augeas"; license = licenses.lgpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix index fdb478bc143..a2f2742ee88 100644 --- a/pkgs/development/python-modules/authheaders/default.nix +++ b/pkgs/development/python-modules/authheaders/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "Python library for the generation of email authentication headers"; - homepage = https://github.com/ValiMail/authentication-headers; + homepage = "https://github.com/ValiMail/authentication-headers"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/authres/default.nix b/pkgs/development/python-modules/authres/default.nix index d2a72461b17..372fb03a947 100644 --- a/pkgs/development/python-modules/authres/default.nix +++ b/pkgs/development/python-modules/authres/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { Authentication-Results Headers generation and parsing for Python/Python3. ''; - homepage = https://launchpad.net/authentication-results-python; + homepage = "https://launchpad.net/authentication-results-python"; license = licenses.bsd3; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/autograd/default.nix b/pkgs/development/python-modules/autograd/default.nix index 68dc9339ce4..6d56775d90c 100644 --- a/pkgs/development/python-modules/autograd/default.nix +++ b/pkgs/development/python-modules/autograd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/HIPS/autograd; + homepage = "https://github.com/HIPS/autograd"; description = "Compute derivatives of NumPy code efficiently"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/autologging/default.nix b/pkgs/development/python-modules/autologging/default.nix index 1d028eeb187..7a3b36c3514 100644 --- a/pkgs/development/python-modules/autologging/default.nix +++ b/pkgs/development/python-modules/autologging/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://ninthtest.info/python-autologging/; + homepage = "http://ninthtest.info/python-autologging/"; description = "Easier logging and tracing for Python classes"; license = licenses.mit; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/automat/default.nix b/pkgs/development/python-modules/automat/default.nix index fb6ac1daa1f..8a9f85b54fd 100644 --- a/pkgs/development/python-modules/automat/default.nix +++ b/pkgs/development/python-modules/automat/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/glyph/Automat; + homepage = "https://github.com/glyph/Automat"; description = "Self-service finite-state machines for the programmer on the go"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index 55b416a0b58..ce83a0b2b4d 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tool that automatically formats Python code to conform to the PEP 8 style guide"; - homepage = https://pypi.python.org/pypi/autopep8/; + homepage = "https://pypi.python.org/pypi/autopep8/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix index 38f658cf982..7ccc569a87e 100644 --- a/pkgs/development/python-modules/av/default.nix +++ b/pkgs/development/python-modules/av/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Pythonic bindings for FFmpeg/Libav"; - homepage = https://github.com/mikeboers/PyAV/; + homepage = "https://github.com/mikeboers/PyAV/"; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index 46272a5418d..3efb1dd0069 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A serialization and RPC framework"; - homepage = https://pypi.python.org/pypi/avro-python3/; + homepage = "https://pypi.python.org/pypi/avro-python3/"; license = licenses.asl20; maintainers = [ maintainers.shlevy maintainers.timma ]; diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index 839c7fa45be..d4d14ce9744 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -12,6 +12,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A serialization and RPC framework"; - homepage = https://pypi.python.org/pypi/avro/; + homepage = "https://pypi.python.org/pypi/avro/"; }; } diff --git a/pkgs/development/python-modules/avro3k/default.nix b/pkgs/development/python-modules/avro3k/default.nix index 3a5b34ebb85..59d09b3f25f 100644 --- a/pkgs/development/python-modules/avro3k/default.nix +++ b/pkgs/development/python-modules/avro3k/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A serialization and RPC framework"; - homepage = https://pypi.python.org/pypi/avro3k/; + homepage = "https://pypi.python.org/pypi/avro3k/"; }; } diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index 350a82d13fd..bd933205f6a 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Manipulate jagged, chunky, and/or bitmasked arrays as easily as Numpy"; - homepage = https://github.com/scikit-hep/awkward-array; + homepage = "https://github.com/scikit-hep/awkward-array"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/aws-adfs/default.nix b/pkgs/development/python-modules/aws-adfs/default.nix index 1f03ef8cb3b..20ed59f9e5b 100644 --- a/pkgs/development/python-modules/aws-adfs/default.nix +++ b/pkgs/development/python-modules/aws-adfs/default.nix @@ -1,15 +1,15 @@ { lib, buildPythonPackage, fetchPypi -, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, boto3 +, pytest, pytestrunner, pytestcov, mock, glibcLocales, lxml, botocore , requests, requests-kerberos, click, configparser, fido2, isPy27 }: buildPythonPackage rec { pname = "aws-adfs"; - version = "1.21.2"; + version = "1.24.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ba96e71404474350b2c3ae4d5cb2dd25e9267b6d0680933c5711a51ea364e3bc"; + sha256 = "0bcjlf5dkg2q0db0ra1ssa3hy98spflkd3ykhmlyv65rkgx8w1wv"; }; # Relax version constraint @@ -24,11 +24,11 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ glibcLocales pytest pytestrunner pytestcov mock ]; - propagatedBuildInputs = [ lxml boto3 requests requests-kerberos click configparser fido2 ]; + propagatedBuildInputs = [ botocore lxml requests requests-kerberos click configparser fido2 ]; meta = with lib; { description = "Command line tool to ease aws cli authentication against ADFS"; - homepage = https://github.com/venth/aws-adfs; + homepage = "https://github.com/venth/aws-adfs"; license = licenses.psfl; maintainers = [ maintainers.bhipple ]; }; diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix index b10bd6d7c1a..9979ccdd3c0 100644 --- a/pkgs/development/python-modules/aws-lambda-builders/default.nix +++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/awslabs/aws-lambda-builders; + homepage = "https://github.com/awslabs/aws-lambda-builders"; description = "A tool to compile, build and package AWS Lambda functions"; longDescription = '' Lambda Builders is a Python library to compile, build and package diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index 1fdfc4d4358..13bc3cdbbbb 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ] ++ lib.optionals (pythonOlder "3.4") [ enum34 ]; meta = { - homepage = https://github.com/awslabs/serverless-application-model; + homepage = "https://github.com/awslabs/serverless-application-model"; description = "Python library to transform SAM templates into AWS CloudFormation templates"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.andreabedini ]; diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index c0ca6908586..6e12a1bcb31 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { meta = { description = "AWS X-Ray SDK for the Python programming language"; license = lib.licenses.asl20; - homepage = https://github.com/aws/aws-xray-sdk-python; + homepage = "https://github.com/aws/aws-xray-sdk-python"; }; doCheck = false; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index f772d16942f..05021c73edb 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "8.0.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi"; + sha256 = "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-cosmos/default.nix b/pkgs/development/python-modules/azure-cosmos/default.nix index 5716b1254af..4fa05ada850 100644 --- a/pkgs/development/python-modules/azure-cosmos/default.nix +++ b/pkgs/development/python-modules/azure-cosmos/default.nix @@ -17,9 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six requests ]; - postInstall = '' - rm $out/${python.sitePackages}/azure/__init__.py - ''; + pythonNamespaces = [ "azure" ]; # requires an active Azure Cosmos service doCheck = false; diff --git a/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/pkgs/development/python-modules/azure-keyvault-keys/default.nix index de2b87ecb5c..7e03e7faa8e 100644 --- a/pkgs/development/python-modules/azure-keyvault-keys/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-keys/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { cryptography ]; + pythonNamespaces = [ "azure.keyvault" ]; + # requires relative paths to utilities in the mono-repo doCheck = false; checkInputs = [ aiohttp pytestCheckHook ]; diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index b4749711b9f..25d58513d31 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -21,6 +21,8 @@ buildPythonPackage rec { msrest ]; + pythonNamespaces = [ "azure.keyvault" ]; + # requires checkout from mono-repo doCheck = false; diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index b6f7f1d70d4..035871ab937 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { # this is just a meta package, which contains keys and secrets doCheck = false; + pythonNamespaces = [ "azure" ]; + pythonImportsCheck = [ "azure.keyvault.keys" "azure.keyvault.secrets" diff --git a/pkgs/development/python-modules/azure-loganalytics/default.nix b/pkgs/development/python-modules/azure-loganalytics/default.nix index 4bfda9a9342..beca4018bab 100644 --- a/pkgs/development/python-modules/azure-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-loganalytics/default.nix @@ -22,9 +22,7 @@ buildPythonPackage rec { azure-common ]; - postInstall = lib.optionalString isPy3k '' - rm -rf $out/${python.sitePackages}/azure/__init__.py - ''; + pythonNamespaces = [ "azure" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 274cb181d2d..76a0d71b151 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -27,9 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix index 6da0cf2210c..8186f87fd72 100644 --- a/pkgs/development/python-modules/azure-mgmt-batchai/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-batchai/default.nix @@ -24,10 +24,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/pkgs/development/python-modules/azure-mgmt-billing/default.nix index 8c658145d7e..6e9656950d5 100644 --- a/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -30,10 +30,7 @@ buildPythonPackage rec { --replace "azure-namespace-package = azure-mgmt-nspkg" "" ''; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 99545d2a981..109c3b77748 100644 --- a/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -16,15 +16,12 @@ buildPythonPackage rec { sha256 = "00ygppmlx21dxvb0swfdyhqf5xhi0zxy26abcgql02w0lklw91nj"; }; - postInstall = if isPy3k then "" else '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + pythonNamespaces = [ "azure.mgmt" ]; + # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix index de4a1338611..7e577164511 100644 --- a/pkgs/development/python-modules/azure-mgmt-consumption/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-consumption/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix index ad77a75fe83..1e4cdd88c95 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-analytics/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { azure-mgmt-datalake-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/datalake/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt.datalake" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix index 5d2db3c2112..4f985e37e6f 100644 --- a/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datalake-store/default.nix @@ -3,6 +3,7 @@ , fetchPypi , python , isPy3k +, pythonNamespacesHook , msrestazure , azure-common , azure-mgmt-datalake-nspkg @@ -24,11 +25,7 @@ buildPythonPackage rec { azure-mgmt-datalake-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/datalake/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt.datalake" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index 93c294e4be9..c82bfeab2ed 100644 --- a/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -27,11 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix index 756af164a71..78f149e2f7d 100644 --- a/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-devtestlabs/default.nix @@ -27,11 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-dns/default.nix b/pkgs/development/python-modules/azure-mgmt-dns/default.nix index 0f1527f688b..ce467dba31d 100644 --- a/pkgs/development/python-modules/azure-mgmt-dns/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-dns/default.nix @@ -27,10 +27,7 @@ buildPythonPackage rec { ]; # this is still needed for when the version is overrided - # to previous versions. E.g azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix index c72ca47cff9..c668e5ed4d6 100644 --- a/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-iothubprovisioningservices/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix index 336bba6a170..fd6cd26c7c6 100644 --- a/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-keyvault/default.nix @@ -26,11 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # this is still need when overriding to prevoius versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index a5e2829a930..c149d5ef6fa 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-maps/default.nix b/pkgs/development/python-modules/azure-mgmt-maps/default.nix index b18c0267236..db87b81c838 100644 --- a/pkgs/development/python-modules/azure-mgmt-maps/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-maps/default.nix @@ -26,10 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index ccefd96ce73..fb3bd445b78 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -27,10 +27,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - postInstall = lib.optionalString isPy3k '' - rm -rf $out/${python.sitePackages}/azure/__init__.py - rm -rf $out/${python.sitePackages}/azure/mgmt/__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-msi/default.nix b/pkgs/development/python-modules/azure-mgmt-msi/default.nix index 328e81c8fe7..2b1b65d60ae 100644 --- a/pkgs/development/python-modules/azure-mgmt-msi/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-msi/default.nix @@ -26,11 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-relay/default.nix b/pkgs/development/python-modules/azure-mgmt-relay/default.nix index b60a82a7b1a..d3bf3f31fc2 100644 --- a/pkgs/development/python-modules/azure-mgmt-relay/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-relay/default.nix @@ -24,11 +24,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # still needed when overriding to previous versions - # E.g. azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix index 03084e11cf3..47df7f05ceb 100644 --- a/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-servicefabric/default.nix @@ -26,11 +26,7 @@ buildPythonPackage rec { azure-mgmt-nspkg ]; - # this is still needed for overriding to previous versions - # E.g azure-cli - postInstall = lib.optionalString isPy3k '' - rm -f $out/${python.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; # has no tests doCheck = false; diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 48af270a9d7..e786731dcd0 100644 --- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -7,22 +7,19 @@ }: buildPythonPackage rec { - version = "8.0.0"; + version = "9.0.0"; pname = "azure-mgmt-storage"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "636778912823cebed1c212e4feacc4885d9e49e19a047da20fca9393bc6fac33"; + sha256 = "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; }; - postInstall = if isPy3k then "" else '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py - ''; - propagatedBuildInputs = [ azure-mgmt-common ]; + pythonNamespaces = [ "azure.mgmt" ]; + # has no tests doCheck = false; @@ -30,6 +27,6 @@ buildPythonPackage rec { description = "This is the Microsoft Azure Storage Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; license = licenses.mit; - maintainers = with maintainers; [ olcai mwilsoninsight ]; + maintainers = with maintainers; [ jonringer olcai mwilsoninsight ]; }; } diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix index dc4a011e078..677b8bbeb12 100644 --- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix +++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix @@ -16,11 +16,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ azure-common msrest msrestazure ]; - # fix namespace issues - postInstall = '' - rm $out/${python.sitePackages}/azure/__init__.py - rm $out/${python.sitePackages}/azure/multiapi/__init__.py - ''; + # fix namespace + pythonNamespaces = [ "azure.multiapi" ]; # no tests included doCheck = false; diff --git a/pkgs/development/python-modules/azure-storage/default.nix b/pkgs/development/python-modules/azure-storage/default.nix index c199fbbeb36..e2037bb7d21 100644 --- a/pkgs/development/python-modules/azure-storage/default.nix +++ b/pkgs/development/python-modules/azure-storage/default.nix @@ -10,20 +10,21 @@ }: buildPythonPackage rec { - version = "0.20.3"; + version = "0.36.0"; pname = "azure-storage"; src = fetchPypi { inherit pname version; - extension = "zip"; - sha256 = "06bmw6k2000kln5jwk5r9bgcalqbyvqirmdh9gq4s6nb4fv3c0jb"; + sha256 = "0pyasfxkin6j8j00qmky7d9cvpxgis4fi9bscgclj6yrpvf14qpv"; }; propagatedBuildInputs = [ azure-common dateutil requests ] ++ pkgs.lib.optionals (!isPy3k) [ futures ]; - postInstall = '' - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py + postPatch = '' + rm azure_bdist_wheel.py + substituteInPlace setup.cfg \ + --replace "azure-namespace-package = azure-nspkg" "" ''; meta = with pkgs.lib; { diff --git a/pkgs/development/python-modules/babelfish/default.nix b/pkgs/development/python-modules/babelfish/default.nix index c8245a15c7f..87769aa3ea9 100644 --- a/pkgs/development/python-modules/babelfish/default.nix +++ b/pkgs/development/python-modules/babelfish/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/babelfish; + homepage = "https://pypi.python.org/pypi/babelfish"; description = "A module to work with countries and languages"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/backcall/default.nix b/pkgs/development/python-modules/backcall/default.nix index 2eb44cb3624..f1951a13d78 100644 --- a/pkgs/development/python-modules/backcall/default.nix +++ b/pkgs/development/python-modules/backcall/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { meta = { description = "Specifications for callback functions passed in to an API"; - homepage = https://github.com/takluyver/backcall; + homepage = "https://github.com/takluyver/backcall"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/backports-shutil-which/default.nix b/pkgs/development/python-modules/backports-shutil-which/default.nix index 1b8b8f2ba47..656842f4434 100644 --- a/pkgs/development/python-modules/backports-shutil-which/default.nix +++ b/pkgs/development/python-modules/backports-shutil-which/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Backport of shutil.which from Python 3.3"; - homepage = https://github.com/minrk/backports.shutil_which; + homepage = "https://github.com/minrk/backports.shutil_which"; license = licenses.psfl; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/backports_abc/default.nix b/pkgs/development/python-modules/backports_abc/default.nix index ab34d376de0..d67117613d7 100644 --- a/pkgs/development/python-modules/backports_abc/default.nix +++ b/pkgs/development/python-modules/backports_abc/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/cython/backports_abc; + homepage = "https://github.com/cython/backports_abc"; license = lib.licenses.psfl; description = "A backport of recent additions to the 'collections.abc' module"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/backports_csv/default.nix b/pkgs/development/python-modules/backports_csv/default.nix index ce5d15c212a..e2fae4897f6 100644 --- a/pkgs/development/python-modules/backports_csv/default.nix +++ b/pkgs/development/python-modules/backports_csv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Backport of Python 3 csv module"; - homepage = https://github.com/ryanhiebert; + homepage = "https://github.com/ryanhiebert"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix index 8cb84c02b37..79e11ecae4f 100644 --- a/pkgs/development/python-modules/backports_functools_lru_cache/default.nix +++ b/pkgs/development/python-modules/backports_functools_lru_cache/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Backport of functools.lru_cache"; - homepage = https://github.com/jaraco/backports.functools_lru_cache; + homepage = "https://github.com/jaraco/backports.functools_lru_cache"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/backports_lzma/default.nix b/pkgs/development/python-modules/backports_lzma/default.nix index 997e4930ac7..1ebae86dec9 100644 --- a/pkgs/development/python-modules/backports_lzma/default.nix +++ b/pkgs/development/python-modules/backports_lzma/default.nix @@ -29,7 +29,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage rec { meta = { description = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files"; - homepage = https://github.com/peterjc/backports.lzma; + homepage = "https://github.com/peterjc/backports.lzma"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/backports_os/default.nix b/pkgs/development/python-modules/backports_os/default.nix index 9d0ddc2cad9..dc969cbb4b9 100644 --- a/pkgs/development/python-modules/backports_os/default.nix +++ b/pkgs/development/python-modules/backports_os/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pjdelport/backports.os; + homepage = "https://github.com/pjdelport/backports.os"; description = "Backport of new features in Python's os module"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix index 14365747971..34a7ddefa47 100644 --- a/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix +++ b/pkgs/development/python-modules/backports_shutil_get_terminal_size/default.nix @@ -28,7 +28,7 @@ if !(pythonOlder "3.3") then null else buildPythonPackage { meta = with lib; { description = "A backport of the get_terminal_size function from Python 3.3’s shutil."; - homepage = https://github.com/chrippa/backports.shutil_get_terminal_size; + homepage = "https://github.com/chrippa/backports.shutil_get_terminal_size"; license = with licenses; [ mit ]; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix index 013fe9f446f..d6fecfbdfb9 100644 --- a/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix +++ b/pkgs/development/python-modules/backports_ssl_match_hostname/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "The Secure Sockets layer is only actually *secure*"; - homepage = https://bitbucket.org/brandon/backports.ssl_match_hostname; + homepage = "https://bitbucket.org/brandon/backports.ssl_match_hostname"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/backports_tempfile/default.nix b/pkgs/development/python-modules/backports_tempfile/default.nix index c2dbb0e6fa8..cc51e23260b 100644 --- a/pkgs/development/python-modules/backports_tempfile/default.nix +++ b/pkgs/development/python-modules/backports_tempfile/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { meta = { description = "Backport of new features in Python's tempfile module"; license = lib.licenses.psfl; - homepage = https://github.com/pjdelport/backports.tempfile; + homepage = "https://github.com/pjdelport/backports.tempfile"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/backports_unittest-mock/default.nix b/pkgs/development/python-modules/backports_unittest-mock/default.nix index 57d2cad281e..a55eeff511f 100644 --- a/pkgs/development/python-modules/backports_unittest-mock/default.nix +++ b/pkgs/development/python-modules/backports_unittest-mock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides a function install() which makes the mock module"; - homepage = https://github.com/jaraco/backports.unittest_mock; + homepage = "https://github.com/jaraco/backports.unittest_mock"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index e0492a7d1c4..fd63294302c 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages."; - homepage = https://github.com/BinaryAnalysisPlatform/bap/; + homepage = "https://github.com/BinaryAnalysisPlatform/bap/"; maintainers = [ maintainers.maurer ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/base58/default.nix b/pkgs/development/python-modules/base58/default.nix index aafd73b8d8d..8f26a3340a7 100644 --- a/pkgs/development/python-modules/base58/default.nix +++ b/pkgs/development/python-modules/base58/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Base58 and Base58Check implementation"; - homepage = https://github.com/keis/base58; + homepage = "https://github.com/keis/base58"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/baselines/default.nix b/pkgs/development/python-modules/baselines/default.nix index 56a60de5979..66972dc8b23 100644 --- a/pkgs/development/python-modules/baselines/default.nix +++ b/pkgs/development/python-modules/baselines/default.nix @@ -57,7 +57,7 @@ buildPythonPackage { meta = with lib; { description = "High-quality implementations of reinforcement learning algorithms"; - homepage = https://github.com/openai/baselines; + homepage = "https://github.com/openai/baselines"; license = licenses.mit; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix index c575dc516ff..8e29eed2acf 100644 --- a/pkgs/development/python-modules/bashlex/default.nix +++ b/pkgs/development/python-modules/bashlex/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser for bash"; license = licenses.gpl3; - homepage = https://github.com/idank/bashlex; + homepage = "https://github.com/idank/bashlex"; maintainers = with maintainers; [ multun ]; }; } diff --git a/pkgs/development/python-modules/basiciw/default.nix b/pkgs/development/python-modules/basiciw/default.nix index 0d25d7cdbe9..8ae4a59cfb4 100644 --- a/pkgs/development/python-modules/basiciw/default.nix +++ b/pkgs/development/python-modules/basiciw/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Get info about wireless interfaces using libiw"; - homepage = https://github.com/enkore/basiciw; + homepage = "https://github.com/enkore/basiciw"; platforms = lib.platforms.linux; license = lib.licenses.gpl2; }; diff --git a/pkgs/development/python-modules/batinfo/default.nix b/pkgs/development/python-modules/batinfo/default.nix index 3e21fae1de6..57dfd5062c1 100644 --- a/pkgs/development/python-modules/batinfo/default.nix +++ b/pkgs/development/python-modules/batinfo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/nicolargo/batinfo; + homepage = "https://github.com/nicolargo/batinfo"; description = "A simple Python lib to retrieve battery information"; license = licenses.lgpl3; platforms = platforms.all; diff --git a/pkgs/development/python-modules/bayespy/default.nix b/pkgs/development/python-modules/bayespy/default.nix index 210fbbe2176..0532e0e022e 100644 --- a/pkgs/development/python-modules/bayespy/default.nix +++ b/pkgs/development/python-modules/bayespy/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi, pythonOlder -, pytest, glibcLocales +, pytest, nose, glibcLocales , numpy, scipy, matplotlib, h5py }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "24e1327ce241a0113abf217fbaf41ac25e04f5a01f9ed606610f2f1f2d82d34f"; }; - checkInputs = [ pytest glibcLocales ]; + checkInputs = [ pytest nose glibcLocales ]; propagatedBuildInputs = [ numpy scipy matplotlib h5py ]; checkPhase = '' @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.bayespy.org; + homepage = "http://www.bayespy.org"; description = "Variational Bayesian inference tools for Python"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index c32fefbbdfe..2468eaccecd 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { maintainers = with maintainers; [ domenkozar ]; description = "Modern password hashing for your software and your servers"; license = licenses.asl20; - homepage = https://github.com/pyca/bcrypt/; + homepage = "https://github.com/pyca/bcrypt/"; }; } diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix index 9405e3489d4..045dd14da0d 100644 --- a/pkgs/development/python-modules/beancount/default.nix +++ b/pkgs/development/python-modules/beancount/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; meta = { - homepage = http://furius.ca/beancount/; + homepage = "http://furius.ca/beancount/"; description = "Double-entry bookkeeping computer language"; longDescription = '' A double-entry bookkeeping computer language that lets you define diff --git a/pkgs/development/python-modules/beanstalkc/default.nix b/pkgs/development/python-modules/beanstalkc/default.nix index e83a9f67789..c24e9a03d15 100644 --- a/pkgs/development/python-modules/beanstalkc/default.nix +++ b/pkgs/development/python-modules/beanstalkc/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "A simple beanstalkd client library for Python"; maintainers = with stdenv.lib.maintainers; [ aanderse ]; license = with stdenv.lib.licenses; [ asl20 ]; - homepage = https://github.com/earl/beanstalkc; + 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 1720738b169..fc07c4ae96e 100644 --- a/pkgs/development/python-modules/beautifulsoup4/default.nix +++ b/pkgs/development/python-modules/beautifulsoup4/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ soupsieve ]; meta = with stdenv.lib; { - homepage = http://crummy.com/software/BeautifulSoup/bs4/; + homepage = "http://crummy.com/software/BeautifulSoup/bs4/"; description = "HTML and XML parser"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/bedup/default.nix b/pkgs/development/python-modules/bedup/default.nix index 13aa48f7f8f..6c0c3c44d2d 100644 --- a/pkgs/development/python-modules/bedup/default.nix +++ b/pkgs/development/python-modules/bedup/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { on disk. It integrates deeply with btrfs so that scans are incremental and low-impact. ''; - homepage = https://github.com/g2p/bedup; + homepage = "https://github.com/g2p/bedup"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 ]; }; diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix index 6d0364676f9..fbe108e2a02 100644 --- a/pkgs/development/python-modules/behave/default.nix +++ b/pkgs/development/python-modules/behave/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { patches = [ # Fix tests on Python 2.7 (fetchpatch { - url = https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch; + url = "https://github.com/behave/behave/commit/0a9430a94881cd18437deb03d2ae23afea0f009c.patch"; sha256 = "1nrh9ii6ik6gw2kjh8a6jk4mg5yqw3jfjfllbyxardclsab62ydy"; }) ]; @@ -44,7 +44,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/behave/behave; + homepage = "https://github.com/behave/behave"; description = "behaviour-driven development, Python style"; license = licenses.bsd2; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 762154ac45d..e95a34d1542 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ betamax requests_toolbelt ]; meta = with stdenv.lib; { - homepage = https://github.com/sigmavirus24/betamax_matchers; + homepage = "https://github.com/sigmavirus24/betamax_matchers"; description = "A group of experimental matchers for Betamax"; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/python-modules/betamax-serializers/default.nix b/pkgs/development/python-modules/betamax-serializers/default.nix index 41341c24481..60a79a51d49 100644 --- a/pkgs/development/python-modules/betamax-serializers/default.nix +++ b/pkgs/development/python-modules/betamax-serializers/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ betamax pyyaml ]; meta = with stdenv.lib; { - homepage = https://gitlab.com/betamax/serializers; + homepage = "https://gitlab.com/betamax/serializers"; description = "A set of third-party serializers for Betamax"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/betamax/default.nix b/pkgs/development/python-modules/betamax/default.nix index 8051ed0beff..7339fcbf648 100644 --- a/pkgs/development/python-modules/betamax/default.nix +++ b/pkgs/development/python-modules/betamax/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://betamax.readthedocs.org/en/latest/; + homepage = "https://betamax.readthedocs.org/en/latest/"; description = "A VCR imitation for requests"; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/python-modules/bibtexparser/default.nix b/pkgs/development/python-modules/bibtexparser/default.nix index 849b6e8b240..d69b2d6ce4c 100644 --- a/pkgs/development/python-modules/bibtexparser/default.nix +++ b/pkgs/development/python-modules/bibtexparser/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Bibtex parser for python 2.7 and 3.3 and newer"; - homepage = https://github.com/sciunto-org/python-bibtexparser; + homepage = "https://github.com/sciunto-org/python-bibtexparser"; license = with lib.licenses; [ gpl3 bsd3 ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index e96e59dd7cf..84ff0e88b14 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/jab/bidict; + homepage = "https://github.com/jab/bidict"; description = "Efficient, Pythonic bidirectional map data structures and related functionality"; license = licenses.mpl20; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/billiard/default.nix b/pkgs/development/python-modules/billiard/default.nix index 91624210bb5..5bccf792452 100644 --- a/pkgs/development/python-modules/billiard/default.nix +++ b/pkgs/development/python-modules/billiard/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/celery/billiard; + homepage = "https://github.com/celery/billiard"; description = "Python multiprocessing fork with improvements and bugfixes"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/binaryornot/default.nix b/pkgs/development/python-modules/binaryornot/default.nix index 77f1ff7cbd0..103bd79294e 100644 --- a/pkgs/development/python-modules/binaryornot/default.nix +++ b/pkgs/development/python-modules/binaryornot/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ hypothesis ]; meta = with lib; { - homepage = https://github.com/audreyr/binaryornot; + homepage = "https://github.com/audreyr/binaryornot"; description = "Ultra-lightweight pure Python package to check if a file is binary or text"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/biopython/default.nix b/pkgs/development/python-modules/biopython/default.nix index 727687c5e70..76de4c39054 100644 --- a/pkgs/development/python-modules/biopython/default.nix +++ b/pkgs/development/python-modules/biopython/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { applications which address the needs of current and future work in bioinformatics. ''; - homepage = https://biopython.org/wiki/Documentation; + homepage = "https://biopython.org/wiki/Documentation"; maintainers = with lib.maintainers; [ luispedro ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index d89ab9c3107..06329c8ab90 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Efficient arrays of booleans"; - homepage = https://github.com/ilanschnell/bitarray; + homepage = "https://github.com/ilanschnell/bitarray"; license = licenses.psfl; maintainers = [ maintainers.bhipple ]; }; diff --git a/pkgs/development/python-modules/bitbucket-api/default.nix b/pkgs/development/python-modules/bitbucket-api/default.nix index 0d1ac109179..82b49a26757 100644 --- a/pkgs/development/python-modules/bitbucket-api/default.nix +++ b/pkgs/development/python-modules/bitbucket-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/Sheeprider/BitBucket-api; + homepage = "https://github.com/Sheeprider/BitBucket-api"; description = "Python library to interact with BitBucket REST API"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/bitbucket-cli/default.nix b/pkgs/development/python-modules/bitbucket-cli/default.nix index 0a54c0ed17c..5e5d5662ba3 100644 --- a/pkgs/development/python-modules/bitbucket-cli/default.nix +++ b/pkgs/development/python-modules/bitbucket-cli/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bitbucket command line interface"; - homepage = https://bitbucket.org/zhemao/bitbucket-cli; + homepage = "https://bitbucket.org/zhemao/bitbucket-cli"; maintainers = with maintainers; [ refnil ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/bitcoin-price-api/default.nix b/pkgs/development/python-modules/bitcoin-price-api/default.nix index d9ddc842642..3e74c17f3be 100644 --- a/pkgs/development/python-modules/bitcoin-price-api/default.nix +++ b/pkgs/development/python-modules/bitcoin-price-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/dursk/bitcoin-price-api; + homepage = "https://github.com/dursk/bitcoin-price-api"; description = "Price APIs for bitcoin exchanges"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/bitmath/default.nix b/pkgs/development/python-modules/bitmath/default.nix index 092ad6c1003..55194b02db3 100644 --- a/pkgs/development/python-modules/bitmath/default.nix +++ b/pkgs/development/python-modules/bitmath/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Module for representing and manipulating file sizes with different prefix"; - homepage = https://github.com/tbielawa/bitmath; + homepage = "https://github.com/tbielawa/bitmath"; license = licenses.mit; maintainers = with maintainers; [ twey ]; }; diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 3e546d38697..7c58aab85c4 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/eerimoq/bitstruct; + homepage = "https://github.com/eerimoq/bitstruct"; description = "Python bit pack/unpack package"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/bjoern/default.nix b/pkgs/development/python-modules/bjoern/default.nix index 08caabef3bd..c2f60fce9dc 100644 --- a/pkgs/development/python-modules/bjoern/default.nix +++ b/pkgs/development/python-modules/bjoern/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jonashaag/bjoern; + homepage = "https://github.com/jonashaag/bjoern"; description = "A screamingly fast Python 2/3 WSGI server written in C"; license = licenses.bsd2; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/development/python-modules/bkcharts/default.nix b/pkgs/development/python-modules/bkcharts/default.nix index 270015a423b..9e105c09d57 100644 --- a/pkgs/development/python-modules/bkcharts/default.nix +++ b/pkgs/development/python-modules/bkcharts/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "High level chart types built on top of Bokeh"; - homepage = https://github.com/bokeh/bkcharts; + homepage = "https://github.com/bokeh/bkcharts"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 315e891030e..4b4d2e4a903 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The uncompromising Python code formatter"; - homepage = https://github.com/ambv/black; + homepage = "https://github.com/ambv/black"; license = licenses.mit; maintainers = with maintainers; [ sveitser ]; }; diff --git a/pkgs/development/python-modules/blaze/default.nix b/pkgs/development/python-modules/blaze/default.nix index b3c56a618e8..0707c431f1b 100644 --- a/pkgs/development/python-modules/blaze/default.nix +++ b/pkgs/development/python-modules/blaze/default.nix @@ -63,9 +63,9 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/ContinuumIO/blaze; + homepage = "https://github.com/ContinuumIO/blaze"; description = "Allows Python users a familiar interface to query data living in other data storage systems"; license = lib.licenses.bsdOriginal; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix index 1033f9def76..d8760d2e128 100644 --- a/pkgs/development/python-modules/bleach/default.nix +++ b/pkgs/development/python-modules/bleach/default.nix @@ -42,8 +42,8 @@ buildPythonPackage rec { to do lots of things, you're probably outside the use cases. Either trust those users, or don't. ''; - homepage = https://github.com/mozilla/bleach; - downloadPage = https://github.com/mozilla/bleach/releases; + homepage = "https://github.com/mozilla/bleach"; + downloadPage = "https://github.com/mozilla/bleach/releases"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ prikhi ]; }; diff --git a/pkgs/development/python-modules/blessed/default.nix b/pkgs/development/python-modules/blessed/default.nix index 164848aeac9..76394c5f85a 100644 --- a/pkgs/development/python-modules/blessed/default.nix +++ b/pkgs/development/python-modules/blessed/default.nix @@ -5,12 +5,12 @@ let fixTestSuiteFailure_1 = fetchpatch { - url = https://github.com/jquast/blessed/pull/108/commits/76a54d39b0f58bfc71af04ee143459eefb0e1e7b.patch; + url = "https://github.com/jquast/blessed/pull/108/commits/76a54d39b0f58bfc71af04ee143459eefb0e1e7b.patch"; sha256 = "1higmv4c03ly7ywac1d7s71f3hrl531vj16nsfl9xh6zh9c47qcg"; }; fixTestSuiteFailure_2 = fetchpatch { - url = https://github.com/jquast/blessed/pull/108/commits/aa94e01aed745715e667601fb674844b257cfcc9.patch; + url = "https://github.com/jquast/blessed/pull/108/commits/aa94e01aed745715e667601fb674844b257cfcc9.patch"; sha256 = "1frygr6sc1vakdfx1hf6jj0dbwibiqz8hw9maf1b605cbslc9nay"; }; @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ wcwidth six ]; meta = with stdenv.lib; { - homepage = https://github.com/jquast/blessed; + homepage = "https://github.com/jquast/blessed"; description = "A thin, practical wrapper around terminal capabilities in Python."; maintainers = with maintainers; [ eqyiel ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/blessings/default.nix b/pkgs/development/python-modules/blessings/default.nix index 23e9067ea33..c285b3a7d00 100644 --- a/pkgs/development/python-modules/blessings/default.nix +++ b/pkgs/development/python-modules/blessings/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/erikrose/blessings; + homepage = "https://github.com/erikrose/blessings"; description = "A thin, practical wrapper around terminal coloring, styling, and positioning"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/blinker/default.nix b/pkgs/development/python-modules/blinker/default.nix index 441d1250e0a..5c76efb029f 100644 --- a/pkgs/development/python-modules/blinker/default.nix +++ b/pkgs/development/python-modules/blinker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://pythonhosted.org/blinker/; + homepage = "https://pythonhosted.org/blinker/"; description = "Fast, simple object-to-object and broadcast signaling"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/blinkstick/default.nix b/pkgs/development/python-modules/blinkstick/default.nix index 96f7bfebdeb..5e7cd42362d 100644 --- a/pkgs/development/python-modules/blinkstick/default.nix +++ b/pkgs/development/python-modules/blinkstick/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch; + url = "https://github.com/arvydas/blinkstick-python/commit/a9227d0.patch"; sha256 = "1mcmxlnkbfxwp84qz32l5rlc7r9anh9yhnqaj1y8rny5s13jb01f"; }) (fetchpatch { - url = https://github.com/arvydas/blinkstick-python/pull/54.patch; + url = "https://github.com/arvydas/blinkstick-python/pull/54.patch"; sha256 = "1gjq6xbai794bbdyrv82i96l1a7qkwvlhzd6sa937dy5ivv6s6hl"; }) ]; @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to control BlinkStick USB devices"; - homepage = https://pypi.python.org/pypi/BlinkStick/; + homepage = "https://pypi.python.org/pypi/BlinkStick/"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index ca6d5d62442..596545093a9 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "BLAS-like linear algebra library"; - homepage = https://github.com/explosion/cython-blis; + homepage = "https://github.com/explosion/cython-blis"; license = licenses.bsd3; maintainers = with maintainers; [ danieldk ]; }; diff --git a/pkgs/development/python-modules/blist/default.nix b/pkgs/development/python-modules/blist/default.nix index 90a4b99cda3..52687bf2506 100644 --- a/pkgs/development/python-modules/blist/default.nix +++ b/pkgs/development/python-modules/blist/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = http://stutzbachenterprises.com/blist/; + homepage = "http://stutzbachenterprises.com/blist/"; description = "A list-like type with better asymptotic performance and similar performance on small lists"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 4b96e86193d..f3efba1f378 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -37,7 +37,7 @@ in buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://fedoraproject.org/wiki/Blivet; + homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index f6bd3178bba..f80c8a8c145 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Integrate Bitcoin, Dogecoin and Litecoin in your Python applications using block.io"; - homepage = https://github.com/BlockIo/block_io-python; + homepage = "https://github.com/BlockIo/block_io-python"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/blockdiag/default.nix b/pkgs/development/python-modules/blockdiag/default.nix index 7b67997fa08..ceaa31874ec 100644 --- a/pkgs/development/python-modules/blockdiag/default.nix +++ b/pkgs/development/python-modules/blockdiag/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate block-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; + homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix index 18f59b05288..7157cf14096 100644 --- a/pkgs/development/python-modules/bokeh/default.nix +++ b/pkgs/development/python-modules/bokeh/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { meta = { description = "Statistical and novel interactive HTML plots for Python"; - homepage = https://github.com/bokeh/bokeh; + homepage = "https://github.com/bokeh/bokeh"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ orivej ]; }; diff --git a/pkgs/development/python-modules/boltons/default.nix b/pkgs/development/python-modules/boltons/default.nix index 6470b7da859..36361ac0118 100644 --- a/pkgs/development/python-modules/boltons/default.nix +++ b/pkgs/development/python-modules/boltons/default.nix @@ -2,21 +2,21 @@ buildPythonPackage rec { pname = "boltons"; - version = "20.0.0"; + version = "20.1.0"; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "mahmoud"; repo = "boltons"; rev = version; - sha256 = "0scdslqi28b899i42m4c9pvhwv3kkw4wpi3n9zm5n64ggn5ngfbz"; + sha256 = "0mbxc2n10mlmpbwhg0byddl1i0s6rlrr6z9xm8zzmkv62136irqh"; }; checkInputs = [ pytest ]; checkPhase = "pytest tests"; meta = with stdenv.lib; { - homepage = https://github.com/mahmoud/boltons; + homepage = "https://github.com/mahmoud/boltons"; description = "220+ constructs, recipes, and snippets extending (and relying on nothing but) the Python standard library"; longDescription = '' Boltons is a set of over 220 BSD-licensed, pure-Python utilities diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 8452e05becc..85ebae5b612 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests httpretty ]; meta = with pkgs.lib; { - homepage = https://github.com/boto/boto; + homepage = "https://github.com/boto/boto"; license = licenses.mit; description = "Python interface to Amazon Web Services"; longDescription = '' diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 58af27fe439..4bbb98d6a29 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/boto/boto3; + homepage = "https://github.com/boto/boto3"; license = lib.licenses.asl20; description = "AWS SDK for Python"; longDescription = '' diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 8bf6b4eff7e..b7061eb0a1d 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/boto/botocore; + homepage = "https://github.com/boto/botocore"; license = "bsd"; description = "A low-level interface to a growing number of Amazon Web Services"; }; diff --git a/pkgs/development/python-modules/bottle/default.nix b/pkgs/development/python-modules/bottle/default.nix index c0de6eecae9..5fda85dc972 100644 --- a/pkgs/development/python-modules/bottle/default.nix +++ b/pkgs/development/python-modules/bottle/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; meta = with stdenv.lib; { - homepage = http://bottlepy.org; + homepage = "http://bottlepy.org"; description = "A fast and simple micro-framework for small web-applications"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/box2d/default.nix b/pkgs/development/python-modules/box2d/default.nix index 5870bdcdb73..1b372f90a90 100644 --- a/pkgs/development/python-modules/box2d/default.nix +++ b/pkgs/development/python-modules/box2d/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/pybox2d/pybox2d; + homepage = "https://github.com/pybox2d/pybox2d"; description = '' A 2D game physics library for Python under the very liberal zlib license diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix index a91be0e13dd..73ce843cf01 100644 --- a/pkgs/development/python-modules/bpython/default.nix +++ b/pkgs/development/python-modules/bpython/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bpython"; - version = "0.18"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "56cc20dbe568c98c81de4990fddf5862c0d8d3ab0ad1cf7057988abc5f7686c2"; + sha256 = "1764ikgj24jjq46s50apwkydqvy5a13adb2nbszk8kbci6df0v27"; }; propagatedBuildInputs = [ curtsies greenlet pygments requests urwid ]; diff --git a/pkgs/development/python-modules/branca/default.nix b/pkgs/development/python-modules/branca/default.nix index 447a5230c7f..95ba6d537c3 100644 --- a/pkgs/development/python-modules/branca/default.nix +++ b/pkgs/development/python-modules/branca/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Generate complex HTML+JS pages with Python"; - homepage = https://github.com/python-visualization/branca; + homepage = "https://github.com/python-visualization/branca"; license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/bravia-tv/default.nix b/pkgs/development/python-modules/bravia-tv/default.nix new file mode 100644 index 00000000000..2df937f4232 --- /dev/null +++ b/pkgs/development/python-modules/bravia-tv/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, buildPythonPackage, isPy27, requests }: + +buildPythonPackage rec { + pname = "bravia-tv"; + version = "1.0.1"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "dcnielsen90"; + repo = "python-bravia-tv"; + rev = "v${version}"; + sha256 = "0jlrin5qw3ny2r961y5divd5xa9giprxhhxdc84rjlq9qdmnsk68"; + }; + + propagatedBuildInputs = [ requests ]; + + # package does not include tests + doCheck = false; + + pythonImportsCheck = [ "bravia_tv" ]; + + meta = with lib; { + homepage = "https://github.com/dcnielsen90/python-bravia-tv"; + description = "Python library for Sony Bravia TV remote control"; + license = licenses.mit; + maintainers = with maintainers; [ colemickens ]; + }; +} diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index c088199fda7..842c8289f77 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.14.1"; + version = "4.14.2"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1ia9iq3kk0g8cqcsf03di3cnq295gfixriqfpp9wd38zf2wgq0l1"; + sha256 = "1vj2yylff07hh4l3sh3srhpnrk1q6pxznvwqzgmbplhn8gf5rimb"; }; propagatedBuildInputs = [ docutils six sphinx ]; @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = !isPy3k; meta = { - homepage = https://github.com/michaeljones/breathe; + homepage = "https://github.com/michaeljones/breathe"; license = lib.licenses.bsd3; description = "Sphinx Doxygen renderer"; inherit (sphinx.meta) platforms; diff --git a/pkgs/development/python-modules/broadlink/default.nix b/pkgs/development/python-modules/broadlink/default.nix index 99d7641c07e..971b56d8b88 100644 --- a/pkgs/development/python-modules/broadlink/default.nix +++ b/pkgs/development/python-modules/broadlink/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for controlling Broadlink IR controllers"; - homepage = https://github.com/mjg59/python-broadlink; + homepage = "https://github.com/mjg59/python-broadlink"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/brotli/default.nix b/pkgs/development/python-modules/brotli/default.nix index bec205676ba..0da53ab5ca2 100644 --- a/pkgs/development/python-modules/brotli/default.nix +++ b/pkgs/development/python-modules/brotli/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/google/brotli; + homepage = "https://github.com/google/brotli"; description = "Generic-purpose lossless compression algorithm"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/browser-cookie3/default.nix b/pkgs/development/python-modules/browser-cookie3/default.nix index 13eea3e21fd..909641a9ffd 100644 --- a/pkgs/development/python-modules/browser-cookie3/default.nix +++ b/pkgs/development/python-modules/browser-cookie3/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Loads cookies from your browser into a cookiejar object"; maintainers = with maintainers; [ borisbabic ]; - homepage = https://github.com/borisbabic/browser_cookie3; + homepage = "https://github.com/borisbabic/browser_cookie3"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/browsermob-proxy/default.nix b/pkgs/development/python-modules/browsermob-proxy/default.nix index b5da73a32d2..68668fce079 100644 --- a/pkgs/development/python-modules/browsermob-proxy/default.nix +++ b/pkgs/development/python-modules/browsermob-proxy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A library for interacting with Browsermob Proxy"; - homepage = http://oss.theautomatedtester.co.uk/browsermob-proxy-py; + homepage = "http://oss.theautomatedtester.co.uk/browsermob-proxy-py"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 7a541a47952..39ffaae6538 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for Oracle Berkeley DB"; - homepage = https://www.jcea.es/programacion/pybsddb.htm; + homepage = "https://www.jcea.es/programacion/pybsddb.htm"; license = with licenses; [ agpl3 ]; # License changed from bsd3 to agpl3 since 6.x maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/bt-proximity/default.nix b/pkgs/development/python-modules/bt-proximity/default.nix index f998ebca06d..17f38406248 100644 --- a/pkgs/development/python-modules/bt-proximity/default.nix +++ b/pkgs/development/python-modules/bt-proximity/default.nix @@ -20,7 +20,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Bluetooth Proximity Detection using Python"; - homepage = https://github.com/FrederikBolding/bluetooth-proximity; + homepage = "https://github.com/FrederikBolding/bluetooth-proximity"; maintainers = with maintainers; [ peterhoeg ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix index 4b17b5046aa..e51d0e75a0b 100644 --- a/pkgs/development/python-modules/btrees/default.nix +++ b/pkgs/development/python-modules/btrees/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scalable persistent components"; - homepage = http://packages.python.org/BTrees; + homepage = "http://packages.python.org/BTrees"; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/bugwarrior/default.nix b/pkgs/development/python-modules/bugwarrior/default.nix index 190598942c7..37c91127a2c 100644 --- a/pkgs/development/python-modules/bugwarrior/default.nix +++ b/pkgs/development/python-modules/bugwarrior/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ralphbean/bugwarrior; + homepage = "https://github.com/ralphbean/bugwarrior"; description = "Sync github, bitbucket, bugzilla, and trac issues with taskwarrior"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/python-modules/bugzilla/default.nix b/pkgs/development/python-modules/bugzilla/default.nix index a342ac99943..f4048851109 100644 --- a/pkgs/development/python-modules/bugzilla/default.nix +++ b/pkgs/development/python-modules/bugzilla/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/python-bugzilla/python-bugzilla; + homepage = "https://github.com/python-bugzilla/python-bugzilla"; description = "Bugzilla XMLRPC access module"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix index c1e19eb8560..c22b03f4fa1 100644 --- a/pkgs/development/python-modules/bumps/default.nix +++ b/pkgs/development/python-modules/bumps/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://www.reflectometry.org/danse/software.html; + homepage = "http://www.reflectometry.org/danse/software.html"; description = "Data fitting with bayesian uncertainty analysis"; maintainers = with maintainers; [ rprospero ]; license = licenses.publicDomain; diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix index 693646c80a4..e5a7584234c 100644 --- a/pkgs/development/python-modules/cachecontrol/default.nix +++ b/pkgs/development/python-modules/cachecontrol/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ionrock/cachecontrol; + homepage = "https://github.com/ionrock/cachecontrol"; description = "Httplib2 caching for requests"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/cached-property/default.nix b/pkgs/development/python-modules/cached-property/default.nix index 3a3e6d1e6dd..d25e2e963dc 100644 --- a/pkgs/development/python-modules/cached-property/default.nix +++ b/pkgs/development/python-modules/cached-property/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "A decorator for caching properties in classes"; - homepage = https://github.com/pydanny/cached-property; + homepage = "https://github.com/pydanny/cached-property"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ ericsagnes ]; diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix index e66bef51d03..278dd5a8ae6 100644 --- a/pkgs/development/python-modules/cachy/default.nix +++ b/pkgs/development/python-modules/cachy/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/sdispater/cachy; + homepage = "https://github.com/sdispater/cachy"; description = "Cachy provides a simple yet effective caching library"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix index cf1618a865b..ee795d80dce 100644 --- a/pkgs/development/python-modules/cairocffi/generic.nix +++ b/pkgs/development/python-modules/cairocffi/generic.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/SimonSapin/cairocffi; + homepage = "https://github.com/SimonSapin/cairocffi"; license = licenses.bsd3; maintainers = with maintainers; []; description = "cffi-based cairo bindings for Python"; diff --git a/pkgs/development/python-modules/cairosvg/1_x.nix b/pkgs/development/python-modules/cairosvg/1_x.nix index b6d40a5fdb7..b98fbbf91e8 100644 --- a/pkgs/development/python-modules/cairosvg/1_x.nix +++ b/pkgs/development/python-modules/cairosvg/1_x.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { # ''; meta = with stdenv.lib; { - homepage = https://cairosvg.org; + homepage = "https://cairosvg.org"; license = licenses.lgpl3; description = "SVG converter based on Cairo"; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/cairosvg/default.nix b/pkgs/development/python-modules/cairosvg/default.nix index 77c5c21befe..31f7d7bc5d6 100644 --- a/pkgs/development/python-modules/cairosvg/default.nix +++ b/pkgs/development/python-modules/cairosvg/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner pytestcov pytest-flake8 pytest-isort ]; meta = with stdenv.lib; { - homepage = https://cairosvg.org; + homepage = "https://cairosvg.org"; license = licenses.lgpl3; description = "SVG converter based on Cairo"; }; diff --git a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix index a12a12547e9..2d882967493 100644 --- a/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix +++ b/pkgs/development/python-modules/caldavclientlibrary-asynk/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { that package. ''; - homepage = https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/; + homepage = "https://github.com/skarra/CalDAVClientLibrary/tree/asynkdev/"; maintainers = with maintainers; [ pjones ]; broken = true; # 2018-04-11 }; diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix index 8aa80a75067..3629e0097ed 100644 --- a/pkgs/development/python-modules/can/default.nix +++ b/pkgs/development/python-modules/can/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/hardbyte/python-can; + homepage = "https://github.com/hardbyte/python-can"; description = "CAN support for Python"; license = licenses.lgpl3; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/development/python-modules/canmatrix/default.nix b/pkgs/development/python-modules/canmatrix/default.nix index 004669d605b..b9a61af8b48 100644 --- a/pkgs/development/python-modules/canmatrix/default.nix +++ b/pkgs/development/python-modules/canmatrix/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/ebroecker/canmatrix; + homepage = "https://github.com/ebroecker/canmatrix"; description = "Support and convert several CAN (Controller Area Network) database formats .arxml .dbc .dbf .kcd .sym fibex xls(x)"; license = licenses.bsd2; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 7457002929a..24cccc3aa77 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/matrix-org/python-canonicaljson; + homepage = "https://github.com/matrix-org/python-canonicaljson"; description = "Encodes objects and arrays as RFC 7159 JSON."; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index a76e05332f1..83dd1f006fc 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -36,7 +36,7 @@ buildPythonPackage { checkInputs = [ nose ]; meta = with lib; { - homepage = https://github.com/christiansandberg/canopen/; + homepage = "https://github.com/christiansandberg/canopen/"; description = "CANopen stack implementation"; license = licenses.lgpl3; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/development/python-modules/capturer/default.nix b/pkgs/development/python-modules/capturer/default.nix index 86062d28a85..2dcd075ec0e 100644 --- a/pkgs/development/python-modules/capturer/default.nix +++ b/pkgs/development/python-modules/capturer/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easily capture stdout/stderr of the current process and subprocesses"; - homepage = https://github.com/xolox/python-capturer; + homepage = "https://github.com/xolox/python-capturer"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/carbon/default.nix b/pkgs/development/python-modules/carbon/default.nix index 427108a9391..71a7174fb23 100644 --- a/pkgs/development/python-modules/carbon/default.nix +++ b/pkgs/development/python-modules/carbon/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "carbon"; - version = "1.1.6"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "9ecda1469e497e3fed346b23ac94fd576e1bd9962677ab88975f4f598186e851"; + sha256 = "08ndphpcbdx2ab4f5jsn2y4l5p55h9wscbg7clhbyyh03r5hianr"; }; # Carbon-s default installation is /opt/graphite. This env variable ensures diff --git a/pkgs/development/python-modules/carrot/default.nix b/pkgs/development/python-modules/carrot/default.nix index 3b976fb7ad9..9a5ffe57856 100644 --- a/pkgs/development/python-modules/carrot/default.nix +++ b/pkgs/development/python-modules/carrot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; # depends on the network meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/carrot; + homepage = "https://pypi.python.org/pypi/carrot"; description = "AMQP Messaging Framework for Python"; }; } diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index a3f90b3282a..c01f27608fd 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "Process geospatial data to create maps and perform analyses"; license = licenses.lgpl3; - homepage = https://scitools.org.uk/cartopy/docs/latest/; + homepage = "https://scitools.org.uk/cartopy/docs/latest/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/casbin/default.nix b/pkgs/development/python-modules/casbin/default.nix index 114625c397c..2fb670e418a 100644 --- a/pkgs/development/python-modules/casbin/default.nix +++ b/pkgs/development/python-modules/casbin/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "An authorization library that supports access control models like ACL, RBAC, ABAC in Python"; - homepage = https://github.com/casbin/pycasbin; + homepage = "https://github.com/casbin/pycasbin"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/case/default.nix b/pkgs/development/python-modules/case/default.nix index 0f1bba36def..771a349be1f 100644 --- a/pkgs/development/python-modules/case/default.nix +++ b/pkgs/development/python-modules/case/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six nose unittest2 mock ]; meta = with stdenv.lib; { - homepage = https://github.com/celery/case; + homepage = "https://github.com/celery/case"; description = "unittests utilities"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix index 5d3b80aeb16..ff8e5614ceb 100644 --- a/pkgs/development/python-modules/casttube/default.nix +++ b/pkgs/development/python-modules/casttube/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "casttube"; - version = "0.2.0"; + version = "0.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0g7mksfl341vfsxqvw8h15ci2qwd1rczg41n4fb2hw7y9rikqnzj"; + sha256 = "10pw2sjy648pvp42lbbdmkkx79bqlkq1xcbzp1frraj9g66azljl"; }; propagatedBuildInputs = [ requests ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interact with the Youtube Chromecast api"; - homepage = https://github.com/ur1katz/casttube; + homepage = "https://github.com/ur1katz/casttube"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix index 360872c0f89..c6df7358ad7 100644 --- a/pkgs/development/python-modules/cbor/default.nix +++ b/pkgs/development/python-modules/cbor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://bitbucket.org/bodhisnarkva/cbor; + homepage = "https://bitbucket.org/bodhisnarkva/cbor"; description = "Concise Binary Object Representation (CBOR) library"; license = licenses.asl20; maintainers = with maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix index 811ecef1f86..3bf660bd098 100644 --- a/pkgs/development/python-modules/cbor2/default.nix +++ b/pkgs/development/python-modules/cbor2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.0.1"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1fid6li95jx9c3v83v8c2c8lb03jgirkk9mjmck30yxcwmlxp6a2"; + sha256 = "1ai1i0wydxfbdakqnrlpgdk4l2ps7gw0r9nihv9p2jgyqbl13kj3"; }; nativeBuildInputs = [ setuptools_scm ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python CBOR (de)serializer with extensive tag support"; - homepage = https://github.com/agronholm/cbor2; + 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 9751dcd2f3e..5f5e396a02e 100644 --- a/pkgs/development/python-modules/cccolutils/default.nix +++ b/pkgs/development/python-modules/cccolutils/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Kerberos 5 Credential Cache Collection Utilities"; - homepage = https://pagure.io/cccolutils; + homepage = "https://pagure.io/cccolutils"; license = licenses.gpl2; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/development/python-modules/cddb/default.nix b/pkgs/development/python-modules/cddb/default.nix index f40ff08fcf4..5c27b48d62f 100644 --- a/pkgs/development/python-modules/cddb/default.nix +++ b/pkgs/development/python-modules/cddb/default.nix @@ -5,18 +5,19 @@ }: buildPythonPackage rec { - name = "CDDB-1.4"; + pname = "CDDB"; + version = "1.4"; disabled = isPy3k; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.IOKit ]; src = pkgs.fetchurl { - url = "http://cddb-py.sourceforge.net/${name}.tar.gz"; + url = "http://cddb-py.sourceforge.net/${pname}-${version}.tar.gz"; sha256 = "098xhd575ibvdx7i3dny3lwi851yxhjg2hn5jbbgrwj833rg5l5w"; }; meta = with stdenv.lib; { - homepage = http://cddb-py.sourceforge.net/; + homepage = "http://cddb-py.sourceforge.net/"; description = "CDDB and FreeDB audio CD track info access"; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/cdecimal/default.nix b/pkgs/development/python-modules/cdecimal/default.nix index 0c636e12088..3508b392203 100644 --- a/pkgs/development/python-modules/cdecimal/default.nix +++ b/pkgs/development/python-modules/cdecimal/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast drop-in replacement for decimal.py"; - homepage = http://www.bytereef.org/mpdecimal/; + homepage = "http://www.bytereef.org/mpdecimal/"; license = licenses.bsd2; maintainers = [ maintainers.udono ]; }; diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 68c6c282c9b..d0d4f2e69fb 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ kombu billiard pytz anyjson amqp eventlet ]; meta = with lib; { - homepage = https://github.com/celery/celery/; + homepage = "https://github.com/celery/celery/"; description = "Distributed task queue"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/cement/default.nix b/pkgs/development/python-modules/cement/default.nix index edcb4086cf2..9117908f399 100644 --- a/pkgs/development/python-modules/cement/default.nix +++ b/pkgs/development/python-modules/cement/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = !isPy3k; meta = with stdenv.lib; { - homepage = https://builtoncement.com/; + homepage = "https://builtoncement.com/"; description = "A CLI Application Framework for Python."; maintainers = with maintainers; [ eqyiel ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index 5218a55078d..b0c35204d6e 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://python-cerberus.org/; + homepage = "http://python-cerberus.org/"; description = "Lightweight, extensible schema and data validation tool for Python dictionaries"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 7ffc50ea520..35df76e68cd 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = { - homepage = http://certifi.io/; + homepage = "http://certifi.io/"; description = "Python package for providing Mozilla's CA Bundle"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index ce96bce5bc7..12706ab3d8a 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; #no tests were included meta = with stdenv.lib; { - homepage = https://github.com/LLNL/certipy; + homepage = "https://github.com/LLNL/certipy"; description = "wrapper for pyOpenSSL"; license = licenses.bsd3; maintainers = with maintainers; [ isgy ]; diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 6f1e362f8bf..85dcd72a934 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -39,7 +39,7 @@ if isPyPy then null else buildPythonPackage rec { meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar lnl7 ]; - homepage = https://cffi.readthedocs.org/; + homepage = "https://cffi.readthedocs.org/"; license = with licenses; [ mit ]; description = "Foreign Function Interface for Python calling C code"; }; diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index 2487caea608..a58669e58a8 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Validate configuration and produce human readable error messages"; - homepage = https://github.com/asottile/cfgv; + homepage = "https://github.com/asottile/cfgv"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 7b1ef63767d..c632bb6a68c 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Checks cloudformation for practices and behaviour that could potentially be improved"; - homepage = https://github.com/aws-cloudformation/cfn-python-lint; + homepage = "https://github.com/aws-cloudformation/cfn-python-lint"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/cgen/default.nix b/pkgs/development/python-modules/cgen/default.nix index f6cf985349b..30ecb8d1b33 100644 --- a/pkgs/development/python-modules/cgen/default.nix +++ b/pkgs/development/python-modules/cgen/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "C/C++ source generation from an AST"; - homepage = https://github.com/inducer/cgen; + homepage = "https://github.com/inducer/cgen"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cgroup-utils/default.nix b/pkgs/development/python-modules/cgroup-utils/default.nix index 7496e7e1fcc..a94b4439250 100644 --- a/pkgs/development/python-modules/cgroup-utils/default.nix +++ b/pkgs/development/python-modules/cgroup-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pep8, nose }: buildPythonPackage rec { - version = "0.6"; + version = "0.8"; pname = "cgroup-utils"; buildInputs = [ pep8 nose ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "peo3"; repo = "cgroup-utils"; rev = "v${version}"; - sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc"; + sha256 = "0qnbn8cnq8m14s8s1hcv25xjd55dyb6yy54l5vc7sby5xzzp11fq"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/chainer/default.nix b/pkgs/development/python-modules/chainer/default.nix index 9585004a89a..0c3b7a946fc 100644 --- a/pkgs/development/python-modules/chainer/default.nix +++ b/pkgs/development/python-modules/chainer/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A flexible framework of neural networks for deep learning"; - homepage = https://chainer.org/; + homepage = "https://chainer.org/"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/chainmap/default.nix b/pkgs/development/python-modules/chainmap/default.nix index eb769ed4623..17a51f17763 100644 --- a/pkgs/development/python-modules/chainmap/default.nix +++ b/pkgs/development/python-modules/chainmap/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Backport/clone of ChainMap"; - homepage = https://bitbucket.org/jeunice/chainmap; + homepage = "https://bitbucket.org/jeunice/chainmap"; license = licenses.psfl; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index 62f3731632d..f99905950c9 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "chalice"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "f8f929f26df77285a202fb93174400230f8912c5b9c1fb061c7836a78413e325"; + sha256 = "07xzpbz7znr853xm6p27lkrcgdib3ym5dlwys0n4zvkjm5x7jn2a"; }; checkInputs = [ watchdog pytest hypothesis mock ]; @@ -58,7 +58,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Serverless Microframework for AWS"; - homepage = https://github.com/aws/chalice; + homepage = "https://github.com/aws/chalice"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index a7e51a6513f..c2a3db6820d 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://chameleon.readthedocs.io/; + homepage = "https://chameleon.readthedocs.io/"; description = "Fast HTML/XML Template Compiler"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index 8812e4097ab..b8a95387571 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/django/channels_redis/; + homepage = "https://github.com/django/channels_redis/"; description = "Redis-backed ASGI channel layer implementation"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix index b7c83b3b3ff..94d1705637d 100644 --- a/pkgs/development/python-modules/channels/default.nix +++ b/pkgs/development/python-modules/channels/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Brings event-driven capabilities to Django with a channel system"; license = licenses.bsd3; - homepage = https://github.com/django/channels; + homepage = "https://github.com/django/channels"; }; } diff --git a/pkgs/development/python-modules/characteristic/default.nix b/pkgs/development/python-modules/characteristic/default.nix index f082510713a..2e12077bd56 100644 --- a/pkgs/development/python-modules/characteristic/default.nix +++ b/pkgs/development/python-modules/characteristic/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { meta = { description = "Python attributes without boilerplate"; - homepage = https://characteristic.readthedocs.org; + homepage = "https://characteristic.readthedocs.org"; }; } diff --git a/pkgs/development/python-modules/chardet/default.nix b/pkgs/development/python-modules/chardet/default.nix index 829ae0b0f14..1a8b1f36e99 100644 --- a/pkgs/development/python-modules/chardet/default.nix +++ b/pkgs/development/python-modules/chardet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner hypothesis ]; meta = with stdenv.lib; { - homepage = https://github.com/chardet/chardet; + homepage = "https://github.com/chardet/chardet"; description = "Universal encoding detector"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix index eaae8f3d099..3de542a8bb0 100644 --- a/pkgs/development/python-modules/check-manifest/default.nix +++ b/pkgs/development/python-modules/check-manifest/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/mgedmin/check-manifest; + homepage = "https://github.com/mgedmin/check-manifest"; description = "Check MANIFEST.in in a Python source package for completeness"; license = licenses.mit; maintainers = with maintainers; [ lewo ]; diff --git a/pkgs/development/python-modules/cheetah/default.nix b/pkgs/development/python-modules/cheetah/default.nix index 98af2f10a0b..1cee46fa725 100644 --- a/pkgs/development/python-modules/cheetah/default.nix +++ b/pkgs/development/python-modules/cheetah/default.nix @@ -26,8 +26,8 @@ buildPythonPackage rec { ]; meta = { - homepage = http://www.cheetahtemplate.org/; + homepage = "http://www.cheetahtemplate.org/"; description = "A template engine and code generation tool"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 971d8848b37..54c502b815c 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-performance, pure-Python HTTP"; - homepage = https://github.com/cherrypy/cheroot; + homepage = "https://github.com/cherrypy/cheroot"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/cherrypy/17.nix b/pkgs/development/python-modules/cherrypy/17.nix index d9b9166e0f0..5e5541b26e2 100644 --- a/pkgs/development/python-modules/cherrypy/17.nix +++ b/pkgs/development/python-modules/cherrypy/17.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.cherrypy.org; + homepage = "https://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 17531f1406d..e37f2cb470e 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.cherrypy.org; + homepage = "https://www.cherrypy.org"; description = "A pythonic, object-oriented HTTP framework"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/chevron/default.nix b/pkgs/development/python-modules/chevron/default.nix index 7fa3a2b471d..5f8cc321750 100644 --- a/pkgs/development/python-modules/chevron/default.nix +++ b/pkgs/development/python-modules/chevron/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { ''; meta = with lib; { - homepage = https://github.com/noahmorrison/chevron; + homepage = "https://github.com/noahmorrison/chevron"; description = "A python implementation of the mustache templating language"; license = licenses.mit; maintainers = with maintainers; [ dhkl ]; diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index d6109e8aaba..a671f0e68e8 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -79,7 +79,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; - homepage = "http://github.com/quantumlib/cirq"; + homepage = "https://github.com/quantumlib/cirq"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/ciso8601/default.nix b/pkgs/development/python-modules/ciso8601/default.nix new file mode 100644 index 00000000000..d0de4b320e8 --- /dev/null +++ b/pkgs/development/python-modules/ciso8601/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytz +, unittest2 +, isPy27 +}: + +buildPythonPackage rec { + pname = "ciso8601"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "closeio"; + repo = "ciso8601"; + rev = "v${version}"; + sha256 = "0g1aiyc1ayh0rnibyy416m5mmck38ksgdm3jsy0z3rxgmgb24951"; + }; + + checkInputs = [ + pytz + ] ++ lib.optional (isPy27) unittest2; + + meta = with lib; { + description = "Fast ISO8601 date time parser for Python written in C"; + homepage = "https://github.com/closeio/ciso8601"; + license = licenses.mit; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/cjson/default.nix b/pkgs/development/python-modules/cjson/default.nix index c9b5be5e604..5ceb26bfeb6 100644 --- a/pkgs/development/python-modules/cjson/default.nix +++ b/pkgs/development/python-modules/cjson/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A very fast JSON encoder/decoder for Python"; - homepage = https://ag-projects.com/; + homepage = "https://ag-projects.com/"; license = licenses.lgpl2; }; } diff --git a/pkgs/development/python-modules/cleo/default.nix b/pkgs/development/python-modules/cleo/default.nix index 13a91837a6c..2809fb33e92 100644 --- a/pkgs/development/python-modules/cleo/default.nix +++ b/pkgs/development/python-modules/cleo/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/sdispater/cleo; + homepage = "https://github.com/sdispater/cleo"; description = "Allows you to create beautiful and testable command-line interfaces"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/clf/default.nix b/pkgs/development/python-modules/clf/default.nix index 9303f90141d..d3741ef38a9 100644 --- a/pkgs/development/python-modules/clf/default.nix +++ b/pkgs/development/python-modules/clf/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ncrocfer/clf; + homepage = "https://github.com/ncrocfer/clf"; description = "Command line tool to search snippets on Commandlinefu.com"; license = licenses.mit; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 2ebc6f44b44..ba7ca3d5b20 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { Read the documentation at http://cli-helpers.rtfd.io ''; - homepage = https://cli-helpers.readthedocs.io/en/stable/; + homepage = "https://cli-helpers.readthedocs.io/en/stable/"; license = licenses.bsd3 ; maintainers = [ maintainers.kalbasit ]; }; diff --git a/pkgs/development/python-modules/cliapp/default.nix b/pkgs/development/python-modules/cliapp/default.nix index c3e6a120ae7..233028235b1 100644 --- a/pkgs/development/python-modules/cliapp/default.nix +++ b/pkgs/development/python-modules/cliapp/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/cliapp/; + homepage = "http://liw.fi/cliapp/"; description = "Python framework for Unix command line programs"; license = licenses.gpl2; maintainers = []; diff --git a/pkgs/development/python-modules/click-completion/default.nix b/pkgs/development/python-modules/click-completion/default.nix index 79d85a81c37..3fd41f54f66 100644 --- a/pkgs/development/python-modules/click-completion/default.nix +++ b/pkgs/development/python-modules/click-completion/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Add or enhance bash, fish, zsh and powershell completion in Click"; - homepage = https://github.com/click-contrib/click-completion; + homepage = "https://github.com/click-contrib/click-completion"; license = licenses.mit; maintainers = with maintainers; [ mbode ]; }; diff --git a/pkgs/development/python-modules/click-default-group/default.nix b/pkgs/development/python-modules/click-default-group/default.nix index 6bc092dcd4e..58da038faae 100644 --- a/pkgs/development/python-modules/click-default-group/default.nix +++ b/pkgs/development/python-modules/click-default-group/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; meta = with lib; { - homepage = https://github.com/click-contrib/click-default-group; + homepage = "https://github.com/click-contrib/click-default-group"; description = "Group to invoke a command without explicit subcommand name"; license = licenses.bsd3; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/click-didyoumean/default.nix b/pkgs/development/python-modules/click-didyoumean/default.nix index 4cd2ea15029..58d7da4fd39 100644 --- a/pkgs/development/python-modules/click-didyoumean/default.nix +++ b/pkgs/development/python-modules/click-didyoumean/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Enable git-like did-you-mean feature in click"; - homepage = https://github.com/click-contrib/click-didyoumean; + homepage = "https://github.com/click-contrib/click-didyoumean"; license = licenses.mit; maintainers = with maintainers; [ mbode ]; }; diff --git a/pkgs/development/python-modules/click-log/default.nix b/pkgs/development/python-modules/click-log/default.nix index f5626859d06..dd2b4b158ed 100644 --- a/pkgs/development/python-modules/click-log/default.nix +++ b/pkgs/development/python-modules/click-log/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click ]; meta = with stdenv.lib; { - homepage = https://github.com/click-contrib/click-log/; + homepage = "https://github.com/click-contrib/click-log/"; description = "Logging integration for Click"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/click-plugins/default.nix b/pkgs/development/python-modules/click-plugins/default.nix index 8039d0cb4c7..a8c1d7a489f 100644 --- a/pkgs/development/python-modules/click-plugins/default.nix +++ b/pkgs/development/python-modules/click-plugins/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An extension module for click to enable registering CLI commands"; - homepage = https://github.com/click-contrib/click-plugins; + homepage = "https://github.com/click-contrib/click-plugins"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix index 8a487ab2410..03c9520014c 100644 --- a/pkgs/development/python-modules/click-repl/default.nix +++ b/pkgs/development/python-modules/click-repl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click prompt_toolkit ]; meta = with stdenv.lib; { - homepage = https://github.com/click-contrib/click-repl; + homepage = "https://github.com/click-contrib/click-repl"; description = "Subcommand REPL for click apps"; license = licenses.mit; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/click-threading/default.nix b/pkgs/development/python-modules/click-threading/default.nix index 3fe2af19fef..6943a3dcfd1 100644 --- a/pkgs/development/python-modules/click-threading/default.nix +++ b/pkgs/development/python-modules/click-threading/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { doCheck = !isPy3k; meta = { - homepage = https://github.com/click-contrib/click-threading/; + homepage = "https://github.com/click-contrib/click-threading/"; description = "Multithreaded Click apps made easy"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 9951b1711b3..abf1ea58c8f 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = http://click.pocoo.org/; + homepage = "http://click.pocoo.org/"; description = "Create beautiful command line interfaces in Python"; longDescription = '' A Python package for creating beautiful command line interfaces in a diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix index 93cd5c7a1d7..d35c356c822 100644 --- a/pkgs/development/python-modules/clickclick/default.nix +++ b/pkgs/development/python-modules/clickclick/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Click command line utilities"; - homepage = https://github.com/hjacobs/python-clickclick/; + homepage = "https://github.com/hjacobs/python-clickclick/"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 46ac5be03ce..00da74929a4 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "2.17.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f5a1c6b32047aa0d272398d311fd711d41dd5e1cd5195ebe36ebb47f464416fa"; + sha256 = "0j9q6725226hdhdyy9b0qfjngdj35d3y7fxbmfxpr36ksbh0x6sj"; }; propagatedBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command Line Interface Formulation Framework"; - homepage = https://docs.openstack.org/cliff/latest/; + homepage = "https://docs.openstack.org/cliff/latest/"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/clifford/default.nix b/pkgs/development/python-modules/clifford/default.nix index 961f6b5bc1d..71b9c4899ab 100644 --- a/pkgs/development/python-modules/clifford/default.nix +++ b/pkgs/development/python-modules/clifford/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Numerical Geometric Algebra Module"; - homepage = https://clifford.readthedocs.io; + homepage = "https://clifford.readthedocs.io"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cligj/default.nix b/pkgs/development/python-modules/cligj/default.nix index 0ec82efed8b..91124cd21f4 100644 --- a/pkgs/development/python-modules/cligj/default.nix +++ b/pkgs/development/python-modules/cligj/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Click params for commmand line interfaces to GeoJSON"; - homepage = https://github.com/mapbox/cligj; + homepage = "https://github.com/mapbox/cligj"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 94f3fa08b13..32e9b4fcb4a 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "clikit"; - version = "0.4.1"; + version = "0.4.3"; src = fetchPypi { inherit pname version; - sha256 = "8ae4766b974d7b1983e39d501da9a0aadf118a907a0c9b50714d027c8b59ea81"; + sha256 = "0glppxx0pyppjcigzs8h16srlbxb6nci0282xfy3ayvwbq8pwbbf"; }; propagatedBuildInputs = [ @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/sdispater/clikit; + homepage = "https://github.com/sdispater/clikit"; description = "A group of utilities to build beautiful and testable command line interfaces"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/clint/default.nix b/pkgs/development/python-modules/clint/default.nix index 602ab00b084..329cf4f07cc 100644 --- a/pkgs/development/python-modules/clint/default.nix +++ b/pkgs/development/python-modules/clint/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow blessings args ]; meta = with stdenv.lib; { - homepage = https://github.com/kennethreitz/clint; + homepage = "https://github.com/kennethreitz/clint"; description = "Python Command Line Interface Tools"; license = licenses.isc; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index a24fc074408..279571c157c 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Extended pickling support for Python objects"; - homepage = https://github.com/cloudpipe/cloudpickle; + homepage = "https://github.com/cloudpipe/cloudpickle"; license = with licenses; [ bsd3 ]; }; } diff --git a/pkgs/development/python-modules/clustershell/default.nix b/pkgs/development/python-modules/clustershell/default.nix index 75a77d4c63c..86d44aed532 100644 --- a/pkgs/development/python-modules/clustershell/default.nix +++ b/pkgs/development/python-modules/clustershell/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scalable Python framework for cluster administration"; - homepage = https://cea-hpc.github.io/clustershell; + homepage = "https://cea-hpc.github.io/clustershell"; license = licenses.lgpl21; maintainers = [ maintainers.alexvorobiev ]; }; diff --git a/pkgs/development/python-modules/cma/default.nix b/pkgs/development/python-modules/cma/default.nix index 1743e23942f..3d39392da6b 100644 --- a/pkgs/development/python-modules/cma/default.nix +++ b/pkgs/development/python-modules/cma/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "CMA-ES, Covariance Matrix Adaptation Evolution Strategy for non-linear numerical optimization in Python"; - homepage = https://github.com/CMA-ES/pycma; + homepage = "https://github.com/CMA-ES/pycma"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cmarkgfm/default.nix b/pkgs/development/python-modules/cmarkgfm/default.nix index b2f58887ffb..2337964017a 100644 --- a/pkgs/development/python-modules/cmarkgfm/default.nix +++ b/pkgs/development/python-modules/cmarkgfm/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Minimal bindings to GitHub's fork of cmark"; - homepage = https://github.com/jonparrott/cmarkgfm; + homepage = "https://github.com/jonparrott/cmarkgfm"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index a2e5862f540..13f68d6a392 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GtSqmkWCHX/1t31sny3f2ek8uTS1oEMSM1rRXG9DuFI="; + sha256 = "0fjwc095y97n3a7jxl9pk4h1i5hghas7y6zhgprl5lv5ixnicffk"; }; LC_ALL="en_US.UTF-8"; @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Enhancements for standard library's cmd module"; - homepage = https://github.com/python-cmd2/cmd2; + homepage = "https://github.com/python-cmd2/cmd2"; maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/python-modules/cmdline/default.nix b/pkgs/development/python-modules/cmdline/default.nix index cf0cff1f155..39f1f9de0c6 100644 --- a/pkgs/development/python-modules/cmdline/default.nix +++ b/pkgs/development/python-modules/cmdline/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities for consistent command line tools"; - homepage = https://github.com/rca/cmdline; + homepage = "https://github.com/rca/cmdline"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/cmdtest/default.nix b/pkgs/development/python-modules/cmdtest/default.nix index 0d0bc368295..ca2402cff6c 100644 --- a/pkgs/development/python-modules/cmdtest/default.nix +++ b/pkgs/development/python-modules/cmdtest/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/cmdtest/; + homepage = "http://liw.fi/cmdtest/"; description = "Black box tests Unix command line tools"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/cocotb/default.nix b/pkgs/development/python-modules/cocotb/default.nix index 9bde31d1f13..c0148effdf9 100644 --- a/pkgs/development/python-modules/cocotb/default.nix +++ b/pkgs/development/python-modules/cocotb/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cocotb"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "0gwd79zm7196fhnbzbdpyvgzsfjfzl3pmc5hh27h7hckfpxzj9yw"; + sha256 = "118wp5sjsl99hj8pqw5n3v2lry9r949p2hv4l92p086q1n0axxk3"; }; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonPackage rec { substituteInPlace $f --replace 'shell which' 'shell command -v' done - # This can probably be removed in the next update after 1.3.0 + # This can probably be removed in the next update after 1.3.1 substituteInPlace cocotb/share/makefiles/Makefile.inc --replace "-Werror" "" ''; diff --git a/pkgs/development/python-modules/codecov/default.nix b/pkgs/development/python-modules/codecov/default.nix index 6b2063f4992..6ebdefedeaf 100644 --- a/pkgs/development/python-modules/codecov/default.nix +++ b/pkgs/development/python-modules/codecov/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Python report uploader for Codecov"; - homepage = https://codecov.io/; + homepage = "https://codecov.io/"; license = stdenv.lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/cogapp/default.nix b/pkgs/development/python-modules/cogapp/default.nix index f894380fa49..2962e65a7fb 100644 --- a/pkgs/development/python-modules/cogapp/default.nix +++ b/pkgs/development/python-modules/cogapp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A code generator for executing Python snippets in source files"; - homepage = http://nedbatchelder.com/code/cog; + homepage = "http://nedbatchelder.com/code/cog"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; }; diff --git a/pkgs/development/python-modules/coinmarketcap/default.nix b/pkgs/development/python-modules/coinmarketcap/default.nix index bcf32714796..168f75b7f49 100644 --- a/pkgs/development/python-modules/coinmarketcap/default.nix +++ b/pkgs/development/python-modules/coinmarketcap/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper around the https://coinmarketcap.com API."; - homepage = https://github.com/barnumbirr/coinmarketcap; + homepage = "https://github.com/barnumbirr/coinmarketcap"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index a3e613652db..944a7818452 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple schema-based serialization and deserialization library"; - homepage = https://docs.pylonsproject.org/projects/colander/en/latest/; + homepage = "https://docs.pylonsproject.org/projects/colander/en/latest/"; license = licenses.free; # http://repoze.org/LICENSE.txt maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/colanderalchemy/default.nix b/pkgs/development/python-modules/colanderalchemy/default.nix index 686608445ab..34e58e0927c 100644 --- a/pkgs/development/python-modules/colanderalchemy/default.nix +++ b/pkgs/development/python-modules/colanderalchemy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Autogenerate Colander schemas based on SQLAlchemy models"; - homepage = https://github.com/stefanofontanelli/ColanderAlchemy; + homepage = "https://github.com/stefanofontanelli/ColanderAlchemy"; license = licenses.mit; # ColanderAlchemy's tests currently fail with colander >1.6.0 # (see https://github.com/stefanofontanelli/ColanderAlchemy/issues/107) diff --git a/pkgs/development/python-modules/colorama/default.nix b/pkgs/development/python-modules/colorama/default.nix index d6f84ca8748..d22f93d47f1 100644 --- a/pkgs/development/python-modules/colorama/default.nix +++ b/pkgs/development/python-modules/colorama/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/tartley/colorama; + homepage = "https://github.com/tartley/colorama"; license = licenses.bsd3; description = "Cross-platform colored terminal text"; }; diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index e4288745d96..a80895de3d1 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Collection of perceptually uniform colormaps"; - homepage = https://colorcet.pyviz.org; + homepage = "https://colorcet.pyviz.org"; license = licenses.cc-by-40; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix index b035bb9b57c..4a627cab545 100644 --- a/pkgs/development/python-modules/colorclass/default.nix +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/Robpol86/colorclass; + homepage = "https://github.com/Robpol86/colorclass"; license = licenses.mit; description = "Automatic support for console colors"; }; diff --git a/pkgs/development/python-modules/colored/default.nix b/pkgs/development/python-modules/colored/default.nix index b62d80600c7..2d2cac3da1b 100644 --- a/pkgs/development/python-modules/colored/default.nix +++ b/pkgs/development/python-modules/colored/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://gitlab.com/dslackw/colored; + homepage = "https://gitlab.com/dslackw/colored"; description = "Simple library for color and formatting to terminal"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/coloredlogs/default.nix b/pkgs/development/python-modules/coloredlogs/default.nix index f27cf5abe75..219e48ad664 100644 --- a/pkgs/development/python-modules/coloredlogs/default.nix +++ b/pkgs/development/python-modules/coloredlogs/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Colored stream handler for Python's logging module"; - homepage = https://github.com/xolox/python-coloredlogs; + homepage = "https://github.com/xolox/python-coloredlogs"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix index edcd040b066..aa39588f313 100644 --- a/pkgs/development/python-modules/colorlog/default.nix +++ b/pkgs/development/python-modules/colorlog/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorlog"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "3cf31b25cbc8f86ec01fef582ef3b840950dea414084ed19ab922c8b493f9b42"; + sha256 = "1lpk8zmfv8vz090h5d0hzb4n39wgasxdd3x3bpn3v1x1n9dfzaih"; }; checkInputs = [ pytest ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Log formatting with colors"; - homepage = https://github.com/borntyping/python-colorlog; + homepage = "https://github.com/borntyping/python-colorlog"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/colorlover/default.nix b/pkgs/development/python-modules/colorlover/default.nix index 2e57ea538c9..6aea26e8936 100644 --- a/pkgs/development/python-modules/colorlover/default.nix +++ b/pkgs/development/python-modules/colorlover/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/jackparmer/colorlover; + homepage = "https://github.com/jackparmer/colorlover"; description = "Color scales in Python for humans"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ globin ]; diff --git a/pkgs/development/python-modules/colour/default.nix b/pkgs/development/python-modules/colour/default.nix index a162b21b083..d0f802072a3 100644 --- a/pkgs/development/python-modules/colour/default.nix +++ b/pkgs/development/python-modules/colour/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Converts and manipulates common color representation (RGB, HSV, web, ...)"; - homepage = https://github.com/vaab/colour; + homepage = "https://github.com/vaab/colour"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/commonmark/default.nix b/pkgs/development/python-modules/commonmark/default.nix index 0f381d50261..56ddf766307 100644 --- a/pkgs/development/python-modules/commonmark/default.nix +++ b/pkgs/development/python-modules/commonmark/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser for the CommonMark Markdown spec"; - homepage = https://github.com/rolandshoemaker/CommonMark-py; + homepage = "https://github.com/rolandshoemaker/CommonMark-py"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/compiledb/default.nix b/pkgs/development/python-modules/compiledb/default.nix index f2741c615b8..1892337dc2d 100644 --- a/pkgs/development/python-modules/compiledb/default.nix +++ b/pkgs/development/python-modules/compiledb/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool for generating Clang's JSON Compilation Database files"; license = licenses.gpl3; - homepage = https://github.com/nickdiego/compiledb; + homepage = "https://github.com/nickdiego/compiledb"; maintainers = with maintainers; [ multun ]; }; } diff --git a/pkgs/development/python-modules/conda/default.nix b/pkgs/development/python-modules/conda/default.nix index a240ea21e3e..b097805292e 100644 --- a/pkgs/development/python-modules/conda/default.nix +++ b/pkgs/development/python-modules/conda/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "OS-agnostic, system-level binary package manager"; - homepage = https://github.com/conda/conda; + homepage = "https://github.com/conda/conda"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/configargparse/default.nix b/pkgs/development/python-modules/configargparse/default.nix index e2532f23709..75255badf98 100644 --- a/pkgs/development/python-modules/configargparse/default.nix +++ b/pkgs/development/python-modules/configargparse/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A drop-in replacement for argparse"; - homepage = https://github.com/zorro3/ConfigArgParse; + homepage = "https://github.com/zorro3/ConfigArgParse"; license = licenses.mit; maintainers = [ maintainers.willibutz ]; }; diff --git a/pkgs/development/python-modules/configobj/default.nix b/pkgs/development/python-modules/configobj/default.nix index 029f35ac87a..82ca70c4679 100644 --- a/pkgs/development/python-modules/configobj/default.nix +++ b/pkgs/development/python-modules/configobj/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Config file reading, writing and validation"; - homepage = https://pypi.python.org/pypi/configobj; + homepage = "https://pypi.python.org/pypi/configobj"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/configparser/default.nix b/pkgs/development/python-modules/configparser/default.nix index 4c05ec29359..9c6c631d9c2 100644 --- a/pkgs/development/python-modules/configparser/default.nix +++ b/pkgs/development/python-modules/configparser/default.nix @@ -21,6 +21,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Updated configparser from Python 3.7 for Python 2.6+."; license = licenses.mit; - homepage = https://github.com/jaraco/configparser; + homepage = "https://github.com/jaraco/configparser"; }; } diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index fed5a71fd17..3add4b7f4e4 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python library for building configuration shells"; - homepage = https://github.com/open-iscsi/configshell-fb; + homepage = "https://github.com/open-iscsi/configshell-fb"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index f32a6bfd1ac..029171fea2f 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Confluent's Apache Kafka client for Python"; - homepage = https://github.com/confluentinc/confluent-kafka-python; + homepage = "https://github.com/confluentinc/confluent-kafka-python"; license = licenses.asl20; maintainers = with maintainers; [ mlieberman85 ]; }; diff --git a/pkgs/development/python-modules/connexion/default.nix b/pkgs/development/python-modules/connexion/default.nix index 4f2af55f208..6b212be3bb7 100644 --- a/pkgs/development/python-modules/connexion/default.nix +++ b/pkgs/development/python-modules/connexion/default.nix @@ -87,7 +87,7 @@ buildPythonPackage rec { meta = with lib; { description = "Swagger/OpenAPI First framework on top of Flask"; - homepage = https://github.com/zalando/connexion/; + homepage = "https://github.com/zalando/connexion/"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index 4766a1285ac..9b7222b7bbc 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/twisted/constantly; + homepage = "https://github.com/twisted/constantly"; description = "symbolic constant support"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/construct/default.nix b/pkgs/development/python-modules/construct/default.nix index 1009727c29c..59b3eb38afd 100644 --- a/pkgs/development/python-modules/construct/default.nix +++ b/pkgs/development/python-modules/construct/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Powerful declarative parser (and builder) for binary data"; - homepage = https://construct.readthedocs.org/; + homepage = "https://construct.readthedocs.org/"; license = licenses.mit; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/consul/default.nix b/pkgs/development/python-modules/consul/default.nix index 5c9e83b8d20..589076481c9 100644 --- a/pkgs/development/python-modules/consul/default.nix +++ b/pkgs/development/python-modules/consul/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client for Consul (https://www.consul.io/)"; - homepage = https://github.com/cablehead/python-consul; + homepage = "https://github.com/cablehead/python-consul"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/contextlib2/default.nix b/pkgs/development/python-modules/contextlib2/default.nix index e23964f1a2b..38d9fb696e2 100644 --- a/pkgs/development/python-modules/contextlib2/default.nix +++ b/pkgs/development/python-modules/contextlib2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Backports and enhancements for the contextlib module"; - homepage = https://contextlib2.readthedocs.org/; + homepage = "https://contextlib2.readthedocs.org/"; license = lib.licenses.psfl; }; } diff --git a/pkgs/development/python-modules/contextvars/default.nix b/pkgs/development/python-modules/contextvars/default.nix index b378c901fad..1eda85a6ffe 100644 --- a/pkgs/development/python-modules/contextvars/default.nix +++ b/pkgs/development/python-modules/contextvars/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "A backport of the Python 3.7 contextvars module for Python 3.6"; - homepage = https://github.com/MagicStack/contextvars; + homepage = "https://github.com/MagicStack/contextvars"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index 4010eb5ec5a..c11ee6798a3 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/audreyr/cookiecutter; + homepage = "https://github.com/audreyr/cookiecutter"; description = "A command-line utility that creates projects from project templates"; license = licenses.bsd3; maintainers = with maintainers; [ kragniz ]; diff --git a/pkgs/development/python-modules/cookies/default.nix b/pkgs/development/python-modules/cookies/default.nix index 1b8e5b6061d..7ae110fef3c 100644 --- a/pkgs/development/python-modules/cookies/default.nix +++ b/pkgs/development/python-modules/cookies/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Friendlier RFC 6265-compliant cookie parser/renderer"; - homepage = https://github.com/sashahart/cookies; + homepage = "https://github.com/sashahart/cookies"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/coordinates/default.nix b/pkgs/development/python-modules/coordinates/default.nix index 8c08021a823..44a41b92c4e 100644 --- a/pkgs/development/python-modules/coordinates/default.nix +++ b/pkgs/development/python-modules/coordinates/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convenience class for doing maths with explicit coordinates"; - homepage = https://github.com/clbarnes/coordinates; + homepage = "https://github.com/clbarnes/coordinates"; license = licenses.mit; maintainers = [ maintainers.mildlyincompetent ]; }; diff --git a/pkgs/development/python-modules/coreapi/default.nix b/pkgs/development/python-modules/coreapi/default.nix index 216d1ee6985..521b06755ce 100644 --- a/pkgs/development/python-modules/coreapi/default.nix +++ b/pkgs/development/python-modules/coreapi/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client library for Core API"; - homepage = https://github.com/core-api/python-client; + homepage = "https://github.com/core-api/python-client"; license = licenses.bsd3; maintainers = with maintainers; [ ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/coreschema/default.nix b/pkgs/development/python-modules/coreschema/default.nix index 949fa31df95..5b5ca3f5044 100644 --- a/pkgs/development/python-modules/coreschema/default.nix +++ b/pkgs/development/python-modules/coreschema/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client library for Core Schema"; - homepage = https://github.com/ivegotasthma/python-coreschema; + homepage = "https://github.com/ivegotasthma/python-coreschema"; license = licenses.bsd3; maintainers = with maintainers; [ ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 598c3bd1c08..4307b3f6f4f 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/cornice; + homepage = "https://github.com/mozilla-services/cornice"; description = "Build Web Services with Pyramid"; license = licenses.mpl20; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index dfe86b36065..04c469204d7 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Code coverage measurement for python"; - homepage = http://nedbatchelder.com/code/coverage/; + homepage = "http://nedbatchelder.com/code/coverage/"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index dbf6616c22d..96f3782ab8d 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "Show coverage stats online via coveralls.io"; - homepage = https://github.com/coveralls-clients/coveralls-python; + homepage = "https://github.com/coveralls-clients/coveralls-python"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/cozy/default.nix b/pkgs/development/python-modules/cozy/default.nix index 7515891456e..c55c85c3dfd 100644 --- a/pkgs/development/python-modules/cozy/default.nix +++ b/pkgs/development/python-modules/cozy/default.nix @@ -33,7 +33,7 @@ buildPythonPackage { meta = { description = "The collection synthesizer"; - homepage = https://cozy.uwplse.org/; + homepage = "https://cozy.uwplse.org/"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.MostAwesomeDude ]; }; diff --git a/pkgs/development/python-modules/cram/default.nix b/pkgs/development/python-modules/cram/default.nix index f27cfc44e57..ff156187a30 100644 --- a/pkgs/development/python-modules/cram/default.nix +++ b/pkgs/development/python-modules/cram/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "A simple testing framework for command line applications"; - homepage = https://bitheap.org/cram/; + homepage = "https://bitheap.org/cram/"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jluttine ]; # Tests fail on i686: https://hydra.nixos.org/build/52896671/nixlog/4 diff --git a/pkgs/development/python-modules/crayons/default.nix b/pkgs/development/python-modules/crayons/default.nix index 97c33821547..1810f790719 100644 --- a/pkgs/development/python-modules/crayons/default.nix +++ b/pkgs/development/python-modules/crayons/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "TextUI colors for Python"; - homepage = https://github.com/kennethreitz/crayons; + homepage = "https://github.com/kennethreitz/crayons"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/crcmod/default.nix b/pkgs/development/python-modules/crcmod/default.nix index f85e045d525..47e1b4097d3 100644 --- a/pkgs/development/python-modules/crcmod/default.nix +++ b/pkgs/development/python-modules/crcmod/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module for generating objects that compute the Cyclic Redundancy Check (CRC)"; - homepage = http://crcmod.sourceforge.net/; + homepage = "http://crcmod.sourceforge.net/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 585bc010606..75ab8b739d8 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A utility for managing secrets in the cloud using AWS KMS and DynamoDB"; - homepage = https://github.com/LuminalOSS/credstash; + homepage = "https://github.com/LuminalOSS/credstash"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index a538721c9b9..90334fd4225 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "croniter provides iteration for datetime object with cron like format"; - homepage = https://github.com/kiorky/croniter; + homepage = "https://github.com/kiorky/croniter"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 82d0b43bc35..f3a3955571d 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { Our goal is for it to be your "cryptographic standard library". It supports Python 2.7, Python 3.4+, and PyPy 5.3+. ''; - homepage = https://github.com/pyca/cryptography; + homepage = "https://github.com/pyca/cryptography"; license = with licenses; [ asl20 bsd3 psfl ]; maintainers = with maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 86cc195b05b..7c994ef6a47 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test vectors for the cryptography package"; - homepage = https://cryptography.io/en/latest/development/test-vectors/; + homepage = "https://cryptography.io/en/latest/development/test-vectors/"; # Source: https://github.com/pyca/cryptography/tree/master/vectors; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/development/python-modules/css-parser/default.nix b/pkgs/development/python-modules/css-parser/default.nix index 8b2fe0929c7..cba0c878701 100644 --- a/pkgs/development/python-modules/css-parser/default.nix +++ b/pkgs/development/python-modules/css-parser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A CSS Cascading Style Sheets library for Python"; - homepage = https://github.com/ebook-utils/css-parser; + homepage = "https://github.com/ebook-utils/css-parser"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ jethro ]; }; diff --git a/pkgs/development/python-modules/csscompressor/default.nix b/pkgs/development/python-modules/csscompressor/default.nix index a6c294456fa..50f20164f64 100644 --- a/pkgs/development/python-modules/csscompressor/default.nix +++ b/pkgs/development/python-modules/csscompressor/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { description = "A python port of YUI CSS Compressor"; - homepage = https://pypi.python.org/pypi/csscompressor; + homepage = "https://pypi.python.org/pypi/csscompressor"; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.ahmedtd]; }; diff --git a/pkgs/development/python-modules/cssmin/default.nix b/pkgs/development/python-modules/cssmin/default.nix index 2d1ffaccd6f..deace3233b2 100644 --- a/pkgs/development/python-modules/cssmin/default.nix +++ b/pkgs/development/python-modules/cssmin/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python port of the YUI CSS compression algorithm"; - homepage = https://github.com/zacharyvoase/cssmin; + homepage = "https://github.com/zacharyvoase/cssmin"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/cssselect2/default.nix b/pkgs/development/python-modules/cssselect2/default.nix index ff56e2a2f47..dfa08dfe0b0 100644 --- a/pkgs/development/python-modules/cssselect2/default.nix +++ b/pkgs/development/python-modules/cssselect2/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "CSS selectors for Python ElementTree"; - homepage = https://github.com/Kozea/cssselect2; + homepage = "https://github.com/Kozea/cssselect2"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/csvs-to-sqlite/default.nix b/pkgs/development/python-modules/csvs-to-sqlite/default.nix index 15f43eb994e..3c4bfa0bff7 100644 --- a/pkgs/development/python-modules/csvs-to-sqlite/default.nix +++ b/pkgs/development/python-modules/csvs-to-sqlite/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert CSV files into a SQLite database"; - homepage = https://github.com/simonw/csvs-to-sqlite; + homepage = "https://github.com/simonw/csvs-to-sqlite"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/cufflinks/default.nix b/pkgs/development/python-modules/cufflinks/default.nix index 315c28c74ca..4c2db1f5214 100644 --- a/pkgs/development/python-modules/cufflinks/default.nix +++ b/pkgs/development/python-modules/cufflinks/default.nix @@ -4,6 +4,7 @@ , ipython , ipywidgets , pytest +, nose , numpy , pandas , six @@ -30,7 +31,7 @@ buildPythonPackage rec { statsmodels ]; - checkInputs = [ pytest ]; + checkInputs = [ pytest nose ]; # ignore tests which are incompatible with pandas>=1.0 # https://github.com/santosjorge/cufflinks/issues/236 diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 443d96b097a..d2db8dcd9ee 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A NumPy-compatible matrix library accelerated by CUDA"; - homepage = https://cupy.chainer.org/; + homepage = "https://cupy.chainer.org/"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ hyphon81 ]; diff --git a/pkgs/development/python-modules/curtsies/default.nix b/pkgs/development/python-modules/curtsies/default.nix index b0e9fee93d4..9f45c2fd2ba 100644 --- a/pkgs/development/python-modules/curtsies/default.nix +++ b/pkgs/development/python-modules/curtsies/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { patches = [ # Fix dependency on typing. Remove with the next release (fetchpatch { - url = https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch; + url = "https://github.com/bpython/curtsies/commit/217b4f83e954837f8adc4c549c1f2f9f2bb272a7.patch"; sha256 = "1d3zwx9c7i0drb4nvydalm9mr83jrvdm75ffgisri89h337hiffs"; }) ]; @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Curses-like terminal wrapper, with colored strings!"; - homepage = https://github.com/bpython/curtsies; + homepage = "https://github.com/bpython/curtsies"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/curve25519-donna/default.nix b/pkgs/development/python-modules/curve25519-donna/default.nix index 789fc7488fa..1672557f1b9 100644 --- a/pkgs/development/python-modules/curve25519-donna/default.nix +++ b/pkgs/development/python-modules/curve25519-donna/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for the portable curve25519-donna implementation"; - homepage = http://code.google.com/p/curve25519-donna/; + homepage = "http://code.google.com/p/curve25519-donna/"; license = licenses.bsd3; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index fd44f49b53c..b48f6b99136 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = http://cvxopt.org/; + homepage = "http://cvxopt.org/"; description = "Python Software for Convex Optimization"; longDescription = '' CVXOPT is a free software package for convex optimization based on the diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 2a77f45217a..b0bab9c7ee0 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -16,34 +16,36 @@ buildPythonPackage rec { pname = "cvxpy"; - version = "1.0.25"; + version = "1.0.31"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "04zalvc8lckjfzm3i2ir32ib5pd6v7hxqqcnsnq6fw40vffm4dc5"; + sha256 = "17g6xcy99icrdcmb4pa793kqvzchbzl5lsw00xms9slwkr7pb65k"; }; propagatedBuildInputs = [ cvxopt ecos multiprocess + numpy osqp + scipy scs six ]; checkInputs = [ nose ]; checkPhase = '' - nosetests + nosetests cvxpy ''; - meta = { + meta = with lib; { description = "A domain-specific language for modeling convex optimization problems in Python."; homepage = "https://www.cvxpy.org/"; - downloadPage = "https://github.com/cvxgrp/cvxpy/"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ drewrisinger ]; + downloadPage = "https://github.com/cvxgrp/cvxpy/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/cycler/default.nix b/pkgs/development/python-modules/cycler/default.nix index 3d220535404..643a57e259f 100644 --- a/pkgs/development/python-modules/cycler/default.nix +++ b/pkgs/development/python-modules/cycler/default.nix @@ -29,8 +29,8 @@ buildPythonPackage rec { meta = { description = "Composable style cycles"; - homepage = https://github.com/matplotlib/cycler; + homepage = "https://github.com/matplotlib/cycler"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/cymem/default.nix b/pkgs/development/python-modules/cymem/default.nix index 1ca86f3d9d0..e563e6615fe 100644 --- a/pkgs/development/python-modules/cymem/default.nix +++ b/pkgs/development/python-modules/cymem/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cython memory pool for RAII-style memory management"; - homepage = https://github.com/explosion/cymem; + homepage = "https://github.com/explosion/cymem"; license = licenses.mit; maintainers = with maintainers; [ sdll ]; }; diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 6c3e20b3f70..9308a13fb50 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Cython bindings for PARI"; license = licenses.gpl2; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/defeo/cypari2; + homepage = "https://github.com/defeo/cypari2"; }; } diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index e69fbce2158..137451b6b5c 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = { description = "Interrupt and signal handling for Cython"; - homepage = https://github.com/sagemath/cysignals/; + homepage = "https://github.com/sagemath/cysignals/"; maintainers = with lib.maintainers; [ timokau ]; license = lib.licenses.lgpl3Plus; }; diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix index 1a142cae0f0..512e26023c0 100644 --- a/pkgs/development/python-modules/cytoolz/default.nix +++ b/pkgs/development/python-modules/cytoolz/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/pytoolz/cytoolz/; + homepage = "https://github.com/pytoolz/cytoolz/"; description = "Cython implementation of Toolz: High performance functional utilities"; license = "licenses.bsd3"; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/d2to1/default.nix b/pkgs/development/python-modules/d2to1/default.nix index 70b0da89d5b..8a48ddcb13a 100644 --- a/pkgs/development/python-modules/d2to1/default.nix +++ b/pkgs/development/python-modules/d2to1/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib;{ description = "Support for distutils2-like setup.cfg files as package metadata"; - homepage = https://github.com/embray/d2to1; + homepage = "https://github.com/embray/d2to1"; license = licenses.bsd2; maintainers = with maintainers; [ makefu ]; }; diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix index 2f7992e860f..9db82380684 100644 --- a/pkgs/development/python-modules/daemonize/default.nix +++ b/pkgs/development/python-modules/daemonize/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library to enable your code run as a daemon process on Unix-like systems"; - homepage = https://github.com/thesharp/daemonize; + homepage = "https://github.com/thesharp/daemonize"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix index e577617c478..49e6c3b3c47 100644 --- a/pkgs/development/python-modules/daphne/default.nix +++ b/pkgs/development/python-modules/daphne/default.nix @@ -38,6 +38,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django ASGI (HTTP/WebSocket) server"; license = licenses.bsd3; - homepage = https://github.com/django/daphne; + homepage = "https://github.com/django/daphne"; }; } diff --git a/pkgs/development/python-modules/darcsver/default.nix b/pkgs/development/python-modules/darcsver/default.nix index 753b592a4c5..33c7eb2d116 100644 --- a/pkgs/development/python-modules/darcsver/default.nix +++ b/pkgs/development/python-modules/darcsver/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Darcsver, generate a version number from Darcs history"; - homepage = https://pypi.python.org/pypi/darcsver; + homepage = "https://pypi.python.org/pypi/darcsver"; license = "BSD-style"; }; } diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index 4f1e26e42cb..1a1e3db46ff 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.8.1"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0qqf51mphv1pqqc2ff50rkbw44sp9liifg0mg7xkh41sgnv032cs"; + sha256 = "1wr6989hq7q9vyh1qqdpbp8igk9rfca4phfpaim3nnk4swvm5m75"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-html-components/default.nix b/pkgs/development/python-modules/dash-html-components/default.nix index 4e9ef39b411..901a6702492 100644 --- a/pkgs/development/python-modules/dash-html-components/default.nix +++ b/pkgs/development/python-modules/dash-html-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_html_components"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "166agkrl52j5qin2npsdl2a96jccxz5f1jvcz0hxsnjg0ix0k4l9"; + sha256 = "1fj5wlh6x9nngmz1rzb5xazc5pl34yrp4kf7a3zgy0dniap59yys"; }; # No tests in archive @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTML components for Dash"; - homepage = https://dash.plot.ly/dash-html-components; + homepage = "https://dash.plot.ly/dash-html-components"; license = licenses.mit; maintainers = [ maintainers.antoinerg ]; }; diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index d009ce192d7..348deba7123 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.2.4"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1w6mpmvfj6nv5rdzikwc7wwhrgscbh50d0azzydhsa9jccxvkakl"; + sha256 = "07nyajjc3209ha2nbvk43sh5bnslwb2hs9wn8q5dpfngsc96wr9g"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 3a0e0c40176..3ea04666249 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.6.1"; + version = "4.6.2"; src = fetchPypi { inherit pname version; - sha256 = "0xwwkp7zsmrcnl3fswm5f319cxk7hk4dzacvfsarll2b47rmm434"; + sha256 = "1hn1yjz5ig2kzkk0wkr75q3l4lrfbnsh0kxzlld9sfn69d1vvsjw"; }; # No tests in archive diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 72ae7104536..83632ff6db6 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "0lqvcq7xaw5l1mwmgfdhr9jspq8jzkxf77862k0ca4d9zglkqp4z"; + sha256 = "18rrysfhmjfzb5b3n8fjbwk755p4slbb8fh9myq4qp76v00lfpnh"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-glm/default.nix b/pkgs/development/python-modules/dask-glm/default.nix index 73705d9982a..0a88323fafd 100644 --- a/pkgs/development/python-modules/dask-glm/default.nix +++ b/pkgs/development/python-modules/dask-glm/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-glm/; + homepage = "https://github.com/dask/dask-glm/"; description = "Generalized Linear Models with Dask"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index 7b12d1fcc22..48a6a73af67 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dask numpy toolz scipy pims ]; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-image; + homepage = "https://github.com/dask/dask-image"; description = "Distributed image processing"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix index f9af247bc80..b651dca7265 100644 --- a/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-jobqueue; + homepage = "https://github.com/dask/dask-jobqueue"; description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index c5fafa495aa..f47515d5543 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-ml; + homepage = "https://github.com/dask/dask-ml"; description = "Scalable Machine Learn with Dask"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index cd538afa15a..741e39423a9 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-mpi; + homepage = "https://github.com/dask/dask-mpi"; description = "Deploy Dask using mpi4py"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index d5f4de4efaa..e5a94b491da 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/dask/dask-xgboost; + homepage = "https://github.com/dask/dask-xgboost"; description = "Interactions between Dask and XGBoost"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index ef47f419a6e..b8dfd8deb4a 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = { description = "Minimal task scheduling abstraction"; - homepage = https://github.com/ContinuumIO/dask/; + homepage = "https://github.com/ContinuumIO/dask/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/databases/default.nix b/pkgs/development/python-modules/databases/default.nix index e4129ed9bbf..f5a7c52ef8e 100644 --- a/pkgs/development/python-modules/databases/default.nix +++ b/pkgs/development/python-modules/databases/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Async database support for Python"; - homepage = https://github.com/encode/databases; + homepage = "https://github.com/encode/databases"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/datadiff/default.nix b/pkgs/development/python-modules/datadiff/default.nix index 72964e3d1f6..0c30f2f8468 100644 --- a/pkgs/development/python-modules/datadiff/default.nix +++ b/pkgs/development/python-modules/datadiff/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "DataDiff"; - homepage = https://sourceforge.net/projects/datadiff/; + homepage = "https://sourceforge.net/projects/datadiff/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 204a14eb0da..d08d0903886 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.34.1"; + version = "0.35.0"; src = fetchPypi { inherit pname version; - sha256 = "1msi3wm0khmzh0ad7lwd5gigmqrxj25hd4w0qrsarihmd4ywrn1v"; + sha256 = "0qpy6mg9gfjxvjms0aaglzayhmdds4agv0lh05g2mkfw620nm8zl"; }; postPatch = '' diff --git a/pkgs/development/python-modules/datamodeldict/default.nix b/pkgs/development/python-modules/datamodeldict/default.nix index d23ecec169a..1a77c22104c 100644 --- a/pkgs/development/python-modules/datamodeldict/default.nix +++ b/pkgs/development/python-modules/datamodeldict/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/usnistgov/DataModelDict/; + homepage = "https://github.com/usnistgov/DataModelDict/"; description = "Class allowing for data models equivalently represented as Python dictionaries, JSON, and XML"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 81b07eeacb4..06e611c8cbf 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -1,49 +1,52 @@ { lib , buildPythonPackage , fetchFromGitHub +, aiofiles , click , click-default-group +, janus , jinja2 , hupper , pint , pluggy -, pytest +, uvicorn +# Check Inputs +, pytestCheckHook , pytestrunner , pytest-asyncio , black , aiohttp , beautifulsoup4 -, uvicorn , asgiref -, aiofiles }: buildPythonPackage rec { pname = "datasette"; - version = "0.35"; + version = "0.39"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "0v6af7agg27lapz1nbab07595v4hl2x5wm2f03drj81f7pm8y7hc"; + sha256 = "07d46512bc9sdan9lv39sf1bwlf7vf1bfhcsm825vk7sv7g9kczd"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ + aiofiles click click-default-group + janus jinja2 hupper pint pluggy uvicorn - aiofiles ]; checkInputs = [ - pytest + pytestCheckHook pytest-asyncio aiohttp beautifulsoup4 @@ -53,28 +56,36 @@ buildPythonPackage rec { postConfigure = '' substituteInPlace setup.py \ - --replace "click-default-group==1.2" "click-default-group" \ - --replace "Sanic==0.7.0" "Sanic" \ - --replace "hupper==1.0" "hupper" \ - --replace "pint~=0.8.1" "pint" \ - --replace "pluggy~=0.12.0" "pint" \ - --replace "Jinja2==2.10.1" "Jinja2" \ - --replace "uvicorn~=0.8.4" "uvicorn" + --replace "click~=7.1.1" "click" \ + --replace "click-default-group~=1.2.2" "click-default-group" \ + --replace "Jinja2~=2.10.3" "Jinja2" \ + --replace "hupper~=1.9" "hupper" \ + --replace "pint~=0.9" "pint" \ + --replace "pluggy~=0.13.0" "pint" \ + --replace "uvicorn~=0.11" "uvicorn" \ + --replace "aiofiles~=0.4.0" "aiofiles" \ + --replace "janus~=0.4.0" "janus" \ + --replace "PyYAML~=5.3" "PyYAML" ''; # many tests require network access # test_black fails on darwin - checkPhase = '' - pytest --ignore tests/test_api.py \ - --ignore tests/test_csv.py \ - --ignore tests/test_html.py \ - --ignore tests/test_black.py \ - -k 'not facet' - ''; + dontUseSetuptoolsCheck = true; + pytestFlagsArray = [ + "--ignore=tests/test_api.py" + "--ignore=tests/test_csv.py" + "--ignore=tests/test_html.py" + "--ignore=tests/test_docs.py" + "--ignore=tests/test_black.py" + ]; + disabledTests = [ + "facet" + "_invalid_database" # checks error message when connecting to invalid database + ]; meta = with lib; { description = "An instant JSON API for your SQLite databases"; - homepage = https://github.com/simonw/datasette; + homepage = "https://github.com/simonw/datasette"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix index 789e488e461..6f7925a4998 100644 --- a/pkgs/development/python-modules/datashader/default.nix +++ b/pkgs/development/python-modules/datashader/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Data visualization toolchain based on aggregating into a grid"; - homepage = https://datashader.org; + homepage = "https://datashader.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/datashape/default.nix b/pkgs/development/python-modules/datashape/default.nix index 27665c689c4..6f11ae62c3e 100644 --- a/pkgs/development/python-modules/datashape/default.nix +++ b/pkgs/development/python-modules/datashape/default.nix @@ -42,7 +42,7 @@ in buildPythonPackage rec { PYTEST_ADDOPTS = "-k 'not test_record and not test_tuple'"; meta = { - homepage = https://github.com/ContinuumIO/datashape; + homepage = "https://github.com/ContinuumIO/datashape"; description = "A data description language"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/dateparser/default.nix b/pkgs/development/python-modules/dateparser/default.nix index 9c406671f78..f8810c95464 100644 --- a/pkgs/development/python-modules/dateparser/default.nix +++ b/pkgs/development/python-modules/dateparser/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Date parsing library designed to parse dates from HTML pages"; - homepage = https://github.com/scrapinghub/dateparser; + homepage = "https://github.com/scrapinghub/dateparser"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dateutil/default.nix b/pkgs/development/python-modules/dateutil/default.nix index 9c5f6145d8f..88024265d94 100644 --- a/pkgs/development/python-modules/dateutil/default.nix +++ b/pkgs/development/python-modules/dateutil/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Powerful extensions to the standard datetime module"; - homepage = https://pypi.python.org/pypi/python-dateutil; + homepage = "https://pypi.python.org/pypi/python-dateutil"; license = "BSD-style"; }; } diff --git a/pkgs/development/python-modules/dbfread/default.nix b/pkgs/development/python-modules/dbfread/default.nix index 6c50313a518..9dda98e03ac 100644 --- a/pkgs/development/python-modules/dbfread/default.nix +++ b/pkgs/development/python-modules/dbfread/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Read DBF Files with Python"; - homepage = https://dbfread.readthedocs.org/; + homepage = "https://dbfread.readthedocs.org/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/python-modules/dcmstack/default.nix b/pkgs/development/python-modules/dcmstack/default.nix new file mode 100644 index 00000000000..f06e361dc71 --- /dev/null +++ b/pkgs/development/python-modules/dcmstack/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pythonAtLeast +, nose +, nibabel +, pydicom +}: + +buildPythonPackage rec { + pname = "dcmstack"; + version = "0.8"; + + disabled = pythonAtLeast "3.8"; + # https://github.com/moloney/dcmstack/issues/67 + + src = fetchFromGitHub { + owner = "moloney"; + repo = pname; + rev = "v${version}"; + sha256 = "1n24pp3rqz7ss1z6276fxynnppraxadbl3b9p8ijrcqnpzbzih7p"; + }; + + propagatedBuildInputs = [ nibabel pydicom ]; + + checkInputs = [ nose ]; + checkPhase = '' + runHook preCheck + nosetests + runHook postCheck + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/moloney/dcmstack"; + description = "DICOM to Nifti conversion preserving metadata"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/ddt/default.nix b/pkgs/development/python-modules/ddt/default.nix index dac72fb72b7..a660aaafca8 100644 --- a/pkgs/development/python-modules/ddt/default.nix +++ b/pkgs/development/python-modules/ddt/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Data-Driven/Decorated Tests, a library to multiply test cases"; - homepage = https://github.com/txels/ddt; + homepage = "https://github.com/txels/ddt"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/deap/default.nix b/pkgs/development/python-modules/deap/default.nix index 9c49057398c..5a09c42a9bb 100644 --- a/pkgs/development/python-modules/deap/default.nix +++ b/pkgs/development/python-modules/deap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib }: +{ stdenv, buildPythonPackage, fetchPypi, python, numpy, matplotlib, nose }: buildPythonPackage rec { pname = "deap"; @@ -11,6 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy matplotlib ]; + checkInputs = [ nose ]; checkPhase = '' ${python.interpreter} setup.py nosetests --verbosity=3 ''; diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix index efdd5023a24..b9e8e25ac43 100644 --- a/pkgs/development/python-modules/decorator/default.nix +++ b/pkgs/development/python-modules/decorator/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch; + url = "https://github.com/micheles/decorator/commit/3265f2755d16c0a3dfc9f1feee39722ddc11ee80.patch"; sha256 = "1q5nmff30vccqq5swf2ivm8cn7x3lhz8c9qpj0zddgs2y7fw8syz"; }) ]; meta = with lib; { - homepage = https://pypi.python.org/pypi/decorator; + homepage = "https://pypi.python.org/pypi/decorator"; description = "Better living through Python with decorators"; license = lib.licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix index 8ebd3ef47bd..8ede226d38b 100644 --- a/pkgs/development/python-modules/deform/default.nix +++ b/pkgs/development/python-modules/deform/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Form library with advanced features like nested forms"; - homepage = https://docs.pylonsproject.org/projects/deform/en/latest/; + homepage = "https://docs.pylonsproject.org/projects/deform/en/latest/"; license = licenses.free; # http://www.repoze.org/LICENSE.txt maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/deluge-client/default.nix b/pkgs/development/python-modules/deluge-client/default.nix index a2a986828b5..127fe07f373 100644 --- a/pkgs/development/python-modules/deluge-client/default.nix +++ b/pkgs/development/python-modules/deluge-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Lightweight pure-python rpc client for deluge"; - homepage = https://github.com/JohnDoee/deluge-client; + homepage = "https://github.com/JohnDoee/deluge-client"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/dendropy/default.nix b/pkgs/development/python-modules/dendropy/default.nix index c0055580c40..05737ecf9a8 100644 --- a/pkgs/development/python-modules/dendropy/default.nix +++ b/pkgs/development/python-modules/dendropy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://dendropy.org/; + homepage = "https://dendropy.org/"; description = "A Python library for phylogenetic computing"; maintainers = with lib.maintainers; [ unode ]; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix index e33382ffd01..643556d8793 100644 --- a/pkgs/development/python-modules/denonavr/default.nix +++ b/pkgs/development/python-modules/denonavr/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "denonavr"; - version = "0.7.12"; + version = "0.8.1"; src = fetchFromGitHub { owner = "scarface-4711"; repo = "denonavr"; rev = version; - sha256 = "1i7r0f8ldxpy9vkwjla6rfkaq37071d36zfhb1dwm9jgp6ggi34m"; + sha256 = "12g9w5674fmyf3f4plbhvpxpyhzw32pzwl0hvwswzrc2823xl6vx"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index b5a3a869b69..121175c5085 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Dependency injection microframework for Python"; - homepage = https://github.com/ets-labs/python-dependency-injector; + homepage = "https://github.com/ets-labs/python-dependency-injector"; license = licenses.bsd3; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/python-modules/deprecated/default.nix b/pkgs/development/python-modules/deprecated/default.nix index 2af9d020c95..6c338ce6dc2 100644 --- a/pkgs/development/python-modules/deprecated/default.nix +++ b/pkgs/development/python-modules/deprecated/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "Deprecated"; - version = "1.2.7"; + version = "1.2.8"; src = fetchPypi { inherit pname version; - sha256 = "408038ab5fdeca67554e8f6742d1521cd3cd0ee0ff9d47f29318a4f4da31c308"; + sha256 = "029mr75wgah0z1ilsf3vf3dmjn65y4fy1jgq5qny2qsb9hvwbblw"; }; propagatedBuildInputs = [ wrapt ]; diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index e01433d90c5..7478c18b2c0 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to handle automated deprecations"; - homepage = https://deprecation.readthedocs.io/; + homepage = "https://deprecation.readthedocs.io/"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/derpconf/default.nix b/pkgs/development/python-modules/derpconf/default.nix index 84f30b7edf6..9138ef28530 100644 --- a/pkgs/development/python-modules/derpconf/default.nix +++ b/pkgs/development/python-modules/derpconf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "derpconf abstracts loading configuration files for your app"; - homepage = https://github.com/globocom/derpconf; + homepage = "https://github.com/globocom/derpconf"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/descartes/default.nix b/pkgs/development/python-modules/descartes/default.nix index 996cd22e263..c726492f69d 100644 --- a/pkgs/development/python-modules/descartes/default.nix +++ b/pkgs/development/python-modules/descartes/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library to use Shapely or GeoJSON objects as matplotlib paths"; - homepage = https://bitbucket.org/sgillies/descartes/; + homepage = "https://bitbucket.org/sgillies/descartes/"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; diff --git a/pkgs/development/python-modules/deskcon/default.nix b/pkgs/development/python-modules/deskcon/default.nix index 2e205ce6955..7beaa838a82 100644 --- a/pkgs/development/python-modules/deskcon/default.nix +++ b/pkgs/development/python-modules/deskcon/default.nix @@ -7,7 +7,8 @@ }: buildPythonPackage { - name = "deskcon-0.3"; + pname = "deskcon"; + version = "0.3"; disabled = isPy3k; src = pkgs.fetchFromGitHub { @@ -34,7 +35,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Integrates an Android device into a desktop"; - homepage = https://github.com/screenfreeze/deskcon-desktop; + homepage = "https://github.com/screenfreeze/deskcon-desktop"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/detox/default.nix b/pkgs/development/python-modules/detox/default.nix index 9fbeef2488c..5353d4361e3 100644 --- a/pkgs/development/python-modules/detox/default.nix +++ b/pkgs/development/python-modules/detox/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "What is detox?"; - homepage = https://bitbucket.org/hpk42/detox; + homepage = "https://bitbucket.org/hpk42/detox"; license = licenses.mit; # detox is unmaintained and incompatible with tox > 3.6 broken = true; diff --git a/pkgs/development/python-modules/devpi-common/default.nix b/pkgs/development/python-modules/devpi-common/default.nix index 72db5d1b0ec..25d9353e155 100644 --- a/pkgs/development/python-modules/devpi-common/default.nix +++ b/pkgs/development/python-modules/devpi-common/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/devpi/devpi; + homepage = "https://github.com/devpi/devpi"; description = "Utilities jointly used by devpi-server and devpi-client"; license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; diff --git a/pkgs/development/python-modules/dftfit/default.nix b/pkgs/development/python-modules/dftfit/default.nix index 9095eb962fe..0f0563e3baf 100644 --- a/pkgs/development/python-modules/dftfit/default.nix +++ b/pkgs/development/python-modules/dftfit/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = { description = "Ab-Initio Molecular Dynamics Potential Development"; - homepage = https://gitlab.com/costrouc/dftfit; + homepage = "https://gitlab.com/costrouc/dftfit"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/dicttoxml/default.nix b/pkgs/development/python-modules/dicttoxml/default.nix index 7d30aad69c4..9e24784731c 100644 --- a/pkgs/development/python-modules/dicttoxml/default.nix +++ b/pkgs/development/python-modules/dicttoxml/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Converts a Python dictionary or other native data type into a valid XML string"; - homepage = https://github.com/quandyfactory/dicttoxml; + homepage = "https://github.com/quandyfactory/dicttoxml"; license = lib.licenses.gpl2; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix index 585f96341ee..340e5bd6366 100644 --- a/pkgs/development/python-modules/diff_cover/default.nix +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Automatically find diff lines that need test coverage"; - homepage = https://github.com/Bachmann1234/diff-cover; + homepage = "https://github.com/Bachmann1234/diff-cover"; license = licenses.asl20; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/dipy/default.nix b/pkgs/development/python-modules/dipy/default.nix new file mode 100644 index 00000000000..939f0912fe1 --- /dev/null +++ b/pkgs/development/python-modules/dipy/default.nix @@ -0,0 +1,68 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, packaging +, pytest +, cython +, numpy +, scipy +, h5py +, nibabel +}: + +buildPythonPackage rec { + pname = "dipy"; + version = "1.1.1"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "dipy"; + repo = pname; + rev = version; + sha256 = "08abx0f4li6ya62ilc59miw4mk6wndizahyylxhgcrpacb6ydw28"; + }; + + nativeBuildInputs = [ cython packaging ]; + propagatedBuildInputs = [ + numpy + scipy + h5py + nibabel + ]; + + checkInputs = [ pytest ]; + + # disable tests for now due to: + # - some tests require data download (see dipy/dipy/issues/2092); + # - running the tests manually causes a multiprocessing hang; + # - import weirdness when running the tests + doCheck = false; + + pythonImportsCheck = [ + "dipy" + "dipy.core" + "dipy.direction" + "dipy.tracking" + "dipy.reconst" + "dipy.io" + "dipy.viz" + "dipy.boots" + "dipy.data" + "dipy.utils" + "dipy.segment" + "dipy.sims" + "dipy.stats" + "dipy.denoise" + "dipy.workflows" + "dipy.nn" + ]; + + meta = with lib; { + homepage = "https://dipy.org/"; + description = "Diffusion imaging toolkit for Python"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/distlib/default.nix b/pkgs/development/python-modules/distlib/default.nix index 81575058b15..b9a92fb2cdb 100644 --- a/pkgs/development/python-modules/distlib/default.nix +++ b/pkgs/development/python-modules/distlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Low-level components of distutils2/packaging"; - homepage = https://distlib.readthedocs.io; + homepage = "https://distlib.readthedocs.io"; license = licenses.psfl; maintainers = with maintainers; [ lnl7 ]; }; diff --git a/pkgs/development/python-modules/distorm3/default.nix b/pkgs/development/python-modules/distorm3/default.nix index e21e6270b91..29524240a8a 100644 --- a/pkgs/development/python-modules/distorm3/default.nix +++ b/pkgs/development/python-modules/distorm3/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Powerful Disassembler Library For x86/AMD64"; - homepage = https://github.com/gdabah/distorm; + homepage = "https://github.com/gdabah/distorm"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 951593bac97..d85b4496e22 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -3,7 +3,6 @@ , fetchPypi , pytest , pytest-repeat -, pytest-faulthandler , pytest-timeout , mock , joblib @@ -36,7 +35,7 @@ buildPythonPackage rec { sha256 = "d37a5c5be992f3b16db24b54d2801cbe370990fbc63089c6e7ef40d6f03cf5dd"; }; - checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ]; + checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; propagatedBuildInputs = [ click cloudpickle dask msgpack psutil six sortedcontainers tblib toolz tornado zict pyyaml mpi4py bokeh @@ -54,7 +53,7 @@ buildPythonPackage rec { meta = { description = "Distributed computation in Python."; - homepage = https://distributed.readthedocs.io/en/latest/; + homepage = "https://distributed.readthedocs.io/en/latest/"; license = lib.licenses.bsd3; platforms = lib.platforms.x86; # fails on aarch64 maintainers = with lib.maintainers; [ teh costrouc ]; diff --git a/pkgs/development/python-modules/distro/default.nix b/pkgs/development/python-modules/distro/default.nix index ad8da4255d6..8880ec7235d 100644 --- a/pkgs/development/python-modules/distro/default.nix +++ b/pkgs/development/python-modules/distro/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/nir0s/distro; + homepage = "https://github.com/nir0s/distro"; description = "Linux Distribution - a Linux OS platform information API."; license = licenses.asl20; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/distutils_extra/default.nix b/pkgs/development/python-modules/distutils_extra/default.nix index 42e7fe6e9f4..1e66f04374b 100644 --- a/pkgs/development/python-modules/distutils_extra/default.nix +++ b/pkgs/development/python-modules/distutils_extra/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://launchpad.net/python-distutils-extra; + homepage = "https://launchpad.net/python-distutils-extra"; description = "Enhancements to Python's distutils"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/dj-database-url/default.nix b/pkgs/development/python-modules/dj-database-url/default.nix index f334b7efeac..698e2a0c305 100644 --- a/pkgs/development/python-modules/dj-database-url/default.nix +++ b/pkgs/development/python-modules/dj-database-url/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use Database URLs in your Django Application"; - homepage = https://github.com/kennethreitz/dj-database-url; + homepage = "https://github.com/kennethreitz/dj-database-url"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/dj-email-url/default.nix b/pkgs/development/python-modules/dj-email-url/default.nix index de052b67ecf..cd01ddf1e82 100644 --- a/pkgs/development/python-modules/dj-email-url/default.nix +++ b/pkgs/development/python-modules/dj-email-url/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/migonzalvar/dj-email-url; + homepage = "https://github.com/migonzalvar/dj-email-url"; description = "Use an URL to configure email backend settings in your Django Application"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/dj-search-url/default.nix b/pkgs/development/python-modules/dj-search-url/default.nix index 68fe4c913d6..f86f08ae60b 100644 --- a/pkgs/development/python-modules/dj-search-url/default.nix +++ b/pkgs/development/python-modules/dj-search-url/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/dstufft/dj-search-url; + homepage = "https://github.com/dstufft/dj-search-url"; description = "Use Search URLs in your Django Haystack Application"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 10fe8cde826..a91bd6cadc3 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication"; - homepage = https://www.intenct.nl/projects/django-allauth; + homepage = "https://www.intenct.nl/projects/django-allauth"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-anymail/default.nix b/pkgs/development/python-modules/django-anymail/default.nix index d05b5b0b92b..8c3e19630d4 100644 --- a/pkgs/development/python-modules/django-anymail/default.nix +++ b/pkgs/development/python-modules/django-anymail/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { # sparkpost is missing because it's not packaged yet meta = with stdenv.lib; { description = "Django email backends and webhooks for Mailgun"; - homepage = https://github.com/anymail/django-anymail; + homepage = "https://github.com/anymail/django-anymail"; license = licenses.bsd3; maintainers = with maintainers; [ ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index f0de263f130..9f50a7ea22b 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.1.0"; + version = "2.1.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "5f48232c85ddfa33e3573153e6080526ac2eef5e7ec9cf42b5c4ba3c62afb96d"; + sha256 = "1j1fwinbkr4khn9i869r22jfdgw2kli0jqrz5shyd36jllsvrfzs"; }; propagatedBuildInputs = [ ldap django ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django authentication backend that authenticates against an LDAP service"; - homepage = https://github.com/django-auth-ldap/django-auth-ldap; + homepage = "https://github.com/django-auth-ldap/django-auth-ldap"; license = licenses.bsd2; maintainers = with maintainers; [ mmai ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 6b8aac33139..6c5ac103912 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ghickman/django-cache-url; + homepage = "https://github.com/ghickman/django-cache-url"; description = "Use Cache URLs in your Django application"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 6484fb8c555..37b0959b6b7 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Automatically deletes old file for FileField and ImageField. It also deletes files on models instance deletion"; - homepage = https://github.com/un1t/django-cleanup; + homepage = "https://github.com/un1t/django-cleanup"; license = licenses.mit; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-compat/default.nix b/pkgs/development/python-modules/django-compat/default.nix index 9caa1cb730b..57426181b73 100644 --- a/pkgs/development/python-modules/django-compat/default.nix +++ b/pkgs/development/python-modules/django-compat/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11"; - homepage = https://github.com/arteria/django-compat; + homepage = "https://github.com/arteria/django-compat"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django-configurations/default.nix b/pkgs/development/python-modules/django-configurations/default.nix index 37646e90506..5b813977493 100644 --- a/pkgs/development/python-modules/django-configurations/default.nix +++ b/pkgs/development/python-modules/django-configurations/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://django-configurations.readthedocs.io/; + homepage = "https://django-configurations.readthedocs.io/"; description = "A helper for organizing Django settings"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 005dc65a499..6e699391705 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django app for handling server Cross-Origin Resource Sharing (CORS) headers"; - homepage = https://github.com/OttoYiu/django-cors-headers; + homepage = "https://github.com/OttoYiu/django-cors-headers"; license = licenses.mit; maintainers = [ maintainers.ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/django-discover-runner/default.nix b/pkgs/development/python-modules/django-discover-runner/default.nix index 82895f76473..43ae9a7c83a 100644 --- a/pkgs/development/python-modules/django-discover-runner/default.nix +++ b/pkgs/development/python-modules/django-discover-runner/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jezdez/django-discover-runner; + homepage = "https://github.com/jezdez/django-discover-runner"; description = "A Django test runner based on unittest2's test discovery"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index cea5a7976bb..5d50c628920 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/EliotBerriot/django-dynamic-preferences; + homepage = "https://github.com/EliotBerriot/django-dynamic-preferences"; description = "Dynamic global and instance settings for your django project"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; diff --git a/pkgs/development/python-modules/django-hijack-admin/default.nix b/pkgs/development/python-modules/django-hijack-admin/default.nix index 005d61acab9..e30fc88079c 100644 --- a/pkgs/development/python-modules/django-hijack-admin/default.nix +++ b/pkgs/development/python-modules/django-hijack-admin/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Admin integration for django-hijack"; - homepage = https://github.com/arteria/django-hijack-admin; + homepage = "https://github.com/arteria/django-hijack-admin"; license = licenses.mit; maintainers = with maintainers; [ lsix ]; }; diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index f41e7d146c9..d736e69ae6e 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows superusers to hijack (=login as) and work on behalf of another user"; - homepage = https://github.com/arteria/django-hijack; + homepage = "https://github.com/arteria/django-hijack"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 89147db63a8..4049f8722fc 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { meta = { description = "A Django application to retrieve user's IP address"; - homepage = https://github.com/un33k/django-ipware; + homepage = "https://github.com/un33k/django-ipware"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/django-jinja2/default.nix b/pkgs/development/python-modules/django-jinja2/default.nix index 338af16b2e9..7b49ddb5399 100644 --- a/pkgs/development/python-modules/django-jinja2/default.nix +++ b/pkgs/development/python-modules/django-jinja2/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Simple and nonobstructive jinja2 integration with Django"; - homepage = https://github.com/niwinz/django-jinja; + homepage = "https://github.com/niwinz/django-jinja"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 01ae357677b..bcb39633f7e 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "django-mailman3"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "b05cf04b2c36916d15b78e24610002206529f1441e2632253a26b2db6bfd3b27"; + sha256 = "1vq5qa136h4rz4hjznnk6y8l443i41yh4w4wxg20f9b059xrsld1"; }; propagatedBuildInputs = [ @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django library for Mailman UIs"; - homepage = https://gitlab.com/mailman/django-mailman3; + homepage = "https://gitlab.com/mailman/django-mailman3"; license = licenses.gpl3; maintainers = with maintainers; [ globin peti ]; }; diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index a4dcb57fe43..3561f1d8c1c 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-multiselectfield"; - version = "0.1.11"; + version = "0.1.12"; src = fetchPypi { inherit pname version; - sha256 = "043fa1aaddceb9b170c64c0745dc3a059165dcbc74946a434340778f63efa3c2"; + sha256 = "1ygra8s394d1szgj7yawlca17q08hygsrzvq2k3k48zvd0awg96h"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/pkgs/development/python-modules/django-oauth-toolkit/default.nix index 1927e4e9954..700fc3ae4e8 100644 --- a/pkgs/development/python-modules/django-oauth-toolkit/default.nix +++ b/pkgs/development/python-modules/django-oauth-toolkit/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OAuth2 goodies for the Djangonauts"; - homepage = https://github.com/jazzband/django-oauth-toolkit; + homepage = "https://github.com/jazzband/django-oauth-toolkit"; license = licenses.bsd2; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-paintstore/default.nix b/pkgs/development/python-modules/django-paintstore/default.nix index 096215a70ab..b2c755907c1 100644 --- a/pkgs/development/python-modules/django-paintstore/default.nix +++ b/pkgs/development/python-modules/django-paintstore/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django app that integrates jQuery ColorPicker with the Django admin"; - homepage = https://github.com/gsiegman/django-paintstore; + homepage = "https://github.com/gsiegman/django-paintstore"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-pglocks/default.nix b/pkgs/development/python-modules/django-pglocks/default.nix index 5963b24c830..a84850a1fda 100644 --- a/pkgs/development/python-modules/django-pglocks/default.nix +++ b/pkgs/development/python-modules/django-pglocks/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { meta = { description = "PostgreSQL locking context managers and functions for Django."; - homepage = https://github.com/Xof/django-pglocks; + homepage = "https://github.com/Xof/django-pglocks"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/django-picklefield/default.nix b/pkgs/development/python-modules/django-picklefield/default.nix index 9ba4e14c31a..90772b503af 100644 --- a/pkgs/development/python-modules/django-picklefield/default.nix +++ b/pkgs/development/python-modules/django-picklefield/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = { description = "A pickled object field for Django"; - homepage = https://github.com/gintas/django-picklefield; + homepage = "https://github.com/gintas/django-picklefield"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix index acb5587186d..3276f7a065c 100644 --- a/pkgs/development/python-modules/django-pipeline/default.nix +++ b/pkgs/development/python-modules/django-pipeline/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pipeline is an asset packaging library for Django"; - homepage = https://github.com/cyberdelia/django-pipeline; + homepage = "https://github.com/cyberdelia/django-pipeline"; license = licenses.mit; broken = true; }; diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix index 443f793f37b..c08facd3650 100644 --- a/pkgs/development/python-modules/django-polymorphic/default.nix +++ b/pkgs/development/python-modules/django-polymorphic/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/django-polymorphic/django-polymorphic; + homepage = "https://github.com/django-polymorphic/django-polymorphic"; description = "Improved Django model inheritance with automatic downcasting"; license = stdenv.lib.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 35be6f76147..993647c3f23 100644 --- a/pkgs/development/python-modules/django-postgresql-netfields/default.nix +++ b/pkgs/development/python-modules/django-postgresql-netfields/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django PostgreSQL netfields implementation"; - homepage = https://github.com/jimfunk/django-postgresql-netfields; + homepage = "https://github.com/jimfunk/django-postgresql-netfields"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 7ceee27e6f4..89a88348244 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A multiprocessing distributed task queue for Django"; - homepage = https://django-q.readthedocs.org; + homepage = "https://django-q.readthedocs.org"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-raster/default.nix b/pkgs/development/python-modules/django-raster/default.nix index e549fc8e1d7..03310afa027 100644 --- a/pkgs/development/python-modules/django-raster/default.nix +++ b/pkgs/development/python-modules/django-raster/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Basic raster data integration for Django"; - homepage = https://github.com/geodesign/django-raster; + homepage = "https://github.com/geodesign/django-raster"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/django-rest-auth/default.nix b/pkgs/development/python-modules/django-rest-auth/default.nix index a6edc98b0cb..9e11c2b6a03 100644 --- a/pkgs/development/python-modules/django-rest-auth/default.nix +++ b/pkgs/development/python-modules/django-rest-auth/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django app that makes registration and authentication easy"; - homepage = https://github.com/Tivix/django-rest-auth; + homepage = "https://github.com/Tivix/django-rest-auth"; license = licenses.mit; maintainers = [ maintainers.ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/django-sampledatahelper/default.nix b/pkgs/development/python-modules/django-sampledatahelper/default.nix index e08c296e807..edeb914946e 100644 --- a/pkgs/development/python-modules/django-sampledatahelper/default.nix +++ b/pkgs/development/python-modules/django-sampledatahelper/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Helper class for generate sample data for django apps development"; - homepage = https://github.com/kaleidos/django-sampledatahelper; + homepage = "https://github.com/kaleidos/django-sampledatahelper"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django-sesame/default.nix b/pkgs/development/python-modules/django-sesame/default.nix index cdf737061ba..e24fff1efe7 100644 --- a/pkgs/development/python-modules/django-sesame/default.nix +++ b/pkgs/development/python-modules/django-sesame/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "URLs with authentication tokens for automatic login"; - homepage = https://github.com/aaugustin/django-sesame; + homepage = "https://github.com/aaugustin/django-sesame"; license = licenses.bsd3; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/django-sites/default.nix b/pkgs/development/python-modules/django-sites/default.nix index 2882e1dc2b9..468f7e73803 100644 --- a/pkgs/development/python-modules/django-sites/default.nix +++ b/pkgs/development/python-modules/django-sites/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { Alternative implementation of django "sites" framework based on settings instead of models. ''; - homepage = https://github.com/niwinz/django-sites; + homepage = "https://github.com/niwinz/django-sites"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/django-sr/default.nix b/pkgs/development/python-modules/django-sr/default.nix index b8924b37bfd..39b3832185d 100644 --- a/pkgs/development/python-modules/django-sr/default.nix +++ b/pkgs/development/python-modules/django-sr/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { meta = { description = "Django settings resolver"; - homepage = https://github.com/jespino/django-sr; + homepage = "https://github.com/jespino/django-sr"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django-storages/default.nix b/pkgs/development/python-modules/django-storages/default.nix index dbf4e64db5a..cae83135a6f 100644 --- a/pkgs/development/python-modules/django-storages/default.nix +++ b/pkgs/development/python-modules/django-storages/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Collection of custom storage backends for Django"; - homepage = https://django-storages.readthedocs.io; + homepage = "https://django-storages.readthedocs.io"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; }; diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix index af3404b2f88..bbfe454b48d 100644 --- a/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use webpack to generate your static bundles"; - homepage = https://github.com/owais/django-webpack-loader; + homepage = "https://github.com/owais/django-webpack-loader"; maintainers = with maintainers; [ peterromfeldhk ]; license = with licenses; [ mit ]; }; diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix index 4c4997595c4..b38962f4efa 100644 --- a/pkgs/development/python-modules/django/1_11.nix +++ b/pkgs/development/python-modules/django/1_11.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; + homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/django/2_2.nix b/pkgs/development/python-modules/django/2_2.nix index 63a0f33d8f9..70cba819e92 100644 --- a/pkgs/development/python-modules/django/2_2.nix +++ b/pkgs/development/python-modules/django/2_2.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A high-level Python Web framework"; - homepage = https://www.djangoproject.com/; + homepage = "https://www.djangoproject.com/"; license = licenses.bsd3; maintainers = with maintainers; [ georgewhewell lsix ]; }; diff --git a/pkgs/development/python-modules/django_appconf/default.nix b/pkgs/development/python-modules/django_appconf/default.nix index 0d077b4f268..45116ddd554 100644 --- a/pkgs/development/python-modules/django_appconf/default.nix +++ b/pkgs/development/python-modules/django_appconf/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A helper class for handling configuration defaults of packaged apps gracefully"; - homepage = https://django-appconf.readthedocs.org/; + homepage = "https://django-appconf.readthedocs.org/"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django_colorful/default.nix b/pkgs/development/python-modules/django_colorful/default.nix index 84dca56b22b..10068f87b07 100644 --- a/pkgs/development/python-modules/django_colorful/default.nix +++ b/pkgs/development/python-modules/django_colorful/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django extension that provides database and form color fields"; - homepage = https://github.com/charettes/django-colorful; + homepage = "https://github.com/charettes/django-colorful"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix index cc860a9d354..1408032d0c2 100644 --- a/pkgs/development/python-modules/django_compressor/default.nix +++ b/pkgs/development/python-modules/django_compressor/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Compresses linked and inline JavaScript or CSS into single cached files"; - homepage = https://django-compressor.readthedocs.org/en/latest/; + homepage = "https://django-compressor.readthedocs.org/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django_contrib_comments/default.nix b/pkgs/development/python-modules/django_contrib_comments/default.nix index 12d8c220aff..303d6d95a46 100644 --- a/pkgs/development/python-modules/django_contrib_comments/default.nix +++ b/pkgs/development/python-modules/django_contrib_comments/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django six ]; meta = with stdenv.lib; { - homepage = https://github.com/django/django-contrib-comments; + homepage = "https://github.com/django/django-contrib-comments"; description = "The code formerly known as django.contrib.comments"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/django_environ/default.nix b/pkgs/development/python-modules/django_environ/default.nix index f95babfe233..e4ec7505c83 100644 --- a/pkgs/development/python-modules/django_environ/default.nix +++ b/pkgs/development/python-modules/django_environ/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilize environment variables to configure your Django application"; - homepage = https://github.com/joke2k/django-environ/; + homepage = "https://github.com/joke2k/django-environ/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index db11817186e..e276c6b656b 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Per object permissions for Django"; - homepage = https://github.com/django-guardian/django-guardian; + homepage = "https://github.com/django-guardian/django-guardian"; license = [ licenses.mit licenses.bsd2 ]; }; } diff --git a/pkgs/development/python-modules/django_modelcluster/default.nix b/pkgs/development/python-modules/django_modelcluster/default.nix index 943f9491498..27060e18ae2 100644 --- a/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/pkgs/development/python-modules/django_modelcluster/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Django extension to allow working with 'clusters' of models as a single unit, independently of the database"; - homepage = https://github.com/torchbox/django-modelcluster/; + homepage = "https://github.com/torchbox/django-modelcluster/"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django_nose/default.nix b/pkgs/development/python-modules/django_nose/default.nix index cf9516ce23a..5d3522c5b47 100644 --- a/pkgs/development/python-modules/django_nose/default.nix +++ b/pkgs/development/python-modules/django_nose/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides all the goodness of nose in your Django tests"; - homepage = https://github.com/django-nose/django-nose; + homepage = "https://github.com/django-nose/django-nose"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix index c19ca255319..26fb504e0e9 100644 --- a/pkgs/development/python-modules/django_redis/default.nix +++ b/pkgs/development/python-modules/django_redis/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Full featured redis cache backend for Django"; - homepage = https://github.com/niwibe/django-redis; + homepage = "https://github.com/niwibe/django-redis"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/django_reversion/default.nix b/pkgs/development/python-modules/django_reversion/default.nix index 5a4faf5f24e..8b536a40ebc 100644 --- a/pkgs/development/python-modules/django_reversion/default.nix +++ b/pkgs/development/python-modules/django_reversion/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An extension to the Django web framework that provides comprehensive version control facilities"; - homepage = https://github.com/etianen/django-reversion; + homepage = "https://github.com/etianen/django-reversion"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/django_silk/default.nix b/pkgs/development/python-modules/django_silk/default.nix index 85e5f8f02f0..95a991f3417 100644 --- a/pkgs/development/python-modules/django_silk/default.nix +++ b/pkgs/development/python-modules/django_silk/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Silky smooth profiling for the Django Framework"; - homepage = https://github.com/mtford90/silk; + homepage = "https://github.com/mtford90/silk"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/django_tagging/default.nix b/pkgs/development/python-modules/django_tagging/default.nix index fa06117a644..b54186b4fa2 100644 --- a/pkgs/development/python-modules/django_tagging/default.nix +++ b/pkgs/development/python-modules/django_tagging/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = { description = "A generic tagging application for Django projects"; - homepage = https://github.com/Fantomas42/django-tagging; + homepage = "https://github.com/Fantomas42/django-tagging"; }; } diff --git a/pkgs/development/python-modules/django_taggit/default.nix b/pkgs/development/python-modules/django_taggit/default.nix index 2851894b6b6..d7359626914 100644 --- a/pkgs/development/python-modules/django_taggit/default.nix +++ b/pkgs/development/python-modules/django_taggit/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "django-taggit is a reusable Django application for simple tagging"; - homepage = https://github.com/alex/django-taggit/tree/master/; + homepage = "https://github.com/alex/django-taggit/tree/master/"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/django_treebeard/default.nix b/pkgs/development/python-modules/django_treebeard/default.nix index d4b3464b6ae..060867d837f 100644 --- a/pkgs/development/python-modules/django_treebeard/default.nix +++ b/pkgs/development/python-modules/django_treebeard/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Efficient tree implementations for Django 1.6+"; - homepage = https://tabo.pe/projects/django-treebeard/; + homepage = "https://tabo.pe/projects/django-treebeard/"; maintainers = with maintainers; [ desiderius ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index df8d62e9bdc..28aa28c3b99 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Advanced search language for Django"; - homepage = https://github.com/ivelum/djangoql; + homepage = "https://github.com/ivelum/djangoql"; license = licenses.mit; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/djangorestframework-jwt/default.nix b/pkgs/development/python-modules/djangorestframework-jwt/default.nix index f50fd3ff9b6..643218242d7 100644 --- a/pkgs/development/python-modules/djangorestframework-jwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-jwt/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON Web Token Authentication support for Django REST Framework"; - homepage = https://github.com/GetBlimp/django-rest-framework-jwt; + homepage = "https://github.com/GetBlimp/django-rest-framework-jwt"; license = licenses.mit; maintainers = [ maintainers.ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index 60e5760b524..ee67db3eab0 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Web APIs for Django, made easy"; - homepage = https://www.django-rest-framework.org/; + homepage = "https://www.django-rest-framework.org/"; maintainers = with maintainers; [ desiderius ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/djmail/default.nix b/pkgs/development/python-modules/djmail/default.nix index 1659d46abbc..516a2163f44 100644 --- a/pkgs/development/python-modules/djmail/default.nix +++ b/pkgs/development/python-modules/djmail/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { meta = { description = "Simple, powerfull and nonobstructive django email middleware"; - homepage = https://github.com/bameda/djmail; + homepage = "https://github.com/bameda/djmail"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index c65fdfec953..de64f249cde 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { records. This version also supports the experimental Authenticated Received Chain (ARC) protocol. ''; - homepage = https://launchpad.net/dkimpy; + homepage = "https://launchpad.net/dkimpy"; license = licenses.bsd3; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/dm-sonnet/default.nix b/pkgs/development/python-modules/dm-sonnet/default.nix index 603d900b810..08dbafe019e 100644 --- a/pkgs/development/python-modules/dm-sonnet/default.nix +++ b/pkgs/development/python-modules/dm-sonnet/default.nix @@ -84,7 +84,7 @@ in buildPythonPackage { meta = with lib; { description = "TensorFlow-based neural network library"; - homepage = https://sonnet.dev; + homepage = "https://sonnet.dev"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/dmenu/default.nix b/pkgs/development/python-modules/dmenu/default.nix index 7897138d59f..130110173ee 100644 --- a/pkgs/development/python-modules/dmenu/default.nix +++ b/pkgs/development/python-modules/dmenu/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A Python wrapper for dmenu"; - homepage = https://dmenu.readthedocs.io; + homepage = "https://dmenu.readthedocs.io"; license = lib.licenses.mit; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/dnslib/default.nix b/pkgs/development/python-modules/dnslib/default.nix index e6ec04bb79e..fafa4c5cbf5 100644 --- a/pkgs/development/python-modules/dnslib/default.nix +++ b/pkgs/development/python-modules/dnslib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple library to encode/decode DNS wire-format packets"; license = licenses.bsd2; - homepage = https://bitbucket.org/paulc/dnslib/; + homepage = "https://bitbucket.org/paulc/dnslib/"; maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 74b49d1fa5a..6a65dba767c 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "A DNS toolkit for Python 3.x"; - homepage = http://www.dnspython.org; + homepage = "http://www.dnspython.org"; # BSD-like, check http://www.dnspython.org/LICENSE for details license = lib.licenses.free; }; diff --git a/pkgs/development/python-modules/doc8/default.nix b/pkgs/development/python-modules/doc8/default.nix index 307496cc65c..f7e620f491c 100644 --- a/pkgs/development/python-modules/doc8/default.nix +++ b/pkgs/development/python-modules/doc8/default.nix @@ -7,6 +7,7 @@ , chardet , stevedore , restructuredtext_lint +, pygments }: buildPythonPackage rec { @@ -19,7 +20,14 @@ buildPythonPackage rec { }; buildInputs = [ pbr ]; - propagatedBuildInputs = [ docutils six chardet stevedore restructuredtext_lint ]; + propagatedBuildInputs = [ + docutils + six + chardet + stevedore + restructuredtext_lint + pygments + ]; doCheck = false; diff --git a/pkgs/development/python-modules/docker-py/default.nix b/pkgs/development/python-modules/docker-py/default.nix index 84dba75e404..f7982c4a119 100644 --- a/pkgs/development/python-modules/docker-py/default.nix +++ b/pkgs/development/python-modules/docker-py/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Python library for the Docker Remote API"; - homepage = https://github.com/docker/docker-py/; + homepage = "https://github.com/docker/docker-py/"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.pmiddend ]; }; diff --git a/pkgs/development/python-modules/docker-pycreds/default.nix b/pkgs/development/python-modules/docker-pycreds/default.nix index e47196df07a..a75278d45d4 100644 --- a/pkgs/development/python-modules/docker-pycreds/default.nix +++ b/pkgs/development/python-modules/docker-pycreds/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for the docker credentials store API."; - homepage = https://github.com/shin-/dockerpy-creds; + homepage = "https://github.com/shin-/dockerpy-creds"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index 701a211a6bb..a31ba7c69c0 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -18,9 +18,7 @@ buildPythonPackage rec { sha256 = "0bkj1xfp6mnvk1i9hl5awsmwi07q6iwwsjznd7kvrx5m19i6dbnx"; }; - nativeBuildInputs = [ - pytestCheckHook - ] ++ lib.optional isPy27 mock; + nativeBuildInputs = lib.optional isPy27 mock; propagatedBuildInputs = [ paramiko @@ -29,12 +27,15 @@ buildPythonPackage rec { websocket_client ] ++ lib.optional isPy27 backports_ssl_match_hostname; + checkInputs = [ + pytestCheckHook + ]; + pytestFlagsArray = [ "tests/unit" ]; # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket disabledTests = lib.optionals stdenv.isDarwin [ "stream_response" "socket_file" ]; - # skip setuptoolsCheckPhase - doCheck = false; + dontUseSetuptoolsCheck = true; meta = with lib; { description = "An API client for docker written in Python"; diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 2f9e32f088e..5c3e517a494 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for parsing Dockerfile files"; - homepage = https://github.com/DBuildService/dockerfile-parse; + homepage = "https://github.com/DBuildService/dockerfile-parse"; license = licenses.bsd3; maintainers = with maintainers; [ leenaars ]; }; diff --git a/pkgs/development/python-modules/dockerpty/default.nix b/pkgs/development/python-modules/dockerpty/default.nix index f7a64481c66..fd9d7b4b88d 100644 --- a/pkgs/development/python-modules/dockerpty/default.nix +++ b/pkgs/development/python-modules/dockerpty/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; - homepage = https://github.com/d11wtq/dockerpty; + homepage = "https://github.com/d11wtq/dockerpty"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/docopt/default.nix b/pkgs/development/python-modules/docopt/default.nix index 61c71d87c53..135bedfc43e 100644 --- a/pkgs/development/python-modules/docopt/default.nix +++ b/pkgs/development/python-modules/docopt/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pythonic argument parser, that will make you smile"; - homepage = http://docopt.org/; + homepage = "http://docopt.org/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/docrep/default.nix b/pkgs/development/python-modules/docrep/default.nix index 8e6b00d808c..b467802b62f 100644 --- a/pkgs/development/python-modules/docrep/default.nix +++ b/pkgs/development/python-modules/docrep/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Python package for docstring repetition"; - homepage = https://github.com/Chilipp/docrep; + homepage = "https://github.com/Chilipp/docrep"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix index f3be8898760..0241fd15ad4 100644 --- a/pkgs/development/python-modules/doctest-ignore-unicode/default.nix +++ b/pkgs/development/python-modules/doctest-ignore-unicode/default.nix @@ -14,6 +14,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Add flag to ignore unicode literal prefixes in doctests"; license = with licenses; [ asl20 ]; - homepage = https://github.com/gnublade/doctest-ignore-unicode; + homepage = "https://github.com/gnublade/doctest-ignore-unicode"; }; } diff --git a/pkgs/development/python-modules/docutils/default.nix b/pkgs/development/python-modules/docutils/default.nix index e81a502742c..8c1fb3720ca 100644 --- a/pkgs/development/python-modules/docutils/default.nix +++ b/pkgs/development/python-modules/docutils/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Docutils -- Python Documentation Utilities"; - homepage = http://docutils.sourceforge.net/; + homepage = "http://docutils.sourceforge.net/"; maintainers = with lib.maintainers; [ AndersonTorres ]; }; } diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index 414e9b065c7..af811903505 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; - homepage = https://bitbucket.org/zzzeek/dogpile.cache; + homepage = "https://bitbucket.org/zzzeek/dogpile.cache"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dogpile.core/default.nix b/pkgs/development/python-modules/dogpile.core/default.nix index 622954f6144..41340cda26e 100644 --- a/pkgs/development/python-modules/dogpile.core/default.nix +++ b/pkgs/development/python-modules/dogpile.core/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A 'dogpile' lock, typically used as a component of a larger caching solution"; - homepage = https://bitbucket.org/zzzeek/dogpile.core; + homepage = "https://bitbucket.org/zzzeek/dogpile.core"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/dogtail/default.nix b/pkgs/development/python-modules/dogtail/default.nix index a12a63c46f1..44142ca9441 100644 --- a/pkgs/development/python-modules/dogtail/default.nix +++ b/pkgs/development/python-modules/dogtail/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { # sha256 = "0p5wfssvzr9w0bvhllzbbd8fnp4cca2qxcpcsc33dchrmh5n552x"; # }; src = fetchurl { - url = https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz; + url = "https://gitlab.com/dogtail/dogtail/raw/released/dogtail-0.9.10.tar.gz"; sha256 = "14sycidl8ahj3fwlhpwlpnyd43c302yqr7nqg2hj39pyj7kgk15b"; }; @@ -53,7 +53,7 @@ buildPythonPackage { meta = { description = "GUI test tool and automation framework that uses Accessibility technologies to communicate with desktop applications"; - homepage = https://gitlab.com/dogtail/dogtail; + homepage = "https://gitlab.com/dogtail/dogtail"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ jtojnar ]; }; diff --git a/pkgs/development/python-modules/dpath/default.nix b/pkgs/development/python-modules/dpath/default.nix index 3b878f7d5e4..c526d9aedc6 100644 --- a/pkgs/development/python-modules/dpath/default.nix +++ b/pkgs/development/python-modules/dpath/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/akesterson/dpath-python; + homepage = "https://github.com/akesterson/dpath-python"; license = [ licenses.mit ]; description = "A python library for accessing and searching dictionaries via /slashed/paths ala xpath"; maintainers = [ maintainers.mmlb ]; diff --git a/pkgs/development/python-modules/drf-yasg/default.nix b/pkgs/development/python-modules/drf-yasg/default.nix index 707b1e5bc6e..d1a349d79a2 100644 --- a/pkgs/development/python-modules/drf-yasg/default.nix +++ b/pkgs/development/python-modules/drf-yasg/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generation of Swagger/OpenAPI schemas for Django REST Framework"; - homepage = https://github.com/axnsan12/drf-yasg; + homepage = "https://github.com/axnsan12/drf-yasg"; maintainers = with maintainers; [ ivegotasthma ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/drms/default.nix b/pkgs/development/python-modules/drms/default.nix index 975ec8400b2..bc01b46eada 100644 --- a/pkgs/development/python-modules/drms/default.nix +++ b/pkgs/development/python-modules/drms/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Access HMI, AIA and MDI data with Python"; - homepage = https://github.com/sunpy/drms; + homepage = "https://github.com/sunpy/drms"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ds4drv/default.nix b/pkgs/development/python-modules/ds4drv/default.nix index ccc5c574689..05f54c2f906 100644 --- a/pkgs/development/python-modules/ds4drv/default.nix +++ b/pkgs/development/python-modules/ds4drv/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Userspace driver for the DualShock 4 controller"; - homepage = https://github.com/chrippa/ds4drv; + homepage = "https://github.com/chrippa/ds4drv"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/dtopt/default.nix b/pkgs/development/python-modules/dtopt/default.nix index 601ebf6d9a9..4b649cad966 100644 --- a/pkgs/development/python-modules/dtopt/default.nix +++ b/pkgs/development/python-modules/dtopt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Add options to doctest examples while they are running"; - homepage = https://pypi.python.org/pypi/dtopt; + homepage = "https://pypi.python.org/pypi/dtopt"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/dulwich/default.nix b/pkgs/development/python-modules/dulwich/default.nix index 785f37144be..01ad71883ce 100644 --- a/pkgs/development/python-modules/dulwich/default.nix +++ b/pkgs/development/python-modules/dulwich/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple Python implementation of the Git file formats and protocols"; - homepage = https://samba.org/~jelmer/dulwich/; + homepage = "https://samba.org/~jelmer/dulwich/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index f3e4e0a8b73..9150a6746a2 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy pkgs.libdynd ]; meta = with stdenv.lib; { - homepage = http://libdynd.org; + homepage = "http://libdynd.org"; license = licenses.bsd2; description = "Python exposure of dynd"; maintainers = with maintainers; [ teh ]; diff --git a/pkgs/development/python-modules/easy-thumbnails/default.nix b/pkgs/development/python-modules/easy-thumbnails/default.nix index 894363237f5..cd200149320 100644 --- a/pkgs/development/python-modules/easy-thumbnails/default.nix +++ b/pkgs/development/python-modules/easy-thumbnails/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Easy thumbnails for Django"; - homepage = https://github.com/SmileyChris/easy-thumbnails; + homepage = "https://github.com/SmileyChris/easy-thumbnails"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/easydict/default.nix b/pkgs/development/python-modules/easydict/default.nix index 4179306b8d9..d8dbb045ddc 100644 --- a/pkgs/development/python-modules/easydict/default.nix +++ b/pkgs/development/python-modules/easydict/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { docheck = false; # No tests in archive meta = { - homepage = https://github.com/makinacorpus/easydict; + homepage = "https://github.com/makinacorpus/easydict"; license = with stdenv.lib; 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 3a7046c50b3..30c03ae6e2c 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Very simple, very easy GUI programming in Python"; - homepage = https://github.com/robertlugg/easygui; + homepage = "https://github.com/robertlugg/easygui"; license = licenses.bsd3; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index 32acb1213a8..41a4c1a7a2a 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Easy to use python subprocess interface"; - homepage = https://github.com/ponty/EasyProcess; + homepage = "https://github.com/ponty/EasyProcess"; license = licenses.bsdOriginal; maintainers = with maintainers; [ layus ]; }; diff --git a/pkgs/development/python-modules/easysnmp/default.nix b/pkgs/development/python-modules/easysnmp/default.nix index 2602fba7713..d5c69d4c7e9 100644 --- a/pkgs/development/python-modules/easysnmp/default.nix +++ b/pkgs/development/python-modules/easysnmp/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "A blazingly fast and Pythonic SNMP library based on the official Net-SNMP bindings"; - homepage = https://easysnmp.readthedocs.io/en/latest/; + homepage = "https://easysnmp.readthedocs.io/en/latest/"; license = licenses.bsd3; maintainers = with maintainers; [ WhittlesJr ]; }; diff --git a/pkgs/development/python-modules/easywatch/default.nix b/pkgs/development/python-modules/easywatch/default.nix index 96301996fe8..a56ffb95281 100644 --- a/pkgs/development/python-modules/easywatch/default.nix +++ b/pkgs/development/python-modules/easywatch/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Dead-simple way to watch a directory"; - homepage = https://github.com/Ceasar/easywatch; + homepage = "https://github.com/Ceasar/easywatch"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/development/python-modules/ecpy/default.nix b/pkgs/development/python-modules/ecpy/default.nix index 62111721ad1..c6109d5c084 100644 --- a/pkgs/development/python-modules/ecpy/default.nix +++ b/pkgs/development/python-modules/ecpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Pyhton Elliptic Curve Library"; - homepage = https://github.com/ubinity/ECPy; + homepage = "https://github.com/ubinity/ECPy"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/ed25519/default.nix b/pkgs/development/python-modules/ed25519/default.nix index cd3c98e9cce..27ebc6a0ff2 100644 --- a/pkgs/development/python-modules/ed25519/default.nix +++ b/pkgs/development/python-modules/ed25519/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Ed25519 public-key signatures"; - homepage = https://github.com/warner/python-ed25519; + homepage = "https://github.com/warner/python-ed25519"; license = licenses.mit; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/editorconfig/default.nix b/pkgs/development/python-modules/editorconfig/default.nix index 28eff473199..ac3845bb667 100644 --- a/pkgs/development/python-modules/editorconfig/default.nix +++ b/pkgs/development/python-modules/editorconfig/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://editorconfig.org; + homepage = "https://editorconfig.org"; description = "EditorConfig File Locator and Interpreter for Python"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix index 1ad5ea1ab3b..0f42ddcc799 100644 --- a/pkgs/development/python-modules/edward/default.nix +++ b/pkgs/development/python-modules/edward/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Probabilistic programming language using Tensorflow"; - homepage = https://github.com/blei-lab/edward; + homepage = "https://github.com/blei-lab/edward"; license = licenses.asl20; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/effect/default.nix b/pkgs/development/python-modules/effect/default.nix index fec5518f0e8..67537dd1f48 100644 --- a/pkgs/development/python-modules/effect/default.nix +++ b/pkgs/development/python-modules/effect/default.nix @@ -1,33 +1,40 @@ { buildPythonPackage , fetchPypi , lib +, isPy3k , six , attrs , pytest , testtools }: + buildPythonPackage rec { version = "1.1.0"; pname = "effect"; + disabled = (!isPy3k); src = fetchPypi { inherit pname version; sha256 = "7affb603707c648b07b11781ebb793a4b9aee8acf1ac5764c3ed2112adf0c9ea"; }; + checkInputs = [ pytest testtools ]; + propagatedBuildInputs = [ six attrs ]; + checkPhase = '' pytest ''; + meta = with lib; { description = "Pure effects for Python"; - homepage = https://github.com/python-effect/effect; + homepage = "https://github.com/python-effect/effect"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index c837e46066f..d10c1a0be65 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tool which computes a dependency graph between active Python eggs"; - homepage = http://thomas-lotze.de/en/software/eggdeps/; + homepage = "http://thomas-lotze.de/en/software/eggdeps/"; license = licenses.zpl20; }; diff --git a/pkgs/development/python-modules/elasticsearch-dsl/default.nix b/pkgs/development/python-modules/elasticsearch-dsl/default.nix index 382a9965293..deef21985c6 100644 --- a/pkgs/development/python-modules/elasticsearch-dsl/default.nix +++ b/pkgs/development/python-modules/elasticsearch-dsl/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { writing and running queries against Elasticsearch. It is built on top of the official low-level client (elasticsearch-py). ''; - homepage = https://github.com/elasticsearch/elasticsearch-dsl-py; + homepage = "https://github.com/elasticsearch/elasticsearch-dsl-py"; license = licenses.asl20; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/elasticsearch/default.nix b/pkgs/development/python-modules/elasticsearch/default.nix index ccef465eca1..ce8c0dc77a0 100644 --- a/pkgs/development/python-modules/elasticsearch/default.nix +++ b/pkgs/development/python-modules/elasticsearch/default.nix @@ -22,7 +22,7 @@ buildPythonPackage (rec { meta = with stdenv.lib; { description = "Official low-level client for Elasticsearch"; - homepage = https://github.com/elasticsearch/elasticsearch-py; + homepage = "https://github.com/elasticsearch/elasticsearch-py"; license = licenses.asl20; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/elementpath/default.nix b/pkgs/development/python-modules/elementpath/default.nix index 903e74e3278..c8b1a376f26 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 = "1.4.2"; + version = "1.4.3"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "0dd5si2ml3srn8snp7x3y4xjamssmnp05h41aqazzd9ykwmhh919"; + sha256 = "18gqqdsrdlgwn93xnxy6ifxrk7ppaimijinflphxia2qcm8czkgf"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/pkgs/development/python-modules/email-validator/default.nix b/pkgs/development/python-modules/email-validator/default.nix index 99859ac1517..3ad0c34685b 100644 --- a/pkgs/development/python-modules/email-validator/default.nix +++ b/pkgs/development/python-modules/email-validator/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "A robust email syntax and deliverability validation library for Python 2.x/3.x."; - homepage = https://github.com/JoshData/python-email-validator; + homepage = "https://github.com/JoshData/python-email-validator"; license = licenses.cc0; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/emailthreads/default.nix b/pkgs/development/python-modules/emailthreads/default.nix index 0e5db1de3e9..36553daff55 100644 --- a/pkgs/development/python-modules/emailthreads/default.nix +++ b/pkgs/development/python-modules/emailthreads/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/emersion/python-emailthreads; + homepage = "https://github.com/emersion/python-emailthreads"; description = "Python library to parse and format email threads"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 5f3d14e73c7..7e9dae53bbc 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Emoji for Python"; - homepage = https://pypi.python.org/pypi/emoji/; + homepage = "https://pypi.python.org/pypi/emoji/"; license = licenses.bsd3; maintainers = with maintainers; [ joachifm ]; }; diff --git a/pkgs/development/python-modules/entrance/default.nix b/pkgs/development/python-modules/entrance/default.nix index 67005d577cd..8dc28f823e1 100644 --- a/pkgs/development/python-modules/entrance/default.nix +++ b/pkgs/development/python-modules/entrance/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A server framework for web apps with an Elm frontend"; - homepage = https://github.com/ensoft/entrance; + homepage = "https://github.com/ensoft/entrance"; license = licenses.mit; maintainers = with maintainers; [ simonchatts ]; }; diff --git a/pkgs/development/python-modules/entrypoints/default.nix b/pkgs/development/python-modules/entrypoints/default.nix index 77d20876fe1..a26d6ede890 100644 --- a/pkgs/development/python-modules/entrypoints/default.nix +++ b/pkgs/development/python-modules/entrypoints/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Discover and load entry points from installed packages"; - homepage = https://github.com/takluyver/entrypoints; + homepage = "https://github.com/takluyver/entrypoints"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/enum-compat/default.nix b/pkgs/development/python-modules/enum-compat/default.nix index e95eb089bc4..42a4b63479c 100644 --- a/pkgs/development/python-modules/enum-compat/default.nix +++ b/pkgs/development/python-modules/enum-compat/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ enum34 ]; meta = with lib; { - homepage = https://github.com/jstasiak/enum-compat; + homepage = "https://github.com/jstasiak/enum-compat"; description = "enum/enum34 compatibility package"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/enum/default.nix b/pkgs/development/python-modules/enum/default.nix index 8aec63689d9..92d3faa5989 100644 --- a/pkgs/development/python-modules/enum/default.nix +++ b/pkgs/development/python-modules/enum/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = !isPyPy; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/enum/; + homepage = "https://pypi.python.org/pypi/enum/"; description = "Robust enumerated type support in Python"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/enum34/default.nix b/pkgs/development/python-modules/enum34/default.nix index a5175eba49d..9d9af3c6447 100644 --- a/pkgs/development/python-modules/enum34/default.nix +++ b/pkgs/development/python-modules/enum34/default.nix @@ -19,7 +19,7 @@ if pythonAtLeast "3.4" then null else buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/enum34; + homepage = "https://pypi.python.org/pypi/enum34"; description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index 54dcfe9e4b5..ba3e6a0c636 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'"; - homepage = https://github.com/enthought/envisage; + homepage = "https://github.com/enthought/envisage"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; diff --git a/pkgs/development/python-modules/envs/default.nix b/pkgs/development/python-modules/envs/default.nix index 600cb3b0320..133e99912cb 100644 --- a/pkgs/development/python-modules/envs/default.nix +++ b/pkgs/development/python-modules/envs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy access to environment variables from Python"; - homepage = https://github.com/capless/envs; + homepage = "https://github.com/capless/envs"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/enzyme/default.nix b/pkgs/development/python-modules/enzyme/default.nix index d776bfd62aa..110575464cb 100644 --- a/pkgs/development/python-modules/enzyme/default.nix +++ b/pkgs/development/python-modules/enzyme/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = { - homepage = https://github.com/Diaoul/enzyme; + homepage = "https://github.com/Diaoul/enzyme"; license = with stdenv.lib; licenses.asl20; description = "Python video metadata parser"; }; diff --git a/pkgs/development/python-modules/ephem/default.nix b/pkgs/development/python-modules/ephem/default.nix index 2b7815c6978..87d719a7af3 100644 --- a/pkgs/development/python-modules/ephem/default.nix +++ b/pkgs/development/python-modules/ephem/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Compute positions of the planets and stars"; - homepage = https://pypi.python.org/pypi/ephem/; + homepage = "https://pypi.python.org/pypi/ephem/"; license = licenses.lgpl3; maintainers = with maintainers; [ chrisrosset ]; }; diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index 6b3909a5b45..18a7a9ab27f 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "eradicate removes commented-out code from Python files."; - homepage = https://github.com/myint/eradicate; + homepage = "https://github.com/myint/eradicate"; license = [ licenses.mit ]; maintainers = [ maintainers.mmlb ]; diff --git a/pkgs/development/python-modules/etcd/default.nix b/pkgs/development/python-modules/etcd/default.nix index 1e6e1e70944..7a122f1b616 100644 --- a/pkgs/development/python-modules/etcd/default.nix +++ b/pkgs/development/python-modules/etcd/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python etcd client that just works"; - homepage = https://github.com/dsoprea/PythonEtcdClient; + homepage = "https://github.com/dsoprea/PythonEtcdClient"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/etesync/default.nix b/pkgs/development/python-modules/etesync/default.nix index 4edf0f71cf2..47305d89540 100644 --- a/pkgs/development/python-modules/etesync/default.nix +++ b/pkgs/development/python-modules/etesync/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "etesync"; - version = "0.10.0"; + version = "0.11.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "09sdqviv9jyd013gxjjcw6vd4si860304haylvw4dp9kljsd94qa"; + sha256 = "0yads0s84z41hf003qk5i8222fi7096whzwfp48kf369gchp39kc"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/eth-hash/default.nix b/pkgs/development/python-modules/eth-hash/default.nix index ce5fce1b1cb..ad58ee3ae2f 100644 --- a/pkgs/development/python-modules/eth-hash/default.nix +++ b/pkgs/development/python-modules/eth-hash/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "The Ethereum hashing function keccak256"; - homepage = https://github.com/ethereum/eth-hash; + homepage = "https://github.com/ethereum/eth-hash"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/eth-typing/default.nix b/pkgs/development/python-modules/eth-typing/default.nix index 437d2d9ce16..87aa914b59f 100644 --- a/pkgs/development/python-modules/eth-typing/default.nix +++ b/pkgs/development/python-modules/eth-typing/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Common type annotations for Ethereum Python packages"; - homepage = https://github.com/ethereum/eth-typing; + homepage = "https://github.com/ethereum/eth-typing"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/eth-utils/default.nix b/pkgs/development/python-modules/eth-utils/default.nix index 1c373c64e89..25f2ebd5541 100644 --- a/pkgs/development/python-modules/eth-utils/default.nix +++ b/pkgs/development/python-modules/eth-utils/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Common utility functions for codebases which interact with ethereum"; - homepage = https://github.com/ethereum/eth-utils; + homepage = "https://github.com/ethereum/eth-utils"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index 1711131be2d..cef6c27e59c 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provides bindings to the generic input event interface in Linux"; - homepage = https://pythonhosted.org/evdev; + homepage = "https://pythonhosted.org/evdev"; license = licenses.bsd3; maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 0436f3cbdb1..9a006c08772 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ dnspython greenlet monotonic six ] ++ lib.optional (pythonOlder "3.4") enum34; meta = with lib; { - homepage = https://pypi.python.org/pypi/eventlet/; + homepage = "https://pypi.python.org/pypi/eventlet/"; description = "A concurrent networking library for Python"; }; diff --git a/pkgs/development/python-modules/events/default.nix b/pkgs/development/python-modules/events/default.nix index 93c2165ce01..21c459d62b9 100644 --- a/pkgs/development/python-modules/events/default.nix +++ b/pkgs/development/python-modules/events/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://events.readthedocs.org; + homepage = "https://events.readthedocs.org"; description = "Bringing the elegance of C# EventHanlder to Python"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix index 189f282b02d..55b60315c50 100644 --- a/pkgs/development/python-modules/evernote/default.nix +++ b/pkgs/development/python-modules/evernote/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Evernote SDK for Python"; - homepage = http://dev.evernote.com; + homepage = "http://dev.evernote.com"; license = licenses.asl20; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/ewmh/default.nix b/pkgs/development/python-modules/ewmh/default.nix index a24d049fc22..c9ac68ae74d 100644 --- a/pkgs/development/python-modules/ewmh/default.nix +++ b/pkgs/development/python-modules/ewmh/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/parkouss/pyewmh; + homepage = "https://github.com/parkouss/pyewmh"; description = "An implementation of EWMH (Extended Window Manager Hints), based on Xlib"; license = lib.licenses.lgpl3Plus; maintainers = with lib.maintainers; [ bandresen ]; diff --git a/pkgs/development/python-modules/executor/default.nix b/pkgs/development/python-modules/executor/default.nix index 8c71d63ef5c..8d9b379187b 100644 --- a/pkgs/development/python-modules/executor/default.nix +++ b/pkgs/development/python-modules/executor/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Programmer friendly subprocess wrapper"; - homepage = https://github.com/xolox/python-executor; + homepage = "https://github.com/xolox/python-executor"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/eyed3/default.nix b/pkgs/development/python-modules/eyed3/default.nix index 47602afa07d..ee0c426bded 100644 --- a/pkgs/development/python-modules/eyed3/default.nix +++ b/pkgs/development/python-modules/eyed3/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python module and command line program for processing ID3 tags"; - homepage = https://eyed3.nicfit.net/; + homepage = "https://eyed3.nicfit.net/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/face/default.nix b/pkgs/development/python-modules/face/default.nix index 948236b3f01..34d91ceda98 100644 --- a/pkgs/development/python-modules/face/default.nix +++ b/pkgs/development/python-modules/face/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/mahmoud/face; + homepage = "https://github.com/mahmoud/face"; description = "A command-line interface parser and framework"; longDescription = '' A command-line interface parser and framework, friendly for diff --git a/pkgs/development/python-modules/face_recognition/default.nix b/pkgs/development/python-modules/face_recognition/default.nix index 93502a296dc..2b26fa735e6 100644 --- a/pkgs/development/python-modules/face_recognition/default.nix +++ b/pkgs/development/python-modules/face_recognition/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://github.com/ageitgey/face_recognition; + homepage = "https://github.com/ageitgey/face_recognition"; maintainers = with maintainers; [ ma27 ]; description = "The world's simplest facial recognition api for Python and the command line"; }; diff --git a/pkgs/development/python-modules/face_recognition_models/default.nix b/pkgs/development/python-modules/face_recognition_models/default.nix index 12587e6792d..427ad364dde 100644 --- a/pkgs/development/python-modules/face_recognition_models/default.nix +++ b/pkgs/development/python-modules/face_recognition_models/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; meta = with stdenv.lib; { - homepage = https://github.com/ageitgey/face_recognition_models; + homepage = "https://github.com/ageitgey/face_recognition_models"; license = licenses.cc0; maintainers = with maintainers; [ ma27 ]; description = "Trained models for the face_recognition python library"; diff --git a/pkgs/development/python-modules/facebook-sdk/default.nix b/pkgs/development/python-modules/facebook-sdk/default.nix index d74c6e57470..e9300edab09 100644 --- a/pkgs/development/python-modules/facebook-sdk/default.nix +++ b/pkgs/development/python-modules/facebook-sdk/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with pkgs.lib; { description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK"; - homepage = https://github.com/pythonforfacebook/facebook-sdk; + homepage = "https://github.com/pythonforfacebook/facebook-sdk"; license = licenses.asl20 ; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/facedancer/default.nix b/pkgs/development/python-modules/facedancer/default.nix index 47147bdb01b..0aabe704f04 100644 --- a/pkgs/development/python-modules/facedancer/default.nix +++ b/pkgs/development/python-modules/facedancer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "library for emulating usb devices"; - homepage = https://greatscottgadgets.com/greatfet/; + homepage = "https://greatscottgadgets.com/greatfet/"; license = licenses.bsd3; maintainers = with maintainers; [ mog ]; }; diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index becf1cc1972..92e889564af 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python package to create factories for complex objects"; - homepage = https://github.com/rbarrois/factory_boy; + homepage = "https://github.com/rbarrois/factory_boy"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/fake_factory/default.nix b/pkgs/development/python-modules/fake_factory/default.nix index f17af02ee0f..ab947756fa9 100644 --- a/pkgs/development/python-modules/fake_factory/default.nix +++ b/pkgs/development/python-modules/fake_factory/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python package that generates fake data for you"; - homepage = https://pypi.python.org/pypi/fake-factory; + homepage = "https://pypi.python.org/pypi/fake-factory"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix index 0d8c77f557f..89415237714 100644 --- a/pkgs/development/python-modules/faker/default.nix +++ b/pkgs/development/python-modules/faker/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for generating fake user data"; - homepage = http://faker.rtfd.org; + homepage = "http://faker.rtfd.org"; license = licenses.mit; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index daec9218a1d..0ed9d42c3b0 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchurl , uvicorn , starlette , pydantic @@ -12,11 +11,12 @@ , passlib , aiosqlite , peewee +, flask }: buildPythonPackage rec { pname = "fastapi"; - version = "0.49.0"; + version = "0.54.0"; format = "flit"; disabled = !isPy3k; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tiangolo"; repo = "fastapi"; rev = version; - sha256 = "1dw5f2xvn0fqqsy29ypba8v3444cy7dvc7gkpmnhshky0rmfni3n"; + sha256 = "17bicrpr801z71wrn9iimvh7qk6iwyxvr89ialf0s2rxxa2s0yb5"; }; propagatedBuildInputs = [ @@ -40,10 +40,16 @@ buildPythonPackage rec { passlib aiosqlite peewee + flask ]; + # test_default_response_class.py: requires orjson, which requires rust toolchain + # test_custom_response/test_tutorial001b.py: requires orjson + # tests/test_tutorial/test_sql_databases/test_testing_databases.py: just broken, don't know why checkPhase = '' - pytest --ignore=tests/test_default_response_class.py + pytest --ignore=tests/test_default_response_class.py \ + --ignore=tests/test_tutorial/test_custom_response/test_tutorial001b.py \ + --ignore=tests/test_tutorial/test_sql_databases/test_testing_databases.py ''; meta = with lib; { diff --git a/pkgs/development/python-modules/fastcache/default.nix b/pkgs/development/python-modules/fastcache/default.nix index f50eb8f53bb..100af5244b5 100644 --- a/pkgs/development/python-modules/fastcache/default.nix +++ b/pkgs/development/python-modules/fastcache/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "C implementation of Python3 lru_cache for Python 2 and 3"; - homepage = https://github.com/pbrady/fastcache; + homepage = "https://github.com/pbrady/fastcache"; license = licenses.mit; maintainers = [ maintainers.bhipple ]; }; diff --git a/pkgs/development/python-modules/fasteners/default.nix b/pkgs/development/python-modules/fasteners/default.nix index 50a6dbf40df..75719a78fb2 100644 --- a/pkgs/development/python-modules/fasteners/default.nix +++ b/pkgs/development/python-modules/fasteners/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python package that provides useful locks"; - homepage = https://github.com/harlowja/fasteners; + homepage = "https://github.com/harlowja/fasteners"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/fastentrypoints/default.nix b/pkgs/development/python-modules/fastentrypoints/default.nix index e2e0a4d4d92..08e2e384ff9 100644 --- a/pkgs/development/python-modules/fastentrypoints/default.nix +++ b/pkgs/development/python-modules/fastentrypoints/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Makes entry_points specified in setup.py load more quickly"; - homepage = https://github.com/ninjaaron/fast-entry_points; + homepage = "https://github.com/ninjaaron/fast-entry_points"; license = licenses.bsd2; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/development/python-modules/fastimport/default.nix b/pkgs/development/python-modules/fastimport/default.nix index 02c1ea60e61..c1fab50c06e 100644 --- a/pkgs/development/python-modules/fastimport/default.nix +++ b/pkgs/development/python-modules/fastimport/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://launchpad.net/python-fastimport; + homepage = "https://launchpad.net/python-fastimport"; description = "VCS fastimport/fastexport parser"; maintainers = with maintainers; [ koral ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/fastpair/default.nix b/pkgs/development/python-modules/fastpair/default.nix index e9e6316bb61..edb45eb0687 100644 --- a/pkgs/development/python-modules/fastpair/default.nix +++ b/pkgs/development/python-modules/fastpair/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/carsonfarmer/fastpair; + homepage = "https://github.com/carsonfarmer/fastpair"; description = "Data-structure for the dynamic closest-pair problem"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/development/python-modules/fastparquet/default.nix b/pkgs/development/python-modules/fastparquet/default.nix index 1cf62428a0f..e8ad6e13644 100644 --- a/pkgs/development/python-modules/fastparquet/default.nix +++ b/pkgs/development/python-modules/fastparquet/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python implementation of the parquet format"; - homepage = https://github.com/dask/fastparquet; + homepage = "https://github.com/dask/fastparquet"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/fastpbkdf2/default.nix b/pkgs/development/python-modules/fastpbkdf2/default.nix index 63a7565cf55..568d894805f 100644 --- a/pkgs/development/python-modules/fastpbkdf2/default.nix +++ b/pkgs/development/python-modules/fastpbkdf2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi six ]; meta = with stdenv.lib; { - homepage = https://github.com/Ayrx/python-fastpbkdf2; + homepage = "https://github.com/Ayrx/python-fastpbkdf2"; description = "Python bindings for fastpbkdf2"; license = licenses.bsd3; maintainers = with maintainers; [ jqueiroz ]; diff --git a/pkgs/development/python-modules/fastrlock/default.nix b/pkgs/development/python-modules/fastrlock/default.nix index 9b553e65db6..8271bec090b 100644 --- a/pkgs/development/python-modules/fastrlock/default.nix +++ b/pkgs/development/python-modules/fastrlock/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/scoder/fastrlock; + homepage = "https://github.com/scoder/fastrlock"; description = "A fast RLock implementation for CPython"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 9f1a8b18d7b..050b3873a00 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module for text classification and representation learning"; - homepage = https://fasttext.cc/; + homepage = "https://fasttext.cc/"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; }; diff --git a/pkgs/development/python-modules/faulthandler/default.nix b/pkgs/development/python-modules/faulthandler/default.nix index d69c320ccaa..f1588690a77 100644 --- a/pkgs/development/python-modules/faulthandler/default.nix +++ b/pkgs/development/python-modules/faulthandler/default.nix @@ -1,18 +1,27 @@ -{ stdenv, fetchPypi, buildPythonPackage }: +{ lib, fetchPypi, buildPythonPackage }: buildPythonPackage rec { pname = "faulthandler"; - version = "3.1"; + version = "3.2"; src = fetchPypi { inherit pname version; - sha256 = "83301ffab03c86b291677b64b5cec7026f412cbda5ebd27e4cb3338452c40021"; + sha256 = "08ybjjdrfp01syckksxzivqhn6b0yhmc17kdxh77h0lg6rvgvk8y"; }; - meta = { + # This may be papering over a real failure where the env var activation route + # for faulthandler does not appear to work. That said, since all other tests + # pass and since this module is python 2 only (it was upstreamed into the + # interpreter itself as of python 3.3 and is disabled ) this just disables the + # test to fix the build. From inspecting Hydra logs and git bisect, the commit + # that broke it is this one: + # https://github.com/NixOS/nixpkgs/commit/90be4c2c7875c9487508d95b5c638d97e2903ada + patches = [ ./disable-env-test.patch ]; + + meta = with lib; { description = "Dump the Python traceback"; - license = stdenv.lib.licenses.bsd2; - maintainers = with stdenv.lib.maintainers; [ sauyon ]; - homepage = https://faulthandler.readthedocs.io/; + license = licenses.bsd2; + maintainers = with maintainers; [ sauyon ]; + homepage = "https://faulthandler.readthedocs.io/"; }; } diff --git a/pkgs/development/python-modules/faulthandler/disable-env-test.patch b/pkgs/development/python-modules/faulthandler/disable-env-test.patch new file mode 100644 index 00000000000..5824652f617 --- /dev/null +++ b/pkgs/development/python-modules/faulthandler/disable-env-test.patch @@ -0,0 +1,13 @@ +diff --git a/tests.py b/tests.py +index e5a2811..16e7a0f 100644 +--- a/tests.py ++++ b/tests.py +@@ -394,7 +394,7 @@ class FaultHandlerTests(unittest.TestCase): + print(faulthandler.is_enabled()) + """, + env=dict(os.environ, PYTHONFAULTHANDLER='x')) +- self.assertEqual(output, ["True"]) ++ #self.assertEqual(output, ["True"]) + self.assertEqual(exitcode, 0) + + output, exitcode = self.get_output(""" diff --git a/pkgs/development/python-modules/favicon/default.nix b/pkgs/development/python-modules/favicon/default.nix index 16eac939e1e..5af3be420b0 100644 --- a/pkgs/development/python-modules/favicon/default.nix +++ b/pkgs/development/python-modules/favicon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Find a website's favicon"; - homepage = https://github.com/scottwernervt/favicon; + homepage = "https://github.com/scottwernervt/favicon"; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix index 25aae4591eb..32a6a1d60ca 100644 --- a/pkgs/development/python-modules/fb-re2/default.nix +++ b/pkgs/development/python-modules/fb-re2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Python wrapper for Google's RE2"; - homepage = https://github.com/facebook/pyre2; + homepage = "https://github.com/facebook/pyre2"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ivan ]; }; diff --git a/pkgs/development/python-modules/fdint/default.nix b/pkgs/development/python-modules/fdint/default.nix index 869e26d675a..68c3b039a47 100644 --- a/pkgs/development/python-modules/fdint/default.nix +++ b/pkgs/development/python-modules/fdint/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/scott-maddox/fdint; + homepage = "https://github.com/scott-maddox/fdint"; description = "A free, open-source python package for quickly and precisely approximating Fermi-Dirac integrals"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/feedgen/default.nix b/pkgs/development/python-modules/feedgen/default.nix index 4c1eb10c6b1..dbc303f4302 100644 --- a/pkgs/development/python-modules/feedgen/default.nix +++ b/pkgs/development/python-modules/feedgen/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module to generate ATOM feeds, RSS feeds and Podcasts."; - downloadPage = https://github.com/lkiesow/python-feedgen/releases; - homepage = https://github.com/lkiesow/python-feedgen; + downloadPage = "https://github.com/lkiesow/python-feedgen/releases"; + homepage = "https://github.com/lkiesow/python-feedgen"; license = with licenses; [ bsd2 lgpl3 ]; maintainers = with maintainers; [ casey ]; }; diff --git a/pkgs/development/python-modules/feedgenerator/default.nix b/pkgs/development/python-modules/feedgenerator/default.nix index c8ea6df7ae0..ead11aa38be 100644 --- a/pkgs/development/python-modules/feedgenerator/default.nix +++ b/pkgs/development/python-modules/feedgenerator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Standalone version of django.utils.feedgenerator, compatible with Py3k"; - homepage = https://github.com/dmdm/feedgenerator-py3k.git; + homepage = "https://github.com/dmdm/feedgenerator-py3k.git"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/filebrowser_safe/default.nix b/pkgs/development/python-modules/filebrowser_safe/default.nix index d0d324fb977..014e3b9810a 100644 --- a/pkgs/development/python-modules/filebrowser_safe/default.nix +++ b/pkgs/development/python-modules/filebrowser_safe/default.nix @@ -30,8 +30,8 @@ buildPythonPackage rec { with Django 1.1 - filebrowser_safe was therefore created to address these specific issues. ''; - homepage = https://github.com/stephenmcd/filebrowser-safe; - downloadPage = https://pypi.python.org/pypi/filebrowser_safe/; + homepage = "https://github.com/stephenmcd/filebrowser-safe"; + downloadPage = "https://pypi.python.org/pypi/filebrowser_safe/"; license = licenses.free; maintainers = with maintainers; [ prikhi ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix index 3592a1f28c7..9729c1543cb 100644 --- a/pkgs/development/python-modules/filelock/default.nix +++ b/pkgs/development/python-modules/filelock/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/benediktschmitt/py-filelock; + homepage = "https://github.com/benediktschmitt/py-filelock"; description = "A platform independent file lock for Python"; license = licenses.unlicense; maintainers = with maintainers; [ hyphon81 ]; diff --git a/pkgs/development/python-modules/filemagic/default.nix b/pkgs/development/python-modules/filemagic/default.nix index cbb5ca56fed..2feda678f74 100644 --- a/pkgs/development/python-modules/filemagic/default.nix +++ b/pkgs/development/python-modules/filemagic/default.nix @@ -22,7 +22,7 @@ buildPythonPackage { meta = with lib; { description = "File type identification using libmagic"; - homepage = https://github.com/aliles/filemagic; + homepage = "https://github.com/aliles/filemagic"; license = licenses.asl20; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index 34f7ac4e4a9..40bbc688e20 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { inherit pname version; - sha256 = "17a3b885f19034da29640b083d767e0f13c2dcb5dcc267945c8b6e5a5a9013c7"; + sha256 = "10985zfx90m527binx3fxvm4nsqmlwf0jj8j8mpbxb8wj8ivkllr"; }; checkPhase = '' @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Infer file type and MIME type of any file/buffer"; - homepage = https://github.com/h2non/filetype.py; + homepage = "https://github.com/h2non/filetype.py"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/filterpy/default.nix b/pkgs/development/python-modules/filterpy/default.nix index 076a3a72b89..bae362d3a4a 100644 --- a/pkgs/development/python-modules/filterpy/default.nix +++ b/pkgs/development/python-modules/filterpy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/rlabbe/filterpy; + homepage = "https://github.com/rlabbe/filterpy"; description = "Kalman filtering and optimal estimation library"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/fints/default.nix b/pkgs/development/python-modules/fints/default.nix index d3f796ab950..10915e766ac 100644 --- a/pkgs/development/python-modules/fints/default.nix +++ b/pkgs/development/python-modules/fints/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/raphaelm/python-fints/; + homepage = "https://github.com/raphaelm/python-fints/"; description = "Pure-python FinTS (formerly known as HBCI) implementation"; license = licenses.lgpl3; maintainers = with maintainers; [ elohmeier ]; diff --git a/pkgs/development/python-modules/fipy/default.nix b/pkgs/development/python-modules/fipy/default.nix index 7fbf14cf7de..d54379d0683 100644 --- a/pkgs/development/python-modules/fipy/default.nix +++ b/pkgs/development/python-modules/fipy/default.nix @@ -14,6 +14,8 @@ , gmsh , python , stdenv +, openssh +, fetchurl }: let @@ -21,12 +23,11 @@ let in buildPythonPackage rec { pname = "fipy"; - version = "3.3"; + version = "3.4.1"; - src = fetchPypi { - pname = "FiPy"; - inherit version; - sha256 = "11agpg3d6yrns8igkpml1mxy3mkqkjq2yrw1mw12y07dkk12ii19"; + src = fetchurl { + url = "https://github.com/usnistgov/fipy/releases/download/${version}/FiPy-${version}.tar.gz"; + sha256 = "0078yg96fknqhywn1v26ryc5z47c0j0c1qwz6p8wsjn0wmzggaqk"; }; propagatedBuildInputs = [ @@ -38,16 +39,18 @@ in mpi4py future scikit-fmm + openssh ] ++ lib.optionals isPy27 [ pysparse ] ++ not_darwin_inputs; checkInputs = not_darwin_inputs; checkPhase = '' + export OMPI_MCA_plm_rsh_agent=${openssh}/bin/ssh ${python.interpreter} setup.py test --modules ''; meta = with lib; { - homepage = https://www.ctcms.nist.gov/fipy/; + homepage = "https://www.ctcms.nist.gov/fipy/"; description = "A Finite Volume PDE Solver Using Python"; license = licenses.free; maintainers = with maintainers; [ costrouc wd15 ]; diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index 7af8d29fce7..0f0f0fd69ee 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "fire"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "google"; repo = "python-fire"; rev = "v${version}"; - sha256 = "1r6cmihafd7mb6j3mvgk251my6ckb0sqqj1l2ny2azklv175b38a"; + sha256 = "1jwf1qv9xmr1c8nyvwqn02329vzyh9py4slx13n55ms8h1n998nr"; }; propagatedBuildInputs = [ six termcolor ] ++ stdenv.lib.optional isPy27 enum34; diff --git a/pkgs/development/python-modules/firetv/default.nix b/pkgs/development/python-modules/firetv/default.nix index 21e44bb4581..8cbcc354c83 100644 --- a/pkgs/development/python-modules/firetv/default.nix +++ b/pkgs/development/python-modules/firetv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Communicate with an Amazon Fire TV device via ADB over a network"; - homepage = https://github.com/happyleavesaoc/python-firetv/; + homepage = "https://github.com/happyleavesaoc/python-firetv/"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/first/default.nix b/pkgs/development/python-modules/first/default.nix index de7342d67ca..6956addb29f 100644 --- a/pkgs/development/python-modules/first/default.nix +++ b/pkgs/development/python-modules/first/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The function you always missed in Python"; - homepage = https://github.com/hynek/first/; + homepage = "https://github.com/hynek/first/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/fitbit/default.nix b/pkgs/development/python-modules/fitbit/default.nix index ef4859a749a..46c6ac78a6c 100644 --- a/pkgs/development/python-modules/fitbit/default.nix +++ b/pkgs/development/python-modules/fitbit/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fitbit API Python Client Implementation"; license = licenses.asl20; - homepage = https://github.com/orcasgit/python-fitbit; + homepage = "https://github.com/orcasgit/python-fitbit"; maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/development/python-modules/flake8-blind-except/default.nix b/pkgs/development/python-modules/flake8-blind-except/default.nix index f999bab8932..1c2dbe5f52c 100644 --- a/pkgs/development/python-modules/flake8-blind-except/default.nix +++ b/pkgs/development/python-modules/flake8-blind-except/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "16g58mkr3fcn2vlfhp3rlahj93qswc7jd5qrqp748mc26dk3b8xc"; }; meta = { - homepage = https://github.com/elijahandrews/flake8-blind-except; + homepage = "https://github.com/elijahandrews/flake8-blind-except"; description = "A flake8 extension that checks for blind except: statements"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/flake8-debugger/default.nix b/pkgs/development/python-modules/flake8-debugger/default.nix index e6ac743396a..1f41c0a6849 100644 --- a/pkgs/development/python-modules/flake8-debugger/default.nix +++ b/pkgs/development/python-modules/flake8-debugger/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/jbkahn/flake8-debugger; + homepage = "https://github.com/jbkahn/flake8-debugger"; description = "ipdb/pdb statement checker plugin for flake8"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix index 8099f3318e8..25aa995f912 100644 --- a/pkgs/development/python-modules/flake8-import-order/default.nix +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flake8 and pylama plugin that checks the ordering of import statements"; - homepage = https://github.com/PyCQA/flake8-import-order; + homepage = "https://github.com/PyCQA/flake8-import-order"; license = with licenses; [ lgpl3 mit ]; }; } diff --git a/pkgs/development/python-modules/flake8-polyfill/default.nix b/pkgs/development/python-modules/flake8-polyfill/default.nix index 070e6997010..050a6d4f9c8 100644 --- a/pkgs/development/python-modules/flake8-polyfill/default.nix +++ b/pkgs/development/python-modules/flake8-polyfill/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://gitlab.com/pycqa/flake8-polyfill; + homepage = "https://gitlab.com/pycqa/flake8-polyfill"; description = "Polyfill package for Flake8 plugins"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index e76b7cdf269..c6cf1bf2ab1 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Code checking using pep8 and pyflakes"; - homepage = https://pypi.python.org/pypi/flake8; + homepage = "https://pypi.python.org/pypi/flake8"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index c4e803245d5..4fe79864791 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/box/flaky; + homepage = "https://github.com/box/flaky"; description = "Plugin for nose or py.test that automatically reruns flaky tests"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix index 3a2c1fe5e9b..5803d8ea2c7 100644 --- a/pkgs/development/python-modules/flask-admin/default.nix +++ b/pkgs/development/python-modules/flask-admin/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple and extensible admin interface framework for Flask"; - homepage = https://github.com/flask-admin/flask-admin/; + homepage = "https://github.com/flask-admin/flask-admin/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix index 8bb6a472c9f..bbac045675f 100644 --- a/pkgs/development/python-modules/flask-api/default.nix +++ b/pkgs/development/python-modules/flask-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask markdown ]; meta = with lib; { - homepage = https://github.com/miracle2k/flask-assets; + homepage = "https://github.com/miracle2k/flask-assets"; description = "Browsable web APIs for Flask"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/flask-assets/default.nix b/pkgs/development/python-modules/flask-assets/default.nix index a8e454f4a2c..2fbfb17def4 100644 --- a/pkgs/development/python-modules/flask-assets/default.nix +++ b/pkgs/development/python-modules/flask-assets/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask webassets flask_script nose ]; meta = with lib; { - homepage = https://github.com/miracle2k/flask-assets; + homepage = "https://github.com/miracle2k/flask-assets"; description = "Asset management for Flask, to compress and merge CSS and Javascript files"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix index afd3db60ffc..ae1be1ae54c 100644 --- a/pkgs/development/python-modules/flask-autoindex/default.nix +++ b/pkgs/development/python-modules/flask-autoindex/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { ''; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = https://pythonhosted.org/Flask-AutoIndex/; + homepage = "https://pythonhosted.org/Flask-AutoIndex/"; }; } diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix index 307b670fa7f..2d542411fa2 100644 --- a/pkgs/development/python-modules/flask-babel/default.nix +++ b/pkgs/development/python-modules/flask-babel/default.nix @@ -39,6 +39,6 @@ buildPythonPackage rec { ''; license = licenses.bsd2; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/python-babel/flask-babel; + homepage = "https://github.com/python-babel/flask-babel"; }; } diff --git a/pkgs/development/python-modules/flask-bcrypt/default.nix b/pkgs/development/python-modules/flask-bcrypt/default.nix index dfcdad18f9c..fd0e63d26f3 100644 --- a/pkgs/development/python-modules/flask-bcrypt/default.nix +++ b/pkgs/development/python-modules/flask-bcrypt/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Brcrypt hashing for Flask"; - homepage = https://github.com/maxcountryman/flask-bcrypt; + homepage = "https://github.com/maxcountryman/flask-bcrypt"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/flask-bootstrap/default.nix b/pkgs/development/python-modules/flask-bootstrap/default.nix index 7c12b79bb2f..797be78bc56 100644 --- a/pkgs/development/python-modules/flask-bootstrap/default.nix +++ b/pkgs/development/python-modules/flask-bootstrap/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask visitor dominate ]; meta = with lib; { - homepage = https://github.com/mbr/flask-bootstrap; + homepage = "https://github.com/mbr/flask-bootstrap"; description = "Ready-to-use Twitter-bootstrap for use in Flask."; license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/flask-common/default.nix b/pkgs/development/python-modules/flask-common/default.nix index 05385e08d05..40c7903aee3 100644 --- a/pkgs/development/python-modules/flask-common/default.nix +++ b/pkgs/development/python-modules/flask-common/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Flask extension with lots of common time-savers"; - homepage = https://github.com/kennethreitz/flask-common; + homepage = "https://github.com/kennethreitz/flask-common"; license = licenses.asl20; # XXX: setup.py lists BSD but git repo has Apache 2.0 LICENSE }; } diff --git a/pkgs/development/python-modules/flask-cors/default.nix b/pkgs/development/python-modules/flask-cors/default.nix index c532802a7f4..e20d213029c 100644 --- a/pkgs/development/python-modules/flask-cors/default.nix +++ b/pkgs/development/python-modules/flask-cors/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Flask extension adding a decorator for CORS support"; - homepage = https://github.com/corydolphin/flask-cors; + homepage = "https://github.com/corydolphin/flask-cors"; license = with licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/flask-jwt-extended/default.nix b/pkgs/development/python-modules/flask-jwt-extended/default.nix index 1fcb7e3cd87..bc1e2778e19 100644 --- a/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "JWT extension for Flask"; - homepage = https://flask-jwt-extended.readthedocs.io/; + homepage = "https://flask-jwt-extended.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/python-modules/flask-ldap-login/default.nix b/pkgs/development/python-modules/flask-ldap-login/default.nix index 99b57dac816..2573f549740 100644 --- a/pkgs/development/python-modules/flask-ldap-login/default.nix +++ b/pkgs/development/python-modules/flask-ldap-login/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { patches = [ # Fix flask_wtf>=0.9.0 incompatibility. See https://github.com/ContinuumIO/flask-ldap-login/issues/41 (fetchpatch { - url = https://github.com/ContinuumIO/flask-ldap-login/commit/ed08c03c818dc63b97b01e2e7c56862eaa6daa43.patch; + url = "https://github.com/ContinuumIO/flask-ldap-login/commit/ed08c03c818dc63b97b01e2e7c56862eaa6daa43.patch"; sha256 = "19pkhbldk8jq6m10kdylvjf1c8m84fvvj04v5qda4cjyks15aq48"; }) ]; @@ -28,7 +28,7 @@ buildPythonPackage rec { checkPhase = "nosetests -d"; meta = with stdenv.lib; { - homepage = https://github.com/ContinuumIO/flask-ldap-login; + homepage = "https://github.com/ContinuumIO/flask-ldap-login"; description = "User session management for Flask"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/flask-limiter/default.nix b/pkgs/development/python-modules/flask-limiter/default.nix index 01b340a2847..041935e28e3 100644 --- a/pkgs/development/python-modules/flask-limiter/default.nix +++ b/pkgs/development/python-modules/flask-limiter/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Rate limiting for flask applications"; - homepage = https://flask-limiter.readthedocs.org/; + homepage = "https://flask-limiter.readthedocs.org/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/flask-login/default.nix b/pkgs/development/python-modules/flask-login/default.nix index d466a78a681..8a48bbdd7da 100644 --- a/pkgs/development/python-modules/flask-login/default.nix +++ b/pkgs/development/python-modules/flask-login/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3.3"; meta = with stdenv.lib; { - homepage = https://github.com/maxcountryman/flask-login; + homepage = "https://github.com/maxcountryman/flask-login"; description = "User session management for Flask"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix index d7fbec5715d..ef2b3a40705 100644 --- a/pkgs/development/python-modules/flask-migrate/default.nix +++ b/pkgs/development/python-modules/flask-migrate/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = { description = "SQLAlchemy database migrations for Flask applications using Alembic"; license = licenses.mit; - homepage = https://github.com/miguelgrinberg/Flask-Migrate; + homepage = "https://github.com/miguelgrinberg/Flask-Migrate"; }; } diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix index 5e61a2415b7..ad435331236 100644 --- a/pkgs/development/python-modules/flask-mongoengine/default.nix +++ b/pkgs/development/python-modules/flask-mongoengine/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flask-MongoEngine is a Flask extension that provides integration with MongoEngine and WTF model forms"; - homepage = https://github.com/mongoengine/flask-mongoengine; + homepage = "https://github.com/mongoengine/flask-mongoengine"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/flask-openid/default.nix b/pkgs/development/python-modules/flask-openid/default.nix index c1f9a51a225..a9a5ec9acc8 100644 --- a/pkgs/development/python-modules/flask-openid/default.nix +++ b/pkgs/development/python-modules/flask-openid/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "OpenID support for Flask"; - homepage = https://pythonhosted.org/Flask-OpenID/; + homepage = "https://pythonhosted.org/Flask-OpenID/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/flask-paginate/default.nix b/pkgs/development/python-modules/flask-paginate/default.nix index ba1c0b10d15..f0cf96d1367 100644 --- a/pkgs/development/python-modules/flask-paginate/default.nix +++ b/pkgs/development/python-modules/flask-paginate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ flask ]; meta = with lib; { - homepage = https://github.com/lixxu/flask-paginate; + homepage = "https://github.com/lixxu/flask-paginate"; description = "Pagination support for Flask"; license = licenses.bsd3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/flask-principal/default.nix b/pkgs/development/python-modules/flask-principal/default.nix index cbdbd989211..f3164aa1f08 100644 --- a/pkgs/development/python-modules/flask-principal/default.nix +++ b/pkgs/development/python-modules/flask-principal/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = with lib; { - homepage = http://packages.python.org/Flask-Principal/; + homepage = "http://packages.python.org/Flask-Principal/"; description = "Identity management for flask"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix index 89cc47cbcfb..17c63f326ea 100644 --- a/pkgs/development/python-modules/flask-restful/default.nix +++ b/pkgs/development/python-modules/flask-restful/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch; + url = "https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch"; sha256 = "11s6ag6l42g61ccg5jw9j1f26hwgjfa3sp890cbl5r4hy5ycpyr5"; }) (fetchpatch { - url = https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch; + url = "https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch"; sha256 = "16avd369j5r08d1l23mwbba26zjwnmfqvfvnfz02am3gr5l6p3gl"; }) ]; diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix index 2fc0fa8569b..3de74531c28 100644 --- a/pkgs/development/python-modules/flask-restplus/default.nix +++ b/pkgs/development/python-modules/flask-restplus/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/noirbizarre/flask-restplus; + homepage = "https://github.com/noirbizarre/flask-restplus"; description = "Fast, easy and documented API development with Flask"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix new file mode 100644 index 00000000000..d6912de6fe8 --- /dev/null +++ b/pkgs/development/python-modules/flask-reverse-proxy-fix/default.nix @@ -0,0 +1,37 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, flask +}: + +buildPythonPackage rec { + pname = "flask-reverse-proxy-fix"; + version = "0.2.1"; + + # master fixes flask import syntax and has no major changes + # new release requested: https://github.com/sublee/flask-silk/pull/6 + src = fetchFromGitHub { + owner = "antarctica"; + repo = "flask-reverse-proxy-fix"; + rev = "v${version}"; + sha256 = "1jbr67cmnryn0igv05qkvqjwrwj2rsajvvjnv3cdkm9bkgb4h5k5"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ + flask + ]; + + meta = with stdenv.lib; { + description = "Python Flask middleware for applications running under a reverse proxy"; + maintainers = with maintainers; [ matthiasbeyer ]; + homepage = "https://github.com/antarctica/flask-reverse-proxy-fix"; + + license = { + fullName = "Open Government Licence"; + url = "http://www.nationalarchives.gov.uk/doc/open-government-licence/version/3/"; + }; + }; +} diff --git a/pkgs/development/python-modules/flask-script/default.nix b/pkgs/development/python-modules/flask-script/default.nix index 51ba7ce4d7c..9acc55166a8 100644 --- a/pkgs/development/python-modules/flask-script/default.nix +++ b/pkgs/development/python-modules/flask-script/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/smurfix/flask-script; + homepage = "https://github.com/smurfix/flask-script"; description = "Scripting support for Flask"; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/flask-silk/default.nix b/pkgs/development/python-modules/flask-silk/default.nix index 653e39b1740..831eb03a09b 100644 --- a/pkgs/development/python-modules/flask-silk/default.nix +++ b/pkgs/development/python-modules/flask-silk/default.nix @@ -25,6 +25,6 @@ buildPythonPackage { description = "Adds silk icons to your Flask application or module, or extension"; license = licenses.bsd3; maintainers = with maintainers; [ timokau ]; - homepage = https://github.com/sublee/flask-silk; + homepage = "https://github.com/sublee/flask-silk"; }; } diff --git a/pkgs/development/python-modules/flask-socketio/default.nix b/pkgs/development/python-modules/flask-socketio/default.nix index 5ec462a45e0..e0e56aa6e92 100644 --- a/pkgs/development/python-modules/flask-socketio/default.nix +++ b/pkgs/development/python-modules/flask-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Socket.IO integration for Flask applications"; - homepage = https://github.com/miguelgrinberg/Flask-SocketIO/; + homepage = "https://github.com/miguelgrinberg/Flask-SocketIO/"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/flask-sqlalchemy/default.nix b/pkgs/development/python-modules/flask-sqlalchemy/default.nix index 02d8d25bafe..2453bb50766 100644 --- a/pkgs/development/python-modules/flask-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/flask-sqlalchemy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "SQLAlchemy extension for Flask"; - homepage = http://flask-sqlalchemy.pocoo.org/; + homepage = "http://flask-sqlalchemy.pocoo.org/"; license = licenses.bsd3; maintainers = with maintainers; [ gerschtli ]; }; diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix index 96828dcdce2..962555d492d 100644 --- a/pkgs/development/python-modules/flask-wtf/default.nix +++ b/pkgs/development/python-modules/flask-wtf/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "Simple integration of Flask and WTForms."; license = licenses.bsd3; maintainers = [ maintainers.mic92 ]; - homepage = https://github.com/lepture/flask-wtf/; + homepage = "https://github.com/lepture/flask-wtf/"; }; } diff --git a/pkgs/development/python-modules/flask/default.nix b/pkgs/development/python-modules/flask/default.nix index a330b9dd8a6..ffbebf96ee9 100644 --- a/pkgs/development/python-modules/flask/default.nix +++ b/pkgs/development/python-modules/flask/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://flask.pocoo.org/; + homepage = "http://flask.pocoo.org/"; description = "A microframework based on Werkzeug, Jinja 2, and good intentions"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix index d3a46143e6e..db0a4377947 100644 --- a/pkgs/development/python-modules/flaskbabel/default.nix +++ b/pkgs/development/python-modules/flaskbabel/default.nix @@ -10,18 +10,18 @@ buildPythonPackage rec { pname = "Flask-Babel"; - version = "0.12.2"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "316ad183e42003f3922957fa643d0a1e8e34a0f0301a88c3a8f605bc37ba5c86"; + sha256 = "0gmb165vkwv5v7dxsxa2i3zhafns0fh938m2zdcrv4d8z5l099yn"; }; propagatedBuildInputs = [ flask jinja2 speaklater Babel pytz ]; meta = with stdenv.lib; { description = "Adds i18n/l10n support to Flask applications"; - homepage = https://github.com/mitsuhiko/flask-babel; + homepage = "https://github.com/mitsuhiko/flask-babel"; license = licenses.bsd0; maintainers = with maintainers; [ matejc ]; }; diff --git a/pkgs/development/python-modules/flexmock/default.nix b/pkgs/development/python-modules/flexmock/default.nix index e4da4ce7926..74c3418b54b 100644 --- a/pkgs/development/python-modules/flexmock/default.nix +++ b/pkgs/development/python-modules/flexmock/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "flexmock is a testing library for Python that makes it easy to create mocks,stubs and fakes."; - homepage = https://flexmock.readthedocs.org; + homepage = "https://flexmock.readthedocs.org"; license = licenses.bsdOriginal; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index 88dfff3aa8f..cfcc4d36299 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "A Python interface to the Flickr API"; - homepage = https://stuvel.eu/flickrapi; + homepage = "https://stuvel.eu/flickrapi"; license = lib.licenses.psfl; maintainers = with lib.maintainers; [ obadz ]; }; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 22bba39ff01..72957a94afa 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple packaging tool for simple packages"; - homepage = https://github.com/takluyver/flit; + homepage = "https://github.com/takluyver/flit"; license = licenses.bsd3; maintainers = [ maintainers.fridh ]; }; diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index dab4ce30f6f..a1202b5586d 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "A structured logger for Fluentd (Python)"; - homepage = https://github.com/fluent/fluent-logger-python; + homepage = "https://github.com/fluent/fluent-logger-python"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/fn/default.nix b/pkgs/development/python-modules/fn/default.nix index 550c4a71101..f64d1a3d122 100644 --- a/pkgs/development/python-modules/fn/default.nix +++ b/pkgs/development/python-modules/fn/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { Functional programming in Python: implementation of missing features to enjoy FP ''; - homepage = https://github.com/kachayev/fn.py; + homepage = "https://github.com/kachayev/fn.py"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/folium/default.nix b/pkgs/development/python-modules/folium/default.nix index 967e7cf09c1..9a89c9a8e00 100644 --- a/pkgs/development/python-modules/folium/default.nix +++ b/pkgs/development/python-modules/folium/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Make beautiful maps with Leaflet.js & Python"; - homepage = https://github.com/python-visualization/folium; + homepage = "https://github.com/python-visualization/folium"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index f85afa77021..45d39410137 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/fonttools/fonttools; + homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/foolscap/default.nix b/pkgs/development/python-modules/foolscap/default.nix index a9ab0db1ed9..d1374ca71bf 100644 --- a/pkgs/development/python-modules/foolscap/default.nix +++ b/pkgs/development/python-modules/foolscap/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://foolscap.lothar.com/; + homepage = "http://foolscap.lothar.com/"; description = "Foolscap, an RPC protocol for Python that follows the distributed object-capability model"; longDescription = '' "Foolscap" is the name for the next-generation RPC protocol, diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix index 534f2cd7bb7..75b4fdef337 100644 --- a/pkgs/development/python-modules/forbiddenfruit/default.nix +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Patch python built-in objects"; - homepage = https://pypi.python.org/pypi/forbiddenfruit; + homepage = "https://pypi.python.org/pypi/forbiddenfruit"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index e99c944c549..8f0a6f788b0 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Live coding music with SuperCollider"; - homepage = https://foxdot.org/; + homepage = "https://foxdot.org/"; license = licenses.cc-by-sa-40; maintainers = with maintainers; [ mrmebelman ]; }; diff --git a/pkgs/development/python-modules/fpdf/default.nix b/pkgs/development/python-modules/fpdf/default.nix index a528244cb0f..e8e34f89c43 100644 --- a/pkgs/development/python-modules/fpdf/default.nix +++ b/pkgs/development/python-modules/fpdf/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/reingart/pyfpdf; + homepage = "https://github.com/reingart/pyfpdf"; description = "Simple PDF generation for Python"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index e23351d3da6..55876579723 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = { description = "A Python interface for fplll"; changelog = "https://github.com/fplll/fpylll/releases/tag/${version}"; - homepage = https://github.com/fplll/fpylll; + homepage = "https://github.com/fplll/fpylll"; maintainers = with lib.maintainers; [ timokau ]; license = lib.licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 32e9e9393ce..d8f1a52d465 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -1,25 +1,38 @@ -{ stdenv, buildPythonPackage, fetchPypi, lxml, requests, tkinter }: +{ stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pytest, requests }: buildPythonPackage rec { pname = "fritzconnection"; - version = "0.8.4"; + version = "1.2.1"; - src = fetchPypi { - inherit pname version; - sha256 = "adc629a48b50700f5478f69436e4b78c8792a9260cc674cccef15ffe68eb0643"; + src = fetchFromGitHub { + owner = "kbr"; + repo = pname; + rev = version; + hash = "sha256:17z4shs56ci9mxmilppv5xy9gbnbp6p1h2ms6x55nkvwndacrp7x"; }; + 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 fritzconnection/test.py \ - --replace "from fritzconnection import" "from .fritzconnection import" + substituteInPlace setup.py \ + --replace 'find_packages()' 'find_packages(exclude=["*.tests"])' ''; - propagatedBuildInputs = [ lxml requests tkinter ]; + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; meta = with stdenv.lib; { description = "Python-Tool to communicate with the AVM FritzBox using the TR-064 protocol"; - homepage = https://bitbucket.org/kbr/fritzconnection; + homepage = "https://bitbucket.org/kbr/fritzconnection"; license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda valodim ]; }; } diff --git a/pkgs/development/python-modules/frozendict/default.nix b/pkgs/development/python-modules/frozendict/default.nix index 94d42206d63..583dad1b014 100644 --- a/pkgs/development/python-modules/frozendict/default.nix +++ b/pkgs/development/python-modules/frozendict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/slezica/python-frozendict; + homepage = "https://github.com/slezica/python-frozendict"; description = "An immutable dictionary"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/fs-s3fs/default.nix b/pkgs/development/python-modules/fs-s3fs/default.nix index cb9723742dc..18434f530cb 100644 --- a/pkgs/development/python-modules/fs-s3fs/default.nix +++ b/pkgs/development/python-modules/fs-s3fs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://pypi.org/project/fs-s3fs/; + homepage = "https://pypi.org/project/fs-s3fs/"; license = licenses.mit; description = "Amazon S3 filesystem for PyFilesystem2"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/fs/default.nix b/pkgs/development/python-modules/fs/default.nix index fee20021e1a..ff6ce57aefa 100644 --- a/pkgs/development/python-modules/fs/default.nix +++ b/pkgs/development/python-modules/fs/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Filesystem abstraction"; - homepage = https://github.com/PyFilesystem/pyfilesystem2; + homepage = "https://github.com/PyFilesystem/pyfilesystem2"; license = licenses.bsd3; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/fsspec/default.nix b/pkgs/development/python-modules/fsspec/default.nix index 7e0ed8b9712..8f2c11f4265 100644 --- a/pkgs/development/python-modules/fsspec/default.nix +++ b/pkgs/development/python-modules/fsspec/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "A specification that python filesystems should adhere to"; - homepage = https://github.com/intake/filesystem_spec; + homepage = "https://github.com/intake/filesystem_spec"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix index 1b8b8c17846..bb421d746d4 100644 --- a/pkgs/development/python-modules/ftfy/default.nix +++ b/pkgs/development/python-modules/ftfy/default.nix @@ -4,6 +4,7 @@ , fetchPypi , html5lib , wcwidth +, setuptools , pytest }: @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ html5lib wcwidth + setuptools ]; checkInputs = [ @@ -39,7 +41,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Given Unicode text, make its representation consistent and possibly less broken"; - homepage = https://github.com/LuminosoInsight/python-ftfy; + homepage = "https://github.com/LuminosoInsight/python-ftfy"; license = licenses.mit; maintainers = with maintainers; [ sdll aborsu ]; }; diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index d3d338a2c8d..941b5792f30 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -13,15 +13,16 @@ buildPythonPackage rec { checkPhase = '' touch Makefile - # Disable tests that require network access or access /home + # Disable tests that require network access or access /home or assume execution before year 2020 py.test test \ -k "not test_public_servers and not test_real_ftp \ - and not test_set_parser and not test_repr" + and not test_set_parser and not test_repr \ + and not test_conditional_upload and not test_conditional_download_with_older_target" ''; meta = with lib; { description = "High-level FTP client library (virtual file system and more)"; - homepage = http://ftputil.sschwarzer.net/; + homepage = "http://ftputil.sschwarzer.net/"; license = licenses.bsd2; # "Modified BSD license, says pypi" }; } diff --git a/pkgs/development/python-modules/fudge/default.nix b/pkgs/development/python-modules/fudge/default.nix index de45a1404f5..16656fb19a7 100644 --- a/pkgs/development/python-modules/fudge/default.nix +++ b/pkgs/development/python-modules/fudge/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/fudge-py/fudge; + homepage = "https://github.com/fudge-py/fudge"; description = "Replace real objects with fakes (mocks, stubs, etc) while testing"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/funcsigs/default.nix b/pkgs/development/python-modules/funcsigs/default.nix index 5a4701df9c3..1febf9d356e 100644 --- a/pkgs/development/python-modules/funcsigs/default.nix +++ b/pkgs/development/python-modules/funcsigs/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python function signatures from PEP362 for Python 2.6, 2.7 and 3.2+"; - homepage = https://github.com/aliles/funcsigs; + homepage = "https://github.com/aliles/funcsigs"; maintainers = with maintainers; [ ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 0ac33be3899..8c69ead0ae0 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for FUSE"; - homepage = https://github.com/libfuse/python-fuse; + homepage = "https://github.com/libfuse/python-fuse"; license = licenses.lgpl21; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/fusepy/default.nix b/pkgs/development/python-modules/fusepy/default.nix index 80ca5099f34..57355126dde 100644 --- a/pkgs/development/python-modules/fusepy/default.nix +++ b/pkgs/development/python-modules/fusepy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { Python module that provides a simple interface to FUSE and MacFUSE. It's just one file and is implemented using ctypes. ''; - homepage = https://github.com/terencehonles/fusepy; + homepage = "https://github.com/terencehonles/fusepy"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index c9b49fee4cb..ffb798e6487 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/asottile/future-fstrings; + homepage = "https://github.com/asottile/future-fstrings"; description = "A backport of fstrings to python<3.6"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; diff --git a/pkgs/development/python-modules/future/default.nix b/pkgs/development/python-modules/future/default.nix index dad0372a8c1..a24ea8ab972 100644 --- a/pkgs/development/python-modules/future/default.nix +++ b/pkgs/development/python-modules/future/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { either Py2 or Py3 code easily to support both Python 2 and 3 in a single clean Py3-style codebase, module by module. ''; - homepage = https://python-future.org; - downloadPage = https://github.com/PythonCharmers/python-future/releases; + homepage = "https://python-future.org"; + downloadPage = "https://github.com/PythonCharmers/python-future/releases"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ prikhi ]; }; diff --git a/pkgs/development/python-modules/fuzzywuzzy/default.nix b/pkgs/development/python-modules/fuzzywuzzy/default.nix index 551f5f4c3dd..8baec8c1089 100644 --- a/pkgs/development/python-modules/fuzzywuzzy/default.nix +++ b/pkgs/development/python-modules/fuzzywuzzy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fuzzy string matching for Python"; - homepage = https://github.com/seatgeek/fuzzywuzzy; + homepage = "https://github.com/seatgeek/fuzzywuzzy"; license = licenses.gpl2; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/fx2/default.nix b/pkgs/development/python-modules/fx2/default.nix index 93eedc73a6f..acbaf93a4ea 100644 --- a/pkgs/development/python-modules/fx2/default.nix +++ b/pkgs/development/python-modules/fx2/default.nix @@ -38,7 +38,7 @@ buildPythonPackage { meta = with lib; { description = "Chip support package for Cypress EZ-USB FX2 series microcontrollers"; - homepage = https://github.com/whitequark/libfx2; + homepage = "https://github.com/whitequark/libfx2"; license = licenses.bsd0; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/gateone/default.nix b/pkgs/development/python-modules/gateone/default.nix index 7a6aa659ace..372cdae8c23 100644 --- a/pkgs/development/python-modules/gateone/default.nix +++ b/pkgs/development/python-modules/gateone/default.nix @@ -8,7 +8,8 @@ }: buildPythonPackage { - name = "gateone-1.2-0d57c3"; + pname = "gateone"; + version = "1.2-0d57c3"; disabled = isPy3k; src = pkgs.fetchFromGitHub { diff --git a/pkgs/development/python-modules/gcovr/default.nix b/pkgs/development/python-modules/gcovr/default.nix index 278bd381ca6..774b2087d8f 100644 --- a/pkgs/development/python-modules/gcovr/default.nix +++ b/pkgs/development/python-modules/gcovr/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python script for summarizing gcov data"; license = licenses.bsd0; - homepage = https://www.gcovr.com/; + homepage = "https://www.gcovr.com/"; }; } diff --git a/pkgs/development/python-modules/gdrivefs/default.nix b/pkgs/development/python-modules/gdrivefs/default.nix index 0b2d0fbc91d..24b788f2c6d 100644 --- a/pkgs/development/python-modules/gdrivefs/default.nix +++ b/pkgs/development/python-modules/gdrivefs/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { (Google Doc files do not have a particular format). - Allow for the same file at multiple paths. ''; - homepage = https://github.com/dsoprea/GDriveFS; + homepage = "https://github.com/dsoprea/GDriveFS"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/geeknote/default.nix b/pkgs/development/python-modules/geeknote/default.nix index c8ff60b318b..cacc832486e 100644 --- a/pkgs/development/python-modules/geeknote/default.nix +++ b/pkgs/development/python-modules/geeknote/default.nix @@ -30,7 +30,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Work with Evernote from command line"; - homepage = http://www.geeknote.me; + homepage = "http://www.geeknote.me"; license = licenses.gpl1; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/genanki/default.nix b/pkgs/development/python-modules/genanki/default.nix index bab5b26635d..b9209ba78c2 100644 --- a/pkgs/development/python-modules/genanki/default.nix +++ b/pkgs/development/python-modules/genanki/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/kerrickstaley/genanki; + homepage = "https://github.com/kerrickstaley/genanki"; description = "Generate Anki decks programmatically"; license = licenses.mit; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/genpy/default.nix b/pkgs/development/python-modules/genpy/default.nix index c8bbeefd6ac..64e253b3201 100644 --- a/pkgs/development/python-modules/genpy/default.nix +++ b/pkgs/development/python-modules/genpy/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "C/C++ source generation from an AST"; - homepage = https://github.com/inducer/genpy; + homepage = "https://github.com/inducer/genpy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/genshi/default.nix b/pkgs/development/python-modules/genshi/default.nix index c86fae5d0e9..5554e4b330e 100644 --- a/pkgs/development/python-modules/genshi/default.nix +++ b/pkgs/development/python-modules/genshi/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { parsing, generating, and processing HTML, XML or other textual content for output generation on the web. ''; - homepage = https://genshi.edgewall.org/; + homepage = "https://genshi.edgewall.org/"; license = licenses.bsd0; }; } diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix index 592db824f3f..4f13ea0b498 100644 --- a/pkgs/development/python-modules/gensim/default.nix +++ b/pkgs/development/python-modules/gensim/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Topic-modelling library"; - homepage = https://radimrehurek.com/gensim/; + homepage = "https://radimrehurek.com/gensim/"; license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ jyp ]; }; diff --git a/pkgs/development/python-modules/gentools/default.nix b/pkgs/development/python-modules/gentools/default.nix index 57105f87a7c..129eaae340a 100644 --- a/pkgs/development/python-modules/gentools/default.nix +++ b/pkgs/development/python-modules/gentools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for generators, generator functions, and generator-based coroutines"; license = licenses.mit; - homepage = https://gentools.readthedocs.io/; + homepage = "https://gentools.readthedocs.io/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/genzshcomp/default.nix b/pkgs/development/python-modules/genzshcomp/default.nix index d7b73071b0c..99d89e79d12 100644 --- a/pkgs/development/python-modules/genzshcomp/default.nix +++ b/pkgs/development/python-modules/genzshcomp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Automatically generated zsh completion function for Python's option parser modules"; - homepage = https://bitbucket.org/hhatto/genzshcomp/; + homepage = "https://bitbucket.org/hhatto/genzshcomp/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/geoalchemy2/default.nix b/pkgs/development/python-modules/geoalchemy2/default.nix index 02d00461e26..ae2df2ce607 100644 --- a/pkgs/development/python-modules/geoalchemy2/default.nix +++ b/pkgs/development/python-modules/geoalchemy2/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sqlalchemy shapely ]; meta = with stdenv.lib; { - homepage = http://geoalchemy.org/; + homepage = "http://geoalchemy.org/"; license = licenses.mit; description = "Toolkit for working with spatial databases"; }; diff --git a/pkgs/development/python-modules/geojson/default.nix b/pkgs/development/python-modules/geojson/default.nix index a41cdada4be..5d0fa902416 100644 --- a/pkgs/development/python-modules/geojson/default.nix +++ b/pkgs/development/python-modules/geojson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales ]; meta = { - homepage = https://github.com/frewsxcv/python-geojson; + homepage = "https://github.com/frewsxcv/python-geojson"; description = "Python bindings and utilities for GeoJSON"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/gevent-socketio/default.nix b/pkgs/development/python-modules/gevent-socketio/default.nix index e95519a346c..2b847275bed 100644 --- a/pkgs/development/python-modules/gevent-socketio/default.nix +++ b/pkgs/development/python-modules/gevent-socketio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent ]; meta = with stdenv.lib; { - homepage = https://github.com/abourget/gevent-socketio; + homepage = "https://github.com/abourget/gevent-socketio"; description = "SocketIO server based on the Gevent pywsgi server, a Python network library"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/gevent-websocket/default.nix b/pkgs/development/python-modules/gevent-websocket/default.nix index 6c9df6b571b..adc13738d5e 100644 --- a/pkgs/development/python-modules/gevent-websocket/default.nix +++ b/pkgs/development/python-modules/gevent-websocket/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ gevent gunicorn ]; meta = with stdenv.lib; { - homepage = https://www.gitlab.com/noppo/gevent-websocket; + homepage = "https://www.gitlab.com/noppo/gevent-websocket"; description = "Websocket handler for the gevent pywsgi server, a Python network library"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/gevent/default.nix b/pkgs/development/python-modules/gevent/default.nix index a8caf650016..56467523a17 100644 --- a/pkgs/development/python-modules/gevent/default.nix +++ b/pkgs/development/python-modules/gevent/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Coroutine-based networking library"; - homepage = http://www.gevent.org/; + homepage = "http://www.gevent.org/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/geventhttpclient/default.nix b/pkgs/development/python-modules/geventhttpclient/default.nix index 6a78d60544d..59b11e0f6ac 100644 --- a/pkgs/development/python-modules/geventhttpclient/default.nix +++ b/pkgs/development/python-modules/geventhttpclient/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gwik/geventhttpclient; + homepage = "https://github.com/gwik/geventhttpclient"; description = "HTTP client library for gevent"; license = licenses.mit; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/gflags/default.nix b/pkgs/development/python-modules/gflags/default.nix index 9eb8e3b2d6c..9b3b92784d7 100644 --- a/pkgs/development/python-modules/gflags/default.nix +++ b/pkgs/development/python-modules/gflags/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/google/python-gflags; + homepage = "https://github.com/google/python-gflags"; description = "A module for command line handling, similar to Google's gflags for C++"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/ghdiff/default.nix b/pkgs/development/python-modules/ghdiff/default.nix index 3a5fbe8433c..c58d63a0837 100644 --- a/pkgs/development/python-modules/ghdiff/default.nix +++ b/pkgs/development/python-modules/ghdiff/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six chardet ]; meta = with stdenv.lib; { - homepage = https://github.com/kilink/ghdiff; + homepage = "https://github.com/kilink/ghdiff"; license = licenses.mit; description = "Generate Github-style HTML for unified diffs."; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/gidgethub/default.nix b/pkgs/development/python-modules/gidgethub/default.nix index 341d08d95ed..634d7c2ddc0 100644 --- a/pkgs/development/python-modules/gidgethub/default.nix +++ b/pkgs/development/python-modules/gidgethub/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "An async GitHub API library"; - homepage = https://github.com/brettcannon/gidgethub; + homepage = "https://github.com/brettcannon/gidgethub"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/gin-config/default.nix b/pkgs/development/python-modules/gin-config/default.nix index 5e8343a4b0c..39a64781c8f 100644 --- a/pkgs/development/python-modules/gin-config/default.nix +++ b/pkgs/development/python-modules/gin-config/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck= false; meta = with lib; { - homepage = https://github.com/google/gin-config; + homepage = "https://github.com/google/gin-config"; description = "Gin provides a lightweight configuration framework for Python, based on dependency injection."; license = licenses.asl20; maintainers = with maintainers; [ jethro ]; diff --git a/pkgs/development/python-modules/gipc/default.nix b/pkgs/development/python-modules/gipc/default.nix index 8255668de1c..df1bd590d37 100644 --- a/pkgs/development/python-modules/gipc/default.nix +++ b/pkgs/development/python-modules/gipc/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { multiprocessing. Process-based child processes can safely be created anywhere within your gevent-powered application. ''; - homepage = http://gehrcke.de/gipc; + homepage = "http://gehrcke.de/gipc"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index a7bac0fd762..ba3ff3bfd6c 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/alpernebbi/git-annex-adapter; + homepage = "https://github.com/alpernebbi/git-annex-adapter"; description = "Call git-annex commands from Python"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index dfc0b4afb8a..b4de6077529 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Efficiently update, split, and rearrange git commits"; - homepage = https://github.com/mystor/git-revise; + homepage = "https://github.com/mystor/git-revise"; changelog = "https://github.com/mystor/git-revise/blob/${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ emily ]; diff --git a/pkgs/development/python-modules/git-sweep/default.nix b/pkgs/development/python-modules/git-sweep/default.nix index e2182892e85..aa2a223c777 100644 --- a/pkgs/development/python-modules/git-sweep/default.nix +++ b/pkgs/development/python-modules/git-sweep/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A command-line tool that helps you clean up Git branches"; - homepage = https://github.com/arc90/git-sweep; + homepage = "https://github.com/arc90/git-sweep"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/python-modules/gitdb/default.nix b/pkgs/development/python-modules/gitdb/default.nix index 880fc543fb6..b76ee4394c6 100644 --- a/pkgs/development/python-modules/gitdb/default.nix +++ b/pkgs/development/python-modules/gitdb/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Git Object Database"; maintainers = [ ]; - homepage = https://github.com/gitpython-developers/gitdb; + homepage = "https://github.com/gitpython-developers/gitdb"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/github3_py/default.nix b/pkgs/development/python-modules/github3_py/default.nix index d0d82adf491..6b1ea305d4a 100644 --- a/pkgs/development/python-modules/github3_py/default.nix +++ b/pkgs/development/python-modules/github3_py/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github3py.readthedocs.org/en/master/; + homepage = "https://github3py.readthedocs.org/en/master/"; description = "A wrapper for the GitHub API written in python"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/python-modules/glasgow/default.nix b/pkgs/development/python-modules/glasgow/default.nix index 94ae2a1258e..6a32364fdf3 100644 --- a/pkgs/development/python-modules/glasgow/default.nix +++ b/pkgs/development/python-modules/glasgow/default.nix @@ -68,7 +68,7 @@ buildPythonPackage rec { meta = with lib; { description = "Software for Glasgow, a digital interface multitool"; - homepage = https://github.com/GlasgowEmbedded/Glasgow; + homepage = "https://github.com/GlasgowEmbedded/Glasgow"; license = licenses.bsd0; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix index bce69bffff2..29028e6d32d 100644 --- a/pkgs/development/python-modules/glob2/default.nix +++ b/pkgs/development/python-modules/glob2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Version of the glob module that can capture patterns and supports recursive wildcards"; - homepage = https://github.com/miracle2k/python-glob2/; + homepage = "https://github.com/miracle2k/python-glob2/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index 45ae5fe00de..f7a89732467 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "globus-sdk"; - version = "1.8.0"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0ggxa3av4rwva9h5idg1vfdybr7wkajw7g0sn42k04sxxa0cigwz"; + sha256 = "1fm0iqfbzd13m1lkd4h3ss4y9isp5cadd2w2k0qr3yqwfmrqqba2"; }; checkPhase = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; - homepage = https://github.com/globus/globus-sdk-python; + homepage = "https://github.com/globus/globus-sdk-python"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 739ef7d95e4..cc73b26d797 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = !isPy37; # https://github.com/mahmoud/glom/issues/72 meta = with stdenv.lib; { - homepage = https://github.com/mahmoud/glom; + homepage = "https://github.com/mahmoud/glom"; description = "Restructuring data, the Python way"; longDescription = '' glom helps pull together objects from other objects in a diff --git a/pkgs/development/python-modules/glymur/default.nix b/pkgs/development/python-modules/glymur/default.nix index 3da367c445f..d2721951ad7 100644 --- a/pkgs/development/python-modules/glymur/default.nix +++ b/pkgs/development/python-modules/glymur/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tools for accessing JPEG2000 files"; - homepage = https://github.com/quintusdias/glymur; + homepage = "https://github.com/quintusdias/glymur"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/gmpy/default.nix b/pkgs/development/python-modules/gmpy/default.nix index 73f1175e0bd..c0522587724 100644 --- a/pkgs/development/python-modules/gmpy/default.nix +++ b/pkgs/development/python-modules/gmpy/default.nix @@ -19,6 +19,6 @@ buildPythonPackage { meta = { description = "GMP or MPIR interface to Python 2.4+ and 3.x"; - homepage = https://github.com/aleaxit/gmpy/; + homepage = "https://github.com/aleaxit/gmpy/"; }; } diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix index fc554906409..1f7975abe5c 100644 --- a/pkgs/development/python-modules/gmpy2/default.nix +++ b/pkgs/development/python-modules/gmpy2/default.nix @@ -40,7 +40,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "GMP/MPIR, MPFR, and MPC interface to Python 2.6+ and 3.x"; - homepage = https://github.com/aleaxit/gmpy/; + homepage = "https://github.com/aleaxit/gmpy/"; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/gmusicapi/default.nix b/pkgs/development/python-modules/gmusicapi/default.nix index 2b57ce37a7f..0c98446991f 100644 --- a/pkgs/development/python-modules/gmusicapi/default.nix +++ b/pkgs/development/python-modules/gmusicapi/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An unofficial API for Google Play Music"; - homepage = https://pypi.python.org/pypi/gmusicapi/; + homepage = "https://pypi.python.org/pypi/gmusicapi/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/gnureadline/default.nix b/pkgs/development/python-modules/gnureadline/default.nix index 2e802e05c07..3b926325858 100644 --- a/pkgs/development/python-modules/gnureadline/default.nix +++ b/pkgs/development/python-modules/gnureadline/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The standard Python readline extension statically linked against the GNU readline library"; - homepage = https://github.com/ludwigschwardt/python-gnureadline; + homepage = "https://github.com/ludwigschwardt/python-gnureadline"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/gnutls/default.nix b/pkgs/development/python-modules/gnutls/default.nix index 61c799589a9..9b5cb905666 100644 --- a/pkgs/development/python-modules/gnutls/default.nix +++ b/pkgs/development/python-modules/gnutls/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for the GnuTLS library"; - homepage = https://github.com/AGProjects/python-gnutls; + homepage = "https://github.com/AGProjects/python-gnutls"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index a04bf6250e9..f8daf66c156 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Search your google contacts from the command-line or mutt"; - homepage = https://pypi.python.org/pypi/goobook; + homepage = "https://pypi.python.org/pypi/goobook"; license = licenses.gpl3; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/google-auth-httplib2/default.nix b/pkgs/development/python-modules/google-auth-httplib2/default.nix index 99c9945ea66..2d6a9a3e405 100644 --- a/pkgs/development/python-modules/google-auth-httplib2/default.nix +++ b/pkgs/development/python-modules/google-auth-httplib2/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Google Authentication Library: httplib2 transport"; - homepage = https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2; + homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix index cf83bd4d0ed..ed7e57963ba 100644 --- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix +++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google Authentication Library: oauthlib integration"; - homepage = https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib; + homepage = "https://github.com/GoogleCloudPlatform/google-auth-library-python-oauthlib"; license = licenses.asl20; maintainers = with maintainers; [ terlar ]; }; diff --git a/pkgs/development/python-modules/google-i18n-address/default.nix b/pkgs/development/python-modules/google-i18n-address/default.nix index d7bf6d082f8..f0cda83d3b2 100644 --- a/pkgs/development/python-modules/google-i18n-address/default.nix +++ b/pkgs/development/python-modules/google-i18n-address/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Google's i18n address data packaged for Python"; - homepage = https://pypi.org/project/google-i18n-address/; + homepage = "https://pypi.org/project/google-i18n-address/"; maintainers = with maintainers; [ ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/google-music-proto/default.nix b/pkgs/development/python-modules/google-music-proto/default.nix index d3f41880784..2645c4efad8 100644 --- a/pkgs/development/python-modules/google-music-proto/default.nix +++ b/pkgs/development/python-modules/google-music-proto/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder , attrs , audio-metadata +, importlib-metadata , marshmallow , pendulum , protobuf @@ -8,28 +9,34 @@ buildPythonPackage rec { pname = "google-music-proto"; - version = "2.5.1"; + version = "2.8.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "94cd205b3cb0d9e36f3724ace259d4c6de04db97e095577a26a5cfa5e35844c6"; + sha256 = "10qraipdr18pwnr1dz6ai5vxs9lmww5wbavbh1xyg4lsggmlsrqb"; }; + postPatch = '' + sed -i -e "/audio-metadata/c\'audio-metadata'," -e "/marshmallow/c\'marshmallow'," setup.py + ''; + propagatedBuildInputs = [ attrs audio-metadata marshmallow pendulum protobuf + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata ]; # No tests doCheck = false; - - disabled = pythonOlder "3.6"; + pythonImportsCheck = [ "google_music_proto" ]; meta = with lib; { - homepage = https://github.com/thebigmunch/google-music-proto; + homepage = "https://github.com/thebigmunch/google-music-proto"; description = "Sans-I/O wrapper of Google Music API calls"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/google-music-utils/default.nix b/pkgs/development/python-modules/google-music-utils/default.nix index 84f677d4d4e..b7fd2738e04 100644 --- a/pkgs/development/python-modules/google-music-utils/default.nix +++ b/pkgs/development/python-modules/google-music-utils/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; meta = with lib; { - homepage = https://github.com/thebigmunch/google-music-utils; + homepage = "https://github.com/thebigmunch/google-music-utils"; description = "A set of utility functionality for google-music and related projects"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/google-music/default.nix b/pkgs/development/python-modules/google-music/default.nix index 0a3f145f131..f6b53aeebea 100644 --- a/pkgs/development/python-modules/google-music/default.nix +++ b/pkgs/development/python-modules/google-music/default.nix @@ -2,6 +2,7 @@ , appdirs , audio-metadata , google-music-proto +, httpx , protobuf , requests_oauthlib , tenacity @@ -9,22 +10,23 @@ buildPythonPackage rec { pname = "google-music"; - version = "3.2.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "15d543ab31c981bcb9bfb10f588159848ef570fafb6b9d1347f1429a9b1f531a"; + sha256 = "1agqsbnn72gx88sk736k1pzdn2j8fi7flwqhj5g2qhz3wvkx90yq"; }; postPatch = '' substituteInPlace setup.py \ - --replace "audio-metadata>=0.3,<0.4" "audio-metadata" + --replace "audio-metadata>=0.8,<0.9" "audio-metadata" ''; propagatedBuildInputs = [ appdirs audio-metadata google-music-proto + httpx protobuf requests_oauthlib tenacity @@ -36,7 +38,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; meta = with lib; { - homepage = https://github.com/thebigmunch/google-music; + homepage = "https://github.com/thebigmunch/google-music"; description = "A Google Music API wrapper"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index fc4fb5a46d8..2b6394ae6ba 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "An AST-based Python refactoring library"; - homepage = https://github.com/google/pasta; + homepage = "https://github.com/google/pasta"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index 934af49462b..6c565d0f820 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Asset API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index e081d4e3c31..6900b4f212f 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud AutoML API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; 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 3da3fbfdf85..ef76c1e0aae 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "BigQuery Data Transfer API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index becc2678dc1..b4eed7e5493 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Dataproc API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index 30990938435..5c285ca0b1b 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Data Loss Prevention (DLP) API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index e6211d844fa..5d8f4b53539 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Firestore API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_iot/default.nix b/pkgs/development/python-modules/google_cloud_iot/default.nix index 6f6cd3262f8..fb2d2bf4a68 100644 --- a/pkgs/development/python-modules/google_cloud_iot/default.nix +++ b/pkgs/development/python-modules/google_cloud_iot/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud IoT API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; # maintainers = [ maintainers. ]; }; diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index e3e9ed58eba..e9f8275deb9 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Key Management Service (KMS) API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_language/default.nix b/pkgs/development/python-modules/google_cloud_language/default.nix index 44a3456607d..4479231aba4 100644 --- a/pkgs/development/python-modules/google_cloud_language/default.nix +++ b/pkgs/development/python-modules/google_cloud_language/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Natural Language API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix index 7ea418977df..fa4590ff0b2 100644 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Stackdriver Logging API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_monitoring/default.nix b/pkgs/development/python-modules/google_cloud_monitoring/default.nix index a556fb95568..c29b31eb50d 100644 --- a/pkgs/development/python-modules/google_cloud_monitoring/default.nix +++ b/pkgs/development/python-modules/google_cloud_monitoring/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Stackdriver Monitoring API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index 99723450866..683f5807a0c 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Pub/Sub API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_redis/default.nix b/pkgs/development/python-modules/google_cloud_redis/default.nix index 1eb2b9e08e9..d3c12d29f2b 100644 --- a/pkgs/development/python-modules/google_cloud_redis/default.nix +++ b/pkgs/development/python-modules/google_cloud_redis/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Memorystore for Redis API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index 5ace3fad011..42dccd60805 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Security Command Center API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 856de74dd93..b253a4c71ed 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Storage API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_tasks/default.nix b/pkgs/development/python-modules/google_cloud_tasks/default.nix index 95bcb0d4d57..b4dc1e83ca8 100644 --- a/pkgs/development/python-modules/google_cloud_tasks/default.nix +++ b/pkgs/development/python-modules/google_cloud_tasks/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Tasks API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_testutils/default.nix b/pkgs/development/python-modules/google_cloud_testutils/default.nix index 311815ef331..90e4683f7b0 100644 --- a/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/pkgs/development/python-modules/google_cloud_testutils/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "System test utilities for google-cloud-python"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index e8ed28ab267..0f448440ca4 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Text-to-Speech API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google_cloud_trace/default.nix index 8e79759dfff..4c49b0e70eb 100644 --- a/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/pkgs/development/python-modules/google_cloud_trace/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Stackdriver Trace API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index 57e106fcfbe..38ecb8bcc21 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Video Intelligence API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index 39dfc123650..c2bdc652c7c 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cloud Vision API API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index 3318ab03238..a68bd9df570 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Cloud Web Security Scanner API client library"; - homepage = https://github.com/GoogleCloudPlatform/google-cloud-python; + homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 8486eba68c1..e9c7eecbc3a 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities for Google Media Downloads and Resumable Uploads"; - homepage = https://github.com/GoogleCloudPlatform/google-resumable-media-python; + homepage = "https://github.com/GoogleCloudPlatform/google-resumable-media-python"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix index c6afce2f9ba..1181c59c1fc 100644 --- a/pkgs/development/python-modules/gpapi/default.nix +++ b/pkgs/development/python-modules/gpapi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests protobuf pycryptodome ]; meta = with stdenv.lib; { - homepage = https://github.com/NoMore201/googleplay-api; + homepage = "https://github.com/NoMore201/googleplay-api"; license = licenses.gpl3; description = "Google Play Unofficial Python API"; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix index 074d41aab94..7e740323901 100644 --- a/pkgs/development/python-modules/gplaycli/default.nix +++ b/pkgs/development/python-modules/gplaycli/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ libffi pyasn1 clint ndg-httpsclient protobuf requests args gpapi pyaxmlparser ]; meta = with stdenv.lib; { - homepage = https://github.com/matlink/gplaycli; + homepage = "https://github.com/matlink/gplaycli"; description = "Google Play Downloader via Command line"; license = licenses.agpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/gpy/default.nix b/pkgs/development/python-modules/gpy/default.nix index a6390261204..dbc5791ac33 100644 --- a/pkgs/development/python-modules/gpy/default.nix +++ b/pkgs/development/python-modules/gpy/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Gaussian process framework in Python"; - homepage = https://sheffieldml.github.io/GPy; + homepage = "https://sheffieldml.github.io/GPy"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/gpyopt/default.nix b/pkgs/development/python-modules/gpyopt/default.nix index 3ad5cb7d89b..67f934ccf05 100644 --- a/pkgs/development/python-modules/gpyopt/default.nix +++ b/pkgs/development/python-modules/gpyopt/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bayesian optimization toolbox in Python"; - homepage = https://sheffieldml.github.io/GPyOpt; + homepage = "https://sheffieldml.github.io/GPyOpt"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/grammalecte/default.nix b/pkgs/development/python-modules/grammalecte/default.nix index 01c052bfdce..c6fcca9434d 100644 --- a/pkgs/development/python-modules/grammalecte/default.nix +++ b/pkgs/development/python-modules/grammalecte/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Grammalecte is an open source grammar checker for the French language"; - homepage = https://grammalecte.net; + homepage = "https://grammalecte.net"; license = with lib.licenses; [ gpl3 ]; maintainers = with lib.maintainers; [ apeyroux ]; }; diff --git a/pkgs/development/python-modules/grandalf/default.nix b/pkgs/development/python-modules/grandalf/default.nix index 79413b26544..2d2658e00f8 100644 --- a/pkgs/development/python-modules/grandalf/default.nix +++ b/pkgs/development/python-modules/grandalf/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python package made for experimentations with graphs and drawing algorithms"; - homepage = https://github.com/bdcht/grandalf; + homepage = "https://github.com/bdcht/grandalf"; license = licenses.gpl2; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix index e069c8f8c7b..2197cfd9d0f 100644 --- a/pkgs/development/python-modules/graph-tool/2.x.x.nix +++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook +{ fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook , pkg-config, boost, expat, scipy, cgal, gmp, mpfr , gobject-introspection, pygobject3, gtk3, matplotlib, ncurses , buildPythonPackage @@ -10,18 +10,11 @@ buildPythonPackage rec { pname = "graph-tool"; format = "other"; - version = "2.29"; - - meta = with stdenv.lib; { - description = "Python module for manipulation and statistical analysis of graphs"; - homepage = https://graph-tool.skewed.de/; - license = licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.joelmo ]; - }; + version = "2.31"; src = fetchurl { url = "https://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2"; - sha256 = "0ykzcnqc5bhqb4xlf9ahpp807vj5868xdrmcj6fggqnnpqv4633c"; + sha256 = "0z6n9xkb5yz7z6rlwl6z9gq3ac5vdsby90nhvvvskadsx2pagd7v"; }; configureFlags = [ @@ -55,4 +48,11 @@ buildPythonPackage rec { ]; enableParallelBuilding = false; + + meta = with lib; { + description = "Python module for manipulation and statistical analysis of graphs"; + homepage = "https://graph-tool.skewed.de/"; + license = licenses.gpl3; + maintainers = [ maintainers.joelmo ]; + }; } diff --git a/pkgs/development/python-modules/graph_nets/default.nix b/pkgs/development/python-modules/graph_nets/default.nix index 6b2536d37b3..4e83be64d03 100644 --- a/pkgs/development/python-modules/graph_nets/default.nix +++ b/pkgs/development/python-modules/graph_nets/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Build Graph Nets in Tensorflow"; - homepage = https://github.com/deepmind/graph_nets; + homepage = "https://github.com/deepmind/graph_nets"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix index 7f1726a2c4b..51300847bbb 100644 --- a/pkgs/development/python-modules/graphite-api/default.nix +++ b/pkgs/development/python-modules/graphite-api/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Graphite-web, without the interface. Just the rendering HTTP API"; - homepage = https://github.com/brutasse/graphite-api; + homepage = "https://github.com/brutasse/graphite-api"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix index b94a92bc02f..159b09d10b9 100644 --- a/pkgs/development/python-modules/graphite_beacon/default.nix +++ b/pkgs/development/python-modules/graphite_beacon/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple alerting application for Graphite metrics"; - homepage = https://github.com/klen/graphite-beacon; + homepage = "https://github.com/klen/graphite-beacon"; maintainers = [ maintainers.offline ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index 572fdcaee51..fcb2867050d 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple Python interface for Graphviz"; - homepage = https://github.com/xflr6/graphviz; + homepage = "https://github.com/xflr6/graphviz"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/grappelli_safe/default.nix b/pkgs/development/python-modules/grappelli_safe/default.nix index 5a845f733f5..299ce04f6fa 100644 --- a/pkgs/development/python-modules/grappelli_safe/default.nix +++ b/pkgs/development/python-modules/grappelli_safe/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { with Django 1.1 - grappelli_safe was therefore created to address these specific issues. ''; - homepage = https://github.com/stephenmcd/grappelli-safe; - downloadPage = http://pypi.python.org/pypi/grappelli_safe/; + homepage = "https://github.com/stephenmcd/grappelli-safe"; + downloadPage = "http://pypi.python.org/pypi/grappelli_safe/"; license = licenses.free; maintainers = with maintainers; [ prikhi ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/graspy/default.nix b/pkgs/development/python-modules/graspy/default.nix new file mode 100644 index 00000000000..2a7fab12fa2 --- /dev/null +++ b/pkgs/development/python-modules/graspy/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, pytest +, pytestcov +, matplotlib +, networkx +, numpy +, scikitlearn +, scipy +, seaborn +}: + +buildPythonPackage rec { + pname = "graspy"; + version = "0.2"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "neurodata"; + repo = pname; + rev = "v${version}"; + sha256 = "1ss7d71lwblimg7ri88ir9w59j0ri13wl75091hjf7q0mchqr6yd"; + }; + + propagatedBuildInputs = [ + matplotlib + networkx + numpy + scikitlearn + scipy + seaborn + ]; + + checkInputs = [ pytest pytestcov ]; + + checkPhase = '' + runHook preCheck + # `test_autogmm` takes too long; fixed in next release (graspy/pull/328) + pytest tests -k 'not test_autogmm' + runHook postCheck + ''; + + meta = with lib; { + homepage = "https://graspy.neurodata.io"; + description = "A package for graph statistical algorithms"; + license = licenses.asl20; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/development/python-modules/greatfet/default.nix b/pkgs/development/python-modules/greatfet/default.nix index c6fddd1554c..b4048c922da 100644 --- a/pkgs/development/python-modules/greatfet/default.nix +++ b/pkgs/development/python-modules/greatfet/default.nix @@ -24,7 +24,7 @@ buildPythonPackage { meta = { description = "Hardware hacking with the greatfet"; - homepage = https://greatscottgadgets.com/greatfet; + homepage = "https://greatscottgadgets.com/greatfet"; license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ mog ]; diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index a1167f24035..1bf59a24dd4 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python test runner"; - homepage = https://github.com/CleanCut/green; + homepage = "https://github.com/CleanCut/green"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/greenlet/default.nix b/pkgs/development/python-modules/greenlet/default.nix index 3754f08c28b..f6cff7411d2 100644 --- a/pkgs/development/python-modules/greenlet/default.nix +++ b/pkgs/development/python-modules/greenlet/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { ''; meta = { - homepage = https://pypi.python.org/pypi/greenlet; + homepage = "https://pypi.python.org/pypi/greenlet"; description = "Module for lightweight in-process concurrent programming"; license = lib.licenses.lgpl2; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/grequests/default.nix b/pkgs/development/python-modules/grequests/default.nix index 0557fe787e8..9534e416550 100644 --- a/pkgs/development/python-modules/grequests/default.nix +++ b/pkgs/development/python-modules/grequests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Asynchronous HTTP requests"; - homepage = https://github.com/kennethreitz/grequests; + homepage = "https://github.com/kennethreitz/grequests"; license = with licenses; [ bsd2 ]; maintainers = with maintainers; [ matejc ]; }; diff --git a/pkgs/development/python-modules/grip/default.nix b/pkgs/development/python-modules/grip/default.nix index d812d58b74c..cf29b11b268 100644 --- a/pkgs/development/python-modules/grip/default.nix +++ b/pkgs/development/python-modules/grip/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { patches = [ # Render "front matter", used in our RFC template and elsewhere (fetchpatch { - url = https://github.com/joeyespo/grip/pull/249.patch; + url = "https://github.com/joeyespo/grip/pull/249.patch"; sha256 = "07za5iymfv647dfrvi6hhj54a96hgjyarys51zbi08c51shqyzpg"; }) ]; @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Preview GitHub Markdown files like Readme locally before committing them"; - homepage = https://github.com/joeyespo/grip; + homepage = "https://github.com/joeyespo/grip"; license = licenses.mit; maintainers = with maintainers; [ koral ]; }; 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 843c1b32f49..caa3b8cafb4 100644 --- a/pkgs/development/python-modules/grpc_google_iam_v1/default.nix +++ b/pkgs/development/python-modules/grpc_google_iam_v1/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "GRPC library for the google-iam-v1 service"; - homepage = https://github.com/googleapis/googleapis; + homepage = "https://github.com/googleapis/googleapis"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/grpcio-gcp/default.nix b/pkgs/development/python-modules/grpcio-gcp/default.nix index 067b27c8ffd..6af70be2f6c 100644 --- a/pkgs/development/python-modules/grpcio-gcp/default.nix +++ b/pkgs/development/python-modules/grpcio-gcp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "gRPC extensions for Google Cloud Platform"; - homepage = https://grpc.io; + homepage = "https://grpc.io"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index fcfccf29efd..f3eb93cd060 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.27.1"; + version = "1.28.1"; src = fetchPypi { inherit pname version; - sha256 = "e29aa3f7a47d37f8a15605e97bec580baa6bb7ead7114b8d2f20d7b28da30c5c"; + sha256 = "adf089aaf6e21358b12e39d9fa7c28611340d8399a918c0b72ff122ce9b7e0af"; }; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/gsd/1.7.nix b/pkgs/development/python-modules/gsd/1.7.nix index 311c4aba732..c9b3078cd46 100644 --- a/pkgs/development/python-modules/gsd/1.7.nix +++ b/pkgs/development/python-modules/gsd/1.7.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://bitbucket.org/glotzer/gsd; + homepage = "https://bitbucket.org/glotzer/gsd"; description = "General simulation data file format"; license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix index a26b02ee030..405dd7374fc 100644 --- a/pkgs/development/python-modules/gst-python/default.nix +++ b/pkgs/development/python-modules/gst-python/default.nix @@ -1,52 +1,42 @@ -{ buildPythonPackage, fetchurl, meson, ninja, stdenv, pkgconfig, python, pygobject3 -, gobject-introspection, gst-plugins-base, isPy3k +{ buildPythonPackage +, fetchurl +, meson +, ninja +, stdenv +, pkgconfig +, python +, pygobject3 +, gobject-introspection +, gst-plugins-base +, isPy3k }: -let +buildPythonPackage rec { pname = "gst-python"; - version = "1.14.4"; - name = "${pname}-${version}"; -in buildPythonPackage rec { - inherit pname version; + version = "1.16.2"; + format = "other"; outputs = [ "out" "dev" ]; src = fetchurl { - urls = [ - "${meta.homepage}/src/gst-python/${name}.tar.xz" - "mirror://gentoo/distfiles/${name}.tar.xz" - ]; - sha256 = "06ssx19fs6pg4d32p9ph9w4f0xwmxaw2dxfj17rqkn5njd7v5zfh"; + url = "${meta.homepage}/src/gst-python/${pname}-${version}.tar.xz"; + sha256 = "II3zFI1z2fQW0BZWRzdYXY6nY9kSAXMtRLX+aIxiiKg="; }; - patches = [ - # Meson build does not support Python 2 at the moment - # https://bugzilla.gnome.org/show_bug.cgi?id=796092 - (fetchurl { - name = "0002-meson-use-new-python-module.patch"; - url = https://bugzilla.gnome.org/attachment.cgi?id=371989; - sha256 = "1k46nvw175c1wvkqnx783i9d4w9vn431spcl48jb3y224jj3va08"; - }) - # Fixes `from gi.repository import Gst` when gst-python's site-package is in - # PYTHONPATH - (fetchurl { - url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/d64bbc1e0c3c948c148f505cc5f856ce56732880.diff; - sha256 = "1n9pxmcl1x491mp47avpcw2a6n71lm0haz6mfas168prkgsk8q3r"; - }) - # Fixes python2 build from the above changes - (fetchurl { - url = https://gitlab.freedesktop.org/gstreamer/gst-python/commit/f79ac2d1434d7ba9717f3e943cfdc76e121eb5dd.diff; - sha256 = "17a164b0v36g0kwiqdlkjx6g0pjhcs6ilizck7iky8bgjnmiypm1"; - }) + nativeBuildInputs = [ + meson + ninja + pkgconfig + python + gobject-introspection + gst-plugins-base ]; - # TODO: First python_dep in meson.build needs to be removed - postPatch = '' - substituteInPlace meson.build --replace python3 python${if isPy3k then "3" else "2"} - ''; - - nativeBuildInputs = [ meson ninja pkgconfig python gobject-introspection gst-plugins-base ]; + propagatedBuildInputs = [ + gst-plugins-base + pygobject3 + ]; mesonFlags = [ "-Dpython=python${if isPy3k then "3" else "2"}" @@ -59,10 +49,8 @@ in buildPythonPackage rec { # https://github.com/NixOS/nixpkgs/issues/47390 installCheckPhase = "meson test --print-errorlogs"; - propagatedBuildInputs = [ gst-plugins-base pygobject3 ]; - meta = { - homepage = https://gstreamer.freedesktop.org; + homepage = "https://gstreamer.freedesktop.org"; description = "Python bindings for GStreamer"; diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index 17dc8dea4f8..b6fe06610b3 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A small GTK app for keeping track of your time. It's main goal is to be as unintrusive as possible"; - homepage = https://mg.pov.lt/gtimelog/; + homepage = "https://mg.pov.lt/gtimelog/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ocharles ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/gtts-token/default.nix b/pkgs/development/python-modules/gtts-token/default.nix index 62d709aa921..d3443ef0c97 100644 --- a/pkgs/development/python-modules/gtts-token/default.nix +++ b/pkgs/development/python-modules/gtts-token/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Calculates a token to run the Google Translate text to speech"; - homepage = https://github.com/boudewijn26/gTTS-token; + homepage = "https://github.com/boudewijn26/gTTS-token"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/guessit/default.nix b/pkgs/development/python-modules/guessit/default.nix index 509488ebfa4..0a6a6c50e07 100644 --- a/pkgs/development/python-modules/guessit/default.nix +++ b/pkgs/development/python-modules/guessit/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { ]; meta = { - homepage = https://pypi.python.org/pypi/guessit; + homepage = "https://pypi.python.org/pypi/guessit"; license = lib.licenses.lgpl3; description = "A library for guessing information from video files"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix index 08b42b80799..7b4498afb2c 100644 --- a/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix +++ b/pkgs/development/python-modules/guzzle_sphinx_theme/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Sphinx theme used by Guzzle: http://guzzlephp.org"; - homepage = https://github.com/guzzle/guzzle_sphinx_theme/; + homepage = "https://github.com/guzzle/guzzle_sphinx_theme/"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/gyp/default.nix b/pkgs/development/python-modules/gyp/default.nix index db828eb222d..b9ad6ccec24 100644 --- a/pkgs/development/python-modules/gyp/default.nix +++ b/pkgs/development/python-modules/gyp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A tool to generate native build files"; - homepage = https://chromium.googlesource.com/external/gyp/+/master/README.md; + homepage = "https://chromium.googlesource.com/external/gyp/+/master/README.md"; license = licenses.bsd3; maintainers = with maintainers; [ codyopel ]; }; diff --git a/pkgs/development/python-modules/h11/default.nix b/pkgs/development/python-modules/h11/default.nix index 361ac0c59d1..28461311021 100644 --- a/pkgs/development/python-modules/h11/default.nix +++ b/pkgs/development/python-modules/h11/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { patches = [ # pytest5 compatability (fetchpatch { - url = https://github.com/python-hyper/h11/commit/241e220493a511a5f5a5d472cb88d72661a92ab1.patch; + url = "https://github.com/python-hyper/h11/commit/241e220493a511a5f5a5d472cb88d72661a92ab1.patch"; sha256 = "1s3ipf9s41m1lksws3xv3j133q7jnjdqvmgk4sfnm8q7li2dww39"; }) ]; diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix index 23e659ea7ae..2ee4a858f61 100644 --- a/pkgs/development/python-modules/h5py/default.nix +++ b/pkgs/development/python-modules/h5py/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { meta = { description = "Pythonic interface to the HDF5 binary data format"; - homepage = http://www.h5py.org/; + homepage = "http://www.h5py.org/"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix index 717c8a95453..d6438c6a5b8 100644 --- a/pkgs/development/python-modules/ha-ffmpeg/default.nix +++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/pvizeli/ha-ffmpeg; + homepage = "https://github.com/pvizeli/ha-ffmpeg"; description = "Library for home-assistant to handle ffmpeg"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/development/python-modules/habanero/default.nix b/pkgs/development/python-modules/habanero/default.nix index b58d4a30020..a7ec358ffd7 100644 --- a/pkgs/development/python-modules/habanero/default.nix +++ b/pkgs/development/python-modules/habanero/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Python interface to Library Genesis"; - homepage = https://habanero.readthedocs.io/en/latest/; + homepage = "https://habanero.readthedocs.io/en/latest/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 87a4a21568c..e13cae33960 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -1,14 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch, acme, aiohttp, snitun, attrs, pytest-aiohttp, warrant, pytest }: +{ lib, buildPythonPackage, fetchFromGitHub, fetchpatch +, acme, aiohttp, snitun, attrs, pycognito, warrant +, pytest-aiohttp, asynctest, pytest }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.31"; + version = "0.32.2"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "0hxdvdj41gq5ryafjhrcgf6y8l33lyf45a1vgwwbk0q29sir9bnr"; + sha256 = "1hfi5q222kgbgrj5yvr4lbhca49hcs6sc2yhxc4pjxqsc12bv1f1"; }; # upstreamed in https://github.com/NabuCasa/hass-nabucasa/pull/119 @@ -17,13 +19,13 @@ buildPythonPackage rec { cat setup.py ''; - propagatedBuildInputs = [ acme aiohttp snitun attrs warrant ]; + propagatedBuildInputs = [ acme aiohttp snitun attrs warrant pycognito ]; - checkInputs = [ pytest pytest-aiohttp ]; + checkInputs = [ pytest pytest-aiohttp asynctest ]; checkPhase = '' pytest tests/ - ''; + ''; meta = with lib; { homepage = "https://github.com/NabuCasa/hass-nabucasa"; diff --git a/pkgs/development/python-modules/hawkauthlib/default.nix b/pkgs/development/python-modules/hawkauthlib/default.nix index 46e49ba6b88..a819bca362d 100644 --- a/pkgs/development/python-modules/hawkauthlib/default.nix +++ b/pkgs/development/python-modules/hawkauthlib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "0.1.1"; src = fetchgit { - url = https://github.com/mozilla-services/hawkauthlib.git; + url = "https://github.com/mozilla-services/hawkauthlib.git"; rev = "refs/tags/v${version}"; sha256 = "0mr1mpx4j9q7sch9arwfvpysnpf2p7ijy7072wilxm8pnj0bwvsi"; }; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests webob ]; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/hawkauthlib; + homepage = "https://github.com/mozilla-services/hawkauthlib"; description = "Hawk Access Authentication protocol"; license = licenses.mpl20; }; diff --git a/pkgs/development/python-modules/hbmqtt/default.nix b/pkgs/development/python-modules/hbmqtt/default.nix index d94806c6219..b00e3a88d3e 100644 --- a/pkgs/development/python-modules/hbmqtt/default.nix +++ b/pkgs/development/python-modules/hbmqtt/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/beerfactory/hbmqtt; + homepage = "https://github.com/beerfactory/hbmqtt"; description = "MQTT client/broker using Python asynchronous I/O"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/hcs_utils/default.nix b/pkgs/development/python-modules/hcs_utils/default.nix index 51d42e5c8b7..445c2fe1f82 100644 --- a/pkgs/development/python-modules/hcs_utils/default.nix +++ b/pkgs/development/python-modules/hcs_utils/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library collecting some useful snippets"; - homepage = https://pypi.python.org/pypi/hcs_utils/1.3; + homepage = "https://pypi.python.org/pypi/hcs_utils/1.3"; license = licenses.isc; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 7351b274210..9f261417884 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hdbscan"; - version = "0.8.24"; + version = "0.8.25"; src = fetchPypi { inherit pname version; - sha256 = "fe31a7ea0ce2c9babd190a195e491834ff9f64c74daa4ca94fa65a88f701269a"; + sha256 = "17mi4nlifaygfw3n5ark5mfzx71pjxz3h6l455sh0i5mzh6czk4j"; }; checkInputs = [ nose ]; @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; - homepage = https://github.com/scikit-learn-contrib/hdbscan; + homepage = "https://github.com/scikit-learn-contrib/hdbscan"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/hdmedians/default.nix b/pkgs/development/python-modules/hdmedians/default.nix index 3a573f69c70..691e17a5a41 100644 --- a/pkgs/development/python-modules/hdmedians/default.nix +++ b/pkgs/development/python-modules/hdmedians/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/daleroberts/hdmedians; + homepage = "https://github.com/daleroberts/hdmedians"; description = "High-dimensional medians"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/heapdict/default.nix b/pkgs/development/python-modules/heapdict/default.nix index 841c3a45259..159e0a7d74e 100644 --- a/pkgs/development/python-modules/heapdict/default.nix +++ b/pkgs/development/python-modules/heapdict/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "a heap with decrease-key and increase-key operations."; - homepage = http://stutzbachenterprises.com; + homepage = "http://stutzbachenterprises.com"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/helper/default.nix b/pkgs/development/python-modules/helper/default.nix index 8aa6e1e921f..00e4ddce8b4 100644 --- a/pkgs/development/python-modules/helper/default.nix +++ b/pkgs/development/python-modules/helper/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Development library for quickly writing configurable applications and daemons"; - homepage = https://helper.readthedocs.org/; + homepage = "https://helper.readthedocs.org/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/hg-evolve/default.nix b/pkgs/development/python-modules/hg-evolve/default.nix index b2857eb2457..5aabc20ebd9 100644 --- a/pkgs/development/python-modules/hg-evolve/default.nix +++ b/pkgs/development/python-modules/hg-evolve/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "hg-evolve"; - version = "9.2.2"; + version = "9.3.0"; src = fetchPypi { inherit pname version; - sha256 = "08bjrgxv8zrrz5xxydzkjl4a8cw3g62nmzfnvdzxxcrf1c96qw76"; + sha256 = "1jqlckibf7wwrg7syx6mzqz6zsipmsl474rfpmin6j6axh4cdpn7"; }; doCheck = false; diff --git a/pkgs/development/python-modules/hg-git/default.nix b/pkgs/development/python-modules/hg-git/default.nix index 452b946a042..c82352f9bfe 100644 --- a/pkgs/development/python-modules/hg-git/default.nix +++ b/pkgs/development/python-modules/hg-git/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Push and pull from a Git server using Mercurial"; - homepage = http://hg-git.github.com/; + homepage = "http://hg-git.github.com/"; maintainers = with maintainers; [ koral ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/development/python-modules/hgsvn/default.nix b/pkgs/development/python-modules/hgsvn/default.nix index 056415df4f6..ccf8635b8b1 100644 --- a/pkgs/development/python-modules/hgsvn/default.nix +++ b/pkgs/development/python-modules/hgsvn/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; # too many assumptions meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/hgsvn; + homepage = "https://pypi.python.org/pypi/hgsvn"; description = "A set of scripts to work locally on Subversion checkouts using Mercurial"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/hidapi/default.nix b/pkgs/development/python-modules/hidapi/default.nix index 2d78a45da8c..cd70a7ba2ff 100644 --- a/pkgs/development/python-modules/hidapi/default.nix +++ b/pkgs/development/python-modules/hidapi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi"; - homepage = https://github.com/trezor/cython-hidapi; + homepage = "https://github.com/trezor/cython-hidapi"; # license can actually be either bsd3 or gpl3 # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt license = licenses.bsd3; diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 9fa28126452..ab6203581cd 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate HTML presentations from plain text sources"; - homepage = https://github.com/nyergler/hieroglyph/; + homepage = "https://github.com/nyergler/hieroglyph/"; license = licenses.bsd3; maintainers = with maintainers; [ juliendehos ]; }; diff --git a/pkgs/development/python-modules/hiro/default.nix b/pkgs/development/python-modules/hiro/default.nix index ea6cb6d34e3..f8ef8ba028d 100644 --- a/pkgs/development/python-modules/hiro/default.nix +++ b/pkgs/development/python-modules/hiro/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Time manipulation utilities for Python"; - homepage = https://hiro.readthedocs.io/en/latest/; + homepage = "https://hiro.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ nyarly ]; }; diff --git a/pkgs/development/python-modules/hmmlearn/default.nix b/pkgs/development/python-modules/hmmlearn/default.nix index e29c31e6fa7..c92c707d907 100644 --- a/pkgs/development/python-modules/hmmlearn/default.nix +++ b/pkgs/development/python-modules/hmmlearn/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Hidden Markov Models in Python with scikit-learn like API"; - homepage = https://github.com/hmmlearn/hmmlearn; + homepage = "https://github.com/hmmlearn/hmmlearn"; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/hocr-tools/default.nix b/pkgs/development/python-modules/hocr-tools/default.nix index 810d9ee6148..fdc578c76df 100644 --- a/pkgs/development/python-modules/hocr-tools/default.nix +++ b/pkgs/development/python-modules/hocr-tools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = " Tools for manipulating and evaluating the hOCR format for representing multi-lingual OCR results by embedding them into HTML"; - homepage = https://github.com/tmbdev/hocr-tools; + homepage = "https://github.com/tmbdev/hocr-tools"; license = licenses.asl20; maintainers = [ maintainers.kiwi ]; }; diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index b12ef64c602..51f1e20662a 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python data analysis and visualization seamless and simple"; - homepage = http://www.holoviews.org/; + homepage = "http://www.holoviews.org/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/homeassistant-pyozw/default.nix b/pkgs/development/python-modules/homeassistant-pyozw/default.nix index 5674db53e5a..e8aec6781fa 100644 --- a/pkgs/development/python-modules/homeassistant-pyozw/default.nix +++ b/pkgs/development/python-modules/homeassistant-pyozw/default.nix @@ -11,5 +11,5 @@ python_openzwave.overridePythonAttrs (oldAttrs: rec { }; patches = []; - meta.homepage = https://github.com/home-assistant/python-openzwave; + meta.homepage = "https://github.com/home-assistant/python-openzwave"; }) diff --git a/pkgs/development/python-modules/hoomd-blue/default.nix b/pkgs/development/python-modules/hoomd-blue/default.nix index 59528723d80..7d6ceb0cc5a 100644 --- a/pkgs/development/python-modules/hoomd-blue/default.nix +++ b/pkgs/development/python-modules/hoomd-blue/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = with stdenv.lib; { - homepage = http://glotzerlab.engin.umich.edu/hoomd-blue/; + homepage = "http://glotzerlab.engin.umich.edu/hoomd-blue/"; description = "HOOMD-blue is a general-purpose particle simulation toolkit"; license = licenses.bsdOriginal; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/python-modules/hopcroftkarp/default.nix b/pkgs/development/python-modules/hopcroftkarp/default.nix index e6033aa347e..995f10073c6 100644 --- a/pkgs/development/python-modules/hopcroftkarp/default.nix +++ b/pkgs/development/python-modules/hopcroftkarp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of HopcroftKarp's algorithm"; - homepage = https://github.com/sofiat-olaosebikan/hopcroftkarp; + homepage = "https://github.com/sofiat-olaosebikan/hopcroftkarp"; license = licenses.gpl1; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 293ad51e302..9b1fb75b461 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Instant coding answers via the command line"; - homepage = https://pypi.python.org/pypi/howdoi; + homepage = "https://pypi.python.org/pypi/howdoi"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/hsaudiotag/default.nix b/pkgs/development/python-modules/hsaudiotag/default.nix index d08d9e06b71..2da6e4a150c 100644 --- a/pkgs/development/python-modules/hsaudiotag/default.nix +++ b/pkgs/development/python-modules/hsaudiotag/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure Python library that lets one to read metadata from media files"; - homepage = http://hg.hardcoded.net/hsaudiotag/; + homepage = "http://hg.hardcoded.net/hsaudiotag/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/hsaudiotag3k/default.nix b/pkgs/development/python-modules/hsaudiotag3k/default.nix index 06f89f73333..28fa42b70f0 100644 --- a/pkgs/development/python-modules/hsaudiotag3k/default.nix +++ b/pkgs/development/python-modules/hsaudiotag3k/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure Python library that lets one to read metadata from media files"; - homepage = http://hg.hardcoded.net/hsaudiotag/; + homepage = "http://hg.hardcoded.net/hsaudiotag/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/hstspreload/default.nix b/pkgs/development/python-modules/hstspreload/default.nix index a4b7fb3a652..6f2bf5d511d 100644 --- a/pkgs/development/python-modules/hstspreload/default.nix +++ b/pkgs/development/python-modules/hstspreload/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "hstspreload"; - version = "2020.2.29"; + version = "2020.3.31"; disabled = isPy27; src = fetchFromGitHub { owner = "sethmlarson"; repo = pname; rev = version; - sha256 = "1s6f9sdr5l9dqri92s8qr7r1nyvai3vnpcaw06293kc8dribi0m2"; + sha256 = "12hncxzawvdsrssl350xxn1byfm1firgd3ziqfll4xhhw403jaa9"; }; # tests require network connection diff --git a/pkgs/development/python-modules/html2text/2018.nix b/pkgs/development/python-modules/html2text/2018.nix index cac88c55794..e0a60e1ef0a 100644 --- a/pkgs/development/python-modules/html2text/2018.nix +++ b/pkgs/development/python-modules/html2text/2018.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Turn HTML into equivalent Markdown-structured text"; - homepage = https://github.com/Alir3z4/html2text/; + homepage = "https://github.com/Alir3z4/html2text/"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/html2text/default.nix b/pkgs/development/python-modules/html2text/default.nix index a0462795d23..dd23ad6c619 100644 --- a/pkgs/development/python-modules/html2text/default.nix +++ b/pkgs/development/python-modules/html2text/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Turn HTML into equivalent Markdown-structured text"; - homepage = https://github.com/Alir3z4/html2text/; + homepage = "https://github.com/Alir3z4/html2text/"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix index db59bb49cf2..4962e89526d 100644 --- a/pkgs/development/python-modules/html5-parser/default.nix +++ b/pkgs/development/python-modules/html5-parser/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast C based HTML 5 parsing for python"; - homepage = https://html5-parser.readthedocs.io; + homepage = "https://html5-parser.readthedocs.io"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 82b48180709..81042ac3409 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -31,8 +31,8 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/html5lib/html5lib-python; - downloadPage = https://github.com/html5lib/html5lib-python/releases; + homepage = "https://github.com/html5lib/html5lib-python"; + downloadPage = "https://github.com/html5lib/html5lib-python/releases"; description = "HTML parser based on WHAT-WG HTML5 specification"; longDescription = '' html5lib is a pure-python library for parsing HTML. It is designed to diff --git a/pkgs/development/python-modules/htmllaundry/default.nix b/pkgs/development/python-modules/htmllaundry/default.nix index 787163d477e..df3bdb216a4 100644 --- a/pkgs/development/python-modules/htmllaundry/default.nix +++ b/pkgs/development/python-modules/htmllaundry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple HTML cleanup utilities"; license = licenses.bsd3; - homepage = https://pypi.org/project/htmllaundry/; + homepage = "https://pypi.org/project/htmllaundry/"; }; } diff --git a/pkgs/development/python-modules/htmlmin/default.nix b/pkgs/development/python-modules/htmlmin/default.nix index 538b75c3dd0..ee8a83a098c 100644 --- a/pkgs/development/python-modules/htmlmin/default.nix +++ b/pkgs/development/python-modules/htmlmin/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { description = "A configurable HTML Minifier with safety features"; - homepage = https://pypi.python.org/pypi/htmlmin; + homepage = "https://pypi.python.org/pypi/htmlmin"; license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.ahmedtd]; }; diff --git a/pkgs/development/python-modules/htmltreediff/default.nix b/pkgs/development/python-modules/htmltreediff/default.nix index c2c7f4e12f4..cd742606f8b 100644 --- a/pkgs/development/python-modules/htmltreediff/default.nix +++ b/pkgs/development/python-modules/htmltreediff/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = " Structure-aware diff for html and xml documents"; - homepage = https://github.com/christian-oudard/htmltreediff; + homepage = "https://github.com/christian-oudard/htmltreediff"; license = licenses.bsdOriginal; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/development/python-modules/httmock/default.nix b/pkgs/development/python-modules/httmock/default.nix index 53447544ca9..5913ceca777 100644 --- a/pkgs/development/python-modules/httmock/default.nix +++ b/pkgs/development/python-modules/httmock/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A mocking library for requests"; - homepage = https://github.com/patrys/httmock; + homepage = "https://github.com/patrys/httmock"; license = licenses.asl20; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/http-ece/default.nix b/pkgs/development/python-modules/http-ece/default.nix index 1f50608d3d1..eafa429b439 100644 --- a/pkgs/development/python-modules/http-ece/default.nix +++ b/pkgs/development/python-modules/http-ece/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Encipher HTTP Messages"; - homepage = https://github.com/martinthomson/encrypted-content-encoding; + homepage = "https://github.com/martinthomson/encrypted-content-encoding"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/http_signature/default.nix b/pkgs/development/python-modules/http_signature/default.nix index 48f06db1ba5..d86861a9251 100644 --- a/pkgs/development/python-modules/http_signature/default.nix +++ b/pkgs/development/python-modules/http_signature/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycrypto ]; meta = with stdenv.lib; { - homepage = https://github.com/atl/py-http-signature; + homepage = "https://github.com/atl/py-http-signature"; description = "Simple secure signing for HTTP requests using http-signature"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/httpauth/default.nix b/pkgs/development/python-modules/httpauth/default.nix index f1afd41ebed..bab2193f6a2 100644 --- a/pkgs/development/python-modules/httpauth/default.nix +++ b/pkgs/development/python-modules/httpauth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "WSGI HTTP Digest Authentication middleware"; - homepage = https://github.com/jonashaag/httpauth; + homepage = "https://github.com/jonashaag/httpauth"; license = licenses.bsd2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/httpbin/default.nix b/pkgs/development/python-modules/httpbin/default.nix index 77dc27f1096..cf937b6bae3 100644 --- a/pkgs/development/python-modules/httpbin/default.nix +++ b/pkgs/development/python-modules/httpbin/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/kennethreitz/httpbin; + homepage = "https://github.com/kennethreitz/httpbin"; description = "HTTP Request & Response Service"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/httplib2/default.nix b/pkgs/development/python-modules/httplib2/default.nix index c40f3453d6b..719a6a966c6 100644 --- a/pkgs/development/python-modules/httplib2/default.nix +++ b/pkgs/development/python-modules/httplib2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "httplib2"; - version = "0.15.0"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "a5f914f18f99cb9541660454a159e3b3c63241fc3ab60005bb88d97cc7a4fb58"; + sha256 = "0qc2vn98a4icp3h04pdhiykddz5q6wfi905f19zfxl26kyjd15ny"; }; # Needs setting up diff --git a/pkgs/development/python-modules/httpserver/default.nix b/pkgs/development/python-modules/httpserver/default.nix index 3bd61ec8afa..830e0c9b1bf 100644 --- a/pkgs/development/python-modules/httpserver/default.nix +++ b/pkgs/development/python-modules/httpserver/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Asyncio implementation of an HTTP server"; - homepage = https://github.com/thomwiggers/httpserver; + homepage = "https://github.com/thomwiggers/httpserver"; license = with lib.licenses; [ bsd3 ]; }; } diff --git a/pkgs/development/python-modules/httpsig/default.nix b/pkgs/development/python-modules/httpsig/default.nix index 24ba9be1382..30c918d86fe 100644 --- a/pkgs/development/python-modules/httpsig/default.nix +++ b/pkgs/development/python-modules/httpsig/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Sign HTTP requests with secure signatures"; license = licenses.mit; maintainers = with maintainers; [ srhb ]; - homepage = https://github.com/ahknight/httpsig; + homepage = "https://github.com/ahknight/httpsig"; }; } diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index fc83675fd65..b5d7f8cdb10 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A collection of framework independent HTTP protocol utils"; - homepage = https://github.com/MagicStack/httptools; + homepage = "https://github.com/MagicStack/httptools"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix index 04a0592d750..0b29c80fc39 100644 --- a/pkgs/development/python-modules/httpx/default.nix +++ b/pkgs/development/python-modules/httpx/default.nix @@ -16,18 +16,19 @@ , uvicorn , trio , brotli +, urllib3 }: buildPythonPackage rec { pname = "httpx"; - version = "0.9.5"; + version = "0.12.1"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "140z2j7b5hlcxvfb433hqv5b8irqa88hpq33lzr9m992djbhj2hb"; + sha256 = "1nrp4h1ppb5vll81fzxmks82p0hxcil9f3mja3dgya511kc703h6"; }; propagatedBuildInputs = [ @@ -39,6 +40,7 @@ buildPythonPackage rec { idna rfc3986 sniffio + urllib3 ]; checkInputs = [ @@ -61,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "The next generation HTTP client"; - homepage = https://github.com/encode/httpx; + homepage = "https://github.com/encode/httpx"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix index bb38c738760..6769b5371b8 100644 --- a/pkgs/development/python-modules/hug/default.nix +++ b/pkgs/development/python-modules/hug/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { 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/timothycrosley/hug"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/humanfriendly/default.nix b/pkgs/development/python-modules/humanfriendly/default.nix index bef32f947c3..8674231bc30 100644 --- a/pkgs/development/python-modules/humanfriendly/default.nix +++ b/pkgs/development/python-modules/humanfriendly/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Human friendly output for text interfaces using Python"; - homepage = https://humanfriendly.readthedocs.io/; + homepage = "https://humanfriendly.readthedocs.io/"; license = licenses.mit; maintainers = with maintainers; [ montag451 ]; }; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index f1fac28dd93..d54c932ae32 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python humanize utilities"; - homepage = https://github.com/jmoiron/humanize; + homepage = "https://github.com/jmoiron/humanize"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/hvplot/default.nix b/pkgs/development/python-modules/hvplot/default.nix index 2079f849769..0bf09419c0c 100644 --- a/pkgs/development/python-modules/hvplot/default.nix +++ b/pkgs/development/python-modules/hvplot/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "A high-level plotting API for the PyData ecosystem built on HoloViews"; - homepage = https://hvplot.pyviz.org; + homepage = "https://hvplot.pyviz.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/hydra/default.nix b/pkgs/development/python-modules/hydra/default.nix index 9087be43f95..42f2812a6e1 100644 --- a/pkgs/development/python-modules/hydra/default.nix +++ b/pkgs/development/python-modules/hydra/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework for configuring complex applications"; - homepage = https://hydra.cc; + homepage = "https://hydra.cc"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/hypothesis/default.nix b/pkgs/development/python-modules/hypothesis/default.nix index 9e3b0cdc894..834f1039fd7 100644 --- a/pkgs/development/python-modules/hypothesis/default.nix +++ b/pkgs/development/python-modules/hypothesis/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library for property based testing"; - homepage = https://github.com/HypothesisWorks/hypothesis; + homepage = "https://github.com/HypothesisWorks/hypothesis"; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 707a58ff85e..f5a8fc1e46c 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An improved Python library to control i3wm and sway"; - homepage = https://github.com/acrisci/i3ipc-python; + homepage = "https://github.com/acrisci/i3ipc-python"; license = licenses.bsd3; maintainers = with maintainers; [ vanzef ]; }; diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 56aaf6ec71a..e4ce6425f26 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Productivity-centric Python Big Data Framework"; - homepage = https://github.com/ibis-project/ibis; + homepage = "https://github.com/ibis-project/ibis"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ibis/default.nix b/pkgs/development/python-modules/ibis/default.nix index 6b405366c7e..2d4a19107ce 100644 --- a/pkgs/development/python-modules/ibis/default.nix +++ b/pkgs/development/python-modules/ibis/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A lightweight template engine"; - homepage = https://github.com/dmulholland/ibis; + homepage = "https://github.com/dmulholland/ibis"; license = licenses.publicDomain; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ibmquantumexperience/default.nix b/pkgs/development/python-modules/ibmquantumexperience/default.nix deleted file mode 100644 index dcf39dd24f0..00000000000 --- a/pkgs/development/python-modules/ibmquantumexperience/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, requests -, requests_ntlm -}: - -buildPythonPackage rec { - pname = "IBMQuantumExperience"; - version = "2.0.4"; - - src = fetchPypi { - inherit pname version; - sha256 = "0szn743sbm3cs80982cf4994c1xcg6iz5xkhdbpm1kfv5qn1phja"; - }; - - propagatedBuildInputs = [ - requests - requests_ntlm - ]; - - # test requires an API token - doCheck = false; - - meta = { - description = "A Python library for the Quantum Experience API"; - homepage = https://github.com/QISKit/qiskit-api-py; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - pandaman - ]; - }; -} diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 7102995cdf2..c0858605bd7 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.4.11"; + version = "1.4.13"; src = fetchPypi { inherit pname version; - sha256 = "15kbcgqz6zf9qqvyw3pwy611knv1lyaqmc213ivmqciq3zifn96q"; + sha256 = "12adarxndb9f5kgbfch9644h86jhbf6vc1d5c5iiqnjqws9n495b"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/idna-ssl/default.nix b/pkgs/development/python-modules/idna-ssl/default.nix index a8a040d39e2..ba11a39f5d9 100644 --- a/pkgs/development/python-modules/idna-ssl/default.nix +++ b/pkgs/development/python-modules/idna-ssl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Patch ssl.match_hostname for Unicode(idna) domains support"; - homepage = https://github.com/aio-libs/idna-ssl; + homepage = "https://github.com/aio-libs/idna-ssl"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/ifaddr/default.nix b/pkgs/development/python-modules/ifaddr/default.nix index e5087a10536..e9f5fed49a3 100644 --- a/pkgs/development/python-modules/ifaddr/default.nix +++ b/pkgs/development/python-modules/ifaddr/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pydron/ifaddr; + homepage = "https://github.com/pydron/ifaddr"; description = "Enumerates all IP addresses on all network adapters of the system"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index 1ded86af3fb..cd682072707 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "High-level training library for PyTorch"; - homepage = https://pytorch.org/ignite; + homepage = "https://pytorch.org/ignite"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/image-match/default.nix b/pkgs/development/python-modules/image-match/default.nix index 49d1062abc3..6bb45f83790 100644 --- a/pkgs/development/python-modules/image-match/default.nix +++ b/pkgs/development/python-modules/image-match/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ascribe/image-match; + homepage = "https://github.com/ascribe/image-match"; description = "Quickly search over billions of images"; license = licenses.asl20; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index 406417d6cc5..f77e2dcab0d 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/bethgelab/imagecorruptions; + homepage = "https://github.com/bethgelab/imagecorruptions"; description = "This package provides a set of image corruptions"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index 5d07024656e..e3a6e3bfd8d 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "FFMPEG wrapper for Python"; - homepage = https://github.com/imageio/imageio-ffmpeg; + homepage = "https://github.com/imageio/imageio-ffmpeg"; license = licenses.bsd2; maintainers = [ maintainers.pmiddend ]; }; diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 0e5134eeb26..5433e1ea9e4 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for reading and writing a wide range of image, video, scientific, and volumetric data formats"; - homepage = http://imageio.github.io/; + homepage = "http://imageio.github.io/"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/imagesize/default.nix b/pkgs/development/python-modules/imagesize/default.nix index 6be9f76d380..aa7f1ea4724 100644 --- a/pkgs/development/python-modules/imagesize/default.nix +++ b/pkgs/development/python-modules/imagesize/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Getting image size from png/jpeg/jpeg2000/gif file"; - homepage = https://github.com/shibukawa/imagesize_py; + homepage = "https://github.com/shibukawa/imagesize_py"; license = with licenses; [ mit ]; }; diff --git a/pkgs/development/python-modules/imaplib2/default.nix b/pkgs/development/python-modules/imaplib2/default.nix index 0ceff353f9a..1825e1a40d8 100644 --- a/pkgs/development/python-modules/imaplib2/default.nix +++ b/pkgs/development/python-modules/imaplib2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A threaded Python IMAP4 client"; - homepage = https://github.com/bcoe/imaplib2; + homepage = "https://github.com/bcoe/imaplib2"; # See https://github.com/bcoe/imaplib2/issues/25 license = licenses.psfl; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/imbalanced-learn/0.4.nix b/pkgs/development/python-modules/imbalanced-learn/0.4.nix index e7d2c2f3714..1ec139d5b3a 100644 --- a/pkgs/development/python-modules/imbalanced-learn/0.4.nix +++ b/pkgs/development/python-modules/imbalanced-learn/0.4.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; - homepage = https://github.com/scikit-learn-contrib/imbalanced-learn; + homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 568fc825ab6..b2d15d5faa5 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library offering a number of re-sampling techniques commonly used in datasets showing strong between-class imbalance"; - homepage = https://github.com/scikit-learn-contrib/imbalanced-learn; + homepage = "https://github.com/scikit-learn-contrib/imbalanced-learn"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/imgaug/default.nix b/pkgs/development/python-modules/imgaug/default.nix index 603e25fce72..82f10c1bb74 100644 --- a/pkgs/development/python-modules/imgaug/default.nix +++ b/pkgs/development/python-modules/imgaug/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { checkInputs = [ opencv3 pytest ]; meta = with stdenv.lib; { - homepage = https://github.com/aleju/imgaug; + homepage = "https://github.com/aleju/imgaug"; description = "Image augmentation for machine learning experiments"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai rakesh4g ]; diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index 8ca0fe6df9f..c3b6b9c9e7e 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { description = "An immutable mapping type for Python"; - homepage = https://github.com/MagicStack/immutables; + homepage = "https://github.com/MagicStack/immutables"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index f22354e41b5..76545edcbeb 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read metadata from Python packages"; - homepage = https://importlib-metadata.readthedocs.io/; + homepage = "https://importlib-metadata.readthedocs.io/"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index f5769bf0b2d..6fba0a703e1 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Read resources from Python packages"; - homepage = https://importlib-resources.readthedocs.io/; + homepage = "https://importlib-resources.readthedocs.io/"; license = licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/importmagic/default.nix b/pkgs/development/python-modules/importmagic/default.nix index 0aa4a295f5d..5217474ac23 100644 --- a/pkgs/development/python-modules/importmagic/default.nix +++ b/pkgs/development/python-modules/importmagic/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Import Magic - automagically add, remove and manage imports"; - homepage = https://github.com/alecthomas/importmagic; + homepage = "https://github.com/alecthomas/importmagic"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/imread/default.nix b/pkgs/development/python-modules/imread/default.nix index 0711283a1b8..1e4ccde4b31 100644 --- a/pkgs/development/python-modules/imread/default.nix +++ b/pkgs/development/python-modules/imread/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python package to load images as numpy arrays"; - homepage = https://imread.readthedocs.io/en/latest/; + homepage = "https://imread.readthedocs.io/en/latest/"; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/imutils/default.nix b/pkgs/development/python-modules/imutils/default.nix index 45e795cd616..9a0797f095f 100644 --- a/pkgs/development/python-modules/imutils/default.nix +++ b/pkgs/development/python-modules/imutils/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jrosebr1/imutils; + homepage = "https://github.com/jrosebr1/imutils"; description = "A series of convenience functions to make basic image processing functions"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/incremental/default.nix b/pkgs/development/python-modules/incremental/default.nix index a97a98b207a..6241bc869c1 100644 --- a/pkgs/development/python-modules/incremental/default.nix +++ b/pkgs/development/python-modules/incremental/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/twisted/treq; + homepage = "https://github.com/twisted/treq"; description = "Incremental is a small library that versions your Python projects"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index bccf49c56ad..bc2a24abe59 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkPhase = ''pytest >/dev/null || pytest''; meta = { - homepage = https://github.com/jpvanhal/inflection; + homepage = "https://github.com/jpvanhal/inflection"; description = "A port of Ruby on Rails inflector to Python"; maintainers = with lib.maintainers; [ NikolaMandic ilya-kolpakov ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index d624ebd60e5..cb86e18eb6e 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client for InfluxDB"; - homepage = https://github.com/influxdb/influxdb-python; + homepage = "https://github.com/influxdb/influxdb-python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix index eeb27b14080..c4597650fe7 100644 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "InfluxDB storage plugin for Graphite-API"; - homepage = https://github.com/InfluxGraph/influxgraph; + homepage = "https://github.com/InfluxGraph/influxgraph"; license = licenses.asl20; maintainers = with maintainers; [ basvandijk ]; }; diff --git a/pkgs/development/python-modules/inotify-simple/default.nix b/pkgs/development/python-modules/inotify-simple/default.nix index 10c64fa6b3f..898737ca7b4 100644 --- a/pkgs/development/python-modules/inotify-simple/default.nix +++ b/pkgs/development/python-modules/inotify-simple/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple Python wrapper around inotify"; - homepage = https://github.com/chrisjbillington/inotify_simple; + homepage = "https://github.com/chrisjbillington/inotify_simple"; license = licenses.bsd2; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/intake/default.nix b/pkgs/development/python-modules/intake/default.nix index 487ffc35b1a..6cbf694955c 100644 --- a/pkgs/development/python-modules/intake/default.nix +++ b/pkgs/development/python-modules/intake/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Data load and catalog system"; - homepage = https://github.com/ContinuumIO/intake; + homepage = "https://github.com/ContinuumIO/intake"; license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/intelhex/default.nix b/pkgs/development/python-modules/intelhex/default.nix index 20098485ad4..0634e919024 100644 --- a/pkgs/development/python-modules/intelhex/default.nix +++ b/pkgs/development/python-modules/intelhex/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ]; meta = { - homepage = https://github.com/bialix/intelhex; + homepage = "https://github.com/bialix/intelhex"; description = "Python library for Intel HEX files manipulations"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ pjones ]; diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix index 6b393aea1e7..f9caaa058cb 100644 --- a/pkgs/development/python-modules/internetarchive/default.nix +++ b/pkgs/development/python-modules/internetarchive/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper for the various Internet Archive APIs"; - homepage = https://github.com/jjjake/internetarchive; + homepage = "https://github.com/jjjake/internetarchive"; license = licenses.agpl3; }; } diff --git a/pkgs/development/python-modules/interruptingcow/default.nix b/pkgs/development/python-modules/interruptingcow/default.nix index ee81c40febc..279fb1c9685 100644 --- a/pkgs/development/python-modules/interruptingcow/default.nix +++ b/pkgs/development/python-modules/interruptingcow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A watchdog that interrupts long running code"; - homepage = https://bitbucket.org/evzijst/interruptingcow; + homepage = "https://bitbucket.org/evzijst/interruptingcow"; license = licenses.mit; maintainers = with maintainers; [ benley ]; }; diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index b60eb0c7327..209920db2b6 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Editable interval tree data structure for Python 2 and 3"; - homepage = https://github.com/chaimleib/intervaltree; + homepage = "https://github.com/chaimleib/intervaltree"; license = [ licenses.asl20 ]; maintainers = [ maintainers.bennofs ]; }; diff --git a/pkgs/development/python-modules/intreehooks/default.nix b/pkgs/development/python-modules/intreehooks/default.nix index be8d3927c9f..e76a6997cb6 100644 --- a/pkgs/development/python-modules/intreehooks/default.nix +++ b/pkgs/development/python-modules/intreehooks/default.nix @@ -23,6 +23,6 @@ buildPythonPackage rec { description = "Load a PEP 517 backend from inside the source tree"; license = lib.licenses.mit; maintainers = [ lib.maintainers.fridh ]; - homepage = https://github.com/takluyver/intreehooks; + homepage = "https://github.com/takluyver/intreehooks"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/iocapture/default.nix b/pkgs/development/python-modules/iocapture/default.nix index 1e333d923a0..0f0466c8b3e 100644 --- a/pkgs/development/python-modules/iocapture/default.nix +++ b/pkgs/development/python-modules/iocapture/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Capture stdout, stderr easily."; - homepage = https://github.com/oinume/iocapture; + homepage = "https://github.com/oinume/iocapture"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/iowait/default.nix b/pkgs/development/python-modules/iowait/default.nix index c67d56b153e..dc8a1265f7a 100644 --- a/pkgs/development/python-modules/iowait/default.nix +++ b/pkgs/development/python-modules/iowait/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { meta = { description = "Platform-independent module for I/O completion events"; - homepage = https://launchpad.net/python-iowait; + homepage = "https://launchpad.net/python-iowait"; }; } diff --git a/pkgs/development/python-modules/ipaddress/default.nix b/pkgs/development/python-modules/ipaddress/default.nix index d5611959275..0074ad2420d 100644 --- a/pkgs/development/python-modules/ipaddress/default.nix +++ b/pkgs/development/python-modules/ipaddress/default.nix @@ -20,7 +20,7 @@ if (pythonAtLeast "3.3") then null else buildPythonPackage rec { meta = with stdenv.lib; { description = "Port of the 3.3+ ipaddress module to 2.6, 2.7, and 3.2"; - homepage = https://github.com/phihag/ipaddress; + homepage = "https://github.com/phihag/ipaddress"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/ipdb/default.nix b/pkgs/development/python-modules/ipdb/default.nix index 5de9e25bcf1..4b234cc11ac 100644 --- a/pkgs/development/python-modules/ipdb/default.nix +++ b/pkgs/development/python-modules/ipdb/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipdb"; - version = "0.13.0"; + version = "0.13.2"; disabled = isPyPy; # setupterm: could not find terminfo database src = fetchPypi { inherit pname version; - sha256 = "0nbs9m2pqg4j10m7c31vyb8h7wy29d9s8kiv0k2igbr821k1y3xr"; + sha256 = "0jcd849rx30y3wcgzsqbn06v0yjlzvb9x3076q0yxpycdwm1ryvp"; }; propagatedBuildInputs = [ ipython ]; diff --git a/pkgs/development/python-modules/ipdbplugin/default.nix b/pkgs/development/python-modules/ipdbplugin/default.nix index b092a9fa2ae..7c9ee263b2b 100644 --- a/pkgs/development/python-modules/ipdbplugin/default.nix +++ b/pkgs/development/python-modules/ipdbplugin/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose ipython ]; meta = with stdenv.lib; { - homepage = https://github.com/flavioamieiro/nose-ipdb/tree/master; + homepage = "https://github.com/flavioamieiro/nose-ipdb/tree/master"; description = "Nose plugin to use iPdb instead of Pdb when tests fail"; license = licenses.lgpl2; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/iptools/default.nix b/pkgs/development/python-modules/iptools/default.nix index 6b33edfca3c..9498ee2762a 100644 --- a/pkgs/development/python-modules/iptools/default.nix +++ b/pkgs/development/python-modules/iptools/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting"; - homepage = https://pypi.python.org/pypi/iptools; + homepage = "https://pypi.python.org/pypi/iptools"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/ipykernel/4.nix b/pkgs/development/python-modules/ipykernel/4.nix index 9ef4a96366d..d408c1185dc 100644 --- a/pkgs/development/python-modules/ipykernel/4.nix +++ b/pkgs/development/python-modules/ipykernel/4.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index 9c0ab175004..1e71e35de16 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -60,7 +60,7 @@ buildPythonPackage rec { meta = { description = "IPython Kernel for Jupyter"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/ipympl/default.nix b/pkgs/development/python-modules/ipympl/default.nix index ef023727d70..0c5da2cd7a9 100644 --- a/pkgs/development/python-modules/ipympl/default.nix +++ b/pkgs/development/python-modules/ipympl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ipympl"; - version = "0.3.3"; + version = "0.5.6"; src = fetchPypi { inherit pname version; - sha256 = "0m5sh2ha9hlgigc5xxsy7nd0gdadx797h1i66i9z616p0r43gx7d"; + sha256 = "1sak58wcpikn4ww1k8gr2vf1hmwzfly31hzcnwiizp7l0vk40qh7"; }; propagatedBuildInputs = [ ipywidgets matplotlib ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Matplotlib Jupyter Extension"; - homepage = https://github.com/matplotlib/jupyter-matplotlib; + homepage = "https://github.com/matplotlib/jupyter-matplotlib"; maintainers = with maintainers; [ jluttine ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index 3fa1acb875a..578dfd306b1 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -33,8 +33,8 @@ buildPythonPackage rec { meta = { description = "Interactive Parallel Computing with IPython"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix index dd0c97fc3c5..598e890bb1c 100644 --- a/pkgs/development/python-modules/ipython/5.nix +++ b/pkgs/development/python-modules/ipython/5.nix @@ -65,7 +65,7 @@ buildPythonPackage rec { meta = { description = "IPython: Productive Interactive Computing"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bjornfor orivej lnl7 ]; }; diff --git a/pkgs/development/python-modules/ipython/7.9.nix b/pkgs/development/python-modules/ipython/7.9.nix index c097bdbe9e1..4c8086def33 100644 --- a/pkgs/development/python-modules/ipython/7.9.nix +++ b/pkgs/development/python-modules/ipython/7.9.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = with lib; { description = "IPython: Productive Interactive Computing"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 23dc52e8334..fe89691431c 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "IPython: Productive Interactive Computing"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor fridh ]; }; diff --git a/pkgs/development/python-modules/ipython_genutils/default.nix b/pkgs/development/python-modules/ipython_genutils/default.nix index 0f3504780c2..51cf6986349 100644 --- a/pkgs/development/python-modules/ipython_genutils/default.nix +++ b/pkgs/development/python-modules/ipython_genutils/default.nix @@ -22,8 +22,8 @@ buildPythonPackage rec { meta = { description = "Vestigial utilities from IPython"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix new file mode 100644 index 00000000000..2b03fd368d9 --- /dev/null +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -0,0 +1,31 @@ +{ lib +, isPy27 +, buildPythonPackage +, fetchPypi + # Python Inputs +, ipywidgets +}: + +buildPythonPackage rec { + pname = "ipyvue"; + version = "1.3.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "01kp7d8iyz04d0m4njhv8rg72daqmgd93bdljwyffzxg71pwq92a"; + }; + + propagatedBuildInputs = [ ipywidgets ]; + + doCheck = false; # No tests in package or GitHub + pythonImportsCheck = [ "ipyvue" ]; + + meta = with lib; { + description = "Jupyter widgets base for Vue libraries."; + homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix new file mode 100644 index 00000000000..dc9df34c0d0 --- /dev/null +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchPypi + # Python Inputs +, ipyvue +}: + +buildPythonPackage rec { + pname = "ipyvuetify"; + version = "1.2.2"; + + # GitHub version tries to run npm (Node JS) + src = fetchPypi { + inherit pname version; + sha256 = "0vg3sdkdhba917xs6gyzwpp10gi2gszihf45cw2llwsfgb7kpfw8"; + }; + + propagatedBuildInputs = [ ipyvue ]; + + doCheck = false; # no tests on PyPi/GitHub + pythonImportsCheck = [ "ipyvuetify" ]; + + meta = with lib; { + description = "Jupyter widgets based on Vuetify UI Components."; + homepage = "https://github.com/mariobuikhuizen/ipyvuetify"; + license = licenses.mit; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix index 20f91f5e806..5f2b3299a02 100644 --- a/pkgs/development/python-modules/ipywidgets/default.nix +++ b/pkgs/development/python-modules/ipywidgets/default.nix @@ -39,8 +39,8 @@ buildPythonPackage rec { meta = { description = "IPython HTML widgets for Jupyter"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix index af12ba587d4..6b238163cb5 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.9.10"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "1a389556cc5cf82b7ad95924710101e3bd06d809d6f889a3f437975b275af944"; + sha256 = "1p7iaa6ykvhalpv09svxs50hnp25j5nv1zzp42n5r7a7rw70wlf8"; }; checkInputs = [ @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Extract, clean, transform, hyphenate and metadata for ISBNs"; - homepage = https://github.com/xlcnd/isbnlib; + homepage = "https://github.com/xlcnd/isbnlib"; license = licenses.lgpl3; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 6edf9a77186..22426d331c2 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper around isl, an integer set library"; - homepage = https://github.com/inducer/islpy; + homepage = "https://github.com/inducer/islpy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/iso-639/default.nix b/pkgs/development/python-modules/iso-639/default.nix index 59d0d27b8b6..7a510598dca 100644 --- a/pkgs/development/python-modules/iso-639/default.nix +++ b/pkgs/development/python-modules/iso-639/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; meta = with lib; { - homepage = https://github.com/noumar/iso639; + homepage = "https://github.com/noumar/iso639"; description = "ISO 639 library for Python"; license = licenses.agpl3; maintainers = with maintainers; [ zraexy ]; diff --git a/pkgs/development/python-modules/iso3166/default.nix b/pkgs/development/python-modules/iso3166/default.nix index 54d9aff280f..f6a4a00283c 100644 --- a/pkgs/development/python-modules/iso3166/default.nix +++ b/pkgs/development/python-modules/iso3166/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/deactivated/python-iso3166; + homepage = "https://github.com/deactivated/python-iso3166"; description = "Self-contained ISO 3166-1 country definitions"; license = licenses.mit; maintainers = with maintainers; [ zraexy ]; diff --git a/pkgs/development/python-modules/iso8601/default.nix b/pkgs/development/python-modules/iso8601/default.nix index 4f9ff70556b..28f8db12895 100644 --- a/pkgs/development/python-modules/iso8601/default.nix +++ b/pkgs/development/python-modules/iso8601/default.nix @@ -20,8 +20,8 @@ buildPythonPackage rec { ''; meta = { - homepage = https://bitbucket.org/micktwomey/pyiso8601/; + homepage = "https://bitbucket.org/micktwomey/pyiso8601/"; description = "Simple module to parse ISO 8601 dates"; maintainers = with lib.maintainers; [ phreedom ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/isodate/default.nix b/pkgs/development/python-modules/isodate/default.nix index 425a295e5a5..d46fb7ed74c 100644 --- a/pkgs/development/python-modules/isodate/default.nix +++ b/pkgs/development/python-modules/isodate/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "ISO 8601 date/time parser"; - homepage = http://cheeseshop.python.org/pypi/isodate; + homepage = "http://cheeseshop.python.org/pypi/isodate"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/isort/default.nix b/pkgs/development/python-modules/isort/default.nix index 8e292ba7cd5..b2ef4e66f36 100644 --- a/pkgs/development/python-modules/isort/default.nix +++ b/pkgs/development/python-modules/isort/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { meta = with lib; { description = "A Python utility / library to sort Python imports"; - homepage = https://github.com/timothycrosley/isort; + homepage = "https://github.com/timothycrosley/isort"; license = licenses.mit; maintainers = with maintainers; [ couchemar nand0p ]; }; diff --git a/pkgs/development/python-modules/itypes/default.nix b/pkgs/development/python-modules/itypes/default.nix index 1386ba39a26..efbec0fb8fa 100644 --- a/pkgs/development/python-modules/itypes/default.nix +++ b/pkgs/development/python-modules/itypes/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple immutable types for python"; - homepage = https://github.com/tomchristie/itypes; + homepage = "https://github.com/tomchristie/itypes"; license = licenses.bsd3; maintainers = with maintainers; [ ivegotasthma ]; }; diff --git a/pkgs/development/python-modules/j2cli/default.nix b/pkgs/development/python-modules/j2cli/default.nix index 98725ca4767..b2b80e2766c 100644 --- a/pkgs/development/python-modules/j2cli/default.nix +++ b/pkgs/development/python-modules/j2cli/default.nix @@ -1,9 +1,9 @@ { stdenv , buildPythonPackage , fetchPypi -, nose , jinja2 , pyyaml +, setuptools }: buildPythonPackage rec { @@ -15,8 +15,8 @@ buildPythonPackage rec { sha256 = "6f6f643b3fa5c0f72fbe9f07e246f8e138052b9f689e14c7c64d582c59709ae4"; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ jinja2 pyyaml ]; + doCheck = false; # tests aren't installed thus aren't found, so skip + propagatedBuildInputs = [ jinja2 pyyaml setuptools ]; meta = with stdenv.lib; { homepage = "https://github.com/kolypto/j2cli"; diff --git a/pkgs/development/python-modules/jabberbot/default.nix b/pkgs/development/python-modules/jabberbot/default.nix index 6c04e6945de..4e550bcca20 100644 --- a/pkgs/development/python-modules/jabberbot/default.nix +++ b/pkgs/development/python-modules/jabberbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A framework for writing Jabber/XMPP bots and services"; - homepage = http://thp.io/2007/python-jabberbot/; + homepage = "http://thp.io/2007/python-jabberbot/"; license = licenses.gpl3; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/jaraco_classes/default.nix b/pkgs/development/python-modules/jaraco_classes/default.nix index 8e5458509c4..c9ce6915d2e 100644 --- a/pkgs/development/python-modules/jaraco_classes/default.nix +++ b/pkgs/development/python-modules/jaraco_classes/default.nix @@ -1,12 +1,13 @@ -{ buildPythonPackage, fetchPypi, setuptools_scm, six, more-itertools }: +{ buildPythonPackage, fetchPypi, isPy27, setuptools_scm, six, more-itertools }: buildPythonPackage rec { pname = "jaraco.classes"; - version = "3.0.0"; + version = "3.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "886ad165d495e7d18781142d6dda4f0045053a038f9e63c38ef03e2f7127bafc"; + sha256 = "1avsxzm5mwylmy2zbxq3xvn48z5djb0qy3hwv4ryncprivzri1n3"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/jaraco_functools/default.nix b/pkgs/development/python-modules/jaraco_functools/default.nix index 7fc90d63f69..ac6eb936e62 100644 --- a/pkgs/development/python-modules/jaraco_functools/default.nix +++ b/pkgs/development/python-modules/jaraco_functools/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Additional functools in the spirit of stdlib's functools"; - homepage = https://github.com/jaraco/jaraco.functools; + homepage = "https://github.com/jaraco/jaraco.functools"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/jaraco_itertools/default.nix b/pkgs/development/python-modules/jaraco_itertools/default.nix index 59d8538bb1e..446a3874c48 100644 --- a/pkgs/development/python-modules/jaraco_itertools/default.nix +++ b/pkgs/development/python-modules/jaraco_itertools/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for working with iterables"; - homepage = https://github.com/jaraco/jaraco.itertools; + homepage = "https://github.com/jaraco/jaraco.itertools"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/jaraco_logging/default.nix b/pkgs/development/python-modules/jaraco_logging/default.nix index ae05a76da1d..1ac7b48c0fa 100644 --- a/pkgs/development/python-modules/jaraco_logging/default.nix +++ b/pkgs/development/python-modules/jaraco_logging/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Support for Python logging facility"; - homepage = https://github.com/jaraco/jaraco.logging; + homepage = "https://github.com/jaraco/jaraco.logging"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 0c4d2062901..9ade29bece1 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "jc"; - version = "1.9.2"; + version = "1.9.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1zn6skiv5nm7g8cs86n152ni79ck538bwdjynlh8n2k9dvfd5i8l"; + sha256 = "1hg6h3ag4pbilpmqylnj7dflz7avk3w8ngmk6psfqrizizwx0hnj"; }; propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ]; diff --git a/pkgs/development/python-modules/jdatetime/default.nix b/pkgs/development/python-modules/jdatetime/default.nix index 1fbdd510e71..d51d54287e7 100644 --- a/pkgs/development/python-modules/jdatetime/default.nix +++ b/pkgs/development/python-modules/jdatetime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Jalali datetime binding for python"; - homepage = https://pypi.python.org/pypi/jdatetime; + homepage = "https://pypi.python.org/pypi/jdatetime"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index eb3cdfaadd8..3a8da882d12 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/davidhalter/jedi; + homepage = "https://github.com/davidhalter/jedi"; description = "An autocompletion tool for Python that can be used for text editors"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/jeepney/default.nix b/pkgs/development/python-modules/jeepney/default.nix index 04e47ff6b58..f937b2b1252 100644 --- a/pkgs/development/python-modules/jeepney/default.nix +++ b/pkgs/development/python-modules/jeepney/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://gitlab.com/takluyver/jeepney; + homepage = "https://gitlab.com/takluyver/jeepney"; description = "Pure Python DBus interface"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/jellyfish/default.nix b/pkgs/development/python-modules/jellyfish/default.nix index fa8ce7b6298..45f427017fc 100644 --- a/pkgs/development/python-modules/jellyfish/default.nix +++ b/pkgs/development/python-modules/jellyfish/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest unicodecsv ]; meta = { - homepage = https://github.com/sunlightlabs/jellyfish; + homepage = "https://github.com/sunlightlabs/jellyfish"; description = "Approximate and phonetic matching of strings"; maintainers = with lib.maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/jenkinsapi/default.nix b/pkgs/development/python-modules/jenkinsapi/default.nix index bf5877c9f08..7fe7f2baa4a 100644 --- a/pkgs/development/python-modules/jenkinsapi/default.nix +++ b/pkgs/development/python-modules/jenkinsapi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python API for accessing resources on a Jenkins continuous-integration server"; - homepage = https://github.com/salimfadhley/jenkinsapi; + homepage = "https://github.com/salimfadhley/jenkinsapi"; maintainers = with maintainers; [ drets ]; license = licenses.mit; broken = true; diff --git a/pkgs/development/python-modules/jieba/default.nix b/pkgs/development/python-modules/jieba/default.nix index 2e64360c5c2..b515cd92b23 100644 --- a/pkgs/development/python-modules/jieba/default.nix +++ b/pkgs/development/python-modules/jieba/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Chinese Words Segementation Utilities"; - homepage = https://github.com/fxsjy/jieba; + homepage = "https://github.com/fxsjy/jieba"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 90dfc6fa7da..87c44d11a8c 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://jinja.pocoo.org/; + homepage = "http://jinja.pocoo.org/"; description = "Stand-alone template engine"; license = licenses.bsd3; longDescription = '' diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2_pluralize/default.nix index 5f80f4e4b20..4a62fa4c25b 100644 --- a/pkgs/development/python-modules/jinja2_pluralize/default.nix +++ b/pkgs/development/python-modules/jinja2_pluralize/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Jinja2 pluralize filters"; - homepage = https://github.com/audreyr/jinja2_pluralize; + homepage = "https://github.com/audreyr/jinja2_pluralize"; license = licenses.bsd3; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/jinja2_time/default.nix b/pkgs/development/python-modules/jinja2_time/default.nix index 69fbffa92b2..d84c16f1aba 100644 --- a/pkgs/development/python-modules/jinja2_time/default.nix +++ b/pkgs/development/python-modules/jinja2_time/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ arrow jinja2 ]; meta = with stdenv.lib; { - homepage = https://github.com/hackebrot/jinja2-time; + homepage = "https://github.com/hackebrot/jinja2-time"; description = "Jinja2 Extension for Dates and Times"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/jmespath/default.nix b/pkgs/development/python-modules/jmespath/default.nix index 848437b453d..ebea3546d9e 100644 --- a/pkgs/development/python-modules/jmespath/default.nix +++ b/pkgs/development/python-modules/jmespath/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ply ]; meta = with stdenv.lib; { - homepage = https://github.com/boto/jmespath; + homepage = "https://github.com/boto/jmespath"; description = "JMESPath allows you to declaratively specify how to extract elements from a JSON document"; license = "BSD"; }; diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix index 87b5a4d8bba..d34fc8cb570 100644 --- a/pkgs/development/python-modules/josepy/default.nix +++ b/pkgs/development/python-modules/josepy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "JOSE protocol implementation in Python"; - homepage = https://github.com/jezdez/josepy; + homepage = "https://github.com/jezdez/josepy"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 4c77a07da02..b30d2ee7e0f 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.10.2"; + version = "1.10.3"; propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "a5ce5195c0b54a68eb813649829143373823ca28caa4d7aa682442b87ebea1ce"; + sha256 = "0aaxi56qm2wmccsdj4v1lc158625c2g6ikqq950yv43i0pyyi3lp"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/json-merge-patch/default.nix b/pkgs/development/python-modules/json-merge-patch/default.nix index b0bc2a835c4..1846bfc596d 100644 --- a/pkgs/development/python-modules/json-merge-patch/default.nix +++ b/pkgs/development/python-modules/json-merge-patch/default.nix @@ -18,14 +18,14 @@ buildPythonPackage rec { # https://github.com/OpenDataServices/json-merge-patch/pull/1 (fetchpatch { name = "fully-qualified-json-merge-patch-import-on-tests"; - url = https://patch-diff.githubusercontent.com/raw/OpenDataServices/json-merge-patch/pull/1.patch; + url = "https://patch-diff.githubusercontent.com/raw/OpenDataServices/json-merge-patch/pull/1.patch"; sha256 = "1k6xsrxsmz03nwcqsf4gf0zsfnl2r20n83npic8z6bqlpl4lidl4"; }) ]; meta = with lib; { description = "JSON Merge Patch library"; - homepage = https://github.com/open-contracting/json-merge-patch; + homepage = "https://github.com/open-contracting/json-merge-patch"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/jsondiff/default.nix b/pkgs/development/python-modules/jsondiff/default.nix index 6b254a7221a..2a622d913a8 100644 --- a/pkgs/development/python-modules/jsondiff/default.nix +++ b/pkgs/development/python-modules/jsondiff/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Diff JSON and JSON-like structures in Python"; - homepage = https://github.com/ZoomerAnalytics/jsondiff; + homepage = "https://github.com/ZoomerAnalytics/jsondiff"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix index eec4c6b3846..cde440380b4 100644 --- a/pkgs/development/python-modules/jsonlines/default.nix +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to simplify working with jsonlines and ndjson data"; - homepage = https://github.com/wbolster/jsonlines; + homepage = "https://github.com/wbolster/jsonlines"; maintainers = with maintainers; [ sondr3 ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/jsonmerge/default.nix b/pkgs/development/python-modules/jsonmerge/default.nix index 9379abcc604..4fc558fd394 100644 --- a/pkgs/development/python-modules/jsonmerge/default.nix +++ b/pkgs/development/python-modules/jsonmerge/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Merge a series of JSON documents"; - homepage = https://github.com/avian2/jsonmerge; + homepage = "https://github.com/avian2/jsonmerge"; changelog = "https://github.com/avian2/jsonmerge/blob/jsonmerge-${version}/ChangeLog"; license = licenses.mit; maintainers = with maintainers; [ emily ]; diff --git a/pkgs/development/python-modules/jsonpath_rw/default.nix b/pkgs/development/python-modules/jsonpath_rw/default.nix index a109404c06f..4b842a02af8 100644 --- a/pkgs/development/python-modules/jsonpath_rw/default.nix +++ b/pkgs/development/python-modules/jsonpath_rw/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/kennknowles/python-jsonpath-rw; + homepage = "https://github.com/kennknowles/python-jsonpath-rw"; description = "A robust and significantly extended implementation of JSONPath for Python, with a clear AST for metaprogramming"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/jsonpickle/default.nix b/pkgs/development/python-modules/jsonpickle/default.nix index d21864d2682..528287028a2 100644 --- a/pkgs/development/python-modules/jsonpickle/default.nix +++ b/pkgs/development/python-modules/jsonpickle/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Python library for serializing any arbitrary object graph into JSON"; - homepage = http://jsonpickle.github.io/; + homepage = "http://jsonpickle.github.io/"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/jsonrpc-async/default.nix b/pkgs/development/python-modules/jsonrpc-async/default.nix index e18f3bc9b3d..c410b9407ea 100644 --- a/pkgs/development/python-modules/jsonrpc-async/default.nix +++ b/pkgs/development/python-modules/jsonrpc-async/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A JSON-RPC client library for asyncio"; - homepage = https://github.com/armills/jsonrpc-async; + homepage = "https://github.com/armills/jsonrpc-async"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/jsonrpc-base/default.nix b/pkgs/development/python-modules/jsonrpc-base/default.nix index a26a040eedd..3505a13bbd1 100644 --- a/pkgs/development/python-modules/jsonrpc-base/default.nix +++ b/pkgs/development/python-modules/jsonrpc-base/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A JSON-RPC client library base interface"; - homepage = https://github.com/armills/jsonrpc-base; + homepage = "https://github.com/armills/jsonrpc-base"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/jsonrpc-websocket/default.nix b/pkgs/development/python-modules/jsonrpc-websocket/default.nix index c0c2fe2a8ee..df5216bdd1a 100644 --- a/pkgs/development/python-modules/jsonrpc-websocket/default.nix +++ b/pkgs/development/python-modules/jsonrpc-websocket/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "jsonrpc-websocket"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f1aaca95db795d6a9f7bba52ff83c7fd4139050d0df93ee3a5a448adcfa0c0ac"; + sha256 = "029gxp6f06gmba7glxfdz5xfhs5kkqph7x78k38qqvdrmca4z450"; }; nativeBuildInputs = [ pep8 ]; @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A JSON-RPC websocket client library for asyncio"; - homepage = https://github.com/armills/jsonrpc-websocket; + homepage = "https://github.com/armills/jsonrpc-websocket"; license = licenses.bsd3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix index 2d017ca1101..27de988b3bd 100644 --- a/pkgs/development/python-modules/jsonrpclib-pelix/default.nix +++ b/pkgs/development/python-modules/jsonrpclib-pelix/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON RPC client library - Pelix compatible fork"; - homepage = https://pypi.python.org/pypi/jsonrpclib-pelix/; + homepage = "https://pypi.python.org/pypi/jsonrpclib-pelix/"; license = lib.licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/jsonrpclib/default.nix b/pkgs/development/python-modules/jsonrpclib/default.nix index 81dcdc07473..d37b4ce3ccb 100644 --- a/pkgs/development/python-modules/jsonrpclib/default.nix +++ b/pkgs/development/python-modules/jsonrpclib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON RPC client library"; - homepage = https://pypi.python.org/pypi/jsonrpclib/; + homepage = "https://pypi.python.org/pypi/jsonrpclib/"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.joachifm ]; }; diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix index 9ff267b6fce..d90040c4269 100644 --- a/pkgs/development/python-modules/jsonschema/default.nix +++ b/pkgs/development/python-modules/jsonschema/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/Julian/jsonschema; + homepage = "https://github.com/Julian/jsonschema"; description = "An implementation of JSON Schema validation for Python"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/junit-xml/default.nix b/pkgs/development/python-modules/junit-xml/default.nix index dcd26fabee7..7c5ffc9fad5 100644 --- a/pkgs/development/python-modules/junit-xml/default.nix +++ b/pkgs/development/python-modules/junit-xml/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Creates JUnit XML test result documents that can be read by tools such as Jenkins"; - homepage = https://github.com/kyrus/python-junit-xml; + homepage = "https://github.com/kyrus/python-junit-xml"; maintainers = with maintainers; [ multun ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/junitparser/default.nix b/pkgs/development/python-modules/junitparser/default.nix index 11bd1d60ab0..3a712251fc5 100644 --- a/pkgs/development/python-modules/junitparser/default.nix +++ b/pkgs/development/python-modules/junitparser/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "A JUnit/xUnit Result XML Parser"; license = licenses.asl20; - homepage = https://github.com/gastlygem/junitparser; + homepage = "https://github.com/gastlygem/junitparser"; maintainers = with maintainers; [ multun ]; }; } diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 77b56e01b0c..9c98895a8b2 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.github.com/Juniper/py-junos-eznc; + homepage = "http://www.github.com/Juniper/py-junos-eznc"; description = "Junos 'EZ' automation for non-programmers"; license = licenses.asl20; maintainers = with maintainers; [ xnaveira ]; diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 44c0a3514f5..2a5e1a988da 100644 --- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://repo2docker.readthedocs.io/en/latest/; + homepage = "https://repo2docker.readthedocs.io/en/latest/"; description = "Repo2docker: Turn code repositories into Jupyter enabled Docker Images"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index e5dec4c98e2..4855663ebc7 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Jupyter protocol implementation and client libraries"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index 535afa31ee1..c10f3026876 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyter core package. A base package on which Jupyter projects rely"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 8a228bebb0b..d6c505c4a17 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple LDAP Authenticator Plugin for JupyterHub"; - homepage = https://github.com/jupyterhub/ldapauthenticator; + homepage = "https://github.com/jupyterhub/ldapauthenticator"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix index 952e5b781a1..fa63af115f2 100644 --- a/pkgs/development/python-modules/jupyterhub/default.nix +++ b/pkgs/development/python-modules/jupyterhub/default.nix @@ -118,7 +118,7 @@ buildPythonPackage rec { meta = with lib; { description = "Serves multiple Jupyter notebook instances"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie cstrahan ]; }; diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 3faa0a2edc3..d3b67ba87bc 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.0.0"; + version = "2.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "17p8rpihid0103fyjndk2yvg18n3ypn3hxay92ckcv10vsbiys5b"; + sha256 = "10fwpgsi996nk2hcva14k8x6znczxgfmydvfsfrs1fpmmfmrl8wc"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 9a526169489..db9fd195ae5 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "1.0.7"; + version = "1.1.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1qnqxy6812py7xklg7xfrkadm0v4z8x6n1035i26h2z7y891ff0j"; + sha256 = "0cqpyy4jr3023c47ij08djkpx526gmz8fab45mcnws0glhp7xhms"; }; checkInputs = [ requests pytest ]; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index a77a1a576b4..8b2d56277ce 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.3.4"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "0jijf4a3iaskzi6frjwhd8drh7brn94r1zl7gni6d0dzr296mm93"; + sha256 = "126lmz702hbk7gyr4i6gkicmycx7zgsgjf47a6izq2d17bs0a9ji"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 9b219127069..1902f9bd4e4 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of JOSE Web standards"; - homepage = https://github.com/latchset/jwcrypto; + homepage = "https://github.com/latchset/jwcrypto"; license = licenses.lgpl3Plus; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/k5test/default.nix b/pkgs/development/python-modules/k5test/default.nix index d3937300a5e..80b62f1e448 100644 --- a/pkgs/development/python-modules/k5test/default.nix +++ b/pkgs/development/python-modules/k5test/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for setting up self-contained Kerberos 5 environment"; - homepage = https://github.com/pythongssapi/k5test; + homepage = "https://github.com/pythongssapi/k5test"; license = licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/kaa-base/default.nix b/pkgs/development/python-modules/kaa-base/default.nix index f0994cebe11..a0b8cd97ced 100644 --- a/pkgs/development/python-modules/kaa-base/default.nix +++ b/pkgs/development/python-modules/kaa-base/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generic application framework, providing the foundation for other modules"; - homepage = https://github.com/freevo/kaa-base; + homepage = "https://github.com/freevo/kaa-base"; license = licenses.lgpl21; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/kaa-metadata/default.nix b/pkgs/development/python-modules/kaa-metadata/default.nix index d78adf7fd39..31f87965a03 100644 --- a/pkgs/development/python-modules/kaa-metadata/default.nix +++ b/pkgs/development/python-modules/kaa-metadata/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for parsing media metadata, which can extract metadata (e.g., such as id3 tags) from a wide range of media files"; - homepage = https://github.com/freevo/kaa-metadata; + homepage = "https://github.com/freevo/kaa-metadata"; license = licenses.gpl2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 52c6e64aa10..953a5895034 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure Python client for Apache Kafka"; - homepage = https://github.com/dpkp/kafka-python; + homepage = "https://github.com/dpkp/kafka-python"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/kaptan/default.nix b/pkgs/development/python-modules/kaptan/default.nix index 5a6cf80a835..78a33a8e302 100644 --- a/pkgs/development/python-modules/kaptan/default.nix +++ b/pkgs/development/python-modules/kaptan/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Configuration manager for python applications"; - homepage = https://kaptan.readthedocs.io/; + homepage = "https://kaptan.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/kconfiglib/default.nix b/pkgs/development/python-modules/kconfiglib/default.nix index 8685fb8a3fa..ba8fecc470b 100644 --- a/pkgs/development/python-modules/kconfiglib/default.nix +++ b/pkgs/development/python-modules/kconfiglib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A flexible Python 2/3 Kconfig implementation and library"; - homepage = https://github.com/ulfalizer/Kconfiglib; + homepage = "https://github.com/ulfalizer/Kconfiglib"; license = licenses.isc; maintainers = with maintainers; [ teto ]; }; diff --git a/pkgs/development/python-modules/keepkey/default.nix b/pkgs/development/python-modules/keepkey/default.nix index bbe72befb6d..f43c7618b13 100644 --- a/pkgs/development/python-modules/keepkey/default.nix +++ b/pkgs/development/python-modules/keepkey/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "KeepKey Python client"; - homepage = https://github.com/keepkey/python-keepkey; + homepage = "https://github.com/keepkey/python-keepkey"; license = licenses.gpl3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix index c2361043e41..fec2d198fdd 100644 --- a/pkgs/development/python-modules/keepkey_agent/default.nix +++ b/pkgs/development/python-modules/keepkey_agent/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Using KeepKey as hardware-based SSH/PGP agent"; - homepage = https://github.com/romanz/trezor-agent; + homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; maintainers = with maintainers; [ hkjn np mmahut ]; }; diff --git a/pkgs/development/python-modules/keras-applications/default.nix b/pkgs/development/python-modules/keras-applications/default.nix index 54509f04e71..82ee6803d4b 100644 --- a/pkgs/development/python-modules/keras-applications/default.nix +++ b/pkgs/development/python-modules/keras-applications/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reference implementations of popular deep learning models"; - homepage = https://github.com/keras-team/keras-applications; + homepage = "https://github.com/keras-team/keras-applications"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/keras-preprocessing/default.nix b/pkgs/development/python-modules/keras-preprocessing/default.nix index 01a0cf0dfb7..cb4b6d249b6 100644 --- a/pkgs/development/python-modules/keras-preprocessing/default.nix +++ b/pkgs/development/python-modules/keras-preprocessing/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy data preprocessing and data augmentation for deep learning models"; - homepage = https://github.com/keras-team/keras-preprocessing; + homepage = "https://github.com/keras-team/keras-preprocessing"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 0c1f6f35d54..e255789aaf7 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Deep Learning library for Theano and TensorFlow"; - homepage = https://keras.io; + homepage = "https://keras.io"; license = licenses.mit; maintainers = with maintainers; [ NikolaMandic ]; }; diff --git a/pkgs/development/python-modules/kerberos/default.nix b/pkgs/development/python-modules/kerberos/default.nix index 3d581d763a5..7f5341a6a25 100644 --- a/pkgs/development/python-modules/kerberos/default.nix +++ b/pkgs/development/python-modules/kerberos/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Kerberos high-level interface"; - homepage = https://pypi.python.org/pypi/kerberos; + homepage = "https://pypi.python.org/pypi/kerberos"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/keyrings-alt/default.nix b/pkgs/development/python-modules/keyrings-alt/default.nix index aa873b63ab9..dcc16ded122 100644 --- a/pkgs/development/python-modules/keyrings-alt/default.nix +++ b/pkgs/development/python-modules/keyrings-alt/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; description = "Alternate keyring implementations"; - homepage = https://github.com/jaraco/keyrings.alt; + homepage = "https://github.com/jaraco/keyrings.alt"; maintainers = with maintainers; [ nyarly ]; }; } diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix index a109659ebdd..4134c47084a 100644 --- a/pkgs/development/python-modules/keyutils/default.nix +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A set of python bindings for keyutils"; - homepage = https://github.com/sassoftware/python-keyutils; + homepage = "https://github.com/sassoftware/python-keyutils"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index e41c4bbeee0..c54cad1987a 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "A fast implementation of the Cassowary constraint solver"; - homepage = https://github.com/nucleic/kiwi; + homepage = "https://github.com/nucleic/kiwi"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/klaus/default.nix b/pkgs/development/python-modules/klaus/default.nix index a2d171fbb9a..dd57c835738 100644 --- a/pkgs/development/python-modules/klaus/default.nix +++ b/pkgs/development/python-modules/klaus/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "The first Git web viewer that Just Works"; - homepage = https://github.com/jonashaag/klaus; + homepage = "https://github.com/jonashaag/klaus"; license = licenses.isc; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index 9b96ae038ca..f4c26edd0e4 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { name = "tests-expect-werkzeug-308.patch"; - url = https://github.com/twisted/klein/commit/e2a5835b83e37a2bc5faefbfe1890c529b18b9c6.patch; + url = "https://github.com/twisted/klein/commit/e2a5835b83e37a2bc5faefbfe1890c529b18b9c6.patch"; sha256 = "03j0bj3l3hnf7f96rb27i4bzy1iih79ll5bcah7gybdi1wpznh8w"; }) ]; diff --git a/pkgs/development/python-modules/kmapper/default.nix b/pkgs/development/python-modules/kmapper/default.nix index 67b9343ecca..f985a7e6965 100644 --- a/pkgs/development/python-modules/kmapper/default.nix +++ b/pkgs/development/python-modules/kmapper/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of Mapper algorithm for Topological Data Analysis"; - homepage = https://kepler-mapper.scikit-tda.org/; + homepage = "https://kepler-mapper.scikit-tda.org/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/knack/default.nix b/pkgs/development/python-modules/knack/default.nix index c3025311e10..fc65361b35c 100644 --- a/pkgs/development/python-modules/knack/default.nix +++ b/pkgs/development/python-modules/knack/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/microsoft/knack; + homepage = "https://github.com/microsoft/knack"; description = "A Command-Line Interface framework"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/development/python-modules/koji/default.nix b/pkgs/development/python-modules/koji/default.nix index aec1916c1ff..eac2ab59643 100644 --- a/pkgs/development/python-modules/koji/default.nix +++ b/pkgs/development/python-modules/koji/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "An RPM-based build system"; - homepage = https://pagure.io/koji; + homepage = "https://pagure.io/koji"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index e0ac9e0fc18..6fcb31a9458 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Messaging library for Python"; - homepage = https://github.com/celery/kombu; + homepage = "https://github.com/celery/kombu"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 6827480b9df..62b74516971 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Kubernetes python client"; - homepage = https://github.com/kubernetes-client/python; + homepage = "https://github.com/kubernetes-client/python"; license = licenses.asl20; maintainers = with maintainers; [ lsix ]; }; diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index c8279835c92..783faa7b5f6 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/Labelbox/Labelbox; + homepage = "https://github.com/Labelbox/Labelbox"; description = "Platform API for LabelBox"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; diff --git a/pkgs/development/python-modules/lammps-cython/default.nix b/pkgs/development/python-modules/lammps-cython/default.nix index df2a122d068..4c16010f4af 100644 --- a/pkgs/development/python-modules/lammps-cython/default.nix +++ b/pkgs/development/python-modules/lammps-cython/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "Pythonic Wrapper to LAMMPS using cython"; - homepage = https://gitlab.com/costrouc/lammps-cython; + homepage = "https://gitlab.com/costrouc/lammps-cython"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index d73940e56a6..4426e9cb9a8 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "A toolkit for working with and comparing the standardized codes for languages, such as ‘en’ for English or ‘es’ for Spanish"; - homepage = https://github.com/LuminosoInsight/langcodes; + homepage = "https://github.com/LuminosoInsight/langcodes"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/langdetect/default.nix b/pkgs/development/python-modules/langdetect/default.nix index dcd90dd89bd..57fee2664cd 100644 --- a/pkgs/development/python-modules/langdetect/default.nix +++ b/pkgs/development/python-modules/langdetect/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python port of Google's language-detection library"; - homepage = https://github.com/Mimino666/langdetect; + homepage = "https://github.com/Mimino666/langdetect"; license = licenses.asl20; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/larch/default.nix b/pkgs/development/python-modules/larch/default.nix index 9942168607e..a94b076ded3 100644 --- a/pkgs/development/python-modules/larch/default.nix +++ b/pkgs/development/python-modules/larch/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/larch/; + homepage = "http://liw.fi/larch/"; description = "Python B-tree library"; license = licenses.gpl3; maintainers = []; diff --git a/pkgs/development/python-modules/lark-parser/default.nix b/pkgs/development/python-modules/lark-parser/default.nix index ddf6cabcae9..41c16548032 100644 --- a/pkgs/development/python-modules/lark-parser/default.nix +++ b/pkgs/development/python-modules/lark-parser/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "lark-parser"; - version = "0.8.2"; + version = "0.8.5"; src = fetchFromGitHub { owner = "lark-parser"; repo = "lark"; rev = version; - sha256 = "1i585q27qlwk4rpgsh621s60im1j9ynwyz5pcc8s3ffmjam28vss"; + sha256 = "1rfybmr0rlljhc0dpd9npbw8x7r6dvnn2wvclz93rmgkzhmd3zah"; }; # tests of Nearley support require js2py diff --git a/pkgs/development/python-modules/lazy-object-proxy/default.nix b/pkgs/development/python-modules/lazy-object-proxy/default.nix index f174aa1066c..043e3e1123e 100644 --- a/pkgs/development/python-modules/lazy-object-proxy/default.nix +++ b/pkgs/development/python-modules/lazy-object-proxy/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A fast and thorough lazy object proxy"; - homepage = https://github.com/ionelmc/python-lazy-object-proxy; + homepage = "https://github.com/ionelmc/python-lazy-object-proxy"; license = with licenses; [ bsd2 ]; }; diff --git a/pkgs/development/python-modules/ldap/default.nix b/pkgs/development/python-modules/ldap/default.nix index 8f5cd7e7e88..70b4ba2bf1f 100644 --- a/pkgs/development/python-modules/ldap/default.nix +++ b/pkgs/development/python-modules/ldap/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python modules for implementing LDAP clients"; - homepage = https://www.python-ldap.org/; + homepage = "https://www.python-ldap.org/"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index 58acc263eff..d9694633704 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; # requires network meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/ldap3; + homepage = "https://pypi.python.org/pypi/ldap3"; description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/ldappool/default.nix b/pkgs/development/python-modules/ldappool/default.nix index e22ab22d5a7..d1b9da15cc5 100644 --- a/pkgs/development/python-modules/ldappool/default.nix +++ b/pkgs/development/python-modules/ldappool/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple connector pool for python-ldap"; - homepage = https://git.openstack.org/cgit/openstack/ldappool; + homepage = "https://git.openstack.org/cgit/openstack/ldappool"; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/ldaptor/default.nix b/pkgs/development/python-modules/ldaptor/default.nix index 614fe60ada9..817fe79c3c9 100644 --- a/pkgs/development/python-modules/ldaptor/default.nix +++ b/pkgs/development/python-modules/ldaptor/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "A Pure-Python Twisted library for LDAP"; - homepage = https://github.com/twisted/ldaptor; + homepage = "https://github.com/twisted/ldaptor"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/le/default.nix b/pkgs/development/python-modules/le/default.nix index cb0a8bc6348..927b3f44bcf 100644 --- a/pkgs/development/python-modules/le/default.nix +++ b/pkgs/development/python-modules/le/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ simplejson psutil ]; meta = with stdenv.lib; { - homepage = https://github.com/rapid7/le; + homepage = "https://github.com/rapid7/le"; description = "Logentries agent"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/leather/default.nix b/pkgs/development/python-modules/leather/default.nix index 98cc3a42074..30a76747723 100644 --- a/pkgs/development/python-modules/leather/default.nix +++ b/pkgs/development/python-modules/leather/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { - homepage = http://leather.rtfd.io; + homepage = "http://leather.rtfd.io"; description = "Python charting library"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/pkgs/development/python-modules/ledger_agent/default.nix index 4aaecf6bc76..605fbed98a1 100644 --- a/pkgs/development/python-modules/ledger_agent/default.nix +++ b/pkgs/development/python-modules/ledger_agent/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Using Ledger as hardware-based SSH/PGP agent"; - homepage = https://github.com/romanz/trezor-agent; + homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; maintainers = with maintainers; [ hkjn np mmahut ]; }; diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index 8d50f9846cc..87fece0f026 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library to communicate with Ledger Blue/Nano S"; - homepage = https://github.com/LedgerHQ/blue-loader-python; + homepage = "https://github.com/LedgerHQ/blue-loader-python"; license = licenses.asl20; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix index e55887a49f5..7fb3d873e74 100644 --- a/pkgs/development/python-modules/libagent/default.nix +++ b/pkgs/development/python-modules/libagent/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Using hardware wallets as SSH/GPG agent"; - homepage = https://github.com/romanz/trezor-agent; + homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/libais/default.nix b/pkgs/development/python-modules/libais/default.nix index 2fbe7207f4f..3d7408e8712 100644 --- a/pkgs/development/python-modules/libais/default.nix +++ b/pkgs/development/python-modules/libais/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { - homepage = https://github.com/schwehr/libais; + homepage = "https://github.com/schwehr/libais"; description = "Library for decoding maritime Automatic Identification System messages"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 8488343362d..6bcb7f80484 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Changaco/python-libarchive-c; + homepage = "https://github.com/Changaco/python-libarchive-c"; description = "Python interface to libarchive"; license = licenses.cc0; }; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index fdb6ebb3fe3..a3f795f254e 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Communication library between internal components for Ultimaker software"; - homepage = https://github.com/Ultimaker/libArcus; + homepage = "https://github.com/Ultimaker/libArcus"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar gebner ]; diff --git a/pkgs/development/python-modules/libasyncns/default.nix b/pkgs/development/python-modules/libasyncns/default.nix index aed76728d7e..fa7320bdf4e 100644 --- a/pkgs/development/python-modules/libasyncns/default.nix +++ b/pkgs/development/python-modules/libasyncns/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { description = "libasyncns-python is a python binding for the asynchronous name service query library"; license = licenses.lgpl21; maintainers = [ maintainers.mic92 ]; - homepage = https://launchpad.net/libasyncns-python; + homepage = "https://launchpad.net/libasyncns-python"; }; } diff --git a/pkgs/development/python-modules/libcloud/default.nix b/pkgs/development/python-modules/libcloud/default.nix index 3d505166e4a..f78501b8ced 100644 --- a/pkgs/development/python-modules/libcloud/default.nix +++ b/pkgs/development/python-modules/libcloud/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A unified interface to many cloud providers"; - homepage = http://incubator.apache.org/libcloud/; + homepage = "http://incubator.apache.org/libcloud/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/libkeepass/default.nix b/pkgs/development/python-modules/libkeepass/default.nix index 09177f16bc6..0969e62c79e 100644 --- a/pkgs/development/python-modules/libkeepass/default.nix +++ b/pkgs/development/python-modules/libkeepass/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/libkeepass/libkeepass; + homepage = "https://github.com/libkeepass/libkeepass"; description = "A library to access KeePass 1.x/KeePassX (v3) and KeePass 2.x (v4) files"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jqueiroz ]; diff --git a/pkgs/development/python-modules/libmr/default.nix b/pkgs/development/python-modules/libmr/default.nix index c258b8dd865..7b1bbf6020d 100644 --- a/pkgs/development/python-modules/libmr/default.nix +++ b/pkgs/development/python-modules/libmr/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "libMR provides core MetaRecognition and Weibull fitting functionality"; - homepage = https://github.com/Vastlab/libMR; + homepage = "https://github.com/Vastlab/libMR"; license = licenses.bsd3; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix index 893789d961d..9e19fe5e8e1 100644 --- a/pkgs/development/python-modules/libnacl/default.nix +++ b/pkgs/development/python-modules/libnacl/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { maintainers = with maintainers; [ xvapx ]; description = "Python bindings for libsodium based on ctypes"; - homepage = https://pypi.python.org/pypi/libnacl; + homepage = "https://pypi.python.org/pypi/libnacl"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 8920fecf3da..6bd917a69e3 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module for audio and music processing"; - homepage = http://librosa.github.io/; + homepage = "http://librosa.github.io/"; license = licenses.isc; }; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index abde16d8700..c7b12e3daf5 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "C++ implementation of 3mf loading with SIP python bindings"; - homepage = https://github.com/Ultimaker/libSavitar; + homepage = "https://github.com/Ultimaker/libSavitar"; license = licenses.lgpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ abbradar orivej gebner ]; diff --git a/pkgs/development/python-modules/libsoundtouch/default.nix b/pkgs/development/python-modules/libsoundtouch/default.nix index e89b606879b..119cb6cbefa 100644 --- a/pkgs/development/python-modules/libsoundtouch/default.nix +++ b/pkgs/development/python-modules/libsoundtouch/default.nix @@ -28,7 +28,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Bose Soundtouch Python library"; - homepage = https://github.com/CharlesBlonde/libsoundtouch; + homepage = "https://github.com/CharlesBlonde/libsoundtouch"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/libthumbor/default.nix b/pkgs/development/python-modules/libthumbor/default.nix index 6c9987a5b8e..c8fab079715 100644 --- a/pkgs/development/python-modules/libthumbor/default.nix +++ b/pkgs/development/python-modules/libthumbor/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "libthumbor is the python extension to thumbor"; - homepage = https://github.com/heynemann/libthumbor; + homepage = "https://github.com/heynemann/libthumbor"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index d1220a6abbf..65accea559a 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scripting library for tmux"; - homepage = https://libtmux.readthedocs.io/; + homepage = "https://libtmux.readthedocs.io/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index b63704bf8e0..2d943837459 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/vpelletier/python-libusb1; + homepage = "https://github.com/vpelletier/python-libusb1"; description = "Python ctype-based wrapper around libusb1"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/development/python-modules/libversion/default.nix b/pkgs/development/python-modules/libversion/default.nix index 775d1a9ef85..21aa46348b1 100644 --- a/pkgs/development/python-modules/libversion/default.nix +++ b/pkgs/development/python-modules/libversion/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; meta = with stdenv.lib; { - homepage = https://github.com/repology/py-libversion; + homepage = "https://github.com/repology/py-libversion"; description = "Python bindings for libversion, which provides fast, powerful and correct generic version string comparison algorithm"; license = licenses.mit; maintainers = [ maintainers.ryantm ]; diff --git a/pkgs/development/python-modules/libvirt/5.9.0.nix b/pkgs/development/python-modules/libvirt/5.9.0.nix new file mode 100644 index 00000000000..7b0b7c438d9 --- /dev/null +++ b/pkgs/development/python-modules/libvirt/5.9.0.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchgit, pkgconfig, lxml, libvirt, nose }: + +buildPythonPackage rec { + pname = "libvirt"; + version = "5.9.0"; + + src = fetchgit { + url = "git://libvirt.org/libvirt-python.git"; + rev = "v${version}"; + sha256 = "0qvr0s7yasswy1s5cvkm91iifk33pb8s7nbb38zznc46706b358r"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libvirt lxml ]; + + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + + meta = with stdenv.lib; { + homepage = "http://www.libvirt.org/"; + description = "libvirt Python bindings"; + license = licenses.lgpl2; + maintainers = [ maintainers.fpletz ]; + }; +} diff --git a/pkgs/development/python-modules/libvirt/default.nix b/pkgs/development/python-modules/libvirt/default.nix index f4a07b9635f..43962c7d4d6 100644 --- a/pkgs/development/python-modules/libvirt/default.nix +++ b/pkgs/development/python-modules/libvirt/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "libvirt"; - version = "5.4.0"; + version = "6.2.0"; src = assert version == libvirt.version; fetchgit { - url = git://libvirt.org/libvirt-python.git; + url = "git://libvirt.org/libvirt-python.git"; rev = "v${version}"; - sha256 = "0ja35z90i3m7vsjfpzfm7awkmja3h0150376i5pzmf2q8vp61fi5"; + sha256 = "0a8crk29rmnw1kcgi72crb7syacdk03lkl05yand5cxs0l65jwdl"; }; nativeBuildInputs = [ pkgconfig ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.libvirt.org/; + homepage = "http://www.libvirt.org/"; description = "libvirt Python bindings"; license = licenses.lgpl2; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/development/python-modules/lightblue/default.nix b/pkgs/development/python-modules/lightblue/default.nix index f826bbecb0a..99db9e5c2f7 100644 --- a/pkgs/development/python-modules/lightblue/default.nix +++ b/pkgs/development/python-modules/lightblue/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.bluez pkgs.openobex ]; meta = with stdenv.lib; { - homepage = http://lightblue.sourceforge.net; + homepage = "http://lightblue.sourceforge.net"; description = "Cross-platform Bluetooth API for Python"; maintainers = with maintainers; [ leenaars ]; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/lightgbm/default.nix b/pkgs/development/python-modules/lightgbm/default.nix index 0a711b31d1a..95dac53c97c 100644 --- a/pkgs/development/python-modules/lightgbm/default.nix +++ b/pkgs/development/python-modules/lightgbm/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A fast, distributed, high performance gradient boosting (GBDT, GBRT, GBM or MART) framework"; - homepage = https://github.com/Microsoft/LightGBM; + homepage = "https://github.com/Microsoft/LightGBM"; license = licenses.mit; maintainers = with maintainers; [ teh costrouc ]; }; diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix index d0e1a10ae00..8b128e7cb89 100644 --- a/pkgs/development/python-modules/lightning/default.nix +++ b/pkgs/development/python-modules/lightning/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python client library for the Lightning data visualization server"; - homepage = http://lightning-viz.org; + homepage = "http://lightning-viz.org"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/limitlessled/default.nix b/pkgs/development/python-modules/limitlessled/default.nix index c2029aa6d6b..6d12f6d5149 100644 --- a/pkgs/development/python-modules/limitlessled/default.nix +++ b/pkgs/development/python-modules/limitlessled/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Control LimitlessLED products"; - homepage = https://github.com/happyleavesaoc/python-limitlessled/; + homepage = "https://github.com/happyleavesaoc/python-limitlessled/"; license = licenses.mit; maintainers = with maintainers; [ sephalon ]; }; diff --git a/pkgs/development/python-modules/limits/default.nix b/pkgs/development/python-modules/limits/default.nix index 614945d1364..5d0b1aacb55 100644 --- a/pkgs/development/python-modules/limits/default.nix +++ b/pkgs/development/python-modules/limits/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Rate limiting utilities"; license = licenses.mit; - homepage = https://limits.readthedocs.org/; + homepage = "https://limits.readthedocs.org/"; }; } diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index 00ea8dba663..a60b023acd7 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "Line-by-line profiler"; - homepage = https://github.com/rkern/line_profiler; + homepage = "https://github.com/rkern/line_profiler"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/linuxfd/default.nix b/pkgs/development/python-modules/linuxfd/default.nix index e5b8fe6f34c..ecccba3938a 100644 --- a/pkgs/development/python-modules/linuxfd/default.nix +++ b/pkgs/development/python-modules/linuxfd/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for the Linux eventfd/signalfd/timerfd/inotify syscalls"; - homepage = https://github.com/FrankAbelbeck/linuxfd; + homepage = "https://github.com/FrankAbelbeck/linuxfd"; license = with lib.licenses; [ lgpl3 ]; }; } diff --git a/pkgs/development/python-modules/livestreamer-curses/default.nix b/pkgs/development/python-modules/livestreamer-curses/default.nix index bf3b2cc1164..846f7633924 100644 --- a/pkgs/development/python-modules/livestreamer-curses/default.nix +++ b/pkgs/development/python-modules/livestreamer-curses/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ livestreamer ]; meta = with stdenv.lib; { - homepage = https://github.com/gapato/livestreamer-curses; + homepage = "https://github.com/gapato/livestreamer-curses"; description = "Curses frontend for livestreamer"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index fb8f74d7219..da789c0f6a6 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://livestreamer.tanuki.se; + homepage = "http://livestreamer.tanuki.se"; description = '' Livestreamer is CLI program that extracts streams from various services and pipes them into a video player of choice. diff --git a/pkgs/development/python-modules/llfuse/default.nix b/pkgs/development/python-modules/llfuse/default.nix index 02adb5a8d16..1fa97d2949c 100644 --- a/pkgs/development/python-modules/llfuse/default.nix +++ b/pkgs/development/python-modules/llfuse/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for the low-level FUSE API"; - homepage = https://github.com/python-llfuse/python-llfuse; + homepage = "https://github.com/python-llfuse/python-llfuse"; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index 8032588201b..0878424abb6 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = { description = "A lightweight LLVM python binding for writing JIT compilers"; - homepage = http://llvmlite.pydata.org/; + homepage = "http://llvmlite.pydata.org/"; license = stdenv.lib.licenses.bsd2; maintainers = with stdenv.lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index d05acd21c10..0078c917567 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/moggers87/lmtpd; + homepage = "https://github.com/moggers87/lmtpd"; description = "LMTP counterpart to smtpd in the Python standard library"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/locket/default.nix b/pkgs/development/python-modules/locket/default.nix index a4d7a8ce706..d98ab637974 100644 --- a/pkgs/development/python-modules/locket/default.nix +++ b/pkgs/development/python-modules/locket/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Locket implements a lock that can be used by multiple processes provided they use the same path."; - homepage = https://github.com/mwilliamson/locket.py; + homepage = "https://github.com/mwilliamson/locket.py"; license = licenses.bsd2; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/lockfile/default.nix b/pkgs/development/python-modules/lockfile/default.nix index 15cfee67f84..295c8eaf979 100644 --- a/pkgs/development/python-modules/lockfile/default.nix +++ b/pkgs/development/python-modules/lockfile/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://launchpad.net/pylockfile; + homepage = "https://launchpad.net/pylockfile"; description = "Platform-independent advisory file locking capability for Python applications"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/logilab/common.nix b/pkgs/development/python-modules/logilab/common.nix index 8a23b69cf67..9c4b6dbd791 100644 --- a/pkgs/development/python-modules/logilab/common.nix +++ b/pkgs/development/python-modules/logilab/common.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python packages and modules used by Logilab "; - homepage = https://www.logilab.org/project/logilab-common; + homepage = "https://www.logilab.org/project/logilab-common"; license = licenses.lgpl21; }; } diff --git a/pkgs/development/python-modules/logilab_astng/default.nix b/pkgs/development/python-modules/logilab_astng/default.nix index 53284d12228..81879b2218d 100644 --- a/pkgs/development/python-modules/logilab_astng/default.nix +++ b/pkgs/development/python-modules/logilab_astng/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ logilab_common ]; meta = with stdenv.lib; { - homepage = https://www.logilab.org/project/logilab-astng; + homepage = "https://www.logilab.org/project/logilab-astng"; description = "Python Abstract Syntax Tree New Generation"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/logster/default.nix b/pkgs/development/python-modules/logster/default.nix index e4b57e4ce40..7f3a4eeb83b 100644 --- a/pkgs/development/python-modules/logster/default.nix +++ b/pkgs/development/python-modules/logster/default.nix @@ -16,6 +16,6 @@ buildPythonPackage rec { meta = with lib; { description = "Parses log files, generates metrics for Graphite and Ganglia"; license = licenses.gpl3Plus; - homepage = https://github.com/etsy/logster; + homepage = "https://github.com/etsy/logster"; }; } diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index c12084f008e..410ca27c8aa 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ++ stdenv.lib.optionals stdenv.isDarwin [ "test_rotation_and_retention" "test_rotation_and_retention_timed_file" "test_renaming" "test_await_complete_inheritance" ]; meta = with stdenv.lib; { - homepage = https://github.com/Delgan/loguru; + homepage = "https://github.com/Delgan/loguru"; description = "Python logging made (stupidly) simple"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/logzero/default.nix b/pkgs/development/python-modules/logzero/default.nix index 098d9f3e06d..d5c7685832c 100644 --- a/pkgs/development/python-modules/logzero/default.nix +++ b/pkgs/development/python-modules/logzero/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/metachris/logzero; + homepage = "https://github.com/metachris/logzero"; description = "Robust and effective logging for Python 2 and 3"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/loo-py/default.nix b/pkgs/development/python-modules/loo-py/default.nix index fe765f5ff0a..16060c1c030 100644 --- a/pkgs/development/python-modules/loo-py/default.nix +++ b/pkgs/development/python-modules/loo-py/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "A code generator for array-based code on CPUs and GPUs"; - homepage = https://mathema.tician.de/software/loopy; + homepage = "https://mathema.tician.de/software/loopy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/lpod/default.nix b/pkgs/development/python-modules/lpod/default.nix index 9b262007706..effdc3f432a 100644 --- a/pkgs/development/python-modules/lpod/default.nix +++ b/pkgs/development/python-modules/lpod/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/lpod/lpod-python/; + homepage = "https://github.com/lpod/lpod-python/"; description = "Library implementing the ISO/IEC 26300 OpenDocument Format standard (ODF) "; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/lsi/default.nix b/pkgs/development/python-modules/lsi/default.nix index 2277a2be92f..5f193f52e9a 100644 --- a/pkgs/development/python-modules/lsi/default.nix +++ b/pkgs/development/python-modules/lsi/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "CLI for querying and SSHing onto AWS EC2 instances"; - homepage = https://github.com/NarrativeScience/lsi; + homepage = "https://github.com/NarrativeScience/lsi"; maintainers = [maintainers.adnelson]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index f0b3aa60f17..7bea2b04bbd 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Web crawler; fork of wpull used by grab-site"; - homepage = https://github.com/ludios/wpull; + homepage = "https://github.com/ludios/wpull"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ivan ]; }; diff --git a/pkgs/development/python-modules/luftdaten/default.nix b/pkgs/development/python-modules/luftdaten/default.nix index 9784d3af61f..dbbe3d25212 100644 --- a/pkgs/development/python-modules/luftdaten/default.nix +++ b/pkgs/development/python-modules/luftdaten/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "luftdaten"; - version = "0.6.3"; + version = "0.6.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "161g3s3nwbkn3s101g8l4axll0kk8xxahxnvjrjdg2cghcjq9n8n"; + sha256 = "1w1f0kmiwslg1dxn7gq0ak8f5wajlwl03r5zklshjc11j34b4d5i"; }; propagatedBuildInputs = [ aiohttp async-timeout ]; @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for interacting with luftdaten.info"; - homepage = https://github.com/fabaff/python-luftdaten; + homepage = "https://github.com/fabaff/python-luftdaten"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/lxc/default.nix b/pkgs/development/python-modules/lxc/default.nix index 26be7020c66..2798cb80075 100644 --- a/pkgs/development/python-modules/lxc/default.nix +++ b/pkgs/development/python-modules/lxc/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Out of tree python 2.7 binding for liblxc"; - homepage = https://github.com/lxc/python2-lxc; + homepage = "https://github.com/lxc/python2-lxc"; license = licenses.lgpl2; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix index 67c338b58c7..f39e71ed690 100644 --- a/pkgs/development/python-modules/lxml/default.nix +++ b/pkgs/development/python-modules/lxml/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pythonic binding for the libxml2 and libxslt libraries"; - homepage = https://lxml.de; + homepage = "https://lxml.de"; license = licenses.bsd3; maintainers = with maintainers; [ jonringer sjourdois ]; }; diff --git a/pkgs/development/python-modules/lzstring/default.nix b/pkgs/development/python-modules/lzstring/default.nix index cfd30082c1c..499c720d53f 100644 --- a/pkgs/development/python-modules/lzstring/default.nix +++ b/pkgs/development/python-modules/lzstring/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "lz-string for python"; - homepage = https://github.com/gkovacs/lz-string-python; + homepage = "https://github.com/gkovacs/lz-string-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ obadz ]; }; diff --git a/pkgs/development/python-modules/m2crypto/default.nix b/pkgs/development/python-modules/m2crypto/default.nix index 0ccf55e5bc4..0e079dd832c 100644 --- a/pkgs/development/python-modules/m2crypto/default.nix +++ b/pkgs/development/python-modules/m2crypto/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python crypto and SSL toolkit"; - homepage = https://gitlab.com/m2crypto/m2crypto; + homepage = "https://gitlab.com/m2crypto/m2crypto"; license = licenses.mit; maintainers = with maintainers; [ andrew-d ]; }; diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 612e2fd76b2..3de9ec079d4 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/miyakogi/m2r; + homepage = "https://github.com/miyakogi/m2r"; description = "converts a markdown file including reST markups to a valid reST format"; license = licenses.mit; maintainers = [ ]; diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix index 8dfa0038cdd..0ba4d08ff0d 100644 --- a/pkgs/development/python-modules/macfsevents/default.nix +++ b/pkgs/development/python-modules/macfsevents/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/malthe/macfsevents; + homepage = "https://github.com/malthe/macfsevents"; description = "Thread-based interface to file system observation primitives"; license = licenses.bsd2; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/python-modules/macropy/default.nix b/pkgs/development/python-modules/macropy/default.nix index 952740d7837..9048166773e 100644 --- a/pkgs/development/python-modules/macropy/default.nix +++ b/pkgs/development/python-modules/macropy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/lihaoyi/macropy; + homepage = "https://github.com/lihaoyi/macropy"; description = "Macros in Python: quasiquotes, case classes, LINQ and more"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; 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 28d09672584..571a92900c9 100644 --- a/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Securely transfer data between computers"; - homepage = https://github.com/warner/magic-wormhole-mailbox-server; + homepage = "https://github.com/warner/magic-wormhole-mailbox-server"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix index d6e3ac2b153..2d6a8d969d8 100644 --- a/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix +++ b/pkgs/development/python-modules/magic-wormhole-transit-relay/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Transit Relay server for Magic-Wormhole"; - homepage = https://github.com/warner/magic-wormhole-transit-relay; + homepage = "https://github.com/warner/magic-wormhole-transit-relay"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index 5db5c28a4cb..9e73001a149 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -23,18 +23,18 @@ buildPythonPackage rec { pname = "magic-wormhole"; - version = "0.11.2"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf"; + sha256 = "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv"; }; buildInputs = [ glibcLocales ]; propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ]; checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ]; - postPatch = '' + postPatch = stdenv.lib.optionalString stdenv.isLinux '' sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py ''; @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Securely transfer data between computers"; - homepage = https://github.com/warner/magic-wormhole; + homepage = "https://github.com/warner/magic-wormhole"; license = licenses.mit; # Currently broken on Python 2.7. See # https://github.com/NixOS/nixpkgs/issues/71826 diff --git a/pkgs/development/python-modules/magic/default.nix b/pkgs/development/python-modules/magic/default.nix index ee2c38fed53..98e6731a1b8 100644 --- a/pkgs/development/python-modules/magic/default.nix +++ b/pkgs/development/python-modules/magic/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A Python wrapper around libmagic"; - homepage = http://www.darwinsys.com/file/; + homepage = "http://www.darwinsys.com/file/"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/mahotas/default.nix b/pkgs/development/python-modules/mahotas/default.nix index 94bf0a0cb1e..f48c36bdb03 100644 --- a/pkgs/development/python-modules/mahotas/default.nix +++ b/pkgs/development/python-modules/mahotas/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Computer vision package based on numpy"; - homepage = https://mahotas.readthedocs.io/; + homepage = "https://mahotas.readthedocs.io/"; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/mail-parser/default.nix b/pkgs/development/python-modules/mail-parser/default.nix index 1f06f7f250a..fe68b507ecf 100644 --- a/pkgs/development/python-modules/mail-parser/default.nix +++ b/pkgs/development/python-modules/mail-parser/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A mail parser for python 2 and 3"; - homepage = https://github.com/SpamScope/mail-parser; + homepage = "https://github.com/SpamScope/mail-parser"; license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/mailman-hyperkitty/default.nix b/pkgs/development/python-modules/mailman-hyperkitty/default.nix index fd89260ab94..6abe5f5c6bc 100644 --- a/pkgs/development/python-modules/mailman-hyperkitty/default.nix +++ b/pkgs/development/python-modules/mailman-hyperkitty/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Mailman archiver plugin for HyperKitty"; - homepage = https://gitlab.com/mailman/mailman-hyperkitty; + homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; license = licenses.gpl3; maintainers = with maintainers; [ globin peti ]; }; diff --git a/pkgs/development/python-modules/mailman-rss/default.nix b/pkgs/development/python-modules/mailman-rss/default.nix index afce4521d5b..d0d103bfbec 100644 --- a/pkgs/development/python-modules/mailman-rss/default.nix +++ b/pkgs/development/python-modules/mailman-rss/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Mailman archive -> rss converter"; - homepage = https://github.com/kyamagu/mailman-rss; + homepage = "https://github.com/kyamagu/mailman-rss"; license = licenses.mit; maintainers = with maintainers; [ samueldr ]; }; diff --git a/pkgs/development/python-modules/manhole/default.nix b/pkgs/development/python-modules/manhole/default.nix index c8b77e9668f..13b887f6ee4 100644 --- a/pkgs/development/python-modules/manhole/default.nix +++ b/pkgs/development/python-modules/manhole/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ionelmc/python-manhole; + homepage = "https://github.com/ionelmc/python-manhole"; description = "Debugging manhole for Python applications"; license = licenses.bsd2; maintainers = with maintainers; [ ivan ]; diff --git a/pkgs/development/python-modules/manuel/default.nix b/pkgs/development/python-modules/manuel/default.nix index e08c61140d6..1f2c09d4370 100644 --- a/pkgs/development/python-modules/manuel/default.nix +++ b/pkgs/development/python-modules/manuel/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A documentation builder"; - homepage = https://pypi.python.org/pypi/manuel; + homepage = "https://pypi.python.org/pypi/manuel"; license = licenses.zpl20; }; diff --git a/pkgs/development/python-modules/mapbox/default.nix b/pkgs/development/python-modules/mapbox/default.nix index 1eec58919d5..f721228ddca 100644 --- a/pkgs/development/python-modules/mapbox/default.nix +++ b/pkgs/development/python-modules/mapbox/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook responses ]; meta = with lib; { - homepage = https://github.com/mapbox/mapbox-sdk-py; + homepage = "https://github.com/mapbox/mapbox-sdk-py"; license = licenses.mit; description = "Mapbox SDK for Python"; longDescription = "Low-level client API for Mapbox web services."; diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix index eb02941c1a1..a5dd00971d0 100644 --- a/pkgs/development/python-modules/mapsplotlib/default.nix +++ b/pkgs/development/python-modules/mapsplotlib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Custom Python plots on a Google Maps background"; - homepage = https://github.com/tcassou/mapsplotlib; + homepage = "https://github.com/tcassou/mapsplotlib"; license = licenses.mit; maintainers = [ maintainers.rob ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index 4a9e0113c68..29d38a1f2f0 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Mozilla Marionette protocol test automation harness"; - homepage = https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette; + homepage = "https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/manifestparser.nix b/pkgs/development/python-modules/marionette-harness/manifestparser.nix index 7316526aa28..45e24ec2e1a 100644 --- a/pkgs/development/python-modules/marionette-harness/manifestparser.nix +++ b/pkgs/development/python-modules/marionette-harness/manifestparser.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Mozilla test manifest handling"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index 4567d34932b..60e9e0460e7 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Mozilla Marionette driver"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Marionette; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Marionette"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozcrash.nix b/pkgs/development/python-modules/marionette-harness/mozcrash.nix index c5d91fbfef7..18b39307a17 100644 --- a/pkgs/development/python-modules/marionette-harness/mozcrash.nix +++ b/pkgs/development/python-modules/marionette-harness/mozcrash.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Minidump stack trace extractor"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozdevice.nix b/pkgs/development/python-modules/marionette-harness/mozdevice.nix index 9f1a682c2ce..03187c00bef 100644 --- a/pkgs/development/python-modules/marionette-harness/mozdevice.nix +++ b/pkgs/development/python-modules/marionette-harness/mozdevice.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Mozilla-authored device management"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozfile.nix b/pkgs/development/python-modules/marionette-harness/mozfile.nix index 9ca8ea0b789..829e909535a 100644 --- a/pkgs/development/python-modules/marionette-harness/mozfile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozfile.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "File utilities for Mozilla testing"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index 6862967e420..3520d23081b 100644 --- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Webserver for Mozilla testing"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozinfo.nix b/pkgs/development/python-modules/marionette-harness/mozinfo.nix index 080be7e04ef..1aca4cb5846 100644 --- a/pkgs/development/python-modules/marionette-harness/mozinfo.nix +++ b/pkgs/development/python-modules/marionette-harness/mozinfo.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "System information utilities for Mozilla testing"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = licenses.mpl20; maintainers = with maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozlog.nix b/pkgs/development/python-modules/marionette-harness/mozlog.nix index 834bf48adbd..ee1aed055e7 100644 --- a/pkgs/development/python-modules/marionette-harness/mozlog.nix +++ b/pkgs/development/python-modules/marionette-harness/mozlog.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Mozilla logging library"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index 106a94b50e2..3029f7ed546 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Network utilities for Mozilla testing"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozprocess.nix b/pkgs/development/python-modules/marionette-harness/mozprocess.nix index cfa0f766620..91ed225ecb8 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprocess.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprocess.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Mozilla-authored process handling"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozprofile.nix b/pkgs/development/python-modules/marionette-harness/mozprofile.nix index dda9e07d5e5..7075a37263b 100644 --- a/pkgs/development/python-modules/marionette-harness/mozprofile.nix +++ b/pkgs/development/python-modules/marionette-harness/mozprofile.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Mozilla application profile handling library"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozrunner.nix b/pkgs/development/python-modules/marionette-harness/mozrunner.nix index 8cabe18e3c6..fc1d8a7bc7c 100644 --- a/pkgs/development/python-modules/marionette-harness/mozrunner.nix +++ b/pkgs/development/python-modules/marionette-harness/mozrunner.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Mozilla application start/stop helpers"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/moztest.nix b/pkgs/development/python-modules/marionette-harness/moztest.nix index 2ff50e1fa92..1c9f9259d99 100644 --- a/pkgs/development/python-modules/marionette-harness/moztest.nix +++ b/pkgs/development/python-modules/marionette-harness/moztest.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Mozilla test result storage and output"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marionette-harness/mozversion.nix b/pkgs/development/python-modules/marionette-harness/mozversion.nix index 12925f3575a..9717a847d35 100644 --- a/pkgs/development/python-modules/marionette-harness/mozversion.nix +++ b/pkgs/development/python-modules/marionette-harness/mozversion.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Application version information library"; - homepage = https://wiki.mozilla.org/Auto-tools/Projects/Mozbase; + homepage = "https://wiki.mozilla.org/Auto-tools/Projects/Mozbase"; license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix index 71be4f5726d..031f7b04021 100644 --- a/pkgs/development/python-modules/marisa-trie/default.nix +++ b/pkgs/development/python-modules/marisa-trie/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Static memory-efficient Trie-like structures for Python (2.x and 3.x) based on marisa-trie C++ library"; longDescription = "There are official SWIG-based Python bindings included in C++ library distribution; this package provides alternative Cython-based pip-installable Python bindings."; - homepage = https://github.com/kmike/marisa-trie; + homepage = "https://github.com/kmike/marisa-trie"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/marisa/default.nix b/pkgs/development/python-modules/marisa/default.nix index 006e3a9051b..0fa5a98f752 100644 --- a/pkgs/development/python-modules/marisa/default.nix +++ b/pkgs/development/python-modules/marisa/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python binding for marisa package (do not confuse with marisa-trie python bindings)"; - homepage = https://github.com/s-yata/marisa-trie; + homepage = "https://github.com/s-yata/marisa-trie"; license = with licenses; [ bsd2 lgpl2 ]; maintainers = with maintainers; [ vanzef ]; }; diff --git a/pkgs/development/python-modules/markdown-macros/default.nix b/pkgs/development/python-modules/markdown-macros/default.nix index 98dce913046..41a634f4b9a 100644 --- a/pkgs/development/python-modules/markdown-macros/default.nix +++ b/pkgs/development/python-modules/markdown-macros/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An extension for python-markdown that makes writing trac-like macros easy"; - homepage = https://github.com/wnielson/markdown-macros; + homepage = "https://github.com/wnielson/markdown-macros"; license = licenses.mit; maintainers = [ maintainers.abigailbuccaneer ]; }; diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix index a07e0b14fdc..8add8f15298 100644 --- a/pkgs/development/python-modules/markdown2/default.nix +++ b/pkgs/development/python-modules/markdown2/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A fast and complete Python implementation of Markdown"; - homepage = https://github.com/trentm/python-markdown2; + homepage = "https://github.com/trentm/python-markdown2"; license = licenses.mit; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/markdownsuperscript/default.nix b/pkgs/development/python-modules/markdownsuperscript/default.nix index 1212651aec8..5bbf47278ce 100644 --- a/pkgs/development/python-modules/markdownsuperscript/default.nix +++ b/pkgs/development/python-modules/markdownsuperscript/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "An extension to the Python Markdown package enabling superscript text"; - homepage = https://github.com/jambonrose/markdown_superscript_extension; + homepage = "https://github.com/jambonrose/markdown_superscript_extension"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/markerlib/default.nix b/pkgs/development/python-modules/markerlib/default.nix index 640b11a6f28..256f395a8f8 100644 --- a/pkgs/development/python-modules/markerlib/default.nix +++ b/pkgs/development/python-modules/markerlib/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://bitbucket.org/dholth/markerlib/; + homepage = "https://bitbucket.org/dholth/markerlib/"; description = "A compiler for PEP 345 environment markers"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix index d15aa82c3a9..864e30214ef 100644 --- a/pkgs/development/python-modules/markupsafe/default.nix +++ b/pkgs/development/python-modules/markupsafe/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Implements a XML/HTML/XHTML Markup safe string"; - homepage = http://dev.pocoo.org; + homepage = "http://dev.pocoo.org"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/marshmallow-enum/default.nix b/pkgs/development/python-modules/marshmallow-enum/default.nix index 9d68e66c91a..16af840b036 100644 --- a/pkgs/development/python-modules/marshmallow-enum/default.nix +++ b/pkgs/development/python-modules/marshmallow-enum/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Enum field for Marshmallow"; - homepage = https://github.com/justanr/marshmallow_enum; + homepage = "https://github.com/justanr/marshmallow_enum"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index cb0b9e9e60d..3b18c10cbc3 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "marshmallow-polyfield"; - version = "5.7"; + version = "5.9"; src = fetchFromGitHub { owner = "Bachmann1234"; @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ marshmallow ]; - + # setuptools check can run, but won't find tests checkInputs = [ pytestCheckHook pytestcov ]; diff --git a/pkgs/development/python-modules/matchpy/default.nix b/pkgs/development/python-modules/matchpy/default.nix index 2a0544cf6d8..132be56f19b 100644 --- a/pkgs/development/python-modules/matchpy/default.nix +++ b/pkgs/development/python-modules/matchpy/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library for pattern matching on symbolic expressions"; - homepage = https://github.com/HPAC/matchpy; + homepage = "https://github.com/HPAC/matchpy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/mathics/default.nix b/pkgs/development/python-modules/mathics/default.nix index b20cc070909..0bd81f00848 100644 --- a/pkgs/development/python-modules/mathics/default.nix +++ b/pkgs/development/python-modules/mathics/default.nix @@ -42,7 +42,7 @@ if (stdenv.lib.versionOlder django.version "1.8") || meta = with stdenv.lib; { description = "A general-purpose computer algebra system"; - homepage = http://www.mathics.org; + homepage = "http://www.mathics.org"; license = licenses.gpl3; maintainers = [ maintainers.benley ]; }; diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index beca4fed17d..658388eabae 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = - [ cycler dateutil nose numpy pyparsing tornado freetype kiwisolver + [ cycler dateutil 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 ] diff --git a/pkgs/development/python-modules/matrix-client/default.nix b/pkgs/development/python-modules/matrix-client/default.nix index 19c4baca8b2..71092583d7f 100644 --- a/pkgs/development/python-modules/matrix-client/default.nix +++ b/pkgs/development/python-modules/matrix-client/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Matrix Client-Server SDK"; - homepage = https://github.com/matrix-org/matrix-python-sdk; + homepage = "https://github.com/matrix-org/matrix-python-sdk"; license = licenses.asl20; maintainers = with maintainers; [ olejorgenb ]; }; diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index ea5f5ee4851..a9310af1432 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/tulir/mautrix-python; + homepage = "https://github.com/tulir/mautrix-python"; description = "A Python 3 asyncio Matrix framework."; license = licenses.mpl20; maintainers = with maintainers; [ nyanloutre ma27 ]; diff --git a/pkgs/development/python-modules/maya/default.nix b/pkgs/development/python-modules/maya/default.nix index 9c6cb241fea..6df4091664b 100644 --- a/pkgs/development/python-modules/maya/default.nix +++ b/pkgs/development/python-modules/maya/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Datetimes for Humans"; - homepage = https://github.com/kennethreitz/maya; + homepage = "https://github.com/kennethreitz/maya"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index d7a821915f2..ffdf9747583 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "mayavi"; - version = "4.7.0"; + version = "4.7.1"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "02rg4j1vkny2piqn3f728kg34m54kgx396g6h5y7ykz2lk3f3h44"; + sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy"; }; # Discovery of 'vtk' in setuptools is not working properly, due to a missing @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "3D visualization of scientific data in Python"; - homepage = https://github.com/enthought/mayavi; + homepage = "https://github.com/enthought/mayavi"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; diff --git a/pkgs/development/python-modules/mccabe/default.nix b/pkgs/development/python-modules/mccabe/default.nix index 520e872c91e..7a4605e68ce 100644 --- a/pkgs/development/python-modules/mccabe/default.nix +++ b/pkgs/development/python-modules/mccabe/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "McCabe checker, plugin for flake8"; - homepage = https://github.com/flintwork/mccabe; + homepage = "https://github.com/flintwork/mccabe"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/mdp/default.nix b/pkgs/development/python-modules/mdp/default.nix index 9fbaced9b65..854622f2064 100644 --- a/pkgs/development/python-modules/mdp/default.nix +++ b/pkgs/development/python-modules/mdp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for building complex data processing software by combining widely used machine learning algorithms"; - homepage = http://mdp-toolkit.sourceforge.net; + homepage = "http://mdp-toolkit.sourceforge.net"; license = licenses.bsd3; maintainers = with maintainers; [ nico202 ]; }; diff --git a/pkgs/development/python-modules/measurement/default.nix b/pkgs/development/python-modules/measurement/default.nix index b3a0430a93b..6b7a02a76eb 100644 --- a/pkgs/development/python-modules/measurement/default.nix +++ b/pkgs/development/python-modules/measurement/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use and manipulate unit-aware measurement objects in Python"; - homepage = https://github.com/coddingtonbear/python-measurement; + homepage = "https://github.com/coddingtonbear/python-measurement"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; }; diff --git a/pkgs/development/python-modules/mecab-python3/default.nix b/pkgs/development/python-modules/mecab-python3/default.nix index 263a71254ed..893dfb0251d 100644 --- a/pkgs/development/python-modules/mecab-python3/default.nix +++ b/pkgs/development/python-modules/mecab-python3/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper for mecab: Morphological Analysis engine"; - homepage = https://github.com/SamuraiT/mecab-python3; + homepage = "https://github.com/SamuraiT/mecab-python3"; license = with licenses; [ gpl2 lgpl21 bsd3 ]; # any of the three maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/meinheld/default.nix b/pkgs/development/python-modules/meinheld/default.nix index f1291a14f3f..247523a9a83 100644 --- a/pkgs/development/python-modules/meinheld/default.nix +++ b/pkgs/development/python-modules/meinheld/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "High performance asynchronous Python WSGI Web Server"; - homepage = https://meinheld.org/; + homepage = "https://meinheld.org/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/meld3/default.nix b/pkgs/development/python-modules/meld3/default.nix index a1729ecb04e..013bd56aa3d 100644 --- a/pkgs/development/python-modules/meld3/default.nix +++ b/pkgs/development/python-modules/meld3/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An HTML/XML templating engine used by supervisor"; - homepage = https://github.com/supervisor/meld3; + homepage = "https://github.com/supervisor/meld3"; license = licenses.free; }; diff --git a/pkgs/development/python-modules/meliae/default.nix b/pkgs/development/python-modules/meliae/default.nix index b0cdbd60c3e..e02e72c1add 100644 --- a/pkgs/development/python-modules/meliae/default.nix +++ b/pkgs/development/python-modules/meliae/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Memory Usage Analyzer"; - homepage = https://launchpad.net/meliae; + homepage = "https://launchpad.net/meliae"; license = licenses.gpl3; maintainers = with maintainers; [ xvapx ]; }; diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix index 854f7440daa..65473160480 100644 --- a/pkgs/development/python-modules/memcached/default.nix +++ b/pkgs/development/python-modules/memcached/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python API for communicating with the memcached distributed memory object cache daemon"; - homepage = http://www.tummy.com/Community/software/python-memcached/; + homepage = "http://www.tummy.com/Community/software/python-memcached/"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/memory_profiler/default.nix b/pkgs/development/python-modules/memory_profiler/default.nix index e0367e6c505..0dafde83c40 100644 --- a/pkgs/development/python-modules/memory_profiler/default.nix +++ b/pkgs/development/python-modules/memory_profiler/default.nix @@ -22,7 +22,7 @@ python.pkgs.buildPythonPackage rec { This is a python module for monitoring memory consumption of a process as well as line-by-line analysis of memory consumption for python programs. ''; - homepage = https://pypi.python.org/pypi/memory_profiler; + homepage = "https://pypi.python.org/pypi/memory_profiler"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix index ec63526070a..fd44f3e4480 100644 --- a/pkgs/development/python-modules/mesonpep517/default.nix +++ b/pkgs/development/python-modules/mesonpep517/default.nix @@ -35,8 +35,8 @@ buildPythonPackage rec { meta = { description = "Create pep517 compliant packages from the meson build system"; - homepage = https://gitlab.com/thiblahute/mesonpep517; + homepage = "https://gitlab.com/thiblahute/mesonpep517"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/metaphone/default.nix b/pkgs/development/python-modules/metaphone/default.nix index e167ee494a8..a9a4409c0de 100644 --- a/pkgs/development/python-modules/metaphone/default.nix +++ b/pkgs/development/python-modules/metaphone/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { buildInputs = [ nose ]; meta = with stdenv.lib; { - homepage = https://github.com/oubiwann/metaphone; + homepage = "https://github.com/oubiwann/metaphone"; description = "A Python implementation of the metaphone and double metaphone algorithms"; license = licenses.bsd3; maintainers = with maintainers; [ ris ]; diff --git a/pkgs/development/python-modules/micawber/default.nix b/pkgs/development/python-modules/micawber/default.nix index 003234c2adf..5129fe253c7 100644 --- a/pkgs/development/python-modules/micawber/default.nix +++ b/pkgs/development/python-modules/micawber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ beautifulsoup4 ]; meta = with stdenv.lib; { - homepage = https://micawber.readthedocs.io/en/latest/; + homepage = "https://micawber.readthedocs.io/en/latest/"; description = "A small library for extracting rich content from urls"; license = licenses.mit; longDescription = '' diff --git a/pkgs/development/python-modules/milksnake/default.nix b/pkgs/development/python-modules/milksnake/default.nix index 014bb223225..6d063021697 100644 --- a/pkgs/development/python-modules/milksnake/default.nix +++ b/pkgs/development/python-modules/milksnake/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python library that extends setuptools for binary extensions"; - homepage = https://github.com/getsentry/milksnake; + homepage = "https://github.com/getsentry/milksnake"; license = licenses.asl20; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/minidb/default.nix b/pkgs/development/python-modules/minidb/default.nix index 3a65ef1028a..a324c8d7d08 100644 --- a/pkgs/development/python-modules/minidb/default.nix +++ b/pkgs/development/python-modules/minidb/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "minidb"; - version = "2.0.2"; + version = "2.0.3"; disabled = !isPy3k; src = fetchFromGitHub { owner = "thp"; repo = "minidb"; rev = version; - sha256 = "14y5vf8vhgviczhzy9h3xv99fjvrg975nz4w1fj5c1jv37da1lq3"; + sha256 = "0c6y3x957pc5sxkl34lymhkwpn4nlsfw07fcv4y9p2zdb7kjd1gc"; }; # module imports are incompatible with python2 diff --git a/pkgs/development/python-modules/minimock/default.nix b/pkgs/development/python-modules/minimock/default.nix index 856f7b45adf..6275d92b055 100644 --- a/pkgs/development/python-modules/minimock/default.nix +++ b/pkgs/development/python-modules/minimock/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A minimalistic mocking library for python"; - homepage = https://pypi.python.org/pypi/MiniMock; + homepage = "https://pypi.python.org/pypi/MiniMock"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index a27867467ed..a3d6cb8879e 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple APIs to access any Amazon S3 compatible object storage server"; - homepage = https://github.com/minio/minio-py; + homepage = "https://github.com/minio/minio-py"; maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/miniupnpc/default.nix b/pkgs/development/python-modules/miniupnpc/default.nix index d267cb6a976..b3c559c8462 100644 --- a/pkgs/development/python-modules/miniupnpc/default.nix +++ b/pkgs/development/python-modules/miniupnpc/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "miniUPnP client"; - homepage = http://miniupnp.free.fr/; + homepage = "http://miniupnp.free.fr/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/mistune/default.nix b/pkgs/development/python-modules/mistune/default.nix index 75011a8219f..cde668bd5fb 100644 --- a/pkgs/development/python-modules/mistune/default.nix +++ b/pkgs/development/python-modules/mistune/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "The fastest markdown parser in pure Python"; - homepage = https://github.com/lepture/mistune; + homepage = "https://github.com/lepture/mistune"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/mmpython/default.nix b/pkgs/development/python-modules/mmpython/default.nix index 0a41b6e3c87..dbb6590eee6 100644 --- a/pkgs/development/python-modules/mmpython/default.nix +++ b/pkgs/development/python-modules/mmpython/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mmpython"; src = fetchurl { - url = https://sourceforge.net/projects/mmpython/files/latest/download; + url = "https://sourceforge.net/projects/mmpython/files/latest/download"; sha256 = "1b7qfad3shgakj37gcj1b9h78j1hxlz6wp9k7h76pb4sq4bfyihy"; name = "${pname}-${version}.tar.gz"; }; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Media Meta Data retrieval framework"; - homepage = https://sourceforge.net/projects/mmpython/; + homepage = "https://sourceforge.net/projects/mmpython/"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/mnemonic/default.nix b/pkgs/development/python-modules/mnemonic/default.nix index ca41917744a..2811d0ecda5 100644 --- a/pkgs/development/python-modules/mnemonic/default.nix +++ b/pkgs/development/python-modules/mnemonic/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = { description = "Implementation of Bitcoin BIP-0039"; - homepage = https://github.com/trezor/python-mnemonic; + homepage = "https://github.com/trezor/python-mnemonic"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/mock-open/default.nix b/pkgs/development/python-modules/mock-open/default.nix index edb3407270f..449430a593d 100644 --- a/pkgs/development/python-modules/mock-open/default.nix +++ b/pkgs/development/python-modules/mock-open/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional (pythonOlder "3.3") mock; meta = with lib; { - homepage = https://github.com/nivbend/mock-open; + homepage = "https://github.com/nivbend/mock-open"; description = "A better mock for file I/O"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/mock/default.nix b/pkgs/development/python-modules/mock/default.nix index 6978bee000a..de1ff58243e 100644 --- a/pkgs/development/python-modules/mock/default.nix +++ b/pkgs/development/python-modules/mock/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mock objects for Python"; - homepage = http://python-mock.sourceforge.net/; + homepage = "http://python-mock.sourceforge.net/"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/modeled/default.nix b/pkgs/development/python-modules/modeled/default.nix index 298c69194f2..e4cdec7766d 100644 --- a/pkgs/development/python-modules/modeled/default.nix +++ b/pkgs/development/python-modules/modeled/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Universal data modeling for Python"; - homepage = https://bitbucket.org/userzimmermann/python-modeled; + homepage = "https://bitbucket.org/userzimmermann/python-modeled"; license = licenses.lgpl3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/moderngl/default.nix b/pkgs/development/python-modules/moderngl/default.nix index 5802b33041f..48abc30c9f7 100644 --- a/pkgs/development/python-modules/moderngl/default.nix +++ b/pkgs/development/python-modules/moderngl/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/moderngl/moderngl; + homepage = "https://github.com/moderngl/moderngl"; description = "High performance rendering for Python 3"; license = licenses.mit; platforms = platforms.linux; # should be mesaPlatforms, darwin build breaks. diff --git a/pkgs/development/python-modules/moderngl_window/default.nix b/pkgs/development/python-modules/moderngl_window/default.nix index a3c93978ff6..b4aee8c61cf 100644 --- a/pkgs/development/python-modules/moderngl_window/default.nix +++ b/pkgs/development/python-modules/moderngl_window/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "moderngl_window"; - version = "1.2.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "moderngl"; repo = pname; rev = version; - sha256 = "054w77lyc2nc0dyx76zsrbq2b3xbywdijhb62b2qqm99ldr1k1x5"; + sha256 = "1p03j91pk2bwycd13p0qi8kns1sf357180hd2mkaip8mfaf33x3q"; }; propagatedBuildInputs = [ numpy moderngl pyglet pillow pyrr ]; diff --git a/pkgs/development/python-modules/modestmaps/default.nix b/pkgs/development/python-modules/modestmaps/default.nix index b25e6f5644e..c7b1071954d 100644 --- a/pkgs/development/python-modules/modestmaps/default.nix +++ b/pkgs/development/python-modules/modestmaps/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for building interactive maps"; - homepage = http://modestmaps.com; + homepage = "http://modestmaps.com"; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/mongoengine/default.nix b/pkgs/development/python-modules/mongoengine/default.nix index db20d9442ef..c1c69598cd0 100644 --- a/pkgs/development/python-modules/mongoengine/default.nix +++ b/pkgs/development/python-modules/mongoengine/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "MongoEngine is a Python Object-Document Mapper for working with MongoDB"; - homepage = http://mongoengine.org/; + homepage = "http://mongoengine.org/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/monotonic/default.nix b/pkgs/development/python-modules/monotonic/default.nix index c784730da6e..38a25841c7b 100644 --- a/pkgs/development/python-modules/monotonic/default.nix +++ b/pkgs/development/python-modules/monotonic/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An implementation of time.monotonic() for Python 2 & < 3.3"; - homepage = https://github.com/atdt/monotonic; + homepage = "https://github.com/atdt/monotonic"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 427f0af4573..77448d0e15f 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -29,6 +29,13 @@ buildPythonPackage rec { checkInputs = [ lsof nose numpy msgpack coverage coveralls pymongo]; propagatedBuildInputs = [ six ruamel_yaml ]; + # test suite tries to decode bytes, but msgpack now returns a str + # https://github.com/materialsvirtuallab/monty/pull/121 + postPatch = '' + substituteInPlace tests/test_serialization.py \ + --replace ".decode('utf-8')" "" + ''; + preCheck = '' substituteInPlace tests/test_os.py \ --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' @@ -41,7 +48,7 @@ buildPythonPackage rec { standard library. Examples include useful utilities like transparent support for zipped files, useful design patterns such as singleton and cached_class, and many more. "; - homepage = https://github.com/materialsvirtuallab/monty; + homepage = "https://github.com/materialsvirtuallab/monty"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/more-itertools/2.7.nix b/pkgs/development/python-modules/more-itertools/2.7.nix index e0786aefa2c..f9a6ac732e2 100644 --- a/pkgs/development/python-modules/more-itertools/2.7.nix +++ b/pkgs/development/python-modules/more-itertools/2.7.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.is32bit; meta = { - homepage = https://more-itertools.readthedocs.org; + homepage = "https://more-itertools.readthedocs.org"; description = "Expansion of the itertools module"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 37152b3a502..cd128fb2164 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !stdenv.hostPlatform.is32bit; meta = { - homepage = https://more-itertools.readthedocs.org; + homepage = "https://more-itertools.readthedocs.org"; description = "Expansion of the itertools module"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/moretools/default.nix b/pkgs/development/python-modules/moretools/default.nix index 061eedfe7b0..c9fd953f350 100644 --- a/pkgs/development/python-modules/moretools/default.nix +++ b/pkgs/development/python-modules/moretools/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { description = '' Many more basic tools for python 2/3 extending itertools, functools, operator and collections ''; - homepage = https://bitbucket.org/userzimmermann/python-moretools; + homepage = "https://bitbucket.org/userzimmermann/python-moretools"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/morphys/default.nix b/pkgs/development/python-modules/morphys/default.nix new file mode 100644 index 00000000000..8f8525f7afe --- /dev/null +++ b/pkgs/development/python-modules/morphys/default.nix @@ -0,0 +1,24 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +}: +buildPythonPackage rec { + pname = "morphys"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "mkalinski"; + repo = "morphys"; + rev = "0642a71126c32cd26b3a443a5cac27e4e1f7240f"; + sha256 = "1da8s04m5wwih9cvkrks3ymb8v082lia47f274hxmfhi6ma3qc8b"; + }; + + pythonImportsCheck = [ "morphys" ]; + + meta = with lib; { + description = "Smart conversions between unicode and bytes types"; + homepage = "https://github.com/mkalinski/morphys"; + license = licenses.mit; + maintainers = with maintainers; [ rakesh4g ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/moto/default.nix b/pkgs/development/python-modules/moto/default.nix index c84427b01c4..0d45103a295 100644 --- a/pkgs/development/python-modules/moto/default.nix +++ b/pkgs/development/python-modules/moto/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allows your tests to easily mock out AWS Services"; - homepage = https://github.com/spulec/moto; + homepage = "https://github.com/spulec/moto"; license = licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/moviepy/default.nix b/pkgs/development/python-modules/moviepy/default.nix index 7e9215f3393..2daabf22d9e 100644 --- a/pkgs/development/python-modules/moviepy/default.nix +++ b/pkgs/development/python-modules/moviepy/default.nix @@ -25,13 +25,13 @@ assert advancedProcessing -> ( buildPythonPackage rec { pname = "moviepy"; - version = "1.0.1"; + version = "1.0.2"; disabled = !(pythonAtLeast "3.4"); src = fetchPypi { inherit pname version; - sha256 = "1vgi9k1r4f5s9hzfzlhmmc574n80aq713ahv8cnbj3jci070lnwx"; + sha256 = "0ajw2xmcd962qw2kxxnbp08l5vgk5k78sls9bb227lw8aa51ln80"; }; # No tests, require network connection @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Video editing with Python"; - homepage = http://zulko.github.io/moviepy/; + homepage = "https://zulko.github.io/moviepy/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/mox3/default.nix b/pkgs/development/python-modules/mox3/default.nix index 480e28dffcb..bdbccc790cf 100644 --- a/pkgs/development/python-modules/mox3/default.nix +++ b/pkgs/development/python-modules/mox3/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Mock object framework for Python"; - homepage = https://docs.openstack.org/mox3/latest/; + homepage = "https://docs.openstack.org/mox3/latest/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/mozsvc/default.nix b/pkgs/development/python-modules/mozsvc/default.nix index a7b3984b912..780a162a916 100644 --- a/pkgs/development/python-modules/mozsvc/default.nix +++ b/pkgs/development/python-modules/mozsvc/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid simplejson konfig ]; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/mozservices; + homepage = "https://github.com/mozilla-services/mozservices"; description = "Various utilities for Mozilla apps"; license = licenses.mpl20; maintainers = with maintainers; [ nadrieril ]; diff --git a/pkgs/development/python-modules/mpd/default.nix b/pkgs/development/python-modules/mpd/default.nix index 48693293458..5ae3e2b41ec 100644 --- a/pkgs/development/python-modules/mpd/default.nix +++ b/pkgs/development/python-modules/mpd/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An MPD (Music Player Daemon) client library written in pure Python"; - homepage = http://jatreuman.indefero.net/p/python-mpd/; + homepage = "http://jatreuman.indefero.net/p/python-mpd/"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/mplleaflet/default.nix b/pkgs/development/python-modules/mplleaflet/default.nix index 62c5282b335..bfe442d05f5 100644 --- a/pkgs/development/python-modules/mplleaflet/default.nix +++ b/pkgs/development/python-modules/mplleaflet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Convert Matplotlib plots into Leaflet web maps"; - homepage = https://github.com/jwass/mplleaflet; + homepage = "https://github.com/jwass/mplleaflet"; license = with lib.licenses; [ bsd3 ]; }; } diff --git a/pkgs/development/python-modules/mrbob/default.nix b/pkgs/development/python-modules/mrbob/default.nix index dd255d4d004..7074dab739b 100644 --- a/pkgs/development/python-modules/mrbob/default.nix +++ b/pkgs/development/python-modules/mrbob/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 six ]; meta = with stdenv.lib; { - homepage = https://github.com/domenkozar/mr.bob; + homepage = "https://github.com/domenkozar/mr.bob"; description = "A tool to generate code skeletons from templates"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/msgpack-numpy/default.nix b/pkgs/development/python-modules/msgpack-numpy/default.nix index c23f0b6572e..354498836a9 100644 --- a/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Numpy data type serialization using msgpack"; - homepage = https://github.com/lebedov/msgpack-numpy; + homepage = "https://github.com/lebedov/msgpack-numpy"; license = licenses.bsd3; maintainers = with maintainers; [ aborsu ]; }; diff --git a/pkgs/development/python-modules/msgpack/default.nix b/pkgs/development/python-modules/msgpack/default.nix index 8095c151da7..70a52dfe994 100644 --- a/pkgs/development/python-modules/msgpack/default.nix +++ b/pkgs/development/python-modules/msgpack/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest ]; meta = { - homepage = https://github.com/msgpack/msgpack-python; + homepage = "https://github.com/msgpack/msgpack-python"; description = "MessagePack serializer implementation for Python"; license = lib.licenses.asl20; # maintainers = ?? ; diff --git a/pkgs/development/python-modules/msrplib/default.nix b/pkgs/development/python-modules/msrplib/default.nix index bba72ea62bb..ffb87ff48ee 100644 --- a/pkgs/development/python-modules/msrplib/default.nix +++ b/pkgs/development/python-modules/msrplib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlib application gnutls ]; meta = with stdenv.lib; { - homepage = https://github.com/AGProjects/python-msrplib; + homepage = "https://github.com/AGProjects/python-msrplib"; description = "Client library for MSRP protocol and its relay extension (RFC 4975 and RFC4976)"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index f31bb4c064e..c41b472a693 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to parse MT940 files and returns smart Python collections for statistics and manipulation"; - homepage = https://github.com/WoLpH/mt940; + homepage = "https://github.com/WoLpH/mt940"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index 0b05416436d..16fea2898dd 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Multidict implementation"; - homepage = https://github.com/aio-libs/multidict/; + homepage = "https://github.com/aio-libs/multidict/"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/multipledispatch/default.nix b/pkgs/development/python-modules/multipledispatch/default.nix index 8b2de6c5af1..ed55b0421cd 100644 --- a/pkgs/development/python-modules/multipledispatch/default.nix +++ b/pkgs/development/python-modules/multipledispatch/default.nix @@ -19,9 +19,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = { - homepage = https://github.com/mrocklin/multipledispatch/; + homepage = "https://github.com/mrocklin/multipledispatch/"; description = "A relatively sane approach to multiple dispatch in Python"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/multiprocess/default.nix b/pkgs/development/python-modules/multiprocess/default.nix index 51fe7a83c9d..df304efb919 100644 --- a/pkgs/development/python-modules/multiprocess/default.nix +++ b/pkgs/development/python-modules/multiprocess/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Better multiprocessing and multithreading in python"; - homepage = https://github.com/uqfoundation/multiprocess; + homepage = "https://github.com/uqfoundation/multiprocess"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/multiset/default.nix b/pkgs/development/python-modules/multiset/default.nix index 5cc159dc205..020617abebf 100644 --- a/pkgs/development/python-modules/multiset/default.nix +++ b/pkgs/development/python-modules/multiset/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "An implementation of a multiset"; - homepage = https://github.com/wheerd/multiset; + homepage = "https://github.com/wheerd/multiset"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index 764523e0cf7..0d7d6f7c633 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A dot-accessible dictionary (a la JavaScript objects)"; license = licenses.mit; - homepage = https://github.com/Infinidat/munch; + homepage = "https://github.com/Infinidat/munch"; }; } diff --git a/pkgs/development/python-modules/munkres/default.nix b/pkgs/development/python-modules/munkres/default.nix index 5e83818a014..93e0c27fcca 100644 --- a/pkgs/development/python-modules/munkres/default.nix +++ b/pkgs/development/python-modules/munkres/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = http://bmc.github.com/munkres/; + homepage = "http://bmc.github.com/munkres/"; description = "Munkres algorithm for the Assignment Problem"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/murmurhash/default.nix b/pkgs/development/python-modules/murmurhash/default.nix index 2e826ab61e8..82b33b6b402 100644 --- a/pkgs/development/python-modules/murmurhash/default.nix +++ b/pkgs/development/python-modules/murmurhash/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cython bindings for MurmurHash2"; - homepage = https://github.com/explosion/murmurhash; + homepage = "https://github.com/explosion/murmurhash"; license = licenses.mit; maintainers = with maintainers; [ aborsu sdll ]; }; diff --git a/pkgs/development/python-modules/mutag/default.nix b/pkgs/development/python-modules/mutag/default.nix index 0d5d8d75a36..273a009a1f4 100644 --- a/pkgs/development/python-modules/mutag/default.nix +++ b/pkgs/development/python-modules/mutag/default.nix @@ -6,7 +6,8 @@ }: buildPythonPackage { - name = "mutag-0.0.2-2ffa0258ca"; + pname = "mutag"; + version = "0.0.2-2ffa0258ca"; disabled = ! isPy3k; src = fetchgit { @@ -18,7 +19,7 @@ buildPythonPackage { propagatedBuildInputs = [ pyparsing ]; meta = with stdenv.lib; { - homepage = https://github.com/aroig/mutag; + homepage = "https://github.com/aroig/mutag"; description = "A script to change email tags in a mu indexed maildir"; license = licenses.gpl3; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/muttils/default.nix b/pkgs/development/python-modules/muttils/default.nix index 868700b6223..01e789fb759 100644 --- a/pkgs/development/python-modules/muttils/default.nix +++ b/pkgs/development/python-modules/muttils/default.nix @@ -10,7 +10,7 @@ buildPythonPackage { disabled = isPy3k; src = fetchurl { - url = https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2; + url = "https://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2"; sha256 = "1a4kxa0fpgg6rdj5p4kggfn8xpniqh8v5kbiaqc6wids02m7kag6"; }; @@ -19,7 +19,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Utilities for use with console mail clients, like mutt"; - homepage = https://www.blacktrash.org/hg/muttils; + homepage = "https://www.blacktrash.org/hg/muttils"; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/mwclient/default.nix b/pkgs/development/python-modules/mwclient/default.nix index ce987311a74..b26a3f948c8 100644 --- a/pkgs/development/python-modules/mwclient/default.nix +++ b/pkgs/development/python-modules/mwclient/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client library to the MediaWiki API"; license = licenses.mit; - homepage = https://github.com/mwclient/mwclient; + homepage = "https://github.com/mwclient/mwclient"; }; } diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 778a081992c..94a85d41d9e 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library designed to provide a simple means to performing an OAuth handshake with a MediaWiki installation with the OAuth Extension installed."; - homepage = https://github.com/mediawiki-utilities/python-mwoauth; + homepage = "https://github.com/mediawiki-utilities/python-mwoauth"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index 570d0c3e749..14834923954 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Access your meal tracking data stored in MyFitnessPal programatically"; - homepage = https://github.com/coddingtonbear/python-myfitnesspal; + homepage = "https://github.com/coddingtonbear/python-myfitnesspal"; license = licenses.mit; maintainers = with maintainers; [ bhipple ]; }; diff --git a/pkgs/development/python-modules/mygpoclient/default.nix b/pkgs/development/python-modules/mygpoclient/default.nix index 5f30316eb71..2af73f2d897 100644 --- a/pkgs/development/python-modules/mygpoclient/default.nix +++ b/pkgs/development/python-modules/mygpoclient/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { The mygpoclient library allows developers to utilize a Pythonic interface to the gpodder.net web services. ''; - homepage = https://github.com/gpodder/mygpoclient; + homepage = "https://github.com/gpodder/mygpoclient"; license = with licenses; [ gpl3 ]; maintainers = with maintainers; [ skeidel ]; }; diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 954e913c9cf..5cc192313ac 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.16"; + version = "1.20"; src = fetchPypi { inherit pname version; - sha256 = "72ab724299aebd930b88476f6545587bff5bf480697c016097bd188841a56276"; + sha256 = "03j2i9vhpdxbvwlqg6zghlzzq46s1x2jbx20fwninb6kss0ps3rg"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix index 90b00ba1717..bcd0ab4a6c6 100644 --- a/pkgs/development/python-modules/mypy/default.nix +++ b/pkgs/development/python-modules/mypy/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "mypy"; - version = "0.761"; + version = "0.770"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1gw7h84d21wmi267kmgqs9whz0l7rp62pzja2f31wq7cfj6spfl5"; + sha256 = "1bm40nx9g1n4nj1309cijnh0ns4qbhym3agyl537nc4vxw3paqla"; }; propagatedBuildInputs = [ typed-ast psutil mypy-extensions typing-extensions ]; diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index e66f102e6ca..4608d3f93e6 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -32,7 +32,7 @@ in buildPythonPackage rec { A MySQL driver that does not depend on MySQL C client libraries and implements the DB API v2.0 specification. ''; - homepage = https://github.com/mysql/mysql-connector-python; + homepage = "https://github.com/mysql/mysql-connector-python"; license = [ lib.licenses.gpl2 ]; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/nagiosplugin/default.nix b/pkgs/development/python-modules/nagiosplugin/default.nix index ef46e7ccafd..6b6e889b5d5 100644 --- a/pkgs/development/python-modules/nagiosplugin/default.nix +++ b/pkgs/development/python-modules/nagiosplugin/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python class library which helps with writing Nagios (Icinga) compatible plugins"; - homepage = https://github.com/mpounsett/nagiosplugin; + homepage = "https://github.com/mpounsett/nagiosplugin"; license = licenses.zpl21; maintainers = with maintainers; [ symphorien ]; }; diff --git a/pkgs/development/python-modules/namedlist/default.nix b/pkgs/development/python-modules/namedlist/default.nix index ae07076bb05..b66ecb6210c 100644 --- a/pkgs/development/python-modules/namedlist/default.nix +++ b/pkgs/development/python-modules/namedlist/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Similar to namedtuple, but instances are mutable"; - homepage = https://bitbucket.org/ericvsmith/namedlist; + homepage = "https://bitbucket.org/ericvsmith/namedlist"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ivan ]; }; diff --git a/pkgs/development/python-modules/nameparser/default.nix b/pkgs/development/python-modules/nameparser/default.nix index de4803c60e4..3384ed67c1e 100644 --- a/pkgs/development/python-modules/nameparser/default.nix +++ b/pkgs/development/python-modules/nameparser/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple Python module for parsing human names into their individual components"; - homepage = https://github.com/derek73/python-nameparser; + homepage = "https://github.com/derek73/python-nameparser"; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/nanoleaf/default.nix b/pkgs/development/python-modules/nanoleaf/default.nix index ccf0be4ae6d..ea15da78bfb 100644 --- a/pkgs/development/python-modules/nanoleaf/default.nix +++ b/pkgs/development/python-modules/nanoleaf/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python interface for Nanoleaf Aurora lighting"; - homepage = https://github.com/software-2/nanoleaf; + homepage = "https://github.com/software-2/nanoleaf"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/nanomsg-python/default.nix b/pkgs/development/python-modules/nanomsg-python/default.nix index 31662cd3941..29d71d0243f 100644 --- a/pkgs/development/python-modules/nanomsg-python/default.nix +++ b/pkgs/development/python-modules/nanomsg-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Bindings for nanomsg"; - homepage = https://github.com/tonysimpson/nanomsg-python; + homepage = "https://github.com/tonysimpson/nanomsg-python"; license = licenses.mit; maintainers = with maintainers; [ bgamari ]; }; diff --git a/pkgs/development/python-modules/nanotime/default.nix b/pkgs/development/python-modules/nanotime/default.nix index 8dd520a04e9..fc9306eb571 100644 --- a/pkgs/development/python-modules/nanotime/default.nix +++ b/pkgs/development/python-modules/nanotime/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provides a time object that keeps time as the number of nanoseconds since the UNIX epoch"; - homepage = https://github.com/jbenet/nanotime/tree/master/python; + homepage = "https://github.com/jbenet/nanotime/tree/master/python"; license = licenses.mit; maintainers = with maintainers; [ cmcdragonkai ]; }; diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix index 8bdfdb9d720..918d491083d 100644 --- a/pkgs/development/python-modules/natsort/default.nix +++ b/pkgs/development/python-modules/natsort/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "Natural sorting for python"; - homepage = https://github.com/SethMMorton/natsort; + homepage = "https://github.com/SethMMorton/natsort"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/naturalsort/default.nix b/pkgs/development/python-modules/naturalsort/default.nix index f7dcbe4d827..98ced7a381c 100644 --- a/pkgs/development/python-modules/naturalsort/default.nix +++ b/pkgs/development/python-modules/naturalsort/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple natural order sorting API for Python that just works"; - homepage = https://github.com/xolox/python-naturalsort; + homepage = "https://github.com/xolox/python-naturalsort"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index b0357c16165..49e4862999c 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = { description = "Converting Jupyter Notebooks"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index f641c017384..7e774eed296 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "1.1.0"; + version = "2.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0qfy7nmlg75vryvrlgd6p0rqrvcclq8n9kd0n4xv5959s9sjy0w0"; + sha256 = "0pbi22mc5al29pvsw7bhai2d58i8n77gv09r7avr1wap6ni7jvw9"; }; checkInputs = [ @@ -61,7 +61,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/jupyter/nbdime; + homepage = "https://github.com/jupyter/nbdime"; description = "Tools for diffing and merging of Jupyter notebooks."; license = licenses.bsd3; maintainers = with maintainers; [ tbenst ]; diff --git a/pkgs/development/python-modules/nbformat/2.nix b/pkgs/development/python-modules/nbformat/2.nix index fbc71202d28..faf2cee2b00 100644 --- a/pkgs/development/python-modules/nbformat/2.nix +++ b/pkgs/development/python-modules/nbformat/2.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter Notebook format"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh globin ]; }; diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 179c5e8b9b6..35ee52b11ec 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter Notebook format"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh globin ]; }; diff --git a/pkgs/development/python-modules/nbsmoke/default.nix b/pkgs/development/python-modules/nbsmoke/default.nix index 6fff7857565..46d47fd1679 100644 --- a/pkgs/development/python-modules/nbsmoke/default.nix +++ b/pkgs/development/python-modules/nbsmoke/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Basic notebook checks and linting"; - homepage = https://github.com/pyviz/nbsmoke; + homepage = "https://github.com/pyviz/nbsmoke"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index 4557d665650..06a210db6c4 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Jupyter Notebook Tools for Sphinx"; - homepage = https://nbsphinx.readthedocs.io/; + homepage = "https://nbsphinx.readthedocs.io/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix index 020fab8f888..41f5425317d 100644 --- a/pkgs/development/python-modules/nbval/default.nix +++ b/pkgs/development/python-modules/nbval/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "A py.test plugin to validate Jupyter notebooks"; - homepage = https://github.com/computationalmodelling/nbval; + homepage = "https://github.com/computationalmodelling/nbval"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ndg-httpsclient/default.nix b/pkgs/development/python-modules/ndg-httpsclient/default.nix index d9c7e41c576..687f589fe1a 100644 --- a/pkgs/development/python-modules/ndg-httpsclient/default.nix +++ b/pkgs/development/python-modules/ndg-httpsclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/cedadev/ndg_httpsclient/; + homepage = "https://github.com/cedadev/ndg_httpsclient/"; description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"; license = licenses.bsd2; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/nest-asyncio/default.nix b/pkgs/development/python-modules/nest-asyncio/default.nix index dbbbc04d141..1934317a112 100644 --- a/pkgs/development/python-modules/nest-asyncio/default.nix +++ b/pkgs/development/python-modules/nest-asyncio/default.nix @@ -5,16 +5,16 @@ }: buildPythonPackage rec { - version = "1.3.0"; + version = "1.3.2"; pname = "nest_asyncio"; disabled = !(pythonAtLeast "3.5"); src = fetchPypi { inherit pname version; - sha256 = "1cbd885n3sf4qg1dv3mk1ggr5ssk48yzrzssznr92dh53g04ly7g"; + sha256 = "0l43k0lx7r6izancfhhg68x82mvws2di1a9w2y12l1a446vr9q8l"; }; - # tests not packaged with source dist as of 1.3.0/1.3.0, and + # tests not packaged with source dist as of 1.3.2/1.3.2, and # can't check tests out of GitHub easily without specific commit IDs (no tagged releases) doCheck = false; pythonImportsCheck = [ "nest_asyncio" ]; diff --git a/pkgs/development/python-modules/netaddr/default.nix b/pkgs/development/python-modules/netaddr/default.nix index ed56e6803f4..200392c85f8 100644 --- a/pkgs/development/python-modules/netaddr/default.nix +++ b/pkgs/development/python-modules/netaddr/default.nix @@ -27,13 +27,13 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch; + url = "https://github.com/drkjam/netaddr/commit/2ab73f10be7069c9412e853d2d0caf29bd624012.patch"; sha256 = "0s1cdn9v5alpviabhcjmzc0m2pnpq9dh2fnnk2x96dnry1pshg39"; }) ]; meta = with stdenv.lib; { - homepage = https://github.com/drkjam/netaddr/; + homepage = "https://github.com/drkjam/netaddr/"; description = "A network address manipulation library for Python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 17d1cd59675..62373ebc42d 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interface to netCDF library (versions 3 and 4)"; - homepage = https://pypi.python.org/pypi/netCDF4; + homepage = "https://pypi.python.org/pypi/netCDF4"; license = licenses.free; # Mix of license (all MIT* like) }; } diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 1c9af258995..b5353a5842d 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library to scan local network for services and devices"; - homepage = https://github.com/home-assistant/netdisco; + homepage = "https://github.com/home-assistant/netdisco"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/netifaces/default.nix b/pkgs/development/python-modules/netifaces/default.nix index 1f1cc3857e4..94cdb829013 100644 --- a/pkgs/development/python-modules/netifaces/default.nix +++ b/pkgs/development/python-modules/netifaces/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://alastairs-place.net/projects/netifaces/; + homepage = "https://alastairs-place.net/projects/netifaces/"; description = "Portable access to network interfaces from Python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/nevow/default.nix b/pkgs/development/python-modules/nevow/default.nix index 6054e6d3a73..301d2c7a394 100644 --- a/pkgs/development/python-modules/nevow/default.nix +++ b/pkgs/development/python-modules/nevow/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pages if appropriate. Once a form post has validated successfully, the method will be called with the coerced values. ''; - homepage = https://github.com/twisted/nevow; + homepage = "https://github.com/twisted/nevow"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/nibabel/default.nix b/pkgs/development/python-modules/nibabel/default.nix index 3a907bc8ca0..751cc139548 100644 --- a/pkgs/development/python-modules/nibabel/default.nix +++ b/pkgs/development/python-modules/nibabel/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://nipy.org/nibabel/; + homepage = "https://nipy.org/nibabel"; description = "Access a multitude of neuroimaging data formats"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; diff --git a/pkgs/development/python-modules/nilearn/default.nix b/pkgs/development/python-modules/nilearn/default.nix index a379f236f3f..1e58aee503b 100644 --- a/pkgs/development/python-modules/nilearn/default.nix +++ b/pkgs/development/python-modules/nilearn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, pytest +{ stdenv, buildPythonPackage, fetchPypi, pytest, nose , nibabel, numpy, pandas, scikitlearn, scipy, matplotlib, joblib }: buildPythonPackage rec { @@ -20,7 +20,7 @@ buildPythonPackage rec { pytest nilearn/tests -k 'not test_cache_mixin_with_expand_user' # accesses ~/ ''; - checkInputs = [ pytest ]; + checkInputs = [ pytest nose ]; propagatedBuildInputs = [ joblib @@ -33,7 +33,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = http://nilearn.github.io; + homepage = "http://nilearn.github.io"; description = "A module for statistical learning on neuroimaging data"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/nipy/default.nix b/pkgs/development/python-modules/nipy/default.nix index 5b8c1e5185d..fef24e837d1 100644 --- a/pkgs/development/python-modules/nipy/default.nix +++ b/pkgs/development/python-modules/nipy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://nipy.org/nipy/; + homepage = "https://nipy.org/nipy"; description = "Software for structural and functional neuroimaging analysis"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 5944e4d863f..436c9fe6379 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -106,7 +106,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://nipy.org/nipype/; + homepage = "https://nipy.org/nipype/"; description = "Neuroimaging in Python: Pipelines and Interfaces"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; diff --git a/pkgs/development/python-modules/nipype/neurdflib.nix b/pkgs/development/python-modules/nipype/neurdflib.nix index 33526bebd55..0a266ff7bf8 100644 --- a/pkgs/development/python-modules/nipype/neurdflib.nix +++ b/pkgs/development/python-modules/nipype/neurdflib.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "A temporary convenience package for changes waiting to be merged into the primary rdflib repo"; - homepage = https://pypi.org/project/neurdflib; + homepage = "https://pypi.org/project/neurdflib"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/nitime/default.nix b/pkgs/development/python-modules/nitime/default.nix index b61c3d92bc9..8fa40465c10 100644 --- a/pkgs/development/python-modules/nitime/default.nix +++ b/pkgs/development/python-modules/nitime/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { checkPhase = "pytest nitime/tests"; meta = with lib; { - homepage = https://nipy.org/nitime; + homepage = "https://nipy.org/nitime"; description = "Algorithms and containers for time-series analysis in time and spectral domains"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index f73fb6dac33..17e4669b6be 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Prefetch sources from github"; - homepage = https://github.com/seppeljordan/nix-prefetch-github; + homepage = "https://github.com/seppeljordan/nix-prefetch-github"; license = licenses.gpl3; maintainers = with maintainers; [ seppeljordan ]; }; diff --git a/pkgs/development/python-modules/nixpkgs-pytools/default.nix b/pkgs/development/python-modules/nixpkgs-pytools/default.nix index ebb8b7c70eb..401c4814116 100644 --- a/pkgs/development/python-modules/nixpkgs-pytools/default.nix +++ b/pkgs/development/python-modules/nixpkgs-pytools/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for removing the tedious nature of creating nixpkgs derivations"; - homepage = https://github.com/nix-community/nixpkgs-pytools; + homepage = "https://github.com/nix-community/nixpkgs-pytools"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/nixpkgs/default.nix b/pkgs/development/python-modules/nixpkgs/default.nix index 66e8bb2a735..7df6d72c55c 100644 --- a/pkgs/development/python-modules/nixpkgs/default.nix +++ b/pkgs/development/python-modules/nixpkgs/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows to `from nixpkgs import` stuff in interactive Python sessions"; - homepage = https://github.com/t184256/nixpkgs-python-importer; + homepage = "https://github.com/t184256/nixpkgs-python-importer"; license = licenses.mit; maintainers = with maintainers; [ t184256 ]; }; diff --git a/pkgs/development/python-modules/nltk/default.nix b/pkgs/development/python-modules/nltk/default.nix index ef6d51cb19a..4f0a90a36af 100644 --- a/pkgs/development/python-modules/nltk/default.nix +++ b/pkgs/development/python-modules/nltk/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Natural Language Processing ToolKit"; - homepage = http://nltk.org/; + homepage = "http://nltk.org/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ lheckemann ]; }; diff --git a/pkgs/development/python-modules/nmigen-boards/default.nix b/pkgs/development/python-modules/nmigen-boards/default.nix index e40624b7a5c..55f70f74db9 100644 --- a/pkgs/development/python-modules/nmigen-boards/default.nix +++ b/pkgs/development/python-modules/nmigen-boards/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Board and connector definitions for nMigen"; - homepage = https://github.com/nmigen/nmigen-boards; + homepage = "https://github.com/nmigen/nmigen-boards"; license = licenses.bsd2; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/nmigen-soc/default.nix b/pkgs/development/python-modules/nmigen-soc/default.nix index bcd3deece54..4c15e65e62b 100644 --- a/pkgs/development/python-modules/nmigen-soc/default.nix +++ b/pkgs/development/python-modules/nmigen-soc/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "System on Chip toolkit for nMigen"; - homepage = https://github.com/nmigen/nmigen-soc; + homepage = "https://github.com/nmigen/nmigen-soc"; license = licenses.bsd2; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/nmigen/default.nix b/pkgs/development/python-modules/nmigen/default.nix index 010b4472966..3cb2056c7cf 100644 --- a/pkgs/development/python-modules/nmigen/default.nix +++ b/pkgs/development/python-modules/nmigen/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "A refreshed Python toolbox for building complex digital hardware"; - homepage = https://github.com/nmigen/nmigen; + homepage = "https://github.com/nmigen/nmigen"; license = licenses.bsd2; maintainers = with maintainers; [ emily ]; }; diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix index 1c38918c147..9c787147407 100644 --- a/pkgs/development/python-modules/node-semver/default.nix +++ b/pkgs/development/python-modules/node-semver/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/podhmo/python-semver; + homepage = "https://github.com/podhmo/python-semver"; description = "A port of node-semver"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/nodeenv/default.nix b/pkgs/development/python-modules/nodeenv/default.nix index 042ee1e3e61..f3f1c2b86c1 100644 --- a/pkgs/development/python-modules/nodeenv/default.nix +++ b/pkgs/development/python-modules/nodeenv/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Node.js virtual environment builder"; - homepage = https://github.com/ekalinin/nodeenv; + homepage = "https://github.com/ekalinin/nodeenv"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/noise/default.nix b/pkgs/development/python-modules/noise/default.nix index d136c41aa37..736444ec6e1 100644 --- a/pkgs/development/python-modules/noise/default.nix +++ b/pkgs/development/python-modules/noise/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/caseman/noise; + homepage = "https://github.com/caseman/noise"; description = "Native-code and shader implementations of Perlin noise"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/nose-cov/default.nix b/pkgs/development/python-modules/nose-cov/default.nix index 1d3d6179ae6..4b94e2657e9 100644 --- a/pkgs/development/python-modules/nose-cov/default.nix +++ b/pkgs/development/python-modules/nose-cov/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ nose covCore ]; meta = with lib; { - homepage = https://pypi.org/project/nose-cov/; + homepage = "https://pypi.org/project/nose-cov/"; license = licenses.mit; description = "This plugin produces coverage reports. It also supports coverage of subprocesses."; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/nose-cover3/default.nix b/pkgs/development/python-modules/nose-cover3/default.nix index 273c0ab042f..7f954f7ebca 100644 --- a/pkgs/development/python-modules/nose-cover3/default.nix +++ b/pkgs/development/python-modules/nose-cover3/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Coverage 3.x support for Nose"; - homepage = https://github.com/ask/nosecover3; + homepage = "https://github.com/ask/nosecover3"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/nose-cprof/default.nix b/pkgs/development/python-modules/nose-cprof/default.nix index c8bc7dbaf68..aa3f0d37f09 100644 --- a/pkgs/development/python-modules/nose-cprof/default.nix +++ b/pkgs/development/python-modules/nose-cprof/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python nose plugin to profile using cProfile rather than the default Hotshot profiler"; - homepage = https://github.com/msherry/nose-cprof; + homepage = "https://github.com/msherry/nose-cprof"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/nose-exclude/default.nix b/pkgs/development/python-modules/nose-exclude/default.nix index 7f679e545e7..81204a34bd9 100644 --- a/pkgs/development/python-modules/nose-exclude/default.nix +++ b/pkgs/development/python-modules/nose-exclude/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { license = lib.licenses.lgpl21; description = "Exclude specific directories from nosetests runs"; - homepage = https://github.com/kgrandis/nose-exclude; + homepage = "https://github.com/kgrandis/nose-exclude"; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/nose-focus/default.nix b/pkgs/development/python-modules/nose-focus/default.nix index ef86a35b304..d7b13eb1059 100644 --- a/pkgs/development/python-modules/nose-focus/default.nix +++ b/pkgs/development/python-modules/nose-focus/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Decorator and plugin to make nose focus on specific tests"; - homepage = https://nose-focus.readthedocs.io/en/latest/; + homepage = "https://nose-focus.readthedocs.io/en/latest/"; license = licenses.wtfpl; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/nose-of-yeti/default.nix b/pkgs/development/python-modules/nose-of-yeti/default.nix index 7a783da3117..b7fd1e241aa 100644 --- a/pkgs/development/python-modules/nose-of-yeti/default.nix +++ b/pkgs/development/python-modules/nose-of-yeti/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Nose plugin providing BDD dsl for python"; - homepage = https://github.com/delfick/nose-of-yeti; + homepage = "https://github.com/delfick/nose-of-yeti"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/pkgs/development/python-modules/nose-pattern-exclude/default.nix index 24d74b938af..2170ac224d9 100644 --- a/pkgs/development/python-modules/nose-pattern-exclude/default.nix +++ b/pkgs/development/python-modules/nose-pattern-exclude/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Exclude specific files and directories from nosetests runs"; - homepage = https://github.com/jakubroztocil/nose-pattern-exclude; + homepage = "https://github.com/jakubroztocil/nose-pattern-exclude"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/nose-randomly/default.nix b/pkgs/development/python-modules/nose-randomly/default.nix index 23315f9531b..eb75a375d77 100644 --- a/pkgs/development/python-modules/nose-randomly/default.nix +++ b/pkgs/development/python-modules/nose-randomly/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Nose plugin to randomly order tests and control random.seed"; - homepage = https://github.com/adamchainz/nose-randomly; + homepage = "https://github.com/adamchainz/nose-randomly"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/nose/default.nix b/pkgs/development/python-modules/nose/default.nix index bec5156d22e..a5ed49a29d7 100644 --- a/pkgs/development/python-modules/nose/default.nix +++ b/pkgs/development/python-modules/nose/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A unittest-based testing framework for python that makes writing and running tests easier"; - homepage = http://readthedocs.org/docs/nose/; + homepage = "http://readthedocs.org/docs/nose/"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/nose2/default.nix b/pkgs/development/python-modules/nose2/default.nix index 749a4d4618b..9ba65a22259 100644 --- a/pkgs/development/python-modules/nose2/default.nix +++ b/pkgs/development/python-modules/nose2/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "nose2 is the next generation of nicer testing for Python"; - homepage = https://github.com/nose-devs/nose2; + homepage = "https://github.com/nose-devs/nose2"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/nose_progressive/default.nix b/pkgs/development/python-modules/nose_progressive/default.nix index 6d9d98f27ab..b4683ef12cb 100644 --- a/pkgs/development/python-modules/nose_progressive/default.nix +++ b/pkgs/development/python-modules/nose_progressive/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = !isPy3k; meta = with stdenv.lib; { - homepage = https://github.com/erikrose/nose-progressive; + homepage = "https://github.com/erikrose/nose-progressive"; description = "A testrunner with a progress bar and smarter tracebacks"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/nose_warnings_filters/default.nix b/pkgs/development/python-modules/nose_warnings_filters/default.nix index 2b1ee207cfe..81e7de8815e 100644 --- a/pkgs/development/python-modules/nose_warnings_filters/default.nix +++ b/pkgs/development/python-modules/nose_warnings_filters/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Allow injecting warning filters during nosetest"; - homepage = https://github.com/Carreau/nose_warnings_filters; + homepage = "https://github.com/Carreau/nose_warnings_filters"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/nosejs/default.nix b/pkgs/development/python-modules/nosejs/default.nix index c2d3ee94c7b..9d30855c68e 100644 --- a/pkgs/development/python-modules/nosejs/default.nix +++ b/pkgs/development/python-modules/nosejs/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pypi.org/project/NoseJS/; + homepage = "https://pypi.org/project/NoseJS/"; description = "A Nose plugin for integrating JavaScript tests into a Python test suite"; license = licenses.free; }; diff --git a/pkgs/development/python-modules/nosexcover/default.nix b/pkgs/development/python-modules/nosexcover/default.nix index 2fb69838879..84cc4994b08 100644 --- a/pkgs/development/python-modules/nosexcover/default.nix +++ b/pkgs/development/python-modules/nosexcover/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Extends nose.plugins.cover to add Cobertura-style XML reports"; - homepage = https://github.com/cmheisel/nose-xcover/; + homepage = "https://github.com/cmheisel/nose-xcover/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index d081a5a92fb..8b8cce2f824 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -69,7 +69,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index b73dc553546..4550bb63631 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = { description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/notedown/default.nix b/pkgs/development/python-modules/notedown/default.nix index c1dacc84da0..8ecbf1f5afa 100644 --- a/pkgs/development/python-modules/notedown/default.nix +++ b/pkgs/development/python-modules/notedown/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/aaren/notedown; + homepage = "https://github.com/aaren/notedown"; description = "Convert IPython Notebooks to markdown (and back)"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ vcanadi ]; diff --git a/pkgs/development/python-modules/notify/default.nix b/pkgs/development/python-modules/notify/default.nix index f3a1d6514eb..7e71eb8b302 100644 --- a/pkgs/development/python-modules/notify/default.nix +++ b/pkgs/development/python-modules/notify/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = "0.1.1"; src = fetchurl { - url = http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2; + url = "http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.bz2"; sha256 = "1kh4spwgqxm534qlzzf2ijchckvs0pwjxl1irhicjmlg7mybnfvx"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Python bindings for libnotify"; - homepage = http://www.galago-project.org/; + homepage = "http://www.galago-project.org/"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/notify2/default.nix b/pkgs/development/python-modules/notify2/default.nix index 2d585192907..a7928fb66c6 100644 --- a/pkgs/development/python-modules/notify2/default.nix +++ b/pkgs/development/python-modules/notify2/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Pure Python interface to DBus notifications"; - homepage = https://bitbucket.org/takluyver/pynotify2; + homepage = "https://bitbucket.org/takluyver/pynotify2"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ mog ]; }; diff --git a/pkgs/development/python-modules/notmuch/default.nix b/pkgs/development/python-modules/notmuch/default.nix index 567977a84f5..4ae42b3390b 100644 --- a/pkgs/development/python-modules/notmuch/default.nix +++ b/pkgs/development/python-modules/notmuch/default.nix @@ -1,26 +1,24 @@ { stdenv , buildPythonPackage -, pkgs +, notmuch , python }: buildPythonPackage { - name = "python-${pkgs.notmuch.name}"; + inherit (notmuch) pname version src; - src = pkgs.notmuch.src; + sourceRoot = notmuch.pythonSourceRoot; - sourceRoot = pkgs.notmuch.pythonSourceRoot; - - buildInputs = [ python pkgs.notmuch ]; + buildInputs = [ python notmuch ]; postPatch = '' - sed -i -e '/CDLL/s@"libnotmuch\.@"${pkgs.notmuch}/lib/libnotmuch.@' \ + sed -i -e '/CDLL/s@"libnotmuch\.@"${notmuch}/lib/libnotmuch.@' \ notmuch/globals.py ''; meta = with stdenv.lib; { description = "A Python wrapper around notmuch"; - homepage = https://notmuchmail.org/; + homepage = "https://notmuchmail.org/"; license = licenses.gpl3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/ntlm-auth/default.nix b/pkgs/development/python-modules/ntlm-auth/default.nix index e4bbe0fb430..14900d5c55d 100644 --- a/pkgs/development/python-modules/ntlm-auth/default.nix +++ b/pkgs/development/python-modules/ntlm-auth/default.nix @@ -3,22 +3,23 @@ , fetchFromGitHub , mock , pytest +, requests , unittest2 , six }: buildPythonPackage rec { pname = "ntlm-auth"; - version = "1.0.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "jborean93"; repo = "ntlm-auth"; rev = "v${version}"; - sha256 = "09f2g4ivfi9lh1kr30hlg0q4n2imnvmd79w83gza11q9nmhhiwpz"; + sha256 = "168k3ygwbvnfcwn7q1nv3vvy6b9jc4cnpix0xgg5j8av7v1x0grn"; }; - checkInputs = [ mock pytest unittest2 ]; + checkInputs = [ mock pytest requests unittest2 ]; propagatedBuildInputs = [ six ]; # Functional tests require networking @@ -28,8 +29,8 @@ buildPythonPackage rec { meta = with lib; { description = "Calculates NTLM Authentication codes"; - homepage = https://github.com/jborean93/ntlm-auth; - license = licenses.lgpl3; + homepage = "https://github.com/jborean93/ntlm-auth"; + license = licenses.mit; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/ntplib/default.nix b/pkgs/development/python-modules/ntplib/default.nix index d6506ae4b4a..71397fd84cd 100644 --- a/pkgs/development/python-modules/ntplib/default.nix +++ b/pkgs/development/python-modules/ntplib/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python NTP library"; - homepage = http://code.google.com/p/ntplib/; + homepage = "http://code.google.com/p/ntplib/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/nuitka/default.nix b/pkgs/development/python-modules/nuitka/default.nix index edaed742538..5eef92a2879 100644 --- a/pkgs/development/python-modules/nuitka/default.nix +++ b/pkgs/development/python-modules/nuitka/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Python compiler with full language support and CPython compatibility"; license = licenses.asl20; - homepage = https://nuitka.net/; + homepage = "https://nuitka.net/"; }; } diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 829a983e380..8fbbdb677fd 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://numba.pydata.org/; + homepage = "http://numba.pydata.org/"; license = stdenv.lib.licenses.bsd2; description = "Compiling Python code using LLVM"; maintainers = with stdenv.lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 9725f131111..ea93fc1f3f3 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with lib;{ - homepage = https://github.com/alimanfoo/numcodecs; + homepage = "https://github.com/alimanfoo/numcodecs"; license = licenses.mit; description = "Buffer compression and transformation codecs for use in data storage and communication applications"; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/numericalunits/default.nix b/pkgs/development/python-modules/numericalunits/default.nix index 3f041ef698e..208178f5e11 100644 --- a/pkgs/development/python-modules/numericalunits/default.nix +++ b/pkgs/development/python-modules/numericalunits/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { disabled = !isPy3k; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/numericalunits; + homepage = "http://pypi.python.org/pypi/numericalunits"; description = "A package that lets you define quantities with unit"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/numpy-stl/default.nix b/pkgs/development/python-modules/numpy-stl/default.nix index 4c2af8a0081..5acdfd6f8c6 100644 --- a/pkgs/development/python-modules/numpy-stl/default.nix +++ b/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.10.1"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "f6b529b8a8112dfe456d4f7697c7aee0aca62be5a873879306afe4b26fca963c"; + sha256 = "1z6b740fpkr8fbbhw79l29hmwf76xcda6ni804sqz0jghm7883yy"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 92bcb131ab1..a863ef60d4a 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -78,7 +78,7 @@ in buildPythonPackage rec { meta = { description = "Scientific tools for Python"; - homepage = https://numpy.org/; + homepage = "https://numpy.org/"; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/numtraits/default.nix b/pkgs/development/python-modules/numtraits/default.nix index a0262c77595..624f32fd337 100644 --- a/pkgs/development/python-modules/numtraits/default.nix +++ b/pkgs/development/python-modules/numtraits/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Numerical traits for Python objects"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fridh ]; - homepage = https://github.com/astrofrog/numtraits; + homepage = "https://github.com/astrofrog/numtraits"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index 641db7008f8..9046a75260a 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; meta = with stdenv.lib; { - homepage = https://github.com/lilydjwg/nvchecker; + homepage = "https://github.com/lilydjwg/nvchecker"; description = "New version checker for software"; license = licenses.mit; maintainers = with maintainers; [ marsam ]; diff --git a/pkgs/development/python-modules/nwdiag/default.nix b/pkgs/development/python-modules/nwdiag/default.nix index ff66cb9450b..9e7d4958e3b 100644 --- a/pkgs/development/python-modules/nwdiag/default.nix +++ b/pkgs/development/python-modules/nwdiag/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate network-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; + homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix index 8e294f290cb..aae9b5f7437 100644 --- a/pkgs/development/python-modules/nxt-python/default.nix +++ b/pkgs/development/python-modules/nxt-python/default.nix @@ -27,7 +27,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Python driver/interface for Lego Mindstorms NXT robot"; - homepage = https://github.com/Eelviny/nxt-python; + homepage = "https://github.com/Eelviny/nxt-python"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/python-modules/oauth/default.nix b/pkgs/development/python-modules/oauth/default.nix index f4a8e3a62c2..133640f6620 100644 --- a/pkgs/development/python-modules/oauth/default.nix +++ b/pkgs/development/python-modules/oauth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/oauth/; + homepage = "https://code.google.com/archive/p/oauth/"; description = "Library for OAuth version 1.0a"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/oauth2client/default.nix b/pkgs/development/python-modules/oauth2client/default.nix index 8500b53b244..dc6e65d95cb 100644 --- a/pkgs/development/python-modules/oauth2client/default.nix +++ b/pkgs/development/python-modules/oauth2client/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A client library for OAuth 2.0"; - homepage = https://github.com/google/oauth2client/; + homepage = "https://github.com/google/oauth2client/"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index d8a97692976..d3617f25a9a 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Authenticate JupyterHub users with common OAuth providers, including GitHub, Bitbucket, and more."; - homepage = https://github.com/jupyterhub/oauthenticator; + homepage = "https://github.com/jupyterhub/oauthenticator"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/oauthlib/default.nix b/pkgs/development/python-modules/oauthlib/default.nix index b8b85f606a9..6c6ddc29de9 100644 --- a/pkgs/development/python-modules/oauthlib/default.nix +++ b/pkgs/development/python-modules/oauthlib/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/idan/oauthlib; + homepage = "https://github.com/idan/oauthlib"; description = "A generic, spec-compliant, thorough implementation of the OAuth request-signing logic"; maintainers = with maintainers; [ prikhi ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/obfsproxy/default.nix b/pkgs/development/python-modules/obfsproxy/default.nix index 8abd3f22ea3..c320f299ddb 100644 --- a/pkgs/development/python-modules/obfsproxy/default.nix +++ b/pkgs/development/python-modules/obfsproxy/default.nix @@ -29,8 +29,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pluggable transport proxy"; - homepage = https://www.torproject.org/projects/obfsproxy; - repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git; + homepage = "https://www.torproject.org/projects/obfsproxy"; + repositories.git = "https://git.torproject.org/pluggable-transports/obfsproxy.git"; maintainers = with maintainers; [ phreedom thoughtpolice ]; }; diff --git a/pkgs/development/python-modules/objgraph/default.nix b/pkgs/development/python-modules/objgraph/default.nix index c0e0cddb2c8..860f8c0051e 100644 --- a/pkgs/development/python-modules/objgraph/default.nix +++ b/pkgs/development/python-modules/objgraph/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Draws Python object reference graphs with graphviz"; - homepage = https://mg.pov.lt/objgraph/; + homepage = "https://mg.pov.lt/objgraph/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/od/default.nix b/pkgs/development/python-modules/od/default.nix index 0aaa40e1758..aa275cb27a6 100644 --- a/pkgs/development/python-modules/od/default.nix +++ b/pkgs/development/python-modules/od/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Shorthand syntax for building OrderedDicts"; - homepage = https://github.com/epsy/od; + homepage = "https://github.com/epsy/od"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix index 5e7cdfc9341..531a80759a0 100644 --- a/pkgs/development/python-modules/odfpy/default.nix +++ b/pkgs/development/python-modules/odfpy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Python API and tools to manipulate OpenDocument files"; - homepage = https://github.com/eea/odfpy; + homepage = "https://github.com/eea/odfpy"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/odo/default.nix b/pkgs/development/python-modules/odo/default.nix index 6c19bf0a0fd..4badad33a08 100644 --- a/pkgs/development/python-modules/odo/default.nix +++ b/pkgs/development/python-modules/odo/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/ContinuumIO/odo; + homepage = "https://github.com/ContinuumIO/odo"; description = "Data migration utilities"; license = licenses.bsdOriginal; maintainers = with maintainers; [ fridh costrouc ]; diff --git a/pkgs/development/python-modules/offtrac/default.nix b/pkgs/development/python-modules/offtrac/default.nix index e098ecc8c31..be796b5c37d 100644 --- a/pkgs/development/python-modules/offtrac/default.nix +++ b/pkgs/development/python-modules/offtrac/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://fedorahosted.org/offtrac; + homepage = "http://fedorahosted.org/offtrac"; description = "Trac xmlrpc library"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/ofxclient/default.nix b/pkgs/development/python-modules/ofxclient/default.nix index 2bde7b174d3..7eb4bef7350 100644 --- a/pkgs/development/python-modules/ofxclient/default.nix +++ b/pkgs/development/python-modules/ofxclient/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ofxhome ofxparse beautifulsoup4 lxml keyring ]; meta = with stdenv.lib; { - homepage = https://github.com/captin411/ofxclient; + homepage = "https://github.com/captin411/ofxclient"; description = "OFX client for dowloading transactions from banks"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/olefile/default.nix b/pkgs/development/python-modules/olefile/default.nix index ff4aba83bc8..5667da7fbc6 100644 --- a/pkgs/development/python-modules/olefile/default.nix +++ b/pkgs/development/python-modules/olefile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python package to parse, read and write Microsoft OLE2 files"; - homepage = https://www.decalage.info/python/olefileio; + homepage = "https://www.decalage.info/python/olefileio"; # BSD like + reference to Pillow license = "http://olefile.readthedocs.io/en/latest/License.html"; }; diff --git a/pkgs/development/python-modules/onkyo-eiscp/default.nix b/pkgs/development/python-modules/onkyo-eiscp/default.nix index 39c98706060..117b8228d2e 100644 --- a/pkgs/development/python-modules/onkyo-eiscp/default.nix +++ b/pkgs/development/python-modules/onkyo-eiscp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Control Onkyo receivers over ethernet"; - homepage = https://github.com/miracle2k/onkyo-eiscp; + homepage = "https://github.com/miracle2k/onkyo-eiscp"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/onnx/default.nix b/pkgs/development/python-modules/onnx/default.nix index 3f3cf38f333..3e2c8bd499d 100644 --- a/pkgs/development/python-modules/onnx/default.nix +++ b/pkgs/development/python-modules/onnx/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { dontConfigure = true; meta = { - homepage = http://onnx.ai; + homepage = "http://onnx.ai"; description = "Open Neural Network Exchange"; license = lib.licenses.mit; maintainers = [ lib.maintainers.acairncross ]; diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 160427db7f1..5e3806934d0 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { checkInputs = [ mock pytest pytestcov pytest-flake8 tox ]; meta = with lib; { - homepage = https://github.com/p1c2u/openapi-spec-validator; + homepage = "https://github.com/p1c2u/openapi-spec-validator"; description = "Validates OpenAPI Specs against the OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0.0 specification"; license = licenses.asl20; maintainers = with maintainers; [ rvl ]; diff --git a/pkgs/development/python-modules/openidc-client/default.nix b/pkgs/development/python-modules/openidc-client/default.nix index e0eb1ac8d79..9cfe714ef6f 100644 --- a/pkgs/development/python-modules/openidc-client/default.nix +++ b/pkgs/development/python-modules/openidc-client/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A CLI python OpenID Connect client with token caching and management"; - homepage = https://github.com/puiterwijk; + homepage = "https://github.com/puiterwijk"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/development/python-modules/openpyxl/2.nix b/pkgs/development/python-modules/openpyxl/2.nix index d58192c0666..73300de645f 100644 --- a/pkgs/development/python-modules/openpyxl/2.nix +++ b/pkgs/development/python-modules/openpyxl/2.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; - homepage = https://openpyxl.readthedocs.org; + homepage = "https://openpyxl.readthedocs.org"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lihop sjourdois ]; }; diff --git a/pkgs/development/python-modules/openpyxl/default.nix b/pkgs/development/python-modules/openpyxl/default.nix index a3f74f00093..ce6a909a5bf 100644 --- a/pkgs/development/python-modules/openpyxl/default.nix +++ b/pkgs/development/python-modules/openpyxl/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "A Python library to read/write Excel 2007 xlsx/xlsm files"; - homepage = https://openpyxl.readthedocs.org; + homepage = "https://openpyxl.readthedocs.org"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lihop sjourdois ]; }; diff --git a/pkgs/development/python-modules/openrazer/common.nix b/pkgs/development/python-modules/openrazer/common.nix index f231169115f..501b3fa54a4 100644 --- a/pkgs/development/python-modules/openrazer/common.nix +++ b/pkgs/development/python-modules/openrazer/common.nix @@ -9,7 +9,7 @@ sha256 = "013r9q4xg2xjmyxybx07zsl2b5lm9vw843anx22ygpvxz1qgz9hp"; }; meta = with stdenv.lib; { - homepage = https://openrazer.github.io/; + homepage = "https://openrazer.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ roelvandijk evanjs ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/opentimestamps/default.nix b/pkgs/development/python-modules/opentimestamps/default.nix index f9394efe398..e9dce6b2322 100644 --- a/pkgs/development/python-modules/opentimestamps/default.nix +++ b/pkgs/development/python-modules/opentimestamps/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Create and verify OpenTimestamps proofs"; - homepage = https://github.com/opentimestamps/python-opentimestamps; + homepage = "https://github.com/opentimestamps/python-opentimestamps"; license = lib.licenses.lgpl3; }; } diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index f20ca7285e6..63107ec372a 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/opentracing/opentracing-python; + homepage = "https://github.com/opentracing/opentracing-python"; description = "Platform API for OpenTracing"; license = licenses.asl20; maintainers = with maintainers; [ rakesh4g ]; diff --git a/pkgs/development/python-modules/openwrt-luci-rpc/default.nix b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix new file mode 100644 index 00000000000..4dc4ffa68fc --- /dev/null +++ b/pkgs/development/python-modules/openwrt-luci-rpc/default.nix @@ -0,0 +1,36 @@ +{ buildPythonPackage +, fetchPypi +, lib +, click +, requests +, packaging +}: + +with lib; + +buildPythonPackage rec { + pname = "openwrt-luci-rpc"; + version = "1.1.2"; + + srcs = fetchPypi { + inherit pname version; + sha256 = "144bw7w1xvpdkad5phflpkl15ih5pvi19799wmvfv8mj1dn1yjhp"; + }; + + postPatch = '' + substituteInPlace setup.py --replace "requests==2.21.0" "requests" + substituteInPlace setup.py --replace "packaging==19.1" "packaging" + ''; + + propagatedBuildInputs = [ click requests packaging ]; + + meta = { + description = '' + Python3 module for interacting with the OpenWrt Luci RPC interface. + Supports 15.X & 17.X & 18.X or newer releases of OpenWrt. + ''; + homepage = "https://github.com/fbradyirl/openwrt-luci-rpc"; + license = licenses.asl20; + maintainers = with maintainers; [ matt-snider ]; + }; +} diff --git a/pkgs/development/python-modules/opt-einsum/default.nix b/pkgs/development/python-modules/opt-einsum/default.nix index 1d8c9d9531a..85753ffa071 100644 --- a/pkgs/development/python-modules/opt-einsum/default.nix +++ b/pkgs/development/python-modules/opt-einsum/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Optimizing NumPy's einsum function with order optimization and GPU support."; - homepage = https://github.com/dgasmith/opt_einsum; + homepage = "https://github.com/dgasmith/opt_einsum"; license = licenses.mit; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/optuna/default.nix b/pkgs/development/python-modules/optuna/default.nix index 26c72899317..64ed54cafbe 100644 --- a/pkgs/development/python-modules/optuna/default.nix +++ b/pkgs/development/python-modules/optuna/default.nix @@ -85,7 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "A hyperparameter optimization framework"; - homepage = https://optuna.org/; + homepage = "https://optuna.org/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/orderedmultidict/default.nix b/pkgs/development/python-modules/orderedmultidict/default.nix index f144c43da06..82c08d65535 100644 --- a/pkgs/development/python-modules/orderedmultidict/default.nix +++ b/pkgs/development/python-modules/orderedmultidict/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Ordered Multivalue Dictionary."; - homepage = https://github.com/gruns/orderedmultidict; + homepage = "https://github.com/gruns/orderedmultidict"; license = licenses.publicDomain; maintainers = with maintainers; [ vanzef ]; }; diff --git a/pkgs/development/python-modules/orm/default.nix b/pkgs/development/python-modules/orm/default.nix index c2f6bc4fc57..dece359b0c0 100644 --- a/pkgs/development/python-modules/orm/default.nix +++ b/pkgs/development/python-modules/orm/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "An async ORM"; - homepage = https://github.com/encode/orm; + homepage = "https://github.com/encode/orm"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/osmnx/default.nix b/pkgs/development/python-modules/osmnx/default.nix index ae4e8a03971..856c2bb45db 100755 --- a/pkgs/development/python-modules/osmnx/default.nix +++ b/pkgs/development/python-modules/osmnx/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A package to easily download, construct, project, visualize, and analyze complex street networks from OpenStreetMap with NetworkX."; - homepage = https://github.com/gboeing/osmnx; + homepage = "https://github.com/gboeing/osmnx"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix index 237ad7a7a00..16997d66781 100644 --- a/pkgs/development/python-modules/osqp/default.nix +++ b/pkgs/development/python-modules/osqp/default.nix @@ -4,10 +4,9 @@ , cmake , future , numpy - # check inputs , scipy +# check inputs , pytestCheckHook -, mkl }: buildPythonPackage rec { @@ -23,16 +22,15 @@ buildPythonPackage rec { dontUseCmakeConfigure = true; propagatedBuildInputs = [ - numpy future + numpy + scipy ]; - checkInputs = [ scipy pytestCheckHook mkl ]; pythonImportsCheck = [ "osqp" ]; - dontUseSetuptoolsCheck = true; # running setup.py fails if false - preCheck = '' - export LD_LIBRARY_PATH=${lib.strings.makeLibraryPath [ mkl ]}:$LD_LIBRARY_PATH; - ''; + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; # don't run checks twice + disabledTests = [ "mkl_" ]; meta = with lib; { description = "The Operator Splitting QP Solver"; @@ -44,8 +42,8 @@ buildPythonPackage rec { where x in R^n is the optimization variable ''; homepage = "https://osqp.org/"; - downloadPage = "https://github.com/oxfordcontrol/osqp"; + downloadPage = "https://github.com/oxfordcontrol/osqp-python/releases"; license = licenses.asl20; - maintainers = with lib.maintainers; [ drewrisinger ]; + maintainers = with maintainers; [ drewrisinger ]; }; } diff --git a/pkgs/development/python-modules/outcome/default.nix b/pkgs/development/python-modules/outcome/default.nix index ff97ca15a92..6e7593cec1c 100644 --- a/pkgs/development/python-modules/outcome/default.nix +++ b/pkgs/development/python-modules/outcome/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Capture the outcome of Python function calls."; - homepage = https://github.com/python-trio/outcome; + homepage = "https://github.com/python-trio/outcome"; license = with lib.licenses; [ mit asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/ovh/default.nix b/pkgs/development/python-modules/ovh/default.nix index 22e82141cdc..305b03b4d14 100644 --- a/pkgs/development/python-modules/ovh/default.nix +++ b/pkgs/development/python-modules/ovh/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Thin wrapper around OVH's APIs"; - homepage = https://github.com/ovh/python-ovh; + homepage = "https://github.com/ovh/python-ovh"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/ovito/default.nix b/pkgs/development/python-modules/ovito/default.nix index 694b87581cd..5f852b29298 100644 --- a/pkgs/development/python-modules/ovito/default.nix +++ b/pkgs/development/python-modules/ovito/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Scientific visualization and analysis software for atomistic simulation data"; - homepage = https://www.ovito.org; + homepage = "https://www.ovito.org"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; # ensures not built on hydra diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix index 1e79a764147..93adf764597 100644 --- a/pkgs/development/python-modules/owslib/default.nix +++ b/pkgs/development/python-modules/owslib/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { meta = with lib; { description = "client for Open Geospatial Consortium web service interface standards"; license = licenses.bsd3; - homepage = https://www.osgeo.org/projects/owslib/; + homepage = "https://www.osgeo.org/projects/owslib/"; }; } diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix index 0c64c95b4b6..ce6836f9f2b 100644 --- a/pkgs/development/python-modules/packaging/default.nix +++ b/pkgs/development/python-modules/packaging/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Core utilities for Python packages"; - homepage = https://github.com/pypa/packaging; + homepage = "https://github.com/pypa/packaging"; license = [ licenses.bsd2 licenses.asl20 ]; maintainers = with maintainers; [ bennofs ]; }; diff --git a/pkgs/development/python-modules/pafy/default.nix b/pkgs/development/python-modules/pafy/default.nix index 53218146557..c657a2fa1b1 100644 --- a/pkgs/development/python-modules/pafy/default.nix +++ b/pkgs/development/python-modules/pafy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to download YouTube content and retrieve metadata"; - homepage = https://github.com/mps-youtube/pafy; + homepage = "https://github.com/mps-youtube/pafy"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ odi ]; }; diff --git a/pkgs/development/python-modules/pagerduty/default.nix b/pkgs/development/python-modules/pagerduty/default.nix index d3f47dad3ca..00236f3c234 100644 --- a/pkgs/development/python-modules/pagerduty/default.nix +++ b/pkgs/development/python-modules/pagerduty/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/samuel/python-pagerduty; + homepage = "https://github.com/samuel/python-pagerduty"; description = "Library for the PagerDuty service API"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/paho-mqtt/default.nix b/pkgs/development/python-modules/paho-mqtt/default.nix index 886307b7104..977ba3cdeb8 100644 --- a/pkgs/development/python-modules/paho-mqtt/default.nix +++ b/pkgs/development/python-modules/paho-mqtt/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; meta = with lib; { - homepage = https://eclipse.org/paho; + homepage = "https://eclipse.org/paho"; description = "MQTT version 3.1.1 client class"; license = licenses.epl10; maintainers = with maintainers; [ mog dotlambda ]; diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index 6313e759e6b..9f1aed30ff7 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library of color palettes"; - homepage = https://jiffyclub.github.io/palettable/; + homepage = "https://jiffyclub.github.io/palettable/"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pam/default.nix b/pkgs/development/python-modules/pam/default.nix new file mode 100644 index 00000000000..6b585537978 --- /dev/null +++ b/pkgs/development/python-modules/pam/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pam +}: + +buildPythonPackage rec { + pname = "python-pam"; + version = "1.8.4"; + + src = fetchFromGitHub { + owner = "FirefighterBlu3"; + repo = pname; + rev = "v${version}"; + sha256 = "0gp7vzd332j7jwndcnz7kc9j283d6lyv32bndd1nqv9ghzv69sxp"; + }; + + buildInputs = [ + pam + ]; + + postPatch = '' + sed "s|find_library(\"pam\")|\"${pam}/lib/libpam.so\"|g" -i pam.py + ''; + + meta = with lib; { + description = "Python pam module supporting py3 (and py2)"; + homepage = "https://github.com/FirefighterBlu3/python-pam"; + license = licenses.mit; + maintainers = with maintainers; [ mkg20001 ]; + }; +} diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 07eab3b7bc9..09cda279730 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "RabbitMQ Focused AMQP low-level library"; - homepage = https://pypi.python.org/pypi/pamqp; + homepage = "https://pypi.python.org/pypi/pamqp"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index d0e932dec1b..0f4a3542086 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -122,7 +122,7 @@ in buildPythonPackage rec { # 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/; + homepage = "https://pandas.pydata.org/"; description = "Python Data Analysis Library"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ raskin fridh knedlsepp ]; diff --git a/pkgs/development/python-modules/pandoc-attributes/default.nix b/pkgs/development/python-modules/pandoc-attributes/default.nix index 8b5652bfb54..d4da8e3cac6 100644 --- a/pkgs/development/python-modules/pandoc-attributes/default.nix +++ b/pkgs/development/python-modules/pandoc-attributes/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/aaren/pandoc-attributes; + homepage = "https://github.com/aaren/pandoc-attributes"; description = "An Attribute class to be used with pandocfilters"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ vcanadi ]; diff --git a/pkgs/development/python-modules/pandocfilters/default.nix b/pkgs/development/python-modules/pandocfilters/default.nix index a6edb89dcab..5b87593e0c6 100644 --- a/pkgs/development/python-modules/pandocfilters/default.nix +++ b/pkgs/development/python-modules/pandocfilters/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec{ meta = with stdenv.lib; { description = "A python module for writing pandoc filters, with a collection of examples"; - homepage = https://github.com/jgm/pandocfilters; + homepage = "https://github.com/jgm/pandocfilters"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index 0047548779c..ef1553e6d09 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "A high level dashboarding library for python visualization libraries"; - homepage = https://pyviz.org; + homepage = "https://pyviz.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/papermill/default.nix b/pkgs/development/python-modules/papermill/default.nix index ffe0fbc5da5..baa2ae7e449 100644 --- a/pkgs/development/python-modules/papermill/default.nix +++ b/pkgs/development/python-modules/papermill/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parametrize and run Jupyter and nteract Notebooks"; - homepage = https://github.com/nteract/papermill; + homepage = "https://github.com/nteract/papermill"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/paperspace/default.nix b/pkgs/development/python-modules/paperspace/default.nix index 7999ce03efe..c439b4099a0 100644 --- a/pkgs/development/python-modules/paperspace/default.nix +++ b/pkgs/development/python-modules/paperspace/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python API for Paperspace Cloud"; - homepage = https://paperspace.com; + homepage = "https://paperspace.com"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/python-modules/papis-python-rofi/default.nix b/pkgs/development/python-modules/papis-python-rofi/default.nix index 1344e1588cd..8750b96f5c9 100644 --- a/pkgs/development/python-modules/papis-python-rofi/default.nix +++ b/pkgs/development/python-modules/papis-python-rofi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "A Python module to make simple GUIs with Rofi"; - homepage = https://github.com/alejandrogallo/python-rofi; + homepage = "https://github.com/alejandrogallo/python-rofi"; license = lib.licenses.mit; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index f770fecd5e5..39b324dd55c 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = { description = "Powerful command-line document and bibliography manager"; - homepage = https://papis.readthedocs.io/en/latest/; + homepage = "https://papis.readthedocs.io/en/latest/"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ nico202 teto ]; }; diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index d6b35725c76..3467cb488f5 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Declarative Python programming using Parameters"; - homepage = https://github.com/pyviz/param; + homepage = "https://github.com/pyviz/param"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/parameterized/default.nix b/pkgs/development/python-modules/parameterized/default.nix index f5dd38cc743..fb921bb2938 100644 --- a/pkgs/development/python-modules/parameterized/default.nix +++ b/pkgs/development/python-modules/parameterized/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parameterized testing with any Python test framework"; - homepage = https://pypi.python.org/pypi/parameterized; + homepage = "https://pypi.python.org/pypi/parameterized"; license = licenses.bsd3; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/development/python-modules/paramz/default.nix b/pkgs/development/python-modules/paramz/default.nix index 029ce4a1712..430d91a60ec 100644 --- a/pkgs/development/python-modules/paramz/default.nix +++ b/pkgs/development/python-modules/paramz/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parameterization framework for parameterized model creation and handling"; - homepage = https://github.com/sods/paramz; + homepage = "https://github.com/sods/paramz"; license = licenses.bsd3; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/parfive/default.nix b/pkgs/development/python-modules/parfive/default.nix index 26a3a613be4..225ee12e51a 100644 --- a/pkgs/development/python-modules/parfive/default.nix +++ b/pkgs/development/python-modules/parfive/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with lib; { description = "A HTTP and FTP parallel file downloader"; - homepage = https://parfive.readthedocs.io/; + homepage = "https://parfive.readthedocs.io/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/parse-type/default.nix b/pkgs/development/python-modules/parse-type/default.nix index 04ad3ba9c18..cbf4ee0836e 100644 --- a/pkgs/development/python-modules/parse-type/default.nix +++ b/pkgs/development/python-modules/parse-type/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jenisys/parse_type; + homepage = "https://github.com/jenisys/parse_type"; description = "Simplifies to build parse types based on the parse module"; license = licenses.bsd3; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index d79badd66c9..08af6dc2720 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/r1chardj0n3s/parse; + homepage = "https://github.com/r1chardj0n3s/parse"; description = "parse() is the opposite of format()"; license = licenses.bsdOriginal; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index 24fc5789405..c6a15b8c99f 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "A Python Parser"; - homepage = https://github.com/davidhalter/parso; + homepage = "https://github.com/davidhalter/parso"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/parsy/default.nix b/pkgs/development/python-modules/parsy/default.nix index c7ee17f8c8d..156da088547 100644 --- a/pkgs/development/python-modules/parsy/default.nix +++ b/pkgs/development/python-modules/parsy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.4"; meta = with lib; { - homepage = https://github.com/python-parsy/parsy; + homepage = "https://github.com/python-parsy/parsy"; description = "Easy-to-use parser combinators, for parsing in pure Python"; license = [ licenses.mit ]; maintainers = with maintainers; [ aepsil0n ]; diff --git a/pkgs/development/python-modules/partd/default.nix b/pkgs/development/python-modules/partd/default.nix index e8a148edb23..584b4b4315c 100644 --- a/pkgs/development/python-modules/partd/default.nix +++ b/pkgs/development/python-modules/partd/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { meta = { description = "Appendable key-value storage"; license = with lib.licenses; [ bsd3 ]; - homepage = https://github.com/dask/partd/; + homepage = "https://github.com/dask/partd/"; }; } diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index e49ad50d91f..84ace0bdb82 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -19,6 +19,6 @@ buildPythonPackage rec { meta = { description = "A password hashing library for Python"; - homepage = https://code.google.com/p/passlib/; + homepage = "https://code.google.com/p/passlib/"; }; } diff --git a/pkgs/development/python-modules/paste/default.nix b/pkgs/development/python-modules/paste/default.nix index 210996123a3..a9c86513fe8 100644 --- a/pkgs/development/python-modules/paste/default.nix +++ b/pkgs/development/python-modules/paste/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tools for using a Web Server Gateway Interface stack"; - homepage = http://pythonpaste.org/; + homepage = "http://pythonpaste.org/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pastedeploy/default.nix b/pkgs/development/python-modules/pastedeploy/default.nix index 3301521b085..d2ca8d445e4 100644 --- a/pkgs/development/python-modules/pastedeploy/default.nix +++ b/pkgs/development/python-modules/pastedeploy/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Load, configure, and compose WSGI applications and servers"; - homepage = http://pythonpaste.org/deploy/; + homepage = "http://pythonpaste.org/deploy/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pastel/default.nix b/pkgs/development/python-modules/pastel/default.nix index 532970c62c2..a44b4253ca5 100644 --- a/pkgs/development/python-modules/pastel/default.nix +++ b/pkgs/development/python-modules/pastel/default.nix @@ -1,24 +1,21 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pytest }: +{ lib, buildPythonPackage, fetchPypi, poetry, pytest }: buildPythonPackage rec { pname = "pastel"; - version = "0.1.0"; + version = "0.2.0"; - # No tests in PyPi tarball - src = fetchFromGitHub { - owner = "sdispater"; - repo = "pastel"; - rev = version; - sha256 = "1b4ag7jr7j0sxly5g29imdq8g0d4ixhbck55dblr45mlsidydx0s"; + src = fetchPypi { + inherit pname version; + sha256 = "0dnaw44ss10i10z4ksy0xljknvjap7rb7g0b8p6yzm5x4g2my5a6"; }; checkInputs = [ pytest ]; checkPhase = '' - pytest tests -sq + pytest ''; meta = with lib; { - homepage = https://github.com/sdispater/pastel; + homepage = "https://github.com/sdispater/pastel"; description = "Bring colors to your terminal"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/pastescript/default.nix b/pkgs/development/python-modules/pastescript/default.nix index dd93bd404d0..ce012c3d102 100644 --- a/pkgs/development/python-modules/pastescript/default.nix +++ b/pkgs/development/python-modules/pastescript/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pluggable command-line frontend, including commands to setup package file layouts"; - homepage = https://github.com/cdent/pastescript/; + homepage = "https://github.com/cdent/pastescript/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/patch-ng/default.nix b/pkgs/development/python-modules/patch-ng/default.nix index 726df160929..7cab2570798 100644 --- a/pkgs/development/python-modules/patch-ng/default.nix +++ b/pkgs/development/python-modules/patch-ng/default.nix @@ -1,15 +1,15 @@ { stdenv , buildPythonPackage -, fetchurl +, fetchPypi }: buildPythonPackage rec { - version = "1.17.2"; # note: `conan` package may require a hardcoded one + version = "1.17.4"; # note: `conan` package may require a hardcoded one pname = "patch-ng"; - src = fetchurl { - url = "mirror://pypi/p/${pname}/${pname}-${version}.tar.gz"; - sha256 = "02nadk70sk51liv0qav88kx8rzfdjc1x52023zayanz44kkcjl2i"; + src = fetchPypi { + inherit pname version; + sha256 = "1kja1nn08w0k8k6j4kad48k581hh9drvjjb8x60v9j13sxdvqyk2"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/patch/default.nix b/pkgs/development/python-modules/patch/default.nix index 1a7ce953947..a4af8319f62 100644 --- a/pkgs/development/python-modules/patch/default.nix +++ b/pkgs/development/python-modules/patch/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library to parse and apply unified diffs"; - homepage = https://github.com/techtonik/python-patch/; + homepage = "https://github.com/techtonik/python-patch/"; license = licenses.mit; maintainers = [ maintainers.igsha ]; }; diff --git a/pkgs/development/python-modules/path-and-address/default.nix b/pkgs/development/python-modules/path-and-address/default.nix index 55d7afd9fa4..f30a6ddd408 100644 --- a/pkgs/development/python-modules/path-and-address/default.nix +++ b/pkgs/development/python-modules/path-and-address/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Functions for server CLI applications used by humans"; - homepage = https://github.com/joeyespo/path-and-address; + homepage = "https://github.com/joeyespo/path-and-address"; license = licenses.mit; maintainers = with maintainers; [ koral]; }; diff --git a/pkgs/development/python-modules/path.py/2.nix b/pkgs/development/python-modules/path.py/2.nix index 318642a393a..fb4ff20b707 100644 --- a/pkgs/development/python-modules/path.py/2.nix +++ b/pkgs/development/python-modules/path.py/2.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "A module wrapper for os.path"; - homepage = https://github.com/jaraco/path.py; + homepage = "https://github.com/jaraco/path.py"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/path.py/default.nix b/pkgs/development/python-modules/path.py/default.nix index 272c34df429..56e856cff9a 100644 --- a/pkgs/development/python-modules/path.py/default.nix +++ b/pkgs/development/python-modules/path.py/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "A module wrapper for os.path"; - homepage = https://github.com/jaraco/path.py; + homepage = "https://github.com/jaraco/path.py"; license = lib.licenses.mit; }; @@ -45,7 +45,7 @@ buildPythonPackage rec { patches = [ (fetchpatch { - url = https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch; + url = "https://github.com/jaraco/path.py/commit/02eb16f0eb2cdc0015972ce963357aaa1cd0b84b.patch"; sha256 = "0bqa8vjwil7jn35a6984adcm24pvv3pjkhszv10qv6yr442d1mk9"; }) ]; diff --git a/pkgs/development/python-modules/pathlib/default.nix b/pkgs/development/python-modules/pathlib/default.nix index d70178dac85..cf4dd0999d4 100644 --- a/pkgs/development/python-modules/pathlib/default.nix +++ b/pkgs/development/python-modules/pathlib/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Object-oriented filesystem paths"; - homepage = https://pathlib.readthedocs.org/; + homepage = "https://pathlib.readthedocs.org/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index a81c652075c..6e04f2e7a03 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "This module offers classes representing filesystem paths with semantics appropriate for different operating systems."; - homepage = https://pypi.python.org/pypi/pathlib2/; + homepage = "https://pypi.python.org/pypi/pathlib2/"; license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/pathos/default.nix b/pkgs/development/python-modules/pathos/default.nix index e575aa333eb..2b9134750fe 100644 --- a/pkgs/development/python-modules/pathos/default.nix +++ b/pkgs/development/python-modules/pathos/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parallel graph management and execution in heterogeneous computing"; - homepage = https://github.com/uqfoundation/pathos/; + homepage = "https://github.com/uqfoundation/pathos/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pathtools/default.nix b/pkgs/development/python-modules/pathtools/default.nix index 8709662e6a1..75901743c7e 100644 --- a/pkgs/development/python-modules/pathtools/default.nix +++ b/pkgs/development/python-modules/pathtools/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pattern matching and various utilities for file systems paths"; - homepage = https://github.com/gorakhargosh/pathtools; + homepage = "https://github.com/gorakhargosh/pathtools"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/patsy/default.nix b/pkgs/development/python-modules/patsy/default.nix index a21b4027bbb..bd3c103b9a7 100644 --- a/pkgs/development/python-modules/patsy/default.nix +++ b/pkgs/development/python-modules/patsy/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "A Python package for describing statistical models"; - homepage = https://github.com/pydata/patsy; + homepage = "https://github.com/pydata/patsy"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ ilya-kolpakov ]; }; diff --git a/pkgs/development/python-modules/paver/default.nix b/pkgs/development/python-modules/paver/default.nix index 17ae2428b87..ec4a40fec1b 100644 --- a/pkgs/development/python-modules/paver/default.nix +++ b/pkgs/development/python-modules/paver/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python-based build/distribution/deployment scripting tool"; - homepage = https://github.com/paver/paver; + homepage = "https://github.com/paver/paver"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/paypalrestsdk/default.nix b/pkgs/development/python-modules/paypalrestsdk/default.nix index dbc918e6c0d..26c44f0b070 100644 --- a/pkgs/development/python-modules/paypalrestsdk/default.nix +++ b/pkgs/development/python-modules/paypalrestsdk/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six pyopenssl ]; meta = { - homepage = https://developer.paypal.com/; + homepage = "https://developer.paypal.com/"; description = "Python APIs to create, process and manage payment"; license = "PayPal SDK License"; }; diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix index 310d16026a9..4180d1069e4 100644 --- a/pkgs/development/python-modules/pbr/default.nix +++ b/pkgs/development/python-modules/pbr/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://docs.openstack.org/developer/pbr/; + homepage = "http://docs.openstack.org/developer/pbr/"; license = stdenv.lib.licenses.asl20; description = "Python Build Reasonableness"; }; diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index 1c032ea62b4..f621140f137 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/ned14/pcpp; + homepage = "https://github.com/ned14/pcpp"; description = "A C99 preprocessor written in pure Python"; license = licenses.bsd0; maintainers = with maintainers; [ rakesh4g ]; diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix index 41009a4b7a2..def036d271c 100644 --- a/pkgs/development/python-modules/pdf2image/default.nix +++ b/pkgs/development/python-modules/pdf2image/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python module that wraps the pdftoppm utility to convert PDF to PIL Image object"; - homepage = https://github.com/Belval/pdf2image; + homepage = "https://github.com/Belval/pdf2image"; license = licenses.mit; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/pdfkit/default.nix b/pkgs/development/python-modules/pdfkit/default.nix index 0d6edcbd3f4..dc9d33ddf0d 100644 --- a/pkgs/development/python-modules/pdfkit/default.nix +++ b/pkgs/development/python-modules/pdfkit/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/pdfkit; + homepage = "https://pypi.python.org/pypi/pdfkit"; description = "Wkhtmltopdf python wrapper to convert html to pdf using the webkit rendering engine and qt"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 5f3cc06b5af..ace2b618ef2 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,19 +1,29 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, six, pycryptodome, chardet, nose, sortedcontainers }: +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers, fetchpatch }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20191020"; + version = "20200402"; + + disabled = !isPy3k; # No tests in PyPi Tarball src = fetchFromGitHub { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1fqn4ilcscvw6ws9a1yqiprha9d3rgw3d0280clkbk6s4l26wm9h"; + sha256 = "1wl64r3ifpwi7mm5pcxc0ji7w380nxcq3zrv66n95lglm4zqkf26"; }; - propagatedBuildInputs = [ six pycryptodome sortedcontainers ] - ++ stdenv.lib.optionals isPy3k [ chardet ]; + patches = [ + # Add shebang line to scripts. See: https://github.com/pdfminer/pdfminer.six/pull/408 + (fetchpatch { + url = "https://github.com/pdfminer/pdfminer.six/commit/0c2f44b6de064d9a3cea99bde5b8e9c6a525a69c.patch"; + sha256 = "1vml66grnvg4g26mya24kiyxsz809d4mr7wz8qmawjbn4ss65y21"; + excludes = [ "CHANGELOG.md" ]; + }) + ]; + + propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ]; checkInputs = [ nose ]; checkPhase = '' @@ -21,8 +31,8 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "fork of PDFMiner using six for Python 2+3 compatibility"; - homepage = https://github.com/pdfminer/pdfminer.six; + description = "PDF parser and analyzer"; + homepage = "https://github.com/pdfminer/pdfminer.six"; license = licenses.mit; maintainers = with maintainers; [ psyanticy marsam ]; }; diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index fc329009d31..24be7ce7f86 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple PDF text extraction"; - homepage = https://github.com/jalan/pdftotext; + homepage = "https://github.com/jalan/pdftotext"; license = licenses.mit; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/peewee/default.nix b/pkgs/development/python-modules/peewee/default.nix index 2c7832f6ab4..3cc5c3eec49 100644 --- a/pkgs/development/python-modules/peewee/default.nix +++ b/pkgs/development/python-modules/peewee/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with stdenv.lib;{ description = "a small, expressive orm"; - homepage = http://peewee-orm.com; + 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 7066ecd3a52..c7c1ced34f1 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tool to generate a static blog from reStructuredText or Markdown input files"; - homepage = http://getpelican.com/; + homepage = "http://getpelican.com/"; license = licenses.agpl3; maintainers = with maintainers; [ offline prikhi ]; }; diff --git a/pkgs/development/python-modules/pendulum/default.nix b/pkgs/development/python-modules/pendulum/default.nix index 354bded7b8c..77217d1c38d 100644 --- a/pkgs/development/python-modules/pendulum/default.nix +++ b/pkgs/development/python-modules/pendulum/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python datetimes made easy"; - homepage = https://github.com/sdispater/pendulum; + homepage = "https://github.com/sdispater/pendulum"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pep257/default.nix b/pkgs/development/python-modules/pep257/default.nix index fc1028a0d1c..8f3a1e0ea8b 100644 --- a/pkgs/development/python-modules/pep257/default.nix +++ b/pkgs/development/python-modules/pep257/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/GreenSteam/pep257/; + homepage = "https://github.com/GreenSteam/pep257/"; description = "Python docstring style checker"; longDescription = "Static analysis tool for checking compliance with Python PEP 257."; license = licenses.mit; diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 5c66eb6cad0..1c972b00275 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/PyCQA/pep8-naming; + homepage = "https://github.com/PyCQA/pep8-naming"; description = "Check PEP-8 naming conventions, plugin for flake8"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/peppercorn/default.nix b/pkgs/development/python-modules/peppercorn/default.nix index 1fb661d53e7..51114a591a5 100644 --- a/pkgs/development/python-modules/peppercorn/default.nix +++ b/pkgs/development/python-modules/peppercorn/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for converting a token stream into a data structure for use in web form posts"; - homepage = https://docs.pylonsproject.org/projects/peppercorn/en/latest/; + homepage = "https://docs.pylonsproject.org/projects/peppercorn/en/latest/"; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/percol/default.nix b/pkgs/development/python-modules/percol/default.nix index 2d113049009..eddf58e559d 100644 --- a/pkgs/development/python-modules/percol/default.nix +++ b/pkgs/development/python-modules/percol/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with lib; { - homepage = https://github.com/mooz/percol; + homepage = "https://github.com/mooz/percol"; description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; license = licenses.mit; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/perfplot/default.nix b/pkgs/development/python-modules/perfplot/default.nix index 4e451e816c0..229e994b41b 100644 --- a/pkgs/development/python-modules/perfplot/default.nix +++ b/pkgs/development/python-modules/perfplot/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Performance plots for Python code snippets"; - homepage = https://github.com/nschloe/perfplot; + homepage = "https://github.com/nschloe/perfplot"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/periodictable/default.nix b/pkgs/development/python-modules/periodictable/default.nix index c88da3ff07f..e3536232680 100644 --- a/pkgs/development/python-modules/periodictable/default.nix +++ b/pkgs/development/python-modules/periodictable/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec{ }; meta = { - homepage = http://www.reflectometry.org/danse/software.html; + homepage = "http://www.reflectometry.org/danse/software.html"; description = "an extensible periodic table of the elements prepopulated with data important to neutron and x-ray scattering experiments"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ rprospero ]; diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix index 471552cdcc9..b59fa303573 100644 --- a/pkgs/development/python-modules/persim/default.nix +++ b/pkgs/development/python-modules/persim/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "Distances and representations of persistence diagrams"; - homepage = https://persim.scikit-tda.org; + homepage = "https://persim.scikit-tda.org"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/persisting-theory/default.nix b/pkgs/development/python-modules/persisting-theory/default.nix index 3e729c2149e..ca14f80868c 100644 --- a/pkgs/development/python-modules/persisting-theory/default.nix +++ b/pkgs/development/python-modules/persisting-theory/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = https://code.eliotberriot.com/eliotberriot/persisting-theory; + homepage = "https://code.eliotberriot.com/eliotberriot/persisting-theory"; description = "Automate data discovering and access inside a list of packages"; license = licenses.bsd3; maintainers = with maintainers; [ mmai ]; diff --git a/pkgs/development/python-modules/pexif/default.nix b/pkgs/development/python-modules/pexif/default.nix index ac1c7de8682..f3086b6b055 100644 --- a/pkgs/development/python-modules/pexif/default.nix +++ b/pkgs/development/python-modules/pexif/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A module for editing JPEG EXIF data"; - homepage = http://www.benno.id.au/code/pexif/; + homepage = "http://www.benno.id.au/code/pexif/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pexpect/default.nix b/pkgs/development/python-modules/pexpect/default.nix index 01b16d5bd63..4c287cfc37c 100644 --- a/pkgs/development/python-modules/pexpect/default.nix +++ b/pkgs/development/python-modules/pexpect/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ ptyprocess ]; meta = with lib; { - homepage = http://www.noah.org/wiki/Pexpect; + homepage = "http://www.noah.org/wiki/Pexpect"; description = "Automate interactive console applications such as ssh, ftp, etc"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/development/python-modules/pg8000/1_12.nix b/pkgs/development/python-modules/pg8000/1_12.nix index efeee5e077f..bc4ff9f4f03 100644 --- a/pkgs/development/python-modules/pg8000/1_12.nix +++ b/pkgs/development/python-modules/pg8000/1_12.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz six ]; meta = with stdenv.lib; { - homepage = https://github.com/tlocke/pg8000; + homepage = "https://github.com/tlocke/pg8000"; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 33790b97c4e..9131d8adaa2 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ passlib ]; meta = with stdenv.lib; { - homepage = https://github.com/tlocke/pg8000; + homepage = "https://github.com/tlocke/pg8000"; description = "PostgreSQL interface library, for asyncio"; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index bc54c18ac81..1165157fecc 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.8"; + version = "1.10"; src = fetchPypi { inherit pname version; - sha256 = "115067100fbb9eb36f530d94b64b4e1e36a8d304537af0847d562ff9ed399c05"; + sha256 = "a26ba77127b363446955e8a5317b3194defb1c1bb9d2ed5e7d4830fd4f066d97"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pgpdump/default.nix b/pkgs/development/python-modules/pgpdump/default.nix index ea9ef0a156f..0f200409622 100644 --- a/pkgs/development/python-modules/pgpdump/default.nix +++ b/pkgs/development/python-modules/pgpdump/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for parsing PGP packets"; - homepage = https://github.com/toofishes/python-pgpdump; + homepage = "https://github.com/toofishes/python-pgpdump"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pgpy/default.nix b/pkgs/development/python-modules/pgpy/default.nix index 50220bb3993..9067817a3ba 100644 --- a/pkgs/development/python-modules/pgpy/default.nix +++ b/pkgs/development/python-modules/pgpy/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/SecurityInnovation/PGPy; + homepage = "https://github.com/SecurityInnovation/PGPy"; description = "Pretty Good Privacy for Python 2 and 3"; longDescription = '' PGPy is a Python (2 and 3) library for implementing Pretty Good Privacy diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix index ccca0dd155e..03db8916d44 100644 --- a/pkgs/development/python-modules/pgspecial/default.nix +++ b/pkgs/development/python-modules/pgspecial/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Meta-commands handler for Postgres Database"; - homepage = https://pypi.python.org/pypi/pgspecial; + homepage = "https://pypi.python.org/pypi/pgspecial"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/phe/default.nix b/pkgs/development/python-modules/phe/default.nix index b016a9bd92c..6a849734e90 100644 --- a/pkgs/development/python-modules/phe/default.nix +++ b/pkgs/development/python-modules/phe/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A library for Partially Homomorphic Encryption in Python"; - homepage = https://github.com/n1analytics/python-paillier; + homepage = "https://github.com/n1analytics/python-paillier"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/phik/default.nix b/pkgs/development/python-modules/phik/default.nix index cef6173af3d..ecfaf3c9078 100644 --- a/pkgs/development/python-modules/phik/default.nix +++ b/pkgs/development/python-modules/phik/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Phi_K correlation analyzer library"; longDescription = "Phi_K is a new and practical correlation coefficient based on several refinements to Pearson’s hypothesis test of independence of two variables."; - homepage = https://phik.readthedocs.io/en/latest/; + homepage = "https://phik.readthedocs.io/en/latest/"; maintainers = with maintainers; [ melsigl ]; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index ff64f9ca82d..f16bf3f014c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.11.4"; + version = "8.12.0"; src = fetchPypi { inherit pname version; - sha256 = "13hfcw89kppm8s2qx0s5bafzxjc0qhm9sxmpf6yqvshz2fn82pk8"; + sha256 = "0mnicas0c5av322d7k6m14j3c10axh9mcvn3vx99vhngdnb9j6hn"; }; meta = { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index e67932f4a88..5dd4e25b662 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A package for phonon calculations at harmonic and quasi-harmonic levels"; - homepage = https://atztogo.github.io/phonopy/; + homepage = "https://atztogo.github.io/phonopy/"; license = licenses.bsd0; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/phpserialize/default.nix b/pkgs/development/python-modules/phpserialize/default.nix index 0ddeb99f10b..9323fe6a264 100644 --- a/pkgs/development/python-modules/phpserialize/default.nix +++ b/pkgs/development/python-modules/phpserialize/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "A port of the serialize and unserialize functions of PHP to Python"; - homepage = https://github.com/mitsuhiko/phpserialize; + homepage = "https://github.com/mitsuhiko/phpserialize"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pickleshare/default.nix b/pkgs/development/python-modules/pickleshare/default.nix index b46207ae33d..496d20d52e3 100644 --- a/pkgs/development/python-modules/pickleshare/default.nix +++ b/pkgs/development/python-modules/pickleshare/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tiny 'shelve'-like database with concurrency support"; - homepage = https://github.com/vivainio/pickleshare; + homepage = "https://github.com/vivainio/pickleshare"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix index 57fbe099071..ca6346d1cd2 100644 --- a/pkgs/development/python-modules/picos/default.nix +++ b/pkgs/development/python-modules/picos/default.nix @@ -4,19 +4,25 @@ , numpy , cvxopt , python +, networkx }: buildPythonPackage rec { pname = "picos"; - version = "1.2.0"; + version = "2.0"; src = fetchFromGitLab { owner = "picos-api"; repo = "picos"; rev = "v${version}"; - sha256 = "018xhc7cb2crkk27lhl63c7h77w5wa37fg41i7nqr4xclr43cs9z"; + sha256 = "1k65iq791k5r08gh2kc6iz0xw1wyzqik19j6iam8ip732r7jm607"; }; + # Needed only for the tests + checkInputs = [ + networkx + ]; + propagatedBuildInputs = [ numpy cvxopt @@ -28,9 +34,8 @@ buildPythonPackage rec { meta = with lib; { description = "A Python interface to conic optimization solvers"; - homepage = https://gitlab.com/picos-api/picos; + homepage = "https://gitlab.com/picos-api/picos"; license = licenses.gpl3; maintainers = with maintainers; [ tobiasBora ]; }; } - diff --git a/pkgs/development/python-modules/piep/default.nix b/pkgs/development/python-modules/piep/default.nix index 0ef44f98175..667a8e3b737 100644 --- a/pkgs/development/python-modules/piep/default.nix +++ b/pkgs/development/python-modules/piep/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bringing the power of python to stream editing"; - homepage = https://github.com/timbertson/piep; + homepage = "https://github.com/timbertson/piep"; maintainers = with maintainers; [ timbertson ]; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/piexif/default.nix b/pkgs/development/python-modules/piexif/default.nix index 595e246f777..af4b539d457 100644 --- a/pkgs/development/python-modules/piexif/default.nix +++ b/pkgs/development/python-modules/piexif/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simplify Exif manipulations with Python"; - homepage = https://github.com/hMatoba/Piexif; + homepage = "https://github.com/hMatoba/Piexif"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pika-pool/default.nix b/pkgs/development/python-modules/pika-pool/default.nix index 5007fc78d10..c13490fb3e8 100644 --- a/pkgs/development/python-modules/pika-pool/default.nix +++ b/pkgs/development/python-modules/pika-pool/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pika ]; meta = with stdenv.lib; { - homepage = https://github.com/bninja/pika-pool; + homepage = "https://github.com/bninja/pika-pool"; license = licenses.bsdOriginal; description = "Pools for pikas."; }; diff --git a/pkgs/development/python-modules/pika/default.nix b/pkgs/development/python-modules/pika/default.nix index b09c4a240e5..8b0807e3569 100644 --- a/pkgs/development/python-modules/pika/default.nix +++ b/pkgs/development/python-modules/pika/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure-Python implementation of the AMQP 0-9-1 protocol"; - homepage = https://pika.readthedocs.org; + homepage = "https://pika.readthedocs.org"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pilkit/default.nix b/pkgs/development/python-modules/pilkit/default.nix index 0f2a2bb4a8b..019d5551a3a 100644 --- a/pkgs/development/python-modules/pilkit/default.nix +++ b/pkgs/development/python-modules/pilkit/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { buildInputs = [ pillow nose_progressive nose mock blessings ]; meta = with stdenv.lib; { - homepage = https://github.com/matthewwithanm/pilkit/; + homepage = "https://github.com/matthewwithanm/pilkit/"; description = "A collection of utilities and processors for the Python Imaging Libary"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index 7dc6ce9051b..bdc1351be93 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://python-pillow.github.io/; + homepage = "https://python-pillow.github.io/"; description = "Fork of The Python Imaging Library (PIL)"; longDescription = '' The Python Imaging Library (PIL) adds image processing diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index 4504886d03d..c7037cf5385 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/soft-matter/pims; + homepage = "https://github.com/soft-matter/pims"; description = "Python Image Sequence: Load video and sequential images in many formats with a simple, consistent interface"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 8bbda8bd51f..532d9d0ede8 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -2,20 +2,40 @@ , buildPythonPackage , fetchPypi , isPy27 +, pythonOlder , funcsigs +, setuptools_scm +# Check Inputs +, pytestCheckHook +, numpy +, matplotlib +, uncertainties }: buildPythonPackage rec { pname = "pint"; - version = "0.9"; + version = "0.11"; src = fetchPypi { inherit version; pname = "Pint"; - sha256 = "32d8a9a9d63f4f81194c0014b3b742679dce81a26d45127d9810a68a561fe4e2"; + sha256 = "0kfgnmcs6z9ndhzvwg2xzhpwxgyyagdsdz5dns1jy40fa1q113rh"; }; - propagatedBuildInputs = lib.optional isPy27 funcsigs; + disabled = pythonOlder "3.6"; + + propagatedBuildInputs = [ + setuptools_scm + ] ++ lib.optional isPy27 funcsigs; + + # Test suite explicitly requires pytest + checkInputs = [ + pytestCheckHook + numpy + matplotlib + uncertainties + ]; + dontUseSetuptoolsCheck = true; meta = with lib; { description = "Physical quantities module"; diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 20a42cddcf9..02e6edfffce 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Keeps your pinned dependencies fresh"; - homepage = https://github.com/jazzband/pip-tools/; + homepage = "https://github.com/jazzband/pip-tools/"; license = licenses.bsd3; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/pip/default.nix b/pkgs/development/python-modules/pip/default.nix index d1ffd0931b8..f4107dba8f3 100644 --- a/pkgs/development/python-modules/pip/default.nix +++ b/pkgs/development/python-modules/pip/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = { description = "The PyPA recommended tool for installing Python packages"; license = with lib.licenses; [ mit ]; - homepage = https://pip.pypa.io/; + homepage = "https://pip.pypa.io/"; priority = 10; }; } diff --git a/pkgs/development/python-modules/pip2nix/default.nix b/pkgs/development/python-modules/pip2nix/default.nix index 8854e7d5678..f6474883b83 100644 --- a/pkgs/development/python-modules/pip2nix/default.nix +++ b/pkgs/development/python-modules/pip2nix/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate Nix expressions for Python packages"; - homepage = https://github.com/johbo/pip2nix; + homepage = "https://github.com/johbo/pip2nix"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 93f38fb3779..8dff0965579 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "pip update helpers"; - homepage = https://github.com/nschloe/pipdate; + homepage = "https://github.com/nschloe/pipdate"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 4206b58032f..36427f99585 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/coin3d/pivy/; + homepage = "https://github.com/coin3d/pivy/"; description = "A Python binding for Coin"; license = licenses.bsd0; maintainers = with maintainers; [ gebner ]; diff --git a/pkgs/development/python-modules/pkgconfig/default.nix b/pkgs/development/python-modules/pkgconfig/default.nix index 791905aef0f..2e6fb7c4705 100644 --- a/pkgs/development/python-modules/pkgconfig/default.nix +++ b/pkgs/development/python-modules/pkgconfig/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Interface Python with pkg-config"; - homepage = https://github.com/matze/pkgconfig; + homepage = "https://github.com/matze/pkgconfig"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pkginfo/default.nix b/pkgs/development/python-modules/pkginfo/default.nix index 879274a16c3..55c954c20f9 100644 --- a/pkgs/development/python-modules/pkginfo/default.nix +++ b/pkgs/development/python-modules/pkginfo/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { doCheck = false; # I don't know why, but with doCheck = true it fails. meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/pkginfo; + homepage = "https://pypi.python.org/pypi/pkginfo"; license = licenses.mit; description = "Query metadatdata from sdists / bdists / installed packages"; diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 77bcf6cf4fc..789f1ca1ff2 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Parsing the Command Line the Easy Way"; - homepage = https://github.com/micheles/plac; + homepage = "https://github.com/micheles/plac"; license = licenses.bsdOriginal; maintainers = with maintainers; [ sdll ]; }; diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index 428d88d1831..a41265165c7 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Python client library for the Plaid API and Link"; - homepage = https://github.com/plaid/plaid-python; + homepage = "https://github.com/plaid/plaid-python"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bhipple ]; }; diff --git a/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/pkgs/development/python-modules/plaster-pastedeploy/default.nix index e794b53950e..262bdceb5db 100644 --- a/pkgs/development/python-modules/plaster-pastedeploy/default.nix +++ b/pkgs/development/python-modules/plaster-pastedeploy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { # Fix tests compatibility with PasteDeploy 2+ # https://github.com/Pylons/plaster_pastedeploy/pull/17 (fetchpatch { - url = https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch; + url = "https://github.com/Pylons/plaster_pastedeploy/commit/d77d81a57e917c67a20332beca8f418651172905.patch"; sha256 = "0n5vnqn8kad41kn9grcwiic6c6rhvy1ji3w81s2v9xyk0bd9yryf"; }) ]; diff --git a/pkgs/development/python-modules/plone-testing/default.nix b/pkgs/development/python-modules/plone-testing/default.nix index 91592596ed4..45e22a8788e 100644 --- a/pkgs/development/python-modules/plone-testing/default.nix +++ b/pkgs/development/python-modules/plone-testing/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Testing infrastructure for Zope and Plone projects"; - homepage = https://github.com/plone/plone.testing; + homepage = "https://github.com/plone/plone.testing"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index a71506c6197..ecb5f7cc3ad 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Python plotting library for collaborative, interactive, publication-quality graphs"; - homepage = https://plot.ly/python/; + homepage = "https://plot.ly/python/"; license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/pluginbase/default.nix b/pkgs/development/python-modules/pluginbase/default.nix index c0d44e2851e..c35fbf7bd13 100644 --- a/pkgs/development/python-modules/pluginbase/default.nix +++ b/pkgs/development/python-modules/pluginbase/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mitsuhiko/pluginbase; + homepage = "https://github.com/mitsuhiko/pluginbase"; description = "A support library for building plugins sytems in Python"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index d24b2dcafda..796f9418497 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -5,7 +5,7 @@ buildPythonPackage rec { pname = "plumbum"; - version = "1.6.8"; + version = "1.6.9"; checkInputs = [ pytest ]; @@ -14,6 +14,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "14mbyvc1y25lr72n1zh9ym5ngify7zdr57lxahidq03ycpwz4wc5"; + sha256 = "1ps37vamqav6p277dlp51jnacd5q4x4z1x8y0nfjw3y8jsfy3f8n"; }; } \ No newline at end of file diff --git a/pkgs/development/python-modules/ply/default.nix b/pkgs/development/python-modules/ply/default.nix index ae55cac642f..e177ce70917 100644 --- a/pkgs/development/python-modules/ply/default.nix +++ b/pkgs/development/python-modules/ply/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://www.dabeaz.com/ply/; + homepage = "http://www.dabeaz.com/ply/"; description = "PLY (Python Lex-Yacc), an implementation of the lex and yacc parsing tools for Python"; longDescription = '' PLY is an implementation of lex and yacc parsing tools for Python. @@ -39,4 +39,4 @@ buildPythonPackage rec { ''; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix index 0aa891cd5ac..08a562c0133 100644 --- a/pkgs/development/python-modules/plyfile/default.nix +++ b/pkgs/development/python-modules/plyfile/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "NumPy-based text/binary PLY file reader/writer for Python"; - homepage = https://github.com/dranjan/python-plyfile; + homepage = "https://github.com/dranjan/python-plyfile"; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/plyplus/default.nix b/pkgs/development/python-modules/plyplus/default.nix index 41327c6fc48..4b9f1a9a084 100644 --- a/pkgs/development/python-modules/plyplus/default.nix +++ b/pkgs/development/python-modules/plyplus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = !isPy3k; meta = { - homepage = https://github.com/erezsh/plyplus; + homepage = "https://github.com/erezsh/plyplus"; description = "A general-purpose parser built on top of PLY"; maintainers = with lib.maintainers; [ twey ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/plyvel/default.nix b/pkgs/development/python-modules/plyvel/default.nix index 26c9a8af5e6..9b9b453e56a 100644 --- a/pkgs/development/python-modules/plyvel/default.nix +++ b/pkgs/development/python-modules/plyvel/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast and feature-rich Python interface to LevelDB"; platforms = platforms.unix; - homepage = https://github.com/wbolster/plyvel; + homepage = "https://github.com/wbolster/plyvel"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/podcastparser/default.nix b/pkgs/development/python-modules/podcastparser/default.nix index d2fc1093844..823c5fb16cd 100644 --- a/pkgs/development/python-modules/podcastparser/default.nix +++ b/pkgs/development/python-modules/podcastparser/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "podcastparser is a simple, fast and efficient podcast parser written in Python."; - homepage = http://gpodder.org/podcastparser/; + homepage = "http://gpodder.org/podcastparser/"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/podcats/default.nix b/pkgs/development/python-modules/podcats/default.nix index 8af9e759c95..127cf47251b 100644 --- a/pkgs/development/python-modules/podcats/default.nix +++ b/pkgs/development/python-modules/podcats/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Application that generates RSS feeds for podcast episodes from local audio files"; - homepage = https://github.com/jakubroztocil/podcats; + homepage = "https://github.com/jakubroztocil/podcats"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index f007ff3df1d..481fd2c5feb 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -36,7 +36,7 @@ in buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0y528095njf28isbcp5iwbf12j67xhxnrkac93pws0zy133v7kc1"; + sha256 = "02h387k0xssvv78yy82pcpknpq4w5ym2in1zl8cg9r5wljl5w6cf"; }; postPatch = '' diff --git a/pkgs/development/python-modules/polib/default.nix b/pkgs/development/python-modules/polib/default.nix index 2e3928b742c..304ef95a884 100644 --- a/pkgs/development/python-modules/polib/default.nix +++ b/pkgs/development/python-modules/polib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library to manipulate gettext files (po and mo files)"; - homepage = https://bitbucket.org/izi/polib/; + homepage = "https://bitbucket.org/izi/polib/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/polyline/default.nix b/pkgs/development/python-modules/polyline/default.nix index 6a5df880fd6..f1dcd699527 100644 --- a/pkgs/development/python-modules/polyline/default.nix +++ b/pkgs/development/python-modules/polyline/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/hicsail/polyline; + homepage = "https://github.com/hicsail/polyline"; license = licenses.mit; description = "Python implementation of Google's Encoded Polyline Algorithm Format."; longDescription = "polyline is a Python implementation of Google's Encoded Polyline Algorithm Format (http://goo.gl/PvXf8Y). It is essentially a port of https://github.com/mapbox/polyline built with Python 2 and 3 support in mind."; diff --git a/pkgs/development/python-modules/pomegranate/default.nix b/pkgs/development/python-modules/pomegranate/default.nix index 5f0c8cd8dad..c3d5638841d 100644 --- a/pkgs/development/python-modules/pomegranate/default.nix +++ b/pkgs/development/python-modules/pomegranate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Probabilistic and graphical models for Python, implemented in cython for speed"; - homepage = https://github.com/jmschrei/pomegranate; + homepage = "https://github.com/jmschrei/pomegranate"; license = licenses.mit; maintainers = with maintainers; [ rybern ]; }; diff --git a/pkgs/development/python-modules/pony/default.nix b/pkgs/development/python-modules/pony/default.nix index 22c14cc0dfb..c69e4fc4867 100644 --- a/pkgs/development/python-modules/pony/default.nix +++ b/pkgs/development/python-modules/pony/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pony"; - version = "0.7.12"; + version = "0.7.13"; src = fetchPypi { inherit pname version; - sha256 = "02njpqwfvzxj9icabil8ycmfx8avzih3g1kcdif290qgsy57a28r"; + sha256 = "1fqc45m106xfy4hhzzwb8p7s2fh5x2x7s143dib84lbszqwp77la"; }; doCheck = true; diff --git a/pkgs/development/python-modules/poppler-qt5/default.nix b/pkgs/development/python-modules/poppler-qt5/default.nix index 7a893384996..6f12a9e6981 100644 --- a/pkgs/development/python-modules/poppler-qt5/default.nix +++ b/pkgs/development/python-modules/poppler-qt5/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/wbsoft/python-poppler-qt5; + homepage = "https://github.com/wbsoft/python-poppler-qt5"; license = licenses.gpl2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/portalocker/default.nix b/pkgs/development/python-modules/portalocker/default.nix index b3b98b2b2ec..82ac16e4027 100644 --- a/pkgs/development/python-modules/portalocker/default.nix +++ b/pkgs/development/python-modules/portalocker/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library to provide an easy API to file locking"; - homepage = https://github.com/WoLpH/portalocker; + homepage = "https://github.com/WoLpH/portalocker"; license = licenses.psfl; maintainers = with maintainers; [ jonringer ]; platforms = platforms.unix; # Windows has a dependency on pypiwin32 diff --git a/pkgs/development/python-modules/portend/default.nix b/pkgs/development/python-modules/portend/default.nix index 6d7d7b2563d..b5650f7dda0 100644 --- a/pkgs/development/python-modules/portend/default.nix +++ b/pkgs/development/python-modules/portend/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Monitor TCP ports for bound or unbound states"; - homepage = https://github.com/jaraco/portend; + homepage = "https://github.com/jaraco/portend"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/posix_ipc/default.nix b/pkgs/development/python-modules/posix_ipc/default.nix index c152b1537ec..adde770bbc4 100644 --- a/pkgs/development/python-modules/posix_ipc/default.nix +++ b/pkgs/development/python-modules/posix_ipc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "POSIX IPC primitives (semaphores, shared memory and message queues)"; license = licenses.bsd3; - homepage = http://semanchuk.com/philip/posix_ipc/; + homepage = "http://semanchuk.com/philip/posix_ipc/"; }; } diff --git a/pkgs/development/python-modules/poster3/default.nix b/pkgs/development/python-modules/poster3/default.nix index 175faa343ca..269995717aa 100644 --- a/pkgs/development/python-modules/poster3/default.nix +++ b/pkgs/development/python-modules/poster3/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Streaming HTTP uploads and multipart/form-data encoding"; - homepage = https://atlee.ca/software/poster/; + homepage = "https://atlee.ca/software/poster/"; license = licenses.mit; maintainers = with maintainers; [ WhittlesJr ]; }; diff --git a/pkgs/development/python-modules/power/default.nix b/pkgs/development/python-modules/power/default.nix index a54bd025dc7..b3d750f7e65 100644 --- a/pkgs/development/python-modules/power/default.nix +++ b/pkgs/development/python-modules/power/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cross-platform system power status information"; - homepage = https://github.com/Kentzo/Power; + homepage = "https://github.com/Kentzo/Power"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index f8db636520f..098ad530084 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/powerline/powerline; + homepage = "https://github.com/powerline/powerline"; description = "The ultimate statusline/prompt utility"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/pox/default.nix b/pkgs/development/python-modules/pox/default.nix index 3ae276ca28e..e4869a8f46c 100644 --- a/pkgs/development/python-modules/pox/default.nix +++ b/pkgs/development/python-modules/pox/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities for filesystem exploration and automated builds"; license = licenses.bsd3; - homepage = https://github.com/uqfoundation/pox/; + homepage = "https://github.com/uqfoundation/pox/"; }; } diff --git a/pkgs/development/python-modules/poyo/default.nix b/pkgs/development/python-modules/poyo/default.nix index b6d2eb3bda9..3eff663aed9 100644 --- a/pkgs/development/python-modules/poyo/default.nix +++ b/pkgs/development/python-modules/poyo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/hackebrot/poyo; + homepage = "https://github.com/hackebrot/poyo"; description = "A lightweight YAML Parser for Python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/ppft/default.nix b/pkgs/development/python-modules/ppft/default.nix index 8731c997aa7..d8e8f33181f 100644 --- a/pkgs/development/python-modules/ppft/default.nix +++ b/pkgs/development/python-modules/ppft/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Distributed and parallel python"; - homepage = https://github.com/uqfoundation; + homepage = "https://github.com/uqfoundation"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pplpy/default.nix b/pkgs/development/python-modules/pplpy/default.nix index a693c8cad4c..706c6251d3a 100644 --- a/pkgs/development/python-modules/pplpy/default.nix +++ b/pkgs/development/python-modules/pplpy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python wrapper for ppl"; - homepage = https://gitlab.com/videlec/pplpy; + homepage = "https://gitlab.com/videlec/pplpy"; maintainers = with maintainers; [ timokau ]; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pprintpp/default.nix b/pkgs/development/python-modules/pprintpp/default.nix index daf9d0062fb..5b07613f098 100644 --- a/pkgs/development/python-modules/pprintpp/default.nix +++ b/pkgs/development/python-modules/pprintpp/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/wolever/pprintpp; + homepage = "https://github.com/wolever/pprintpp"; description = "A drop-in replacement for pprint that's actually pretty"; license = licenses.bsd2; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 972520793a4..efa12433c8a 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; - homepage = https://github.com/jfinkhaeuser/prance; + homepage = "https://github.com/jfinkhaeuser/prance"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/prawcore/default.nix b/pkgs/development/python-modules/prawcore/default.nix index f16937692c2..71f34b6ec4d 100644 --- a/pkgs/development/python-modules/prawcore/default.nix +++ b/pkgs/development/python-modules/prawcore/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Low-level communication layer for PRAW"; - homepage = https://praw.readthedocs.org/; + homepage = "https://praw.readthedocs.org/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 963aa19653b..27673b15111 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -50,7 +50,7 @@ buildPythonApplication rec { meta = with lib; { description = "A framework for managing and maintaining multi-language pre-commit hooks"; - homepage = https://pre-commit.com/; + homepage = "https://pre-commit.com/"; license = licenses.mit; maintainers = with maintainers; [ borisbabic ]; }; diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix index 4c50aaee706..199a6804ea9 100644 --- a/pkgs/development/python-modules/precis-i18n/default.nix +++ b/pkgs/development/python-modules/precis-i18n/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = { - homepage = https://github.com/byllyfish/precis_i18n; + homepage = "https://github.com/byllyfish/precis_i18n"; description = "Internationalized usernames and passwords"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/preggy/default.nix b/pkgs/development/python-modules/preggy/default.nix index cf2867322f7..a3ca7d15c77 100644 --- a/pkgs/development/python-modules/preggy/default.nix +++ b/pkgs/development/python-modules/preggy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Assertion library for Python"; - homepage = http://heynemann.github.io/preggy/; + homepage = "http://heynemann.github.io/preggy/"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/premailer/default.nix b/pkgs/development/python-modules/premailer/default.nix index df9d5801302..184f01c4592 100644 --- a/pkgs/development/python-modules/premailer/default.nix +++ b/pkgs/development/python-modules/premailer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = { description = "Turns CSS blocks into style attributes "; - homepage = https://github.com/peterbe/premailer; + homepage = "https://github.com/peterbe/premailer"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index 60f551bec16..050295204bc 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Cython hash tables that assume keys are pre-hashed"; - homepage = https://github.com/explosion/preshed; + homepage = "https://github.com/explosion/preshed"; license = licenses.mit; maintainers = with maintainers; [ sdll ]; }; diff --git a/pkgs/development/python-modules/pretend/default.nix b/pkgs/development/python-modules/pretend/default.nix index fed0499624a..af5b3399831 100644 --- a/pkgs/development/python-modules/pretend/default.nix +++ b/pkgs/development/python-modules/pretend/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/alex/pretend; + homepage = "https://github.com/alex/pretend"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/prettytable/default.nix b/pkgs/development/python-modules/prettytable/default.nix index be0fb7e4023..bf1035316a6 100644 --- a/pkgs/development/python-modules/prettytable/default.nix +++ b/pkgs/development/python-modules/prettytable/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = http://code.google.com/p/prettytable/; + homepage = "http://code.google.com/p/prettytable/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/priority/default.nix b/pkgs/development/python-modules/priority/default.nix index f6e7efb78c2..a699f6ff812 100644 --- a/pkgs/development/python-modules/priority/default.nix +++ b/pkgs/development/python-modules/priority/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://python-hyper.org/priority/; + homepage = "https://python-hyper.org/priority/"; description = "A pure-Python implementation of the HTTP/2 priority tree"; license = licenses.mit; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/development/python-modules/prison/default.nix b/pkgs/development/python-modules/prison/default.nix index 4993976b51d..941da2bf9af 100644 --- a/pkgs/development/python-modules/prison/default.nix +++ b/pkgs/development/python-modules/prison/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Rison encoder/decoder"; - homepage = https://github.com/betodealmeida/python-rison; + homepage = "https://github.com/betodealmeida/python-rison"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/proboscis/default.nix b/pkgs/development/python-modules/proboscis/default.nix index 3d99d9530f3..9d4ae92f2c1 100644 --- a/pkgs/development/python-modules/proboscis/default.nix +++ b/pkgs/development/python-modules/proboscis/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python test framework that extends Python's built-in unittest module and Nose with features from TestNG"; - homepage = https://pypi.python.org/pypi/proboscis; + homepage = "https://pypi.python.org/pypi/proboscis"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/process-tests/default.nix b/pkgs/development/python-modules/process-tests/default.nix index 5ab27b67da4..5ebda6bf04c 100644 --- a/pkgs/development/python-modules/process-tests/default.nix +++ b/pkgs/development/python-modules/process-tests/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tools for testing processes"; license = licenses.bsd2; - homepage = https://github.com/ionelmc/python-process-tests; + homepage = "https://github.com/ionelmc/python-process-tests"; }; } diff --git a/pkgs/development/python-modules/proglog/default.nix b/pkgs/development/python-modules/proglog/default.nix index d6fe22e1754..ef5c21f450d 100644 --- a/pkgs/development/python-modules/proglog/default.nix +++ b/pkgs/development/python-modules/proglog/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Logs and progress bars manager for Python"; - homepage = https://github.com/Edinburgh-Genome-Foundry/Proglog; + homepage = "https://github.com/Edinburgh-Genome-Foundry/Proglog"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/progress/default.nix b/pkgs/development/python-modules/progress/default.nix index d6c8d9125d1..9ebef268571 100644 --- a/pkgs/development/python-modules/progress/default.nix +++ b/pkgs/development/python-modules/progress/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/verigak/progress/; + homepage = "https://github.com/verigak/progress/"; description = "Easy to use progress bars"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/progressbar/default.nix b/pkgs/development/python-modules/progressbar/default.nix index fcd802b3487..c756a41b5d0 100644 --- a/pkgs/development/python-modules/progressbar/default.nix +++ b/pkgs/development/python-modules/progressbar/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/progressbar; + homepage = "https://pypi.python.org/pypi/progressbar"; description = "Text progressbar library for python"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/progressbar2/default.nix b/pkgs/development/python-modules/progressbar2/default.nix index aa6c9b70926..69200d54571 100644 --- a/pkgs/development/python-modules/progressbar2/default.nix +++ b/pkgs/development/python-modules/progressbar2/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://progressbar-2.readthedocs.io/en/latest/; + homepage = "https://progressbar-2.readthedocs.io/en/latest/"; description = "Text progressbar library for python"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; diff --git a/pkgs/development/python-modules/progressbar231/default.nix b/pkgs/development/python-modules/progressbar231/default.nix index f9825961754..5271912cc0a 100644 --- a/pkgs/development/python-modules/progressbar231/default.nix +++ b/pkgs/development/python-modules/progressbar231/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/progressbar231; + homepage = "https://pypi.python.org/pypi/progressbar231"; description = "Text progressbar library for python"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/progressbar33/default.nix b/pkgs/development/python-modules/progressbar33/default.nix index f3b94436d45..5aef2844784 100644 --- a/pkgs/development/python-modules/progressbar33/default.nix +++ b/pkgs/development/python-modules/progressbar33/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/progressbar33; + homepage = "https://pypi.python.org/pypi/progressbar33"; description = "Text progressbar library for python"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ twey ]; diff --git a/pkgs/development/python-modules/prometheus_client/default.nix b/pkgs/development/python-modules/prometheus_client/default.nix index 17c04df814f..2c6bef0c201 100644 --- a/pkgs/development/python-modules/prometheus_client/default.nix +++ b/pkgs/development/python-modules/prometheus_client/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "Prometheus instrumentation library for Python applications"; - homepage = https://github.com/prometheus/client_python; + homepage = "https://github.com/prometheus/client_python"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/prompt_toolkit/1.nix b/pkgs/development/python-modules/prompt_toolkit/1.nix index c296af18de9..bc39a8c9229 100644 --- a/pkgs/development/python-modules/prompt_toolkit/1.nix +++ b/pkgs/development/python-modules/prompt_toolkit/1.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { with it should run fine on both Unix and Windows systems. Also ships with a nice interactive Python shell (called ptpython) built on top. ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index dd3c8d16a51..6932cd515c7 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "2.0.10"; + version = "3.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1nr990i4b04rnlw1ghd0xmgvvvhih698mb6lb6jylr76cs7zcnpi"; + sha256 = "10wpsbl1mmnvm8q63zs40633kbq93bidx4vz1p2q92w8ijqb3rpb"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' @@ -29,7 +29,7 @@ buildPythonPackage rec { with it should run fine on both Unix and Windows systems. Also ships with a nice interactive Python shell (called ptpython) built on top. ''; - homepage = https://github.com/jonathanslenders/python-prompt-toolkit; + homepage = "https://github.com/jonathanslenders/python-prompt-toolkit"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/property-manager/default.nix b/pkgs/development/python-modules/property-manager/default.nix index 30c720927e7..55d7bafc014 100644 --- a/pkgs/development/python-modules/property-manager/default.nix +++ b/pkgs/development/python-modules/property-manager/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Useful property variants for Python programming"; - homepage = https://github.com/xolox/python-property-manager; + homepage = "https://github.com/xolox/python-property-manager"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index e414dff8aa1..7f66549893b 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -60,7 +60,7 @@ buildPythonPackage { meta = { description = "Protocol Buffers are Google's data interchange format"; - homepage = https://developers.google.com/protocol-buffers/; + 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 c6cb98e33b2..1dfc671c532 100644 --- a/pkgs/development/python-modules/prov/default.nix +++ b/pkgs/development/python-modules/prov/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python library for W3C Provenance Data Model (PROV)"; - homepage = https://github.com/trungdong/prov; + homepage = "https://github.com/trungdong/prov"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; }; diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 2568620f539..60482d45551 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/albarji/proxTV; + homepage = "https://github.com/albarji/proxTV"; description = "A toolbox for fast Total Variation proximity operators"; license = licenses.bsd2; maintainers = with maintainers; [ multun ]; diff --git a/pkgs/development/python-modules/psd-tools/default.nix b/pkgs/development/python-modules/psd-tools/default.nix index edf502171e7..c66e1e2b40e 100644 --- a/pkgs/development/python-modules/psd-tools/default.nix +++ b/pkgs/development/python-modules/psd-tools/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Python package for reading Adobe Photoshop PSD files"; - homepage = https://github.com/kmike/psd-tools; + homepage = "https://github.com/kmike/psd-tools"; license = lib.licenses.mit; broken = true; # missing packbits from nixpkgs }; diff --git a/pkgs/development/python-modules/ptest/default.nix b/pkgs/development/python-modules/ptest/default.nix index bdd9fc5c47e..0cdbeb372e3 100644 --- a/pkgs/development/python-modules/ptest/default.nix +++ b/pkgs/development/python-modules/ptest/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports"; - homepage = https://pypi.python.org/pypi/ptest; + homepage = "https://pypi.python.org/pypi/ptest"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 01f9dda8f2c..f5a37dda630 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -1,16 +1,17 @@ -{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, docopt , jedi, pygments, isPy3k }: +{ stdenv, buildPythonPackage, fetchPypi, prompt_toolkit, appdirs, docopt, jedi +, pygments, isPy3k }: buildPythonPackage rec { pname = "ptpython"; - version = "2.0.6"; + version = "3.0.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "90e24040e82de4abae0bbe6e352d59ae6657e14e1154e742c0038679361b052f"; + sha256 = "a69cce0aa04f0075e2e65287a0ee2f3a928c0591b301ce22aa2e498af1ebcb4b"; }; - propagatedBuildInputs = [ prompt_toolkit docopt jedi pygments ]; + propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ]; # no tests to run doCheck = false; diff --git a/pkgs/development/python-modules/ptyprocess/default.nix b/pkgs/development/python-modules/ptyprocess/default.nix index 5de528ccd40..233dc6fb314 100644 --- a/pkgs/development/python-modules/ptyprocess/default.nix +++ b/pkgs/development/python-modules/ptyprocess/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "Run a subprocess in a pseudo terminal"; - homepage = https://github.com/pexpect/ptyprocess; + homepage = "https://github.com/pexpect/ptyprocess"; license = lib.licenses.isc; }; } diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index 414c21b263c..049d8720f45 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/coin-or/pulp; + homepage = "https://github.com/coin-or/pulp"; description = "PuLP is an LP modeler written in python"; maintainers = with maintainers; [ teto ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix index 51db9783555..acb9b73403b 100644 --- a/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix +++ b/pkgs/development/python-modules/pure-python-adb-homeassistant/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure python implementation of the adb client"; - homepage = https://github.com/JeffLIrion/pure-python-adb; + homepage = "https://github.com/JeffLIrion/pure-python-adb"; license = licenses.mit; maintainers = [ maintainers.makefu ]; }; diff --git a/pkgs/development/python-modules/purepng/default.nix b/pkgs/development/python-modules/purepng/default.nix index c6f28067bf6..fe504a0776b 100644 --- a/pkgs/development/python-modules/purepng/default.nix +++ b/pkgs/development/python-modules/purepng/default.nix @@ -40,7 +40,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Pure Python library for PNG image encoding/decoding"; - homepage = https://github.com/scondo/purepng; + homepage = "https://github.com/scondo/purepng"; license = licenses.mit; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/pushbullet/default.nix b/pkgs/development/python-modules/pushbullet/default.nix index 74c0f66b91e..b9c2a84728f 100644 --- a/pkgs/development/python-modules/pushbullet/default.nix +++ b/pkgs/development/python-modules/pushbullet/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A simple python client for pushbullet.com"; - homepage = https://github.com/randomchars/pushbullet.py; + homepage = "https://github.com/randomchars/pushbullet.py"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pushover-complete/default.nix b/pkgs/development/python-modules/pushover-complete/default.nix index b526ba6cab1..e588ae9f796 100644 --- a/pkgs/development/python-modules/pushover-complete/default.nix +++ b/pkgs/development/python-modules/pushover-complete/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python package for interacting with *all* aspects of the Pushover API"; - homepage = https://github.com/scolby33/pushover_complete; + homepage = "https://github.com/scolby33/pushover_complete"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pushover/default.nix b/pkgs/development/python-modules/pushover/default.nix index 3ff449037ea..72d38259129 100644 --- a/pkgs/development/python-modules/pushover/default.nix +++ b/pkgs/development/python-modules/pushover/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bindings and command line utility for the Pushover notification service"; - homepage = https://github.com/Thibauth/python-pushover; + homepage = "https://github.com/Thibauth/python-pushover"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pvlib/default.nix b/pkgs/development/python-modules/pvlib/default.nix index d1eeb3e31d0..e03543fb520 100644 --- a/pkgs/development/python-modules/pvlib/default.nix +++ b/pkgs/development/python-modules/pvlib/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pvlib-python.readthedocs.io; + homepage = "https://pvlib-python.readthedocs.io"; description = "Simulate the performance of photovoltaic energy systems"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix index 13f237750de..aba58b54c3b 100644 --- a/pkgs/development/python-modules/pweave/default.nix +++ b/pkgs/development/python-modules/pweave/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scientific reports with embedded python computations with reST, LaTeX or markdown"; - homepage = http://mpastell.com/pweave/ ; + homepage = "http://mpastell.com/pweave/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/py-lru-cache/default.nix b/pkgs/development/python-modules/py-lru-cache/default.nix index b1d8c4f2946..08630928f23 100644 --- a/pkgs/development/python-modules/py-lru-cache/default.nix +++ b/pkgs/development/python-modules/py-lru-cache/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "An in-memory LRU cache for python"; - homepage = https://github.com/stucchio/Python-LRU-cache; + homepage = "https://github.com/stucchio/Python-LRU-cache"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/py-radix/default.nix b/pkgs/development/python-modules/py-radix/default.nix index b06de3a27a7..16a362591dd 100644 --- a/pkgs/development/python-modules/py-radix/default.nix +++ b/pkgs/development/python-modules/py-radix/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python radix tree for IPv4 and IPv6 prefix matching"; - homepage = https://github.com/mjschultz/py-radix; + homepage = "https://github.com/mjschultz/py-radix"; license = with licenses; [ isc bsdOriginal ]; maintainers = with maintainers; [ mkg ]; }; diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix index b0ca5c262cf..f8531288007 100644 --- a/pkgs/development/python-modules/py-vapid/default.nix +++ b/pkgs/development/python-modules/py-vapid/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "VAPID is a voluntary standard for WebPush subscription providers"; - homepage = https://github.com/mozilla-services/vapid; + homepage = "https://github.com/mozilla-services/vapid"; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index 7b84d72fde4..5da15bb91f4 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library with cross-python path, ini-parsing, io, code, log facilities"; - homepage = https://pylib.readthedocs.org/; + homepage = "https://pylib.readthedocs.org/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/py3dns/default.nix b/pkgs/development/python-modules/py3dns/default.nix index 5a28a045c3e..223e6c0ab7a 100644 --- a/pkgs/development/python-modules/py3dns/default.nix +++ b/pkgs/development/python-modules/py3dns/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python 3 DNS library"; - homepage = https://launchpad.net/py3dns; + homepage = "https://launchpad.net/py3dns"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/py3status/default.nix b/pkgs/development/python-modules/py3status/default.nix index d2a2b50d3c0..fda91e8a305 100644 --- a/pkgs/development/python-modules/py3status/default.nix +++ b/pkgs/development/python-modules/py3status/default.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Extensible i3status wrapper"; license = licenses.bsd3; - homepage = https://github.com/ultrabug/py3status; + homepage = "https://github.com/ultrabug/py3status"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/py4j/default.nix b/pkgs/development/python-modules/py4j/default.nix index a442dfa097b..3724687463c 100644 --- a/pkgs/development/python-modules/py4j/default.nix +++ b/pkgs/development/python-modules/py4j/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Py4J enables Python programs running in a Python interpreter to dynamically access Java objects in a Java Virtual Machine. Methods are called as if the Java objects resided in the Python interpreter and Java collections can be accessed through standard Python collection methods. Py4J also enables Java programs to call back Python objects."; - homepage = https://www.py4j.org/; + homepage = "https://www.py4j.org/"; license = licenses.bsd3; maintainers = [ maintainers.shlevy ]; }; diff --git a/pkgs/development/python-modules/pyGithub/default.nix b/pkgs/development/python-modules/pyGithub/default.nix index 3f5d3a5bd8c..2102554face 100644 --- a/pkgs/development/python-modules/pyGithub/default.nix +++ b/pkgs/development/python-modules/pyGithub/default.nix @@ -1,22 +1,35 @@ -{ stdenv, fetchFromGitHub -, buildPythonPackage, python-jose, pyjwt, requests, deprecated, httpretty }: +{ stdenv +, buildPythonPackage +, cryptography +, deprecated +, fetchFromGitHub +, httpretty +, isPy3k +, parameterized +, pyjwt +, pytestCheckHook +, requests }: buildPythonPackage rec { pname = "PyGithub"; - version = "1.45"; + version = "1.47"; + disabled = !isPy3k; src = fetchFromGitHub { owner = "PyGithub"; repo = "PyGithub"; rev = "v${version}"; - sha256 = "1aiyqwdxpcr7yzz7aqmmjn1g2ajs5bpbln4sax5zw19dqi6qgp9z"; + sha256 = "0zvp1gib2lryw698vxkbdv40n3lsmdlhwp7vdcg41dqqa5nfryhn"; }; - propagatedBuildInputs = [ python-jose pyjwt requests deprecated httpretty ]; + checkInputs = [ httpretty parameterized pytestCheckHook ]; + propagatedBuildInputs = [ cryptography deprecated pyjwt requests ]; + + # Test suite makes REST calls against github.com doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/PyGithub/PyGithub; + homepage = "https://github.com/PyGithub/PyGithub"; description = "A Python (2 and 3) library to access the GitHub API v3"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/py_scrypt/default.nix b/pkgs/development/python-modules/py_scrypt/default.nix index 0c2d5eb5c02..056a0299670 100644 --- a/pkgs/development/python-modules/py_scrypt/default.nix +++ b/pkgs/development/python-modules/py_scrypt/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Bindings for scrypt key derivation function library"; - homepage = https://pypi.python.org/pypi/scrypt; + homepage = "https://pypi.python.org/pypi/scrypt"; maintainers = with maintainers; [ asymmetric ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index 16b98320e8e..f4407150204 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python string matching library including string tokenizers and string similarity measures"; - homepage = https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching; + homepage = "https://sites.google.com/site/anhaidgroup/projects/magellan/py_stringmatching"; license = licenses.bsd3; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/pyaes/default.nix b/pkgs/development/python-modules/pyaes/default.nix index 5ca837cdee4..2674211479f 100644 --- a/pkgs/development/python-modules/pyaes/default.nix +++ b/pkgs/development/python-modules/pyaes/default.nix @@ -12,6 +12,6 @@ buildPythonPackage rec { meta = { description = "Pure-Python AES"; license = lib.licenses.mit; - homepage = https://github.com/ricmoo/pyaes; + homepage = "https://github.com/ricmoo/pyaes"; }; } diff --git a/pkgs/development/python-modules/pyairvisual/default.nix b/pkgs/development/python-modules/pyairvisual/default.nix index 010c2805d2b..58eb5f7028a 100644 --- a/pkgs/development/python-modules/pyairvisual/default.nix +++ b/pkgs/development/python-modules/pyairvisual/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = with lib; { description = "A thin Python wrapper for the AirVisual API"; license = licenses.mit; - homepage = https://github.com/bachya/pyairvisual; + homepage = "https://github.com/bachya/pyairvisual"; }; } diff --git a/pkgs/development/python-modules/pyalgotrade/default.nix b/pkgs/development/python-modules/pyalgotrade/default.nix index 7602caf24cf..3703b5fcca4 100644 --- a/pkgs/development/python-modules/pyalgotrade/default.nix +++ b/pkgs/development/python-modules/pyalgotrade/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Algorithmic Trading"; - homepage = http://gbeced.github.io/pyalgotrade/; + homepage = "http://gbeced.github.io/pyalgotrade/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pyamf/default.nix b/pkgs/development/python-modules/pyamf/default.nix index 5ac6ef82964..1c31efadff7 100644 --- a/pkgs/development/python-modules/pyamf/default.nix +++ b/pkgs/development/python-modules/pyamf/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "AMF (Action Message Format) support for Python"; - homepage = https://pypi.python.org/pypi/PyAMF; + homepage = "https://pypi.python.org/pypi/PyAMF"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pyamg/default.nix b/pkgs/development/python-modules/pyamg/default.nix index b299e44f3e3..f229ef5839e 100644 --- a/pkgs/development/python-modules/pyamg/default.nix +++ b/pkgs/development/python-modules/pyamg/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Algebraic Multigrid Solvers in Python"; - homepage = https://github.com/pyamg/pyamg; + homepage = "https://github.com/pyamg/pyamg"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyaml/default.nix b/pkgs/development/python-modules/pyaml/default.nix index 6aeb37cfff6..1d0168b6bfa 100644 --- a/pkgs/development/python-modules/pyaml/default.nix +++ b/pkgs/development/python-modules/pyaml/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; - homepage = https://github.com/mk-fg/pretty-yaml; + homepage = "https://github.com/mk-fg/pretty-yaml"; license = lib.licenses.wtfpl; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pyannotate/default.nix b/pkgs/development/python-modules/pyannotate/default.nix index 06dcdf83bcc..a2dd4eaf7cf 100644 --- a/pkgs/development/python-modules/pyannotate/default.nix +++ b/pkgs/development/python-modules/pyannotate/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/dropbox/pyannotate; + homepage = "https://github.com/dropbox/pyannotate"; description = "Auto-generate PEP-484 annotations"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix index ab05f49ac38..e24ca0fa78e 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, pytest, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: +{ lib, fetchpatch, buildPythonPackage, python, isPy3k, arrow-cpp, cmake, cython, futures, hypothesis, numpy, pandas, pytestCheckHook, pytest-lazy-fixture, pkgconfig, setuptools_scm, six }: let _arrow-cpp = arrow-cpp.override { inherit python; }; @@ -9,11 +9,21 @@ buildPythonPackage rec { inherit (_arrow-cpp) version src; + patches = [ + # Remove when updating pkgs.arrow-cpp to 0.17 + (fetchpatch { + name = "ARROW-8106-fix-conversion-test"; + url = "https://github.com/apache/arrow/commit/af20bbff30adc560d7e57dd921345d00cc8b870c.patch"; + sha256 = "0ihpw589vh35va31ajzy5zpx3bqd9gdn3342rghi03r245kch9zd"; + stripLen = 1; + }) + ]; + sourceRoot = "apache-arrow-${version}/python"; nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ]; propagatedBuildInputs = [ numpy six ] ++ lib.optionals (!isPy3k) [ futures ]; - checkInputs = [ hypothesis pandas pytest pytest-lazy-fixture ]; + checkInputs = [ hypothesis pandas pytestCheckHook pytest-lazy-fixture ]; PYARROW_BUILD_TYPE = "release"; PYARROW_WITH_PARQUET = true; @@ -24,6 +34,8 @@ buildPythonPackage rec { # ourselves "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" ]; + ARROW_HOME = _arrow-cpp; + PARQUET_HOME = _arrow-cpp; dontUseCmakeConfigure = true; @@ -31,45 +43,17 @@ buildPythonPackage rec { export PYARROW_PARALLEL=$NIX_BUILD_CORES ''; + dontUseSetuptoolsCheck = true; preCheck = '' - rm pyarrow/tests/test_jvm.py - rm pyarrow/tests/test_hdfs.py - rm pyarrow/tests/test_cuda.py - - # fails: "ArrowNotImplementedError: Unsupported numpy type 22" - substituteInPlace pyarrow/tests/test_feather.py --replace "test_timedelta_with_nulls" "_disabled" - - # runs out of memory on @grahamcofborg linux box - substituteInPlace pyarrow/tests/test_feather.py --replace "test_large_dataframe" "_disabled" - - # probably broken on python2 - substituteInPlace pyarrow/tests/test_feather.py --replace "test_unicode_filename" "_disabled" - - # fails "error: [Errno 2] No such file or directory: 'test'" because - # nix_run_setup invocation somehow manages to import deserialize_buffer.py - # when it is not intended to be imported at all - rm pyarrow/tests/deserialize_buffer.py - substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled" - - # Fails to bind a socket - # "PermissionError: [Errno 1] Operation not permitted" - substituteInPlace pyarrow/tests/test_ipc.py --replace "test_socket_" "_disabled" - ''; - - ARROW_HOME = _arrow-cpp; - PARQUET_HOME = _arrow-cpp; - - checkPhase = '' mv pyarrow/tests tests rm -rf pyarrow mkdir pyarrow mv tests pyarrow/tests - pytest -v ''; meta = with lib; { description = "A cross-language development platform for in-memory data"; - homepage = https://arrow.apache.org/; + homepage = "https://arrow.apache.org/"; license = lib.licenses.asl20; platforms = platforms.unix; maintainers = with lib.maintainers; [ veprbl ]; diff --git a/pkgs/development/python-modules/pyasn1-modules/default.nix b/pkgs/development/python-modules/pyasn1-modules/default.nix index 4ed93f63551..83cb8f654e2 100644 --- a/pkgs/development/python-modules/pyasn1-modules/default.nix +++ b/pkgs/development/python-modules/pyasn1-modules/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A collection of ASN.1-based protocols modules"; - homepage = https://pypi.python.org/pypi/pyasn1-modules; + homepage = "https://pypi.python.org/pypi/pyasn1-modules"; license = licenses.bsd3; platforms = platforms.unix; # same as pyasn1 }; diff --git a/pkgs/development/python-modules/pyasn1/default.nix b/pkgs/development/python-modules/pyasn1/default.nix index e1d61866f90..206db053a56 100644 --- a/pkgs/development/python-modules/pyasn1/default.nix +++ b/pkgs/development/python-modules/pyasn1/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "ASN.1 tools for Python"; - homepage = http://pyasn1.sourceforge.net/; + homepage = "http://pyasn1.sourceforge.net/"; license = "mBSD"; platforms = platforms.unix; # arbitrary choice }; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 5036307982b..d9f602aa7e2 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple API to access Netatmo weather station data"; license = licenses.mit; - homepage = https://github.com/jabesq/netatmo-api-python; + homepage = "https://github.com/jabesq/netatmo-api-python"; maintainers = with maintainers; [ delroth ]; }; } diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index 3f427e34002..b704e54321b 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyatspi"; - version = "2.34.0"; + version = "2.36.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j3f75j0zd6ca8msg7yr19qsfirqkn9fk8pqbjnlhqrpri455g4p"; + sha256 = "UTbBv5GeEB1OyQGiduhupg5Ygaj/d2PjVvGYQOX/4d0="; }; nativeBuildInputs = [ pkgconfig ]; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python client bindings for D-Bus AT-SPI"; - homepage = https://wiki.linuxfoundation.org/accessibility/d-bus; + homepage = "https://wiki.linuxfoundation.org/accessibility/d-bus"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; platforms = with platforms; unix; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index ae2780e1dc3..19aa73bec59 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python client library for the Apple TV"; - homepage = https://github.com/postlund/pyatv; + homepage = "https://github.com/postlund/pyatv"; license = licenses.mit; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/pyaudio/default.nix b/pkgs/development/python-modules/pyaudio/default.nix index 62fec908a4d..91791f5a067 100644 --- a/pkgs/development/python-modules/pyaudio/default.nix +++ b/pkgs/development/python-modules/pyaudio/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for PortAudio"; - homepage = https://people.csail.mit.edu/hubert/pyaudio/; + homepage = "https://people.csail.mit.edu/hubert/pyaudio/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pyavm/default.nix b/pkgs/development/python-modules/pyavm/default.nix index 2279f792818..4535767a69c 100644 --- a/pkgs/development/python-modules/pyavm/default.nix +++ b/pkgs/development/python-modules/pyavm/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple pure-python AVM meta-data handling"; - homepage = http://astrofrog.github.io/pyavm/; + homepage = "http://astrofrog.github.io/pyavm/"; license = licenses.mit; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/pyaxmlparser/default.nix b/pkgs/development/python-modules/pyaxmlparser/default.nix index 85140d3db49..045cf19c8c0 100644 --- a/pkgs/development/python-modules/pyaxmlparser/default.nix +++ b/pkgs/development/python-modules/pyaxmlparser/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python3 Parser for Android XML file and get Application Name without using Androguard"; - homepage = https://github.com/appknox/pyaxmlparser; + homepage = "https://github.com/appknox/pyaxmlparser"; # Files from Androguard are licensed ASL 2.0 license = with licenses; [ mit asl20 ]; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 6c32de593c1..6a141484bb4 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/pybase64; + homepage = "https://pypi.python.org/pypi/pybase64"; description = "Fast Base64 encoding/decoding"; license = licenses.bsd2; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/pybfd/default.nix b/pkgs/development/python-modules/pybfd/default.nix index 29ae5ed3c5c..d04d7bfb5af 100644 --- a/pkgs/development/python-modules/pybfd/default.nix +++ b/pkgs/development/python-modules/pybfd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { LIBOPCODES_LIBRARY = "${libopcodes}/lib/libopcodes.so"; meta = { - homepage = https://github.com/Groundworkstech/pybfd; + homepage = "https://github.com/Groundworkstech/pybfd"; description = "A Python interface to the GNU Binary File Descriptor (BFD) library"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index dc9cbefe0b5..1a06a699c32 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tools for querying and manipulating BIDS datasets"; - homepage = https://github.com/bids-standard/pybids; + homepage = "https://github.com/bids-standard/pybids"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/pybind11/default.nix b/pkgs/development/python-modules/pybind11/default.nix index a8c66a49fb8..3cfdbba31c1 100644 --- a/pkgs/development/python-modules/pybind11/default.nix +++ b/pkgs/development/python-modules/pybind11/default.nix @@ -66,7 +66,7 @@ buildPythonPackage rec { ]; meta = { - homepage = https://github.com/pybind/pybind11; + homepage = "https://github.com/pybind/pybind11"; description = "Seamless operability between C++11 and Python"; longDescription = '' Pybind11 is a lightweight header-only library that exposes diff --git a/pkgs/development/python-modules/pybindgen/default.nix b/pkgs/development/python-modules/pybindgen/default.nix index 79c015576a5..ee880fda398 100644 --- a/pkgs/development/python-modules/pybindgen/default.nix +++ b/pkgs/development/python-modules/pybindgen/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = (!isPy3k); # Fails to import module 'cxxfilt' from pygccxml on Py3k meta = with stdenv.lib; { - homepage = https://github.com/gjcarneiro/pybindgen; + homepage = "https://github.com/gjcarneiro/pybindgen"; description = "Python Bindings Generator"; license = licenses.lgpl2; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pyblake2/default.nix b/pkgs/development/python-modules/pyblake2/default.nix index e106ee3f3f1..a0f62cf0e77 100644 --- a/pkgs/development/python-modules/pyblake2/default.nix +++ b/pkgs/development/python-modules/pyblake2/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = { description = "BLAKE2 hash function extension module"; license = lib.licenses.publicDomain; - homepage = https://github.com/dchest/pyblake2; + homepage = "https://github.com/dchest/pyblake2"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pyblock/default.nix b/pkgs/development/python-modules/pyblock/default.nix index 4dcc3434025..e7af4f70b1e 100644 --- a/pkgs/development/python-modules/pyblock/default.nix +++ b/pkgs/development/python-modules/pyblock/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.centos.org/docs/5/html/5.4/Technical_Notes/python-pyblock.html; + homepage = "https://www.centos.org/docs/5/html/5.4/Technical_Notes/python-pyblock.html"; description = "Interface for working with block devices"; license = licenses.gpl2Plus; broken = isPy3k; # doesn't build on python 3, 2018-04-11 diff --git a/pkgs/development/python-modules/pybotvac/default.nix b/pkgs/development/python-modules/pybotvac/default.nix index e7ad1ef2d35..f915c498350 100644 --- a/pkgs/development/python-modules/pybotvac/default.nix +++ b/pkgs/development/python-modules/pybotvac/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python package for controlling Neato pybotvac Connected vacuum robot"; - homepage = https://github.com/stianaske/pybotvac; + 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 946fb1a054f..fe5ace886ac 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for the BrowserID Protocol"; - homepage = https://github.com/mozilla/PyBrowserID; + homepage = "https://github.com/mozilla/PyBrowserID"; license = licenses.mpl20; maintainers = with maintainers; [ worldofpeace ]; }; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index e2d391493d2..dfd29ce8bd5 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-source software for robot simulation, integrated with OpenAI Gym"; - homepage = https://pybullet.org/; + homepage = "https://pybullet.org/"; license = licenses.zlib; maintainers = with maintainers; [ timokau ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index c38366894dc..fbefd7efefa 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python 2/3 bindings for cairo"; - homepage = https://pycairo.readthedocs.io/; + homepage = "https://pycairo.readthedocs.io/"; license = with licenses; [ lgpl2 mpl11 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; diff --git a/pkgs/development/python-modules/pycallgraph/default.nix b/pkgs/development/python-modules/pycallgraph/default.nix index 9a6a3f4be2e..293489cce05 100644 --- a/pkgs/development/python-modules/pycallgraph/default.nix +++ b/pkgs/development/python-modules/pycallgraph/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pycallgraph.slowchop.com; + homepage = "http://pycallgraph.slowchop.com"; description = "Call graph visualizations for Python applications"; maintainers = with maintainers; [ auntie ]; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix index b3e31a9bc78..dc4ab1d4bbd 100644 --- a/pkgs/development/python-modules/pycangjie/default.nix +++ b/pkgs/development/python-modules/pycangjie/default.nix @@ -28,7 +28,7 @@ in buildPythonPackage { meta = with stdenv.lib; { description = "Python wrapper to libcangjie"; - homepage = http://cangjians.github.io/projects/pycangjie/; + homepage = "http://cangjians.github.io/projects/pycangjie/"; license = licenses.lgpl3Plus; maintainers = [ maintainers.linquize ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/pycaption/default.nix b/pkgs/development/python-modules/pycaption/default.nix index a9864a0f095..a0a0ff76337 100644 --- a/pkgs/development/python-modules/pycaption/default.nix +++ b/pkgs/development/python-modules/pycaption/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Closed caption converter"; - homepage = https://github.com/pbs/pycaption; + homepage = "https://github.com/pbs/pycaption"; license = with licenses; [ asl20 ]; }; } diff --git a/pkgs/development/python-modules/pycarddav/default.nix b/pkgs/development/python-modules/pycarddav/default.nix index c5c6182e4e0..674c9e9af86 100644 --- a/pkgs/development/python-modules/pycarddav/default.nix +++ b/pkgs/development/python-modules/pycarddav/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Command-line interface carddav client"; - homepage = http://lostpackets.de/pycarddav; + homepage = "http://lostpackets.de/pycarddav"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pycares/default.nix b/pkgs/development/python-modules/pycares/default.nix index 22f519c0486..f44aa2e8f8e 100644 --- a/pkgs/development/python-modules/pycares/default.nix +++ b/pkgs/development/python-modules/pycares/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/saghul/pycares; + homepage = "https://github.com/saghul/pycares"; description = "Interface for c-ares"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pycassa/default.nix b/pkgs/development/python-modules/pycassa/default.nix index d5b6805c2bb..d366486c8f8 100644 --- a/pkgs/development/python-modules/pycassa/default.nix +++ b/pkgs/development/python-modules/pycassa/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "A python client library for Apache Cassandra"; - homepage = https://github.com/pycassa/pycassa; + homepage = "https://github.com/pycassa/pycassa"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pycdio/default.nix b/pkgs/development/python-modules/pycdio/default.nix index 5b1d774c169..d5633f9eaef 100644 --- a/pkgs/development/python-modules/pycdio/default.nix +++ b/pkgs/development/python-modules/pycdio/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/libcdio/; + homepage = "https://www.gnu.org/software/libcdio/"; description = "Wrapper around libcdio (CD Input and Control library)"; maintainers = with maintainers; [ rycee ]; license = licenses.gpl3Plus; diff --git a/pkgs/development/python-modules/pychart/default.nix b/pkgs/development/python-modules/pychart/default.nix index 259c87347d7..98c3242cb29 100644 --- a/pkgs/development/python-modules/pychart/default.nix +++ b/pkgs/development/python-modules/pychart/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for creating high quality encapsulated Postscript, PDF, PNG, or SVG charts"; - homepage = https://pypi.python.org/pypi/PyChart; + homepage = "https://pypi.python.org/pypi/PyChart"; license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/pychef/default.nix b/pkgs/development/python-modules/pychef/default.nix index 51ce6241bb9..6d60573b96e 100644 --- a/pkgs/development/python-modules/pychef/default.nix +++ b/pkgs/development/python-modules/pychef/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/coderanger/pychef; + homepage = "https://github.com/coderanger/pychef"; description = "Python implementation of a Chef API client"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 9ce934c8467..44cecb5e463 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 = "4.1.1"; + version = "4.2.0"; src = fetchPypi { inherit pname version; - sha256 = "13cxyxs0cl2cwbx1fkw6b26hrzpllx1wfq2q58fx298yjn3niiby"; + sha256 = "05h7ncymyh1715v2jkj312qza5qlqrz6yfpgyv4kdf1m07zh7pxh"; }; disabled = !isPy3k; @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library for Python 3.4+ to communicate with the Google Chromecast"; - homepage = https://github.com/balloob/pychromecast; + homepage = "https://github.com/balloob/pychromecast"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix index e8daa382076..a51aa1b931a 100644 --- a/pkgs/development/python-modules/pycm/default.nix +++ b/pkgs/development/python-modules/pycm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Multiclass confusion matrix library"; - homepage = https://pycm.ir; + homepage = "https://pycm.ir"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pycodestyle/default.nix b/pkgs/development/python-modules/pycodestyle/default.nix index acaf78cc4d2..289332eb7c4 100644 --- a/pkgs/development/python-modules/pycodestyle/default.nix +++ b/pkgs/development/python-modules/pycodestyle/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python style guide checker (formerly called pep8)"; - homepage = https://pycodestyle.readthedocs.io; + homepage = "https://pycodestyle.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ kamadorueda diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix new file mode 100644 index 00000000000..afc607baa40 --- /dev/null +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cryptography +, boto3 +, envs +, python-jose +, requests +, mock +, isPy27 +}: + +buildPythonPackage rec { + pname = "pycognito"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "pvizeli"; + repo = "pycognito"; + rev = version; + sha256 = "01zns522awm5yp5cbk1y7k7px534i5akiivip709i1naph3hvnfk"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace 'python-jose[cryptography]' 'python-jose' + ''; + + propagatedBuildInputs = [ + boto3 + envs + python-jose + requests + ]; + + disabled = isPy27; + + checkInputs = [ mock ]; + + meta = with lib; { + description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support"; + homepage = "https://GitHub.com/pvizeli/pycognito"; + license = licenses.asl20; + maintainers = [ maintainers.mic92 ]; + }; +} diff --git a/pkgs/development/python-modules/pycollada/default.nix b/pkgs/development/python-modules/pycollada/default.nix index 0803d658930..4015f9164e9 100644 --- a/pkgs/development/python-modules/pycollada/default.nix +++ b/pkgs/development/python-modules/pycollada/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for reading and writing collada documents"; - homepage = http://pycollada.github.io/; + homepage = "http://pycollada.github.io/"; license = "BSD"; # they don't specify which BSD variant platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix index 7594c7c1e57..55354a17c72 100644 --- a/pkgs/development/python-modules/pycontracts/default.nix +++ b/pkgs/development/python-modules/pycontracts/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows to declare constraints on function parameters and return values"; - homepage = https://pypi.python.org/pypi/PyContracts; + homepage = "https://pypi.python.org/pypi/PyContracts"; license = licenses.lgpl2; }; } diff --git a/pkgs/development/python-modules/pycosat/default.nix b/pkgs/development/python-modules/pycosat/default.nix index ad49e38d065..9fc633c6808 100644 --- a/pkgs/development/python-modules/pycosat/default.nix +++ b/pkgs/development/python-modules/pycosat/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "Bindings to picosat SAT solver"; - homepage = https://github.com/ContinuumIO/pycosat; + homepage = "https://github.com/ContinuumIO/pycosat"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pycountry/default.nix b/pkgs/development/python-modules/pycountry/default.nix index aec477d36a0..584ba838cc2 100644 --- a/pkgs/development/python-modules/pycountry/default.nix +++ b/pkgs/development/python-modules/pycountry/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://bitbucket.org/flyingcircus/pycountry; + homepage = "https://bitbucket.org/flyingcircus/pycountry"; description = "ISO country, subdivision, language, currency and script definitions and their translations"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix index 4845c625652..ea7caba5eb4 100644 --- a/pkgs/development/python-modules/pycparser/default.nix +++ b/pkgs/development/python-modules/pycparser/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "C parser in Python"; - homepage = https://github.com/eliben/pycparser; + homepage = "https://github.com/eliben/pycparser"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pycrc/default.nix b/pkgs/development/python-modules/pycrc/default.nix index e9ea8646b41..ca65f784038 100644 --- a/pkgs/development/python-modules/pycrc/default.nix +++ b/pkgs/development/python-modules/pycrc/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/cristianav/PyCRC; + homepage = "https://github.com/cristianav/PyCRC"; description = "Python libraries for CRC calculations (it supports CRC-16, CRC-32, CRC-CCITT, etc)"; license = licenses.gpl3; maintainers = with maintainers; [ guibou ]; diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index e7858888d36..a9a302cf51b 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = http://www.pycrypto.org/; + homepage = "http://www.pycrypto.org/"; description = "Python Cryptography Toolkit"; platforms = pycryptodome.meta.platforms; }; diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index 17bb7c9dcd0..cf88c6722a6 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = { - homepage = https://www.pycryptodome.org/; + homepage = "https://www.pycryptodome.org/"; description = "Python Cryptography Toolkit"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index bf6ac65fc7f..5cc4446c5a3 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { meta = { description = "A self-contained cryptographic library for Python"; - homepage = https://www.pycryptodome.org; + homepage = "https://www.pycryptodome.org"; license = lib.licenses.bsd2; }; diff --git a/pkgs/development/python-modules/pyct/default.nix b/pkgs/development/python-modules/pyct/default.nix index fc61d689329..c187c6a5576 100644 --- a/pkgs/development/python-modules/pyct/default.nix +++ b/pkgs/development/python-modules/pyct/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Cli for python common tasks for users"; - homepage = https://github.com/pyviz/pyct; + homepage = "https://github.com/pyviz/pyct"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index 225c605a57f..a03662aa961 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/inducer/pycuda/; + homepage = "https://github.com/inducer/pycuda/"; description = "CUDA integration for Python."; license = licenses.mit; maintainers = with maintainers; [ artuuge ]; diff --git a/pkgs/development/python-modules/pycups/default.nix b/pkgs/development/python-modules/pycups/default.nix index 28dff352e38..789d9d4cb8e 100644 --- a/pkgs/development/python-modules/pycups/default.nix +++ b/pkgs/development/python-modules/pycups/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for libcups"; - homepage = http://cyberelk.net/tim/software/pycups/; + homepage = "http://cyberelk.net/tim/software/pycups/"; license = with licenses; [ gpl2Plus ]; }; } diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix index 36e5b96319e..44ff6b7f084 100644 --- a/pkgs/development/python-modules/pycurl/default.nix +++ b/pkgs/development/python-modules/pycurl/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { ''; meta = { - homepage = http://pycurl.sourceforge.net/; + homepage = "http://pycurl.sourceforge.net/"; description = "Python wrapper for libcurl"; }; } diff --git a/pkgs/development/python-modules/pycurl2/default.nix b/pkgs/development/python-modules/pycurl2/default.nix index 478f4451cf7..1cdfb6c4413 100644 --- a/pkgs/development/python-modules/pycurl2/default.nix +++ b/pkgs/development/python-modules/pycurl2/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { buildInputs = [ simplejson unittest2 nose ]; meta = with lib; { - homepage = https://pypi.python.org/pypi/pycurl2; + homepage = "https://pypi.python.org/pypi/pycurl2"; description = "A fork from original PycURL library that no maintained from 7.19.0"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pydbus/default.nix b/pkgs/development/python-modules/pydbus/default.nix index 27b2d237cfc..09f777b0181 100644 --- a/pkgs/development/python-modules/pydbus/default.nix +++ b/pkgs/development/python-modules/pydbus/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pygobject3 ]; meta = { - homepage = https://github.com/LEW21/pydbus; + homepage = "https://github.com/LEW21/pydbus"; description = "Pythonic DBus library"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ gnidorah ]; diff --git a/pkgs/development/python-modules/pydenticon/default.nix b/pkgs/development/python-modules/pydenticon/default.nix index 9b650181e8c..db04991e6eb 100644 --- a/pkgs/development/python-modules/pydenticon/default.nix +++ b/pkgs/development/python-modules/pydenticon/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pillow mock ]; meta = with stdenv.lib; { - homepage = https://github.com/azaghal/pydenticon; + homepage = "https://github.com/azaghal/pydenticon"; description = "Library for generating identicons. Port of Sigil (https://github.com/cupcake/sigil) with enhancements"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 639bd99da33..339775c2f54 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestrunner ]; meta = with stdenv.lib; { - homepage = https://pydicom.github.io; + homepage = "https://pydicom.github.io"; description = "Pure-Python package for working with DICOM files"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/pydispatcher/default.nix b/pkgs/development/python-modules/pydispatcher/default.nix index 68772cab306..066410b7a0d 100644 --- a/pkgs/development/python-modules/pydispatcher/default.nix +++ b/pkgs/development/python-modules/pydispatcher/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://pydispatcher.sourceforge.net/; + homepage = "http://pydispatcher.sourceforge.net/"; description = "Signal-registration and routing infrastructure for use in multiple contexts"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pydns/default.nix b/pkgs/development/python-modules/pydns/default.nix index 48bc3c3fa00..399eab3e674 100644 --- a/pkgs/development/python-modules/pydns/default.nix +++ b/pkgs/development/python-modules/pydns/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python DNS library"; - homepage = http://pydns.sourceforge.net/; + homepage = "http://pydns.sourceforge.net/"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/pydocstyle/2.nix b/pkgs/development/python-modules/pydocstyle/2.nix index a2f2daa2fe9..21e39b68d12 100644 --- a/pkgs/development/python-modules/pydocstyle/2.nix +++ b/pkgs/development/python-modules/pydocstyle/2.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python docstring style checker"; - homepage = https://github.com/PyCQA/pydocstyle/; + homepage = "https://github.com/PyCQA/pydocstyle/"; license = licenses.mit; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 39d9f9f9a23..eb85c690d81 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python docstring style checker"; - homepage = https://github.com/PyCQA/pydocstyle/; + homepage = "https://github.com/PyCQA/pydocstyle/"; license = licenses.mit; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/pydocumentdb/default.nix b/pkgs/development/python-modules/pydocumentdb/default.nix index 659997d7158..7a78730d39b 100644 --- a/pkgs/development/python-modules/pydocumentdb/default.nix +++ b/pkgs/development/python-modules/pydocumentdb/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Azure Cosmos DB API"; - homepage = https://github.com/Azure/azure-cosmos-python; + homepage = "https://github.com/Azure/azure-cosmos-python"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/pydot/default.nix b/pkgs/development/python-modules/pydot/default.nix index 021043d9e9d..0a637a48ba2 100644 --- a/pkgs/development/python-modules/pydot/default.nix +++ b/pkgs/development/python-modules/pydot/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/erocarrera/pydot; + homepage = "https://github.com/erocarrera/pydot"; description = "Allows to easily create both directed and non directed graphs from Python"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/pydotplus/default.nix b/pkgs/development/python-modules/pydotplus/default.nix index 03b594a131a..bb25ecd85e2 100644 --- a/pkgs/development/python-modules/pydotplus/default.nix +++ b/pkgs/development/python-modules/pydotplus/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/erocarrera/pydot; + 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/pydy/default.nix b/pkgs/development/python-modules/pydy/default.nix index 8bdb2affc53..82556ac1a71 100644 --- a/pkgs/development/python-modules/pydy/default.nix +++ b/pkgs/development/python-modules/pydy/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python tool kit for multi-body dynamics"; - homepage = http://pydy.org; + homepage = "http://pydy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyechonest/default.nix b/pkgs/development/python-modules/pyechonest/default.nix index 33e8d9c3fa9..510849edf47 100644 --- a/pkgs/development/python-modules/pyechonest/default.nix +++ b/pkgs/development/python-modules/pyechonest/default.nix @@ -12,6 +12,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tap into The Echo Nest's Musical Brain for the best music search, information, recommendations and remix tools on the web"; - homepage = https://github.com/echonest/pyechonest; + homepage = "https://github.com/echonest/pyechonest"; }; } diff --git a/pkgs/development/python-modules/pyelftools/default.nix b/pkgs/development/python-modules/pyelftools/default.nix index c619df297fe..9e557668de0 100644 --- a/pkgs/development/python-modules/pyelftools/default.nix +++ b/pkgs/development/python-modules/pyelftools/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for analyzing ELF files and DWARF debugging information"; - homepage = https://github.com/eliben/pyelftools; + homepage = "https://github.com/eliben/pyelftools"; license = licenses.publicDomain; maintainers = [ maintainers.igsha ]; }; diff --git a/pkgs/development/python-modules/pyemd/default.nix b/pkgs/development/python-modules/pyemd/default.nix index 28c74487c96..c6bc941046d 100644 --- a/pkgs/development/python-modules/pyemd/default.nix +++ b/pkgs/development/python-modules/pyemd/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python wrapper for Ofir Pele and Michael Werman's implementation of the Earth Mover's Distance"; - homepage = https://github.com/wmayner/pyemd; + homepage = "https://github.com/wmayner/pyemd"; license = licenses.mit; maintainers = with maintainers; [ rvl ]; }; diff --git a/pkgs/development/python-modules/pyenchant/default.nix b/pkgs/development/python-modules/pyenchant/default.nix index f144cf55552..472cdc7118d 100644 --- a/pkgs/development/python-modules/pyenchant/default.nix +++ b/pkgs/development/python-modules/pyenchant/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "pyenchant: Python bindings for the Enchant spellchecker"; - homepage = https://github.com/pyenchant/pyenchant; + homepage = "https://github.com/pyenchant/pyenchant"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/pyepsg/default.nix b/pkgs/development/python-modules/pyepsg/default.nix index 4822e528dee..2e0b2c282a2 100644 --- a/pkgs/development/python-modules/pyepsg/default.nix +++ b/pkgs/development/python-modules/pyepsg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple Python interface to epsg.io"; license = licenses.lgpl3; - homepage = https://pyepsg.readthedocs.io/en/latest/; + homepage = "https://pyepsg.readthedocs.io/en/latest/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/pyext/default.nix b/pkgs/development/python-modules/pyext/default.nix index 2e4c639465b..9351ee5d104 100644 --- a/pkgs/development/python-modules/pyext/default.nix +++ b/pkgs/development/python-modules/pyext/default.nix @@ -17,7 +17,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Simple Python extensions"; - homepage = https://github.com/kirbyfan64/PyExt; + homepage = "https://github.com/kirbyfan64/PyExt"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 6bc2be39fd3..d5e093ce866 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fake file system that mocks the Python file system modules"; license = licenses.asl20; - homepage = http://pyfakefs.org/; + homepage = "http://pyfakefs.org/"; maintainers = with maintainers; [ gebner ]; }; } diff --git a/pkgs/development/python-modules/pyfantom/default.nix b/pkgs/development/python-modules/pyfantom/default.nix index b9e15d376b5..a3facfc771c 100644 --- a/pkgs/development/python-modules/pyfantom/default.nix +++ b/pkgs/development/python-modules/pyfantom/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = http://pyfantom.ni.fr.eu.org/; + homepage = "http://pyfantom.ni.fr.eu.org/"; description = "Wrapper for the LEGO Mindstorms Fantom Driver"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyfftw/default.nix b/pkgs/development/python-modules/pyfftw/default.nix index 41330ca6405..c8dc83b4eba 100644 --- a/pkgs/development/python-modules/pyfftw/default.nix +++ b/pkgs/development/python-modules/pyfftw/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; - homepage = http://hgomersall.github.com/pyFFTW/; + homepage = "http://hgomersall.github.com/pyFFTW/"; license = with licenses; [ bsd2 bsd3 ]; maintainers = with maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/pyflakes/default.nix b/pkgs/development/python-modules/pyflakes/default.nix index 036872e23e3..85176d9ccca 100644 --- a/pkgs/development/python-modules/pyflakes/default.nix +++ b/pkgs/development/python-modules/pyflakes/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ unittest2 ]; meta = with stdenv.lib; { - homepage = https://launchpad.net/pyflakes; + homepage = "https://launchpad.net/pyflakes"; description = "A simple program which checks Python source files for errors"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/pyfma/default.nix b/pkgs/development/python-modules/pyfma/default.nix index 6c7038b9488..936f9c2a02d 100644 --- a/pkgs/development/python-modules/pyfma/default.nix +++ b/pkgs/development/python-modules/pyfma/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Fused multiply-add for Python"; - homepage = https://github.com/nschloe/pyfma; + homepage = "https://github.com/nschloe/pyfma"; license = licenses.mit; maintainers = [ maintainers.costrouc]; }; diff --git a/pkgs/development/python-modules/pyfribidi/default.nix b/pkgs/development/python-modules/pyfribidi/default.nix index fcb201c0311..e71550867a3 100644 --- a/pkgs/development/python-modules/pyfribidi/default.nix +++ b/pkgs/development/python-modules/pyfribidi/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple wrapper around fribidi"; - homepage = https://github.com/pediapress/pyfribidi; + homepage = "https://github.com/pediapress/pyfribidi"; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyftdi/default.nix b/pkgs/development/python-modules/pyftdi/default.nix index cc197754692..d73ee24f584 100644 --- a/pkgs/development/python-modules/pyftdi/default.nix +++ b/pkgs/development/python-modules/pyftdi/default.nix @@ -1,26 +1,24 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pythonOlder -, pyusb -, pyserial -}: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pyusb, pyserial }: buildPythonPackage rec { pname = "pyftdi"; - version = "0.44.2"; + version = "0.49.0"; disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "18k9wnpjxg71v4jm0pwr2bmksq7sckr6ylh1slf0xgpg89b27bxq"; + src = fetchFromGitHub { + owner = "eblot"; + repo = pname; + rev = "v${version}"; + sha256 = "063kwvgw7g4nn09pyqwqy72vnhzw0aajg23bi32vr0k49g8fx27s"; }; propagatedBuildInputs = [ pyusb pyserial ]; + pythonImportsCheck = [ "pyftdi" ]; + meta = { description = "User-space driver for modern FTDI devices"; homepage = "https://github.com/eblot/pyftdi"; - license = lib.licenses.lgpl2; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pyftpdlib/default.nix b/pkgs/development/python-modules/pyftpdlib/default.nix index e7c5b922dc0..721d279478d 100644 --- a/pkgs/development/python-modules/pyftpdlib/default.nix +++ b/pkgs/development/python-modules/pyftpdlib/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/giampaolo/pyftpdlib/; + homepage = "https://github.com/giampaolo/pyftpdlib/"; description = "Very fast asynchronous FTP server library"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pyfttt/default.nix b/pkgs/development/python-modules/pyfttt/default.nix index 44d6679e47c..8592d9b0aee 100644 --- a/pkgs/development/python-modules/pyfttt/default.nix +++ b/pkgs/development/python-modules/pyfttt/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Package for sending events to the IFTTT Webhooks Channel"; - homepage = https://github.com/briandconnelly/pyfttt; + homepage = "https://github.com/briandconnelly/pyfttt"; maintainers = with maintainers; [ peterhoeg ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/pyfxa/default.nix b/pkgs/development/python-modules/pyfxa/default.nix index 4bde8e9997a..0f964bfc9f9 100644 --- a/pkgs/development/python-modules/pyfxa/default.nix +++ b/pkgs/development/python-modules/pyfxa/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Firefox Accounts client library for Python"; - homepage = https://github.com/mozilla/PyFxA; + homepage = "https://github.com/mozilla/PyFxA"; license = licenses.mpl20; }; } diff --git a/pkgs/development/python-modules/pygal/default.nix b/pkgs/development/python-modules/pygal/default.nix index a3d6f6e4c21..b02b6043425 100644 --- a/pkgs/development/python-modules/pygal/default.nix +++ b/pkgs/development/python-modules/pygal/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Sexy and simple python charting"; - homepage = http://www.pygal.org; + homepage = "http://www.pygal.org"; license = licenses.lgpl3; maintainers = with maintainers; [ sjourdois ]; }; diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index b9c45ce8967..8f9a9e5e59c 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for games"; - homepage = http://www.pygame.org/; + homepage = "http://www.pygame.org/"; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/pygbm/default.nix b/pkgs/development/python-modules/pygbm/default.nix index 702dbf70ee9..0d2747c1cb4 100644 --- a/pkgs/development/python-modules/pygbm/default.nix +++ b/pkgs/development/python-modules/pygbm/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Experimental Gradient Boosting Machines in Python"; - homepage = https://github.com/ogrisel/pygbm; + homepage = "https://github.com/ogrisel/pygbm"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; broken = true; diff --git a/pkgs/development/python-modules/pygccxml/default.nix b/pkgs/development/python-modules/pygccxml/default.nix index d4c46d6b835..14bd14ab75e 100644 --- a/pkgs/development/python-modules/pygccxml/default.nix +++ b/pkgs/development/python-modules/pygccxml/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/gccxml/pygccxml; + homepage = "https://github.com/gccxml/pygccxml"; description = "Python package for easy C++ declarations navigation"; license = licenses.boost; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/pygdbmi/default.nix b/pkgs/development/python-modules/pygdbmi/default.nix index c294b02c31d..447fbdfcdc4 100644 --- a/pkgs/development/python-modules/pygdbmi/default.nix +++ b/pkgs/development/python-modules/pygdbmi/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Parse gdb machine interface output with Python"; - homepage = https://github.com/cs01/pygdbmi; + homepage = "https://github.com/cs01/pygdbmi"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pygeoip/default.nix b/pkgs/development/python-modules/pygeoip/default.nix index 0b0e8f55fa7..6cd21a94a9b 100644 --- a/pkgs/development/python-modules/pygeoip/default.nix +++ b/pkgs/development/python-modules/pygeoip/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure Python GeoIP API"; - homepage = https://github.com/appliedsec/pygeoip; + homepage = "https://github.com/appliedsec/pygeoip"; license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/python-modules/pygit2/default.nix b/pkgs/development/python-modules/pygit2/default.nix index 013ce9ae916..ff14c78a7b7 100644 --- a/pkgs/development/python-modules/pygit2/default.nix +++ b/pkgs/development/python-modules/pygit2/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of Python bindings to the libgit2 shared library"; - homepage = https://pypi.python.org/pypi/pygit2; + homepage = "https://pypi.python.org/pypi/pygit2"; license = licenses.gpl2; }; } diff --git a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix index 65688cf17bb..8f41995cf39 100644 --- a/pkgs/development/python-modules/pygments-markdown-lexer/default.nix +++ b/pkgs/development/python-modules/pygments-markdown-lexer/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jhermann/pygments-markdown-lexer; + homepage = "https://github.com/jhermann/pygments-markdown-lexer"; description = "Pygments Markdown Lexer – A Markdown lexer for Pygments to highlight Markdown code snippets"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index c7dfdef4be4..d846cc4f18c 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -45,7 +45,7 @@ in buildPythonPackage { meta = with lib; { description = "Parallel optimisation for Python"; - homepage = https://esa.github.io/pagmo2/; + homepage = "https://esa.github.io/pagmo2/"; license = licenses.gpl3Plus; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index e9cbeb422f1..2a1b8bcb410 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -3,13 +3,13 @@ pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: buildPythonPackage rec { pname = "pygobject"; - version = "3.34.0"; + version = "3.36.0"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7"; + sha256 = "hoPS37W6qeUBqaZO66XCwRF+rbeBqxzXqdJVg0r22u8="; }; outputs = [ "out" "dev" ]; @@ -31,7 +31,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://pygobject.readthedocs.io/; + homepage = "https://pygobject.readthedocs.io/"; description = "Python bindings for Glib"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 706284b56db..1a084f8a870 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python interface to Graphviz graph drawing package"; - homepage = https://github.com/pygraphviz/pygraphviz; + homepage = "https://github.com/pygraphviz/pygraphviz"; license = licenses.bsd3; maintainers = with maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/pygreat/default.nix b/pkgs/development/python-modules/pygreat/default.nix index 103e215f047..bdced30f983 100644 --- a/pkgs/development/python-modules/pygreat/default.nix +++ b/pkgs/development/python-modules/pygreat/default.nix @@ -24,7 +24,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Python library for talking with libGreat devices"; - homepage = https://greatscottgadgets.com/greatfet/; + homepage = "https://greatscottgadgets.com/greatfet/"; license = with licenses; [ bsd3 ]; }; diff --git a/pkgs/development/python-modules/pygtail/default.nix b/pkgs/development/python-modules/pygtail/default.nix index 503dad717c2..492a36c50a2 100644 --- a/pkgs/development/python-modules/pygtail/default.nix +++ b/pkgs/development/python-modules/pygtail/default.nix @@ -20,6 +20,6 @@ buildPythonPackage rec { meta = with lib; { description = "A library for reading log file lines that have not been read"; license = licenses.gpl2Plus; - homepage = https://github.com/bgreenlee/pygtail; + homepage = "https://github.com/bgreenlee/pygtail"; }; } diff --git a/pkgs/development/python-modules/pyhamcrest/default.nix b/pkgs/development/python-modules/pyhamcrest/default.nix index 18540aca50e..98ef4afacc1 100644 --- a/pkgs/development/python-modules/pyhamcrest/default.nix +++ b/pkgs/development/python-modules/pyhamcrest/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; # pypi tarball does not include tests meta = with stdenv.lib; { - homepage = https://github.com/hamcrest/PyHamcrest; + homepage = "https://github.com/hamcrest/PyHamcrest"; description = "Hamcrest framework for matcher objects"; license = licenses.bsd3; maintainers = with maintainers; [ diff --git a/pkgs/development/python-modules/pyhaversion/default.nix b/pkgs/development/python-modules/pyhaversion/default.nix index 73de6ba0839..7717706561d 100644 --- a/pkgs/development/python-modules/pyhaversion/default.nix +++ b/pkgs/development/python-modules/pyhaversion/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python module to the newest version number of Home Assistant"; - homepage = https://github.com/ludeeus/pyhaversion; + homepage = "https://github.com/ludeeus/pyhaversion"; maintainers = [ maintainers.makefu ]; }; } diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix index b40305c0dce..d3e0da07868 100644 --- a/pkgs/development/python-modules/pyhcl/default.nix +++ b/pkgs/development/python-modules/pyhcl/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyhcl"; - version = "0.4.1"; + version = "0.4.2"; disabled = !isPy3k; src = fetchFromGitHub { owner = "virtuald"; repo = pname; rev = version; - sha256 = "13nszg2plfvza3syki1rxnx3k3h90qq4wkgv86l1xpz31k3pf6k4"; + sha256 = "01y5fn3pis43i0w0858wmrc8azfinp07a16ixglmg28gg07c0zkd"; }; # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64 diff --git a/pkgs/development/python-modules/pyhocon/default.nix b/pkgs/development/python-modules/pyhocon/default.nix index f0e50895d83..487f7ca66f3 100644 --- a/pkgs/development/python-modules/pyhocon/default.nix +++ b/pkgs/development/python-modules/pyhocon/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/chimpler/pyhocon/; + homepage = "https://github.com/chimpler/pyhocon/"; description = "HOCON parser for Python"; # Long description copied from # https://github.com/chimpler/pyhocon/blob/55a9ea3ebeeac5764bdebebfbeacbf099f64db26/setup.py diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 33df2985cfc..1b070880626 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python 3 Interface to interact with Homematic devices"; - homepage = https://github.com/danielperna84/pyhomematic; + homepage = "https://github.com/danielperna84/pyhomematic"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyicloud/default.nix b/pkgs/development/python-modules/pyicloud/default.nix index 7bc52f74701..d579d3e96fb 100644 --- a/pkgs/development/python-modules/pyicloud/default.nix +++ b/pkgs/development/python-modules/pyicloud/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyicloud"; - version = "0.9.4"; + version = "0.9.5"; src = fetchPypi { inherit pname version; - sha256 = "0r171wnq2g5bw7gd59vh6flm0104ix1a6s2vhdrf8s74hipw57si"; + sha256 = "1c8sdlqcmpajcpf6jfpi6amncibm9c3zrl1860r0vfimps50m34h"; }; propagatedBuildInputs = [ @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyiCloud is a module which allows pythonistas to interact with iCloud webservices"; - homepage = https://github.com/picklepete/pyicloud; + homepage = "https://github.com/picklepete/pyicloud"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/pyicu/default.nix b/pkgs/development/python-modules/pyicu/default.nix index a9523826b11..9dcdfb64c93 100644 --- a/pkgs/development/python-modules/pyicu/default.nix +++ b/pkgs/development/python-modules/pyicu/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/PyICU/; + homepage = "https://pypi.python.org/pypi/PyICU/"; description = "Python extension wrapping the ICU C++ API"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/pyinotify/default.nix b/pkgs/development/python-modules/pyinotify/default.nix index 0e070d8a89d..7193fe118fd 100644 --- a/pkgs/development/python-modules/pyinotify/default.nix +++ b/pkgs/development/python-modules/pyinotify/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/seb-m/pyinotify/wiki; + homepage = "https://github.com/seb-m/pyinotify/wiki"; description = "Monitor filesystems events on Linux platforms with inotify"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/pyjwkest/default.nix b/pkgs/development/python-modules/pyjwkest/default.nix index 3c5b96af2ad..945cc20528e 100644 --- a/pkgs/development/python-modules/pyjwkest/default.nix +++ b/pkgs/development/python-modules/pyjwkest/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Implementation of JWT, JWS, JWE and JWK"; - homepage = https://github.com/rohe/pyjwkest; + homepage = "https://github.com/rohe/pyjwkest"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/pyjwt/default.nix b/pkgs/development/python-modules/pyjwt/default.nix index e91fbe2b3e4..9255c02ac2e 100644 --- a/pkgs/development/python-modules/pyjwt/default.nix +++ b/pkgs/development/python-modules/pyjwt/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "JSON Web Token implementation in Python"; - homepage = https://github.com/jpadilla/pyjwt; + homepage = "https://github.com/jpadilla/pyjwt"; license = licenses.mit; maintainers = with maintainers; [ prikhi ]; }; diff --git a/pkgs/development/python-modules/pykdtree/default.nix b/pkgs/development/python-modules/pykdtree/default.nix index 2dd014821e6..f266d17bb46 100644 --- a/pkgs/development/python-modules/pykdtree/default.nix +++ b/pkgs/development/python-modules/pykdtree/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "kd-tree implementation for fast nearest neighbour search in Python"; - homepage = https://github.com/storpipfugl/pykdtree; + homepage = "https://github.com/storpipfugl/pykdtree"; license = licenses.lgpl3; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pykeepass/default.nix b/pkgs/development/python-modules/pykeepass/default.nix index a8fff00ae15..311417bf0e4 100644 --- a/pkgs/development/python-modules/pykeepass/default.nix +++ b/pkgs/development/python-modules/pykeepass/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/pschmitt/pykeepass; + homepage = "https://github.com/pschmitt/pykeepass"; description = "Python library to interact with keepass databases (supports KDBX3 and KDBX4)"; license = lib.licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pykka/default.nix b/pkgs/development/python-modules/pykka/default.nix index 8482b1e1bc8..a787b869527 100644 --- a/pkgs/development/python-modules/pykka/default.nix +++ b/pkgs/development/python-modules/pykka/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://www.pykka.org; + homepage = "http://www.pykka.org"; description = "A Python implementation of the actor model"; license = licenses.asl20; maintainers = []; diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix index 3073f55ca3a..1aa96dfe464 100644 --- a/pkgs/development/python-modules/pylama/default.nix +++ b/pkgs/development/python-modules/pylama/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Code audit tool for python"; - homepage = https://github.com/klen/pylama; + homepage = "https://github.com/klen/pylama"; # ambiguous license declarations: https://github.com/klen/pylama/issues/64 license = [ licenses.lgpl3 ]; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix index 6d58fbfb21a..6a6853e5599 100644 --- a/pkgs/development/python-modules/pylast/default.nix +++ b/pkgs/development/python-modules/pylast/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/pylast/pylast; + homepage = "https://github.com/pylast/pylast"; description = "A python interface to last.fm (and compatibles)"; license = licenses.asl20; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/development/python-modules/pylev/default.nix b/pkgs/development/python-modules/pylev/default.nix index f198d214172..5df0ce4690e 100644 --- a/pkgs/development/python-modules/pylev/default.nix +++ b/pkgs/development/python-modules/pylev/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { }; meta = with lib; { - homepage = https://github.com/toastdriven/pylev; + homepage = "https://github.com/toastdriven/pylev"; description = "A pure Python Levenshtein implementation that's not freaking GPL'd"; license = licenses.bsd3; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/pylibconfig2/default.nix b/pkgs/development/python-modules/pylibconfig2/default.nix index 6cea70c5708..3c2a0be941d 100644 --- a/pkgs/development/python-modules/pylibconfig2/default.nix +++ b/pkgs/development/python-modules/pylibconfig2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyparsing ]; meta = with stdenv.lib; { - homepage = https://github.com/heinzK1X/pylibconfig2; + homepage = "https://github.com/heinzK1X/pylibconfig2"; description = "Pure python library for libconfig syntax"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pylibgen/default.nix b/pkgs/development/python-modules/pylibgen/default.nix index 559b75eec41..9dc6689e900 100644 --- a/pkgs/development/python-modules/pylibgen/default.nix +++ b/pkgs/development/python-modules/pylibgen/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to Library Genesis"; - homepage = https://pypi.org/project/pylibgen/; + homepage = "https://pypi.org/project/pylibgen/"; license = licenses.mit; maintainers = [ maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/pyliblo/default.nix b/pkgs/development/python-modules/pyliblo/default.nix index 3c637ffced3..4c0a406bed3 100644 --- a/pkgs/development/python-modules/pyliblo/default.nix +++ b/pkgs/development/python-modules/pyliblo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { buildInputs = [ liblo cython ]; meta = with stdenv.lib; { - homepage = http://das.nasophon.de/pyliblo/; + homepage = "http://das.nasophon.de/pyliblo/"; description = "Python wrapper for the liblo OSC library"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix index 053d73af1a3..26d6e4fb6fb 100644 --- a/pkgs/development/python-modules/pylibmc/default.nix +++ b/pkgs/development/python-modules/pylibmc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Quick and small memcached client for Python"; - homepage = http://sendapatch.se/projects/pylibmc/; + homepage = "http://sendapatch.se/projects/pylibmc/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix index b1253c65b33..568d85b7e1b 100644 --- a/pkgs/development/python-modules/pylint/1.9.nix +++ b/pkgs/development/python-modules/pylint/1.9.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/PyCQA/pylint; + homepage = "https://github.com/PyCQA/pylint"; description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 95f86e31c04..c596b4042cc 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/PyCQA/pylint; + homepage = "https://github.com/PyCQA/pylint"; description = "A bug and style checker for Python"; platforms = platforms.all; license = licenses.gpl1Plus; diff --git a/pkgs/development/python-modules/pyls-black/default.nix b/pkgs/development/python-modules/pyls-black/default.nix index bd27de6eba7..d21002f9160 100644 --- a/pkgs/development/python-modules/pyls-black/default.nix +++ b/pkgs/development/python-modules/pyls-black/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ black toml python-language-server ]; meta = with lib; { - homepage = https://github.com/rupert/pyls-black; + homepage = "https://github.com/rupert/pyls-black"; description = "Black plugin for the Python Language Server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/pyls-isort/default.nix b/pkgs/development/python-modules/pyls-isort/default.nix index fa94441e200..9dc614035e0 100644 --- a/pkgs/development/python-modules/pyls-isort/default.nix +++ b/pkgs/development/python-modules/pyls-isort/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/paradoxxxzero/pyls-isort; + homepage = "https://github.com/paradoxxxzero/pyls-isort"; description = "Isort plugin for python-language-server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/pyls-mypy/default.nix b/pkgs/development/python-modules/pyls-mypy/default.nix index 414c2cccbea..b4fd98607d8 100644 --- a/pkgs/development/python-modules/pyls-mypy/default.nix +++ b/pkgs/development/python-modules/pyls-mypy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/tomv564/pyls-mypy; + homepage = "https://github.com/tomv564/pyls-mypy"; description = "Mypy plugin for the Python Language Server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/pymacaroons/default.nix b/pkgs/development/python-modules/pymacaroons/default.nix index 96023c01e1e..c9ffcc0a070 100644 --- a/pkgs/development/python-modules/pymacaroons/default.nix +++ b/pkgs/development/python-modules/pymacaroons/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Macaroon library for Python"; - homepage = https://github.com/ecordell/pymacaroons; + homepage = "https://github.com/ecordell/pymacaroons"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pymaging/default.nix b/pkgs/development/python-modules/pymaging/default.nix index 81100a8e214..68a2e59b298 100644 --- a/pkgs/development/python-modules/pymaging/default.nix +++ b/pkgs/development/python-modules/pymaging/default.nix @@ -16,7 +16,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = http://pymaging.rtfd.org; + homepage = "http://pymaging.rtfd.org"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/pymaging_png/default.nix b/pkgs/development/python-modules/pymaging_png/default.nix index 61239f1cbe3..9bf2559e2f0 100644 --- a/pkgs/development/python-modules/pymaging_png/default.nix +++ b/pkgs/development/python-modules/pymaging_png/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; - homepage = https://github.com/ojii/pymaging-png/; + homepage = "https://github.com/ojii/pymaging-png/"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/pymatgen-lammps/default.nix b/pkgs/development/python-modules/pymatgen-lammps/default.nix index c38f56885d1..c80472a6730 100644 --- a/pkgs/development/python-modules/pymatgen-lammps/default.nix +++ b/pkgs/development/python-modules/pymatgen-lammps/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "A LAMMPS wrapper using pymatgen"; - homepage = https://gitlab.com/costrouc/pymatgen-lammps; + homepage = "https://gitlab.com/costrouc/pymatgen-lammps"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 4f99d0021e0..f9869cc2c7f 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A robust materials analysis code that defines core object representations for structures and molecules"; - homepage = https://pymatgen.org/; + homepage = "https://pymatgen.org/"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix index 2411abc5ac4..85379949729 100644 --- a/pkgs/development/python-modules/pymbolic/default.nix +++ b/pkgs/development/python-modules/pymbolic/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A package for symbolic computation"; - homepage = https://mathema.tician.de/software/pymbolic; + homepage = "https://mathema.tician.de/software/pymbolic"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 39472bb3177..922a8bb59c5 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = { description = "Bayesian estimation, particularly using Markov chain Monte Carlo (MCMC)"; - homepage = https://github.com/pymc-devs/pymc3; + homepage = "https://github.com/pymc-devs/pymc3"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ilya-kolpakov ]; }; diff --git a/pkgs/development/python-modules/pymediainfo/default.nix b/pkgs/development/python-modules/pymediainfo/default.nix index dbed3c7f037..a7bdfeea90a 100644 --- a/pkgs/development/python-modules/pymediainfo/default.nix +++ b/pkgs/development/python-modules/pymediainfo/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for the mediainfo library"; - homepage = https://github.com/sbraz/pymediainfo; + homepage = "https://github.com/sbraz/pymediainfo"; license = licenses.mit; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/development/python-modules/pyment/default.nix b/pkgs/development/python-modules/pyment/default.nix index bb27e5b3c3d..fbf2c93fde6 100644 --- a/pkgs/development/python-modules/pyment/default.nix +++ b/pkgs/development/python-modules/pyment/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/dadadel/pyment; + homepage = "https://github.com/dadadel/pyment"; description = "Create, update or convert docstrings in existing Python files, managing several styles"; license = licenses.gpl3; maintainers = with maintainers; [ jethro ]; diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix index 2baf3181ac6..6896eaa097e 100644 --- a/pkgs/development/python-modules/pymetar/default.nix +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A command-line tool to show the weather report by a given station ID"; - homepage = http://www.schwarzvogel.de/software/pymetar.html; + homepage = "http://www.schwarzvogel.de/software/pymetar.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ erosennin ]; }; diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index a10bb9169ed..35fb4673ef5 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/mongodb/mongo-python-driver; + homepage = "https://github.com/mongodb/mongo-python-driver"; license = licenses.asl20; description = "Python driver for MongoDB"; }; diff --git a/pkgs/development/python-modules/pympler/default.nix b/pkgs/development/python-modules/pympler/default.nix index 85be0b4309c..0fc04942655 100644 --- a/pkgs/development/python-modules/pympler/default.nix +++ b/pkgs/development/python-modules/pympler/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool to measure, monitor and analyze memory behavior"; - homepage = https://pythonhosted.org/Pympler/; + homepage = "https://pythonhosted.org/Pympler/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/pymsgbox/default.nix b/pkgs/development/python-modules/pymsgbox/default.nix index 38cc411f54d..d844144addb 100644 --- a/pkgs/development/python-modules/pymsgbox/default.nix +++ b/pkgs/development/python-modules/pymsgbox/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple, cross-platform, pure Python module for JavaScript-like message boxes"; - homepage = https://github.com/asweigart/PyMsgBox; + homepage = "https://github.com/asweigart/PyMsgBox"; license = licenses.bsd3; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix index 954be3f40e2..5c013efc2d1 100644 --- a/pkgs/development/python-modules/pymssql/default.nix +++ b/pkgs/development/python-modules/pymssql/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = http://pymssql.org/en/stable/; + homepage = "http://pymssql.org/en/stable/"; description = "A simple database interface for Python that builds on top of FreeTDS to provide a Python DB-API (PEP-249) interface to Microsoft SQL Server"; diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index a3286b31461..2ab33fb1838 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.12"; + version = "1.16.16"; src = fetchPypi { inherit pname version; - sha256 = "0mywnhn8ylm9xy23yfgnxiq4akk1rq3n7bl1m7pw6imsgbdhzrwg"; + sha256 = "1rw4wjbsp8pnkkqcn097psjd6qinv70pjzvrbns04maybhn4ni6v"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pymvglive/default.nix b/pkgs/development/python-modules/pymvglive/default.nix index 3b7011fa748..e2c2e8f05a1 100644 --- a/pkgs/development/python-modules/pymvglive/default.nix +++ b/pkgs/development/python-modules/pymvglive/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "get live-data from mvg-live.de"; - homepage = https://github.com/pc-coholic/PyMVGLive; + homepage = "https://github.com/pc-coholic/PyMVGLive"; license = licenses.free; }; } diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix index 4529a736f13..a43dcfb26fc 100644 --- a/pkgs/development/python-modules/pymysql/default.nix +++ b/pkgs/development/python-modules/pymysql/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python MySQL Client"; - homepage = https://github.com/PyMySQL/PyMySQL; + homepage = "https://github.com/PyMySQL/PyMySQL"; license = licenses.mit; maintainers = [ maintainers.kalbasit ]; }; diff --git a/pkgs/development/python-modules/pymysqlsa/default.nix b/pkgs/development/python-modules/pymysqlsa/default.nix index 11813d3d1bc..16c0e1a58d3 100644 --- a/pkgs/development/python-modules/pymysqlsa/default.nix +++ b/pkgs/development/python-modules/pymysqlsa/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "PyMySQL dialect for SQL Alchemy"; - homepage = https://pypi.python.org/pypi/pymysql_sa; + homepage = "https://pypi.python.org/pypi/pymysql_sa"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pymystem3/default.nix b/pkgs/development/python-modules/pymystem3/default.nix index 5311d981752..2b00dd7951d 100644 --- a/pkgs/development/python-modules/pymystem3/default.nix +++ b/pkgs/development/python-modules/pymystem3/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for the Yandex MyStem 3.1 morpholocial analyzer of the Russian language"; - homepage = https://github.com/nlpub/pymystem3; + homepage = "https://github.com/nlpub/pymystem3"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/pynac/default.nix b/pkgs/development/python-modules/pynac/default.nix index 755dda341c9..69233adc264 100644 --- a/pkgs/development/python-modules/pynac/default.nix +++ b/pkgs/development/python-modules/pynac/default.nix @@ -13,7 +13,7 @@ buildPythonPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/se-esss-litterbox/Pynac; + homepage = "https://github.com/se-esss-litterbox/Pynac"; description = "A Python wrapper around the Dynac charged particle simulator"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix index 1561c3c4d6d..be24815ba13 100644 --- a/pkgs/development/python-modules/pynacl/default.nix +++ b/pkgs/development/python-modules/pynacl/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { maintainers = with maintainers; [ va1entin ]; description = "Python binding to the Networking and Cryptography (NaCl) library"; - homepage = https://github.com/pyca/pynacl/; + homepage = "https://github.com/pyca/pynacl/"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/pynamecheap/default.nix b/pkgs/development/python-modules/pynamecheap/default.nix index 571206a7167..84c13b9d1ca 100644 --- a/pkgs/development/python-modules/pynamecheap/default.nix +++ b/pkgs/development/python-modules/pynamecheap/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Namecheap API client in Python."; - homepage = https://github.com/Bemmu/PyNamecheap; + homepage = "https://github.com/Bemmu/PyNamecheap"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pynanoleaf/default.nix b/pkgs/development/python-modules/pynanoleaf/default.nix new file mode 100644 index 00000000000..40e2783aa57 --- /dev/null +++ b/pkgs/development/python-modules/pynanoleaf/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, requests }: + +buildPythonPackage rec { + pname = "pynanoleaf"; + version = "0.0.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "2ced000e3c37f4e2ce0ea177d924af71c97007de9e4fd0ef37dcd7b4a6d1b622"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ requests ]; + + # pynanoleaf does not contain tests + doCheck = false; + + pythonImportsCheck = [ + "pynanoleaf" + ]; + + meta = with lib; { + homepage = "https://github.com/Oro/pynanoleaf"; + description = "A Python3 wrapper for the Nanoleaf API, capable of controlling both Nanoleaf Aurora and Nanoleaf Canvas"; + license = licenses.mit; + maintainers = with maintainers; [ oro ]; + }; +} diff --git a/pkgs/development/python-modules/pync/default.nix b/pkgs/development/python-modules/pync/default.nix index 24d285423f1..b7c819c4593 100644 --- a/pkgs/development/python-modules/pync/default.nix +++ b/pkgs/development/python-modules/pync/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Wrapper for Mac OS 10.8 Notification Center"; - homepage = https://pypi.python.org/pypi/pync/1.4; + homepage = "https://pypi.python.org/pypi/pync/1.4"; license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 5f877fd90d2..27e41f300c7 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The pynisher is a little module intended to limit a functions resources."; - homepage = https://github.com/sfalkner/pynisher; + homepage = "https://github.com/sfalkner/pynisher"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/pynmea2/default.nix b/pkgs/development/python-modules/pynmea2/default.nix index f950c7798b8..71d874740c5 100644 --- a/pkgs/development/python-modules/pynmea2/default.nix +++ b/pkgs/development/python-modules/pynmea2/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { checkPhase = "pytest"; meta = { - homepage = https://github.com/Knio/pynmea2; + homepage = "https://github.com/Knio/pynmea2"; description = "Python library for the NMEA 0183 protcol"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/pynrrd/default.nix b/pkgs/development/python-modules/pynrrd/default.nix index 02361fe84de..7a136176cf6 100644 --- a/pkgs/development/python-modules/pynrrd/default.nix +++ b/pkgs/development/python-modules/pynrrd/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; meta = with lib; { - homepage = https://github.com/mhe/pynrrd; + homepage = "https://github.com/mhe/pynrrd"; description = "Simple pure-Python reader for NRRD files"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index c64d723ec32..75d8056fa55 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python bindings for the NVIDIA Management Library"; - homepage = https://www.nvidia.com; + homepage = "https://www.nvidia.com"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/pynzb/default.nix b/pkgs/development/python-modules/pynzb/default.nix index 4225d30c6fe..530a5e2e179 100644 --- a/pkgs/development/python-modules/pynzb/default.nix +++ b/pkgs/development/python-modules/pynzb/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/ericflo/pynzb; + homepage = "https://github.com/ericflo/pynzb"; description = "Unified API for parsing NZB files"; license = licenses.bsd3; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pyobjc/default.nix b/pkgs/development/python-modules/pyobjc/default.nix index 8576de1b379..8b35ef4b3da 100644 --- a/pkgs/development/python-modules/pyobjc/default.nix +++ b/pkgs/development/python-modules/pyobjc/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { description = "A bridge between the Python and Objective-C programming languages"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ sauyon ]; - homepage = https://pythonhosted.org/pyobjc/; + homepage = "https://pythonhosted.org/pyobjc/"; }; } diff --git a/pkgs/development/python-modules/pyogg/default.nix b/pkgs/development/python-modules/pyogg/default.nix index 88fdc960a2b..3edf3768956 100644 --- a/pkgs/development/python-modules/pyogg/default.nix +++ b/pkgs/development/python-modules/pyogg/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "Xiph.org's Ogg Vorbis, Opus and FLAC for Python"; - homepage = https://github.com/Zuzu-Typ/PyOgg; + homepage = "https://github.com/Zuzu-Typ/PyOgg"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/pyomo/default.nix b/pkgs/development/python-modules/pyomo/default.nix index 14ccdaa64c3..99f002b9317 100644 --- a/pkgs/development/python-modules/pyomo/default.nix +++ b/pkgs/development/python-modules/pyomo/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pyomo: Python Optimization Modeling Objects"; - homepage = http://pyomo.org; + homepage = "http://pyomo.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index 0fd6253e5fd..ed8c4c4a090 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for OpenCL"; - homepage = https://github.com/pyopencl/pyopencl; + homepage = "https://github.com/pyopencl/pyopencl"; license = licenses.mit; maintainers = [ maintainers.fridh ]; }; diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index ed643eb2198..fddc27ee191 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pyopengl.sourceforge.net/; + homepage = "http://pyopengl.sourceforge.net/"; description = "PyOpenGL, the Python OpenGL bindings"; longDescription = '' PyOpenGL is the cross platform Python binding to OpenGL and diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 8d5f6291c26..4305487b656 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -85,19 +85,19 @@ buildPythonPackage rec { # 4 patches for 2020 bug # https://github.com/pyca/pyopenssl/pull/828 (fetchpatch { - url = https://github.com/pyca/pyopenssl/commit/0d2fd1a24b30077ead6960bd63b4a9893a57c101.patch; + url = "https://github.com/pyca/pyopenssl/commit/0d2fd1a24b30077ead6960bd63b4a9893a57c101.patch"; sha256 = "1c27g53qrwxddyx04sxf8yvj7xgbaabla7mc1cgbfd426rncbqf3"; }) (fetchpatch { - url = https://github.com/pyca/pyopenssl/commit/d08a742573c3205348a4eec9a65abaf6c16110c4.patch; + url = "https://github.com/pyca/pyopenssl/commit/d08a742573c3205348a4eec9a65abaf6c16110c4.patch"; sha256 = "18xn8s1wpycz575ivrbsbs0qd2q48z8pdzsjzh8i60xba3f8yj2f"; }) (fetchpatch { - url = https://github.com/pyca/pyopenssl/commit/60b9e10e6da7ccafaf722def630285f54510ed12.patch; + url = "https://github.com/pyca/pyopenssl/commit/60b9e10e6da7ccafaf722def630285f54510ed12.patch"; sha256 = "0aw8qvy8m0bhgp39lmbcrpprpg4bhpssm327hyrk476wwgajk01j"; }) (fetchpatch { - url = https://github.com/pyca/pyopenssl/commit/7a37cc23fcbe43abe785cd4badd14bdc7acfb175.patch; + url = "https://github.com/pyca/pyopenssl/commit/7a37cc23fcbe43abe785cd4badd14bdc7acfb175.patch"; sha256 = "1c7zb568rs71rsl16p6dq7aixwlkgzfnba4vzmfvbmy3zsnaslq2"; }) ]; diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index 6c1dcadaccf..c78b7fb1459 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python One Time Password Library"; - homepage = https://github.com/pyotp/pyotp; + homepage = "https://github.com/pyotp/pyotp"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index 1b8fffa1d29..731bba046e8 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python wrapper around the OpenWeatherMap web API"; - homepage = https://pyowm.readthedocs.io/; + homepage = "https://pyowm.readthedocs.io/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix index 41576c5ad1f..6ec2c4a47ae 100644 --- a/pkgs/development/python-modules/pypandoc/default.nix +++ b/pkgs/development/python-modules/pypandoc/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Thin wrapper for pandoc"; - homepage = https://github.com/bebraw/pypandoc; + homepage = "https://github.com/bebraw/pypandoc"; license = licenses.mit; maintainers = with maintainers; [ sternenseemann bennofs ]; }; diff --git a/pkgs/development/python-modules/pyparser/default.nix b/pkgs/development/python-modules/pyparser/default.nix index 1c00d726ead..8e4deafd542 100644 --- a/pkgs/development/python-modules/pyparser/default.nix +++ b/pkgs/development/python-modules/pyparser/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Simple library that makes it easier to parse files"; - homepage = https://bitbucket.org/rw_grim/pyparser; + homepage = "https://bitbucket.org/rw_grim/pyparser"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.nico202 ]; }; diff --git a/pkgs/development/python-modules/pypcap/default.nix b/pkgs/development/python-modules/pypcap/default.nix index 620b1d81160..06a669e3f4f 100644 --- a/pkgs/development/python-modules/pypcap/default.nix +++ b/pkgs/development/python-modules/pypcap/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { checkInputs = [ dpkt ]; meta = with lib; { - homepage = https://github.com/pynetwork/pypcap; + homepage = "https://github.com/pynetwork/pypcap"; description = "Simplified object-oriented Python wrapper for libpcap"; license = licenses.bsd3; maintainers = with maintainers; [ geistesk ]; diff --git a/pkgs/development/python-modules/pypeg2/default.nix b/pkgs/development/python-modules/pypeg2/default.nix index de2ddc98a8e..7aa0f2eda42 100644 --- a/pkgs/development/python-modules/pypeg2/default.nix +++ b/pkgs/development/python-modules/pypeg2/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "PEG parser interpreter in Python"; - homepage = http://fdik.org/pyPEG; + homepage = "http://fdik.org/pyPEG"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyplatec/default.nix b/pkgs/development/python-modules/pyplatec/default.nix index a17c650e0f0..78d939bca1c 100644 --- a/pkgs/development/python-modules/pyplatec/default.nix +++ b/pkgs/development/python-modules/pyplatec/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library to simulate plate tectonics with Python bindings"; - homepage = https://github.com/Mindwerks/plate-tectonics; + homepage = "https://github.com/Mindwerks/plate-tectonics"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/pypoppler/default.nix b/pkgs/development/python-modules/pypoppler/default.nix index ccda4f2631d..3287c70db9c 100644 --- a/pkgs/development/python-modules/pypoppler/default.nix +++ b/pkgs/development/python-modules/pypoppler/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://code.launchpad.net/~mriedesel/poppler-python/main; + homepage = "https://code.launchpad.net/~mriedesel/poppler-python/main"; description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/pyprind/default.nix b/pkgs/development/python-modules/pyprind/default.nix index de1b17be739..42c99c30088 100644 --- a/pkgs/development/python-modules/pyprind/default.nix +++ b/pkgs/development/python-modules/pyprind/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Progress Bar and Percent Indicator Utility"; - homepage = https://github.com/rasbt/pyprind; + homepage = "https://github.com/rasbt/pyprind"; license = licenses.bsd3; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/development/python-modules/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index 198445177c4..f86d830635f 100644 --- a/pkgs/development/python-modules/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Help visualize profiling data from cProfile with kcachegrind and qcachegrind"; - homepage = https://pypi.python.org/pypi/pyprof2calltree/; + homepage = "https://pypi.python.org/pypi/pyprof2calltree/"; license = licenses.mit; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/development/python-modules/pyptlib/default.nix b/pkgs/development/python-modules/pyptlib/default.nix index 6349b56b474..f820f161de5 100644 --- a/pkgs/development/python-modules/pyptlib/default.nix +++ b/pkgs/development/python-modules/pyptlib/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; # No such file or directory errors on 32bit meta = with stdenv.lib; { - homepage = https://pypi.org/project/pyptlib/; + homepage = "https://pypi.org/project/pyptlib/"; description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/pyqrcode/default.nix b/pkgs/development/python-modules/pyqrcode/default.nix index 4313f700ae1..7cb0a94eb74 100644 --- a/pkgs/development/python-modules/pyqrcode/default.nix +++ b/pkgs/development/python-modules/pyqrcode/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "A QR code generator written purely in Python with SVG, EPS, PNG and terminal output"; - homepage = https://github.com/mnooner256/pyqrcode; + homepage = "https://github.com/mnooner256/pyqrcode"; license = licenses.bsd3; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 9f7c75a02d3..05cf0aba354 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -62,7 +62,7 @@ buildPythonPackage rec { meta = { description = "Python bindings for Qt"; license = "GPL"; - homepage = http://www.riverbankcomputing.co.uk; + homepage = "http://www.riverbankcomputing.co.uk"; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index f3578459b9d..52b27638ac7 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -80,6 +80,9 @@ in buildPythonPackage rec { passthru = { inherit sip; + multimediaEnabled = withMultimedia; + webKitEnabled = withWebKit; + WebSocketsEnabled = withWebSockets; }; configurePhase = '' @@ -138,7 +141,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Python bindings for Qt5"; - homepage = http://www.riverbankcomputing.co.uk; + homepage = "http://www.riverbankcomputing.co.uk"; license = licenses.gpl3; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ sander ]; diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix index a2c4a9491b6..3d7fe0bcc5f 100644 --- a/pkgs/development/python-modules/pyqtgraph/default.nix +++ b/pkgs/development/python-modules/pyqtgraph/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Scientific Graphics and GUI Library for Python"; - homepage = http://www.pyqtgraph.org/; + homepage = "http://www.pyqtgraph.org/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index b48f21b9e78..22e7f076910 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -86,7 +86,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Python bindings for Qt5"; - homepage = http://www.riverbankcomputing.co.uk; + homepage = "http://www.riverbankcomputing.co.uk"; license = licenses.gpl3; platforms = platforms.mesaPlatforms; }; diff --git a/pkgs/development/python-modules/pyquery/default.nix b/pkgs/development/python-modules/pyquery/default.nix index 70f144b6258..6ba9cb91982 100644 --- a/pkgs/development/python-modules/pyquery/default.nix +++ b/pkgs/development/python-modules/pyquery/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/gawel/pyquery; + homepage = "https://github.com/gawel/pyquery"; description = "A jquery-like library for python"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pyrabbit2/default.nix b/pkgs/development/python-modules/pyrabbit2/default.nix index 36182e9986b..96f5d66cf65 100644 --- a/pkgs/development/python-modules/pyrabbit2/default.nix +++ b/pkgs/development/python-modules/pyrabbit2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Pythonic interface to the RabbitMQ Management HTTP API"; - homepage = https://github.com/deslum/pyrabbit2; + homepage = "https://github.com/deslum/pyrabbit2"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyramid/default.nix b/pkgs/development/python-modules/pyramid/default.nix index a851344b4ce..3de55f628c4 100644 --- a/pkgs/development/python-modules/pyramid/default.nix +++ b/pkgs/development/python-modules/pyramid/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The Pyramid Web Framework, a Pylons project"; - homepage = https://trypyramid.com/; + homepage = "https://trypyramid.com/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix index 398869e467b..9e148ca8ed5 100644 --- a/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Chameleon template compiler for pyramid"; - homepage = https://github.com/Pylons/pyramid_chameleon; + homepage = "https://github.com/Pylons/pyramid_chameleon"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pyramid_exclog/default.nix b/pkgs/development/python-modules/pyramid_exclog/default.nix index 912fb06c11b..0c2abeb74e2 100644 --- a/pkgs/development/python-modules/pyramid_exclog/default.nix +++ b/pkgs/development/python-modules/pyramid_exclog/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A package which logs to a Python logger when an exception is raised by a Pyramid application"; - homepage = https://docs.pylonsproject.org/; + homepage = "https://docs.pylonsproject.org/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pyramid_hawkauth/default.nix b/pkgs/development/python-modules/pyramid_hawkauth/default.nix index a2723255057..ff966d906c8 100644 --- a/pkgs/development/python-modules/pyramid_hawkauth/default.nix +++ b/pkgs/development/python-modules/pyramid_hawkauth/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "0.1.0"; src = fetchgit { - url = https://github.com/mozilla-services/pyramid_hawkauth.git; + url = "https://github.com/mozilla-services/pyramid_hawkauth.git"; rev = "refs/tags/v${version}"; sha256 = "038ign7qlavlmvrhb2y8bygbxvy4j7bx2k1zg0i3wblg2ja50w7h"; }; @@ -21,7 +21,7 @@ buildPythonPackage rec { buildInputs = [ webtest ]; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/pyramid_hawkauth; + homepage = "https://github.com/mozilla-services/pyramid_hawkauth"; description = "A Pyramid authentication plugin for HAWK"; license = licenses.mpl20; }; diff --git a/pkgs/development/python-modules/pyramid_jinja2/default.nix b/pkgs/development/python-modules/pyramid_jinja2/default.nix index 216fb57c221..6be0fe479d2 100644 --- a/pkgs/development/python-modules/pyramid_jinja2/default.nix +++ b/pkgs/development/python-modules/pyramid_jinja2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Jinja2 template bindings for the Pyramid web framework"; - homepage = https://github.com/Pylons/pyramid_jinja2; + homepage = "https://github.com/Pylons/pyramid_jinja2"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/pyramid_mako/default.nix b/pkgs/development/python-modules/pyramid_mako/default.nix index 80546ee768e..2bae93d1e30 100644 --- a/pkgs/development/python-modules/pyramid_mako/default.nix +++ b/pkgs/development/python-modules/pyramid_mako/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyramid Mako ]; meta = with stdenv.lib; { - homepage = https://github.com/Pylons/pyramid_mako; + homepage = "https://github.com/Pylons/pyramid_mako"; description = "Mako template bindings for the Pyramid web framework"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/pyramid_multiauth/default.nix b/pkgs/development/python-modules/pyramid_multiauth/default.nix index 7c01e3e093b..f441aaed8c1 100644 --- a/pkgs/development/python-modules/pyramid_multiauth/default.nix +++ b/pkgs/development/python-modules/pyramid_multiauth/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Authentication policy for Pyramid that proxies to a stack of other authentication policies"; - homepage = https://github.com/mozilla-services/pyramid_multiauth; + homepage = "https://github.com/mozilla-services/pyramid_multiauth"; license = licenses.mpl20; }; diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix index 60bdbf01167..9aa87d238ec 100644 --- a/pkgs/development/python-modules/pyreadability/default.nix +++ b/pkgs/development/python-modules/pyreadability/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/hyperlinkapp/python-readability; + homepage = "https://github.com/hyperlinkapp/python-readability"; description = "fast python port of arc90's readability tool, updated to match latest readability.js!"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/pyregion/default.nix b/pkgs/development/python-modules/pyregion/default.nix index a2b0423e558..b1868e7edde 100644 --- a/pkgs/development/python-modules/pyregion/default.nix +++ b/pkgs/development/python-modules/pyregion/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python parser for ds9 region files"; - homepage = https://github.com/astropy/pyregion; + homepage = "https://github.com/astropy/pyregion"; license = licenses.mit; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/pyreport/default.nix b/pkgs/development/python-modules/pyreport/default.nix index d75119b6e32..9795d30ea2e 100644 --- a/pkgs/development/python-modules/pyreport/default.nix +++ b/pkgs/development/python-modules/pyreport/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/pyreport; + homepage = "https://pypi.python.org/pypi/pyreport"; license = licenses.bsd0; description = "Pyreport makes notes out of a python script"; }; diff --git a/pkgs/development/python-modules/pyres/default.nix b/pkgs/development/python-modules/pyres/default.nix index 99c4b7116d5..d4bd8789144 100644 --- a/pkgs/development/python-modules/pyres/default.nix +++ b/pkgs/development/python-modules/pyres/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python resque clone"; - homepage = https://github.com/binarydud/pyres; + homepage = "https://github.com/binarydud/pyres"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pyrfc3339/default.nix b/pkgs/development/python-modules/pyrfc3339/default.nix index ba72bf4be94..3c157d83fec 100644 --- a/pkgs/development/python-modules/pyrfc3339/default.nix +++ b/pkgs/development/python-modules/pyrfc3339/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate and parse RFC 3339 timestamps"; - homepage = https://github.com/kurtraschke/pyRFC3339; + homepage = "https://github.com/kurtraschke/pyRFC3339"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index a0545ece74a..a11c2cad928 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "A Python library for probabilistic modeling and inference"; - homepage = http://pyro.ai; + homepage = "http://pyro.ai"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ teh ]; broken = true; diff --git a/pkgs/development/python-modules/pyro4/default.nix b/pkgs/development/python-modules/pyro4/default.nix index fdeed665623..64f1aa56546 100644 --- a/pkgs/development/python-modules/pyro4/default.nix +++ b/pkgs/development/python-modules/pyro4/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Distributed object middleware for Python (RPC)"; - homepage = https://github.com/irmen/Pyro4; + homepage = "https://github.com/irmen/Pyro4"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix index 76007b83588..5a49fa10fbf 100644 --- a/pkgs/development/python-modules/pyroute2/default.nix +++ b/pkgs/development/python-modules/pyroute2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyroute2"; - version = "0.5.10"; + version = "0.5.11"; src = fetchPypi { inherit pname version; - sha256 = "0akls1w67v17dmgr07n6rr5xy6yyj6p83ss05033gk1c3mfsbb1r"; + sha256 = "1wjamijkg2pp9mgj5k4qw3jl2i3ajikkps0zp5c52wcxm3qmks85"; }; # requires root priviledges diff --git a/pkgs/development/python-modules/pyrr/default.nix b/pkgs/development/python-modules/pyrr/default.nix index 3380cf1205c..96d16061958 100644 --- a/pkgs/development/python-modules/pyrr/default.nix +++ b/pkgs/development/python-modules/pyrr/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "3D mathematical functions using NumPy"; - homepage = https://github.com/adamlwgriffiths/Pyrr/; + homepage = "https://github.com/adamlwgriffiths/Pyrr/"; license = licenses.bsd2; maintainers = with maintainers; [ c0deaddict ]; }; diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index bbed677dfaf..28b804470ff 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tobgu/pyrsistent/; + homepage = "https://github.com/tobgu/pyrsistent/"; description = "Persistent/Functional/Immutable data structures"; license = licenses.mit; maintainers = with maintainers; [ desiderius ]; diff --git a/pkgs/development/python-modules/pyrss2gen/default.nix b/pkgs/development/python-modules/pyrss2gen/default.nix index 1c65d7ca5c7..ee51e84ba0f 100644 --- a/pkgs/development/python-modules/pyrss2gen/default.nix +++ b/pkgs/development/python-modules/pyrss2gen/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://www.dalkescientific.om/Python/PyRSS2Gen.html; + homepage = "http://www.dalkescientific.om/Python/PyRSS2Gen.html"; description = "Library for generating RSS 2.0 feeds"; license = licenses.bsd2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix index 0bb24031084..ad40aa6f05e 100644 --- a/pkgs/development/python-modules/pyrtlsdr/default.nix +++ b/pkgs/development/python-modules/pyrtlsdr/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)"; - homepage = https://github.com/roger-/pyrtlsdr; + homepage = "https://github.com/roger-/pyrtlsdr"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index ddd8b0ce295..4bda0b3c65c 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { nativeBuildInputs = [ swig ]; meta = { - homepage = https://pyscard.sourceforge.io/; + homepage = "https://pyscard.sourceforge.io/"; description = "Smartcard library for python"; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ layus ]; diff --git a/pkgs/development/python-modules/pyschedule/default.nix b/pkgs/development/python-modules/pyschedule/default.nix index 5fbabdc0988..c387bdef4b8 100644 --- a/pkgs/development/python-modules/pyschedule/default.nix +++ b/pkgs/development/python-modules/pyschedule/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Formulate and solve resource-constrained scheduling problems"; - homepage = https://github.com/timnon/pyschedule; + homepage = "https://github.com/timnon/pyschedule"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyscss/default.nix b/pkgs/development/python-modules/pyscss/default.nix index 2dfa1f22962..f268566fb54 100644 --- a/pkgs/development/python-modules/pyscss/default.nix +++ b/pkgs/development/python-modules/pyscss/default.nix @@ -32,7 +32,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A Scss compiler for Python"; - homepage = https://pyscss.readthedocs.org/en/latest/; + homepage = "https://pyscss.readthedocs.org/en/latest/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pysdl2/default.nix b/pkgs/development/python-modules/pysdl2/default.nix index 1ffc546cfa1..acc27811b28 100644 --- a/pkgs/development/python-modules/pysdl2/default.nix +++ b/pkgs/development/python-modules/pysdl2/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "A wrapper around the SDL2 library and as such similar to the discontinued PySDL project"; - homepage = https://github.com/marcusva/py-sdl2; + homepage = "https://github.com/marcusva/py-sdl2"; license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix index 3f55a015991..cc2dee7957d 100644 --- a/pkgs/development/python-modules/pysensors/default.nix +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -25,7 +25,7 @@ buildPythonPackage { meta = with stdenv.lib; { maintainers = with maintainers; [ guibou ]; description = "Easy hardware health monitoring in Python for Linux systems"; - homepage = https://pysensors.readthedocs.org; + homepage = "https://pysensors.readthedocs.org"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/development/python-modules/pysftp/default.nix b/pkgs/development/python-modules/pysftp/default.nix index 0ed5790a519..61fc4f122d2 100644 --- a/pkgs/development/python-modules/pysftp/default.nix +++ b/pkgs/development/python-modules/pysftp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ paramiko ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/dundeemt/pysftp; + homepage = "https://bitbucket.org/dundeemt/pysftp"; description = "A friendly face on SFTP"; license = licenses.mit; longDescription = '' diff --git a/pkgs/development/python-modules/pysha3/default.nix b/pkgs/development/python-modules/pysha3/default.nix index d459be25a86..8bdbb860195 100644 --- a/pkgs/development/python-modules/pysha3/default.nix +++ b/pkgs/development/python-modules/pysha3/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { description = "Backport of hashlib.sha3 for 2.7 to 3.5"; - homepage = https://github.com/tiran/pysha3; + homepage = "https://github.com/tiran/pysha3"; license = lib.licenses.psfl; }; } diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 17d60f7507d..185465bb640 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure Python read/write support for ESRI Shapefile format"; - homepage = https://github.com/GeospatialPython/pyshp; + homepage = "https://github.com/GeospatialPython/pyshp"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pyside/apiextractor.nix b/pkgs/development/python-modules/pyside/apiextractor.nix index d9168f291c0..452320e1d71 100644 --- a/pkgs/development/python-modules/pyside/apiextractor.nix +++ b/pkgs/development/python-modules/pyside/apiextractor.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { meta = { 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; - homepage = http://www.pyside.org/docs/apiextractor/; + homepage = "http://www.pyside.org/docs/apiextractor/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/default.nix b/pkgs/development/python-modules/pyside/default.nix index df309c5c68a..8eae5034a4f 100644 --- a/pkgs/development/python-modules/pyside/default.nix +++ b/pkgs/development/python-modules/pyside/default.nix @@ -22,6 +22,6 @@ buildPythonPackage rec { meta = { description = "LGPL-licensed Python bindings for the Qt cross-platform application and UI framework"; license = lib.licenses.lgpl21; - homepage = http://www.pyside.org; + homepage = "http://www.pyside.org"; }; } diff --git a/pkgs/development/python-modules/pyside/generatorrunner.nix b/pkgs/development/python-modules/pyside/generatorrunner.nix index feeeda812f9..7cb132c1ad7 100644 --- a/pkgs/development/python-modules/pyside/generatorrunner.nix +++ b/pkgs/development/python-modules/pyside/generatorrunner.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = { 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; - homepage = http://www.pyside.org/docs/generatorrunner/; + homepage = "http://www.pyside.org/docs/generatorrunner/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/shiboken.nix b/pkgs/development/python-modules/pyside/shiboken.nix index a968935dc06..c5561525db5 100644 --- a/pkgs/development/python-modules/pyside/shiboken.nix +++ b/pkgs/development/python-modules/pyside/shiboken.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "Plugin (front-end) for pyside-generatorrunner, that generates bindings for C++ libraries using CPython source code"; license = lib.licenses.gpl2; - homepage = http://www.pyside.org/docs/shiboken/; + homepage = "http://www.pyside.org/docs/shiboken/"; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/development/python-modules/pyside/tools.nix b/pkgs/development/python-modules/pyside/tools.nix index 6c2b357c566..9698c09f347 100644 --- a/pkgs/development/python-modules/pyside/tools.nix +++ b/pkgs/development/python-modules/pyside/tools.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Development tools (pyside-uic/rcc/lupdate) for PySide, the LGPL-licensed Python bindings for the Qt framework"; license = licenses.gpl2; - homepage = https://wiki.qt.io/PySide; + homepage = "https://wiki.qt.io/PySide"; maintainers = [ ]; platforms = platforms.all; }; diff --git a/pkgs/development/python-modules/pysigset/default.nix b/pkgs/development/python-modules/pysigset/default.nix index 85bcf56f062..4e1b87a1f1b 100644 --- a/pkgs/development/python-modules/pysigset/default.nix +++ b/pkgs/development/python-modules/pysigset/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides access to sigprocmask(2) and friends and convenience wrappers to python application developers wanting to SIG_BLOCK and SIG_UNBLOCK signals"; - homepage = https://github.com/ossobv/pysigset; + homepage = "https://github.com/ossobv/pysigset"; license = licenses.gpl3; maintainers = with maintainers; [ dzabraev ]; }; diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix index 7b0fba1a5ae..f5169b68393 100644 --- a/pkgs/development/python-modules/pyslurm/default.nix +++ b/pkgs/development/python-modules/pyslurm/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/PySlurm/pyslurm; + homepage = "https://github.com/PySlurm/pyslurm"; description = "Python bindings to Slurm"; license = licenses.gpl2; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/python-modules/pysmbc/default.nix b/pkgs/development/python-modules/pysmbc/default.nix index 18ee419e8e5..99a9f01d4b0 100644 --- a/pkgs/development/python-modules/pysmbc/default.nix +++ b/pkgs/development/python-modules/pysmbc/default.nix @@ -3,13 +3,13 @@ , setuptools }: buildPythonPackage rec { - version = "1.0.18"; + version = "1.0.19"; pname = "pysmbc"; src = fetchPypi { inherit pname version; extension = "tar.bz2"; - sha256 = "5da8aef1e3edaaffb1fbe2afe3772ba0a5f5bf666a28ae5db7b59ef96e465bdf"; + sha256 = "0dwffbfp3ay8y35hhc37ip61xdh522f5rfs097f3ia121h9x1mvj"; }; nativeBuildInputs = [ pkgconfig ]; @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "libsmbclient binding for Python"; - homepage = https://github.com/hamano/pysmbc; + homepage = "https://github.com/hamano/pysmbc"; license = licenses.gpl2Plus; }; } diff --git a/pkgs/development/python-modules/pysmi/default.nix b/pkgs/development/python-modules/pysmi/default.nix index 62c631ac98c..a3a7c3d7ec1 100644 --- a/pkgs/development/python-modules/pysmi/default.nix +++ b/pkgs/development/python-modules/pysmi/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pysmi.sf.net; + homepage = "http://pysmi.sf.net"; description = "SNMP SMI/MIB Parser"; license = licenses.bsd2; maintainers = with maintainers; [ koral ]; diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix index e4027128993..c0bed855a4c 100644 --- a/pkgs/development/python-modules/pysnmp/default.nix +++ b/pkgs/development/python-modules/pysnmp/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pyasn1 pycryptodomex pysmi ]; meta = with stdenv.lib; { - homepage = http://snmplabs.com/pysnmp/index.html; + homepage = "http://snmplabs.com/pysnmp/index.html"; description = "A pure-Python SNMPv1/v2c/v3 library"; license = licenses.bsd2; maintainers = with maintainers; [ primeos koral ]; diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index bb41a4d1855..347daa6cec0 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A poor man's debugger for Python"; - homepage = https://github.com/cool-RR/PySnooper; + homepage = "https://github.com/cool-RR/PySnooper"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; }; diff --git a/pkgs/development/python-modules/pysonos/default.nix b/pkgs/development/python-modules/pysonos/default.nix index ddab28471a8..83d1a606658 100644 --- a/pkgs/development/python-modules/pysonos/default.nix +++ b/pkgs/development/python-modules/pysonos/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/amelchio/pysonos; + homepage = "https://github.com/amelchio/pysonos"; description = "A SoCo fork with fixes for Home Assistant"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ juaningan ]; diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index dd83e87d724..8de0bd02b51 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Apache Spark"; - homepage = https://github.com/apache/spark/tree/master/python; + homepage = "https://github.com/apache/spark/tree/master/python"; license = licenses.asl20; maintainers = [ maintainers.shlevy ]; }; diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix index 5c3a6bb26f8..41f67a4140d 100644 --- a/pkgs/development/python-modules/pysparse/default.nix +++ b/pkgs/development/python-modules/pysparse/default.nix @@ -41,7 +41,7 @@ buildPythonPackage { ''; meta = with lib; { - homepage = https://github.com/PythonOptimizers/pysparse; + homepage = "https://github.com/PythonOptimizers/pysparse"; description = "A Sparse Matrix Library for Python"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; diff --git a/pkgs/development/python-modules/pyspf/default.nix b/pkgs/development/python-modules/pyspf/default.nix index 8f1fc795ea9..74e264b9da0 100644 --- a/pkgs/development/python-modules/pyspf/default.nix +++ b/pkgs/development/python-modules/pyspf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = http://bmsi.com/python/milter.html; + homepage = "http://bmsi.com/python/milter.html"; description = "Python API for Sendmail Milters (SPF)"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; diff --git a/pkgs/development/python-modules/pyspotify/default.nix b/pkgs/development/python-modules/pyspotify/default.nix index e329d4f7b6e..d6d0a6007f6 100644 --- a/pkgs/development/python-modules/pyspotify/default.nix +++ b/pkgs/development/python-modules/pyspotify/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pyspotify.mopidy.com; + homepage = "http://pyspotify.mopidy.com"; description = "A Python interface to Spotify’s online music streaming service"; license = licenses.unfree; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/development/python-modules/pyspread/default.nix b/pkgs/development/python-modules/pyspread/default.nix index d80cbf41629..14abe9ff02d 100644 --- a/pkgs/development/python-modules/pyspread/default.nix +++ b/pkgs/development/python-modules/pyspread/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with stdenv.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/; + homepage = "https://manns.github.io/pyspread/"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/pysptk/default.nix b/pkgs/development/python-modules/pysptk/default.nix index 46864632964..a4a293ec1b0 100644 --- a/pkgs/development/python-modules/pysptk/default.nix +++ b/pkgs/development/python-modules/pysptk/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "A python wrapper for Speech Signal Processing Toolkit (SPTK)"; - homepage = https://pysptk.readthedocs.io/en/latest/; + homepage = "https://pysptk.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ hyphon81 ]; }; diff --git a/pkgs/development/python-modules/pysqlite/default.nix b/pkgs/development/python-modules/pysqlite/default.nix index b13cd1781d2..a1916f09a6c 100644 --- a/pkgs/development/python-modules/pysqlite/default.nix +++ b/pkgs/development/python-modules/pysqlite/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pysqlite.org/; + homepage = "https://pysqlite.org/"; description = "Python bindings for the SQLite embedded relational database engine"; longDescription = '' pysqlite is a DB-API 2.0-compliant database interface for SQLite. diff --git a/pkgs/development/python-modules/pysrim/default.nix b/pkgs/development/python-modules/pysrim/default.nix index 8fb73455051..b8570427d30 100644 --- a/pkgs/development/python-modules/pysrim/default.nix +++ b/pkgs/development/python-modules/pysrim/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Srim Automation of Tasks via Python"; - homepage = https://gitlab.com/costrouc/pysrim; + homepage = "https://gitlab.com/costrouc/pysrim"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pysrt/default.nix b/pkgs/development/python-modules/pysrt/default.nix index f383854d5b4..e8c9aa3d5c8 100644 --- a/pkgs/development/python-modules/pysrt/default.nix +++ b/pkgs/development/python-modules/pysrt/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet ]; meta = with stdenv.lib; { - homepage = https://github.com/byroot/pysrt; + homepage = "https://github.com/byroot/pysrt"; license = licenses.gpl3; description = "Python library used to edit or create SubRip files"; }; diff --git a/pkgs/development/python-modules/pyssim/default.nix b/pkgs/development/python-modules/pyssim/default.nix index 38dddda9b2e..ad2057351d9 100644 --- a/pkgs/development/python-modules/pyssim/default.nix +++ b/pkgs/development/python-modules/pyssim/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Module for computing Structured Similarity Image Metric (SSIM) in Python"; - homepage = https://github.com/jterrace/pyssim; + homepage = "https://github.com/jterrace/pyssim"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pystache/default.nix b/pkgs/development/python-modules/pystache/default.nix index 8ae01e49397..1900bc31f21 100644 --- a/pkgs/development/python-modules/pystache/default.nix +++ b/pkgs/development/python-modules/pystache/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et"; - homepage = https://github.com/defunkt/pystache; + homepage = "https://github.com/defunkt/pystache"; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 47d6ea7e26b..0164b393493 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -17,7 +17,7 @@ python.pkgs.buildPythonPackage rec { meta = with stdenv.lib; { description = "A thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way."; - homepage = https://github.com/facebookincubator/pystemd/; + homepage = "https://github.com/facebookincubator/pystemd/"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/pystemmer/default.nix b/pkgs/development/python-modules/pystemmer/default.nix index e569042f729..1d3df7dfc34 100644 --- a/pkgs/development/python-modules/pystemmer/default.nix +++ b/pkgs/development/python-modules/pystemmer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Snowball stemming algorithms, for information retrieval"; - homepage = http://snowball.tartarus.org/; + homepage = "http://snowball.tartarus.org/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/pysvn/default.nix b/pkgs/development/python-modules/pysvn/default.nix index c1c765f1adc..d46d3cfc500 100644 --- a/pkgs/development/python-modules/pysvn/default.nix +++ b/pkgs/development/python-modules/pysvn/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for Subversion"; - homepage = http://pysvn.tigris.org/; + homepage = "http://pysvn.tigris.org/"; license = licenses.asl20; broken = true; }; diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix index a1c70b4c205..40b221d3dc9 100644 --- a/pkgs/development/python-modules/pytado/default.nix +++ b/pkgs/development/python-modules/pytado/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python binding for Tado web API. Pythonize your central heating!"; - homepage = https://github.com/wmalgadey/PyTado; + homepage = "https://github.com/wmalgadey/PyTado"; license = licenses.gpl3; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/pytaglib/default.nix b/pkgs/development/python-modules/pytaglib/default.nix index 6b19a8f0c73..9155151950a 100644 --- a/pkgs/development/python-modules/pytaglib/default.nix +++ b/pkgs/development/python-modules/pytaglib/default.nix @@ -22,17 +22,17 @@ buildPythonPackage rec { patches = [ # fix tests on python 2.7 (fetchpatch { - url = https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch; + url = "https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch"; sha256 = "1kv3c68vimx5dc8aacvzphiaq916avmprxddi38wji8p2ql6vngj"; }) # properly install pyprinttags (fetchpatch { - url = https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch; + url = "https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch"; sha256 = "0pi0dcq7db5fd3jnbwnfsfsgxvlhnm07z5yhpp93shk0s7ci2bwp"; }) (fetchpatch { - url = https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch; + url = "https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch"; sha256 = "0h259vzj1l0gpibdf322yclyd10x5rh1anzhsjj2ghm6rj6q0r0m"; }) ]; @@ -50,7 +50,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/supermihi/pytaglib; + homepage = "https://github.com/supermihi/pytaglib"; description = "Python 2.x/3.x bindings for the Taglib audio metadata library"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.mrkkrp ]; diff --git a/pkgs/development/python-modules/pyte/default.nix b/pkgs/development/python-modules/pyte/default.nix index 675bd47481e..f09bd95d070 100644 --- a/pkgs/development/python-modules/pyte/default.nix +++ b/pkgs/development/python-modules/pyte/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple VTXXX-compatible linux terminal emulator"; - homepage = https://github.com/selectel/pyte; + homepage = "https://github.com/selectel/pyte"; license = licenses.lgpl3; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 451ff9d0bca..496a163cb5f 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://pypi.org/project/pytesseract/; + homepage = "https://pypi.org/project/pytesseract/"; license = licenses.asl20; description = "A Python wrapper for Google Tesseract"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/python-modules/pytest-aiohttp/default.nix b/pkgs/development/python-modules/pytest-aiohttp/default.nix index 7f707ebc46b..f2491bd571c 100644 --- a/pkgs/development/python-modules/pytest-aiohttp/default.nix +++ b/pkgs/development/python-modules/pytest-aiohttp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/aio-libs/pytest-aiohttp/; + homepage = "https://github.com/aio-libs/pytest-aiohttp/"; description = "Pytest plugin for aiohttp support"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix index c21ae854c9a..53879bffbc8 100644 --- a/pkgs/development/python-modules/pytest-annotate/default.nix +++ b/pkgs/development/python-modules/pytest-annotate/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/kensho-technologies/pytest-annotate; + homepage = "https://github.com/kensho-technologies/pytest-annotate"; description = "Generate PyAnnotate annotations from your pytest tests"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pytest-ansible/default.nix b/pkgs/development/python-modules/pytest-ansible/default.nix index 0ef79cd0989..2e98654c5d4 100644 --- a/pkgs/development/python-modules/pytest-ansible/default.nix +++ b/pkgs/development/python-modules/pytest-ansible/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jlaska/pytest-ansible; + homepage = "https://github.com/jlaska/pytest-ansible"; description = "Plugin for py.test to simplify calling ansible modules from tests or fixtures"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pytest-arraydiff/default.nix b/pkgs/development/python-modules/pytest-arraydiff/default.nix index e01d26b530e..8b1de360f49 100644 --- a/pkgs/development/python-modules/pytest-arraydiff/default.nix +++ b/pkgs/development/python-modules/pytest-arraydiff/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to help with comparing array output from tests"; - homepage = https://github.com/astrofrog/pytest-arraydiff; + homepage = "https://github.com/astrofrog/pytest-arraydiff"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-astropy/default.nix b/pkgs/development/python-modules/pytest-astropy/default.nix index 272b1fa56b9..1365c43b03a 100644 --- a/pkgs/development/python-modules/pytest-astropy/default.nix +++ b/pkgs/development/python-modules/pytest-astropy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Meta-package containing dependencies for testing"; - homepage = https://astropy.org; + homepage = "https://astropy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index 346530d4a81..1484432c045 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "library for testing asyncio code with pytest"; license = licenses.asl20; - homepage = https://github.com/pytest-dev/pytest-asyncio; + homepage = "https://github.com/pytest-dev/pytest-asyncio"; }; } diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index e215feac44f..29225859dfd 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "BDD library for the py.test runner"; - homepage = https://github.com/pytest-dev/pytest-bdd; + homepage = "https://github.com/pytest-dev/pytest-bdd"; license = licenses.mit; maintainers = with maintainers; [ jm2dev ]; }; diff --git a/pkgs/development/python-modules/pytest-benchmark/default.nix b/pkgs/development/python-modules/pytest-benchmark/default.nix index 924f16694c5..eedbbc274f4 100644 --- a/pkgs/development/python-modules/pytest-benchmark/default.nix +++ b/pkgs/development/python-modules/pytest-benchmark/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Py.test fixture for benchmarking code"; - homepage = https://github.com/ionelmc/pytest-benchmark; + homepage = "https://github.com/ionelmc/pytest-benchmark"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-catchlog/default.nix b/pkgs/development/python-modules/pytest-catchlog/default.nix index fb020ba471f..35d3fce49d1 100644 --- a/pkgs/development/python-modules/pytest-catchlog/default.nix +++ b/pkgs/development/python-modules/pytest-catchlog/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-catchlog/; + homepage = "https://pypi.python.org/pypi/pytest-catchlog/"; description = "py.test plugin to catch log messages. This is a fork of pytest-capturelog."; }; } diff --git a/pkgs/development/python-modules/pytest-check/default.nix b/pkgs/development/python-modules/pytest-check/default.nix index f91b8191eb1..104a2ae6490 100644 --- a/pkgs/development/python-modules/pytest-check/default.nix +++ b/pkgs/development/python-modules/pytest-check/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "pytest plugin allowing multiple failures per test"; - homepage = https://github.com/okken/pytest-check; + homepage = "https://github.com/okken/pytest-check"; license = licenses.mit; maintainers = [ maintainers.flokli ]; }; diff --git a/pkgs/development/python-modules/pytest-click/default.nix b/pkgs/development/python-modules/pytest-click/default.nix index e20ebc77ad1..e271373b73e 100644 --- a/pkgs/development/python-modules/pytest-click/default.nix +++ b/pkgs/development/python-modules/pytest-click/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "pytest plugin for click"; - homepage = https://github.com/Stranger6667/pytest-click; + homepage = "https://github.com/Stranger6667/pytest-click"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index e376abbc33a..420afd3c555 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Plugin for coverage reporting with support for both centralised and distributed testing, including subprocesses and multiprocessing"; - homepage = https://github.com/pytest-dev/pytest-cov; + homepage = "https://github.com/pytest-dev/pytest-cov"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-cram/default.nix b/pkgs/development/python-modules/pytest-cram/default.nix index ff2a29384bc..237e5ee7355 100644 --- a/pkgs/development/python-modules/pytest-cram/default.nix +++ b/pkgs/development/python-modules/pytest-cram/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = { description = "Test command-line applications with pytest and cram"; - homepage = https://github.com/tbekolay/pytest-cram; + homepage = "https://github.com/tbekolay/pytest-cram"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/pytest-datafiles/default.nix b/pkgs/development/python-modules/pytest-datafiles/default.nix index 1c323929a8e..7a6e3f7d931 100644 --- a/pkgs/development/python-modules/pytest-datafiles/default.nix +++ b/pkgs/development/python-modules/pytest-datafiles/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-catchlog/; + homepage = "https://pypi.python.org/pypi/pytest-catchlog/"; description = "py.test plugin to create a 'tmpdir' containing predefined files/directories."; }; } diff --git a/pkgs/development/python-modules/pytest-dependency/default.nix b/pkgs/development/python-modules/pytest-dependency/default.nix index 2f82f4d7dbd..13806781125 100644 --- a/pkgs/development/python-modules/pytest-dependency/default.nix +++ b/pkgs/development/python-modules/pytest-dependency/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/RKrahl/pytest-dependency; + homepage = "https://github.com/RKrahl/pytest-dependency"; description = "Manage dependencies of tests"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix index 6b60eb6d3c5..2417bdd4ac0 100644 --- a/pkgs/development/python-modules/pytest-django/default.nix +++ b/pkgs/development/python-modules/pytest-django/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "py.test plugin for testing of Django applications"; - homepage = https://pytest-django.readthedocs.org/en/latest/; + homepage = "https://pytest-django.readthedocs.org/en/latest/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index cdf60b7b07c..ed71592361c 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin with advanced doctest features"; - homepage = https://astropy.org; + homepage = "https://astropy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-env/default.nix b/pkgs/development/python-modules/pytest-env/default.nix index 909a193bd7b..3e2fb0a05dc 100644 --- a/pkgs/development/python-modules/pytest-env/default.nix +++ b/pkgs/development/python-modules/pytest-env/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin used to set environment variables"; - homepage = https://github.com/MobileDynasty/pytest-env; + homepage = "https://github.com/MobileDynasty/pytest-env"; license = licenses.mit; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/pytest-expect/default.nix b/pkgs/development/python-modules/pytest-expect/default.nix index 557446b5adc..dfd498c6b1e 100644 --- a/pkgs/development/python-modules/pytest-expect/default.nix +++ b/pkgs/development/python-modules/pytest-expect/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "py.test plugin to store test expectations and mark tests based on them"; - homepage = https://github.com/gsnedders/pytest-expect; + homepage = "https://github.com/gsnedders/pytest-expect"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-faulthandler/default.nix b/pkgs/development/python-modules/pytest-faulthandler/default.nix deleted file mode 100644 index b9ac354abfd..00000000000 --- a/pkgs/development/python-modules/pytest-faulthandler/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, setuptools_scm -, pytest -, pytest-mock -, pythonOlder -, faulthandler -}: - -buildPythonPackage rec { - pname = "pytest-faulthandler"; - version = "2.0.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "ed72bbce87ac344da81eb7d882196a457d4a1026a3da4a57154dacd85cd71ae5"; - }; - - nativeBuildInputs = [ setuptools_scm pytest ]; - checkInputs = [ pytest-mock ]; - propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler; - - checkPhase = '' - py.test - ''; - - meta = { - description = "Py.test plugin that activates the fault handler module for tests"; - homepage = https://github.com/pytest-dev/pytest-faulthandler; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ costrouc ]; - }; -} diff --git a/pkgs/development/python-modules/pytest-fixture-config/default.nix b/pkgs/development/python-modules/pytest-fixture-config/default.nix index 7fc3d4e951f..7c7d4c66cd4 100644 --- a/pkgs/development/python-modules/pytest-fixture-config/default.nix +++ b/pkgs/development/python-modules/pytest-fixture-config/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple configuration objects for Py.test fixtures. Allows you to skip tests when their required config variables aren’t set."; - homepage = https://github.com/manahl/pytest-plugins; + homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; maintainers = with maintainers; [ ryansydnor ]; }; diff --git a/pkgs/development/python-modules/pytest-flake8/default.nix b/pkgs/development/python-modules/pytest-flake8/default.nix index d3b2df60399..88f5cc0e188 100644 --- a/pkgs/development/python-modules/pytest-flake8/default.nix +++ b/pkgs/development/python-modules/pytest-flake8/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "py.test plugin for efficiently checking PEP8 compliance"; - homepage = https://github.com/tholo/pytest-flake8; + homepage = "https://github.com/tholo/pytest-flake8"; maintainers = with lib.maintainers; [ jluttine ]; license = lib.licenses.bsd2; }; diff --git a/pkgs/development/python-modules/pytest-flakes/default.nix b/pkgs/development/python-modules/pytest-flakes/default.nix index df7981e6bfc..d1f06b03a8d 100644 --- a/pkgs/development/python-modules/pytest-flakes/default.nix +++ b/pkgs/development/python-modules/pytest-flakes/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-flakes; + homepage = "https://pypi.python.org/pypi/pytest-flakes"; description = "pytest plugin to check source code with pyflakes"; }; } diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 472e0b3559d..3139e32a0b1 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -25,8 +25,8 @@ buildPythonPackage rec { meta = { description = "Run tests in isolated forked subprocesses"; - homepage = https://github.com/pytest-dev/pytest-forked; + homepage = "https://github.com/pytest-dev/pytest-forked"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pytest-html/default.nix b/pkgs/development/python-modules/pytest-html/default.nix index 6847c5e05d4..2c0c23ebdca 100644 --- a/pkgs/development/python-modules/pytest-html/default.nix +++ b/pkgs/development/python-modules/pytest-html/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "pytest-html"; - version = "2.1.0"; + version = "2.1.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "14cy5iixi6i8i5r5xvvkhwk48zgxnb1ypbp0g1343mwfdihshic6"; + sha256 = "1iap9rzxx9pkvz6im3px8xj37pb098lvvf9yiqh93qq5w68w6jka"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-httpbin/default.nix b/pkgs/development/python-modules/pytest-httpbin/default.nix index 6d84ef0de7d..836da1e157f 100644 --- a/pkgs/development/python-modules/pytest-httpbin/default.nix +++ b/pkgs/development/python-modules/pytest-httpbin/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Easily test your HTTP library against a local copy of httpbin.org"; - homepage = https://github.com/kevin1024/pytest-httpbin; + homepage = "https://github.com/kevin1024/pytest-httpbin"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-isort/default.nix b/pkgs/development/python-modules/pytest-isort/default.nix index 235d6f3af24..9aa4410ec03 100644 --- a/pkgs/development/python-modules/pytest-isort/default.nix +++ b/pkgs/development/python-modules/pytest-isort/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin to perform isort checks (import ordering)"; - homepage = https://github.com/moccu/pytest-isort/; + homepage = "https://github.com/moccu/pytest-isort/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/pytest-localserver/default.nix b/pkgs/development/python-modules/pytest-localserver/default.nix index 5f2516b646c..6ea0b9d3e57 100644 --- a/pkgs/development/python-modules/pytest-localserver/default.nix +++ b/pkgs/development/python-modules/pytest-localserver/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Plugin for the pytest testing framework to test server connections locally"; - homepage = https://pypi.python.org/pypi/pytest-localserver; + homepage = "https://pypi.python.org/pypi/pytest-localserver"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index c4ef0d81111..c65e617b795 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Thin-wrapper around the mock package for easier use with py.test."; - homepage = https://github.com/pytest-dev/pytest-mock; + homepage = "https://github.com/pytest-dev/pytest-mock"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index d86647b7503..a239c1dbe63 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pytest plugin to help with testing figures output from Matplotlib"; - homepage = https://github.com/matplotlib/pytest-mpl; + homepage = "https://github.com/matplotlib/pytest-mpl"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index 4fb2146d7a7..2e1bd1b626d 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mypy static type checker plugin for Pytest"; - homepage = https://github.com/dbader/pytest-mypy; + homepage = "https://github.com/dbader/pytest-mypy"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-openfiles/default.nix b/pkgs/development/python-modules/pytest-openfiles/default.nix index 0fb23f245fb..daa55f91cd2 100644 --- a/pkgs/development/python-modules/pytest-openfiles/default.nix +++ b/pkgs/development/python-modules/pytest-openfiles/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin for detecting inadvertent open file handles"; - homepage = https://astropy.org; + homepage = "https://astropy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-ordering/default.nix b/pkgs/development/python-modules/pytest-ordering/default.nix index ec340806964..6cd1ed22797 100644 --- a/pkgs/development/python-modules/pytest-ordering/default.nix +++ b/pkgs/development/python-modules/pytest-ordering/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/ftobia/pytest-ordering; + homepage = "https://github.com/ftobia/pytest-ordering"; description = "Pytest plugin to run your tests in a specific order"; license = licenses.mit; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/pytest-pep257/default.nix b/pkgs/development/python-modules/pytest-pep257/default.nix index 0ff8890a6fb..8c20cf873ab 100644 --- a/pkgs/development/python-modules/pytest-pep257/default.nix +++ b/pkgs/development/python-modules/pytest-pep257/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pep257 ]; meta = with stdenv.lib; { - homepage = https://github.com/anderslime/pytest-pep257; + homepage = "https://github.com/anderslime/pytest-pep257"; description = "py.test plugin for PEP257"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pytest-pep8/default.nix b/pkgs/development/python-modules/pytest-pep8/default.nix index 1fcb99574b2..82a900a9d2f 100644 --- a/pkgs/development/python-modules/pytest-pep8/default.nix +++ b/pkgs/development/python-modules/pytest-pep8/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-pep8; + homepage = "https://pypi.python.org/pypi/pytest-pep8"; description = "pytest plugin to check PEP8 requirements"; }; } diff --git a/pkgs/development/python-modules/pytest-pylint/default.nix b/pkgs/development/python-modules/pytest-pylint/default.nix index 52eeccc7cd0..40ab69c5735 100644 --- a/pkgs/development/python-modules/pytest-pylint/default.nix +++ b/pkgs/development/python-modules/pytest-pylint/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , pytest , pylint , six @@ -9,11 +10,12 @@ buildPythonPackage rec { pname = "pytest-pylint"; - version = "0.14.1"; + version = "0.15.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1v6jqxbvzaw6v3xxwd689agy01k0j06q5c3q8gn2f3jlkrvylf4c"; + sha256 = "0sbmnw3bly4pry5lp6q6g0r8xzaxwbdlf0k19k8pygkhllnj6gnx"; }; buildInputs = [ pytestrunner ]; @@ -29,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "pytest plugin to check source code with pylint"; - homepage = https://github.com/carsongee/pytest-pylint; + homepage = "https://github.com/carsongee/pytest-pylint"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-raisesregexp/default.nix b/pkgs/development/python-modules/pytest-raisesregexp/default.nix index bc7d1413200..638548e9424 100644 --- a/pkgs/development/python-modules/pytest-raisesregexp/default.nix +++ b/pkgs/development/python-modules/pytest-raisesregexp/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple pytest plugin to look for regex in Exceptions"; - homepage = https://github.com/Walkman/pytest_raisesregexp; + homepage = "https://github.com/Walkman/pytest_raisesregexp"; license = with licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/pytest-relaxed/default.nix b/pkgs/development/python-modules/pytest-relaxed/default.nix index 4de823c2c87..c9871368bbe 100644 --- a/pkgs/development/python-modules/pytest-relaxed/default.nix +++ b/pkgs/development/python-modules/pytest-relaxed/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pytest-relaxed.readthedocs.io/; + homepage = "https://pytest-relaxed.readthedocs.io/"; description = "Relaxed test discovery/organization for pytest"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pytest-remotedata/default.nix b/pkgs/development/python-modules/pytest-remotedata/default.nix index 7d801a2789c..94bc02159bf 100644 --- a/pkgs/development/python-modules/pytest-remotedata/default.nix +++ b/pkgs/development/python-modules/pytest-remotedata/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest plugin for controlling remote data access"; - homepage = https://astropy.org; + homepage = "https://astropy.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix index f5c35905cf6..f772fb131d8 100644 --- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix +++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "pytest plugin to re-run tests to eliminate flaky failures"; - homepage = https://github.com/pytest-dev/pytest-rerunfailures; + homepage = "https://github.com/pytest-dev/pytest-rerunfailures"; license = licenses.mpl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/pytest-sanic/default.nix b/pkgs/development/python-modules/pytest-sanic/default.nix index 647d7abb07c..68f8fd4fcee 100644 --- a/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/pkgs/development/python-modules/pytest-sanic/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A pytest plugin for Sanic"; - homepage = https://github.com/yunstanford/pytest-sanic/; + homepage = "https://github.com/yunstanford/pytest-sanic/"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index c940dcadc7e..909b8e80103 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Services plugin for pytest testing framework"; - homepage = https://github.com/pytest-dev/pytest-services; + homepage = "https://github.com/pytest-dev/pytest-services"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest-shutil/default.nix b/pkgs/development/python-modules/pytest-shutil/default.nix index 6bc7047866e..ef03762e188 100644 --- a/pkgs/development/python-modules/pytest-shutil/default.nix +++ b/pkgs/development/python-modules/pytest-shutil/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A goodie-bag of unix shell and environment tools for py.test"; - homepage = https://github.com/manahl/pytest-plugins; + homepage = "https://github.com/manahl/pytest-plugins"; maintainers = with maintainers; [ ryansydnor ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pytest-socket/default.nix b/pkgs/development/python-modules/pytest-socket/default.nix index a28970a8ec4..dcfa2036014 100644 --- a/pkgs/development/python-modules/pytest-socket/default.nix +++ b/pkgs/development/python-modules/pytest-socket/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pytest Plugin to disable socket calls during tests"; - homepage = https://github.com/miketheman/pytest-socket; + homepage = "https://github.com/miketheman/pytest-socket"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-subtesthack/default.nix b/pkgs/development/python-modules/pytest-subtesthack/default.nix index b639b61ad4d..d42eb5f8aa3 100644 --- a/pkgs/development/python-modules/pytest-subtesthack/default.nix +++ b/pkgs/development/python-modules/pytest-subtesthack/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Terrible plugin to set up and tear down fixtures within the test function itself"; - homepage = https://github.com/untitaker/pytest-subtesthack; + homepage = "https://github.com/untitaker/pytest-subtesthack"; license = licenses.publicDomain; }; } diff --git a/pkgs/development/python-modules/pytest-sugar/default.nix b/pkgs/development/python-modules/pytest-sugar/default.nix index 5ece578dc25..2ff6f40e344 100644 --- a/pkgs/development/python-modules/pytest-sugar/default.nix +++ b/pkgs/development/python-modules/pytest-sugar/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "A plugin that changes the default look and feel of py.test"; - homepage = https://github.com/Frozenball/pytest-sugar; + homepage = "https://github.com/Frozenball/pytest-sugar"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-timeout/default.nix b/pkgs/development/python-modules/pytest-timeout/default.nix index 3849fffd47c..30bd93e433d 100644 --- a/pkgs/development/python-modules/pytest-timeout/default.nix +++ b/pkgs/development/python-modules/pytest-timeout/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; patches = fetchpatch { - url = https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw; + url = "https://bitbucket.org/pytest-dev/pytest-timeout/commits/36998c891573d8ec1db1acd4f9438cb3cf2aee2e/raw"; sha256 = "05zc2w7mjgv8rm8i1cbxp7k09vlscmay5iy78jlzgjqkrx3wkf46"; }; @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib;{ description = "py.test plugin to abort hanging tests"; - homepage = https://bitbucket.org/pytest-dev/pytest-timeout/; + homepage = "https://bitbucket.org/pytest-dev/pytest-timeout/"; license = licenses.mit; maintainers = with maintainers; [ makefu costrouc ]; }; diff --git a/pkgs/development/python-modules/pytest-tornado/default.nix b/pkgs/development/python-modules/pytest-tornado/default.nix index a5c35150268..1f2978228e2 100644 --- a/pkgs/development/python-modules/pytest-tornado/default.nix +++ b/pkgs/development/python-modules/pytest-tornado/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "A py.test plugin providing fixtures and markers to simplify testing of asynchronous tornado applications."; - homepage = https://github.com/eugeniy/pytest-tornado; + homepage = "https://github.com/eugeniy/pytest-tornado"; license = licenses.asl20; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/pytest-virtualenv/default.nix b/pkgs/development/python-modules/pytest-virtualenv/default.nix index 0e8add5417b..27350efd745 100644 --- a/pkgs/development/python-modules/pytest-virtualenv/default.nix +++ b/pkgs/development/python-modules/pytest-virtualenv/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Create a Python virtual environment in your test that cleans up on teardown. The fixture has utility methods to install packages and list what’s installed."; - homepage = https://github.com/manahl/pytest-plugins; + homepage = "https://github.com/manahl/pytest-plugins"; license = licenses.mit; maintainers = with maintainers; [ ryansydnor ]; }; diff --git a/pkgs/development/python-modules/pytest-warnings/default.nix b/pkgs/development/python-modules/pytest-warnings/default.nix index 78cd02897f9..7f9de5b5eca 100644 --- a/pkgs/development/python-modules/pytest-warnings/default.nix +++ b/pkgs/development/python-modules/pytest-warnings/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = { description = "Plugin to list Python warnings in pytest report"; - homepage = https://github.com/fschulze/pytest-warnings; + homepage = "https://github.com/fschulze/pytest-warnings"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index c8e41fdaa35..d71d28612ee 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; - homepage = https://github.com/pytest-dev/pytest-xdist; + homepage = "https://github.com/pytest-dev/pytest-xdist"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index 2524dc61afd..be2ef93e6ee 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://docs.pytest.org; + homepage = "https://docs.pytest.org"; description = "Framework for writing tests"; maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index bb44cebad91..8f86e41be3b 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://docs.pytest.org; + homepage = "https://docs.pytest.org"; description = "Framework for writing tests"; maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; license = licenses.mit; diff --git a/pkgs/development/python-modules/pytestcache/default.nix b/pkgs/development/python-modules/pytestcache/default.nix index 2875bf88340..f2427991e3f 100644 --- a/pkgs/development/python-modules/pytestcache/default.nix +++ b/pkgs/development/python-modules/pytestcache/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { license = licenses.mit; - homepage = https://pypi.python.org/pypi/pytest-cache/; + homepage = "https://pypi.python.org/pypi/pytest-cache/"; description = "pytest plugin with mechanisms for caching across test runs"; }; } diff --git a/pkgs/development/python-modules/pytestrunner/default.nix b/pkgs/development/python-modules/pytestrunner/default.nix index fa937e9626c..5ea632fa7f8 100644 --- a/pkgs/development/python-modules/pytestrunner/default.nix +++ b/pkgs/development/python-modules/pytestrunner/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Invoke py.test as distutils command with dependency resolution"; - homepage = https://github.com/pytest-dev/pytest-runner; + homepage = "https://github.com/pytest-dev/pytest-runner"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix index e372913af7d..1bd44dc3fc7 100644 --- a/pkgs/development/python-modules/python-axolotl-curve25519/default.nix +++ b/pkgs/development/python-modules/python-axolotl-curve25519/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/tgalal/python-axolotl-curve25519; + homepage = "https://github.com/tgalal/python-axolotl-curve25519"; description = "Curve25519 with ed25519 signatures"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/python-axolotl/default.nix b/pkgs/development/python-modules/python-axolotl/default.nix index 55a0a355a9e..3b55811f4e4 100644 --- a/pkgs/development/python-modules/python-axolotl/default.nix +++ b/pkgs/development/python-modules/python-axolotl/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography python-axolotl-curve25519 protobuf ]; meta = with lib; { - homepage = https://github.com/tgalal/python-axolotl; + homepage = "https://github.com/tgalal/python-axolotl"; description = "Python port of libaxolotl-android"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl3; diff --git a/pkgs/development/python-modules/python-baseconv/default.nix b/pkgs/development/python-modules/python-baseconv/default.nix new file mode 100644 index 00000000000..f9ac014919c --- /dev/null +++ b/pkgs/development/python-modules/python-baseconv/default.nix @@ -0,0 +1,22 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "python-baseconv"; + version = "1.2.2"; + + src = fetchPypi { + inherit pname version ; + sha256 = "0539f8bd0464013b05ad62e0a1673f0ac9086c76b43ebf9f833053527cd9931b"; + }; + + pythonImportsCheck = [ "baseconv" ]; + + meta = with lib; { + description = "Python module to convert numbers from base 10 integers to base X strings and back again"; + homepage = "https://github.com/semente/python-baseconv"; + license = licenses.psfl; + maintainers = with maintainers; [ rakesh4g ]; + }; +} diff --git a/pkgs/development/python-modules/python-binance/default.nix b/pkgs/development/python-modules/python-binance/default.nix index 62aa11749a8..b4857d7abef 100644 --- a/pkgs/development/python-modules/python-binance/default.nix +++ b/pkgs/development/python-modules/python-binance/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Binance Exchange API python implementation for automated trading"; - homepage = https://github.com/sammchardy/python-binance; + homepage = "https://github.com/sammchardy/python-binance"; license = lib.licenses.mit; maintainers = [ lib.maintainers.bhipple ]; }; diff --git a/pkgs/development/python-modules/python-ctags3/default.nix b/pkgs/development/python-modules/python-ctags3/default.nix index c37abf7b55f..bc7b8484996 100644 --- a/pkgs/development/python-modules/python-ctags3/default.nix +++ b/pkgs/development/python-modules/python-ctags3/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with lib; { description = "Ctags indexing python bindings"; - homepage = https://github.com/jonashaag/python-ctags3; + homepage = "https://github.com/jonashaag/python-ctags3"; license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 9cfc68dee46..3d6a4a7aee0 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { meta = with lib; { description = "Mock D-Bus objects for tests"; - homepage = https://github.com/martinpitt/python-dbusmock; + homepage = "https://github.com/martinpitt/python-dbusmock"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ callahad ]; platforms = platforms.linux; diff --git a/pkgs/development/python-modules/python-docx/default.nix b/pkgs/development/python-modules/python-docx/default.nix index f86cdc665a1..15ccd45760d 100644 --- a/pkgs/development/python-modules/python-docx/default.nix +++ b/pkgs/development/python-modules/python-docx/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Create and update Microsoft Word .docx files"; - homepage = https://python-docx.readthedocs.io/en/latest/; + homepage = "https://python-docx.readthedocs.io/en/latest/"; license = lib.licenses.mit; maintainers = [ lib.maintainers.alexchapman ]; }; diff --git a/pkgs/development/python-modules/python-doi/default.nix b/pkgs/development/python-modules/python-doi/default.nix index 0cb6b2a7502..2fcd30e84b3 100644 --- a/pkgs/development/python-modules/python-doi/default.nix +++ b/pkgs/development/python-modules/python-doi/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library to work with Document Object Identifiers (doi)"; - homepage = https://github.com/alejandrogallo/python-doi; + homepage = "https://github.com/alejandrogallo/python-doi"; maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/development/python-modules/python-dotenv/default.nix b/pkgs/development/python-modules/python-dotenv/default.nix index d663bfd8bc9..bc71a662f3e 100644 --- a/pkgs/development/python-modules/python-dotenv/default.nix +++ b/pkgs/development/python-modules/python-dotenv/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Add .env support to your django/flask apps in development and deployments"; - homepage = https://github.com/theskumar/python-dotenv; + homepage = "https://github.com/theskumar/python-dotenv"; license = licenses.bsdOriginal; maintainers = with maintainers; [ earvstedt ]; }; diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix index 4691785dae1..523229220ef 100644 --- a/pkgs/development/python-modules/python-editor/default.nix +++ b/pkgs/development/python-modules/python-editor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library that provides the `editor` module for programmatically"; - homepage = https://github.com/fmoo/python-editor; + homepage = "https://github.com/fmoo/python-editor"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 5cf1efc49b7..0657c627770 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for EFL and Elementary"; - homepage = https://phab.enlightenment.org/w/projects/python_bindings_for_efl/; + homepage = "https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"; platforms = platforms.linux; license = with licenses; [ gpl3 lgpl3 ]; maintainers = with maintainers; [ matejc tstrobel ftrvxmtrx romildo ]; diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix index e1c380b64c3..128fb8961d4 100644 --- a/pkgs/development/python-modules/python-engineio/default.nix +++ b/pkgs/development/python-modules/python-engineio/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Engine.IO server"; - homepage = https://github.com/miguelgrinberg/python-engineio/; + homepage = "https://github.com/miguelgrinberg/python-engineio/"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/python-etcd/default.nix b/pkgs/development/python-modules/python-etcd/default.nix index 1369479ac4f..714c324b440 100644 --- a/pkgs/development/python-modules/python-etcd/default.nix +++ b/pkgs/development/python-modules/python-etcd/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python client for Etcd"; - homepage = https://github.com/jplana/python-etcd; + homepage = "https://github.com/jplana/python-etcd"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/python-fontconfig/default.nix b/pkgs/development/python-modules/python-fontconfig/default.nix index dbfde18a874..88778ff794e 100644 --- a/pkgs/development/python-modules/python-fontconfig/default.nix +++ b/pkgs/development/python-modules/python-fontconfig/default.nix @@ -26,7 +26,7 @@ in buildPythonPackage rec { ''; meta = { - homepage = https://github.com/Vayn/python-fontconfig; + homepage = "https://github.com/Vayn/python-fontconfig"; description = "Python binding for Fontconfig"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ gnidorah ]; diff --git a/pkgs/development/python-modules/python-forecastio/default.nix b/pkgs/development/python-modules/python-forecastio/default.nix index 68f9ad16977..7ef2eee4f2e 100644 --- a/pkgs/development/python-modules/python-forecastio/default.nix +++ b/pkgs/development/python-modules/python-forecastio/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://zeevgilovitz.com/python-forecast.io/; + homepage = "https://zeevgilovitz.com/python-forecast.io/"; description = "A thin Python Wrapper for the Dark Sky (formerly forecast.io) weather API"; license = licenses.bsd2; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index bbdf7aa6033..d2b1a6570b1 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interact with GitLab API"; - homepage = https://github.com/python-gitlab/python-gitlab; + homepage = "https://github.com/python-gitlab/python-gitlab"; license = licenses.lgpl3; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/python-gnupg/default.nix b/pkgs/development/python-modules/python-gnupg/default.nix index 90dee35d290..17deff412cb 100644 --- a/pkgs/development/python-modules/python-gnupg/default.nix +++ b/pkgs/development/python-modules/python-gnupg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A wrapper for the Gnu Privacy Guard"; - homepage = https://pypi.python.org/pypi/python-gnupg; + homepage = "https://pypi.python.org/pypi/python-gnupg"; license = licenses.bsd3; maintainers = with maintainers; [ copumpkin ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/python-hosts/default.nix b/pkgs/development/python-modules/python-hosts/default.nix index 1fdd036bd12..e7dbaa1d64e 100644 --- a/pkgs/development/python-modules/python-hosts/default.nix +++ b/pkgs/development/python-modules/python-hosts/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for managing a hosts file. It enables adding and removing entries, or importing them from a file or URL"; - homepage = https://github.com/jonhadfield/python-hosts; + homepage = "https://github.com/jonhadfield/python-hosts"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix index a9377c4a1c2..d6986f06975 100644 --- a/pkgs/development/python-modules/python-jose/default.nix +++ b/pkgs/development/python-modules/python-jose/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "python-jose"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mpdavis"; repo = "python-jose"; rev = version; - sha256 = "1ahq4m86z504bnlk9z473r7r3dprg5m39900rld797hbczdhqa4f"; + sha256 = "1gnn0zy03pywj65ammy3sd07knzhjv8n5jhx1ir9bikgra9v0iqh"; }; checkInputs = [ @@ -31,7 +31,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ future six ecdsa rsa ]; meta = with stdenv.lib; { - homepage = https://github.com/mpdavis/python-jose; + homepage = "https://github.com/mpdavis/python-jose"; description = "A JOSE implementation in Python"; license = licenses.mit; maintainers = [ maintainers.jhhuh ]; diff --git a/pkgs/development/python-modules/python-json-logger/default.nix b/pkgs/development/python-modules/python-json-logger/default.nix index 0141141b43c..26ab4c118ce 100644 --- a/pkgs/development/python-modules/python-json-logger/default.nix +++ b/pkgs/development/python-modules/python-json-logger/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = with stdenv.lib; { - homepage = https://github.com/madzak/python-json-logger; + homepage = "https://github.com/madzak/python-json-logger"; description = "A python library adding a json log formatter"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index f972187d6fc..f6e95f409b8 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ++ stdenv.lib.optional (pythonOlder "3.2") futures; meta = with stdenv.lib; { - homepage = https://github.com/palantir/python-jsonrpc-server; + homepage = "https://github.com/palantir/python-jsonrpc-server"; description = "A Python 2 and 3 asynchronous JSON RPC server"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/python-language-server/default.nix b/pkgs/development/python-modules/python-language-server/default.nix index c8bb1b5fa6f..9f42839960d 100644 --- a/pkgs/development/python-modules/python-language-server/default.nix +++ b/pkgs/development/python-modules/python-language-server/default.nix @@ -71,7 +71,7 @@ buildPythonPackage rec { ++ stdenv.lib.optionals (pythonOlder "3.2") [ backports_functools_lru_cache futures ]; meta = with stdenv.lib; { - homepage = https://github.com/palantir/python-language-server; + homepage = "https://github.com/palantir/python-language-server"; description = "An implementation of the Language Server Protocol for Python"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/python-modules/python-ldap-test/default.nix b/pkgs/development/python-modules/python-ldap-test/default.nix index 3ba81cacfd4..3f543e8569b 100644 --- a/pkgs/development/python-modules/python-ldap-test/default.nix +++ b/pkgs/development/python-modules/python-ldap-test/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool for testing code speaking with LDAP server"; - homepage = https://github.com/zoldar/python-ldap-test; + homepage = "https://github.com/zoldar/python-ldap-test"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/python-libarchive/default.nix b/pkgs/development/python-modules/python-libarchive/default.nix index bae94191fc0..02fe2347924 100644 --- a/pkgs/development/python-modules/python-libarchive/default.nix +++ b/pkgs/development/python-modules/python-libarchive/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Multi-format archive and compression library"; - homepage = https://libarchive.org/; + homepage = "https://libarchive.org/"; license = licenses.bsd0; broken = true; }; diff --git a/pkgs/development/python-modules/python-logstash/default.nix b/pkgs/development/python-modules/python-logstash/default.nix index f4ecccf0683..55d3c60cd44 100644 --- a/pkgs/development/python-modules/python-logstash/default.nix +++ b/pkgs/development/python-modules/python-logstash/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python logging handler for Logstash"; - homepage = https://github.com/vklochan/python-logstash; + homepage = "https://github.com/vklochan/python-logstash"; maintainers = with maintainers; [ peterromfeldhk ]; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/python-lz4/default.nix b/pkgs/development/python-modules/python-lz4/default.nix index e967ba9934d..4c66ed02cfc 100644 --- a/pkgs/development/python-modules/python-lz4/default.nix +++ b/pkgs/development/python-modules/python-lz4/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "LZ4 Bindings for Python"; - homepage = https://github.com/python-lz4/python-lz4; + homepage = "https://github.com/python-lz4/python-lz4"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/python-lzf/default.nix b/pkgs/development/python-modules/python-lzf/default.nix index e8b89563f03..3064afe3ba4 100644 --- a/pkgs/development/python-modules/python-lzf/default.nix +++ b/pkgs/development/python-modules/python-lzf/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "liblzf python bindings"; - homepage = https://github.com/teepark/python-lzf; + homepage = "https://github.com/teepark/python-lzf"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/python-magic/default.nix b/pkgs/development/python-modules/python-magic/default.nix index d48a6288a7d..7ba794716bf 100644 --- a/pkgs/development/python-modules/python-magic/default.nix +++ b/pkgs/development/python-modules/python-magic/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "A python interface to the libmagic file type identification library"; - homepage = https://github.com/ahupp/python-magic; + homepage = "https://github.com/ahupp/python-magic"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/python-mapnik/default.nix b/pkgs/development/python-modules/python-mapnik/default.nix index 2b3c4ba1e9b..61cd5e34855 100644 --- a/pkgs/development/python-modules/python-mapnik/default.nix +++ b/pkgs/development/python-modules/python-mapnik/default.nix @@ -59,7 +59,7 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for Mapnik"; - homepage = https://mapnik.org; + homepage = "https://mapnik.org"; license = licenses.lgpl21; }; diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix index 053b4897e83..a72e20021df 100644 --- a/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/pkgs/development/python-modules/python-markdown-math/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Math extension for Python-Markdown"; - homepage = https://github.com/mitya57/python-markdown-math; + homepage = "https://github.com/mitya57/python-markdown-math"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ klntsky ]; }; diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index eb7c9153196..20393d40cce 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for interfacing with Xiaomi smart appliances"; - homepage = https://github.com/rytilahti/python-miio; + homepage = "https://github.com/rytilahti/python-miio"; license = licenses.gpl3; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/pkgs/development/python-modules/python-mnist/default.nix b/pkgs/development/python-modules/python-mnist/default.nix index 67cb4eae251..3b0ecf23770 100644 --- a/pkgs/development/python-modules/python-mnist/default.nix +++ b/pkgs/development/python-modules/python-mnist/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/sorki/python-mnist; + homepage = "https://github.com/sorki/python-mnist"; description = "Simple MNIST data parser written in Python"; license = licenses.bsd3; maintainers = with maintainers; [ cmcdragonkai ]; diff --git a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix index 8b46b105d69..9f9818350bf 100644 --- a/pkgs/development/python-modules/python-mpv-jsonipc/default.nix +++ b/pkgs/development/python-modules/python-mpv-jsonipc/default.nix @@ -3,14 +3,14 @@ buildPythonPackage rec { pname = "python-mpv-jsonipc"; - version = "1.1.7"; + version = "1.1.8"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "iwalton3"; repo = "python-mpv-jsonipc"; rev = "v${version}"; - sha256 = "1a8lcvgwf7a19d4dj1wkkpxk44c2z9gsyz1xv4wpxi3gxlplcmcz"; + sha256 = "0f4nfzfka5n76n6dxmgcz0rkaws7a3jrgyh00va6lnfi7h6dsmx4"; }; # 'mpv-jsonipc' does not have any tests diff --git a/pkgs/development/python-modules/python-multipart/default.nix b/pkgs/development/python-modules/python-multipart/default.nix index e3e75d88604..c2792342487 100644 --- a/pkgs/development/python-modules/python-multipart/default.nix +++ b/pkgs/development/python-modules/python-multipart/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "A streaming multipart parser for Python"; - homepage = https://github.com/andrew-d/python-multipart; + homepage = "https://github.com/andrew-d/python-multipart"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/python-oauth2/default.nix b/pkgs/development/python-modules/python-oauth2/default.nix index 4361b0a108d..bc3c13478e6 100644 --- a/pkgs/development/python-modules/python-oauth2/default.nix +++ b/pkgs/development/python-modules/python-oauth2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Framework that aims at making it easy to provide authentication via OAuth 2.0 within an application stack"; - homepage = https://github.com/wndhydrnt/python-oauth2; + homepage = "https://github.com/wndhydrnt/python-oauth2"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/python-otr/default.nix b/pkgs/development/python-modules/python-otr/default.nix index 2b08bbffa45..d83d2597245 100644 --- a/pkgs/development/python-modules/python-otr/default.nix +++ b/pkgs/development/python-modules/python-otr/default.nix @@ -24,10 +24,13 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python implementation of OTR"; - homepage = https://github.com/AGProjects/otr; + homepage = "https://github.com/AGProjects/python-otr"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = with maintainers; [ edwtjo ]; + # The package itself does not support python3, and its transitive + # dependencies rely on namespace package support that does not work in + # Nix's python2 infra. See #74619 for details. + broken = true; }; - } diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index ff3d28b4746..04cbaf77247 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An interface for packer.io"; - homepage = https://github.com/nir0s/python-packer; + homepage = "https://github.com/nir0s/python-packer"; license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/python-periphery/default.nix b/pkgs/development/python-modules/python-periphery/default.nix index 1c6cdcc28a1..d1f5de83a4c 100644 --- a/pkgs/development/python-modules/python-periphery/default.nix +++ b/pkgs/development/python-modules/python-periphery/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/vsergeev/python-periphery; + homepage = "https://github.com/vsergeev/python-periphery"; description = "Linux Peripheral I/O (GPIO, LED, PWM, SPI, I2C, MMIO, Serial) with Python 2 & 3"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bandresen ]; diff --git a/pkgs/development/python-modules/python-prctl/default.nix b/pkgs/development/python-modules/python-prctl/default.nix index 5d092f5e6ea..4da75195025 100644 --- a/pkgs/development/python-modules/python-prctl/default.nix +++ b/pkgs/development/python-modules/python-prctl/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = { description = "Python(ic) interface to the linux prctl syscall"; - homepage = https://github.com/seveas/python-prctl; + homepage = "https://github.com/seveas/python-prctl"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ catern ]; diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index 426b956880a..9ca1affed88 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python binding of ptrace library"; - homepage = https://github.com/vstinner/python-ptrace; + homepage = "https://github.com/vstinner/python-ptrace"; license = licenses.gpl2; maintainers = with maintainers; [ mic92 ]; }; diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix index 9c2b18ba006..b9e7c136b38 100644 --- a/pkgs/development/python-modules/python-rapidjson/default.nix +++ b/pkgs/development/python-modules/python-rapidjson/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/python-rapidjson/python-rapidjson; + homepage = "https://github.com/python-rapidjson/python-rapidjson"; description = "Python wrapper around rapidjson "; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix index 24a21959b8c..f41aefe92aa 100644 --- a/pkgs/development/python-modules/python-simple-hipchat/default.nix +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Easy peasy wrapper for HipChat's v1 API"; - homepage = https://github.com/kurttheviking/simple-hipchat-py; + homepage = "https://github.com/kurttheviking/simple-hipchat-py"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/python-slugify/default.nix b/pkgs/development/python-modules/python-slugify/default.nix index 008e5e25a48..d83fa3b9ad3 100644 --- a/pkgs/development/python-modules/python-slugify/default.nix +++ b/pkgs/development/python-modules/python-slugify/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/un33k/python-slugify; + homepage = "https://github.com/un33k/python-slugify"; description = "A Python Slugify application that handles Unicode"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/python-snappy/default.nix b/pkgs/development/python-modules/python-snappy/default.nix index 328b1ec0994..084c66e172a 100644 --- a/pkgs/development/python-modules/python-snappy/default.nix +++ b/pkgs/development/python-modules/python-snappy/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for the snappy compression library from Google"; - homepage = https://github.com/andrix/python-snappy; + homepage = "https://github.com/andrix/python-snappy"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix index 8f85f991534..23c806c3bab 100644 --- a/pkgs/development/python-modules/python-socketio/default.nix +++ b/pkgs/development/python-modules/python-socketio/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Socket.IO server"; - homepage = https://github.com/miguelgrinberg/python-socketio/; + homepage = "https://github.com/miguelgrinberg/python-socketio/"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 846a9c26d70..b6a48934372 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = { - homepage = https://python-sql.tryton.org/; + homepage = "https://python-sql.tryton.org/"; description = "A library to write SQL queries in a pythonic way"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 9b70d76bfed..5b921e32667 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "This library provides a pure Python interface for the Telegram Bot API."; - homepage = https://python-telegram-bot.org; + homepage = "https://python-telegram-bot.org"; license = licenses.lgpl3; maintainers = with maintainers; [ veprbl pingiun ]; }; diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix index 5170c5a8a09..57085b04cf9 100644 --- a/pkgs/development/python-modules/python-toolbox/default.nix +++ b/pkgs/development/python-modules/python-toolbox/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tools for testing PySnooper"; - homepage = https://github.com/cool-RR/python_toolbox; + homepage = "https://github.com/cool-RR/python_toolbox"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; }; diff --git a/pkgs/development/python-modules/python-u2flib-host/default.nix b/pkgs/development/python-modules/python-u2flib-host/default.nix index 38785d81313..eddf0deb015 100644 --- a/pkgs/development/python-modules/python-u2flib-host/default.nix +++ b/pkgs/development/python-modules/python-u2flib-host/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python based U2F host library"; - homepage = https://github.com/Yubico/python-u2flib-host; + homepage = "https://github.com/Yubico/python-u2flib-host"; license = licenses.bsd2; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/python-uinput/default.nix b/pkgs/development/python-modules/python-uinput/default.nix index 8f6c7c54cb2..e7579058f71 100644 --- a/pkgs/development/python-modules/python-uinput/default.nix +++ b/pkgs/development/python-modules/python-uinput/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pythonic API to Linux uinput kernel module"; - homepage = http://tjjr.fi/sw/python-uinput/; + homepage = "http://tjjr.fi/sw/python-uinput/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/python-vagrant/default.nix b/pkgs/development/python-modules/python-vagrant/default.nix index 88982f15293..92ba757667d 100644 --- a/pkgs/development/python-modules/python-vagrant/default.nix +++ b/pkgs/development/python-modules/python-vagrant/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "Python module that provides a thin wrapper around the vagrant command line executable"; - homepage = https://github.com/todddeluca/python-vagrant; + homepage = "https://github.com/todddeluca/python-vagrant"; license = lib.licenses.mit; maintainers = [ lib.maintainers.pmiddend ]; }; diff --git a/pkgs/development/python-modules/python-vipaccess/default.nix b/pkgs/development/python-modules/python-vipaccess/default.nix index 30c6dff048a..ca82f8aa187 100644 --- a/pkgs/development/python-modules/python-vipaccess/default.nix +++ b/pkgs/development/python-modules/python-vipaccess/default.nix @@ -1,7 +1,6 @@ { stdenv , buildPythonPackage , fetchPypi -, lxml , oath , pycryptodome , requests @@ -10,15 +9,14 @@ buildPythonPackage rec { pname = "python-vipaccess"; - version = "0.10.3"; + version = "0.12"; src = fetchPypi { inherit pname version; - sha256 = "1m6b7qipiaj6pz86kjhyq5m5jxxijpk58gpsdkj5bn0wjl6x1pg2"; + sha256 = "0g6mmf896wp036263zkkvi3ff59zcrzssjsw7csfmbisiszgdnrj"; }; propagatedBuildInputs = [ - lxml oath pycryptodome requests diff --git a/pkgs/development/python-modules/python-wifi/default.nix b/pkgs/development/python-modules/python-wifi/default.nix index 7e4f2ebccf0..7300efc77bc 100644 --- a/pkgs/development/python-modules/python-wifi/default.nix +++ b/pkgs/development/python-modules/python-wifi/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { inherit version; description = "Read & write wireless card capabilities using the Linux Wireless Extensions"; - homepage = http://pythonwifi.tuxfamily.org/; + homepage = "http://pythonwifi.tuxfamily.org/"; # From the README: "pythonwifi is licensed under LGPLv2+, however, the # examples (e.g. iwconfig.py and iwlist.py) are licensed under GPLv2+." license = with licenses; [ lgpl2Plus gpl2Plus ]; diff --git a/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/pkgs/development/python-modules/python-xmp-toolkit/default.nix index 8a160da2964..e5d7a7f0326 100644 --- a/pkgs/development/python-modules/python-xmp-toolkit/default.nix +++ b/pkgs/development/python-modules/python-xmp-toolkit/default.nix @@ -36,7 +36,7 @@ buildPythonPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/python-xmp-toolkit/python-xmp-toolkit; + homepage = "https://github.com/python-xmp-toolkit/python-xmp-toolkit"; description = "Python XMP Toolkit for working with metadata"; license = licenses.bsd3; maintainers = [ maintainers.kiwi ]; diff --git a/pkgs/development/python-modules/python3-openid/default.nix b/pkgs/development/python-modules/python3-openid/default.nix index d0b10c42d01..27445554ddf 100644 --- a/pkgs/development/python-modules/python3-openid/default.nix +++ b/pkgs/development/python-modules/python3-openid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OpenID support for modern servers and consumers"; - homepage = https://github.com/necaris/python3-openid; + homepage = "https://github.com/necaris/python3-openid"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/python_fedora/default.nix b/pkgs/development/python-modules/python_fedora/default.nix index 24f56ae53b2..ca4aa726d50 100644 --- a/pkgs/development/python-modules/python_fedora/default.nix +++ b/pkgs/development/python-modules/python_fedora/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Fedora Module"; - homepage = https://github.com/fedora-infra/python-fedora; + homepage = "https://github.com/fedora-infra/python-fedora"; license = licenses.lgpl2; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/python_keyczar/default.nix b/pkgs/development/python-modules/python_keyczar/default.nix index da4f3ed529e..c9e29ab5c63 100644 --- a/pkgs/development/python-modules/python_keyczar/default.nix +++ b/pkgs/development/python-modules/python_keyczar/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Toolkit for safe and simple cryptography"; - homepage = https://pypi.python.org/pypi/python-keyczar; + homepage = "https://pypi.python.org/pypi/python-keyczar"; license = licenses.asl20; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/python_openzwave/default.nix b/pkgs/development/python-modules/python_openzwave/default.nix index bb8d236335c..d3f1a0a8120 100644 --- a/pkgs/development/python-modules/python_openzwave/default.nix +++ b/pkgs/development/python-modules/python_openzwave/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for the OpenZWave C++ library"; - homepage = https://github.com/OpenZWave/python-openzwave; + homepage = "https://github.com/OpenZWave/python-openzwave"; license = licenses.gpl3Plus; maintainers = with maintainers; [ etu ]; inherit (openzwave.meta) platforms; diff --git a/pkgs/development/python-modules/python_statsd/default.nix b/pkgs/development/python-modules/python_statsd/default.nix index d6b262d9aa3..6455b694517 100644 --- a/pkgs/development/python-modules/python_statsd/default.nix +++ b/pkgs/development/python-modules/python_statsd/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A client for Etsy's node-js statsd server"; - homepage = https://github.com/WoLpH/python-statsd; + homepage = "https://github.com/WoLpH/python-statsd"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pythonnet/default.nix b/pkgs/development/python-modules/pythonnet/default.nix index 3b89e3245ca..0027c8d32a6 100644 --- a/pkgs/development/python-modules/pythonnet/default.nix +++ b/pkgs/development/python-modules/pythonnet/default.nix @@ -84,7 +84,7 @@ buildPythonPackage rec { meta = with lib; { description = ".Net and Mono integration for Python"; - homepage = https://pythonnet.github.io; + homepage = "https://pythonnet.github.io"; license = licenses.mit; maintainers = with maintainers; [ jraygauthier ]; broken = true; diff --git a/pkgs/development/python-modules/pytidylib/default.nix b/pkgs/development/python-modules/pytidylib/default.nix index 4ece6fb4134..a0aade1fe67 100644 --- a/pkgs/development/python-modules/pytidylib/default.nix +++ b/pkgs/development/python-modules/pytidylib/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python wrapper for HTML Tidy (tidylib) on Python 2 and 3"; - homepage = https://countergram.github.io/pytidylib/; + homepage = "https://countergram.github.io/pytidylib/"; license = licenses.mit; maintainers = with maintainers; [ layus ]; }; diff --git a/pkgs/development/python-modules/pytoml/default.nix b/pkgs/development/python-modules/pytoml/default.nix index d65de812323..8ec17b15844 100644 --- a/pkgs/development/python-modules/pytoml/default.nix +++ b/pkgs/development/python-modules/pytoml/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A TOML parser/writer for Python"; - homepage = https://github.com/avakar/pytoml; + homepage = "https://github.com/avakar/pytoml"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 2de5b21d86f..7321fbef0d6 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -31,9 +31,9 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/inducer/pytools/; + homepage = "https://github.com/inducer/pytools/"; description = "Miscellaneous Python lifesavers."; license = lib.licenses.mit; maintainers = with lib.maintainers; [ artuuge ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 0556ff93c13..a0a4aadfe58 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -230,7 +230,7 @@ in buildPythonPackage rec { meta = { description = "Open source, prototype-to-production deep learning platform"; - homepage = https://pytorch.org/; + homepage = "https://pytorch.org/"; license = lib.licenses.bsd3; platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; maintainers = with lib.maintainers; [ teh thoughtpolice stites tscholak ]; # tscholak esp. for darwin-related builds diff --git a/pkgs/development/python-modules/pytricia/default.nix b/pkgs/development/python-modules/pytricia/default.nix index 2f95d7fcecb..80e95fb6050 100644 --- a/pkgs/development/python-modules/pytricia/default.nix +++ b/pkgs/development/python-modules/pytricia/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for fast IP address lookup in Python"; - homepage = https://github.com/jsommers/pytricia; + homepage = "https://github.com/jsommers/pytricia"; license = with licenses; [ lgpl3Plus ]; maintainers = with maintainers; [ mkg ]; }; diff --git a/pkgs/development/python-modules/pytun/default.nix b/pkgs/development/python-modules/pytun/default.nix index 32e3b683e41..fed78cea96f 100644 --- a/pkgs/development/python-modules/pytun/default.nix +++ b/pkgs/development/python-modules/pytun/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/montag451/pytun; + homepage = "https://github.com/montag451/pytun"; description = "Linux TUN/TAP wrapper for Python"; license = licenses.mit; maintainers = with maintainers; [ montag451 ]; diff --git a/pkgs/development/python-modules/pytzdata/default.nix b/pkgs/development/python-modules/pytzdata/default.nix index afda908113b..a4df0bd71e6 100644 --- a/pkgs/development/python-modules/pytzdata/default.nix +++ b/pkgs/development/python-modules/pytzdata/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Timezone database for Python"; - homepage = https://github.com/sdispater/pytzdata; + homepage = "https://github.com/sdispater/pytzdata"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/pyu2f/default.nix b/pkgs/development/python-modules/pyu2f/default.nix index 16aa7b0ec31..c703a8fe30c 100644 --- a/pkgs/development/python-modules/pyu2f/default.nix +++ b/pkgs/development/python-modules/pyu2f/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "U2F host library for interacting with a U2F device over USB"; - homepage = https://github.com/google/pyu2f/; + homepage = "https://github.com/google/pyu2f/"; license = licenses.asl20; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index c35c35d6c57..dedec796e65 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://pyudev.readthedocs.org/; + homepage = "https://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; license = lib.licenses.lgpl21Plus; }; diff --git a/pkgs/development/python-modules/pyunifi/default.nix b/pkgs/development/python-modules/pyunifi/default.nix index c87d9d465bc..ea9cedeeae1 100644 --- a/pkgs/development/python-modules/pyunifi/default.nix +++ b/pkgs/development/python-modules/pyunifi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "API towards Ubiquity Networks UniFi controller"; - homepage = https://github.com/finish06/unifi-api; + homepage = "https://github.com/finish06/unifi-api"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pyupdate/default.nix b/pkgs/development/python-modules/pyupdate/default.nix index f4bf22854e7..9ce93d67a52 100644 --- a/pkgs/development/python-modules/pyupdate/default.nix +++ b/pkgs/development/python-modules/pyupdate/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { # This description is terrible, but it's what upstream uses. description = "Package to update stuff"; - homepage = https://github.com/ludeeus/pyupdate; + homepage = "https://github.com/ludeeus/pyupdate"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index c54711bb6c8..d646f7930f9 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends - homepage = http://pyusb.sourceforge.net/; + homepage = "http://pyusb.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/pyutil/default.nix b/pkgs/development/python-modules/pyutil/default.nix index 2115374aa43..a943c8eb523 100644 --- a/pkgs/development/python-modules/pyutil/default.nix +++ b/pkgs/development/python-modules/pyutil/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { we're not alone in wanting tools like these. ''; - homepage = http://allmydata.org/trac/pyutil; + homepage = "http://allmydata.org/trac/pyutil"; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/pyutilib/default.nix b/pkgs/development/python-modules/pyutilib/default.nix index e9397ad6fa8..3877db3254b 100644 --- a/pkgs/development/python-modules/pyutilib/default.nix +++ b/pkgs/development/python-modules/pyutilib/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "PyUtilib: A collection of Python utilities"; - homepage = https://github.com/PyUtilib/pyutilib; + homepage = "https://github.com/PyUtilib/pyutilib"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyuv/default.nix b/pkgs/development/python-modules/pyuv/default.nix index cd76b283028..7f476d3c11d 100644 --- a/pkgs/development/python-modules/pyuv/default.nix +++ b/pkgs/development/python-modules/pyuv/default.nix @@ -20,8 +20,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python interface for libuv"; - homepage = https://github.com/saghul/pyuv; - repositories.git = git://github.com/saghul/pyuv.git; + homepage = "https://github.com/saghul/pyuv"; + repositories.git = "git://github.com/saghul/pyuv.git"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pyvcd/default.nix b/pkgs/development/python-modules/pyvcd/default.nix index be6d10d0a0e..ae41d196543 100644 --- a/pkgs/development/python-modules/pyvcd/default.nix +++ b/pkgs/development/python-modules/pyvcd/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package for writing Value Change Dump (VCD) files"; - homepage = https://github.com/SanDisk-Open-Source/pyvcd; + homepage = "https://github.com/SanDisk-Open-Source/pyvcd"; changelog = "https://github.com/SanDisk-Open-Source/pyvcd/blob/${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = [ maintainers.sb0 maintainers.emily ]; diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index f83ee05bc26..c62399db117 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Launch jobs, organize the output, and dissect the results"; - homepage = https://pyviz.org/; + homepage = "https://pyviz.org/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix index 83bdcec86bd..e9986541782 100644 --- a/pkgs/development/python-modules/pyvoro/default.nix +++ b/pkgs/development/python-modules/pyvoro/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/joe-jordan/pyvoro; + homepage = "https://github.com/joe-jordan/pyvoro"; description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/pywal/default.nix b/pkgs/development/python-modules/pywal/default.nix index 3fd61891878..b565188ccea 100644 --- a/pkgs/development/python-modules/pywal/default.nix +++ b/pkgs/development/python-modules/pywal/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generate and change colorschemes on the fly. A 'wal' rewrite in Python 3."; - homepage = https://github.com/dylanaraps/pywal; + homepage = "https://github.com/dylanaraps/pywal"; license = licenses.mit; maintainers = with maintainers; [ Fresheyeball ]; }; diff --git a/pkgs/development/python-modules/pywatchman/default.nix b/pkgs/development/python-modules/pywatchman/default.nix index 40aaea9c01a..f9951465e25 100644 --- a/pkgs/development/python-modules/pywatchman/default.nix +++ b/pkgs/development/python-modules/pywatchman/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Watchman client for Python"; - homepage = https://facebook.github.io/watchman/; + homepage = "https://facebook.github.io/watchman/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/pywavelets/default.nix b/pkgs/development/python-modules/pywavelets/default.nix index fbb226bb1f2..66c996a487b 100644 --- a/pkgs/development/python-modules/pywavelets/default.nix +++ b/pkgs/development/python-modules/pywavelets/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Wavelet transform module"; - homepage = https://github.com/PyWavelets/pywt; + homepage = "https://github.com/PyWavelets/pywt"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index c5ffb79a5d6..82370faf7ef 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Support for the WBEM standard for systems management"; - homepage = https://pywbem.github.io; + homepage = "https://pywbem.github.io"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pywebdav/default.nix b/pkgs/development/python-modules/pywebdav/default.nix index 15cb474f5fe..9a56bf76046 100644 --- a/pkgs/development/python-modules/pywebdav/default.nix +++ b/pkgs/development/python-modules/pywebdav/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { sha256 = "1v10vg79h85milnq8w7yd75qq5z6297ywkn9b2kxajldzwqxn3ji"; }; meta = with stdenv.lib; { - homepage = http://code.google.com/p/pywebdav/; + homepage = "http://code.google.com/p/pywebdav/"; description = "WebDAV library including a standalone server for python"; maintainers = with maintainers; [ johbo ]; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/pywebpush/default.nix b/pkgs/development/python-modules/pywebpush/default.nix index ff9b20f8177..b8a453e99ed 100644 --- a/pkgs/development/python-modules/pywebpush/default.nix +++ b/pkgs/development/python-modules/pywebpush/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Webpush Data encryption library for Python"; - homepage = https://github.com/web-push-libs/pywebpush; + homepage = "https://github.com/web-push-libs/pywebpush"; license = licenses.mpl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/pyx/default.nix b/pkgs/development/python-modules/pyx/default.nix index 63e6e632100..8b5e3633e25 100644 --- a/pkgs/development/python-modules/pyx/default.nix +++ b/pkgs/development/python-modules/pyx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python package for the generation of PostScript, PDF, and SVG files"; - homepage = http://pyx.sourceforge.net/; + homepage = "http://pyx.sourceforge.net/"; license = with licenses; [ gpl2 ]; }; diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix index 2f2b6e9b543..a5cb694b4c1 100644 --- a/pkgs/development/python-modules/pyxdg/default.nix +++ b/pkgs/development/python-modules/pyxdg/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://freedesktop.org/wiki/Software/pyxdg; + homepage = "http://freedesktop.org/wiki/Software/pyxdg"; description = "Contains implementations of freedesktop.org standards"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/pyxl3/default.nix b/pkgs/development/python-modules/pyxl3/default.nix index c30dd0f024f..2fa5ef76669 100644 --- a/pkgs/development/python-modules/pyxl3/default.nix +++ b/pkgs/development/python-modules/pyxl3/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python 3 port of pyxl for writing structured and reusable inline HTML"; - homepage = https://github.com/gvanrossum/pyxl3; + homepage = "https://github.com/gvanrossum/pyxl3"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix index 5a55c1f47bb..a528de8e0ca 100644 --- a/pkgs/development/python-modules/pyxml/default.nix +++ b/pkgs/development/python-modules/pyxml/default.nix @@ -25,6 +25,6 @@ buildPythonPackage rec { meta = { description = "A collection of libraries to process XML with Python"; - homepage = http://pyxml.sourceforge.net/; + homepage = "http://pyxml.sourceforge.net/"; }; } diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix index 316e9974cfe..4d1d16b0f12 100644 --- a/pkgs/development/python-modules/pyyaml/default.nix +++ b/pkgs/development/python-modules/pyyaml/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "The next generation YAML parser and emitter for Python"; - homepage = https://github.com/yaml/pyyaml; + homepage = "https://github.com/yaml/pyyaml"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/pyzufall/default.nix b/pkgs/development/python-modules/pyzufall/default.nix index 20666010f9a..2c5121e61e8 100644 --- a/pkgs/development/python-modules/pyzufall/default.nix +++ b/pkgs/development/python-modules/pyzufall/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://pyzufall.readthedocs.io/de/latest/; + homepage = "https://pyzufall.readthedocs.io/de/latest/"; description = "Library for generating random data and sentences in german language"; license = licenses.gpl3Plus; maintainers = with maintainers; [ davidak ]; diff --git a/pkgs/development/python-modules/qasm2image/default.nix b/pkgs/development/python-modules/qasm2image/default.nix index 00f15f801d1..9748e3e4348 100644 --- a/pkgs/development/python-modules/qasm2image/default.nix +++ b/pkgs/development/python-modules/qasm2image/default.nix @@ -43,7 +43,7 @@ buildPythonPackage { meta = { description = "A Python module to visualise quantum circuit"; - homepage = https://github.com/nelimeee/qasm2image; + homepage = "https://github.com/nelimeee/qasm2image"; license = lib.licenses.cecill-b; maintainers = with lib.maintainers; [ pandaman diff --git a/pkgs/development/python-modules/qdarkstyle/default.nix b/pkgs/development/python-modules/qdarkstyle/default.nix index a1893c88e0e..6b9b94b603f 100644 --- a/pkgs/development/python-modules/qdarkstyle/default.nix +++ b/pkgs/development/python-modules/qdarkstyle/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "qdarkstyle"; - version = "2.8"; + version = "2.8.1"; src = fetchPypi { inherit version; pname = "QDarkStyle"; - sha256 = "6a967c4b664446f8bed9df12d1032cf68cb54f186bfc9cbfdbbc756bf9a5d475"; + sha256 = "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym"; }; # No tests available @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A dark stylesheet for Python and Qt applications"; - homepage = https://github.com/ColinDuquesnoy/QDarkStyleSheet; + homepage = "https://github.com/ColinDuquesnoy/QDarkStyleSheet"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; }; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix new file mode 100644 index 00000000000..7c36328f557 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -0,0 +1,103 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, cmake +, cvxpy +, cython +, numpy +, openblas +, pybind11 +, scikit-build +, spdlog + # Check Inputs +, qiskit-terra +, pytestCheckHook +, python +}: + +buildPythonPackage rec { + pname = "qiskit-aer"; + version = "0.4.1"; + + disabled = pythonOlder "3.5"; + + src = fetchFromGitHub { + owner = "Qiskit"; + repo = pname; + rev = version; + fetchSubmodules = true; # fetch muparserx and other required libraries + sha256 = "1j2pv6jx5dlzanjp1qnf32s53d8jrlpv96nvymznkcnjvqn60gv9"; + }; + + nativeBuildInputs = [ + cmake + scikit-build + ]; + + buildInputs = [ + openblas + spdlog + ]; + + propagatedBuildInputs = [ + cvxpy + cython # generates some cython files at runtime that need to be cython-ized + numpy + pybind11 + ]; + + prePatch = '' + # remove dependency on PyPi cmake package, which isn't in Nixpkgs + substituteInPlace setup.py --replace "'cmake'" "" + ''; + + dontUseCmakeConfigure = true; + + cmakeFlags = [ + "-DBUILD_TESTS=True" + "-DAER_THRUST_BACKEND=OMP" + ]; + + # Needed to find qiskit.providers.aer modules in cython. This exists in GitHub, don't know why it isn't copied by default + postFixup = '' + touch $out/${python.sitePackages}/qiskit/__init__.pxd + ''; + + # *** Testing *** + + pythonImportsCheck = [ + "qiskit.providers.aer" + "qiskit.providers.aer.backends.qasm_simulator" + "qiskit.providers.aer.backends.controller_wrappers" # Checks C++ files built correctly. Only exists if built & moved to output + ]; + checkInputs = [ + qiskit-terra + pytestCheckHook + ]; + dontUseSetuptoolsCheck = true; # Otherwise runs tests twice + + preCheck = '' + # Tests include a compiled "circuit" which is auto-built in $HOME + export HOME=$(mktemp -d) + # move tests b/c by default try to find (missing) cython-ized code in /build/source dir + cp -r test $HOME + + # Add qiskit-aer compiled files to cython include search + pushd $HOME + ''; + postCheck = '' + popd + ''; + + meta = with lib; { + description = "High performance simulators for Qiskit"; + homepage = "https://github.com/QISKit/qiskit-aer"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + # Doesn't build on aarch64 (libmuparserx issue). + # Can fix by building muparserx from source (https://github.com/beltoforion/muparserx) + # or in future updates (e.g. Raspberry Pi enabled via https://github.com/Qiskit/qiskit-aer/pull/651 & https://github.com/Qiskit/qiskit-aer/pull/660) + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix new file mode 100644 index 00000000000..ee01a5c4cb5 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -0,0 +1,131 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, cvxopt +, dlx +, docplex +, fastdtw +, h5py +, networkx +, numpy +, psutil +, qiskit-ignis +, qiskit-terra +, quandl +, scikitlearn + # Check Inputs +, parameterized +, pytestCheckHook +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-aqua"; + version = "0.6.5"; + + disabled = pythonOlder "3.5"; + + # Pypi's tarball doesn't contain tests + src = fetchFromGitHub { + owner = "Qiskit"; + repo = "qiskit-aqua"; + rev = version; + sha256 = "03c0gl2qxyngf3cccjghjb0bhp0w78sdbvhim08cimf3cd577ldz"; + }; + + # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. + propagatedBuildInputs = [ + cvxopt + docplex + dlx # Python Dancing Links package + fastdtw + h5py + networkx + numpy + psutil + qiskit-terra + qiskit-ignis + quandl + scikitlearn + ]; + + # *** NOTE *** + # We make pyscf optional in this package, due to difficulties packaging it in Nix (test failures, complicated flags, etc). + # See nixpkgs#78772, nixpkgs#83447. You are welcome to try to package it yourself, + # or use the Nix User Repository version (https://github.com/drewrisinger/nur-packages). + # It can also be installed at runtime from the pip wheel. + # We disable appropriate tests below to allow building without pyscf installed + + postPatch = '' + substituteInPlace setup.py \ + --replace "pyscf; sys_platform == 'linux' or (python_version < '3.8' and sys_platform != 'win32')" "" + + # Add ImportWarning when running qiskit.chemistry (pyscf is a chemistry package) that pyscf is not included + echo -e "\nimport warnings\ntry: import pyscf;\nexcept:\n " \ + "warnings.warn('pyscf is not supported on Nixpkgs so some qiskit features will fail." \ + "You must install it yourself via pip or add it to your environment from the Nix User Repository." \ + "See https://github.com/NixOS/nixpkgs/pull/83447 for details', ImportWarning)\n" \ + >> qiskit/chemistry/__init__.py + ''; + + checkInputs = [ parameterized qiskit-aer pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + pythonImportsCheck = [ + "qiskit.aqua" + "qiskit.aqua.algorithms" + "qiskit.chemistry" + "qiskit.finance" + "qiskit.ml" + "qiskit.optimization" + ]; + pytestFlagsArray = [ + # Disabled b/c missing pyscf + "--ignore=test/chemistry/test_qeom_ee.py" + "--ignore=test/chemistry/test_qeom_vqe.py" + "--ignore=test/chemistry/test_vqe_uccsd_adapt.py" + + # Following tend to be slow tests, all pass + "--ignore=test/aqua/test_vqc.py" + "--ignore=test/aqua/test_hhl.py" + "--ignore=test/aqua/test_qgan.py" + "--ignore=test/aqua/test_mcr.py" + "--ignore=test/aqua/test_mcu1.py" + "--ignore=test/aqua/test_vqe.py" + ]; + disabledTests = [ + # Disabled due to missing pyscf + "test_validate" # test/chemistry/test_inputparser.py + + # Disabling slow tests > 10 seconds + "test_clique_vqe" + "test_delta_3_qasm" + "test_evaluate_qasm_mode" + "test_evolve_1_suzuki" + "test_exact_cover_vqe" + "test_exchangedata" + "test_expected_value_0_statevector" + "test_expected_value_1_qasm" + "test_expected_value_2_statevector" + "test_graph_partition_vqe" + "test_lookup_rotation" + "test_mct_with_dirty_ancillae_15" + "test_mcrz_11" + "test_measurement_error_mitigation_auto_refresh" + "test_qgan_training" + "test_qsvm_multiclass" + "test_shor_factoring_0" + "test_vertex_cover_vqe" + "test_vqc_with_raw_feature_vector_on_wine" + "test_vqe_2_iqpe" + "test_vqe_qasm" + "test_wikipedia" + ]; + + meta = with lib; { + description = "An extensible library of quantum computing algorithms"; + homepage = "https://github.com/QISKit/qiskit-aqua"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix new file mode 100644 index 00000000000..bed1bffe1a6 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -0,0 +1,91 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, arrow +, nest-asyncio +, qiskit-terra +, requests +, requests_ntlm +, websockets + # Visualization inputs +, ipykernel +, ipyvuetify +, ipywidgets +, matplotlib +, nbconvert +, nbformat +, plotly +, pyperclip +, seaborn + # check inputs +, pytestCheckHook +, pproxy +, vcrpy +}: + +buildPythonPackage rec { + pname = "qiskit-ibmq-provider"; + version = "0.6.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Qiskit"; + repo = pname; + rev = version; + sha256 = "0arbhwaa2kx04jbrj6hk3vvn92wdk6lrr9zx36pr6p22r0yyxnj9"; + }; + + propagatedBuildInputs = [ + arrow + nest-asyncio + qiskit-terra + requests + requests_ntlm + websockets + # Visualization/Jupyter inputs + ipykernel + ipyvuetify + ipywidgets + matplotlib + nbconvert + nbformat + plotly + pyperclip + seaborn + ]; + + # websockets seems to be pinned b/c in v8+ it drops py3.5 support. Not an issue here (usually py3.7+, and disabled for older py3.6) + prePatch = '' + substituteInPlace requirements.txt --replace "websockets>=7,<8" "websockets" + substituteInPlace setup.py --replace "websockets>=7,<8" "websockets" + ''; + + # Most tests require credentials to run on IBMQ + checkInputs = [ + pytestCheckHook + pproxy + vcrpy + ]; + dontUseSetuptoolsCheck = true; + + pythonImportsCheck = [ "qiskit.providers.ibmq" ]; + # These disabled tests require internet connection, aren't skipped elsewhere + disabledTests = [ + "test_old_api_url" + "test_non_auth_url" + "test_non_auth_url_with_hub" + ]; + + # Skip tests that rely on internet access (mostly to IBM Quantum Experience cloud). + # Options defined in qiskit.terra.test.testing_options.py::get_test_options + QISKIT_TESTS = "skip_online"; + + meta = with lib; { + description = "Qiskit provider for accessing the quantum devices and simulators at IBMQ"; + homepage = "https://github.com/Qiskit/qiskit-ibmq-provider"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix new file mode 100644 index 00000000000..2f0a99dc0f8 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -0,0 +1,62 @@ +{ lib +, pythonOlder +, buildPythonPackage +, fetchFromGitHub +, fetchpatch +, numpy +, qiskit-terra +, scipy + # Check Inputs +, pytestCheckHook +, qiskit-aer +}: + +buildPythonPackage rec { + pname = "qiskit-ignis"; + version = "0.2.0"; + + disabled = pythonOlder "3.5"; + + # Pypi's tarball doesn't contain tests + src = fetchFromGitHub { + owner = "Qiskit"; + repo = pname; + rev = version; + sha256 = "08a60xk5dq5wmqc23r4hr2v2nsf9hs0ybz832vbnd6d80dl6izyc"; + }; + + patches = [ + # Update tests for compatibility with qiskit-aer 0.4 (#342). Remove in version > 0.2.0 + (fetchpatch { + url = "https://github.com/Qiskit/qiskit-ignis/commit/d78c494579f370058e68e360f10149db81b52477.patch"; + sha256 = "0ygkllf95c0jfvjg7gn399a5fd0wshsjpcn279kj7855m8j306h6"; + }) + # Fix statevector test over-eager validation (PR #333) + (fetchpatch { + url = "https://github.com/Qiskit/qiskit-ignis/commit/7cc8eb2e852b383ea429233fa43d3728931f1707.patch"; + sha256 = "0mdygykilg4qivdaa731z3y56l3ax4jp1sil9npqv0gn4p03c9g5"; + }) + ]; + + propagatedBuildInputs = [ + numpy + qiskit-terra + scipy + ]; + + # Tests + pythonImportsCheck = [ "qiskit.ignis" ]; + dontUseSetuptoolsCheck = true; + preCheck = ''export HOME=$TMPDIR''; + checkInputs = [ + pytestCheckHook + qiskit-aer + ]; + + meta = with lib; { + description = "Qiskit tools for quantum hardware verification, noise characterization, and error correction"; + homepage = "https://github.com/QISKit/qiskit-ignis"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 89d02f7b803..3b5c9e706dc 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -1,65 +1,49 @@ -{ stdenv -, isPy3k +{ lib +, pythonOlder , buildPythonPackage -, fetchPypi -, numpy -, scipy -, sympy -, matplotlib -, networkx -, ply -, pillow -, cffi -, requests -, requests_ntlm -, IBMQuantumExperience -, jsonschema -, psutil -, cmake -, llvmPackages +, fetchFromGitHub + # Python Inputs +, qiskit-aer +, qiskit-aqua +, qiskit-ibmq-provider +, qiskit-ignis +, qiskit-terra + # Check Inputs +, pytestCheckHook }: buildPythonPackage rec { pname = "qiskit"; - version = "0.14.0"; + # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history + version = "0.17.0"; - disabled = !isPy3k; + disabled = pythonOlder "3.5"; - src = fetchPypi { - inherit pname version; - sha256 = "d086a21d0eee61bb12e1f2cd6148a7292005fd10584ca33d6c404dd5c53ba95f"; + src = fetchFromGitHub { + owner = "Qiskit"; + repo = "qiskit"; + rev = version; + sha256 = "1cnjcvvzklyq102fipqnwd5ham0sp0451gp7j79cwwsxzvji6pcc"; }; - buildInputs = [ cmake ] - ++ stdenv.lib.optional stdenv.isDarwin llvmPackages.openmp; - propagatedBuildInputs = [ - numpy - matplotlib - networkx - ply - scipy - sympy - pillow - cffi - requests - requests_ntlm - IBMQuantumExperience - jsonschema - psutil + qiskit-aer + qiskit-aqua + qiskit-ibmq-provider + qiskit-ignis + qiskit-terra ]; - # Pypi's tarball doesn't contain tests - doCheck = false; + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + # following doesn't work b/c they are distributed across different nix sitePackages dirs. Tested with pytest though. + # pythonImportsCheck = [ "qiskit" "qiskit.terra" "qiskit.ignis" "qiskit.aer" "qiskit.aqua" ]; meta = { - description = "Quantum Software Development Kit for writing quantum computing experiments, programs, and applications"; - homepage = https://github.com/QISKit/qiskit-terra; - license = stdenv.lib.licenses.asl20; - maintainers = with stdenv.lib.maintainers; [ - pandaman - ]; - # Needs to be updated and have its new dependencies added - broken = true; + description = "Software for developing quantum computing programs"; + homepage = "https://qiskit.org"; + downloadPage = "https://github.com/QISKit/qiskit/releases"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ drewrisinger pandaman ]; }; } diff --git a/pkgs/development/python-modules/qpid-python/default.nix b/pkgs/development/python-modules/qpid-python/default.nix index 713e9db566e..f7221a981ea 100644 --- a/pkgs/development/python-modules/qpid-python/default.nix +++ b/pkgs/development/python-modules/qpid-python/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://qpid.apache.org/; + homepage = "http://qpid.apache.org/"; description = "Python client implementation and AMQP conformance tests for Apache Qpid"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/qscintilla-qt5/default.nix b/pkgs/development/python-modules/qscintilla-qt5/default.nix index b5ce1eb26fe..4d63cb5f454 100644 --- a/pkgs/development/python-modules/qscintilla-qt5/default.nix +++ b/pkgs/development/python-modules/qscintilla-qt5/default.nix @@ -45,6 +45,6 @@ buildPythonPackage { description = "A Python binding to QScintilla, Qt based text editing control"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ lsix ]; - homepage = https://www.riverbankcomputing.com/software/qscintilla/; + homepage = "https://www.riverbankcomputing.com/software/qscintilla/"; }; } diff --git a/pkgs/development/python-modules/qtawesome/default.nix b/pkgs/development/python-modules/qtawesome/default.nix index 8150290ca74..2cf88805b79 100644 --- a/pkgs/development/python-modules/qtawesome/default.nix +++ b/pkgs/development/python-modules/qtawesome/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Iconic fonts in PyQt and PySide applications"; - homepage = https://github.com/spyder-ide/qtawesome; + homepage = "https://github.com/spyder-ide/qtawesome"; license = licenses.mit; platforms = platforms.linux; # fails on Darwin }; diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 885eee8d4b6..abf5509056d 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "Jupyter Qt console"; - homepage = https://jupyter.org/; + homepage = "https://jupyter.org/"; license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/qtpy/default.nix b/pkgs/development/python-modules/qtpy/default.nix index 5d2210e00c4..313b1266a52 100644 --- a/pkgs/development/python-modules/qtpy/default.nix +++ b/pkgs/development/python-modules/qtpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Abstraction layer for PyQt5/PyQt4/PySide2/PySide"; - homepage = https://github.com/spyder-ide/qtpy; + homepage = "https://github.com/spyder-ide/qtpy"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/quamash/default.nix b/pkgs/development/python-modules/quamash/default.nix index b39e081c471..ed52c191c22 100644 --- a/pkgs/development/python-modules/quamash/default.nix +++ b/pkgs/development/python-modules/quamash/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Implementation of the PEP 3156 event-loop (asyncio) api using the Qt Event-Loop"; - homepage = https://github.com/harvimt/quamash; + homepage = "https://github.com/harvimt/quamash"; license = licenses.bsd2; maintainers = with maintainers; [ borisbabic ]; }; diff --git a/pkgs/development/python-modules/quandl/default.nix b/pkgs/development/python-modules/quandl/default.nix index bd73a021331..2d78b626092 100644 --- a/pkgs/development/python-modules/quandl/default.nix +++ b/pkgs/development/python-modules/quandl/default.nix @@ -10,12 +10,13 @@ buildPythonPackage rec { pname = "quandl"; - version = "3.4.8"; + version = "3.5.0"; + disabled = !isPy3k; src = fetchPypi { inherit version; pname = "Quandl"; - sha256 = "179knz21filz6x6qk66b7dk2pj1x4jnvxxd5x71ap19f367dkkb3"; + sha256 = "0zpw0nwqr4g56l9z4my0fahfgpcmfx74acbmv6nfx1dmq5ggraf3"; }; doCheck = true; @@ -46,10 +47,10 @@ buildPythonPackage rec { pyasn1 ]; - meta = { - homepage = "https://github.com/quandl/quandl-python"; + meta = with lib; { description = "Quandl Python client library"; - maintainers = [ lib.maintainers.ilya-kolpakov ]; - license = lib.licenses.mit; + homepage = "https://github.com/quandl/quandl-python"; + license = licenses.mit; + maintainers = with maintainers; [ ilya-kolpakov ]; }; } diff --git a/pkgs/development/python-modules/quantities/default.nix b/pkgs/development/python-modules/quantities/default.nix index 6e92881aad0..ca6d8f0cfdb 100644 --- a/pkgs/development/python-modules/quantities/default.nix +++ b/pkgs/development/python-modules/quantities/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Quantities is designed to handle arithmetic and"; - homepage = https://python-quantities.readthedocs.io/; + homepage = "https://python-quantities.readthedocs.io/"; license = lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/qutip/default.nix b/pkgs/development/python-modules/qutip/default.nix index 2f609651c8e..6066e1e3b84 100644 --- a/pkgs/development/python-modules/qutip/default.nix +++ b/pkgs/development/python-modules/qutip/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { superconducting circuits, and quantum nanomechanical resonators. ''; - homepage = http://qutip.org/; + homepage = "http://qutip.org/"; license = licenses.bsd0; broken = true; }; diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 920cc22fb39..998fa929698 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interact with radare2"; - homepage = https://github.com/radare/radare2-r2pipe; + homepage = "https://github.com/radare/radare2-r2pipe"; license = licenses.mit; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/rabbitpy/default.nix b/pkgs/development/python-modules/rabbitpy/default.nix index 7406faca601..26f3ffd4fe6 100644 --- a/pkgs/development/python-modules/rabbitpy/default.nix +++ b/pkgs/development/python-modules/rabbitpy/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library"; - homepage = https://pypi.python.org/pypi/rabbitpy; + homepage = "https://pypi.python.org/pypi/rabbitpy"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/radicale_infcloud/default.nix b/pkgs/development/python-modules/radicale_infcloud/default.nix index 08d4a8f36a3..4b30d643fbd 100644 --- a/pkgs/development/python-modules/radicale_infcloud/default.nix +++ b/pkgs/development/python-modules/radicale_infcloud/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { doCheck = false; # Tries to import radicale, circular dependency meta = with stdenv.lib; { - homepage = https://github.com/Unrud/RadicaleInfCloud/; + homepage = "https://github.com/Unrud/RadicaleInfCloud/"; description = "Integrate InfCloud into Radicale's web interface"; license = with licenses; [ agpl3 gpl3 ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/radio_beam/default.nix b/pkgs/development/python-modules/radio_beam/default.nix index d21da2c7583..8ed5c720ef3 100644 --- a/pkgs/development/python-modules/radio_beam/default.nix +++ b/pkgs/development/python-modules/radio_beam/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Tools for Beam IO and Manipulation"; - homepage = http://radio-astro-tools.github.io; + homepage = "http://radio-astro-tools.github.io"; license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ smaret ]; diff --git a/pkgs/development/python-modules/random2/default.nix b/pkgs/development/python-modules/random2/default.nix index ecc049b34f4..1334fa2aa32 100644 --- a/pkgs/development/python-modules/random2/default.nix +++ b/pkgs/development/python-modules/random2/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/random2; + homepage = "http://pypi.python.org/pypi/random2"; description = "Python 3 compatible Python 2 `random` Module"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/rarfile/default.nix b/pkgs/development/python-modules/rarfile/default.nix index a2da451905a..024d043c471 100644 --- a/pkgs/development/python-modules/rarfile/default.nix +++ b/pkgs/development/python-modules/rarfile/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "RAR archive reader for Python"; - homepage = https://github.com/markokr/rarfile; + homepage = "https://github.com/markokr/rarfile"; license = licenses.isc; }; } diff --git a/pkgs/development/python-modules/ratelimiter/default.nix b/pkgs/development/python-modules/ratelimiter/default.nix index 375b6639368..15437889fc2 100644 --- a/pkgs/development/python-modules/ratelimiter/default.nix +++ b/pkgs/development/python-modules/ratelimiter/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/RazerM/ratelimiter; + homepage = "https://github.com/RazerM/ratelimiter"; license = licenses.asl20; description = "Simple python rate limiting object"; maintainers = with maintainers; [ helkafen ]; diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix index 9ea04fa8bdf..45a408640b5 100644 --- a/pkgs/development/python-modules/raven/default.nix +++ b/pkgs/development/python-modules/raven/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "A Python client for Sentry (getsentry.com)"; - homepage = https://github.com/getsentry/raven-python; + homepage = "https://github.com/getsentry/raven-python"; license = [ lib.licenses.bsd3 ]; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/rawkit/default.nix b/pkgs/development/python-modules/rawkit/default.nix index 6bee2bf1b0a..a114d2400aa 100644 --- a/pkgs/development/python-modules/rawkit/default.nix +++ b/pkgs/development/python-modules/rawkit/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { patches = [ # Python 3.7 compatibility (fetchpatch { - url = https://github.com/photoshell/rawkit/commit/663e90afa835d398aedd782c87b8cd0bff64bc9f.patch; + url = "https://github.com/photoshell/rawkit/commit/663e90afa835d398aedd782c87b8cd0bff64bc9f.patch"; sha256 = "1cdw0x9bgk0b5jnpjnmd8jpbaryarr3cjqizq44366qh3l0jycxy"; }) ]; @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "CTypes based LibRaw bindings for Python"; - homepage = https://rawkit.readthedocs.org/; + homepage = "https://rawkit.readthedocs.org/"; license = licenses.mit; maintainers = with maintainers; [ jfrankenau ]; }; diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 71b40318a51..477a11f2ce9 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://www.reviewboard.org/docs/rbtools/dev/; + homepage = "https://www.reviewboard.org/docs/rbtools/dev/"; description = "RBTools is a set of command line tools for working with Review Board and RBCommons"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/rcssmin/default.nix b/pkgs/development/python-modules/rcssmin/default.nix index 53a8e046b55..30d5a3c0e27 100644 --- a/pkgs/development/python-modules/rcssmin/default.nix +++ b/pkgs/development/python-modules/rcssmin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://opensource.perlig.de/rcssmin/; + homepage = "http://opensource.perlig.de/rcssmin/"; license = licenses.asl20; description = "CSS minifier written in pure python"; }; diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix index badaf9b3787..87d99623057 100644 --- a/pkgs/development/python-modules/rdflib/default.nix +++ b/pkgs/development/python-modules/rdflib/default.nix @@ -31,6 +31,6 @@ buildPythonPackage rec { meta = { description = "A Python library for working with RDF, a simple yet powerful language for representing information"; - homepage = http://www.rdflib.net/; + homepage = "http://www.rdflib.net/"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/readme_renderer/default.nix b/pkgs/development/python-modules/readme_renderer/default.nix index 8369c3df943..8d36df3d980 100644 --- a/pkgs/development/python-modules/readme_renderer/default.nix +++ b/pkgs/development/python-modules/readme_renderer/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = { description = "readme_renderer is a library for rendering readme descriptions for Warehouse"; - homepage = https://github.com/pypa/readme_renderer; + homepage = "https://github.com/pypa/readme_renderer"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 948e523cb7e..e9245d426f0 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension for Read the Docs overrides"; - homepage = https://github.com/rtfd/readthedocs-sphinx-ext; + homepage = "https://github.com/rtfd/readthedocs-sphinx-ext"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix index d1355560ac1..2d3d3cd23fd 100644 --- a/pkgs/development/python-modules/rebulk/default.nix +++ b/pkgs/development/python-modules/rebulk/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six regex ]; meta = with stdenv.lib; { - homepage = https://github.com/Toilal/rebulk/; + homepage = "https://github.com/Toilal/rebulk/"; license = licenses.mit; description = "Advanced string matching from simple patterns"; }; diff --git a/pkgs/development/python-modules/recaptcha_client/default.nix b/pkgs/development/python-modules/recaptcha_client/default.nix index 09090540a5b..bcb6741bb29 100644 --- a/pkgs/development/python-modules/recaptcha_client/default.nix +++ b/pkgs/development/python-modules/recaptcha_client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A CAPTCHA for Python using the reCAPTCHA service"; - homepage = http://recaptcha.net/; + homepage = "http://recaptcha.net/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/recommonmark/default.nix b/pkgs/development/python-modules/recommonmark/default.nix index 98cee494f3f..26ba8a68d87 100644 --- a/pkgs/development/python-modules/recommonmark/default.nix +++ b/pkgs/development/python-modules/recommonmark/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "A docutils-compatibility bridge to CommonMark"; - homepage = https://github.com/rtfd/recommonmark; + homepage = "https://github.com/rtfd/recommonmark"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/rednose/default.nix b/pkgs/development/python-modules/rednose/default.nix index fa142cf8723..8c3c98bf630 100644 --- a/pkgs/development/python-modules/rednose/default.nix +++ b/pkgs/development/python-modules/rednose/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python nose plugin adding color to console results"; - homepage = https://github.com/JBKahn/rednose; + homepage = "https://github.com/JBKahn/rednose"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 5a0cb50903a..a9456ac963c 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Alternative regular expression module, to replace re"; - homepage = https://bitbucket.org/mrabarnett/mrab-regex; + homepage = "https://bitbucket.org/mrabarnett/mrab-regex"; license = lib.licenses.psfl; maintainers = with lib.maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/regional/default.nix b/pkgs/development/python-modules/regional/default.nix index 5f2aee1b42a..26f0755b3fe 100644 --- a/pkgs/development/python-modules/regional/default.nix +++ b/pkgs/development/python-modules/regional/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple manipualtion and display of spatial regions"; - homepage = https://github.com/freeman-lab/regional; + homepage = "https://github.com/freeman-lab/regional"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 6a7cbdcc5af..611bdd66901 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "GPGPU algorithms for PyCUDA and PyOpenCL"; - homepage = https://github.com/fjarri/reikna; + homepage = "https://github.com/fjarri/reikna"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.fridh ]; diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 3b98128bcf7..a6da936999e 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ]; meta = { - homepage = https://relatorio.tryton.org/; + homepage = "https://relatorio.tryton.org/"; description = "A templating library able to output odt and pdf files"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.gpl3; diff --git a/pkgs/development/python-modules/remotecv/default.nix b/pkgs/development/python-modules/remotecv/default.nix index 5c401fe799b..9ab250f78af 100644 --- a/pkgs/development/python-modules/remotecv/default.nix +++ b/pkgs/development/python-modules/remotecv/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OpenCV worker for facial and feature recognition"; - homepage = https://github.com/thumbor/remotecv/wiki; + homepage = "https://github.com/thumbor/remotecv/wiki"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; broken = true; # no longer compatible with latest pillow diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index 46f562ee5d6..7769adf2219 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -11,7 +11,7 @@ buildPythonPackage { disabled = isPy33; src = fetchgit { - url = https://github.com/aresch/rencode; + url = "https://github.com/aresch/rencode"; rev = "b45e04abdca0dea36e383a8199783269f186c99e"; sha256 = "b4bd82852d4220e8a9493d3cfaecbc57b1325708a2d48c0f8acf262edb10dc40"; }; @@ -19,7 +19,7 @@ buildPythonPackage { buildInputs = [ cython ]; meta = with stdenv.lib; { - homepage = https://github.com/aresch/rencode; + homepage = "https://github.com/aresch/rencode"; description = "Fast (basic) object serialization similar to bencode"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index 619da0e28bf..e37a8f57e9e 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -42,6 +42,6 @@ in buildPythonPackage rec { meta = { description = "An Open Source Python library for generating PDFs and graphics"; - homepage = http://www.reportlab.com/; + homepage = "http://www.reportlab.com/"; }; } diff --git a/pkgs/development/python-modules/repoze_lru/default.nix b/pkgs/development/python-modules/repoze_lru/default.nix index ef2a7fb246a..afaac0b35f3 100644 --- a/pkgs/development/python-modules/repoze_lru/default.nix +++ b/pkgs/development/python-modules/repoze_lru/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tiny LRU cache implementation and decorator"; - homepage = http://www.repoze.org/; + homepage = "http://www.repoze.org/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix index 9e144340fb3..0cc55ef7fea 100644 --- a/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix +++ b/pkgs/development/python-modules/repoze_sphinx_autointerface/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface sphinx ]; meta = with stdenv.lib; { - homepage = https://github.com/repoze/repoze.sphinx.autointerface; + homepage = "https://github.com/repoze/repoze.sphinx.autointerface"; description = "Auto-generate Sphinx API docs from Zope interfaces"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 2d4d24cf805..43fd7fe67de 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Reproject astronomical images"; - homepage = https://reproject.readthedocs.io; + homepage = "https://reproject.readthedocs.io"; license = licenses.bsd3; maintainers = [ maintainers.smaret ]; }; diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 46d1dbdbbd6..2cbbee3c9c4 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Amazon Web Services version 4 authentication for the Python Requests library."; - homepage = https://github.com/sam-washington/requests-aws4auth; + homepage = "https://github.com/sam-washington/requests-aws4auth"; license = licenses.mit; maintainers = [ maintainers.basvandijk ]; }; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index e2409ec598f..4042197e1c3 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Persistent cache for requests library"; - homepage = https://pypi.python.org/pypi/requests-cache; + homepage = "https://pypi.python.org/pypi/requests-cache"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/requests-file/default.nix b/pkgs/development/python-modules/requests-file/default.nix index fac22217651..6c94144ef15 100644 --- a/pkgs/development/python-modules/requests-file/default.nix +++ b/pkgs/development/python-modules/requests-file/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six ]; meta = { - homepage = https://github.com/dashea/requests-file; + homepage = "https://github.com/dashea/requests-file"; description = "Transport adapter for fetching file:// URLs with the requests python library"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index dd802abdb55..c4394fa87cd 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "OAuthlib authentication support for Requests"; - homepage = https://github.com/requests/requests-oauthlib; + homepage = "https://github.com/requests/requests-oauthlib"; maintainers = with maintainers; [ prikhi ]; }; } diff --git a/pkgs/development/python-modules/requests-toolbelt/default.nix b/pkgs/development/python-modules/requests-toolbelt/default.nix index 8dba9a91226..5a87d0a0e05 100644 --- a/pkgs/development/python-modules/requests-toolbelt/default.nix +++ b/pkgs/development/python-modules/requests-toolbelt/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = { description = "A toolbelt of useful classes and functions to be used with python-requests"; - homepage = http://toolbelt.rtfd.org; + homepage = "http://toolbelt.rtfd.org"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; diff --git a/pkgs/development/python-modules/requests-unixsocket/default.nix b/pkgs/development/python-modules/requests-unixsocket/default.nix index d0deaba9244..a244b9ba30c 100644 --- a/pkgs/development/python-modules/requests-unixsocket/default.nix +++ b/pkgs/development/python-modules/requests-unixsocket/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Use requests to talk HTTP via a UNIX domain socket"; - homepage = https://github.com/msabramo/requests-unixsocket; + homepage = "https://github.com/msabramo/requests-unixsocket"; license = licenses.asl20; maintainers = [ maintainers.catern ]; }; diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 260c0329576..3d216e4bc44 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An Apache2 licensed HTTP library, written in Python, for human beings"; - homepage = http://docs.python-requests.org/en/latest/; + homepage = "http://docs.python-requests.org/en/latest/"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 8062834e180..3c265a5955e 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Download files using requests and save them to a target path"; - homepage = https://www.github.com/takluyver/requests_download; + homepage = "https://www.github.com/takluyver/requests_download"; license = lib.licenses.mit; maintainers = [ lib.maintainers.fridh ]; }; diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests_ntlm/default.nix index 12cbae543ce..2a34f73c0a7 100644 --- a/pkgs/development/python-modules/requests_ntlm/default.nix +++ b/pkgs/development/python-modules/requests_ntlm/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "HTTP NTLM authentication support for python-requests"; - homepage = https://github.com/requests/requests-ntlm; + homepage = "https://github.com/requests/requests-ntlm"; license = licenses.isc; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index a83e196005d..43088cf5122 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/bmcfee/resampy; + homepage = "https://github.com/bmcfee/resampy"; description = "Efficient signal resampling"; license = licenses.isc; }; diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix index 5163c7389b2..09b713dc87c 100644 --- a/pkgs/development/python-modules/restrictedpython/default.nix +++ b/pkgs/development/python-modules/restrictedpython/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/zopefoundation/RestrictedPython; + homepage = "https://github.com/zopefoundation/RestrictedPython"; description = "A restricted execution environment for Python to run untrusted code"; license = lib.licenses.zpl21; maintainers = with lib.maintainers; [ juaningan ]; diff --git a/pkgs/development/python-modules/restructuredtext_lint/default.nix b/pkgs/development/python-modules/restructuredtext_lint/default.nix index 340c558b7a4..4f62d232ab5 100644 --- a/pkgs/development/python-modules/restructuredtext_lint/default.nix +++ b/pkgs/development/python-modules/restructuredtext_lint/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "reStructuredText linter"; - homepage = https://github.com/twolfson/restructuredtext-lint; + homepage = "https://github.com/twolfson/restructuredtext-lint"; license = lib.licenses.unlicense; }; } diff --git a/pkgs/development/python-modules/restview/default.nix b/pkgs/development/python-modules/restview/default.nix index a6b22220da3..715a4cfb43f 100644 --- a/pkgs/development/python-modules/restview/default.nix +++ b/pkgs/development/python-modules/restview/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "ReStructuredText viewer"; - homepage = https://mg.pov.lt/restview/; + homepage = "https://mg.pov.lt/restview/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/retry/default.nix b/pkgs/development/python-modules/retry/default.nix index a4743dcbfe4..03deee5bae2 100644 --- a/pkgs/development/python-modules/retry/default.nix +++ b/pkgs/development/python-modules/retry/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Easy to use retry decorator"; - homepage = https://github.com/invl/retry; + homepage = "https://github.com/invl/retry"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/retry_decorator/default.nix b/pkgs/development/python-modules/retry_decorator/default.nix index 496705acbc4..ea6a214691e 100644 --- a/pkgs/development/python-modules/retry_decorator/default.nix +++ b/pkgs/development/python-modules/retry_decorator/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/pnpnpn/retry-decorator; + homepage = "https://github.com/pnpnpn/retry-decorator"; description = "Retry Decorator for python functions"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix index 9074634e9b6..75a17fb6dc4 100644 --- a/pkgs/development/python-modules/retrying/default.nix +++ b/pkgs/development/python-modules/retrying/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/rholder/retrying; + homepage = "https://github.com/rholder/retrying"; description = "General-purpose retrying library"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/rfc-bibtex/default.nix b/pkgs/development/python-modules/rfc-bibtex/default.nix index dd114fd7096..7eb79d1b251 100644 --- a/pkgs/development/python-modules/rfc-bibtex/default.nix +++ b/pkgs/development/python-modules/rfc-bibtex/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { disabled = !isPy3k; meta = with stdenv.lib; { - homepage = https://github.com/iluxonchik/rfc-bibtex/; + homepage = "https://github.com/iluxonchik/rfc-bibtex/"; description = "Generate Bibtex entries for IETF RFCs and Internet-Drafts"; license = licenses.mit; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix index eda1be2c110..7d8a44365c4 100644 --- a/pkgs/development/python-modules/rfc3986/default.nix +++ b/pkgs/development/python-modules/rfc3986/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://rfc3986.readthedocs.org; + homepage = "https://rfc3986.readthedocs.org"; license = licenses.asl20; description = "Validating URI References per RFC 3986"; }; diff --git a/pkgs/development/python-modules/rfc7464/default.nix b/pkgs/development/python-modules/rfc7464/default.nix index 60a5308d718..9e5a5d3689d 100644 --- a/pkgs/development/python-modules/rfc7464/default.nix +++ b/pkgs/development/python-modules/rfc7464/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/moshez/rfc7464; + homepage = "https://github.com/moshez/rfc7464"; description = "RFC 7464 is a proposed standard for streaming JSON documents."; license = [ licenses.mit ]; maintainers = with maintainers; [ shlevy ]; diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index 577c21d6e0b..bfc53910b29 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -6,7 +6,7 @@ buildPythonPackage { format = "other"; src = fetchurl { - url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm; + url = "http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm"; sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16"; }; diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 258ad7cece1..6bb9eb71773 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Lean Persistent Homology Library for Python"; - homepage = https://ripser.scikit-tda.org; + homepage = "https://ripser.scikit-tda.org"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/rjsmin/default.nix b/pkgs/development/python-modules/rjsmin/default.nix index 287ae0391df..49520b1ee45 100644 --- a/pkgs/development/python-modules/rjsmin/default.nix +++ b/pkgs/development/python-modules/rjsmin/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://opensource.perlig.de/rjsmin/; + homepage = "http://opensource.perlig.de/rjsmin/"; license = licenses.asl20; description = "Javascript minifier written in python"; }; diff --git a/pkgs/development/python-modules/robomachine/default.nix b/pkgs/development/python-modules/robomachine/default.nix index c1695a25b45..11fff472e98 100644 --- a/pkgs/development/python-modules/robomachine/default.nix +++ b/pkgs/development/python-modules/robomachine/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Test data generator for Robot Framework"; - homepage = https://github.com/mkorpela/RoboMachine; + homepage = "https://github.com/mkorpela/RoboMachine"; license = licenses.asl20; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index a86e17e921b..53b909844ac 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { meta = with lib; { description = "Open-source software for robot simulation, integrated with OpenAI Gym"; - homepage = https://github.com/openai/roboschool; + homepage = "https://github.com/openai/roboschool"; license = licenses.mit; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/robot-detection/default.nix b/pkgs/development/python-modules/robot-detection/default.nix index 81428b44ad9..5cf864cd801 100644 --- a/pkgs/development/python-modules/robot-detection/default.nix +++ b/pkgs/development/python-modules/robot-detection/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for detecting if a HTTP User Agent header is likely to be a bot"; - homepage = https://github.com/rory/robot-detection; + homepage = "https://github.com/rory/robot-detection"; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix index 6af58312523..73b538aa12f 100644 --- a/pkgs/development/python-modules/robotframework-databaselibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-databaselibrary/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Database Library contains utilities meant for Robot Framework"; - homepage = https://github.com/franz-see/Robotframework-Database-Library; + homepage = "https://github.com/franz-see/Robotframework-Database-Library"; license = licenses.asl20; maintainers = with maintainers; [ talkara ]; }; diff --git a/pkgs/development/python-modules/robotframework-requests/default.nix b/pkgs/development/python-modules/robotframework-requests/default.nix index 9baf3e40227..b0cb616dbde 100644 --- a/pkgs/development/python-modules/robotframework-requests/default.nix +++ b/pkgs/development/python-modules/robotframework-requests/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Robot Framework keyword library wrapper around the HTTP client library requests"; - homepage = https://github.com/bulkan/robotframework-requests; + homepage = "https://github.com/bulkan/robotframework-requests"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/robotframework-ride/default.nix b/pkgs/development/python-modules/robotframework-ride/default.nix index 4db1db04acc..368c4e4c15a 100644 --- a/pkgs/development/python-modules/robotframework-ride/default.nix +++ b/pkgs/development/python-modules/robotframework-ride/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Light-weight and intuitive editor for Robot Framework test case files"; - homepage = https://code.google.com/p/robotframework-ride/; + homepage = "https://code.google.com/p/robotframework-ride/"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/robotframework-selenium2library/default.nix b/pkgs/development/python-modules/robotframework-selenium2library/default.nix index 67f04f4f991..14ce2db5d0b 100644 --- a/pkgs/development/python-modules/robotframework-selenium2library/default.nix +++ b/pkgs/development/python-modules/robotframework-selenium2library/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Web testing library for Robot Framework"; - homepage = https://github.com/robotframework/Selenium2Library; + homepage = "https://github.com/robotframework/Selenium2Library"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix index 7294126f516..2bba9cfbdd8 100644 --- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Web testing library for Robot Framework"; - homepage = https://github.com/robotframework/SeleniumLibrary; + homepage = "https://github.com/robotframework/SeleniumLibrary"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix index b5ca464938b..e9565cff159 100644 --- a/pkgs/development/python-modules/robotframework-sshlibrary/default.nix +++ b/pkgs/development/python-modules/robotframework-sshlibrary/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "SSHLibrary is a Robot Framework test library for SSH and SFTP"; - homepage = https://github.com/robotframework/SSHLibrary; + homepage = "https://github.com/robotframework/SSHLibrary"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/robotframework-tools/default.nix b/pkgs/development/python-modules/robotframework-tools/default.nix index 97bc9de0bf7..0ed0bcaf494 100644 --- a/pkgs/development/python-modules/robotframework-tools/default.nix +++ b/pkgs/development/python-modules/robotframework-tools/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Tools for Robot Framework and Test Libraries"; - homepage = https://bitbucket.org/userzimmermann/robotframework-tools; + homepage = "https://bitbucket.org/userzimmermann/robotframework-tools"; license = licenses.gpl3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/robotframework/default.nix b/pkgs/development/python-modules/robotframework/default.nix index bd96da28964..a1251fa0093 100644 --- a/pkgs/development/python-modules/robotframework/default.nix +++ b/pkgs/development/python-modules/robotframework/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generic test automation framework"; - homepage = https://robotframework.org/; + homepage = "https://robotframework.org/"; license = licenses.asl20; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/robotstatuschecker/default.nix b/pkgs/development/python-modules/robotstatuschecker/default.nix index 1a2ef201c50..c5094b4ee59 100644 --- a/pkgs/development/python-modules/robotstatuschecker/default.nix +++ b/pkgs/development/python-modules/robotstatuschecker/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tool for checking that Robot Framework test cases have expected statuses and log messages"; - homepage = https://github.com/robotframework/statuschecker; + homepage = "https://github.com/robotframework/statuschecker"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/robotsuite/default.nix b/pkgs/development/python-modules/robotsuite/default.nix index 59ef766adf1..75b7fac0cfc 100644 --- a/pkgs/development/python-modules/robotsuite/default.nix +++ b/pkgs/development/python-modules/robotsuite/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python unittest test suite for Robot Framework"; - homepage = https://github.com/collective/robotsuite/; + homepage = "https://github.com/collective/robotsuite/"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/rocket-errbot/default.nix b/pkgs/development/python-modules/rocket-errbot/default.nix index 616927531a5..29970e7fd28 100644 --- a/pkgs/development/python-modules/rocket-errbot/default.nix +++ b/pkgs/development/python-modules/rocket-errbot/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }) ]; meta = { - homepage = https://github.com/errbotio/rocket; + homepage = "https://github.com/errbotio/rocket"; description = "Modern, multi-threaded and extensible web server"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/roku/default.nix b/pkgs/development/python-modules/roku/default.nix new file mode 100644 index 00000000000..6cdfa2aa15b --- /dev/null +++ b/pkgs/development/python-modules/roku/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, buildPythonPackage, requests, pytest, flask, isPy27 +}: + +buildPythonPackage rec { + version = "4.1"; + pname = "roku"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "jcarbaugh"; + repo = "python-roku"; + rev = "v${version}"; + sha256 = "09mq59kjll7gj1srw4qc921ncsm7cld95sbz5v3p2bwmgckpqza7"; + }; + + propagatedBuildInputs = [ requests ]; + + checkInputs = [ pytest flask ]; + pythonImportsCheck = [ "roku" ]; + + meta = with stdenv.lib; { + description = "Screw remotes. Control your Roku with Python."; + homepage = "https://github.com/jcarbaugh/python-roku"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/rope/default.nix b/pkgs/development/python-modules/rope/default.nix index c14b4f36407..6bcc05fb34d 100644 --- a/pkgs/development/python-modules/rope/default.nix +++ b/pkgs/development/python-modules/rope/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "rope"; - version = "0.14.0"; + version = "0.16.0"; disabled = pythonAtLeast "3.8"; # 0.17 should support Python 3.8 src = fetchPypi { inherit pname version; - sha256 = "1bwayj0hh459s3yh0sdrxksr9wfilgi3a49izfaj06kvgyladif5"; + sha256 = "1zlxdrs6ww2hm41izz67h67z9dkm0rlgw8m04vygaip0q91030yj"; }; checkInputs = [ nose ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python refactoring library"; - homepage = https://github.com/python-rope/rope; + homepage = "https://github.com/python-rope/rope"; maintainers = with maintainers; [ goibhniu ]; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/ropper/default.nix b/pkgs/development/python-modules/ropper/default.nix index 9a0b91fdeb8..51fc191dd46 100644 --- a/pkgs/development/python-modules/ropper/default.nix +++ b/pkgs/development/python-modules/ropper/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { checkInputs = [pytest]; propagatedBuildInputs = [ capstone filebytes ]; meta = with stdenv.lib; { - homepage = https://scoding.de/ropper/; + homepage = "https://scoding.de/ropper/"; license = licenses.bsd3; description = "Show information about files in different file formats"; maintainers = with maintainers; [ bennofs ]; diff --git a/pkgs/development/python-modules/routes/default.nix b/pkgs/development/python-modules/routes/default.nix index 1e2e67c6206..985f6244cc6 100644 --- a/pkgs/development/python-modules/routes/default.nix +++ b/pkgs/development/python-modules/routes/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python re-implementation of the Rails routes system for mapping URLs to application actions"; - homepage = http://routes.groovie.org/; + homepage = "http://routes.groovie.org/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/rpdb/default.nix b/pkgs/development/python-modules/rpdb/default.nix index 8b22ef967d5..d7faeeaed7c 100644 --- a/pkgs/development/python-modules/rpdb/default.nix +++ b/pkgs/development/python-modules/rpdb/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "pdb wrapper with remote access via tcp socket"; - homepage = https://github.com/tamentis/rpdb; + homepage = "https://github.com/tamentis/rpdb"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/rpkg/default.nix b/pkgs/development/python-modules/rpkg/default.nix index bbe20fd1e82..2be6830130d 100644 --- a/pkgs/development/python-modules/rpkg/default.nix +++ b/pkgs/development/python-modules/rpkg/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for dealing with rpm packaging"; - homepage = https://pagure.io/fedpkg; + homepage = "https://pagure.io/fedpkg"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/rply/default.nix b/pkgs/development/python-modules/rply/default.nix index a468bee275c..1c4fd16eedf 100644 --- a/pkgs/development/python-modules/rply/default.nix +++ b/pkgs/development/python-modules/rply/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python Lex/Yacc that works with RPython"; - homepage = https://github.com/alex/rply; + homepage = "https://github.com/alex/rply"; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/development/python-modules/rpmfluff/default.nix b/pkgs/development/python-modules/rpmfluff/default.nix index 76fc508a5d8..1893f7dd19c 100644 --- a/pkgs/development/python-modules/rpmfluff/default.nix +++ b/pkgs/development/python-modules/rpmfluff/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "lightweight way of building RPMs, and sabotaging them"; - homepage = https://pagure.io/rpmfluff; + homepage = "https://pagure.io/rpmfluff"; license = licenses.gpl2; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/development/python-modules/rpy2/2.nix b/pkgs/development/python-modules/rpy2/2.nix index aef184d4afc..e178d3c8211 100644 --- a/pkgs/development/python-modules/rpy2/2.nix +++ b/pkgs/development/python-modules/rpy2/2.nix @@ -99,7 +99,7 @@ buildPythonPackage rec { ''; meta = { - homepage = http://rpy.sourceforge.net/rpy2; + homepage = "http://rpy.sourceforge.net/rpy2"; description = "Python interface to R"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix index 613e7af7d3a..c0c0420e925 100644 --- a/pkgs/development/python-modules/rpy2/default.nix +++ b/pkgs/development/python-modules/rpy2/default.nix @@ -98,7 +98,7 @@ buildPythonPackage rec { ]; meta = { - homepage = http://rpy.sourceforge.net/rpy2; + homepage = "http://rpy.sourceforge.net/rpy2"; description = "Python interface to R"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/rpyc/default.nix b/pkgs/development/python-modules/rpyc/default.nix index 5b2345f803e..5b6dba0f9ed 100644 --- a/pkgs/development/python-modules/rpyc/default.nix +++ b/pkgs/development/python-modules/rpyc/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Remote Python Call (RPyC), a transparent and symmetric RPC library"; - homepage = https://rpyc.readthedocs.org; + homepage = "https://rpyc.readthedocs.org"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 1b3d339b078..459ca043796 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://stuvel.eu/rsa; + homepage = "https://stuvel.eu/rsa"; license = licenses.asl20; description = "A pure-Python RSA implementation"; }; diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index c1d27488bdd..2dd724a9f54 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python object API for managing the Linux LIO kernel target"; - homepage = https://github.com/open-iscsi/rtslib-fb; + homepage = "https://github.com/open-iscsi/rtslib-fb"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index f3784342281..4f042dcf90f 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ hypothesis ]; meta = with stdenv.lib; { - homepage = https://github.com/d9pouces/RubyMarshal/; + homepage = "https://github.com/d9pouces/RubyMarshal/"; description = "Read and write Ruby-marshalled data"; license = licenses.wtfpl; maintainers = [ maintainers.ryantm ]; diff --git a/pkgs/development/python-modules/ruffus/default.nix b/pkgs/development/python-modules/ruffus/default.nix index 37222964b04..b3f09ee88ff 100644 --- a/pkgs/development/python-modules/ruffus/default.nix +++ b/pkgs/development/python-modules/ruffus/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Light-weight Python Computational Pipeline Management"; - homepage = http://www.ruffus.org.uk; + homepage = "http://www.ruffus.org.uk"; license = licenses.mit; maintainers = [ maintainers.kiwi ]; }; diff --git a/pkgs/development/python-modules/runsnakerun/default.nix b/pkgs/development/python-modules/runsnakerun/default.nix index b3a38320a2b..6d601197d76 100644 --- a/pkgs/development/python-modules/runsnakerun/default.nix +++ b/pkgs/development/python-modules/runsnakerun/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "GUI Viewer for Python profiling runs"; - homepage = http://www.vrplumber.com/programming/runsnakerun/; + homepage = "http://www.vrplumber.com/programming/runsnakerun/"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index fca11c100cf..d2d63b2b5c4 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Helper library for creating Runway models"; - homepage = https://github.com/runwayml/model-sdk; + homepage = "https://github.com/runwayml/model-sdk"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/rx/default.nix b/pkgs/development/python-modules/rx/default.nix index 6183596ef7d..fd57a8013c1 100644 --- a/pkgs/development/python-modules/rx/default.nix +++ b/pkgs/development/python-modules/rx/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/ReactiveX/RxPY; + homepage = "https://github.com/ReactiveX/RxPY"; description = "Reactive Extensions for Python"; maintainers = with lib.maintainers; [ thanegill ]; license = lib.licenses.asl20; diff --git a/pkgs/development/python-modules/rxv/default.nix b/pkgs/development/python-modules/rxv/default.nix index 8133936798e..7f3e6527d06 100644 --- a/pkgs/development/python-modules/rxv/default.nix +++ b/pkgs/development/python-modules/rxv/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automation Library for Yamaha RX-V473, RX-V573, RX-V673, RX-V773 receivers"; - homepage = https://github.com/wuub/rxv; + homepage = "https://github.com/wuub/rxv"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 0f800c14fa9..c6241e88ef9 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "S3FS builds on boto3 to provide a convenient Python filesystem interface for S3."; - homepage = https://github.com/dask/s3fs/; + homepage = "https://github.com/dask/s3fs/"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/s3transfer/default.nix b/pkgs/development/python-modules/s3transfer/default.nix index 18ffbc4e5c3..27551a798d7 100644 --- a/pkgs/development/python-modules/s3transfer/default.nix +++ b/pkgs/development/python-modules/s3transfer/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/boto/s3transfer; + homepage = "https://github.com/boto/s3transfer"; license = stdenv.lib.licenses.asl20; description = "A library for managing Amazon S3 transfers"; }; diff --git a/pkgs/development/python-modules/salmon-mail/default.nix b/pkgs/development/python-modules/salmon-mail/default.nix index afd915ed840..a33bec431d6 100644 --- a/pkgs/development/python-modules/salmon-mail/default.nix +++ b/pkgs/development/python-modules/salmon-mail/default.nix @@ -1,26 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, nose, dnspython -, chardet, lmtpd, python-daemon, six, jinja2, mock }: +{ stdenv, buildPythonPackage, fetchPypi, dnspython, chardet, lmtpd +, python-daemon, six, jinja2, mock, click }: buildPythonPackage rec { pname = "salmon-mail"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "0ddd9nwdmiibk3jaampznm8nai5b7zalp0f8c65l71674300bqnw"; + sha256 = "0q2m6xri1b7qv46rqpv2qfdgk2jvswj8lpaacnxwjna3m685fhfx"; }; - checkInputs = [ nose jinja2 mock ]; - propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six ]; + checkInputs = [ jinja2 mock ]; + propagatedBuildInputs = [ chardet dnspython lmtpd python-daemon six click ]; + + # Darwin tests fail without this. See: + # https://github.com/NixOS/nixpkgs/pull/82166#discussion_r399909846 + __darwinAllowLocalNetworking = true; # The tests use salmon executable installed by salmon itself so we need to add # that to PATH checkPhase = '' - PATH=$out/bin:$PATH nosetests . + PATH=$out/bin:$PATH python setup.py test ''; meta = with stdenv.lib; { - homepage = https://salmon-mail.readthedocs.org/; + homepage = "https://salmon-mail.readthedocs.org/"; description = "Pythonic mail application server"; license = licenses.gpl3; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/development/python-modules/sampledata/default.nix b/pkgs/development/python-modules/sampledata/default.nix index fcc27e3c4db..93d45b3d1a0 100644 --- a/pkgs/development/python-modules/sampledata/default.nix +++ b/pkgs/development/python-modules/sampledata/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "Sample Data generator for Python "; - homepage = https://github.com/jespino/sampledata; + homepage = "https://github.com/jespino/sampledata"; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/samplerate/default.nix b/pkgs/development/python-modules/samplerate/default.nix index 8de675d4ea1..02278d9be41 100644 --- a/pkgs/development/python-modules/samplerate/default.nix +++ b/pkgs/development/python-modules/samplerate/default.nix @@ -9,7 +9,7 @@ buildPythonPackage { version = "0.3.3"; src = pkgs.fetchgit { - url = https://github.com/cournape/samplerate; + url = "https://github.com/cournape/samplerate"; rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210"; sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg"; }; @@ -28,7 +28,7 @@ buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/cournape/samplerate; + homepage = "https://github.com/cournape/samplerate"; description = "High quality sampling rate convertion from audio data in numpy arrays"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/sandboxlib/default.nix b/pkgs/development/python-modules/sandboxlib/default.nix index 1a3511dab97..541bd810871 100644 --- a/pkgs/development/python-modules/sandboxlib/default.nix +++ b/pkgs/development/python-modules/sandboxlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Sandboxing Library for Python"; - homepage = https://pypi.python.org/pypi/sandboxlib/0.3.1; + homepage = "https://pypi.python.org/pypi/sandboxlib/0.3.1"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix index 5c1e0e81246..14eb1d9a3f3 100644 --- a/pkgs/development/python-modules/sanic/default.nix +++ b/pkgs/development/python-modules/sanic/default.nix @@ -132,7 +132,7 @@ buildPythonPackage rec { meta = with lib; { description = "A microframework based on uvloop, httptools, and learnings of flask"; - homepage = http://github.com/channelcat/sanic/; + homepage = "http://github.com/channelcat/sanic/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/sarge/default.nix b/pkgs/development/python-modules/sarge/default.nix index 4d7a3a5972f..37a72278d85 100644 --- a/pkgs/development/python-modules/sarge/default.nix +++ b/pkgs/development/python-modules/sarge/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://sarge.readthedocs.org/; + homepage = "https://sarge.readthedocs.org/"; description = "A wrapper for subprocess which provides command pipeline functionality"; license = licenses.bsd3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix index 2aec6dced1c..1715cf2b7c3 100644 --- a/pkgs/development/python-modules/sasmodels/default.nix +++ b/pkgs/development/python-modules/sasmodels/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Library of small angle scattering models"; - homepage = http://sasview.org; + homepage = "http://sasview.org"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ rprospero ]; }; diff --git a/pkgs/development/python-modules/scales/default.nix b/pkgs/development/python-modules/scales/default.nix index 4fb169b1558..0407c1fa86d 100644 --- a/pkgs/development/python-modules/scales/default.nix +++ b/pkgs/development/python-modules/scales/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Stats for Python processes"; - homepage = https://www.github.com/Cue/scales; + homepage = "https://www.github.com/Cue/scales"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/scandir/default.nix b/pkgs/development/python-modules/scandir/default.nix index bc71fde5ced..f92b1f5a6ed 100644 --- a/pkgs/development/python-modules/scandir/default.nix +++ b/pkgs/development/python-modules/scandir/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "A better directory iterator and faster os.walk()"; - homepage = https://github.com/benhoyt/scandir; + homepage = "https://github.com/benhoyt/scandir"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix index 4f058a0761b..ec0ccc102f3 100644 --- a/pkgs/development/python-modules/scapy/default.nix +++ b/pkgs/development/python-modules/scapy/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Powerful interactive network packet manipulation program"; - homepage = https://scapy.net/; + homepage = "https://scapy.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ primeos bjornfor ]; diff --git a/pkgs/development/python-modules/schedule/default.nix b/pkgs/development/python-modules/schedule/default.nix index 4d4ec409e02..118c95cc8c5 100644 --- a/pkgs/development/python-modules/schedule/default.nix +++ b/pkgs/development/python-modules/schedule/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python job scheduling for humans"; - homepage = https://github.com/dbader/schedule; + homepage = "https://github.com/dbader/schedule"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 2c1173ce68f..d4d45e8bd3b 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for validating Python data structures"; - homepage = https://github.com/keleshev/schema; + homepage = "https://github.com/keleshev/schema"; license = licenses.mit; maintainers = [ maintainers.tobim ]; }; diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix index c5e36f8ac07..6391e833114 100644 --- a/pkgs/development/python-modules/scikit-bio/default.nix +++ b/pkgs/development/python-modules/scikit-bio/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://scikit-bio.org/; + homepage = "http://scikit-bio.org/"; description = "Data structures, algorithms and educational resources for bioinformatics"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/scikit-build/default.nix b/pkgs/development/python-modules/scikit-build/default.nix index 8d459e24984..745723a01bc 100644 --- a/pkgs/development/python-modules/scikit-build/default.nix +++ b/pkgs/development/python-modules/scikit-build/default.nix @@ -1,7 +1,28 @@ -{ lib, buildPythonPackage, fetchPypi, wheel, setuptools, packaging -, cmake, ninja, cython, codecov, coverage, six, virtualenv, pathpy -, pytest, pytestcov, pytest-virtualenv, pytest-mock, pytestrunner -, requests, flake8 }: +{ lib +, buildPythonPackage +, fetchPypi +, fetchpatch +, distro +, packaging +, setuptools +, wheel +# Test Inputs +, cmake +, codecov +, coverage +, cython +, flake8 +, ninja +, pathpy +, pytest +, pytestcov +, pytest-mock +, pytestrunner +, pytest-virtualenv +, requests +, six +, virtualenv +}: buildPythonPackage rec { pname = "scikit-build"; @@ -12,15 +33,41 @@ buildPythonPackage rec { sha256 = "7342017cc82dd6178e3b19377389b8a8d1f8b429d9cdb315cfb1094e34a0f526"; }; - propagatedBuildInputs = [ wheel setuptools packaging ]; - checkInputs = [ - cmake ninja cython codecov coverage six pathpy - pytest pytestcov pytest-mock pytest-virtualenv pytestrunner - requests flake8 + propagatedBuildInputs = [ + distro + packaging + setuptools + wheel + ]; + checkInputs = [ + cmake + codecov + coverage + cython + flake8 + ninja + pathpy + pytest + pytestcov + pytest-mock + pytestrunner + pytest-virtualenv + requests + six + virtualenv ]; dontUseCmakeConfigure = true; + # scikit-build PR #458. Remove in version > 0.10.0 + patches = [ + (fetchpatch { + name = "python38-platform_linux_distribution-fix-458"; + url = "https://github.com/scikit-build/scikit-build/commit/faa7284e5bc4c72bc8744987acdf3297b5d2e7e4.patch"; + sha256 = "1hgl3cnkf266zaw534b64c88waxfz9721wha0m6j3hsnxk76ayjv"; + }) + ]; + disabledTests = lib.concatMapStringsSep " and " (s: "not " + s) ([ "test_hello_develop" # tries setuptools develop install "test_source_distribution" # pip has no way to install missing dependencies @@ -35,9 +82,9 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = http://scikit-build.org/; description = "Improved build system generator for CPython C/C++/Fortran/Cython extensions"; + homepage = "http://scikit-build.org/"; license = with licenses; [ mit bsd2 ]; # BSD due to reuses of PyNE code - maintainers = [ maintainers.FlorianFranzen ]; + maintainers = with maintainers; [ FlorianFranzen ]; }; } diff --git a/pkgs/development/python-modules/scikit-fmm/default.nix b/pkgs/development/python-modules/scikit-fmm/default.nix index 122af8cfda2..8705488ba14 100644 --- a/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/pkgs/development/python-modules/scikit-fmm/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python extension module which implements the fast marching method"; - homepage = https://github.com/scikit-fmm/scikit-fmm; + homepage = "https://github.com/scikit-fmm/scikit-fmm"; license = licenses.bsd3; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/scikit-image/default.nix b/pkgs/development/python-modules/scikit-image/default.nix index fa6ced432f7..41f2609df78 100644 --- a/pkgs/development/python-modules/scikit-image/default.nix +++ b/pkgs/development/python-modules/scikit-image/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Image processing routines for SciPy"; - homepage = https://scikit-image.org; + homepage = "https://scikit-image.org"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/scikit-optimize/default.nix b/pkgs/development/python-modules/scikit-optimize/default.nix index f82dc947b06..f8e30397189 100644 --- a/pkgs/development/python-modules/scikit-optimize/default.nix +++ b/pkgs/development/python-modules/scikit-optimize/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sequential model-based optimization toolbox"; - homepage = https://scikit-optimize.github.io/; + homepage = "https://scikit-optimize.github.io/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/scikit-tda/default.nix b/pkgs/development/python-modules/scikit-tda/default.nix index 0c33f7a0dab..f6d573573b9 100644 --- a/pkgs/development/python-modules/scikit-tda/default.nix +++ b/pkgs/development/python-modules/scikit-tda/default.nix @@ -57,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Topological Data Analysis for humans"; - homepage = https://github.com/scikit-tda/scikit-tda; + homepage = "https://github.com/scikit-tda/scikit-tda"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikitlearn/0.20.nix index 92977331a84..790c2970376 100644 --- a/pkgs/development/python-modules/scikitlearn/0.20.nix +++ b/pkgs/development/python-modules/scikitlearn/0.20.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; - homepage = http://scikit-learn.org; + homepage = "http://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index 4830e3fb2ab..d5d5ee8b788 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; - homepage = http://scikit-learn.org; + homepage = "http://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/scikits-odes/default.nix b/pkgs/development/python-modules/scikits-odes/default.nix index ba3d5eaaff0..7927da30c89 100644 --- a/pkgs/development/python-modules/scikits-odes/default.nix +++ b/pkgs/development/python-modules/scikits-odes/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A scikit offering extra ode/dae solvers, as an extension to what is available in scipy"; - homepage = https://github.com/bmcage/odes; + homepage = "https://github.com/bmcage/odes"; license = licenses.bsd3; maintainers = with maintainers; [ flokli idontgetoutmuch ]; platforms = [ "aarch64-linux" "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 6c62adb7821..a9947e7e689 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -55,7 +55,7 @@ in buildPythonPackage rec { meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; - homepage = https://www.scipy.org/; + homepage = "https://www.scipy.org/"; maintainers = with lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index 7c198519331..67eac729644 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "An SVG Optimizer / Cleaner "; - homepage = https://github.com/scour-project/scour; + homepage = "https://github.com/scour-project/scour"; license = licenses.asl20; maintainers = with maintainers; [ worldofpeace ]; }; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix index c57d10cf890..b17be3c77d8 100644 --- a/pkgs/development/python-modules/scp/default.nix +++ b/pkgs/development/python-modules/scp/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jbardin/scp.py; + homepage = "https://github.com/jbardin/scp.py"; description = "SCP module for paramiko"; license = licenses.lgpl3; maintainers = with maintainers; [ xnaveira ]; diff --git a/pkgs/development/python-modules/scripttest/default.nix b/pkgs/development/python-modules/scripttest/default.nix index 2ae7a4c8e36..ab53585fe8c 100644 --- a/pkgs/development/python-modules/scripttest/default.nix +++ b/pkgs/development/python-modules/scripttest/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for testing interactive command-line applications"; - homepage = https://pypi.python.org/pypi/ScriptTest/; + homepage = "https://pypi.python.org/pypi/ScriptTest/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/sdnotify/default.nix b/pkgs/development/python-modules/sdnotify/default.nix index 47845382178..f1a7fc4d52c 100644 --- a/pkgs/development/python-modules/sdnotify/default.nix +++ b/pkgs/development/python-modules/sdnotify/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure Python implementation of systemd's service notification protocol"; - homepage = https://github.com/bb4242/sdnotify; + homepage = "https://github.com/bb4242/sdnotify"; license = licenses.mit; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix index 8555c024c76..7cf062765d3 100644 --- a/pkgs/development/python-modules/seabreeze/default.nix +++ b/pkgs/development/python-modules/seabreeze/default.nix @@ -6,8 +6,9 @@ }: ## Usage -# In NixOS, simply add the `udev` multiple output to services.udev.packages: -# services.udev.packages = [ pkgs.python3Packages.seabreeze.udev ]; +# In NixOS, add the package to services.udev.packages for non-root plugdev +# users to get device access permission: +# services.udev.packages = [ pkgs.python3Packages.seabreeze ]; buildPythonPackage rec { pname = "seabreeze"; @@ -20,11 +21,9 @@ buildPythonPackage rec { sha256 = "0bc2s9ic77gz9m40w89snixphxlzib60xa4f49n4zasjrddfz1l8"; }; - outputs = [ "out" "udev" ]; - postInstall = '' - mkdir -p $udev/lib/udev/rules.d - cp misc/10-oceanoptics.rules $udev/lib/udev/rules.d/10-oceanoptics.rules + mkdir -p $out/etc/udev/rules.d + cp misc/10-oceanoptics.rules $out/etc/udev/rules.d/10-oceanoptics.rules ''; # underlying c libraries are tested and fail diff --git a/pkgs/development/python-modules/secp256k1/default.nix b/pkgs/development/python-modules/secp256k1/default.nix index 6b9f00783fd..2cd7590b83d 100644 --- a/pkgs/development/python-modules/secp256k1/default.nix +++ b/pkgs/development/python-modules/secp256k1/default.nix @@ -40,9 +40,9 @@ buildPythonPackage rec { ''; meta = { - homepage = https://github.com/ludbb/secp256k1-py; + homepage = "https://github.com/ludbb/secp256k1-py"; description = "Python FFI bindings for secp256k1"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ chris-martin ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/secretstorage/2.nix b/pkgs/development/python-modules/secretstorage/2.nix index 8fa044e638a..378be5be313 100644 --- a/pkgs/development/python-modules/secretstorage/2.nix +++ b/pkgs/development/python-modules/secretstorage/2.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/mitya57/secretstorage; + homepage = "https://github.com/mitya57/secretstorage"; description = "Python bindings to FreeDesktop.org Secret Service API"; license = licenses.bsd3; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index e2c3e975b9a..9e2b5df845e 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/mitya57/secretstorage; + homepage = "https://github.com/mitya57/secretstorage"; description = "Python bindings to FreeDesktop.org Secret Service API"; license = licenses.bsd3; maintainers = with maintainers; [ teto ]; diff --git a/pkgs/development/python-modules/selectors2/default.nix b/pkgs/development/python-modules/selectors2/default.nix index 030178fef83..159047eafd7 100644 --- a/pkgs/development/python-modules/selectors2/default.nix +++ b/pkgs/development/python-modules/selectors2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://www.github.com/SethMichaelLarson/selectors2; + homepage = "https://www.github.com/SethMichaelLarson/selectors2"; description = "Back-ported, durable, and portable selectors"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/selectors34/default.nix b/pkgs/development/python-modules/selectors34/default.nix index 7bb66be3096..6d02c9dc79b 100644 --- a/pkgs/development/python-modules/selectors34/default.nix +++ b/pkgs/development/python-modules/selectors34/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A backport of the selectors module from Python 3.4"; - homepage = https://github.com/berkerpeksag/selectors34; + homepage = "https://github.com/berkerpeksag/selectors34"; license = licenses.psfl; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/selenium/default.nix b/pkgs/development/python-modules/selenium/default.nix index ada159aaa12..b32dfe2653e 100644 --- a/pkgs/development/python-modules/selenium/default.nix +++ b/pkgs/development/python-modules/selenium/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { meta = with lib; { description = "The selenium package is used to automate web browser interaction from Python"; - homepage = http://www.seleniumhq.org; + homepage = "http://www.seleniumhq.org"; license = licenses.asl20; maintainers = with maintainers; [ jraygauthier ]; }; diff --git a/pkgs/development/python-modules/semantic/default.nix b/pkgs/development/python-modules/semantic/default.nix index b5855fbb143..f0371f860cf 100644 --- a/pkgs/development/python-modules/semantic/default.nix +++ b/pkgs/development/python-modules/semantic/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Common Natural Language Processing Tasks for Python"; - homepage = https://github.com/crm416/semantic; + homepage = "https://github.com/crm416/semantic"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 3201de0ba46..bc0262a89c9 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -18,7 +18,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; - homepage = https://github.com/k-bx/python-semver; + homepage = "https://github.com/k-bx/python-semver"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/send2trash/default.nix b/pkgs/development/python-modules/send2trash/default.nix index bb9f115590e..16528c976ac 100644 --- a/pkgs/development/python-modules/send2trash/default.nix +++ b/pkgs/development/python-modules/send2trash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Send file to trash natively under macOS, Windows and Linux"; - homepage = https://github.com/hsoft/send2trash; + homepage = "https://github.com/hsoft/send2trash"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/sepaxml/default.nix b/pkgs/development/python-modules/sepaxml/default.nix index 1790ae2e8f5..94fd2d65d46 100644 --- a/pkgs/development/python-modules/sepaxml/default.nix +++ b/pkgs/development/python-modules/sepaxml/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/raphaelm/python-sepaxml/; + homepage = "https://github.com/raphaelm/python-sepaxml/"; description = "SEPA Direct Debit XML generation in python"; license = licenses.mit; maintainers = with maintainers; [ elohmeier ]; diff --git a/pkgs/development/python-modules/seqdiag/default.nix b/pkgs/development/python-modules/seqdiag/default.nix index feddc24985a..b7fba998600 100644 --- a/pkgs/development/python-modules/seqdiag/default.nix +++ b/pkgs/development/python-modules/seqdiag/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)"; - homepage = http://blockdiag.com/; + homepage = "http://blockdiag.com/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index f568ad6b044..353ea1cbe26 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple serialization library based on ast.literal_eval"; - homepage = https://github.com/irmen/Serpent; + homepage = "https://github.com/irmen/Serpent"; license = licenses.mit; maintainers = with maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/serpy/default.nix b/pkgs/development/python-modules/serpy/default.nix index b627322307d..7a1b8348a0e 100644 --- a/pkgs/development/python-modules/serpy/default.nix +++ b/pkgs/development/python-modules/serpy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { meta = { description = "ridiculously fast object serialization"; - homepage = https://github.com/clarkduvall/serpy; + homepage = "https://github.com/clarkduvall/serpy"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/serverlessrepo/default.nix b/pkgs/development/python-modules/serverlessrepo/default.nix index 90be965c4f2..1e6f8307fbc 100644 --- a/pkgs/development/python-modules/serverlessrepo/default.nix +++ b/pkgs/development/python-modules/serverlessrepo/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/awslabs/aws-serverlessrepo-python; + homepage = "https://github.com/awslabs/aws-serverlessrepo-python"; description = "Helpers for working with the AWS Serverless Application Repository"; longDescription = '' A Python library with convenience helpers for working with the diff --git a/pkgs/development/python-modules/serversyncstorage/default.nix b/pkgs/development/python-modules/serversyncstorage/default.nix index 2f7acce976d..e8541da6cd4 100644 --- a/pkgs/development/python-modules/serversyncstorage/default.nix +++ b/pkgs/development/python-modules/serversyncstorage/default.nix @@ -40,7 +40,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { broken = cornice.version != "0.17"; description = "The SyncServer server software, as used by Firefox Sync"; - homepage = https://github.com/mozilla-services/server-syncstorage; + homepage = "https://github.com/mozilla-services/server-syncstorage"; license = licenses.mpl20; maintainers = with maintainers; [ nadrieril ]; }; diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service_identity/default.nix index f39dd48232b..5465fe7c994 100644 --- a/pkgs/development/python-modules/service_identity/default.nix +++ b/pkgs/development/python-modules/service_identity/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { meta = with lib; { description = "Service identity verification for pyOpenSSL"; license = licenses.mit; - homepage = https://service-identity.readthedocs.io; + homepage = "https://service-identity.readthedocs.io"; }; } diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix index e45638edd10..5b678ee1d50 100644 --- a/pkgs/development/python-modules/setproctitle/default.nix +++ b/pkgs/development/python-modules/setproctitle/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Allows a process to change its title (as displayed by system tools such as ps and top)"; - homepage = https://github.com/dvarrazzo/py-setproctitle; + homepage = "https://github.com/dvarrazzo/py-setproctitle"; license = licenses.bsdOriginal; maintainers = with maintainers; [ exi ]; }; diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix index 862a7bc2778..5c0b40b4af4 100644 --- a/pkgs/development/python-modules/setuptools-git/default.nix +++ b/pkgs/development/python-modules/setuptools-git/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Setuptools revision control system plugin for Git"; - homepage = https://pypi.python.org/pypi/setuptools-git; + homepage = "https://pypi.python.org/pypi/setuptools-git"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/setuptools/44.0.nix b/pkgs/development/python-modules/setuptools/44.0.nix index 194b90cb42a..66330ca250f 100644 --- a/pkgs/development/python-modules/setuptools/44.0.nix +++ b/pkgs/development/python-modules/setuptools/44.0.nix @@ -66,7 +66,7 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; - homepage = https://pypi.python.org/pypi/setuptools; + homepage = "https://pypi.python.org/pypi/setuptools"; license = with licenses; [ psfl zpl20 ]; platforms = python.meta.platforms; priority = 10; diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix index 93c6c0ca38e..c4ff18697e5 100644 --- a/pkgs/development/python-modules/setuptools/default.nix +++ b/pkgs/development/python-modules/setuptools/default.nix @@ -66,7 +66,7 @@ in buildPythonPackage rec { meta = with stdenv.lib; { description = "Utilities to facilitate the installation of Python packages"; - homepage = https://pypi.python.org/pypi/setuptools; + homepage = "https://pypi.python.org/pypi/setuptools"; license = with licenses; [ psfl zpl20 ]; platforms = python.meta.platforms; priority = 10; diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix index b423ac9b15b..54622c36e6b 100644 --- a/pkgs/development/python-modules/setuptools_scm/default.nix +++ b/pkgs/development/python-modules/setuptools_scm/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://bitbucket.org/pypa/setuptools_scm/; + homepage = "https://bitbucket.org/pypa/setuptools_scm/"; description = "Handles managing your python package versions in scm metadata"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/pkgs/development/python-modules/setuptoolsdarcs/default.nix index d696a5be08f..5e58f80985f 100644 --- a/pkgs/development/python-modules/setuptoolsdarcs/default.nix +++ b/pkgs/development/python-modules/setuptoolsdarcs/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Setuptools plugin for the Darcs version control system"; - homepage = http://allmydata.org/trac/setuptools_darcs; + homepage = "http://allmydata.org/trac/setuptools_darcs"; license = licenses.bsd0; }; } diff --git a/pkgs/development/python-modules/sfepy/default.nix b/pkgs/development/python-modules/sfepy/default.nix index 36f4f82cb3f..8a37f41086e 100644 --- a/pkgs/development/python-modules/sfepy/default.nix +++ b/pkgs/development/python-modules/sfepy/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { name = "sfepy_${version}"; - version = "2019.2"; + version = "2019.4"; src = fetchurl { url="https://github.com/sfepy/sfepy/archive/release_${version}.tar.gz"; - sha256 = "17dj0wbchcfa6x27yx4d4jix4z4nk6r2640xkqcsw0mf62x5l1pj"; + sha256 = "1l9vgcw09l6bwhgfzlbn68fzpvns25r6nkd1pcp7hz5165hs6zzn"; }; propagatedBuildInputs = [ @@ -33,6 +33,7 @@ buildPythonPackage rec { postPatch = '' # broken test rm tests/test_homogenization_perfusion.py + rm tests/test_splinebox.py # slow tests rm tests/test_input_*.py @@ -54,7 +55,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://sfepy.org/; + homepage = "https://sfepy.org/"; description = "Simple Finite Elements in Python"; license = licenses.bsd3; maintainers = with maintainers; [ wd15 ]; diff --git a/pkgs/development/python-modules/sh/default.nix b/pkgs/development/python-modules/sh/default.nix index aa18f07e49e..913840110c9 100644 --- a/pkgs/development/python-modules/sh/default.nix +++ b/pkgs/development/python-modules/sh/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = { description = "Python subprocess interface"; - homepage = https://pypi.python.org/pypi/sh/; + homepage = "https://pypi.python.org/pypi/sh/"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix index 220726733dc..d895f00285d 100644 --- a/pkgs/development/python-modules/shapely/default.nix +++ b/pkgs/development/python-modules/shapely/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Shapely"; - version = "1.6.4.post2"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "c4b87bb61fc3de59fc1f85e71a79b0c709dc68364d9584473697aad4aa13240f"; + sha256 = "07lmrihj6pa7f99m97hbf2anqlhhwippcdz03bqkyihnlkhry6p2"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/shapely/library-paths.patch b/pkgs/development/python-modules/shapely/library-paths.patch index f75ad7a9486..4081936abe3 100644 --- a/pkgs/development/python-modules/shapely/library-paths.patch +++ b/pkgs/development/python-modules/shapely/library-paths.patch @@ -1,9 +1,9 @@ diff --git a/shapely/geos.py b/shapely/geos.py -index 09bf1ab..837aa98 100644 +index d5a67d2..19b7ffc 100644 --- a/shapely/geos.py +++ b/shapely/geos.py -@@ -55,100 +55,10 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): - "Could not find lib {0} or load any of its variants {1}.".format( +@@ -61,123 +61,11 @@ def load_dll(libname, fallbacks=None, mode=DEFAULT_MODE): + "Could not find lib {} or load any of its variants {}.".format( libname, fallbacks or [])) -_lgeos = None @@ -16,15 +16,25 @@ index 09bf1ab..837aa98 100644 - if len(geos_whl_so) == 1: - _lgeos = CDLL(geos_whl_so[0]) - LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- elif hasattr(sys, 'frozen'): +- geos_pyinstaller_so = glob.glob(os.path.join(sys.prefix, 'libgeos_c-*.so.*')) +- if len(geos_pyinstaller_so) == 1: +- _lgeos = CDLL(geos_pyinstaller_so[0]) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- elif os.getenv('CONDA_PREFIX', ''): +- # conda package. +- _lgeos = CDLL(os.path.join(sys.prefix, 'lib', 'libgeos_c.so')) - else: - alt_paths = [ - 'libgeos_c.so.1', - 'libgeos_c.so', -- # anaconda -- os.path.join(sys.prefix, "lib", "libgeos_c.so"), - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) -- free = load_dll('c').free +- # Necessary for environments with only libc.musl +- c_alt_paths = [ +- 'libc.musl-x86_64.so.1' +- ] +- free = load_dll('c', fallbacks=c_alt_paths).free - free.argtypes = [c_void_p] - free.restype = None - @@ -32,10 +42,19 @@ index 09bf1ab..837aa98 100644 - # Test to see if we have a delocated wheel with a GEOS dylib. - geos_whl_dylib = os.path.abspath(os.path.join(os.path.dirname( - __file__), '.dylibs/libgeos_c.1.dylib')) +- - if os.path.exists(geos_whl_dylib): -- _lgeos = CDLL(geos_whl_dylib) -- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) +- handle = CDLL(None) +- if hasattr(handle, "initGEOS_r"): +- LOG.debug("GEOS already loaded") +- _lgeos = handle +- else: +- _lgeos = CDLL(geos_whl_dylib) +- LOG.debug("Found GEOS DLL: %r, using it.", _lgeos) - +- elif os.getenv('CONDA_PREFIX', ''): +- # conda package. +- _lgeos = CDLL(os.path.join(sys.prefix, 'lib', 'libgeos_c.dylib')) - else: - if hasattr(sys, 'frozen'): - try: @@ -52,12 +71,12 @@ index 09bf1ab..837aa98 100644 - os.path.join(sys._MEIPASS, 'libgeos_c.1.dylib')) - else: - alt_paths = [ -- # anaconda -- os.path.join(sys.prefix, "lib", "libgeos_c.dylib"), - # The Framework build from Kyng Chaos - "/Library/Frameworks/GEOS.framework/Versions/Current/GEOS", - # macports - '/opt/local/lib/libgeos_c.dylib', +- # homebrew +- '/usr/local/lib/libgeos_c.dylib', - ] - _lgeos = load_dll('geos_c', fallbacks=alt_paths) - @@ -66,30 +85,34 @@ index 09bf1ab..837aa98 100644 - free.restype = None - -elif sys.platform == 'win32': -- try: -- egg_dlls = os.path.abspath( -- os.path.join(os.path.dirname(__file__), 'DLLs')) -- if hasattr(sys, "frozen"): -- wininst_dlls = os.path.normpath( -- os.path.abspath(sys.executable + '../../DLLS')) -- else: -- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") -- original_path = os.environ['PATH'] -- os.environ['PATH'] = "%s;%s;%s" % \ -- (egg_dlls, wininst_dlls, original_path) -- _lgeos = load_dll("geos_c.dll", fallbacks=[ -- os.path.join(sys.prefix, "Library", "lib", "geos_c.dll"), -- ]) -- except (ImportError, WindowsError, OSError): -- raise -- -- def free(m): +- if os.getenv('CONDA_PREFIX', ''): +- # conda package. +- _lgeos = CDLL(os.path.join(sys.prefix, 'Library', 'bin', 'geos_c.dll')) +- else: - try: -- cdll.msvcrt.free(m) -- except WindowsError: -- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 -- pass +- egg_dlls = os.path.abspath( +- os.path.join(os.path.dirname(__file__), 'DLLs')) +- if hasattr(sys, '_MEIPASS'): +- wininst_dlls = sys._MEIPASS +- elif hasattr(sys, "frozen"): +- wininst_dlls = os.path.normpath( +- os.path.abspath(sys.executable + '../../DLLS')) +- else: +- wininst_dlls = os.path.abspath(os.__file__ + "../../../DLLs") +- original_path = os.environ['PATH'] +- os.environ['PATH'] = "%s;%s;%s" % \ +- (egg_dlls, wininst_dlls, original_path) +- _lgeos = load_dll("geos_c.dll") +- except (ImportError, WindowsError, OSError): +- raise - +- def free(m): +- try: +- cdll.msvcrt.free(m) +- except WindowsError: +- # XXX: See http://trac.gispython.org/projects/PCL/ticket/149 +- pass + -elif sys.platform == 'sunos5': - _lgeos = load_dll('geos_c', fallbacks=['libgeos_c.so.1', 'libgeos_c.so']) - free = CDLL('libc.so.1').free diff --git a/pkgs/development/python-modules/sharedmem/default.nix b/pkgs/development/python-modules/sharedmem/default.nix index 42277fc00c5..9111fd971ca 100644 --- a/pkgs/development/python-modules/sharedmem/default.nix +++ b/pkgs/development/python-modules/sharedmem/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ numpy ]; meta = { - homepage = http://rainwoodman.github.io/sharedmem/; + homepage = "http://rainwoodman.github.io/sharedmem/"; description = "Easier parallel programming on shared memory computers"; maintainers = with lib.maintainers; [ edwtjo ]; license = lib.licenses.gpl3; diff --git a/pkgs/development/python-modules/shellingham/default.nix b/pkgs/development/python-modules/shellingham/default.nix index 707a79e1055..8bf73209ad8 100644 --- a/pkgs/development/python-modules/shellingham/default.nix +++ b/pkgs/development/python-modules/shellingham/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool to Detect Surrounding Shell"; - homepage = https://github.com/sarugaku/shellingham; + homepage = "https://github.com/sarugaku/shellingham"; license = licenses.isc; maintainers = with maintainers; [ mbode ]; }; diff --git a/pkgs/development/python-modules/shippai/default.nix b/pkgs/development/python-modules/shippai/default.nix index 7682d208603..1bae1c50fb6 100644 --- a/pkgs/development/python-modules/shippai/default.nix +++ b/pkgs/development/python-modules/shippai/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Use Rust failures as Python exceptions"; - homepage = https://github.com/untitaker/shippai; + homepage = "https://github.com/untitaker/shippai"; license = licenses.mit; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/development/python-modules/shortuuid/default.nix b/pkgs/development/python-modules/shortuuid/default.nix index ac2fef9f2df..fc2a25dab5c 100644 --- a/pkgs/development/python-modules/shortuuid/default.nix +++ b/pkgs/development/python-modules/shortuuid/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A generator library for concise, unambiguous and URL-safe UUIDs"; - homepage = https://github.com/stochastic-technologies/shortuuid/; + homepage = "https://github.com/stochastic-technologies/shortuuid/"; license = licenses.bsd3; maintainers = with maintainers; [ zagy ]; }; diff --git a/pkgs/development/python-modules/should-dsl/default.nix b/pkgs/development/python-modules/should-dsl/default.nix index 987d7e60cea..abfe47bfc7a 100644 --- a/pkgs/development/python-modules/should-dsl/default.nix +++ b/pkgs/development/python-modules/should-dsl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Should assertions in Python as clear and readable as possible"; - homepage = http://www.should-dsl.info/; + homepage = "http://www.should-dsl.info/"; license = licenses.mit; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/shouldbe/default.nix b/pkgs/development/python-modules/shouldbe/default.nix index ccff9ff4b9f..1623d216ac9 100644 --- a/pkgs/development/python-modules/shouldbe/default.nix +++ b/pkgs/development/python-modules/shouldbe/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Assertion Helpers inspired by Shouldly"; - homepage = https://pypi.python.org/pypi/shouldbe/; + homepage = "https://pypi.python.org/pypi/shouldbe/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/showit/default.nix b/pkgs/development/python-modules/showit/default.nix index 4060b1a4fc5..0cc37916132 100644 --- a/pkgs/development/python-modules/showit/default.nix +++ b/pkgs/development/python-modules/showit/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "simple and sensible display of images"; - homepage = https://github.com/freeman-lab/showit; + homepage = "https://github.com/freeman-lab/showit"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/shutilwhich/default.nix b/pkgs/development/python-modules/shutilwhich/default.nix index d88141c8b35..a30e23c894e 100644 --- a/pkgs/development/python-modules/shutilwhich/default.nix +++ b/pkgs/development/python-modules/shutilwhich/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Backport of shutil.which"; license = licenses.psfl; - homepage = https://github.com/mbr/shutilwhich; + homepage = "https://github.com/mbr/shutilwhich"; maintainers = with maintainers; [ multun ]; }; } diff --git a/pkgs/development/python-modules/sievelib/default.nix b/pkgs/development/python-modules/sievelib/default.nix index d579f3ef744..8204cc3b415 100644 --- a/pkgs/development/python-modules/sievelib/default.nix +++ b/pkgs/development/python-modules/sievelib/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "Client-side Sieve and Managesieve library written in Python"; - homepage = https://github.com/tonioo/sievelib; + homepage = "https://github.com/tonioo/sievelib"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ leenaars ]; longDescription = '' diff --git a/pkgs/development/python-modules/signedjson/default.nix b/pkgs/development/python-modules/signedjson/default.nix index 1214730dad8..6916b704fcd 100644 --- a/pkgs/development/python-modules/signedjson/default.nix +++ b/pkgs/development/python-modules/signedjson/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ canonicaljson unpaddedbase64 pynacl typing-extensions ]; meta = with stdenv.lib; { - homepage = https://pypi.org/project/signedjson/; + homepage = "https://pypi.org/project/signedjson/"; description = "Sign JSON with Ed25519 signatures"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/simanneal/default.nix b/pkgs/development/python-modules/simanneal/default.nix index ad1f2643e5f..5b084c399ba 100644 --- a/pkgs/development/python-modules/simanneal/default.nix +++ b/pkgs/development/python-modules/simanneal/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python implementation of the simulated annealing optimization technique"; - homepage = https://github.com/perrygeo/simanneal; + homepage = "https://github.com/perrygeo/simanneal"; license = licenses.isc; maintainers = with maintainers; [ veprbl ]; }; diff --git a/pkgs/development/python-modules/simple-salesforce/default.nix b/pkgs/development/python-modules/simple-salesforce/default.nix index 1eacd25bede..3b6803aa5de 100644 --- a/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/pkgs/development/python-modules/simple-salesforce/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { meta = with lib; { description = "A very simple Salesforce.com REST API client for Python"; - homepage = https://github.com/simple-salesforce/simple-salesforce; + homepage = "https://github.com/simple-salesforce/simple-salesforce"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/simple-websocket-server/default.nix b/pkgs/development/python-modules/simple-websocket-server/default.nix index 312f58bf9fa..c8020681372 100644 --- a/pkgs/development/python-modules/simple-websocket-server/default.nix +++ b/pkgs/development/python-modules/simple-websocket-server/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A python based websocket server that is simple and easy to use"; - homepage = https://github.com/dpallot/simple-websocket-server/; + homepage = "https://github.com/dpallot/simple-websocket-server/"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/simpleai/default.nix b/pkgs/development/python-modules/simpleai/default.nix index 230ac17fa0a..c8d1a99326f 100644 --- a/pkgs/development/python-modules/simpleai/default.nix +++ b/pkgs/development/python-modules/simpleai/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/simpleai-team/simpleai; + homepage = "https://github.com/simpleai-team/simpleai"; description = "This lib implements many of the artificial intelligence algorithms described on the book 'Artificial Intelligence, a Modern Approach'"; maintainers = with maintainers; [ NikolaMandic ]; }; diff --git a/pkgs/development/python-modules/simpleeval/default.nix b/pkgs/development/python-modules/simpleeval/default.nix index 0aded2f423f..cb6f50fdd28 100644 --- a/pkgs/development/python-modules/simpleeval/default.nix +++ b/pkgs/development/python-modules/simpleeval/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { sha256 = "1skvl467kj83rzkhk01i0wm8m5vmh6j5znrfdizn6r18ii45a839"; }; meta = { - homepage = https://github.com/danthedeckie/simpleeval; + homepage = "https://github.com/danthedeckie/simpleeval"; description = "A simple, safe single expression evaluator library"; maintainers = with lib.maintainers; [ johbo ]; license = lib.licenses.mit; diff --git a/pkgs/development/python-modules/simplefix/default.nix b/pkgs/development/python-modules/simplefix/default.nix index 8b84d6a248e..06968443426 100644 --- a/pkgs/development/python-modules/simplefix/default.nix +++ b/pkgs/development/python-modules/simplefix/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple FIX Protocol implementation for Python"; - homepage = https://github.com/da4089/simplefix; + homepage = "https://github.com/da4089/simplefix"; license = licenses.mit; maintainers = with maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/simplegeneric/default.nix b/pkgs/development/python-modules/simplegeneric/default.nix index 491e218154c..ea320a2ad5a 100644 --- a/pkgs/development/python-modules/simplegeneric/default.nix +++ b/pkgs/development/python-modules/simplegeneric/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "Simple generic functions"; - homepage = http://cheeseshop.python.org/pypi/simplegeneric; + homepage = "http://cheeseshop.python.org/pypi/simplegeneric"; license = lib.licenses.zpl21; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix index 54e19d2e604..fe08f5bbe2e 100644 --- a/pkgs/development/python-modules/simplejson/default.nix +++ b/pkgs/development/python-modules/simplejson/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { default, encoding is done in an encoding neutral fashion (plain ASCII with \uXXXX escapes for unicode characters). ''; - homepage = https://github.com/simplejson/simplejson; + homepage = "https://github.com/simplejson/simplejson"; license = with lib.licenses; [ mit afl21 ]; }; } diff --git a/pkgs/development/python-modules/simplekml/default.nix b/pkgs/development/python-modules/simplekml/default.nix index be149e7edea..6b8bac25b87 100644 --- a/pkgs/development/python-modules/simplekml/default.nix +++ b/pkgs/development/python-modules/simplekml/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "simplekml"; - version = "1.3.3"; + version = "1.3.5"; src = fetchPypi { inherit pname version; - sha256 = "08l24gfql83yjcdqb51nnnvckbnfb7bl89am4q9zr0fslrbcn3vf"; + sha256 = "17h48r1dsfz4g9xcxh1xq85h20hiz7qzzymc1gla96bj2wh4wyv5"; }; - doCheck = false; # no tests are defined in 1.3.3 + doCheck = false; # no tests are defined in 1.3.5 meta = with lib; { description = "Generate KML with as little effort as possible"; - homepage = https://readthedocs.org/projects/simplekml/; + homepage = "https://readthedocs.org/projects/simplekml/"; license = licenses.lgpl3Plus; maintainers = with maintainers; [ rvolosatovs ]; }; diff --git a/pkgs/development/python-modules/simpleparse/default.nix b/pkgs/development/python-modules/simpleparse/default.nix index 339f6d1debd..acb07178117 100644 --- a/pkgs/development/python-modules/simpleparse/default.nix +++ b/pkgs/development/python-modules/simpleparse/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Parser Generator for Python"; - homepage = https://pypi.python.org/pypi/SimpleParse; + homepage = "https://pypi.python.org/pypi/SimpleParse"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/simpy/default.nix b/pkgs/development/python-modules/simpy/default.nix index 981b6693f7d..348dd51599f 100644 --- a/pkgs/development/python-modules/simpy/default.nix +++ b/pkgs/development/python-modules/simpy/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://simpy.readthedocs.io/en/latest/; + homepage = "https://simpy.readthedocs.io/en/latest/"; description = "A process-based discrete-event simulation framework based on standard Python."; license = [ licenses.mit ]; maintainers = with maintainers; [ shlevy ]; diff --git a/pkgs/development/python-modules/singledispatch/default.nix b/pkgs/development/python-modules/singledispatch/default.nix index e0b207735df..789a24f3e81 100644 --- a/pkgs/development/python-modules/singledispatch/default.nix +++ b/pkgs/development/python-modules/singledispatch/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "This library brings functools.singledispatch from Python 3.4 to Python 2.6-3.3."; - homepage = https://docs.python.org/3/library/functools.html; + homepage = "https://docs.python.org/3/library/functools.html"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/sipsimple/default.nix b/pkgs/development/python-modules/sipsimple/default.nix index 29e278c211a..76820b6ebc6 100644 --- a/pkgs/development/python-modules/sipsimple/default.nix +++ b/pkgs/development/python-modules/sipsimple/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "SIP SIMPLE implementation for Python"; - homepage = https://sipsimpleclient.org/; + homepage = "https://sipsimpleclient.org/"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; }; diff --git a/pkgs/development/python-modules/six/default.nix b/pkgs/development/python-modules/six/default.nix index 9f949bf8203..46f7f6d38b6 100644 --- a/pkgs/development/python-modules/six/default.nix +++ b/pkgs/development/python-modules/six/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "A Python 2 and 3 compatibility library"; - homepage = https://pypi.python.org/pypi/six/; + homepage = "https://pypi.python.org/pypi/six/"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sklearn-deap/default.nix b/pkgs/development/python-modules/sklearn-deap/default.nix index 47df62dd1c6..e4a01778352 100644 --- a/pkgs/development/python-modules/sklearn-deap/default.nix +++ b/pkgs/development/python-modules/sklearn-deap/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Use evolutionary algorithms instead of gridsearch in scikit-learn"; - homepage = https://github.com/rsteca/sklearn-deap; + homepage = "https://github.com/rsteca/sklearn-deap"; license = licenses.lgpl3; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/slicedimage/default.nix b/pkgs/development/python-modules/slicedimage/default.nix index 3273e5fe3a3..08bdc183186 100644 --- a/pkgs/development/python-modules/slicedimage/default.nix +++ b/pkgs/development/python-modules/slicedimage/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = with lib; { description = "Library to access sliced imaging data"; - homepage = https://github.com/spacetx/slicedimage; + homepage = "https://github.com/spacetx/slicedimage"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/slicerator/default.nix b/pkgs/development/python-modules/slicerator/default.nix index 896ecbdd26b..45d406f560e 100644 --- a/pkgs/development/python-modules/slicerator/default.nix +++ b/pkgs/development/python-modules/slicerator/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/soft-matter/slicerator; + homepage = "https://github.com/soft-matter/slicerator"; description = "A lazy-loading, fancy-sliceable iterable"; license = licenses.bsdOriginal; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix index e82cbe5b705..30654bd03f6 100644 --- a/pkgs/development/python-modules/slimit/default.nix +++ b/pkgs/development/python-modules/slimit/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { # Some patches from https://github.com/rspivak/slimit/pull/65 patches = lib.optionals isPy3k [ (fetchpatch { - url = https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch; + url = "https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch"; sha256 = "0lbhvkgn4l8g9fwvb81rfwjx7hsaq2pid8a5gczdk1ba65wfvdq5"; }) (fetchpatch { - url = https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch; + url = "https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch"; sha256 = "1hv4ysn09c9bfd5bxhhrp51hsi81hdidmx0y7zcrjjiich9ayrni"; }) ]; @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "JavaScript minifier"; - homepage = https://slimit.readthedocs.org/; + homepage = "https://slimit.readthedocs.org/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index 0f12dbb8850..379a7e1b01c 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { runs a suite of vulnerability detectors, prints visual information about contract details, and provides an API to easily write custom analyses. ''; - homepage = https://github.com/trailofbits/slither; + homepage = "https://github.com/trailofbits/slither"; license = licenses.agpl3; maintainers = [ maintainers.asymmetric ]; }; diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix index 53d2006315c..b5315549119 100644 --- a/pkgs/development/python-modules/slixmpp/default.nix +++ b/pkgs/development/python-modules/slixmpp/default.nix @@ -29,6 +29,6 @@ buildPythonPackage rec { meta = { description = "Elegant Python library for XMPP"; license = lib.licenses.mit; - homepage = https://dev.louiz.org/projects/slixmpp; + homepage = "https://dev.louiz.org/projects/slixmpp"; }; } diff --git a/pkgs/development/python-modules/slob/default.nix b/pkgs/development/python-modules/slob/default.nix index 8a6971ceb8f..9e6ba2ff635 100644 --- a/pkgs/development/python-modules/slob/default.nix +++ b/pkgs/development/python-modules/slob/default.nix @@ -7,8 +7,8 @@ }: buildPythonPackage { - name = "slob"; - verison = "unstable-2016-11-03"; + pname = "slob"; + version = "unstable-2016-11-03"; disabled = !isPy3k; src = fetchFromGitHub { @@ -25,7 +25,7 @@ buildPythonPackage { ''; meta = with stdenv.lib; { - homepage = https://github.com/itkach/slob/; + homepage = "https://github.com/itkach/slob/"; description = "Reference implementation of the slob (sorted list of blobs) format"; license = licenses.gpl3; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/development/python-modules/sly/default.nix b/pkgs/development/python-modules/sly/default.nix index 011fa1799ab..273972cbe4e 100644 --- a/pkgs/development/python-modules/sly/default.nix +++ b/pkgs/development/python-modules/sly/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "sly"; - version = "0.3"; + version = "0.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "be6a3825b042a9e1b6f5730fc747e6d983c917f0f002d798d0b9f86ca5c05ad9"; + sha256 = "0an31bm5m8wqwphanmcsbbnmycy6l4xkmg4za4bwq8hk4dm2dwp5"; }; checkInputs = [ pytest ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "An improved PLY implementation of lex and yacc for Python 3"; - homepage = https://github.com/dabeaz/sly; + homepage = "https://github.com/dabeaz/sly"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/smartdc/default.nix b/pkgs/development/python-modules/smartdc/default.nix index 50667ce9398..2fe9926cab9 100644 --- a/pkgs/development/python-modules/smartdc/default.nix +++ b/pkgs/development/python-modules/smartdc/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Joyent SmartDataCenter CloudAPI connector using http-signature authentication via Requests"; - homepage = https://github.com/atl/py-smartdc; + homepage = "https://github.com/atl/py-smartdc"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/smugline/default.nix b/pkgs/development/python-modules/smugline/default.nix index 514a3005725..d779a79ed21 100644 --- a/pkgs/development/python-modules/smugline/default.nix +++ b/pkgs/development/python-modules/smugline/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/gingerlime/smugline; + homepage = "https://github.com/gingerlime/smugline"; description = "A simple command line tool for smugmug "; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/smugpy/default.nix b/pkgs/development/python-modules/smugpy/default.nix index c2028228c31..43ac45b1235 100644 --- a/pkgs/development/python-modules/smugpy/default.nix +++ b/pkgs/development/python-modules/smugpy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for the SmugMug API"; license = with licenses; [ mit ]; - homepage = https://github.com/chrishoffman/smugpy; + homepage = "https://github.com/chrishoffman/smugpy"; }; doCheck = false; # Tries to login to Smugmug… diff --git a/pkgs/development/python-modules/snakebite/default.nix b/pkgs/development/python-modules/snakebite/default.nix index 09945a094c7..b4d83e67227 100644 --- a/pkgs/development/python-modules/snakebite/default.nix +++ b/pkgs/development/python-modules/snakebite/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python HDFS client"; - homepage = https://github.com/spotify/snakebite; + homepage = "https://github.com/spotify/snakebite"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/snakeviz/default.nix b/pkgs/development/python-modules/snakeviz/default.nix index c55d6c7376a..efb0a23a7c6 100644 --- a/pkgs/development/python-modules/snakeviz/default.nix +++ b/pkgs/development/python-modules/snakeviz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Browser based viewer for profiling data"; - homepage = https://jiffyclub.github.io/snakeviz; + homepage = "https://jiffyclub.github.io/snakeviz"; license = licenses.bsd3; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 1e008d96497..ccdaa64b098 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Control Snapcast, a multi-room synchronous audio solution"; - homepage = https://github.com/happyleavesaoc/python-snapcast/; + homepage = "https://github.com/happyleavesaoc/python-snapcast/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/snappergui/default.nix b/pkgs/development/python-modules/snappergui/default.nix index 6b31145d519..ff274c1ba8b 100644 --- a/pkgs/development/python-modules/snappergui/default.nix +++ b/pkgs/development/python-modules/snappergui/default.nix @@ -21,7 +21,7 @@ buildPythonPackage { propagatedBuildInputs = [ pygobject3 dbus-python ]; meta = with stdenv.lib; { - homepage = https://github.com/ricardomv/snapper-gui; + 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/sniffio/default.nix b/pkgs/development/python-modules/sniffio/default.nix index f5674c09e02..82275762ce3 100644 --- a/pkgs/development/python-modules/sniffio/default.nix +++ b/pkgs/development/python-modules/sniffio/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/python-trio/sniffio; + homepage = "https://github.com/python-trio/sniffio"; license = licenses.asl20; description = "Sniff out which async library your code is running under"; }; diff --git a/pkgs/development/python-modules/snowballstemmer/default.nix b/pkgs/development/python-modules/snowballstemmer/default.nix index 61a12c2b298..c546fefcf50 100644 --- a/pkgs/development/python-modules/snowballstemmer/default.nix +++ b/pkgs/development/python-modules/snowballstemmer/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "16 stemmer algorithms (15 + Poerter English stemmer) generated from Snowball algorithms"; - homepage = http://sigal.saimon.org/en/latest/index.html; + homepage = "http://sigal.saimon.org/en/latest/index.html"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/snscrape/default.nix b/pkgs/development/python-modules/snscrape/default.nix index 18a7c2bb209..9f0b805a19d 100644 --- a/pkgs/development/python-modules/snscrape/default.nix +++ b/pkgs/development/python-modules/snscrape/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "snscrape"; - version = "0.3.0"; + version = "0.3.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1f3lyq06l8s4kcsmwbxcwcxnv6mvz9c3zj70np8vnx149p3zi983"; + sha256 = "11jv5mv3l11qjlsjihd74gc1jafq0i7360cksqjkx1wv2hcc32rf"; }; # There are no tests; make sure the executable works. @@ -30,7 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools requests lxml beautifulsoup4 ]; meta = with lib; { - homepage = https://github.com/JustAnotherArchivist/snscrape; + homepage = "https://github.com/JustAnotherArchivist/snscrape"; description = "A social networking service scraper in Python"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ivan ]; diff --git a/pkgs/development/python-modules/snug/default.nix b/pkgs/development/python-modules/snug/default.nix index a697ed0161a..08896467b4e 100644 --- a/pkgs/development/python-modules/snug/default.nix +++ b/pkgs/development/python-modules/snug/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tiny toolkit for writing reusable interactions with web APIs"; license = licenses.mit; - homepage = https://snug.readthedocs.io/en/latest/; + homepage = "https://snug.readthedocs.io/en/latest/"; maintainers = with maintainers; [ mredaelli ]; }; diff --git a/pkgs/development/python-modules/snuggs/default.nix b/pkgs/development/python-modules/snuggs/default.nix index a97bbf4012c..f88b6080fdf 100644 --- a/pkgs/development/python-modules/snuggs/default.nix +++ b/pkgs/development/python-modules/snuggs/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "S-expressions for Numpy"; license = licenses.mit; - homepage = https://github.com/mapbox/snuggs; + homepage = "https://github.com/mapbox/snuggs"; maintainers = with maintainers; [ mredaelli ]; }; } diff --git a/pkgs/development/python-modules/sockjs-tornado/default.nix b/pkgs/development/python-modules/sockjs-tornado/default.nix index 10722e8af06..a74c40486fc 100644 --- a/pkgs/development/python-modules/sockjs-tornado/default.nix +++ b/pkgs/development/python-modules/sockjs-tornado/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ tornado ]; meta = with lib; { - homepage = https://github.com/mrjoes/sockjs-tornado/; + homepage = "https://github.com/mrjoes/sockjs-tornado/"; description = "SockJS python server implementation on top of Tornado framework"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/socksipy-branch/default.nix b/pkgs/development/python-modules/socksipy-branch/default.nix index 37961f898f5..e17f38cb50d 100644 --- a/pkgs/development/python-modules/socksipy-branch/default.nix +++ b/pkgs/development/python-modules/socksipy-branch/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://code.google.com/p/socksipy-branch/; + homepage = "http://code.google.com/p/socksipy-branch/"; description = "This Python module allows you to create TCP connections through a SOCKS proxy without any special effort"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 4a44b7d0b7a..0af09cc01ce 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "soco"; - version = "0.18.1"; + version = "0.19"; src = fetchPypi { inherit pname version; - sha256 = "de033ad69f86a655f50d407648b3aa2dd9647c69fd7bb317e9adfcd38a1adf4b"; + sha256 = "0dgca286vhrabm4r4jj545k895z6w2c70ars06vrjhf9cpgg7qck"; }; postPatch = '' @@ -27,7 +27,7 @@ buildPythonPackage rec { ]; meta = { - homepage = http://python-soco.com/; + homepage = "http://python-soco.com/"; description = "A CLI and library to control Sonos speakers"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 6548c3637a8..93b0e309b7c 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "A set of Python libraries that assist in calling the SoftLayer API."; - homepage = https://github.com/softlayer/softlayer-python; + homepage = "https://github.com/softlayer/softlayer-python"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index f052da2bf7b..306737c4002 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.0.4"; + version = "2.0.5"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "126jaslg8cfap2is3sy3v13xpl9drb80yc5lfsm1nw5s2xcxklqw"; + sha256 = "01zvmqilnndh2b257z7bhcc7av5vhjm1g8gmdiiw15gcd2xfmqjs"; }; propagatedBuildInputs = [ regex ]; diff --git a/pkgs/development/python-modules/sorl_thumbnail/default.nix b/pkgs/development/python-modules/sorl_thumbnail/default.nix index 098e2292efd..1979daf85be 100644 --- a/pkgs/development/python-modules/sorl_thumbnail/default.nix +++ b/pkgs/development/python-modules/sorl_thumbnail/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://sorl-thumbnail.readthedocs.org/en/latest/; + homepage = "https://sorl-thumbnail.readthedocs.org/en/latest/"; description = "Thumbnails for Django"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/sortedcollections/default.nix b/pkgs/development/python-modules/sortedcollections/default.nix index b8261d88628..ffcf0bfeac0 100644 --- a/pkgs/development/python-modules/sortedcollections/default.nix +++ b/pkgs/development/python-modules/sortedcollections/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python Sorted Collections"; - homepage = http://www.grantjenks.com/docs/sortedcollections/; + homepage = "http://www.grantjenks.com/docs/sortedcollections/"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index b2b7f203503..c5ae45b8500 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Python Sorted Container Types: SortedList, SortedDict, and SortedSet"; - homepage = http://www.grantjenks.com/docs/sortedcontainers/; + homepage = "http://www.grantjenks.com/docs/sortedcontainers/"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index e538875da2b..614f0881ff8 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "Play and Record Sound with Python"; - homepage = http://python-sounddevice.rtfd.org/; + homepage = "http://python-sounddevice.rtfd.org/"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/soundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix index ff11e75a0de..dea0e345a99 100644 --- a/pkgs/development/python-modules/soundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "An audio library based on libsndfile, CFFI and NumPy"; license = lib.licenses.bsd3; - homepage = https://github.com/bastibe/PySoundFile; + homepage = "https://github.com/bastibe/PySoundFile"; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 8995e98ca78..b8cdd63cbde 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = { description = "A CSS4 selector implementation for Beautiful Soup"; license = lib.licenses.mit; - homepage = https://github.com/facelessuser/soupsieve; + homepage = "https://github.com/facelessuser/soupsieve"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/spacy/default.nix b/pkgs/development/python-modules/spacy/default.nix index beee4a186c9..0c990962268 100644 --- a/pkgs/development/python-modules/spacy/default.nix +++ b/pkgs/development/python-modules/spacy/default.nix @@ -55,7 +55,7 @@ buildPythonPackage rec { meta = with lib; { description = "Industrial-strength Natural Language Processing (NLP) with Python and Cython"; - homepage = https://github.com/explosion/spaCy; + homepage = "https://github.com/explosion/spaCy"; license = licenses.mit; maintainers = with maintainers; [ danieldk sdll ]; }; diff --git a/pkgs/development/python-modules/spacy/models.json b/pkgs/development/python-modules/spacy/models.json index 4d7eff7fd02..1f1558b23c3 100644 --- a/pkgs/development/python-modules/spacy/models.json +++ b/pkgs/development/python-modules/spacy/models.json @@ -1,43 +1,43 @@ [{ "pname": "de_core_news_md", - "version": "2.2.0", - "sha256": "1n61jg0mxpl5mqpydclq9d2xds14v0blnb0plmnf7qhzzfhrmxq9", + "version": "2.2.5", + "sha256": "1jkc4r0f1916k5qpmpnwawsbnrbscq250q7b1llgxi70f2xyw9gk", "license": "cc-by-sa-40" }, { "pname": "de_core_news_sm", - "version": "2.2.0", - "sha256": "06g2snm57k64il3plgn20l27a00dsr9dcxkyyqj6pq5ih91mfycb", + "version": "2.2.5", + "sha256": "10z30hirfwa692m0zp6wk60ccvqj84i5vjaiyyzd21innysb5y3g", "license": "cc-by-sa-40" }, { "pname": "el_core_news_md", - "version": "2.2.0", - "sha256": "0xgyh5wj9mpbl2mdrk60i3m8wmgaxbf5qviy78qk8zb1jvnxzc2n", + "version": "2.2.5", + "sha256": "1jjmf6rf1hjgqswhpqq2l5w7s351k4kk93c7rr85iv2754f71h36", "license": "cc-by-sa-40" }, { "pname": "el_core_news_sm", - "version": "2.2.0", - "sha256": "0qbf16g6s1xfm2clnmrwr3m3vgmvvsziyhy6jbm6axh8c0fy0j8p", + "version": "2.2.5", + "sha256": "00h55fc27d3jfm3knyidz7a4rasiz7qs4wfs3sl0ndq815yvag0l", "license": "cc-by-sa-40" }, { "pname": "en_core_web_lg", - "version": "2.2.0", - "sha256": "1dxy43kf3vbz4jxc7jkr315hyzmi44v41lf09rax53f3s1jghsbh", + "version": "2.2.5", + "sha256": "1shd4gkshr4a92fhvrjhzn1abywnrcf548cv3dz8dhmi0wxa4klr", "license": "cc-by-sa-40" }, { "pname": "en_core_web_md", - "version": "2.2.0", - "sha256": "13fvr8z7fjhyzc9mm55ah6c2snpj27lrrc0rzgyb0hcg7ghd6v58", + "version": "2.2.5", + "sha256": "1x32vl2a75ps2iyhysjvdygd366zs546s82yzqwj2m7jcsdszrxy", "license": "cc-by-sa-40" }, { "pname": "en_core_web_sm", - "version": "2.2.0", - "sha256": "197afra99lhh84yi6wxvxdxibd1ikaybqfsq2nsmm7ahsw9s3kk5", + "version": "2.2.5", + "sha256": "1vna6zik7863hahxdgz0s80kbbfyw42h4c1k5jby9lkzr5jr1dk0", "license": "cc-by-sa-40" }, { @@ -48,44 +48,44 @@ }, { "pname": "es_core_news_md", - "version": "2.2.0", - "sha256": "0sdps0cdmsd2l3irsg63d874sba9vpn0san0n89rk8h3pa49dpab", + "version": "2.2.5", + "sha256": "0b50gd2mx1klr6ss0fsj58qmw2wpbawwv015pr9vq3j7jq805scl", "license": "cc-by-sa-40" }, { "pname": "es_core_news_sm", - "version": "2.2.0", - "sha256": "073dgna796lk4rm7f25gyyl2ml7dfsb4azd4jkk03kxkcy6ypnag", + "version": "2.2.5", + "sha256": "19hrpxg1a5bvf9j9wlm03rkxfkgrldky7alsgl8bdwnwq3vpbgfi", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_md", - "version": "2.2.0", - "sha256": "0061hnw03189z3ya1gb6506bq8yxrg17v9cywg7zbk6izakxcasr", + "version": "2.2.5", + "sha256": "1y4dqbcwa7gg6z8q84n0j4my7gyia7a2z7pln71sqa78pin06r9b", "license": "cc-by-sa-40" }, { "pname": "fr_core_news_sm", - "version": "2.2.0", - "sha256": "0kj31kx4q9mm7ms622ph2i6pkl1ifm8s5ng3f3khf9ia0vr31vbq", + "version": "2.2.5", + "sha256": "1q2kvznbylyz4frxy5rbvpm5jvm7bfin8g3dks0c1k9hhdymv35y", "license": "cc-by-sa-40" }, { "pname": "it_core_news_sm", - "version": "2.2.0", - "sha256": "0gxmknd68kajak8jr443799bfd69pp5j0jnmcbnyx5abzyq6wkzx", + "version": "2.2.5", + "sha256": "02r3x308s5kn62xpa2cizxfw7cyjk48zm9i6r4vhs8kycmp9z0px", "license": "cc-by-sa-40" }, { "pname": "lt_core_news_sm", - "version": "2.2.0", - "sha256": "1j63xnp96qavg8c960y83z752mmvp9qx92r458lydrg1ixmffx9r", + "version": "2.2.5", + "sha256": "0vy0cff1fw33srqyi93vj03rnzqr8f62p1hwi565b0sb8v3n4p08", "license": "cc-by-sa-40" }, { "pname": "nb_core_news_sm", - "version": "2.2.0", - "sha256": "0s0wf3kxrhdzfkgrbxjc53hzin3w8v06iivazh6bpf6rhbiwzfr0", + "version": "2.2.5", + "sha256": "1kdn3qwlmmd52sjrvi97aiv7xp260bka009jjal79l3qrz4czrw1", "license": "mit" }, { @@ -96,8 +96,8 @@ }, { "pname": "pt_core_news_sm", - "version": "2.2.0", - "sha256": "1fi4wick1x96sj46idic1ad26l9zd2p5smi4v7mkry71xp7d9s13", + "version": "2.2.5", + "sha256": "02p617ybh6wqmq1scch9dgim44rhhj0k81sbw8nysv20pc6wb89a", "license": "cc-by-sa-40" }, { diff --git a/pkgs/development/python-modules/spake2/default.nix b/pkgs/development/python-modules/spake2/default.nix index 2d2f066eaed..4038e2255af 100644 --- a/pkgs/development/python-modules/spake2/default.nix +++ b/pkgs/development/python-modules/spake2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "SPAKE2 password-authenticated key exchange library"; - homepage = https://github.com/warner/python-spake2; + homepage = "https://github.com/warner/python-spake2"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/spambayes/default.nix b/pkgs/development/python-modules/spambayes/default.nix index bbd7cbb210e..f33748379d1 100644 --- a/pkgs/development/python-modules/spambayes/default.nix +++ b/pkgs/development/python-modules/spambayes/default.nix @@ -15,6 +15,6 @@ buildPythonPackage rec { meta = { description = "Statistical anti-spam filter, initially based on the work of Paul Graham"; - homepage = http://spambayes.sourceforge.net/; + homepage = "http://spambayes.sourceforge.net/"; }; } diff --git a/pkgs/development/python-modules/sparse/default.nix b/pkgs/development/python-modules/sparse/default.nix index a1b9eae398d..483fc12915f 100644 --- a/pkgs/development/python-modules/sparse/default.nix +++ b/pkgs/development/python-modules/sparse/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sparse n-dimensional arrays computations"; - homepage = https://github.com/pydata/sparse/; + homepage = "https://github.com/pydata/sparse/"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/speaklater/default.nix b/pkgs/development/python-modules/speaklater/default.nix index 5de86d9e14c..03b525147bf 100644 --- a/pkgs/development/python-modules/speaklater/default.nix +++ b/pkgs/development/python-modules/speaklater/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Implements a lazy string for python useful for use with gettext"; - homepage = https://github.com/mitsuhiko/speaklater; + homepage = "https://github.com/mitsuhiko/speaklater"; license = licenses.bsd0; maintainers = with maintainers; [ matejc ]; }; diff --git a/pkgs/development/python-modules/spectral-cube/default.nix b/pkgs/development/python-modules/spectral-cube/default.nix index 39edcf9b8f5..3e520919f33 100644 --- a/pkgs/development/python-modules/spectral-cube/default.nix +++ b/pkgs/development/python-modules/spectral-cube/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = { description = "Library for reading and analyzing astrophysical spectral data cubes"; - homepage = http://radio-astro-tools.github.io; + homepage = "http://radio-astro-tools.github.io"; license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ smaret ]; diff --git a/pkgs/development/python-modules/speedtest-cli/default.nix b/pkgs/development/python-modules/speedtest-cli/default.nix index ef97617225c..7476a54a98b 100644 --- a/pkgs/development/python-modules/speedtest-cli/default.nix +++ b/pkgs/development/python-modules/speedtest-cli/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Command line interface for testing internet bandwidth using speedtest.net"; - homepage = https://github.com/sivel/speedtest-cli; + homepage = "https://github.com/sivel/speedtest-cli"; license = licenses.asl20; maintainers = with maintainers; [ makefu domenkozar ]; }; diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index bad76f8cb93..02155483b20 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for C library for finding and handling crystal symmetries"; - homepage = https://atztogo.github.io/spglib; + homepage = "https://atztogo.github.io/spglib"; license = licenses.bsd3; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/sphfile/default.nix b/pkgs/development/python-modules/sphfile/default.nix index f1455f945a9..b10552bf093 100644 --- a/pkgs/development/python-modules/sphfile/default.nix +++ b/pkgs/development/python-modules/sphfile/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Numpy-based NIST SPH audio-file reader"; - homepage = https://github.com/mcfletch/sphfile; + homepage = "https://github.com/mcfletch/sphfile"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/sphinx-argparse/default.nix b/pkgs/development/python-modules/sphinx-argparse/default.nix index f5de476d109..3f1a80c3c97 100644 --- a/pkgs/development/python-modules/sphinx-argparse/default.nix +++ b/pkgs/development/python-modules/sphinx-argparse/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "A sphinx extension that automatically documents argparse commands and options"; - homepage = https://github.com/ribozz/sphinx-argparse; + homepage = "https://github.com/ribozz/sphinx-argparse"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ clacke ]; }; diff --git a/pkgs/development/python-modules/sphinx-testing/default.nix b/pkgs/development/python-modules/sphinx-testing/default.nix index 8f953970555..1a8521bf438 100644 --- a/pkgs/development/python-modules/sphinx-testing/default.nix +++ b/pkgs/development/python-modules/sphinx-testing/default.nix @@ -27,8 +27,8 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/sphinx-doc/sphinx-testing; + homepage = "https://github.com/sphinx-doc/sphinx-testing"; license = lib.licenses.bsd2; description = "Testing utility classes and functions for Sphinx extensions"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sphinx/2.nix b/pkgs/development/python-modules/sphinx/2.nix index 541c292fe8f..5cf2cecd97f 100644 --- a/pkgs/development/python-modules/sphinx/2.nix +++ b/pkgs/development/python-modules/sphinx/2.nix @@ -75,7 +75,7 @@ buildPythonPackage rec { meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = http://sphinx.pocoo.org/; + homepage = "http://sphinx.pocoo.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix index 0989809a1ff..9c7d699d20f 100644 --- a/pkgs/development/python-modules/sphinx/default.nix +++ b/pkgs/development/python-modules/sphinx/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = { description = "A tool that makes it easy to create intelligent and beautiful documentation for Python projects"; - homepage = http://sphinx.pocoo.org/; + homepage = "http://sphinx.pocoo.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix index 52590817c71..6d353cc63c9 100644 --- a/pkgs/development/python-modules/sphinx_pypi_upload/default.nix +++ b/pkgs/development/python-modules/sphinx_pypi_upload/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Setuptools command for uploading Sphinx documentation to PyPI"; - homepage = https://bitbucket.org/jezdez/sphinx-pypi-upload/; + homepage = "https://bitbucket.org/jezdez/sphinx-pypi-upload/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix index 515f6b6156a..bb9fcb293da 100644 --- a/pkgs/development/python-modules/sphinx_rtd_theme/default.nix +++ b/pkgs/development/python-modules/sphinx_rtd_theme/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "ReadTheDocs.org theme for Sphinx"; - homepage = https://github.com/snide/sphinx_rtd_theme/; + homepage = "https://github.com/snide/sphinx_rtd_theme/"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix index 60d7a20feb5..5644834b281 100644 --- a/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-applehelp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-applehelp is a sphinx extension which outputs Apple help books"; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix index dde8bfbb7dd..fca1856863b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-devhelp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-devhelp is a sphinx extension which outputs Devhelp document."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix index 88b54d8e94f..42a6046a1fb 100644 --- a/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-htmlhelp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-htmlhelp is a sphinx extension which ..."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix index ca2c8e99d41..6c860cafa59 100644 --- a/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-jsmath/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-jsmath is a sphinx extension which renders display math in HTML via JavaScript."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix index 92471c6c3d0..358ad771c5d 100644 --- a/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-qthelp/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-qthelp is a sphinx extension which outputs QtHelp document."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix index 76fba6e1b3a..04b19aef8bf 100644 --- a/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-serializinghtml/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sphinxcontrib-serializinghtml is a sphinx extension which outputs \"serialized\" HTML files (json and pickle)."; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index b3e1ca01dba..79b2aa42e36 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Sphinx spelling extension"; - homepage = https://bitbucket.org/dhellmann/sphinxcontrib-spelling; + homepage = "https://bitbucket.org/dhellmann/sphinxcontrib-spelling"; maintainers = with maintainers; [ nand0p ]; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 747fa1cb243..bcf24413d63 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "TikZ extension for Sphinx"; - homepage = https://bitbucket.org/philexander/tikz; + homepage = "https://bitbucket.org/philexander/tikz"; maintainers = with maintainers; [ costrouc ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index d4f17171e3b..b1bdf6a0dff 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = { description = "Sphinx API for Web Apps"; - homepage = http://sphinx-doc.org/; + homepage = "http://sphinx-doc.org/"; license = lib.licenses.bsd2; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix index 5173c54be34..9f042efcc97 100644 --- a/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_httpdomain/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Provides a Sphinx domain for describing RESTful HTTP APIs"; - homepage = https://bitbucket.org/birkenfeld/sphinx-contrib; + homepage = "https://bitbucket.org/birkenfeld/sphinx-contrib"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix index 2dfaf7dbc14..93c53581c4f 100644 --- a/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib_newsfeed/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Extension for adding a simple Blog, News or Announcements section to a Sphinx website"; - homepage = https://bitbucket.org/prometheus/sphinxcontrib-newsfeed; + homepage = "https://bitbucket.org/prometheus/sphinxcontrib-newsfeed"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index fac73dc8715..1ff38f0a6df 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "Browser abstraction for web acceptance testing"; - homepage = https://github.com/cobrateam/splinter; + homepage = "https://github.com/cobrateam/splinter"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index e733c269cd0..74ab81c2f08 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spotipy"; - version = "2.9.0"; + version = "2.10.0"; src = fetchPypi { inherit pname version; - sha256 = "163z3j0sd9a7cc9pv9hcrh230gisvvi2fxabh1f6nzhfr8avrncr"; + sha256 = "0s2f9yxhfkfipbb06965gfjq4lg0khp5vcykijrx6dzxyh20vggm"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix index 283c9b33f34..82c45f3cb64 100644 --- a/pkgs/development/python-modules/spyder/default.nix +++ b/pkgs/development/python-modules/spyder/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "spyder"; - version = "4.1.1"; + version = "4.1.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "13ajjifyf7w895vpl0h9r59m73zisby81xjw2c5pk49fh5l6ycs9"; + sha256 = "0qyisrs9xkzx4hbyin9nasvl10qk7jlxrmyasxycz4zwnvzfvxzf"; }; nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; @@ -35,7 +35,7 @@ buildPythonPackage rec { comment = "Scientific Python Development Environment"; desktopName = "Spyder"; genericName = "Python IDE"; - categories = "Application;Development;Editor;IDE;"; + categories = "Application;Development;IDE;"; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index b91e3385404..1f0dd5eb7ea 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "A sqlalchemy plugin that allows postgres use of CITEXT"; - homepage = https://github.com/mahmoudimus/sqlalchemy-citext; + homepage = "https://github.com/mahmoudimus/sqlalchemy-citext"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix index eefb53dd7a6..35e6854137e 100644 --- a/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-imageattach/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { doCheck = !isPyPy; # failures due to sqla version mismatch meta = with stdenv.lib; { - homepage = https://github.com/dahlia/sqlalchemy-imageattach; + homepage = "https://github.com/dahlia/sqlalchemy-imageattach"; description = "SQLAlchemy extension for attaching images to entity objects"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix index ba93fb040b9..c64d8f61f79 100644 --- a/pkgs/development/python-modules/sqlalchemy-migrate/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-migrate/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { # See: https://review.openstack.org/#/c/608382/ patches = [ (fetchpatch { - url = https://github.com/openstack/sqlalchemy-migrate/pull/18.patch; + url = "https://github.com/openstack/sqlalchemy-migrate/pull/18.patch"; sha256 = "1qyfq2m7w7xqf0r9bc2x42qcra4r9k9l9g1jy5j0fvlb6bvvjj07"; }) ]; @@ -41,7 +41,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/openstack/sqlalchemy-migrate; + homepage = "https://github.com/openstack/sqlalchemy-migrate"; description = "Schema migration tools for SQLAlchemy"; license = licenses.asl20; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index c58ec72498a..3ca0423bd1d 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/kvesteri/sqlalchemy-utils; + homepage = "https://github.com/kvesteri/sqlalchemy-utils"; description = "Various utility functions and datatypes for SQLAlchemy"; license = licenses.bsd3; maintainers = with maintainers; [ eadwu ]; diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix index 93a2fa233f6..b536059bed1 100644 --- a/pkgs/development/python-modules/sqlalchemy/default.nix +++ b/pkgs/development/python-modules/sqlalchemy/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { ++ lib.optionals stdenv.isDarwin [ "MemUsageWBackendTest" "MemUsageTest" ]; meta = with lib; { - homepage = http://www.sqlalchemy.org/; + homepage = "http://www.sqlalchemy.org/"; description = "A Python SQL toolkit and Object Relational Mapper"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/sqlite3dbm/default.nix b/pkgs/development/python-modules/sqlite3dbm/default.nix index bc49c0e426b..66a1200eeb2 100644 --- a/pkgs/development/python-modules/sqlite3dbm/default.nix +++ b/pkgs/development/python-modules/sqlite3dbm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "sqlite-backed dictionary"; - homepage = https://github.com/Yelp/sqlite3dbm; + homepage = "https://github.com/Yelp/sqlite3dbm"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 1e35d4024eb..e6227e4ced3 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.3"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "0qp9j8c92zbkwlbv5ywrszil6kvlkkf3wkc4krh2vdsrwd9cnf2g"; + sha256 = "0chnb421g4bsshbkx6d1xnhsda4250jsn8zyklg5p1vqyr12mhik"; }; postPatch = '' diff --git a/pkgs/development/python-modules/sqlparse/default.nix b/pkgs/development/python-modules/sqlparse/default.nix index e631a5ac5d9..4e1ced22beb 100644 --- a/pkgs/development/python-modules/sqlparse/default.nix +++ b/pkgs/development/python-modules/sqlparse/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { longDescription = '' Provides support for parsing, splitting and formatting SQL statements. ''; - homepage = https://github.com/andialbrecht/sqlparse; + homepage = "https://github.com/andialbrecht/sqlparse"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix index fb339550062..4927d8c725d 100644 --- a/pkgs/development/python-modules/squaremap/default.nix +++ b/pkgs/development/python-modules/squaremap/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Hierarchic visualization control for wxPython"; - homepage = https://launchpad.net/squaremap; + homepage = "https://launchpad.net/squaremap"; license = licenses.bsd3; broken = true; # wxPython doesn't seem to be able to be detected by pip }; diff --git a/pkgs/development/python-modules/srptools/default.nix b/pkgs/development/python-modules/srptools/default.nix index e7e9a1e5391..3b1844fb138 100644 --- a/pkgs/development/python-modules/srptools/default.nix +++ b/pkgs/development/python-modules/srptools/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python-Tools to implement Secure Remote Password (SRP) authentication"; - homepage = https://github.com/idlesign/srptools; + homepage = "https://github.com/idlesign/srptools"; license = licenses.bsd3; maintainers = with maintainers; [ elseym ]; }; diff --git a/pkgs/development/python-modules/srsly/default.nix b/pkgs/development/python-modules/srsly/default.nix index 028378ad32d..39765f06a50 100644 --- a/pkgs/development/python-modules/srsly/default.nix +++ b/pkgs/development/python-modules/srsly/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Modern high-performance serialization utilities for Python"; - homepage = https://github.com/explosion/srsly; + homepage = "https://github.com/explosion/srsly"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; }; diff --git a/pkgs/development/python-modules/ssdeep/default.nix b/pkgs/development/python-modules/ssdeep/default.nix index f33143a0f02..fc6b548ed5b 100644 --- a/pkgs/development/python-modules/ssdeep/default.nix +++ b/pkgs/development/python-modules/ssdeep/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/DinoTools/python-ssdeep; + homepage = "https://github.com/DinoTools/python-ssdeep"; description = "Python wrapper for the ssdeep library"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/ssdp/default.nix b/pkgs/development/python-modules/ssdp/default.nix index 547bddbd84d..3c1d2c9976f 100644 --- a/pkgs/development/python-modules/ssdp/default.nix +++ b/pkgs/development/python-modules/ssdp/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = !isPy27; meta = with stdenv.lib; { - homepage = https://github.com/codingjoe/ssdp; + homepage = "https://github.com/codingjoe/ssdp"; description = "Python asyncio library for Simple Service Discovery Protocol (SSDP)."; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/sseclient/default.nix b/pkgs/development/python-modules/sseclient/default.nix index 8157b893d74..fb0c013ef08 100644 --- a/pkgs/development/python-modules/sseclient/default.nix +++ b/pkgs/development/python-modules/sseclient/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Client library for reading Server Sent Event streams"; - homepage = https://github.com/btubbs/sseclient; + homepage = "https://github.com/btubbs/sseclient"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix index aefb4bd4d4b..6e250cf85f2 100644 --- a/pkgs/development/python-modules/sshpubkeys/default.nix +++ b/pkgs/development/python-modules/sshpubkeys/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "OpenSSH Public Key Parser for Python"; - homepage = https://github.com/ojarva/python-sshpubkeys; + homepage = "https://github.com/ojarva/python-sshpubkeys"; license = licenses.bsd3; maintainers = [ ]; }; diff --git a/pkgs/development/python-modules/sslib/default.nix b/pkgs/development/python-modules/sslib/default.nix index 3e5be211d42..0f1edfd31bd 100644 --- a/pkgs/development/python-modules/sslib/default.nix +++ b/pkgs/development/python-modules/sslib/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/jqueiroz/python-sslib; + homepage = "https://github.com/jqueiroz/python-sslib"; description = "A Python3 library for sharing secrets"; license = licenses.mit; maintainers = with maintainers; [ jqueiroz ]; diff --git a/pkgs/development/python-modules/starfish/default.nix b/pkgs/development/python-modules/starfish/default.nix index 8fc0a23b065..1affd797c13 100644 --- a/pkgs/development/python-modules/starfish/default.nix +++ b/pkgs/development/python-modules/starfish/default.nix @@ -82,7 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pipelines and pipeline components for the analysis of image-based transcriptomics data"; - homepage = https://spacetx-starfish.readthedocs.io/en/latest/; + homepage = "https://spacetx-starfish.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; broken = true; # incompatible with latest python-dateutil, scikit-image diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index a6d93465ffc..cad0aa79705 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -26,14 +26,14 @@ buildPythonPackage rec { # https://github.com/tiangolo/fastapi/issues/683. Please update when # possible. FastAPI is currently Starlette's only dependent. - version = "0.12.9"; + version = "0.13.2"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0w44s8ynzy8w8dgm755c8jina9i4dd87vqkcv7jc1kwkg384w9i5"; + sha256 = "1ls8d121zyyhry5ji7gf7vjvhyqdpr4za3qx1llq48943fmaxxpq"; }; propagatedBuildInputs = [ @@ -59,7 +59,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://www.starlette.io/; + homepage = "https://www.starlette.io/"; description = "The little ASGI framework that shines"; license = licenses.bsd3; maintainers = with maintainers; [ wd15 ]; diff --git a/pkgs/development/python-modules/staticjinja/default.nix b/pkgs/development/python-modules/staticjinja/default.nix index 32aecdc9191..29fd116c0d5 100644 --- a/pkgs/development/python-modules/staticjinja/default.nix +++ b/pkgs/development/python-modules/staticjinja/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A library and cli tool that makes it easy to build static sites using Jinja2"; - homepage = https://staticjinja.readthedocs.io/en/latest/; + homepage = "https://staticjinja.readthedocs.io/en/latest/"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/development/python-modules/statistics/default.nix b/pkgs/development/python-modules/statistics/default.nix index 4380e592ff5..283954c838b 100644 --- a/pkgs/development/python-modules/statistics/default.nix +++ b/pkgs/development/python-modules/statistics/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "A Python 2.* port of 3.4 Statistics Module"; - homepage = https://github.com/digitalemagine/py-statistics; + homepage = "https://github.com/digitalemagine/py-statistics"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ costrouc ]; }; diff --git a/pkgs/development/python-modules/statsd/default.nix b/pkgs/development/python-modules/statsd/default.nix index 36042a72ea8..cf376113b3e 100644 --- a/pkgs/development/python-modules/statsd/default.nix +++ b/pkgs/development/python-modules/statsd/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { maintainers = with maintainers; [ domenkozar ]; description = "A simple statsd client"; license = licenses.mit; - homepage = https://github.com/jsocol/pystatsd; + homepage = "https://github.com/jsocol/pystatsd"; }; } diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index 61d354c8d5f..e2c7142c979 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Statistical computations and models for use with SciPy"; - homepage = https://www.github.com/statsmodels/statsmodels; + homepage = "https://www.github.com/statsmodels/statsmodels"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix index 4d4e75d5326..32e4bab5afc 100644 --- a/pkgs/development/python-modules/stem/default.nix +++ b/pkgs/development/python-modules/stem/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Controller library that allows applications to interact with Tor"; - homepage = https://stem.torproject.org/; + homepage = "https://stem.torproject.org/"; license = licenses.gpl3; maintainers = with maintainers; [ phreedom ]; }; diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 2e3071ed29c..d6ec10579f9 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Manage dynamic plugins for Python applications"; - homepage = https://pypi.python.org/pypi/stevedore; + homepage = "https://pypi.python.org/pypi/stevedore"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/stm32loader/default.nix b/pkgs/development/python-modules/stm32loader/default.nix index c7ea7804198..3e09506ac66 100644 --- a/pkgs/development/python-modules/stm32loader/default.nix +++ b/pkgs/development/python-modules/stm32loader/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Flash firmware to STM32 microcontrollers in Python"; - homepage = https://github.com/florisla/stm32loader; + homepage = "https://github.com/florisla/stm32loader"; changelog = "https://github.com/florisla/stm32loader/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ emily ]; diff --git a/pkgs/development/python-modules/stompclient/default.nix b/pkgs/development/python-modules/stompclient/default.nix index 1efcd6a6500..4cb59cf5f28 100644 --- a/pkgs/development/python-modules/stompclient/default.nix +++ b/pkgs/development/python-modules/stompclient/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Lightweight and extensible STOMP messaging client"; - homepage = https://bitbucket.org/hozn/stompclient; + homepage = "https://bitbucket.org/hozn/stompclient"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index e8e4eb4bf35..1615f57d5e5 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for interacting with Strava v3 REST API"; - homepage = https://github.com/hozn/stravalib; + homepage = "https://github.com/hozn/stravalib"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index bb4824b5c02..2e4b416f047 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "Strict, typed YAML parser"; - homepage = https://hitchdev.com/strictyaml/; + homepage = "https://hitchdev.com/strictyaml/"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/stringcase/default.nix b/pkgs/development/python-modules/stringcase/default.nix index 79f05f9b72d..531f1eb9223 100644 --- a/pkgs/development/python-modules/stringcase/default.nix +++ b/pkgs/development/python-modules/stringcase/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/okunishinishi/python-stringcase; + homepage = "https://github.com/okunishinishi/python-stringcase"; description = "Convert string cases between camel case, pascal case, snake case etc…"; license = licenses.mit; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index 7326f7d48e1..c70cac59920 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://www.stringtemplate.org/; + homepage = "https://www.stringtemplate.org/"; description = "Text Templating Library"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index 4acc694a572..ff520c5ffe3 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.43.0"; + version = "2.44.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0jikvcapg2xp3w824wz0wn74mx91nl3vmd92a10il3gli2p4wcnp"; + sha256 = "0aaaf8dp989im2n0cdmslq0ys4ia970yl1irhxiwwqarmh6fap5i"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index fece2f1b443..2156c7f2802 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "Painless structural logging"; - homepage = http://www.structlog.org/; + homepage = "http://www.structlog.org/"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/stumpy/default.nix b/pkgs/development/python-modules/stumpy/default.nix index 71b643e5cb5..4c26a62060e 100644 --- a/pkgs/development/python-modules/stumpy/default.nix +++ b/pkgs/development/python-modules/stumpy/default.nix @@ -48,7 +48,7 @@ buildPythonPackage { meta = with lib; { description = "A powerful and scalable library that can be used for a variety of time series data mining tasks"; - homepage = https://github.com/TDAmeritrade/stumpy; + homepage = "https://github.com/TDAmeritrade/stumpy"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/stups-zign/default.nix b/pkgs/development/python-modules/stups-zign/default.nix index a4355dd7808..6b80f55636a 100644 --- a/pkgs/development/python-modules/stups-zign/default.nix +++ b/pkgs/development/python-modules/stups-zign/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { patches = [ # pytest 5 is currently unsupported. Fetch and apply a pr that resolves this. (fetchpatch { - url = https://github.com/zalando-stups/zign/commit/50140720211e547b0e59f7ddb39a732f0cc73ad7.patch; + url = "https://github.com/zalando-stups/zign/commit/50140720211e547b0e59f7ddb39a732f0cc73ad7.patch"; sha256 = "1zmyvg1z1asaqqsmxvsx0srvxd6gkgavppvg3dblxwhkml01awqk"; }) ]; diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/pkgs/development/python-modules/subdownloader/default.nix index 24b082123b8..8c5ab94f9d6 100644 --- a/pkgs/development/python-modules/subdownloader/default.nix +++ b/pkgs/development/python-modules/subdownloader/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; - homepage = http://www.subdownloader.net; + homepage = "http://www.subdownloader.net"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/subliminal/default.nix b/pkgs/development/python-modules/subliminal/default.nix index 61d406edafc..4c8bf7f6ba6 100644 --- a/pkgs/development/python-modules/subliminal/default.nix +++ b/pkgs/development/python-modules/subliminal/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/Diaoul/subliminal; + homepage = "https://github.com/Diaoul/subliminal"; description = "Python library to search and download subtitles"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/subprocess32/default.nix b/pkgs/development/python-modules/subprocess32/default.nix index 0f43a73546d..3fc4378fc34 100644 --- a/pkgs/development/python-modules/subprocess32/default.nix +++ b/pkgs/development/python-modules/subprocess32/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { ''; meta = { - homepage = https://pypi.python.org/pypi/subprocess32; + homepage = "https://pypi.python.org/pypi/subprocess32"; description = "Backport of the subprocess module from Python 3.2.5 for use on 2.x"; maintainers = with lib.maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/subunit/default.nix b/pkgs/development/python-modules/subunit/default.nix index eeef94e6c76..f4622689187 100644 --- a/pkgs/development/python-modules/subunit/default.nix +++ b/pkgs/development/python-modules/subunit/default.nix @@ -1,22 +1,33 @@ { buildPythonPackage -, pkgs -, testtools +# pkgs dependencies +, check +, cppunit +, pkg-config +, subunit + +# python dependencies +, fixtures +, hypothesis +, pytest , testscenarios +, testtools }: buildPythonPackage { - name = pkgs.subunit.name; - src = pkgs.subunit.src; + inherit (subunit) name src meta; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ check cppunit ]; propagatedBuildInputs = [ testtools ]; - checkInputs = [ testscenarios ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ pkgs.check pkgs.cppunit ]; - patchPhase = '' - sed -i 's/version=VERSION/version="${pkgs.subunit.version}"/' setup.py + checkInputs = [ testscenarios hypothesis fixtures pytest ]; + # ignore tests which call shell code, or call methods which haven't been implemented + checkPhase = '' + pytest python/subunit \ + --ignore=python/subunit/tests/test_{output_filter,test_protocol{,2}}.py ''; - meta = pkgs.subunit.meta; - + patchPhase = '' + sed -i 's/version=VERSION/version="${subunit.version}"/' setup.py + ''; } diff --git a/pkgs/development/python-modules/suds-jurko/default.nix b/pkgs/development/python-modules/suds-jurko/default.nix index 25ff5fd1636..e83448d82cf 100644 --- a/pkgs/development/python-modules/suds-jurko/default.nix +++ b/pkgs/development/python-modules/suds-jurko/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Lightweight SOAP client (Jurko's fork)"; - homepage = https://bitbucket.org/jurko/suds; + homepage = "https://bitbucket.org/jurko/suds"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/suds/default.nix b/pkgs/development/python-modules/suds/default.nix index c4a8e480ed4..77f4c731265 100644 --- a/pkgs/development/python-modules/suds/default.nix +++ b/pkgs/development/python-modules/suds/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { # - https://lwn.net/Vulnerabilities/559200/ broken = true; description = "Lightweight SOAP client"; - homepage = https://fedorahosted.org/suds; + homepage = "https://fedorahosted.org/suds"; license = licenses.lgpl3Plus; }; diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index 09732252437..ea937bef1be 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { meta = with lib; { description = "SunPy: Python for Solar Physics"; - homepage = https://sunpy.org; + homepage = "https://sunpy.org"; license = licenses.bsd2; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/supervise_api/default.nix b/pkgs/development/python-modules/supervise_api/default.nix index 47cdc8a28b1..687aec08a01 100644 --- a/pkgs/development/python-modules/supervise_api/default.nix +++ b/pkgs/development/python-modules/supervise_api/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = { description = "An API for running processes safely and securely"; - homepage = https://github.com/catern/supervise; + homepage = "https://github.com/catern/supervise"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix index 4ae57add6e7..93dc91b4d10 100644 --- a/pkgs/development/python-modules/supervisor/default.nix +++ b/pkgs/development/python-modules/supervisor/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "A system for controlling process state under UNIX"; - homepage = http://supervisord.org/; + homepage = "http://supervisord.org/"; license = licenses.free; # http://www.repoze.org/LICENSE.txt maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/development/python-modules/sure/default.nix b/pkgs/development/python-modules/sure/default.nix index b4c5fdf4022..2e6e7548efd 100644 --- a/pkgs/development/python-modules/sure/default.nix +++ b/pkgs/development/python-modules/sure/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Utility belt for automated testing"; - homepage = https://sure.readthedocs.io/en/latest/; + homepage = "https://sure.readthedocs.io/en/latest/"; license = licenses.gpl3Plus; }; diff --git a/pkgs/development/python-modules/svg-path/default.nix b/pkgs/development/python-modules/svg-path/default.nix index ac62b8b415d..a8427558f43 100644 --- a/pkgs/development/python-modules/svg-path/default.nix +++ b/pkgs/development/python-modules/svg-path/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "SVG path objects and parser"; - homepage = https://github.com/regebro/svg.path; + homepage = "https://github.com/regebro/svg.path"; license = licenses.mit; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/svg2tikz/default.nix b/pkgs/development/python-modules/svg2tikz/default.nix index 36f6dc06850..b592ee75dec 100644 --- a/pkgs/development/python-modules/svg2tikz/default.nix +++ b/pkgs/development/python-modules/svg2tikz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/kjellmf/svg2tikz; + homepage = "https://github.com/kjellmf/svg2tikz"; description = "An SVG to TikZ converter"; license = licenses.gpl2Plus; maintainers = with maintainers; [ gal_bolle ]; diff --git a/pkgs/development/python-modules/svgwrite/default.nix b/pkgs/development/python-modules/svgwrite/default.nix index 186bf0a1ce2..08c3f6e52ca 100644 --- a/pkgs/development/python-modules/svgwrite/default.nix +++ b/pkgs/development/python-modules/svgwrite/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python library to create SVG drawings"; - homepage = https://github.com/mozman/svgwrite; + homepage = "https://github.com/mozman/svgwrite"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/swagger-ui-bundle/default.nix b/pkgs/development/python-modules/swagger-ui-bundle/default.nix index 9922e081934..cf524ade356 100644 --- a/pkgs/development/python-modules/swagger-ui-bundle/default.nix +++ b/pkgs/development/python-modules/swagger-ui-bundle/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "bundled swagger-ui pip package"; - homepage = https://github.com/dtkav/swagger_ui_bundle; + homepage = "https://github.com/dtkav/swagger_ui_bundle"; license = licenses.asl20; maintainers = with maintainers; [ elohmeier ]; }; diff --git a/pkgs/development/python-modules/sybase/default.nix b/pkgs/development/python-modules/sybase/default.nix index 7821c7b3d74..8fd0f023d0f 100644 --- a/pkgs/development/python-modules/sybase/default.nix +++ b/pkgs/development/python-modules/sybase/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The Sybase module provides a Python interface to the Sybase relational database system"; - homepage = http://python-sybase.sourceforge.net; + homepage = "http://python-sybase.sourceforge.net"; license = licenses.bsd3; maintainers = with maintainers; [ veprbl ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index cf30b4546cd..358c70d3425 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.2.2"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "dd84e68facfcb778298ef50a4d7446d4d9092e9d8596012b12bcb82858fd10e1"; + sha256 = "0x34mzxvxj1kkld7sz9n90pdcinxcan56jg6cnnwkv87v7s1vna6"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/symengine/default.nix b/pkgs/development/python-modules/symengine/default.nix index 68664d0d0fd..9b1117a94a1 100644 --- a/pkgs/development/python-modules/symengine/default.nix +++ b/pkgs/development/python-modules/symengine/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library providing wrappers to SymEngine"; - homepage = https://github.com/symengine/symengine.py; + homepage = "https://github.com/symengine/symengine.py"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; broken = true; diff --git a/pkgs/development/python-modules/systemd/default.nix b/pkgs/development/python-modules/systemd/default.nix index cbe2a213191..f0be01b92d8 100644 --- a/pkgs/development/python-modules/systemd/default.nix +++ b/pkgs/development/python-modules/systemd/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python module for native access to the systemd facilities"; - homepage = http://www.freedesktop.org/software/systemd/python-systemd/; + homepage = "http://www.freedesktop.org/software/systemd/python-systemd/"; license = licenses.lgpl21; }; } diff --git a/pkgs/development/python-modules/sysv_ipc/default.nix b/pkgs/development/python-modules/sysv_ipc/default.nix index 37853980f43..1c2e3baa526 100644 --- a/pkgs/development/python-modules/sysv_ipc/default.nix +++ b/pkgs/development/python-modules/sysv_ipc/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "SysV IPC primitives (semaphores, shared memory and message queues)"; license = licenses.bsd3; - homepage = http://semanchuk.com/philip/sysv_ipc/; + homepage = "http://semanchuk.com/philip/sysv_ipc/"; maintainers = with maintainers; [ ris ]; }; diff --git a/pkgs/development/python-modules/tableaudocumentapi/default.nix b/pkgs/development/python-modules/tableaudocumentapi/default.nix index a2f8fbb2f53..5260a678e8c 100644 --- a/pkgs/development/python-modules/tableaudocumentapi/default.nix +++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python module for working with Tableau files"; - homepage = https://github.com/tableau/document-api-python; + homepage = "https://github.com/tableau/document-api-python"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/tables/3.5.nix b/pkgs/development/python-modules/tables/3.5.nix index 4cca72aa313..bf0eb51c851 100644 --- a/pkgs/development/python-modules/tables/3.5.nix +++ b/pkgs/development/python-modules/tables/3.5.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { meta = { description = "Hierarchical datasets for Python"; - homepage = http://www.pytables.org/; + homepage = "http://www.pytables.org/"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix index d67bec7a496..cd2af0dc28d 100644 --- a/pkgs/development/python-modules/tables/default.nix +++ b/pkgs/development/python-modules/tables/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = { description = "Hierarchical datasets for Python"; - homepage = http://www.pytables.org/; + homepage = "http://www.pytables.org/"; license = stdenv.lib.licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index cda898d2725..c482c517989 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Pretty-print tabular data"; - homepage = https://bitbucket.org/astanin/python-tabulate; + homepage = "https://bitbucket.org/astanin/python-tabulate"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/tadasets/default.nix b/pkgs/development/python-modules/tadasets/default.nix index 61f6b866455..d1de836a5b8 100644 --- a/pkgs/development/python-modules/tadasets/default.nix +++ b/pkgs/development/python-modules/tadasets/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with lib; { description = "Great data sets for Topological Data Analysis"; - homepage = https://tadasets.scikit-tda.org; + homepage = "https://tadasets.scikit-tda.org"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/tarman/default.nix b/pkgs/development/python-modules/tarman/default.nix index 305daecc8de..f2a503cb55d 100644 --- a/pkgs/development/python-modules/tarman/default.nix +++ b/pkgs/development/python-modules/tarman/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/matejc/tarman; + homepage = "https://github.com/matejc/tarman"; description = "Archive manager with curses interface"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index 197c98def3a..9e37df17bf2 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -27,7 +27,7 @@ in buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/robgolding/tasklib; + homepage = "https://github.com/robgolding/tasklib"; description = "A library for interacting with taskwarrior databases"; maintainers = with maintainers; [ arcnmx ]; platforms = platforms.all; diff --git a/pkgs/development/python-modules/taskw/default.nix b/pkgs/development/python-modules/taskw/default.nix index d2d12ca0b96..ee9a9716d11 100644 --- a/pkgs/development/python-modules/taskw/default.nix +++ b/pkgs/development/python-modules/taskw/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six dateutil kitchen pytz ]; meta = with stdenv.lib; { - homepage = https://github.com/ralphbean/taskw; + homepage = "https://github.com/ralphbean/taskw"; description = "Python bindings for your taskwarrior database"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pierron ]; diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 55a164773ca..e7cbb7848f4 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Traceback fiddling library. Allows you to pickle tracebacks."; - homepage = https://github.com/ionelmc/python-tblib; + homepage = "https://github.com/ionelmc/python-tblib"; license = licenses.bsd2; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/tbm-utils/default.nix b/pkgs/development/python-modules/tbm-utils/default.nix index f0593ba1bcc..5c63121812a 100644 --- a/pkgs/development/python-modules/tbm-utils/default.nix +++ b/pkgs/development/python-modules/tbm-utils/default.nix @@ -10,28 +10,23 @@ buildPythonPackage rec { pname = "tbm-utils"; - version = "1.0.0"; + version = "2.5.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "08fb86b5ab469bafdbef19751abb6dc1e08a3043c373ea915e1b6e20d023b529"; + sha256 = "02bmra9f0p1irhbrklxk9nhkvgwkn8042hx7z6c00qlhac1wlba2"; }; - postPatch = '' - substituteInPlace setup.py --replace ",<19.3" "" - ''; + propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; # No tests in archive. doCheck = false; - disabled = pythonOlder "3.6"; - - propagatedBuildInputs = [ attrs pendulum pprintpp wrapt ]; - meta = { - homepage = https://github.com/thebigmunch/tbm-utils; - license = with lib.licenses; [ mit ]; description = "A commonly-used set of utilities"; + homepage = "https://github.com/thebigmunch/tbm-utils"; + license = with lib.licenses; [ mit ]; }; } diff --git a/pkgs/development/python-modules/telegram/default.nix b/pkgs/development/python-modules/telegram/default.nix index df45aaaee3b..6074f479071 100644 --- a/pkgs/development/python-modules/telegram/default.nix +++ b/pkgs/development/python-modules/telegram/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/liluo/telegram; + homepage = "https://github.com/liluo/telegram"; description = "Telegram APIs"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix index b74fe9dc0de..ccacb9157e2 100644 --- a/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix +++ b/pkgs/development/python-modules/telethon-session-sqlalchemy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://github.com/tulir/telethon-session-sqlalchemy; + homepage = "https://github.com/tulir/telethon-session-sqlalchemy"; description = "SQLAlchemy backend for Telethon session storage"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; diff --git a/pkgs/development/python-modules/telethon/default.nix b/pkgs/development/python-modules/telethon/default.nix index b94796b708e..a125cfd9bff 100644 --- a/pkgs/development/python-modules/telethon/default.nix +++ b/pkgs/development/python-modules/telethon/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { disabled = pythonOlder "3.5"; meta = with lib; { - homepage = https://github.com/LonamiWebs/Telethon; + homepage = "https://github.com/LonamiWebs/Telethon"; description = "Full-featured Telegram client library for Python 3"; license = licenses.mit; maintainers = with maintainers; [ nyanloutre ]; diff --git a/pkgs/development/python-modules/tempita/default.nix b/pkgs/development/python-modules/tempita/default.nix index a903aae104e..a45edb8d267 100644 --- a/pkgs/development/python-modules/tempita/default.nix +++ b/pkgs/development/python-modules/tempita/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { buildInputs = [ nose ]; meta = { - homepage = https://github.com/gjhiggins/tempita; + homepage = "https://github.com/gjhiggins/tempita"; description = "A very small text templating language"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index 10de193866b..ebc79212c25 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Objects and routines pertaining to date and time"; - homepage = https://github.com/jaraco/tempora; + homepage = "https://github.com/jaraco/tempora"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index fa039e7b170..17ce469dc1c 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/jd/tenacity; + homepage = "https://github.com/jd/tenacity"; description = "Retrying library for Python"; license = licenses.asl20; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix b/pkgs/development/python-modules/tensorflow-estimator/1/default.nix index 39c667357c8..c34d6948d89 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/1_15_1.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/1/default.nix @@ -6,6 +6,9 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; + # This is effectively 1.15.0. Upstream tagged 1.15.0 by mistake before + # actually updating the version in setup.py, which is why this tag is called + # 1.15.1. version = "1.15.1"; format = "wheel"; @@ -19,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp ]; }; diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/2/default.nix index 47ce0f83b02..dbac36ff07f 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/2/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "TensorFlow Estimator is a high-level API that encapsulates model training, evaluation, prediction, and exporting."; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp ]; }; diff --git a/pkgs/development/python-modules/tensorflow-probability/default.nix b/pkgs/development/python-modules/tensorflow-probability/default.nix index 99a3a978a4e..d5dda5d6b5f 100644 --- a/pkgs/development/python-modules/tensorflow-probability/default.nix +++ b/pkgs/development/python-modules/tensorflow-probability/default.nix @@ -42,7 +42,7 @@ let bazelTarget = ":pip_pkg"; fetchAttrs = { - sha256 = "0135nxxvkmjzpd80r1g9fdkk9h62g0xlvp32g5zgk0hkma5kq0bx"; + sha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; }; buildAttrs = { @@ -103,7 +103,7 @@ in buildPythonPackage { meta = with lib; { description = "Library for probabilistic reasoning and statistical analysis"; - homepage = https://www.tensorflow.org/probability/; + homepage = "https://www.tensorflow.org/probability/"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; }; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix new file mode 100644 index 00000000000..6cc3636b7f3 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow-tensorboard/1/default.nix @@ -0,0 +1,66 @@ +{ lib, fetchPypi, buildPythonPackage, isPy3k +, numpy +, wheel +, werkzeug +, protobuf +, grpcio +, markdown +, futures +, absl-py +}: + +# tensorflow/tensorboard is built from a downloaded wheel, because +# https://github.com/tensorflow/tensorboard/issues/719 blocks +# buildBazelPackage. + +buildPythonPackage rec { + pname = "tensorflow-tensorboard"; + version = "1.15.0"; + format = "wheel"; + + src = fetchPypi ({ + pname = "tensorboard"; + inherit version; + format = "wheel"; + } // (if isPy3k then { + python = "py3"; + sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac"; + } else { + python = "py2"; + sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1"; + })); + + propagatedBuildInputs = [ + numpy + werkzeug + protobuf + markdown + grpcio + absl-py + # not declared in install_requires, but used at runtime + # https://github.com/NixOS/nixpkgs/issues/73840 + wheel + ] ++ lib.optional (!isPy3k) futures; + + # in the absence of a real test suite, run cli and imports + checkPhase = '' + $out/bin/tensorboard --help > /dev/null + ''; + + pythonImportsCheck = [ + "tensorboard" + "tensorboard.backend" + "tensorboard.compat" + "tensorboard.data" + "tensorboard.plugins" + "tensorboard.summary" + "tensorboard.util" + ]; + + meta = with lib; { + description = "TensorFlow's Visualization Toolkit"; + homepage = "http://tensorflow.org"; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix index 202b167c7e6..945896dda01 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/2/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "TensorFlow's Visualization Toolkit"; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/tensorflow/1/bin.nix b/pkgs/development/python-modules/tensorflow/1/bin.nix new file mode 100644 index 00000000000..9bd2bc78437 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/1/bin.nix @@ -0,0 +1,121 @@ +{ stdenv +, lib +, fetchurl +, buildPythonPackage +, isPy3k, pythonOlder, isPy38 +, astor +, gast +, google-pasta +, wrapt +, numpy +, six +, termcolor +, protobuf +, absl-py +, grpcio +, mock +, backports_weakref +, tensorflow-estimator_1 +, tensorflow-tensorboard +, cudaSupport ? false +, cudatoolkit ? null +, cudnn ? null +, nvidia_x11 ? null +, zlib +, python +, symlinkJoin +, keras-applications +, keras-preprocessing +, addOpenGLRunpath +}: + +# We keep this binary build for two reasons: +# - the source build doesn't work on Darwin. +# - the source build is currently brittle and not easy to maintain + +assert cudaSupport -> cudatoolkit != null + && cudnn != null + && nvidia_x11 != null; + +# unsupported combination +assert ! (stdenv.isDarwin && cudaSupport); + +let + packages = import ./binary-hashes.nix; + + variant = if cudaSupport then "-gpu" else ""; + pname = "tensorflow${variant}"; + +in buildPythonPackage { + inherit pname; + inherit (packages) version; + format = "wheel"; + + disabled = isPy38; + + src = let + pyVerNoDot = lib.strings.stringAsChars (x: if x == "." then "" else x) python.pythonVersion; + pyver = if stdenv.isDarwin then builtins.substring 0 1 pyVerNoDot else pyVerNoDot; + platform = if stdenv.isDarwin then "mac" else "linux"; + unit = if cudaSupport then "gpu" else "cpu"; + key = "${platform}_py_${pyver}_${unit}"; + in fetchurl packages.${key}; + + propagatedBuildInputs = [ + protobuf + numpy + termcolor + grpcio + six + astor + absl-py + gast + google-pasta + wrapt + tensorflow-estimator_1 + tensorflow-tensorboard + keras-applications + keras-preprocessing + ] ++ lib.optional (!isPy3k) mock + ++ lib.optionals (pythonOlder "3.4") [ backports_weakref ]; + + nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propageted input tensorflow-tensorboard which causes environment collisions. + # another possibility would be to have tensorboard only in the buildInputs + # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 + postInstall = '' + rm $out/bin/tensorboard + ''; + + # Note that we need to run *after* the fixup phase because the + # libraries are loaded at runtime. If we run in preFixup then + # patchelf --shrink-rpath will remove the cuda libraries. + postFixup = let + rpath = stdenv.lib.makeLibraryPath + ([ stdenv.cc.cc.lib zlib ] ++ lib.optionals cudaSupport [ cudatoolkit.out cudatoolkit.lib cudnn nvidia_x11 ]); + in + lib.optionalString stdenv.isLinux '' + rrPath="$out/${python.sitePackages}/tensorflow/:$out/${python.sitePackages}/tensorflow/contrib/tensor_forest/:${rpath}" + internalLibPath="$out/${python.sitePackages}/tensorflow/python/_pywrap_tensorflow_internal.so" + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + patchelf --set-rpath "$rrPath" "$lib" + ${lib.optionalString cudaSupport '' + addOpenGLRunpath "$lib" + ''} + done + ''; + + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = "http://tensorflow.org"; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + # Python 2.7 build uses different string encoding. + # See https://github.com/NixOS/nixpkgs/pull/37044#issuecomment-373452253 + broken = stdenv.isDarwin && !isPy3k; + }; +} diff --git a/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix new file mode 100644 index 00000000000..fa4809dc3f1 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/1/binary-hashes.nix @@ -0,0 +1,43 @@ +{ +version = "1.14.0"; +linux_py_27_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp27-none-linux_x86_64.whl"; + sha256 = "0yywdrfk97dh1bxhibspg0raz70fx9lcczj6xlimqy4xb60clx7k"; +}; +linux_py_35_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp35-cp35m-linux_x86_64.whl"; + sha256 = "1xvyb6xcrjhlwvrmrhn5vs9xy7g98smqmpv4i3hhpry4qyasphhj"; +}; +linux_py_36_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp36-cp36m-linux_x86_64.whl"; + sha256 = "1psd9vyxz9f39dwj77nvrg373sxv3p5vdp9fnz81dpsm0b0mwl44"; +}; +linux_py_37_cpu = { + url = "https://storage.googleapis.com/tensorflow/linux/cpu/tensorflow-1.14.0-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0bg2sb1n2ag27r7ww695kg5hb0mjrw4kc5893krmixx2j71860c5"; +}; +linux_py_27_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp27-none-linux_x86_64.whl"; + sha256 = "0y1x91gayg6pjddgl8ndcm63wfzhyv4s5khgl7ffzsgni1ivaqw5"; +}; +linux_py_35_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp35-cp35m-linux_x86_64.whl"; + sha256 = "03piggpbz1jx8m2b95spq3jrdff4w6xx63ji07am7hyw2nsgx3mx"; +}; +linux_py_36_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp36-cp36m-linux_x86_64.whl"; + sha256 = "0ypkp8cfhharsyyikb1qgf44cfm6284km9xswzvzymjzz75vg3gd"; +}; +linux_py_37_gpu = { + url = "https://storage.googleapis.com/tensorflow/linux/gpu/tensorflow_gpu-1.14.0-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0virp8nn2ysx4855hq29kas6fm6b3dsiybwzdxy9nnb9n2d8qlm2"; +}; +mac_py_2_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py2-none-any.whl"; + sha256 = "14f86k3pgq7z6i4s4im55zpp38f0drnm7xlclavsgcc0nxnj3z26"; +}; +mac_py_3_cpu = { + url = "https://storage.googleapis.com/tensorflow/mac/cpu/tensorflow-1.14.0-py3-none-any.whl"; + sha256 = "0f3swpcjfgqhj6h5wnx8snc0xjkx4hnkqx83fmlrwpncs8c131d3"; +}; +} diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 7c80452b20f..aae812e8ebe 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -1,13 +1,13 @@ -{ stdenv, pkgs, bazel_0, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +{ stdenv, pkgs, bazel_0_26, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin , addOpenGLRunpath # Python deps , buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python # Python libraries -, numpy, tensorflow-tensorboard, backports_weakref, mock, enum34, absl-py +, numpy, tensorflow-tensorboard_1, backports_weakref, mock, enum34, absl-py , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta , functools32 , opt-einsum -, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1_15_1 +, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_1 # Common deps , git, swig, which, binutils, glibcLocales, cython # Common libraries @@ -18,6 +18,7 @@ # it would also make the default tensorflow package unfree. See # https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null, nccl ? null +, mklSupport ? false, mkl ? null # XLA without CUDA is broken , xlaSupport ? cudaSupport # Default from ./configure script @@ -36,6 +37,8 @@ assert cudaSupport -> nvidia_x11 != null # unsupported combination assert ! (stdenv.isDarwin && cudaSupport); +assert mklSupport -> mkl != null; + let withTensorboard = pythonOlder "3.6"; @@ -94,7 +97,7 @@ let bazel-build = buildBazelPackage { name = "${pname}-${version}"; - bazel = bazel_0; + bazel = bazel_0_26; src = fetchFromGitHub { owner = "tensorflow"; @@ -105,9 +108,9 @@ let patches = [ # Work around https://github.com/tensorflow/tensorflow/issues/24752 - ./no-saved-proto.patch + ../no-saved-proto.patch # Fixes for NixOS jsoncpp - ./system-jsoncpp.patch + ../system-jsoncpp.patch # https://github.com/tensorflow/tensorflow/pull/29673 (fetchpatch { @@ -121,7 +124,6 @@ let sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz"; }) - (fetchpatch { # be compatible with gast >0.2 instead of only gast 0.2.2 name = "gast-update.patch"; @@ -132,7 +134,7 @@ let # cuda 10.2 does not have "-bin2c-path" option anymore # https://github.com/tensorflow/tensorflow/issues/34429 - ./cuda-10.2-no-bin2c-path.patch + ../cuda-10.2-no-bin2c-path.patch ]; # On update, it can be useful to steal the changes from gentoo @@ -168,6 +170,8 @@ let cudatoolkit cudnn nvidia_x11 + ] ++ lib.optionals mklSupport [ + mkl ] ++ lib.optionals stdenv.isDarwin [ Foundation Security @@ -285,7 +289,8 @@ let ]; bazelBuildFlags = [ "--config=opt" # optimize using the flags set in the configure phase - ]; + ] + ++ lib.optionals (mklSupport) [ "--config=mkl" ]; bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; @@ -336,7 +341,7 @@ let meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = with platforms; linux ++ darwin; @@ -373,7 +378,7 @@ in buildPythonPackage { numpy six protobuf - tensorflow-estimator_1_15_1 + tensorflow-estimator_1 termcolor wrapt grpcio @@ -385,7 +390,7 @@ in buildPythonPackage { ] ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ] ++ lib.optionals withTensorboard [ - tensorflow-tensorboard + tensorflow-tensorboard_1 ]; nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; diff --git a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch b/pkgs/development/python-modules/tensorflow/1/lift-gast-restriction.patch index 30861d92341..30861d92341 100644 --- a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch +++ b/pkgs/development/python-modules/tensorflow/1/lift-gast-restriction.patch diff --git a/pkgs/development/python-modules/tensorflow/1/prefetcher.sh b/pkgs/development/python-modules/tensorflow/1/prefetcher.sh new file mode 100755 index 00000000000..d590fb0f173 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/1/prefetcher.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +version=1.14.0 +hashfile=binary-hashes.nix +rm -f $hashfile +echo "{" >> $hashfile +echo "version = \"$version\";" >> $hashfile +for sys in "linux" "mac"; do + for tfpref in "cpu/tensorflow" "gpu/tensorflow_gpu"; do + for pykind in "py2-none-any" "py3-none-any" "cp27-none-linux_x86_64" "cp35-cp35m-linux_x86_64" "cp36-cp36m-linux_x86_64" "cp37-cp37m-linux_x86_64"; do + if [ $sys == "mac" ]; then + [[ $pykind =~ py.* ]] && [[ $tfpref =~ cpu.* ]] + result=$? + pyver=${pykind:2:1} + flavour=cpu + else + [[ $pykind =~ .*linux.* ]] + result=$? + pyver=${pykind:2:2} + flavour=${tfpref:0:3} + fi + if [ $result == 0 ]; then + url=https://storage.googleapis.com/tensorflow/$sys/$tfpref-$version-$pykind.whl + hash=$(nix-prefetch-url $url) + echo "${sys}_py_${pyver}_${flavour} = {" >> $hashfile + echo " url = \"$url\";" >> $hashfile + echo " sha256 = \"$hash\";" >> $hashfile + echo "};" >> $hashfile + fi + done + done +done +echo "}" >> $hashfile diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index e81dc2dbd00..d32305ff513 100644 --- a/pkgs/development/python-modules/tensorflow/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -18,7 +18,7 @@ , wheel , opt-einsum , backports_weakref -, tensorflow-estimator +, tensorflow-estimator_2 , tensorflow-tensorboard , cudaSupport ? false , cudatoolkit ? null @@ -76,7 +76,7 @@ in buildPythonPackage { opt-einsum google-pasta wrapt - tensorflow-estimator + tensorflow-estimator_2 tensorflow-tensorboard keras-applications keras-preprocessing @@ -168,7 +168,7 @@ in buildPythonPackage { meta = with stdenv.lib; { description = "Computation using data flow graphs for scalable machine learning"; - homepage = http://tensorflow.org; + homepage = "http://tensorflow.org"; license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/2/binary-hashes.nix index 90848e93273..90848e93273 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/2/binary-hashes.nix diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix new file mode 100644 index 00000000000..089d377ec24 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -0,0 +1,427 @@ +{ stdenv, pkgs, bazel_0_29, buildBazelPackage, lib, fetchFromGitHub, fetchpatch, symlinkJoin +, addOpenGLRunpath +# Python deps +, buildPythonPackage, isPy3k, isPy27, pythonOlder, pythonAtLeast, python +# Python libraries +, numpy, tensorflow-tensorboard_2, backports_weakref, mock, enum34, absl-py +, future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta +, functools32 +, opt-einsum +, termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator_2 +# Common deps +, git, swig, which, binutils, glibcLocales, cython +# Common libraries +, jemalloc, openmpi, astor, gast, grpc, sqlite, openssl, jsoncpp, re2 +, curl, snappy, flatbuffers, icu, double-conversion, libpng, libjpeg, 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 +# it would also make the default tensorflow package unfree. See +# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 +, cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null, nccl ? null +, mklSupport ? false, mkl ? null +# XLA without CUDA is broken +, xlaSupport ? cudaSupport +# Default from ./configure script +, cudaCapabilities ? [ "3.5" "5.2" ] +, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] +, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +# Darwin deps +, Foundation, Security +}: + +assert cudaSupport -> nvidia_x11 != null + && cudatoolkit != null + && cudnn != null; + +# unsupported combination +assert ! (stdenv.isDarwin && cudaSupport); + +assert mklSupport -> mkl != null; + +let + withTensorboard = pythonOlder "3.6"; + + cudatoolkit_joined = symlinkJoin { + name = "${cudatoolkit.name}-merged"; + paths = [ + cudatoolkit.lib + cudatoolkit.out + # for some reason some of the required libs are in the targets/x86_64-linux + # directory; not sure why but this works around it + "${cudatoolkit}/targets/${stdenv.system}" + ]; + }; + + cudatoolkit_cc_joined = symlinkJoin { + name = "${cudatoolkit.cc.name}-merged"; + paths = [ + cudatoolkit.cc + binutils.bintools # for ar, dwp, nm, objcopy, objdump, strip + ]; + }; + + # Needed for _some_ system libraries, grep INCLUDEDIR. + includes_joined = symlinkJoin { + name = "tensorflow-deps-merged"; + paths = [ + pkgs.protobuf + jsoncpp + ]; + }; + + tfFeature = x: if x then "1" else "0"; + + version = "2.1.0"; + variant = if cudaSupport then "-gpu" else ""; + pname = "tensorflow${variant}"; + + pythonEnv = python.withPackages (_: + [ # python deps needed during wheel build time (not runtime, see the buildPythonPackage part for that) + numpy + keras-preprocessing + protobuf + wrapt + gast + astor + absl-py + termcolor + keras-applications + setuptools + wheel + ] ++ lib.optionals (!isPy3k) + [ future + functools32 + mock + ]); + + bazel-build = buildBazelPackage { + name = "${pname}-${version}"; + bazel = bazel_0_29; + + src = fetchFromGitHub { + owner = "tensorflow"; + repo = "tensorflow"; + rev = "v${version}"; + sha256 = "1g79xi8yl4sjia8ysk9b7xfzrz83zy28v5dlb2wzmcf0k5pmz60p"; + }; + + patches = [ + # Work around https://github.com/tensorflow/tensorflow/issues/24752 + ../no-saved-proto.patch + # Fixes for NixOS jsoncpp + ../system-jsoncpp.patch + + (fetchpatch { + name = "backport-pr-18950.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/73640aaec2ab0234d9fff138e3c9833695570c0a.patch"; + sha256 = "1n9ypbrx36fc1kc9cz5b3p9qhg15xxhq4nz6ap3hwqba535nakfz"; + }) + + (fetchpatch { + # Don't try to fetch things that don't exist + name = "prune-missing-deps.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/b39b1ed24b4814db27d2f748dc85c10730ae851d.patch"; + sha256 = "1skysz53nancvw1slij6s7flar2kv3gngnsq60ff4lap88kx5s6c"; + excludes = [ "tensorflow/cc/saved_model/BUILD" ]; + }) + + ./lift-gast-restriction.patch + + # cuda 10.2 does not have "-bin2c-path" option anymore + # https://github.com/tensorflow/tensorflow/issues/34429 + ../cuda-10.2-no-bin2c-path.patch + ]; + + # On update, it can be useful to steal the changes from gentoo + # https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-libs/tensorflow + + nativeBuildInputs = [ + swig which pythonEnv + ] ++ lib.optional cudaSupport addOpenGLRunpath; + + buildInputs = [ + jemalloc + openmpi + glibcLocales + git + + # libs taken from system through the TF_SYS_LIBS mechanism + # grpc + sqlite + openssl + jsoncpp + pkgs.protobuf + curl + snappy + flatbuffers + icu + double-conversion + libpng + libjpeg + giflib + re2 + pkgs.lmdb + ] ++ lib.optionals cudaSupport [ + cudatoolkit + cudnn + nvidia_x11 + ] ++ lib.optionals mklSupport [ + mkl + ] ++ lib.optionals stdenv.isDarwin [ + Foundation + Security + ]; + + # arbitrarily set to the current latest bazel version, overly careful + TF_IGNORE_MAX_BAZEL_VERSION = true; + + # Take as many libraries from the system as possible. Keep in sync with + # list of valid syslibs in + # https://github.com/tensorflow/tensorflow/blob/master/third_party/systemlibs/syslibs_configure.bzl + TF_SYSTEM_LIBS = lib.concatStringsSep "," [ + "absl_py" + "astor_archive" + "boringssl" + # Not packaged in nixpkgs + # "com_github_googleapis_googleapis" + # "com_github_googlecloudplatform_google_cloud_cpp" + "com_google_protobuf" + "com_googlesource_code_re2" + "curl" + "cython" + "double_conversion" + "flatbuffers" + "gast_archive" + # Lots of errors, requires an older version + # "grpc" + "hwloc" + "icu" + "jpeg" + "jsoncpp_git" + "keras_applications_archive" + "lmdb" + "nasm" + # "nsync" # not packaged in nixpkgs + "opt_einsum_archive" + "org_sqlite" + "pasta" + "pcre" + "six_archive" + "snappy" + "swig" + "termcolor_archive" + "wrapt" + "zlib_archive" + ]; + + INCLUDEDIR = "${includes_joined}/include"; + + PYTHON_BIN_PATH = pythonEnv.interpreter; + + TF_NEED_GCP = true; + TF_NEED_HDFS = true; + TF_ENABLE_XLA = tfFeature xlaSupport; + + CC_OPT_FLAGS = " "; + + # https://github.com/tensorflow/tensorflow/issues/14454 + TF_NEED_MPI = tfFeature cudaSupport; + + TF_NEED_CUDA = tfFeature cudaSupport; + TF_CUDA_PATHS = lib.optionalString cudaSupport "${cudatoolkit_joined},${cudnn},${nccl}"; + GCC_HOST_COMPILER_PREFIX = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin"; + GCC_HOST_COMPILER_PATH = lib.optionalString cudaSupport "${cudatoolkit_cc_joined}/bin/gcc"; + TF_CUDA_COMPUTE_CAPABILITIES = lib.concatStringsSep "," cudaCapabilities; + + postPatch = '' + # https://github.com/tensorflow/tensorflow/issues/20919 + sed -i '/androidndk/d' tensorflow/lite/kernels/internal/BUILD + + # Tensorboard pulls in a bunch of dependencies, some of which may + # include security vulnerabilities. So we make it optional. + # https://github.com/tensorflow/tensorflow/issues/20280#issuecomment-400230560 + sed -i '/tensorboard >=/d' tensorflow/tools/pip_package/setup.py + ''; + + preConfigure = let + opt_flags = [] + ++ lib.optionals sse42Support ["-msse4.2"] + ++ lib.optionals avx2Support ["-mavx2"] + ++ lib.optionals fmaSupport ["-mfma"]; + in '' + patchShebangs configure + + # dummy ldconfig + mkdir dummy-ldconfig + echo "#!${stdenv.shell}" > dummy-ldconfig/ldconfig + chmod +x dummy-ldconfig/ldconfig + export PATH="$PWD/dummy-ldconfig:$PATH" + + export PYTHON_LIB_PATH="$NIX_BUILD_TOP/site-packages" + export CC_OPT_FLAGS="${lib.concatStringsSep " " opt_flags}" + mkdir -p "$PYTHON_LIB_PATH" + + # To avoid mixing Python 2 and Python 3 + unset PYTHONPATH + ''; + + configurePhase = '' + runHook preConfigure + ./configure + runHook postConfigure + ''; + + # FIXME: Tensorflow uses dlopen() for CUDA libraries. + NIX_LDFLAGS = lib.optionalString cudaSupport "-lcudart -lcublas -lcufft -lcurand -lcusolver -lcusparse -lcudnn"; + + hardeningDisable = [ "format" ]; + + bazelFlags = [ + # temporary fixes to make the build work with bazel 0.27 + "--incompatible_no_support_tools_in_action_inputs=false" + ]; + bazelBuildFlags = [ + "--config=opt" # optimize using the flags set in the configure phase + ] + ++ lib.optionals (mklSupport) [ "--config=mkl" ]; + + bazelTarget = "//tensorflow/tools/pip_package:build_pip_package //tensorflow/tools/lib_package:libtensorflow"; + + fetchAttrs = { + # So that checksums don't depend on these. + TF_SYSTEM_LIBS = null; + + # cudaSupport causes fetch of ncclArchive, resulting in different hashes + sha256 = if cudaSupport then + "0hg3ysy644950a34j28hrb317cz8gcbb9n84d36wdailvnlshghb" + else + "1gy4pz9kn30wb9c4a9584fibb88c3h38y3dqa99yw1lbsbyyi28c"; + }; + + buildAttrs = { + outputs = [ "out" "python" ]; + + preBuild = '' + patchShebangs . + ''; + + installPhase = '' + mkdir -p "$out" + tar -xf bazel-bin/tensorflow/tools/lib_package/libtensorflow.tar.gz -C "$out" + # Write pkgconfig file. + mkdir "$out/lib/pkgconfig" + cat > "$out/lib/pkgconfig/tensorflow.pc" << EOF + Name: TensorFlow + Version: ${version} + Description: Library for computation using data flow graphs for scalable machine learning + Requires: + Libs: -L$out/lib -ltensorflow + Cflags: -I$out/include/tensorflow + EOF + + # build the source code, then copy it to $python (build_pip_package + # actually builds a symlink farm so we must dereference them). + bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "$PWD/dist" + cp -Lr "$PWD/dist" "$python" + ''; + + postFixup = lib.optionalString cudaSupport '' + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + addOpenGLRunpath "$lib" + done + ''; + }; + + meta = with stdenv.lib; { + description = "Computation using data flow graphs for scalable machine learning"; + homepage = "http://tensorflow.org"; + license = licenses.asl20; + maintainers = with maintainers; [ jyp abbradar ]; + platforms = with platforms; linux ++ darwin; + # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in + # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b + broken = !(xlaSupport -> cudaSupport) || !isPy3k; + }; + }; + +in buildPythonPackage { + inherit version pname; + disabled = isPy27 || (pythonAtLeast "3.8"); + + src = bazel-build.python; + + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # Another possibility would be to have tensorboard only in the buildInputs + # https://github.com/tensorflow/tensorflow/blob/v1.7.1/tensorflow/tools/pip_package/setup.py#L79 + postInstall = '' + rm $out/bin/tensorboard + ''; + + setupPyGlobalFlags = [ "--project_name ${pname}" ]; + + # tensorflow/tools/pip_package/setup.py + propagatedBuildInputs = [ + absl-py + astor + gast + google-pasta + keras-applications + keras-preprocessing + numpy + six + protobuf + tensorflow-estimator_2 + termcolor + wrapt + grpcio + opt-einsum + ] ++ lib.optionals (!isPy3k) [ + mock + future + functools32 + ] ++ lib.optionals (pythonOlder "3.4") [ + backports_weakref enum34 + ] ++ lib.optionals withTensorboard [ + tensorflow-tensorboard_2 + ]; + + nativeBuildInputs = lib.optional cudaSupport addOpenGLRunpath; + + postFixup = lib.optionalString cudaSupport '' + find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + addOpenGLRunpath "$lib" + done + ''; + + # Actual tests are slow and impure. + # TODO try to run them anyway + # TODO better test (files in tensorflow/tools/ci_build/builds/*test) + checkPhase = '' + ${python.interpreter} <<EOF + # A simple "Hello world" + import tensorflow as tf + hello = tf.constant("Hello, world!") + tf.print(hello) + + # Fit a simple model to random data + import numpy as np + np.random.seed(0) + tf.random.set_seed(0) + model = tf.keras.models.Sequential([ + tf.keras.layers.Dense(1, activation="linear") + ]) + model.compile(optimizer="sgd", loss="mse") + + x = np.random.uniform(size=(1,1)) + y = np.random.uniform(size=(1,)) + model.fit(x, y, epochs=1) + EOF + ''; + # Regression test for #77626 removed because not more `tensorflow.contrib`. + + passthru.libtensorflow = bazel-build.out; + + inherit (bazel-build) meta; +} diff --git a/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch b/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch new file mode 100644 index 00000000000..e0d367f4924 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/2/lift-gast-restriction.patch @@ -0,0 +1,11 @@ +diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py +index 992f2eae22..d9386f9b13 100644 +--- a/tensorflow/tools/pip_package/setup.py ++++ b/tensorflow/tools/pip_package/setup.py +@@ -54,5 +54,5 @@ REQUIRED_PACKAGES = [ + 'enum34 >= 1.1.6;python_version<"3.4"', +- 'gast == 0.2.2', ++ 'gast >= 0.2.2', + 'google_pasta >= 0.1.6', + 'keras_applications >= 1.0.8', + 'keras_preprocessing >= 1.0.5', diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/2/prefetcher.sh index abb0faac283..abb0faac283 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/2/prefetcher.sh diff --git a/pkgs/development/python-modules/tensorly/default.nix b/pkgs/development/python-modules/tensorly/default.nix index 33aca636f45..94acabe78d2 100644 --- a/pkgs/development/python-modules/tensorly/default.nix +++ b/pkgs/development/python-modules/tensorly/default.nix @@ -38,7 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tensor learning in Python"; - homepage = https://tensorly.org/; + homepage = "https://tensorly.org/"; license = licenses.bsd3; maintainers = [ maintainers.bcdarwin ]; }; diff --git a/pkgs/development/python-modules/termcolor/default.nix b/pkgs/development/python-modules/termcolor/default.nix index 2931f0e5199..7879482f17d 100644 --- a/pkgs/development/python-modules/termcolor/default.nix +++ b/pkgs/development/python-modules/termcolor/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Termcolor"; - homepage = https://pypi.python.org/pypi/termcolor; + homepage = "https://pypi.python.org/pypi/termcolor"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/terminado/default.nix b/pkgs/development/python-modules/terminado/default.nix index af1c4d53e13..51e9b98db5b 100644 --- a/pkgs/development/python-modules/terminado/default.nix +++ b/pkgs/development/python-modules/terminado/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Terminals served by Tornado websockets"; - homepage = https://github.com/jupyter/terminado; + homepage = "https://github.com/jupyter/terminado"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/tess/default.nix b/pkgs/development/python-modules/tess/default.nix index c168492be72..883d541f812 100644 --- a/pkgs/development/python-modules/tess/default.nix +++ b/pkgs/development/python-modules/tess/default.nix @@ -23,7 +23,7 @@ buildPythonPackage { meta = with lib; { description = "A module for calculating and analyzing Voronoi tessellations"; - homepage = https://tess.readthedocs.org; + homepage = "https://tess.readthedocs.org"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/tesserocr/default.nix b/pkgs/development/python-modules/tesserocr/default.nix index 2d4f9d10a8c..df1b0228304 100644 --- a/pkgs/development/python-modules/tesserocr/default.nix +++ b/pkgs/development/python-modules/tesserocr/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tesserocr"; - version = "2.5.0"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "0nj33mwvppacy6p5mqk9a4x26hx9ailshgad84ks60wyms6rgjiv"; + sha256 = "0cc7d4r11z26rhcwpmcc42fi9kr3f20nq5pk84jrczr18i0g99mh"; }; nativeBuildInputs = [ cython pkg-config ]; diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index 8fca654632e..0c0db60f2c0 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Simplistix/testfixtures; + homepage = "https://github.com/Simplistix/testfixtures"; description = "A collection of helpers and mock objects for unit tests and doc tests"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index c9d0e8f0ad2..8357cd2c456 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Test utilities for code working with files and commands"; license = licenses.mit; - homepage = https://github.com/jupyter/testpath; + homepage = "https://github.com/jupyter/testpath"; }; } diff --git a/pkgs/development/python-modules/testrepository/default.nix b/pkgs/development/python-modules/testrepository/default.nix index 188c320e761..f3c7e169207 100644 --- a/pkgs/development/python-modules/testrepository/default.nix +++ b/pkgs/development/python-modules/testrepository/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A database of test results which can be used as part of developer workflow"; - homepage = https://pypi.python.org/pypi/testrepository; + homepage = "https://pypi.python.org/pypi/testrepository"; license = licenses.bsd2; }; diff --git a/pkgs/development/python-modules/testresources/default.nix b/pkgs/development/python-modules/testresources/default.nix index ce00b17b177..1aaddc3dec9 100644 --- a/pkgs/development/python-modules/testresources/default.nix +++ b/pkgs/development/python-modules/testresources/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pyunit extension for managing expensive test resources"; - homepage = https://launchpad.net/testresources; + homepage = "https://launchpad.net/testresources"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/testscenarios/default.nix b/pkgs/development/python-modules/testscenarios/default.nix index 6fddc17af32..751ab02670a 100644 --- a/pkgs/development/python-modules/testscenarios/default.nix +++ b/pkgs/development/python-modules/testscenarios/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pyunit extension for dependency injection"; - homepage = https://pypi.python.org/pypi/testscenarios; + homepage = "https://pypi.python.org/pypi/testscenarios"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/testtools/default.nix b/pkgs/development/python-modules/testtools/default.nix index 1a99378a541..8264314c96a 100644 --- a/pkgs/development/python-modules/testtools/default.nix +++ b/pkgs/development/python-modules/testtools/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "A set of extensions to the Python standard library's unit testing framework"; - homepage = https://pypi.python.org/pypi/testtools; + homepage = "https://pypi.python.org/pypi/testtools"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/text-unidecode/default.nix b/pkgs/development/python-modules/text-unidecode/default.nix index ff5d2425593..5f5a0bf8512 100644 --- a/pkgs/development/python-modules/text-unidecode/default.nix +++ b/pkgs/development/python-modules/text-unidecode/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "The most basic Text::Unidecode port"; - homepage = https://github.com/kmike/text-unidecode; + homepage = "https://github.com/kmike/text-unidecode"; license = licenses.artistic1; }; } diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix index 5b8e10db83e..791479b69e1 100644 --- a/pkgs/development/python-modules/textwrap3/default.nix +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Textwrap from Python 3.6 backport plus a few tweaks"; - homepage = https://github.com/jonathaneunice/textwrap3; + homepage = "https://github.com/jonathaneunice/textwrap3"; license = licenses.psfl; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/thinc/default.nix b/pkgs/development/python-modules/thinc/default.nix index c12a00c011f..6f1eaa80495 100644 --- a/pkgs/development/python-modules/thinc/default.nix +++ b/pkgs/development/python-modules/thinc/default.nix @@ -64,7 +64,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Practical Machine Learning for NLP in Python"; - homepage = https://github.com/explosion/thinc; + homepage = "https://github.com/explosion/thinc"; license = licenses.mit; maintainers = with maintainers; [ aborsu danieldk sdll ]; }; diff --git a/pkgs/development/python-modules/threadpool/default.nix b/pkgs/development/python-modules/threadpool/default.nix index a604302add1..bbc3074c964 100644 --- a/pkgs/development/python-modules/threadpool/default.nix +++ b/pkgs/development/python-modules/threadpool/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://chrisarndt.de/projects/threadpool/; + homepage = "https://chrisarndt.de/projects/threadpool/"; description = "Easy to use object-oriented thread pool framework"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/thrift/default.nix b/pkgs/development/python-modules/thrift/default.nix index 7d80be987f7..999d950771c 100644 --- a/pkgs/development/python-modules/thrift/default.nix +++ b/pkgs/development/python-modules/thrift/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python bindings for the Apache Thrift RPC system"; - homepage = http://thrift.apache.org/; + homepage = "http://thrift.apache.org/"; license = licenses.asl20; maintainers = with maintainers; [ hbunke ]; }; diff --git a/pkgs/development/python-modules/thumbor/default.nix b/pkgs/development/python-modules/thumbor/default.nix index 6f2d0de9acc..ee805ce6300 100644 --- a/pkgs/development/python-modules/thumbor/default.nix +++ b/pkgs/development/python-modules/thumbor/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { meta = with lib; { description = "A smart imaging service"; - homepage = https://github.com/thumbor/thumbor/wiki; + homepage = "https://github.com/thumbor/thumbor/wiki"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/thumborpexif/default.nix b/pkgs/development/python-modules/thumborpexif/default.nix index 2a1240526ab..586045edc27 100644 --- a/pkgs/development/python-modules/thumborpexif/default.nix +++ b/pkgs/development/python-modules/thumborpexif/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Module to parse and edit the EXIF data tags in a JPEG image"; - homepage = http://www.benno.id.au/code/pexif/; + homepage = "http://www.benno.id.au/code/pexif/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix index 07f8edc3bec..cf688d75f01 100644 --- a/pkgs/development/python-modules/tiledb/default.nix +++ b/pkgs/development/python-modules/tiledb/default.nix @@ -65,9 +65,9 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface to the TileDB storage manager"; - homepage = https://github.com/TileDB-Inc/TileDB-Py; + homepage = "https://github.com/TileDB-Inc/TileDB-Py"; license = licenses.mit; maintainers = with maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/tilestache/default.nix b/pkgs/development/python-modules/tilestache/default.nix index c76cc6645d9..d4e54fcc40e 100644 --- a/pkgs/development/python-modules/tilestache/default.nix +++ b/pkgs/development/python-modules/tilestache/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A tile server for rendered geographic data"; - homepage = http://tilestache.org; + homepage = "http://tilestache.org"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/timeout-decorator/default.nix b/pkgs/development/python-modules/timeout-decorator/default.nix index af1a85c9627..bf37e671cd1 100644 --- a/pkgs/development/python-modules/timeout-decorator/default.nix +++ b/pkgs/development/python-modules/timeout-decorator/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Timeout decorator"; license = licenses.mit; - homepage = https://github.com/pnpnpn/timeout-decorator; + homepage = "https://github.com/pnpnpn/timeout-decorator"; }; } diff --git a/pkgs/development/python-modules/tinycss/default.nix b/pkgs/development/python-modules/tinycss/default.nix index 223d778095a..42250b058d5 100644 --- a/pkgs/development/python-modules/tinycss/default.nix +++ b/pkgs/development/python-modules/tinycss/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with pkgs.lib; { description = "Complete yet simple CSS parser for Python"; license = licenses.bsd3; - homepage = https://pythonhosted.org/tinycss/; + homepage = "https://pythonhosted.org/tinycss/"; maintainers = [ maintainers.costrouc ]; }; } diff --git a/pkgs/development/python-modules/tinycss2/default.nix b/pkgs/development/python-modules/tinycss2/default.nix index 894d4f737fb..2d8581cfb90 100644 --- a/pkgs/development/python-modules/tinycss2/default.nix +++ b/pkgs/development/python-modules/tinycss2/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "Low-level CSS parser for Python"; - homepage = https://github.com/Kozea/tinycss2; + homepage = "https://github.com/Kozea/tinycss2"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/tissue/default.nix b/pkgs/development/python-modules/tissue/default.nix index 895700f681e..8f551ab5926 100644 --- a/pkgs/development/python-modules/tissue/default.nix +++ b/pkgs/development/python-modules/tissue/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pep8 ]; meta = with stdenv.lib; { - homepage = https://github.com/WoLpH/tissue; + homepage = "https://github.com/WoLpH/tissue"; description = "Tissue - automated pep8 checker for nose"; license = licenses.lgpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index e25d871f978..aed342c119f 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = { - homepage = https://github.com/ppannuto/python-titlecase; + homepage = "https://github.com/ppannuto/python-titlecase"; description = "Python Port of John Gruber's titlecase.pl"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix index ba910f75e19..1efebed9872 100644 --- a/pkgs/development/python-modules/tkinter/default.nix +++ b/pkgs/development/python-modules/tkinter/default.nix @@ -6,7 +6,8 @@ }: buildPythonPackage { - name = "tkinter-${python.version}"; + pname = "tkinter"; + version = python.version; src = py; format = "other"; diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 5e7380f7bb3..dff50c78cf6 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -30,7 +30,7 @@ python.pkgs.buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/barseghyanartur/tld; + homepage = "https://github.com/barseghyanartur/tld"; description = "Extracts the top level domain (TLD) from the URL given"; license = licenses.lgpl21; maintainers = with maintainers; [ genesis ]; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index 07865a6b4b8..e771470b400 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { checkInputs = [ pytest responses ]; meta = { - homepage = https://github.com/john-kurkowski/tldextract; + homepage = "https://github.com/john-kurkowski/tldextract"; description = "Accurately separate the TLD from the registered domain and subdomains of a URL, using the Public Suffix List."; license = lib.licenses.bsd3; }; diff --git a/pkgs/development/python-modules/tlsh/default.nix b/pkgs/development/python-modules/tlsh/default.nix index 2a74a00539f..3448d40cf3a 100644 --- a/pkgs/development/python-modules/tlsh/default.nix +++ b/pkgs/development/python-modules/tlsh/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "Trend Micro Locality Sensitive Hash"; - homepage = https://github.com/trendmicro/tlsh; + homepage = "https://github.com/trendmicro/tlsh"; license = licenses.asl20; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/tlslite-ng/default.nix b/pkgs/development/python-modules/tlslite-ng/default.nix index ac68019d369..244444a276f 100644 --- a/pkgs/development/python-modules/tlslite-ng/default.nix +++ b/pkgs/development/python-modules/tlslite-ng/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure python implementation of SSL and TLS."; - homepage = https://pypi.python.org/pypi/tlslite-ng; + homepage = "https://pypi.python.org/pypi/tlslite-ng"; license = licenses.lgpl2; maintainers = [ maintainers.erictapen ]; }; diff --git a/pkgs/development/python-modules/tlslite/default.nix b/pkgs/development/python-modules/tlslite/default.nix index fb1cdd0a471..ac0c572ec3e 100644 --- a/pkgs/development/python-modules/tlslite/default.nix +++ b/pkgs/development/python-modules/tlslite/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure Python implementation of SSL and TLS"; - homepage = https://pypi.python.org/pypi/tlslite; + homepage = "https://pypi.python.org/pypi/tlslite"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/tmdb3/default.nix b/pkgs/development/python-modules/tmdb3/default.nix index 87b62cd78ac..47247c6911d 100644 --- a/pkgs/development/python-modules/tmdb3/default.nix +++ b/pkgs/development/python-modules/tmdb3/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python implementation of the v3 API for TheMovieDB.org, allowing access to movie and cast information"; - homepage = https://pypi.python.org/pypi/tmdb3; + homepage = "https://pypi.python.org/pypi/tmdb3"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index 6ad6a62861d..ecf9aa91b41 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = { description = "The official Todoist Python API library"; - homepage = https://todoist-python.readthedocs.io/en/latest/; + homepage = "https://todoist-python.readthedocs.io/en/latest/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; diff --git a/pkgs/development/python-modules/tokenlib/default.nix b/pkgs/development/python-modules/tokenlib/default.nix index 24f54b98a96..0ffb5ce0cb7 100644 --- a/pkgs/development/python-modules/tokenlib/default.nix +++ b/pkgs/development/python-modules/tokenlib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "0.3.1"; src = fetchgit { - url = https://github.com/mozilla-services/tokenlib.git; + url = "https://github.com/mozilla-services/tokenlib.git"; rev = "refs/tags/${version}"; sha256 = "0bq6dqyfwh29pg8ngmrm4mx4q27an9lsj0p9l79p9snn4g2rxzc8"; }; @@ -18,7 +18,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests webob ]; meta = with stdenv.lib; { - homepage = https://github.com/mozilla-services/tokenlib; + homepage = "https://github.com/mozilla-services/tokenlib"; description = "Generic support library for signed-token-based auth schemes"; license = licenses.mpl20; }; diff --git a/pkgs/development/python-modules/tokenserver/default.nix b/pkgs/development/python-modules/tokenserver/default.nix index 08f3f87321f..6d3c7e2be05 100644 --- a/pkgs/development/python-modules/tokenserver/default.nix +++ b/pkgs/development/python-modules/tokenserver/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "The Mozilla Token Server"; - homepage = https://github.com/mozilla-services/tokenserver; + homepage = "https://github.com/mozilla-services/tokenserver"; license = licenses.mpl20; maintainers = with maintainers; [ nadrieril ]; }; diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix index 7f506e56413..cb635d227f7 100644 --- a/pkgs/development/python-modules/toolz/default.nix +++ b/pkgs/development/python-modules/toolz/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec{ ''; meta = with lib; { - homepage = https://github.com/pytoolz/toolz; + homepage = "https://github.com/pytoolz/toolz"; description = "List processing tools and functional utilities"; license = licenses.bsd3; maintainers = with maintainers; [ fridh ]; diff --git a/pkgs/development/python-modules/toposort/default.nix b/pkgs/development/python-modules/toposort/default.nix index dd1156f4355..eddd6ac4fd1 100644 --- a/pkgs/development/python-modules/toposort/default.nix +++ b/pkgs/development/python-modules/toposort/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A topological sort algorithm"; - homepage = https://pypi.python.org/pypi/toposort/1.1; + homepage = "https://pypi.python.org/pypi/toposort/1.1"; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix index 0413fd33f6f..4d371579099 100644 --- a/pkgs/development/python-modules/torchvision/default.nix +++ b/pkgs/development/python-modules/torchvision/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = { description = "PyTorch vision library"; - homepage = https://pytorch.org/; + homepage = "https://pytorch.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ericsagnes ]; }; diff --git a/pkgs/development/python-modules/tornado/default.nix b/pkgs/development/python-modules/tornado/default.nix index 1d8a03578cd..102cf0fed57 100644 --- a/pkgs/development/python-modules/tornado/default.nix +++ b/pkgs/development/python-modules/tornado/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { meta = { description = "A web framework and asynchronous networking library"; - homepage = http://www.tornadoweb.org/; + homepage = "http://www.tornadoweb.org/"; license = lib.licenses.asl20; }; } diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index 5cec769decc..d6bc9ea7f39 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Virtualenv-based automation of test activities"; - homepage = https://tox.readthedocs.io/; + homepage = "https://tox.readthedocs.io/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index ec281138aeb..a6549ee07c9 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = { description = "A Fast, Extensible Progress Meter"; - homepage = https://github.com/tqdm/tqdm; + homepage = "https://github.com/tqdm/tqdm"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/traceback2/default.nix b/pkgs/development/python-modules/traceback2/default.nix index fe15285f065..3a70df1548d 100644 --- a/pkgs/development/python-modules/traceback2/default.nix +++ b/pkgs/development/python-modules/traceback2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A backport of traceback to older supported Pythons"; - homepage = https://pypi.python.org/pypi/traceback2/; + homepage = "https://pypi.python.org/pypi/traceback2/"; license = licenses.psfl; }; diff --git a/pkgs/development/python-modules/tracing/default.nix b/pkgs/development/python-modules/tracing/default.nix index 094c01eef78..2d91ae6a137 100644 --- a/pkgs/development/python-modules/tracing/default.nix +++ b/pkgs/development/python-modules/tracing/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/tracing/; + homepage = "http://liw.fi/tracing/"; description = "Python debug logging helper"; license = licenses.gpl3; maintainers = []; diff --git a/pkgs/development/python-modules/trackpy/default.nix b/pkgs/development/python-modules/trackpy/default.nix index d77ca31687f..6d198534149 100644 --- a/pkgs/development/python-modules/trackpy/default.nix +++ b/pkgs/development/python-modules/trackpy/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Particle-tracking toolkit"; - homepage = https://github.com/soft-matter/trackpy; + homepage = "https://github.com/soft-matter/trackpy"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; broken = true; # not compatible with latest pandas diff --git a/pkgs/development/python-modules/traitlets/default.nix b/pkgs/development/python-modules/traitlets/default.nix index 0342abdfefe..00110632808 100644 --- a/pkgs/development/python-modules/traitlets/default.nix +++ b/pkgs/development/python-modules/traitlets/default.nix @@ -31,8 +31,8 @@ buildPythonPackage rec { meta = { description = "Traitlets Python config system"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 84aa1c5784e..47bbbee04e7 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Explicitly typed attributes for Python"; - homepage = https://pypi.python.org/pypi/traits; + homepage = "https://pypi.python.org/pypi/traits"; license = "BSD"; }; diff --git a/pkgs/development/python-modules/traitsui/default.nix b/pkgs/development/python-modules/traitsui/default.nix index 8e7a5643d70..617ba227c41 100644 --- a/pkgs/development/python-modules/traitsui/default.nix +++ b/pkgs/development/python-modules/traitsui/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchPypi, buildPythonPackage -, traits, pyface, wxPython +{ lib, fetchPypi, buildPythonPackage +, traits, pyface, six }: buildPythonPackage rec { @@ -11,14 +11,14 @@ buildPythonPackage rec { sha256 = "0kw1xy5ax6l0lzmk7pfzjw6qs0idv78k3118my7cbvw1n5iiff28"; }; - propagatedBuildInputs = [ traits pyface wxPython ]; + propagatedBuildInputs = [ traits pyface six ]; doCheck = false; # Needs X server - meta = with stdenv.lib; { + meta = with lib; { description = "Traits-capable windowing framework"; homepage = "https://github.com/enthought/traitsui"; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/transaction/default.nix b/pkgs/development/python-modules/transaction/default.nix index 0ed6f84ff30..887c4686336 100644 --- a/pkgs/development/python-modules/transaction/default.nix +++ b/pkgs/development/python-modules/transaction/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Transaction management"; - homepage = https://pypi.python.org/pypi/transaction; + homepage = "https://pypi.python.org/pypi/transaction"; license = licenses.zpl20; }; } diff --git a/pkgs/development/python-modules/transip/default.nix b/pkgs/development/python-modules/transip/default.nix index 977ff17ecec..e71660d5b88 100644 --- a/pkgs/development/python-modules/transip/default.nix +++ b/pkgs/development/python-modules/transip/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "TransIP API Connector"; - homepage = https://github.com/benkonrath/transip-api; + homepage = "https://github.com/benkonrath/transip-api"; license = licenses.mit; maintainers = with maintainers; [ flyfloh ]; }; diff --git a/pkgs/development/python-modules/transitions/default.nix b/pkgs/development/python-modules/transitions/default.nix index f4eb4fe5293..4ab3e11acb1 100644 --- a/pkgs/development/python-modules/transitions/default.nix +++ b/pkgs/development/python-modules/transitions/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pytransitions/transitions; + homepage = "https://github.com/pytransitions/transitions"; description = "A lightweight, object-oriented finite state machine implementation in Python"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix index 53f88188083..0933b90ede9 100644 --- a/pkgs/development/python-modules/translationstring/default.nix +++ b/pkgs/development/python-modules/translationstring/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://pylonsproject.org/; + homepage = "https://pylonsproject.org/"; description = "Utility library for i18n relied on by various Repoze and Pyramid packages"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/transmissionrpc/default.nix b/pkgs/development/python-modules/transmissionrpc/default.nix index 932045b6502..eb209a0d49e 100644 --- a/pkgs/development/python-modules/transmissionrpc/default.nix +++ b/pkgs/development/python-modules/transmissionrpc/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python implementation of the Transmission bittorent client RPC protocol"; - homepage = https://pypi.python.org/pypi/transmissionrpc/; + homepage = "https://pypi.python.org/pypi/transmissionrpc/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index 1d488eed4e1..31b2a3ef209 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/twisted/treq; + homepage = "https://github.com/twisted/treq"; description = "A requests-like API built on top of twisted.web's Agent"; license = licenses.mit; maintainers = with maintainers; [ nand0p ]; diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 2d40ad971db..e7bec00863a 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "trezor"; - version = "0.11.6"; + version = "0.12.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1i73j812i0dgjw9n106pipc6qksd9cgs59d0as0b4j5iyl0087hh"; + sha256 = "0ycmpwjv5xp25993divjhaq5j766zgcy22xx39xfc1pcvldq5g7n"; }; propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic trezor-udev-rules ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 11f3c94aece..135142529a9 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = { description = "An async/await-native I/O library for humans and snake people"; - homepage = https://github.com/python-trio/trio; + homepage = "https://github.com/python-trio/trio"; license = with lib.licenses; [ mit asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/trollius/default.nix b/pkgs/development/python-modules/trollius/default.nix index 21a3c5d6d08..b81a92d08e6 100644 --- a/pkgs/development/python-modules/trollius/default.nix +++ b/pkgs/development/python-modules/trollius/default.nix @@ -45,7 +45,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Port of the asyncio project to Python 2.7"; - homepage = https://github.com/vstinner/trollius; + homepage = "https://github.com/vstinner/trollius"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/trueskill/default.nix b/pkgs/development/python-modules/trueskill/default.nix index 2106e4d2e76..18033aff391 100644 --- a/pkgs/development/python-modules/trueskill/default.nix +++ b/pkgs/development/python-modules/trueskill/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The video game rating system"; - homepage = https://trueskill.org; + homepage = "https://trueskill.org"; license = licenses.bsd3; maintainers = with maintainers; [ eadwu diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 42cbf23e56f..4c99c8e9377 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = { description = "High quality TLS certs while you wait, for the discerning tester"; - homepage = https://github.com/python-trio/trustme; + homepage = "https://github.com/python-trio/trustme"; license = with lib.licenses; [ mit asl20 ]; maintainers = with lib.maintainers; [ catern ]; }; diff --git a/pkgs/development/python-modules/ttystatus/default.nix b/pkgs/development/python-modules/ttystatus/default.nix index bce0ad8d7c0..8cf8c426b3b 100644 --- a/pkgs/development/python-modules/ttystatus/default.nix +++ b/pkgs/development/python-modules/ttystatus/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://liw.fi/ttystatus/; + homepage = "http://liw.fi/ttystatus/"; description = "Progress and status updates on terminals for Python"; license = licenses.gpl3; maintainers = []; diff --git a/pkgs/development/python-modules/tunigo/default.nix b/pkgs/development/python-modules/tunigo/default.nix index 767bb21f0fd..9f2f177552d 100644 --- a/pkgs/development/python-modules/tunigo/default.nix +++ b/pkgs/development/python-modules/tunigo/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for the browse feature of Spotify"; - homepage = https://github.com/trygveaa/python-tunigo; + homepage = "https://github.com/trygveaa/python-tunigo"; license = licenses.asl20; }; } diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 88174a94ef4..13fafe788fd 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests six requests_oauthlib ]; meta = with lib; { - homepage = https://github.com/tweepy/tweepy; + homepage = "https://github.com/tweepy/tweepy"; description = "Twitter library for python"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/twiggy/default.nix b/pkgs/development/python-modules/twiggy/default.nix index 9a87c684f1b..6c502ebe011 100644 --- a/pkgs/development/python-modules/twiggy/default.nix +++ b/pkgs/development/python-modules/twiggy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://twiggy.wearpants.org; + homepage = "http://twiggy.wearpants.org"; # Taken from http://i.wearpants.org/blog/meet-twiggy/ description = "Twiggy is the first totally new design for a logger since log4j"; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index fa167896ea0..75c9a19491c 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Twilio API client and TwiML generator"; - homepage = https://github.com/twilio/twilio-python/; + homepage = "https://github.com/twilio/twilio-python/"; license = licenses.mit; maintainers = with maintainers; [ flokli ]; }; diff --git a/pkgs/development/python-modules/twill/default.nix b/pkgs/development/python-modules/twill/default.nix index 097e691f7c1..e11d7392e1c 100644 --- a/pkgs/development/python-modules/twill/default.nix +++ b/pkgs/development/python-modules/twill/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; # pypi package comes without tests, other homepage does not provide all verisons meta = with lib; { - homepage = http://twill.idyll.org/; + homepage = "http://twill.idyll.org/"; description = "A simple scripting language for Web browsing"; license = licenses.mit; maintainers = with maintainers; [ mic92 ]; diff --git a/pkgs/development/python-modules/twine/default.nix b/pkgs/development/python-modules/twine/default.nix index 762df433f97..b3dddbbba68 100644 --- a/pkgs/development/python-modules/twine/default.nix +++ b/pkgs/development/python-modules/twine/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "Collection of utilities for interacting with PyPI"; - homepage = https://github.com/pypa/twine; + homepage = "https://github.com/pypa/twine"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 2bea54818c2..d38d6aebcbd 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://twistedmatrix.com/; + homepage = "https://twistedmatrix.com/"; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 3b60c63d964..01a7cd3d87a 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "txtorcon"; - version = "19.1.0"; + version = "20.0.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "19ayn5w9ayxbb1m84l1s9qlb6kv7sz6sg34mzy8bnidc7qnfbn15"; + sha256 = "0yipb41w2icbj50d3z1j92d8w6xhbqd1rnmd31vzb5k3g20x0b0j"; }; # zope.interface issue @@ -28,7 +28,7 @@ buildPythonPackage rec { meta = { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; - homepage = https://github.com/meejah/txtorcon; + homepage = "https://github.com/meejah/txtorcon"; maintainers = with lib.maintainers; [ jluttine ]; # Currently broken on Python 2.7. See # https://github.com/NixOS/nixpkgs/issues/71826 diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix index 0514be0fb4d..5095265e33f 100644 --- a/pkgs/development/python-modules/typed-ast/default.nix +++ b/pkgs/development/python-modules/typed-ast/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # No tests in archive doCheck = false; meta = { - homepage = https://pypi.python.org/pypi/typed-ast; + homepage = "https://pypi.python.org/pypi/typed-ast"; description = "a fork of Python 2 and 3 ast modules with type comment support"; license = lib.licenses.asl20; }; diff --git a/pkgs/development/python-modules/typeguard/default.nix b/pkgs/development/python-modules/typeguard/default.nix index 51dc3555250..042bd2e7654 100644 --- a/pkgs/development/python-modules/typeguard/default.nix +++ b/pkgs/development/python-modules/typeguard/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "This library provides run-time type checking for functions defined with argument type annotations"; - homepage = https://github.com/agronholm/typeguard; + homepage = "https://github.com/agronholm/typeguard"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/typesystem/default.nix b/pkgs/development/python-modules/typesystem/default.nix index 8a66d6cbcc9..bfaed58b13f 100644 --- a/pkgs/development/python-modules/typesystem/default.nix +++ b/pkgs/development/python-modules/typesystem/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "A type system library for Python"; - homepage = https://github.com/encode/typesystem; + homepage = "https://github.com/encode/typesystem"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index 6c1e85eb93c..1d8929e3d7e 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -24,7 +24,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Backported and Experimental Type Hints for Python 3.5+"; - homepage = https://github.com/python/typing; + homepage = "https://github.com/python/typing"; license = licenses.psfl; maintainers = with maintainers; [ pmiddend ]; }; diff --git a/pkgs/development/python-modules/typing/default.nix b/pkgs/development/python-modules/typing/default.nix index c6351690f5e..6c25031a8dc 100644 --- a/pkgs/development/python-modules/typing/default.nix +++ b/pkgs/development/python-modules/typing/default.nix @@ -24,7 +24,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Backport of typing module to Python versions older than 3.5"; - homepage = https://docs.python.org/3/library/typing.html; + homepage = "https://docs.python.org/3/library/typing.html"; license = licenses.psfl; }; } diff --git a/pkgs/development/python-modules/tzlocal/default.nix b/pkgs/development/python-modules/tzlocal/default.nix index 9948dd1e84e..f10f76d53cf 100644 --- a/pkgs/development/python-modules/tzlocal/default.nix +++ b/pkgs/development/python-modules/tzlocal/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tzinfo object for the local timezone"; - homepage = https://github.com/regebro/tzlocal; + homepage = "https://github.com/regebro/tzlocal"; license = licenses.cddl; }; } diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index 8fd8eaf8329..93cd1a21a94 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "A portable, lightweight MessagePack serializer and deserializer written in pure Python"; - homepage = https://github.com/vsergeev/u-msgpack-python; + homepage = "https://github.com/vsergeev/u-msgpack-python"; license = lib.licenses.mit; }; diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix index f0b42e6609f..7e03017ce56 100644 --- a/pkgs/development/python-modules/uarray/default.nix +++ b/pkgs/development/python-modules/uarray/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Universal array library"; - homepage = https://github.com/Quansight-Labs/uarray; + homepage = "https://github.com/Quansight-Labs/uarray"; license = licenses.bsd0; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index a9d68978c3b..d60ec743032 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/ujson; + homepage = "https://pypi.python.org/pypi/ujson"; description = "Ultra fast JSON encoder and decoder for Python"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/ukpostcodeparser/default.nix b/pkgs/development/python-modules/ukpostcodeparser/default.nix index 42588347c85..a2c452046ab 100644 --- a/pkgs/development/python-modules/ukpostcodeparser/default.nix +++ b/pkgs/development/python-modules/ukpostcodeparser/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with lib; { description = "UK Postcode parser"; - homepage = https://github.com/hamstah/ukpostcodeparser; + homepage = "https://github.com/hamstah/ukpostcodeparser"; license = licenses.publicDomain; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/umalqurra/default.nix b/pkgs/development/python-modules/umalqurra/default.nix index a41921a9d8c..2eea9ebf385 100644 --- a/pkgs/development/python-modules/umalqurra/default.nix +++ b/pkgs/development/python-modules/umalqurra/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # https://github.com/tytkal/python-hijiri-ummalqura/issues/4 meta = with stdenv.lib; { description = "Date Api that support Hijri Umalqurra calendar"; - homepage = https://github.com/tytkal/python-hijiri-ummalqura; + homepage = "https://github.com/tytkal/python-hijiri-ummalqura"; license = with licenses; [ publicDomain ]; }; diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 465c02beb4f..9979183c497 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -42,7 +42,7 @@ def test_umap_transform_on_iris()" meta = with lib; { description = "Uniform Manifold Approximation and Projection"; - homepage = https://github.com/lmcinnes/umap; + homepage = "https://github.com/lmcinnes/umap"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/umemcache/default.nix b/pkgs/development/python-modules/umemcache/default.nix index 95c0d628697..07bb181958a 100644 --- a/pkgs/development/python-modules/umemcache/default.nix +++ b/pkgs/development/python-modules/umemcache/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Ultra fast memcache client written in highly optimized C++ with Python bindings"; - homepage = https://github.com/esnme/ultramemcache; + homepage = "https://github.com/esnme/ultramemcache"; license = licenses.bsdOriginal; }; } diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix index f2c02c8a6c6..2e87565554c 100644 --- a/pkgs/development/python-modules/uncertainties/default.nix +++ b/pkgs/development/python-modules/uncertainties/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pythonhosted.org/uncertainties/; + homepage = "https://pythonhosted.org/uncertainties/"; description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)"; maintainers = with maintainers; [ rnhmjoj ]; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/uncompyle6/default.nix b/pkgs/development/python-modules/uncompyle6/default.nix index c03e8724d3d..a598591b0f0 100644 --- a/pkgs/development/python-modules/uncompyle6/default.nix +++ b/pkgs/development/python-modules/uncompyle6/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python cross-version byte-code deparser"; - homepage = https://github.com/rocky/python-uncompyle6/; + homepage = "https://github.com/rocky/python-uncompyle6/"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/unicodecsv/default.nix b/pkgs/development/python-modules/unicodecsv/default.nix index d0f54a7c6b2..83ef602de60 100644 --- a/pkgs/development/python-modules/unicodecsv/default.nix +++ b/pkgs/development/python-modules/unicodecsv/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Drop-in replacement for Python2's stdlib csv module, with unicode support"; - homepage = https://github.com/jdunck/python-unicodecsv; + homepage = "https://github.com/jdunck/python-unicodecsv"; maintainers = with maintainers; [ koral ]; }; diff --git a/pkgs/development/python-modules/unidecode/default.nix b/pkgs/development/python-modules/unidecode/default.nix index 8d3ecc54377..0ff066850dd 100644 --- a/pkgs/development/python-modules/unidecode/default.nix +++ b/pkgs/development/python-modules/unidecode/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ glibcLocales ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/Unidecode/; + homepage = "https://pypi.python.org/pypi/Unidecode/"; description = "ASCII transliterations of Unicode text"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 81e9019f489..25ea689e9a2 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Unified diff python parsing/metadata extraction library"; - homepage = https://github.com/matiasb/python-unidiff; + homepage = "https://github.com/matiasb/python-unidiff"; license = licenses.mit; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/python-modules/unifi/default.nix b/pkgs/development/python-modules/unifi/default.nix index d7a8e6eaf04..4d2eae618c3 100644 --- a/pkgs/development/python-modules/unifi/default.nix +++ b/pkgs/development/python-modules/unifi/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An API towards the Ubiquity Networks UniFi controller"; - homepage = https://pypi.python.org/pypi/unifi/; + homepage = "https://pypi.python.org/pypi/unifi/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/units/default.nix b/pkgs/development/python-modules/units/default.nix index 02a3fc940ae..13ae42823ff 100644 --- a/pkgs/development/python-modules/units/default.nix +++ b/pkgs/development/python-modules/units/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python support for quantities with units"; - homepage = https://bitbucket.org/adonohue/units/; + homepage = "https://bitbucket.org/adonohue/units/"; license = licenses.psfl; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/unittest-data-provider/default.nix b/pkgs/development/python-modules/unittest-data-provider/default.nix index ec34a451156..67a3cf313ae 100644 --- a/pkgs/development/python-modules/unittest-data-provider/default.nix +++ b/pkgs/development/python-modules/unittest-data-provider/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with lib; { description = "PHPUnit-like @dataprovider decorator for unittest"; - homepage = https://github.com/yourlabs/unittest-data-provider; + homepage = "https://github.com/yourlabs/unittest-data-provider"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 8d815833a40..f39876d6396 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "9d28ddf6524cf0ff9293f61bd12e792de298f8561a5c945acea63fb437789e0e"; }; meta = with lib; { - homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; + homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/"; description = "A unittest runner that can save test results to XML files"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ rprospero ]; diff --git a/pkgs/development/python-modules/unittest2/default.nix b/pkgs/development/python-modules/unittest2/default.nix index 85ca7157e12..65774d1e33a 100644 --- a/pkgs/development/python-modules/unittest2/default.nix +++ b/pkgs/development/python-modules/unittest2/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A backport of the new features added to the unittest testing framework"; - homepage = https://pypi.python.org/pypi/unittest2; + homepage = "https://pypi.python.org/pypi/unittest2"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/unpaddedbase64/default.nix b/pkgs/development/python-modules/unpaddedbase64/default.nix index b69f894cb5c..bcb902e5bfd 100644 --- a/pkgs/development/python-modules/unpaddedbase64/default.nix +++ b/pkgs/development/python-modules/unpaddedbase64/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/matrix-org/python-unpaddedbase64; + homepage = "https://github.com/matrix-org/python-unpaddedbase64"; description = "Unpadded Base64"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/upass/default.nix b/pkgs/development/python-modules/upass/default.nix index baf536fdbad..2d532be3640 100644 --- a/pkgs/development/python-modules/upass/default.nix +++ b/pkgs/development/python-modules/upass/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Console UI for pass"; - homepage = https://github.com/Kwpolska/upass; + homepage = "https://github.com/Kwpolska/upass"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/update-copyright/default.nix b/pkgs/development/python-modules/update-copyright/default.nix index 9ff1137fb56..169c361e507 100644 --- a/pkgs/development/python-modules/update-copyright/default.nix +++ b/pkgs/development/python-modules/update-copyright/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "An automatic copyright update tool"; - homepage = http://blog.tremily.us/posts/update-copyright; + homepage = "http://blog.tremily.us/posts/update-copyright"; license = licenses.gpl3; }; } diff --git a/pkgs/development/python-modules/update-dotdee/default.nix b/pkgs/development/python-modules/update-dotdee/default.nix index b537ca8c264..ec9dbd947c0 100644 --- a/pkgs/development/python-modules/update-dotdee/default.nix +++ b/pkgs/development/python-modules/update-dotdee/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Generic modularized configuration file manager"; - homepage = https://github.com/xolox/python-update-dotdee; + homepage = "https://github.com/xolox/python-update-dotdee"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix index ad401d80190..913c8903e9e 100644 --- a/pkgs/development/python-modules/update_checker/default.nix +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A python module that will check for package updates"; - homepage = https://github.com/bboe/update_checker; + homepage = "https://github.com/bboe/update_checker"; license = licenses.bsd2; }; } diff --git a/pkgs/development/python-modules/uproot-methods/default.nix b/pkgs/development/python-modules/uproot-methods/default.nix index 7e799439274..47fc285a546 100644 --- a/pkgs/development/python-modules/uproot-methods/default.nix +++ b/pkgs/development/python-modules/uproot-methods/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/scikit-hep/uproot-methods; + homepage = "https://github.com/scikit-hep/uproot-methods"; description = "Pythonic mix-ins for ROOT classes"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/uptime/default.nix b/pkgs/development/python-modules/uptime/default.nix index 035acbcec2b..0e1d10f7ae5 100644 --- a/pkgs/development/python-modules/uptime/default.nix +++ b/pkgs/development/python-modules/uptime/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/Cairnarvon/uptime; + homepage = "https://github.com/Cairnarvon/uptime"; description = "Cross-platform way to retrieve system uptime and boot time"; license = licenses.bsd2; maintainers = with maintainers; [ rob ]; diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 64333f23929..1ab67be5bdc 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python framework for building Desktop applications"; - homepage = https://github.com/Ultimaker/Uranium; + homepage = "https://github.com/Ultimaker/Uranium"; license = licenses.lgpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar gebner ]; diff --git a/pkgs/development/python-modules/uritemplate/default.nix b/pkgs/development/python-modules/uritemplate/default.nix index 64a2fd51ee3..5077267528a 100644 --- a/pkgs/development/python-modules/uritemplate/default.nix +++ b/pkgs/development/python-modules/uritemplate/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/python-hyper/uritemplate; + homepage = "https://github.com/python-hyper/uritemplate"; description = "URI template parsing for Humans"; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ matthiasbeyer ]; diff --git a/pkgs/development/python-modules/urlgrabber/default.nix b/pkgs/development/python-modules/urlgrabber/default.nix index f81a6d814e9..7af69e5ded8 100644 --- a/pkgs/development/python-modules/urlgrabber/default.nix +++ b/pkgs/development/python-modules/urlgrabber/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pycurl six ]; meta = with stdenv.lib; { - homepage = http://urlgrabber.baseurl.org; + homepage = "http://urlgrabber.baseurl.org"; license = licenses.lgpl2Plus; description = "Python module for downloading files"; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/development/python-modules/urllib3/default.nix b/pkgs/development/python-modules/urllib3/default.nix index ce1e8490c9f..5abf99670c1 100644 --- a/pkgs/development/python-modules/urllib3/default.nix +++ b/pkgs/development/python-modules/urllib3/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Powerful, sanity-friendly HTTP client for Python"; - homepage = https://github.com/shazow/urllib3; + homepage = "https://github.com/shazow/urllib3"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 8e255dc69dc..3e71cae26e3 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -15,8 +15,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; - homepage = http://excess.org/urwid; - repositories.git = git://github.com/wardi/urwid.git; + homepage = "http://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 468420f0e5c..1b5c58b9ca5 100644 --- a/pkgs/development/python-modules/urwidtrees/default.nix +++ b/pkgs/development/python-modules/urwidtrees/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tree widgets for urwid"; - homepage = https://github.com/pazz/urwidtrees; + homepage = "https://github.com/pazz/urwidtrees"; license = licenses.gpl3; }; diff --git a/pkgs/development/python-modules/us/default.nix b/pkgs/development/python-modules/us/default.nix index 53b5bc9ad16..307f6fd7524 100644 --- a/pkgs/development/python-modules/us/default.nix +++ b/pkgs/development/python-modules/us/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { state name lookup, is contiguous or continental, URLs to shapefiles for state, census, congressional districts, counties, and census tracts ''; - homepage = https://github.com/unitedstates/python-us/; + homepage = "https://github.com/unitedstates/python-us/"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/usbtmc/default.nix b/pkgs/development/python-modules/usbtmc/default.nix index 8b397d3c42c..34e6025dcfb 100644 --- a/pkgs/development/python-modules/usbtmc/default.nix +++ b/pkgs/development/python-modules/usbtmc/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python implementation of the USBTMC instrument control protocol"; - homepage = http://alexforencich.com/wiki/en/python-usbtmc/start; + homepage = "http://alexforencich.com/wiki/en/python-usbtmc/start"; license = licenses.mit; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/pkgs/development/python-modules/user-agents/default.nix b/pkgs/development/python-modules/user-agents/default.nix index 827ef72d2eb..80985eed481 100644 --- a/pkgs/development/python-modules/user-agents/default.nix +++ b/pkgs/development/python-modules/user-agents/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python library to identify devices by parsing user agent strings"; - homepage = https://github.com/selwin/python-user-agents; + homepage = "https://github.com/selwin/python-user-agents"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/development/python-modules/uuid/default.nix b/pkgs/development/python-modules/uuid/default.nix index 5e31f6ccad0..c7bcb770070 100644 --- a/pkgs/development/python-modules/uuid/default.nix +++ b/pkgs/development/python-modules/uuid/default.nix @@ -11,6 +11,6 @@ buildPythonPackage rec { meta = with lib; { description = "UUID object and generation functions (Python 2.3 or higher)"; - homepage = http://zesty.ca/python/; + homepage = "http://zesty.ca/python/"; }; } diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index f6cc91413c0..d839c421ea0 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -50,7 +50,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://www.uvicorn.org/; + homepage = "https://www.uvicorn.org/"; description = "The lightning-fast ASGI server"; license = licenses.bsd3; maintainers = with maintainers; [ wd15 ]; diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 36c5af1d718..109d8d8efab 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -6,16 +6,17 @@ , libuv , psutil , isPy27 -, pythonAtLeast , CoreServices , ApplicationServices +# Check Inputs +, pytestCheckHook +# , pytest-asyncio }: buildPythonPackage rec { pname = "uvloop"; version = "0.14.0"; - # python 3.8 hangs on tests, assuming it's subtly broken with race condition - disabled = isPy27 || pythonAtLeast "3.8"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -28,20 +29,44 @@ buildPythonPackage rec { libuv ] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; - postPatch = '' - # Removing code linting tests, which we don't care about - rm tests/test_sourcecode.py - ''; + pythonImportsCheck = [ + "uvloop" + "uvloop.loop" + ]; + + dontUseSetuptoolsCheck = true; + checkInputs = [ pytestCheckHook pyopenssl psutil ]; + + pytestFlagsArray = [ + # from pytest.ini, these are NECESSARY to prevent failures + "--capture=no" + "--assert=plain" + "--tb=native" + # ignore code linting tests + "--ignore=tests/test_sourcecode.py" + ]; - checkInputs = [ pyopenssl psutil ]; + disabledTests = [ + "test_sock_cancel_add_reader_race" # asyncio version of test is supposed to be skipped but skip doesn't happen. uvloop version runs fine + ]; + + # force using installed/compiled uvloop vs source by moving tests to temp dir + preCheck = '' + export TEST_DIR=$(mktemp -d) + cp -r tests $TEST_DIR + pushd $TEST_DIR + ''; + postCheck = '' + popd + ''; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; meta = with lib; { description = "Fast implementation of asyncio event loop on top of libuv"; - homepage = https://github.com/MagicStack/uvloop; + homepage = "https://github.com/MagicStack/uvloop"; license = licenses.mit; - maintainers = [ maintainers.costrouc ]; + maintainers = with maintainers; [ costrouc ]; }; } diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index 5efd676f53d..c6dee84da30 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Data Validation for Humans™"; - homepage = https://github.com/kvesteri/validators; + homepage = "https://github.com/kvesteri/validators"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/validictory/default.nix b/pkgs/development/python-modules/validictory/default.nix index c27d13ab8f1..81e80375e68 100644 --- a/pkgs/development/python-modules/validictory/default.nix +++ b/pkgs/development/python-modules/validictory/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Validate dicts against a schema"; - homepage = https://github.com/sunlightlabs/validictory; + homepage = "https://github.com/sunlightlabs/validictory"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/variants/default.nix b/pkgs/development/python-modules/variants/default.nix new file mode 100644 index 00000000000..11c50646700 --- /dev/null +++ b/pkgs/development/python-modules/variants/default.nix @@ -0,0 +1,35 @@ +{ buildPythonPackage +, isPy27 +, fetchPypi +, pytestrunner +, setuptools_scm +, singledispatch +, pytest +, lib +}: + +buildPythonPackage rec { + pname = "variants"; + version = "0.2.0"; + + src = fetchPypi { + inherit pname version ; + sha256 = "511f75b4cf7483c27e4d86d9accf2b5317267900c166d17636beeed118929b90"; + }; + + nativeBuildInputs = [ + pytestrunner + setuptools_scm + ]; + + checkInputs = [ + pytest + ] ++ lib.optionals isPy27 [ singledispatch ]; + + meta = with lib; { + description = "Library providing syntactic sugar for creating variant forms of a canonical function"; + homepage = "https://github.com/python-variants/variants"; + license = licenses.asl20; + maintainers = with maintainers; [ rakesh4g ]; + }; +} diff --git a/pkgs/development/python-modules/varint/default.nix b/pkgs/development/python-modules/varint/default.nix new file mode 100644 index 00000000000..5f32dff4aa5 --- /dev/null +++ b/pkgs/development/python-modules/varint/default.nix @@ -0,0 +1,25 @@ +{ buildPythonPackage +, fetchPypi +, lib +}: +buildPythonPackage rec { + pname = "varint"; + version = "1.0.2"; + + src = fetchPypi { + inherit pname version ; + sha256 = "a6ecc02377ac5ee9d65a6a8ad45c9ff1dac8ccee19400a5950fb51d594214ca5"; + }; + + # No tests are available + doCheck = false; + + pythonImportsCheck = [ "varint" ]; + + meta = with lib; { + description = "A basic varint implementation in python"; + homepage = "https://github.com/fmoo/python-varint"; + license = licenses.mit; + maintainers = with maintainers; [ rakesh4g ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index c518314d964..ddd4015aad1 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { meta = with lib; { description = "Automatically mock your HTTP interactions to simplify and speed up testing"; - homepage = https://github.com/kevin1024/vcrpy; + homepage = "https://github.com/kevin1024/vcrpy"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/vcversioner/default.nix b/pkgs/development/python-modules/vcversioner/default.nix index ffe184e263a..5f7f30e2c33 100644 --- a/pkgs/development/python-modules/vcversioner/default.nix +++ b/pkgs/development/python-modules/vcversioner/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "take version numbers from version control"; - homepage = https://github.com/habnabit/vcversioner; + homepage = "https://github.com/habnabit/vcversioner"; license = licenses.isc; }; } diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index 2ce3e24f4cd..73725c8e5e3 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Library for working with Valve's VDF text format"; - homepage = https://github.com/ValvePython/vdf; + homepage = "https://github.com/ValvePython/vdf"; license = licenses.mit; maintainers = with maintainers; [ metadark ]; }; diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index 73485329ef7..4bd3f1b9931 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { jupyter nbextension install --user --py vega jupyter nbextension enable --user vega ''; - homepage = https://github.com/vega/ipyvega; + homepage = "https://github.com/vega/ipyvega"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; platforms = platforms.unix; diff --git a/pkgs/development/python-modules/vega_datasets/default.nix b/pkgs/development/python-modules/vega_datasets/default.nix index f028f85f3ec..5845557c54c 100644 --- a/pkgs/development/python-modules/vega_datasets/default.nix +++ b/pkgs/development/python-modules/vega_datasets/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "A Python package for offline access to vega datasets"; - homepage = https://github.com/altair-viz/vega_datasets; + homepage = "https://github.com/altair-viz/vega_datasets"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/venusian/default.nix b/pkgs/development/python-modules/venusian/default.nix index 7a67fdf727b..8817b057cc9 100644 --- a/pkgs/development/python-modules/venusian/default.nix +++ b/pkgs/development/python-modules/venusian/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A library for deferring decorator actions"; - homepage = https://pylonsproject.org/; + homepage = "https://pylonsproject.org/"; license = licenses.bsd0; maintainers = with maintainers; [ domenkozar ]; }; diff --git a/pkgs/development/python-modules/verboselogs/default.nix b/pkgs/development/python-modules/verboselogs/default.nix index f4c78858913..99eb80530ef 100644 --- a/pkgs/development/python-modules/verboselogs/default.nix +++ b/pkgs/development/python-modules/verboselogs/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Verbose logging for Python's logging module"; - homepage = https://github.com/xolox/python-verboselogs; + homepage = "https://github.com/xolox/python-verboselogs"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/development/python-modules/versioneer/default.nix b/pkgs/development/python-modules/versioneer/default.nix index a3328671417..8094a15a32e 100644 --- a/pkgs/development/python-modules/versioneer/default.nix +++ b/pkgs/development/python-modules/versioneer/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Version-string management for VCS-controlled trees"; - homepage = https://github.com/warner/python-versioneer; + homepage = "https://github.com/warner/python-versioneer"; license = licenses.publicDomain; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/versiontools/default.nix b/pkgs/development/python-modules/versiontools/default.nix index e92dbae8138..ea282c22ddc 100644 --- a/pkgs/development/python-modules/versiontools/default.nix +++ b/pkgs/development/python-modules/versiontools/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = (!isPy3k); meta = with stdenv.lib; { - homepage = https://launchpad.net/versiontools; + homepage = "https://launchpad.net/versiontools"; description = "Smart replacement for plain tuple used in __version__"; license = licenses.lgpl2; }; diff --git a/pkgs/development/python-modules/veryprettytable/default.nix b/pkgs/development/python-modules/veryprettytable/default.nix index 8d71e6331f5..eff996c3ae4 100644 --- a/pkgs/development/python-modules/veryprettytable/default.nix +++ b/pkgs/development/python-modules/veryprettytable/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; - homepage = https://github.com/smeggingsmegger/VeryPrettyTable; + homepage = "https://github.com/smeggingsmegger/VeryPrettyTable"; license = licenses.free; }; diff --git a/pkgs/development/python-modules/vidstab/default.nix b/pkgs/development/python-modules/vidstab/default.nix index 55d618899fd..895699df954 100644 --- a/pkgs/development/python-modules/vidstab/default.nix +++ b/pkgs/development/python-modules/vidstab/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/AdamSpannbauer/python_video_stab; + homepage = "https://github.com/AdamSpannbauer/python_video_stab"; description = "Video Stabilization using OpenCV"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; diff --git a/pkgs/development/python-modules/vine/default.nix b/pkgs/development/python-modules/vine/default.nix index c3ee5237935..ce5756656bc 100644 --- a/pkgs/development/python-modules/vine/default.nix +++ b/pkgs/development/python-modules/vine/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python promises"; - homepage = https://github.com/celery/vine; + homepage = "https://github.com/celery/vine"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/virtkey/default.nix b/pkgs/development/python-modules/virtkey/default.nix index cf62704e8be..9ab89e9ac0d 100644 --- a/pkgs/development/python-modules/virtkey/default.nix +++ b/pkgs/development/python-modules/virtkey/default.nix @@ -18,7 +18,7 @@ in buildPythonPackage rec { meta = with lib; { description = "Extension to emulate keypresses and to get the layout information from the X server"; - homepage = https://launchpad.net/virtkey; + homepage = "https://launchpad.net/virtkey"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/virtualenv-clone/default.nix b/pkgs/development/python-modules/virtualenv-clone/default.nix index b1ce764c4ac..cc68d4b7090 100644 --- a/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.5.3"; + version = "0.5.4"; src = fetchPypi { inherit pname version; - sha256 = "c88ae171a11b087ea2513f260cdac9232461d8e9369bcd1dc143fc399d220557"; + sha256 = "0absh96fsxk9di7ir76f5djyfm2c214wnyk53avrhjy8akflhpk6"; }; buildInputs = [ pytest ]; @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/edwardgeorge/virtualenv-clone; + homepage = "https://github.com/edwardgeorge/virtualenv-clone"; description = "Script to clone virtualenvs"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 62c86567655..70be4a05f69 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { meta = { description = "A tool to create isolated Python environments"; - homepage = http://www.virtualenv.org; + homepage = "http://www.virtualenv.org"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ goibhniu ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/visitor/default.nix b/pkgs/development/python-modules/visitor/default.nix index 78dc29bbeb0..1c0d725ac86 100644 --- a/pkgs/development/python-modules/visitor/default.nix +++ b/pkgs/development/python-modules/visitor/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; meta = with lib; { - homepage = https://github.com/mbr/visitor; + homepage = "https://github.com/mbr/visitor"; description = "A tiny pythonic visitor implementation"; license = licenses.mit; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index a9eb492c01e..70e7dbeba69 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A vmprof client"; license = licenses.mit; - homepage = https://vmprof.readthedocs.org/; + homepage = "https://vmprof.readthedocs.org/"; broken = true; }; diff --git a/pkgs/development/python-modules/vobject/default.nix b/pkgs/development/python-modules/vobject/default.nix index 95cf6efaa46..1bb87d9d122 100644 --- a/pkgs/development/python-modules/vobject/default.nix +++ b/pkgs/development/python-modules/vobject/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module for reading vCard and vCalendar files"; - homepage = http://eventable.github.io/vobject/; + homepage = "http://eventable.github.io/vobject/"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/voluptuous-serialize/default.nix b/pkgs/development/python-modules/voluptuous-serialize/default.nix index 4a27252e060..f310148d75d 100644 --- a/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/balloob/voluptuous-serialize; + homepage = "https://github.com/balloob/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 70512edf400..6dd8ab86938 100644 --- a/pkgs/development/python-modules/voluptuous/default.nix +++ b/pkgs/development/python-modules/voluptuous/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Voluptuous is a Python data validation library"; - homepage = http://alecthomas.github.io/voluptuous/; + homepage = "http://alecthomas.github.io/voluptuous/"; license = licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 65dbce862a4..ddd36a98cb6 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "8.8.0"; + version = "8.8.1"; src = fetchPypi{ inherit pname version; - sha256 = "bd4c7e49a6ddaa1afedf97b22b822c7322328d686d45151b47a5127fc409c2af"; + sha256 = "17fw1g4ka9jppd41srw39zbp2b8h81izc71bbggxgf2r0xbdpga6"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vsts/default.nix b/pkgs/development/python-modules/vsts/default.nix index 0f49ffd05c6..8095ccf98f0 100644 --- a/pkgs/development/python-modules/vsts/default.nix +++ b/pkgs/development/python-modules/vsts/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python APIs for interacting with and managing Azure DevOps"; - homepage = https://github.com/microsoft/azure-devops-python-api; + homepage = "https://github.com/microsoft/azure-devops-python-api"; license = licenses.mit; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/vxi11/default.nix b/pkgs/development/python-modules/vxi11/default.nix index 7bae1e9860b..15a9d7073ab 100644 --- a/pkgs/development/python-modules/vxi11/default.nix +++ b/pkgs/development/python-modules/vxi11/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "VXI-11 driver for controlling instruments over Ethernet"; - homepage = https://github.com/python-ivi/python-vxi11; + homepage = "https://github.com/python-ivi/python-vxi11"; license = licenses.mit; maintainers = with maintainers; [ bgamari ]; }; diff --git a/pkgs/development/python-modules/waitress/default.nix b/pkgs/development/python-modules/waitress/default.nix index acbe03793db..72da3204a64 100644 --- a/pkgs/development/python-modules/waitress/default.nix +++ b/pkgs/development/python-modules/waitress/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/Pylons/waitress; + homepage = "https://github.com/Pylons/waitress"; description = "Waitress WSGI server"; license = licenses.zpl20; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index b5c9e14da35..dd947c0555c 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A small python module for wake on lan"; - homepage = https://github.com/remcohaszing/pywakeonlan; + homepage = "https://github.com/remcohaszing/pywakeonlan"; license = licenses.wtfpl; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/warlock/default.nix b/pkgs/development/python-modules/warlock/default.nix index bc298b2794d..34815f99a94 100644 --- a/pkgs/development/python-modules/warlock/default.nix +++ b/pkgs/development/python-modules/warlock/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six jsonpatch jsonschema jsonpointer ]; meta = with stdenv.lib; { - homepage = https://github.com/bcwaldon/warlock; + homepage = "https://github.com/bcwaldon/warlock"; description = "Python object model built on JSON schema and JSON patch"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/warrant/default.nix b/pkgs/development/python-modules/warrant/default.nix index 7cf69fdb614..a4bbee43d01 100644 --- a/pkgs/development/python-modules/warrant/default.nix +++ b/pkgs/development/python-modules/warrant/default.nix @@ -37,7 +37,7 @@ buildPythonPackage { meta = with lib; { description = "Python library for using AWS Cognito with support for SRP"; - homepage = https://github.com/capless/warrant; + homepage = "https://github.com/capless/warrant"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index 8a6af2e69db..1865b5792b1 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A lightweight console printing and formatting toolkit"; - homepage = https://github.com/ines/wasabi; + homepage = "https://github.com/ines/wasabi"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; }; diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 361baea4916..1e5ab9a9f2f 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python API and shell utilities to monitor file system events"; - homepage = https://github.com/gorakhargosh/watchdog; + homepage = "https://github.com/gorakhargosh/watchdog"; license = licenses.asl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/wcwidth/default.nix b/pkgs/development/python-modules/wcwidth/default.nix index 39ce62ca47c..4b604bd2c6a 100644 --- a/pkgs/development/python-modules/wcwidth/default.nix +++ b/pkgs/development/python-modules/wcwidth/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { a Terminal. It is implemented in python (no C library calls) and has no 3rd-party dependencies. ''; - homepage = https://github.com/jquast/wcwidth; + homepage = "https://github.com/jquast/wcwidth"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/weasyprint/default.nix b/pkgs/development/python-modules/weasyprint/default.nix index f112d6f1555..c1eaa1fd754 100644 --- a/pkgs/development/python-modules/weasyprint/default.nix +++ b/pkgs/development/python-modules/weasyprint/default.nix @@ -63,7 +63,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://weasyprint.org/; + homepage = "https://weasyprint.org/"; description = "Converts web documents to PDF"; license = licenses.bsd3; maintainers = with maintainers; [ elohmeier ]; diff --git a/pkgs/development/python-modules/webapp2/default.nix b/pkgs/development/python-modules/webapp2/default.nix index 584440eab6a..01c1ca309d4 100644 --- a/pkgs/development/python-modules/webapp2/default.nix +++ b/pkgs/development/python-modules/webapp2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Taking Google App Engine's webapp to the next level"; - homepage = http://webapp-improved.appspot.com; + homepage = "http://webapp-improved.appspot.com"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/webassets/default.nix b/pkgs/development/python-modules/webassets/default.nix index 4556eefed2d..176d2f66160 100644 --- a/pkgs/development/python-modules/webassets/default.nix +++ b/pkgs/development/python-modules/webassets/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Media asset management for Python, with glue code for various web frameworks"; - homepage = https://github.com/miracle2k/webassets/; + homepage = "https://github.com/miracle2k/webassets/"; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/webcolors/default.nix b/pkgs/development/python-modules/webcolors/default.nix index 3ca97c4556c..e0e2f97501b 100644 --- a/pkgs/development/python-modules/webcolors/default.nix +++ b/pkgs/development/python-modules/webcolors/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Library for working with color names/values defined by the HTML and CSS specifications"; - homepage = https://bitbucket.org/ubernostrum/webcolors/overview/; + homepage = "https://bitbucket.org/ubernostrum/webcolors/overview/"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/webencodings/default.nix b/pkgs/development/python-modules/webencodings/default.nix index c4ab0dd59ca..fa89241d7d8 100644 --- a/pkgs/development/python-modules/webencodings/default.nix +++ b/pkgs/development/python-modules/webencodings/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = { description = "Character encoding aliases for legacy web content"; - homepage = https://github.com/SimonSapin/python-webencodings; + homepage = "https://github.com/SimonSapin/python-webencodings"; license = lib.licenses.bsd3; }; } diff --git a/pkgs/development/python-modules/webhelpers/default.nix b/pkgs/development/python-modules/webhelpers/default.nix index 37f9735f47c..d88f8210ae1 100644 --- a/pkgs/development/python-modules/webhelpers/default.nix +++ b/pkgs/development/python-modules/webhelpers/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://webhelpers.readthedocs.org/en/latest/; + homepage = "https://webhelpers.readthedocs.org/en/latest/"; description = "Web Helpers"; license = licenses.free; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix index bd2e0574a47..77e91feebac 100644 --- a/pkgs/development/python-modules/webob/default.nix +++ b/pkgs/development/python-modules/webob/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "WSGI request and response object"; - homepage = http://pythonpaste.org/webob/; + homepage = "http://pythonpaste.org/webob/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/weboob/default.nix b/pkgs/development/python-modules/weboob/default.nix index d0a5d6116f8..7c3d25068e3 100644 --- a/pkgs/development/python-modules/weboob/default.nix +++ b/pkgs/development/python-modules/weboob/default.nix @@ -1,4 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy27 +, Babel , cssselect , dateutil , feedparser @@ -24,11 +25,11 @@ buildPythonPackage rec { pname = "weboob"; - version = "1.5"; + version = "2.0"; src = fetchPypi { inherit pname version; - sha256 = "1c9z9gid1mbm1cakb2wj6jjkbrmji8y8ac46iqpih9x1h498bhbs"; + sha256 = "1c69vzf8sg8471lcaafpz9iw2q3rfj5hmcpqrs2k59fkgbvy32zw"; }; postPatch = '' @@ -44,13 +45,12 @@ buildPythonPackage rec { }; p' weboob/browser/browsers.py weboob/browser/pages.py ''; - setupPyBuildFlags = ["--qt" "--xdg"]; - checkInputs = [ nose ]; nativeBuildInputs = [ pyqt5 ]; propagatedBuildInputs = [ + Babel cssselect dateutil feedparser @@ -77,7 +77,7 @@ buildPythonPackage rec { ''; meta = { - homepage = http://weboob.org; + homepage = "http://weboob.org"; description = "Collection of applications and APIs to interact with websites without requiring the user to open a browser"; license = lib.licenses.agpl3; }; diff --git a/pkgs/development/python-modules/webrtcvad/default.nix b/pkgs/development/python-modules/webrtcvad/default.nix index 7bd0f20bfa1..f90d0b97bee 100644 --- a/pkgs/development/python-modules/webrtcvad/default.nix +++ b/pkgs/development/python-modules/webrtcvad/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = { description = "Interface to the Google WebRTC Voice Activity Detector (VAD)"; - homepage = https://github.com/wiseman/py-webrtcvad; + homepage = "https://github.com/wiseman/py-webrtcvad"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/websockify/default.nix b/pkgs/development/python-modules/websockify/default.nix index 484cc33b1f3..e885a1ba9b7 100644 --- a/pkgs/development/python-modules/websockify/default.nix +++ b/pkgs/development/python-modules/websockify/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "WebSockets support for any application/server"; - homepage = https://github.com/kanaka/websockify; + homepage = "https://github.com/kanaka/websockify"; license = licenses.lgpl3; }; diff --git a/pkgs/development/python-modules/webtest/default.nix b/pkgs/development/python-modules/webtest/default.nix index d97d58b2e5d..48acb6c881d 100644 --- a/pkgs/development/python-modules/webtest/default.nix +++ b/pkgs/development/python-modules/webtest/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Helper to test WSGI applications"; - homepage = https://webtest.readthedocs.org/en/latest/; + homepage = "https://webtest.readthedocs.org/en/latest/"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/wget/default.nix b/pkgs/development/python-modules/wget/default.nix index 2ffd747d04d..a86b693affa 100644 --- a/pkgs/development/python-modules/wget/default.nix +++ b/pkgs/development/python-modules/wget/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = { description = "Pure python download utility"; - homepage = https://bitbucket.org/techtonik/python-wget/; + homepage = "https://bitbucket.org/techtonik/python-wget/"; license = with lib.licenses; [ unlicense ]; maintainers = with lib.maintainers; [ prusnak ]; }; diff --git a/pkgs/development/python-modules/wheel/default.nix b/pkgs/development/python-modules/wheel/default.nix index 8b6aa35b1ac..4527006fadd 100644 --- a/pkgs/development/python-modules/wheel/default.nix +++ b/pkgs/development/python-modules/wheel/default.nix @@ -36,6 +36,6 @@ buildPythonPackage rec { meta = { description = "A built-package format for Python"; license = with lib.licenses; [ mit ]; - homepage = https://bitbucket.org/pypa/wheel/; + homepage = "https://bitbucket.org/pypa/wheel/"; }; } diff --git a/pkgs/development/python-modules/whichcraft/default.nix b/pkgs/development/python-modules/whichcraft/default.nix index de6c4c570cc..b771615ebbd 100644 --- a/pkgs/development/python-modules/whichcraft/default.nix +++ b/pkgs/development/python-modules/whichcraft/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = https://github.com/pydanny/whichcraft; + homepage = "https://github.com/pydanny/whichcraft"; description = "Cross-platform cross-python shutil.which functionality"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index 134d797ecf8..70709d3e666 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -2,18 +2,18 @@ buildPythonPackage rec { pname = "whisper"; - version = "1.1.6"; + version = "1.1.7"; src = fetchPypi { inherit pname version; - sha256 = "8dbb3b7cf4a02a080162467fff5cd38bf77940c3e2b25f7c4f78529427ca9cfe"; + sha256 = "08biw3g6x6p2aa1nlvfazbgcs1xvf6m0hvskdjhgwnsbwxk1xq46"; }; propagatedBuildInputs = [ six ]; checkInputs = [ mock ]; meta = with stdenv.lib; { - homepage = http://graphite.wikidot.com/; + homepage = "http://graphite.wikidot.com/"; description = "Fixed size round-robin style database"; maintainers = with maintainers; [ offline basvandijk ]; license = licenses.asl20; diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index 565032ad523..9ef4fd14979 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Radically simplified static file serving for WSGI applications"; - homepage = http://whitenoise.evans.io/; + homepage = "http://whitenoise.evans.io/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/whoosh/default.nix b/pkgs/development/python-modules/whoosh/default.nix index a7b34cf9b36..e203cdb2934 100644 --- a/pkgs/development/python-modules/whoosh/default.nix +++ b/pkgs/development/python-modules/whoosh/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fast, pure-Python full text indexing, search, and spell checking library."; - homepage = https://bitbucket.org/mchaput/whoosh; + homepage = "https://bitbucket.org/mchaput/whoosh"; license = licenses.bsd2; maintainers = with maintainers; [ nand0p ]; }; diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix index f0aee6b8058..bb8f1ab3b4d 100644 --- a/pkgs/development/python-modules/widgetsnbextension/default.nix +++ b/pkgs/development/python-modules/widgetsnbextension/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { meta = { description = "IPython HTML widgets for Jupyter"; - homepage = http://ipython.org/; + homepage = "http://ipython.org/"; license = ipywidgets.meta.license; # Build from same repo maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/willow/default.nix b/pkgs/development/python-modules/willow/default.nix index 138facad701..275a46a1472 100644 --- a/pkgs/development/python-modules/willow/default.nix +++ b/pkgs/development/python-modules/willow/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A Python image library that sits on top of Pillow, Wand and OpenCV"; - homepage = https://github.com/torchbox/Willow/; + homepage = "https://github.com/torchbox/Willow/"; license = licenses.bsd2; maintainers = with maintainers; [ desiderius ]; }; diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 97530989a38..0dab5234860 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -42,7 +42,7 @@ buildPythonPackage { meta = with lib; { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; - homepage = https://github.com/LuminosoInsight/wordfreq/; + homepage = "https://github.com/LuminosoInsight/wordfreq/"; license = licenses.mit; maintainers = with maintainers; [ ixxie ]; }; diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix index 81c09bf7425..dafa948f69d 100644 --- a/pkgs/development/python-modules/worldengine/default.nix +++ b/pkgs/development/python-modules/worldengine/default.nix @@ -56,7 +56,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://world-engine.org; + homepage = "http://world-engine.org"; description = "World generator using simulation of plates, rain shadow, erosion, etc"; license = licenses.mit; maintainers = with maintainers; [ rardiol ]; diff --git a/pkgs/development/python-modules/wptserve/default.nix b/pkgs/development/python-modules/wptserve/default.nix index 12172c376c9..65e3669734f 100644 --- a/pkgs/development/python-modules/wptserve/default.nix +++ b/pkgs/development/python-modules/wptserve/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = { description = "A webserver intended for web browser testing"; - homepage = https://wptserve.readthedocs.org/; + homepage = "https://wptserve.readthedocs.org/"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ raskin ]; }; diff --git a/pkgs/development/python-modules/wrapt/default.nix b/pkgs/development/python-modules/wrapt/default.nix index 5ef9dd07508..a380e6ac379 100644 --- a/pkgs/development/python-modules/wrapt/default.nix +++ b/pkgs/development/python-modules/wrapt/default.nix @@ -18,6 +18,6 @@ buildPythonPackage rec { meta = { description = "Module for decorators, wrappers and monkey patching"; license = lib.licenses.bsd2; - homepage = https://github.com/GrahamDumpleton/wrapt; + homepage = "https://github.com/GrahamDumpleton/wrapt"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/wrf-python/default.nix b/pkgs/development/python-modules/wrf-python/default.nix index 29c1f8dfa79..c4bc74a58d2 100644 --- a/pkgs/development/python-modules/wrf-python/default.nix +++ b/pkgs/development/python-modules/wrf-python/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = { description = "WRF postprocessing library for Python"; - homepage = http://wrf-python.rtfd.org; + 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 141b499453e..83e1fbad323 100644 --- a/pkgs/development/python-modules/ws4py/default.nix +++ b/pkgs/development/python-modules/ws4py/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://ws4py.readthedocs.org; + homepage = "https://ws4py.readthedocs.org"; description = "A WebSocket package for Python"; maintainers = []; license = licenses.bsd3; diff --git a/pkgs/development/python-modules/wsgiproxy2/default.nix b/pkgs/development/python-modules/wsgiproxy2/default.nix index 4877e5f66f2..ef3ce69742c 100644 --- a/pkgs/development/python-modules/wsgiproxy2/default.nix +++ b/pkgs/development/python-modules/wsgiproxy2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = http://pythonpaste.org/wsgiproxy/; + homepage = "http://pythonpaste.org/wsgiproxy/"; description = "HTTP proxying tools for WSGI apps"; license = licenses.mit; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/wsproto/0.14.nix b/pkgs/development/python-modules/wsproto/0.14.nix index b2c3c527d82..79a66d2e4b1 100644 --- a/pkgs/development/python-modules/wsproto/0.14.nix +++ b/pkgs/development/python-modules/wsproto/0.14.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python, pure state-machine WebSocket implementation"; - homepage = https://github.com/python-hyper/wsproto/; + homepage = "https://github.com/python-hyper/wsproto/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/wsproto/default.nix b/pkgs/development/python-modules/wsproto/default.nix index dfbf9ceabdc..95ed95cb860 100644 --- a/pkgs/development/python-modules/wsproto/default.nix +++ b/pkgs/development/python-modules/wsproto/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pure Python, pure state-machine WebSocket implementation"; - homepage = https://github.com/python-hyper/wsproto/; + homepage = "https://github.com/python-hyper/wsproto/"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index a01aaa4631a..efd3fbd77ab 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = with lib; { description = "WTForms integration for peewee models"; - homepage = https://github.com/coleifer/wtf-peewee/; + homepage = "https://github.com/coleifer/wtf-peewee/"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/wtforms/default.nix b/pkgs/development/python-modules/wtforms/default.nix index 40f0b655451..98c3b1be93b 100644 --- a/pkgs/development/python-modules/wtforms/default.nix +++ b/pkgs/development/python-modules/wtforms/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ Babel ]; meta = with stdenv.lib; { - homepage = https://github.com/wtforms/wtforms; + homepage = "https://github.com/wtforms/wtforms"; description = "A flexible forms validation and rendering library for Python"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index b946d23acf6..272c903f57b 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { meta = { description = "Capture C-level output in context managers"; - homepage = https://github.com/minrk/wurlitzer; + homepage = "https://github.com/minrk/wurlitzer"; license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 689a1336ef7..e185e26a4f7 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -76,7 +76,7 @@ buildPythonPackage rec { meta = { description = "Cross platform GUI toolkit for Python, Phoenix version"; - homepage = http://wxpython.org/; + homepage = "http://wxpython.org/"; license = lib.licenses.wxWindows; }; diff --git a/pkgs/development/python-modules/x11_hash/default.nix b/pkgs/development/python-modules/x11_hash/default.nix index 060d08869b8..7cc921047ac 100644 --- a/pkgs/development/python-modules/x11_hash/default.nix +++ b/pkgs/development/python-modules/x11_hash/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec{ meta = with stdenv.lib; { description = "Binding for X11 proof of work hashing"; - homepage = https://github.com/mazaclub/x11_hash; + homepage = "https://github.com/mazaclub/x11_hash"; license = licenses.mit; maintainers = with maintainers; [ np ]; }; diff --git a/pkgs/development/python-modules/x256/default.nix b/pkgs/development/python-modules/x256/default.nix index 55a3ad7d0cc..bc0f0f65790 100644 --- a/pkgs/development/python-modules/x256/default.nix +++ b/pkgs/development/python-modules/x256/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Find the nearest xterm 256 color index for an RGB"; - homepage = https://github.com/magarcia/python-x256; + homepage = "https://github.com/magarcia/python-x256"; license = licenses.mit; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/python-modules/xapian/default.nix b/pkgs/development/python-modules/xapian/default.nix index 05c7fed589e..a71ade1b41b 100644 --- a/pkgs/development/python-modules/xapian/default.nix +++ b/pkgs/development/python-modules/xapian/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python Bindings for Xapian"; - homepage = https://xapian.org/; + homepage = "https://xapian.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonringer ]; }; diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index ce46443ec06..a950076a261 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = { description = "N-D labeled arrays and datasets in Python"; - homepage = https://github.com/pydata/xarray; + homepage = "https://github.com/pydata/xarray"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fridh ]; }; diff --git a/pkgs/development/python-modules/xattr/default.nix b/pkgs/development/python-modules/xattr/default.nix index 35c11e90088..8634d616b73 100644 --- a/pkgs/development/python-modules/xattr/default.nix +++ b/pkgs/development/python-modules/xattr/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/xattr/xattr; + homepage = "https://github.com/xattr/xattr"; description = "Python wrapper for extended filesystem attributes"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix index 7002c43cf2b..25061d5321a 100644 --- a/pkgs/development/python-modules/xcaplib/default.nix +++ b/pkgs/development/python-modules/xcaplib/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlib application ]; meta = with stdenv.lib; { - homepage = https://github.com/AGProjects/python-xcaplib; + homepage = "https://github.com/AGProjects/python-xcaplib"; description = "XCAP (RFC4825) client library"; license = licenses.gpl2; }; diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix new file mode 100644 index 00000000000..8b2d73b00fb --- /dev/null +++ b/pkgs/development/python-modules/xdg/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +, clikit +, poetry +, pytestCheckHook +}: + +buildPythonPackage rec { + version = "4.0.1"; + pname = "xdg"; + disabled = isPy27; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "srstevenson"; + repo = pname; + rev = version; + sha256 = "13kgnbwam6wmdbig0m98vmyjcqrp0j62nmfknb6prr33ns2nxbs2"; + }; + + nativeBuildInputs = [ poetry ]; + + propagatedBuildInputs = [ + clikit + ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "XDG Base Directory Specification for Python"; + homepage = "https://github.com/srstevenson/xdg"; + license = licenses.isc; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix index 03e91c0cff4..b4c8e46f146 100644 --- a/pkgs/development/python-modules/xdis/default.nix +++ b/pkgs/development/python-modules/xdis/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "xdis"; - version = "4.2.3"; + version = "4.2.4"; disabled = isPy27; src = fetchFromGitHub { owner = "rocky"; repo = "python-xdis"; rev = version; - sha256 = "0yjb07gk74qsag4ahjrbqgl7pgr2kvm43c7yrv10mwxk0ax51337"; + sha256 = "0nq6ijmj48c2dk75vmb040wgvr4y7wyjxrcm2dyvcwfk2h6phwri"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/xdot/default.nix b/pkgs/development/python-modules/xdot/default.nix index 14f4b24747c..990e74d2549 100644 --- a/pkgs/development/python-modules/xdot/default.nix +++ b/pkgs/development/python-modules/xdot/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "xdot.py is an interactive viewer for graphs written in Graphviz's dot"; - homepage = https://github.com/jrfonseca/xdot.py; + homepage = "https://github.com/jrfonseca/xdot.py"; license = licenses.lgpl3Plus; }; } diff --git a/pkgs/development/python-modules/xhtml2pdf/default.nix b/pkgs/development/python-modules/xhtml2pdf/default.nix index d5a66685646..466b72696f3 100644 --- a/pkgs/development/python-modules/xhtml2pdf/default.nix +++ b/pkgs/development/python-modules/xhtml2pdf/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A PDF generator using HTML and CSS"; - homepage = https://github.com/xhtml2pdf/xhtml2pdf; + homepage = "https://github.com/xhtml2pdf/xhtml2pdf"; license = licenses.asl20; }; diff --git a/pkgs/development/python-modules/xkcdpass/default.nix b/pkgs/development/python-modules/xkcdpass/default.nix index 9ea1445eff5..d21142f5dc0 100644 --- a/pkgs/development/python-modules/xkcdpass/default.nix +++ b/pkgs/development/python-modules/xkcdpass/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/xkcdpass/; + homepage = "https://pypi.python.org/pypi/xkcdpass/"; description = "Generate secure multiword passwords/passphrases, inspired by XKCD"; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/xlib/default.nix b/pkgs/development/python-modules/xlib/default.nix index 1903c3aaca8..4c98497c8b1 100644 --- a/pkgs/development/python-modules/xlib/default.nix +++ b/pkgs/development/python-modules/xlib/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Fully functional X client library for Python programs"; - homepage = http://python-xlib.sourceforge.net/; + homepage = "http://python-xlib.sourceforge.net/"; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/python-modules/xlrd/default.nix b/pkgs/development/python-modules/xlrd/default.nix index e37b2694576..9b5e8b83e30 100644 --- a/pkgs/development/python-modules/xlrd/default.nix +++ b/pkgs/development/python-modules/xlrd/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://www.python-excel.org/; + homepage = "http://www.python-excel.org/"; description = "Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix index 5faf56b7eba..e1694b9d33e 100644 --- a/pkgs/development/python-modules/xlsx2csv/default.nix +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/bitprophet/alabaster; + homepage = "https://github.com/bitprophet/alabaster"; description = "Convert xlsx to csv"; license = licenses.bsd3; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix index 5de0348e00e..7b8e931fb87 100644 --- a/pkgs/development/python-modules/xlwt/default.nix +++ b/pkgs/development/python-modules/xlwt/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = { description = "Library to create spreadsheet files compatible with MS"; - homepage = https://github.com/python-excel/xlwt; + homepage = "https://github.com/python-excel/xlwt"; license = with lib.licenses; [ bsdOriginal bsd3 lgpl21 ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index cf4eadd99d8..b2bd5af56c8 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.37.3"; + version = "2.41.0"; src = fetchPypi { inherit pname version; - sha256 = "4ae4e99a4b482caac89d8ffd93d16a4510db36907475b1879713a1dc885646ad"; + sha256 = "0xmhgn62a8a7282yd003zz63mrgyajb6sg29bfyllx3mxmdlb0iz"; }; propagatedBuildInputs = [ @@ -36,7 +36,7 @@ buildPythonPackage rec { meta = with lib; { description = "Tool generating IETF RFCs and drafts from XML sources"; - homepage = https://tools.ietf.org/tools/xml2rfc/trac/; + homepage = "https://tools.ietf.org/tools/xml2rfc/trac/"; # Well, parts might be considered unfree, if being strict; see: # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright license = licenses.bsd3; diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix index 07250337f83..790aaec3ce3 100644 --- a/pkgs/development/python-modules/xmltodict/default.nix +++ b/pkgs/development/python-modules/xmltodict/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = { description = "Makes working with XML feel like you are working with JSON"; - homepage = https://github.com/martinblech/xmltodict; + homepage = "https://github.com/martinblech/xmltodict"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/xmodem/default.nix b/pkgs/development/python-modules/xmodem/default.nix index 00a0bfb6043..48d658ba49b 100644 --- a/pkgs/development/python-modules/xmodem/default.nix +++ b/pkgs/development/python-modules/xmodem/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Pure python implementation of the XMODEM protocol"; maintainers = with maintainers; [ emantor ]; - homepage = https://github.com/tehmaze/xmodem; + homepage = "https://github.com/tehmaze/xmodem"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/xmpppy/default.nix b/pkgs/development/python-modules/xmpppy/default.nix index ec725564f2b..b812609a7d7 100644 --- a/pkgs/development/python-modules/xmpppy/default.nix +++ b/pkgs/development/python-modules/xmpppy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "XMPP python library"; - homepage = http://xmpppy.sourceforge.net/; + homepage = "http://xmpppy.sourceforge.net/"; license = licenses.gpl3; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/development/python-modules/xstatic-bootbox/default.nix b/pkgs/development/python-modules/xstatic-bootbox/default.nix index 1f60a0fbe6c..ba75ed0b882 100644 --- a/pkgs/development/python-modules/xstatic-bootbox/default.nix +++ b/pkgs/development/python-modules/xstatic-bootbox/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = http://bootboxjs.com; + homepage = "http://bootboxjs.com"; description = "Bootboxjs packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-bootstrap/default.nix b/pkgs/development/python-modules/xstatic-bootstrap/default.nix index 9abc9b273a2..83b33dc3edf 100644 --- a/pkgs/development/python-modules/xstatic-bootstrap/default.nix +++ b/pkgs/development/python-modules/xstatic-bootstrap/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = https://getbootstrap.com; + homepage = "https://getbootstrap.com"; description = "Bootstrap packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix index e4352e3b984..3eac0329910 100644 --- a/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-file-upload/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ xstatic-jquery ]; meta = with lib;{ - homepage = http://plugins.jquery.com/project/jQuery-File-Upload; + homepage = "http://plugins.jquery.com/project/jQuery-File-Upload"; description = "jquery-file-upload packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix index c47dfbc05d8..8c872d0bbd1 100644 --- a/pkgs/development/python-modules/xstatic-jquery-ui/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery-ui/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ xstatic-jquery ]; meta = with lib;{ - homepage = https://jqueryui.com/; + homepage = "https://jqueryui.com/"; description = "jquery-ui packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-jquery/default.nix b/pkgs/development/python-modules/xstatic-jquery/default.nix index a1a5e2b4dad..3cfbf3eb932 100644 --- a/pkgs/development/python-modules/xstatic-jquery/default.nix +++ b/pkgs/development/python-modules/xstatic-jquery/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = https://jquery.org; + homepage = "https://jquery.org"; description = "jquery packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic-pygments/default.nix b/pkgs/development/python-modules/xstatic-pygments/default.nix index 919d262c50d..c71fce169d9 100644 --- a/pkgs/development/python-modules/xstatic-pygments/default.nix +++ b/pkgs/development/python-modules/xstatic-pygments/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = https://pygments.org; + homepage = "https://pygments.org"; description = "pygments packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xstatic/default.nix b/pkgs/development/python-modules/xstatic/default.nix index bbfcce54d89..39e5f233ccd 100644 --- a/pkgs/development/python-modules/xstatic/default.nix +++ b/pkgs/development/python-modules/xstatic/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib;{ - homepage = https://bitbucket.org/thomaswaldmann/xstatic; + homepage = "https://bitbucket.org/thomaswaldmann/xstatic"; description = "Base packaged static files for python"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix index c7708d0f20b..dacb3b63436 100644 --- a/pkgs/development/python-modules/xvfbwrapper/default.nix +++ b/pkgs/development/python-modules/xvfbwrapper/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Run headless display inside X virtual framebuffer (Xvfb)"; - homepage = https://github.com/cgoldberg/xvfbwrapper; + homepage = "https://github.com/cgoldberg/xvfbwrapper"; license = licenses.mit; maintainers = with maintainers; [ ashgillman ]; }; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index 66f31441ec5..a3a5da18a98 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/ifduyue/python-xxhash; + homepage = "https://github.com/ifduyue/python-xxhash"; description = "Python Binding for xxHash https://pypi.org/project/xxhash/"; license = licenses.bsd2; maintainers = [ maintainers.teh ]; diff --git a/pkgs/development/python-modules/yahooweather/default.nix b/pkgs/development/python-modules/yahooweather/default.nix index 38c060aa8e8..7bcf637af32 100644 --- a/pkgs/development/python-modules/yahooweather/default.nix +++ b/pkgs/development/python-modules/yahooweather/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Provide an interface to the Yahoo! Weather RSS feed"; - homepage = https://github.com/pvizeli/yahooweather; + homepage = "https://github.com/pvizeli/yahooweather"; license = licenses.bsd2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix index b4d5834b242..b883a3d2bc8 100644 --- a/pkgs/development/python-modules/yamllint/default.nix +++ b/pkgs/development/python-modules/yamllint/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.20.0"; + version = "1.21.0"; src = fetchPypi { inherit pname version; - sha256 = "1gx3f9wcf8af9cz2v3x3196pab34n8mlqk5iswahhzpxc9i2p4bn"; + sha256 = "14yijcnmanyd3s2ir38sxl07rzpxgpgw9s6b8sy68jrl7n5nj7ky"; }; checkInputs = [ nose ]; @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A linter for YAML files"; - homepage = https://github.com/adrienverge/yamllint; + homepage = "https://github.com/adrienverge/yamllint"; license = licenses.gpl3; maintainers = with maintainers; [ mikefaille ]; }; diff --git a/pkgs/development/python-modules/yanc/default.nix b/pkgs/development/python-modules/yanc/default.nix index 690b110fc93..9bbfc410068 100644 --- a/pkgs/development/python-modules/yanc/default.nix +++ b/pkgs/development/python-modules/yanc/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Yet another nose colorer"; - homepage = https://github.com/0compute/yanc; + homepage = "https://github.com/0compute/yanc"; license = licenses.gpl3; maintainers = with maintainers; [ jluttine ]; }; diff --git a/pkgs/development/python-modules/yappi/default.nix b/pkgs/development/python-modules/yappi/default.nix index f7a18bba903..6ab776d2307 100644 --- a/pkgs/development/python-modules/yappi/default.nix +++ b/pkgs/development/python-modules/yappi/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; meta = with lib; { - homepage = https://github.com/sumerc/yappi; + homepage = "https://github.com/sumerc/yappi"; description = "Python profiler that supports multithreading and measuring CPU time"; license = licenses.mit; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/python-modules/yapsy/default.nix b/pkgs/development/python-modules/yapsy/default.nix index dfdd3dd3c05..f0d39f69e55 100644 --- a/pkgs/development/python-modules/yapsy/default.nix +++ b/pkgs/development/python-modules/yapsy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://yapsy.sourceforge.net/; + homepage = "http://yapsy.sourceforge.net/"; description = "Yet another plugin system"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/yarg/default.nix b/pkgs/development/python-modules/yarg/default.nix index f49ed20b2b9..97237ba09b0 100644 --- a/pkgs/development/python-modules/yarg/default.nix +++ b/pkgs/development/python-modules/yarg/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with lib; { description = "An easy to use PyPI client"; - homepage = https://yarg.readthedocs.io; + homepage = "https://yarg.readthedocs.io"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index 19314e19611..bfb09f9c1c5 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Yet another URL library"; - homepage = https://github.com/aio-libs/yarl/; + homepage = "https://github.com/aio-libs/yarl/"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index 8f97a374df6..32b378ddd57 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -12,6 +12,6 @@ buildPythonPackage rec { meta = with lib; { description = "Generate HTML or XML in a pythonic way. Pure python alternative to web template engines. Can fill HTML forms with default values and error messages."; license = [ licenses.lgpl21 ]; - homepage = https://www.yattag.org/; + homepage = "https://www.yattag.org/"; }; } diff --git a/pkgs/development/python-modules/yenc/default.nix b/pkgs/development/python-modules/yenc/default.nix index 3c51d00ec14..13c8d53f19b 100644 --- a/pkgs/development/python-modules/yenc/default.nix +++ b/pkgs/development/python-modules/yenc/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec{ meta = { description = "Encoding and decoding yEnc"; license = lib.licenses.lgpl21; - homepage = https://bitbucket.org/dual75/yenc; + homepage = "https://bitbucket.org/dual75/yenc"; maintainers = with lib.maintainers; [ fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix index fe7f0cf466e..d241e3f8edc 100644 --- a/pkgs/development/python-modules/yolk/default.nix +++ b/pkgs/development/python-modules/yolk/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool for querying PyPI and Python packages installed on your system"; - homepage = https://github.com/cakebread/yolk; + homepage = "https://github.com/cakebread/yolk"; maintainers = with maintainers; []; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/yt/default.nix b/pkgs/development/python-modules/yt/default.nix index f2d7e62eca3..ce89ec0fd3d 100644 --- a/pkgs/development/python-modules/yt/default.nix +++ b/pkgs/development/python-modules/yt/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "An analysis and visualization toolkit for volumetric data"; - homepage = https://github.com/yt-project/yt; + homepage = "https://github.com/yt-project/yt"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/yubico-client/default.nix b/pkgs/development/python-modules/yubico-client/default.nix index 99aedd4e681..f679c54f96c 100644 --- a/pkgs/development/python-modules/yubico-client/default.nix +++ b/pkgs/development/python-modules/yubico-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with lib; { description = "Verifying Yubico OTPs based on the validation protocol version 2.0"; - homepage = https://github.com/Kami/python-yubico-client/; + homepage = "https://github.com/Kami/python-yubico-client/"; maintainers= with maintainers; [ peterromfeldhk ]; license = licenses.bsd3; }; diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index cf4f6f7dd14..f4f42cf9e3f 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/z3c.checkversions; + homepage = "https://github.com/zopefoundation/z3c.checkversions"; description = "Find newer package versions on PyPI"; license = licenses.zpl21; }; diff --git a/pkgs/development/python-modules/zarr/default.nix b/pkgs/development/python-modules/zarr/default.nix index 5570688e98b..ac7c2b6af01 100644 --- a/pkgs/development/python-modules/zarr/default.nix +++ b/pkgs/development/python-modules/zarr/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "An implementation of chunked, compressed, N-dimensional arrays for Python"; - homepage = https://github.com/zarr-developers/zarr; + homepage = "https://github.com/zarr-developers/zarr"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/python-modules/zbaemon/default.nix b/pkgs/development/python-modules/zbaemon/default.nix index c15e46e5d0d..a87bd3093f4 100644 --- a/pkgs/development/python-modules/zbaemon/default.nix +++ b/pkgs/development/python-modules/zbaemon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A daemon process control library and tools for Unix-based systems"; - homepage = https://pypi.python.org/pypi/zdaemon; + homepage = "https://pypi.python.org/pypi/zdaemon"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zbase32/default.nix b/pkgs/development/python-modules/zbase32/default.nix index a5002e80f49..9c97ad066ed 100644 --- a/pkgs/development/python-modules/zbase32/default.nix +++ b/pkgs/development/python-modules/zbase32/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "zbase32, a base32 encoder/decoder"; - homepage = https://pypi.python.org/pypi/zbase32; + homepage = "https://pypi.python.org/pypi/zbase32"; license = licenses.bsd0; }; diff --git a/pkgs/development/python-modules/zc_lockfile/default.nix b/pkgs/development/python-modules/zc_lockfile/default.nix index 173a619197c..18fc7bcf511 100644 --- a/pkgs/development/python-modules/zc_lockfile/default.nix +++ b/pkgs/development/python-modules/zc_lockfile/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Inter-process locks"; - homepage = https://www.python.org/pypi/zc.lockfile; + homepage = "https://www.python.org/pypi/zc.lockfile"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zconfig/default.nix b/pkgs/development/python-modules/zconfig/default.nix index f68164284da..75f8647730c 100644 --- a/pkgs/development/python-modules/zconfig/default.nix +++ b/pkgs/development/python-modules/zconfig/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Structured Configuration Library"; - homepage = https://pypi.python.org/pypi/ZConfig; + homepage = "https://pypi.python.org/pypi/ZConfig"; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/development/python-modules/zdaemon/default.nix b/pkgs/development/python-modules/zdaemon/default.nix index c15e46e5d0d..a87bd3093f4 100644 --- a/pkgs/development/python-modules/zdaemon/default.nix +++ b/pkgs/development/python-modules/zdaemon/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A daemon process control library and tools for Unix-based systems"; - homepage = https://pypi.python.org/pypi/zdaemon; + homepage = "https://pypi.python.org/pypi/zdaemon"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix index 72a6e1ba229..50dda4c8edb 100644 --- a/pkgs/development/python-modules/zeep/default.nix +++ b/pkgs/development/python-modules/zeep/default.nix @@ -77,7 +77,7 @@ buildPythonPackage rec { ''; meta = with lib; { - homepage = http://docs.python-zeep.org; + homepage = "http://docs.python-zeep.org"; license = licenses.mit; description = "A modern/fast Python SOAP client based on lxml / requests"; maintainers = with maintainers; [ rvl ]; diff --git a/pkgs/development/python-modules/zerobin/default.nix b/pkgs/development/python-modules/zerobin/default.nix index ce993d3d41a..efc2bb380b8 100644 --- a/pkgs/development/python-modules/zerobin/default.nix +++ b/pkgs/development/python-modules/zerobin/default.nix @@ -26,7 +26,7 @@ buildPythonPackage { meta = with stdenv.lib; { description = "A client side encrypted pastebin"; - homepage = https://0bin.net/; + homepage = "https://0bin.net/"; license = licenses.wtfpl; }; diff --git a/pkgs/development/python-modules/zeroc-ice/default.nix b/pkgs/development/python-modules/zeroc-ice/default.nix index c7342bbfa55..ccc34b42afb 100644 --- a/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/pkgs/development/python-modules/zeroc-ice/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { buildInputs = [ openssl bzip2 ]; meta = with stdenv.lib; { - homepage = https://zeroc.com/; + homepage = "https://zeroc.com/"; license = licenses.gpl2; description = "Comprehensive RPC framework with support for Python, C++, .NET, Java, JavaScript and more."; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 622de68c6d4..a1246485cd8 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.24.4"; + version = "0.24.5"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f66d38f16026097572939ab78b1f46a97f556bca415491eb0fd094d0b5827dfe"; + sha256 = "0jpgd0rk91si93857mjrizan5gc42kj1q4fi4160qgk68la88fl9"; }; propagatedBuildInputs = [ ifaddr ] @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A pure python implementation of multicast DNS service discovery"; - homepage = https://github.com/jstasiak/python-zeroconf; + homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/development/python-modules/zetup/default.nix b/pkgs/development/python-modules/zetup/default.nix index eb3c5ff135c..85e950b830e 100644 --- a/pkgs/development/python-modules/zetup/default.nix +++ b/pkgs/development/python-modules/zetup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi , setuptools_scm, pathpy, nbconvert , pytest }: @@ -11,11 +11,10 @@ buildPythonPackage rec { sha256 = "b8a9bdcfa4b705d72b55b218658bc9403c157db7b57a14158253c98d03ab713d"; }; - # Python 3.7 compatibility - # See https://github.com/zimmermanncode/zetup/pull/1 + # Python 3.8 compatibility postPatch = '' substituteInPlace zetup/zetup_config.py \ - --replace "'3.6']" "'3.6', '3.7']" + --replace "'3.7']" "'3.7', '3.8']" ''; checkPhase = '' @@ -25,11 +24,9 @@ buildPythonPackage rec { checkInputs = [ pytest pathpy nbconvert ]; propagatedBuildInputs = [ setuptools_scm ]; - meta = with stdenv.lib; { - description = '' - Zimmermann's Extensible Tools for Unified Project setups - ''; - homepage = https://github.com/zimmermanncode/zetup; + meta = with lib; { + description = "Zimmermann's Extensible Tools for Unified Project setups"; + homepage = "https://github.com/zimmermanncode/zetup"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/python-modules/zfec/default.nix b/pkgs/development/python-modules/zfec/default.nix index 9193c2ddc08..e848511d9ca 100644 --- a/pkgs/development/python-modules/zfec/default.nix +++ b/pkgs/development/python-modules/zfec/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = http://allmydata.org/trac/zfec; + homepage = "http://allmydata.org/trac/zfec"; description = "Zfec, a fast erasure codec which can be used with the command-line, C, Python, or Haskell"; longDescription = '' Fast, portable, programmable erasure coding a.k.a. "forward diff --git a/pkgs/development/python-modules/zict/default.nix b/pkgs/development/python-modules/zict/default.nix index 42f0218c846..9208b54981b 100644 --- a/pkgs/development/python-modules/zict/default.nix +++ b/pkgs/development/python-modules/zict/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Mutable mapping tools."; - homepage = https://github.com/dask/zict; + homepage = "https://github.com/dask/zict"; license = licenses.bsd3; maintainers = with maintainers; [ teh ]; }; diff --git a/pkgs/development/python-modules/zipfile36/default.nix b/pkgs/development/python-modules/zipfile36/default.nix index 2148dcc4b80..46dd1e173fb 100644 --- a/pkgs/development/python-modules/zipfile36/default.nix +++ b/pkgs/development/python-modules/zipfile36/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = { description = "Read and write ZIP files - backport of the zipfile module from Python 3.6"; - homepage = https://gitlab.com/takluyver/zipfile36; + homepage = "https://gitlab.com/takluyver/zipfile36"; license = lib.licenses.psfl; maintainers = lib.maintainers.fridh; }; diff --git a/pkgs/development/python-modules/zipp/default.nix b/pkgs/development/python-modules/zipp/default.nix index 3b9b1a12cca..13cb2131a4d 100644 --- a/pkgs/development/python-modules/zipp/default.nix +++ b/pkgs/development/python-modules/zipp/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pathlib-compatible object wrapper for zip files"; - homepage = https://github.com/jaraco/zipp; + homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix index 4d5fabe7fca..ec885c6df0f 100644 --- a/pkgs/development/python-modules/zipstream/default.nix +++ b/pkgs/development/python-modules/zipstream/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { meta = { description = "A zip archive generator"; - homepage = https://github.com/allanlei/python-zipstream; + homepage = "https://github.com/allanlei/python-zipstream"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/zm-py/default.nix b/pkgs/development/python-modules/zm-py/default.nix index 4cd5e9b1d20..3ce07115693 100644 --- a/pkgs/development/python-modules/zm-py/default.nix +++ b/pkgs/development/python-modules/zm-py/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with lib; { description = "A loose python wrapper around the ZoneMinder REST API"; - homepage = https://github.com/rohankapoorcom/zm-py; + homepage = "https://github.com/rohankapoorcom/zm-py"; license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/development/python-modules/zodb/default.nix b/pkgs/development/python-modules/zodb/default.nix index f15cefaa475..bcc164ea380 100644 --- a/pkgs/development/python-modules/zodb/default.nix +++ b/pkgs/development/python-modules/zodb/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope Object Database: object database and persistence"; - homepage = https://pypi.python.org/pypi/ZODB; + homepage = "https://pypi.python.org/pypi/ZODB"; license = licenses.zpl21; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index b24b5853876..9a0727c82e9 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -17,6 +17,6 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://pypi.python.org/pypi/zodbpickle; + homepage = "https://pypi.python.org/pypi/zodbpickle"; }; } diff --git a/pkgs/development/python-modules/zope-deferredimport/default.nix b/pkgs/development/python-modules/zope-deferredimport/default.nix index 26d8255c03b..2998376b672 100644 --- a/pkgs/development/python-modules/zope-deferredimport/default.nix +++ b/pkgs/development/python-modules/zope-deferredimport/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { meta = with lib; { description = "Allows you to perform imports names that will only be resolved when used in the code"; - homepage = https://github.com/zopefoundation/zope.deferredimport; + homepage = "https://github.com/zopefoundation/zope.deferredimport"; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/zope-hookable/default.nix b/pkgs/development/python-modules/zope-hookable/default.nix index 0b7bc80bf3a..c9e6311cf32 100644 --- a/pkgs/development/python-modules/zope-hookable/default.nix +++ b/pkgs/development/python-modules/zope-hookable/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Supports the efficient creation of “hookable” objects"; - homepage = https://github.com/zopefoundation/zope.hookable; + homepage = "https://github.com/zopefoundation/zope.hookable"; license = licenses.zpl21; }; } diff --git a/pkgs/development/python-modules/zope_broken/default.nix b/pkgs/development/python-modules/zope_broken/default.nix index df3a2053ebf..aa12167bddc 100644 --- a/pkgs/development/python-modules/zope_broken/default.nix +++ b/pkgs/development/python-modules/zope_broken/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { buildInputs = [ zope_interface ]; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/zope.broken; + homepage = "http://pypi.python.org/pypi/zope.broken"; description = "Zope Broken Object Interfaces"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_component/default.nix b/pkgs/development/python-modules/zope_component/default.nix index 25452fdd070..fc63f3d1ebf 100644 --- a/pkgs/development/python-modules/zope_component/default.nix +++ b/pkgs/development/python-modules/zope_component/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.component; + homepage = "https://github.com/zopefoundation/zope.component"; description = "Zope Component Architecture"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_configuration/default.nix b/pkgs/development/python-modules/zope_configuration/default.nix index e0ec7bd6ca8..664aa0af6e8 100644 --- a/pkgs/development/python-modules/zope_configuration/default.nix +++ b/pkgs/development/python-modules/zope_configuration/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope Configuration Markup Language (ZCML)"; - homepage = https://github.com/zopefoundation/zope.configuration; + homepage = "https://github.com/zopefoundation/zope.configuration"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_contenttype/default.nix b/pkgs/development/python-modules/zope_contenttype/default.nix index 6db39d6c5b5..d3cd69943a7 100644 --- a/pkgs/development/python-modules/zope_contenttype/default.nix +++ b/pkgs/development/python-modules/zope_contenttype/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.contenttype; + homepage = "https://github.com/zopefoundation/zope.contenttype"; description = "A utility module for content-type (MIME type) handling"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_deprecation/default.nix b/pkgs/development/python-modules/zope_deprecation/default.nix index b56e1969711..c4059dbcd41 100644 --- a/pkgs/development/python-modules/zope_deprecation/default.nix +++ b/pkgs/development/python-modules/zope_deprecation/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { buildInputs = [ zope_testing ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.deprecation; + homepage = "https://github.com/zopefoundation/zope.deprecation"; description = "Zope Deprecation Infrastructure"; license = licenses.zpl20; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/development/python-modules/zope_dottedname/default.nix b/pkgs/development/python-modules/zope_dottedname/default.nix index d2a21fd03b0..b2afc9cc23f 100644 --- a/pkgs/development/python-modules/zope_dottedname/default.nix +++ b/pkgs/development/python-modules/zope_dottedname/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = http://pypi.python.org/pypi/zope.dottedname; + homepage = "http://pypi.python.org/pypi/zope.dottedname"; description = "Resolver for Python dotted names"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_event/default.nix b/pkgs/development/python-modules/zope_event/default.nix index 3dea7adcb00..4f9e14ba20d 100644 --- a/pkgs/development/python-modules/zope_event/default.nix +++ b/pkgs/development/python-modules/zope_event/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "An event publishing system"; - homepage = https://pypi.python.org/pypi/zope.event; + homepage = "https://pypi.python.org/pypi/zope.event"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index dbbba691edb..04e68f038e9 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Exception interfaces and implementations"; - homepage = https://pypi.python.org/pypi/zope.exceptions; + homepage = "https://pypi.python.org/pypi/zope.exceptions"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_filerepresentation/default.nix b/pkgs/development/python-modules/zope_filerepresentation/default.nix index e9104a1b939..0a7e959e11f 100644 --- a/pkgs/development/python-modules/zope_filerepresentation/default.nix +++ b/pkgs/development/python-modules/zope_filerepresentation/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_schema ]; meta = with stdenv.lib; { - homepage = https://zopefilerepresentation.readthedocs.io/; + homepage = "https://zopefilerepresentation.readthedocs.io/"; description = "File-system Representation Interfaces"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_i18n/default.nix b/pkgs/development/python-modules/zope_i18n/default.nix index 81558a21446..662188db153 100644 --- a/pkgs/development/python-modules/zope_i18n/default.nix +++ b/pkgs/development/python-modules/zope_i18n/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pytz zope_component ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.i18n; + homepage = "https://github.com/zopefoundation/zope.i18n"; description = "Zope Internationalization Support"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_i18nmessageid/default.nix b/pkgs/development/python-modules/zope_i18nmessageid/default.nix index fe9a6b56ed8..bf1dc7e0b6b 100644 --- a/pkgs/development/python-modules/zope_i18nmessageid/default.nix +++ b/pkgs/development/python-modules/zope_i18nmessageid/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.i18nmessageid; + homepage = "https://github.com/zopefoundation/zope.i18nmessageid"; description = "Message Identifiers for internationalization"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_interface/default.nix b/pkgs/development/python-modules/zope_interface/default.nix index d208d4a3529..0388c1041ed 100644 --- a/pkgs/development/python-modules/zope_interface/default.nix +++ b/pkgs/development/python-modules/zope_interface/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope.Interface"; - homepage = http://zope.org/Products/ZopeInterface; + homepage = "http://zope.org/Products/ZopeInterface"; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_lifecycleevent/default.nix b/pkgs/development/python-modules/zope_lifecycleevent/default.nix index 738b30c489f..2beabc8a61c 100644 --- a/pkgs/development/python-modules/zope_lifecycleevent/default.nix +++ b/pkgs/development/python-modules/zope_lifecycleevent/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_event zope_component ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.lifecycleevent; + homepage = "https://github.com/zopefoundation/zope.lifecycleevent"; description = "Object life-cycle events"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_location/default.nix b/pkgs/development/python-modules/zope_location/default.nix index 7c0df16f775..1c868a73971 100644 --- a/pkgs/development/python-modules/zope_location/default.nix +++ b/pkgs/development/python-modules/zope_location/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.location/; + homepage = "https://github.com/zopefoundation/zope.location/"; description = "Zope Location"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_proxy/default.nix b/pkgs/development/python-modules/zope_proxy/default.nix index 537fc1465f2..361095bf180 100644 --- a/pkgs/development/python-modules/zope_proxy/default.nix +++ b/pkgs/development/python-modules/zope_proxy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.proxy; + homepage = "https://github.com/zopefoundation/zope.proxy"; description = "Generic Transparent Proxies"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_schema/default.nix b/pkgs/development/python-modules/zope_schema/default.nix index df5322acc87..8ecbf0a9907 100644 --- a/pkgs/development/python-modules/zope_schema/default.nix +++ b/pkgs/development/python-modules/zope_schema/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.schema; + homepage = "https://github.com/zopefoundation/zope.schema"; description = "zope.interface extension for defining data schemas"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_size/default.nix b/pkgs/development/python-modules/zope_size/default.nix index 8651e2d6822..92df0aa1eb7 100644 --- a/pkgs/development/python-modules/zope_size/default.nix +++ b/pkgs/development/python-modules/zope_size/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; meta = with stdenv.lib; { - homepage = https://github.com/zopefoundation/zope.size; + homepage = "https://github.com/zopefoundation/zope.size"; description = "Interfaces and simple adapter that give the size of an object"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/development/python-modules/zope_testing/default.nix b/pkgs/development/python-modules/zope_testing/default.nix index 037c5d87f9a..1ea12eb377d 100644 --- a/pkgs/development/python-modules/zope_testing/default.nix +++ b/pkgs/development/python-modules/zope_testing/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Zope testing helpers"; - homepage = http://pypi.python.org/pypi/zope.testing; + homepage = "http://pypi.python.org/pypi/zope.testing"; license = licenses.zpl20; maintainers = with maintainers; [ goibhniu ]; }; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index f6bf7f96a76..9b7145a5851 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A flexible test runner with layer support"; - homepage = https://pypi.python.org/pypi/zope.testrunner; + homepage = "https://pypi.python.org/pypi/zope.testrunner"; license = licenses.zpl20; maintainers = [ maintainers.goibhniu ]; }; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 6c1b9c2bb5b..75856a88b7e 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Simple python bindings to Yann Collet ZSTD compression library"; - homepage = https://github.com/sergey-dryabzhinsky/python-zstd; + homepage = "https://github.com/sergey-dryabzhinsky/python-zstd"; license = licenses.bsd2; maintainers = with maintainers; [ eadwu diff --git a/pkgs/development/ruby-modules/bundix/default.nix b/pkgs/development/ruby-modules/bundix/default.nix index 353adbcea6f..34114ad9a4f 100644 --- a/pkgs/development/ruby-modules/bundix/default.nix +++ b/pkgs/development/ruby-modules/bundix/default.nix @@ -36,7 +36,7 @@ buildRubyGem rec { The output is then usable by the bundlerEnv derivation to list all the dependencies of a ruby package. ''; - homepage = https://github.com/manveru/bundix; + homepage = "https://github.com/manveru/bundix"; license = "MIT"; maintainers = with lib.maintainers; [ manveru qyliss zimbatm ]; platforms = lib.platforms.all; diff --git a/pkgs/development/ruby-modules/bundled-common/default.nix b/pkgs/development/ruby-modules/bundled-common/default.nix index 66f33f6e31f..65416d9295b 100644 --- a/pkgs/development/ruby-modules/bundled-common/default.nix +++ b/pkgs/development/ruby-modules/bundled-common/default.nix @@ -124,7 +124,7 @@ let for i in ${ruby}/bin/*; do makeWrapper "$i" $out/bin/$(basename "$i") \ --set BUNDLE_GEMFILE ${confFiles}/Gemfile \ - --set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} \ + --unset BUNDLE_PATH \ --set BUNDLE_FROZEN 1 \ --set GEM_HOME ${basicEnv}/${ruby.gemPath} \ --set GEM_PATH ${basicEnv}/${ruby.gemPath} diff --git a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb index add5db56d1d..2bf9d84caa0 100644 --- a/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb +++ b/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb @@ -32,10 +32,12 @@ paths.each do |path| # ENV["BUNDLE_GEMFILE"] = #{gemfile.dump} -ENV["BUNDLE_PATH"] = #{bundle_path.dump} +ENV.delete 'BUNDLE_PATH' ENV['BUNDLE_FROZEN'] = '1' -$LOAD_PATH.unshift #{bundler_path.dump} + "/lib" +Gem.paths = { 'GEM_HOME' => #{bundle_path.dump} } + +$LOAD_PATH.unshift #{File.join(bundler_path, "/lib").dump} require 'bundler' Bundler.setup(#{groups.map(&:dump).join(', ')}) diff --git a/pkgs/development/ruby-modules/bundler-app/default.nix b/pkgs/development/ruby-modules/bundler-app/default.nix index 2fa70664323..0859f08c2f7 100644 --- a/pkgs/development/ruby-modules/bundler-app/default.nix +++ b/pkgs/development/ruby-modules/bundler-app/default.nix @@ -53,7 +53,7 @@ in ${(lib.concatMapStrings (x: "ln -s '${basicEnv}/bin/${x}' $out/bin/${x};\n") exes)} ${(lib.concatMapStrings (s: "makeWrapper $out/bin/$(basename ${s}) $srcdir/${s} " + "--set BUNDLE_GEMFILE ${basicEnv.confFiles}/Gemfile "+ - "--set BUNDLE_PATH ${basicEnv}/${ruby.gemPath} "+ + "--unset BUNDLE_PATH "+ "--set BUNDLE_FROZEN 1 "+ "--set GEM_HOME ${basicEnv}/${ruby.gemPath} "+ "--set GEM_PATH ${basicEnv}/${ruby.gemPath} "+ diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index 6190b4210cd..fc2733de3f0 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.17.3"; - source.sha256 = "0ln3gnk7cls81gwsbxvrmlidsfd78s6b2hzlm4d4a9wbaidzfjxw"; + version = "2.1.4"; + source.sha256 = "12glbb1357x91fvd004jgkw7ihlkpc9dwr349pd7j83isqhls0ah"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/solargraph/Gemfile.lock b/pkgs/development/ruby-modules/solargraph/Gemfile.lock index c2e4840eab0..d9438a79956 100644 --- a/pkgs/development/ruby-modules/solargraph/Gemfile.lock +++ b/pkgs/development/ruby-modules/solargraph/Gemfile.lock @@ -3,41 +3,47 @@ GEM specs: ast (2.4.0) backport (1.1.2) + benchmark (0.1.0) + e2mmap (0.1.0) jaro_winkler (1.5.4) maruku (0.7.3) mini_portile2 (2.4.0) - nokogiri (1.10.5) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.6.5.0) + parser (2.7.0.5) ast (~> 2.4.0) rainbow (3.0.0) - reverse_markdown (1.3.0) + reverse_markdown (1.4.0) nokogiri - rubocop (0.77.0) + rexml (3.2.4) + rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) ruby-progressbar (1.10.1) - solargraph (0.38.0) + solargraph (0.38.6) backport (~> 1.1) + benchmark bundler (>= 1.17.2) + e2mmap jaro_winkler (~> 1.5) maruku (~> 0.7, >= 0.7.3) nokogiri (~> 1.9, >= 1.9.1) parser (~> 2.3) reverse_markdown (~> 1.0, >= 1.0.5) rubocop (~> 0.52) - thor (~> 0.19, >= 0.19.4) + thor (~> 1.0) tilt (~> 2.0) yard (~> 0.9) - thor (0.20.3) + thor (1.0.1) tilt (2.0.10) - unicode-display_width (1.6.0) - yard (0.9.20) + unicode-display_width (1.6.1) + yard (0.9.24) PLATFORMS ruby @@ -46,4 +52,4 @@ DEPENDENCIES solargraph! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index ff9b1bac321..60c1aee5a00 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "IDE tools for the Ruby language"; - homepage = http://www.github.com/castwide/solargraph; + homepage = "http://www.github.com/castwide/solargraph"; license = licenses.mit; maintainers = with maintainers; [ worldofpeace nicknovitski angristan ]; platforms = platforms.unix; diff --git a/pkgs/development/ruby-modules/solargraph/gemset.nix b/pkgs/development/ruby-modules/solargraph/gemset.nix index e1ea15fb4e1..a6ec78b7458 100644 --- a/pkgs/development/ruby-modules/solargraph/gemset.nix +++ b/pkgs/development/ruby-modules/solargraph/gemset.nix @@ -1,5 +1,6 @@ { ast = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -10,6 +11,7 @@ version = "2.4.0"; }; backport = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -19,7 +21,30 @@ }; version = "1.1.2"; }; + benchmark = { + dependencies = []; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jadlpsl504ql436a6bx8ihp0bkg3rvxg7fbi4r1bmra3cqz0h88"; + type = "gem"; + }; + version = "0.1.0"; + }; + e2mmap = { + dependencies = []; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n8gxjb63dck3vrmsdcqqll7xs7f3wk78mw8w0gdk9wp5nx6pvj5"; + type = "gem"; + }; + version = "0.1.0"; + }; jaro_winkler = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -30,6 +55,7 @@ version = "1.5.4"; }; maruku = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -40,6 +66,7 @@ version = "0.7.3"; }; mini_portile2 = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -55,12 +82,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "185g3dwba73jqxjr94bd2zk6fil6n9hmcfnfyzh3p1w47vm296r7"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.5"; + version = "1.10.9"; }; parallel = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -76,12 +104,13 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; + sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc"; type = "gem"; }; - version = "2.6.5.0"; + version = "2.7.0.5"; }; rainbow = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -97,23 +126,35 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zb9n227b5s4cg942sc0g3n1bdx9fpcvq5m6w7ap0yc116ivv5w2"; + sha256 = "0w786j869fjhjf72waj0hc9i4ghi45b78a2am27kij4sa2hmsc53"; + type = "gem"; + }; + version = "1.4.0"; + }; + rexml = { + dependencies = []; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mkvkcw9fhpaizrhca0pdgjcrbns48rlz4g6lavl5gjjq3rk2sq3"; type = "gem"; }; - version = "1.3.0"; + version = "3.2.4"; }; rubocop = { - dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "rexml" "ruby-progressbar" "unicode-display_width"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0m88b1bgbhmmbdnz2xv6n0il0j4q5qm9jbc0vf1zsaxmxqp06nx9"; + sha256 = "1i8pw7p4dk11xpahs0j6vlvqlv3rgapaccj933g0i34hbx392lj8"; type = "gem"; }; - version = "0.77.0"; + version = "0.80.1"; }; ruby-progressbar = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -124,27 +165,29 @@ version = "1.10.1"; }; solargraph = { - dependencies = ["backport" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; + dependencies = ["backport" "benchmark" "e2mmap" "jaro_winkler" "maruku" "nokogiri" "parser" "reverse_markdown" "rubocop" "thor" "tilt" "yard"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pdqpxvjj6r6gzrz9rmxfg85cmfjs4y2lyq8p5qfg3kfpqx4rhpw"; + sha256 = "06kcqm032sq1y4pgg7cl32hv74573b1vsy79x81zglar80ybgzv4"; type = "gem"; }; - version = "0.38.0"; + version = "0.38.6"; }; thor = { + dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; type = "gem"; }; - version = "0.20.3"; + version = "1.0.1"; }; tilt = { + dependencies = []; groups = ["default"]; platforms = []; source = { @@ -155,23 +198,25 @@ version = "2.0.10"; }; unicode-display_width = { + dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; yard = { + dependencies = []; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny"; + sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp"; type = "gem"; }; - version = "0.9.20"; + version = "0.9.24"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index 0b34055274d..ed91df066c3 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -41,11 +41,11 @@ let generic = { major, version, src }: finds structures that satisfy them. Structures are displayed graphically, and their appearance can be customized for the domain at hand. ''; - homepage = http://alloytools.org/; - downloadPage = http://alloytools.org/download.html; + homepage = "http://alloytools.org/"; + downloadPage = "http://alloytools.org/download.html"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ aminb ]; + maintainers = with maintainers; [ notbandali ]; }; }; diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 5ac6c5afa91..2f3ebcbed0a 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ameba"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0zjv59f555q2w8ahrvmpdzasrifwjgr0mk6rly9yss4ab3rj8cy2"; + sha256 = "0g68yijbm2j4ig536fwq49d1z7x2iv9kp4g3gjklf5zn1sbqhm12"; }; nativeBuildInputs = [ crystal shards ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A static code analysis tool for Crystal"; - homepage = https://crystal-ameba.github.io; + homepage = "https://crystal-ameba.github.io"; license = licenses.mit; maintainers = with maintainers; [ kimburgess ]; }; diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 743ebeef0a8..271869bd7c4 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { with a lot of ergonomic improvements and configurability that may be familiar to people coming from IDEs or other REPLs such as IPython or Zsh. ''; - homepage = http://www.lihaoyi.com/Ammonite/; + homepage = "http://www.lihaoyi.com/Ammonite/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.nequissimus ]; diff --git a/pkgs/development/tools/analysis/autoflake/default.nix b/pkgs/development/tools/analysis/autoflake/default.nix index 7ae563c058b..ca095faa97f 100644 --- a/pkgs/development/tools/analysis/autoflake/default.nix +++ b/pkgs/development/tools/analysis/autoflake/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/myint/autoflake; + homepage = "https://github.com/myint/autoflake"; description = "A simple program which removes unused imports and unused variables as reported by pyflakes"; license = licenses.mit; maintainers = with maintainers; [ yuriaisaka ]; diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index a46d7f9d953..374331f3ac8 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { on various metrics of the code. Metrics supported include lines of code, McCabe's complexity and metrics proposed by Chidamber&Kemerer and Henry&Kafura. ''; - homepage = http://cccc.sourceforge.net/; + homepage = "http://cccc.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.linquize ]; diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 8649c05d73b..539c2f7d191 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 }: stdenv.mkDerivation rec { - version = "8.30"; + version = "8.31"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "1wsgpfdqasfz6chhy0w5pdjm4by6ih2g0l44lxwks9kik2lrs4av"; + sha256 = "03dn07lissr2dkhi44wlkrbsby4zfvwai8gykc3xjgs46jy05rf8"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 951c46e2166..4c6e9f1a078 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { respect to a specified configuration. Dead code removal is an application of this sort. ''; - homepage = http://coan2.sourceforge.net/; + homepage = "http://coan2.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index 309ba9d392b..f722a155086 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.0.4"; + version = "2.1.0"; 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 = "02sqs7shxqrq6c6h12ldskk30k7sisa75wjxz99xyg49m4b2lw4m"; + sha256 = "1vp4f5kwmxc4j59cdzwj0jh0n4c05hkvssvv9ii6w88phzblzpjk"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 0f3e810ec42..6642a833cf1 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { Check C/C++ code for memory leaks, mismatching allocation-deallocation, buffer overruns and more. ''; - homepage = http://cppcheck.sourceforge.net/; + homepage = "http://cppcheck.sourceforge.net/"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [ joachifm ]; diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 8b4a68adba3..577a09e8de9 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/cpplint/cpplint; + homepage = "https://github.com/cpplint/cpplint"; description = "Static code checker for C++"; maintainers = [ maintainers.bhipple ]; license = [ licenses.bsd3 ]; diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix index 6259756794d..080b19bf163 100644 --- a/pkgs/development/tools/analysis/egypt/default.nix +++ b/pkgs/development/tools/analysis/egypt/default.nix @@ -25,7 +25,7 @@ perlPackages.buildPerlPackage rec { Egypt is simply a very small Perl script that glues these existing tools together. ''; - homepage = http://www.gson.org/egypt/; + homepage = "http://www.gson.org/egypt/"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/analysis/emma/default.nix b/pkgs/development/tools/analysis/emma/default.nix index 1bd24b4785d..3cc16c07ec5 100644 --- a/pkgs/development/tools/analysis/emma/default.nix +++ b/pkgs/development/tools/analysis/emma/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "emma-2.0.5312"; src = fetchurl { - url = mirror://sourceforge/emma/emma-2.0.5312.zip; + url = "mirror://sourceforge/emma/emma-2.0.5312.zip"; sha256 = "0xxy39s2lvgs56vicjzpcz936l1vjaplliwa0dm7v3iyvw6jn7vj"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://emma.sourceforge.net/; + homepage = "http://emma.sourceforge.net/"; description = "A code coverage tool for Java"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.cpl10; diff --git a/pkgs/development/tools/analysis/eresi/default.nix b/pkgs/development/tools/analysis/eresi/default.nix index b84eeae15dc..c8c0d0c6960 100644 --- a/pkgs/development/tools/analysis/eresi/default.nix +++ b/pkgs/development/tools/analysis/eresi/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { description = "The ERESI Reverse Engineering Software Interface"; license = lib.licenses.gpl2; - homepage = http://www.eresi-project.org/; + homepage = "http://www.eresi-project.org/"; maintainers = [ lib.maintainers.aszlig ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/development/tools/analysis/evmdis/default.nix b/pkgs/development/tools/analysis/evmdis/default.nix index c250f442a0e..64a1c317393 100644 --- a/pkgs/development/tools/analysis/evmdis/default.nix +++ b/pkgs/development/tools/analysis/evmdis/default.nix @@ -13,7 +13,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/Arachnid/evmdis; + homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; license = [ licenses.asl20 ]; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/development/tools/analysis/findbugs/default.nix b/pkgs/development/tools/analysis/findbugs/default.nix index 7f2df62008f..d522b2b9422 100644 --- a/pkgs/development/tools/analysis/findbugs/default.nix +++ b/pkgs/development/tools/analysis/findbugs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A static analysis tool to find bugs in Java programs automatically"; - homepage = http://findbugs.sourceforge.net/; + homepage = "http://findbugs.sourceforge.net/"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; license = licenses.lgpl3; diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 9e7b2d5096d..014c7dea11b 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.121.0"; + version = "0.122.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "1lx3lfn0blnwpq6iph0x6xcr4nrdhyvfvx6x8qk6axwlmg2swdcy"; + sha256 = "0a1pcrp0r7l0c8cyrg1qc1qz5dnj0mzd60v9nixgm419a7rrmp93"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 7d24bf5e0d5..c7ac2986fd6 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = { description = "An extensible and collaborative platform dedicated to source-code analysis of C software"; - homepage = http://frama-c.com/; + homepage = "http://frama-c.com/"; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ thoughtpolice amiddelk ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix index f96f7e9b66b..d0221e80b9b 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilegen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automatically generate all types of basic memory management operations and write into trace files"; - homepage = https://github.com/GarCoSim; + homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix index 557fa838474..7a6f3481d53 100644 --- a/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix +++ b/pkgs/development/tools/analysis/garcosim/tracefilesim/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.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; + homepage = "https://github.com/GarCoSim"; maintainers = [ maintainers.cmcdragonkai ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 14b61eac374..4fbf986e41a 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.21"; + version = "4.5.22"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "0s733n3hmzpsnrvfryq7kzsvwshd1y9fzm16a64gnii8cmfalrqc"; + sha256 = "1321i9ls5k677diwfccrjinzzb5586ygdgax7ryyha3ccdj1ikda"; }; sourceRoot = "."; diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index fc7cd2ffe19..23ca35b3717 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -59,7 +59,7 @@ mkDerivation rec { It takes a perf.data file, parses and evaluates its contents and then displays the result in a graphical way. ''; - homepage = https://github.com/KDAB/hotspot; + homepage = "https://github.com/KDAB/hotspot"; license = with stdenv.lib.licenses; [ gpl2 gpl3 ]; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ nh2 ]; diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index a882d158f32..a7b7677484d 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { postBuild = "make doc"; meta = with lib; { - homepage = https://github.com/NASA-SW-VnV/ikos; + homepage = "https://github.com/NASA-SW-VnV/ikos"; description = "Static analyzer for C/C++ based on the theory of Abstract Interpretation"; license = licenses.nasa13; maintainers = with maintainers; [ atnnn ]; 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 424d83822e8..6e19d89702a 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { actually needed for this file (for both .cc and .h files), and by replacing #includes with forward-declares when possible. ''; - homepage = https://include-what-you-use.org; + homepage = "https://include-what-you-use.org"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/analysis/kcov/default.nix b/pkgs/development/tools/analysis/kcov/default.nix index b5bc31ad5e9..bbea8a1dd65 100644 --- a/pkgs/development/tools/analysis/kcov/default.nix +++ b/pkgs/development/tools/analysis/kcov/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { applications. ''; - homepage = http://simonkagstrom.github.io/kcov/index.html; + homepage = "http://simonkagstrom.github.io/kcov/index.html"; license = licenses.gpl2; maintainers = with maintainers; [ gal_bolle ekleog ]; diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 50bb85eae0d..6ac778180b7 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch; + url = "https://github.com/linux-test-project/lcov/commit/ebfeb3e179e450c69c3532f98cd5ea1fbf6ccba7.patch"; sha256 = "0dalkqbjb6a4vp1lcsxd39dpn5fzdf7ihsjbiviq285s15nxdj1j"; }) (fetchpatch { - url = https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch; + url = "https://github.com/linux-test-project/lcov/commit/75fbae1cfc5027f818a0bb865bf6f96fab3202da.patch"; sha256 = "0v1hn0511dxqbf50ppwasc6vmg0m6rns7ydbdy2rdbn0j7gxw30x"; }) ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { HTML output. ''; - homepage = http://ltp.sourceforge.net/coverage/lcov.php; + homepage = "http://ltp.sourceforge.net/coverage/lcov.php"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ dezgeg ]; diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index f5e649d0354..8cc0477ca59 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An OpenCL device simulator and debugger"; - homepage = https://github.com/jrprice/oclgrind; + homepage = "https://github.com/jrprice/oclgrind"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ athas ]; diff --git a/pkgs/development/tools/analysis/panopticon/default.nix b/pkgs/development/tools/analysis/panopticon/default.nix index 85fd8c93529..e2c174783d4 100644 --- a/pkgs/development/tools/analysis/panopticon/default.nix +++ b/pkgs/development/tools/analysis/panopticon/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zv87nqhrzsxx0m891df4vagzssj3kblfv9yp7j96dw0vn9950qa"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ makeWrapper ]; propagatedBuildInputs = with qt5; [ qt5.qtbase @@ -20,7 +20,6 @@ rustPlatform.buildRustPackage rec { qtsvg qtquickcontrols2 qtgraphicaleffects - pkgconfig git ]; diff --git a/pkgs/development/tools/analysis/randoop/default.nix b/pkgs/development/tools/analysis/randoop/default.nix index 274418172d1..54c990ee058 100644 --- a/pkgs/development/tools/analysis/randoop/default.nix +++ b/pkgs/development/tools/analysis/randoop/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.2.3"; pname = "randoop"; src = fetchurl { url = "https://github.com/randoop/randoop/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "1ac4llphh16n5ihc2hb1vggl65mbkw1xd1j3ixfskvmcy8valgqw"; + sha256 = "0apmwbh761b02z8i4s3d270ms0c1fw98d10rpczngrs2jz37s2m9"; }; buildInputs = [ unzip ]; diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 848dfca5ce6..55c077f932d 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -187,12 +187,12 @@ in stdenv.mkDerivation rec { patches = [ # 2.1.2 -> 2.2.1 (fetchpatch { - url = https://github.com/avast-tl/retdec/commit/c9d23da1c6e23c149ed684c6becd3f3828fb4a55.patch; + url = "https://github.com/avast-tl/retdec/commit/c9d23da1c6e23c149ed684c6becd3f3828fb4a55.patch"; sha256 = "0hdq634f72fihdy10nx2ajbps561w03dfdsy5r35afv9fapla6mv"; }) # 2.2.1 -> 2.2.2 (fetchpatch { - url = https://github.com/avast-tl/retdec/commit/fb85f00754b5d13b781385651db557741679721e.patch; + url = "https://github.com/avast-tl/retdec/commit/fb85f00754b5d13b781385651db557741679721e.patch"; sha256 = "0a8mwmwb39pr5ag3q11nv81ncdk51shndqrkm92shqrmdq14va52"; }) ]; @@ -228,7 +228,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A retargetable machine-code decompiler based on LLVM"; - homepage = https://retdec.com; + homepage = "https://retdec.com"; license = licenses.mit; maintainers = with maintainers; [ dtzWill timokau ]; platforms = ["x86_64-linux" "i686-linux"]; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 8ca6dff9f5d..47832c5ae2a 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { preCheck = "export HOME=$TMPDIR"; meta = { - homepage = https://rr-project.org/; + homepage = "https://rr-project.org/"; description = "Records nondeterministic executions and debugs them deterministically"; longDescription = '' rr aspires to be your primary debugging tool, replacing -- well, diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix index 9dc1e2db8c0..1443c31192d 100644 --- a/pkgs/development/tools/analysis/smatch/default.nix +++ b/pkgs/development/tools/analysis/smatch/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { name = "smatch-20120924"; src = fetchgit { - url = git://repo.or.cz/smatch.git; + url = "git://repo.or.cz/smatch.git"; rev = "23656e3e578b700cbf96d043f039e6341a3ba5b9"; sha256 = "0r43qi6vryqg450fj73yjwbb7gzcgx64rhrhb3r1m6a252srijiy"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = { description = "A semantic analysis tool for C"; - homepage = http://smatch.sourceforge.net/; + homepage = "http://smatch.sourceforge.net/"; license = stdenv.lib.licenses.free; /* OSL, see http://www.opensource.org */ platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix index 26598bb36cd..73e88f9811c 100644 --- a/pkgs/development/tools/analysis/spin/default.nix +++ b/pkgs/development/tools/analysis/spin/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Formal verification tool for distributed software systems"; - homepage = http://spinroot.com/; + homepage = "http://spinroot.com/"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/analysis/splint/default.nix b/pkgs/development/tools/analysis/splint/default.nix index 57a83e54d70..4dc93897e86 100644 --- a/pkgs/development/tools/analysis/splint/default.nix +++ b/pkgs/development/tools/analysis/splint/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://www.splint.org/; + homepage = "http://www.splint.org/"; description = "Annotation-assisted lightweight static analyzer for C"; longDescription = '' diff --git a/pkgs/development/tools/analysis/swarm/default.nix b/pkgs/development/tools/analysis/swarm/default.nix index 922a73a4be0..03f218546eb 100644 --- a/pkgs/development/tools/analysis/swarm/default.nix +++ b/pkgs/development/tools/analysis/swarm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Verification script generator for Spin"; - homepage = http://spinroot.com/; + homepage = "http://spinroot.com/"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 2cc9182cd68..200df98c0a2 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -1,23 +1,21 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "tflint"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1j56dadkyg483i2p4i76d4kdkm229yjiyariga96zxp3s4rl0fni"; + sha256 = "1z98zy04dj4hj94k9c9r1sfw167s3ywpxnjbylj7nsyxdlvwj37j"; }; - modSha256 = "14vgy5lavyp4w16g7wpi9xbni3js541rc3w9qn5ab3khqw5rdhgn"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1j6vflvg2k544r0kkdiw64n6v467c0kr7l2m39h8yjbyjbmwl5xz"; subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Terraform linter focused on possible errors, best practices, and so on"; homepage = "https://github.com/terraform-linters/tflint"; changelog = "https://github.com/terraform-linters/tflint/releases/tag/v${version}"; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 8e2db5caab1..9d8e999c385 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.valgrind.org/; + homepage = "http://www.valgrind.org/"; description = "Debugging and profiling tool suite"; longDescription = '' diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 1ecdd9f32ce..1c571fe6be0 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ qmake4Hook ]; meta = with stdenv.lib; { - homepage = http://www.valgrind.org/; + homepage = "http://www.valgrind.org/"; description = "Qt4-based GUI for the Valgrind 3.6.x series"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/apktool/default.nix b/pkgs/development/tools/apktool/default.nix index 76037f98e1b..529f705e101 100644 --- a/pkgs/development/tools/apktool/default.nix +++ b/pkgs/development/tools/apktool/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for reverse engineering Android apk files"; - homepage = https://ibotpeaches.github.io/Apktool/; + homepage = "https://ibotpeaches.github.io/Apktool/"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index 04cb6f808df..9794180eec1 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { meta = with lib; { description = "Go Assembler Formatter"; - homepage = https://github.com/klauspost/asmfmt; + homepage = "https://github.com/klauspost/asmfmt"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix index d429a926f8a..68a0c0f6073 100644 --- a/pkgs/development/tools/asn2quickder/default.nix +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "An ASN.1 compiler with a backend for Quick DER"; - homepage = https://github.com/vanrein/asn2quickder; + homepage = "https://github.com/vanrein/asn2quickder"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix index 6b51e2c482c..c337afa5a6d 100644 --- a/pkgs/development/tools/avro-tools/default.nix +++ b/pkgs/development/tools/avro-tools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://avro.apache.org/; + homepage = "https://avro.apache.org/"; description = "Avro command-line tools and utilities"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.nequissimus ]; diff --git a/pkgs/development/tools/aws-sam-cli/default.nix b/pkgs/development/tools/aws-sam-cli/default.nix index 94ca01faef2..d3b917b0d5d 100644 --- a/pkgs/development/tools/aws-sam-cli/default.nix +++ b/pkgs/development/tools/aws-sam-cli/default.nix @@ -72,7 +72,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/awslabs/aws-sam-cli; + homepage = "https://github.com/awslabs/aws-sam-cli"; description = "CLI tool for local development and testing of Serverless applications"; license = licenses.asl20; maintainers = with maintainers; [ andreabedini lo1tuma ]; diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 40741d96f56..328092feafc 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "azure-storage-azcopy"; @@ -11,8 +11,6 @@ buildGoModule rec { sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "." ]; modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb"; diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 831ed1e97ac..b1671b098b3 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -42,7 +42,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line tool for accessing the Backblaze B2 storage service"; - homepage = https://github.com/Backblaze/B2_Command_Line_Tool; + homepage = "https://github.com/Backblaze/B2_Command_Line_Tool"; license = licenses.mit; maintainers = with maintainers; [ hrdinka kevincox ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix new file mode 100644 index 00000000000..ca2a0ec1e68 --- /dev/null +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "bazel-gazelle"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = pname; + rev = "v${version}"; + sha256 = "1rw9zq8rmc0zr91kk70xl67dl6jx4dswwisv3bd1f16yncqgv2a1"; + }; + + modSha256 = "0bfhy0ig8apxb5qzxjdj6q7jr2i6rdq0ffby0pha8viadah8v2rm"; + + subPackages = [ "cmd/gazelle" ]; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel-gazelle"; + description = '' + Gazelle is a Bazel build file generator for Bazel projects. It natively + supports Go and protobuf, and it may be extended to support new languages + and custom rule sets. + ''; + license = licenses.asl20; + maintainers = with maintainers; [ kalbasit ]; + }; +} diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 29276fb6bfb..27c72b351e7 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -78,7 +78,7 @@ buildBazelPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/bazelbuild/bazel-watcher; + homepage = "https://github.com/bazelbuild/bazel-watcher"; description = "Tools for building Bazel targets when source files change."; license = licenses.asl20; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index a737ddbb0fb..5780cf4382a 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "bazelisk"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "A user-friendly launcher for Bazel"; longDescription = '' diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index 9a12a7afc62..8d3472a4a38 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a size profiler for binaries"; - homepage = https://github.com/google/bloaty; + homepage = "https://github.com/google/bloaty"; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.dtzWill ]; diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index 821e51ac605..bec5357691f 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -17,7 +17,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://github.com/BoomerangDecompiler/boomerang; + homepage = "https://github.com/BoomerangDecompiler/boomerang"; license = licenses.bsd3; description = "A general, open source, retargetable decompiler"; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/development/tools/boost-build/default.nix b/pkgs/development/tools/boost-build/default.nix index f392475f618..8ce475c893d 100644 --- a/pkgs/development/tools/boost-build/default.nix +++ b/pkgs/development/tools/boost-build/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.boost.org/boost-build2/; + homepage = "http://www.boost.org/boost-build2/"; license = stdenv.lib.licenses.boost; platforms = platforms.unix; maintainers = with maintainers; [ ivan-tkatchev ]; diff --git a/pkgs/development/tools/build-managers/alibuild/default.nix b/pkgs/development/tools/build-managers/alibuild/default.nix index c50e5716063..ad9813cde6f 100644 --- a/pkgs/development/tools/build-managers/alibuild/default.nix +++ b/pkgs/development/tools/build-managers/alibuild/default.nix @@ -2,11 +2,11 @@ python.pkgs.buildPythonApplication rec { pname = "alibuild"; - version = "1.5.4rc3"; + version = "1.5.5"; src = python.pkgs.fetchPypi { inherit pname version; - sha256 = "1mnh0h9m96p78b9ln1gbl4lw1mgl16qbyfi9fj2l13p3nxaq1sib"; + sha256 = "1sh02avpab4qlyin3p928xw91l4fgs8x5x2rzl623ayqsnfjv19j"; }; doCheck = false; 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 661e16d83e8..3f43cad17c4 100644 --- a/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; contrib = fetchurl { - url = mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2; + url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1"; }; @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; # */ meta = { - homepage = http://ant.apache.org/; + homepage = "http://ant.apache.org/"; description = "A Java-based build tool"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 28e86e29175..f06467867ce 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; contrib = fetchurl { - url = mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2; + url = "mirror://sourceforge/ant-contrib/ant-contrib-1.0b3-bin.tar.bz2"; sha256 = "96effcca2581c1ab42a4828c770b48d54852edf9e71cefc9ed2ffd6590571ad1"; }; @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; # */ meta = { - homepage = http://ant.apache.org/; + homepage = "http://ant.apache.org/"; description = "A Java-based build tool"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 9194eda3361..83260cbc186 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Build automation tool (used primarily for Java projects)"; - homepage = http://maven.apache.org/; + homepage = "http://maven.apache.org/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ cko ]; 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 3222406c15d..f6d112800b6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel-remote/default.nix @@ -81,7 +81,7 @@ buildBazelPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/buchgr/bazel-remote; + homepage = "https://github.com/buchgr/bazel-remote"; description = "A remote HTTP/1.1 cache for Bazel."; license = licenses.asl20; maintainers = [ maintainers.uri-canva ]; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index f54868de533..6d4ba50a9fb 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -161,6 +161,14 @@ stdenv.mkDerivation rec { postPatch = let darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + # Disable Bazel's Xcode toolchain detection which would configure compilers # and linkers from Xcode instead of from PATH export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 @@ -170,14 +178,14 @@ stdenv.mkDerivation rec { # Framework search paths aren't added by bintools hook # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ scripts/bootstrap/compile.sh \ src/tools/xcode/realpath/BUILD \ src/tools/xcode/stdredirect/BUILD \ diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_0_26/glibc.patch index c4de48068f1..c4de48068f1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0/glibc.patch +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/glibc.patch diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch b/pkgs/development/tools/build-managers/bazel/bazel_0_26/python-stub-path-fix.patch index cbc4192d2d9..cbc4192d2d9 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0/python-stub-path-fix.patch +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/python-stub-path-fix.patch diff --git a/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix index 6c12003b964..19d33235a34 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-latest/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, lib, fetchurl, fetchFromGitHub , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) -, bazel +, bazel_self , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater @@ -25,11 +25,11 @@ }: let - version = "2.1.0"; + version = "0.29.1"; src = fetchurl { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - sha256 = "0ijz9lxralyw18r5ra2h79jnafk5521ncr3knaip74cqa28csw9k"; + sha256 = "1rcd6xy61n07n7m6dgcw23275r8z3gkwmqdkd48nwrq8yb7m4al7"; }; # Update with `eval $(nix-build -A bazel.updater)`, @@ -49,12 +49,12 @@ let srcs.io_bazel_rules_sass srcs.platforms (if stdenv.hostPlatform.isDarwin - then srcs."java_tools_javac11_darwin-v7.0.zip" - else srcs."java_tools_javac11_linux-v7.0.zip") - srcs."coverage_output_generator-v2.1.zip" + then srcs."java_tools_javac11_darwin-v4.0.zip" + else srcs."java_tools_javac11_linux-v4.0.zip") + srcs."coverage_output_generator-v1.0.zip" srcs.build_bazel_rules_nodejs - srcs."android_tools_pkg-0.13.tar.gz" - srcs."0.28.3.tar.gz" + srcs."android_tools_pkg-0.8.tar.gz" + srcs."0.27.1.tar.gz" srcs.rules_pkg srcs.rules_cc srcs.rules_java @@ -106,12 +106,11 @@ let # and libraries path. # We prefetch it, patch it, and override it in a global bazelrc. system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - arch = stdenv.hostPlatform.parsed.cpu.name; remote_java_tools = stdenv.mkDerivation { name = "remote_java_tools_${system}"; - src = srcDepsSet."java_tools_javac11_${system}-v7.0.zip"; + src = srcDepsSet."java_tools_javac11_${system}-v4.0.zip"; nativeBuildInputs = [ autoPatchelfHook unzip ]; buildInputs = [ gcc-unwrapped ]; @@ -161,6 +160,7 @@ stdenv.mkDerivation rec { # This is breaking the build of any C target. This patch removes the last # argument if it's found to be an empty string. ../trim-last-argument-to-gcc-if-empty.patch + ./glibc.patch # --experimental_strict_action_env (which may one day become the default # see bazelbuild/bazel#2574) hardcodes the default @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { touch $out ''); - bazelWithNixHacks = bazel.override { enableNixHacks = true; }; + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; bazel-examples = fetchFromGitHub { owner = "bazelbuild"; @@ -494,11 +494,9 @@ stdenv.mkDerivation rec { mkdir -p $out/bin # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel - # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} - # The binary _must_ exist with this naming if your project contains a .bazelversion - # file. + # if it can’t find something in tools, it calls $out/bin/bazel-real cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel - mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + mv ./bazel_src/output/bazel $out/bin/bazel-real # shell completion files mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions @@ -537,7 +535,7 @@ stdenv.mkDerivation rec { exec "$BAZEL_REAL" "$@" EOF - # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} + # second call succeeds because it defers to $out/bin/bazel-real hello_test ''; diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/glibc.patch b/pkgs/development/tools/build-managers/bazel/bazel_0_29/glibc.patch new file mode 100644 index 00000000000..c4de48068f1 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/glibc.patch @@ -0,0 +1,78 @@ +From https://github.com/grpc/grpc/commit/57586a1ca7f17b1916aed3dea4ff8de872dbf853 +From: Benjamin Peterson <benjamin@dropbox.com> +Date: Fri, 3 May 2019 08:11:00 -0700 +Subject: [PATCH] Rename gettid() functions. + +glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts. +--- + src/core/lib/gpr/log_linux.cc | 6 ++---- + src/core/lib/gpr/log_posix.cc | 4 ++-- + src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++-- + 3 files changed, 6 insertions(+), 8 deletions(-) + +diff --git a/third_party/grpc/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc +index 81026e5689b..8b597b4cf2f 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_linux.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_linux.cc +@@ -40,7 +40,7 @@ + #include <time.h> + #include <unistd.h> + +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) { + gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME); + struct tm tm; + static __thread long tid = 0; +- if (tid == 0) tid = gettid(); ++ if (tid == 0) tid = sys_gettid(); + + timer = static_cast<time_t>(now.tv_sec); + final_slash = strrchr(args->file, '/'); +diff --git a/third_party/grpc/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc +index b6edc14ab6b..2f7c6ce3760 100644 +--- a/third_party/grpc/src/core/lib/gpr/log_posix.cc ++++ b/third_party/grpc/src/core/lib/gpr/log_posix.cc +@@ -31,7 +31,7 @@ + #include <string.h> + #include <time.h> + +-static intptr_t gettid(void) { return (intptr_t)pthread_self(); } ++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); } + + void gpr_log(const char* file, int line, gpr_log_severity severity, + const char* format, ...) { +@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) { + char* prefix; + gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]", + gpr_log_severity_string(args->severity), time_buffer, +- (int)(now.tv_nsec), gettid(), display_file, args->line); ++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line); + + fprintf(stderr, "%-70s %s\n", prefix, args->message); + gpr_free(prefix); +diff --git a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc +index c2d80c08ddb..4a83cb6c215 100644 +--- a/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc ++++ b/third_party/grpc/src/core/lib/iomgr/ev_epollex_linux.cc +@@ -1077,7 +1077,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker, + } + + #ifndef NDEBUG +-static long gettid(void) { return syscall(__NR_gettid); } ++static long sys_gettid(void) { return syscall(__NR_gettid); } + #endif + + /* pollset->mu lock must be held by the caller before calling this. +@@ -1097,7 +1097,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset, + #define WORKER_PTR (&worker) + #endif + #ifndef NDEBUG +- WORKER_PTR->originator = gettid(); ++ WORKER_PTR->originator = sys_gettid(); + #endif + if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { + gpr_log(GPR_INFO, diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_29/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_0_29/src-deps.json new file mode 100644 index 00000000000..f93794249ec --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_29/src-deps.json @@ -0,0 +1,506 @@ +{ + "0.16.2.zip": { + "name": "0.16.2.zip", + "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", + "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" + ] + }, + "0.27.1.tar.gz": { + "name": "0.27.1.tar.gz", + "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" + ] + }, + "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip": { + "name": "0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz": { + "name": "41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" + ] + }, + "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip": { + "name": "441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" + ] + }, + "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip": { + "name": "7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz": { + "name": "8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" + ] + }, + "android_tools_pkg-0.8.tar.gz": { + "name": "android_tools_pkg-0.8.tar.gz", + "sha256": "a9eac6e1b27d5549edaaa724b20eb1cdae6253b84f44d5744c30372bd523cfcd", + "urls": [ + "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.8.tar.gz" + ] + }, + "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz": { + "name": "b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" + ] + }, + "bazel_j2objc": { + "name": "bazel_j2objc", + "sha256": "8d3403b5b7db57e347c943d214577f6879e5b175c2b59b7e075c0b6453330e9b", + "strip_prefix": "j2objc-2.5", + "urls": [ + "https://miirror.bazel.build/github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip", + "https://github.com/google/j2objc/releases/download/2.5/j2objc-2.5.zip" + ] + }, + "bazel_skylib": { + "name": "bazel_skylib", + "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", + "strip_prefix": "bazel-skylib-f83cb8dd6f5658bc574ccd873e25197055265d1c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" + ] + }, + "bazel_toolchains": { + "name": "bazel_toolchains", + "sha256": "28cb3666da80fbc62d4c46814f5468dd5d0b59f9064c0b933eee3140d706d330", + "strip_prefix": "bazel-toolchains-0.27.1", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz", + "https://github.com/bazelbuild/bazel-toolchains/archive/0.27.1.tar.gz" + ] + }, + "build_bazel_rules_nodejs": { + "name": "build_bazel_rules_nodejs", + "sha256": "9b72bb0aea72d7cbcfc82a01b1e25bf3d85f791e790ddec16c65e2d906382ee0", + "strip_prefix": "rules_nodejs-0.16.2", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip", + "https://github.com/bazelbuild/rules_nodejs/archive/0.16.2.zip" + ] + }, + "com_google_googletest": { + "name": "com_google_googletest", + "sha256": "0fb00ff413f6b9b80ccee44a374ca7a18af7315aea72a43c62f2acd1ca74e9b5", + "strip_prefix": "googletest-f13bbe2992d188e834339abe6f715b2b2f840a77", + "urls": [ + "https://mirror.bazel.build/github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz", + "https://github.com/google/googletest/archive/f13bbe2992d188e834339abe6f715b2b2f840a77.tar.gz" + ] + }, + "coverage_output_generator-v1.0.zip": { + "name": "coverage_output_generator-v1.0.zip", + "sha256": "cc470e529fafb6165b5be3929ff2d99b38429b386ac100878687416603a67889", + "urls": [ + "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v1.0.zip" + ] + }, + "desugar_jdk_libs": { + "name": "desugar_jdk_libs", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "strip_prefix": "desugar_jdk_libs-e0b0291b2c51fbe5a7cfa14473a1ae850f94f021", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip": { + "name": "e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "sha256": "fe2e04f91ce8c59d49d91b8102edc6627c6fa2906c1b0e7346f01419ec4f419d", + "urls": [ + "https://mirror.bazel.build/github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip", + "https://github.com/google/desugar_jdk_libs/archive/e0b0291b2c51fbe5a7cfa14473a1ae850f94f021.zip" + ] + }, + "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz": { + "name": "f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "sha256": "ba5d15ca230efca96320085d8e4d58da826d1f81b444ef8afccd8b23e0799b52", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz", + "https://github.com/bazelbuild/bazel-skylib/archive/f83cb8dd6f5658bc574ccd873e25197055265d1c.tar.gz" + ] + }, + "io_bazel_rules_sass": { + "name": "io_bazel_rules_sass", + "sha256": "d868ce50d592ef4aad7dec4dd32ae68d2151261913450fac8390b3fd474bb898", + "strip_prefix": "rules_sass-8ccf4f1c351928b55d5dddf3672e3667f6978d60", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz", + "https://github.com/bazelbuild/rules_sass/archive/8ccf4f1c351928b55d5dddf3672e3667f6978d60.tar.gz" + ] + }, + "io_bazel_skydoc": { + "name": "io_bazel_skydoc", + "sha256": "fdc34621839104b57363a258eab9d821b02ff7837923cfe7fb6fd67182780829", + "strip_prefix": "skydoc-41c28e43dffbae39c52dd4b91932d1209e5a8893", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz", + "https://github.com/bazelbuild/skydoc/archive/41c28e43dffbae39c52dd4b91932d1209e5a8893.tar.gz" + ] + }, + "java_tools_javac11_darwin-v4.0.zip": { + "name": "java_tools_javac11_darwin-v4.0.zip", + "sha256": "fbf5bf22e9aab9c622e4c8c59314a1eef5ea09eafc5672b4f3250dc0b971bbcc", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_darwin-v4.0.zip" + ] + }, + "java_tools_javac11_linux-v4.0.zip": { + "name": "java_tools_javac11_linux-v4.0.zip", + "sha256": "96e223094a12c842a66db0bb7bb6866e88e26e678f045842911f9bd6b47161f5", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_linux-v4.0.zip" + ] + }, + "java_tools_javac11_windows-v4.0.zip": { + "name": "java_tools_javac11_windows-v4.0.zip", + "sha256": "a1de51447b2ba2eab923d589ba6c72c289c16e6091e6a3bb3e67a05ef4ad200c", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/releases/javac11/v4.0/java_tools_javac11_windows-v4.0.zip" + ] + }, + "java_tools_langtools_javac10": { + "name": "java_tools_langtools_javac10", + "sha256": "0e9c9ac5ef17869de3cb8c3497c4c0d31836ef7b63efe1690506f53783adb212", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk10_v2.zip" + ] + }, + "java_tools_langtools_javac11": { + "name": "java_tools_langtools_javac11", + "sha256": "cf0814fa002ef3d794582bb086516d8c9ed0958f83f19799cdb08949019fe4c7", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk11_v2.zip" + ] + }, + "java_tools_langtools_javac12": { + "name": "java_tools_langtools_javac12", + "sha256": "99b107105165a91df82cd7cf82a8efb930d803fb7de1663cf7f780142104cd14", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk12.zip" + ] + }, + "java_tools_langtools_javac9": { + "name": "java_tools_langtools_javac9", + "sha256": "d94befcfb325a9a62aebc2052e631fde2322b4df5c82a19ed260b38ba12a0ad1", + "urls": [ + "https://mirror.bazel.build/bazel_java_tools/jdk_langtools/langtools_jdk9_v2.zip" + ] + }, + "jdk10-server-release-1804.tar.xz": { + "name": "jdk10-server-release-1804.tar.xz", + "sha256": "b7098b7aaf6ee1ffd4a2d0371a0be26c5a5c87f6aebbe46fe9a92c90583a84be", + "urls": [ + "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk10-server-release-1804.tar.xz" + ] + }, + "jdk9-server-release-1708.tar.xz": { + "name": "jdk9-server-release-1708.tar.xz", + "sha256": "72e7843902b0395e2d30e1e9ad2a5f05f36a4bc62529828bcbc698d54aec6022", + "urls": [ + "https://mirror.bazel.build/openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz" + ] + }, + "openjdk10_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk10_linux_archive", + "sha256": "b3c2d762091a615b0c1424ebbd05d75cc114da3bf4f25a0dec5c51ea7e84146f", + "strip_prefix": "zulu10.2+3-jdk10.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64.tar.gz" + ] + }, + "openjdk11_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk11_linux_archive", + "sha256": "ddb0fd4526089cf1ce2db36282c282263f587a9e8be373fa02f511a12923cc48", + "strip_prefix": "zulu11.31.11-ca-jdk11.0.3-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.11-ca-jdk11.0.3/zulu11.31.11-ca-jdk11.0.3-linux_x64.tar.gz" + ] + }, + "openjdk12_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk12_linux_archive", + "sha256": "529c99841d69e11a85aea967ccfb9d0fd40b98c5b68dbe1d059002655e0a9c13", + "strip_prefix": "zulu12.2.3-ca-jdk12.0.1-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu12.2.3-ca-jdk12.0.1/zulu12.2.3-ca-jdk12.0.1-linux_x64.tar.gz" + ] + }, + "openjdk9_linux_archive": { + "build_file_content": "java_runtime(name = 'runtime', srcs = glob(['**']), visibility = ['//visibility:public'])", + "name": "openjdk9_linux_archive", + "sha256": "45f2dfbee93b91b1468cf81d843fc6d9a47fef1f831c0b7ceff4f1eb6e6851c8", + "strip_prefix": "zulu9.0.7.1-jdk9.0.7-linux_x64", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64.tar.gz" + ] + }, + "openjdk_linux": { + "downloaded_file_path": "zulu-linux.tar.gz", + "name": "openjdk_linux", + "sha256": "460d8a4f0c0204160b48086e341b22943c9cca471b195340e75b38ae9eb33c1c", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209950.tar.gz" + ] + }, + "openjdk_linux_aarch64": { + "downloaded_file_path": "zulu-linux-aarch64.tar.gz", + "name": "openjdk_linux_aarch64", + "sha256": "23c37c0c3a8fdcbc68e96e70ff5c5c020c14db76deaae9b547849afda4586e5e", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-allmodules-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" + ] + }, + "openjdk_linux_aarch64_minimal": { + "downloaded_file_path": "zulu-linux-aarch64-minimal.tar.gz", + "name": "openjdk_linux_aarch64_minimal", + "sha256": "7af2583fe5ef0a781d4a9dca0c0160d42e7db1305ec1b66f98aa44c91cc875df", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64-minimal-c82eb4878c7dc829455caeb915affe36c89df06f-1561630858.tar.gz" + ] + }, + "openjdk_linux_aarch64_vanilla": { + "downloaded_file_path": "zulu-linux-aarch64-vanilla.tar.gz", + "name": "openjdk_linux_aarch64_vanilla", + "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" + ] + }, + "openjdk_linux_minimal": { + "downloaded_file_path": "zulu-linux-minimal.tar.gz", + "name": "openjdk_linux_minimal", + "sha256": "5123bc8dd21886761d1fd9ca0fb1898b3372d7243064a070ec81ca9c9d1a6791", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556011926.tar.gz" + ] + }, + "openjdk_linux_vanilla": { + "downloaded_file_path": "zulu-linux-vanilla.tar.gz", + "name": "openjdk_linux_vanilla", + "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" + ] + }, + "openjdk_macos": { + "downloaded_file_path": "zulu-macos.tar.gz", + "name": "openjdk_macos", + "sha256": "8fa61d85ca6f657d646fdb50cfc8634987f8f7d8a3250ed39fb7364647633252", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209951.tar.gz" + ] + }, + "openjdk_macos_minimal": { + "downloaded_file_path": "zulu-macos-minimal.tar.gz", + "name": "openjdk_macos_minimal", + "sha256": "ac56e44db46fd56ac78b39b6823daed4faa74a2677ac340c7d217f863884ec0f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003114.tar.gz" + ] + }, + "openjdk_macos_vanilla": { + "downloaded_file_path": "zulu-macos-vanilla.tar.gz", + "name": "openjdk_macos_vanilla", + "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" + ] + }, + "openjdk_win": { + "downloaded_file_path": "zulu-win.zip", + "name": "openjdk_win", + "sha256": "e6ddb361309f8e84eb5fb5ad8b0f5cc031ba3679910139262c31efd8f7579d05", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-allmodules-90755145cb6e6418584d8603cd5fa9afbb30aecc-1549209972.zip" + ] + }, + "openjdk_win_minimal": { + "downloaded_file_path": "zulu-win-minimal.zip", + "name": "openjdk_win_minimal", + "sha256": "8e5dada6e9ebcc9ce29b4d051449bb95d3ee1e620e166da862224bbf15211f8b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64-minimal-524ae2ca2a782c9f15e00f08bd35b3f8ceacbd7f-1556003136.zip" + ] + }, + "openjdk_win_vanilla": { + "downloaded_file_path": "zulu-win-vanilla.zip", + "name": "openjdk_win_vanilla", + "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" + ] + }, + "platforms": { + "name": "platforms", + "sha256": "a07fe5e75964361885db725039c2ba673f0ee0313d971ae4f50c9b18cd28b0b5", + "strip_prefix": "platforms-441afe1bfdadd6236988e9cac159df6b5a9f5a98", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip", + "https://github.com/bazelbuild/platforms/archive/441afe1bfdadd6236988e9cac159df6b5a9f5a98.zip" + ] + }, + "rules_cc": { + "name": "rules_cc", + "sha256": "36fa66d4d49debd71d05fba55c1353b522e8caef4a20f8080a3d17cdda001d89", + "strip_prefix": "rules_cc-0d5f3f2768c6ca2faca0079a997a97ce22997a0c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip", + "https://github.com/bazelbuild/rules_cc/archive/0d5f3f2768c6ca2faca0079a997a97ce22997a0c.zip" + ] + }, + "rules_java": { + "name": "rules_java", + "sha256": "bc81f1ba47ef5cc68ad32225c3d0e70b8c6f6077663835438da8d5733f917598", + "strip_prefix": "rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip", + "https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip" + ] + }, + "rules_pkg": { + "name": "rules_pkg", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_pkg-0.2.0.tar.gz": { + "name": "rules_pkg-0.2.0.tar.gz", + "sha256": "5bdc04987af79bd27bc5b00fe30f59a858f77ffa0bd2d8143d5b31ad8b1bd71c", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/rules_pkg-0.2.0.tar.gz", + "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.0/rules_pkg-0.2.0.tar.gz" + ] + }, + "rules_proto": { + "name": "rules_proto", + "sha256": "88b0a90433866b44bb4450d4c30bc5738b8c4f9c9ba14e9661deb123f56a833d", + "strip_prefix": "rules_proto-b0cc14be5da05168b01db282fe93bdf17aa2b9f4", + "urls": [ + "https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz", + "https://github.com/bazelbuild/rules_proto/archive/b0cc14be5da05168b01db282fe93bdf17aa2b9f4.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz": { + "name": "zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz", + "sha256": "57fad3602e74c79587901d6966d3b54ef32cb811829a2552163185d5064fe9b5", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-linux_x64-allmodules.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz": { + "name": "zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz", + "sha256": "e669c9a897413d855b550b4e39d79614392e6fb96f494e8ef99a34297d9d85d3", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-macosx_x64-allmodules.tar.gz" + ] + }, + "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip": { + "name": "zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip", + "sha256": "c39e7700a8d41794d60985df5a20352435196e78ecbc6a2b30df7be8637bffd5", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu10.2+3-jdk10.0.1/zulu10.2+3-jdk10.0.1-win_x64-allmodules.zip" + ] + }, + "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz": { + "name": "zulu11.2.3-jdk11.0.1-linux_x64.tar.gz", + "sha256": "232b1c3511f0d26e92582b7c3cc363be7ac633e371854ca2f2e9f2b50eb72a75", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-linux_x64.tar.gz" + ] + }, + "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz": { + "name": "zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz", + "sha256": "1edf366ee821e5db8e348152fcb337b28dfd6bf0f97943c270dcc6747cedb6cb", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-macosx_x64.tar.gz" + ] + }, + "zulu11.2.3-jdk11.0.1-win_x64.zip": { + "name": "zulu11.2.3-jdk11.0.1-win_x64.zip", + "sha256": "8e1e2b8347de6746f3fd1538840dd643201533ab113abc4ed93678e342d28aa3", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.2.3-jdk11.0.1/zulu11.2.3-jdk11.0.1-win_x64.zip" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz": { + "name": "zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz", + "sha256": "f3f44b6235508e87b760bf37a49e186cc1fa4e9cd28384c4dbf5a33991921e08", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-linux_x64.tar.gz" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip": { + "name": "zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip", + "sha256": "059f8e3484bf07b63a8f2820d5f528f473eff1befdb1896ee4f8ff06be3b8d8f", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-macosx_x64.zip" + ] + }, + "zulu11.29.3-ca-jdk11.0.2-win_x64.zip": { + "name": "zulu11.29.3-ca-jdk11.0.2-win_x64.zip", + "sha256": "e1f5b4ce1b9148140fae2fcfb8a96d1c9b7eac5b8df0e13fbcad9b8561284880", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.29.3-ca-jdk11.0.2/zulu11.29.3-ca-jdk11.0.2-win_x64.zip" + ] + }, + "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz": { + "name": "zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz", + "sha256": "3b0d91611b1bdc4d409afcf9eab4f0e7f4ae09f88fc01bd9f2b48954882ae69b", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu11.31.15-ca-jdk11.0.3/zulu11.31.15-ca-jdk11.0.3-linux_aarch64.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz": { + "name": "zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz", + "sha256": "f27cb933de4f9e7fe9a703486cf44c84bc8e9f138be0c270c9e5716a32367e87", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz": { + "name": "zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz", + "sha256": "404e7058ff91f956612f47705efbee8e175a38b505fb1b52d8c1ea98718683de", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-macosx_x64-allmodules.tar.gz" + ] + }, + "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip": { + "name": "zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip", + "sha256": "e738829017f107e7a7cd5069db979398ec3c3f03ef56122f89ba38e7374f63ed", + "urls": [ + "https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-win_x64-allmodules.zip" + ] + } +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix index ffb5714631c..eff8aede6c1 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_1/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, lib, fetchurl, fetchFromGitHub , runCommand, runCommandCC, makeWrapper, recurseIntoAttrs # this package (through the fixpoint glass) -, bazel_1 +, bazel_self , lr, xe, zip, unzip, bash, writeCBin, coreutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils # updater @@ -247,7 +247,7 @@ stdenv.mkDerivation rec { touch $out ''); - bazelWithNixHacks = bazel_1.override { enableNixHacks = true; }; + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; bazel-examples = fetchFromGitHub { owner = "bazelbuild"; @@ -258,20 +258,20 @@ stdenv.mkDerivation rec { in (if !stdenv.hostPlatform.isDarwin then { # `extracted` doesn’t work on darwin - shebang = callPackage ./shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; } else {}) // { - bashTools = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; }; - cpp = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - java = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; - protobuf = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; }; - pythonBinPath = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; - - bashToolsWithNixHacks = callPackage ./bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - - cppWithNixHacks = callPackage ./cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - javaWithNixHacks = callPackage ./java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; - protobufWithNixHacks = callPackage ./protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; - pythonBinPathWithNixHacks = callPackage ./python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; # downstream packages using buildBazelPackage # fixed-output hashes of the fetch phase need to be spot-checked manually diff --git a/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix new file mode 100644 index 00000000000..edda48c4b99 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/bazel_2/default.nix @@ -0,0 +1,561 @@ +{ stdenv, callPackage, lib, fetchurl, fetchFromGitHub +, runCommand, runCommandCC, makeWrapper, recurseIntoAttrs +# this package (through the fixpoint glass) +, bazel_self +, lr, xe, zip, unzip, bash, writeCBin, coreutils +, which, gawk, gnused, gnutar, gnugrep, gzip, findutils +# updater +, python27, python3, writeScript +# Apple dependencies +, cctools, libcxx, CoreFoundation, CoreServices, Foundation +# Allow to independently override the jdks used to build and run respectively +, buildJdk, runJdk +, buildJdkName +, runtimeShell +# Downstream packages for tests +, bazel-watcher +# Always assume all markers valid (this is needed because we remove markers; they are non-deterministic). +# Also, don't clean up environment variables (so that NIX_ environment variables are passed to compilers). +, enableNixHacks ? false +, gcc-unwrapped +, autoPatchelfHook +, file +, substituteAll +, writeTextFile +}: + +let + version = "2.1.0"; + + src = fetchurl { + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; + sha256 = "0ijz9lxralyw18r5ra2h79jnafk5521ncr3knaip74cqa28csw9k"; + }; + + # Update with `eval $(nix-build -A bazel.updater)`, + # then add new dependencies from the dict in ./src-deps.json as required. + srcDeps = lib.attrsets.attrValues srcDepsSet; + srcDepsSet = + let + srcs = (builtins.fromJSON (builtins.readFile ./src-deps.json)); + toFetchurl = d: lib.attrsets.nameValuePair d.name (fetchurl { + urls = d.urls; + sha256 = d.sha256; + }); + in builtins.listToAttrs (map toFetchurl [ + srcs.desugar_jdk_libs + srcs.io_bazel_skydoc + srcs.bazel_skylib + srcs.io_bazel_rules_sass + srcs.platforms + (if stdenv.hostPlatform.isDarwin + then srcs."java_tools_javac11_darwin-v7.0.zip" + else srcs."java_tools_javac11_linux-v7.0.zip") + srcs."coverage_output_generator-v2.1.zip" + srcs.build_bazel_rules_nodejs + srcs."android_tools_pkg-0.13.tar.gz" + srcs."0.28.3.tar.gz" + srcs.rules_pkg + srcs.rules_cc + srcs.rules_java + srcs.rules_proto + ]); + + distDir = runCommand "bazel-deps" {} '' + mkdir -p $out + for i in ${builtins.toString srcDeps}; do cp $i $out/$(stripHash $i); done + ''; + + defaultShellPath = lib.makeBinPath + # Keep this list conservative. For more exotic tools, prefer to use + # @rules_nixpkgs to pull in tools from the nix repository. Example: + # + # WORKSPACE: + # + # nixpkgs_git_repository( + # name = "nixpkgs", + # revision = "def5124ec8367efdba95a99523dd06d918cb0ae8", + # ) + # + # # This defines an external Bazel workspace. + # nixpkgs_package( + # name = "bison", + # repositories = { "nixpkgs": "@nixpkgs//:default.nix" }, + # ) + # + # some/BUILD.bazel: + # + # genrule( + # ... + # cmd = "$(location @bison//:bin/bison) -other -args", + # tools = [ + # ... + # "@bison//:bin/bison", + # ], + # ) + # + [ bash coreutils findutils gawk gnugrep gnutar gnused gzip which unzip file zip ]; + + # Java toolchain used for the build and tests + javaToolchain = "@bazel_tools//tools/jdk:toolchain_host${buildJdkName}"; + + platforms = lib.platforms.linux ++ lib.platforms.darwin; + + # This repository is fetched by bazel at runtime + # however it contains prebuilt java binaries, with wrong interpreter + # and libraries path. + # We prefetch it, patch it, and override it in a global bazelrc. + system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; + arch = stdenv.hostPlatform.parsed.cpu.name; + + remote_java_tools = stdenv.mkDerivation { + name = "remote_java_tools_${system}"; + + src = srcDepsSet."java_tools_javac11_${system}-v7.0.zip"; + + nativeBuildInputs = [ autoPatchelfHook unzip ]; + buildInputs = [ gcc-unwrapped ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir $out; + ''; + + installPhase = '' + cp -Ra * $out/ + touch $out/WORKSPACE + ''; + }; + + bazelRC = writeTextFile { + name = "bazel-rc"; + text = '' + build --override_repository=${remote_java_tools.name}=${remote_java_tools} + build --distdir=${distDir} + startup --server_javabase=${runJdk} + + # load default location for the system wide configuration + try-import /etc/bazel.bazelrc + ''; + }; + +in +stdenv.mkDerivation rec { + pname = "bazel"; + inherit version; + + meta = with lib; { + homepage = "https://github.com/bazelbuild/bazel/"; + description = "Build tool that builds code quickly and reliably"; + license = licenses.asl20; + maintainers = [ maintainers.mboes ]; + inherit platforms; + }; + + inherit src; + sourceRoot = "."; + + patches = [ + # On Darwin, the last argument to gcc is coming up as an empty string. i.e: '' + # This is breaking the build of any C target. This patch removes the last + # argument if it's found to be an empty string. + ../trim-last-argument-to-gcc-if-empty.patch + + # --experimental_strict_action_env (which may one day become the default + # see bazelbuild/bazel#2574) hardcodes the default + # action environment to a non hermetic value (e.g. "/usr/local/bin"). + # This is non hermetic on non-nixos systems. On NixOS, bazel cannot find the required binaries. + # So we are replacing this bazel paths by defaultShellPath, + # improving hermeticity and making it work in nixos. + (substituteAll { + src = ../strict_action_env.patch; + strictActionEnvPatch = defaultShellPath; + }) + + # bazel reads its system bazelrc in /etc + # override this path to a builtin one + (substituteAll { + src = ../bazel_rc.patch; + bazelSystemBazelRCPath = bazelRC; + }) + ] ++ lib.optional enableNixHacks ../nix-hacks.patch; + + + # Additional tests that check bazel’s functionality. Execute + # + # nix-build . -A bazel.tests + # + # in the nixpkgs checkout root to exercise them locally. + passthru.tests = + let + runLocal = name: attrs: script: + let + attrs' = removeAttrs attrs [ "buildInputs" ]; + buildInputs = [ python3 ] ++ (attrs.buildInputs or []); + in + runCommandCC name ({ + inherit buildInputs; + preferLocalBuild = true; + meta.platforms = platforms; + } // attrs') script; + + # bazel wants to extract itself into $install_dir/install every time it runs, + # so let’s do that only once. + extracted = bazelPkg: + let install_dir = + # `install_base` field printed by `bazel info`, minus the hash. + # yes, this path is kinda magic. Sorry. + "$HOME/.cache/bazel/_bazel_nixbld"; + in runLocal "bazel-extracted-homedir" { passthru.install_dir = install_dir; } '' + export HOME=$(mktemp -d) + touch WORKSPACE # yeah, everything sucks + install_base="$(${bazelPkg}/bin/bazel info | grep install_base)" + # assert it’s actually below install_dir + [[ "$install_base" =~ ${install_dir} ]] \ + || (echo "oh no! $install_base but we are \ + trying to copy ${install_dir} to $out instead!"; exit 1) + cp -R ${install_dir} $out + ''; + + bazelTest = { name, bazelScript, workspaceDir, bazelPkg, buildInputs ? [] }: + let + be = extracted bazelPkg; + in runLocal name { inherit buildInputs; } ( + # skip extraction caching on Darwin, because nobody knows how Darwin works + (lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + # set up home with pre-unpacked bazel + export HOME=$(mktemp -d) + mkdir -p ${be.install_dir} + cp -R ${be}/install ${be.install_dir} + + # https://stackoverflow.com/questions/47775668/bazel-how-to-skip-corrupt-installation-on-centos6 + # Bazel checks whether the mtime of the install dir files + # is >9 years in the future, otherwise it extracts itself again. + # see PosixFileMTime::IsUntampered in src/main/cpp/util + # What the hell bazel. + ${lr}/bin/lr -0 -U ${be.install_dir} | ${xe}/bin/xe -N0 -0 touch --date="9 years 6 months" {} + '') + + + '' + # Note https://github.com/bazelbuild/bazel/issues/5763#issuecomment-456374609 + # about why to create a subdir for the workspace. + cp -r ${workspaceDir} wd && chmod u+w wd && cd wd + + ${bazelScript} + + touch $out + ''); + + bazelWithNixHacks = bazel_self.override { enableNixHacks = true; }; + + bazel-examples = fetchFromGitHub { + owner = "bazelbuild"; + repo = "examples"; + rev = "5d8c8961a2516ebf875787df35e98cadd08d43dc"; + sha256 = "03c1bwlq5bs3hg96v4g4pg2vqwhqq6w538h66rcpw02f83yy7fs8"; + }; + + in (if !stdenv.hostPlatform.isDarwin then { + # `extracted` doesn’t work on darwin + shebang = callPackage ../shebang-test.nix { inherit runLocal extracted bazelTest distDir; }; + } else {}) // { + bashTools = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; }; + cpp = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + java = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; }; + protobuf = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; }; + pythonBinPath = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; }; + + bashToolsWithNixHacks = callPackage ../bash-tools-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + cppWithNixHacks = callPackage ../cpp-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + javaWithNixHacks = callPackage ../java-test.nix { inherit runLocal bazelTest bazel-examples distDir; bazel = bazelWithNixHacks; }; + protobufWithNixHacks = callPackage ../protobuf-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + pythonBinPathWithNixHacks = callPackage ../python-bin-path-test.nix { inherit runLocal bazelTest distDir; bazel = bazelWithNixHacks; }; + + # downstream packages using buildBazelPackage + # fixed-output hashes of the fetch phase need to be spot-checked manually + downstream = recurseIntoAttrs ({ + inherit bazel-watcher; + } + # dm-sonnet is only packaged for linux + // (lib.optionalAttrs stdenv.isLinux { + # TODO(timokau) dm-sonnet is broken currently + # dm-sonnet-linux = python3.pkgs.dm-sonnet; + })); + }; + + # update the list of workspace dependencies + passthru.updater = writeScript "update-bazel-deps.sh" '' + #!${runtimeShell} + cat ${runCommand "bazel-deps.json" {} '' + ${unzip}/bin/unzip ${src} WORKSPACE + ${python3}/bin/python3 ${../update-srcDeps.py} ./WORKSPACE > $out + ''} > ${builtins.toString ./src-deps.json} + ''; + + # Necessary for the tests to pass on Darwin with sandbox enabled. + # Bazel starts a local server and needs to bind a local address. + __darwinAllowLocalNetworking = true; + + # Bazel expects several utils to be available in Bash even without PATH. Hence this hack. + customBash = writeCBin "bash" '' + #include <stdio.h> + #include <stdlib.h> + #include <string.h> + #include <unistd.h> + + extern char **environ; + + int main(int argc, char *argv[]) { + char *path = getenv("PATH"); + char *pathToAppend = "${defaultShellPath}"; + char *newPath; + if (path != NULL) { + int length = strlen(path) + 1 + strlen(pathToAppend) + 1; + newPath = malloc(length * sizeof(char)); + snprintf(newPath, length, "%s:%s", path, pathToAppend); + } else { + newPath = pathToAppend; + } + setenv("PATH", newPath, 1); + execve("${bash}/bin/bash", argv, environ); + return 0; + } + ''; + + postPatch = let + + darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + + # Disable Bazel's Xcode toolchain detection which would configure compilers + # and linkers from Xcode instead of from PATH + export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 + + # Explicitly configure gcov since we don't have it on Darwin, so autodetection fails + export GCOV=${coreutils}/bin/false + + # Framework search paths aren't added by bintools hook + # https://github.com/NixOS/nixpkgs/pull/41914 + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + + # libcxx includes aren't added by libcxx hook + # https://github.com/NixOS/nixpkgs/pull/41589 + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" + + # don't use system installed Xcode to run clang, use Nix clang instead + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ + scripts/bootstrap/compile.sh \ + src/tools/xcode/realpath/BUILD \ + src/tools/xcode/stdredirect/BUILD \ + tools/osx/BUILD + + # nixpkgs's libSystem cannot use pthread headers directly, must import GCD headers instead + sed -i -e "/#include <pthread\/spawn.h>/i #include <dispatch/dispatch.h>" src/main/cpp/blaze_util_darwin.cc + + # clang installed from Xcode has a compatibility wrapper that forwards + # invocations of gcc to clang, but vanilla clang doesn't + sed -i -e 's;_find_generic(repository_ctx, "gcc", "CC", overriden_tools);_find_generic(repository_ctx, "clang", "CC", overriden_tools);g' tools/cpp/unix_cc_configure.bzl + + sed -i -e 's;/usr/bin/libtool;${cctools}/bin/libtool;g' tools/cpp/unix_cc_configure.bzl + wrappers=( tools/cpp/osx_cc_wrapper.sh tools/cpp/osx_cc_wrapper.sh.tpl ) + for wrapper in "''${wrappers[@]}"; do + sed -i -e "s,/usr/bin/install_name_tool,${cctools}/bin/install_name_tool,g" $wrapper + done + ''; + + genericPatches = '' + # Substitute j2objc and objc wrapper's python shebang to plain python path. + # These scripts explicitly depend on Python 2.7, hence we use python27. + # See also `postFixup` where python27 is added to $out/nix-support + substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python" + + # md5sum is part of coreutils + sed -i 's|/sbin/md5|md5sum|' \ + src/BUILD + + # substituteInPlace is rather slow, so prefilter the files with grep + grep -rlZ /bin src/main/java/com/google/devtools | while IFS="" read -r -d "" path; do + # If you add more replacements here, you must change the grep above! + # Only files containing /bin are taken into account. + # We default to python3 where possible. See also `postFixup` where + # python3 is added to $out/nix-support + substituteInPlace "$path" \ + --replace /bin/bash ${customBash}/bin/bash \ + --replace "/usr/bin/env bash" ${customBash}/bin/bash \ + --replace "/usr/bin/env python" ${python3}/bin/python \ + --replace /usr/bin/env ${coreutils}/bin/env \ + --replace /bin/true ${coreutils}/bin/true + done + + # bazel test runner include references to /bin/bash + substituteInPlace tools/build_rules/test_rules.bzl \ + --replace /bin/bash ${customBash}/bin/bash + + for i in $(find tools/cpp/ -type f) + do + substituteInPlace $i \ + --replace /bin/bash ${customBash}/bin/bash + done + + # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. + substituteInPlace scripts/bootstrap/compile.sh \ + --replace /bin/bash ${customBash}/bin/bash + + # add nix environment vars to .bazelrc + cat >> .bazelrc <<EOF + build --distdir=${distDir} + fetch --distdir=${distDir} + build --copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt="/g')" + build --host_copt="$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt="/g')" + build --linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt="-Wl,/g')" + build --host_linkopt="-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt="-Wl,/g')" + build --host_javabase='@local_jdk//:jdk' + build --host_java_toolchain='${javaToolchain}' + EOF + + # add the same environment vars to compile.sh + sed -e "/\$command \\\\$/a --copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_copt=\"$(echo $NIX_CFLAGS_COMPILE | sed -e 's/ /" --host_copt=\"/g')\" \\\\" \ + -e "/\$command \\\\$/a --linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_linkopt=\"-Wl,$(echo $NIX_LDFLAGS | sed -e 's/ /" --host_linkopt=\"-Wl,/g')\" \\\\" \ + -e "/\$command \\\\$/a --host_javabase='@local_jdk//:jdk' \\\\" \ + -e "/\$command \\\\$/a --host_java_toolchain='${javaToolchain}' \\\\" \ + -i scripts/bootstrap/compile.sh + + # This is necessary to avoid: + # "error: no visible @interface for 'NSDictionary' declares the selector + # 'initWithContentsOfURL:error:'" + # This can be removed when the apple_sdk is upgraded beyond 10.13+ + sed -i '/initWithContentsOfURL:versionPlistUrl/ { + N + s/error:nil\];/\];/ + }' tools/osx/xcode_locator.m + + # append the PATH with defaultShellPath in tools/bash/runfiles/runfiles.bash + echo "PATH=\$PATH:${defaultShellPath}" >> runfiles.bash.tmp + cat tools/bash/runfiles/runfiles.bash >> runfiles.bash.tmp + mv runfiles.bash.tmp tools/bash/runfiles/runfiles.bash + + patchShebangs . + ''; + in lib.optionalString stdenv.hostPlatform.isDarwin darwinPatches + + genericPatches; + + buildInputs = [ + buildJdk + python3 + ]; + + # when a command can’t be found in a bazel build, you might also + # need to add it to `defaultShellPath`. + nativeBuildInputs = [ + zip + python3 + unzip + makeWrapper + which + customBash + ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ]; + + # Bazel makes extensive use of symlinks in the WORKSPACE. + # This causes problems with infinite symlinks if the build output is in the same location as the + # Bazel WORKSPACE. This is why before executing the build, the source code is moved into a + # subdirectory. + # Failing to do this causes "infinite symlink expansion detected" + preBuildPhases = ["preBuildPhase"]; + preBuildPhase = '' + mkdir bazel_src + shopt -s dotglob extglob + mv !(bazel_src) bazel_src + ''; + + buildPhase = '' + # Increasing memory during compilation might be necessary. + # export BAZEL_JAVAC_OPTS="-J-Xmx2g -J-Xms200m" + ./bazel_src/compile.sh + ./bazel_src/scripts/generate_bash_completion.sh \ + --bazel=./bazel_src/output/bazel \ + --output=./bazel_src/output/bazel-complete.bash \ + --prepend=./bazel_src/scripts/bazel-complete-header.bash \ + --prepend=./bazel_src/scripts/bazel-complete-template.bash + ''; + + installPhase = '' + mkdir -p $out/bin + + # official wrapper scripts that searches for $WORKSPACE_ROOT/tools/bazel + # if it can’t find something in tools, it calls $out/bin/bazel-{version}-{os_arch} + # The binary _must_ exist with this naming if your project contains a .bazelversion + # file. + cp ./bazel_src/scripts/packages/bazel.sh $out/bin/bazel + mv ./bazel_src/output/bazel $out/bin/bazel-${version}-${system}-${arch} + + # shell completion files + mkdir -p $out/share/bash-completion/completions $out/share/zsh/site-functions + mv ./bazel_src/output/bazel-complete.bash $out/share/bash-completion/completions/bazel + cp ./bazel_src/scripts/zsh_completion/_bazel $out/share/zsh/site-functions/ + ''; + + doInstallCheck = true; + installCheckPhase = '' + export TEST_TMPDIR=$(pwd) + + hello_test () { + $out/bin/bazel test --distdir=${distDir} \ + --test_output=errors \ + --java_toolchain='${javaToolchain}' \ + examples/cpp:hello-success_test \ + examples/java-native/src/test/java/com/example/myproject:hello + } + + cd ./bazel_src + + # test whether $WORKSPACE_ROOT/tools/bazel works + + mkdir -p tools + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exit 1 + EOF + chmod +x tools/bazel + + # first call should fail if tools/bazel is used + ! hello_test + + cat > tools/bazel <<"EOF" + #!${runtimeShell} -e + exec "$BAZEL_REAL" "$@" + EOF + + # second call succeeds because it defers to $out/bin/bazel-{version}-{os_arch} + hello_test + ''; + + # Save paths to hardcoded dependencies so Nix can detect them. + postFixup = '' + mkdir -p $out/nix-support + echo "${customBash} ${defaultShellPath}" >> $out/nix-support/depends + # The templates get tar’d up into a .jar, + # so nix can’t detect python is needed in the runtime closure + # Some of the scripts explicitly depend on Python 2.7. Otherwise, we + # default to using python3. Therefore, both python27 and python3 are + # runtime dependencies. + echo "${python27}" >> $out/nix-support/depends + echo "${python3}" >> $out/nix-support/depends + '' + lib.optionalString stdenv.isDarwin '' + echo "${cctools}" >> $out/nix-support/depends + ''; + + dontStrip = true; + dontPatchELF = true; +} diff --git a/pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json b/pkgs/development/tools/build-managers/bazel/bazel_2/src-deps.json index 7517a8c1b95..7517a8c1b95 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel-latest/src-deps.json +++ b/pkgs/development/tools/build-managers/bazel/bazel_2/src-deps.json diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index e1d5b669982..8257f4eade9 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps."; - homepage = https://github.com/bazelbuild/buildtools; + homepage = "https://github.com/bazelbuild/buildtools"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog uri-canva marsam ]; platforms = platforms.all; diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 9e2fb13b0e7..bc7bb46cd5b 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { e.g. for YouCompleteMe. You just enter your development nix-shell and run `bear make`. It's not perfect, but it gets a long way. ''; - homepage = https://github.com/rizsotto/Bear; + homepage = "https://github.com/rizsotto/Bear"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.babariviere ]; diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix index ce656d4d78f..51ca62d0520 100644 --- a/pkgs/development/tools/build-managers/bloop/default.nix +++ b/pkgs/development/tools/build-managers/bloop/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://scalacenter.github.io/bloop/; + homepage = "https://scalacenter.github.io/bloop/"; license = licenses.asl20; description = "Bloop is 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."; maintainers = with maintainers; [ tomahna ]; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index ed1e6a174ce..944bbd9d4bb 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200212"; + version = "20200318"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "134ibplk5rj7s3ig2czbhqs89l45jl6vswg3cy6xzm0anz5smhb2"; + sha256 = "10rcgv0hd5axm2b41a5xaig6iqbpyqfp2q7llr7zc3mnbacwaz35"; }; nativeBuildInputs = [ getopt ]; diff --git a/pkgs/development/tools/build-managers/boot/default.nix b/pkgs/development/tools/build-managers/boot/default.nix index 3f086c912c1..09c1eada54b 100644 --- a/pkgs/development/tools/build-managers/boot/default.nix +++ b/pkgs/development/tools/build-managers/boot/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Build tooling for Clojure"; - homepage = https://boot-clj.com/; + homepage = "https://boot-clj.com/"; license = licenses.epl10; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ ragge ]; diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 88ebc5ebfae..804bdd76f67 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = https://cmake.org; + 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 ]; diff --git a/pkgs/development/tools/build-managers/colormake/default.nix b/pkgs/development/tools/build-managers/colormake/default.nix index f14aa4eea6e..99ed58324af 100644 --- a/pkgs/development/tools/build-managers/colormake/default.nix +++ b/pkgs/development/tools/build-managers/colormake/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { buildInputs = [perl]; src = fetchgit { - url = https://github.com/pagekite/Colormake.git; + url = "https://github.com/pagekite/Colormake.git"; rev = "66544f40d"; sha256 = "8e714c5540305d169989d9387dbac47b8b9fb2cfb424af7bcd412bfe684dc6d7"; }; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 5990208b645..cc44ac1a220 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -39,12 +39,12 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.23.0"; + version = "1.24.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "06jnmgvzdyxjpcmyj1804mlq6b842jvvbsngsamdy976sqws870g"; + sha256 = "0nkh4f6plamijwcfw536ydm0i04y74qmkh5l1nanyb8p0c3z3x0y"; }; propagatedBuildInputs = with newPython.pkgs; [ @@ -94,7 +94,7 @@ in newPython.pkgs.buildPythonApplication rec { ''; meta = with lib; { - homepage = https://conan.io; + homepage = "https://conan.io"; description = "Decentralized and portable C/C++ package manager"; license = licenses.mit; maintainers = with maintainers; [ HaoZeke ]; diff --git a/pkgs/development/tools/build-managers/doit/default.nix b/pkgs/development/tools/build-managers/doit/default.nix index 8fd2514c4a0..b906d64f0af 100644 --- a/pkgs/development/tools/build-managers/doit/default.nix +++ b/pkgs/development/tools/build-managers/doit/default.nix @@ -25,7 +25,7 @@ in python3Packages.buildPythonApplication { checkPhase = "py.test"; meta = with stdenv.lib; { - homepage = https://pydoit.org/; + homepage = "https://pydoit.org/"; description = "A task management & automation tool"; license = licenses.mit; longDescription = '' diff --git a/pkgs/development/tools/build-managers/drake/Gemfile.lock b/pkgs/development/tools/build-managers/drake/Gemfile.lock index 52060a0e625..466133010e0 100644 --- a/pkgs/development/tools/build-managers/drake/Gemfile.lock +++ b/pkgs/development/tools/build-managers/drake/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES drake BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/build-managers/drake/default.nix b/pkgs/development/tools/build-managers/drake/default.nix index 15fc682a315..2f753c82521 100644 --- a/pkgs/development/tools/build-managers/drake/default.nix +++ b/pkgs/development/tools/build-managers/drake/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A branch of Rake supporting automatic parallelizing of tasks"; - homepage = http://quix.github.io/rake/; + homepage = "http://quix.github.io/rake/"; maintainers = with maintainers; [ romildo manveru nicknovitski ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix index ef2b155482f..44c91e93609 100644 --- a/pkgs/development/tools/build-managers/dub/default.nix +++ b/pkgs/development/tools/build-managers/dub/default.nix @@ -67,10 +67,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Package and build manager for D applications and libraries"; - homepage = http://code.dlang.org/; + homepage = "https://code.dlang.org/"; license = licenses.mit; maintainers = with maintainers; [ ThomasMader ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } - diff --git a/pkgs/development/tools/build-managers/gn/default.nix b/pkgs/development/tools/build-managers/gn/default.nix index d8557bfcbc2..599e10af1a9 100644 --- a/pkgs/development/tools/build-managers/gn/default.nix +++ b/pkgs/development/tools/build-managers/gn/default.nix @@ -1,31 +1,37 @@ { stdenv, lib, fetchgit, darwin, writeText -, git, ninja, python3 }: +, ninja, python3 +}: let - rev = "64b846c96daeb3eaf08e26d8a84d8451c6cb712b"; - sha256 = "1v2kzsshhxn0ck6gd5w16gi2m3higwd9vkyylmsczxfxnw8skgpy"; + # Note: Please use the recommended version for Chromium, e.g.: + # https://git.archlinux.org/svntogit/packages.git/tree/trunk/chromium-gn-version.sh?h=packages/gn + rev = "fd3d768bcfd44a8d9639fe278581bd9851d0ce3a"; + revNum = "1718"; # git describe HEAD --match initial-commit | cut -d- -f3 + version = "2020-03-09"; + sha256 = "1asc14y8by7qcn10vbk467hvx93s30pif8r0brissl0sihsaqazr"; - shortRev = builtins.substring 0 7 rev; + revShort = builtins.substring 0 7 rev; lastCommitPosition = writeText "last_commit_position.h" '' #ifndef OUT_LAST_COMMIT_POSITION_H_ #define OUT_LAST_COMMIT_POSITION_H_ - #define LAST_COMMIT_POSITION "(${shortRev})" + #define LAST_COMMIT_POSITION_NUM ${revNum} + #define LAST_COMMIT_POSITION "${revNum} (${revShort})" #endif // OUT_LAST_COMMIT_POSITION_H_ ''; -in -stdenv.mkDerivation { - pname = "gn"; - version = "20190403"; +in stdenv.mkDerivation { + pname = "gn-unstable"; + inherit version; src = fetchgit { + # Note: The TAR-Archives (+archive/${rev}.tar.gz) are not deterministic! url = "https://gn.googlesource.com/gn"; inherit rev sha256; }; - nativeBuildInputs = [ ninja python3 git ]; + nativeBuildInputs = [ ninja python3 ]; buildInputs = lib.optionals stdenv.isDarwin (with darwin; with apple_sdk.frameworks; [ libobjc cctools @@ -49,8 +55,8 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = with lib; { - description = "A meta-build system that generates NinjaBuild files"; - homepage = https://gn.googlesource.com/gn; + description = "A meta-build system that generates build files for Ninja"; + homepage = "https://gn.googlesource.com/gn"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ stesie matthewbauer ]; 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 37467f225ea..a83281c4e96 100644 --- a/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { outputs = [ "out" "man" "info" ]; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/make/; + 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 f6fa53cfab0..b5215611c0c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -45,7 +45,7 @@ rec { between the flexibility of Ant and the convenience of a build-by-convention behavior. ''; - homepage = http://www.gradle.org/; + homepage = "http://www.gradle.org/"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix index 7135790c1bd..89e2b8d0cc6 100644 --- a/pkgs/development/tools/build-managers/icmake/default.nix +++ b/pkgs/development/tools/build-managers/icmake/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program maintenance (make) utility using a C-like grammar"; - homepage = https://fbb-git.gitlab.io/icmake/; + homepage = "https://fbb-git.gitlab.io/icmake/"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/build-managers/jam/default.nix b/pkgs/development/tools/build-managers/jam/default.nix index 2d94b48ba54..7d7502fad4b 100644 --- a/pkgs/development/tools/build-managers/jam/default.nix +++ b/pkgs/development/tools/build-managers/jam/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.perforce.com/resources/documentation/jam; + homepage = "https://www.perforce.com/resources/documentation/jam"; license = licenses.free; description = "Just Another Make"; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/tools/build-managers/kati/default.nix b/pkgs/development/tools/build-managers/kati/default.nix index 05834565f93..a7fced4482b 100644 --- a/pkgs/development/tools/build-managers/kati/default.nix +++ b/pkgs/development/tools/build-managers/kati/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An experimental GNU make clone"; - homepage = https://github.com/google/kati; + homepage = "https://github.com/google/kati"; platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ danielfullmer ]; diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 9538171474d..07a95539f8d 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://leiningen.org/; + homepage = "https://leiningen.org/"; description = "Project automation for Clojure"; license = stdenv.lib.licenses.epl10; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 2930cc79374..3ac8e641eb6 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -95,7 +95,7 @@ python3Packages.buildPythonApplication rec { isCross = stdenv.targetPlatform != stdenv.hostPlatform; meta = with lib; { - homepage = https://mesonbuild.com; + homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; license = licenses.asl20; maintainers = with maintainers; [ jtojnar mbe rasendubi ]; diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index f510752d385..09028789daa 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mk-2006-01-31"; src = fetchurl { - url = http://tarballs.nixos.org/mk-20060131.tar.gz; + url = "http://tarballs.nixos.org/mk-20060131.tar.gz"; sha256 = "0za8dp1211bdp4584xb59liqpww7w1ql0cmlv34p9y928nibcxsr"; }; builder = ./builder.sh; diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index e9bb3c27df9..aea215cc927 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -124,7 +124,7 @@ EOF meta = with stdenv.lib; { description = "Mono version of Microsoft Build Engine, the build platform for .NET, and Visual Studio"; - homepage = https://github.com/mono/msbuild; + homepage = "https://github.com/mono/msbuild"; license = licenses.mit; maintainers = with maintainers; [ jdanek ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index 9702a197903..efe9a495494 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { input files generated by a higher-level build system, and it is designed to run builds as fast as possible. ''; - homepage = https://ninja-build.org/; + homepage = "https://ninja-build.org/"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice bjornfor orivej ]; diff --git a/pkgs/development/tools/build-managers/rake/Gemfile.lock b/pkgs/development/tools/build-managers/rake/Gemfile.lock index 992a0bc8929..f89ceae9344 100644 --- a/pkgs/development/tools/build-managers/rake/Gemfile.lock +++ b/pkgs/development/tools/build-managers/rake/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES rake BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/build-managers/rake/default.nix b/pkgs/development/tools/build-managers/rake/default.nix index 2ce65b28fae..d2f0a264ba7 100644 --- a/pkgs/development/tools/build-managers/rake/default.nix +++ b/pkgs/development/tools/build-managers/rake/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A software task management and build automation tool"; - homepage = https://github.com/ruby/rake; + homepage = "https://github.com/ruby/rake"; license = with licenses; mit; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/build-managers/rebar/default.nix b/pkgs/development/tools/build-managers/rebar/default.nix index 6178a7368fc..39366c7a9ca 100644 --- a/pkgs/development/tools/build-managers/rebar/default.nix +++ b/pkgs/development/tools/build-managers/rebar/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/rebar/rebar; + homepage = "https://github.com/rebar/rebar"; description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix index 792daba791b..5c0fff134a7 100644 --- a/pkgs/development/tools/build-managers/rebar3/default.nix +++ b/pkgs/development/tools/build-managers/rebar3/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/rebar/rebar3; + homepage = "https://github.com/rebar/rebar3"; description = "Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases"; longDescription = '' diff --git a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix index ab6f505bff3..79707fc64db 100644 --- a/pkgs/development/tools/build-managers/redo-apenwarr/default.nix +++ b/pkgs/development/tools/build-managers/redo-apenwarr/default.nix @@ -57,7 +57,7 @@ meta = with lib; { description = "Smaller, easier, more powerful, and more reliable than make. An implementation of djb's redo."; - homepage = https://github.com/apenwarr/redo; + homepage = "https://github.com/apenwarr/redo"; maintainers = with maintainers; [ andrewchambers ck3d diff --git a/pkgs/development/tools/build-managers/redo-sh/default.nix b/pkgs/development/tools/build-managers/redo-sh/default.nix index 19ce0b44bf7..d8c6cdf1888 100644 --- a/pkgs/development/tools/build-managers/redo-sh/default.nix +++ b/pkgs/development/tools/build-managers/redo-sh/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Redo implementation in Bourne Shell"; - homepage = http://news.dieweltistgarnichtso.net/bin/redo-sh.html; + homepage = "http://news.dieweltistgarnichtso.net/bin/redo-sh.html"; license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ sternenseemann ]; diff --git a/pkgs/development/tools/build-managers/redo/default.nix b/pkgs/development/tools/build-managers/redo/default.nix index 97b82d204ad..a735a05dc5b 100644 --- a/pkgs/development/tools/build-managers/redo/default.nix +++ b/pkgs/development/tools/build-managers/redo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://jdebp.eu./Softwares/redo/; + 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 ]; diff --git a/pkgs/development/tools/build-managers/remake/default.nix b/pkgs/development/tools/build-managers/remake/default.nix index 4d43812ebe6..7d44bc74df8 100644 --- a/pkgs/development/tools/build-managers/remake/default.nix +++ b/pkgs/development/tools/build-managers/remake/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline ]; meta = { - homepage = http://bashdb.sourceforge.net/remake/; + homepage = "http://bashdb.sourceforge.net/remake/"; license = stdenv.lib.licenses.gpl3; description = "GNU Make with comprehensible tracing and a debugger"; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/development/tools/build-managers/samurai/default.nix b/pkgs/development/tools/build-managers/samurai/default.nix index 063a2c198da..f8b649e0409 100644 --- a/pkgs/development/tools/build-managers/samurai/default.nix +++ b/pkgs/development/tools/build-managers/samurai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "samurai"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "michaelforney"; repo = pname; rev = version; - sha256 = "1jsxfpwa6q893x18qlvpsiym29rrw5cj0k805wgmk2n57j9rw4f2"; + sha256 = "0k0amxpi3v9v68a8vc69r4b86xs12vhzm0wxd7f11vap1pnqz2cz"; }; makeFlags = [ "DESTDIR=" "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/development/tools/build-managers/sbt-extras/default.nix b/pkgs/development/tools/build-managers/sbt-extras/default.nix index 33e8e7cad5d..105012d1c8f 100644 --- a/pkgs/development/tools/build-managers/sbt-extras/default.nix +++ b/pkgs/development/tools/build-managers/sbt-extras/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "A more featureful runner for sbt, the simple/scala/standard build tool"; - homepage = https://github.com/paulp/sbt-extras; + homepage = "https://github.com/paulp/sbt-extras"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 5d2a713cfc4..2336900bf85 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.8"; + version = "1.3.9"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "0pcrbpsvccyxdwc7f8h87rkn0kalar0iypnh3gygw4c0fm4yvci7"; + sha256 = "06k4dyb5gjnqx70akjfb65hiafh683800bncbq33kmq77arfkm7c"; }; patchPhase = '' @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.scala-sbt.org/; + homepage = "https://www.scala-sbt.org/"; license = licenses.bsd3; description = "A build tool for Scala, Java and more"; maintainers = with maintainers; [ nequissimus ]; diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 740d04d853f..41ac16bed7a 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -1,25 +1,22 @@ { version, sha256 }: -{ stdenv, fetchurl, python2Packages }: +{ stdenv, fetchurl, python3Packages, python2Packages, scons }: -let name = "scons"; -in python2Packages.buildPythonApplication { - name = "${name}-${version}"; +python3Packages.buildPythonApplication rec { + pname = "scons"; + inherit version; src = fetchurl { - url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/scons/${pname}-${version}.tar.gz"; inherit sha256; }; - # Fix a regression in 3.0.0 (causes build errors for some packages) - patches = stdenv.lib.optional (version == "3.0.0") ./print-statements.patch; - setupHook = ./setup-hook.sh; + passthru.py2 = scons.override { python3Packages = python2Packages; }; + meta = with stdenv.lib; { - homepage = http://scons.org/; description = "An improved, cross-platform substitute for Make"; - license = licenses.mit; longDescription = '' SCons is an Open Source software construction tool. Think of SCons as an improved, cross-platform substitute for the classic @@ -28,6 +25,9 @@ in python2Packages.buildPythonApplication { SCons is an easier, more reliable and faster way to build software. ''; + homepage = "https://scons.org/"; + changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; + license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.primeos ]; }; diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 0afe2fbe928..19b092b86ba 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -1,12 +1,12 @@ -{ callPackage }: +{ callPackage, python2Packages }: let mkScons = args: callPackage (import ./common.nix args) { }; in { - scons_3_0_1 = mkScons { + scons_3_0_1 = (mkScons { version = "3.0.1"; sha256 = "0wzid419mlwqw9llrg8gsx4nkzhqy16m4m40r0xnh6cwscw5wir4"; - }; + }).override { python3Packages = python2Packages; }; scons_latest = mkScons { version = "3.1.2"; sha256 = "1yzq2gg9zwz9rvfn42v5jzl3g4qf1khhny6zfbi2hib55zvg60bq"; diff --git a/pkgs/development/tools/build-managers/scons/print-statements.patch b/pkgs/development/tools/build-managers/scons/print-statements.patch deleted file mode 100644 index a963bf78aba..00000000000 --- a/pkgs/development/tools/build-managers/scons/print-statements.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py -index 558e28f9..8fea9c4d 100644 ---- src/engine/SCons/Script/SConscript.py -+++ src/engine/SCons/Script/SConscript.py -@@ -5,8 +5,6 @@ - - """ - --from __future__ import print_function -- - # - # __COPYRIGHT__ - # diff --git a/pkgs/development/tools/build-managers/tup/default.nix b/pkgs/development/tools/build-managers/tup/default.nix index 9b44b30d777..709528b2ad3 100644 --- a/pkgs/development/tools/build-managers/tup/default.nix +++ b/pkgs/development/tools/build-managers/tup/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { algorithms to avoid doing unnecessary work. This means you can stay focused on your project rather than on your build system. ''; - homepage = http://gittup.org/tup/; + homepage = "http://gittup.org/tup/"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index 4c8fa3f234b..f3e49e7bc86 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Meta build system"; - homepage = https://waf.io; + homepage = "https://waf.io"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh index 38998e8db34..439350c3abc 100644 --- a/pkgs/development/tools/build-managers/wafHook/setup-hook.sh +++ b/pkgs/development/tools/build-managers/wafHook/setup-hook.sh @@ -11,17 +11,23 @@ wafConfigurePhase() { fi local flagsArray=( - @crossFlags@ "${flagsArray[@]}" $wafConfigureFlags "${wafConfigureFlagsArray[@]}" ${configureTargets:-configure} ) + if [ -z "${dontAddWafCrossFlags:-}" ]; then + flagsArray+=(@crossFlags@) + fi echoCmd 'configure flags' "${flagsArray[@]}" python "$wafPath" "${flagsArray[@]}" runHook postConfigure } +if [ -z "${dontUseWafConfigure-}" -a -z "${configurePhase-}" ]; then + configurePhase=wafConfigurePhase +fi + wafBuildPhase () { runHook preBuild @@ -41,6 +47,10 @@ wafBuildPhase () { runHook postBuild } +if [ -z "${dontUseWafBuild-}" -a -z "${buildPhase-}" ]; then + buildPhase=wafBuildPhase +fi + wafInstallPhase() { runHook preInstall @@ -51,7 +61,7 @@ wafInstallPhase() { local flagsArray=( $wafFlags ${wafFlagsArray[@]} $installFlags ${installFlagsArray[@]} - ${installTargets:-install} + ${installTargets:-install} ) echoCmd 'install flags' "${flagsArray[@]}" @@ -60,6 +70,6 @@ wafInstallPhase() { runHook postInstall } -configurePhase=wafConfigurePhase -buildPhase=wafBuildPhase -installPhase=wafInstallPhase +if [ -z "${dontUseWafInstall-}" -a -z "${installPhase-}" ]; then + installPhase=wafInstallPhase +fi diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index f48aa35852b..7fbb21ffb12 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "buildah"; - version = "1.14.3"; + version = "1.14.8"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "1qghlba8396gj9dfih8hg249gzwx0gpw9cysdw2vh8z52jhi5sx9"; + sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q"; }; outputs = [ "bin" "man" "out" ]; @@ -39,6 +39,6 @@ buildGoPackage rec { homepage = "https://buildah.io/"; changelog = "https://github.com/containers/buildah/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ]; + maintainers = with maintainers; [ Profpatsch ] ++ teams.podman.members; }; } diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 5d8d22fbfbb..042929e750a 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Concurrent, cache-efficient, and Dockerfile-agnostic builder toolkit"; - homepage = https://github.com/moby/buildkit; + homepage = "https://github.com/moby/buildkit"; license = licenses.asl20; maintainers = with maintainers; [ vdemeester marsam ]; }; diff --git a/pkgs/development/tools/cadre/Gemfile.lock b/pkgs/development/tools/cadre/Gemfile.lock index c14df9cffa6..5d22e69f31c 100644 --- a/pkgs/development/tools/cadre/Gemfile.lock +++ b/pkgs/development/tools/cadre/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES cadre (= 1.0.4) BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/cadre/default.nix b/pkgs/development/tools/cadre/default.nix index 77b49107e16..17b505bf2a9 100644 --- a/pkgs/development/tools/cadre/default.nix +++ b/pkgs/development/tools/cadre/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Toolkit to add Ruby development - in-editor coverage, libnotify of test runs"; - homepage = https://github.com/nyarly/cadre; + homepage = "https://github.com/nyarly/cadre"; license = licenses.mit; maintainers = with maintainers; [ nyarly nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 51cdbcef324..26dd3a895ae 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Easy flamegraphs for Rust projects and everything else, without Perl or pipes <3"; - homepage = https://github.com/ferrous-systems/flamegraph; + homepage = "https://github.com/ferrous-systems/flamegraph"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ killercup ]; platforms = platforms.all; diff --git a/pkgs/development/tools/cargo-web/default.nix b/pkgs/development/tools/cargo-web/default.nix index 5b1e91dda2a..4e6f8fbc71a 100644 --- a/pkgs/development/tools/cargo-web/default.nix +++ b/pkgs/development/tools/cargo-web/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A Cargo subcommand for the client-side Web"; - homepage = https://github.com/koute/cargo-web; + homepage = "https://github.com/koute/cargo-web"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ kevincox ]; platforms = platforms.all; diff --git a/pkgs/development/tools/casperjs/default.nix b/pkgs/development/tools/casperjs/default.nix index 8a1d81acaaa..80786a10f5f 100644 --- a/pkgs/development/tools/casperjs/default.nix +++ b/pkgs/development/tools/casperjs/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation { syntactic sugar for doing common tasks. ''; - homepage = http://casperjs.org; + homepage = "http://casperjs.org"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/development/tools/cbor-diag/Gemfile.lock b/pkgs/development/tools/cbor-diag/Gemfile.lock index 9f9a160c587..8bebc81ebd9 100644 --- a/pkgs/development/tools/cbor-diag/Gemfile.lock +++ b/pkgs/development/tools/cbor-diag/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES cbor-diag BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/cbor-diag/default.nix b/pkgs/development/tools/cbor-diag/default.nix index 7942ff52645..118197af2d1 100644 --- a/pkgs/development/tools/cbor-diag/default.nix +++ b/pkgs/development/tools/cbor-diag/default.nix @@ -23,7 +23,7 @@ bundlerApp { meta = with lib; { description = "CBOR diagnostic utilities"; - homepage = https://github.com/cabo/cbor-diag; + homepage = "https://github.com/cabo/cbor-diag"; license = with licenses; asl20; maintainers = with maintainers; [ fdns nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/ccloud-cli/default.nix b/pkgs/development/tools/ccloud-cli/default.nix index 7fa53029772..abf5845b7e9 100644 --- a/pkgs/development/tools/ccloud-cli/default.nix +++ b/pkgs/development/tools/ccloud-cli/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Confluent Cloud CLI"; - homepage = https://docs.confluent.io/current/cloud/cli/index.html; + homepage = "https://docs.confluent.io/current/cloud/cli/index.html"; license = licenses.unfree; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/cddl/Gemfile.lock b/pkgs/development/tools/cddl/Gemfile.lock index cd4e1407637..796a7743cac 100644 --- a/pkgs/development/tools/cddl/Gemfile.lock +++ b/pkgs/development/tools/cddl/Gemfile.lock @@ -27,4 +27,4 @@ DEPENDENCIES cddl BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/cddl/default.nix b/pkgs/development/tools/cddl/default.nix index 60e7edc7520..8fdae4b1c44 100644 --- a/pkgs/development/tools/cddl/default.nix +++ b/pkgs/development/tools/cddl/default.nix @@ -10,7 +10,7 @@ bundlerApp { meta = with lib; { description = "A parser, generator, and validator for CDDL"; - homepage = https://rubygems.org/gems/cddl; + homepage = "https://rubygems.org/gems/cddl"; license = with licenses; mit; maintainers = with maintainers; [ fdns nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/check/default.nix b/pkgs/development/tools/check/default.nix index 9ae1026c858..107b8b58024 100644 --- a/pkgs/development/tools/check/default.nix +++ b/pkgs/development/tools/check/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with lib; { description = "A set of utilities for checking Go sources."; - homepage = https://gitlab.com/opennota/check; + homepage = "https://gitlab.com/opennota/check"; license = licenses.gpl3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/chefdk/Gemfile.lock b/pkgs/development/tools/chefdk/Gemfile.lock index 47346c1bc45..ce23018bd73 100644 --- a/pkgs/development/tools/chefdk/Gemfile.lock +++ b/pkgs/development/tools/chefdk/Gemfile.lock @@ -723,4 +723,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/chefdk/default.nix b/pkgs/development/tools/chefdk/default.nix index 7f52dec229a..1a5f6c8626a 100644 --- a/pkgs/development/tools/chefdk/default.nix +++ b/pkgs/development/tools/chefdk/default.nix @@ -12,7 +12,7 @@ bundlerEnv { meta = with lib; { description = "A streamlined development and deployment workflow for Chef platform"; - homepage = https://downloads.chef.io/chef-dk/; + homepage = "https://downloads.chef.io/chef-dk/"; license = licenses.asl20; maintainers = with maintainers; [ offline nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/chit/default.nix b/pkgs/development/tools/chit/default.nix index 9859739a1df..c7a8483719f 100644 --- a/pkgs/development/tools/chit/default.nix +++ b/pkgs/development/tools/chit/default.nix @@ -36,7 +36,7 @@ buildRustPackage rec { * Should i use this crate? * How mature is it? ''; - homepage = https://github.com/peterheesterman/chit; + homepage = "https://github.com/peterheesterman/chit"; license = licenses.mit; maintainers = [ maintainers.lilyball ]; platforms = platforms.all; diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 8317473570d..769c30578c9 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ pname = "clj-kondo"; - version = "2019.12.14"; + version = "2020.03.20"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "1mprwqc5ydqn2wkssrj2g3wbpjss7flv584wss9j0jjfgy7jc4s1"; + sha256 = "05z80cdzk8aw3j0nxfynzwpb9hhpbl54bbrv18dpqj5dj893mbgm"; }; dontUnpack = true; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec{ meta = with lib; { description = "A linter for Clojure code that sparks joy."; - homepage = https://github.com/borkdude/clj-kondo; + homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; platforms = graalvm8.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen ]; diff --git a/pkgs/development/tools/clog-cli/default.nix b/pkgs/development/tools/clog-cli/default.nix index 23c0fc06b6a..6d843ead24e 100644 --- a/pkgs/development/tools/clog-cli/default.nix +++ b/pkgs/development/tools/clog-cli/default.nix @@ -17,7 +17,7 @@ buildRustPackage rec { meta = { description = "Generate changelogs from local git metadata"; - homepage = https://github.com/clog-tool/clog-cli; + homepage = "https://github.com/clog-tool/clog-cli"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = [stdenv.lib.maintainers.nthorne]; diff --git a/pkgs/development/tools/cloudflare-wrangler/default.nix b/pkgs/development/tools/cloudflare-wrangler/default.nix index a13433e784b..5a05b7ca7c0 100644 --- a/pkgs/development/tools/cloudflare-wrangler/default.nix +++ b/pkgs/development/tools/cloudflare-wrangler/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cloudflare-wrangler"; - version = "1.8.1"; + version = "1.8.4"; src = fetchFromGitHub { owner = "cloudflare"; repo = "wrangler"; rev = "v${version}"; - sha256 = "0lh06cnjddmy5h5xvbkg8f97vw2v0wr5fi7vrs3nnidiz7x4rsja"; + sha256 = "1lllam0zgr26fbg04hnw1sy35grwrs4br8cx4r9vqjf113cyr80x"; }; - cargoSha256 = "1q7vilh0bynhdz5bbpig5ibaqvk2153n07gmc715qb80w92sjw7w"; + cargoSha256 = "0yvnqp15iqv142vcgsmcad07r5nnp417c0iqa9qgyzn39ssgpn0r"; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index be39f6e3667..ab746c9c530 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -38,7 +38,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "The official command line client for Cloud Foundry"; - homepage = https://github.com/cloudfoundry/cli; + 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/development/tools/compass/Gemfile.lock b/pkgs/development/tools/compass/Gemfile.lock index 43790d9e7a1..ecae8fdd7f6 100644 --- a/pkgs/development/tools/compass/Gemfile.lock +++ b/pkgs/development/tools/compass/Gemfile.lock @@ -28,4 +28,4 @@ DEPENDENCIES compass! BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix index 516900c2067..f8a2aad14f4 100644 --- a/pkgs/development/tools/compass/default.nix +++ b/pkgs/development/tools/compass/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain"; - homepage = https://github.com/Compass/compass; + homepage = "https://github.com/Compass/compass"; license = with licenses; mit; maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 76e53fd73b2..133526c569a 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -1,26 +1,24 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "conftest"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; rev = "v${version}"; - sha256 = "189as930fksyqk3z636gyqdym1bqm522mya7msfnhzpnh46k5jvd"; + sha256 = "0ial1zs5aqcwza813ny6zqn9ybq6ibrqjmaccwbbam1k9f5rplqv"; }; - modSha256 = "0gm08lrlaxc7504mapjdm3c4mwlzybnqxfwkkh6fawzvmd9sqddr"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "17j5fhgwfpyg9r7a5g9rmvkaz510xx9s4mbl1cmyzysvddc6f5wp"; buildFlagsArray = '' -ldflags= -X main.version=${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Write tests against structured configuration data"; homepage = "https://github.com/instrumenta/conftest"; license = licenses.asl20; diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 9aaf886ef06..0e6c58aa7ba 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = { description = "Convert a Container Linux Config into Ignition"; license = licenses.asl20; - homepage = https://github.com/coreos/container-linux-config-transpiler; + homepage = "https://github.com/coreos/container-linux-config-transpiler"; maintainers = with maintainers; [elijahcaine]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 7e86c93b9bd..9182c889598 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -40,7 +40,7 @@ buildGoPackage rec { build jobs, reporting back the status code and output log of the job, and uploading the job's artifacts. ''; - homepage = https://buildkite.com/docs/agent; + homepage = "https://buildkite.com/docs/agent"; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index d9f7237d289..1d50e4ff6d5 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -38,7 +38,7 @@ buildGoPackage { build jobs, reporting back the status code and output log of the job, and uploading the job's artifacts. ''; - homepage = https://buildkite.com/docs/agent; + homepage = "https://buildkite.com/docs/agent"; license = licenses.mit; maintainers = with maintainers; [ pawelpacana zimbatm rvl ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/pkgs/development/tools/continuous-integration/drone-cli/default.nix index c6e4878d52c..a3df81d2605 100644 --- a/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: -buildGoModule rec { +let version = "1.2.1"; +in buildGoModule rec { + inherit version; pname = "drone-cli"; - version = "1.2.1"; + revision = "v${version}"; + goPackagePath = "github.com/drone/drone-cli"; modSha256 = "0g0vq4vm2hy00r2gjsrhg57xv9sldlqix3wzimiqdli085bcz46b"; @@ -13,12 +16,10 @@ buildGoModule rec { src = fetchFromGitHub { owner = "drone"; repo = "drone-cli"; - rev = "v${version}"; + rev = revision; sha256 = "19icihi5nxcafxlh4w61nl4cd0dhvik9zl8g4gqmazikjqsjms2j"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { maintainers = with maintainers; [ bricewge ]; license = licenses.asl20; diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/development/tools/continuous-integration/drone/default.nix index e1f0a8de3b8..05257f65af5 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, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { name = "drone.io-${version}"; @@ -14,8 +14,6 @@ buildGoModule rec { sha256 = "05cgd72qyss836fby0adhrm5p8g7639psk2yslhg6pmz0cqfbq9m"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { maintainers = with maintainers; [ elohmeier vdemeester ]; license = licenses.asl20; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 4093e7e0172..483b8e6b30c 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -1,17 +1,17 @@ -{ buildGoModule, fetchFromGitHub, stdenv, writeText, Security }: +{ buildGoModule, fetchFromGitHub, lib, writeText }: buildGoModule rec { pname = "fly"; - version = "5.8.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0ji3jya4b2b4l6dlvydh3k2jfh6kkhii23d6rmi49ypydhn1qmgj"; + sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq"; }; - modSha256 = "14wwspp8x6i4ry23bz8b08mfyzrwc9m7clrylxzr8j67yhg5kw6v"; + modSha256 = "1wiyfii4rmj3rp8ls0ill0sjpnpjz7l3q5fzrscm8ap1qn90gvzg"; subPackages = [ "fly" ]; @@ -20,8 +20,6 @@ buildGoModule rec { -X github.com/concourse/concourse.Version=${version} ''; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # The fly.bash file included with this derivation can be replaced by a # call to `fly completion bash` once the `completion` subcommand has # made it into a release. Similarly, `fly completion zsh` will provide @@ -30,7 +28,7 @@ buildGoModule rec { install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A command line interface to Concourse CI"; homepage = "https://concourse-ci.org"; license = licenses.asl20; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index df1cef6f3f8..1d94408bd21 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -44,7 +44,7 @@ buildGoPackage rec { meta = with lib; { description = "GitLab Runner the continuous integration executor of GitLab"; license = licenses.mit; - homepage = https://about.gitlab.com/gitlab-ci/; + homepage = "https://about.gitlab.com/gitlab-ci/"; platforms = platforms.unix ++ platforms.darwin; maintainers = with maintainers; [ bachp zimbatm globin ]; }; diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index adee52d967e..7cefd896f48 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; - homepage = http://www.go.cd; + homepage = "http://www.go.cd"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ grahamc swarren83 ]; diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index c0fabdeb5a1..d23bc9d8d8e 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; - homepage = http://www.go.cd; + homepage = "http://www.go.cd"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ grahamc swarren83 ]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 0fe4de98f1d..6baa91f44c9 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.204.5"; + version = "2.222.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "17437wshci2fyvvaznzk738m2npqa61w16aw5jslw2ifnyjkziwl"; + sha256 = "0glmx8xi99mbfr84hi4sn36qkxw00rfn8wlz5n674ygbdj1vnv2s"; }; buildCommand = '' @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; - homepage = https://jenkins-ci.org; + homepage = "https://jenkins-ci.org"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ coconnor fpletz earldouglas ]; diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix index b7772dd659f..2dcc68a09f2 100644 --- a/pkgs/development/tools/corgi/default.nix +++ b/pkgs/development/tools/corgi/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { longDescription = '' Corgi is a command-line tool that helps with your repetitive command usages by organizing them into reusable snippet. ''; - homepage = https://github.com/DrakeW/corgi; + homepage = "https://github.com/DrakeW/corgi"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/corundum/Gemfile.lock b/pkgs/development/tools/corundum/Gemfile.lock index 40ad1948394..596a689e3a2 100644 --- a/pkgs/development/tools/corundum/Gemfile.lock +++ b/pkgs/development/tools/corundum/Gemfile.lock @@ -53,4 +53,4 @@ DEPENDENCIES corundum (= 0.6.2) BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/development/tools/corundum/default.nix b/pkgs/development/tools/corundum/default.nix index 0d1c6985663..3497f709964 100644 --- a/pkgs/development/tools/corundum/default.nix +++ b/pkgs/development/tools/corundum/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Tool and libraries for maintaining Ruby gems."; - homepage = https://github.com/nyarly/corundum; + homepage = "https://github.com/nyarly/corundum"; license = licenses.mit; maintainers = with maintainers; [ nyarly nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index 41303439d76..18f543b3435 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://get-coursier.io/; + homepage = "https://get-coursier.io/"; description = "A Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; diff --git a/pkgs/development/tools/cppclean/default.nix b/pkgs/development/tools/cppclean/default.nix index 85d49667a9a..283d9845dfa 100644 --- a/pkgs/development/tools/cppclean/default.nix +++ b/pkgs/development/tools/cppclean/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Finds problems in C++ source that slow development of large code bases"; - homepage = https://github.com/myint/cppclean; + homepage = "https://github.com/myint/cppclean"; license = licenses.asl20; maintainers = with maintainers; [ nthorne ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/cucumber/Gemfile.lock b/pkgs/development/tools/cucumber/Gemfile.lock index a9a2d073de4..82a97214493 100644 --- a/pkgs/development/tools/cucumber/Gemfile.lock +++ b/pkgs/development/tools/cucumber/Gemfile.lock @@ -31,4 +31,4 @@ DEPENDENCIES cucumber BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/cucumber/default.nix b/pkgs/development/tools/cucumber/default.nix index 15db6013deb..fdd77be07f7 100644 --- a/pkgs/development/tools/cucumber/default.nix +++ b/pkgs/development/tools/cucumber/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A tool for executable specifications"; - homepage = https://cucumber.io/; + homepage = "https://cucumber.io/"; license = with licenses; mit; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 4950e885e25..039344cabc0 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -1,18 +1,16 @@ -{ buildGoModule, fetchgit, stdenv, Security }: +{ buildGoModule, fetchgit, stdenv }: buildGoModule rec { pname = "cue"; - version = "0.0.15"; + version = "0.1.0"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "0mipzci2zjp6yh4lxg9jrdxn03ska188zg3jl6g1zr8rn0ry274h"; + sha256 = "0ndax200vqjb2v6v32s9sl8v961nhgnbkb5i4qww5hd8mn9l0c5s"; }; - modSha256 = "04dapx75zwi8cv1pj3c6266znrhwihv3df4izm3gjk34r2i07q6s"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0n9idgishlp4gaq12kngi42rq9rnkas7g6cj7jpkk8p30c74ki6z"; subPackages = [ "cmd/cue" ]; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 57aa9c654d7..14673cb40c8 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dbmate"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Database migration tool"; - homepage = https://github.com/amacneil/dbmate; + homepage = "https://github.com/amacneil/dbmate"; license = licenses.mit; maintainers = [ maintainers.manveru ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/database/dbmate/deps.nix b/pkgs/development/tools/database/dbmate/deps.nix new file mode 100644 index 00000000000..97bfc10b20a --- /dev/null +++ b/pkgs/development/tools/database/dbmate/deps.nix @@ -0,0 +1,84 @@ +# 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 ae511824569..87b23d10f49 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''Run tests on an isolated, temporary PostgreSQL database.''; license = licenses.isc; - homepage = http://ephemeralpg.org/; + homepage = "http://ephemeralpg.org/"; platforms = platforms.all; maintainers = with maintainers; [ hrdinka ]; }; diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 890ef73a73f..d66d54ef45b 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.8.7"; + version = "3.8.8"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0gs3pmzyx2bz6af2fr5jla3s33vfaw64pgahfvj5bgpj6d7vx1wg"; + sha256 = "1pl9wgnwykvbnis0ndym0lbsj6a7lvpghrc98cw2hdnp5dglxjjl"; }; buildInputs = [ jre makeWrapper ]; diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index 8881bce1a38..17f7e2c7e49 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "litecli"; - version = "1.1.0"; + version = "1.3.2"; # Python 2 won't have prompt_toolkit 2.x.x # See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408 @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0cqil2cmnbw0jvb14v6kbr7l9yarfgy253cbb8v9znp0l4qfs7ra"; + sha256 = "0bfx7fw6jnkqxa82xvd10yx1w2wbmrrqxwbh4anp5x9wnl91a9lp"; }; propagatedBuildInputs = with python3Packages; [ @@ -30,7 +30,8 @@ python3Packages.buildPythonApplication rec { preCheck = '' export XDG_CONFIG_HOME=$TMP # add missing file - echo "litecli is awesome!" > tests/test.txt + mkdir -p tests/data + echo -e "t1,11\nt2,22\n" > tests/data/import_data.csv ''; meta = with lib; { @@ -38,7 +39,7 @@ python3Packages.buildPythonApplication rec { longDescription = '' A command-line client for SQLite databases that has auto-completion and syntax highlighting. ''; - homepage = https://litecli.com; + homepage = "https://litecli.com"; license = licenses.bsd3; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/development/tools/database/pgcli/default.nix b/pkgs/development/tools/database/pgcli/default.nix index 4038ad7010f..01f72c47a45 100644 --- a/pkgs/development/tools/database/pgcli/default.nix +++ b/pkgs/development/tools/database/pgcli/default.nix @@ -37,7 +37,7 @@ buildPythonApplication rec { Rich command-line interface for PostgreSQL with auto-completion and syntax highlighting. ''; - homepage = https://pgcli.com; + homepage = "https://pgcli.com"; license = licenses.bsd3; maintainers = with maintainers; [ dywedir ]; }; diff --git a/pkgs/development/tools/database/pyrseas/default.nix b/pkgs/development/tools/database/pyrseas/default.nix index a83b5a21944..c86a0f6df8b 100644 --- a/pkgs/development/tools/database/pyrseas/default.nix +++ b/pkgs/development/tools/database/pyrseas/default.nix @@ -38,7 +38,7 @@ pythonPackages.buildPythonApplication { ]; meta = { description = "A declarative language to describe PostgreSQL databases"; - homepage = https://perseas.github.io/; + homepage = "https://perseas.github.io/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ pmeunier ]; }; diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix index 38be9089559..1e40bc52b4f 100644 --- a/pkgs/development/tools/database/sqldeveloper/default.nix +++ b/pkgs/development/tools/database/sqldeveloper/default.nix @@ -76,7 +76,7 @@ in a reports interface, a complete data modeling solution, and a migration platform for moving your 3rd party databases to Oracle. ''; - homepage = http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/; + homepage = "http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ ardumont ma27 ]; diff --git a/pkgs/development/tools/database/sqlite-web/default.nix b/pkgs/development/tools/database/sqlite-web/default.nix index a1b8ece1236..9a9314fde9b 100644 --- a/pkgs/development/tools/database/sqlite-web/default.nix +++ b/pkgs/development/tools/database/sqlite-web/default.nix @@ -4,11 +4,11 @@ python3Packages.buildPythonApplication rec { pname = "sqlite-web"; - version = "0.3.5"; + version = "0.3.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "9e0c8938434b0129423544162d4ca6975abf7042c131445f79661a4b9c885d47"; + sha256 = "17pymadm063358nji70xzma64zkfv26c3pai5i1whsfp9ahqzasg"; }; propagatedBuildInputs = with python3Packages; [ flask peewee pygments ]; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Web-based SQLite database browser"; - homepage = https://github.com/coleifer/sqlite-web; + homepage = "https://github.com/coleifer/sqlite-web"; license = licenses.mit; maintainers = [ maintainers.costrouc ]; }; diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix index 3a4425d436a..f8a8ee70e9d 100644 --- a/pkgs/development/tools/database/sqlitebrowser/default.nix +++ b/pkgs/development/tools/database/sqlitebrowser/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { meta = with lib; { description = "DB Browser for SQLite"; - homepage = https://sqlitebrowser.org/; + homepage = "https://sqlitebrowser.org/"; license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 717dc2d7951..024615a7f65 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Universal SQL Client"; - homepage = http://squirrel-sql.sourceforge.net/; + homepage = "http://squirrel-sql.sourceforge.net/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ khumba ]; diff --git a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix index 3c9f9c54dd3..166cda52a3d 100644 --- a/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix +++ b/pkgs/development/tools/database/timescaledb-parallel-copy/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Bulk, parallel insert of CSV records into PostgreSQL"; - homepage = https://github.com/timescale/timescaledb-parallel-copy; + homepage = "https://github.com/timescale/timescaledb-parallel-copy"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/tools/database/timescaledb-tune/default.nix b/pkgs/development/tools/database/timescaledb-tune/default.nix index 9dd92317373..da5ba3fea64 100644 --- a/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A tool for tuning your TimescaleDB for better performance"; - homepage = https://github.com/timescale/timescaledb-tune; + homepage = "https://github.com/timescale/timescaledb-tune"; license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix index 685b9d2f13d..55f888056cf 100644 --- a/pkgs/development/tools/dcadec/default.nix +++ b/pkgs/development/tools/dcadec/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DTS Coherent Acoustics decoder with support for HD extensions"; maintainers = with maintainers; [ edwtjo ]; - homepage = https://github.com/foo86/dcadec; + homepage = "https://github.com/foo86/dcadec"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/deadcode/default.nix b/pkgs/development/tools/deadcode/default.nix index 7d106e5a251..44c824b2c1e 100644 --- a/pkgs/development/tools/deadcode/default.nix +++ b/pkgs/development/tools/deadcode/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with lib; { description = "deadcode is a very simple utility which detects unused declarations in a Go package."; - homepage = https://github.com/remyoudompheng/go-misc/tree/master/deadcode; + homepage = "https://github.com/remyoudompheng/go-misc/tree/master/deadcode"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index db232561add..4625c79767f 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://deis.io; + homepage = "https://deis.io"; description = "A command line utility used to interact with the Deis open source PaaS."; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/tools/deisctl/default.nix b/pkgs/development/tools/deisctl/default.nix index a344bcf91d8..057a8b87a0f 100644 --- a/pkgs/development/tools/deisctl/default.nix +++ b/pkgs/development/tools/deisctl/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://deis.io; + homepage = "https://deis.io"; description = "A command-line utility used to provision and operate a Deis cluster."; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/tools/delve/default.nix b/pkgs/development/tools/delve/default.nix index fc38f3edb47..33eda13b604 100644 --- a/pkgs/development/tools/delve/default.nix +++ b/pkgs/development/tools/delve/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "debugger for the Go programming language"; - homepage = https://github.com/derekparker/delve; + homepage = "https://github.com/derekparker/delve"; maintainers = with maintainers; [ vdemeester ]; license = licenses.mit; platforms = [ "x86_64-linux" ] ++ platforms.darwin; diff --git a/pkgs/development/tools/dep/default.nix b/pkgs/development/tools/dep/default.nix index d807e79f9ed..8d7f3b213ca 100644 --- a/pkgs/development/tools/dep/default.nix +++ b/pkgs/development/tools/dep/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); meta = with stdenv.lib; { - homepage = https://github.com/golang/dep; + homepage = "https://github.com/golang/dep"; description = "Go dependency management tool"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index dcdb1053cf7..86a1ac6d6b1 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -28,7 +28,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Convert `Gopkg.lock` files from golang dep into `deps.nix`"; license = licenses.bsd3; - homepage = https://github.com/nixcloud/dep2nix; + homepage = "https://github.com/nixcloud/dep2nix"; maintainers = [ maintainers.mic92 ]; }; } diff --git a/pkgs/development/tools/detect-secrets/default.nix b/pkgs/development/tools/detect-secrets/default.nix index 6e9e1596b13..1e42a32f7ca 100644 --- a/pkgs/development/tools/detect-secrets/default.nix +++ b/pkgs/development/tools/detect-secrets/default.nix @@ -27,7 +27,7 @@ buildPythonApplication rec { meta = with lib; { description = "An enterprise friendly way of detecting and preventing secrets in code"; - homepage = https://github.com/Yelp/detect-secrets; + homepage = "https://github.com/Yelp/detect-secrets"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix index f3e63c53789..1e48ecde763 100644 --- a/pkgs/development/tools/devd/default.nix +++ b/pkgs/development/tools/devd/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A local webserver for developers"; - homepage = https://github.com/cortesi/devd; + homepage = "https://github.com/cortesi/devd"; license = licenses.mit; maintainers = with maintainers; [ brianhicks ]; platforms = platforms.all; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index dc105a84687..50cc41cd50f 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -62,7 +62,7 @@ buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; meta = with stdenv.lib; { - homepage = http://doc.devpi.net; + homepage = "http://doc.devpi.net"; description = "Client for devpi, a pypi index server and packaging meta tool"; license = licenses.mit; maintainers = with maintainers; [ lewo makefu ]; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 4c8d0276d1a..59a4a6d0030 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib;{ - homepage = http://doc.devpi.net; + homepage = "http://doc.devpi.net"; description = "Github-style pypi index server and packaging meta tool"; license = licenses.mit; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/development/tools/devtodo/default.nix b/pkgs/development/tools/devtodo/default.nix index 4396f295340..f4a974da347 100644 --- a/pkgs/development/tools/devtodo/default.nix +++ b/pkgs/development/tools/devtodo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://swapoff.org/devtodo1.html; + homepage = "https://swapoff.org/devtodo1.html"; description = "A hierarchical command-line task manager"; license = licenses.gpl2; maintainers = [ maintainers.woffs ]; diff --git a/pkgs/development/tools/diesel-cli/default.nix b/pkgs/development/tools/diesel-cli/default.nix index 5c59703af3e..6eac1af512b 100644 --- a/pkgs/development/tools/diesel-cli/default.nix +++ b/pkgs/development/tools/diesel-cli/default.nix @@ -69,7 +69,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Database tool for working with Rust projects that use Diesel"; - homepage = https://github.com/diesel-rs/diesel/tree/master/diesel_cli; + homepage = "https://github.com/diesel-rs/diesel/tree/master/diesel_cli"; license = with licenses; [ mit asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix index 7db4db24689..dbf00ea8e05 100644 --- a/pkgs/development/tools/distgen/default.nix +++ b/pkgs/development/tools/distgen/default.nix @@ -2,11 +2,11 @@ python3.pkgs.buildPythonApplication rec { pname = "distgen"; - version = "1.4"; + version = "1.5"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "13k940xgpci754gmmnhz3j5rfvlg9hdh21j4yjh8dlr6g88qjc1x"; + sha256 = "08f9rw5irgv0gw7jizk5f9csn0yhrdnb84k40px1zbypsylvr5c5"; }; checkInputs = with python3.pkgs; [ diff --git a/pkgs/development/tools/dive/default.nix b/pkgs/development/tools/dive/default.nix index 91889e80c04..b942e0c9199 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, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, btrfs-progs, gpgme, lvm2 }: buildGoModule rec { pname = "dive"; @@ -15,14 +15,13 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with stdenv.lib; { description = "A tool for exploring each layer in a docker image"; - homepage = https://github.com/wagoodman/dive; + homepage = "https://github.com/wagoodman/dive"; license = licenses.mit; maintainers = with maintainers; [ marsam spacekookie ]; }; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 2aead3940ad..f84167afca8 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -1,34 +1,43 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "doctl"; - version = "${major}.${minor}.${patch}"; - major = "1"; - minor = "35"; - patch = "0"; + version = "1.40.0"; + goPackagePath = "github.com/digitalocean/doctl"; - excludedPackages = ''\(doctl-gen-doc\|install-doctl\|release-doctl\)''; - buildFlagsArray = let t = goPackagePath; in '' - -ldflags= - -X ${t}.Major=${major} - -X ${t}.Minor=${minor} - -X ${t}.Patch=${patch} - -X ${t}.Label=release - ''; + subPackages = [ "cmd/doctl" ]; + + buildFlagsArray = '' + -ldflags= + -X ${goPackagePath}.Major=${lib.versions.major version} + -X ${goPackagePath}.Minor=${lib.versions.minor version} + -X ${goPackagePath}.Patch=${lib.versions.patch version} + -X ${goPackagePath}.Label=release + ''; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + export HOME=$(mktemp -d) # attempts to write to /homeless-shelter + for shell in bash fish zsh; do + $bin/bin/doctl completion $shell > doctl.$shell + installShellCompletion doctl.$shell + done + ''; src = fetchFromGitHub { - owner = "digitalocean"; - repo = "doctl"; - rev = "v${version}"; - sha256 = "1blg4xd01vvr8smpii60jlk7rg1cg64115azixw9q022f7cnfiyw"; + owner = "digitalocean"; + repo = "doctl"; + rev = "v${version}"; + sha256 = "1x8rr3707mmbfnjn3ck0953xkkrfq5r8zflbxpkqlfz9k978z835"; }; - meta = { + meta = with lib; { description = "A command line tool for DigitalOcean services"; - homepage = https://github.com/digitalocean/doctl; - license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.siddharthist ]; + homepage = "https://github.com/digitalocean/doctl"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = [ maintainers.siddharthist ]; }; } diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 9152230e388..d7ad57d847c 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://doxygen.nl/; + homepage = "http://doxygen.nl/"; description = "Source code documentation generator tool"; longDescription = '' diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 605bb3f18c6..8d4480945bd 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -44,7 +44,7 @@ buildPythonApplication rec { MkDocs can also be used to generate general-purpose Websites. ''; - homepage = http://mkdocs.org/; + homepage = "http://mkdocs.org/"; license = lib.licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.rkoe ]; diff --git a/pkgs/development/tools/drip/default.nix b/pkgs/development/tools/drip/default.nix index 1b559df8ef6..2a7d2c6626b 100644 --- a/pkgs/development/tools/drip/default.nix +++ b/pkgs/development/tools/drip/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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; + homepage = "https://github.com/ninjudd/drip"; platforms = platforms.linux; maintainers = [ maintainers.rybern ]; }; diff --git a/pkgs/development/tools/drm_info/default.nix b/pkgs/development/tools/drm_info/default.nix index a97526f8538..9243bbb161b 100644 --- a/pkgs/development/tools/drm_info/default.nix +++ b/pkgs/development/tools/drm_info/default.nix @@ -1,21 +1,21 @@ { stdenv, fetchFromGitHub -, libdrm, json_c +, libdrm, json_c, pciutils , meson, ninja, pkgconfig }: stdenv.mkDerivation rec { pname = "drm_info"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "ascent12"; repo = "drm_info"; rev = "v${version}"; - sha256 = "1i5bzkgqxjjw34jpj1x1gfdl3sz0sl6i7s787a6mjjslsc5g422l"; + sha256 = "0s4zp8xz21zcpinbcwdvg48rf0xr7rs0dqri28q093vfmllsk36f"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; - buildInputs = [ libdrm json_c ]; + buildInputs = [ libdrm json_c pciutils ]; meta = with stdenv.lib; { description = "Small utility to dump info about DRM devices."; diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix index 5f359757eac..5efa579ec5a 100644 --- a/pkgs/development/tools/dtools/default.nix +++ b/pkgs/development/tools/dtools/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ancillary tools for the D programming language compiler"; - homepage = https://github.com/dlang/tools; + homepage = "https://github.com/dlang/tools"; license = lib.licenses.boost; maintainers = with maintainers; [ ThomasMader ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/ejson/Gemfile.lock b/pkgs/development/tools/ejson/Gemfile.lock index 52c82545bf3..d0a51c0a062 100644 --- a/pkgs/development/tools/ejson/Gemfile.lock +++ b/pkgs/development/tools/ejson/Gemfile.lock @@ -51,4 +51,4 @@ DEPENDENCIES ronn BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/ejson/default.nix b/pkgs/development/tools/ejson/default.nix index bc46f0776a6..a9481cbb306 100644 --- a/pkgs/development/tools/ejson/default.nix +++ b/pkgs/development/tools/ejson/default.nix @@ -39,7 +39,7 @@ in buildGoPackage rec { meta = with lib; { description = "A small library to manage encrypted secrets using asymmetric encryption."; license = licenses.mit; - homepage = https://github.com/Shopify/ejson; + homepage = "https://github.com/Shopify/ejson"; platforms = platforms.unix; maintainers = [ maintainers.manveru ]; }; diff --git a/pkgs/development/tools/electron/3.x.nix b/pkgs/development/tools/electron/3.x.nix index f66d1a57a04..ee4b69ddca3 100644 --- a/pkgs/development/tools/electron/3.x.nix +++ b/pkgs/development/tools/electron/3.x.nix @@ -8,7 +8,7 @@ let meta = with stdenv.lib; { description = "Cross platform desktop application shell"; - homepage = https://github.com/electron/electron; + homepage = "https://github.com/electron/electron"; license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; diff --git a/pkgs/development/tools/electron/generic.nix b/pkgs/development/tools/electron/generic.nix index a06989ad254..9bcc4dd6ff3 100644 --- a/pkgs/development/tools/electron/generic.nix +++ b/pkgs/development/tools/electron/generic.nix @@ -6,7 +6,7 @@ let meta = with stdenv.lib; { description = "Cross platform desktop application shell"; - homepage = https://github.com/electron/electron; + homepage = "https://github.com/electron/electron"; license = licenses.mit; maintainers = with maintainers; [ travisbhartwell manveru ]; platforms = [ "x86_64-darwin" "x86_64-linux" "i686-linux" "armv7l-linux" "aarch64-linux" ]; diff --git a/pkgs/development/tools/erlang/cuter/default.nix b/pkgs/development/tools/erlang/cuter/default.nix index dccf4a55831..f9d63cc86d8 100644 --- a/pkgs/development/tools/erlang/cuter/default.nix +++ b/pkgs/development/tools/erlang/cuter/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "A concolic testing tool for the Erlang functional programming language"; license = stdenv.lib.licenses.gpl3; - homepage = https://github.com/aggelgian/cuter; + homepage = "https://github.com/aggelgian/cuter"; maintainers = with stdenv.lib.maintainers; [ ericbmerritt ]; platforms = with stdenv.lib.platforms; unix; }; diff --git a/pkgs/development/tools/errcheck/default.nix b/pkgs/development/tools/errcheck/default.nix index f65dfe6565b..d288ff4dfec 100644 --- a/pkgs/development/tools/errcheck/default.nix +++ b/pkgs/development/tools/errcheck/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with lib; { description = "errcheck is a program for checking for unchecked errors in go programs."; - homepage = https://github.com/kisielk/errcheck; + homepage = "https://github.com/kisielk/errcheck"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/fdroidserver/default.nix b/pkgs/development/tools/fdroidserver/default.nix index 731eb80b261..b83070296aa 100644 --- a/pkgs/development/tools/fdroidserver/default.nix +++ b/pkgs/development/tools/fdroidserver/default.nix @@ -49,7 +49,7 @@ python.pkgs.buildPythonApplication rec { ]; meta = with lib; { - homepage = https://f-droid.org; + homepage = "https://f-droid.org"; description = "Server and tools for F-Droid, the Free Software repository system for Android"; license = licenses.agpl3; maintainers = [ lib.maintainers.pmiddend ]; diff --git a/pkgs/development/tools/fedpkg/default.nix b/pkgs/development/tools/fedpkg/default.nix index f257ae8adbf..4fbecc2d58d 100644 --- a/pkgs/development/tools/fedpkg/default.nix +++ b/pkgs/development/tools/fedpkg/default.nix @@ -28,7 +28,7 @@ in buildPythonApplication rec { meta = with stdenv.lib; { description = "Subclass of the rpkg project for dealing with rpm packaging"; - homepage = https://pagure.io/fedpkg; + homepage = "https://pagure.io/fedpkg"; license = licenses.gpl2; maintainers = with maintainers; [ ]; broken = true; diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 1498d179d22..746d66c2dbe 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.2.4"; + version = "6.3.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 = "1ng4ygd44hl63amjaizldsngn72jfz5pqw7wgr1vyvdxdzjfcnwm"; + sha256 = "1av1q7znphpsi1iz4dbh0fgh3jsx9prz980b25yk5r89h518s76q"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; diff --git a/pkgs/development/tools/fmbt/default.nix b/pkgs/development/tools/fmbt/default.nix index 3100daae389..71365c01bfd 100644 --- a/pkgs/development/tools/fmbt/default.nix +++ b/pkgs/development/tools/fmbt/default.nix @@ -4,14 +4,14 @@ , tesseract, gts, libXtst }: stdenv.mkDerivation rec { - version = "0.39"; + version = "0.42"; pname = "fMBT"; src = fetchFromGitHub { owner = "intel"; repo = "fMBT"; rev = "v${version}"; - sha256 = "15sxwdcsjybq50vkla4md2ay8m67ndc4vwcsl5vwsjkim5qlxslb"; + sha256 = "1jb9nb2mipc5cg99a80dny4m06vz2zral0q30fv75rz2cb6ja4zp"; }; nativeBuildInputs = [ autoreconfHook pkgconfig flex makeWrapper diff --git a/pkgs/development/tools/fusee-launcher/default.nix b/pkgs/development/tools/fusee-launcher/default.nix index 4fb05da3067..077dc8b87f9 100644 --- a/pkgs/development/tools/fusee-launcher/default.nix +++ b/pkgs/development/tools/fusee-launcher/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { pythonPath = with python3Packages; [ pyusb ]; meta = with stdenv.lib; { - homepage = https://github.com/Cease-and-DeSwitch/fusee-launcher; + 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; maintainers = with maintainers; [ pneumaticat ]; diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix index 15129bbebff..89d6b700018 100644 --- a/pkgs/development/tools/galen/default.nix +++ b/pkgs/development/tools/galen/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://galenframework.com; + homepage = "http://galenframework.com"; description = "Automated layout testing for websites"; license = licenses.asl20; maintainers = [ ]; diff --git a/pkgs/development/tools/gauge/default.nix b/pkgs/development/tools/gauge/default.nix index b284b7e7a04..c9df63cabb7 100644 --- a/pkgs/development/tools/gauge/default.nix +++ b/pkgs/development/tools/gauge/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Light weight cross-platform test automation"; - homepage = https://gauge.org; + homepage = "https://gauge.org"; license = licenses.gpl3; maintainers = [ maintainers.vdemeester ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/gdm/default.nix b/pkgs/development/tools/gdm/default.nix index 9cfa2f02c6e..284579fd362 100644 --- a/pkgs/development/tools/gdm/default.nix +++ b/pkgs/development/tools/gdm/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Minimalist dependency manager for Go written in Go."; - homepage = https://github.com/sparrc/gdm; + homepage = "https://github.com/sparrc/gdm"; license = licenses.unlicense; platforms = platforms.all; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 44e98d8d186..7cc43f14bae 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; - homepage = https://github.com/mozilla/geckodriver; + homepage = "https://github.com/mozilla/geckodriver"; license = licenses.mpl20; maintainers = with maintainers; [ jraygauthier ]; }; diff --git a/pkgs/development/tools/gir/default.nix b/pkgs/development/tools/gir/default.nix index 8cfcbf26dcd..49e1e6bbe8b 100644 --- a/pkgs/development/tools/gir/default.nix +++ b/pkgs/development/tools/gir/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Tool to generate rust bindings and user API for glib-based libraries"; - homepage = https://github.com/gtk-rs/gir/; + homepage = "https://github.com/gtk-rs/gir/"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ekleog ]; platforms = platforms.all; diff --git a/pkgs/development/tools/git-ftp/default.nix b/pkgs/development/tools/git-ftp/default.nix index c0001774252..7e62a93d564 100644 --- a/pkgs/development/tools/git-ftp/default.nix +++ b/pkgs/development/tools/git-ftp/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Git powered FTP client written as shell script."; - homepage = https://git-ftp.github.io/; + homepage = "https://git-ftp.github.io/"; license = licenses.gpl3; maintainers = with maintainers; [ tweber ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/git-repo-updater/default.nix b/pkgs/development/tools/git-repo-updater/default.nix index 6acb628a322..dbf83677999 100644 --- a/pkgs/development/tools/git-repo-updater/default.nix +++ b/pkgs/development/tools/git-repo-updater/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "gitup"; - version = "0.5"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "11ilz9i2yxrbipyjzpfkj7drx9wkrn3phvd1a60jivphbqdldpgf"; + sha256 = "1pa612rcc94nc461zs9sag9p46sycc214622b06gdn35rmwp0y2g"; }; propagatedBuildInputs = [ colorama GitPython ]; diff --git a/pkgs/development/tools/git-series/default.nix b/pkgs/development/tools/git-series/default.nix index 4a09e2225be..3507131082e 100644 --- a/pkgs/development/tools/git-series/default.nix +++ b/pkgs/development/tools/git-series/default.nix @@ -50,7 +50,7 @@ buildRustPackage rec { series also tracks a cover letter for the patch series, formats the series for email, and prepares pull requests. ''; - homepage = https://github.com/git-series/git-series; + homepage = "https://github.com/git-series/git-series"; license = licenses.mit; maintainers = with maintainers; [ edef vmandela ]; diff --git a/pkgs/development/tools/github-changelog-generator/Gemfile.lock b/pkgs/development/tools/github-changelog-generator/Gemfile.lock index b1b955cba94..d1f67ddd474 100644 --- a/pkgs/development/tools/github-changelog-generator/Gemfile.lock +++ b/pkgs/development/tools/github-changelog-generator/Gemfile.lock @@ -46,4 +46,4 @@ DEPENDENCIES github_changelog_generator (= 1.14.3) BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/github-changelog-generator/default.nix b/pkgs/development/tools/github-changelog-generator/default.nix index 9a14cc7f6e2..0239259a0c8 100644 --- a/pkgs/development/tools/github-changelog-generator/default.nix +++ b/pkgs/development/tools/github-changelog-generator/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Fully automated changelog generation - This gem generates a changelog file based on tags, issues and merged pull requests"; - homepage = https://github.com/github-changelog-generator/github-changelog-generator; + homepage = "https://github.com/github-changelog-generator/github-changelog-generator"; license = licenses.mit; maintainers = with maintainers; [ Scriptkiddi nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/github/cligh/default.nix b/pkgs/development/tools/github/cligh/default.nix index 1bad76b246a..5eb65dc4fbd 100644 --- a/pkgs/development/tools/github/cligh/default.nix +++ b/pkgs/development/tools/github/cligh/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ pyxdg PyGithub ]; meta = with stdenv.lib; { - homepage = http://the-brannons.com/software/cligh.html; + homepage = "http://the-brannons.com/software/cligh.html"; description = "A simple command-line interface to the facilities of Github"; longDescription = '' Cligh is a simple command-line interface to the facilities of GitHub. diff --git a/pkgs/development/tools/github/github-release/default.nix b/pkgs/development/tools/github/github-release/default.nix index be268fa6de3..8b68426d4b5 100644 --- a/pkgs/development/tools/github/github-release/default.nix +++ b/pkgs/development/tools/github/github-release/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ''; license = licenses.mit; - homepage = https://github.com/aktau/github-release; + homepage = "https://github.com/aktau/github-release"; maintainers = with maintainers; [ ardumont ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index 913c0212559..4f511813ad0 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://glide.sh; + homepage = "https://glide.sh"; description = "Package management for Go"; license = licenses.mit; maintainers = [ maintainers.rushmorem ]; diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index dfc5ed843e7..c0c39892635 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/SRI-CSL/gllvm; + homepage = "https://github.com/SRI-CSL/gllvm"; description = "Whole Program LLVM: wllvm ported to go"; license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/development/tools/global-platform-pro/default.nix b/pkgs/development/tools/global-platform-pro/default.nix index 74a88caeb7c..a9fb671f4a3 100644 --- a/pkgs/development/tools/global-platform-pro/default.nix +++ b/pkgs/development/tools/global-platform-pro/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { The executable requires the PC/SC daemon running for correct execution. If you run NixOS, it can be enabled with `services.pcscd.enable = true;`. ''; - homepage = https://github.com/martinpaljak/GlobalPlatformPro; + homepage = "https://github.com/martinpaljak/GlobalPlatformPro"; license = with licenses; [ lgpl3 ]; maintainers = with maintainers; [ ekleog ]; platforms = platforms.all; diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix index d0e9cc9e2d3..0ffa521f38f 100644 --- a/pkgs/development/tools/glock/default.nix +++ b/pkgs/development/tools/glock/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/robfig/glock; + homepage = "https://github.com/robfig/glock"; description = "A command-line tool to lock Go dependencies to specific revisions"; license = licenses.mit; maintainers = [ maintainers.rushmorem ]; diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index fd22295540d..b9e46ca41e1 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Live GLSL coding renderer"; - homepage = http://patriciogonzalezvivo.com/2015/glslViewer/; + homepage = "http://patriciogonzalezvivo.com/2015/glslViewer/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.hodapp ]; diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index 368a1520ca0..81e4d879375 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "20200223"; src = fetchgit { - url = https://git.savannah.gnu.org/r/gnulib.git; + url = "https://git.savannah.gnu.org/r/gnulib.git"; rev = "292fd5d6ff5ecce81ec3c648f353732a9ece83c0"; sha256 = "0hkg3nql8nsll0vrqk4ifda0v4kpi67xz42r8daqsql6c4rciqnw"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.gnu.org/software/gnulib/; + 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; diff --git a/pkgs/development/tools/go-langserver/default.nix b/pkgs/development/tools/go-langserver/default.nix index ec0e565eabd..c6a0dcc0d9d 100644 --- a/pkgs/development/tools/go-langserver/default.nix +++ b/pkgs/development/tools/go-langserver/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A Go language server protocol server"; - homepage = https://github.com/sourcegraph/go-langserver; + homepage = "https://github.com/sourcegraph/go-langserver"; license = licenses.mit; maintainers = with maintainers; [ johnchildren ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/go-motion/default.nix b/pkgs/development/tools/go-motion/default.nix index 52b2962a23d..824668055b1 100644 --- a/pkgs/development/tools/go-motion/default.nix +++ b/pkgs/development/tools/go-motion/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { It's optimized and created to work with vim-go, but it's designed to work with any editor. It's currently work in progress and open to change. ''; - homepage = https://github.com/fatih/motion; + homepage = "https://github.com/fatih/motion"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/go-outline/default.nix b/pkgs/development/tools/go-outline/default.nix index 5f6088363f1..3df1d5cae25 100644 --- a/pkgs/development/tools/go-outline/default.nix +++ b/pkgs/development/tools/go-outline/default.nix @@ -17,7 +17,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; + homepage = "https://github.com/ramya-rao-a/go-outline"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/tools/go-symbols/default.nix b/pkgs/development/tools/go-symbols/default.nix index e774ed71664..bdee5e4b25a 100644 --- a/pkgs/development/tools/go-symbols/default.nix +++ b/pkgs/development/tools/go-symbols/default.nix @@ -16,7 +16,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; + homepage = "https://github.com/acroca/go-symbols"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index b047689b81f..2035408de3b 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -1,7 +1,6 @@ { buildGoModule -, stdenv +, lib , fetchFromGitHub -, Security }: buildGoModule rec { @@ -17,13 +16,11 @@ buildGoModule rec { sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - modSha256 = "03560xjr2531xj87paskfx2zs364fz6y4kpsid8x08s1syq9nq7p"; - meta = with stdenv.lib; { + meta = with lib; { description = "A collection of tools and libraries for working with Go code, including linters and static analysis"; - homepage = https://staticcheck.io; + homepage = "https://staticcheck.io"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs kalbasit ]; }; diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index adf0977c67d..96f82cc827f 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -38,7 +38,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Go apps packaging for Nix"; - homepage = https://github.com/kamilchm/go2nix; + homepage = "https://github.com/kamilchm/go2nix"; license = licenses.mit; maintainers = with maintainers; [ kamilchm ]; }; diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 24a21c8279c..6a373099a01 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://goa.design; + homepage = "https://goa.design"; description = "A framework for building microservices in Go using a unique design-first approach"; license = licenses.mit; maintainers = [ maintainers.rushmorem ]; diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 1524984756f..3ed719cbfce 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { Typical autocompletion time with warm cache is 30ms, which is barely noticeable. ''; - homepage = https://github.com/stamblerre/gocode; + homepage = "https://github.com/stamblerre/gocode"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ kalbasit rvolosatovs ]; diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index b67f8929e48..12c94cbd3cd 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -37,7 +37,7 @@ buildGoPackage rec { Typical autocompletion time with warm cache is 30ms, which is barely noticeable. ''; - homepage = https://github.com/mdempsky/gocode; + homepage = "https://github.com/mdempsky/gocode"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/development/tools/goconst/default.nix b/pkgs/development/tools/goconst/default.nix index 0ee889d0265..91a53830cbe 100644 --- a/pkgs/development/tools/goconst/default.nix +++ b/pkgs/development/tools/goconst/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with lib; { description = "Find in Go repeated strings that could be replaced by a constant"; - homepage = https://github.com/jgautheron/goconst; + homepage = "https://github.com/jgautheron/goconst"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/goconvey/default.nix b/pkgs/development/tools/goconvey/default.nix index 1df94147ba4..4c4d651ce60 100644 --- a/pkgs/development/tools/goconvey/default.nix +++ b/pkgs/development/tools/goconvey/default.nix @@ -18,7 +18,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; + homepage = "https://github.com/smartystreets/goconvey"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index f446b728908..4ce97349fd7 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code."; - homepage = https://github.com/alecthomas/gocyclo; + homepage = "https://github.com/alecthomas/gocyclo"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index ce6c77b2cc3..60a155cf6c8 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "Print where symbols are defined in Go source code"; - homepage = https://github.com/rogpeppe/godef/; + homepage = "https://github.com/rogpeppe/godef/"; maintainers = with stdenv.lib.maintainers; [ vdemeester rvolosatovs ]; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/development/tools/gofumpt/default.nix b/pkgs/development/tools/gofumpt/default.nix index 5ca0d6cb1e0..c5e27289615 100644 --- a/pkgs/development/tools/gofumpt/default.nix +++ b/pkgs/development/tools/gofumpt/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { description = "A stricter gofmt"; - homepage = https://github.com/mvdan/gofumpt; + homepage = "https://github.com/mvdan/gofumpt"; license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 61d0e7a73db..1835121ba19 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with lib; { description = "Gets documentation for items in Go source code"; - homepage = https://github.com/zmb3/gogetdoc; + homepage = "https://github.com/zmb3/gogetdoc"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 00858e94bc5..14311b0c7a5 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "golangci-lint"; @@ -14,9 +14,7 @@ buildGoModule rec { modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk"; subPackages = [ "cmd/golangci-lint" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Linters Runner for Go. 5x faster than gometalinter. Nice colored output."; homepage = "https://golangci.com/"; license = licenses.agpl3; diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index bd66f35e471..b0b53f7699c 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://golang.org; + homepage = "https://golang.org"; description = "Linter for Go source code"; license = licenses.bsd3; maintainers = with maintainers; [ jhillyerd ]; diff --git a/pkgs/development/tools/gometalinter/default.nix b/pkgs/development/tools/gometalinter/default.nix index c2f2a8a597a..1cd83e443aa 100644 --- a/pkgs/development/tools/gometalinter/default.nix +++ b/pkgs/development/tools/gometalinter/default.nix @@ -62,7 +62,7 @@ in buildGoPackage rec { meta = with lib; { description = "Concurrently run Go lint tools and normalise their output"; - homepage = https://github.com/alecthomas/gometalinter; + homepage = "https://github.com/alecthomas/gometalinter"; license = licenses.mit; maintainers = with maintainers; [ kalbasit rvolosatovs ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 4d97415bc56..188f60e3ef0 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "Go tool to modify struct field tags."; - homepage = https://github.com/fatih/gomodifytags; + homepage = "https://github.com/fatih/gomodifytags"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.bsd3; }; 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 df3310893a4..001edf5c038 100644 --- a/pkgs/development/tools/google-app-engine-go-sdk/default.nix +++ b/pkgs/development/tools/google-app-engine-go-sdk/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google App Engine SDK for Go"; version = version; - homepage = https://cloud.google.com/appengine/docs/go/; + homepage = "https://cloud.google.com/appengine/docs/go/"; license = licenses.asl20; platforms = ["x86_64-linux" "x86_64-darwin"]; maintainers = with maintainers; [ lufia ]; diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 778ed562637..1f7d1d63a62 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "Tool to get list available Go packages."; - homepage = https://github.com/uudashr/gopkgs; + homepage = "https://github.com/uudashr/gopkgs"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix index 1b6b3aed4e8..2600d13cab9 100644 --- a/pkgs/development/tools/gosec/default.nix +++ b/pkgs/development/tools/gosec/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with lib; { description = "Golang security checker"; - homepage = https://github.com/securego/gosec; + homepage = "https://github.com/securego/gosec"; license = licenses.asl20 ; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/gotests/default.nix b/pkgs/development/tools/gotests/default.nix index e74b6c27b2b..13d3c700ce9 100644 --- a/pkgs/development/tools/gotests/default.nix +++ b/pkgs/development/tools/gotests/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Generate Go tests from your source code."; - homepage = https://github.com/cweill/gotests; + homepage = "https://github.com/cweill/gotests"; maintainers = with stdenv.lib.maintainers; [ vdemeester ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 6caa32c16f2..ac4e2c582c4 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -16,7 +16,7 @@ buildGoPackage { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/mitchellh/gox; + homepage = "https://github.com/mitchellh/gox"; description = "A dead simple, no frills Go cross compile tool"; platforms = platforms.all; license = licenses.mpl20; diff --git a/pkgs/development/tools/gtk-mac-bundler/default.nix b/pkgs/development/tools/gtk-mac-bundler/default.nix index 02d5ad87dc4..df21f414ecb 100644 --- a/pkgs/development/tools/gtk-mac-bundler/default.nix +++ b/pkgs/development/tools/gtk-mac-bundler/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "a helper script that creates application bundles form GTK executables for macOS"; maintainers = [ maintainers.matthewbauer ]; platforms = platforms.darwin; - homepage = https://wiki.gnome.org/Projects/GTK/OSX/Bundling; + homepage = "https://wiki.gnome.org/Projects/GTK/OSX/Bundling"; license = licenses.gpl2; }; } diff --git a/pkgs/development/tools/haskell/ihaskell/wrapper.nix b/pkgs/development/tools/haskell/ihaskell/wrapper.nix index 0f42a5e3490..9b33d6e0670 100644 --- a/pkgs/development/tools/haskell/ihaskell/wrapper.nix +++ b/pkgs/development/tools/haskell/ihaskell/wrapper.nix @@ -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="${stdenv.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/hcloud/default.nix b/pkgs/development/tools/hcloud/default.nix index c20f3b9dc12..477a476dfe7 100644 --- a/pkgs/development/tools/hcloud/default.nix +++ b/pkgs/development/tools/hcloud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "hcloud"; @@ -15,8 +15,6 @@ buildGoModule rec { modSha256 = "1zy41hi2qzrdmih3pkpng8im576lhkr64zm66w73p7jyvy0kf9sx"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=" "-w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; postInstall = '' diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix index c97e35583b6..116e7c3a5ce 100644 --- a/pkgs/development/tools/hexio/default.nix +++ b/pkgs/development/tools/hexio/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on"; - homepage = https://github.com/vanrein/hexio; + homepage = "https://github.com/vanrein/hexio"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/development/tools/iaca/2.1.nix b/pkgs/development/tools/iaca/2.1.nix index b2c764c5a85..f36e2e48fdf 100644 --- a/pkgs/development/tools/iaca/2.1.nix +++ b/pkgs/development/tools/iaca/2.1.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { 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/; + homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; diff --git a/pkgs/development/tools/iaca/3.0.nix b/pkgs/development/tools/iaca/3.0.nix index 34b9e1df190..f03f5354422 100644 --- a/pkgs/development/tools/iaca/3.0.nix +++ b/pkgs/development/tools/iaca/3.0.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { description = "Intel Architecture Code Analyzer"; - homepage = https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/; + homepage = "https://software.intel.com/en-us/articles/intel-architecture-code-analyzer/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kazcw ]; diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 58ccb5d4cef..607e2ffe4a9 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { FPGAs and providing simple tools for analyzing and creating bitstream files. ''; - homepage = http://www.clifford.at/icestorm/; + homepage = "http://www.clifford.at/icestorm/"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ shell thoughtpolice emily ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/iferr/default.nix b/pkgs/development/tools/iferr/default.nix index 5874d1eeed3..0e8f797f77c 100644 --- a/pkgs/development/tools/iferr/default.nix +++ b/pkgs/development/tools/iferr/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with lib; { description = ''Generate "if err != nil {" block''; - homepage = https://github.com/koron/iferr; + homepage = "https://github.com/koron/iferr"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/imatix_gsl/default.nix b/pkgs/development/tools/imatix_gsl/default.nix index c4d290bf967..edba0d686db 100644 --- a/pkgs/development/tools/imatix_gsl/default.nix +++ b/pkgs/development/tools/imatix_gsl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { license = licenses.gpl3Plus; - homepage = https://github.com/imatix/gsl/; + homepage = "https://github.com/imatix/gsl/"; description = "A universal code generator"; platforms = platforms.unix; maintainers = [ maintainers.moosingin3space ]; diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix index 8d368ba528a..223f3d425c9 100644 --- a/pkgs/development/tools/impl/default.nix +++ b/pkgs/development/tools/impl/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with lib; { description = "impl generates method stubs for implementing an interface."; - homepage = https://github.com/josharian/impl; + homepage = "https://github.com/josharian/impl"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 06831e3a43c..2be22301cdb 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with lib; { description = "Detect ineffectual assignments in Go code."; - homepage = https://github.com/gordonklaus/ineffassign; + homepage = "https://github.com/gordonklaus/ineffassign"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/interfacer/default.nix b/pkgs/development/tools/interfacer/default.nix index 2f505ef1c67..ff59ce50482 100644 --- a/pkgs/development/tools/interfacer/default.nix +++ b/pkgs/development/tools/interfacer/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with lib; { description = "A linter that suggests interface types."; - homepage = https://github.com/mvdan/interfacer; + homepage = "https://github.com/mvdan/interfacer"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index 9791cd56ea1..04fe7c2f46d 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -23,7 +23,7 @@ let version = "0.98"; in the stock `jar' program running without a JIT. ''; - homepage = https://savannah.nongnu.org/projects/fastjar/; + homepage = "https://savannah.nongnu.org/projects/fastjar/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix index dae39453495..1b235e35485 100644 --- a/pkgs/development/tools/java/jhiccup/default.nix +++ b/pkgs/development/tools/java/jhiccup/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Measure JVM application stalls and GC pauses"; - homepage = https://www.azul.com/jhiccup/; + homepage = "https://www.azul.com/jhiccup/"; license = stdenv.lib.licenses.cc0; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index 210dc101a24..f703cb707e6 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -100,4 +100,4 @@ DEPENDENCIES jazzy BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/jazzy/default.nix b/pkgs/development/tools/jazzy/default.nix index a6cb7a92b63..a0561040704 100644 --- a/pkgs/development/tools/jazzy/default.nix +++ b/pkgs/development/tools/jazzy/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A command-line utility that generates documentation for Swift or Objective-C"; - homepage = https://github.com/realm/jazzy; + homepage = "https://github.com/realm/jazzy"; license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index 0fc8b85d8f4..f63d580bca0 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "A command-line tool to incrementally drill down JSON"; - homepage = https://github.com/simeji/jid; + homepage = "https://github.com/simeji/jid"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ stesie ]; diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 8722d49eb32..19d6fa392dd 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -25,7 +25,7 @@ in meta = with stdenv.lib; { description = "A command line interface to Jira"; - homepage = https://github.com/alisaifee/jira-cli; + homepage = "https://github.com/alisaifee/jira-cli"; maintainers = with maintainers; [ nyarly ]; license = licenses.mit; }; diff --git a/pkgs/development/tools/jl/default.nix b/pkgs/development/tools/jl/default.nix index 0d9ce143a83..9a1314a6083 100644 --- a/pkgs/development/tools/jl/default.nix +++ b/pkgs/development/tools/jl/default.nix @@ -15,7 +15,7 @@ mkDerivation rec { patches = [ # MonadFail compatibility patch. Should be removed with the next release (fetchpatch { - url = https://github.com/chrisdone/jl/commit/6d40308811cbc22a96b47ebe69ec308b4e9fd356.patch; + url = "https://github.com/chrisdone/jl/commit/6d40308811cbc22a96b47ebe69ec308b4e9fd356.patch"; sha256 = "1pg92ffkg8kim5r8rz8js6fjqyjisg1266sf7p9jyxjgsskwpa4g"; }) ]; @@ -33,5 +33,5 @@ mkDerivation rec { license = stdenv.lib.licenses.bsd3; description = "Functional sed for JSON"; maintainers = with stdenv.lib.maintainers; [ fgaz ]; - homepage = https://github.com/chrisdone/jl; + homepage = "https://github.com/chrisdone/jl"; } diff --git a/pkgs/development/tools/jmespath/default.nix b/pkgs/development/tools/jmespath/default.nix index b12be2a9567..5414c51a00c 100644 --- a/pkgs/development/tools/jmespath/default.nix +++ b/pkgs/development/tools/jmespath/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { description = "A JMESPath implementation in Go"; - homepage = https://github.com/jmespath/go-jmespath; + homepage = "https://github.com/jmespath/go-jmespath"; maintainers = with maintainers; [ cransom ]; license = licenses.asl20; }; diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index 9e5d29a6bb2..0dcd02eb618 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small utility to create JSON objects"; - homepage = https://github.com/jpmens/jo; + homepage = "https://github.com/jpmens/jo"; license = licenses.gpl2Plus; maintainers = [maintainers.markus1189]; platforms = platforms.all; diff --git a/pkgs/development/tools/jp/default.nix b/pkgs/development/tools/jp/default.nix index 3ebdc881dcb..1e7d1023edf 100644 --- a/pkgs/development/tools/jp/default.nix +++ b/pkgs/development/tools/jp/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { description = "A command line interface to the JMESPath expression language for JSON"; - homepage = https://github.com/jmespath/jp; + homepage = "https://github.com/jmespath/jp"; maintainers = with maintainers; [ cransom ]; license = licenses.asl20; }; diff --git a/pkgs/development/tools/jsduck/Gemfile.lock b/pkgs/development/tools/jsduck/Gemfile.lock index 2a95d72c946..d8331181652 100644 --- a/pkgs/development/tools/jsduck/Gemfile.lock +++ b/pkgs/development/tools/jsduck/Gemfile.lock @@ -20,4 +20,4 @@ DEPENDENCIES jsduck BUNDLED WITH - 1.13.6 + 2.1.4 diff --git a/pkgs/development/tools/jsduck/default.nix b/pkgs/development/tools/jsduck/default.nix index 0b6098e5ee9..8748fb8e512 100644 --- a/pkgs/development/tools/jsduck/default.nix +++ b/pkgs/development/tools/jsduck/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple JavaScript Duckumentation generator."; - homepage = https://github.com/senchalabs/jsduck; + homepage = "https://github.com/senchalabs/jsduck"; license = with licenses; gpl3; maintainers = with maintainers; [ periklis nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 5641a14e1ab..5ae2ee1c14d 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -2,16 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "0.4.5"; + version = "0.5.10"; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "v${version}"; - sha256 = "0a4bml9nxvyh110a60l4lc11yr2ds5r8d3iplslccrkq1ka96av9"; + sha256 = "0s8np28glzn3kmh59dwk86yc9fb2lm9fq2325kzmy7rkb5jsdcl1"; }; - cargoSha256 = "0wp61zjws9r1aapkapvq2vmad5kylkpw03wa82qhhq30knkpvr7b"; + cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l"; + + postInstall = '' + # generate completion scripts for just + + mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + + $out/bin/just --completions bash > "$out/share/bash-completion/completions/just" + $out/bin/just --completions fish > "$out/share/fish/vendor_completions.d/just.fish" + $out/bin/just --completions zsh > "$out/share/zsh/site-functions/_just" + ''; checkInputs = [ coreutils bash dash ]; @@ -20,25 +30,30 @@ rustPlatform.buildRustPackage rec { export USER=just-user export USERNAME=just-user - sed -i tests/integration.rs \ - -e "s@/bin/echo@${coreutils}/bin/echo@g" \ - -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" - - sed -i tests/interrupts.rs \ - -e "s@/bin/echo@${coreutils}/bin/echo@g" \ - -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" - sed -i src/justfile.rs \ + -i tests/*.rs \ -e "s@/bin/echo@${coreutils}/bin/echo@g" \ -e "s@#!/usr/bin/env sh@#!${bash}/bin/sh@g" \ - -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" + -e "s@#!/usr/bin/env cat@#!${coreutils}/bin/cat@g" \ + -e "s@#!/usr/bin/env bash@#!${bash}/bin/sh@g" + ''; + + # Skip "edit" when running "cargo test", + # since this test case needs "cat". + checkPhase = '' + runHook preCheck + echo "Running cargo test -- + --skip edit + ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" + cargo test -- \ + --skip edit \ + ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + runHook postCheck ''; meta = with stdenv.lib; { description = "A handy way to save and run project-specific commands"; - homepage = https://github.com/casey/just; + homepage = "https://github.com/casey/just"; license = licenses.cc0; maintainers = with maintainers; [ xrelkd ]; platforms = platforms.all; diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index b8071bf1ac2..9b1b4926270 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { subPackages = [ "./" ]; meta = with stdenv.lib; { - homepage = https://k6.io/; + homepage = "https://k6.io/"; description = "A modern load testing tool, using Go and JavaScript"; license = licenses.agpl3Plus; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/development/tools/kafkacat/default.nix b/pkgs/development/tools/kafkacat/default.nix index 7de5cd6340a..5b67d4ddbc5 100644 --- a/pkgs/development/tools/kafkacat/default.nix +++ b/pkgs/development/tools/kafkacat/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A generic non-JVM producer and consumer for Apache Kafka"; - homepage = https://github.com/edenhill/kafkacat; + homepage = "https://github.com/edenhill/kafkacat"; license = licenses.bsd2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ nyarly ]; diff --git a/pkgs/development/tools/kcli/default.nix b/pkgs/development/tools/kcli/default.nix index 0d42df3b5e4..bbcb10a354c 100644 --- a/pkgs/development/tools/kcli/default.nix +++ b/pkgs/development/tools/kcli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kcli"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1wcqh3306q9wxb6pnl8cpk73vmy36bjv2gil03j7j4pajs1f2lwn"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "." ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 94a0ff87982..f86bc489837 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { meta = { description = "Kubernetes IN Docker - local clusters for testing Kubernetes"; - homepage = https://github.com/kubernetes-sigs/kind; + homepage = "https://github.com/kubernetes-sigs/kind"; maintainers = with maintainers; [ offline rawkode ]; license = stdenv.lib.licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/development/tools/ktlint/default.nix b/pkgs/development/tools/ktlint/default.nix index 0c55dc9fdb1..e2897135cd0 100644 --- a/pkgs/development/tools/ktlint/default.nix +++ b/pkgs/development/tools/ktlint/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An anti-bikeshedding Kotlin linter with built-in formatter"; - homepage = https://ktlint.github.io/; + homepage = "https://ktlint.github.io/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ tadfisher ]; diff --git a/pkgs/development/tools/kube-aws/default.nix b/pkgs/development/tools/kube-aws/default.nix index 6083c03ebc9..0e96683b06e 100644 --- a/pkgs/development/tools/kube-aws/default.nix +++ b/pkgs/development/tools/kube-aws/default.nix @@ -29,7 +29,7 @@ buildGoPackage rec { meta = { description = "Tool for deploying kubernetes on aws using coreos"; license = licenses.asl20; - homepage = https://github.com/coreos/coreos-kubernetes; + homepage = "https://github.com/coreos/coreos-kubernetes"; maintainers = with maintainers; [offline]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/kube-prompt/default.nix b/pkgs/development/tools/kube-prompt/default.nix index 8e6ca8e221e..1a7bd6e8289 100644 --- a/pkgs/development/tools/kube-prompt/default.nix +++ b/pkgs/development/tools/kube-prompt/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = { description = "An interactive kubernetes client featuring auto-complete using go-prompt"; license = lib.licenses.mit; - homepage = https://github.com/c-bata/kube-prompt; + homepage = "https://github.com/c-bata/kube-prompt"; maintainers = [ lib.maintainers.vdemeester ]; }; } diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index 87807355413..fd5bdc64dd6 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast way to switch between clusters and namespaces in kubectl!"; license = licenses.asl20; - homepage = https://github.com/ahmetb/kubectx; + homepage = "https://github.com/ahmetb/kubectx"; maintainers = with maintainers; [ periklis ]; platforms = with platforms; unix; }; diff --git a/pkgs/development/tools/kubeprompt/default.nix b/pkgs/development/tools/kubeprompt/default.nix index 0910c061ee5..7c6f3f3396c 100644 --- a/pkgs/development/tools/kubeprompt/default.nix +++ b/pkgs/development/tools/kubeprompt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "kubeprompt"; @@ -21,8 +21,6 @@ buildGoModule rec { goPackagePath = "github.com/jlesquembre/kubeprompt"; modSha256 = "0rbpdk2dixywn3wcdgz48f3xw3b7fk8xh7mrlx27wz7fq5wj9v8f"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Kubernetes prompt"; homepage = "https://github.com/jlesquembre/kubeprompt"; diff --git a/pkgs/development/tools/kubicorn/default.nix b/pkgs/development/tools/kubicorn/default.nix index 104b11c1ce1..67e170f6e25 100644 --- a/pkgs/development/tools/kubicorn/default.nix +++ b/pkgs/development/tools/kubicorn/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "Simple, cloud native infrastructure for Kubernetes"; - homepage = http://kubicorn.io/; + homepage = "http://kubicorn.io/"; maintainers = with stdenv.lib.maintainers; [ offline ]; license = stdenv.lib.licenses.asl20; }; diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index cadaf8238b3..c1fc313fbc1 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { pname = "kubie"; - version = "0.7.1"; + version = "0.7.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "0c94ggrkzyy8zl2z5r4pgfscyhcjp4x64k3bl2byqp3ysgjwkjqx"; + sha256 = "186h5fng16gwqhsy2nxswbrrxsx0ysqrb4pqznyygbiz5cd9bgxp"; }; - cargoSha256 = "1lzyda838s9fmg8hibg2w2wszwyvvqsy20w9877skfcx370rvndi"; + cargoSha256 = "1yllpi8dp1fy39z4zmhyf1hdjpl62vwh8b8qlj0g778qsdrm9p98"; meta = with stdenv.lib; { description = diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index ce173e89a2c..bf4aae23be7 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub, tree }: buildGoModule rec { pname = "kustomize"; @@ -25,16 +25,14 @@ buildGoModule rec { modSha256 = "1bas6al14ck0d2ccb4235426a5hldqsm0nf8vi76chz4nahzb71g"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Customization of kubernetes YAML configurations"; longDescription = '' kustomize lets you customize raw, template-free YAML files for multiple purposes, leaving the original YAML untouched and usable as is. ''; - homepage = https://github.com/kubernetes-sigs/kustomize; + homepage = "https://github.com/kubernetes-sigs/kustomize"; license = licenses.asl20; maintainers = with maintainers; [ carlosdagos vdemeester periklis zaninime ]; }; diff --git a/pkgs/development/tools/kythe/default.nix b/pkgs/development/tools/kythe/default.nix index c2bba7b3254..e9748d6e45e 100644 --- a/pkgs/development/tools/kythe/default.nix +++ b/pkgs/development/tools/kythe/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { source code — including build systems, compilers, interpreters, static analyses, editors, code-review applications, and more — to share information with each other smoothly. ''; - homepage = https://kythe.io/; + homepage = "https://kythe.io/"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.mpickering ]; diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 9a27c7d44e9..4b99cfb10e0 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.16.2"; + version = "0.18"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "0lvhj4iz74h97lkylqg7hl18xcxcl9msxxvap7jqdj2mf2iwxi32"; + sha256 = "1zc6y386w111ygyng5s74zg49iajzs77dbrcdy33igj0hbnkwq2x"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index a2a35c7fd1d..569ad6eb3cf 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "A pair programming tool and library written in Golang"; - homepage = https://github.com/jeffail/leaps/; + homepage = "https://github.com/jeffail/leaps/"; license = "MIT"; maintainers = with stdenv.lib.maintainers; [ qknight ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/libsigrok/default.nix b/pkgs/development/tools/libsigrok/default.nix index a80b638625e..4e104a79d5d 100644 --- a/pkgs/development/tools/libsigrok/default.nix +++ b/pkgs/development/tools/libsigrok/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Core library of the sigrok signal analysis software suite"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index b9c149af531..e78afc1a861 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Protocol decoding library for the sigrok signal analysis software suite"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix index 035374d3e90..c418c16b670 100644 --- a/pkgs/development/tools/literate-programming/Literate/default.nix +++ b/pkgs/development/tools/literate-programming/Literate/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A literate programming tool for any language"; - homepage = http://literate.zbyedidia.webfactional.com/; + homepage = "http://literate.zbyedidia.webfactional.com/"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix index 17a7731896e..53964c0e98b 100644 --- a/pkgs/development/tools/literate-programming/eweb/default.nix +++ b/pkgs/development/tools/literate-programming/eweb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { version = "9.10" ; - homepage = http://eweb.sf.net; + homepage = "http://eweb.sf.net"; description = "An Asciidoc-based literate programming tool, written in Python"; platforms = platforms.linux; license = licenses.gpl3Plus; diff --git a/pkgs/development/tools/literate-programming/funnelweb/default.nix b/pkgs/development/tools/literate-programming/funnelweb/default.nix index 66b44d1fc83..9d27351f15d 100644 --- a/pkgs/development/tools/literate-programming/funnelweb/default.nix +++ b/pkgs/development/tools/literate-programming/funnelweb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "funnelweb-${meta.version}"; src = fetchurl { - url = http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz; + url = "http://www.ross.net/funnelweb/download/funnelweb_v320/funnelweb_v320_source.tar.gz"; sha256 = "0zqhys0j9gabrd12mnk8ibblpc8dal4kbl8vnhxmdlplsdpwn4wg"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { version = "3.20"; description = "A simple, reliable literate-programming macro preprocessor"; - homepage = http://www.ross.net/funnelweb/; + homepage = "http://www.ross.net/funnelweb/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; diff --git a/pkgs/development/tools/literate-programming/noweb/default.nix b/pkgs/development/tools/literate-programming/noweb/default.nix index 11ff5001678..52586939c1d 100644 --- a/pkgs/development/tools/literate-programming/noweb/default.nix +++ b/pkgs/development/tools/literate-programming/noweb/default.nix @@ -72,7 +72,7 @@ let noweb = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple, extensible literate-programming tool"; - homepage = https://www.cs.tufts.edu/~nr/noweb; + homepage = "https://www.cs.tufts.edu/~nr/noweb"; license = licenses.bsd2; maintainers = with maintainers; [ yurrriq ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix index 30eb28fc698..4885081bc5b 100644 --- a/pkgs/development/tools/literate-programming/nuweb/default.nix +++ b/pkgs/development/tools/literate-programming/nuweb/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "A simple literate programming tool"; - homepage = http://nuweb.sourceforge.net; + homepage = "http://nuweb.sourceforge.net"; license = licenses.free; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/makerpm/default.nix b/pkgs/development/tools/makerpm/default.nix index 24e5a6b6e19..a05615a22d9 100644 --- a/pkgs/development/tools/makerpm/default.nix +++ b/pkgs/development/tools/makerpm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/ivan-tkatchev/makerpm/; + homepage = "https://github.com/ivan-tkatchev/makerpm/"; description = "A clean, simple RPM packager reimplemented completely from scratch"; license = licenses.free; platforms = platforms.all; diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix index 3029ee38518..15d14df3ff7 100644 --- a/pkgs/development/tools/maligned/default.nix +++ b/pkgs/development/tools/maligned/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with lib; { description = "Tool to detect Go structs that would take less memory if their fields were sorted."; - homepage = https://github.com/mdempsky/maligned; + homepage = "https://github.com/mdempsky/maligned"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/manul/default.nix b/pkgs/development/tools/manul/default.nix index f921e900e56..b789a99578d 100644 --- a/pkgs/development/tools/manul/default.nix +++ b/pkgs/development/tools/manul/default.nix @@ -17,7 +17,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "The madness vendoring utility for Golang programs"; - homepage = https://github.com/kovetskiy/manul; + homepage = "https://github.com/kovetskiy/manul"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.mic92 ]; diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index cd80a5ad9e6..127fa1bef86 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/ARMmbed/mbed-cli; + homepage = "https://github.com/ARMmbed/mbed-cli"; description = "Arm Mbed Command Line Interface"; license = licenses.asl20; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index 27f0063e24b..2a0b1880601 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "gnu-mdk-1.2.10"; src = fetchurl { - url = https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz; + url = "https://ftp.gnu.org/gnu/mdk/v1.2.10/mdk-1.2.10.tar.gz"; sha256 = "1rwcq2b5vvv7318j92nxc5dayj27dpfhzc4rjiv4ccvsc0x35x5h"; }; nativeBuildInputs = [ pkgconfig ]; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "GNU MIX Development Kit (MDK)"; - homepage = https://www.gnu.org/software/mdk/; + homepage = "https://www.gnu.org/software/mdk/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 85a27fd9150..638fae592a5 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://scalameta.org/metals/; + homepage = "https://scalameta.org/metals/"; license = licenses.asl20; description = "Work-in-progress language server for Scala"; maintainers = with maintainers; [ ceedubs tomahna ]; diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 53e2920c68d..6dfe0f570f9 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://www.minizinc.org/; + homepage = "https://www.minizinc.org/"; description = "MiniZinc is a medium-level constraint modelling language."; longDescription = '' diff --git a/pkgs/development/tools/minizinc/ide.nix b/pkgs/development/tools/minizinc/ide.nix index 921ee3d158c..aedf2ab881d 100644 --- a/pkgs/development/tools/minizinc/ide.nix +++ b/pkgs/development/tools/minizinc/ide.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, makeWrapper, minizinc }: let - version = "2.4.2"; + version = "2.4.3"; in stdenv.mkDerivation { pname = "minizinc-ide"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { owner = "MiniZinc"; repo = "MiniZincIDE"; rev = version; - sha256 = "1xqs27f14r79vcxf9bx72bbnhxc913lpr5d8cv31dacbq5fyxkw7"; + sha256 = "0dfqh73rnp00336pyr1hlgl1wb4m2kh28zvdkamjgml60gmg6wdr"; }; sourceRoot = "source/MiniZincIDE"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.minizinc.org/; + homepage = "https://www.minizinc.org/"; description = "IDE for MiniZinc, a medium-level constraint modelling language"; longDescription = '' diff --git a/pkgs/development/tools/misc/abi-compliance-checker/default.nix b/pkgs/development/tools/misc/abi-compliance-checker/default.nix index 37d49b1f35b..c95a340181c 100644 --- a/pkgs/development/tools/misc/abi-compliance-checker/default.nix +++ b/pkgs/development/tools/misc/abi-compliance-checker/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://lvc.github.io/abi-compliance-checker; + 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; maintainers = [ maintainers.bhipple ]; diff --git a/pkgs/development/tools/misc/abi-dumper/default.nix b/pkgs/development/tools/misc/abi-dumper/default.nix index ca59bf28b1e..3d11d25560d 100644 --- a/pkgs/development/tools/misc/abi-dumper/default.nix +++ b/pkgs/development/tools/misc/abi-dumper/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/lvc/abi-dumper; + homepage = "https://github.com/lvc/abi-dumper"; description = "Dump ABI of an ELF object containing DWARF debug info"; license = licenses.lgpl21; maintainers = [ maintainers.bhipple ]; diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 17ff15265f2..885cef99111 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "act"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0l7id483006mnii4rlcff4p0ricd8a2n24sf74a9b387x0akpbsn"; + sha256 = "0qx3vwsynmil1h3d2dzvqz0jzshfyy3vin14zjfmd353d915hf06"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - modSha256 = "04s4p9j6j7gw1s4v271zwzvdny7dvjaazd2pihmyjfik95xmwx9r"; + modSha256 = "0276dngh29kzgm95d23r8ajjrrkss0v0f0wfq1ribgsxh17v0y5n"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Run your GitHub Actions locally"; homepage = "https://github.com/nektos/act"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/autobuild/default.nix b/pkgs/development/tools/misc/autobuild/default.nix index 8f425a92959..05afa379f99 100644 --- a/pkgs/development/tools/misc/autobuild/default.nix +++ b/pkgs/development/tools/misc/autobuild/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { summary of the build status, after reading the manual. ''; - homepage = https://josefsson.org/autobuild/; + homepage = "https://josefsson.org/autobuild/"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index 9901e46d578..f002346c994 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Archive of autoconf m4 macros"; - homepage = https://www.gnu.org/software/autoconf-archive/; + homepage = "https://www.gnu.org/software/autoconf-archive/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/autoconf/2.13.nix b/pkgs/development/tools/misc/autoconf/2.13.nix index 9e777e53cf6..424dff8541b 100644 --- a/pkgs/development/tools/misc/autoconf/2.13.nix +++ b/pkgs/development/tools/misc/autoconf/2.13.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { postInstall = ''ln -s autoconf "$out"/bin/autoconf-2.13''; meta = { - homepage = https://www.gnu.org/software/autoconf/; + homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; branch = "2.13"; diff --git a/pkgs/development/tools/misc/autoconf/2.64.nix b/pkgs/development/tools/misc/autoconf/2.64.nix index 98b55e31f60..1fd18bcb12a 100644 --- a/pkgs/development/tools/misc/autoconf/2.64.nix +++ b/pkgs/development/tools/misc/autoconf/2.64.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/autoconf/; + homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; longDescription = '' diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index 304b4fddf0d..500d80d4bb8 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/autoconf/; + homepage = "https://www.gnu.org/software/autoconf/"; description = "Part of the GNU Build System"; longDescription = '' diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix index dc719789719..6b9e8db2f2a 100644 --- a/pkgs/development/tools/misc/autogen/default.nix +++ b/pkgs/development/tools/misc/autogen/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Automated text and program generation tool"; license = with licenses; [ gpl3Plus lgpl3Plus ]; - homepage = https://www.gnu.org/software/autogen/; + homepage = "https://www.gnu.org/software/autogen/"; platforms = platforms.all; maintainers = [ ]; }; 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 a5aa44abcde..b79f3047889 100644 --- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { branch = "1.11"; - homepage = https://www.gnu.org/software/automake/; + homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; longDescription = '' 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 f1a48644617..858cb9a4f22 100644 --- a/pkgs/development/tools/misc/automake/automake-1.15.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.15.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { branch = "1.15"; - homepage = https://www.gnu.org/software/automake/; + homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; 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 1e432a6e149..4b622573193 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { branch = "1.15"; - homepage = https://www.gnu.org/software/automake/; + homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/automoc4/default.nix b/pkgs/development/tools/misc/automoc4/default.nix index c2bf7e0a831..1cabb1f0223 100644 --- a/pkgs/development/tools/misc/automoc4/default.nix +++ b/pkgs/development/tools/misc/automoc4/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 ]; meta = with stdenv.lib; { - homepage = https://techbase.kde.org/Development/Tools/Automoc4; + homepage = "https://techbase.kde.org/Development/Tools/Automoc4"; description = "KDE Meta Object Compiler"; license = licenses.bsd2; maintainers = [ maintainers.sander ]; diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index 39f98ae0028..bca091d6309 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers using the in-system programming technique (ISP). ''; - homepage = https://www.nongnu.org/avrdude/; + homepage = "https://www.nongnu.org/avrdude/"; license = licenses.gpl2Plus; platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/awf/default.nix b/pkgs/development/tools/misc/awf/default.nix index 8892142ad77..b1e627e7aa8 100644 --- a/pkgs/development/tools/misc/awf/default.nix +++ b/pkgs/development/tools/misc/awf/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { in a single window allowing to see the visual effect of the applied theme. ''; - homepage = https://github.com/valr/awf; + homepage = "https://github.com/valr/awf"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ michalrus ]; diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix index d9350d5f020..03539eb2cc8 100644 --- a/pkgs/development/tools/misc/babeltrace/default.nix +++ b/pkgs/development/tools/misc/babeltrace/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line tool and library to read and convert LTTng tracefiles"; - homepage = https://www.efficios.com/babeltrace; + homepage = "https://www.efficios.com/babeltrace"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/bashdb/default.nix b/pkgs/development/tools/misc/bashdb/default.nix index 72848d04930..0897960f6aa 100644 --- a/pkgs/development/tools/misc/bashdb/default.nix +++ b/pkgs/development/tools/misc/bashdb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Bash script debugger"; - homepage = http://bashdb.sourceforge.net/; + homepage = "http://bashdb.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.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 c246ddb9d90..8fc809f0f0c 100644 --- a/pkgs/development/tools/misc/bin_replace_string/default.nix +++ b/pkgs/development/tools/misc/bin_replace_string/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation { binaries, bin_replace_string may only replace a given C-string with a shorter C-string. ''; - homepage = http://ohnopub.net/~ohnobinki/bin_replace_string/; - downloadPage = ftp://ohnopub.net/mirror/; + homepage = "http://ohnopub.net/~ohnobinki/bin_replace_string/"; + downloadPage = "ftp://ohnopub.net/mirror/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 82365d986b8..cd05ea354ca 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -155,7 +155,7 @@ stdenv.mkDerivation { They also include the BFD (Binary File Descriptor) library, `gprof', `nm', `strip', etc. ''; - homepage = https://www.gnu.org/software/binutils/; + homepage = "https://www.gnu.org/software/binutils/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericson2314 ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 29aa99d3a15..224cf16d763 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { directory. It also places the FTDI version of the blackmagic executable in the bin directory. ''; - homepage = https://github.com/blacksphere/blackmagic; + homepage = "https://github.com/blacksphere/blackmagic"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pjones emily sorki ]; # fails on darwin with diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix index 6548e964397..38cc2867650 100644 --- a/pkgs/development/tools/misc/bossa/default.nix +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { name = "bossa-1.8"; src = fetchgit { - url = https://github.com/shumatech/BOSSA; + url = "https://github.com/shumatech/BOSSA"; rev = "3be622ca0aa6214a2fc51c1ec682c4a58a423d62"; sha256 = "19ik86qbffcb04cgmi4mnascbkck4ynfj87ha65qdk6fmp5q35vm"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation { Atmel's SAM-BA software. BOSSA is an acronym for Basic Open Source SAM-BA Application to reflect that goal. ''; - homepage = http://www.shumatech.com/web/products/bossa; + homepage = "http://www.shumatech.com/web/products/bossa"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index dd84e3830c4..35406c48534 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -48,7 +48,7 @@ EOF ]; meta = { - homepage = http://bsdbuild.hypertriton.com; + homepage = "http://bsdbuild.hypertriton.com"; description = "A cross-platform build system."; longDescription = '' diff --git a/pkgs/development/tools/misc/cbrowser/default.nix b/pkgs/development/tools/misc/cbrowser/default.nix index 6519f349bfc..f3ba4b3a70d 100644 --- a/pkgs/development/tools/misc/cbrowser/default.nix +++ b/pkgs/development/tools/misc/cbrowser/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = https://sourceforge.net/projects/cbrowser/; + homepage = "https://sourceforge.net/projects/cbrowser/"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 4eeb61a7edd..61ed3825bd9 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -71,8 +71,8 @@ let ccache = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiler cache for fast recompilation of C/C++ code"; - homepage = http://ccache.samba.org/; - downloadPage = https://ccache.samba.org/download.html; + homepage = "http://ccache.samba.org/"; + downloadPage = "https://ccache.samba.org/download.html"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index f442c16e351..cb5653583fd 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A c/c++ language server powered by clang"; - homepage = https://github.com/MaskRay/ccls; + homepage = "https://github.com/MaskRay/ccls"; license = licenses.asl20; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ mic92 tobim ]; diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index ed4886305e3..1215c29c477 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/cflow/; + homepage = "https://www.gnu.org/software/cflow/"; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/development/tools/misc/cgdb/default.nix b/pkgs/development/tools/misc/cgdb/default.nix index f823519fb34..a863cec1d4c 100644 --- a/pkgs/development/tools/misc/cgdb/default.nix +++ b/pkgs/development/tools/misc/cgdb/default.nix @@ -14,9 +14,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A curses interface to gdb"; - homepage = https://cgdb.github.io/; + homepage = "https://cgdb.github.io/"; - repositories.git = git://github.com/cgdb/cgdb.git; + repositories.git = "git://github.com/cgdb/cgdb.git"; license = licenses.gpl2Plus; diff --git a/pkgs/development/tools/misc/checkbashisms/default.nix b/pkgs/development/tools/misc/checkbashisms/default.nix index 887a0f16ec1..86ac37ee491 100644 --- a/pkgs/development/tools/misc/checkbashisms/default.nix +++ b/pkgs/development/tools/misc/checkbashisms/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://sourceforge.net/projects/checkbaskisms/; + homepage = "https://sourceforge.net/projects/checkbaskisms/"; description = "Check shell scripts for non-portable syntax"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/chrpath/default.nix b/pkgs/development/tools/misc/chrpath/default.nix index 3cae6aa2ae6..7e08157d7bd 100644 --- a/pkgs/development/tools/misc/chrpath/default.nix +++ b/pkgs/development/tools/misc/chrpath/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { binary. The rpath, or runpath if it is present, is where the runtime linker should look for the libraries needed for a program. ''; - homepage = https://tracker.debian.org/pkg/chrpath; + homepage = "https://tracker.debian.org/pkg/chrpath"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/chruby/default.nix b/pkgs/development/tools/misc/chruby/default.nix index 1aac0bd651c..bcc0687f55b 100644 --- a/pkgs/development/tools/misc/chruby/default.nix +++ b/pkgs/development/tools/misc/chruby/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Changes the current Ruby"; - homepage = https://github.com/postmodern/chruby; + homepage = "https://github.com/postmodern/chruby"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 0ab126b63e7..fde1c68d34d 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "circleci-cli"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; preBuild = '' diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index 53356e53a78..f6a4a4d9f6a 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI11 is a command line parser for C++11"; - homepage = https://github.com/CLIUtils/CLI11; + homepage = "https://github.com/CLIUtils/CLI11"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.unfreeRedistributable; diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index 4f8ae1a4149..c12d0319386 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,19 +2,23 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200305T151710"; + version = "20200314T202821"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "0zi05skp36azv0b6spxdscal32cj5rc6g0d0gzfnsaavvxd128lg"; + sha256 = "1phfy4cw8pdx2ylfqc4gkniawlz5qn1bih64cx0hsc5i8n0v6qjz"; }; dontUnpack = true; installPhase = '' install -Dm755 $src $out/bin/clojure-lsp + sed -i -e '1 s!java!${jre}/bin/java!' $out/bin/clojure-lsp ''; + # verify shebang patch + installCheckPhase = "PATH= clojure-lsp --version"; + meta = with stdenv.lib; { description = "Language Server Protocol (LSP) for Clojure"; homepage = "https://github.com/snoe/clojure-lsp"; diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 861a6eff164..f8cad56f099 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { and others) for finding and fixing bugs in systems code. ''; - homepage = http://coccinelle.lip6.fr/; + homepage = "http://coccinelle.lip6.fr/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index a2a39b81055..71ed762df04 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/complexity/; + homepage = "https://www.gnu.org/software/complexity/"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index e4d123dece1..8de7391b9ec 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://savannah.gnu.org/projects/cppi/; + homepage = "https://savannah.gnu.org/projects/cppi/"; description = "A C preprocessor directive indenter"; diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index 973caee64e8..8b4317a4538 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to generate C function prototypes from C source code"; - homepage = https://invisible-island.net/cproto/; + homepage = "https://invisible-island.net/cproto/"; license = licenses.publicDomain; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 87b3cbb7121..33a8bf1df61 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A c/c++ language server powered by libclang"; - homepage = https://github.com/cquery-project/cquery; + homepage = "https://github.com/cquery-project/cquery"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.tobim ]; diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index 1aa17bac750..943adf0e469 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A C program reducer"; - homepage = https://embed.cs.utah.edu/creduce; + homepage = "https://embed.cs.utah.edu/creduce"; # Officially, the license is: https://github.com/csmith-project/creduce/blob/master/COPYING license = licenses.ncsa; longDescription = '' diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 67cd321cfd5..31d4e83663b 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { license = "BSD-style"; - homepage = http://cscope.sourceforge.net/; + homepage = "http://cscope.sourceforge.net/"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 34cbadb38af..253dd4065e4 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A random generator of C programs"; - homepage = https://embed.cs.utah.edu/csmith; + homepage = "https://embed.cs.utah.edu/csmith"; # Officially, the license is this: https://github.com/csmith-project/csmith/blob/master/COPYING license = licenses.bsd2; longDescription = '' diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 86136084d84..3adca34a5bb 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { revision = "816"; src = fetchsvn { - url = https://svn.code.sf.net/p/ctags/code/trunk; + url = "https://svn.code.sf.net/p/ctags/code/trunk"; rev = revision; sha256 = "0jmbkrmscbl64j71qffcc39x005jrmphx8kirs1g2ws44wil39hf"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { alternatively, the index entry created for that object). Many programming languages are supported. ''; - homepage = http://ctags.sourceforge.net/; + homepage = "http://ctags.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/cwebbin/default.nix b/pkgs/development/tools/misc/cwebbin/default.nix index 3a54a17a93a..0b89156d71a 100644 --- a/pkgs/development/tools/misc/cwebbin/default.nix +++ b/pkgs/development/tools/misc/cwebbin/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; cweb = fetchurl { - url = https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz; + url = "https://www.ctan.org/tex-archive/web/c_cpp/cweb/cweb-3.64ah.tgz"; sha256 = "1hdzxfzaibnjxjzgp6d2zay8nsarnfy9hfq55hz1bxzzl23n35aj"; }; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index cc256bc23bd..53ba94c7e81 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -74,7 +74,7 @@ python3.pkgs.buildPythonApplication rec { D-Feet can be used to inspect D-Bus interfaces of running programs and invoke methods on those interfaces. ''; - homepage = https://wiki.gnome.org/Apps/DFeet; + homepage = "https://wiki.gnome.org/Apps/DFeet"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ ktosiek ]; diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index 5bccea9ced8..ad46534fcfa 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "dbench-2013-01-01"; src = fetchgit { - url = git://git.samba.org/sahlberg/dbench.git; + url = "git://git.samba.org/sahlberg/dbench.git"; rev = "65b19870ed8d25bff14cafa1c30beb33f1fb6597"; sha256 = "16lcbwmmx8z5i73k3dnf54yffrpx7ql3y9k3cpkss9dcyxb1p83i"; }; @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Filesystem benchmark tool based on load patterns"; - homepage = https://dbench.samba.org/; + homepage = "https://dbench.samba.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/ddd/default.nix b/pkgs/development/tools/misc/ddd/default.nix index 1ff96918766..174168b7db7 100644 --- a/pkgs/development/tools/misc/ddd/default.nix +++ b/pkgs/development/tools/misc/ddd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; meta = { - homepage = https://www.gnu.org/software/ddd; + 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; diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index 693c791875b..73e2ab8ef92 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { Tool command language. ''; - homepage = https://www.gnu.org/software/dejagnu/; + homepage = "https://www.gnu.org/software/dejagnu/"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 1dd53f62cec..10e6dc0d8b8 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.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/; + homepage = "http://dfu-programmer.sourceforge.net/"; maintainers = [ maintainers.the-kenny ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/dfu-util/default.nix b/pkgs/development/tools/misc/dfu-util/default.nix index bf1effbe71a..ecd40f20fd4 100644 --- a/pkgs/development/tools/misc/dfu-util/default.nix +++ b/pkgs/development/tools/misc/dfu-util/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { phones. With dfu-util you are able to download firmware to your device or upload firmware from it. ''; - homepage = http://dfu-util.sourceforge.net; + homepage = "http://dfu-util.sourceforge.net"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix index b82429cdac5..ead10577978 100644 --- a/pkgs/development/tools/misc/dialog/default.nix +++ b/pkgs/development/tools/misc/dialog/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installTargets = [ "install${stdenv.lib.optionalString withLibrary "-full"}" ]; meta = { - homepage = https://invisible-island.net/dialog/dialog.html; + homepage = "https://invisible-island.net/dialog/dialog.html"; description = "Display dialog boxes from shell"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = [ stdenv.lib.maintainers.spacefrogg ]; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 9891726c663..3894ed58728 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -73,7 +73,7 @@ let meta = { description = "A fast, free distributed C/C++ compiler"; - homepage = http://distcc.org; + homepage = "http://distcc.org"; license = "GPL"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/doclifter/default.nix b/pkgs/development/tools/misc/doclifter/default.nix index fe86a22b7f4..3c6fa76616f 100644 --- a/pkgs/development/tools/misc/doclifter/default.nix +++ b/pkgs/development/tools/misc/doclifter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "doclifter-2.19"; src = fetchurl { - url = http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz; + url = "http://www.catb.org/~esr/doclifter/doclifter-2.19.tar.gz"; sha256 = "1as6z7mdjrrkw2kism41q5ybvyzvwcmj9qzla2fz98v9f4jbj2s2"; }; buildInputs = [ python ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Lift documents in nroff markups to XML-DocBook"; - homepage = http://www.catb.org/esr/doclifter; + homepage = "http://www.catb.org/esr/doclifter"; license = "BSD"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix index e0f85c45f29..d5c345d9d22 100644 --- a/pkgs/development/tools/misc/drush/default.nix +++ b/pkgs/development/tools/misc/drush/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line shell and Unix scripting interface for Drupal"; - homepage = https://github.com/drush-ops/drush; + homepage = "https://github.com/drush-ops/drush"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; }; src = fetchurl { - url = https://github.com/drush-ops/drush/archive/6.1.0.tar.gz; + url = "https://github.com/drush-ops/drush/archive/6.1.0.tar.gz"; sha256 = "1jgnc4jjyapyn04iczvcz92ic0vq8d1w8xi55ismqyy5cxhqj6bp"; }; consoleTable = fetchurl { - url = http://download.pear.php.net/package/Console_Table-1.1.3.tgz; + url = "http://download.pear.php.net/package/Console_Table-1.1.3.tgz"; sha256 = "07gbjd7m1fj5dmavr0z20vkqwx1cz2522sj9022p257jifj1yl76"; }; diff --git a/pkgs/development/tools/misc/editorconfig-checker/default.nix b/pkgs/development/tools/misc/editorconfig-checker/default.nix index 335cd2f2524..88c43a8c42a 100644 --- a/pkgs/development/tools/misc/editorconfig-checker/default.nix +++ b/pkgs/development/tools/misc/editorconfig-checker/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "editorconfig-checker"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "1iiv12ginb3ky739z7v8wf4z5lv24gmghbybs3lzay0kqn449n4x"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to verify that your files are in harmony with your .editorconfig"; homepage = "https://editorconfig-checker.github.io/"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/editorconfig-core-c/default.nix b/pkgs/development/tools/misc/editorconfig-core-c/default.nix index 2eda1f044ce..e563ff203a2 100644 --- a/pkgs/development/tools/misc/editorconfig-core-c/default.nix +++ b/pkgs/development/tools/misc/editorconfig-core-c/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = https://editorconfig.org/; + homepage = "https://editorconfig.org/"; description = "EditorConfig core library written in C"; longDescription = '' EditorConfig makes it easy to maintain the correct coding style when @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { by those editors. For information on the file format and supported text editors, see the EditorConfig website. ''; - downloadPage = https://github.com/editorconfig/editorconfig-core-c; + downloadPage = "https://github.com/editorconfig/editorconfig-core-c"; license = with licenses; [ bsd2 bsd3 ]; version = "0.12.1"; maintainers = with maintainers; [ dochang ]; diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix index 7c7e5340434..d1211c9fcec 100644 --- a/pkgs/development/tools/misc/eggdbus/default.nix +++ b/pkgs/development/tools/misc/eggdbus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus dbus-glib ]; meta = with stdenv.lib; { - homepage = https://hal.freedesktop.org/releases/; + homepage = "https://hal.freedesktop.org/releases/"; description = "D-Bus bindings for GObject"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index 8628990d531..bd8a9fecee6 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Small utility for showing information about ELF files"; - homepage = https://elfinfo.roboticoverlords.org/; + homepage = "https://elfinfo.roboticoverlords.org/"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index 288e8bf9699..e8992b62665 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.muppetlabs.com/~breadbox/software/elfkickers.html; + homepage = "http://www.muppetlabs.com/~breadbox/software/elfkickers.html"; description = "A collection of programs that access and manipulate ELF files"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index 06f1e2895c0..56bfe26ec06 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -28,46 +28,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - # This program does not cross-build fine. So I only cross-build some parts - # I need for the linux perf tool. - # On the awful cross-building: - # http://comments.gmane.org/gmane.comp.sysutils.elfutils.devel/2005 - # - # I wrote this testing for the nanonote. - - buildPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - pushd libebl - make - popd - pushd libelf - make - popd - pushd libdwfl - make - popd - pushd libdw - make - popd - ''; - - installPhase = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' - pushd libelf - make install - popd - pushd libdwfl - make install - popd - pushd libdw - make install - popd - cp version.h $out/include - ''; - doCheck = false; # fails 3 out of 174 tests doInstallCheck = false; # fails 70 out of 174 tests meta = { - homepage = https://sourceware.org/elfutils/; + homepage = "https://sourceware.org/elfutils/"; description = "A set of utilities to handle ELF objects"; platforms = lib.platforms.linux; license = lib.licenses.gpl3; diff --git a/pkgs/development/tools/misc/epm/default.nix b/pkgs/development/tools/misc/epm/default.nix index b449c0a2d01..8caa33c20d1 100644 --- a/pkgs/development/tools/misc/epm/default.nix +++ b/pkgs/development/tools/misc/epm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The ESP Package Manager generates distribution archives for a variety of platforms"; - homepage = https://www.msweet.org/projects.php?Z2; + homepage = "https://www.msweet.org/projects.php?Z2"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/findnewest/default.nix b/pkgs/development/tools/misc/findnewest/default.nix index 6dd7e90f8f7..b289c16b7a6 100644 --- a/pkgs/development/tools/misc/findnewest/default.nix +++ b/pkgs/development/tools/misc/findnewest/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/0-wiz-0/findnewest; + homepage = "https://github.com/0-wiz-0/findnewest"; description = "Recursively find newest file in a hierarchy and print its timestamp"; license = licenses.bsd2; maintainers = with maintainers; [ bhipple ]; diff --git a/pkgs/development/tools/misc/fsatrace/default.nix b/pkgs/development/tools/misc/fsatrace/default.nix index b8202f94ce9..69d7c6b3919 100644 --- a/pkgs/development/tools/misc/fsatrace/default.nix +++ b/pkgs/development/tools/misc/fsatrace/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jacereda/fsatrace; + homepage = "https://github.com/jacereda/fsatrace"; description = "filesystem access tracer"; license = licenses.isc; maintainers = [ maintainers.peti ]; diff --git a/pkgs/development/tools/misc/fswatch/default.nix b/pkgs/development/tools/misc/fswatch/default.nix index a5c32bd3dc1..a1ea1d8903b 100644 --- a/pkgs/development/tools/misc/fswatch/default.nix +++ b/pkgs/development/tools/misc/fswatch/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cross-platform file change monitor with multiple backends"; - homepage = https://github.com/emcrisostomo/fswatch; + homepage = "https://github.com/emcrisostomo/fswatch"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index baaba624570..f6a001e488c 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { program was doing at the moment it crashed. ''; - homepage = https://www.gnu.org/software/gdb/; + homepage = "https://www.gnu.org/software/gdb/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index b021a3e222b..d5f8cfa173b 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { pname = "gdbgui"; - version = "0.13.1.1"; + version = "0.13.2.0"; buildInputs = [ gdb ]; propagatedBuildInputs = [ @@ -26,7 +26,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "1ypxgkxwb443ndyrmsa7zx2hn0d9b3s7n2w49ngfghd3l8k0yvi2"; + sha256 = "0m1fnwafzrpk77yj3p26vszlz11cv4g2lj38kymk1ilcifh4gqw0"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/gede/default.nix b/pkgs/development/tools/misc/gede/default.nix index 0965f9fcddc..b27c3a515bb 100644 --- a/pkgs/development/tools/misc/gede/default.nix +++ b/pkgs/development/tools/misc/gede/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = with lib; { description = "Graphical frontend (GUI) to GDB"; - homepage = http://gede.acidron.com; + homepage = "http://gede.acidron.com"; 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 a1a02632478..114a7530f27 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { fills a struct ''; - homepage = https://www.gnu.org/software/gengetopt/; + homepage = "https://www.gnu.org/software/gengetopt/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index edcca88c71d..6f24fc7251e 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { independence of any editor. It runs on a UNIX (POSIX) compatible operating system like GNU and BSD. ''; - homepage = https://www.gnu.org/software/global/; + homepage = "https://www.gnu.org/software/global/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index b01f85bb4a7..b301324e956 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional stdenv.isDarwin ./darwin-secure-format.patch; meta = { - homepage = https://www.gnu.org/software/m4/; + homepage = "https://www.gnu.org/software/m4/"; description = "GNU M4, a macro processor"; longDescription = '' diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 7ab7ff8b742..6675f7ed3e2 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "go-license-detector"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "163f1kiy7kqrnaazb8ydaaiz57lv30jyjkvv6i7pczvcg9yfhmdb"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Reliable project licenses detector"; homepage = "https://github.com/src-d/go-license-detector"; license = licenses.asl20; diff --git a/pkgs/development/tools/misc/gperf/3.0.x.nix b/pkgs/development/tools/misc/gperf/3.0.x.nix index 4a8b2e8daab..e013428a6f7 100644 --- a/pkgs/development/tools/misc/gperf/3.0.x.nix +++ b/pkgs/development/tools/misc/gperf/3.0.x.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/gperf/; + homepage = "https://www.gnu.org/software/gperf/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index cd0854d2beb..bf85cd91380 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/gperf/; + homepage = "https://www.gnu.org/software/gperf/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index 108d6190cb7..182d28375b6 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; + homepage = "https://sourceforge.net/p/globalplatform/wiki/Home/"; description = "Smartcard management application"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index efb61c4730f..6cdcce77ffd 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 ]; meta = { - homepage = https://code.google.com/archive/p/gtkdialog/; + 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; diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index 5b47ce0bc24..82ee2917277 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Application designed to test GTK performance"; - homepage = http://gtkperf.sourceforge.net/; + homepage = "http://gtkperf.sourceforge.net/"; license = with licenses; [ gpl2 ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 88a6a52d5e8..6231f0ccbe5 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ‘--version’ output of other commands. ''; - homepage = https://www.gnu.org/software/help2man/; + homepage = "https://www.gnu.org/software/help2man/"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/hydra-cli/default.nix b/pkgs/development/tools/misc/hydra-cli/default.nix index 5cdd9b0ce1d..b585d27b710 100644 --- a/pkgs/development/tools/misc/hydra-cli/default.nix +++ b/pkgs/development/tools/misc/hydra-cli/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1sj80a99iakxxa698gggiszsrxwlwhr2sx4wmsni0cshx6z2x6za"; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; nativeBuildInputs = [ pkgconfig - openssl ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix new file mode 100644 index 00000000000..52a91db6758 --- /dev/null +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -0,0 +1,135 @@ +{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub +, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx +, gitAndTools, mercurial, darcs, subversion, bazaar, 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 +, migration ? false, patches ? [] +}: + +with stdenv; + +if lib.versions.major nix.version == "1" + then throw "This Hydra version doesn't support Nix 1.x" +else + +let + perlDeps = buildEnv { + name = "hydra-perl-deps"; + paths = with perlPackages; lib.closePropagation + [ ModulePluggable + CatalystActionREST + CatalystAuthenticationStoreDBIxClass + CatalystDevel + CatalystDispatchTypeRegex + CatalystPluginAccessLog + CatalystPluginAuthorizationRoles + CatalystPluginCaptcha + CatalystPluginSessionStateCookie + CatalystPluginSessionStoreFastMmap + CatalystPluginSmartURI + CatalystPluginStackTrace + CatalystRuntime + CatalystTraitForRequestProxyBase + CatalystViewDownload + CatalystViewJSON + CatalystViewTT + CatalystXScriptServerStarman + CatalystXRoleApplicator + CryptRandPasswd + DBDPg + DBDSQLite + DataDump + DateTime + DigestSHA1 + EmailMIME + EmailSender + FileSlurp + IOCompress + IPCRun + JSON + JSONAny + JSONXS + LWP + LWPProtocolHttps + NetAmazonS3 + NetPrometheus + NetStatsd + PadWalker + Readonly + SQLSplitStatement + SetScalar + Starman + SysHostnameLong + TermSizeAny + TextDiff + TextTable + XMLSimple + nix + nix.perl-bindings + git + boehmgc + ]; + }; +in stdenv.mkDerivation rec { + pname = "hydra"; + + inherit stdenv src version patches; + + buildInputs = + [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx + gitAndTools.top-git mercurial /*darcs*/ subversion bazaar openssl bzip2 libxslt + perlDeps perl nix + postgresql # for running the tests + nlohmann_json + boost + ]; + + hydraPath = lib.makeBinPath ( + [ sqlite subversion openssh nix coreutils findutils pixz + gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial /*darcs*/ gnused bazaar + ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; + + NIX_CFLAGS_COMPILE = "-pthread"; + + shellHook = '' + PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH + PERL5LIB=$(pwd)/src/lib:$PERL5LIB; + ''; + + enableParallelBuilding = true; + + preCheck = '' + patchShebangs . + export LOGNAME=''${LOGNAME:-foo} + ''; + + postInstall = '' + mkdir -p $out/nix-support + for i in $out/bin/*; do + read -n 4 chars < $i + if [[ $chars =~ ELF ]]; then continue; fi + wrapProgram $i \ + --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ + --prefix PATH ':' $out/bin:$hydraPath \ + --set HYDRA_RELEASE ${version} \ + --set HYDRA_HOME $out/libexec/hydra \ + --set NIX_RELEASE ${nix.name or "unknown"} + done + ''; # */ + + dontStrip = true; + + passthru = { inherit perlDeps migration; }; + + meta = with stdenv.lib; { + description = "Nix-based continuous build system"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 72aecf20ca3..9e14e16dbaa 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,143 +1,38 @@ -{ stdenv, nix, perlPackages, buildEnv, fetchFromGitHub -, makeWrapper, autoconf, automake, libtool, unzip, pkgconfig, sqlite, libpqxx -, gitAndTools, mercurial, darcs, subversion, bazaar, 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 -}: - -with stdenv; - -if lib.versions.major nix.version == "1" - then throw "This Hydra version doesn't support Nix 1.x" -else - -let - perlDeps = buildEnv { - name = "hydra-perl-deps"; - paths = with perlPackages; lib.closePropagation - [ ModulePluggable - CatalystActionREST - CatalystAuthenticationStoreDBIxClass - CatalystDevel - CatalystDispatchTypeRegex - CatalystPluginAccessLog - CatalystPluginAuthorizationRoles - CatalystPluginCaptcha - CatalystPluginSessionStateCookie - CatalystPluginSessionStoreFastMmap - CatalystPluginStackTrace - CatalystPluginUnicodeEncoding - CatalystTraitForRequestProxyBase - CatalystViewDownload - CatalystViewJSON - CatalystViewTT - CatalystXScriptServerStarman - CatalystXRoleApplicator - CryptRandPasswd - DBDPg - DBDSQLite - DataDump - DateTime - DigestSHA1 - EmailMIME - EmailSender - FileSlurp - IOCompress - IPCRun - JSON - JSONAny - JSONXS - LWP - LWPProtocolHttps - NetAmazonS3 - NetPrometheus - NetStatsd - PadWalker - Readonly - SQLSplitStatement - SetScalar - Starman - SysHostnameLong - TermSizeAny - TestMore - TextDiff - TextTable - XMLSimple - nix - nix.perl-bindings - git - boehmgc - ]; +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch }: + +{ + # Package for phase-1 of the db migration for Hydra. + # https://github.com/NixOS/hydra/pull/711 + hydra-migration = callPackage ./common.nix { + version = "2020-02-10"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra"; + rev = "add4f610ce6f206fb44702b5a894d877b3a30e3a"; + sha256 = "1d8hdgjx2ys0zmixi2ydmimdq7ml20h1ji4amwawcyw59kssh6l3"; + }; + nix = nixStable; + migration = true; }; -in stdenv.mkDerivation rec { - pname = "hydra"; - version = "2020-02-06"; - inherit stdenv; - - src = fetchFromGitHub { - owner = "NixOS"; - repo = pname; - rev = "2b4f14963b16b21ebfcd6b6bfa7832842e9b2afc"; - sha256 = "16q0cffcsfx5pqd91n9k19850c1nbh4vvbd9h8yi64ihn7v8bick"; - }; - - buildInputs = - [ makeWrapper autoconf automake libtool unzip nukeReferences sqlite libpqxx - gitAndTools.top-git mercurial darcs subversion bazaar openssl bzip2 libxslt - guile # optional, for Guile + Guix support - perlDeps perl nix - postgresql # for running the tests - nlohmann_json - boost + # Hydra from latest master branch. Contains breaking changes, + # so when having an older version, `pkgs.hydra-migration` should be deployed first. + + hydra-unstable = callPackage ./common.nix { + version = "2020-04-07"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "hydra"; + rev = "4cabb37ebdeade1435ad8ebf1913cdd603b9c452"; + sha256 = "1ccy639x6yyrqqqqli7vlqm6pcvcq5dx1w3ckba77rl8pd5h31f7"; + }; + patches = [ + # https://github.com/NixOS/hydra/pull/732 + (fetchpatch { + url = "https://github.com/NixOS/hydra/commit/2f9d422172235297759f2b224fe0636cad07b6fb.patch"; + sha256 = "0152nsqqc5d85qdygmwrsk88i9y6nk1b639fj2n042pjvr0kpz6k"; + }) ]; - - hydraPath = lib.makeBinPath ( - [ sqlite subversion openssh nix coreutils findutils pixz - gzip bzip2 lzma gnutar unzip git gitAndTools.top-git mercurial darcs gnused bazaar - ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; - - NIX_CFLAGS_COMPILE = "-pthread"; - - shellHook = '' - PATH=$(pwd)/src/script:$(pwd)/src/hydra-eval-jobs:$(pwd)/src/hydra-queue-runner:$(pwd)/src/hydra-evaluator:$PATH - PERL5LIB=$(pwd)/src/lib:$PERL5LIB; - ''; - - enableParallelBuilding = true; - - preCheck = '' - patchShebangs . - export LOGNAME=''${LOGNAME:-foo} - ''; - - postInstall = '' - mkdir -p $out/nix-support - for i in $out/bin/*; do - read -n 4 chars < $i - if [[ $chars =~ ELF ]]; then continue; fi - wrapProgram $i \ - --prefix PERL5LIB ':' $out/libexec/hydra/lib:$PERL5LIB \ - --prefix PATH ':' $out/bin:$hydraPath \ - --set HYDRA_RELEASE ${version} \ - --set HYDRA_HOME $out/libexec/hydra \ - --set NIX_RELEASE ${nix.name or "unknown"} - done - ''; # */ - - dontStrip = true; - - passthru.perlDeps = perlDeps; - - meta = with stdenv.lib; { - description = "Nix-based continuous build system"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ ma27 ]; + nix = nixFlakes; }; } diff --git a/pkgs/development/tools/misc/icon-naming-utils/default.nix b/pkgs/development/tools/misc/icon-naming-utils/default.nix index d7b2cd36492..0905ce48463 100644 --- a/pkgs/development/tools/misc/icon-naming-utils/default.nix +++ b/pkgs/development/tools/misc/icon-naming-utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification; + 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 996dda4ca94..0780672cc02 100644 --- a/pkgs/development/tools/misc/igprof/default.nix +++ b/pkgs/development/tools/misc/igprof/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; - homepage = https://igprof.org/; + homepage = "https://igprof.org/"; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ktf ]; }; diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index ead13e340d5..a9d642f48f0 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/rvoicilas/inotify-tools/wiki; + homepage = "https://github.com/rvoicilas/inotify-tools/wiki"; license = licenses.gpl2; maintainers = with maintainers; [ marcweber pSub ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index c837728f72d..91acaac75aa 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Translation helper tool"; - homepage = https://launchpad.net/intltool/; + homepage = "https://launchpad.net/intltool/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/iozone/default.nix b/pkgs/development/tools/misc/iozone/default.nix index 1d5da65df7e..e6beeca1d72 100644 --- a/pkgs/development/tools/misc/iozone/default.nix +++ b/pkgs/development/tools/misc/iozone/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { name = "iozone-3.471"; src = fetchurl { - url = http://www.iozone.org/src/current/iozone3_471.tar; + url = "http://www.iozone.org/src/current/iozone3_471.tar"; sha256 = "0w63b3d4ws1sm52lpdd08sl7n4ay438dl3wy0q9la12iq81rglid"; }; license = fetchurl { - url = http://www.iozone.org/docs/Iozone_License.txt; + url = "http://www.iozone.org/docs/Iozone_License.txt"; sha256 = "1309sl1rqm8p9gll3z8zfygr2pmbcvzw5byf5ba8y12avk735zrv"; }; @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = "IOzone Filesystem Benchmark"; - homepage = http://www.iozone.org/; + homepage = "http://www.iozone.org/"; license = stdenv.lib.licenses.unfreeRedistributable; platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; maintainers = with stdenv.lib.maintainers; [ Baughn makefu ]; diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index a5c3623b699..daa06acb289 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ (python3.withPackages(ps: with ps; [ libxml2 ])) ]; meta = { - homepage = http://itstool.org/; + homepage = "http://itstool.org/"; description = "XML to PO and back again"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/jscoverage/default.nix b/pkgs/development/tools/misc/jscoverage/default.nix index af660561ee1..6ed66c8d3cc 100644 --- a/pkgs/development/tools/misc/jscoverage/default.nix +++ b/pkgs/development/tools/misc/jscoverage/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { GNU/Linux. ''; - homepage = http://siliconforks.com/jscoverage/; + homepage = "http://siliconforks.com/jscoverage/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/kconfig-frontends/default.nix b/pkgs/development/tools/misc/kconfig-frontends/default.nix index e33259b416f..fa413511dc0 100644 --- a/pkgs/development/tools/misc/kconfig-frontends/default.nix +++ b/pkgs/development/tools/misc/kconfig-frontends/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { types, simple organization of options, and direct and reverse dependencies. ''; - homepage = http://ymorin.is-a-geek.org/projects/kconfig-frontends; + homepage = "http://ymorin.is-a-geek.org/projects/kconfig-frontends"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ mbe ]; diff --git a/pkgs/development/tools/misc/kdbg/default.nix b/pkgs/development/tools/misc/kdbg/default.nix index 29bf1333aa0..472e9c5857b 100644 --- a/pkgs/development/tools/misc/kdbg/default.nix +++ b/pkgs/development/tools/misc/kdbg/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.kdbg.org/; + homepage = "http://www.kdbg.org/"; description = '' A graphical user interface to gdb, the GNU debugger. It provides an intuitive interface for setting breakpoints, inspecting variables, and diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix index 9605a035be6..354f77d0fb9 100644 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ b/pkgs/development/tools/misc/kibana/6.x.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = { description = "Visualize logs and time-stamped data"; - homepage = http://www.elasticsearch.org/overview/kibana; + homepage = "http://www.elasticsearch.org/overview/kibana"; license = if enableUnfree then licenses.elastic else licenses.asl20; maintainers = with maintainers; [ offline basvandijk ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/misc/kibana/7.x.nix b/pkgs/development/tools/misc/kibana/7.x.nix index a0f2f8f546a..dc3beb9866c 100644 --- a/pkgs/development/tools/misc/kibana/7.x.nix +++ b/pkgs/development/tools/misc/kibana/7.x.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = { description = "Visualize logs and time-stamped data"; - homepage = http://www.elasticsearch.org/overview/kibana; + homepage = "http://www.elasticsearch.org/overview/kibana"; license = if enableUnfree then licenses.elastic else licenses.asl20; maintainers = with maintainers; [ offline basvandijk ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index f56a59c4270..debc4107882 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { documentation for details. ''; - homepage = https://www.gnu.org/software/libtool/; + homepage = "https://www.gnu.org/software/libtool/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix index 0424b901251..4bf637c0eba 100644 --- a/pkgs/development/tools/misc/libtool/libtool2.nix +++ b/pkgs/development/tools/misc/libtool/libtool2.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { your Makefile, Makefile.in, or Makefile.am. See the documentation for details. ''; - homepage = https://www.gnu.org/software/libtool/; + homepage = "https://www.gnu.org/software/libtool/"; license = licenses.gpl2Plus; maintainers = [ ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix index c751c275558..59bbb99bd46 100644 --- a/pkgs/development/tools/misc/libwhich/default.nix +++ b/pkgs/development/tools/misc/libwhich/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Like `which`, for dynamic libraries"; - homepage = https://github.com/vtjnash/libwhich; + homepage = "https://github.com/vtjnash/libwhich"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 5dd6f422713..4fe7740cadf 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with lib; { description = "A toolkit for building secure, portable and lean operating systems for containers"; license = licenses.asl20; - homepage = https://github.com/linuxkit/linuxkit; + homepage = "https://github.com/linuxkit/linuxkit"; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/lit/default.nix b/pkgs/development/tools/misc/lit/default.nix index c4164b41433..1e511cc0f0b 100644 --- a/pkgs/development/tools/misc/lit/default.nix +++ b/pkgs/development/tools/misc/lit/default.nix @@ -1,12 +1,16 @@ -{ lib, python2 }: +{ lib, python3 }: -python2.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "lit"; - version = "0.8.0"; + version = "0.9.0"; - src = python2.pkgs.fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0lwx1w1vk3a0pc237chwycl8qc6lwq8bzf13036wnmk74m9kwi7c"; + sha256 = "0vkqv0ijjkfg70j26cxqz75bpn2p78all5j5cw2gfcrn4c5aldf0"; + }; + + passthru = { + python = python3; }; # Non-standard test suite. Needs custom checkPhase. @@ -14,7 +18,7 @@ python2.pkgs.buildPythonApplication rec { meta = { description = "Portable tool for executing LLVM and Clang style test suites"; - homepage = http://llvm.org/docs/CommandGuide/lit.html; + homepage = "http://llvm.org/docs/CommandGuide/lit.html"; license = lib.licenses.ncsa; maintainers = with lib.maintainers; [ dtzWill ]; }; diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index b8fa02306c4..d88d9d7a7be 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ltrace-0.7.3"; src = fetchurl { - url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2; + url = "mirror://debian/pool/main/l/ltrace/ltrace_0.7.3.orig.tar.bz2"; sha256 = "00wmbdghqbz6x95m1mcdd3wd46l6hgcr4wggdp049dbifh3qqvqf"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { prePatch = let debian = fetchurl { - url = mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz; + url = "mirror://debian/pool/main/l/ltrace/ltrace_0.7.3-6.debian.tar.xz"; sha256 = "0xc4pfd8qw53crvdxr29iwl8na53zmknca082kziwpvlzsick4kp"; }; in '' @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Library call tracer"; - homepage = https://www.ltrace.org/; + homepage = "https://www.ltrace.org/"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.gpl2; }; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 815d5aac406..03e370aeeb4 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tracing tools (kernel + user space) for Linux"; - homepage = https://lttng.org/; + homepage = "https://lttng.org/"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix index 4b0be0f0fa4..1b59045c6fd 100644 --- a/pkgs/development/tools/misc/lttng-ust/default.nix +++ b/pkgs/development/tools/misc/lttng-ust/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LTTng Userspace Tracer libraries"; - homepage = https://lttng.org/; + homepage = "https://lttng.org/"; license = licenses.lgpl21Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix index 36a89726e81..abcc476d594 100644 --- a/pkgs/development/tools/misc/lttv/default.nix +++ b/pkgs/development/tools/misc/lttv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Graphical trace viewer for LTTng trace files"; - homepage = https://lttng.org/; + homepage = "https://lttng.org/"; # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1. # The rest of the LTTV package is distributed under the GNU GPL v2. license = with licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/development/tools/misc/macdylibbundler/default.nix b/pkgs/development/tools/misc/macdylibbundler/default.nix index 518d128890a..103c534dfa3 100644 --- a/pkgs/development/tools/misc/macdylibbundler/default.nix +++ b/pkgs/development/tools/misc/macdylibbundler/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { this with a single command on the teminal! It will also work if your program uses plug-ins that have dependencies too. ''; - homepage = https://github.com/auriamg/macdylibbundler; + homepage = "https://github.com/auriamg/macdylibbundler"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.nomeata ]; diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix index 7cbd9246081..eaff8e1f88a 100644 --- a/pkgs/development/tools/misc/md2man/default.nix +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Go tool to convert markdown to man pages"; license = licenses.mit; - homepage = https://github.com/cpuguy83/go-md2man; + homepage = "https://github.com/cpuguy83/go-md2man"; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/mdl/Gemfile.lock b/pkgs/development/tools/misc/mdl/Gemfile.lock index aabcd784d86..04268d3306c 100644 --- a/pkgs/development/tools/misc/mdl/Gemfile.lock +++ b/pkgs/development/tools/misc/mdl/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES mdl BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/misc/mdl/default.nix b/pkgs/development/tools/misc/mdl/default.nix index eda2fabd9c6..ada686f2498 100644 --- a/pkgs/development/tools/misc/mdl/default.nix +++ b/pkgs/development/tools/misc/mdl/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A tool to check markdown files and flag style issues"; - homepage = https://github.com/markdownlint/markdownlint; + homepage = "https://github.com/markdownlint/markdownlint"; license = licenses.mit; maintainers = with maintainers; [ gerschtli manveru nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/mkcert/default.nix b/pkgs/development/tools/misc/mkcert/default.nix index 6a114a8de8b..1449a55e3a8 100644 --- a/pkgs/development/tools/misc/mkcert/default.nix +++ b/pkgs/development/tools/misc/mkcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mkcert"; @@ -19,10 +19,8 @@ buildGoModule rec { -X ${goPackagePath}/main.Version=${version} ''; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { - homepage = https://github.com/FiloSottile/mkcert; + meta = with lib; { + homepage = "https://github.com/FiloSottile/mkcert"; description = "A simple tool for making locally-trusted development certificates"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 5c2b0ad0ee3..0e28f729fe9 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; - homepage = https://wiki.gnome.org/msitools; + homepage = "https://wiki.gnome.org/msitools"; license = [ licenses.gpl2 licenses.lgpl21 ]; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/misc/ninka/default.nix b/pkgs/development/tools/misc/ninka/default.nix index 8af12170798..e683bef7b06 100644 --- a/pkgs/development/tools/misc/ninka/default.nix +++ b/pkgs/development/tools/misc/ninka/default.nix @@ -28,7 +28,7 @@ perlPackages.buildPerlPackage { meta = with stdenv.lib; { description = "A sentence based license detector"; - homepage = http://ninka.turingmachine.org/; + homepage = "http://ninka.turingmachine.org/"; license = licenses.gpl2; maintainers = [ maintainers.vrthra ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix index 164e0e80b60..468623241bf 100644 --- a/pkgs/development/tools/misc/nixbang/default.nix +++ b/pkgs/development/tools/misc/nixbang/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication { }; meta = { - homepage = https://github.com/madjar/nixbang; + homepage = "https://github.com/madjar/nixbang"; description = "A special shebang to run scripts in a nix-shell"; maintainers = [ lib.maintainers.madjar ]; platforms = lib.platforms.all; diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index dea6256824d..9fdaca52ca8 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Object and executable file converter, modifier and disassembler"; - homepage = https://www.agner.org/optimize/; + homepage = "https://www.agner.org/optimize/"; license = licenses.gpl2; maintainers = with maintainers; [ orivej vrthra ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/one_gadget/Gemfile.lock b/pkgs/development/tools/misc/one_gadget/Gemfile.lock index ea31cc3704f..db20c8b0ffd 100644 --- a/pkgs/development/tools/misc/one_gadget/Gemfile.lock +++ b/pkgs/development/tools/misc/one_gadget/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES one_gadget BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/misc/one_gadget/default.nix b/pkgs/development/tools/misc/one_gadget/default.nix index 1c2cbe35439..c3d0a6b57b4 100644 --- a/pkgs/development/tools/misc/one_gadget/default.nix +++ b/pkgs/development/tools/misc/one_gadget/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "The best tool for finding one gadget RCE in libc.so.6"; - homepage = https://github.com/david942j/one_gadget; + homepage = "https://github.com/david942j/one_gadget"; license = licenses.mit; maintainers = with maintainers; [ artemist nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 21e825ac0bf..79fa383300e 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code search and cross reference engine"; - homepage = https://opengrok.github.io/OpenGrok/; + homepage = "https://opengrok.github.io/OpenGrok/"; license = licenses.cddl; maintainers = [ maintainers.lethalman ]; }; diff --git a/pkgs/development/tools/misc/openocd/default.nix b/pkgs/development/tools/misc/openocd/default.nix index 7ebf4a1e065..0d6bcd959eb 100644 --- a/pkgs/development/tools/misc/openocd/default.nix +++ b/pkgs/development/tools/misc/openocd/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { "remote target" for source-level debugging of embedded systems using the GNU GDB program. ''; - homepage = http://openocd.sourceforge.net/; + homepage = "http://openocd.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 015fc534f6b..8541c7a307a 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "pahole"; version = "1.16"; src = fetchgit { - url = https://git.kernel.org/pub/scm/devel/pahole/pahole.git; + url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; rev = "v${version}"; sha256 = "1gfc9v4dgs811v1zjk0d9hsgmizllw2hibc83ykmakzysimaxsy3"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-D__LIB=lib" ]; meta = with stdenv.lib; { - homepage = https://git.kernel.org/cgit/devel/pahole/pahole.git/; + 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 77d03f299f4..ad09cdc6eb3 100644 --- a/pkgs/development/tools/misc/patchelf/default.nix +++ b/pkgs/development/tools/misc/patchelf/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 8 out of 24 tests, problems when loading libc.so.6 meta = with stdenv.lib; { - homepage = https://nixos.org/patchelf.html; + 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"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix index f5ff1c74bcc..05d39ed5653 100644 --- a/pkgs/development/tools/misc/patchelf/unstable.nix +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { - homepage = https://nixos.org/patchelf.html; + 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"; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/development/tools/misc/pkg-config/default.nix b/pkgs/development/tools/misc/pkg-config/default.nix index 13855eb4e74..494b8d893d4 100644 --- a/pkgs/development/tools/misc/pkg-config/default.nix +++ b/pkgs/development/tools/misc/pkg-config/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "A tool that allows packages to find out information about other packages"; - homepage = http://pkg-config.freedesktop.org/wiki/; + homepage = "http://pkg-config.freedesktop.org/wiki/"; platforms = platforms.all; license = licenses.gpl2Plus; }; diff --git a/pkgs/development/tools/misc/pkgconf/default.nix b/pkgs/development/tools/misc/pkgconf/default.nix index e4a6416129e..02b7ff5fcd3 100644 --- a/pkgs/development/tools/misc/pkgconf/default.nix +++ b/pkgs/development/tools/misc/pkgconf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Package compiler and linker metadata toolkit"; - homepage = https://git.dereferenced.org/pkgconf/pkgconf; + homepage = "https://git.dereferenced.org/pkgconf/pkgconf"; platforms = platforms.all; license = licenses.isc; maintainers = with maintainers; [ zaninime ]; diff --git a/pkgs/development/tools/misc/pmccabe/default.nix b/pkgs/development/tools/misc/pmccabe/default.nix index 0b91953a7c7..81a88f20ad2 100644 --- a/pkgs/development/tools/misc/pmccabe/default.nix +++ b/pkgs/development/tools/misc/pmccabe/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "McCabe-style function complexity and line counting for C and C++"; - homepage = https://people.debian.org/~bame/pmccabe/; + homepage = "https://people.debian.org/~bame/pmccabe/"; license = licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index 7bfff632826..5d7ca75de32 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { }; meta = { - homepage = https://people.redhat.com/jakub/prelink/; + homepage = "https://people.redhat.com/jakub/prelink/"; license = "GPL"; description = "ELF prelinking utility to speed up dynamic linking"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix index a94614af796..a630c0ced9e 100644 --- a/pkgs/development/tools/misc/premake/3.nix +++ b/pkgs/development/tools/misc/premake/3.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = http://industriousone.com/premake; + 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; diff --git a/pkgs/development/tools/misc/premake/5.nix b/pkgs/development/tools/misc/premake/5.nix index d9d28580210..5e8606833d3 100644 --- a/pkgs/development/tools/misc/premake/5.nix +++ b/pkgs/development/tools/misc/premake/5.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = https://premake.github.io; + homepage = "https://premake.github.io"; description = "A simple build configuration and project generation tool using lua"; license = stdenv.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 99bf8cac81f..92445abbba9 100644 --- a/pkgs/development/tools/misc/premake/default.nix +++ b/pkgs/development/tools/misc/premake/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = with stdenv.lib; { - homepage = http://industriousone.com/premake; + homepage = "http://industriousone.com/premake"; description = "A simple build configuration and project generation tool using lua"; license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index aecd373f09e..9af294716ff 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "reviewdog"; @@ -13,13 +13,11 @@ buildGoModule rec { modSha256 = "1jf08g0xr4wknh9x15igq73y02cy2faqjdjs2v842ii4p3n4p9dw"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "cmd/reviewdog" ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; homepage = "https://github.com/reviewdog/reviewdog"; changelog = "https://github.com/reviewdog/reviewdog/releases/tag/v${version}"; diff --git a/pkgs/development/tools/misc/rman/default.nix b/pkgs/development/tools/misc/rman/default.nix index 8093846780d..09769d5c591 100644 --- a/pkgs/development/tools/misc/rman/default.nix +++ b/pkgs/development/tools/misc/rman/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "rman-3.2"; src = fetchurl { - url = mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz; + url = "mirror://sourceforge/polyglotman/3.2/rman-3.2.tar.gz"; sha256 = "0prdld6nbkdlkcgc2r1zp13h2fh8r0mlwxx423dnc695ddlk18b8"; }; diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix index 1e85e87c537..6eb13bb242d 100644 --- a/pkgs/development/tools/misc/rolespec/default.nix +++ b/pkgs/development/tools/misc/rolespec/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://github.com/nickjj/rolespec; + homepage = "https://github.com/nickjj/rolespec"; description = "A test library for testing Ansible roles"; longDescription = '' A shell based test library for Ansible that works both locally and over diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index ffb537abfba..a7e197f9d7e 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software for Saleae logic analyzers"; - homepage = https://www.saleae.com/; + homepage = "https://www.saleae.com/"; license = licenses.unfree; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/semver-tool/default.nix b/pkgs/development/tools/misc/semver-tool/default.nix index 879346a2b79..0c1bb8ede1b 100644 --- a/pkgs/development/tools/misc/semver-tool/default.nix +++ b/pkgs/development/tools/misc/semver-tool/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/fsaintjacques/semver-tool; + homepage = "https://github.com/fsaintjacques/semver-tool"; description = "semver bash implementation"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/sipp/default.nix b/pkgs/development/tools/misc/sipp/default.nix index eec1f32b4df..610e66a2b9c 100644 --- a/pkgs/development/tools/misc/sipp/default.nix +++ b/pkgs/development/tools/misc/sipp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ncurses libpcap]; meta = with stdenv.lib; { - homepage = http://sipp.sf.net; + homepage = "http://sipp.sf.net"; description = "The SIPp testing tool"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 4d63e2c6a15..b2b83aa79b1 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = https://www.dwheeler.com/sloccount/; + homepage = "https://www.dwheeler.com/sloccount/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/misc/srecord/default.nix b/pkgs/development/tools/misc/srecord/default.nix index fd810555296..f978d4d4e12 100644 --- a/pkgs/development/tools/misc/srecord/default.nix +++ b/pkgs/development/tools/misc/srecord/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of powerful tools for manipulating EPROM load files"; - homepage = http://srecord.sourceforge.net/; + homepage = "http://srecord.sourceforge.net/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bjornfor ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/misc/stm32flash/default.nix b/pkgs/development/tools/misc/stm32flash/default.nix index 553ded815ef..a67430d52a1 100644 --- a/pkgs/development/tools/misc/stm32flash/default.nix +++ b/pkgs/development/tools/misc/stm32flash/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source flash program for the STM32 ARM processors using the ST bootloader"; - homepage = https://sourceforge.net/projects/stm32flash/; + homepage = "https://sourceforge.net/projects/stm32flash/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; # Should work on all platforms maintainers = with maintainers; [ the-kenny elitak ]; diff --git a/pkgs/development/tools/misc/swig/2.x.nix b/pkgs/development/tools/misc/swig/2.x.nix index 80cfdc8b196..745cc9a2e78 100644 --- a/pkgs/development/tools/misc/swig/2.x.nix +++ b/pkgs/development/tools/misc/swig/2.x.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = http://swig.org/; + homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/swig/3.x.nix b/pkgs/development/tools/misc/swig/3.x.nix index 262afe4f189..75b0113b497 100644 --- a/pkgs/development/tools/misc/swig/3.x.nix +++ b/pkgs/development/tools/misc/swig/3.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = http://swig.org/; + homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index 079c5e7ef3c..a35a9a35281 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = http://swig.org/; + homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index e74b2898498..cf0880855db 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; - homepage = http://swig.org/; + homepage = "http://swig.org/"; # Different types of licenses available: http://www.swig.org/Release/LICENSE . license = licenses.gpl3Plus; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index dbb8057292b..10748d75159 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Modular, cross-platform and multi-threaded benchmark tool"; - homepage = https://github.com/akopytov/sysbench; + homepage = "https://github.com/akopytov/sysbench"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index 67e8df9561f..e533b065f41 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -1,25 +1,23 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "terracognita"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "1d5yi2jxmk04wcz8rjwa5kz9525j8s90d4rj2d4cbgd3lbbk45qq"; + sha256 = "0ib0p361sxh2qzxccg32pcml4by4mk45abhljwmljwybs34wh5rh"; }; - modSha256 = "0xlhp8pa5g6an10m56g237pixc4h6ay89hkp1ijdz45iyfn9fk91"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1cbhm3jwv0z9fh1q8mva56nbsp9rfyjcs03yxrc8ffkvif0gapps"; subPackages = [ "." ]; buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; homepage = "https://github.com/cycloidio/terracognita"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/tet/default.nix b/pkgs/development/tools/misc/tet/default.nix index fb38d096ab4..acc42d61423 100644 --- a/pkgs/development/tools/misc/tet/default.nix +++ b/pkgs/development/tools/misc/tet/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation ({ pname = "tet"; src = fetchurl { - url = http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz ; + url = "http://tetworks.opengroup.org/downloads/38/software/Sources/3.8/tet3.8-src.tar.gz"; sha256 = "1j57hv56df38w249l595b8rsgmsyvjkbysai03a9724gax5jl9av" ; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation ({ 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 ; + homepage = "http://tetworks.opengroup.org/Products/tet.htm"; license = stdenv.lib.licenses.artistic1; platforms = stdenv.lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/development/tools/misc/texi2html/default.nix b/pkgs/development/tools/misc/texi2html/default.nix index 247733b81ba..755bfcd7274 100644 --- a/pkgs/development/tools/misc/texi2html/default.nix +++ b/pkgs/development/tools/misc/texi2html/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Perl script which converts Texinfo source files to HTML output"; - homepage = https://www.nongnu.org/texi2html/; + homepage = "https://www.nongnu.org/texi2html/"; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 56ae48b7133..1fb8a6b2f0d 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { && !stdenv.isSunOS; # flaky meta = { - homepage = https://www.gnu.org/software/texinfo/; + homepage = "https://www.gnu.org/software/texinfo/"; description = "The GNU documentation system"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index be3a6d47a15..1edc86017ba 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "An implementation of the Language Server Protocol for LaTeX"; - homepage = https://texlab.netlify.com/; + homepage = "https://texlab.netlify.com/"; license = licenses.mit; maintainers = with maintainers; [ doronbehar metadark ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/tie/default.nix b/pkgs/development/tools/misc/tie/default.nix index 5e40152df8d..074523309b6 100644 --- a/pkgs/development/tools/misc/tie/default.nix +++ b/pkgs/development/tools/misc/tie/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.ctan.org/tex-archive/web/tie; + homepage = "https://www.ctan.org/tex-archive/web/tie"; description = "Allow multiple web change files"; platforms = with platforms; unix; maintainers = with maintainers; [ vrthra ]; diff --git a/pkgs/development/tools/misc/tinyprog/default.nix b/pkgs/development/tools/misc/tinyprog/default.nix index 65d2ce37814..4618906038e 100644 --- a/pkgs/development/tools/misc/tinyprog/default.nix +++ b/pkgs/development/tools/misc/tinyprog/default.nix @@ -35,7 +35,7 @@ with python3Packages; buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer; + homepage = "https://github.com/tinyfpga/TinyFPGA-Bootloader/tree/master/programmer"; description = "Programmer for FPGA boards using the TinyFPGA USB Bootloader"; maintainers = with maintainers; [ emily ]; license = licenses.asl20; diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index a06bf4f248a..bc303629775 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { 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. ''; - homepage = https://github.com/XAMPPRocky/tokei; + homepage = "https://github.com/XAMPPRocky/tokei"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gebner lilyball ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock index c13c9646393..e26b31cbaf0 100644 --- a/pkgs/development/tools/misc/travis/Gemfile.lock +++ b/pkgs/development/tools/misc/travis/Gemfile.lock @@ -54,4 +54,4 @@ DEPENDENCIES travis BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix index 9020766fd86..0be7721fe08 100644 --- a/pkgs/development/tools/misc/travis/default.nix +++ b/pkgs/development/tools/misc/travis/default.nix @@ -9,7 +9,7 @@ bundlerEnv { meta = with lib; { description = "CLI and Ruby client library for Travis CI"; - homepage = https://github.com/travis-ci/travis.rb; + homepage = "https://github.com/travis-ci/travis.rb"; license = licenses.mit; maintainers = with maintainers; [ zimbatm nicknovitski ]; }; diff --git a/pkgs/development/tools/misc/uisp/default.nix b/pkgs/development/tools/misc/uisp/default.nix index 1727f772006..ca51e089733 100644 --- a/pkgs/development/tools/misc/uisp/default.nix +++ b/pkgs/development/tools/misc/uisp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "uisp-20050207"; src = fetchurl { - url = http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz; + url = "http://mirror.switch.ch/mirror/gentoo/distfiles/uisp-20050207.tar.gz"; sha256 = "1bncxp5yxh9r1yrp04vvhfiva8livi1pwic7v8xj99q09zrwahvw"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Tool for AVR microcontrollers which can interface to many hardware in-system programmers"; license = stdenv.lib.licenses.gpl2; - homepage = https://savannah.nongnu.org/projects/uisp; + homepage = "https://savannah.nongnu.org/projects/uisp"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/misc/uncrustify/default.nix b/pkgs/development/tools/misc/uncrustify/default.nix index 01ed6603018..d13212085ef 100644 --- a/pkgs/development/tools/misc/uncrustify/default.nix +++ b/pkgs/development/tools/misc/uncrustify/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Source code beautifier for C, C++, C#, ObjectiveC, D, Java, Pawn and VALA"; - homepage = http://uncrustify.sourceforge.net/; + homepage = "http://uncrustify.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/unifdef/default.nix b/pkgs/development/tools/misc/unifdef/default.nix index 8fc26842350..19dd907b73b 100644 --- a/pkgs/development/tools/misc/unifdef/default.nix +++ b/pkgs/development/tools/misc/unifdef/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dotat.at/prog/unifdef/; + homepage = "http://dotat.at/prog/unifdef/"; description = "Selectively remove C preprocessor conditionals"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/universal-ctags/default.nix b/pkgs/development/tools/misc/universal-ctags/default.nix index c104adc78cc..0bf902eccff 100644 --- a/pkgs/development/tools/misc/universal-ctags/default.nix +++ b/pkgs/development/tools/misc/universal-ctags/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A maintained ctags implementation"; - homepage = https://ctags.io/; + homepage = "https://ctags.io/"; license = licenses.gpl2Plus; platforms = platforms.unix; # universal-ctags is preferred over emacs's ctags diff --git a/pkgs/development/tools/misc/vtable-dumper/default.nix b/pkgs/development/tools/misc/vtable-dumper/default.nix index 2b6e349b9fd..a44140c1445 100644 --- a/pkgs/development/tools/misc/vtable-dumper/default.nix +++ b/pkgs/development/tools/misc/vtable-dumper/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/lvc/vtable-dumper; + homepage = "https://github.com/lvc/vtable-dumper"; description = "A tool to list content of virtual tables in a C++ shared library"; license = licenses.lgpl21; maintainers = [ maintainers.bhipple ]; diff --git a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock index fa157d794f7..9e3c166400f 100644 --- a/pkgs/development/tools/misc/watson-ruby/Gemfile.lock +++ b/pkgs/development/tools/misc/watson-ruby/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES watson-ruby BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/development/tools/misc/watson-ruby/default.nix b/pkgs/development/tools/misc/watson-ruby/default.nix index 4d73e106b2f..81f5430371a 100644 --- a/pkgs/development/tools/misc/watson-ruby/default.nix +++ b/pkgs/development/tools/misc/watson-ruby/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An inline issue manager"; - homepage = https://goosecode.com/watson/; + homepage = "https://goosecode.com/watson/"; license = with licenses; mit; maintainers = with maintainers; [ robertodr nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix index 0c6e4f568ff..c882d6243fa 100644 --- a/pkgs/development/tools/misc/whatstyle/default.nix +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -2,12 +2,12 @@ python3.pkgs.buildPythonApplication rec { pname = "whatstyle"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "mikr"; repo = pname; rev = "v${version}"; - sha256 = "16ak4g149cr764c1lqakiyzmf5s98w8bdc4gk69m8qacimfg3mzm"; + sha256 = "08lfd8h5fnvy5gci4f3an411cypad7p2yiahvbmlp51r9xwpaiwr"; }; # Fix references to previous version, to avoid confusion: @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Find a code format style that fits given source files"; - homepage = https://github.com/mikr/whatstyle; + homepage = "https://github.com/mikr/whatstyle"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index 68897105f5c..b39e9028afd 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; - homepage = http://xc3sprog.sourceforge.net/; + homepage = "http://xc3sprog.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index 7befc0fef2d..aee7af17730 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A code-completion and comprehension server"; - homepage = https://github.com/Valloric/ycmd; + homepage = "https://github.com/Valloric/ycmd"; license = licenses.gpl3; maintainers = with maintainers; [ rasendubi cstrahan lnl7 ]; platforms = platforms.all; diff --git a/pkgs/development/tools/misc/yodl/default.nix b/pkgs/development/tools/misc/yodl/default.nix index 38a92bc5482..758bebb57df 100644 --- a/pkgs/development/tools/misc/yodl/default.nix +++ b/pkgs/development/tools/misc/yodl/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A package that implements a pre-document language and tools to process it"; - homepage = https://fbb-git.gitlab.io/yodl/; + homepage = "https://fbb-git.gitlab.io/yodl/"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index cc94692c023..3261c8af202 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -1,23 +1,21 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "mod"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "0aw6r90xf29wdhgnq580f837ga8yypzfhlzx1f2zj0kdhc58wbr5"; + sha256 = "1kcsdi9qls9kgklj96ycyrq5fsz5m2qj3ij63d2rwqjggqk0cab6"; }; - modSha256 = "0x7bdhvam9l23cbdqpna8kwg0v6yhgmw0hlbm48bbhjl27lg7svc"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0famjypv5qg9lgzw4pz2kz70l50cn6n6nbjyk7jrzmd6bjzd0ypl"; subPackages = [ "cmd/mod" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Automated Semantic Import Versioning Upgrades for Go"; longDescription = '' Command line tool to upgrade/downgrade Semantic Import Versioning in Go diff --git a/pkgs/development/tools/modd/default.nix b/pkgs/development/tools/modd/default.nix index 47beb1a2241..106f23ac3f1 100644 --- a/pkgs/development/tools/modd/default.nix +++ b/pkgs/development/tools/modd/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A flexible developer tool that runs processes and responds to filesystem changes"; - homepage = https://github.com/cortesi/modd; + homepage = "https://github.com/cortesi/modd"; license = licenses.mit; maintainers = with maintainers; [ kierdavis ]; platforms = platforms.all; diff --git a/pkgs/development/tools/mpfshell/default.nix b/pkgs/development/tools/mpfshell/default.nix index b44e52aa2bf..69048acb5ba 100644 --- a/pkgs/development/tools/mpfshell/default.nix +++ b/pkgs/development/tools/mpfshell/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/wendlers/mpfshell; + homepage = "https://github.com/wendlers/mpfshell"; description = "A simple shell based file explorer for ESP8266 Micropython based devices"; license = licenses.mit; }; diff --git a/pkgs/development/tools/msgpack-tools/default.nix b/pkgs/development/tools/msgpack-tools/default.nix index 1d7784ae1cc..65bc8feab6b 100644 --- a/pkgs/development/tools/msgpack-tools/default.nix +++ b/pkgs/development/tools/msgpack-tools/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line tools for converting between MessagePack and JSON"; - homepage = https://github.com/ludocode/msgpack-tools; + homepage = "https://github.com/ludocode/msgpack-tools"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ alibabzo ]; diff --git a/pkgs/development/tools/mustache-go/default.nix b/pkgs/development/tools/mustache-go/default.nix index 41e74bc120f..2f3d21f9c82 100644 --- a/pkgs/development/tools/mustache-go/default.nix +++ b/pkgs/development/tools/mustache-go/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/cbroglie/mustache; + homepage = "https://github.com/cbroglie/mustache"; description = "The mustache template language in Go"; license = [ licenses.mit ]; maintainers = [ maintainers.Zimmi48 ]; diff --git a/pkgs/development/tools/nailgun/default.nix b/pkgs/development/tools/nailgun/default.nix index 6e0014b3773..84e5a6b1d9f 100644 --- a/pkgs/development/tools/nailgun/default.nix +++ b/pkgs/development/tools/nailgun/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Client, protocol, and server for running Java programs from the command line without incurring the JVM startup overhead"; - homepage = http://www.martiansoftware.com/nailgun/; + homepage = "http://www.martiansoftware.com/nailgun/"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 1f3556fc904..8890ceca9d3 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -54,15 +54,15 @@ stdenv.mkDerivation rec { patches = [ # build fixes (fetchpatch { - url = https://gitlab.gnome.org/GNOME/nemiver/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch; + url = "https://gitlab.gnome.org/GNOME/nemiver/commit/e0e42221ceb77d88be64fac1c09792dc5c9e2f43.patch"; sha256 = "1g0ixll6yqfj6ysf50p0c7nmh3lgmb6ds15703q7ibnw7dyidvj8"; }) (fetchpatch { - url = https://gitlab.gnome.org/GNOME/nemiver/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch; + url = "https://gitlab.gnome.org/GNOME/nemiver/commit/7005393a8c4d914eac9705e7f47818d0f4de3578.patch"; sha256 = "1mxb1sdqdj7dm204gja8cdygx8579bjriqqbb7cna9rj0m9c8pjg"; }) (fetchpatch { - url = https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch; + url = "https://gitlab.gnome.org/GNOME/nemiver/commit/262cf9657f9c2727a816972b348692adcc666008.patch"; sha256 = "03jv6z54b8nzvplplapk4aj206zl1gvnv6iz0mad19g6yvfbw7a7"; }) ]; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Nemiver; + homepage = "https://wiki.gnome.org/Apps/Nemiver"; description = "Easy to use standalone C/C++ debugger"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index b07ab21fdf1..be772f60492 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -35,10 +35,10 @@ in stdenv.mkDerivation { src = fetchurl ( if stdenv.hostPlatform.system == "x86_64-linux" then - { url = http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x64.sh; + { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x64.sh"; sha256 = "199jcf5a0nwfm8wfld2rcjgq64g91vvz2bkmki8dxfzf1yasifcd"; } else - { url = http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh; + { url = "http://neoload.installers.neotys.com/documents/download/neoload/v4.1/neoload_4_1_4_linux_x86.sh"; sha256 = "1z66jiwcxixsqqwa0f4q8m2p5kna4knq6lic8y8l74dgv25mw912"; } ); buildInputs = [ makeWrapper ]; @@ -84,7 +84,7 @@ in stdenv.mkDerivation { meta = { description = "Load testing software for Web applications to realistically simulate user activity and analyze server behavior"; - homepage = https://www.neotys.com/product/overview-neoload.html; + 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; diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index e052b724439..307e123bf77 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app runtime based on Chromium and node.js"; - homepage = https://nwjs.io/; + homepage = "https://nwjs.io/"; platforms = ["i686-linux" "x86_64-linux"]; maintainers = [ maintainers.offline ]; license = licenses.bsd3; diff --git a/pkgs/development/tools/nrpl/default.nix b/pkgs/development/tools/nrpl/default.nix index d8dab6b0358..a1c9bfd53e3 100644 --- a/pkgs/development/tools/nrpl/default.nix +++ b/pkgs/development/tools/nrpl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { patches = [ (fetchpatch { - url = https://patch-diff.githubusercontent.com/raw/wheineman/nrpl/pull/12.patch; + url = "https://patch-diff.githubusercontent.com/raw/wheineman/nrpl/pull/12.patch"; name = "update_for_new_nim.patch"; sha256 = "1zff7inhn3l1jnxcnidy705lzi3wqib1chf4rayh1g9i23an7wg1"; }) @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "REPL for the Nim programming language"; - homepage = https://github.com/wheineman/nrpl; + homepage = "https://github.com/wheineman/nrpl"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/nsis/default.nix b/pkgs/development/tools/nsis/default.nix index 683d07ed496..5b9e7434a8d 100644 --- a/pkgs/development/tools/nsis/default.nix +++ b/pkgs/development/tools/nsis/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { chmod -R u+w $out/share/nsis ''; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ scons.py2 ]; buildInputs = [ zlib ]; sconsFlags = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NSIS is a free scriptable win32 installer/uninstaller system that doesn't suck and isn't huge"; - homepage = https://nsis.sourceforge.io/; + homepage = "https://nsis.sourceforge.io/"; license = licenses.zlib; platforms = platforms.linux; maintainers = with maintainers; [ pombeirp ]; diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index 30f531d7db2..463642988a8 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -87,7 +87,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An app runtime based on Chromium and node.js"; - homepage = https://nwjs.io/; + homepage = "https://nwjs.io/"; platforms = ["i686-linux" "x86_64-linux"]; maintainers = [ maintainers.offline ]; license = licenses.bsd3; diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index de5da5674a2..ea1b3965098 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A software system for writing extensible parsers for programming languages"; - homepage = https://github.com/ocaml/camlp4; + 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 e0bd0e4ac67..9a69f88c804 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { Camlp5 is a preprocessor and pretty-printer for OCaml programs. It also provides parsing and printing tools. ''; - homepage = https://camlp5.github.io/; + homepage = "https://camlp5.github.io/"; license = licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = with maintainers; [ diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index d6327010e30..63c169f045f 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -6,9 +6,14 @@ in assert stdenv.lib.versionAtLeast ocaml.version "3.12"; let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + if stdenv.lib.versionAtLeast ocaml.version "4.02" then + (if stdenv.lib.versionAtLeast ocaml.version "4.03" then { + version = "1.6.6"; + sha256 = "1smcc0l6fh2n0y6bp96c69j5nw755jja99w0b206wx3yb2m4w2hs"; + } else { version = "1.6.5"; sha256 = "03c0amszy28shinvz61hm340jz446zz5763a1pdqlza36kwcj0p0"; + }) // { buildInputs = [ dune ]; extra = { inherit (dune) installPhase; diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 47e71c41568..510dd183f00 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "096wp6aawgh1ffhbnjfxgakwqd02kfkz2i6m6cc040w1g554iw98"; + sha256 = "1nnpg0fvmp4vf5mk203xk83pkkm953pgip3yhs1x2g8pkcdndhcw"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 9db5ed10c84..1354e158a8e 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://projects.camlcity.org/projects/findlib.html; + homepage = "http://projects.camlcity.org/projects/findlib.html"; description = "O'Caml library manager"; license = stdenv.lib.licenses.mit; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index e535ba29aeb..7f6426c9610 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = http://ocsigen.org/js_of_ocaml/; + homepage = "http://ocsigen.org/js_of_ocaml/"; description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser"; license = licenses.lgpl2; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix index b13d98acd0d..a0932d919c0 100644 --- a/pkgs/development/tools/ocaml/oasis/default.nix +++ b/pkgs/development/tools/ocaml/oasis/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { # You must manually update the url, not just the version. OCamlforge keys off # the number after download.php, not the filename. src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz; + url = "https://forge.ocamlcore.org/frs/download.php/1694/oasis-0.4.10.tar.gz"; sha256 = "13ah03pbcvrjv5lmx971hvkm9rvbvimska5wmjfvgvd20ca0gn8w"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { installPhase = "ocaml setup.ml -install"; meta = with stdenv.lib; { - homepage = http://oasis.forge.ocamlcore.org/; + homepage = "http://oasis.forge.ocamlcore.org/"; description = "Configure, build and install system for OCaml projects"; license = licenses.lgpl21; platforms = ocaml.meta.platforms or []; diff --git a/pkgs/development/tools/ocaml/obuild/default.nix b/pkgs/development/tools/ocaml/obuild/default.nix index 61e8e77f384..5e851a93205 100644 --- a/pkgs/development/tools/ocaml/obuild/default.nix +++ b/pkgs/development/tools/ocaml/obuild/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/ocaml-obuild/obuild; + homepage = "https://github.com/ocaml-obuild/obuild"; platforms = ocaml.meta.platforms or []; description = "Simple package build system for OCaml"; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 3ceb9b1622c..a9b4218224e 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -17,7 +17,7 @@ with ocamlPackages; buildDunePackage rec { ''; meta = { - homepage = https://www.typerex.org/ocaml-top.html; + homepage = "https://www.typerex.org/ocaml-top.html"; license = lib.licenses.gpl3; description = "A simple cross-platform OCaml code editor built for top-level evaluation"; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix index ec9ff6f4ba9..7270386972d 100644 --- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ocaml/ocamlbuild/; + homepage = "https://github.com/ocaml/ocamlbuild/"; description = "A build system with builtin rules to easily build most OCaml projects"; license = licenses.lgpl2; inherit (ocaml.meta) platforms; diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 7738139a65a..da134562e32 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -2,13 +2,15 @@ with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - version = "0.13.0"; + version = "0.14.0"; minimumOCamlVersion = "4.06"; + useDune2 = true; + src = fetchurl { - url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}-2.tbz"; - sha256 = "0ki2flqi3xkhw9mfridivb6laxm7gml8rj9qz42vqmy9yx76jjxq"; + url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; + sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; }; buildInputs = [ @@ -20,6 +22,8 @@ with ocamlPackages; buildDunePackage rec { stdio uuseg uutf + fix + menhir ]; meta = { diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix index 5465e9dcb6f..42faa33fbe1 100644 --- a/pkgs/development/tools/ocaml/ocamlify/default.nix +++ b/pkgs/development/tools/ocaml/ocamlify/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ocamlify-0.0.2"; src = fetchurl { - url = http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz; + url = "http://forge.ocamlcore.org/frs/download.php/1209/ocamlify-0.0.2.tar.gz"; sha256 = "1f0fghvlbfryf5h3j4as7vcqrgfjb4c8abl5y0y5h069vs4kp5ii"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; + homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; license = stdenv.lib.licenses.lgpl21; diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index 522cb7c199d..46a87dc3ffe 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod; + homepage = "http://forge.ocamlcore.org/projects/ocamlmod/ocamlmod"; description = "Generate OCaml modules from source files"; platforms = ocaml.meta.platforms or []; maintainers = with stdenv.lib.maintainers; [ diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix index 33b729f938d..2172c7f6161 100644 --- a/pkgs/development/tools/ocaml/ocamlscript/default.nix +++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "ocamlscript-2.0.3"; src = fetchurl { - url = http://mjambon.com/releases/ocamlscript/ocamlscript-2.0.3.tar.gz; + url = "http://mjambon.com/releases/ocamlscript/ocamlscript-2.0.3.tar.gz"; sha256 = "1v1i24gijxwris8w4hi95r9swld6dm7jbry0zp72767a3g5ivlrd"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; meta = with stdenv.lib; { - homepage = http://martin.jambon.free.fr/ocamlscript.html; + homepage = "http://martin.jambon.free.fr/ocamlscript.html"; license = licenses.boost; platforms = ocaml.meta.platforms or []; description = "Natively-compiled OCaml scripts"; diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix index ca74a701315..4ebea676621 100644 --- a/pkgs/development/tools/ocaml/ocp-build/default.nix +++ b/pkgs/development/tools/ocaml/ocp-build/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.typerex.org/ocp-build.html; + homepage = "https://www.typerex.org/ocp-build.html"; description = "A build tool for OCaml"; longDescription = '' ocp-build is a build system for OCaml application, based on simple diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 6f8d80df564..729985f87fd 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { buildInputs = [ cmdliner ]; meta = with lib; { - homepage = http://typerex.ocamlpro.com/ocp-indent.html; + homepage = "http://typerex.ocamlpro.com/ocp-indent.html"; description = "A customizable tool to indent OCaml code"; license = licenses.gpl3; maintainers = [ maintainers.jirkamarsik ]; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index cf2be985b14..b9404016b4e 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -14,7 +14,7 @@ buildDunePackage rec { propagatedBuildInputs = [ ocp-indent ]; meta = { - homepage = http://typerex.ocamlpro.com/ocp-index.html; + homepage = "http://typerex.ocamlpro.com/ocp-index.html"; description = "A simple and light-weight documentation extractor for OCaml"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ vbgl ]; diff --git a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix index 5144af97f75..476c98ce5bc 100644 --- a/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix +++ b/pkgs/development/tools/ocaml/ocsigen-i18n/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec }; meta = { - homepage = https://github.com/besport/ocsigen-i18n; + 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 ]; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index da7a5b439ab..2afe0d1e9f5 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A build system designed for scalability and portability"; - homepage = http://projects.camlcity.org/projects/omake.html; + homepage = "http://projects.camlcity.org/projects/omake.html"; license = with stdenv.lib.licenses; [ mit /* scripts */ gpl2 /* program */ diff --git a/pkgs/development/tools/ocaml/opam/1.2.2.nix b/pkgs/development/tools/ocaml/opam/1.2.2.nix index 53482598f13..e6c08b97aca 100644 --- a/pkgs/development/tools/ocaml/opam/1.2.2.nix +++ b/pkgs/development/tools/ocaml/opam/1.2.2.nix @@ -84,7 +84,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A package manager for OCaml"; - homepage = http://opam.ocamlpro.com/; + homepage = "http://opam.ocamlpro.com/"; maintainers = [ maintainers.henrytill ]; platforms = platforms.all; license = licenses.lgpl21Plus; diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index f3092a696b1..ac7cd4f4dbb 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -67,7 +67,7 @@ buildDunePackage rec { It integrates with the tuareg mode in Emacs. ''; - homepage = https://github.com/diml/utop; + homepage = "https://github.com/diml/utop"; license = stdenv.lib.licenses.bsd3; platforms = ocaml.meta.platforms or []; maintainers = [ diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix index af295eb242f..350407098a4 100644 --- a/pkgs/development/tools/omniorb/default.nix +++ b/pkgs/development/tools/omniorb/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "omniorb"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2"; - sha256 = "1jlb0wps6311dmhnphn64gv46z0bl8grch4fd9dcx5dlib02lh96"; + sha256 = "0vvsvi5nx4k7kk4qh1pkf3f5fpz7wv4rsdna4hayihbnvz81rh18"; }; buildInputs = [ python2 ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 310ef0be151..5daeb384cc5 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.34.11"; + version = "1.34.15"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "0j55jrji7ya0pm91hfmyd9s6lkl35xbybr81a1gka90mlyp0gx63"; + sha256 = "16wjp89lzg33cap99jv1vgqvdx0y0xvb892fpihwg62iafh10b8m"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 725694063a3..5faeec2387d 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "kernel {module, exploit} development tool"; - homepage = https://out-of-tree.io; + homepage = "https://out-of-tree.io"; maintainers = [ maintainers.dump_stack ]; license = licenses.agpl3Plus; }; diff --git a/pkgs/development/tools/overcommit/Gemfile.lock b/pkgs/development/tools/overcommit/Gemfile.lock index bf88c1bb148..9a6441e76b8 100644 --- a/pkgs/development/tools/overcommit/Gemfile.lock +++ b/pkgs/development/tools/overcommit/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES overcommit BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/overcommit/default.nix b/pkgs/development/tools/overcommit/default.nix index 84529ca4b6f..5fa3dfa0f03 100644 --- a/pkgs/development/tools/overcommit/default.nix +++ b/pkgs/development/tools/overcommit/default.nix @@ -7,7 +7,7 @@ bundlerApp { meta = with lib; { description = "Tool to manage and configure Git hooks"; - homepage = https://github.com/sds/overcommit; + homepage = "https://github.com/sds/overcommit"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 1430f0fc2a3..083600bbf21 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A tool for creating identical machine images for multiple platforms from a single source configuration"; - homepage = https://www.packer.io; + homepage = "https://www.packer.io"; license = licenses.mpl20; maintainers = with maintainers; [ cstrahan zimbatm ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/packet/default.nix b/pkgs/development/tools/packet/default.nix index 54100dfdee9..9bca1ec75b6 100644 --- a/pkgs/development/tools/packet/default.nix +++ b/pkgs/development/tools/packet/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "a CLI tool to manage packet.net services"; - homepage = https://github.com/ebsarr/packet; + homepage = "https://github.com/ebsarr/packet"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.grahamc ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/parinfer-rust/default.nix b/pkgs/development/tools/parinfer-rust/default.nix index a313683f2ae..d016d21b738 100644 --- a/pkgs/development/tools/parinfer-rust/default.nix +++ b/pkgs/development/tools/parinfer-rust/default.nix @@ -13,7 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "16ylk125p368mcz8nandmfqlygrqjlf8mqaxlbpixqga378saidl"; - buildInputs = [ llvmPackages.libclang llvmPackages.clang ]; + nativeBuildInputs = [ llvmPackages.clang ]; + buildInputs = [ llvmPackages.libclang ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; postInstall = '' diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index a054bc82d45..55800a80098 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/antlr/3.4.nix b/pkgs/development/tools/parsing/antlr/3.4.nix index 9e86a29cf93..1263e7934be 100644 --- a/pkgs/development/tools/parsing/antlr/3.4.nix +++ b/pkgs/development/tools/parsing/antlr/3.4.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/parsing/antlr/4.7.nix b/pkgs/development/tools/parsing/antlr/4.7.nix index 05f08e5f060..23267bf2431 100644 --- a/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/pkgs/development/tools/parsing/antlr/4.7.nix @@ -28,7 +28,7 @@ let meta = with stdenv.lib; { description = "C++ target for ANTLR 4"; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.unix; }; @@ -76,7 +76,7 @@ let frameworks. From a grammar, ANTLR generates a parser that can build and walk parse trees. ''; - homepage = https://www.antlr.org/; + homepage = "https://www.antlr.org/"; license = licenses.bsd3; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 41d28173da3..d638170856e 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/bison/; + homepage = "https://www.gnu.org/software/bison/"; description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 79e171d5fd7..9cef29e90bb 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Berkeley YACC"; - homepage = https://invisible-island.net/byacc/byacc.html; + homepage = "https://invisible-island.net/byacc/byacc.html"; license = licenses.publicDomain; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix index e555f1d5985..504e5b09049 100644 --- a/pkgs/development/tools/parsing/flex/2.5.35.nix +++ b/pkgs/development/tools/parsing/flex/2.5.35.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "flex-2.5.35"; src = fetchurl { - url = https://github.com/westes/flex/archive/flex-2-5-35.tar.gz; + url = "https://github.com/westes/flex/archive/flex-2-5-35.tar.gz"; sha256 = "0wh06nix8bd4w1aq4k2fbbkdq5i30a9lxz3xczf3ff28yy0kfwzm"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { branch = "2.5.35"; - homepage = http://flex.sourceforge.net/; + homepage = "http://flex.sourceforge.net/"; description = "A fast lexical analyser generator"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix index fc2c7699583..2562b3c2613 100644 --- a/pkgs/development/tools/parsing/flex/2.6.1.nix +++ b/pkgs/development/tools/parsing/flex/2.6.1.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/westes/flex; + homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index e46a494de76..51373f4a4fd 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { dontDisableStatic = stdenv.buildPlatform != stdenv.hostPlatform; meta = with stdenv.lib; { - homepage = https://github.com/westes/flex; + homepage = "https://github.com/westes/flex"; description = "A fast lexical analyser generator"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix index 93f1d1ee649..a9482f9fd49 100644 --- a/pkgs/development/tools/parsing/flexc++/default.nix +++ b/pkgs/development/tools/parsing/flexc++/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { and requires simpler specification files than offered by flex's C++ option. ''; - homepage = https://fbb-git.github.io/flexcpp/; + homepage = "https://fbb-git.github.io/flexcpp/"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/parsing/hammer/default.nix b/pkgs/development/tools/parsing/hammer/default.nix index e10fe49b1e4..d36dfa9219d 100644 --- a/pkgs/development/tools/parsing/hammer/default.nix +++ b/pkgs/development/tools/parsing/hammer/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { character-oriented, making it ideal for parsing binary data such as images, network packets, audio, and executables. ''; - homepage = https://github.com/UpstandingHackers/hammer; + homepage = "https://github.com/UpstandingHackers/hammer"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/parsing/jikespg/default.nix b/pkgs/development/tools/parsing/jikespg/default.nix index 6f0eb3735ff..18dd531e4b1 100644 --- a/pkgs/development/tools/parsing/jikespg/default.nix +++ b/pkgs/development/tools/parsing/jikespg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://jikes.sourceforge.net/; + homepage = "http://jikes.sourceforge.net/"; description = "The Jikes Parser Generator"; platforms = platforms.linux; license = licenses.ipl10; diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index 359daad2d51..cff36d2cb52 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { # Fix null termination in read_stream. # https://github.com/keenerd/jshon/issues/53 (fetchpatch { - url = https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch; + url = "https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch"; sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl"; }) ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://kmkeen.com/jshon; + homepage = "http://kmkeen.com/jshon"; description = "JSON parser designed for maximum convenience within the shell"; license = licenses.free; platforms = platforms.all; diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix index 009ebe8e2ff..b10e9890951 100644 --- a/pkgs/development/tools/parsing/lemon/default.nix +++ b/pkgs/development/tools/parsing/lemon/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { file using that grammar. Lemon is similar to the much more famous programs "yacc" and "bison", but is not compatible with either. ''; - homepage = http://www.hwaci.com/sw/lemon/; + homepage = "http://www.hwaci.com/sw/lemon/"; license = licenses.publicDomain; platforms = platforms.unix; }; diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix index 12c9b9d57f8..dddddba129c 100644 --- a/pkgs/development/tools/parsing/ragel/default.nix +++ b/pkgs/development/tools/parsing/ragel/default.nix @@ -26,7 +26,7 @@ let doCheck = true; meta = with stdenv.lib; { - homepage = https://www.colm.net/open-source/ragel/; + homepage = "https://www.colm.net/open-source/ragel/"; description = "State machine compiler"; inherit license; platforms = platforms.unix; diff --git a/pkgs/development/tools/pax-rs/default.nix b/pkgs/development/tools/pax-rs/default.nix index aa83a1b8e1b..72516fb7d17 100644 --- a/pkgs/development/tools/pax-rs/default.nix +++ b/pkgs/development/tools/pax-rs/default.nix @@ -10,7 +10,7 @@ buildRustPackage rec { longDescription = '' The fastest JavaScript bundler in the galaxy. Fully supports ECMAScript module syntax (import/export) in addition to CommonJS require(<string>). ''; - homepage = https://github.com/nathan/pax; + homepage = "https://github.com/nathan/pax"; license = licenses.mit; maintainers = [ maintainers.klntsky ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/pet/default.nix b/pkgs/development/tools/pet/default.nix index f1096e479a7..8bbb34fabd4 100644 --- a/pkgs/development/tools/pet/default.nix +++ b/pkgs/development/tools/pet/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "pet"; @@ -13,13 +13,11 @@ buildGoModule rec { modSha256 = "06ham8lsx5c1vk5jkwp1aa9g4q4g7sfq7gxz2gkffa98x2vlawyf"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "." ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Simple command-line snippet manager, written in Go"; - homepage = https://github.com/knqyf263/pet; + homepage = "https://github.com/knqyf263/pet"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/pew/default.nix b/pkgs/development/tools/pew/default.nix index e4b50f31776..a7fabb78395 100644 --- a/pkgs/development/tools/pew/default.nix +++ b/pkgs/development/tools/pew/default.nix @@ -1,34 +1,30 @@ -{ stdenv, python3Packages }: -with python3Packages; buildPythonApplication rec { - pname = "pew"; - version = "1.1.2"; +{ stdenv, python3 }: - src = fetchPypi { - inherit pname version; - sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; - }; +with python3.pkgs; - propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; +buildPythonApplication rec { + pname = "pew"; + version = "1.2.0"; - LC_ALL = "en_US.UTF-8"; + src = fetchPypi { + inherit pname version; + sha256 = "04anak82p4v9w0lgfs55s7diywxil6amq8c8bhli143ca8l2fcdq"; + }; - postFixup = '' - set -euo pipefail - PEW_SITE="$out/lib/${python.libPrefix}/site-packages" - SETUPTOOLS="${setuptools}/lib/${python.libPrefix}/site-packages" - SETUPTOOLS_SITE=$SETUPTOOLS/$(cat $SETUPTOOLS/setuptools.pth) - CLONEVENV_SITE="${virtualenv-clone}/lib/${python.libPrefix}/site-packages" - SITE_PACKAGES="[\'$PEW_SITE\',\'$SETUPTOOLS_SITE\',\'$CLONEVENV_SITE\']" - substituteInPlace $PEW_SITE/pew/pew.py \ - --replace "from pew.pew" "import sys; sys.path.extend($SITE_PACKAGES); from pew.pew" \ - --replace 'sys.executable, "-m", "virtualenv"' "'${virtualenv}/bin/virtualenv'" - ''; + propagatedBuildInputs = [ virtualenv virtualenv-clone setuptools ]; - meta = with stdenv.lib; { - homepage = https://github.com/berdario/pew; - description = "Tools to manage multiple virtualenvs written in pure python"; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ berdario ]; - }; - } + # no tests are packaged + checkPhase = '' + $out/bin/pew > /dev/null + ''; + + pythonImportsCheck = [ "pew" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/berdario/pew"; + description = "Tools to manage multiple virtualenvs written in pure python"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ berdario ]; + }; +} diff --git a/pkgs/development/tools/pgformatter/default.nix b/pkgs/development/tools/pgformatter/default.nix index 87bf826f5c5..c1cb8cea8a6 100644 --- a/pkgs/development/tools/pgformatter/default.nix +++ b/pkgs/development/tools/pgformatter/default.nix @@ -2,13 +2,13 @@ perlPackages.buildPerlPackage rec { pname = "pgformatter"; - version = "4.2"; + version = "4.3"; src = fetchFromGitHub { owner = "darold"; repo = "pgFormatter"; rev = "v${version}"; - sha256 = "1fqhbs7q3nxda7acbcx8dyjh99d0mv485dpmiczxia7cy1xqi63g"; + sha256 = "0n8ydj01nmnkd8glzjb0yrsyax1pmdfvaxb5xj4pkb2mf6zm94qy"; }; outputs = [ "out" ]; diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix index 2c37d71e75c..f042aa35b6f 100644 --- a/pkgs/development/tools/phantomjs/default.nix +++ b/pkgs/development/tools/phantomjs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { - Network Monitoring ''; - homepage = https://phantomjs.org/; + homepage = "https://phantomjs.org/"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bluescreen303 ]; diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix index b18bd0104ce..d565a70798a 100644 --- a/pkgs/development/tools/phantomjs2/default.nix +++ b/pkgs/development/tools/phantomjs2/default.nix @@ -37,27 +37,27 @@ in stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-hardening.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-hardening.patch"; sha256 = "1qs1r76w90qgpw742i7lf0y3b7m9zh5wxcbrhrak6mq1kqaphqb5"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt-components.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt-components.patch"; sha256 = "1fw2q59aqcks3abvwkqg9903yif6aivdsznc0h6frhhjvpp19vsb"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-evaluateJavaScript.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-evaluateJavaScript.patch"; sha256 = "1avig9cfny8kv3s4mf3mdzvf3xlzgyh351yzwc4bkpnjvzv4fmq6"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-no-websecurity.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-no-websecurity.patch"; sha256 = "1nykqpxa7lcf9iarz5lywgg3v3b1h19iwvjdg4kgq0ai6idhcab8"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-print.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/build-qt55-print.patch"; sha256 = "1fydmdjxnplglpbd3ypaih5l237jkxjirpdhzz92mcpy29yla6jw"; }) (fetchpatch { - url = https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/unlock-qt.patch; + url = "https://salsa.debian.org/debian/phantomjs/raw/0b20f0dd/debian/patches/unlock-qt.patch"; sha256 = "13bwz4iw17d6hq5pwkbpcckqyw7fhc6648lvs26m39pp31zwyp03"; }) ./system-qtbase.patch @@ -109,7 +109,7 @@ in stdenv.mkDerivation rec { - Network Monitoring ''; - homepage = https://phantomjs.org/; + homepage = "https://phantomjs.org/"; license = licenses.bsd3; maintainers = [ maintainers.aflatter ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix index 95576b987f5..355cebfd50c 100755 --- a/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/bin/poetry2nix @@ -8,11 +8,16 @@ import json import sys -argparser = argparse.ArgumentParser(description="Generate overrides for git hashes",) -argparser.add_argument( +argparser = argparse.ArgumentParser(description="Poetry2nix CLI") + +subparsers = argparser.add_subparsers(dest="subcommand") +subparsers.required = True + +parser_lock = subparsers.add_parser("lock", help="Generate overrides for git hashes",) +parser_lock.add_argument( "--lock", default="poetry.lock", help="Path to input poetry.lock", ) -argparser.add_argument( +parser_lock.add_argument( "--out", default="poetry-git-overlay.nix", help="Output file", ) @@ -74,7 +79,7 @@ if __name__ == "__main__": indent( textwrap.dedent( """ - %s = super.%s.overrideAttrs ( + %s = super.%s.overridePythonAttrs ( _: { src = pkgs.fetchgit { url = "%s"; @@ -92,7 +97,7 @@ if __name__ == "__main__": expr = "\n".join(lines) - with open(args.out, "w") as f: - f.write(expr) + with open(args.out, "w") as fout: + fout.write(expr) print(f"Wrote {args.out}") diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix index db85d4ddd3c..fbcee749b7c 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix @@ -2,10 +2,8 @@ , lib ? pkgs.lib , version }: - let inherit (pkgs) python3; - in pkgs.stdenv.mkDerivation { pname = "poetry2nix"; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 7d3164fcec6..e7f718519a5 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -7,7 +7,7 @@ let inherit (poetryLib) isCompatible readTOML; # Poetry2nix version - version = "1.6.0"; + version = "1.7.1"; /* The default list of poetry2nix override overlays */ defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; }); @@ -34,91 +34,95 @@ let , overrides ? [ defaultPoetryOverrides ] , python ? pkgs.python3 , pwd ? projectDir - }@attrs: let - poetryPkg = poetry.override { inherit python; }; - - pyProject = readTOML pyproject; - poetryLock = readTOML poetrylock; - lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; + }@attrs: + let + poetryPkg = poetry.override { inherit python; }; - specialAttrs = [ - "overrides" - "poetrylock" - "pwd" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; + pyProject = readTOML pyproject; + poetryLock = readTOML poetrylock; + lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; - evalPep508 = mkEvalPep508 python; + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; - # Filter packages by their PEP508 markers & pyproject interpreter version - partitions = let - supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; - in - lib.partition supportsPythonVersion poetryLock.package; + evalPep508 = mkEvalPep508 python; - compatible = partitions.right; - incompatible = partitions.wrong; + # Filter packages by their PEP508 markers & pyproject interpreter version + partitions = let + supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; + in + lib.partition supportsPythonVersion poetryLock.package; + + compatible = partitions.right; + incompatible = partitions.wrong; + + # Create an overriden version of pythonPackages + # + # We need to avoid mixing multiple versions of pythonPackages in the same + # closure as python can only ever have one version of a dependency + baseOverlay = self: super: + let + getDep = depName: self.${depName}; + + lockPkgs = builtins.listToAttrs ( + builtins.map ( + pkgMeta: rec { + name = pkgMeta.name; + value = self.mkPoetryDep ( + pkgMeta // { + inherit pwd; + source = pkgMeta.source or null; + files = lockFiles.${name}; + pythonPackages = self; + sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name}; + } + ); + } + ) compatible + ); + in + lockPkgs; + overlays = builtins.map getFunctorFn ( + [ + ( + self: super: + let + hooks = self.callPackage ./hooks {}; + in + { + mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { + inherit pkgs lib python poetryLib; + }; + poetry = poetryPkg; + # The canonical name is setuptools-scm + setuptools-scm = super.setuptools_scm; + + inherit (hooks) removePathDependenciesHook poetry2nixFixupHook; + } + ) + # Null out any filtered packages, we don't want python.pkgs from nixpkgs + (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible)) + # Create poetry2nix layer + baseOverlay + ] ++ # User provided overrides + overrides + ); - # Create an overriden version of pythonPackages - # - # We need to avoid mixing multiple versions of pythonPackages in the same - # closure as python can only ever have one version of a dependency - baseOverlay = self: super: - let - getDep = depName: self.${depName}; + packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays; - lockPkgs = builtins.listToAttrs ( - builtins.map ( - pkgMeta: rec { - name = pkgMeta.name; - value = self.mkPoetryDep ( - pkgMeta // { - inherit pwd; - source = pkgMeta.source or null; - files = lockFiles.${name}; - pythonPackages = self; - } - ); - } - ) compatible - ); - in - lockPkgs; - overlays = builtins.map getFunctorFn ( - [ - ( - self: super: let - hooks = self.callPackage ./hooks {}; - in - { - mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { - inherit pkgs lib python poetryLib; - }; - poetry = poetryPkg; - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; - - inherit (hooks) removePathDependenciesHook poetry2nixFixupHook; - } - ) - # Null out any filtered packages, we don't want python.pkgs from nixpkgs - (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible)) - # Create poetry2nix layer - baseOverlay - ] ++ # User provided overrides - overrides - ); - - packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays; - - py = python.override { inherit packageOverrides; self = py; }; - in - { - python = py; - poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible; - poetryLock = poetryLock; - inherit pyProject; - }; + py = python.override { inherit packageOverrides; self = py; }; + in + { + python = py; + poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible; + poetryLock = poetryLock; + inherit pyProject; + }; /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. @@ -153,76 +157,78 @@ let , python ? pkgs.python3 , pwd ? projectDir , ... - }@attrs: let - poetryPython = mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd; - }; - py = poetryPython.python; - - inherit (poetryPython) pyProject; - - specialAttrs = [ - "overrides" - "poetrylock" - "pwd" - "pyproject" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - # Get dependencies and filter out depending on interpreter version - getDeps = depAttr: let - compat = isCompatible py.pythonVersion; - deps = pyProject.tool.poetry.${depAttr} or {}; - depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); - in - builtins.map ( - dep: let - pkg = py.pkgs."${dep}"; - constraints = deps.${dep}.python or ""; - isCompat = compat constraints; + }@attrs: + let + poetryPython = mkPoetryPackages { + inherit pyproject poetrylock overrides python pwd; + }; + py = poetryPython.python; + + inherit (poetryPython) pyProject; + + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + "pyproject" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + + # Get dependencies and filter out depending on interpreter version + getDeps = depAttr: + let + compat = isCompatible py.pythonVersion; + deps = pyProject.tool.poetry.${depAttr} or {}; + depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); in - if isCompat then pkg else null - ) depAttrs; - - getInputs = attr: attrs.${attr} or []; - mkInput = attr: extraInputs: getInputs attr ++ extraInputs; - - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pyProject; - pythonPackages = py.pkgs; - }; - - in - py.pkgs.buildPythonApplication ( - passedAttrs // { - pname = pyProject.tool.poetry.name; - version = pyProject.tool.poetry.version; + builtins.map ( + dep: + let + pkg = py.pkgs."${dep}"; + constraints = deps.${dep}.python or ""; + isCompat = compat constraints; + in + if isCompat then pkg else null + ) depAttrs; + + getInputs = attr: attrs.${attr} or []; + mkInput = attr: extraInputs: getInputs attr ++ extraInputs; + + buildSystemPkgs = poetryLib.getBuildSystemPkgs { + inherit pyProject; + pythonPackages = py.pkgs; + }; + in + py.pkgs.buildPythonApplication ( + passedAttrs // { + pname = pyProject.tool.poetry.name; + version = pyProject.tool.poetry.version; - inherit src; + inherit src; - format = "pyproject"; + format = "pyproject"; - buildInputs = mkInput "buildInputs" buildSystemPkgs; - propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); - nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; - checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); + buildInputs = mkInput "buildInputs" buildSystemPkgs; + propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); + nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; + checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); - passthru = { - python = py; - }; + passthru = { + python = py; + }; - meta = meta // { - inherit (pyProject.tool.poetry) description homepage; - inherit (py.meta) platforms; - license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); - }; + meta = meta // { + inherit (pyProject.tool.poetry) description homepage; + inherit (py.meta) platforms; + license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); + }; - } - ); + } + ); /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ cli = import ./cli.nix { inherit pkgs lib version; }; - in { inherit mkPoetryEnv mkPoetryApplication mkPoetryPackages cli version; @@ -236,11 +242,12 @@ in */ defaultPoetryOverrides = { __functor = defaultPoetryOverrides; - overrideOverlay = fn: self: super: let - defaultSet = defaultPoetryOverrides self super; - customSet = fn self super; - in - defaultSet // customSet; + overrideOverlay = fn: self: super: + let + defaultSet = defaultPoetryOverrides self super; + customSet = fn self super; + in + defaultSet // customSet; }; /* diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index ec3fa0afa69..12d2bc96206 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -3,7 +3,6 @@ , makeSetupHook , yj }: - let pythonInterpreter = python.pythonForBuild.interpreter; in diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index b816feb38e8..f4497afb8bc 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -9,29 +9,30 @@ let ); # Compare a semver expression with a version - isCompatible = version: let - operators = { - "||" = cond1: cond2: cond1 || cond2; - "," = cond1: cond2: cond1 && cond2; # , means && - "&&" = cond1: cond2: cond1 && cond2; - }; - splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; - in - expr: - let - tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); - combine = acc: v: - let - isOperator = builtins.typeOf v == "list"; - operator = if isOperator then (builtins.elemAt v 0) else acc.operator; - in - if isOperator then (acc // { inherit operator; }) else { - inherit operator; - state = operators."${operator}" acc.state (satisfiesSemver version v); - }; - initial = { operator = "&&"; state = true; }; - in - if expr == "" then true else (builtins.foldl' combine initial tokens).state; + isCompatible = version: + let + operators = { + "||" = cond1: cond2: cond1 || cond2; + "," = cond1: cond2: cond1 && cond2; # , means && + "&&" = cond1: cond2: cond1 && cond2; + }; + splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; + in + expr: + let + tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); + combine = acc: v: + let + isOperator = builtins.typeOf v == "list"; + operator = if isOperator then (builtins.elemAt v 0) else acc.operator; + in + if isOperator then (acc // { inherit operator; }) else { + inherit operator; + state = operators."${operator}" acc.state (satisfiesSemver version v); + }; + initial = { operator = "&&"; state = true; }; + in + if expr == "" then true else (builtins.foldl' combine initial tokens).state; fromTOML = builtins.fromTOML or ( @@ -88,23 +89,25 @@ let getBuildSystemPkgs = { pythonPackages , pyProject - }: let - buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject; - drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0; - in - if buildSystem == "" then [] else ( - [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] - ); + }: + let + buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject; + drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0; + in + if buildSystem == "" then [] else ( + [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] + ); # Find gitignore files recursively in parent directory stopping with .git - findGitIgnores = path: let - parent = path + "/.."; - gitIgnore = path + "/.gitignore"; - isGitRoot = builtins.pathExists (path + "/.git"); - hasGitIgnore = builtins.pathExists gitIgnore; - gitIgnores = if hasGitIgnore then [ gitIgnore ] else []; - in - lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; + findGitIgnores = path: + let + parent = path + "/.."; + gitIgnore = path + "/.gitignore"; + isGitRoot = builtins.pathExists (path + "/.git"); + hasGitIgnore = builtins.pathExists gitIgnore; + gitIgnores = if hasGitIgnore then [ gitIgnore ] else []; + in + lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; /* Provides a source filtering mechanism that: @@ -113,21 +116,21 @@ let - Filters pycache/pyc files - Uses cleanSourceFilter to filter out .git/.hg, .o/.so, editor backup files & nix result symlinks */ - cleanPythonSources = { src }: let - gitIgnores = findGitIgnores src; - pycacheFilter = name: type: - (type == "directory" && ! lib.strings.hasInfix "__pycache__" name) - || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) - ; - in - lib.cleanSourceWith { - filter = lib.cleanSourceFilter; - src = lib.cleanSourceWith { - filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; - inherit src; + cleanPythonSources = { src }: + let + gitIgnores = findGitIgnores src; + pycacheFilter = name: type: + (type == "directory" && ! lib.strings.hasInfix "__pycache__" name) + || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) + ; + in + lib.cleanSourceWith { + filter = lib.cleanSourceFilter; + src = lib.cleanSourceWith { + filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; + inherit src; + }; }; - }; - in { inherit diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 5ae35dfed49..5e71190d28f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -14,6 +14,7 @@ , pythonPackages , python-versions , pwd +, sourceSpec , supportedExtensions ? lib.importJSON ./extensions.json , ... }: @@ -22,9 +23,7 @@ pythonPackages.callPackage ( { preferWheel ? false , ... }@args: - let - inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi; inherit (import ./pep425.nix { @@ -68,7 +67,6 @@ pythonPackages.callPackage ( lockFileEntry = builtins.head entries; _isEgg = isEgg lockFileEntry; - in rec { inherit (lockFileEntry) file hash; @@ -92,7 +90,6 @@ pythonPackages.callPackage ( baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format; - in buildPythonPackage { @@ -123,10 +120,11 @@ pythonPackages.callPackage ( compat = isCompatible python.pythonVersion; deps = lib.filterAttrs (n: v: v) ( lib.mapAttrs ( - n: v: let - constraints = v.python or ""; - in - compat constraints + n: v: + let + constraints = v.python or ""; + in + compat constraints ) dependencies ); depAttrs = lib.attrNames deps; @@ -150,6 +148,7 @@ pythonPackages.callPackage ( builtins.fetchGit { inherit (source) url; rev = source.reference; + ref = sourceSpec.branch or sourceSpec.rev or sourceSpec.tag or "HEAD"; } ) else if isLocal then (poetryLib.cleanPythonSources { src = localDepPath; }) else fetchFromPypi { pname = name; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 9eb3f92bd12..8301dcd49b8 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -6,14 +6,14 @@ self: super: { - astroid = super.astroid.overrideAttrs ( + astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - av = super.av.overrideAttrs ( + av = super.av.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig @@ -22,7 +22,7 @@ self: super: } ); - bcrypt = super.bcrypt.overrideAttrs ( + bcrypt = super.bcrypt.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.libffi ]; } @@ -31,14 +31,14 @@ self: super: cffi = # cffi is bundled with pypy if self.python.implementation == "pypy" then null else ( - super.cffi.overrideAttrs ( + super.cffi.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.libffi ]; } ) ); - cftime = super.cftime.overrideAttrs ( + cftime = super.cftime.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.cython @@ -46,14 +46,14 @@ self: super: } ); - cryptography = super.cryptography.overrideAttrs ( + cryptography = super.cryptography.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } ); django = ( - super.django.overrideAttrs ( + super.django.overridePythonAttrs ( old: { propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or []) ++ [ pkgs.gettext ]; @@ -61,7 +61,7 @@ self: super: ) ); - django-bakery = super.django-bakery.overrideAttrs ( + django-bakery = super.django-bakery.overridePythonAttrs ( old: { configurePhase = '' if ! test -e LICENSE; then @@ -71,7 +71,7 @@ self: super: } ); - dlib = super.dlib.overrideAttrs ( + dlib = super.dlib.overridePythonAttrs ( old: { # Parallel building enabled inherit (pkgs.python.pkgs.dlib) patches; @@ -87,14 +87,14 @@ self: super: # Environment markers are not always included (depending on how a dep was defined) enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; - faker = super.faker.overrideAttrs ( + faker = super.faker.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - fancycompleter = super.fancycompleter.overrideAttrs ( + fancycompleter = super.fancycompleter.overridePythonAttrs ( old: { postPatch = '' substituteInPlace setup.py \ @@ -104,14 +104,20 @@ self: super: } ); - grandalf = super.grandalf.overrideAttrs ( + fastparquet = super.fastparquet.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); + + grandalf = super.grandalf.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - h5py = super.h5py.overrideAttrs ( + h5py = super.h5py.overridePythonAttrs ( old: rec { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; @@ -122,20 +128,20 @@ self: super: } ); - horovod = super.horovod.overrideAttrs ( + horovod = super.horovod.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; } ); # importlib-metadata has an incomplete dependency specification - importlib-metadata = super.importlib-metadata.overrideAttrs ( + importlib-metadata = super.importlib-metadata.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; } ); - jupyter = super.jupyter.overrideAttrs ( + jupyter = super.jupyter.overridePythonAttrs ( old: rec { # jupyter is a meta-package. Everything relevant comes from the # dependencies. It does however have a jupyter.py file that conflicts @@ -144,7 +150,7 @@ self: super: } ); - lap = super.lap.overrideAttrs ( + lap = super.lap.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.numpy @@ -152,7 +158,7 @@ self: super: } ); - llvmlite = super.llvmlite.overrideAttrs ( + llvmlite = super.llvmlite.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; @@ -175,59 +181,59 @@ self: super: } ); - lockfile = super.lockfile.overrideAttrs ( + lockfile = super.lockfile.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; } ); - lxml = super.lxml.overrideAttrs ( + lxml = super.lxml.overridePythonAttrs ( old: { nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; } ); - markupsafe = super.markupsafe.overrideAttrs ( + markupsafe = super.markupsafe.overridePythonAttrs ( old: { src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; } ); - matplotlib = super.matplotlib.overrideAttrs ( - old: let - enableGhostscript = old.passthru.enableGhostscript or false; - enableGtk3 = old.passthru.enableTk or false; - enableQt = old.passthru.enableQt or false; - enableTk = old.passthru.enableTk or false; + matplotlib = super.matplotlib.overridePythonAttrs ( + old: + let + enableGhostscript = old.passthru.enableGhostscript or false; + enableGtk3 = old.passthru.enableTk or false; + enableQt = old.passthru.enableQt or false; + enableTk = old.passthru.enableTk or false; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + in + { + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - in - { - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; + XDG_RUNTIME_DIR = "/tmp"; - XDG_RUNTIME_DIR = "/tmp"; + buildInputs = old.buildInputs + ++ lib.optional enableGhostscript pkgs.ghostscript + ++ lib.optional stdenv.isDarwin [ Cocoa ]; - buildInputs = old.buildInputs - ++ lib.optional enableGhostscript pkgs.ghostscript - ++ lib.optional stdenv.isDarwin [ Cocoa ]; - - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - 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 ] - ; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + 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 ] + ; - inherit (super.matplotlib) patches; - } + inherit (super.matplotlib) patches; + } ); # Calls Cargo at build time for source builds and is really tricky to package @@ -235,14 +241,14 @@ self: super: preferWheel = true; }; - mccabe = super.mccabe.overrideAttrs ( + mccabe = super.mccabe.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - netcdf4 = super.netcdf4.overrideAttrs ( + netcdf4 = super.netcdf4.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.cython @@ -265,40 +271,41 @@ self: super: } ); - numpy = super.numpy.overrideAttrs ( - old: let - blas = old.passthru.args.blas or pkgs.openblasCompat; - blasImplementation = lib.nameFromURL blas.name "-"; - cfg = pkgs.writeTextFile { - name = "site.cfg"; - text = ( - lib.generators.toINI {} { - ${blasImplementation} = { - include_dirs = "${blas}/include"; - library_dirs = "${blas}/lib"; - } // lib.optionalAttrs (blasImplementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; - }; - } - ); - }; - in - { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - buildInputs = old.buildInputs ++ [ blas self.cython ]; - enableParallelBuilding = true; - preBuild = '' - ln -s ${cfg} site.cfg - ''; - passthru = old.passthru // { - blas = blas; - inherit blasImplementation cfg; + numpy = super.numpy.overridePythonAttrs ( + old: + let + blas = old.passthru.args.blas or pkgs.openblasCompat; + blasImplementation = lib.nameFromURL blas.name "-"; + cfg = pkgs.writeTextFile { + name = "site.cfg"; + text = ( + lib.generators.toINI {} { + ${blasImplementation} = { + include_dirs = "${blas}/include"; + library_dirs = "${blas}/lib"; + } // lib.optionalAttrs (blasImplementation == "mkl") { + mkl_libs = "mkl_rt"; + lapack_libs = ""; + }; + } + ); }; - } + in + { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + buildInputs = old.buildInputs ++ [ blas self.cython ]; + enableParallelBuilding = true; + preBuild = '' + ln -s ${cfg} site.cfg + ''; + passthru = old.passthru // { + blas = blas; + inherit blasImplementation cfg; + }; + } ); - openexr = super.openexr.overrideAttrs ( + openexr = super.openexr.overridePythonAttrs ( old: rec { buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; @@ -306,38 +313,39 @@ self: super: ); peewee = super.peewee.overridePythonAttrs ( - old: let - withPostgres = old.passthru.withPostgres or false; - withMysql = old.passthru.withMysql or false; - in - { - buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs - ++ lib.optional withPostgres self.psycopg2 - ++ lib.optional withMysql self.mysql-connector; - } + old: + let + withPostgres = old.passthru.withPostgres or false; + withMysql = old.passthru.withMysql or false; + in + { + buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; + propagatedBuildInputs = old.propagatedBuildInputs + ++ lib.optional withPostgres self.psycopg2 + ++ lib.optional withMysql self.mysql-connector; + } ); - pillow = super.pillow.overrideAttrs ( + pillow = super.pillow.overridePythonAttrs ( old: { nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; } ); - psycopg2 = super.psycopg2.overrideAttrs ( + psycopg2 = super.psycopg2.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; } ); - psycopg2-binary = super.psycopg2-binary.overrideAttrs ( + psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; } ); - pyarrow = super.pyarrow.overrideAttrs ( + pyarrow = super.pyarrow.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.cython @@ -352,7 +360,7 @@ self: super: format = "other"; } ) - ).overrideAttrs ( + ).overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ @@ -371,7 +379,7 @@ self: super: ) ) super.pycairo; - pycocotools = super.pycocotools.overrideAttrs ( + pycocotools = super.pycocotools.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.cython @@ -380,21 +388,21 @@ self: super: } ); - pygobject = super.pygobject.overrideAttrs ( + pygobject = super.pygobject.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; } ); - pylint = super.pylint.overrideAttrs ( + pylint = super.pylint.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; doCheck = false; } ); - pyopenssl = super.pyopenssl.overrideAttrs ( + pyopenssl = super.pyopenssl.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } @@ -501,7 +509,7 @@ self: super: } ); - pytest-datadir = super.pytest-datadir.overrideAttrs ( + pytest-datadir = super.pytest-datadir.overridePythonAttrs ( old: { postInstall = '' rm -f $out/LICENSE @@ -517,7 +525,7 @@ self: super: pytest-runner = super.pytest-runner or super.pytestrunner; - python-prctl = super.python-prctl.overrideAttrs ( + python-prctl = super.python-prctl.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.libcap @@ -525,14 +533,14 @@ self: super: } ); - pyzmq = super.pyzmq.overrideAttrs ( + pyzmq = super.pyzmq.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; } ); - rockset = super.rockset.overrideAttrs ( + rockset = super.rockset.overridePythonAttrs ( old: rec { postPatch = '' cp ./setup_rockset.py ./setup.py @@ -540,7 +548,7 @@ self: super: } ); - scaleapi = super.scaleapi.overrideAttrs ( + scaleapi = super.scaleapi.overridePythonAttrs ( old: { postPatch = '' substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true @@ -548,7 +556,7 @@ self: super: } ); - pandas = super.pandas.overrideAttrs ( + pandas = super.pandas.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; } @@ -565,7 +573,7 @@ self: super: } ); - scipy = super.scipy.overrideAttrs ( + scipy = super.scipy.overridePythonAttrs ( old: { nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; @@ -599,7 +607,7 @@ self: super: } ); - shapely = super.shapely.overrideAttrs ( + shapely = super.shapely.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; @@ -614,7 +622,7 @@ self: super: ) ) else super.shellingham; - tables = super.tables.overrideAttrs ( + tables = super.tables.overridePythonAttrs ( old: { HDF5_DIR = "${pkgs.hdf5}"; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; @@ -622,7 +630,7 @@ self: super: } ); - tensorpack = super.tensorpack.overrideAttrs ( + tensorpack = super.tensorpack.overridePythonAttrs ( old: { postPatch = '' substituteInPlace setup.cfg --replace "# will call find_packages()" "" @@ -630,7 +638,7 @@ self: super: } ); - urwidtrees = super.urwidtrees.overrideAttrs ( + urwidtrees = super.urwidtrees.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.urwid @@ -638,7 +646,7 @@ self: super: } ); - vose-alias-method = super.vose-alias-method.overrideAttrs ( + vose-alias-method = super.vose-alias-method.overridePythonAttrs ( old: { postInstall = '' rm -f $out/LICENSE @@ -646,7 +654,7 @@ self: super: } ); - uvloop = super.uvloop.overrideAttrs ( + uvloop = super.uvloop.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.ApplicationServices @@ -667,16 +675,24 @@ self: super: ); zipp = - if lib.versionAtLeast super.zipp.version "2.0.0" then ( - super.zipp.overridePythonAttrs ( - old: { - prePatch = '' - substituteInPlace setup.py --replace \ - 'setuptools.setup()' \ - 'setuptools.setup(version="${super.zipp.version}")' - ''; - } - ) - ) else super.zipp; + ( + if lib.versionAtLeast super.zipp.version "2.0.0" then ( + super.zipp.overridePythonAttrs ( + old: { + prePatch = '' + substituteInPlace setup.py --replace \ + 'setuptools.setup()' \ + 'setuptools.setup(version="${super.zipp.version}")' + ''; + } + ) + ) else super.zipp + ).overridePythonAttrs ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.toml + ]; + } + ); } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index b2e11205c36..cda4e8c78d4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -1,5 +1,4 @@ { lib, stdenv, python, isLinux ? stdenv.isLinux }: - let inherit (lib.strings) hasSuffix hasInfix splitString removeSuffix; @@ -94,12 +93,10 @@ let if isLinux then chooseLinux files else chooseOSX files; - in if (builtins.length filtered == 0) then [] else choose (filtered); - in { inherit selectWheel toWheelAttrs isPyVersionCompatible; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index ae0c29f3683..67ffdddb4bd 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -1,5 +1,4 @@ { lib, stdenv, poetryLib }: python: - let inherit (poetryLib) ireplace; @@ -37,195 +36,199 @@ let ); # Make a tree out of expression groups (parens) - findSubExpressions = expr: let - acc = builtins.foldl' findSubExpressionsFun { - exprs = []; - expr = expr; - pos = 0; - openP = 0; - exprPos = 0; - startPos = 0; - } (lib.stringToCharacters expr); - tailExpr = (substr acc.exprPos acc.pos expr); - tailExprs = if tailExpr != "" then [ tailExpr ] else []; - in - acc.exprs ++ tailExprs; - - parseExpressions = exprs: let - splitCond = ( - s: builtins.map - (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) - (builtins.split " (and|or) " (s + " ")) - ); - - mapfn = expr: ( - if (builtins.match "^ ?$" expr != null) then null # Filter empty - else if (builtins.elem expr [ "and" "or" ]) then { - type = "bool"; - value = expr; - } - else { - type = "expr"; - value = expr; - } - ); + findSubExpressions = expr: + let + acc = builtins.foldl' findSubExpressionsFun { + exprs = []; + expr = expr; + pos = 0; + openP = 0; + exprPos = 0; + startPos = 0; + } (lib.stringToCharacters expr); + tailExpr = (substr acc.exprPos acc.pos expr); + tailExprs = if tailExpr != "" then [ tailExpr ] else []; + in + acc.exprs ++ tailExprs; + + parseExpressions = exprs: + let + splitCond = ( + s: builtins.map + (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) + (builtins.split " (and|or) " (s + " ")) + ); - parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); + mapfn = expr: ( + if (builtins.match "^ ?$" expr != null) then null # Filter empty + else if (builtins.elem expr [ "and" "or" ]) then { + type = "bool"; + value = expr; + } + else { + type = "expr"; + value = expr; + } + ); - in - builtins.foldl' ( - acc: v: acc ++ ( - if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ] - ) - ) [] exprs; + parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); + in + builtins.foldl' ( + acc: v: acc ++ ( + if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ] + ) + ) [] exprs; # Transform individual expressions to structured expressions # This function also performs variable substitution, replacing environment markers with their explicit values - transformExpressions = exprs: let - variables = { - os_name = ( - if python.pname == "jython" then "java" - else "posix" - ); - sys_platform = ( - if stdenv.isLinux then "linux" - else if stdenv.isDarwin then "darwin" - else throw "Unsupported platform" - ); - platform_machine = stdenv.platform.kernelArch; - platform_python_implementation = let - impl = python.passthru.implementation; - in - ( - if impl == "cpython" then "CPython" - else if impl == "pypy" then "PyPy" - else throw "Unsupported implementation ${impl}" + transformExpressions = exprs: + let + variables = { + os_name = ( + if python.pname == "jython" then "java" + else "posix" ); - platform_release = ""; # Field not reproducible - platform_system = ( - if stdenv.isLinux then "Linux" - else if stdenv.isDarwin then "Darwin" - else throw "Unsupported platform" - ); - platform_version = ""; # Field not reproducible - python_version = python.passthru.pythonVersion; - python_full_version = python.version; - implementation_name = python.implementation; - implementation_version = python.version; - extra = ""; - }; - - substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; - - processVar = value: builtins.foldl' (acc: v: v acc) value [ - stripStr - substituteVar - ]; - - in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - mVal = ''[a-zA-Z0-9\'"_\. ]+''; - mOp = "in|[!=<>]+"; - e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + sys_platform = ( + if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "darwin" + else throw "Unsupported platform" + ); + platform_machine = stdenv.platform.kernelArch; + platform_python_implementation = let + impl = python.passthru.implementation; in - { - type = "expr"; - value = { - op = builtins.elemAt m 1; - values = [ - (processVar (builtins.elemAt m 0)) - (processVar (builtins.elemAt m 2)) - ]; - }; - } - ) else exprs - ) else builtins.map transformExpressions exprs; + ( + if impl == "cpython" then "CPython" + else if impl == "pypy" then "PyPy" + else throw "Unsupported implementation ${impl}" + ); + platform_release = ""; # Field not reproducible + platform_system = ( + if stdenv.isLinux then "Linux" + else if stdenv.isDarwin then "Darwin" + else throw "Unsupported platform" + ); + platform_version = ""; # Field not reproducible + python_version = python.passthru.pythonVersion; + python_full_version = python.version; + implementation_name = python.implementation; + implementation_version = python.version; + extra = ""; + }; + + substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; + + processVar = value: builtins.foldl' (acc: v: v acc) value [ + stripStr + substituteVar + ]; + in + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + mVal = ''[a-zA-Z0-9\'"_\. ]+''; + mOp = "in|[!=<>]+"; + e = stripStr exprs.value; + m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + in + { + type = "expr"; + value = { + op = builtins.elemAt m 1; + values = [ + (processVar (builtins.elemAt m 0)) + (processVar (builtins.elemAt m 2)) + ]; + }; + } + ) else exprs + ) else builtins.map transformExpressions exprs; # Recursively eval all expressions - evalExpressions = exprs: let - unmarshal = v: ( - # TODO: Handle single quoted values - if v == "True" then true - else if v == "False" then false - else builtins.fromJSON v - ); - hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack)); - op = { - "<=" = x: y: (unmarshal x) <= (unmarshal y); - "<" = x: y: (unmarshal x) < (unmarshal y); - "!=" = x: y: x != y; - "==" = x: y: x == y; - ">=" = x: y: (unmarshal x) >= (unmarshal y); - ">" = x: y: (unmarshal x) > (unmarshal y); - "~=" = v: c: let - parts = builtins.splitVersion c; - pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); - upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); - in - op.">=" v c && op."<" v upperConstraint; - "===" = x: y: x == y; - "in" = x: y: let - values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); - in - builtins.elem (unmarshal x) values; - }; - in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - expr = exprs; - result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); - in - { - type = "value"; - value = result; - } - ) else exprs - ) else builtins.map evalExpressions exprs; + evalExpressions = exprs: + let + unmarshal = v: ( + # TODO: Handle single quoted values + if v == "True" then true + else if v == "False" then false + else builtins.fromJSON v + ); + hasElem = needle: haystack: builtins.elem needle (builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " haystack)); + op = { + "<=" = x: y: (unmarshal x) <= (unmarshal y); + "<" = x: y: (unmarshal x) < (unmarshal y); + "!=" = x: y: x != y; + "==" = x: y: x == y; + ">=" = x: y: (unmarshal x) >= (unmarshal y); + ">" = x: y: (unmarshal x) > (unmarshal y); + "~=" = v: c: + let + parts = builtins.splitVersion c; + pruned = lib.take ((builtins.length parts) - 1) parts; + upper = builtins.toString ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); + upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); + in + op.">=" v c && op."<" v upperConstraint; + "===" = x: y: x == y; + "in" = x: y: + let + values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); + in + builtins.elem (unmarshal x) values; + }; + in + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + expr = exprs; + result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); + in + { + type = "value"; + value = result; + } + ) else exprs + ) else builtins.map evalExpressions exprs; # Now that we have performed an eval all that's left to do is to concat the graph into a single bool - reduceExpressions = exprs: let - cond = { - "and" = x: y: x && y; - "or" = x: y: x || y; - }; - reduceExpressionsFun = acc: v: ( - if builtins.typeOf v == "set" then ( - if v.type == "value" then ( - acc // { - value = cond."${acc.cond}" acc.value v.value; - } - ) else if v.type == "bool" then ( - acc // { - cond = v.value; - } + reduceExpressions = exprs: + let + cond = { + "and" = x: y: x && y; + "or" = x: y: x || y; + }; + reduceExpressionsFun = acc: v: ( + if builtins.typeOf v == "set" then ( + if v.type == "value" then ( + acc // { + value = cond."${acc.cond}" acc.value v.value; + } + ) else if v.type == "bool" then ( + acc // { + cond = v.value; + } + ) else throw "Unsupported type" + ) else if builtins.typeOf v == "list" then ( + let + ret = builtins.foldl' reduceExpressionsFun { + value = true; + cond = "and"; + } v; + in + acc // { + value = cond."${acc.cond}" acc.value ret.value; + } ) else throw "Unsupported type" - ) else if builtins.typeOf v == "list" then ( - let - ret = builtins.foldl' reduceExpressionsFun { - value = true; - cond = "and"; - } v; - in - acc // { - value = cond."${acc.cond}" acc.value ret.value; - } - ) else throw "Unsupported type" - ); - in - ( - builtins.foldl' reduceExpressionsFun { - value = true; - cond = "and"; - } exprs - ).value; - + ); + in + ( + builtins.foldl' reduceExpressionsFun { + value = true; + cond = "and"; + } exprs + ).value; in e: builtins.foldl' (acc: v: v acc) e [ findSubExpressions diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index 784589a4ca4..07dcbbc5eac 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix @@ -1,26 +1,27 @@ { lib, ireplace }: - let inherit (builtins) elemAt match; operators = let matchWildCard = s: match "([^\*])(\.[\*])" s; mkComparison = ret: version: v: builtins.compareVersions version v == ret; - mkIdxComparison = idx: version: v: let - ver = builtins.splitVersion v; - minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); - upper = builtins.concatStringsSep "." (ireplace idx minor ver); - in - operators.">=" version v && operators."<" version upper; - dropWildcardPrecision = f: version: constraint: let - m = matchWildCard constraint; - hasWildcard = m != null; - c = if hasWildcard then (elemAt m 0) else constraint; - v = - if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) - else version; - in - f v c; + mkIdxComparison = idx: version: v: + let + ver = builtins.splitVersion v; + minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); + upper = builtins.concatStringsSep "." (ireplace idx minor ver); + in + operators.">=" version v && operators."<" version upper; + dropWildcardPrecision = f: version: constraint: + let + m = matchWildCard constraint; + hasWildcard = m != null; + c = if hasWildcard then (elemAt m 0) else constraint; + v = + if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) + else version; + in + f v c; in { # Prefix operators @@ -33,16 +34,17 @@ let # Semver specific operators "~" = mkIdxComparison 1; "^" = mkIdxComparison 0; - "~=" = v: c: let - # Prune constraint - parts = builtins.splitVersion c; - pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); - upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); - in - operators.">=" v c && operators."<" v upperConstraint; + "~=" = v: c: + let + # Prune constraint + parts = builtins.splitVersion c; + pruned = lib.take ((builtins.length parts) - 1) parts; + upper = builtins.toString ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); + upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); + in + operators.">=" v c && operators."<" v upperConstraint; # Infix operators "-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu; # Arbitrary equality clause, just run simple comparison @@ -55,33 +57,34 @@ let version = "([0-9\.\*x]+)"; }; - parseConstraint = constraint: let - constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint; - # The common prefix operators - mPre = match "${re.operators} *${re.version}" constraintStr; - # There is also an infix operator to match ranges - mIn = match "${re.version} *(-) *${re.version}" constraintStr; - in - ( - if mPre != null then { - op = elemAt mPre 0; - v = elemAt mPre 1; - } - # Infix operators are range matches - else if mIn != null then { - op = elemAt mIn 1; - v = { - vl = (elemAt mIn 0); - vu = (elemAt mIn 2); - }; - } - else throw "Constraint \"${constraintStr}\" could not be parsed" - ); - - satisfiesSemver = version: constraint: let - inherit (parseConstraint constraint) op v; - in - if constraint == "*" then true else operators."${op}" version v; + parseConstraint = constraint: + let + constraintStr = builtins.replaceStrings [ " " ] [ "" ] constraint; + # The common prefix operators + mPre = match "${re.operators} *${re.version}" constraintStr; + # There is also an infix operator to match ranges + mIn = match "${re.version} *(-) *${re.version}" constraintStr; + in + ( + if mPre != null then { + op = elemAt mPre 0; + v = elemAt mPre 1; + } + # Infix operators are range matches + else if mIn != null then { + op = elemAt mIn 1; + v = { + vl = (elemAt mIn 0); + vu = (elemAt mIn 2); + }; + } + else throw "Constraint \"${constraintStr}\" could not be parsed" + ); + satisfiesSemver = version: constraint: + let + inherit (parseConstraint constraint) op v; + in + if constraint == "*" then true else operators."${op}" version v; in { inherit satisfiesSemver; } diff --git a/pkgs/development/tools/postiats-utilities/default.nix b/pkgs/development/tools/postiats-utilities/default.nix index 40cd133032f..4b6d230becd 100644 --- a/pkgs/development/tools/postiats-utilities/default.nix +++ b/pkgs/development/tools/postiats-utilities/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://github.com/Hibou57/PostiATS-Utilities; + homepage = "https://github.com/Hibou57/PostiATS-Utilities"; license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.ttuegel ]; diff --git a/pkgs/development/tools/profiling/heaptrack/default.nix b/pkgs/development/tools/profiling/heaptrack/default.nix index 1e52c0e95c0..817bb117171 100644 --- a/pkgs/development/tools/profiling/heaptrack/default.nix +++ b/pkgs/development/tools/profiling/heaptrack/default.nix @@ -23,7 +23,7 @@ mkDerivation rec { meta = with lib; { description = "Heap memory profiler for Linux"; - homepage = https://github.com/KDE/heaptrack; + homepage = "https://github.com/KDE/heaptrack"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ gebner ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 0b2b4971764..6e6cb9fc4cf 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { modules, the kernel, shared libraries, and applications. ''; license = stdenv.lib.licenses.gpl2; - homepage = http://oprofile.sourceforge.net/; + homepage = "http://oprofile.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/development/tools/profiling/pprof/default.nix b/pkgs/development/tools/profiling/pprof/default.nix index 120fd89377b..2618dd3ef1e 100644 --- a/pkgs/development/tools/profiling/pprof/default.nix +++ b/pkgs/development/tools/profiling/pprof/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A tool for visualization and analysis of profiling data"; - homepage = https://github.com/google/pprof; + homepage = "https://github.com/google/pprof"; license = licenses.asl20; longDescription = '' pprof reads a collection of profiling samples in profile.proto format and generates reports to visualize and help analyze the data. It can generate both text and graphical reports (through the use of the dot visualization package). diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index b7538a2b388..e2a769c30b1 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "sysprof"; - version = "3.34.1"; + version = "3.36.0"; outputs = [ "out" "lib" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1l4kr1av7933vb4zql9c5lgzivlw64hyky4nr8xin1v5if6vnjw4"; + sha256 = "hnDbTaz3shnTDFdcRlsXyO1nJNut40fyzelUi/8DkQg="; }; nativeBuildInputs = [ @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System-wide profiler for Linux"; - homepage = https://wiki.gnome.org/Apps/Sysprof; + homepage = "https://wiki.gnome.org/Apps/Sysprof"; longDescription = '' Sysprof is a sampling CPU profiler for Linux that uses the perf_event_open system call to profile the entire system, not just a single diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix index 3f0b37a7175..c1f38a62418 100644 --- a/pkgs/development/tools/profiling/systemtap/default.nix +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -4,7 +4,7 @@ let ## fetchgit info - url = git://sourceware.org/git/systemtap.git; + url = "git://sourceware.org/git/systemtap.git"; rev = "release-${version}"; sha256 = "0mmpiq7bsrwhp7z07a1pwka4q6d2fbmdx5wp83nxj31rvdxhqwnw"; version = "4.1"; @@ -40,7 +40,7 @@ in runCommand "systemtap-${kernel.version}-${version}" { inherit stapBuild kernelBuildDir; buildInputs = [ makeWrapper ]; meta = { - homepage = https://sourceware.org/systemtap/; + homepage = "https://sourceware.org/systemtap/"; repositories.git = url; description = "Provides a scripting language for instrumentation on a live kernel plus user-space"; license = lib.licenses.gpl2; diff --git a/pkgs/development/tools/proto-contrib/default.nix b/pkgs/development/tools/proto-contrib/default.nix index adb0df28ce1..4de843be951 100644 --- a/pkgs/development/tools/proto-contrib/default.nix +++ b/pkgs/development/tools/proto-contrib/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "proto-contrib"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "19cqz13jd95d5vibd10420gg69ldgf6afc51mkglhafgmmif56b0"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Contributed tools and other packages on top of the Go proto package"; - homepage = https://github.com/emicklei/proto-contrib; + homepage = "https://github.com/emicklei/proto-contrib"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/protoc-gen-doc/default.nix b/pkgs/development/tools/protoc-gen-doc/default.nix index c25b2d56fe6..77c1df6f43e 100644 --- a/pkgs/development/tools/protoc-gen-doc/default.nix +++ b/pkgs/development/tools/protoc-gen-doc/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule { pname = "protoc-gen-doc-unstable"; @@ -13,9 +13,7 @@ buildGoModule { modSha256 = "1952ycdkgl00q2s3qmhislhhim15nn6nmlkwbfdvrsfzznqj47rd"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Documentation generator plugin for Google Protocol Buffers"; longDescription = '' This is a documentation generator plugin for the Google Protocol Buffers diff --git a/pkgs/development/tools/prototool/default.nix b/pkgs/development/tools/prototool/default.nix index 15a854e4d86..37b0f1fdf8d 100644 --- a/pkgs/development/tools/prototool/default.nix +++ b/pkgs/development/tools/prototool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, protobuf, Security }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, protobuf }: buildGoModule rec { pname = "prototool"; @@ -13,8 +13,6 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - modSha256 = "1gc8kc9mbi3mlh48zx4lcgpsrf8z879f1qj9wfyr66s7wd1ljazg"; postInstall = '' @@ -25,7 +23,7 @@ buildGoModule rec { subPackages = [ "cmd/prototool" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/uber/prototool"; description = "Your Swiss Army Knife for Protocol Buffers"; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/development/tools/pry/Gemfile.lock b/pkgs/development/tools/pry/Gemfile.lock index e6025f50ca1..d76845bc05a 100644 --- a/pkgs/development/tools/pry/Gemfile.lock +++ b/pkgs/development/tools/pry/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES pry BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/pry/default.nix b/pkgs/development/tools/pry/default.nix index 974b61617fb..c39af508591 100644 --- a/pkgs/development/tools/pry/default.nix +++ b/pkgs/development/tools/pry/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A Ruby runtime developer console and IRB alternative"; - homepage = https://pryrepl.org; + homepage = "https://pryrepl.org"; license = licenses.mit; maintainers = [ maintainers.tckmn ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock index 8c5d369fb37..870652b567a 100644 --- a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock +++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES puppet-lint BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/pydb/default.nix b/pkgs/development/tools/pydb/default.nix index e174184835a..67e7a879d88 100644 --- a/pkgs/development/tools/pydb/default.nix +++ b/pkgs/development/tools/pydb/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Python debugger with GDB-like commands and Emacs bindings"; - homepage = http://bashdb.sourceforge.net/pydb/; + homepage = "http://bashdb.sourceforge.net/pydb/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 9e9ec6f0d3d..a750a21c1b4 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -88,7 +88,7 @@ mkDerivation rec { tailored to the needs of Qt developers. It includes features such as an advanced code editor, a visual debugger and a GUI designer. ''; - homepage = https://wiki.qt.io/Category:Tools::QtCreator; + homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; license = "LGPL"; maintainers = [ maintainers.akaWolf ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" ]; diff --git a/pkgs/development/tools/quilt/default.nix b/pkgs/development/tools/quilt/default.nix index d5059aa6b93..dece0a7b44b 100644 --- a/pkgs/development/tools/quilt/default.nix +++ b/pkgs/development/tools/quilt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://savannah.nongnu.org/projects/quilt; + homepage = "https://savannah.nongnu.org/projects/quilt"; description = "Easily manage large numbers of patches"; longDescription = '' diff --git a/pkgs/development/tools/rdbtools/default.nix b/pkgs/development/tools/rdbtools/default.nix index 5a81ae757ea..050c4ff04a2 100644 --- a/pkgs/development/tools/rdbtools/default.nix +++ b/pkgs/development/tools/rdbtools/default.nix @@ -18,7 +18,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Parse Redis dump.rdb files, Analyze Memory, and Export Data to JSON"; - homepage = https://github.com/sripathikrishnan/redis-rdb-tools; + homepage = "https://github.com/sripathikrishnan/redis-rdb-tools"; license = licenses.mit; maintainers = with maintainers; [ offline ]; }; diff --git a/pkgs/development/tools/rdocker/default.nix b/pkgs/development/tools/rdocker/default.nix index d92003a575e..60df0df1003 100644 --- a/pkgs/development/tools/rdocker/default.nix +++ b/pkgs/development/tools/rdocker/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Securely control a remote docker daemon CLI using ssh forwarding, no SSL setup needed"; - homepage = https://github.com/dvddarias/rdocker; + homepage = "https://github.com/dvddarias/rdocker"; maintainers = [ stdenv.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 15c61da13c0..f4cf500c2f9 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/jhen0409/react-native-debugger; + homepage = "https://github.com/jhen0409/react-native-debugger"; license = licenses.mit; description = "The standalone app based on official debugger of React Native, and includes React Inspector / Redux DevTools"; maintainers = with maintainers; [ ]; diff --git a/pkgs/development/tools/redis-dump/Gemfile.lock b/pkgs/development/tools/redis-dump/Gemfile.lock index 364bdb778f5..f789ae87d8d 100644 --- a/pkgs/development/tools/redis-dump/Gemfile.lock +++ b/pkgs/development/tools/redis-dump/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES redis-dump BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index 646d04c266f..2c93ef47d69 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Backup and restore your Redis data to and from JSON"; - homepage = http://delanotes.com/redis-dump/; + homepage = "http://delanotes.com/redis-dump/"; license = licenses.mit; maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/reflex/default.nix b/pkgs/development/tools/reflex/default.nix index b82c0694fec..86576869a97 100644 --- a/pkgs/development/tools/reflex/default.nix +++ b/pkgs/development/tools/reflex/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with lib; { description = "A small tool to watch a directory and rerun a command when certain files change"; - homepage = https://github.com/cespare/reflex; + homepage = "https://github.com/cespare/reflex"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ nicknovitski ]; diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index 2d5346f2112..c8f540485a3 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with lib; { description = "reftools - refactoring tools for Go"; - homepage = https://github.com/davidrjenni/reftools; + homepage = "https://github.com/davidrjenni/reftools"; license = licenses.bsd2; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index eb70a7b326d..141b70c689c 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Convert between TOML, YAML and JSON"; license = licenses.mit; - homepage = https://github.com/dbohdan/remarshal; + homepage = "https://github.com/dbohdan/remarshal"; maintainers = with maintainers; [ offline ]; }; } diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index 80c64a65083..2b082d03b5f 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -20,7 +20,7 @@ with pythonPackages; buildPythonApplication rec { meta = with stdenv.lib; { description = "Release Notes Manager"; - homepage = http://docs.openstack.org/developer/reno/; + homepage = "http://docs.openstack.org/developer/reno/"; license = licenses.asl20; maintainers = with maintainers; [ guillaumekoenig ]; }; diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix index 416dafe2872..24722741184 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.20.1-01"; + version = "3.22.0-02"; src = fetchurl { url = "https://sonatype-download.global.ssl.fastly.net/nexus/3/nexus-${version}-unix.tar.gz"; - sha256 = "0l8fwcnpbc35lqadyrsljvr4rr5kp9gkx5dxs9i35mg2f0z9bagv"; + sha256 = "12433fgva03gsgi37xqgkdnbglgq4b66lmzk5cyxfg22szl4xvwz"; }; preferLocalBuild = true; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Repository manager for binary software components"; - homepage = http://www.sonatype.org/nexus; + homepage = "http://www.sonatype.org/nexus"; license = licenses.epl10; platforms = platforms.all; maintainers = with maintainers; [ aespinosa ironpinguin zaninime ]; diff --git a/pkgs/development/tools/rgp/default.nix b/pkgs/development/tools/rgp/default.nix new file mode 100644 index 00000000000..dea0512b7d6 --- /dev/null +++ b/pkgs/development/tools/rgp/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, makeWrapper +, fetchurl +, autoPatchelfHook +, dbus +, fontconfig +, freetype +, glib +, libglvnd +, libX11 +, libxcb +, libXi +, ncurses5 +, qtbase +, zlib +}: + +stdenv.mkDerivation rec { + pname = "rgp"; + version = "1.7.0.29"; + + src = fetchurl { + url = "https://github.com/GPUOpen-Tools/radeon_gpu_profiler/releases/download/v${lib.versions.majorMinor version}/RadeonGPUProfiler_${version}.tgz"; + sha256 = "d7d4aa92231796a509dfcf92e9618cac98ae6572c12efd0871eb43afa4e8240a"; + }; + + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; + + buildInputs = [ + dbus + fontconfig + freetype + glib + libglvnd + libX11 + libxcb + libXi + ncurses5 + qtbase + zlib + ]; + + runtimeDependencies = [ + "${placeholder "out"}/opt/rgp" + "${placeholder "out"}/opt/rgp/qt" + ]; + + installPhase = '' + mkdir -p $out/opt/rgp $out/bin + cp -r . $out/opt/rgp/ + # Breaks autoPatchelfHook and has no known usage + rm $out/opt/rgp/AMDToolsDownloader + + for prog in RadeonGPUProfiler RadeonDeveloperPanel RadeonDeveloperService RadeonDeveloperServiceCLI; do + # makeWrapper is needed so that executables are started from the opt + # directory, where qt.conf is + makeWrapper \ + $out/opt/rgp/$prog \ + $out/bin/$prog + done + ''; + + meta = with lib; { + description = "A tool from AMD that allows for deep inspection of GPU workloads"; + homepage = "https://gpuopen.com/gaming-product/radeon-gpu-profiler-rgp/"; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/pkgs/development/tools/richgo/default.nix b/pkgs/development/tools/richgo/default.nix index 871ea0dc67a..9178f53bfde 100644 --- a/pkgs/development/tools/richgo/default.nix +++ b/pkgs/development/tools/richgo/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Enrich `go test` outputs with text decorations."; - homepage = https://github.com/kyoh86/richgo; + homepage = "https://github.com/kyoh86/richgo"; license = licenses.mit; maintainers = with maintainers; [ rvolosatovs ]; }; diff --git a/pkgs/development/tools/ronn/Gemfile.lock b/pkgs/development/tools/ronn/Gemfile.lock index c2b90f63494..ff71ebd7a01 100644 --- a/pkgs/development/tools/ronn/Gemfile.lock +++ b/pkgs/development/tools/ronn/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES ronn BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/pkgs/development/tools/ronn/default.nix b/pkgs/development/tools/ronn/default.nix index e4762796c18..9e4ac0b58eb 100644 --- a/pkgs/development/tools/ronn/default.nix +++ b/pkgs/development/tools/ronn/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "markdown-based tool for building manpages"; - homepage = https://rtomayko.github.io/ronn/; + homepage = "https://rtomayko.github.io/ronn/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm nicknovitski ]; platforms = env.ruby.meta.platforms; diff --git a/pkgs/development/tools/rshell/default.nix b/pkgs/development/tools/rshell/default.nix index b209b09eec7..5087b811ac0 100644 --- a/pkgs/development/tools/rshell/default.nix +++ b/pkgs/development/tools/rshell/default.nix @@ -2,17 +2,17 @@ buildPythonApplication rec { pname = "rshell"; - version = "0.0.26"; + version = "0.0.27"; src = fetchPypi { inherit pname version; - sha256 = "05nvfaykzwj1y86fcckrnvmrva7849lkbmpxsy2hb9akk0y7li6c"; + sha256 = "15pm60jfmr5nms43nrh5jlpz4lxxfhaahznfcys6nc4g80r2fwr2"; }; propagatedBuildInputs = [ pyserial pyudev ]; meta = with lib; { - homepage = https://github.com/dhylands/rshell; + homepage = "https://github.com/dhylands/rshell"; description = "Remote Shell for MicroPython"; license = licenses.mit; maintainers = with maintainers; [ c0deaddict ]; diff --git a/pkgs/development/tools/rtags/default.nix b/pkgs/development/tools/rtags/default.nix index c35018f4cc7..18efcb91353 100644 --- a/pkgs/development/tools/rtags/default.nix +++ b/pkgs/development/tools/rtags/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "C/C++ client-server indexer based on clang"; - homepage = https://github.com/andersbakken/rtags; + homepage = "https://github.com/andersbakken/rtags"; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; x86_64 ++ aarch64; }; diff --git a/pkgs/development/tools/rubocop/Gemfile.lock b/pkgs/development/tools/rubocop/Gemfile.lock index 9d166f0fad5..0e6e3a7f361 100644 --- a/pkgs/development/tools/rubocop/Gemfile.lock +++ b/pkgs/development/tools/rubocop/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES rubocop BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/development/tools/rucksack/default.nix b/pkgs/development/tools/rucksack/default.nix index 9eb568040ff..2734cdd3596 100644 --- a/pkgs/development/tools/rucksack/default.nix +++ b/pkgs/development/tools/rucksack/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Texture packer and resource bundler"; platforms = [ "i686-linux" "x86_64-linux" ]; # fails on Darwin and AArch64 - homepage = https://github.com/andrewrk/rucksack; + homepage = "https://github.com/andrewrk/rucksack"; license = licenses.mit; maintainers = [ maintainers.andrewrk ]; }; diff --git a/pkgs/development/tools/run/default.nix b/pkgs/development/tools/run/default.nix index 4dcfed96056..61e04a774aa 100644 --- a/pkgs/development/tools/run/default.nix +++ b/pkgs/development/tools/run/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { meta = with stdenv.lib; { description = "Easily manage and invoke small scripts and wrappers"; - homepage = https://github.com/TekWizely/run; + homepage = "https://github.com/TekWizely/run"; license = licenses.mit; maintainers = with maintainers; [ rawkode filalex77 ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/rund/default.nix b/pkgs/development/tools/rund/default.nix index a2433da2997..9a7ac0b6324 100644 --- a/pkgs/development/tools/rund/default.nix +++ b/pkgs/development/tools/rund/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A compiler-wrapper that runs and caches D programs"; - homepage = https://github.com/dragon-lang/rund; + homepage = "https://github.com/dragon-lang/rund"; license = lib.licenses.boost; maintainers = with maintainers; [ jonathanmarler ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/tools/rust/cargo-asm/default.nix b/pkgs/development/tools/rust/cargo-asm/default.nix index 9d2279fe598..d8aca4045bf 100644 --- a/pkgs/development/tools/rust/cargo-asm/default.nix +++ b/pkgs/development/tools/rust/cargo-asm/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-asm"; - version = "0.1.17"; + version = "2019-12-24"; src = fetchFromGitHub { owner = "gnzlbg"; repo = "cargo-asm"; - rev = "7f69a17e9c36dfe1f0d7080d7974c72ecc87a145"; - sha256 = "0zn5p95hsmhvk2slc9hakrpvim6l4zbpgkks2x64ndwyfmzyykws"; + rev = "577f890ebd4a09c8265710261e976fe7bfce8668"; + sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb"; }; - cargoSha256 = "1xsfwzn2b7hmb7hwgfa4ss7qfas8957gkw7zys0an9hdj5qr3ywb"; + cargoSha256 = "0d797cisiydblh64vqpfdjf37wmxrvs77phdrqh582lbrvnfhx2j"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Display the assembly or LLVM-IR generated for Rust source code"; - homepage = https://github.com/gnzlbg/cargo-asm; + homepage = "https://github.com/gnzlbg/cargo-asm"; license = licenses.mit; maintainers = [ maintainers.danieldk ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-bloat/default.nix b/pkgs/development/tools/rust/cargo-bloat/default.nix index d9980df02a0..8374e065356 100644 --- a/pkgs/development/tools/rust/cargo-bloat/default.nix +++ b/pkgs/development/tools/rust/cargo-bloat/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-bloat"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "0h535fnmwm1ix08a3ifasppqcm7z4fiwf6kn32vhqqpn7x9vvl53"; + sha256 = "04h9yyna47cgn2d232v2fpbgki9gg4lykpmx46ncpsq4g6azl1a9"; }; - cargoSha256 = "00j2czhb0ag10hwq7ycdwr2ndb6gz99kg12hlmaq4mkaf8h254nn"; + cargoSha256 = "0lzc2nwz9lpwxv704k40d1416qnf3wy3g6ad8w8xbkfc6ydcaa4l"; meta = with lib; { description = "A tool and Cargo subcommand that helps you find out what takes most of the space in your executable"; diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 7ffb77f741b..73dcb96201e 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.18"; + version = "0.4.19"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "1dhrzfy1ii2vg8psvz9rrgk0blj5bl64ghr0z44vh5y0kxn9v62p"; + sha256 = "15izqd6nbpxjjymdmcpzjmaiygs1vdrpg9cw1nzmrkb8fc4h5ch5"; }; - cargoSha256 = "13ib0binyw1rzxjg59ly3ahyr53wdq3z7wfp11gd61kzwz34gs9d"; + cargoSha256 = "0sbpymxhhwxg13w9821b17nda6p3ycqr81i7bj4fxil0n3sb910h"; buildInputs = [ llvmPackages.libclang ] ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index a31bcab82d4..7379fbffe5e 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Command line helpers for fuzzing"; - homepage = https://github.com/rust-fuzz/cargo-fuzz; + homepage = "https://github.com/rust-fuzz/cargo-fuzz"; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.ekleog ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-geiger/default.nix b/pkgs/development/tools/rust/cargo-geiger/default.nix index 7678db0a386..09956976fb6 100644 --- a/pkgs/development/tools/rust/cargo-geiger/default.nix +++ b/pkgs/development/tools/rust/cargo-geiger/default.nix @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Detects usage of unsafe Rust in a Rust crate and its dependencies."; - homepage = https://github.com/rust-secure-code/cargo-geiger; + homepage = "https://github.com/rust-secure-code/cargo-geiger"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ evanjs ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index a5337e94087..360cb469e6c 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "cargo, make me a project"; - homepage = https://github.com/ashleygwilliams/cargo-generate; + homepage = "https://github.com/ashleygwilliams/cargo-generate"; license = licenses.asl20; maintainers = [ maintainers.turbomack ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-inspect/default.nix b/pkgs/development/tools/rust/cargo-inspect/default.nix index 34d45ac83c7..f16a5d5727a 100644 --- a/pkgs/development/tools/rust/cargo-inspect/default.nix +++ b/pkgs/development/tools/rust/cargo-inspect/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "See what Rust is doing behind the curtains"; - homepage = https://github.com/mre/cargo-inspect; + homepage = "https://github.com/mre/cargo-inspect"; license = with licenses; [ mit asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ minijackson ]; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 86a539b33d7..f5ad1b413ca 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -104,14 +104,14 @@ dependencies = [ [[package]] name = "cargo-make" -version = "0.30.0" +version = "0.30.4" dependencies = [ - "ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)", "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscriptsdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "duckscriptsdk 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -142,7 +142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "ci_info" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "envmnt 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -239,7 +239,7 @@ dependencies = [ [[package]] name = "duckscriptsdk" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -953,7 +953,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" "checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" "checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum ci_info 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e53a6853eb0aafd4be4d1c7c891982a91a58f84df98838992ce3eb774572bfd9" +"checksum ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b407009a4a51ae109dbdfcd7b6e4de38d148f37fad512b8c4623c642c4045e68" "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" "checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d" "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" @@ -964,7 +964,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" "checksum duckscript 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aa4a338912dce0ada9929b9aa81c3b279e51b101583da13541339efaee46dfa9" -"checksum duckscriptsdk 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9da937d7dc544fe56d34e2b70c68bac038a821f5822e8a567b1ce52d47edd1c0" +"checksum duckscriptsdk 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cc45d92450a257a4fbf28126086983c88010dbe2f99f3559d0073a6ed440046" "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" "checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index f3d6788e3ac..04e7d17503b 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.30.0"; + version = "0.30.4"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0zlj2jys97nphymxrzdjmnh9vv7rsq3fgidap96mh26q9af7ffbz"; + sha256 = "14sl7kcr1n3xb912vd3445pwf3v1kp74lgxlwqybnwiyh1dxihvg"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1pjdpnilbxn7vzxl15j5d3k07a80y1mr5cdmj96miyq89j5mmjq0"; + cargoSha256 = "06i1z5jjqyadmvjgwxjlxcj2mmb0g83byibl3ap9qffahn0vhf7x"; # 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 f892263dd69..96b4cd078bc 100644 --- a/pkgs/development/tools/rust/cargo-raze/default.nix +++ b/pkgs/development/tools/rust/cargo-raze/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Generate Bazel BUILD files from Cargo dependencies"; - homepage = https://github.com/google/cargo-raze; + homepage = "https://github.com/google/cargo-raze"; license = licenses.asl20; maintainers = with maintainers; [ elasticdog ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 8bebaf24d47..2dfbfeeb179 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; - homepage = https://github.com/holmgr/cargo-sweep; + homepage = "https://github.com/holmgr/cargo-sweep"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ xrelkd ]; diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index d092274cf36..35c0b9530eb 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A Cargo subcommand for watching over Cargo project's source"; - homepage = https://github.com/passcod/cargo-watch; + homepage = "https://github.com/passcod/cargo-watch"; license = licenses.cc0; platforms = platforms.all; maintainers = with maintainers; [ xrelkd ivan ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 34d74480746..87e8e081a93 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "1x21g66gri6z9bnnfn7zmnf2lwdf5ing76pcmw0ilx4nzpvfhkg0"; + sha256 = "100ls8p8w6jwcjh3ligly5alg8fzp21aj7b1qbndn9fm0y1nmjam"; }; - cargoSha256 = "13fbahdih5whll09pfgyb1bjag1f0d0xfwgm2s342bs1krxsrbh3"; + cargoSha256 = "0d9sz46yzh01dx973q10xzw4k7r7ylvg82s5pkp3zpwcin8smaiw"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A project for generating C bindings from Rust code"; - homepage = https://github.com/eqrion/cbindgen; + homepage = "https://github.com/eqrion/cbindgen"; license = licenses.mpl20; maintainers = with maintainers; [ jtojnar andir ]; }; diff --git a/pkgs/development/tools/rust/maturin/Cargo.lock.patch b/pkgs/development/tools/rust/maturin/Cargo.lock.patch new file mode 100644 index 00000000000..9f7d46d4901 --- /dev/null +++ b/pkgs/development/tools/rust/maturin/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 09ecb81..c37c646 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -733,7 +733,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + + [[package]] + name = "maturin" +-version = "0.8.0-beta.1" ++version = "0.8.0" + dependencies = [ + "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/rust/maturin/default.nix b/pkgs/development/tools/rust/maturin/default.nix index 70c424ee008..e4ee97d0242 100644 --- a/pkgs/development/tools/rust/maturin/default.nix +++ b/pkgs/development/tools/rust/maturin/default.nix @@ -5,16 +5,21 @@ let inherit (darwin.apple_sdk.frameworks) Security; in rustPlatform.buildRustPackage rec { name = "maturin-${version}"; - version = "0.7.9"; + version = "0.8.0"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; rev = "v${version}"; - sha256 = "1l8i1mz97zsc8kayvryv6xznwpby9k9jxy7lsx45acs5yksqchrv"; + sha256 = "1fjai0c0j8zzaj4c186dkbvx6cpj0vi3sc1qbjbgn2cm8azsd6m6"; }; - cargoSha256 = "0ly0f64acn1hxnj7vg1m860xpl06rklwqh545c386nnxaj839b0r"; + # The maturin 0.8.0 lockfile has an incorrect version for maturin + # itself. The upstream lockfiles are normally correct, so this + # should be removed post-0.8.0. + cargoPatches = [ ./Cargo.lock.patch ]; + + cargoSha256 = "01sh523fi46k5xwdslhnmjz128jkdw47gp9bd8gim3ay13zkcn1i"; nativeBuildInputs = [ pkgconfig ]; @@ -27,7 +32,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Build and publish crates with pyo3 bindings as python packages"; - homepage = https://github.com/PyO3/maturin; + homepage = "https://github.com/PyO3/maturin"; license = licenses.mit; maintainers = [ maintainers.danieldk ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 82b415bc8a3..0a29577e0cd 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A utility intended to provide Rust code completion for editors and IDEs"; - homepage = https://github.com/racer-rust/racer; + homepage = "https://github.com/racer-rust/racer"; license = licenses.mit; maintainers = with maintainers; [ jagajaga ma27 ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 5d4e4fbeb8d..959eb6875ce 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "The Rust toolchain installer"; - homepage = https://www.rustup.rs/; + homepage = "https://www.rustup.rs/"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.mic92 ]; platforms = platforms.all; diff --git a/pkgs/development/tools/rust/svd2rust/default.nix b/pkgs/development/tools/rust/svd2rust/default.nix index ecc7537267a..733504435ec 100644 --- a/pkgs/development/tools/rust/svd2rust/default.nix +++ b/pkgs/development/tools/rust/svd2rust/default.nix @@ -21,7 +21,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "Generate Rust register maps (`struct`s) from SVD files"; - homepage = https://github.com/rust-embedded/svd2rust; + homepage = "https://github.com/rust-embedded/svd2rust"; license = with licenses; [ mit asl20 ]; platforms = platforms.all; }; diff --git a/pkgs/development/tools/sass/Gemfile.lock b/pkgs/development/tools/sass/Gemfile.lock index 1b99dd3a136..9882e1efcc4 100644 --- a/pkgs/development/tools/sass/Gemfile.lock +++ b/pkgs/development/tools/sass/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES sass BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/sass/default.nix b/pkgs/development/tools/sass/default.nix index 6d9a7f1c080..8c76ac4e017 100644 --- a/pkgs/development/tools/sass/default.nix +++ b/pkgs/development/tools/sass/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Tools and Ruby libraries for the CSS3 extension languages: Sass and SCSS"; - homepage = https://sass-lang.com; + homepage = "https://sass-lang.com"; license = licenses.mit; maintainers = with maintainers; [ romildo manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/sassc/default.nix b/pkgs/development/tools/sassc/default.nix index 07f1581e341..373a7ea6665 100644 --- a/pkgs/development/tools/sassc/default.nix +++ b/pkgs/development/tools/sassc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A front-end for libsass"; - homepage = https://github.com/sass/sassc/; + homepage = "https://github.com/sass/sassc/"; license = licenses.mit; maintainers = with maintainers; [ codyopel pjones ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index 4cd8b328353..9560d45d681 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "A secure tunneling app for executing tests securely when testing behind firewalls"; license = licenses.unfree; - homepage = https://docs.saucelabs.com/reference/sauce-connect/; + homepage = "https://docs.saucelabs.com/reference/sauce-connect/"; maintainers = with maintainers; [offline]; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/development/tools/scalafix/default.nix b/pkgs/development/tools/scalafix/default.nix index ab70552c2e8..aa3a6cfb0dc 100644 --- a/pkgs/development/tools/scalafix/default.nix +++ b/pkgs/development/tools/scalafix/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Refactoring and linting tool for Scala"; - homepage = https://scalacenter.github.io/scalafix/; + homepage = "https://scalacenter.github.io/scalafix/"; license = licenses.bsd3; maintainers = [ maintainers.tomahna ]; }; diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 0c2b94807c0..76091926a23 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Opinionated code formatter for Scala"; - homepage = http://scalameta.org/scalafmt; + homepage = "http://scalameta.org/scalafmt"; license = licenses.asl20; maintainers = [ maintainers.markus1189 ]; }; diff --git a/pkgs/development/tools/scss-lint/Gemfile.lock b/pkgs/development/tools/scss-lint/Gemfile.lock index 546dfabe4d7..08e2fe4e64d 100644 --- a/pkgs/development/tools/scss-lint/Gemfile.lock +++ b/pkgs/development/tools/scss-lint/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES scss_lint BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/development/tools/scss-lint/default.nix b/pkgs/development/tools/scss-lint/default.nix index 8d17969b55e..866a860905c 100644 --- a/pkgs/development/tools/scss-lint/default.nix +++ b/pkgs/development/tools/scss-lint/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A tool to help keep your SCSS files clean and readable"; - homepage = https://github.com/brigade/scss-lint; + homepage = "https://github.com/brigade/scss-lint"; license = licenses.mit; maintainers = with maintainers; [ lovek323 nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 435588953db..3a0e598ca47 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sites.google.com/a/chromium.org/chromedriver; + homepage = "https://sites.google.com/a/chromium.org/chromedriver"; description = "A WebDriver server for running Selenium tests on Chrome"; license = licenses.bsd3; maintainers = [ maintainers.goibhniu maintainers.marsam ]; diff --git a/pkgs/development/tools/selenium/htmlunit-driver/default.nix b/pkgs/development/tools/selenium/htmlunit-driver/default.nix index 3f4b8a22d64..400cf24012a 100644 --- a/pkgs/development/tools/selenium/htmlunit-driver/default.nix +++ b/pkgs/development/tools/selenium/htmlunit-driver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installPhase = "install -D $src $out/share/lib/${pname}-${version}/${pname}-${version}.jar"; meta = { - homepage = https://github.com/SeleniumHQ/htmlunit-driver; + homepage = "https://github.com/SeleniumHQ/htmlunit-driver"; description = "A WebDriver server for running Selenium tests on the HtmlUnit headless browser"; maintainers = with maintainers; [ coconnor offline ]; platforms = platforms.all; diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix index 27e87d212e6..bf9eabec53c 100644 --- a/pkgs/development/tools/selenium/selendroid/default.nix +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://selendroid.io/; + homepage = "http://selendroid.io/"; description = "Test automation for native or hybrid Android apps and the mobile web"; maintainers = with maintainers; [ offline ]; platforms = platforms.all; diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index d3a8efaadb6..a93275f6e2e 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.seleniumhq.org/; + homepage = "http://www.seleniumhq.org/"; description = "Selenium Server for remote WebDriver"; maintainers = with maintainers; [ coconnor offline ]; platforms = platforms.all; diff --git a/pkgs/development/tools/setupcfg2nix/default.nix b/pkgs/development/tools/setupcfg2nix/default.nix index 5d1f015e805..9762862cf61 100644 --- a/pkgs/development/tools/setupcfg2nix/default.nix +++ b/pkgs/development/tools/setupcfg2nix/default.nix @@ -6,12 +6,12 @@ buildSetupcfg rec { owner = "target"; repo = "setupcfg2nix"; rev = info.version; - sha256 = "1zn9njpzwhwikrirgjlyz6ys3xr8gq61ry8blmnpscqvhsdhxcs6"; + sha256 = "1rj227vxybwp9acwnpwg9np964b1qcw2av3qmx00isnrw5vcps8m"; }; application = true; meta = { description = "Generate nix expressions from setup.cfg for a python package."; - homepage = https://github.com/target/setupcfg2nix; + homepage = "https://github.com/target/setupcfg2nix"; license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = [ lib.maintainers.shlevy ]; diff --git a/pkgs/development/tools/setupcfg2nix/info.nix b/pkgs/development/tools/setupcfg2nix/info.nix index b0d5873ed63..6b65632bf7d 100644 --- a/pkgs/development/tools/setupcfg2nix/info.nix +++ b/pkgs/development/tools/setupcfg2nix/info.nix @@ -1,6 +1,6 @@ { pname = ''setupcfg2nix''; - version = ''1.1.0''; + version = ''2.0.1''; install_requires = [ ''setuptools'' ]; diff --git a/pkgs/development/tools/sigrok-cli/default.nix b/pkgs/development/tools/sigrok-cli/default.nix index f5b1399df09..b71e9fb3a99 100644 --- a/pkgs/development/tools/sigrok-cli/default.nix +++ b/pkgs/development/tools/sigrok-cli/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line frontend for the sigrok signal analysis software suite"; - homepage = https://sigrok.org/; + homepage = "https://sigrok.org/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index a455f9e5fc7..83ae00ce7b6 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; - homepage = https://github.com/buserror/simavr; + homepage = "https://github.com/buserror/simavr"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ goodrone ]; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index bab881cf4a4..d1d1200344f 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.4.0"; + version = "1.6.0"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "bb324609b4254ceb9f76d35eb03642a6a1807867"; + rev = "4cc0be23e41e37d8b1bca1464516538b2cc1bba0"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0nrz2gnp722cq4p8lcfl0nlws53c2bfq17jgr2jad4vyjglgfscw"; + sha256 = "0wz9x3p0hfajrkm1qrhl4kw7l7r3n6xv16chl4dxigaix8ga068h"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index c065629018c..4425640828c 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,17 +1,27 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, runCommand -, gpgme, libgpgerror, lvm2, btrfs-progs, pkgconfig, libselinux -, go-md2man }: +{ stdenv +, lib +, buildGoPackage +, fetchFromGitHub +, runCommand +, gpgme +, libgpgerror +, lvm2 +, btrfs-progs +, pkg-config +, libselinux +, go-md2man +}: with stdenv.lib; let - version = "0.1.41"; + version = "0.2.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "0aqw17irj2wn4a8g9hzfm5z5azqq33z6r1dbg1gyn2c8qxy1vfxs"; + sha256 = "09zqzrw6f1s6kaknnj3hra3xz4nq6y86vmw5vk8p4f6g7cwakg1x"; }; defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; @@ -28,7 +38,7 @@ buildGoPackage { excludedPackages = "integration"; - nativeBuildInputs = [ pkgconfig (lib.getBin go-md2man) ]; + nativeBuildInputs = [ pkg-config (lib.getBin go-md2man) ]; buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; buildFlagsArray = '' @@ -49,10 +59,10 @@ buildGoPackage { popd ''; - meta = { + meta = with stdenv.lib; { description = "A command line utility for various operations on container images and image repositories"; homepage = "https://github.com/containers/skopeo"; - maintainers = with stdenv.lib.maintainers; [ vdemeester lewo ]; - license = stdenv.lib.licenses.asl20; + maintainers = with maintainers; [ lewo ] ++ teams.podman.members; + license = licenses.asl20; }; } diff --git a/pkgs/development/tools/solarus-quest-editor/default.nix b/pkgs/development/tools/solarus-quest-editor/default.nix index e0a078415eb..7dcde72fc4b 100644 --- a/pkgs/development/tools/solarus-quest-editor/default.nix +++ b/pkgs/development/tools/solarus-quest-editor/default.nix @@ -26,7 +26,7 @@ mkDerivation rec { Many full-fledged games have been writen for the engine. Games can be created easily using the editor. ''; - homepage = http://www.solarus-games.org; + homepage = "http://www.solarus-games.org"; license = licenses.gpl3; maintainers = [ maintainers.Nate-Devv ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/sourcetrail/default.nix b/pkgs/development/tools/sourcetrail/default.nix index 3d068b06f40..9e41f209cfd 100644 --- a/pkgs/development/tools/sourcetrail/default.nix +++ b/pkgs/development/tools/sourcetrail/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.sourcetrail.com; + homepage = "https://www.sourcetrail.com"; description = "A cross-platform source explorer for C/C++ and Java"; platforms = [ "x86_64-linux" ]; license = licenses.unfree; diff --git a/pkgs/development/tools/spring-boot/default.nix b/pkgs/development/tools/spring-boot/default.nix index 9e0e2b5dee4..4f8c17caeee 100644 --- a/pkgs/development/tools/spring-boot/default.nix +++ b/pkgs/development/tools/spring-boot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { by using java -jar or more traditional war deployments. We also provide a command line tool that runs “spring scripts”. ''; - homepage = https://spring.io/projects/spring-boot; + homepage = "https://spring.io/projects/spring-boot"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; diff --git a/pkgs/development/tools/sqlint/Gemfile.lock b/pkgs/development/tools/sqlint/Gemfile.lock index 6fc638615fb..a57d1811b19 100644 --- a/pkgs/development/tools/sqlint/Gemfile.lock +++ b/pkgs/development/tools/sqlint/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - pg_query (1.1.0) - sqlint (0.1.9) + pg_query (1.2.0) + sqlint (0.1.10) pg_query (~> 1) PLATFORMS @@ -12,4 +12,4 @@ DEPENDENCIES sqlint BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/tools/sqlint/default.nix b/pkgs/development/tools/sqlint/default.nix index d7ff9199460..f9c535cc2ba 100644 --- a/pkgs/development/tools/sqlint/default.nix +++ b/pkgs/development/tools/sqlint/default.nix @@ -27,7 +27,7 @@ in bundlerApp { meta = with lib; { description = "Simple SQL linter"; - homepage = https://github.com/purcell/sqlint; + homepage = "https://github.com/purcell/sqlint"; license = licenses.mit; maintainers = with maintainers; [ ariutta nicknovitski ]; platforms = with platforms; [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/development/tools/sqlint/gemset.nix b/pkgs/development/tools/sqlint/gemset.nix index b10a56c4c92..a86277363fb 100644 --- a/pkgs/development/tools/sqlint/gemset.nix +++ b/pkgs/development/tools/sqlint/gemset.nix @@ -4,10 +4,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "070iy9jdj0snfl42my5n6i2svcnn87cbffcjvvq5068hw0b0296w"; + sha256 = "0p9s6znavm6v5dwk1hxg9a8h2lrrwh9l0rlk0sy8cx4sq2mq82m1"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; sqlint = { dependencies = ["pg_query"]; @@ -15,9 +15,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pg9c00w520mw1mzq8kls8whwgqva1alksdsv536bh9nq7m2hnky"; + sha256 = "0ds7qsaqi745fda8nliy15is36l1bkfbfkr43q6smpy103xbk44c"; type = "gem"; }; - version = "0.1.9"; + 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 52c33f3e444..d6087cd0224 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { by Sybase. ''; license = licenses.gpl2; - homepage = https://sourceforge.net/projects/sqsh/; + homepage = "https://sourceforge.net/projects/sqsh/"; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix index d3875ae8a69..a6d1ce55fdb 100644 --- a/pkgs/development/tools/sslmate/default.nix +++ b/pkgs/development/tools/sslmate/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sslmate.com; + homepage = "https://sslmate.com"; maintainers = [ maintainers.domenkozar ]; description = "Easy to buy, deploy, and manage your SSL certs"; platforms = platforms.unix; diff --git a/pkgs/development/tools/stagit/default.nix b/pkgs/development/tools/stagit/default.nix index 8f4ee7ce6e5..dacee9aa78e 100644 --- a/pkgs/development/tools/stagit/default.nix +++ b/pkgs/development/tools/stagit/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.9.1"; src = fetchgit { - url = git://git.codemadness.org/stagit; + url = "git://git.codemadness.org/stagit"; rev = version; sha256 = "0gh28spkry9wbmdj0hmvz3680fvbyzab9cifhj1p76f4fz27rnv9"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "git static site generator"; - homepage = https://git.codemadness.org/stagit/; + homepage = "https://git.codemadness.org/stagit/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jb55 ]; diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix index b3026cdf84d..5a530c6e9f1 100644 --- a/pkgs/development/tools/sunxi-tools/default.nix +++ b/pkgs/development/tools/sunxi-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libusb, zlib }: +{ stdenv, fetchFromGitHub, pkgconfig, libusb1, zlib }: stdenv.mkDerivation { name = "sunxi-tools-20181113"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb zlib ]; + buildInputs = [ libusb1 zlib ]; makeFlags = [ "PREFIX=$(out)" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tools for Allwinner SoC devices"; - homepage = http://linux-sunxi.org/; + homepage = "http://linux-sunxi.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index cc865e2bd52..4cdb5b8dd16 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; - homepage = https://github.com/dinedal/textql; + homepage = "https://github.com/dinedal/textql"; license = licenses.mit; maintainers = with maintainers; [ vrthra ]; }; diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index 50c34dc39ed..a0bc39f2816 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Chromium-based cross-platform / cross-language application framework"; - homepage = https://github.com/breach/thrust; + homepage = "https://github.com/breach/thrust"; license = licenses.mit; maintainers = [ maintainers.osener ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/development/tools/toluapp/default.nix b/pkgs/development/tools/toluapp/default.nix index aab1c49a537..8f4e6670347 100644 --- a/pkgs/development/tools/toluapp/default.nix +++ b/pkgs/development/tools/toluapp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to integrate C/Cpp code with Lua"; - homepage = http://www.codenix.com/~tolua/; + homepage = "http://www.codenix.com/~tolua/"; license = licenses.mit; maintainers = with maintainers; [ vrthra ]; platforms = with platforms; unix; diff --git a/pkgs/development/tools/tradcpp/default.nix b/pkgs/development/tools/tradcpp/default.nix index 7f395174bb4..ddcdc38a4fb 100644 --- a/pkgs/development/tools/tradcpp/default.nix +++ b/pkgs/development/tools/tradcpp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "tradcpp-0.5.2"; src = fetchurl { - url = https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz; + url = "https://ftp.netbsd.org/pub/NetBSD/misc/dholland/tradcpp-0.5.2.tar.gz"; sha256 = "1h2bwxwc13rz3g2236l89hm47f72hn3m4h7wjir3j532kq0m68bc"; }; diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index d297105ea91..13249273564 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { to provide sufficient information to develop a free and open Verilog to bitstream toolchain for these devices. ''; - homepage = https://github.com/SymbiFlow/prjtrellis; + homepage = "https://github.com/SymbiFlow/prjtrellis"; license = stdenv.lib.licenses.isc; maintainers = with maintainers; [ q3k thoughtpolice emily ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/tychus/default.nix b/pkgs/development/tools/tychus/default.nix index 5908ceb0f80..82dce7f81e7 100644 --- a/pkgs/development/tools/tychus/default.nix +++ b/pkgs/development/tools/tychus/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = { description = "Command line utility to live-reload your application."; - homepage = https://github.com/devlocker/tychus; + homepage = "https://github.com/devlocker/tychus"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/tools/uftrace/default.nix b/pkgs/development/tools/uftrace/default.nix index a364f2eed0c..2fbf7366538 100644 --- a/pkgs/development/tools/uftrace/default.nix +++ b/pkgs/development/tools/uftrace/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Function (graph) tracer for user-space"; - homepage = https://github.com/namhyung/uftrace; + homepage = "https://github.com/namhyung/uftrace"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [stdenv.lib.maintainers.nthorne]; diff --git a/pkgs/development/tools/unconvert/default.nix b/pkgs/development/tools/unconvert/default.nix index a6c087d7be7..d3372ec1b6e 100644 --- a/pkgs/development/tools/unconvert/default.nix +++ b/pkgs/development/tools/unconvert/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with lib; { description = "Remove unnecessary type conversions from Go source"; - homepage = https://github.com/mdempsky/unconvert; + homepage = "https://github.com/mdempsky/unconvert"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 895cedd7010..13ab61b5567 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -127,7 +127,7 @@ in stdenv.mkDerivation { dontPatchELF = true; meta = with stdenv.lib; { - homepage = https://unity3d.com/; + homepage = "https://unity3d.com/"; description = "Game development tool"; longDescription = '' Popular development platform for creating 2D and 3D multiplatform games diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 677fddd0f60..cc1f1c8021a 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -116,7 +116,7 @@ in buildRubyGem rec { meta = with lib; { description = "A tool for building complete development environments"; - homepage = https://www.vagrantup.com/; + homepage = "https://www.vagrantup.com/"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 92fb6ebcc68..199f1626c89 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/vala-lang/vala-lint; + homepage = "https://github.com/vala-lang/vala-lint"; description = "Check Vala code files for code-style errors"; longDescription = '' Small command line tool and library for checking Vala code files for code-style errors. diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index f9a84937af3..bab3ebd5757 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -5,14 +5,14 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.1.36"; + version = "0.2.7"; src = fetchPypi { inherit pname version; - sha256 = "3c3d347f46cda641344ec5d613896499981b0540e2bfa299baf6026dab7649ca"; + sha256 = "1mq8lmb1wh55cqdj7javq7qia4217h6vf5ljc99gsjyibi7g7d3k"; }; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ pyyaml setuptools ]; makeWrapperArgs = ["--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ git bazaar subversion ])]; @@ -20,7 +20,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Provides a command line tool to invoke vcs commands on multiple repositories"; - homepage = https://github.com/dirk-thomas/vcstool; + homepage = "https://github.com/dirk-thomas/vcstool"; license = licenses.asl20; maintainers = with maintainers; [ sivteck ]; }; diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index df0c360f75c..5f2a45f7427 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -33,7 +33,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; - homepage = https://github.com/adisbladis/vgo2nix; + homepage = "https://github.com/adisbladis/vgo2nix"; license = licenses.mit; maintainers = with maintainers; [ adisbladis ]; }; diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 382871ff6af..fcab1f952f2 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -25,7 +25,7 @@ buildPythonApplication rec { meta = with lib; { description = "Fast and Highly Extensible Vim script Language Lint implemented by Python"; - homepage = https://github.com/Kuniwak/vint; + homepage = "https://github.com/Kuniwak/vint"; license = licenses.mit; maintainers = with maintainers; [ andsild ]; platforms = platforms.all; diff --git a/pkgs/development/tools/vndr/default.nix b/pkgs/development/tools/vndr/default.nix index 197f48dbbfb..82f0018ce69 100644 --- a/pkgs/development/tools/vndr/default.nix +++ b/pkgs/development/tools/vndr/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "Stupid golang vendoring tool, inspired by docker vendor script"; - homepage = https://github.com/LK4D4/vndr; + homepage = "https://github.com/LK4D4/vndr"; maintainers = with lib.maintainers; [ vdemeester ]; license = lib.licenses.asl20; }; diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 266024d323d..7821c34bb17 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -48,7 +48,7 @@ mkDerivation { meta = with lib; { description = "OpenGL capture / playback debugger."; - homepage = https://github.com/ValveSoftware/vogl; + homepage = "https://github.com/ValveSoftware/vogl"; license = licenses.mit; maintainers = [ maintainers.deepfire ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 5d807d13a9e..06a1e4025e1 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = https://www.lunarg.com; + homepage = "https://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 23fd684b412..d59ff0c1ec5 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -14,7 +14,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; + homepage = "https://github.com/JamesClonk/vultr"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.zauberpony ]; diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index b3be6c4552d..281d68d27de 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { format * wasm2c: convert a WebAssembly binary file to a C source and header ''; - homepage = https://github.com/WebAssembly/wabt; + homepage = "https://github.com/WebAssembly/wabt"; license = licenses.asl20; maintainers = with maintainers; [ ekleog ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix index 6020d6fe876..5d2550b89cb 100644 --- a/pkgs/development/tools/wally-cli/default.nix +++ b/pkgs/development/tools/wally-cli/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { meta = with lib; { description = "A tool to flash firmware to mechanical keyboards"; - homepage = https://ergodox-ez.com/pages/wally-planck; + homepage = "https://ergodox-ez.com/pages/wally-planck"; license = licenses.mit; maintainers = [ maintainers.spacekookie ]; }; diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index ee9a6ead7fa..b52346d96a8 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "-p" pname ]; meta = with lib; { - homepage = https://rustwasm.github.io/docs/wasm-bindgen/; + homepage = "https://rustwasm.github.io/docs/wasm-bindgen/"; license = licenses.asl20; description = "Facilitating high-level interactions between wasm modules and JavaScript"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/development/tools/wasm-pack/default.nix b/pkgs/development/tools/wasm-pack/default.nix index 77920dfeeed..e36e811ea56 100644 --- a/pkgs/development/tools/wasm-pack/default.nix +++ b/pkgs/development/tools/wasm-pack/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A utility that builds rust-generated WebAssembly package"; - homepage = https://github.com/rustwasm/wasm-pack; + homepage = "https://github.com/rustwasm/wasm-pack"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.dhkl ]; platforms = platforms.all; diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix index 3a58e1088ea..63f2b0e4933 100644 --- a/pkgs/development/tools/watchman/default.nix +++ b/pkgs/development/tools/watchman/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Watches files and takes action when they change"; - homepage = https://facebook.github.io/watchman; + homepage = "https://facebook.github.io/watchman"; maintainers = with maintainers; [ cstrahan ]; platforms = with platforms; linux ++ darwin; license = licenses.asl20; diff --git a/pkgs/development/tools/wiggle/default.nix b/pkgs/development/tools/wiggle/default.nix index f1edd52eca2..b89d36273f8 100644 --- a/pkgs/development/tools/wiggle/default.nix +++ b/pkgs/development/tools/wiggle/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://blog.neil.brown.name/category/wiggle/; + homepage = "http://blog.neil.brown.name/category/wiggle/"; description = "Tool for applying patches with conflicts"; longDescription = '' diff --git a/pkgs/development/tools/wiiload/default.nix b/pkgs/development/tools/wiiload/default.nix index 95f54050184..37d909461d0 100644 --- a/pkgs/development/tools/wiiload/default.nix +++ b/pkgs/development/tools/wiiload/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Load homebrew apps over network/usbgecko to your Wii"; - homepage = https://wiibrew.org/wiki/Wiiload; + homepage = "https://wiibrew.org/wiki/Wiiload"; license = licenses.gpl2; maintainers = with maintainers; [ tomsmeets ]; }; diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index e0c897499d2..500fde0ef47 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -43,7 +43,7 @@ pythonPackages.buildPythonApplication rec { multiple threads, namespace modification, embedded debugging, encrypted communication and is up to 20 times faster than pdb. ''; - homepage = http://winpdb.org/; + homepage = "http://winpdb.org/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 18d7be93258..cd002bd2ef6 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -1,17 +1,17 @@ { stdenv, python3Packages }: python3Packages.buildPythonApplication rec { - version = "1.2.2"; + version = "1.2.8"; pname = "wllvm"; name = "${pname}-${version}"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1zrjcabv41105mmv632gp488kmhya37n0jwgwxhadps4z3jv2qxb"; + sha256 = "1d88fzg4ba4r3hwrinnv6agiyj3xxdy4yryb8wz2ml51nc6bi591"; }; meta = with stdenv.lib; { - homepage = https://github.com/travitch/whole-program-llvm; + homepage = "https://github.com/travitch/whole-program-llvm"; description = "A wrapper script to build whole-program LLVM bitcode files"; license = licenses.mit; maintainers = with maintainers; [ mic92 dtzWill ]; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 14e55f99e0b..901435bb631 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,10 +1,9 @@ { stdenv, lib, fetchurl, writeText, php, makeWrapper }: - let - version = "2.2.0"; + version = "2.4.0"; completion = fetchurl { - url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; + url = "https://raw.githubusercontent.com/wp-cli/wp-cli/v${version}/utils/wp-completion.bash"; sha256 = "15d330x6d3fizrm6ckzmdknqg6wjlx5fr87bmkbd5s6a1ihs0g24"; }; @@ -15,14 +14,14 @@ let [Phar] phar.readonly = Off ''; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "wp-cli"; inherit version; src = fetchurl { - url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; - sha256 = "0s03jbsjwvkcbyss6rvpgw867hiwvk5p4n1qznkghyzi94j8mvki"; + url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${pname}-${version}.phar"; + sha256 = "0h5mjxrw4z3648v4wb4pvapz2a1mlmbszgggg4b7bvrrxn3cr78k"; }; nativeBuildInputs = [ makeWrapper ]; @@ -45,9 +44,9 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "A command line interface for WordPress"; - homepage = https://wp-cli.org; - license = licenses.mit; + homepage = "https://wp-cli.org"; + license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/tools/ws/default.nix b/pkgs/development/tools/ws/default.nix index da1b493b0d2..661865ee74e 100644 --- a/pkgs/development/tools/ws/default.nix +++ b/pkgs/development/tools/ws/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "websocket command line tool"; - homepage = https://github.com/hashrocket/ws; + homepage = "https://github.com/hashrocket/ws"; license = licenses.mit; maintainers = [ maintainers.the-kenny ]; platforms = platforms.unix; diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index 8090aca5ff3..cb2e6edd0e1 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Xcode-compatible build tool"; - homepage = https://github.com/facebook/xcbuild; + homepage = "https://github.com/facebook/xcbuild"; platforms = platforms.unix; maintainers = with maintainers; [ copumpkin matthewbauer ]; license = with licenses; [ bsd2 bsd3 ]; diff --git a/pkgs/development/tools/xcpretty/Gemfile.lock b/pkgs/development/tools/xcpretty/Gemfile.lock index 6f1ba7545a8..c0b9676d27b 100644 --- a/pkgs/development/tools/xcpretty/Gemfile.lock +++ b/pkgs/development/tools/xcpretty/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 1.16.4 + 2.1.4 diff --git a/pkgs/development/tools/xcpretty/default.nix b/pkgs/development/tools/xcpretty/default.nix index 84a6798afe3..9c24b981005 100644 --- a/pkgs/development/tools/xcpretty/default.nix +++ b/pkgs/development/tools/xcpretty/default.nix @@ -12,7 +12,7 @@ bundlerApp { meta = with lib; { description = "Flexible and fast xcodebuild formatter"; - homepage = https://github.com/supermarin/xcpretty; + homepage = "https://github.com/supermarin/xcpretty"; license = licenses.mit; maintainers = with maintainers; [ nicknovitski diff --git a/pkgs/development/tools/yaml2json/default.nix b/pkgs/development/tools/yaml2json/default.nix index f31a119bb65..e1427476dd8 100644 --- a/pkgs/development/tools/yaml2json/default.nix +++ b/pkgs/development/tools/yaml2json/default.nix @@ -16,7 +16,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/bronze1man/yaml2json; + homepage = "https://github.com/bronze1man/yaml2json"; description = "Convert yaml to json"; license = with licenses; [ mit ]; maintainers = [ maintainers.adisbladis ]; diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix index c2f72138db5..f3ecbb451f6 100644 --- a/pkgs/development/tools/ydiff/default.nix +++ b/pkgs/development/tools/ydiff/default.nix @@ -31,7 +31,7 @@ buildPythonApplication rec { checkTarget = if isPy3k then "test3" else "test"; meta = { - homepage = https://github.com/ymattw/ydiff; + 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 diff --git a/pkgs/development/tools/yq/default.nix b/pkgs/development/tools/yq/default.nix index e9b54e67f5e..c15fad01599 100644 --- a/pkgs/development/tools/yq/default.nix +++ b/pkgs/development/tools/yq/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line YAML processor - jq wrapper for YAML documents."; - homepage = https://github.com/kislyuk/yq; + homepage = "https://github.com/kislyuk/yq"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; }; diff --git a/pkgs/development/tools/yuicompressor/default.nix b/pkgs/development/tools/yuicompressor/default.nix index 82fac9f6be7..70160c1ce66 100644 --- a/pkgs/development/tools/yuicompressor/default.nix +++ b/pkgs/development/tools/yuicompressor/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A JavaScript and CSS minifier"; - homepage = http://yui.github.io/yuicompressor/; + homepage = "http://yui.github.io/yuicompressor/"; license = licenses.bsd3; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.all; diff --git a/pkgs/development/web/csslint/default.nix b/pkgs/development/web/csslint/default.nix index 4db0da4f418..a1c656fb766 100644 --- a/pkgs/development/web/csslint/default.nix +++ b/pkgs/development/web/csslint/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { rules to the code that look for problematic patterns or signs of inefficiency. The rules are all pluggable, so you can easily write your own or omit ones you don't want. ''; - homepage = https://nodejs.org; + homepage = "https://nodejs.org"; license = licenses.bsd2; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 86f6b129acc..2b6449d9dd4 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ pname = "cypress"; - version = "3.8.3"; + version = "4.2.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1ncq64s5y5dsx0lrz950vab2yzwihl2wd7yapp12305bjjsihj3z"; + sha256 = "0ksa7c0bpq13xxgk0qizg3kfyjihcqan5wm6f45v7kgz3wwxc4nz"; }; # don't remove runtime deps diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 05f07fd0260..965a53dcdbd 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -1,18 +1,16 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "flyctl"; - version = "0.0.102"; + version = "0.0.110"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "181j248i8j9g7kz5krg0bkbxkvmcwpz2vlknii5q3dy7yhgg19h3"; + sha256 = "1fvvanyzrai41fq98msjwzgwsidxbaly6f6knma6lwmicv4f9svg"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preBuild = '' go generate ./... ''; @@ -22,9 +20,9 @@ buildGoModule rec { rm $out/bin/helpgen ''; - modSha256 = "1mqkc7hnavvpbqar9f1d2vnm47p4car9abnk2ikyf27jr5glwmsd"; + modSha256 = "0lnk2g5msqhhshh99s32sqd793rdlzmp7vhqdb1fd6qafrrrxm5w"; - meta = with stdenv.lib; { + meta = with lib; { description = "Command line tools for fly.io services"; homepage = "https://fly.io/"; license = licenses.asl20; diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 4086566f681..fc68fa53246 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "0ry2z4xn0zmdr38k0aa9qiwvfg3q4yxd1wxdwmhzp1vd3g39cx49"; + sha256 = "107dvgwv2ldpdr99q1nvb1i93jj635p1n7md6q14v9m4a6a226sa"; }; buildInputs = [ unzip ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { over configuration to provide a productive and stream-lined development experience. ''; - homepage = https://grails.org/; + homepage = "https://grails.org/"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/development/web/kcgi/default.nix b/pkgs/development/web/kcgi/default.nix index ec1ec527c5e..0ba764ddbfd 100644 --- a/pkgs/development/web/kcgi/default.nix +++ b/pkgs/development/web/kcgi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = https://kristaps.bsd.lv/kcgi; + homepage = "https://kristaps.bsd.lv/kcgi"; description = "Minimal CGI and FastCGI library for C/C++"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/development/web/kore/default.nix b/pkgs/development/web/kore/default.nix index a59db6d4d1a..9cf74354f6e 100644 --- a/pkgs/development/web/kore/default.nix +++ b/pkgs/development/web/kore/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An easy to use web application framework for C"; - homepage = https://kore.io; + homepage = "https://kore.io"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ johnmh ]; diff --git a/pkgs/development/web/mailcatcher/Gemfile.lock b/pkgs/development/web/mailcatcher/Gemfile.lock index 560213897c9..69cc56a0029 100644 --- a/pkgs/development/web/mailcatcher/Gemfile.lock +++ b/pkgs/development/web/mailcatcher/Gemfile.lock @@ -38,4 +38,4 @@ DEPENDENCIES mailcatcher BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/development/web/mailcatcher/default.nix b/pkgs/development/web/mailcatcher/default.nix index f960fe19278..8be3c7ebb93 100644 --- a/pkgs/development/web/mailcatcher/default.nix +++ b/pkgs/development/web/mailcatcher/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "SMTP server and web interface to locally test outbound emails"; - homepage = https://mailcatcher.me/; + homepage = "https://mailcatcher.me/"; license = licenses.mit; maintainers = with maintainers; [ zarelit nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index cd602317c70..3752519d060 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "minify"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "09jk3mxf7n9wf1cgyiw9mhsr55fb12k399dmzhnib3vhd9xav15i"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Minifiers for web formats"; license = licenses.mit; homepage = "https://go.tacodewolff.nl/minify"; diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index dce8479d219..9f7a2cc9e28 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -139,7 +139,7 @@ in meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; - homepage = https://nodejs.org; + homepage = "https://nodejs.org"; license = licenses.mit; maintainers = with maintainers; [ goibhniu gilligan cko ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/development/web/nodejs/v10.nix b/pkgs/development/web/nodejs/v10.nix index 815b569a7eb..9a50d5fbd35 100644 --- a/pkgs/development/web/nodejs/v10.nix +++ b/pkgs/development/web/nodejs/v10.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "10.19.0"; - sha256 = "0sginvcsf7lrlzsnpahj4bj1f673wfvby8kaxgvzlrbb7sy229v2"; + version = "10.20.0"; + sha256 = "0cvjwnl0wkcsyw3kannbdv01s235wrnp11n2s6swzjx95gpichfi"; } diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 3fa5216ccf8..6d7f213536a 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.16.1"; - sha256 = "0ba1dla31z6i31z3723l74nky1v04irwbl3iaqmi0iicl1dq958a"; + version = "12.16.2"; + sha256 = "0y5yd6h13fr34byi7h5xdjaivgcxiz0ykcmpk9nm5ra01b54fp2m"; } diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index c5e3f7c4bdb..8676214b50b 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "13.11.0"; - sha256 = "07r9xwjmiip9zmgfq77f3av3p93adc5cphj07idph1l8ws1j2h75"; + version = "13.12.0"; + sha256 = "199qcvzikdzw0h25v9dws77fff6hbvr8dj50lyzlnkya1dd6fzhd"; } diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix index eb3254dcd3a..3016ba4cb84 100644 --- a/pkgs/development/web/now-cli/default.nix +++ b/pkgs/development/web/now-cli/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { - homepage = https://zeit.co/now; + homepage = "https://zeit.co/now"; description = "The Command Line Interface for Now - Global Serverless Deployments"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index aea451ff8ae..ba304972d9a 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.20.0"; + version = "7.21.2"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "1al0kl2snbxzmprn13vbna4wyd72dya5lyfkhjgqabm4b7mign6c"; + sha256 = "18lb8csfmy5j97zdg3c5l23aaw9hjg04qhfc1sz9pgi7xhwz5g1b"; name = "${pname}.tar.gz"; }; diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index d56819be019..7859e7b036f 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -6,7 +6,7 @@ let # highlight.js is a git submodule of remark highlightjs = fetchgit { - url = https://github.com/isagalaev/highlight.js; + url = "https://github.com/isagalaev/highlight.js"; rev = "10b9500b67983f0a9c42d8ce8bf8e8c469f7078c"; sha256 = "1yy8by15kfklw8lwh17z1swpj067q0skjjih12yawbryraig41m0"; }; @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = http://remarkjs.com; + homepage = "http://remarkjs.com"; description = "A simple, in-browser, markdown-driven slideshow tool"; maintainers = []; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/web/remarkjs/node-packages.nix b/pkgs/development/web/remarkjs/node-packages.nix index 796f73dd683..3910aedb338 100644 --- a/pkgs/development/web/remarkjs/node-packages.nix +++ b/pkgs/development/web/remarkjs/node-packages.nix @@ -3267,7 +3267,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A markdown parser built for speed"; - homepage = https://marked.js.org/; + homepage = "https://marked.js.org/"; license = "MIT"; }; production = true; @@ -3550,7 +3550,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; license = "Apache-2.0"; }; production = true; @@ -3688,7 +3688,7 @@ in buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = https://mochajs.org/; + homepage = "https://mochajs.org/"; license = "MIT"; }; production = true; @@ -3784,7 +3784,7 @@ in buildInputs = globalBuildInputs; meta = { description = "test framework agnostic BDD-style assertions"; - homepage = https://github.com/shouldjs/should.js; + homepage = "https://github.com/shouldjs/should.js"; license = "MIT"; }; production = true; @@ -3818,7 +3818,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JavaScript test spies, stubs and mocks."; - homepage = https://sinonjs.org/; + homepage = "https://sinonjs.org/"; license = "BSD-3-Clause"; }; production = true; @@ -3871,7 +3871,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = http://jshint.com/; + homepage = "http://jshint.com/"; license = "(MIT AND JSON)"; }; production = true; @@ -3906,11 +3906,11 @@ in buildInputs = globalBuildInputs; meta = { description = "Portable Unix shell commands for Node.js"; - homepage = http://github.com/shelljs/shelljs; + homepage = "http://github.com/shelljs/shelljs"; license = "BSD-3-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/web/twitter-bootstrap/default.nix b/pkgs/development/web/twitter-bootstrap/default.nix index d0de36d426a..a9496f26dec 100644 --- a/pkgs/development/web/twitter-bootstrap/default.nix +++ b/pkgs/development/web/twitter-bootstrap/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Front-end framework for faster and easier web development"; - homepage = https://getbootstrap.com/; + homepage = "https://getbootstrap.com/"; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index c48d16fcae9..e4407b9f556 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib vala ctpl libgee libsoup fcgi ]; meta = with stdenv.lib; { - homepage = https://github.com/valum-framework/valum; + homepage = "https://github.com/valum-framework/valum"; description = "Web micro-framework written in Vala"; license = licenses.lgpl3; platforms = platforms.linux; diff --git a/pkgs/development/web/xmlindent/default.nix b/pkgs/development/web/xmlindent/default.nix index b9b0ccf7272..4d316410365 100644 --- a/pkgs/development/web/xmlindent/default.nix +++ b/pkgs/development/web/xmlindent/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "XML stream reformatter"; - homepage = http://xmlindent.sourceforge.net/; + homepage = "http://xmlindent.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ocharles ]; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index 42464f71ae3..4c9ad706887 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Fixes build with spidermonkey-38.8.0, includes the minor version check: # https://src.fedoraproject.org/rpms/0ad/c/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b (fetchurl { - url = https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch; + url = "https://src.fedoraproject.org/rpms/0ad/raw/26dc1657f6e3c0ad9f1180ca38cd79b933ef0c8b/f/0ad-mozjs-incompatible.patch"; sha256 = "1rzpaalcrzihsgvlk3nqd87n2kxjldlwvb3qp5fcd5ffzr6k90wa"; }) ]; diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix index 37cb96f2cfd..8c81b8b2360 100644 --- a/pkgs/games/20kly/default.nix +++ b/pkgs/games/20kly/default.nix @@ -32,7 +32,7 @@ python.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A steampunk-themed strategy game where you have to manage a steam supply network"; - homepage = http://jwhitham.org.uk/20kly/; + homepage = "http://jwhitham.org.uk/20kly/"; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix index f7de15604fd..334a7f873bb 100644 --- a/pkgs/games/90secondportraits/default.nix +++ b/pkgs/games/90secondportraits/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = http://tangramgames.dk/games/90secondportraits; + downloadPage = "http://tangramgames.dk/games/90secondportraits"; }; } diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 2d3be1880de..055959fff2d 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A rogue-like game with nice graphical interface"; - homepage = http://adom.de/; + homepage = "http://adom.de/"; license = licenses.unfreeRedistributable; maintainers = [maintainers.smironov]; diff --git a/pkgs/games/airstrike/default.nix b/pkgs/games/airstrike/default.nix index 408f2817854..10dfc7501fb 100644 --- a/pkgs/games/airstrike/default.nix +++ b/pkgs/games/airstrike/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A 2d dogfighting game"; - homepage = https://icculus.org/airstrike/; + homepage = "https://icculus.org/airstrike/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/games/alephone/default.nix b/pkgs/games/alephone/default.nix index 1936c93ab84..879571df7a1 100644 --- a/pkgs/games/alephone/default.nix +++ b/pkgs/games/alephone/default.nix @@ -90,10 +90,9 @@ in self // { --add-flags $out/data/$pname ''; - meta = with stdenv.lib; - { - maintainers = with maintainers; [ ehmry ]; - inherit (alephone.meta) platforms; - } // meta; - } // extraArgs); + meta = alephone.meta // { + license = stdenv.lib.licenses.free; + hydraPlatforms = [ ]; + } // meta; + }); } diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/games/alephone/infinity/default.nix index f4cea6c7343..fc3500d0eb9 100644 --- a/pkgs/games/alephone/infinity/default.nix +++ b/pkgs/games/alephone/infinity/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20150620"; + version = "20190331"; icon = alephone.icons + "/marathon-infinity.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "0sgfahppanp9c0p115dg0makrdzghzmbz3iggl6x28fh62j03q64"; + sha256 = "03vn91arnsm71dakbfzrdfwpwh5vkwildl7i16xqi1apinmvvh86"; }; meta = { diff --git a/pkgs/games/alephone/marathon/default.nix b/pkgs/games/alephone/marathon/default.nix index 84831b6a269..1d0787067af 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 = "20150620"; + version = "20190331"; icon = alephone.icons + "/marathon.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/Marathon-${version}-Data.zip"; - sha256 = "0cagsigsjlsr8jqfaqjdxv8fs0f079cjzs26679aacyykc6b8k3p"; + sha256 = "1d18a7hn8s50rqcs9i72ak5fq5a76hwk7nylfinrxjb134c9vlpz"; }; meta = { diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 5c27e3426fd..a28cf2508e2 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { with a retro alien theme, while adding tons of original ideas to make the game quite unique. ''; - homepage = http://red.planetarena.org; + homepage = "http://red.planetarena.org"; # Engine is under GPLv2, everything else is under license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl ]; diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix index fcde2d591f1..f86ee71aa42 100644 --- a/pkgs/games/amoeba/data.nix +++ b/pkgs/games/amoeba/data.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast-paced, polished OpenGL demonstration by Excess (data files)"; - homepage = https://packages.qa.debian.org/a/amoeba-data.html; + homepage = "https://packages.qa.debian.org/a/amoeba-data.html"; license = licenses.unfree; maintainers = [ maintainers.dezgeg ]; platforms = platforms.all; diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 491b20d9969..0475a6b50b5 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast-paced, polished OpenGL demonstration by Excess"; - homepage = https://packages.qa.debian.org/a/amoeba.html; + homepage = "https://packages.qa.debian.org/a/amoeba.html"; license = licenses.gpl2; # Engine is GPLv2, data files in amoeba-data nonfree maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index 943f9eb881c..84c1f545a38 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { And Yet It Moves is an award-winning physics-based platform game in which players rotate the game world at will to solve challenging puzzles. Tilting the world turns walls into floors, slides into platforms, and stacks of rocks into dangerous hazards. ''; - homepage = http://www.andyetitmoves.net/; + homepage = "http://www.andyetitmoves.net/"; license = stdenv.lib.licenses.unfree; diff --git a/pkgs/games/angband/default.nix b/pkgs/games/angband/default.nix index 309ea244d71..e7681a4b7f8 100644 --- a/pkgs/games/angband/default.nix +++ b/pkgs/games/angband/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "bindir=$(out)/bin" ]; meta = with stdenv.lib; { - homepage = http://rephial.org/; + homepage = "http://rephial.org/"; description = "A single-player roguelike dungeon exploration game"; maintainers = [ maintainers.chattered ]; license = licenses.gpl2; diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix index a2a5f7b723a..a8e147b6a7e 100644 --- a/pkgs/games/arena/default.nix +++ b/pkgs/games/arena/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { name = "arena-1.1"; src = fetchurl { - url = http://www.playwitharena.de/downloads/arenalinux_64bit_1.1.tar.gz; + url = "http://www.playwitharena.de/downloads/arenalinux_64bit_1.1.tar.gz"; sha256 = "1sh71v5ymzwflq8ycx9j9kl0jhqllgs6z24h4h8j5z8pwdh528v6"; }; diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 57373d39b54..d4d2cbef164 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -2,7 +2,7 @@ let versionMajor = "0.2.8"; - versionMinor = "3.4"; + versionMinor = "3.5"; version = "${versionMajor}.${versionMinor}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { inherit version; src = fetchurl { url = "https://launchpad.net/armagetronad/${versionMajor}/${versionMajor}.${versionMinor}/+download/armagetronad-${version}.src.tar.bz2"; - sha256 = "157pp84wf0q3bdb72rnbm3ck0czwx2ply6lyhj8z7kfdc7csdbr3"; + sha256 = "1vyja7mzivs3pacxb7kznndsgqhq4p0f7x2zg55dckvzqwprdhqx"; }; NIX_LDFLAGS = "-lSDL_image"; @@ -22,7 +22,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU libGL zlib ]; meta = with stdenv.lib; { - homepage = http://armagetronad.org; + homepage = "http://armagetronad.org"; description = "An multiplayer networked arcade racing game in 3D similar to Tron"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index 354787e0f07..8b2cf83e509 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { first-person role-playing game / dungeon crawler developed by Arkane Studios. ''; - homepage = https://arx-libertatis.org/; + homepage = "https://arx-libertatis.org/"; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/games/asc/default.nix b/pkgs/games/asc/default.nix index c8f5deef924..28b144a4e86 100644 --- a/pkgs/games/asc/default.nix +++ b/pkgs/games/asc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { currently available for Windows and Linux. ''; - homepage = http://www.asc-hq.org/; + homepage = "http://www.asc-hq.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/assaultcube/default.nix b/pkgs/games/assaultcube/default.nix index 7d83d3a7cdb..f40e2ecf220 100644 --- a/pkgs/games/assaultcube/default.nix +++ b/pkgs/games/assaultcube/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = { description = "Fast and fun first-person-shooter based on the Cube fps"; - homepage = https://assault.cubers.net; + homepage = "https://assault.cubers.net"; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; # should work on darwin with a little effort. license = stdenv.lib.licenses.zlib; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 191428f66db..7f1ca325746 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Hardcore 3D space shooter with spaceship upgrade possibilities"; - homepage = https://www.viewizard.com/; + homepage = "https://www.viewizard.com/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index b11a177e045..bb11acf3866 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Atomic Tanks ballistics game"; - homepage = http://atanks.sourceforge.net/; + homepage = "http://atanks.sourceforge.net/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/games/azimuth/default.nix b/pkgs/games/azimuth/default.nix index 8cb583e07d2..67bbd8558c3 100644 --- a/pkgs/games/azimuth/default.nix +++ b/pkgs/games/azimuth/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://mdsteele.games/azimuth/index.html; + homepage = "https://mdsteele.games/azimuth/index.html"; maintainers = with stdenv.lib.maintainers; [ marius851000 ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/ball-and-paddle/default.nix b/pkgs/games/ball-and-paddle/default.nix index a8b5f9fea4d..862905efd3b 100644 --- a/pkgs/games/ball-and-paddle/default.nix +++ b/pkgs/games/ball-and-paddle/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/ballandpaddle/; + homepage = "https://www.gnu.org/software/ballandpaddle/"; maintainers = [ ]; diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index 5699dbb7270..6da8e1bf9bf 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://software.cedar-solutions.com/utilities.html; + homepage = "http://software.cedar-solutions.com/utilities.html"; description = "Print large banners to ASCII terminals"; license = licenses.gpl2; diff --git a/pkgs/games/bastet/default.nix b/pkgs/games/bastet/default.nix index 85b6fcefdd2..d68a05137b4 100644 --- a/pkgs/games/bastet/default.nix +++ b/pkgs/games/bastet/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tetris clone with 'bastard' block-choosing AI"; - homepage = http://fph.altervista.org/prog/bastet.html; + homepage = "http://fph.altervista.org/prog/bastet.html"; license = licenses.gpl3; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index 81bdbed46e9..f640e2c6aef 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = https://gitorious.org/beret/beret/archive-tarball/ae029777; + url = "https://gitorious.org/beret/beret/archive-tarball/ae029777"; name = "beret-1.2.0.tar.gz"; sha256 = "1rx9z72id1810fgv8mizk8qxwd1kh5xi07fdhmjc62mh3fn38szc"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A 2D puzzle-platformer game about a scientist with telekinetic abilities"; - homepage = http://kiwisauce.com/beret/; + homepage = "http://kiwisauce.com/beret/"; license = licenses.lgpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index c6c5176ecdf..52286b32f90 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "bitsnbots-20111230"; src = fetchurl { - url = http://moikmellah.org/downloads/bitsnbots/bitsnbots.source.tgz; + url = "http://moikmellah.org/downloads/bitsnbots/bitsnbots.source.tgz"; sha256 = "1iiclm6bfpp2p6d692hpnw25xyr48ki1xkcxa7fvh5b7m1519gsp"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple puzzle game with moving robots"; - homepage = http://moikmellah.org/blog/?page_id=19; + homepage = "http://moikmellah.org/blog/?page_id=19"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 608b32764bb..e47e430d84c 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "blackshades-svn-110"; src = fetchsvn { - url = svn://svn.icculus.org/blackshades/trunk; + url = "svn://svn.icculus.org/blackshades/trunk"; rev = "110"; sha256 = "0kbrh1dympk8scjxr6av24qs2bffz44l8qmw2m5gyqf4g3rxf6ra"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://icculus.org/blackshades/; + homepage = "http://icculus.org/blackshades/"; description = "Protect the VIP"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 938d767c3d8..ea8bddfa16d 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd3; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; - homepage = http://blobby.sourceforge.net/; + homepage = "http://blobby.sourceforge.net/"; downloadPage = "https://sourceforge.net/projects/blobby/files/Blobby%20Volley%202%20%28Linux%29/"; inherit version; }; diff --git a/pkgs/games/braincurses/default.nix b/pkgs/games/braincurses/default.nix index deb542e3a86..86a8f865442 100644 --- a/pkgs/games/braincurses/default.nix +++ b/pkgs/games/braincurses/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/bderrly/braincurses; + homepage = "https://github.com/bderrly/braincurses"; description = "A version of the classic game Mastermind"; license = licenses.gpl2; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index e34dfc383a1..1662f847bfa 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A roguelike game"; - homepage = https://sites.google.com/site/broguegame/; + homepage = "https://sites.google.com/site/broguegame/"; license = licenses.agpl3; maintainers = [ maintainers.skeidel ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/bsdgames/default.nix b/pkgs/games/bsdgames/default.nix index ef30a3d350c..41414a573a6 100644 --- a/pkgs/games/bsdgames/default.nix +++ b/pkgs/games/bsdgames/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bsd-games-2.17"; src = fetchurl { - url = ftp://metalab.unc.edu/pub/Linux/games/bsd-games-2.17.tar.gz; + url = "ftp://metalab.unc.edu/pub/Linux/games/bsd-games-2.17.tar.gz"; sha256 = "0q7zdyyfvn15y0w4g54kq3gza89h61py727m8slmw73cxx594vq6"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch; + url = "http://svn.exactcode.de/t2/trunk/package/games/bsd-games/dm-noutmpx.patch"; sha256 = "1k3qp3jj0dksjr4dnppv6dvkwslrgk9c7p2n9vipqildpxgqp7w2"; }) ]; @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.t2-project.org/packages/bsd-games.html; + 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]; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index d07088a30a3..c1d1c38990d 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Multiplayer 3D Tank game"; - homepage = https://bzflag.org/; + homepage = "https://bzflag.org/"; license = licenses.lgpl21Plus; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/games/cataclysm-dda/common.nix b/pkgs/games/cataclysm-dda/common.nix index 3a7b410a04b..f904a3c0f35 100644 --- a/pkgs/games/cataclysm-dda/common.nix +++ b/pkgs/games/cataclysm-dda/common.nix @@ -69,7 +69,7 @@ let substances or radiation, now more closely resemble insects, birds or fish than their original form. ''; - homepage = https://cataclysmdda.org/; + homepage = "https://cataclysmdda.org/"; license = licenses.cc-by-sa-30; maintainers = with maintainers; [ mnacamura ]; platforms = platforms.unix; diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 28cea5e0c77..76862c4bffe 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "chessdb-3.6.19-beta-1"; src = fetchurl { - url = mirror://sourceforge/chessdb/ChessDB-3.6.19-beta-1.tar.gz; + url = "mirror://sourceforge/chessdb/ChessDB-3.6.19-beta-1.tar.gz"; sha256 = "0brc3wln3bxp979iqj2w1zxpfd0pch8zzazhdmwf7acww4hrsz62"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://chessdb.sourceforge.net/; + homepage = "http://chessdb.sourceforge.net/"; description = "A free chess database"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix index f0b04489eda..0ff05556cdb 100644 --- a/pkgs/games/chessx/default.nix +++ b/pkgs/games/chessx/default.nix @@ -47,7 +47,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://chessx.sourceforge.net/; + homepage = "http://chessx.sourceforge.net/"; description = "ChessX allows you to browse and analyse chess games"; license = licenses.gpl2; maintainers = [ maintainers.luispedro ]; diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 56a926e63f6..7eef6b5dff8 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://chocolate-doom.org/; + 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; diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 81f1ee0cd15..a13ff8d66fa 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Mod manager for Kerbal Space Program"; - homepage = https://github.com/KSP-CKAN/CKAN; + homepage = "https://github.com/KSP-CKAN/CKAN"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.Baughn ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/games/cockatrice/default.nix b/pkgs/games/cockatrice/default.nix index 83ae5816b28..9d07d09e27b 100644 --- a/pkgs/games/cockatrice/default.nix +++ b/pkgs/games/cockatrice/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "cockatrice"; - version = "2019-08-31-Release-2.7.2"; + version = "2020-03-20-Release-2.7.4"; src = fetchFromGitHub { owner = "Cockatrice"; repo = "Cockatrice"; rev = "${version}"; - sha256 = "17nfz4z6zfkiwcrq1rpm8bc7zh4gvcmb3fis9gdjjbji20dvcfxp"; + sha256 = "1d229gswfcqxch19wb744d9h897qwzf2y9imwrbcwnlhpbr1j62k"; }; buildInputs = [ diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index 56164cfc017..251ea852cf1 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { made for it. All of the original data files are required to do so ''; - homepage = https://github.com/gerstrong/Commander-Genius; + homepage = "https://github.com/gerstrong/Commander-Genius"; maintainers = with maintainers; [ hce ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 5c74b596279..815c2f3fab4 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Masses and springs simulation game"; - homepage = http://fs.fsf.org/construo/; + homepage = "http://fs.fsf.org/construo/"; license = stdenv.lib.licenses.gpl3; }; } diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 4741ac7bb68..c2fe94acf6e 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "crack-attack-1.1.14"; src = fetchurl { - url = mirror://savannah/crack-attack/crack-attack-1.1.14.tar.gz; + url = "mirror://savannah/crack-attack/crack-attack-1.1.14.tar.gz"; sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; }; @@ -23,7 +23,7 @@ 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/; + homepage = "https://www.nongnu.org/crack-attack/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.piotr ]; diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index c9dcd2d9d40..191baa7e592 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { }; bookBin = fetchurl { - url = http://www.craftychess.com/downloads/book/book.bin; + url = "http://www.craftychess.com/downloads/book/book.bin"; sha256 = "10rrgkr3hxm7pxdbc2jq8b5g74gfhzk4smahks3k8am1cmyq4p7r"; }; startPgn = fetchurl { - url = http://craftychess.com/downloads/book/start.pgn.gz; + url = "http://craftychess.com/downloads/book/start.pgn.gz"; sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f"; }; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.craftychess.com/; + homepage = "http://www.craftychess.com/"; description = "Chess program developed by Dr. Robert M. Hyatt"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index e4cccdd6221..8fe3b20419a 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "crawl-${version}${lib.optionalString tileMode "-tiles"}"; - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "crawl"; repo = "crawl"; rev = version; - sha256 = "1cdjd33z04gj70manavihc3lj9ckpmd75n09vvyw01z41s33fzs0"; + sha256 = "1fiizkigmbrw0nb1l1m3syl2mw4a4r36l1y0n4z8z7slp79bsbv4"; }; # Patch hard-coded paths and remove force library builds @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source, single-player, role-playing roguelike game"; - homepage = http://crawl.develz.org/; + homepage = "http://crawl.develz.org/"; longDescription = '' Dungeon Crawl: Stone Soup, an open-source, single-player, role-playing roguelike game of exploration and treasure-hunting in dungeons filled diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index e6b669b8d67..c10e79418be 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.7"; + version = "5.7.2"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "1m9bk7hp3d4sdd3y3isvf26rxya7511mnwyv99l2f80adbsv3nq2"; + sha256 = "002aqbgsksrgzqridwdlkrjincaxh0dkvwlrbb8d2f3kwk7lj4fq"; }; postPatch = '' diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 24077697218..32e173de2b8 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -19,7 +19,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gottcode.org/cutemaze/; + homepage = "https://gottcode.org/cutemaze/"; description = "Simple, top-down game in which mazes are randomly generated"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix index 24e45719f51..72c55fc1811 100644 --- a/pkgs/games/cuyo/default.nix +++ b/pkgs/games/cuyo/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation { version = "2.1.0"; src = fetchurl { - url = https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz; + 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; + 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; diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index fd972937640..1735c4380f2 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = https://github.com/dhewm/dhewm3; + homepage = "https://github.com/dhewm/dhewm3"; description = "Doom 3 port to SDL"; license = stdenv.lib.licenses.gpl3; maintainers = with maintainers; [ MP2E ]; diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix index 7f73e047fd7..7af31c606a9 100644 --- a/pkgs/games/duckmarines/default.nix +++ b/pkgs/games/duckmarines/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; hydraPlatforms = []; license = licenses.free; - downloadPage = http://tangramgames.dk/games/duckmarines; + downloadPage = "http://tangramgames.dk/games/duckmarines"; }; } diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 2467053cc1a..bd37f6180b1 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -140,7 +140,7 @@ buildEnv { meta = with stdenv.lib; { description = "Memory hacking library for Dwarf Fortress and a set of tools that use it"; - homepage = https://github.com/DFHack/dfhack/; + homepage = "https://github.com/DFHack/dfhack/"; license = licenses.zlib; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ robbinch a1russell abbradar numinit ]; diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix index e3a66a508ea..20fbd9fa18b 100644 --- a/pkgs/games/dwarf-fortress/game.nix +++ b/pkgs/games/dwarf-fortress/game.nix @@ -12,7 +12,7 @@ with lib; let libpath = makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc dwarf-fortress-unfuck SDL ]; - homepage = http://www.bay12games.com/dwarves/; + homepage = "http://www.bay12games.com/dwarves/"; # Map Dwarf Fortress platform names to Nixpkgs platform names. # Other srcs are avilable like 32-bit mac & win, but I have only diff --git a/pkgs/games/dwarf-fortress/lazy-pack.nix b/pkgs/games/dwarf-fortress/lazy-pack.nix index 5f0328cba02..e5cfe6da171 100644 --- a/pkgs/games/dwarf-fortress/lazy-pack.nix +++ b/pkgs/games/dwarf-fortress/lazy-pack.nix @@ -42,6 +42,6 @@ buildEnv { maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; platforms = platforms.all; - homepage = https://github.com/NixOS/nixpkgs/; + homepage = "https://github.com/NixOS/nixpkgs/"; }; } diff --git a/pkgs/games/dwarf-fortress/legends-browser/default.nix b/pkgs/games/dwarf-fortress/legends-browser/default.nix index 3bc4fa9c4bb..b1106002515 100644 --- a/pkgs/games/dwarf-fortress/legends-browser/default.nix +++ b/pkgs/games/dwarf-fortress/legends-browser/default.nix @@ -31,6 +31,6 @@ buildEnv { maintainers = with maintainers; [ Baughn ]; license = licenses.mit; platforms = platforms.all; - homepage = https://github.com/robertjanetzko/LegendsBrowser; + homepage = "https://github.com/robertjanetzko/LegendsBrowser"; }; } diff --git a/pkgs/games/dwarf-fortress/twbt/default.nix b/pkgs/games/dwarf-fortress/twbt/default.nix index 011284bcff5..b5bff0e9b7a 100644 --- a/pkgs/games/dwarf-fortress/twbt/default.nix +++ b/pkgs/games/dwarf-fortress/twbt/default.nix @@ -80,6 +80,6 @@ stdenvNoCC.mkDerivation rec { maintainers = with maintainers; [ Baughn numinit ]; license = licenses.mit; platforms = platforms.linux; - homepage = https://github.com/mifki/df-twbt; + homepage = "https://github.com/mifki/df-twbt"; }; } diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index ccf44ee5ca1..533649131f5 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Unfucked multimedia layer for Dwarf Fortress"; - homepage = https://github.com/svenstaro/dwarf_fortress_unfuck; + homepage = "https://github.com/svenstaro/dwarf_fortress_unfuck"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ abbradar numinit ]; diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix index 682d1e05069..47a8222cd6a 100644 --- a/pkgs/games/dxx-rebirth/assets.nix +++ b/pkgs/games/dxx-rebirth/assets.nix @@ -42,7 +42,7 @@ let meta = with stdenv.lib; { description = "Descent ${toString ver} assets from GOG"; - homepage = https://www.dxx-rebirth.com/; + homepage = "https://www.dxx-rebirth.com/"; license = licenses.unfree; maintainers = with maintainers; [ peterhoeg ]; hydraPlatforms = []; diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix index 7a1e690c39d..782a2d21112 100644 --- a/pkgs/games/dxx-rebirth/full.nix +++ b/pkgs/games/dxx-rebirth/full.nix @@ -16,7 +16,7 @@ let meta = with stdenv.lib; { description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG"; - homepage = https://www.dxx-rebirth.com/; + homepage = "https://www.dxx-rebirth.com/"; license = with licenses; [ free unfree ]; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index af6bc4be393..b11cc90d11f 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "eboard-1.1.1"; src = fetchurl { - url = mirror://sourceforge/eboard/eboard-1.1.1.tar.bz2; + url = "mirror://sourceforge/eboard/eboard-1.1.1.tar.bz2"; sha256 = "0vm25j1s2zg1lipwjv9qrcm877ikfmk1yh34i8f5l3bwd63115xd"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-ldl"; meta = { - homepage = http://www.bergo.eng.br/eboard/; + homepage = "http://www.bergo.eng.br/eboard/"; description = "Chess interface for Unix-like systems"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 242e0930db3..60abe296467 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Enhanched port of Duke Nukem 3D for various platforms"; - homepage = http://eduke32.com; + homepage = "http://eduke32.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ sander ]; # Darwin is untested (supported by upstream) diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index c8a5f380900..138ad8a757f 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "3D dungeon crawling adventure"; - homepage = http://www.freedink.org/; + homepage = "http://www.freedink.org/"; license = stdenv.lib.licenses.gpl2Plus; # I take it out of hydra as it does not work as well as I'd like diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index fc71c288b98..53204f87e44 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -24,7 +24,7 @@ let meta = with lib; { description = "C++ game engine coded on top of SFML used for EmptyEpsilon"; - homepage = https://github.com/daid/SeriousProton; + homepage = "https://github.com/daid/SeriousProton"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; @@ -58,7 +58,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Open source bridge simulator based on Artemis"; - homepage = https://daid.github.io/EmptyEpsilon/; + homepage = "https://daid.github.io/EmptyEpsilon/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz lheckemann ma27 ]; platforms = platforms.linux; diff --git a/pkgs/games/endgame-singularity/default.nix b/pkgs/games/endgame-singularity/default.nix index 8b259bad88d..46f21629ca3 100644 --- a/pkgs/games/endgame-singularity/default.nix +++ b/pkgs/games/endgame-singularity/default.nix @@ -44,7 +44,7 @@ python2.pkgs.buildPythonApplication rec { ''; meta = { - homepage = http://www.emhsoft.com/singularity/; + homepage = "http://www.emhsoft.com/singularity/"; description = "A simulation game about strong AI"; longDescription = '' A simulation of a true AI. Go from computer to computer, pursued by the diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 5d1ed1c11a9..f0950cf4d34 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -3,7 +3,7 @@ }: let - version = "0.9.10"; + version = "0.9.11"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "1wax9qhxakydg6bs92d1jy2fki1n9r0wkps1np02y0pvm1fl189i"; + sha256 = "0f4svg448bg8qx49f8fr8l4yzks7an6673jwgva15p3zzfxy6w03"; }; enableParallelBuilding = true; @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A sandbox-style space exploration game similar to Elite, Escape Velocity, or Star Control"; - homepage = https://endless-sky.github.io/; + homepage = "https://endless-sky.github.io/"; license = with licenses; [ gpl3Plus cc-by-sa-30 cc-by-sa-40 publicDomain ]; diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 49339e5619d..c170c0b9c18 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://doomworld.com/eternity; + homepage = "http://doomworld.com/eternity"; description = "New school Doom port by James Haley"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index 07f84d7a151..e735c9c5817 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -5,7 +5,7 @@ let # Digital recordings of the music on an original Roland MT-32. So # we don't need actual MIDI playback capability. audio = fetchurl { - url = mirror://sourceforge/exult/exult_audio.zip; + url = "mirror://sourceforge/exult/exult_audio.zip"; sha256 = "0s5wvgy9qja06v38g0qwzpaw76ff96vzd6gb1i3lb9k4hvx0xqbj"; }; @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://exult.sourceforge.net/; + homepage = "http://exult.sourceforge.net/"; description = "A reimplementation of the Ultima VII game engine"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 43ec92719c2..691140b5bb8 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -164,7 +164,7 @@ let Factorio has been in development since spring of 2012 and it is currently in late alpha. ''; - homepage = https://www.factorio.com/; + homepage = "https://www.factorio.com/"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ Baughn elitak ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/games/factorio/mods.nix b/pkgs/games/factorio/mods.nix index 501665494eb..5c9b4f0628a 100644 --- a/pkgs/games/factorio/mods.nix +++ b/pkgs/games/factorio/mods.nix @@ -16,7 +16,7 @@ rec { bobassembly = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobassembly_0.13.0.zip + "https://f.xor.us/factorio-mods/bobassembly_0.13.0.zip" ]; sha256 = "0c0m7sb45r37g882x0aq8mc82yhfh9j9h8g018d4s5pf93vzr6d1"; }; @@ -28,7 +28,7 @@ rec { bobconfig = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobconfig_0.13.1.zip + "https://f.xor.us/factorio-mods/bobconfig_0.13.1.zip" ]; sha256 = "0z4kmggm1slbr3qiy5xahc9nhdffllp21n9nv5gh1zbzv72sb1rp"; }; @@ -37,7 +37,7 @@ rec { bobelectronics = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobelectronics_0.13.1.zip + "https://f.xor.us/factorio-mods/bobelectronics_0.13.1.zip" ]; sha256 = "16sn5w33s0ckiwqxx7b2pcsqmhxbxjm2w4h4vd99hwpvdpjyav52"; }; @@ -49,7 +49,7 @@ rec { bobenemies = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobenemies_0.13.1.zip + "https://f.xor.us/factorio-mods/bobenemies_0.13.1.zip" ]; sha256 = "1wnb5wsvh9aa3i9mj17f36ybbd13qima3iwshw60i6xkzzqfk44d"; }; @@ -59,7 +59,7 @@ rec { bobgreenhouse = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobgreenhouse_0.13.2.zip + "https://f.xor.us/factorio-mods/bobgreenhouse_0.13.2.zip" ]; sha256 = "1ql26875dvz2lqln289jg1w6yjzsd0x0pqmd570jffwi5m320rrw"; }; @@ -71,7 +71,7 @@ rec { bobinserters = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobinserters_0.13.3.zip + "https://f.xor.us/factorio-mods/bobinserters_0.13.3.zip" ]; sha256 = "0nys9zhaw0v3w2xzrhawr8g2hcxkzdmyqd4s8xm5bnbrgrq86g9z"; }; @@ -83,7 +83,7 @@ rec { boblibrary = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/boblibrary_0.13.1.zip + "https://f.xor.us/factorio-mods/boblibrary_0.13.1.zip" ]; sha256 = "04fybs626lzxf0p21jl8kakh2mddah7l9m57srk7a87jw5bj1zx8"; }; @@ -92,7 +92,7 @@ rec { boblogistics = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/boblogistics_0.13.7.zip + "https://f.xor.us/factorio-mods/boblogistics_0.13.7.zip" ]; sha256 = "0c91zmyxwsmyv6vm6gp498vb7flqlcyzkbp9s5q1651hpyd378hx"; }; @@ -104,7 +104,7 @@ rec { bobmining = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobmining_0.13.1.zip + "https://f.xor.us/factorio-mods/bobmining_0.13.1.zip" ]; sha256 = "1l7k3v4aizihppgi802fr5b8zbnq2h05c2bbsk5hds239qgxy80m"; }; @@ -115,7 +115,7 @@ rec { bobmodules = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobmodules_0.13.0.zip + "https://f.xor.us/factorio-mods/bobmodules_0.13.0.zip" ]; sha256 = "0ggd2gc4s5sbld7gyncbzdgq8gc00mvxjcfv7i2dchcrdzrlr556"; }; @@ -127,7 +127,7 @@ rec { bobores = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobores_0.13.1.zip + "https://f.xor.us/factorio-mods/bobores_0.13.1.zip" ]; sha256 = "1rri70655kj77sdr3zgp56whmcl0gfjmw90jm7lj1jp8l1pdfzb9"; }; @@ -138,7 +138,7 @@ rec { bobplates = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobplates_0.13.2.zip + "https://f.xor.us/factorio-mods/bobplates_0.13.2.zip" ]; sha256 = "0iczpa26hflj17k84p4n6wz0pwhbbrfk86dgac4bfz28kqg58nj1"; }; @@ -150,7 +150,7 @@ rec { bobpower = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobpower_0.13.1.zip + "https://f.xor.us/factorio-mods/bobpower_0.13.1.zip" ]; sha256 = "18sblnlvprrm2vzlczlki09yj9lr4y64808zrwmcasf7470skar3"; }; @@ -162,7 +162,7 @@ rec { bobrevamp = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobrevamp_0.13.0.zip + "https://f.xor.us/factorio-mods/bobrevamp_0.13.0.zip" ]; sha256 = "0rkyf61clh8fjg72z9i7r4skvdzgd49ky6s0486xxljhbil4nxb7"; }; @@ -172,7 +172,7 @@ rec { bobtech = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobtech_0.13.0.zip + "https://f.xor.us/factorio-mods/bobtech_0.13.0.zip" ]; sha256 = "0arc9kilxzdpapn3gh5h8269ssgsjxib4ny0qissq2sg95gxlsn0"; }; @@ -183,7 +183,7 @@ rec { bobtechsave = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobtechsave_0.13.0.zip + "https://f.xor.us/factorio-mods/bobtechsave_0.13.0.zip" ]; sha256 = "1vlv4sgdfd9ldjm8y79n95ms5k6x2i7khjc422lp9080m03v1hcl"; }; @@ -192,7 +192,7 @@ rec { bobwarfare = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/bobwarfare_0.13.4.zip + "https://f.xor.us/factorio-mods/bobwarfare_0.13.4.zip" ]; sha256 = "07wzn16i4r0qjm41wfyl17rrhry2vrph08a0kq8w5iy6qcbqqfd3"; }; @@ -204,7 +204,7 @@ rec { clock = modDrv { src = fetchurl { urls = [ - https://f.xor.us/factorio-mods/clock_0.13.0.zip + "https://f.xor.us/factorio-mods/clock_0.13.0.zip" ]; sha256 = "0nflywbj6p2kz2w9wff78vskzljrzaf32ib56k3z456d9y8mlxfd"; }; diff --git a/pkgs/games/fairymax/default.nix b/pkgs/games/fairymax/default.nix index 44ed91da168..b5e3afa9e3b 100644 --- a/pkgs/games/fairymax/default.nix +++ b/pkgs/games/fairymax/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://home.hccnet.nl/h.g.muller/dwnldpage.html; + 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 47f72c52c1f..638bf59fc78 100644 --- a/pkgs/games/fish-fillets-ng/default.nix +++ b/pkgs/games/fish-fillets-ng/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://fillets.sourceforge.net/; + homepage = "http://fillets.sourceforge.net/"; }; } diff --git a/pkgs/games/fltrator/default.nix b/pkgs/games/fltrator/default.nix index 957452aa162..7cf16e0783e 100644 --- a/pkgs/games/fltrator/default.nix +++ b/pkgs/games/fltrator/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A simple retro style arcade side-scroller game."; longDescription = '' FLTrator is a simple retro style arcade side-scroller game in which you steer a spaceship through a landscape with hostile rockets and other obstacles. It has ten different levels and a level editor to create new levels or modify the existing.''; # from https://libregamewiki.org/FLTrator - homepage = http://fltrator.sourceforge.net/; + homepage = "http://fltrator.sourceforge.net/"; platforms = platforms.linux; maintainers = [ maintainers.marius851000 ]; license = licenses.gpl3; diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index 3ba383c7427..f574f253955 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec{ Off, Forecell, and Seahaven Towers, as well as Simple Simon boards. ''; - homepage = https://fc-solve.shlomifish.org/; + homepage = "https://fc-solve.shlomifish.org/"; license = licenses.mit; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 9fc260e7406..ac05aab3ce6 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { to the space age... ''; - homepage = http://www.freeciv.org; # http only + homepage = "http://www.freeciv.org"; # http only license = licenses.gpl2; maintainers = with maintainers; [ pierron ]; diff --git a/pkgs/games/freedink/default.nix b/pkgs/games/freedink/default.nix index 3b8bc1288ef..735a49bee62 100644 --- a/pkgs/games/freedink/default.nix +++ b/pkgs/games/freedink/default.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { with close compatibility, under multiple platforms. ''; - homepage = http://www.freedink.org/; + homepage = "http://www.freedink.org/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; diff --git a/pkgs/games/freedroidrpg/default.nix b/pkgs/games/freedroidrpg/default.nix index 281691d283d..443d60b9d67 100644 --- a/pkgs/games/freedroidrpg/default.nix +++ b/pkgs/games/freedroidrpg/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { </para> ''; - homepage = http://www.freedroid.org/; + homepage = "http://www.freedroid.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index e32943fa8be..27be32071c1 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open source, turn-based space empire and galactic conquest (4X) computer game"; - homepage = http://www.freeorion.org; + homepage = "http://www.freeorion.org"; license = with licenses; [ gpl2 cc-by-sa-30 ]; platforms = platforms.linux; maintainers = with maintainers; [ tex ]; diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index 94efe1b650a..fdaaadbe42f 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console minesweeper-style game written in C for Unix-like systems"; - homepage = https://github.com/rwestlund/freesweep; + homepage = "https://github.com/rwestlund/freesweep"; license = licenses.gpl2; maintainers = with maintainers; [ kierdavis ]; platforms = platforms.unix; diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix index 6531d407d21..ab5bbe2dd9f 100644 --- a/pkgs/games/frogatto/data.nix +++ b/pkgs/games/frogatto/data.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/frogatto/frogatto; + homepage = "https://github.com/frogatto/frogatto"; description = "Data files to the frogatto game"; license = with licenses; [ cc-by-30 unfree ]; maintainers = with maintainers; [ astro ]; diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix index 4c5f1af8a9b..35ff9706112 100644 --- a/pkgs/games/frogatto/default.nix +++ b/pkgs/games/frogatto/default.nix @@ -34,7 +34,7 @@ in buildEnv { ''; meta = with stdenv.lib; { - homepage = https://frogatto.com; + homepage = "https://frogatto.com"; description = description; license = with licenses; [ cc-by-30 unfree ]; platforms = platforms.linux; diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix index 5254ff25b02..d51cfcb8f20 100644 --- a/pkgs/games/frogatto/engine.nix +++ b/pkgs/games/frogatto/engine.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/anura-engine/anura; + homepage = "https://github.com/anura-engine/anura"; description = "Game engine used by Frogatto"; license = licenses.zlib; platforms = platforms.linux; diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 788280fd820..40b6748693d 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = http://frotz.sourceforge.net/; + homepage = "http://frotz.sourceforge.net/"; description = "A z-machine interpreter for Infocom games and other interactive fiction."; platforms = platforms.unix; maintainers = [ maintainers.nicknovitski ]; diff --git a/pkgs/games/galaxis/default.nix b/pkgs/games/galaxis/default.nix index f5089b6395f..1bbbc5ead94 100644 --- a/pkgs/games/galaxis/default.nix +++ b/pkgs/games/galaxis/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec{ interface of the original, but compensates by automating away some of the game's simpler deductions. ''; - homepage = http://catb.org/~esr/galaxis/; + homepage = "http://catb.org/~esr/galaxis/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/games/gambatte/default.nix b/pkgs/games/gambatte/default.nix index 6d8d14d8de0..ac099e21d56 100644 --- a/pkgs/games/gambatte/default.nix +++ b/pkgs/games/gambatte/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Portable, open-source Game Boy Color emulator"; - homepage = https://github.com/sinamas/gambatte; + homepage = "https://github.com/sinamas/gambatte"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/games/garden-of-coloured-lights/default.nix index 4c57538e234..fde573cecd8 100644 --- a/pkgs/games/garden-of-coloured-lights/default.nix +++ b/pkgs/games/garden-of-coloured-lights/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Old-school vertical shoot-em-up / bullet hell"; - homepage = http://garden.sourceforge.net/drupal/; + homepage = "http://garden.sourceforge.net/drupal/"; maintainers = with maintainers; [ Profpatsch ]; license = licenses.gpl3; }; diff --git a/pkgs/games/gargoyle/default.nix b/pkgs/games/gargoyle/default.nix index 83a567fa578..8c5675407d0 100644 --- a/pkgs/games/gargoyle/default.nix +++ b/pkgs/games/gargoyle/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://ccxvii.net/gargoyle/; + homepage = "http://ccxvii.net/gargoyle/"; license = licenses.gpl2Plus; description = "Interactive fiction interpreter GUI"; platforms = platforms.unix; diff --git a/pkgs/games/gav/default.nix b/pkgs/games/gav/default.nix index 20e3f69152c..e42afefb830 100644 --- a/pkgs/games/gav/default.nix +++ b/pkgs/games/gav/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Remake of AV Arcade Volleyball"; - homepage = http://gav.sourceforge.net/; + homepage = "http://gav.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/gcs/default.nix b/pkgs/games/gcs/default.nix index f1230b739bb..9c0b479304a 100644 --- a/pkgs/games/gcs/default.nix +++ b/pkgs/games/gcs/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A stand-alone, interactive, character sheet editor for the GURPS 4th Edition roleplaying game system"; - homepage = https://gurpscharactersheet.com/; + homepage = "https://gurpscharactersheet.com/"; license = licenses.mpl20; platforms = platforms.all; maintainers = with maintainers; []; diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 7a18f15ffa9..4f7d1cb3750 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { support pseudo-3D role playing games based on the Dungeons & Dragons ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment). ''; - homepage = http://gemrb.org/; + homepage = "http://gemrb.org/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index 09a472f4dac..f76f761189c 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An air combat simulator"; - homepage = https://sourceforge.net/projects/gl-117; + homepage = "https://sourceforge.net/projects/gl-117"; maintainers = with maintainers; [ raskin ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 45c5013705f..e0e4b876f3e 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./header-order.patch ./public-buildproject.patch (fetchpatch { - url = https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw; + url = "https://bitbucket.org/giszmo/glob2/commits/c9dc715624318e4fea4abb24e04f0ebdd9cd8d2a/raw"; sha256 = "0017xg5agj3dy0hx71ijdcrxb72bjqv7x6aq7c9zxzyyw0mkxj0k"; }) ]; diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index 0e70096ab53..f6d74b6e9b7 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ SDL libGLU libGL zlib libpng libvorbis libmikmod SDL_sound ]; meta = { - homepage = http://www.gltron.org/; + homepage = "http://www.gltron.org/"; description = "Game based on the movie Tron"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/gmad/default.nix b/pkgs/games/gmad/default.nix index e51c326da19..aad53a7915a 100644 --- a/pkgs/games/gmad/default.nix +++ b/pkgs/games/gmad/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { meta = { description = "Garry's Mod Addon Creator and Extractor"; - homepage = https://github.com/garrynewman/gmad; + homepage = "https://github.com/garrynewman/gmad"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.abigailbuccaneer ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/games/gnubg/default.nix b/pkgs/games/gnubg/default.nix index ff09a70e932..edfde5ea3e9 100644 --- a/pkgs/games/gnubg/default.nix +++ b/pkgs/games/gnubg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "World class backgammon application"; - homepage = http://www.gnubg.org/; + homepage = "http://www.gnubg.org/"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/games/gnugo/default.nix b/pkgs/games/gnugo/default.nix index fa8d59c0503..069d14756e3 100644 --- a/pkgs/games/gnugo/default.nix +++ b/pkgs/games/gnugo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU Go - A computer go player"; - homepage = https://www.gnu.org/software/gnugo/; + homepage = "https://www.gnu.org/software/gnugo/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix index af2e924960a..8af7b84db26 100644 --- a/pkgs/games/gnujump/default.nix +++ b/pkgs/games/gnujump/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { - homepage = https://jump.gnu.sinusoid.es/index.php?title=Main_Page; + homepage = "https://jump.gnu.sinusoid.es/index.php?title=Main_Page"; description = "A clone of the simple yet addictive game Xjump"; longDescription = '' The goal in this game is to jump to the next floor trying not to fall diff --git a/pkgs/games/gnushogi/default.nix b/pkgs/games/gnushogi/default.nix index 381b4fd5959..01c08fbf3dc 100644 --- a/pkgs/games/gnushogi/default.nix +++ b/pkgs/games/gnushogi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNU implementation of Shogi, also known as Japanese Chess"; - homepage = https://www.gnu.org/software/gnushogi/; + homepage = "https://www.gnu.org/software/gnushogi/"; license = licenses.gpl3; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index f9ae137bb62..b13a145ff5e 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = { maintainers = [ stdenv.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/; + homepage = "http://gogui.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 7e89704324f..307c09dfa1b 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -32,7 +32,7 @@ buildPythonApplication { meta = with stdenv.lib; { description = "Golden Scrabble crossword puzzle game"; - homepage = https://github.com/RaaH/gscrabble/; + homepage = "https://github.com/RaaH/gscrabble/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.genesis ]; diff --git a/pkgs/games/gshogi/default.nix b/pkgs/games/gshogi/default.nix index d3fff64ada6..9004bd3d042 100644 --- a/pkgs/games/gshogi/default.nix +++ b/pkgs/games/gshogi/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A graphical implementation of the Shogi board game, also known as Japanese Chess"; - homepage = http://johncheetham.com/projects/gshogi/; + homepage = "http://johncheetham.com/projects/gshogi/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.ciil ]; diff --git a/pkgs/games/gtetrinet/default.nix b/pkgs/games/gtetrinet/default.nix index f1c24ba4de8..824e7afd734 100644 --- a/pkgs/games/gtetrinet/default.nix +++ b/pkgs/games/gtetrinet/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { GTetrinet is a client program for Tetrinet, a multiplayer tetris game that is played over the internet. ''; - homepage = http://gtetrinet.sourceforge.net/; + homepage = "http://gtetrinet.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.chris-martin ]; diff --git a/pkgs/games/gtypist/default.nix b/pkgs/games/gtypist/default.nix index 6031762d1d6..ae12c325306 100644 --- a/pkgs/games/gtypist/default.nix +++ b/pkgs/games/gtypist/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/gtypist; + homepage = "https://www.gnu.org/software/gtypist"; description = "Universal typing tutor"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 15d2ff5d57e..e6f27eedbb9 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/coelckers/gzdoom; + homepage = "https://github.com/coelckers/gzdoom"; description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features"; license = licenses.gpl3; platforms = ["x86_64-linux"]; diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix index a770e452ae4..81984530992 100644 --- a/pkgs/games/hawkthorne/default.nix +++ b/pkgs/games/hawkthorne/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { to bring to life the video game used to determine the winner of Pierce Hawthorne's inheritance. ''; - homepage = https://www.reddit.com/r/hawkthorne; + homepage = "https://www.reddit.com/r/hawkthorne"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ campadrenalin ]; broken = true; diff --git a/pkgs/games/holdingnuts/default.nix b/pkgs/games/holdingnuts/default.nix index c20cce723c2..d0cee8d76cf 100644 --- a/pkgs/games/holdingnuts/default.nix +++ b/pkgs/games/holdingnuts/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake SDL qt4 ]; meta = with stdenv.lib; { - homepage = http://www.holdingnuts.net/; + homepage = "http://www.holdingnuts.net/"; description = "Open Source Poker client and server"; license = licenses.gpl3; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 09ecd4279e4..24ea0e8c5c0 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "11.2d"; + version = "11.3f"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; - rev = stdenv.lib.strings.stringAsChars (x: if x == "." then "" else x) "v${version}"; - sha256 = "0aj4xy5xjdj32l5mk8796ldh9d7h8rx35kgc1vr7acb4fhpppb0f"; + rev = "v${version}"; + sha256 = "0i6dksxx33xga4pq41qsfllqras1hzk14ffqhnk11aj5lrfg98rm"; }; CPPFLAGS = "-I${SDL.dev}/include/SDL"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.roguetemple.com/z/hyper/; + homepage = "http://www.roguetemple.com/z/hyper/"; description = "A roguelike game set in hyperbolic geometry"; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2; diff --git a/pkgs/games/icbm3d/default.nix b/pkgs/games/icbm3d/default.nix index ba9173c0492..71ecfacb37e 100644 --- a/pkgs/games/icbm3d/default.nix +++ b/pkgs/games/icbm3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "icbm3d-0.4"; src = fetchurl { - url = ftp://ftp.tuxpaint.org/unix/x/icbm3d/icbm3d.0.4.tar.gz; + url = "ftp://ftp.tuxpaint.org/unix/x/icbm3d/icbm3d.0.4.tar.gz"; sha256 = "1z9q01mj0v9qbwby5cajjc9wpvdw2ma5v1r639vraxpl9qairm4s"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.newbreedsoftware.com/icbm3d/; + 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; diff --git a/pkgs/games/instead-launcher/default.nix b/pkgs/games/instead-launcher/default.nix index 10d29657d7c..84e3474225a 100644 --- a/pkgs/games/instead-launcher/default.nix +++ b/pkgs/games/instead-launcher/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ]; meta = with stdenv.lib; { - homepage = https://instead.syscall.ru/wiki/en/instead-launcher; + homepage = "https://instead.syscall.ru/wiki/en/instead-launcher"; description = "Install and play games from INSTEAD repository"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix index fff15b5c5b0..f131b920990 100644 --- a/pkgs/games/instead/default.nix +++ b/pkgs/games/instead/default.nix @@ -6,23 +6,23 @@ let # I took several games at random from http://instead.syscall.ru/games/ games = [ (fetchurl { - url = http://instead-games.googlecode.com/files/instead-apple-day-1.2.zip; + url = "http://instead-games.googlecode.com/files/instead-apple-day-1.2.zip"; sha256 = "0d4m554hiqmgl4xl0jp0b3bqjl35879768hqznh9y57y04sygd2a"; }) (fetchurl { - url = http://instead-games.googlecode.com/files/instead-cat_en-1.2.zip; + url = "http://instead-games.googlecode.com/files/instead-cat_en-1.2.zip"; sha256 = "0jlm3ssqlka16dm0rg6qfjh6xdh3pv7lj2s4ib4mqwj2vfy0v6sg"; }) (fetchurl { - url = http://instead-games.googlecode.com/files/instead-vinny-0.1.zip; + url = "http://instead-games.googlecode.com/files/instead-vinny-0.1.zip"; sha256 = "15qdbg82zp3a8vz4qxminr0xbzbdpnsciliy2wm3raz4hnadawg1"; }) (fetchurl { - url = http://instead-games.googlecode.com/files/instead-toilet3in1-1.2.zip; + url = "http://instead-games.googlecode.com/files/instead-toilet3in1-1.2.zip"; sha256 = "0wz4bljbg67m84qwpaqpzs934a5pcbhpgh39fvbbbfvnnlm4lirl"; }) (fetchurl { - url = http://instead-games.googlecode.com/files/instead-kayleth-0.4.1.zip; + url = "http://instead-games.googlecode.com/files/instead-kayleth-0.4.1.zip"; sha256 = "0xmn9inys0kbcdd02qaqp8gazqs67xq3fq7hvcy2qb9jbq85j8b2"; }) ]; @@ -59,7 +59,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple text adventure interpreter for Unix and Windows"; - homepage = http://instead.syscall.ru/; + homepage = "http://instead.syscall.ru/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix new file mode 100644 index 00000000000..cbbdb538513 --- /dev/null +++ b/pkgs/games/katago/default.nix @@ -0,0 +1,97 @@ +{ stdenv +, gcc8Stdenv +, lib +, libzip +, boost +, cmake +, makeWrapper +, fetchFromGitHub +, cudnn ? null +, cudatoolkit ? null +, libGL_driver ? null +, opencl-headers ? null +, ocl-icd ? null +, gperftools ? null +, cudaSupport ? false +, useTcmalloc ? true}: + +assert cudaSupport -> ( + libGL_driver != null && + cudatoolkit != null && + cudnn != null); + +assert !cudaSupport -> ( + opencl-headers != null && + ocl-icd != null); + +assert useTcmalloc -> ( + gperftools != null); + +let + env = if cudaSupport + then gcc8Stdenv + else stdenv; + +in env.mkDerivation rec { + pname = "katago"; + version = "1.3.5"; + + src = fetchFromGitHub { + owner = "lightvector"; + repo = "katago"; + rev = "v${version}"; + sha256 = "1625s3fh0xc2ldgyl6sjdjmpliyys7rzzkcys6h9x6k828g8n0lq"; + }; + + nativeBuildInputs = [ + cmake + makeWrapper + ]; + + buildInputs = [ + libzip + boost + ] ++ lib.optionals cudaSupport [ + cudnn + libGL_driver + ] ++ lib.optionals (!cudaSupport) [ + opencl-headers + ocl-icd + ] ++ lib.optionals useTcmalloc [ + gperftools + ]; + + cmakeFlags = [ + "-DNO_GIT_REVISION=ON" + ] ++ lib.optionals cudaSupport [ + "-DUSE_BACKEND=CUDA" + ] ++ lib.optionals (!cudaSupport) [ + "-DUSE_BACKEND=OPENCL" + ] ++ lib.optionals useTcmalloc [ + "-DUSE_TCMALLOC=ON" + ]; + + preConfigure = '' + cd cpp/ + '' + lib.optionalString cudaSupport '' + export CUDA_PATH="${cudatoolkit}" + export EXTRA_LDFLAGS="-L/run/opengl-driver/lib" + ''; + + installPhase = '' + mkdir -p $out/bin; cp katago $out/bin; + '' + lib.optionalString cudaSupport '' + wrapProgram $out/bin/katago \ + --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Go engine modeled after AlphaGo Zero"; + homepage = "https://github.com/lightvector/katago"; + license = licenses.mit; + maintainers = [ maintainers.omnipotententity ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/games/keen4/default.nix b/pkgs/games/keen4/default.nix index 64522e568db..c91cc486118 100644 --- a/pkgs/games/keen4/default.nix +++ b/pkgs/games/keen4/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; dist = fetchurl { - url = http://tarballs.nixos.org/keen4.zip; + url = "http://tarballs.nixos.org/keen4.zip"; sha256 = "12rnc9ksl7v6l8wsxvr26ylkafzq80dbsa7yafzw9pqc8pafkhx1"; }; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index f58f86cd8fb..e62c5a18233 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Just another free touch typing tutor program"; - homepage = http://klavaro.sourceforge.net/; + homepage = "http://klavaro.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.linux; maintainers = [stdenv.lib.maintainers.mimame]; diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 38eff4f2fce..5620cee185d 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "kobodeluxe-0.5.1"; src = fetchurl { - url = http://olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2; + url = "http://olofson.net/kobodl/download/KoboDeluxe-0.5.1.tar.bz2"; sha256 = "0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./glibc29.patch ]; meta = { - homepage = http://olofson.net/kobodl/; + 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; diff --git a/pkgs/games/lbreakout2/default.nix b/pkgs/games/lbreakout2/default.nix index 0e6941a8acd..ddd7e454efb 100644 --- a/pkgs/games/lbreakout2/default.nix +++ b/pkgs/games/lbreakout2/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Breakout clone from the LGames series"; - homepage = http://lgames.sourceforge.net/LBreakout2/; + homepage = "http://lgames.sourceforge.net/LBreakout2/"; license = licenses.gpl2; maintainers = [ maintainers.ciil ]; platforms = platforms.unix; diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/games/leela-zero/default.nix index d4621682cc6..7ade06393bb 100644 --- a/pkgs/games/leela-zero/default.nix +++ b/pkgs/games/leela-zero/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Go engine modeled after AlphaGo Zero"; - homepage = https://github.com/gcp/leela-zero; + homepage = "https://github.com/gcp/leela-zero"; license = licenses.gpl3; maintainers = [ maintainers.averelld maintainers.omnipotententity ]; platforms = platforms.linux; diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix index dc6ebd396ed..69200bd184f 100644 --- a/pkgs/games/lgogdownloader/default.nix +++ b/pkgs/games/lgogdownloader/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://github.com/Sude-/lgogdownloader; + homepage = "https://github.com/Sude-/lgogdownloader"; description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader"; license = stdenv.lib.licenses.wtfpl; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/liberal-crime-squad/default.nix b/pkgs/games/liberal-crime-squad/default.nix index 0811c01aa79..25d8bf3eae5 100644 --- a/pkgs/games/liberal-crime-squad/default.nix +++ b/pkgs/games/liberal-crime-squad/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { longDescription = '' Welcome to Liberal Crime Squad! The Conservatives have taken the Executive, Legislative, and Judicial branches of government. Over time, the Liberal laws of this nation will erode and turn the country into a BACKWOODS YET CORPORATE NIGHTMARE. To prevent this from happening, the Liberal Crime Squad was established. The mood of the country is shifting, and we need to turn things around. Go out on the streets and indoctrinate Conservative automatons. That is, let them see their True Liberal Nature. Then arm them and send them forth to Stop Evil. ''; - homepage = https://github.com/Kamal-Sadek/Liberal-Crime-Squad; + homepage = "https://github.com/Kamal-Sadek/Liberal-Crime-Squad"; maintainers = [ maintainers.rardiol ]; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix index fb98b1a3811..574b8ead095 100644 --- a/pkgs/games/lincity/default.nix +++ b/pkgs/games/lincity/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "City simulation game"; license = licenses.gpl2Plus; - homepage = https://sourceforge.net/projects/lincity; + homepage = "https://sourceforge.net/projects/lincity"; }; } diff --git a/pkgs/games/linux-steam-integration/default.nix b/pkgs/games/linux-steam-integration/default.nix index a3c9599e7b1..2a814f30a5f 100644 --- a/pkgs/games/linux-steam-integration/default.nix +++ b/pkgs/games/linux-steam-integration/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation { various workarounds to get games working, and fixes long standing bugs in both games and the client ''; - homepage = https://github.com/clearlinux/linux-steam-integration; + homepage = "https://github.com/clearlinux/linux-steam-integration"; license = licenses.lgpl21; maintainers = [ maintainers.etu ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index 800ac0fc4c7..341d077879c 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Quick tactics game"; - homepage = https://www.gnu.org/software/liquidwar6/; + homepage = "https://www.gnu.org/software/liquidwar6/"; maintainers = [ maintainers.raskin ]; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/games/ltris/default.nix b/pkgs/games/ltris/default.nix index d580d7586ff..0ea4143bc3d 100644 --- a/pkgs/games/ltris/default.nix +++ b/pkgs/games/ltris/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tetris clone from the LGames series"; - homepage = http://lgames.sourceforge.net/LBreakout2/; + homepage = "http://lgames.sourceforge.net/LBreakout2/"; license = licenses.gpl2; maintainers = [ maintainers.ciil ]; platforms = platforms.linux; diff --git a/pkgs/games/lugaru/default.nix b/pkgs/games/lugaru/default.nix index cad98650c24..6620074418d 100644 --- a/pkgs/games/lugaru/default.nix +++ b/pkgs/games/lugaru/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Lugaru HD: Third person ninja rabbit fighting game"; - homepage = https://osslugaru.gitlab.io; + homepage = "https://osslugaru.gitlab.io"; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix index 7879b68c857..f88b763aaf8 100644 --- a/pkgs/games/macopix/default.nix +++ b/pkgs/games/macopix/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Mascot Constructive Pilot for X"; - homepage = http://rosegray.sakura.ne.jp/macopix/index-e.html; + homepage = "http://rosegray.sakura.ne.jp/macopix/index-e.html"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index ed0b2be0d97..9fe99bff2f9 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { original, however, the game still takes place in a two dimensional world. You must view the world as mario does, as a one dimensional line. ''; - homepage = https://github.com/olynch/fp_mario; + homepage = "https://github.com/olynch/fp_mario"; license = licenses.agpl3; maintainers = with maintainers; [ taeer ]; platforms = platforms.linux; diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index ed926461db2..53ffb4e4b2d 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { chmod +x "$out/bin/mars" ''; meta = with stdenv.lib; { - homepage = http://mars-game.sourceforge.net/; + homepage = "http://mars-game.sourceforge.net/"; description = "A game about fighting with ships in a 2D space setting"; license = licenses.gpl3Plus; maintainers = [ maintainers.astsmtl ]; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 14e0d881e09..d5129818cb2 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = { description = "MegaGlest is an entertaining free (freeware and free software) and open source cross-platform 3D real-time strategy (RTS) game"; license = stdenv.lib.licenses.gpl3; - homepage = http://megaglest.org/; + homepage = "http://megaglest.org/"; maintainers = [ stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/meritous/default.nix b/pkgs/games/meritous/default.nix index 4a37fc8f676..2958c6a9210 100644 --- a/pkgs/games/meritous/default.nix +++ b/pkgs/games/meritous/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Action-adventure dungeon crawl game"; - homepage = http://www.asceai.net/meritous/; + homepage = "http://www.asceai.net/meritous/"; license = licenses.gpl3; maintainers = [ maintainers.alexvorobiev ]; platforms = platforms.linux; diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix index 3d4f52f2c70..c0c8663868d 100644 --- a/pkgs/games/mindustry/default.nix +++ b/pkgs/games/mindustry/default.nix @@ -21,14 +21,14 @@ 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 = "103"; + version = "104.6"; buildVersion = makeBuildVersion version; src = fetchFromGitHub { owner = "Anuken"; repo = "Mindustry"; rev = "v${version}"; - sha256 = "0s9pzmnq2v3glbmb6kqifar62wi44z4sg14dnayyj0fjkx6sh05s"; + sha256 = "1crdfiymaz57gnma6bmdcsnbl635nhjdndrjv467c4xfq9vvap2i"; }; desktopItem = makeDesktopItem { @@ -70,7 +70,7 @@ let ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "16k058fw9yk89adx8j1708ynfri5yizmmvh49prls9slw4hipffb"; + outputHash = "08yrczz1qn78qy3x67gs7d0xvihbfbb8ggiczq2nj812745zcizw"; }; # Separate commands for building and installing the server and the client diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix index 4751660af3a..956fbdf3aae 100644 --- a/pkgs/games/minecraft-server/default.nix +++ b/pkgs/games/minecraft-server/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; version = "1.15.2"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; + url = + "https://launcher.mojang.com/v1/objects/bb2b6b1aefcd70dfd1892149ac3a215f6c636b07/server.jar"; sha256 = "12kynrpxgcdg8x12wcvwkxka0fxgm5siqg8qq0nnmv0443f8dkw0"; }; @@ -16,7 +17,7 @@ stdenv.mkDerivation { cat > $out/bin/minecraft-server << EOF #!/bin/sh - exec ${jre}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui + exec ${jre_headless}/bin/java \$@ -jar $out/lib/minecraft/server.jar nogui EOF chmod +x $out/bin/minecraft-server @@ -24,11 +25,11 @@ stdenv.mkDerivation { phases = "installPhase"; - meta = { + meta = with stdenv.lib; { description = "Minecraft Server"; - homepage = "https://minecraft.net"; - license = stdenv.lib.licenses.unfreeRedistributable; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice tomberek costrouc]; + homepage = "https://minecraft.net"; + license = licenses.unfreeRedistributable; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice tomberek costrouc ]; }; } diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index 157fb4b93b9..b29d672d0e7 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -86,11 +86,11 @@ in stdenv.mkDerivation rec { pname = "minecraft-launcher"; - version = "2.1.11314"; + version = "2.1.13509"; src = fetchurl { url = "https://launcher.mojang.com/download/linux/x86_64/minecraft-launcher_${version}.tar.gz"; - sha256 = "1wd3zh91zamlpgnqlk7sq3xja2g5qz34amy4v8yhdxkhj79plwhg"; + sha256 = "1f7b4gr2cnnf6wgxdz38215v31664q2pw00yibb3cjp8a9irvs47"; }; icon = fetchurl { diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 03c1cb5cc4a..b2d958c5e09 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -61,7 +61,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://minetest.net/; + homepage = "http://minetest.net/"; description = "Infinite-world block sandbox game"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/games/moon-buggy/default.nix b/pkgs/games/moon-buggy/default.nix index d0c07b71e2e..9de24c1ae9d 100644 --- a/pkgs/games/moon-buggy/default.nix +++ b/pkgs/games/moon-buggy/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.rybern]; platforms = stdenv.lib.platforms.linux; - homepage = https://www.seehuhn.de/pages/moon-buggy; + homepage = "https://www.seehuhn.de/pages/moon-buggy"; }; } diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix index e8138f81232..367a7a5c5e6 100644 --- a/pkgs/games/mrrescue/default.nix +++ b/pkgs/games/mrrescue/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ ]; platforms = platforms.linux; license = licenses.zlib; - downloadPage = http://tangramgames.dk/games/mrrescue; + downloadPage = "http://tangramgames.dk/games/mrrescue"; }; } diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix index a402587ed8b..75d16586a39 100644 --- a/pkgs/games/mudlet/default.nix +++ b/pkgs/games/mudlet/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Crossplatform mud client"; - homepage = http://mudlet.org/; + homepage = "http://mudlet.org/"; maintainers = [ maintainers.wyvie maintainers.pstn ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix index ae086af184c..f5ff0b4690e 100644 --- a/pkgs/games/n2048/default.nix +++ b/pkgs/games/n2048/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://www.dettus.net/n2048/; + homepage = "http://www.dettus.net/n2048/"; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index a1b525ff093..c328199b377 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = { description = "2D action/rpg space game"; - homepage = http://www.naev.org; + homepage = "http://www.naev.org"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix index 280ca090d60..1b082537148 100644 --- a/pkgs/games/nethack/default.nix +++ b/pkgs/games/nethack/default.nix @@ -143,7 +143,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Rogue-like game"; - homepage = http://nethack.org/; + homepage = "http://nethack.org/"; license = "nethack"; platforms = if x11Mode then platforms.linux else platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index daba54ce810..99ce818d04d 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://neverball.org/; + homepage = "https://neverball.org/"; description = "Tilt the floor to roll a ball"; license = "GPL"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index 9f8d228e716..e055e27d2cd 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation { meta = { description = "A free fast-paced first-person shooter"; - homepage = http://www.alientrap.org/games/nexuiz; + homepage = "http://www.alientrap.org/games/nexuiz"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/njam/default.nix b/pkgs/games/njam/default.nix index 6f700ad3204..5022a92a7cd 100644 --- a/pkgs/games/njam/default.nix +++ b/pkgs/games/njam/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "njam-1.25"; src = fetchurl { - url = mirror://sourceforge/njam/njam-1.25-src.tar.gz; + url = "mirror://sourceforge/njam/njam-1.25-src.tar.gz"; sha256 = "0ysvqw017xkvddj957pdfmbmji7qi20nyr7f0zxvcvm6c7d3cc7s"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { patches = [ ./logfile.patch ]; meta = { - homepage = http://trackballs.sourceforge.net/; + homepage = "http://trackballs.sourceforge.net/"; description = "Cross-platform pacman-like game"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index 2afb259ea43..af9bccadeb3 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "odamex"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-src-${version}.tar.bz2"; - sha256 = "1dz0lqdx3vb62mylqddcdq3vxsl2mvv0w2xskvwgpg0p04fcic2c"; + sha256 = "0d4v1l7kghkz1xz92jxlx50x3iy94z7ix1i3209m5j5545qzxrqq"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 1d56d86f530..6a05a566524 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation { combines the strategic challenge of a classical RTS with the sheer fun of Tower Defense. ''; - homepage = http://oilrush-game.com/; + homepage = "http://oilrush-game.com/"; license = stdenv.lib.licenses.unfree; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/onscripter-en/default.nix b/pkgs/games/onscripter-en/default.nix index 2ad23a72368..ebcf755780d 100644 --- a/pkgs/games/onscripter-en/default.nix +++ b/pkgs/games/onscripter-en/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Japanese visual novel scripting engine"; - homepage = http://unclemion.com/onscripter/; + homepage = "http://unclemion.com/onscripter/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix index 1e839c46f0f..577eafb6a8c 100644 --- a/pkgs/games/openarena/default.nix +++ b/pkgs/games/openarena/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Crossplatform openarena client"; - homepage = http://openarena.ws/; + homepage = "http://openarena.ws/"; maintainers = [ stdenv.lib.maintainers.wyvie ]; platforms = [ "i386-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index cce643e9f7d..18147c896bf 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; - homepage = https://www.openclonk.org; + homepage = "https://www.openclonk.org"; license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; maintainers = with maintainers; [ lheckemann ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/games/opendune/default.nix b/pkgs/games/opendune/default.nix index 751eb6d5933..591bea12297 100644 --- a/pkgs/games/opendune/default.nix +++ b/pkgs/games/opendune/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dune, Reinvented"; - homepage = https://github.com/OpenDUNE/OpenDUNE; + homepage = "https://github.com/OpenDUNE/OpenDUNE"; license = licenses.gpl2; maintainers = with maintainers; [ nand0p ]; }; diff --git a/pkgs/games/opendungeons/default.nix b/pkgs/games/opendungeons/default.nix index f6841abb1d0..467c782211f 100644 --- a/pkgs/games/opendungeons/default.nix +++ b/pkgs/games/opendungeons/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open source, real time strategy game sharing game elements with the Dungeon Keeper series and Evil Genius."; - homepage = https://opendungeons.github.io; + homepage = "https://opendungeons.github.io"; license = [ licenses.gpl3Plus licenses.zlib licenses.mit licenses.cc-by-sa-30 licenses.cc0 licenses.ofl licenses.cc-by-30 ]; platforms = platforms.linux; }; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 07dd2a00c23..2d08a1da999 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "An open-source engine for Star Wars Jedi Academy game"; - homepage = https://github.com/JACoders/OpenJK; + homepage = "https://github.com/JACoders/OpenJK"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ gnidorah ]; diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix index 4b1385f3e10..66c9420591d 100644 --- a/pkgs/games/openlierox/default.nix +++ b/pkgs/games/openlierox/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { pkgconfig curl cmake libzip ]; meta = { - homepage = http://openlierox.net; + homepage = "http://openlierox.net"; description = "Real-time game with Worms-like shooting"; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index a7e386398d2..a9047de7041 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -32,7 +32,7 @@ in mkDerivationWith stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; - homepage = http://openmw.org; + homepage = "http://openmw.org"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index 3d14fb0487c..222aa68dba2 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -69,7 +69,7 @@ in openmw.overrideAttrs (oldAttrs: rec { meta = with stdenv.lib; { description = "Multiplayer for TES3:Morrowind based on OpenMW"; - homepage = https://tes3mp.com/; + homepage = "https://tes3mp.com/"; license = licenses.gpl3; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ gnidorah ]; diff --git a/pkgs/games/openra/engines.nix b/pkgs/games/openra/engines.nix index 1c3d2308d97..933f8411f75 100644 --- a/pkgs/games/openra/engines.nix +++ b/pkgs/games/openra/engines.nix @@ -4,7 +4,7 @@ let buildUpstreamOpenRAEngine = { version, rev, sha256 }: name: (buildOpenRAEngine { inherit version; description = "Open-source re-implementation of Westwood Studios' 2D Command and Conquer games"; - homepage = https://www.openra.net/; + homepage = "https://www.openra.net/"; mods = [ "cnc" "d2k" "ra" "ts" ]; src = fetchFromGitHub { owner = "OpenRA"; diff --git a/pkgs/games/openra/mods.nix b/pkgs/games/openra/mods.nix index a045e365ece..4a79125dc18 100644 --- a/pkgs/games/openra/mods.nix +++ b/pkgs/games/openra/mods.nix @@ -10,7 +10,7 @@ in { version = "96.git.fc3cf0b"; title = "Combined Arms"; description = "A game that combines units from the official OpenRA Red Alert and Tiberian Dawn mods"; - homepage = https://github.com/Inq8/CAmod; + homepage = "https://github.com/Inq8/CAmod"; src = fetchFromGitHub { owner = "Inq8"; repo = "CAmod"; @@ -34,7 +34,7 @@ in { version = "134.git.69a4aa7"; title = "Dune II"; description = "A modernization of the original ${title} game"; - homepage = https://github.com/OpenRA/d2; + homepage = "https://github.com/OpenRA/d2"; src = fetchFromGitHub { owner = "OpenRA"; repo = "d2"; @@ -63,7 +63,7 @@ in { version = "324.git.ffcd6ba"; title = "Dark Reign"; description = "A re-imagination of the original Command & Conquer: ${title} game"; - homepage = https://github.com/drogoganor/DarkReign; + homepage = "https://github.com/drogoganor/DarkReign"; src = fetchFromGitHub { owner = "drogoganor"; repo = "DarkReign"; @@ -87,7 +87,7 @@ in { version = "1157.git.4f5e11d"; title = "Generals Alpha"; description = "Re-imagination of the original Command & Conquer: Generals game"; - homepage = https://github.com/MustaphaTR/Generals-Alpha; + homepage = "https://github.com/MustaphaTR/Generals-Alpha"; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "Generals-Alpha"; @@ -111,7 +111,7 @@ in { inherit version; title = "Krush, Kill 'n' Destroy"; description = "Re-imagination of the original ${title} game"; - homepage = https://kknd-game.com/; + homepage = "https://kknd-game.com/"; src = fetchFromGitHub { owner = "IceReaper"; repo = "KKnD"; @@ -140,7 +140,7 @@ in { version = "257.git.c9be8f2"; title = "Medieval Warfare"; description = "A re-imagination of the original Command & Conquer: ${title} game"; - homepage = https://github.com/CombinE88/Medieval-Warfare; + homepage = "https://github.com/CombinE88/Medieval-Warfare"; src = fetchFromGitHub { owner = "CombinE88"; repo = "Medieval-Warfare"; @@ -164,7 +164,7 @@ in { version = "903.git.2f7c700"; title = "Red Alert 2"; description = "Re-imagination of the original Command & Conquer: ${title} game"; - homepage = https://github.com/OpenRA/ra2; + homepage = "https://github.com/OpenRA/ra2"; src = fetchFromGitHub { owner = "OpenRA"; repo = "ra2"; @@ -192,7 +192,7 @@ in { version = "183.git.c76c13e"; title = "Red Alert Classic"; description = "A modernization of the original Command & Conquer: Red Alert game"; - homepage = https://github.com/OpenRA/raclassic; + homepage = "https://github.com/OpenRA/raclassic"; src = fetchFromGitHub { owner = "OpenRA"; repo = "raclassic"; @@ -216,7 +216,7 @@ in { version = "1330.git.9230e6f"; title = "Romanov's Vengeance"; description = "Re-imagination of the original Command & Conquer: Red Alert 2 game"; - homepage = https://github.com/MustaphaTR/Romanovs-Vengeance; + homepage = "https://github.com/MustaphaTR/Romanovs-Vengeance"; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "Romanovs-Vengeance"; @@ -245,7 +245,7 @@ in { version = "221.git.ac000cc"; title = "Shattered Paradise"; description = "Re-imagination of the original Command & Conquer: Tiberian Sun game"; - homepage = https://github.com/ABrandau/OpenRAModSDK; + homepage = "https://github.com/ABrandau/OpenRAModSDK"; src = fetchFromGitHub { owner = "ABrandau"; repo = "OpenRAModSDK"; @@ -270,7 +270,7 @@ in { version = "77.git.23e1f3e"; title = "Sole Survivor"; description = "A re-imagination of the original Command & Conquer: ${title} game"; - homepage = https://github.com/MustaphaTR/sole-survivor; + homepage = "https://github.com/MustaphaTR/sole-survivor"; src = fetchFromGitHub { owner = "MustaphaTR"; repo = "sole-survivor"; @@ -294,7 +294,7 @@ in { version = "431.git.128dc53"; title = "Red Alert Unplugged"; description = "Re-imagination of the original Command & Conquer: Red Alert game"; - homepage = http://redalertunplugged.com/; + homepage = "http://redalertunplugged.com/"; src = fetchFromGitHub { owner = "RAunplugged"; repo = "uRA"; @@ -316,7 +316,7 @@ in { yr = unsafeBuildOpenRAMod rec { version = "199.git.5b8b952"; - homepage = https://github.com/cookgreen/yr; + homepage = "https://github.com/cookgreen/yr"; title = "Yuri's Revenge"; description = "Re-imagination of the original Command & Conquer: ${title} game"; src = fetchFromGitHub { diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 1dbb14c9497..48114cb766c 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An open source re-implementation of RollerCoaster Tycoon 2 (original game required)"; - homepage = https://openrct2.io/; + homepage = "https://openrct2.io/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ geistesk ]; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 04d8afd2786..c2bb5cfa20c 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable"; - homepage = https://github.com/rwengine/openrw; + homepage = "https://github.com/rwengine/openrw"; license = licenses.gpl3; longDescription = '' OpenRW is an open source re-implementation of Rockstar Games' Grand Theft diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 704ef3c327e..b0f70775bfd 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -6,17 +6,17 @@ let opengfx = fetchzip { - url = "https://binaries.openttd.org/extra/opengfx/0.5.5/opengfx-0.5.5-all.zip"; - sha256 = "065l0g5nawcd6fkfbsfgviwgq9610y7gxzkpmd19i423d0lrq6d8"; + url = "https://cdn.openttd.org/opengfx-releases/0.6.0/opengfx-0.6.0-all.zip"; + sha256 = "1zg871j6kv7r0aqwca68d9kdf3smclgzan8hj76vj4fyfkykh173"; }; opensfx = fetchzip { - url = "https://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip"; + url = "https://cdn.openttd.org/opensfx-releases/0.2.3/opensfx-0.2.3-all.zip"; sha256 = "1bb167kszdd6dqbcdjrxxwab6b7y7jilhzi3qijdhprpm5gf1lp3"; }; openmsx = fetchzip { - url = "https://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip"; + url = "https://cdn.openttd.org/openmsx-releases/0.3.1/openmsx-0.3.1-all.zip"; sha256 = "0qnmfzz0v8vxrrvxnm7szphrlrlvhkwn3y92b4iy0b4b6yam0yd4"; }; @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "openttd"; - version = "1.9.3"; + version = "1.10.0"; src = fetchurl { - url = "https://proxy.binaries.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; - sha256 = "0ijq72kgx997ggw40i5f4a3nf7y2g72z37l47i18yjvgbdzy320r"; + url = "https://cdn.openttd.org/openttd-releases/${version}/${pname}-${version}-source.tar.xz"; + sha256 = "0lz2y2rjc23k0d97y65cqhy2splw9cmrbvhgz0iqps8xkan1m8hv"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ''} ''; - meta = { + meta = with stdenv.lib; { description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"''; longDescription = '' OpenTTD is a transportation economics simulator. In single player mode, @@ -86,9 +86,9 @@ stdenv.mkDerivation rec { - play cooperatively controlling the same business - observe as spectators ''; - homepage = https://www.openttd.org/; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ jcumming the-kenny fpletz ]; + homepage = "https://www.openttd.org/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ jcumming the-kenny fpletz ]; }; } diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 2dae58df976..9872a3ee05f 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; data = fetchzip { - url = http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip; + url = "http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip"; sha256 = "1biz6hf6s7qrwn8ky0g6p8w7yg715w7yklpn6258bkks1s15hpdb"; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = ''Open source port of the game "Tyrian"''; - homepage = https://bitbucket.org/opentyrian/opentyrian; + homepage = "https://bitbucket.org/opentyrian/opentyrian"; # This does not account of Tyrian data. # license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index a77b8f2ba4c..3ec18640054 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { meta = { description = "Open source clone of UFO: Enemy Unknown"; - homepage = https://openxcom.org; - repositories.git = https://github.com/SupSuper/OpenXcom.git; + 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; diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index c115833d848..9e38852a02a 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { description = "X-Ray Engine 1.6 expansion. Original version was used in S.T.A.L.K.E.R.: Call of Pripyat"; homepage = src.meta.homepage; license = licenses.unfree // { - url = https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt; + url = "https://github.com/OpenXRay/xray-16/blob/xd_dev/License.txt"; }; maintainers = [ maintainers.gnidorah ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix index 97fb3ebd19f..a2a66f6838b 100644 --- a/pkgs/games/orthorobot/default.nix +++ b/pkgs/games/orthorobot/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = http://stabyourself.net/orthorobot/; + downloadPage = "http://stabyourself.net/orthorobot/"; }; } diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix new file mode 100644 index 00000000000..9695a350058 --- /dev/null +++ b/pkgs/games/papermc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, jre }: +let + mcVersion = "1.15.2"; + buildNum = "161"; + jar = fetchurl { + url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; + sha256 = "1jngj5djs1fjdj25wg9iszw0dsp56f386j8ydms7x4ky8s8kxyms"; + }; +in stdenv.mkDerivation { + pname = "papermc"; + version = "${mcVersion}r${buildNum}"; + + preferLocalBuild = true; + + dontUnpack = true; + installPhase = '' + mkdir -p $out/bin + cp ${jar} $out/papermc.jar + cat > $out/bin/minecraft-server << EOF + #!/bin/sh + exec ${jre}/bin/java \$@ -jar $out/papermc.jar nogui + EOF + chmod +x $out/bin/minecraft-server + ''; + + phases = "installPhase"; + + meta = { + description = "High-performance Minecraft Server"; + homepage = "https://papermc.io/"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ aaronjanse ]; + }; +} diff --git a/pkgs/games/pentobi/default.nix b/pkgs/games/pentobi/default.nix index 2dc196c33cc..61be5e834a7 100644 --- a/pkgs/games/pentobi/default.nix +++ b/pkgs/games/pentobi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "A computer opponent for the board game Blokus"; - homepage = https://pentobi.sourceforge.io; + homepage = "https://pentobi.sourceforge.io"; license = licenses.gpl3; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 628493a34b1..e96e1a6a6e0 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,34 +1,19 @@ -{stdenv, fetchurl, fetchpatch, scons, SDL, SDL_image, boost, libpng, SDL_mixer -, pkgconfig, libGLU, libGL}: -let - s = # Generated upstream information - { - baseName="pingus"; - version="0.7.6"; - name="pingus-0.7.6"; - hash="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m"; - url="http://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2"; - sha256="0q34d2k6anzqvb0mf67x85q92lfx9jr71ry13dlp47jx0x9i573m"; +{stdenv, fetchgit, cmake, SDL2, SDL2_image, boost, libpng, SDL2_mixer +, pkgconfig, libGLU, libGL, git, jsoncpp }: +stdenv.mkDerivation rec { + pname = "pingus"; + version = "unstable-0.7.6.0.20191104"; + + nativeBuildInputs = [ pkgconfig git ]; + buildInputs = [ cmake SDL2 SDL2_image boost libpng SDL2_mixer libGLU libGL jsoncpp ]; + src = fetchgit { + url = "https://gitlab.com/pingus/pingus/"; + rev = "709546d9b9c4d6d5f45fc9112b45ac10c7f9417d"; + sha256 = "sha256:11mmzk0766riaw5qyd1r5i7s7vczbbzfccm92bvgrm99iy1sj022"; + fetchSubmodules = true; }; -in -stdenv.mkDerivation { - inherit (s) name version; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU libGL]; - src = fetchurl { - inherit (s) url sha256; - }; - patches = [ - # fix build with gcc7 - (fetchpatch { - url = https://github.com/Pingus/pingus/commit/df6e2f445d3e2925a94d22faeb17be9444513e92.patch; - sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p"; - }) - ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; - dontUseSconsInstall = true; + meta = { - inherit (s) version; description = ''A puzzle game with mechanics similar to Lemmings''; platforms = stdenv.lib.platforms.linux; maintainers = [stdenv.lib.maintainers.raskin]; diff --git a/pkgs/games/pingus/default.upstream b/pkgs/games/pingus/default.upstream deleted file mode 100644 index 6b4eb31aa5f..00000000000 --- a/pkgs/games/pingus/default.upstream +++ /dev/null @@ -1 +0,0 @@ -url http://pingus.seul.org/download.html diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index 46190daa3d3..3f3a2dd363d 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; - homepage = https://pioneerspacesim.net; + homepage = "https://pioneerspacesim.net"; license = with licenses; [ gpl3 cc-by-sa-30 ]; diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 53de9fa29e2..a3a80d896c1 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; meta = { - homepage = http://pio.sourceforge.net/; + homepage = "http://pio.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "Addicting game based on The Settlers of Catan"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 74e3b897a03..a42eb672e62 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.uberent.com/pa/; + homepage = "http://www.uberent.com/pa/"; description = "Next-generation RTS that takes the genre to a planetary scale"; license = stdenv.lib.licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 2e4ce270b82..83665bb072c 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let hiDPI = fetchpatch { - url = https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch; + url = "https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch"; sha256 = "192x3lqvd1fanasb95shdygn997qfrpk1k62k1f4j3s5chkwvjig"; }; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.pokerth.net; + homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; license = licenses.gpl3; maintainers = with maintainers; [ obadz yegortimoshenko ]; diff --git a/pkgs/games/pong3d/default.nix b/pkgs/games/pong3d/default.nix index 74e5e50b4e8..c7817041f7a 100644 --- a/pkgs/games/pong3d/default.nix +++ b/pkgs/games/pong3d/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "3dpong-0.5"; src = fetchurl { - url = ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-0.5.tar.gz; + url = "ftp://ftp.tuxpaint.org/unix/x/3dpong/src/3dpong-0.5.tar.gz"; sha256 = "1ibb79sbzlbn4ra3n0qk22gqr6fg7q0jy6cm0wg2qj4z64c7hmdi"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.newbreedsoftware.com/3dpong/; + 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; diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index ea6f8b01c71..278aa8a93ea 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -9,7 +9,7 @@ assert useOpenGL -> libGL != null && libGLU != null; stdenv.mkDerivation rec { name = "prboom-2.5.0"; src = fetchurl { - url = mirror://sourceforge/prboom/prboom-2.5.0.tar.gz; + url = "mirror://sourceforge/prboom/prboom-2.5.0.tar.gz"; sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12"; }; diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 607458f3798..9fd90945eba 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://privateer.sourceforge.net/; + homepage = "http://privateer.sourceforge.net/"; description = "Adventure space flight simulation computer game"; license = licenses.gpl2Plus; # and a special license for art data # https://sourceforge.net/p/privateer/code/HEAD/tree/privgold/trunk/data/art-license.txt diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index 4cfd7de6a55..bbdcd3f5850 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Just an ordinary calculator. Nothing to see here..."; - homepage = https://proofficecalculator.com/; + homepage = "https://proofficecalculator.com/"; maintainers = [ maintainers.pmiddend ]; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/games/pysolfc/default.nix b/pkgs/games/pysolfc/default.nix index 48c06c0eab6..5689edf4f4c 100644 --- a/pkgs/games/pysolfc/default.nix +++ b/pkgs/games/pysolfc/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A collection of more than 1000 solitaire card games"; - homepage = https://pysolfc.sourceforge.io; + homepage = "https://pysolfc.sourceforge.io"; license = licenses.gpl3; maintainers = with maintainers; [ kierdavis genesis ]; }; diff --git a/pkgs/games/qgo/default.nix b/pkgs/games/qgo/default.nix index 17441d14e7c..ea8c8aaeac8 100644 --- a/pkgs/games/qgo/default.nix +++ b/pkgs/games/qgo/default.nix @@ -25,7 +25,7 @@ mkDerivation { Go is an ancient Chinese board game. It's called "圍棋(Wei Qi)" in Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean. ''; - homepage = https://github.com/pzorin/qgo; + homepage = "https://github.com/pzorin/qgo"; license = licenses.gpl2; maintainers = with maintainers; [ zalakain ]; }; diff --git a/pkgs/games/qqwing/default.nix b/pkgs/games/qqwing/default.nix index f161f53bfe1..43fa45ca432 100644 --- a/pkgs/games/qqwing/default.nix +++ b/pkgs/games/qqwing/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" "tgz" ]; meta = with stdenv.lib; { - homepage = https://qqwing.com; + homepage = "https://qqwing.com"; description = "Sudoku generating and solving software"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix index f36581776cb..140cba2e9ae 100644 --- a/pkgs/games/qtads/default.nix +++ b/pkgs/games/qtads/default.nix @@ -18,7 +18,7 @@ mkDerivation rec { buildInputs = [ SDL2 fluidsynth libsndfile libvorbis mpg123 qtbase ]; meta = with lib; { - homepage = https://realnc.github.io/qtads/; + homepage = "https://realnc.github.io/qtads/"; description = "Multimedia interpreter for TADS games"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index a592455486b..285fb7e6884 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://ioquake3.org/; + homepage = "https://ioquake3.org/"; description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/games/quake3/quake3e/default.nix b/pkgs/games/quake3/quake3e/default.nix index 7d6ac0afe45..0e3e74ae7a7 100644 --- a/pkgs/games/quake3/quake3e/default.nix +++ b/pkgs/games/quake3/quake3e/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "Quake3e"; - version = "2020-01-23"; + version = "2020-04-04"; src = fetchFromGitHub { owner = "ec-"; repo = pname; rev = version; - sha256 = "0crqn32nkqhlagamkp5nr0vl474ad4wx5ms7yr85s6zybpsk5jnz"; + sha256 = "1jvk8qd0mi0x8lslknhkfd8h6ridwca34c6qahsbmmpcgsvdv16s"; }; buildInputs = [ curl libGL libX11 libXxf86dga alsaLib libXrandr libXxf86vm libXext ]; @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/ec-/Quake3e; + homepage = "https://github.com/ec-/Quake3e"; description = "Improved Quake III Arena engine"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pmiddend ]; badPlatforms = [ platforms.aarch64 ]; - }; + }; } diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/games/quakespasm/default.nix index a8d740ea512..1e8de1a18f0 100644 --- a/pkgs/games/quakespasm/default.nix +++ b/pkgs/games/quakespasm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "An engine for iD software's Quake"; - homepage = http://quakespasm.sourceforge.net/; + homepage = "http://quakespasm.sourceforge.net/"; longDescription = '' QuakeSpasm is a modern, cross-platform Quake 1 engine based on FitzQuake. It includes support for 64 bit CPUs and custom music playback, a new sound driver, diff --git a/pkgs/games/racer/default.nix b/pkgs/games/racer/default.nix index 1347f88cc2c..a5d9a911afa 100644 --- a/pkgs/games/racer/default.nix +++ b/pkgs/games/racer/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation { name = "racer-1.1"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = http://hippo.nipax.cz/src/racer-1.1.tar.gz; + url = "http://hippo.nipax.cz/src/racer-1.1.tar.gz"; sha256 = "0fll1qkqfcjq87k0jzsilcw701z92lfxn2y5ga1n038772lymxl9"; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = https://hippo.nipax.cz/src/racer-1.1.64.tar.gz; + url = "https://hippo.nipax.cz/src/racer-1.1.64.tar.gz"; sha256 = "0rjy3gmlhwfkb9zs58j0mc0dar0livwpbc19r6zw5r2k6r7xdan0"; } else throw "System not supported"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Car racing game"; - homepage = http://hippo.nipax.cz/download.en.php; + homepage = "http://hippo.nipax.cz/download.en.php"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index 9b0cfaa3b50..da003c3190f 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { meta = { description = "Interpreter for LucasArts' Lua-based 3D adventure games"; - homepage = http://residualvm.org/; - repositories.git = https://github.com/residualvm/residualvm.git; + homepage = "http://residualvm.org/"; + repositories.git = "https://github.com/residualvm/residualvm.git"; license = licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/games/rftg/default.nix b/pkgs/games/rftg/default.nix index 9ab63553053..966f903888b 100644 --- a/pkgs/games/rftg/default.nix +++ b/pkgs/games/rftg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2.dev ]; meta = { - homepage = http://keldon.net/rftg/; + 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 ]; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 00faee7b928..9aa51bf344e 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "3D simulator game where you can drive, fly and sail various vehicles"; - homepage = http://rigsofrods.sourceforge.net/; + homepage = "http://rigsofrods.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/riko4/default.nix b/pkgs/games/riko4/default.nix index 1ddca346fbb..5ea9b8f5416 100644 --- a/pkgs/games/riko4/default.nix +++ b/pkgs/games/riko4/default.nix @@ -18,7 +18,7 @@ let enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/grimfang4/sdl-gpu; + homepage = "https://github.com/grimfang4/sdl-gpu"; description = "A library for high-performance, modern 2D graphics with SDL written in C"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/incinirate/Riko4; + homepage = "https://github.com/incinirate/Riko4"; description = "Fantasy console for pixel art game development"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix index df89f9dc743..0b7fa118f80 100644 --- a/pkgs/games/rili/default.nix +++ b/pkgs/games/rili/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ri_li-2.0.1"; src = fetchurl { - url = mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2; + url = "mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2"; sha256 = "f71ccc20c37c601358d963e087ac0d524de8c68e96df09c3aac1ae65edd38dbd"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ SDL SDL_mixer ]; meta = { - homepage = http://ri-li.sourceforge.net; + homepage = "http://ri-li.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; description = "A children's train game"; longDescription = '' diff --git a/pkgs/games/rimshot/default.nix b/pkgs/games/rimshot/default.nix index c940c90b884..2e5087319f0 100644 --- a/pkgs/games/rimshot/default.nix +++ b/pkgs/games/rimshot/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = http://stabyourself.net/rimshot/; + downloadPage = "http://stabyourself.net/rimshot/"; }; } diff --git a/pkgs/games/robotfindskitten/default.nix b/pkgs/games/robotfindskitten/default.nix index fa1eb338a89..73beba2e34f 100644 --- a/pkgs/games/robotfindskitten/default.nix +++ b/pkgs/games/robotfindskitten/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "robotfindskitten"; - version = "2.7182818.701"; + version = "2.8284271.702"; src = fetchurl { - url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/mayan_apocalypse_edition/${pname}-${version}.tar.gz"; - sha256 = "06fp6b4li50mzw83j3pkzqspm6dpgxgxw03b60xkxlkgg5qa6jbp"; + url = "mirror://sourceforge/project/rfk/robotfindskitten-POSIX/ship_it_anyway/${pname}-${version}.tar.gz"; + sha256 = "1bwrkxm83r9ajpkd6x03nqvmdfpf5vz6yfy0c97pq3v3ykj74082"; }; nativeBuildInputs = [ pkgconfig ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Yet another zen simulation; A simple find-the-kitten game"; - homepage = http://robotfindskitten.org/; + homepage = "http://robotfindskitten.org/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index c0b07814aa5..ebced6467d2 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scrolling tile-based arcade style puzzle game"; - homepage = https://www.artsoft.org/rocksndiamonds/; + homepage = "https://www.artsoft.org/rocksndiamonds/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix index 1e27d67eb03..592f897f20f 100644 --- a/pkgs/games/rogue/default.nix +++ b/pkgs/games/rogue/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-DNCURSES_INTERNALS=1"; meta = with stdenv.lib; { - homepage = http://rogue.rogueforge.net/rogue-5-4/; + homepage = "http://rogue.rogueforge.net/rogue-5-4/"; description = "The final version of the original Rogue game developed for the UNIX operating system"; platforms = platforms.all; license = licenses.bsd3; diff --git a/pkgs/games/scid-vs-pc/default.nix b/pkgs/games/scid-vs-pc/default.nix index c0438153052..1ff0a0dc728 100644 --- a/pkgs/games/scid-vs-pc/default.nix +++ b/pkgs/games/scid-vs-pc/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Chess database with play and training functionality"; - homepage = http://scidvspc.sourceforge.net/; + homepage = "http://scidvspc.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.paraseba ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/scid/default.nix b/pkgs/games/scid/default.nix index 048a8fdc09b..b3d22d4c0f9 100644 --- a/pkgs/games/scid/default.nix +++ b/pkgs/games/scid/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = { description = "Chess database with play and training functionality"; - homepage = http://scid.sourceforge.net/; + homepage = "http://scid.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index c86df396ff1..b7f448e119a 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lopenal"; meta = with stdenv.lib; { - homepage = http://scorched3d.co.uk/; + homepage = "http://scorched3d.co.uk/"; description = "3D Clone of the classic Scorched Earth"; license = licenses.gpl2Plus; platforms = platforms.linux; # maybe more diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index b8bf4efcf0a..a435a240ede 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { meta = { description = "A strategy collectible card game"; - homepage = https://scrolls.com/; + homepage = "https://scrolls.com/"; # http://www.reddit.com/r/Scrolls/comments/2j3pxw/linux_client_experimental/ platforms = [ "x86_64-linux" ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 80fa840cc69..e6efbc6203c 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; - sha256 = "1a6waf1ybp91nwva8g650cljlfb1di4l0jv13vg6yfgkas9pclsp"; + sha256 = "1c4fz1nfg0nqnqx9iipayhzcsiqdmfxm2i95nw9dbhshhsdnrhf4"; }; nativeBuildInputs = [ nasm ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)"; - homepage = https://www.scummvm.org/; + homepage = "https://www.scummvm.org/"; license = licenses.gpl2; maintainers = [ maintainers.peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/games/scummvm/games.nix b/pkgs/games/scummvm/games.nix index a96250e7acb..0165a797c3a 100644 --- a/pkgs/games/scummvm/games.nix +++ b/pkgs/games/scummvm/games.nix @@ -52,7 +52,7 @@ let ''; meta = with stdenv.lib; { - homepage = https://www.scummvm.org; + homepage = "https://www.scummvm.org"; license = licenses.free; # refer to the readme for exact wording maintainers = with maintainers; [ peterhoeg ]; inherit description; @@ -74,6 +74,21 @@ in { files = [ "sky.*" ]; }; + broken-sword-25 = generic rec { + plong = "Broken Sword 2.5"; + pshort = "sword25"; + pcode = "sword25"; + description = "A fan game of the Broken Sword series"; + version = "1.0"; + src = fetchurl { + url = "mirror://sourceforge/scummvm/${pshort}-v${version}.zip"; + sha256 = "0ivj1vflfpih5bs5a902mab88s4d77fwm3ya3fk7pammzc8gjqzz"; + }; + sourceRoot = "."; + docs = [ "README" "license-original.txt" ]; + files = [ "data.b25c" ]; + }; + drascula-the-vampire-strikes-back = generic rec { plong = "Drascula: The Vampire Strikes Back"; pshort = "drascula"; @@ -95,6 +110,21 @@ in { files = [ "Packet.001" ]; }; + dreamweb = generic rec { + plong = "Dreamweb"; + pshort = "dreamweb"; + pcode = "dreamweb"; + description = "2D point-and-click cyberpunk top-down adventure game"; + version = "1.1"; + src = fetchurl { + url = "mirror://sourceforge/scummvm/${pshort}-cd-uk-${version}.zip"; + sha256 = "0hh1p3rd7s0ckvri14lc6wdry9vv0vn4h4744v2n4zg63j8i6vsa"; + }; + sourceRoot = "."; + docs = [ "license.txt" ]; + files = [ "DREAMWEB.*" "SPEECH" "track01.flac" ]; + }; + flight-of-the-amazon-queen = generic rec { plong = "Flight of the Amazon Queen"; pshort = "fotaq"; diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix index f138e1d0491..c17439b5e3e 100644 --- a/pkgs/games/sgt-puzzles/default.nix +++ b/pkgs/games/sgt-puzzles/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.raskin maintainers.genesis ]; platforms = platforms.linux; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/puzzles/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"; }; } diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index ed6ac781cae..bedd446e34c 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = http://tangramgames.dk/games/sienna; + downloadPage = "http://tangramgames.dk/games/sienna"; }; } diff --git a/pkgs/games/sil/default.nix b/pkgs/games/sil/default.nix index a998a86370d..208a14dc1c5 100644 --- a/pkgs/games/sil/default.nix +++ b/pkgs/games/sil/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { 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; + 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; diff --git a/pkgs/games/simutrans/default.nix b/pkgs/games/simutrans/default.nix index 50be7b55203..7b79eefff82 100644 --- a/pkgs/games/simutrans/default.nix +++ b/pkgs/games/simutrans/default.nix @@ -160,7 +160,7 @@ let places. Simutrans is an open source remake of Transport Tycoon. ''; - homepage = http://www.simutrans.com/; + homepage = "http://www.simutrans.com/"; license = with licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ kkallio vcunat phile314 ]; platforms = with platforms; linux; # TODO: ++ darwin; diff --git a/pkgs/games/snake4/default.nix b/pkgs/games/snake4/default.nix index b3a74d0f4fb..4c4161d5049 100644 --- a/pkgs/games/snake4/default.nix +++ b/pkgs/games/snake4/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A game starring a fruit-eating snake"; - homepage = https://shh.thathost.com/pub-unix/html/snake4.html; + homepage = "https://shh.thathost.com/pub-unix/html/snake4.html"; license = licenses.artistic1; platforms = platforms.linux; }; diff --git a/pkgs/games/snipes/default.nix b/pkgs/games/snipes/default.nix index e035bc436cc..37993e32a5d 100644 --- a/pkgs/games/snipes/default.nix +++ b/pkgs/games/snipes/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Modern port of the classic 1982 text-mode game Snipes"; - homepage = https://www.vogons.org/viewtopic.php?f=7&t=49073; + homepage = "https://www.vogons.org/viewtopic.php?f=7&t=49073"; license = licenses.free; # This reverse-engineered source code is released with the original authors' permission. maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 7179c4f48b5..0e4722cebb1 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.free; - downloadPage = https://sourceforge.net/projects/soi/files/; + downloadPage = "https://sourceforge.net/projects/soi/files/"; }; } diff --git a/pkgs/games/solarus/default.nix b/pkgs/games/solarus/default.nix index 68d0f642aef..c0daa99c15a 100644 --- a/pkgs/games/solarus/default.nix +++ b/pkgs/games/solarus/default.nix @@ -27,7 +27,7 @@ mkDerivation rec { Solarus is a game engine for Zelda-like ARPG games written in lua. Many full-fledged games have been writen for the engine. ''; - homepage = http://www.solarus-games.org; + homepage = "http://www.solarus-games.org"; license = licenses.gpl3; maintainers = [ maintainers.Nate-Devv ]; platforms = platforms.linux; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index e0dd5f53449..6e3d42e2891 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -7,13 +7,18 @@ stdenv.mkDerivation rec { pname = "spring"; - version = "104.0.1"; + version = "104.0.1-${buildId}-g${shortRev}"; + # usually the latest in https://github.com/spring/spring/commits/maintenance + rev = "8ecf38a784ed3c4e3d67bc8d59839a77e0f0b83e"; + shortRev = builtins.substring 0 7 rev; + buildId = "1477"; + # taken from https://github.com/spring/spring/commits/maintenance src = fetchFromGitHub { owner = "spring"; repo = "spring"; - rev = "9ee29da876f6d3d23e169185619b58df9c036703"; - sha256 = "0m94i85k8k5ls1ff9z8djslzhkgr7b7vsbpic2axxjvki6sn2xjv"; + inherit rev; + sha256 = "0iai1wnd7msabgw2979cp2k54sgcfvidfmymhnck31jwbfa6y021"; fetchSubmodules = true; }; @@ -28,7 +33,7 @@ stdenv.mkDerivation rec { patchShebangs . rm rts/build/cmake/FindGLEW.cmake - echo "104.0.1-1466-g9ee29da maintenance" > VERSION + echo "${version} maintenance" > VERSION ''; cmakeFlags = ["-DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON" @@ -51,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://springrts.com/; + homepage = "https://springrts.com/"; description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ]; diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index f872d217237..e627575df94 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://springlobby.info/; - repositories.git = git://github.com/springlobby/springlobby.git; + homepage = "https://springlobby.info/"; + repositories.git = "git://github.com/springlobby/springlobby.git"; description = "Cross-platform lobby client for the Spring RTS project"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom qknight domenkozar ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index cb85426c23b..56e1a09f36e 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -105,6 +105,12 @@ in buildFHSUserEnv rec { # called by steam's setup.sh file + + # Prison Architect + libGLU + libuuid + libbsd + alsaLib ] ++ (if (!nativeOnly) then [ (steamPackages.steam-runtime-wrapped.override { inherit runtimeOnly; @@ -152,8 +158,6 @@ in buildFHSUserEnv rec { xorg.libXt xorg.libXmu xorg.libxcb - libGLU - libuuid libogg libvorbis SDL diff --git a/pkgs/games/steam/fonts.nix b/pkgs/games/steam/fonts.nix index dab393a86fb..44dde01a8a8 100644 --- a/pkgs/games/steam/fonts.nix +++ b/pkgs/games/steam/fonts.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "steam-fonts-1"; src = fetchurl { - url = https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip; + url = "https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.zip"; sha256 = "1cgygmwich5f1jhhbmbkkpnzasjl8gy36xln76n6r2gjh6awqfx0"; }; diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index bb4decfda4d..36f16b6155b 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -274,18 +274,18 @@ }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64"; - sha256 = "a3c56793a0751a819897d5cd40562e0bd04b0c1fe56e4f865f0f1653e7190bab"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.2+srt1_amd64"; + sha256 = "b8ce9330efb568bff45d00b678f461c1b45184db97afb34c85a96320dbedcb45"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64"; - sha256 = "0692b46e931815d81421198c35b9c0923d7685c3d2541ad8cc3251d18981305d"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_amd64.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.2+srt1_amd64"; + sha256 = "d130968581123872aa448f1bd92b969c3df5c3c47ffb034c7635f723c7f9a9ff"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; @@ -328,6 +328,15 @@ }; } rec { + name = "libelf1_0.152-1ubuntu3.1+srt3_amd64"; + sha256 = "16f5a035ab04bf0a90d2172820265e56e000fa3b4a5461bda293534f3e39a061"; + url = "mirror://steamrt/pool/main/e/elfutils/libelf1_0.152-1ubuntu3.1+srt3_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libelf1.deb"; + }; + } + rec { name = "libexif12_0.6.20-2ubuntu0.1+srt6_amd64"; sha256 = "adb05c68a77601a6c133d8bd2fcd0e6dccc7fd9e75b70b191e0fee26dd03c1ae"; url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt6_amd64.deb"; @@ -499,9 +508,9 @@ }; } rec { - name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_amd64"; - sha256 = "3fb1f7644d1c83c1cf2271dd6e30dde50adf5ada859530431d205ba24cef8734"; - url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_amd64.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.2+srt1_amd64"; + sha256 = "c6e07fb2f90549d741378a211babd4d1c802e93dde401839c2e89504410ed228"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libgnutls30.deb"; @@ -688,6 +697,15 @@ }; } rec { + name = "libjson-glib-1.0-0_1.0.2-1~steamrt1.1+srt1_amd64"; + sha256 = "636c77a5f10b1861d4ebe7722a0c832e1fdbcc995d248e36280966e387ffaa89"; + url = "mirror://steamrt/pool/main/j/json-glib/libjson-glib-1.0-0_1.0.2-1~steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libjson-glib-1.0-0.deb"; + }; + } + rec { name = "libjson0_0.9-1ubuntu1.1+srt4_amd64"; sha256 = "a72824685bfa0dc7fab313606d1fcba41565363c8f90d22c7e90d3f35a74859c"; url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt4_amd64.deb"; @@ -1048,48 +1066,48 @@ }; } rec { - name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_amd64"; - sha256 = "907391ea4512c3372f86afd8a9a409632d90b9e260de43f8082f90175e08c56c"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_amd64.deb"; + name = "libsdl2-2.0-0_2.0.10-0+steamrt1.3+srt1_amd64"; + sha256 = "a69cf30f4c0f7ee02d9c37bd2ec25bab76a8c1175674959738e945bae05c7ed6"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2-2.0-0_2.0.10-0+steamrt1.3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2.deb"; + name = "libsdl2-2.0-0.deb"; }; } rec { - name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_amd64"; - sha256 = "136a0c68b520f4eaec9ff81321785b09dc6843431b10ba6941faee82af3b215d"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_amd64.deb"; + name = "libsdl2-image-2.0-0_2.0.5-0+steamrt1.1+srt1_amd64"; + sha256 = "13a3c69b92a72490eb1dd7e6c09244047b22765882944dc4bb335cb356f423a1"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image-2.0-0_2.0.5-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2-image.deb"; + name = "libsdl2-image-2.0-0.deb"; }; } rec { - name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_amd64"; - sha256 = "98f77bb9019649440a96e9c70bd160fa03aa0bd306fa51110b861882cb62df0d"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_amd64.deb"; + name = "libsdl2-mixer-2.0-0_2.0.4.~reimport-0+steamrt1.2+srt1_amd64"; + sha256 = "78860d794928a0f7a31cd4ee83f395151dedb74f0e2613c6833438aa0d3f1d54"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer-2.0-0_2.0.4.~reimport-0+steamrt1.2+srt1_amd64.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2-mixer.deb"; + name = "libsdl2-mixer-2.0-0.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt3_amd64"; - sha256 = "492a6e5f4efc454dd720be4028efd89a212e039d3f3f7b01c94c0144d8d8d621"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt3_amd64.deb"; + name = "libsdl2-net-2.0-0_2.0.1.~reimport-0+steamrt1.1+srt1_amd64"; + sha256 = "cea2cc24af441eca4e23227bcc9eef80047befcf4f79c9c5dc796f157068da45"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net-2.0-0_2.0.1.~reimport-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2-net.deb"; + name = "libsdl2-net-2.0-0.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt3_amd64"; - sha256 = "f117047ffeaf77a93fc0932470e80ace2d07d7e672191c9dd50ca5f2a033f56c"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt3_amd64.deb"; + name = "libsdl2-ttf-2.0-0_2.0.15-0+steamrt1.1+srt2_amd64"; + sha256 = "4444fb73f3bc2b7229dea2564baba233958158d82c73489724d4107bd31e3e6c"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf-2.0-0_2.0.15-0+steamrt1.1+srt2_amd64.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2-ttf.deb"; + name = "libsdl2-ttf-2.0-0.deb"; }; } rec { @@ -1174,6 +1192,33 @@ }; } rec { + name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64"; + sha256 = "680a2855b601ecccc81179df162722081ad0c7f4d1689e25bbce9d19de1a3eb6"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libsteam-runtime-tools-0-0.deb"; + }; + } + rec { + name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64"; + sha256 = "b33f5c1217c7927057428b54faa4d0fcdddda1b5b18d708f755e96893ed6e108"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libsteam-runtime-tools-0-helpers.deb"; + }; + } + rec { + name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64"; + sha256 = "4f2ddb4dd6f48636f95bb301541a023ba8235672e1e053be8da9961787958d18"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libsteam-runtime-tools-0-relocatable-libs.deb"; + }; + } + rec { name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64"; sha256 = "dda1950d7e1f50547ce57246bc7e19c3c1ab1166ee81ca637ff86d373e20253c"; url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_amd64.deb"; @@ -1282,33 +1327,78 @@ }; } rec { - name = "libva-glx1_1.7.0-1+steamos1+srt2_amd64"; - sha256 = "c25662535e0bcc1fc349c1f61710f31dcc1be846ea2ba4282225756809b13e15"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt2_amd64.deb"; + name = "libva-drm1_1.7.0-1+steamrt1.1+srt1_amd64"; + sha256 = "ee98522c6c69c1f6134a37d63a74f6c4f4ef5be2944bd504e8886333115f1f06"; + url = "mirror://steamrt/pool/main/libv/libva1/libva-drm1_1.7.0-1+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libva-drm1.deb"; + }; + } + rec { + name = "libva-drm2_2.1.0-3~steamrt1.2+srt1_amd64"; + sha256 = "5add6487f678a13cc71d039b1ebd6991b1395dd8ce78124ac3675ea80f10e1b8"; + url = "mirror://steamrt/pool/main/libv/libva/libva-drm2_2.1.0-3~steamrt1.2+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libva-drm2.deb"; + }; + } + rec { + name = "libva-glx1_1.7.0-1+steamrt1.1+srt1_amd64"; + sha256 = "938db19eecb0a2fbc5058e90962cdbc05f3ef2b1601341b7b6d7be429da97259"; + url = "mirror://steamrt/pool/main/libv/libva1/libva-glx1_1.7.0-1+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.7.0-1+steamos1+srt2_amd64"; - sha256 = "ddfd440a2bfe3174b33ac5b459ce4261ddbcfa36d443ad237d41e5e41dd17bae"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt2_amd64.deb"; + name = "libva-glx2_2.1.0-3~steamrt1.2+srt1_amd64"; + sha256 = "7a14fde5181a5c313e97bcb25d6233c7343ebc009c3c5065bb65e8d3ec74f643"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx2_2.1.0-3~steamrt1.2+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libva-glx2.deb"; + }; + } + rec { + name = "libva-x11-1_1.7.0-1+steamrt1.1+srt1_amd64"; + sha256 = "6f0894f499b44346af1d35a3d1300b9cc2d9b1674fca879345daf392620322ae"; + url = "mirror://steamrt/pool/main/libv/libva1/libva-x11-1_1.7.0-1+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.7.0-1+steamos1+srt2_amd64"; - sha256 = "a06f1a3af4679bb44722458d956177468e78d662cf97dc1ec6c8ee38dc7408a2"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt2_amd64.deb"; + name = "libva-x11-2_2.1.0-3~steamrt1.2+srt1_amd64"; + sha256 = "47f70088a25e92b036374d8ff132e11b38546f26ee2e6cba141d42f766d8c748"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-2_2.1.0-3~steamrt1.2+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libva-x11-2.deb"; + }; + } + rec { + name = "libva1_1.7.0-1+steamrt1.1+srt1_amd64"; + sha256 = "f0c27f86e0ec4e210e05b2217d2d51fe52994add7df2fe5ff41e7f8aeee6f426"; + url = "mirror://steamrt/pool/main/libv/libva1/libva1_1.7.0-1+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { + name = "libva2_2.1.0-3~steamrt1.2+srt1_amd64"; + sha256 = "08c60888e39e4656fa4c41dbbb2baa0d99f91a8fabbf5336261b255c0ea4f185"; + url = "mirror://steamrt/pool/main/libv/libva/libva2_2.1.0-3~steamrt1.2+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libva2.deb"; + }; + } + rec { name = "libvdpau1_0.4.1-3ubuntu1.2+srt3_amd64"; sha256 = "c40c31da412fec43c201e88458782dad6884e1eab9593815bdf0d9132eb76baf"; url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt3_amd64.deb"; @@ -1354,15 +1444,24 @@ }; } rec { - name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_amd64"; - sha256 = "a3820a7cdceef1cf070b762d81437ec87a4d3a2b41566dadaa1cdcb1f08dad3e"; - url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_amd64.deb"; + name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64"; + sha256 = "99b0d38e6a2240dbea57c3ebee18de7013ee5d346c82bc82243c18e66bc50ae4"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { + name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64"; + sha256 = "40ebf5f91707d0f183841ab8673f7bdd6d77540f090fc97cb69be54381c382be"; + url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libwaffle-1-0.deb"; + }; + } + rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; sha256 = "e72aabe5b6c20bb667e1746918a354cb6151e07a9892ea0735406966dff019af"; url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64.deb"; @@ -1813,24 +1912,123 @@ }; } rec { - name = "steamrt-legacy_1.20190624.0+srt1_amd64"; - sha256 = "0a0e96fc8dbe806b2d0b4ac26f217ca5ff49188f295a9a4b0d39cbe0a4da52b0"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190624.0+srt1_amd64.deb"; + name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64"; + sha256 = "b5fcefb31c79a4ac085ef1050cdb2770507fbcf04eae713f9f16fdc3a483a85d"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "steam-runtime-tools-bin.deb"; + }; + } + rec { + name = "steamrt-legacy_1.20200128.0+srt1_amd64"; + sha256 = "16a8adf316032424fa5cd53f498c53472c45a66b572e8c60adb2ff3ae7556eed"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20190624.0+srt1_amd64"; - sha256 = "ed7124e8d11d9dd435ec7b7516a0d0e2c766f677b2c5a1d0b257790c03f307a2"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190624.0+srt1_amd64.deb"; + name = "steamrt-libs_1.20200128.0+srt1_amd64"; + sha256 = "18247c8534f8d67f63f4ece884b15276e0eecf540d0758ed6d5ae8b6a6ba510b"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; }; } rec { + name = "vainfo_2.1.0+ds1-1~steamrt1.1+srt1_amd64"; + sha256 = "20758135cdf3ada791e1c6b57cdf8db1505b3dd3f429f3f12a6e92d589f568d9"; + url = "mirror://steamrt/pool/main/libv/libva-utils/vainfo_2.1.0+ds1-1~steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vainfo.deb"; + }; + } + rec { + name = "vainfo-1_1.7.0-1+steamrt1.1+srt1_amd64"; + sha256 = "f6f80b18d853edcac5ee09a522d01e83f9d02d3ccc7e7fda09b567c37d9f516e"; + url = "mirror://steamrt/pool/main/libv/libva1/vainfo-1_1.7.0-1+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vainfo-1.deb"; + }; + } + rec { + name = "vainfo-1-multiarch_1.7.0-1+steamrt1.1+srt1_amd64"; + sha256 = "6b4369f80a1d24c3c9fdd73f5c8f00ab67c136ad9ef60dfe70f4b662e5040306"; + url = "mirror://steamrt/pool/main/libv/libva1/vainfo-1-multiarch_1.7.0-1+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vainfo-1-multiarch.deb"; + }; + } + rec { + name = "vainfo-multiarch_2.1.0+ds1-1~steamrt1.1+srt1_amd64"; + sha256 = "3ac30bc566b2c949da526d5d26a957cb9bcce1ea7d109ee4b79e2109ae1ee995"; + url = "mirror://steamrt/pool/main/libv/libva-utils/vainfo-multiarch_2.1.0+ds1-1~steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vainfo-multiarch.deb"; + }; + } + rec { + name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; + sha256 = "b5c0c3fd9f5329f2aff54ce73f9281e3e61156556e1ee50c697b37f2144b1531"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-tools.deb"; + }; + } + rec { + name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; + sha256 = "33b03b9413ec308f5ee5b8699e9f9ad939b501b602eea185fdcaa69863deb70c"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-tools-multiarch.deb"; + }; + } + rec { + name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; + sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-utils.deb"; + }; + } + rec { + name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; + sha256 = "a1e9387bb5cb7effb23c5994dd2724614cfed7a447ec9c449ee4effcab58fd4c"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-utils-multiarch.deb"; + }; + } + rec { + name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64"; + sha256 = "b465d2c357b0376f355a99ac99830e78974747859ec4ca9084bdeff9891920d6"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "waffle-utils.deb"; + }; + } + rec { + name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64"; + sha256 = "de563095affd9fd5a4ec2941b72481bbd6176bdc210dad587372bab3cec406c1"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "waffle-utils-multiarch.deb"; + }; + } + rec { name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64"; sha256 = "5eb59aa8d2211153c780aab2304e8694d7eb0204f284193ff2a037dc9e1274db"; url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64.deb"; @@ -2130,18 +2328,18 @@ }; } rec { - name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386"; - sha256 = "f92d0bdda8d394104824fca2ac6d19cb9c95a863893ef604e45c43d0eeb16ac1"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386.deb"; + name = "libcurl3_7.22.0-3ubuntu4.17+steamrt1.2+srt1_i386"; + sha256 = "6199cf8f81ddc6484bf59ac4941e17808cfa09b3c9141895b18a301bd0729547"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.17+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3.deb"; }; } rec { - name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386"; - sha256 = "b210ce907bded1db660df24365861a10421d758cfd7fdb2fe64b058ecb92cdce"; - url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.1+srt5_i386.deb"; + name = "libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.2+srt1_i386"; + sha256 = "2ff0f70b5d522f429c4d9607cf3f1f35fb742693276e874c5f6f50d04553c628"; + url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.17+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libcurl3-gnutls.deb"; @@ -2184,6 +2382,15 @@ }; } rec { + name = "libelf1_0.152-1ubuntu3.1+srt3_i386"; + sha256 = "85aab224f4808b664cb827cd46dc4d559a1568e467db56e7047d26493f90cbf1"; + url = "mirror://steamrt/pool/main/e/elfutils/libelf1_0.152-1ubuntu3.1+srt3_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libelf1.deb"; + }; + } + rec { name = "libexif12_0.6.20-2ubuntu0.1+srt6_i386"; sha256 = "b9a25a54b70c2294e96c447bf05775c89eb056ff8eb0b4840506a955fcf78d35"; url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt6_i386.deb"; @@ -2355,9 +2562,9 @@ }; } rec { - name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_i386"; - sha256 = "a630adb25ecfa209aef8a1b14fac45293f044f652ee91249489dfe9bb0d5001d"; - url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.1+srt4_i386.deb"; + name = "libgnutls30_3.4.10-4ubuntu1.4+steamrt1.2+srt1_i386"; + sha256 = "b841c274bf8478136cdf8d2dfaa156d680dd0b2bdd20fb96f5645b4e9c09ef9a"; + url = "mirror://steamrt/pool/main/g/gnutls28/libgnutls30_3.4.10-4ubuntu1.4+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libgnutls30.deb"; @@ -2544,6 +2751,15 @@ }; } rec { + name = "libjson-glib-1.0-0_1.0.2-1~steamrt1.1+srt1_i386"; + sha256 = "e92b6a5be06128f88d885d2da927ce3a2bf274bf9f812ba102a0966fd17fd2ee"; + url = "mirror://steamrt/pool/main/j/json-glib/libjson-glib-1.0-0_1.0.2-1~steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libjson-glib-1.0-0.deb"; + }; + } + rec { name = "libjson0_0.9-1ubuntu1.1+srt4_i386"; sha256 = "ae3503b9871e27e98bfb37477c4b6e151dcf31fa7af757309d99e70ffe66e570"; url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt4_i386.deb"; @@ -2904,48 +3120,48 @@ }; } rec { - name = "libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_i386"; - sha256 = "b33446315351af70d2cfd602d5ee9e2390e2805b10f199dff383917469a3b344"; - url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.9.~reimport-0+steamrt1.1+srt2_i386.deb"; + name = "libsdl2-2.0-0_2.0.10-0+steamrt1.3+srt1_i386"; + sha256 = "88f38095f8574cf3792b42da2a13b89c4011904e7d5043a911af4cd3f749f62b"; + url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2-2.0-0_2.0.10-0+steamrt1.3+srt1_i386.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2.deb"; + name = "libsdl2-2.0-0.deb"; }; } rec { - name = "libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_i386"; - sha256 = "4783fc8d0012b5a1b917336af3fd7db097c0c43153bb088df0fdd9018b8c4072"; - url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.4.~reimport-0+steamrt1.1+srt2_i386.deb"; + name = "libsdl2-image-2.0-0_2.0.5-0+steamrt1.1+srt1_i386"; + sha256 = "27b47158e7af64376f0fc4382e54b9c3130a0990d4d8b4e421b0729bf6e543a9"; + url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image-2.0-0_2.0.5-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2-image.deb"; + name = "libsdl2-image-2.0-0.deb"; }; } rec { - name = "libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_i386"; - sha256 = "4c7f511b947e416898b169694ef112d137674c9add49162ba1185c36e83b3604"; - url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.4.~reimport-0+steamrt1.1+srt2_i386.deb"; + name = "libsdl2-mixer-2.0-0_2.0.4.~reimport-0+steamrt1.2+srt1_i386"; + sha256 = "36f917c204f56c0836fb1829ecfb36ca5458b121857387afbf9e5afab6c4a36a"; + url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer-2.0-0_2.0.4.~reimport-0+steamrt1.2+srt1_i386.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2-mixer.deb"; + name = "libsdl2-mixer-2.0-0.deb"; }; } rec { - name = "libsdl2-net_2.0.1+srt3_i386"; - sha256 = "f5eba8169255366fdfc809183c89cd6d7ce88da96c6a56cd3da5f8af68cb31d0"; - url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt3_i386.deb"; + name = "libsdl2-net-2.0-0_2.0.1.~reimport-0+steamrt1.1+srt1_i386"; + sha256 = "73316e94bfd4fc2382fd255c93469fdb8fa8a142c64b02522cbd84f972b17acf"; + url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net-2.0-0_2.0.1.~reimport-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2-net.deb"; + name = "libsdl2-net-2.0-0.deb"; }; } rec { - name = "libsdl2-ttf_2.0.14+srt3_i386"; - sha256 = "db1b89ffc678d7845adb3fa57b04865921521bd97603d28751248fb8f367d909"; - url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt3_i386.deb"; + name = "libsdl2-ttf-2.0-0_2.0.15-0+steamrt1.1+srt2_i386"; + sha256 = "1a0a7c17206ed42dbb0a4c36a6be819b2e405c7f2a5c402b44773422bb717fe0"; + url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf-2.0-0_2.0.15-0+steamrt1.1+srt2_i386.deb"; source = fetchurl { inherit url sha256; - name = "libsdl2-ttf.deb"; + name = "libsdl2-ttf-2.0-0.deb"; }; } rec { @@ -3030,6 +3246,33 @@ }; } rec { + name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386"; + sha256 = "dfd80854857cdbc764f799f34acd7f37a4c3e773c4ba5c7c81394071148a140f"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libsteam-runtime-tools-0-0.deb"; + }; + } + rec { + name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386"; + sha256 = "f2c5fc6abcc3a938e2a0b27e8682b56944a2a61416e8d0edb5878af2e16c98cb"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libsteam-runtime-tools-0-helpers.deb"; + }; + } + rec { + name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386"; + sha256 = "c06ea7ec21d2114925c09d5245e87482c81cc4e1928ed31827ab58cb094721ae"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libsteam-runtime-tools-0-relocatable-libs.deb"; + }; + } + rec { name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386"; sha256 = "938ac8ecc9f75f070b65b5d8bddea58d89ba8e1673d004d1b20ca0e1f677ba14"; url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt3_i386.deb"; @@ -3138,33 +3381,78 @@ }; } rec { - name = "libva-glx1_1.7.0-1+steamos1+srt2_i386"; - sha256 = "d9e84658add810853ef5c07729afa864ea07be31b513a2eb5fd569328a9555a9"; - url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.7.0-1+steamos1+srt2_i386.deb"; + name = "libva-drm1_1.7.0-1+steamrt1.1+srt1_i386"; + sha256 = "4f5fdcaf46a2e337fe1cad9c936809b5a38aff7af0b926bb9284930d23a9e09c"; + url = "mirror://steamrt/pool/main/libv/libva1/libva-drm1_1.7.0-1+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libva-drm1.deb"; + }; + } + rec { + name = "libva-drm2_2.1.0-3~steamrt1.2+srt1_i386"; + sha256 = "8f2ca36ca81167017bc3921753ef6d9e3097172d52007ad16484f1f5eaa26a18"; + url = "mirror://steamrt/pool/main/libv/libva/libva-drm2_2.1.0-3~steamrt1.2+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libva-drm2.deb"; + }; + } + rec { + name = "libva-glx1_1.7.0-1+steamrt1.1+srt1_i386"; + sha256 = "8360c4e6d65b444e4a985410101ddddcd7c1c955f25debdf20ccda9664695d44"; + url = "mirror://steamrt/pool/main/libv/libva1/libva-glx1_1.7.0-1+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-glx1.deb"; }; } rec { - name = "libva-x11-1_1.7.0-1+steamos1+srt2_i386"; - sha256 = "1d2e3d83d02dbb83156edba8f6b1564baf795e84bf9c4549db100722f42d4a04"; - url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.7.0-1+steamos1+srt2_i386.deb"; + name = "libva-glx2_2.1.0-3~steamrt1.2+srt1_i386"; + sha256 = "41e935fbb2fd67af1d3477959703ff1211bd34c0902d96e53e073e8b18d9def7"; + url = "mirror://steamrt/pool/main/libv/libva/libva-glx2_2.1.0-3~steamrt1.2+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libva-glx2.deb"; + }; + } + rec { + name = "libva-x11-1_1.7.0-1+steamrt1.1+srt1_i386"; + sha256 = "bf8a787f375533dbb847aea5ab9bb316476d0c8a3e772d449356920fa9b045ce"; + url = "mirror://steamrt/pool/main/libv/libva1/libva-x11-1_1.7.0-1+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva-x11-1.deb"; }; } rec { - name = "libva1_1.7.0-1+steamos1+srt2_i386"; - sha256 = "f32d8049e071903b6b20648b0a30c4300603b2eb0635c71243beb58d9746dce6"; - url = "mirror://steamrt/pool/main/libv/libva/libva1_1.7.0-1+steamos1+srt2_i386.deb"; + name = "libva-x11-2_2.1.0-3~steamrt1.2+srt1_i386"; + sha256 = "766bfc01ee038b21bd48eaacd1aaac1556817a999bdd83c605b4efdaf6c54a1d"; + url = "mirror://steamrt/pool/main/libv/libva/libva-x11-2_2.1.0-3~steamrt1.2+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libva-x11-2.deb"; + }; + } + rec { + name = "libva1_1.7.0-1+steamrt1.1+srt1_i386"; + sha256 = "561d0e3f3a670ee8f6d2e1d4cfa41983d688e0d6233f07e541392016e517aa4d"; + url = "mirror://steamrt/pool/main/libv/libva1/libva1_1.7.0-1+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libva1.deb"; }; } rec { + name = "libva2_2.1.0-3~steamrt1.2+srt1_i386"; + sha256 = "9ea2f165352428378bb6dc987256d37f2d2aace0be23a1ba70db69fab65e82dd"; + url = "mirror://steamrt/pool/main/libv/libva/libva2_2.1.0-3~steamrt1.2+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libva2.deb"; + }; + } + rec { name = "libvdpau1_0.4.1-3ubuntu1.2+srt3_i386"; sha256 = "8ec0513551e19a25934d113cf2f9d68cf2c4b3b65a6ba786f7aa780f81fe2cde"; url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt3_i386.deb"; @@ -3210,15 +3498,24 @@ }; } rec { - name = "libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_i386"; - sha256 = "cac788c3fd6cea1ff7235f9b14f82eb8121e209743f08d15529e54732e692e05"; - url = "mirror://steamrt/pool/main/v/vulkan/libvulkan1_1.1.73+dfsg-1+steamosc2+srt2_i386.deb"; + name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386"; + sha256 = "ac161149e1106247de706788a7ea29dbe5e3c17c2b8aedf97ec892b311abbb75"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { + name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386"; + sha256 = "875ebdcc60fd8be86b6e83a2155bea69aa3ef7442d60eef277bcdf814c663452"; + url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libwaffle-1-0.deb"; + }; + } + rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; sha256 = "6eb4a6d45a5a37f96c0b96dd08f9d7dbbf5d67c4dc9627472e5c7f6e8dcdecd2"; url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386.deb"; @@ -3669,24 +3966,123 @@ }; } rec { - name = "steamrt-legacy_1.20190624.0+srt1_i386"; - sha256 = "22bb83259ee421abdb7cb9877365460619011c859eaf4119615e55726defa56b"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20190624.0+srt1_i386.deb"; + name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386"; + sha256 = "52e587b75463b08e0e903e30cd4b836bd4e39ead8d556807e5628eff36fdc477"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "steam-runtime-tools-bin.deb"; + }; + } + rec { + name = "steamrt-legacy_1.20200128.0+srt1_i386"; + sha256 = "3adf8b89ac83f12eeb431785bd18a569b1174bc81aa24d5c562687b823704f28"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20190624.0+srt1_i386"; - sha256 = "f9a38284deb9c08fbe6f3b8d1617bec74bb803d639a0a77d77736f19a1de765a"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20190624.0+srt1_i386.deb"; + name = "steamrt-libs_1.20200128.0+srt1_i386"; + sha256 = "8ad6092d1b4d257883ca4f3fac8ee5b9a71413c8bdbc149a9bec843047867311"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; }; } rec { + name = "vainfo_2.1.0+ds1-1~steamrt1.1+srt1_i386"; + sha256 = "785128cd89e53ce63317eb958c59546b5526e66183b3819a3d351eb04c599e38"; + url = "mirror://steamrt/pool/main/libv/libva-utils/vainfo_2.1.0+ds1-1~steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vainfo.deb"; + }; + } + rec { + name = "vainfo-1_1.7.0-1+steamrt1.1+srt1_i386"; + sha256 = "8d1c25ccfa3f62ccd680673a0b2460ab4090c66bc539c7f1991e60cd50e1ce1b"; + url = "mirror://steamrt/pool/main/libv/libva1/vainfo-1_1.7.0-1+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vainfo-1.deb"; + }; + } + rec { + name = "vainfo-1-multiarch_1.7.0-1+steamrt1.1+srt1_i386"; + sha256 = "f50869e6dc73354ab1aa3472ca9092c07d7868f3949b0ca1e2cd2fc817967f42"; + url = "mirror://steamrt/pool/main/libv/libva1/vainfo-1-multiarch_1.7.0-1+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vainfo-1-multiarch.deb"; + }; + } + rec { + name = "vainfo-multiarch_2.1.0+ds1-1~steamrt1.1+srt1_i386"; + sha256 = "066f979526321c2d74223426fbc40fd7b210ce6c0396ffc58220313358ae155c"; + url = "mirror://steamrt/pool/main/libv/libva-utils/vainfo-multiarch_2.1.0+ds1-1~steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vainfo-multiarch.deb"; + }; + } + rec { + name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; + sha256 = "6a8576cc6fadc4d18c97b100dc24bad1906f6f56cab024997787355025695df4"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-tools.deb"; + }; + } + rec { + name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; + sha256 = "fae0430f540c71bd8f6ab3099f8aa132d2eda858b66facf3d8a586ab38cffde6"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-tools-multiarch.deb"; + }; + } + rec { + name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; + sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-utils.deb"; + }; + } + rec { + name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; + sha256 = "f81b81ef14f11662d2d5e5a7f688c2ef4f9ad9625ec5e59de91aab3f1ad45406"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "vulkan-utils-multiarch.deb"; + }; + } + rec { + name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_i386"; + sha256 = "37df214d4f0fd1c5e9afce405756fc1615f2d5cba468b34569b13f3e8a08a2a5"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "waffle-utils.deb"; + }; + } + rec { + name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386"; + sha256 = "5866f8bf43b6c19608670a8c565ce8f0dac9db9c943e65ac25e9cb4f951997a4"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "waffle-utils-multiarch.deb"; + }; + } + rec { name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386"; sha256 = "1c772d4f96424d204ab4913efcafbe43518257ca5032ca7b23d6c6ab76439117"; url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386.deb"; diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix index 1fa17c32d6c..ff7a0077f1e 100644 --- a/pkgs/games/steam/runtime.nix +++ b/pkgs/games/steam/runtime.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "The official runtime used by Steam"; - homepage = https://github.com/ValveSoftware/steam-runtime; + homepage = "https://github.com/ValveSoftware/steam-runtime"; license = licenses.unfreeRedistributable; # Includes NVIDIA CG toolkit maintainers = with maintainers; [ hrdinka abbradar ]; }; diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix index 0276122655f..830c97b2fb7 100644 --- a/pkgs/games/steam/steam.nix +++ b/pkgs/games/steam/steam.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A digital distribution platform"; - homepage = http://store.steampowered.com/; + homepage = "http://store.steampowered.com/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ jagajaga ]; }; diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix index a38122702f2..223dff332a7 100644 --- a/pkgs/games/steam/steamcmd.nix +++ b/pkgs/games/steam/steamcmd.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { version = "20180104"; # According to steamcmd_linux.tar.gz mtime src = fetchurl { - url = https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz; + url = "https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz"; sha256 = "0z0y0zqvhydmfc9y9vg5am0vz7m3gbj4l2dwlrfz936hpx301gyf"; }; diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix index 71524c244ee..f6cfb873709 100644 --- a/pkgs/games/stepmania/default.nix +++ b/pkgs/games/stepmania/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://www.stepmania.com/; + homepage = "https://www.stepmania.com/"; description = "Free dance and rhythm game for Windows, Mac, and Linux"; platforms = platforms.linux; license = licenses.mit; # expat version diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix index 1919383048e..5e8429f0336 100644 --- a/pkgs/games/stockfish/default.nix +++ b/pkgs/games/stockfish/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://stockfishchess.org/; + homepage = "https://stockfishchess.org/"; description = "Strong open source chess engine"; longDescription = '' Stockfish is one of the strongest chess engines in the world. It is also diff --git a/pkgs/games/stuntrally/default.nix b/pkgs/games/stuntrally/default.nix index 6b3da08b70c..98a3ca88317 100644 --- a/pkgs/games/stuntrally/default.nix +++ b/pkgs/games/stuntrally/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stunt Rally game with Track Editor, based on VDrift and OGRE"; - homepage = http://stuntrally.tuxfamily.org/; + homepage = "http://stuntrally.tuxfamily.org/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 96444897cc9..dcf1081e4d0 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { characters and items for you to try, similar in spirit to Mario Kart. ''; - homepage = https://supertuxkart.net/; + homepage = "https://supertuxkart.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ pyrolagus peterhoeg ]; platforms = with platforms; linux; diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index 3b33296892f..25f36e9ff3e 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Classic 2D jump'n run sidescroller game"; - homepage = http://supertux.github.io/; + homepage = "http://supertux.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; diff --git a/pkgs/games/t4kcommon/default.nix b/pkgs/games/t4kcommon/default.nix index f576403b70b..f2e226cb570 100644 --- a/pkgs/games/t4kcommon/default.nix +++ b/pkgs/games/t4kcommon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library of code shared between tuxmath and tuxtype."; - homepage = https://github.com/tux4kids/t4kcommon; + homepage = "https://github.com/tux4kids/t4kcommon"; license = licenses.gpl3Plus; maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 57e7217fcdb..765c50149ac 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "tcl2048-0.4.0"; src = fetchurl { - url = https://raw.githubusercontent.com/dbohdan/2048.tcl/v0.4.0/2048.tcl; + url = "https://raw.githubusercontent.com/dbohdan/2048.tcl/v0.4.0/2048.tcl"; sha256 = "53f5503efd7f029b2614b0f9b1e3aac6c0342735a3c9b811d74a5135fee3e89e"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/dbohdan/2048.tcl; + 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; diff --git a/pkgs/games/tdm/default.nix b/pkgs/games/tdm/default.nix index 294d4703bb0..32f91f59868 100644 --- a/pkgs/games/tdm/default.nix +++ b/pkgs/games/tdm/default.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation { sha256 = "17wdpip8zvm2njz0xrf7xcxl73hnsc6i83zj18kn8rnjkpy50dd6"; }; nativeBuildInputs = [ - p7zip scons gnum4 makeWrapper + p7zip scons.py2 gnum4 makeWrapper ]; buildInputs = [ glibc_multi mesa.dev xorg.libX11.dev openal diff --git a/pkgs/games/teetertorture/default.nix b/pkgs/games/teetertorture/default.nix index 7933ef2f069..a568fd79085 100644 --- a/pkgs/games/teetertorture/default.nix +++ b/pkgs/games/teetertorture/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "teeter-torture-20051018"; src = fetchurl { - url = ftp://ftp.tuxpaint.org/unix/x/teetertorture/source/teetertorture-2005-10-18.tar.gz; + url = "ftp://ftp.tuxpaint.org/unix/x/teetertorture/source/teetertorture-2005-10-18.tar.gz"; sha256 = "175gdbkx3m82icyzvwpyzs4v2fd69c695k5n8ca0lnjv81wnw2hr"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.newbreedsoftware.com/teetertorture/; + 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; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index ff0dfad51a6..13918d2f7a5 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,5 +1,5 @@ -{ fetchFromGitHub, stdenv, cmake, pkgconfig, python, alsaLib -, libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack +{ fetchFromGitHub, stdenv, cmake, pkgconfig, python3, alsaLib +, libX11, libGLU, SDL2, lua5_3, zlib, freetype, wavpack, icoutils }: stdenv.mkDerivation rec { @@ -21,12 +21,21 @@ stdenv.mkDerivation rec { '#define DATA_DIR "${placeholder "out"}/share/teeworlds/data"' ''; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig icoutils ]; buildInputs = [ - python alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack + python3 alsaLib libX11 libGLU SDL2 lua5_3 zlib freetype wavpack ]; + postInstall = '' + # Convert and install desktop icon + mkdir -p $out/share/pixmaps + icotool --extract --index 1 --output $out/share/pixmaps/teeworlds.png $src/other/icons/teeworlds.ico + + # Install menu item + install -D $src/other/teeworlds.desktop $out/share/applications/teeworlds.desktop + ''; + meta = { description = "Retro multiplayer shooter game"; diff --git a/pkgs/games/tennix/default.nix b/pkgs/games/tennix/default.nix index 283d8ad21d7..56ac0a2faf4 100644 --- a/pkgs/games/tennix/default.nix +++ b/pkgs/games/tennix/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://icculus.org/tennix/; + homepage = "http://icculus.org/tennix/"; description = "Classic Championship Tour 2011"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/games/terraria-server/default.nix b/pkgs/games/terraria-server/default.nix index 5432824ce6c..dab0b653ee9 100644 --- a/pkgs/games/terraria-server/default.nix +++ b/pkgs/games/terraria-server/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://terraria.org; + homepage = "http://terraria.org"; description = "Dedicated server for Terraria, a 2D action-adventure sandbox"; platforms = ["x86_64-linux"]; license = licenses.unfree; diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 9cc3bf7149f..d5f44daf156 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A physics-based game vaguely similar to Incredible Machine"; - homepage = http://the-butterfly-effect.org/; + homepage = "http://the-butterfly-effect.org/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix index b0901fcb9a0..72b4bf20383 100644 --- a/pkgs/games/the-powder-toy/default.nix +++ b/pkgs/games/the-powder-toy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free 2D physics sandbox game"; - homepage = http://powdertoy.co.uk/; + homepage = "http://powdertoy.co.uk/"; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 1482b58a7b0..b8c2c3f3cf4 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "tibia-10.90"; src = fetchurl { - url = http://static.tibia.com/download/tibia1090.tgz; + url = "http://static.tibia.com/download/tibia1090.tgz"; sha256 = "11mkh2dynmbpay51yfaxm5dmcys3rnpk579s9ypfkhblsrchbkhx"; }; @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = { description = "Top-down MMORPG set in a fantasy world"; - homepage = http://tibia.com; + homepage = "http://tibia.com"; license = stdenv.lib.licenses.unfree; platforms = ["i686-linux"]; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/games/tintin/default.nix b/pkgs/games/tintin/default.nix index fbf4b1beecf..7291f5b4bd2 100644 --- a/pkgs/games/tintin/default.nix +++ b/pkgs/games/tintin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free MUD client for macOS, Linux and Windows"; - homepage = http://tintin.sourceforge.net; + homepage = "http://tintin.sourceforge.net"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix index fb3ebf36db3..fb706d38e18 100644 --- a/pkgs/games/tinyfugue/default.nix +++ b/pkgs/games/tinyfugue/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ++ optional sslSupport openssl; meta = { - homepage = http://tinyfugue.sourceforge.net/; + homepage = "http://tinyfugue.sourceforge.net/"; description = "A terminal UI, screen-oriented MUD client"; longDescription = '' TinyFugue, aka "tf", is a flexible, screen-oriented MUD client, for use diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 67d7f82457f..136578924a0 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "Car racing game"; - homepage = http://torcs.sourceforge.net/; + homepage = "http://torcs.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index b778579c9d7..ec607758bd6 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU libGL ]; meta = { - homepage = https://trackballs.github.io/; + homepage = "https://trackballs.github.io/"; description = "3D Marble Madness clone"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index 7ea83f80fef..cab77b23ee9 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { after death. Other structures provide automated base defense (to some degree), healing functions and much more... ''; - homepage = http://www.tremulous.net; + homepage = "http://www.tremulous.net"; license = with licenses; [ gpl2 cc-by-sa-25 /* media */ diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index 34ae0762bea..c6f31922bb6 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Rally"; - homepage = http://trigger-rally.sourceforge.net/; + homepage = "http://trigger-rally.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 603fb3ef491..b9d7f1b8c28 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Drawing Software for Children"; - homepage = http://www.tuxpaint.org/; + homepage = "http://www.tuxpaint.org/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ woffs ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/tuxtype/default.nix b/pkgs/games/tuxtype/default.nix index 6b2fb8178ea..9d04440a167 100644 --- a/pkgs/games/tuxtype/default.nix +++ b/pkgs/games/tuxtype/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An Educational Typing Tutor Game Starring Tux, the Linux Penguin"; - homepage = https://github.com/tux4kids/tuxtype; + homepage = "https://github.com/tux4kids/tuxtype"; license = licenses.gpl3Plus; maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/games/typespeed/default.nix b/pkgs/games/typespeed/default.nix index 6f0afc359ab..9da67cbd1ea 100644 --- a/pkgs/games/typespeed/default.nix +++ b/pkgs/games/typespeed/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "typespeed-0.6.5"; buildInputs = [ ncurses ]; src = fetchurl { - url = http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz; + url = "http://typespeed.sourceforge.net/typespeed-0.6.5.tar.gz"; sha256 = "5c860385ceed8a60f13217cc0192c4c2b4705c3e80f9866f7d72ff306eb72961"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A curses based typing game"; - homepage = http://typespeed.sourceforge.net/; + homepage = "http://typespeed.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = [ maintainers.auntie ]; diff --git a/pkgs/games/ue4/cdn-deps.nix b/pkgs/games/ue4/cdn-deps.nix index 76c11c6baa7..4b7fa8765ca 100644 --- a/pkgs/games/ue4/cdn-deps.nix +++ b/pkgs/games/ue4/cdn-deps.nix @@ -2,7027 +2,7027 @@ { "0049fd8a61e04257b6dcb37217d4d603cd74cc6b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0049fd8a61e04257b6dcb37217d4d603cd74cc6b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0049fd8a61e04257b6dcb37217d4d603cd74cc6b"; sha256 = "1dcyxixgqsw4lcwg9066q39yghhppfp85yyi4r4drq5j5rg3dgb1"; }; "0055e020f7505cf021eb66b73e3a8fa3cc308b05" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/0055e020f7505cf021eb66b73e3a8fa3cc308b05; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/0055e020f7505cf021eb66b73e3a8fa3cc308b05"; sha256 = "1i2ff0hzrs2kdqv860wjnddyp80asanx5zzispsbzm95iljfby70"; }; "007491dae0c56c74ca78a46639d8e41243bde83f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/007491dae0c56c74ca78a46639d8e41243bde83f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/007491dae0c56c74ca78a46639d8e41243bde83f"; sha256 = "14q664k5dgyc4f30mc6f2537w9mxw9407nba3023xss9vfijldgv"; }; "00927d42baa3e7f8fb204e62ea43ff39384f8679" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/00927d42baa3e7f8fb204e62ea43ff39384f8679; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/00927d42baa3e7f8fb204e62ea43ff39384f8679"; sha256 = "1jpzh24r1xkn8vifqyqljfbb9jbmcl7syigaq2lkjjxfl9nzwqqv"; }; "0092dbc71c6b4bd985a697ac3d1f1597c0bc82f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0092dbc71c6b4bd985a697ac3d1f1597c0bc82f6; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0092dbc71c6b4bd985a697ac3d1f1597c0bc82f6"; sha256 = "17cdmr5p4vyq04m0njv4b82l6gnp0dpxs22y5466ksnksckh9xwz"; }; "009f9921fd444183569a1057648f0c3573688f98" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/009f9921fd444183569a1057648f0c3573688f98; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/009f9921fd444183569a1057648f0c3573688f98"; sha256 = "0pc107dgkg8v51gy4083myp01lby8xfvlkx5xplsq55lxifkxcqy"; }; "00ab55311f402e65385f797ea5e1c4ab4663553e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/00ab55311f402e65385f797ea5e1c4ab4663553e; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/00ab55311f402e65385f797ea5e1c4ab4663553e"; sha256 = "1d2hwgd2zk4alxb6fb4fzkxcpkl3gp95v39jd0g77frj5ajnf5yc"; }; "00add27414f59890b092ab4b03bbbc585cedb847" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/00add27414f59890b092ab4b03bbbc585cedb847; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/00add27414f59890b092ab4b03bbbc585cedb847"; sha256 = "0jmbay34rl6srpkylamsy409a2rpqb9jwhyxfph34bazsp3jv04k"; }; "00b98d4aec7a1f350c0fdd8186841aa96c0cce53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/00b98d4aec7a1f350c0fdd8186841aa96c0cce53; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/00b98d4aec7a1f350c0fdd8186841aa96c0cce53"; sha256 = "0lh9rdgg9nr2mxvgx0rdg0zk4q5gsza4yacxp933bm41vvdwr3kq"; }; "00c4eb5dc59035a15405197341b6b925473708db" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/00c4eb5dc59035a15405197341b6b925473708db; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/00c4eb5dc59035a15405197341b6b925473708db"; sha256 = "00xl95hd2qcnzylvqc77pv758frws8z8anf4kb5vhz3lcv8c1n9n"; }; "00f460c11eef99d9e125c11687a40d39f7b74873" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/00f460c11eef99d9e125c11687a40d39f7b74873; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/00f460c11eef99d9e125c11687a40d39f7b74873"; sha256 = "1zp0qrc4nrv2cy7mc0z7chm75pa6ffzzz7yr32lw9ijzv5rbcjml"; }; "0104416c142ca7b3174660267c22f049db573bdb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0104416c142ca7b3174660267c22f049db573bdb; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0104416c142ca7b3174660267c22f049db573bdb"; sha256 = "0lzg75w1cnbm9yll32la7gcq5wv7wr8ckx3kxv4adhkkaz53bail"; }; "01687bd36252e9a263022192524ca8835ae9552b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/01687bd36252e9a263022192524ca8835ae9552b; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/01687bd36252e9a263022192524ca8835ae9552b"; sha256 = "0cdql0x9nppg7lh4rlnc1k4cj4pv404881z02miqlr99a05rwzpv"; }; "01a1b60633d0e13df7952058973ca4979a5389e2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01a1b60633d0e13df7952058973ca4979a5389e2; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01a1b60633d0e13df7952058973ca4979a5389e2"; sha256 = "127llh0ybq7f6fnsmh1hrh4xh46ap0x3za9xxqfmj0qhfbz5nanr"; }; "01b5b6310231646e87a0bfefaebfee7f0c9e1929" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01b5b6310231646e87a0bfefaebfee7f0c9e1929; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01b5b6310231646e87a0bfefaebfee7f0c9e1929"; sha256 = "0agyb9fy1vpnc06073c8j1k3d9n475pznf5chaxpcqpppcqi8j55"; }; "01d26cddb178f064c3cd74a09430970bf6cc12b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/01d26cddb178f064c3cd74a09430970bf6cc12b7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/01d26cddb178f064c3cd74a09430970bf6cc12b7"; sha256 = "1lxb8g2hd2jdswinzgnr4dqknh1c6nm6xh3fwbkvniglglrr7w9z"; }; "01e6c01a96b3cbe860204f191d1b9153509a9dee" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/01e6c01a96b3cbe860204f191d1b9153509a9dee; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/01e6c01a96b3cbe860204f191d1b9153509a9dee"; sha256 = "1ll3kahg1bvrw1djm855fan0yhfv385qaqbvsx11h4f7nsk1y8l1"; }; "0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0255260ee4d81de161e877cdcc3af4d7fcf8d0e3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0255260ee4d81de161e877cdcc3af4d7fcf8d0e3"; sha256 = "1b35v17pkpxjak9nslgmqik0779yqpfmrqhxih85fw38cx883y9k"; }; "0287d808513bc8ab41d3a122437451b3505e5a06" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0287d808513bc8ab41d3a122437451b3505e5a06; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0287d808513bc8ab41d3a122437451b3505e5a06"; sha256 = "0kjqvqs537kjji645wj9c7g0vm49saz7844gmsvaxbxa7j6qpv8r"; }; "0294cec564dabb2b74767382fed8bf1d85c3dd6a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0294cec564dabb2b74767382fed8bf1d85c3dd6a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0294cec564dabb2b74767382fed8bf1d85c3dd6a"; sha256 = "1bc87j7aqh55c08r95iqhjy7yqyvjfrhnl5p9nvd9rmsywlcdpy6"; }; "02b79c9e934ba5d5df21ca904400f6921b0e919c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/02b79c9e934ba5d5df21ca904400f6921b0e919c; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/02b79c9e934ba5d5df21ca904400f6921b0e919c"; sha256 = "0ky6wm47c5nly14jj171nvr1hyx9qn027jpxzhffmdj1zd0ab1n2"; }; "02db54285fbdc7bcbc5072716c06102dadbe73a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/02db54285fbdc7bcbc5072716c06102dadbe73a3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/02db54285fbdc7bcbc5072716c06102dadbe73a3"; sha256 = "08j35dhpj1wpsjck57w6sncy9vciqmhpnzsmrb8a698alb4nq4la"; }; "02e23f8b72f230a371e141cf422d6339edc7f136" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/02e23f8b72f230a371e141cf422d6339edc7f136; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/02e23f8b72f230a371e141cf422d6339edc7f136"; sha256 = "0lgfl91hyy4isy03jp1lprlr6p6vq95vs408rr620xrrx8v9g1xj"; }; "02e31aefb786970a757120d82ef7e57d99598e2a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/02e31aefb786970a757120d82ef7e57d99598e2a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/02e31aefb786970a757120d82ef7e57d99598e2a"; sha256 = "0kzp6hvpclqgm6ik46ifsb7q8cnyc1jpmn9hablz3bbcgz1ja1v6"; }; "02e3996085d4a6eadcc0403adb002e453626ad38" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/02e3996085d4a6eadcc0403adb002e453626ad38; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/02e3996085d4a6eadcc0403adb002e453626ad38"; sha256 = "1av0m7l2yb9k74482i60gbshpbiay25j6272p78vzzky55gfvvkq"; }; "02f911003167be7b08c3fbf9bdababa124958f48" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2489400-f6cf8f7e3aa44b46b137c223b0724bd6/02f911003167be7b08c3fbf9bdababa124958f48; + url = "http://cdn.unrealengine.com/dependencies/2489400-f6cf8f7e3aa44b46b137c223b0724bd6/02f911003167be7b08c3fbf9bdababa124958f48"; sha256 = "1a63d9d3ca0fhzniqwksxfs1q9fzxa8wz8mmcavnhmh2hcdf8l7s"; }; "037becd787cf315691a800ac53fc1ace30efc22f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/037becd787cf315691a800ac53fc1ace30efc22f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/037becd787cf315691a800ac53fc1ace30efc22f"; sha256 = "19jwdg0gi8axng2jc52i39bahzyhsksmza8ich6xbga7vzmcslic"; }; "038a65feb0c32e0a8997e4798012f90e380a5fa4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/038a65feb0c32e0a8997e4798012f90e380a5fa4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/038a65feb0c32e0a8997e4798012f90e380a5fa4"; sha256 = "11c1sk31f1wv2by7fvmwjlw0bf2khjh1gn7sx5iib6bx10mfk6zg"; }; "03bb65f1dc5e3bf35f5d6d5d6068a10aed0cf4a8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/03bb65f1dc5e3bf35f5d6d5d6068a10aed0cf4a8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/03bb65f1dc5e3bf35f5d6d5d6068a10aed0cf4a8"; sha256 = "1akwa8n1h491r45w8z4396bpg53szq42ac081ra087a92x699h59"; }; "03eac14bed108c28a0a4450fa4f534d145c12179" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/03eac14bed108c28a0a4450fa4f534d145c12179; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/03eac14bed108c28a0a4450fa4f534d145c12179"; sha256 = "1y2gwhynvyr499kj3l4w5wj55q938n6swb8wbzily46r24g8d6g6"; }; "0419d8143ae34750eb7de7c51c4d3cd231bbce51" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0419d8143ae34750eb7de7c51c4d3cd231bbce51; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0419d8143ae34750eb7de7c51c4d3cd231bbce51"; sha256 = "1nr22bs71msfzp0ndi5hm7y4blv51039dpcv05a0xv4s939y16bl"; }; "041d9b9407ae8d58c7c3a7110af093916fee573e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/041d9b9407ae8d58c7c3a7110af093916fee573e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/041d9b9407ae8d58c7c3a7110af093916fee573e"; sha256 = "14syxk0bgc8khzabliibvm82asc692pyxa8m78f3jii47gy6vwcn"; }; "042de486169ab637609e1b035138f64893e04ad5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/042de486169ab637609e1b035138f64893e04ad5; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/042de486169ab637609e1b035138f64893e04ad5"; sha256 = "0j5p0bid72xs8r63nbkyx77w89fy6d1kbx6axph5w6nnkr2flvy6"; }; "049aaeab9a2e4405e946d0097d1a3e824c128df6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/049aaeab9a2e4405e946d0097d1a3e824c128df6; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/049aaeab9a2e4405e946d0097d1a3e824c128df6"; sha256 = "0d56izrz5cbgib0mxzd5zj6yzvfln4rglpvxi1h05l5xrd9rcc9s"; }; "04b9a9091bba671b960e607283c6434625072697" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/04b9a9091bba671b960e607283c6434625072697; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/04b9a9091bba671b960e607283c6434625072697"; sha256 = "1sbhvy7dyir4gk6ignmbssmmhjkqm34rpzri9jv50k59lhdzrmz4"; }; "04e55b081d4e6680ca0da096eab39443e53aeb2a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/04e55b081d4e6680ca0da096eab39443e53aeb2a; + url = "http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/04e55b081d4e6680ca0da096eab39443e53aeb2a"; sha256 = "1f4mypy8nv0m4xzljlj9d5h13670r78lmp1nrzkyj6pkjaiz9l1h"; }; "04ec121ce824aec5caca1ddb70eaa21e0191a5b4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/04ec121ce824aec5caca1ddb70eaa21e0191a5b4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/04ec121ce824aec5caca1ddb70eaa21e0191a5b4"; sha256 = "0a32ss082pizm8qybmpsl91mc60290wj192rlgbp7q7rvn85j5yi"; }; "04f2ae9278db23034ee3cb0bbbe67db49b5881fc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/04f2ae9278db23034ee3cb0bbbe67db49b5881fc; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/04f2ae9278db23034ee3cb0bbbe67db49b5881fc"; sha256 = "1d0l0kjscdgwm5sb454hd7n5vn0x61v78b7zklhjrfzmfsqxxijz"; }; "052ad62516b7d63eaf4c6410cd2dca0264734665" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/052ad62516b7d63eaf4c6410cd2dca0264734665; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/052ad62516b7d63eaf4c6410cd2dca0264734665"; sha256 = "1a70f5mk7z053i0xl949gngkysdg3kc810mm88mirzn501xc6rq3"; }; "05be3410a78afea71327d64933707b9f7550d2f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/05be3410a78afea71327d64933707b9f7550d2f6; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/05be3410a78afea71327d64933707b9f7550d2f6"; sha256 = "1vb8vsjx7h1k9vdikm02lzwjpyfm409kh8q8bv94d0plh9cpg03l"; }; "061b4fb485e75b96f3266aff9a762a28b2d77616" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/061b4fb485e75b96f3266aff9a762a28b2d77616; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/061b4fb485e75b96f3266aff9a762a28b2d77616"; sha256 = "0f4nbrgdpb6dy6z0brk7fidx97svxljqcwng4skqg0rww9275hh2"; }; "0625d1c6055de9cf9025b2e61299912a56f88ccb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/0625d1c6055de9cf9025b2e61299912a56f88ccb; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/0625d1c6055de9cf9025b2e61299912a56f88ccb"; sha256 = "150c0n1n1fa6f89pxv3rp8yxfcvkca3ygp7fwia0s8zcakn02ail"; }; "0668d99201136f1b598c5795fa3e58050020e8b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0668d99201136f1b598c5795fa3e58050020e8b1; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0668d99201136f1b598c5795fa3e58050020e8b1"; sha256 = "0cmd3ix5b39bakyrra0p9847lq14kb7jkvcl3hw30v8kww4m056w"; }; "067baa5f7a564bf867b5b337369950ad00e13e99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/067baa5f7a564bf867b5b337369950ad00e13e99; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/067baa5f7a564bf867b5b337369950ad00e13e99"; sha256 = "1jmdc1hpl7hgn22ws8357lg0v98a51d3qa1fqhq3bbvhcssgls62"; }; "06ebb79f97706bad4850ce9077a9e7e90185e324" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/06ebb79f97706bad4850ce9077a9e7e90185e324; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/06ebb79f97706bad4850ce9077a9e7e90185e324"; sha256 = "18ykxqm31gd1ij30a9vf8saygjk162k2jqmpybx00vqawqwbbcx5"; }; "06f561a38764b8e9c4087a97ed512c995363927c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/06f561a38764b8e9c4087a97ed512c995363927c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/06f561a38764b8e9c4087a97ed512c995363927c"; sha256 = "1wassg3y5yd5i5jqsd528ddb8j9f65r4k5g981z6l70spk5l0v34"; }; "0702299294e21ac823c34d43de2a89140288143d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0702299294e21ac823c34d43de2a89140288143d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0702299294e21ac823c34d43de2a89140288143d"; sha256 = "08wjf4zk7pba5ac5s2d26zlrq7ld12bd7l35xn2pz9lsd1j4qwry"; }; "070b80d72403fb102b91c2c7c1eababab6aec2f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/070b80d72403fb102b91c2c7c1eababab6aec2f7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/070b80d72403fb102b91c2c7c1eababab6aec2f7"; sha256 = "0jv0j6qp1k1zwww3qvrckisa5cdj39xq9aw3ljsvdfsp10x4i4a3"; }; "07a88f4f32dff82062e33545b17b0011c4f3242b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07a88f4f32dff82062e33545b17b0011c4f3242b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07a88f4f32dff82062e33545b17b0011c4f3242b"; sha256 = "139xl7bzcab78s1ma42vl2yqxflxrpgl8qglnwbfdlq1nxbj8yiq"; }; "07bac5d4a23c9a7bc1695e030017c8694d72a735" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07bac5d4a23c9a7bc1695e030017c8694d72a735; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07bac5d4a23c9a7bc1695e030017c8694d72a735"; sha256 = "0f6pjix0slzd06yqgd7vfsdssc3qkqi3av6kvfmjcn22xryq2qn6"; }; "0818124e55b7ae14e580ada76b6fca5656c05836" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0818124e55b7ae14e580ada76b6fca5656c05836; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0818124e55b7ae14e580ada76b6fca5656c05836"; sha256 = "0a3frk5viy0pv4ac7jv50j74d985hgq2dnjq6vgkrdcrir7zbz0m"; }; "084e5de210ff35e876901668dd00537a3a019ac5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/084e5de210ff35e876901668dd00537a3a019ac5; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/084e5de210ff35e876901668dd00537a3a019ac5"; sha256 = "08v9q7796r1nab02ghyvbdsip8bmw07cab6w079vvrqwkrg2ajcm"; }; "0898f76e0b61476b01184a79f59737933332711f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0898f76e0b61476b01184a79f59737933332711f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0898f76e0b61476b01184a79f59737933332711f"; sha256 = "1qrz8ld9a5lv5pxs34icsic6c8fy1ydjx79zf35hvzdaqkds22jc"; }; "08aafc6b5bf5f6834032ea41a414bf57378e9d6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/08aafc6b5bf5f6834032ea41a414bf57378e9d6e; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/08aafc6b5bf5f6834032ea41a414bf57378e9d6e"; sha256 = "10v3b2bsx240fa9xvarh5r4klz2gnqg9ljf2h34j8pqs1fq6dvc2"; }; "09007b1cd8b9f90a5ab85549323903759f18b852" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09007b1cd8b9f90a5ab85549323903759f18b852; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09007b1cd8b9f90a5ab85549323903759f18b852"; sha256 = "0vx3k63svxh9iyzy69vwkm6i9kays9jdkc8fzyd71k9wspq4ynvr"; }; "09510670263d739c9271c8d43047c1e427873509" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2702576-55d4c00170ec40c8a92540c9aee72a96/09510670263d739c9271c8d43047c1e427873509; + url = "http://cdn.unrealengine.com/dependencies/2702576-55d4c00170ec40c8a92540c9aee72a96/09510670263d739c9271c8d43047c1e427873509"; sha256 = "1wzb6gsxrvc3l1yhlaj533k1ha8c6s5bpnivs0jcqflnc3lfcza7"; }; "095aae7dd171f8fa10295657651b0889b387ad68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/095aae7dd171f8fa10295657651b0889b387ad68; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/095aae7dd171f8fa10295657651b0889b387ad68"; sha256 = "0fig4i1afa9y27hhq3dkc5j36hwi5m1h2yviwv2kv60g9k01rsil"; }; "09601c1491f5d27c2533b4e7c9fb26a2e5eaa4d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/09601c1491f5d27c2533b4e7c9fb26a2e5eaa4d3; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/09601c1491f5d27c2533b4e7c9fb26a2e5eaa4d3"; sha256 = "1b99ms4v6shf8ld7faxlckgmz8c8ii5avkhk88809ry6v4mhm2qx"; }; "09732d6bf762ba4d866616248b46adff0e12d76b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/09732d6bf762ba4d866616248b46adff0e12d76b; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/09732d6bf762ba4d866616248b46adff0e12d76b"; sha256 = "0g096y34r6a3f270n7gkh96ybrjl4afgscpzwbk860dik4xkzvnj"; }; "09b220dceaa8205e3a32a877c58c678dfdb8555f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09b220dceaa8205e3a32a877c58c678dfdb8555f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09b220dceaa8205e3a32a877c58c678dfdb8555f"; sha256 = "1a108nfspg6v2mfgj7g310cxvgq1b3b9i8l0sll8p7dcwdqk5077"; }; "0a17d50561c9bf1d85e82416f97726243726fe8e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0a17d50561c9bf1d85e82416f97726243726fe8e; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0a17d50561c9bf1d85e82416f97726243726fe8e"; sha256 = "1ibf6hr9zkrvj7x4mlmmvi552is75p60rgbcrr2bxjnk5vd5kixn"; }; "0a85e36f224c350b058936fdb88cb656864411c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0a85e36f224c350b058936fdb88cb656864411c4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0a85e36f224c350b058936fdb88cb656864411c4"; sha256 = "1wdrvm3s4asra41zgr309y5rwlw0nng1m4cd8p4gcch8q8vybl1z"; }; "0adcf8b7399354848f3b1659ae1bdfebe7c5fb54" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0adcf8b7399354848f3b1659ae1bdfebe7c5fb54; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0adcf8b7399354848f3b1659ae1bdfebe7c5fb54"; sha256 = "0f3zipklkp21qmsi5y9bm5539pgjn9h85w3r7qxhsa7arq4bfv9y"; }; "0ae58afa6b821d9172b327831297925b165ba540" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0ae58afa6b821d9172b327831297925b165ba540; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0ae58afa6b821d9172b327831297925b165ba540"; sha256 = "0xi644mlx97vyfzcp4zg2xy4d7xl6bpsqbyrja8vc02ddcqrz8ws"; }; "0b0c49fd66d2a1e20b9c3dfbaf57920646259399" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b0c49fd66d2a1e20b9c3dfbaf57920646259399; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b0c49fd66d2a1e20b9c3dfbaf57920646259399"; sha256 = "1862n366gcqqkf5apc19qg6w6vmyap3hz5f91lskhd3i28zmzcr6"; }; "0b19af7719665b5651dfb183e0f462030575539c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b19af7719665b5651dfb183e0f462030575539c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b19af7719665b5651dfb183e0f462030575539c"; sha256 = "02015jsy2mzf4hkir3f11xxg2z21vrz5qnwyias322jr3g3k4x8n"; }; "0b2364f6696f39626a964e4370380b3fc8768b43" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0b2364f6696f39626a964e4370380b3fc8768b43; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0b2364f6696f39626a964e4370380b3fc8768b43"; sha256 = "0nfz5g0wp7l4kbdjg3qvl0p2nzcravivw0bhbwb7zppmmrsz08b9"; }; "0b2cd11ad11c170163c7958e24f339bf66609001" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/0b2cd11ad11c170163c7958e24f339bf66609001; + url = "http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/0b2cd11ad11c170163c7958e24f339bf66609001"; sha256 = "0qhsp71xk2pj9dq3al2pghnh5w1zsvfwgg4ykm2czn8dqpr6v2fm"; }; "0b41a5fe69764ca460a102d4569d5cf0a96262dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b41a5fe69764ca460a102d4569d5cf0a96262dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b41a5fe69764ca460a102d4569d5cf0a96262dc"; sha256 = "1w56h4m41178dyi9swrqjbl6jk6hz36i1ax27gmbvlmn71bd25sr"; }; "0b650b20c8c8aba9b4ffbfff4555352296b8026d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b650b20c8c8aba9b4ffbfff4555352296b8026d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b650b20c8c8aba9b4ffbfff4555352296b8026d"; sha256 = "0z46pi0np99l1dd63b8c7wlpzn9aqgfs8m90i8shkb8rr83yvqrd"; }; "0b65847315b6c2c97cf1cb6e6d159e22233c8251" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b65847315b6c2c97cf1cb6e6d159e22233c8251; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b65847315b6c2c97cf1cb6e6d159e22233c8251"; sha256 = "14pcxkamnwscpdq1gw0jdmpxsvilq8wdgpzlgsifdmwhrbzq9dhw"; }; "0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533"; sha256 = "03j28mjv9qhw3inkj2sq9ri7vbajkfg4yq4fydqgas8zxiy7p5sa"; }; "0bbfc90e364f03102506acd5ad039a28e02cadf7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2618399-180c811b4d074c95af323aa82cdccb34/0bbfc90e364f03102506acd5ad039a28e02cadf7; + url = "http://cdn.unrealengine.com/dependencies/2618399-180c811b4d074c95af323aa82cdccb34/0bbfc90e364f03102506acd5ad039a28e02cadf7"; sha256 = "1p276i1gcj0hm4y3n46mz7inc0dh5naz2kj85aa07dy734qmnayf"; }; "0bcc47e413bef8dae40e79c9757941b0db15f97a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0bcc47e413bef8dae40e79c9757941b0db15f97a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0bcc47e413bef8dae40e79c9757941b0db15f97a"; sha256 = "0h6qjxy1p9x7yfyawygb44bhlmdli96riclq9jbw9dypgpywmff3"; }; "0be87d25f74713be10bd98e1e966d795cfe4e5dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0be87d25f74713be10bd98e1e966d795cfe4e5dc; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0be87d25f74713be10bd98e1e966d795cfe4e5dc"; sha256 = "0pd540vl2hs57fsbjrxj0vzsilr8mqx5ad47kmcpsk3nckrq6p1w"; }; "0c8fc2ef1a59d232fd4f22a022e20d492f6e2a84" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/0c8fc2ef1a59d232fd4f22a022e20d492f6e2a84; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/0c8fc2ef1a59d232fd4f22a022e20d492f6e2a84"; sha256 = "0knhyb5y0fmbjds7qjhgxq5cvicv925qbp5pkdsa4bqab8vgzjaq"; }; "0c95d970796b73f6699b10dc55a5f23caeb0e7b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0c95d970796b73f6699b10dc55a5f23caeb0e7b6; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0c95d970796b73f6699b10dc55a5f23caeb0e7b6"; sha256 = "157klpl089j437v12ngyfy20jipwdb252khg84dhz54dnmsl30l7"; }; "0cad2c40463fe8795e6ba38765dd8c775689eca4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0cad2c40463fe8795e6ba38765dd8c775689eca4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0cad2c40463fe8795e6ba38765dd8c775689eca4"; sha256 = "1h85ix8ilw61jqiihm4xgkhknsqwfmkhw6zmyc1b3h5iczwa56m4"; }; "0cb75afcdc3e2acc810f4eaab1c4d0e47b71e66e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0cb75afcdc3e2acc810f4eaab1c4d0e47b71e66e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0cb75afcdc3e2acc810f4eaab1c4d0e47b71e66e"; sha256 = "1w1h8gj1sln0h4vsbqljnbdwmvfii0iykf9p8pfi616pi1rk0zrz"; }; "0cec09dea442a96d2db56d5f25830c204faf9c73" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0cec09dea442a96d2db56d5f25830c204faf9c73; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0cec09dea442a96d2db56d5f25830c204faf9c73"; sha256 = "1lik501r5m0jgnrlkimbwanwdd9j5j81xlwcksiyfaf4mx4jfd5q"; }; "0d1962bd98cbfd172126e306fff8cf75b8796bc7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d1962bd98cbfd172126e306fff8cf75b8796bc7; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d1962bd98cbfd172126e306fff8cf75b8796bc7"; sha256 = "1vjgl25j9v7qnv9829jprsgdlgagsh9rzv22fpq9yyiclxavhza2"; }; "0d5caa5b5d94abc659bf759feee88b37f4cf4618" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d5caa5b5d94abc659bf759feee88b37f4cf4618; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d5caa5b5d94abc659bf759feee88b37f4cf4618"; sha256 = "0660nyachjcvccrdkrarqwwalp5whg7ja998la6vqbpfq3m4x9dx"; }; "0dcd2138b0d77e84dd01b019736eefc97445f806" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0dcd2138b0d77e84dd01b019736eefc97445f806; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0dcd2138b0d77e84dd01b019736eefc97445f806"; sha256 = "0a5693qjs5ap9m3idqiadaym0k6j4saan6jd7mi1db9y66r4czsk"; }; "0e1315e453e0b243c9c0afc4965bc9042f5eadfa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0e1315e453e0b243c9c0afc4965bc9042f5eadfa; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0e1315e453e0b243c9c0afc4965bc9042f5eadfa"; sha256 = "1gjk3jjcnns9pcab7q7b8i46k8lsn5sjmp9vh0cswkl23v3qqwwg"; }; "0e1a08f56c646fa8ce394a0e41b8cab5a658268d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/0e1a08f56c646fa8ce394a0e41b8cab5a658268d; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/0e1a08f56c646fa8ce394a0e41b8cab5a658268d"; sha256 = "1905j12lxpla20xiv6f2cjmnp100mzzp8076n8j295fdn7vbrb9v"; }; "0e26168a7254c7ba26bf4c06b28033e8387c689c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/0e26168a7254c7ba26bf4c06b28033e8387c689c; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/0e26168a7254c7ba26bf4c06b28033e8387c689c"; sha256 = "026w09ixxqzfgp0kbf60h7qwixd2gnx4v13kb9l3nn0g9p73slzk"; }; "0e4c8e5cf7fcfddf545be976ecd6d676331d54c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/0e4c8e5cf7fcfddf545be976ecd6d676331d54c9; + url = "http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/0e4c8e5cf7fcfddf545be976ecd6d676331d54c9"; sha256 = "0r42n43jnwi8w8z0z08p6pzha973qxy3km94w3n0ywn7f1b20wbp"; }; "0e6c43d516af17c6766c4b204af1a1358451d364" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2748421-cc8960341ac147a18a63389f5fd32945/0e6c43d516af17c6766c4b204af1a1358451d364; + url = "http://cdn.unrealengine.com/dependencies/2748421-cc8960341ac147a18a63389f5fd32945/0e6c43d516af17c6766c4b204af1a1358451d364"; sha256 = "1n4n643zzh11k77vwvcsqsz10s8pks5729qbh9wq9ccrs2b5k2kd"; }; "0e934ae8f346ea8f7834da572917c93731ee3e71" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/0e934ae8f346ea8f7834da572917c93731ee3e71; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/0e934ae8f346ea8f7834da572917c93731ee3e71"; sha256 = "0n6czxwf531phc7l9d1daymylsvlhspfa6byx73nj2piifrnzcm3"; }; "0ed7e089f52f2e816998664ec165b776a056ee6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0ed7e089f52f2e816998664ec165b776a056ee6e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0ed7e089f52f2e816998664ec165b776a056ee6e"; sha256 = "0nl7j84np4v6109dnvslal6p6w8ycx8ai9nnagkg8bcsq9a4ramz"; }; "0ee5f371d8dffa94c5df7c2c1337d8a7029c022c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0ee5f371d8dffa94c5df7c2c1337d8a7029c022c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0ee5f371d8dffa94c5df7c2c1337d8a7029c022c"; sha256 = "0jh51nbdqcd7bz5sqj112q4y3iqr47lnp725f32s5ad9ywa2jrpv"; }; "0ef3349a6ee43e03e0390d117749207582bd62fb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/0ef3349a6ee43e03e0390d117749207582bd62fb; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/0ef3349a6ee43e03e0390d117749207582bd62fb"; sha256 = "14qi1p9fxb0mgvhnriqf1qx716ap18vfsjp7kdcmn295fqzkxl8x"; }; "0f5530749f1eb9cd579c611a2c19eb675d225841" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0f5530749f1eb9cd579c611a2c19eb675d225841; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0f5530749f1eb9cd579c611a2c19eb675d225841"; sha256 = "1i3ngjajjhv2yamk2hcza399iylja42ygjbp7kwqx6qxvc2vh02p"; }; "0f74ff9d91cbb2b2061d50909d5d7f093b845a72" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0f74ff9d91cbb2b2061d50909d5d7f093b845a72; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0f74ff9d91cbb2b2061d50909d5d7f093b845a72"; sha256 = "06a5r840iksqmzch0l6hkngd2rv2s7dbwlp7dw1gwfd1ql9vm3c1"; }; "1015366202732d5b428dc71ad9ec5fa99ca1b874" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1015366202732d5b428dc71ad9ec5fa99ca1b874; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1015366202732d5b428dc71ad9ec5fa99ca1b874"; sha256 = "1s4q8bzbxypj650pwrbb6mqr9yqskavdrcj8kw03hj5fz29d9szy"; }; "1016254965add7631ca2982903c6d0169b0d45b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1016254965add7631ca2982903c6d0169b0d45b2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1016254965add7631ca2982903c6d0169b0d45b2"; sha256 = "17rp6pixbs3qi9xyzh0w7kq1hcywckayd1q2db77m48rg36gvg6s"; }; "1028eaded56f0e46a92e7188a0e4dae970bc77c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1028eaded56f0e46a92e7188a0e4dae970bc77c8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1028eaded56f0e46a92e7188a0e4dae970bc77c8"; sha256 = "0867qswbqmmlam1l1a2d2ynzb1p5fwwp92mfb19n1ippgy6d128g"; }; "104b55382829a7351cea26478445bfa8e601d755" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/104b55382829a7351cea26478445bfa8e601d755; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/104b55382829a7351cea26478445bfa8e601d755"; sha256 = "0sr5c506zphmxclrzbq9b23jc8bcvwx58hpqzqg07d94qw9p4rsb"; }; "104eb620cbaf2629b13d4f5dc9edc9a888ff2e33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/104eb620cbaf2629b13d4f5dc9edc9a888ff2e33; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/104eb620cbaf2629b13d4f5dc9edc9a888ff2e33"; sha256 = "01z335z3ddkvsx4z96m9w96hbksg29miqyn6wmvgpbsvgbp1wmgp"; }; "106f60f7c4e09a6444df98f226b3b925941480d8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/106f60f7c4e09a6444df98f226b3b925941480d8; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/106f60f7c4e09a6444df98f226b3b925941480d8"; sha256 = "18xzn1iphddc7hyniyhrlsv36cijij7724psb9nq2dz5dpclg3db"; }; "10723922ccc14914c163a9546c40f01779891869" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10723922ccc14914c163a9546c40f01779891869; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10723922ccc14914c163a9546c40f01779891869"; sha256 = "0pi4s4r7pk6adb8v5f1g9bs3jb028yqsg4d82nd7p99qw4q4q20x"; }; "1077e9c2c6e2f36520c08a148ce3709a6e10a8ab" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1077e9c2c6e2f36520c08a148ce3709a6e10a8ab; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1077e9c2c6e2f36520c08a148ce3709a6e10a8ab"; sha256 = "1ms7r8pkbrsrb7brbcralbmxl20lhb8a77zhiad3b9xbwyil4p67"; }; "109ac2799187c1e94076a2db14922c275e94adbb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/109ac2799187c1e94076a2db14922c275e94adbb; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/109ac2799187c1e94076a2db14922c275e94adbb"; sha256 = "1viw9fa3gd8sc4qdfxh5x5b9pz8712xa15sfgjr16h6mb9h5y4yy"; }; "10bc8f77ff0fe6245b5ecf2b32ffcee97d4d42d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/10bc8f77ff0fe6245b5ecf2b32ffcee97d4d42d4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/10bc8f77ff0fe6245b5ecf2b32ffcee97d4d42d4"; sha256 = "0f7i36149z2g7i4j8z7d5d3xnw476d3raiij87y0siixw0fl0js1"; }; "10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b"; sha256 = "1088hkj96l5kxx3mww39nmkv2mzvc97syx2a9w6yys89n5y166qg"; }; "1142cb9f18f922166ae87d131c1fd09dce63f6d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1142cb9f18f922166ae87d131c1fd09dce63f6d9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1142cb9f18f922166ae87d131c1fd09dce63f6d9"; sha256 = "1frmz1rbhzfinz06lg14pcz7mbr1sddl6v9n53p2dq64lkrpcsw6"; }; "11485b16ed1b0a1f37aef0aec2e8a7afbf490e75" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11485b16ed1b0a1f37aef0aec2e8a7afbf490e75; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11485b16ed1b0a1f37aef0aec2e8a7afbf490e75"; sha256 = "1i1619cvimdj4a6786prdr1c76ga37blckyx6zzqkarq4idl3k9y"; }; "11beb714095ff4a699b6f0a3543c8c2b82cf1a0d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/11beb714095ff4a699b6f0a3543c8c2b82cf1a0d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/11beb714095ff4a699b6f0a3543c8c2b82cf1a0d"; sha256 = "1iyb0g8rbhhjs87z8iadjddk254z3jn6g9c80v93i6vgw8k9bcbf"; }; "11fad551f44760406d524cb0e1892580b9be77bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11fad551f44760406d524cb0e1892580b9be77bc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11fad551f44760406d524cb0e1892580b9be77bc"; sha256 = "00bj5pkychks7kaipf1dqkw7bhf0597g4qlh6rbm8qn4zd5f2747"; }; "12468bf1be869d88d9a8104ffde7c4887839843d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/12468bf1be869d88d9a8104ffde7c4887839843d; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/12468bf1be869d88d9a8104ffde7c4887839843d"; sha256 = "0h5a4gfvj1hjxv4lj0m4bzavfh8akwbz6wg027q0mjnr143k0pr9"; }; "12d1a73c1c063a416ba2a70fa0cb25ebee04cedf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/12d1a73c1c063a416ba2a70fa0cb25ebee04cedf; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/12d1a73c1c063a416ba2a70fa0cb25ebee04cedf"; sha256 = "0wkrw8jwjwhk3zvrs883xhrwcrppg8j3plnvxb109d67k7c1pd1h"; }; "12d213957fbfe643a97d5072b1f6ae30aeebcbb7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/12d213957fbfe643a97d5072b1f6ae30aeebcbb7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/12d213957fbfe643a97d5072b1f6ae30aeebcbb7"; sha256 = "0p4pzcn3fmqnkz93wk023zzs1f12c1xpsx7fkz2hv8i4jm8mrkb4"; }; "12eb0444499ce41f101b1b5f9dd6b87894949511" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/12eb0444499ce41f101b1b5f9dd6b87894949511; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/12eb0444499ce41f101b1b5f9dd6b87894949511"; sha256 = "19nggqdvkq6rap0sqnpkyrwsc882dzy1cg2lbsbd88s2nn6lrc3q"; }; "131d64c4948a0370d99897b2ad5a968b160e4300" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/131d64c4948a0370d99897b2ad5a968b160e4300; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/131d64c4948a0370d99897b2ad5a968b160e4300"; sha256 = "1g0wf836rpmy7g291wyf0xwyr8g196cb0val8lzg5pa5qxivpr1g"; }; "132e734bba8f24cfaecbe6e03b85b76158a57d1f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/132e734bba8f24cfaecbe6e03b85b76158a57d1f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/132e734bba8f24cfaecbe6e03b85b76158a57d1f"; sha256 = "0g7qw0y8006hmmfpmrz80628l35380960j54iqrp88jbqlqsd1p9"; }; "139f335e517878be52106907638e80140951abaa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/139f335e517878be52106907638e80140951abaa; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/139f335e517878be52106907638e80140951abaa"; sha256 = "1xdwmml0i40dvdi148fzk7xp0wcpx4vfp488159xl09p88ad9zk3"; }; "13b3c6250566821e05b35dd3296b5686aae3f325" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/13b3c6250566821e05b35dd3296b5686aae3f325; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/13b3c6250566821e05b35dd3296b5686aae3f325"; sha256 = "0dcis8x0fpq6k33bxfhnh0j0bywr084l8nla6jkx6pfvwirq06cy"; }; "13c7b27a977c4bf9c4e07a19ffb106c1128995bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13c7b27a977c4bf9c4e07a19ffb106c1128995bd; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13c7b27a977c4bf9c4e07a19ffb106c1128995bd"; sha256 = "1387mczy66xavzg995734s7vg45nn895pm3pp8n2yrgzhd1qfzjz"; }; "13f0a72b4826430335caa709e76f92079ca53b13" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13f0a72b4826430335caa709e76f92079ca53b13; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13f0a72b4826430335caa709e76f92079ca53b13"; sha256 = "1w7wbwifr9896ndbmpxmx85md5hb1v8amd8paryn8jb573hjl28d"; }; "1411432bb3fedd8dc4b429d4f6929746ef0e0a2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/1411432bb3fedd8dc4b429d4f6929746ef0e0a2e; + url = "http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/1411432bb3fedd8dc4b429d4f6929746ef0e0a2e"; sha256 = "07586dvm3qmccm5i0894lwcc8zfjx95c8vvdp619vip6xg825g5x"; }; "142674e220c8509ae1f8b001af30a95d6b08951c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/142674e220c8509ae1f8b001af30a95d6b08951c; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/142674e220c8509ae1f8b001af30a95d6b08951c"; sha256 = "0bzlrpir8fw10360kzi422zbhaal8sqdpl77qx3fk3gxhvj26r2h"; }; "145ca8052bc6fccd7bf7af21f36664fc217f2f70" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/145ca8052bc6fccd7bf7af21f36664fc217f2f70; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/145ca8052bc6fccd7bf7af21f36664fc217f2f70"; sha256 = "1ip6wspykfvmxidbwfhflfzbcnqzfmmmhgax5nxg5pla2yn71kdk"; }; "1463ec95f086a9205c1ab27df290f232964381a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1463ec95f086a9205c1ab27df290f232964381a3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1463ec95f086a9205c1ab27df290f232964381a3"; sha256 = "186vk4bdmrd6ggyxz2db5713i3zkqzph0lyr3aivgj0a4ha8gfkn"; }; "1467cb6b7644671f3127567be26cf07d20b6da7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/1467cb6b7644671f3127567be26cf07d20b6da7e; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/1467cb6b7644671f3127567be26cf07d20b6da7e"; sha256 = "0laxdgvsskc4gzbfnbal80ab7pd81v31qg8rcp9pjw1np5zpb63j"; }; "146b3768fb0d7880b8c751140d38a1177906de0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/146b3768fb0d7880b8c751140d38a1177906de0f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/146b3768fb0d7880b8c751140d38a1177906de0f"; sha256 = "15v9nwb7m1746zrwfrgfgf8va5x88by8chsa3ivgraa5j6if1px4"; }; "1471837617ec5898ca2e49cf20ad5e0795687b7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/1471837617ec5898ca2e49cf20ad5e0795687b7b; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/1471837617ec5898ca2e49cf20ad5e0795687b7b"; sha256 = "0gycs7mhhq9y3c5dd014ggbbg3609kds5vzj3v45kkydkylqm0l2"; }; "148131344e6fe6a2249ce840916527aca52dbc35" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/148131344e6fe6a2249ce840916527aca52dbc35; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/148131344e6fe6a2249ce840916527aca52dbc35"; sha256 = "0y5h5v8vlr8jr8yyy529yrjg5rw75jpxz4fa7jmbpr6syai2bdwx"; }; "149605f77f4487d4f238f2439c46df83708b08f8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/149605f77f4487d4f238f2439c46df83708b08f8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/149605f77f4487d4f238f2439c46df83708b08f8"; sha256 = "04rqssi1ndhgps7wsq1zxd2sk5p6michbfn1hi9g072gc0qp5c8a"; }; "14b7da233b40c5199352d0ad87f5c2ef529fbfc2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14b7da233b40c5199352d0ad87f5c2ef529fbfc2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14b7da233b40c5199352d0ad87f5c2ef529fbfc2"; sha256 = "1akz1k4wh5hz1w8zd6hvkmvc6w6hadw2psrr4rwpvdnkvhmnh3yh"; }; "14d50f80e32417f2f524ef471610a343fd6eb8b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14d50f80e32417f2f524ef471610a343fd6eb8b3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14d50f80e32417f2f524ef471610a343fd6eb8b3"; sha256 = "18db45x0zfwxd9v0x1jmid7lklp3ib565d98sqjzbyzfvmq8q6f3"; }; "15299d434cd85410167be0405f54ccdeeaa3f831" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15299d434cd85410167be0405f54ccdeeaa3f831; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15299d434cd85410167be0405f54ccdeeaa3f831"; sha256 = "0ivkh9ysa6nx4dw5bgqb00nynjzbn9gb1ihj43nccxskj0rynz7a"; }; "154306df1d2a4877cbc22db8224277c856f1b6b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/154306df1d2a4877cbc22db8224277c856f1b6b2; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/154306df1d2a4877cbc22db8224277c856f1b6b2"; sha256 = "0jys95p7vg6gjxsphg1widz471ap8hw3y4vz1msw85clkgxh9szl"; }; "1567a031ece4d70d2c360767b32f084b40eeef63" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1567a031ece4d70d2c360767b32f084b40eeef63; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1567a031ece4d70d2c360767b32f084b40eeef63"; sha256 = "04gzs1apaimrmkgsc76qlccqh4z7y7d221fxfaszdlvjaz9k7njs"; }; "157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc"; sha256 = "10sx2ac6w30jbf40l8gixwv8zx4rkdpi5n8a0nfgbpay72rymi2k"; }; "15a502cd7ed28b9a7f8bb3e95ed15009b0e9a29e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/15a502cd7ed28b9a7f8bb3e95ed15009b0e9a29e; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/15a502cd7ed28b9a7f8bb3e95ed15009b0e9a29e"; sha256 = "14zkdf9f592y3ivk49by1dpydv9rrpzggwm5997ykxz7ws04i1lp"; }; "15a50c3fc6a68c2b5fc5d130da66af83529e7ed2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2709658-e5f367f730d84b618e9cbc16aceb91ca/15a50c3fc6a68c2b5fc5d130da66af83529e7ed2; + url = "http://cdn.unrealengine.com/dependencies/2709658-e5f367f730d84b618e9cbc16aceb91ca/15a50c3fc6a68c2b5fc5d130da66af83529e7ed2"; sha256 = "00021z0mfhlx9pkfn04cv07k4xlzywj4nd19mydqppm9r0vw5fwy"; }; "15eddf9d2c822c3f5a608ff772c24ca1c2928c60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15eddf9d2c822c3f5a608ff772c24ca1c2928c60; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15eddf9d2c822c3f5a608ff772c24ca1c2928c60"; sha256 = "0jnslw7j2msim71pgjv2w8jd2xq48ipjw0iryw9i8vibgb30ri90"; }; "160a1829963e541ea0fc69e090047543f0c547a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/160a1829963e541ea0fc69e090047543f0c547a2; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/160a1829963e541ea0fc69e090047543f0c547a2"; sha256 = "0lshw7xhf4z4jzanbrr6q8hmq8xir8w9syl6akfbpjdc25yab0jy"; }; "1623d3a181ce7eddf10a90c3c235075fe55bca69" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1623d3a181ce7eddf10a90c3c235075fe55bca69; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1623d3a181ce7eddf10a90c3c235075fe55bca69"; sha256 = "0r8plai0830ywnqpmrikzr7y1hw34qbfgiigagrr04z97g775l4k"; }; "1627ab02a99a1389c8f3330ff31a92d4994ef631" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1627ab02a99a1389c8f3330ff31a92d4994ef631; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1627ab02a99a1389c8f3330ff31a92d4994ef631"; sha256 = "042si54d7qxziwy6d23fqkcdifqjpqf8j1gs9s5w2csaqy1bjyvl"; }; "162be3e52c290eda8052be126f9b1b9f19a5e182" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/162be3e52c290eda8052be126f9b1b9f19a5e182; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/162be3e52c290eda8052be126f9b1b9f19a5e182"; sha256 = "01g1bj3sld338a22ian9f0mnim418l6j3n7zy23sk6a5qip4h726"; }; "16311b83711df9620e3ea0adad878eb4547e2dc8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16311b83711df9620e3ea0adad878eb4547e2dc8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16311b83711df9620e3ea0adad878eb4547e2dc8"; sha256 = "084iaizc503s24cmximifd4gadlksslras2dv4l46ngik7mmwkzw"; }; "163784cb855cf579aa85c8d84241ac308c31d9c6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/163784cb855cf579aa85c8d84241ac308c31d9c6; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/163784cb855cf579aa85c8d84241ac308c31d9c6"; sha256 = "185fjh744ynh1s45z7ikyhw0mml2vwfa2db4byv8zv122x10844h"; }; "1679ff7ab2527671a6c79835501cd4447f769d26" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1679ff7ab2527671a6c79835501cd4447f769d26; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1679ff7ab2527671a6c79835501cd4447f769d26"; sha256 = "1rdlg3y9ihvhi2lf1isabj58y6f8lj24x6yb4xh9jqm8fgdjbn5x"; }; "167a3b509221baa789dd8c568b74ddcaf7c4a7c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/167a3b509221baa789dd8c568b74ddcaf7c4a7c5; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/167a3b509221baa789dd8c568b74ddcaf7c4a7c5"; sha256 = "143g5h823i5pcbqb30419i1k6mq2s3mhmcgcfn8v0jm83lwar4i9"; }; "16e421c9204b08586edd8de93b93b19fb10644ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16e421c9204b08586edd8de93b93b19fb10644ea; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16e421c9204b08586edd8de93b93b19fb10644ea"; sha256 = "0b9ki8rj1xmy9zaa52d3zbq7jk95mjv8b17qyb0zrpirl51g46gg"; }; "16ff1b3c00e3fef8b809b49a5b63be510b23dc97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/16ff1b3c00e3fef8b809b49a5b63be510b23dc97; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/16ff1b3c00e3fef8b809b49a5b63be510b23dc97"; sha256 = "1fa3b7wri025cgjkd4f4v7pmi13qkza4i1f9zpmcpwfiwvvi8dgx"; }; "17a98e6cd0892c88290f9dd9e9cb3fde84e8798f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/17a98e6cd0892c88290f9dd9e9cb3fde84e8798f; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/17a98e6cd0892c88290f9dd9e9cb3fde84e8798f"; sha256 = "0yhrwdwjn7fszj38ihq9cac1gk44xinnrh506rglmcw81iwz4j39"; }; "17b2ed6bd21c462973aa928a668bafd1f8ebcfbb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/17b2ed6bd21c462973aa928a668bafd1f8ebcfbb; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/17b2ed6bd21c462973aa928a668bafd1f8ebcfbb"; sha256 = "1pw6irhilhicr1xkxf5pvv1ylkckxr8180nvsdnfigrzyk5732sc"; }; "17f24542b619ed66aa29fe28eb716b4dd4c33d84" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/17f24542b619ed66aa29fe28eb716b4dd4c33d84; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/17f24542b619ed66aa29fe28eb716b4dd4c33d84"; sha256 = "15ssnahf78zv5is9n69cd4hyn55iij0zcdqzg446bzpslpd2y1vr"; }; "1802e0cd4e93677f9da0d094475296d070a0a167" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1802e0cd4e93677f9da0d094475296d070a0a167; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1802e0cd4e93677f9da0d094475296d070a0a167"; sha256 = "195dqkx2pwmymd6agn5k72rs6plp6nvap7gk7h5wk9yip51lkmh4"; }; "1819e4a555e0b22457eb52ec088f2d106697434b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1819e4a555e0b22457eb52ec088f2d106697434b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1819e4a555e0b22457eb52ec088f2d106697434b"; sha256 = "1pmz470s77fsl1d2sqf2kdspb8k08xw6hw3f3y1wk9w3w10mcqfd"; }; "184edcd2f9fc791ab8f0ecbb980e124e1622311d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/184edcd2f9fc791ab8f0ecbb980e124e1622311d; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/184edcd2f9fc791ab8f0ecbb980e124e1622311d"; sha256 = "0zcc4qhgzg56hayaiqxjp63bxa0jkf8ws95kfm9x3b4va4qzg907"; }; "185535353a9576cb4f9e4a7fa3c1fe649d00f26b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/185535353a9576cb4f9e4a7fa3c1fe649d00f26b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/185535353a9576cb4f9e4a7fa3c1fe649d00f26b"; sha256 = "0llsp8z8av08d6dp442abpp4pwvc7l5flh9nd29q7l156dxz5nq9"; }; "185908a865ebe7f6ee31701211aad217de343c7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/185908a865ebe7f6ee31701211aad217de343c7f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/185908a865ebe7f6ee31701211aad217de343c7f"; sha256 = "1xmi888fc5hwcvgyw73g6f7gwwhwpybi8sl41dbrj5pjcvrj2clg"; }; "187cc49caa5b9c37b965dc6d5ae486c963873c47" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/187cc49caa5b9c37b965dc6d5ae486c963873c47; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/187cc49caa5b9c37b965dc6d5ae486c963873c47"; sha256 = "1ghn25c2pxibw2wnr5c7wyk8hfdvchm27bqncnxi0vby0bwdis6n"; }; "18943d114a03b9994e64f86843cbfbea2c18fc60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/18943d114a03b9994e64f86843cbfbea2c18fc60; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/18943d114a03b9994e64f86843cbfbea2c18fc60"; sha256 = "00dgywg4p8502rm5b8ykm5xqfb8i98nqip3z96vpbwqlqllxz2fq"; }; "18d1e1adb711eb56d874c79f49ae68b3e26fb044" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/18d1e1adb711eb56d874c79f49ae68b3e26fb044; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/18d1e1adb711eb56d874c79f49ae68b3e26fb044"; sha256 = "1zmdhkcbb8bsciycigj8x7ijc7wxcg5hj21588jimfl4i48zqw78"; }; "1916cbea932d8ec4cbe73743294b2456b6f82f4d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1916cbea932d8ec4cbe73743294b2456b6f82f4d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1916cbea932d8ec4cbe73743294b2456b6f82f4d"; sha256 = "1a0dqqqmk6aj2j90qgf6qz91i37azisqjbrr9srxs42x8q8mhx2s"; }; "1919f737357402ffd6035ef99089bf4492ef39ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1919f737357402ffd6035ef99089bf4492ef39ce; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1919f737357402ffd6035ef99089bf4492ef39ce"; sha256 = "1qnry1aa0hhi4cr279293y35ywl57llrkdgrmhpwi6cvamyfpyrb"; }; "196a7cd92cd85833aa987ab46cc84abad637e671" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/196a7cd92cd85833aa987ab46cc84abad637e671; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/196a7cd92cd85833aa987ab46cc84abad637e671"; sha256 = "1xfbv83r1920v5lv4fpklmv21mmhfykkrfar0cm0yky3nyl93wi3"; }; "19bf552b5636cd53f93b288b3393447e0a9fa015" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/19bf552b5636cd53f93b288b3393447e0a9fa015; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/19bf552b5636cd53f93b288b3393447e0a9fa015"; sha256 = "02cxv7wmy2frhl6kc93y8r98ccpq9cdjji5pdyxniwmwjvnbd152"; }; "19c8ede828d4e84d3023a8cad20c4118e92c51f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/19c8ede828d4e84d3023a8cad20c4118e92c51f6; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/19c8ede828d4e84d3023a8cad20c4118e92c51f6"; sha256 = "1br3pqv9fwrfcrxmxai88qa0wbi56ik5v66x4pzwp2k20ihahmny"; }; "19eb01d07ed61f10eba97cb487040edf44235d88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/19eb01d07ed61f10eba97cb487040edf44235d88; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/19eb01d07ed61f10eba97cb487040edf44235d88"; sha256 = "13pyc8jpln5a5d3nxbbgjkqrl8v3vngg0lzsgkjaf0ddk6jr0vjv"; }; "1a2a4f3777f219966c172ba8de9cb16dc214645a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a2a4f3777f219966c172ba8de9cb16dc214645a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a2a4f3777f219966c172ba8de9cb16dc214645a"; sha256 = "0ghw873w98wx4xv0qwfqa0yshfyf6l58yymf64yw5gignay2jzf1"; }; "1a42be4a1a8f42a72c27e99abb9741fb826a99e9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a42be4a1a8f42a72c27e99abb9741fb826a99e9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a42be4a1a8f42a72c27e99abb9741fb826a99e9"; sha256 = "15ph4vwd1r4gcv25ib0y93jvcxd4nihs32c5j1f5jvr8xgrgrn7f"; }; "1a546bb1c6ba2765dbc10b34126650d033464bf8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a546bb1c6ba2765dbc10b34126650d033464bf8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a546bb1c6ba2765dbc10b34126650d033464bf8"; sha256 = "089h0npcbvxh3nisns5p4ld9pfyk18f16gm9zf90jjcq4r528dqh"; }; "1a5ecbad3eddb57b522f4873840b8a716d98b2b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1a5ecbad3eddb57b522f4873840b8a716d98b2b9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1a5ecbad3eddb57b522f4873840b8a716d98b2b9"; sha256 = "04yfwjcj5w7iwyghhzbqfj4vymy9lfvc9ncxk9z0ll75f2sf0kil"; }; "1a81e6c5fd4cc760a6589fa20070d26a9cb6e53a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/1a81e6c5fd4cc760a6589fa20070d26a9cb6e53a; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/1a81e6c5fd4cc760a6589fa20070d26a9cb6e53a"; sha256 = "0gyx0sq7k9cilcbcl2z49icf5jbknc1qcix2156nar2f8v5mqxmz"; }; "1aad9a745382e917c890acd98a988a1536087fe2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/1aad9a745382e917c890acd98a988a1536087fe2; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/1aad9a745382e917c890acd98a988a1536087fe2"; sha256 = "1hjxm0jz4bwllb08ix354i6cy78dy9vwklw9rpspdxqqkis8jxs9"; }; "1acfcb65de4dc96785b1705ca6c0029e5e4cea95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1acfcb65de4dc96785b1705ca6c0029e5e4cea95; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1acfcb65de4dc96785b1705ca6c0029e5e4cea95"; sha256 = "169xwg1jrwclx20qyci8az8rffmfn22z1x2zvib9dsmi3451mk3i"; }; "1af0a9938323c32bfd00373e1eeec3f0eb7267f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1af0a9938323c32bfd00373e1eeec3f0eb7267f4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1af0a9938323c32bfd00373e1eeec3f0eb7267f4"; sha256 = "1a70ajr3s1msvsmyjmyg6vq8jh8ba5xc1f0k2afjycj3vzjrlgmr"; }; "1af8c3dcef0a363b208600f3db2ab066d1c407b0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/1af8c3dcef0a363b208600f3db2ab066d1c407b0; + url = "http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/1af8c3dcef0a363b208600f3db2ab066d1c407b0"; sha256 = "13q98b90nhzqm9mz24nhdahz1i1gvja5gkab5p5mxsqbkm15r6vn"; }; "1b6ac4ad1dd42a8d52a6cb4a24b64cd86c92cc83" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1b6ac4ad1dd42a8d52a6cb4a24b64cd86c92cc83; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1b6ac4ad1dd42a8d52a6cb4a24b64cd86c92cc83"; sha256 = "03nfc20m6av56gqsg20h2jzc28crmvxs8ychxg0k7cmx7bzz1r23"; }; "1b6e2211b6ef64b74fd226f74bb7fdf14f384868" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/1b6e2211b6ef64b74fd226f74bb7fdf14f384868; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/1b6e2211b6ef64b74fd226f74bb7fdf14f384868"; sha256 = "0fnzj5qxrmgc1mly6my307g9if6mr3pq8mnsdhz7sdpglvqx9745"; }; "1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1b929d889ec58a690a9fb4fe5c7e74eb60c339a5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1b929d889ec58a690a9fb4fe5c7e74eb60c339a5"; sha256 = "1mrvhvp5r3mhq490w4ymjdf4f7ymp56ic8waxdd6ms8xgkrq9cpa"; }; "1bc440e5f448e7dec6f97dbb519814d6c4b17b0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1bc440e5f448e7dec6f97dbb519814d6c4b17b0e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1bc440e5f448e7dec6f97dbb519814d6c4b17b0e"; sha256 = "1vriwq47ck2inw22jl3vy4hn82sphlkdp22jzsxl9wg1bjkp7phf"; }; "1be30bac2f567e402ae48b89e8355a4b4e609b8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621166-706a1811c2684ac5bae65fafa17839c2/1be30bac2f567e402ae48b89e8355a4b4e609b8a; + url = "http://cdn.unrealengine.com/dependencies/2621166-706a1811c2684ac5bae65fafa17839c2/1be30bac2f567e402ae48b89e8355a4b4e609b8a"; sha256 = "145nr5766qs6nhakskrh03b13m650n499q3q1pcj2yzb8qcmr8ml"; }; "1bfd97f204592ed48706e423bb6ab7a6128cad7d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1bfd97f204592ed48706e423bb6ab7a6128cad7d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1bfd97f204592ed48706e423bb6ab7a6128cad7d"; sha256 = "1702mbcd7a2y4hsqmqy7cdr23h628f31spyj6wyajrixqb0xgr24"; }; "1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309; + url = "http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309"; sha256 = "0rzwsxpr3bwsgfpwci3mmy9wvwjkf1p6jam19rnnqz1h88w7ijxx"; }; "1c803eb30ed3570e150cffbce8729d1cc54e8fc3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/1c803eb30ed3570e150cffbce8729d1cc54e8fc3; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/1c803eb30ed3570e150cffbce8729d1cc54e8fc3"; sha256 = "0p9iyll322a8cfdy0h1briv01hxw0iafbq43w5k7sy8kysv5ffl0"; }; "1c8d955be9265f85641ccaa5c0c9abacc66115f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1c8d955be9265f85641ccaa5c0c9abacc66115f7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1c8d955be9265f85641ccaa5c0c9abacc66115f7"; sha256 = "0x7f04mypvy01v78xqjf2q9psw5f0fhhyyf2q4hww70s23xl3j2s"; }; "1cbf6a11e17024243825f5ea454051bf5b1e7d3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cbf6a11e17024243825f5ea454051bf5b1e7d3f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cbf6a11e17024243825f5ea454051bf5b1e7d3f"; sha256 = "0xhgb9grcd2nca9yn495n5d0c0higjqcglhc2ra5kp57fsqmf9vx"; }; "1ce933b4731d07d18548a668fca861035354bbf2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1ce933b4731d07d18548a668fca861035354bbf2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1ce933b4731d07d18548a668fca861035354bbf2"; sha256 = "1bww5rid4w5zjn40701x1509qgn44wfhp9mz723axmdykp5ak6kc"; }; "1cf61777b0744f76064a8cb5a1d0bc1bb2d3165b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cf61777b0744f76064a8cb5a1d0bc1bb2d3165b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cf61777b0744f76064a8cb5a1d0bc1bb2d3165b"; sha256 = "1x3jww0rzkrx2ybx85ncq0d4zwa60x6h05sjm4r0gps8vmjalnl9"; }; "1d09bb4f8ba502cef13de6d570839e6790bf3542" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1d09bb4f8ba502cef13de6d570839e6790bf3542; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1d09bb4f8ba502cef13de6d570839e6790bf3542"; sha256 = "1xfdfyf3pkazb1583qjgv6planywm5ajhqpjndhwn0wkim6lakmb"; }; "1d5c9571ce51f244f1e0158e0cd49bd36f16bfc5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/1d5c9571ce51f244f1e0158e0cd49bd36f16bfc5; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/1d5c9571ce51f244f1e0158e0cd49bd36f16bfc5"; sha256 = "040f2qb2g7jf9hzc48xkszy5adbwnbxy22jmp8v6q9h9qkfvm7w4"; }; "1d81bb3fd4494d2d93359f0cbecd2e9e20e67a09" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2532063-ce5a2c068f9844c8bb5d0e603da092af/1d81bb3fd4494d2d93359f0cbecd2e9e20e67a09; + url = "http://cdn.unrealengine.com/dependencies/2532063-ce5a2c068f9844c8bb5d0e603da092af/1d81bb3fd4494d2d93359f0cbecd2e9e20e67a09"; sha256 = "16xman4991dvi5m50rmplp18xb89181261g5rczkjznkf7q2973a"; }; "1d82f1e693e8f317ca408dc5159b1a6afd317016" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1d82f1e693e8f317ca408dc5159b1a6afd317016; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1d82f1e693e8f317ca408dc5159b1a6afd317016"; sha256 = "1ng1h62id2a1h3kd9mhakbfr568wkm2whbn2lv2x4l1q3ahrw9ix"; }; "1dc7018f35ab6ebe2908608910fbaf9214506ecd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/1dc7018f35ab6ebe2908608910fbaf9214506ecd; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/1dc7018f35ab6ebe2908608910fbaf9214506ecd"; sha256 = "118xrnwqmjfqndg3shn1iw90jnjvxbmr6y9ws0zrn4bas0bsn9bj"; }; "1e0c495e2e2fc0f9ab567761cfeec0d8659f6572" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1e0c495e2e2fc0f9ab567761cfeec0d8659f6572; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1e0c495e2e2fc0f9ab567761cfeec0d8659f6572"; sha256 = "0423h6jq38k03zcfrnh1kkz3dsplpyij4ysrqqyyagni3l0wpwad"; }; "1e8e90fc8fbee70866085a1fbd7ee5585941dc31" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/1e8e90fc8fbee70866085a1fbd7ee5585941dc31; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/1e8e90fc8fbee70866085a1fbd7ee5585941dc31"; sha256 = "1qdm6qkkmxxcml9bi121dvg36j55qzzzy7hslzg5ap8c65vcd00x"; }; "1ef5c21107774059ed6c5010dd2d5f3373c81445" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1ef5c21107774059ed6c5010dd2d5f3373c81445; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1ef5c21107774059ed6c5010dd2d5f3373c81445"; sha256 = "14lmgyagsk3sszh04w9r4gnyi99vhqkccy9408fypxs33l3g2n3a"; }; "1f10b8e0a3d6f6fdfe5b451508626eda10e3e771" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1f10b8e0a3d6f6fdfe5b451508626eda10e3e771; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1f10b8e0a3d6f6fdfe5b451508626eda10e3e771"; sha256 = "1plprfagzg8izyrr3dy5wnmlp0sm76kg0w36001j105accnqkn7l"; }; "1f3815ccc8afbd78900f57993ac9ee538ad3a776" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/1f3815ccc8afbd78900f57993ac9ee538ad3a776; + url = "http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/1f3815ccc8afbd78900f57993ac9ee538ad3a776"; sha256 = "11i9z6hzviapkp8llkn96m5nb9xmlkbxiv8196zkmqxp759a2917"; }; "1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a"; sha256 = "11g2rvmdj5dv5r2kfrw5ccmgl8cbkkhjmbaqpdmhiw306fd9fq5a"; }; "1fe2947f6b39cef244fd00698c7cb7adcee1d927" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1fe2947f6b39cef244fd00698c7cb7adcee1d927; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1fe2947f6b39cef244fd00698c7cb7adcee1d927"; sha256 = "0kviyyjr9hqnibzk36fxnbk7ad8fb2a7gf3hdmlb88jq3ymd4bm2"; }; "1ff18f725dd963421e618df72bf8a01bbb35d02b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1ff18f725dd963421e618df72bf8a01bbb35d02b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1ff18f725dd963421e618df72bf8a01bbb35d02b"; sha256 = "1ki17xws01fvhk796f1qf7yshwgv1a9xnmg25iq2ikm47gjjx9bi"; }; "2061aaa6e57d72cbc697076a3bfff9ede7a0a405" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2061aaa6e57d72cbc697076a3bfff9ede7a0a405; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2061aaa6e57d72cbc697076a3bfff9ede7a0a405"; sha256 = "1siplly88g11327ync8771kzpbdc9g75645fai37rvawip526cln"; }; "2099a8b27bb01df580dca27c74682abb819d7424" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2099a8b27bb01df580dca27c74682abb819d7424; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2099a8b27bb01df580dca27c74682abb819d7424"; sha256 = "1jjcpc1nqk10xhk5y53qv0xwzh34wjcvn2cykjxn5g10n1vs5iqx"; }; "20b2c00511aaf3fb29dfe2ad61683427686bdb7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20b2c00511aaf3fb29dfe2ad61683427686bdb7e; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20b2c00511aaf3fb29dfe2ad61683427686bdb7e"; sha256 = "1dkbivkv0vz5rdwaanjzvc47k1yczdgjb9w0qllxwrdgixacnbv4"; }; "20ce1ae8d2c0f8a6cc946c302b619dfa82a8d0be" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/20ce1ae8d2c0f8a6cc946c302b619dfa82a8d0be; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/20ce1ae8d2c0f8a6cc946c302b619dfa82a8d0be"; sha256 = "0jba3b03d4gb62a7zj758j856mgw5l16zw99xdcgp8qd17nwlksp"; }; "20f22f8b8176717ac951ccdc7e6f5f56806df59d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20f22f8b8176717ac951ccdc7e6f5f56806df59d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20f22f8b8176717ac951ccdc7e6f5f56806df59d"; sha256 = "1fndrfy6azyh1ckzmq4261cs1mpq393abl1mc2k3cxgn67s4ymcn"; }; "211fe5f3ea5194f89c18a81f99259151734b4118" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/211fe5f3ea5194f89c18a81f99259151734b4118; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/211fe5f3ea5194f89c18a81f99259151734b4118"; sha256 = "121q1z4mj75vmcvbvyzb6i05xl8s7nkn700fd156z65g7ywn1dfd"; }; "2130d3a7a6cb4b7985001c43cece413b95605a04" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2130d3a7a6cb4b7985001c43cece413b95605a04; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2130d3a7a6cb4b7985001c43cece413b95605a04"; sha256 = "0bx84arn6w9iic3q5xwd9v20qlpgashanm12qwrxy9dpvixb6z0l"; }; "215f16be383b3e37f6ab866a94263c078729c9ef" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/215f16be383b3e37f6ab866a94263c078729c9ef; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/215f16be383b3e37f6ab866a94263c078729c9ef"; sha256 = "1k9dqr8ll66yp75mv2rx7if4zknrb02yb927xkwb2vvf8smy84x3"; }; "218b41b249f8b8cc60c48cdfe5f9f3139acec694" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605020-6cb4e3cef2f14bbc9f4e8bd763c3120d/218b41b249f8b8cc60c48cdfe5f9f3139acec694; + url = "http://cdn.unrealengine.com/dependencies/2605020-6cb4e3cef2f14bbc9f4e8bd763c3120d/218b41b249f8b8cc60c48cdfe5f9f3139acec694"; sha256 = "09iqnxhngdhsysdvlr05nvz261x7y320b66pgl3m5q5nm1b4vxc4"; }; "21907541d849646ca7b37552024a6bcbab11cce0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/21907541d849646ca7b37552024a6bcbab11cce0; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/21907541d849646ca7b37552024a6bcbab11cce0"; sha256 = "1dscgs1k5p0nsxkfhmwiw29vik2zs317gks9hb6hlkcl62852snl"; }; "219229e93fb1bf7a335603340498ba0d7dded08a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/219229e93fb1bf7a335603340498ba0d7dded08a; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/219229e93fb1bf7a335603340498ba0d7dded08a"; sha256 = "19wwpdx566x9bj3ygiyni23z7q2qdj9nxvzl9wb5nym3nfk75zq5"; }; "21fa784bbf679195e305e3c41f0638cd402f6834" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/21fa784bbf679195e305e3c41f0638cd402f6834; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/21fa784bbf679195e305e3c41f0638cd402f6834"; sha256 = "0iga4d8n471pvk1jfzkg0mvz37lp3b3908dmqfls0lvrqivyi68b"; }; "220e020f8e3d2a2de2da4e1a95e72d0a2efe26bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/220e020f8e3d2a2de2da4e1a95e72d0a2efe26bd; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/220e020f8e3d2a2de2da4e1a95e72d0a2efe26bd"; sha256 = "0jiva87bjrriz0jyx153p6ddisckqam6wl7vzxlxwg9bhc9yadww"; }; "22118798b30814806475890a25dbd3082cf56d24" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/22118798b30814806475890a25dbd3082cf56d24; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/22118798b30814806475890a25dbd3082cf56d24"; sha256 = "1sdlqrj1k5adb1z19mjikbm8cdg12h2kvaprnh6pc4bhs9l8210b"; }; "222160b66bde04349f00f790676a49a8bd3f2aac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/222160b66bde04349f00f790676a49a8bd3f2aac; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/222160b66bde04349f00f790676a49a8bd3f2aac"; sha256 = "0nyd9x389a3bk22kpgmispq6a62y8p5gbjbzdchcznvfjvbg8mdk"; }; "2265f48eeeda05a6393f1268fedaea74e5d989d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2265f48eeeda05a6393f1268fedaea74e5d989d4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2265f48eeeda05a6393f1268fedaea74e5d989d4"; sha256 = "11wk6krf02vqza7mxxdfm22bl19dfsdb79fd23m56yq3i154z65b"; }; "22b3cc937fab3025d3abf8d725b2cb3b1d12ef3c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/22b3cc937fab3025d3abf8d725b2cb3b1d12ef3c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/22b3cc937fab3025d3abf8d725b2cb3b1d12ef3c"; sha256 = "17blrcaa86q8my9b4c1gnp804w7csbrxw92pa5jcag1h68vb2dir"; }; "22c962e9607d75b5917d731e9a66bd74fd15f2a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/22c962e9607d75b5917d731e9a66bd74fd15f2a2; + url = "http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/22c962e9607d75b5917d731e9a66bd74fd15f2a2"; sha256 = "1vzg92pqixpi093rjb8mvnmxd94dplhwpwwm2wkip9asis0wamcb"; }; "22f8914859f73cc332699e1c40e17cd44d700b87" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597566-6e859699948f4adda2592656e3924b32/22f8914859f73cc332699e1c40e17cd44d700b87; + url = "http://cdn.unrealengine.com/dependencies/2597566-6e859699948f4adda2592656e3924b32/22f8914859f73cc332699e1c40e17cd44d700b87"; sha256 = "019zcs7safk4pldr47v9qn710q4d5cw20v8i26frwwqimnjdgjka"; }; "232d603ed060bcff36c5d452ec42caf19d74ec9e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/232d603ed060bcff36c5d452ec42caf19d74ec9e; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/232d603ed060bcff36c5d452ec42caf19d74ec9e"; sha256 = "0y9jplgh3dcf6p3n6vsrs7shz60jj8kx8ccz8yldm9wy7sjqhkzj"; }; "232eab324de501a6a4db9e0af2922875e7b6303f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/232eab324de501a6a4db9e0af2922875e7b6303f; + url = "http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/232eab324de501a6a4db9e0af2922875e7b6303f"; sha256 = "0dvnfwqnf1hwnbg3y0az2hc0zib18fizdska9w64xjni6zq3fy2y"; }; "2339c1d3bfb2db1621ef01225df981c1bcc32f49" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2339c1d3bfb2db1621ef01225df981c1bcc32f49; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2339c1d3bfb2db1621ef01225df981c1bcc32f49"; sha256 = "17wks3c6nz4qxlz6qwgnbp14v4wda2ss5b8mhdiisc6zhsn2sn4f"; }; "23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77"; sha256 = "0v1pafnd21lss6pf6af5r3h5n3minzl45ckmxa1v4rmx3c3j8xnb"; }; "235cc68a11ea8011ea5ca0d1326a488fd48ee713" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/235cc68a11ea8011ea5ca0d1326a488fd48ee713; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/235cc68a11ea8011ea5ca0d1326a488fd48ee713"; sha256 = "0xcpafbrys5hkxqd76fx12cxjbf7i80b9206iz69hfprh0hsa2h6"; }; "236633a6e0745c5413ea190b0e07deb9e9b9d409" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/236633a6e0745c5413ea190b0e07deb9e9b9d409; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/236633a6e0745c5413ea190b0e07deb9e9b9d409"; sha256 = "0ffj6q65nwwpr67pah2h3nzkp7m549zzb47pkbxsk54d06b9q1lq"; }; "23b01ee08bbe595a4dcb1a72014151b82e5e76ff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/23b01ee08bbe595a4dcb1a72014151b82e5e76ff; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/23b01ee08bbe595a4dcb1a72014151b82e5e76ff"; sha256 = "00fml6x864bvh4prq3bkpqn3q6ca4zwif7zxhnsx3ksia8kj9845"; }; "23cc3f11d38de5312fd5798024de0d232bbf2e68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/23cc3f11d38de5312fd5798024de0d232bbf2e68; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/23cc3f11d38de5312fd5798024de0d232bbf2e68"; sha256 = "1w0nr2hvcl0h8fkivrxval1l2vw4546rh9vpkwhybfwjh2g06q1y"; }; "2408381821f1ad904404880379feec1a2eeb2ad4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/2408381821f1ad904404880379feec1a2eeb2ad4; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/2408381821f1ad904404880379feec1a2eeb2ad4"; sha256 = "159g6gb74b6nrmi7rln4mpk1yj3kzsf6bppx53i2sa9wcp0vzqyv"; }; "249d8cdb69fcbdd5f0dfef3a752eb2b7daaf01f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/249d8cdb69fcbdd5f0dfef3a752eb2b7daaf01f4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/249d8cdb69fcbdd5f0dfef3a752eb2b7daaf01f4"; sha256 = "1jgr54z0ic0gaby8zml5kj7iyx60v1spf4a1wqiqq61frbkm4qgr"; }; "24f19b36203cb12aa6892d2d4399df0a679189f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/24f19b36203cb12aa6892d2d4399df0a679189f7; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/24f19b36203cb12aa6892d2d4399df0a679189f7"; sha256 = "0drx0nv2249nfdbmlhc24isigf0bxv2n0vyjr62hpddb6xjqikq2"; }; "252915e59bf956eba7b4eb84256f1eb9c08c16e6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/252915e59bf956eba7b4eb84256f1eb9c08c16e6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/252915e59bf956eba7b4eb84256f1eb9c08c16e6"; sha256 = "0qkvmqhirgdq9wlv0zkkqqa1gl45bw3i19711vfv487n37d2acmf"; }; "254bdc731ce0a3bef83fa6dd6c76771cadefeab5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/254bdc731ce0a3bef83fa6dd6c76771cadefeab5; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/254bdc731ce0a3bef83fa6dd6c76771cadefeab5"; sha256 = "0pr4zh0kf2j52msqfwaailrgm5i091msf7s72nk9j5p4zjmcy4qw"; }; "2573361ce50bbcbed674e108ea4cbb055cd0f2ec" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2573361ce50bbcbed674e108ea4cbb055cd0f2ec; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2573361ce50bbcbed674e108ea4cbb055cd0f2ec"; sha256 = "1ms3v0avlbwf3p8g2zw9w5d90hmyf7ba5d3ya7w4mv9sc3a8h5v2"; }; "25a0a89eda2d7c97ae3a37ba14f151b4682617e9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/25a0a89eda2d7c97ae3a37ba14f151b4682617e9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/25a0a89eda2d7c97ae3a37ba14f151b4682617e9"; sha256 = "1656qa6wxbw19kcihb0rl0ssyhrr7pklhflrbwz7f9nsanw6zjmf"; }; "25a1ae1b60746c8e36e21531648e67b4c330d30d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25a1ae1b60746c8e36e21531648e67b4c330d30d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25a1ae1b60746c8e36e21531648e67b4c330d30d"; sha256 = "04wb1hkil0khgk7qsndar970wgky73f93ng3kgp4c9sgck46gkqz"; }; "25b04d770d7a50481f9276487a5ed9834119dabd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/25b04d770d7a50481f9276487a5ed9834119dabd; + url = "http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/25b04d770d7a50481f9276487a5ed9834119dabd"; sha256 = "1pxvxdxjidk0qsxr0j04jsmjxbjz8havi7ngqfx9dfl6w9nxc0vn"; }; "25d67f4de95951cb969435a84594979cd05c4091" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25d67f4de95951cb969435a84594979cd05c4091; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25d67f4de95951cb969435a84594979cd05c4091"; sha256 = "0rjmj5395cbcg275yd47gmd8gjgq1nip77k8vy8nn4k2cqpn2rlh"; }; "260381a0277c560f8c2006d8bfd4f7069cd5640d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/260381a0277c560f8c2006d8bfd4f7069cd5640d; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/260381a0277c560f8c2006d8bfd4f7069cd5640d"; sha256 = "03v2nzwhbb0f728qyd60l68w2nvpadfz8sppzr3y1zbz75rd2k3r"; }; "2616e3cfebab7a82dd81c3bfee37a62f3317e357" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2616e3cfebab7a82dd81c3bfee37a62f3317e357; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2616e3cfebab7a82dd81c3bfee37a62f3317e357"; sha256 = "1m01ldgxq49rpr4bvrqppkfk9l8ajrw0401704hgnz06xs3sczql"; }; "26407337ede0c844ad2b9b9e4eec2286431b0fc9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/26407337ede0c844ad2b9b9e4eec2286431b0fc9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/26407337ede0c844ad2b9b9e4eec2286431b0fc9"; sha256 = "0kwhdyyg2wqy9z0x9v4rprvy84a1l65777fp9nlq5kqmkhl5qhaa"; }; "267f7ab24d96a8949db4cbc89f50cb9aa755e5e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/267f7ab24d96a8949db4cbc89f50cb9aa755e5e7; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/267f7ab24d96a8949db4cbc89f50cb9aa755e5e7"; sha256 = "1m26i9cxxy8dbfgnmcpar7a19jr7kz57nxqnim3vbkycvfj0i75q"; }; "269c797991f91dddf54acd99a214152e8f155f8f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/269c797991f91dddf54acd99a214152e8f155f8f; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/269c797991f91dddf54acd99a214152e8f155f8f"; sha256 = "0k61nipciisz9q6riyd08n7zi78nnm5b454zg4rnpv4fxkxwrmkh"; }; "27098f36979ec3e79f5f7d7145dae3cfedf9b0a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/27098f36979ec3e79f5f7d7145dae3cfedf9b0a9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/27098f36979ec3e79f5f7d7145dae3cfedf9b0a9"; sha256 = "0ygswmzmb89m4mpl2zansjppn1r83dkwxg5r68ssk4isrr8dha8m"; }; "279afe349fb3fbd2a845d8f650df0bf1dbb73c45" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/279afe349fb3fbd2a845d8f650df0bf1dbb73c45; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/279afe349fb3fbd2a845d8f650df0bf1dbb73c45"; sha256 = "1rcww7wpbygq82zlpnh6gh79yw9w7rb7zjlx9dpdkys3v81rkzr0"; }; "27ab355d7817d1ffb8eb77e96879aab84b9ad7de" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2599004-dd46a4b56e3e4811a26bcf6c9cddf877/27ab355d7817d1ffb8eb77e96879aab84b9ad7de; + url = "http://cdn.unrealengine.com/dependencies/2599004-dd46a4b56e3e4811a26bcf6c9cddf877/27ab355d7817d1ffb8eb77e96879aab84b9ad7de"; sha256 = "104zskbv7ii90incdrl8gwqx60bgfghyl8si1rmnvch2ppnb9cmx"; }; "27e4175b9bbb4b175f9daaa9a824638a178a6d76" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2393838-48fca459a31f4f83a05d71c733f01d7a/27e4175b9bbb4b175f9daaa9a824638a178a6d76; + url = "http://cdn.unrealengine.com/dependencies/2393838-48fca459a31f4f83a05d71c733f01d7a/27e4175b9bbb4b175f9daaa9a824638a178a6d76"; sha256 = "0845rjmqick7mmymkprd4bjpszldxrqcgg56kndy4x0qrmdmh5lc"; }; "2827f79a76e04e6ba05b6cd3cc73e4dfce1ca961" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/2827f79a76e04e6ba05b6cd3cc73e4dfce1ca961; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/2827f79a76e04e6ba05b6cd3cc73e4dfce1ca961"; sha256 = "18y83fxfr8r6fya771s8wn3fpwd0f0kpdd3bvnr5f0dqqqa84g1d"; }; "28438bc19c11df6c698e30491b3413fed60b2f0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28438bc19c11df6c698e30491b3413fed60b2f0e; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28438bc19c11df6c698e30491b3413fed60b2f0e"; sha256 = "0vp18h36h5wdy17a31mwl2mf049kk2mkg09ldjidn25qfd4cdjm4"; }; "28783f63ac21ccc8c6ba68949502795e3a63f569" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/28783f63ac21ccc8c6ba68949502795e3a63f569; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/28783f63ac21ccc8c6ba68949502795e3a63f569"; sha256 = "19cd3p7gsd9ka8gmpzrabcya7pzmsmmjr3djmvj5nmraf4qxprd1"; }; "288cc5ec4da8903ba6077e259a8d9f1a0e5360c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/288cc5ec4da8903ba6077e259a8d9f1a0e5360c5; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/288cc5ec4da8903ba6077e259a8d9f1a0e5360c5"; sha256 = "0ypv6mj46hibaa5hbi1i8a44gjmbp1y7qlvk4xywrqsj9fiadjyj"; }; "288d0122b6bf19ad09a81fb7a631a19113ae96f1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/288d0122b6bf19ad09a81fb7a631a19113ae96f1; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/288d0122b6bf19ad09a81fb7a631a19113ae96f1"; sha256 = "0araqg4vmbmpfbda1m1pj7b62rh1nd8pqs3smha0jpmfx1gj75xb"; }; "28926b6102371746bf5dd7c493c2353392ba76f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/28926b6102371746bf5dd7c493c2353392ba76f7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/28926b6102371746bf5dd7c493c2353392ba76f7"; sha256 = "0b24j3l4ln2rjkc6bfczdyzpgzmc0kbai26di8afz2lsklsmpjdn"; }; "289a1b921105ce48ba09d95a245cd2daa77b05bb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/289a1b921105ce48ba09d95a245cd2daa77b05bb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/289a1b921105ce48ba09d95a245cd2daa77b05bb"; sha256 = "0p903d63x9zxqlfs23c48v52gmvja3p71z8bcc2qbryrcv7w50bl"; }; "289c460fd7eac93f2aa4548c3c805ce6f69f32ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/289c460fd7eac93f2aa4548c3c805ce6f69f32ce; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/289c460fd7eac93f2aa4548c3c805ce6f69f32ce"; sha256 = "123pwgcmmyv03b1i9i6q6ks457hsipwbkvap8jfjvn2rppy4cr1b"; }; "28a656853baebf8714c795ebceb8ac04f687f67f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28a656853baebf8714c795ebceb8ac04f687f67f; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28a656853baebf8714c795ebceb8ac04f687f67f"; sha256 = "0g4w1nkwi27mbh523511qwsdpjzi5lz9awcaha94031krjayfn69"; }; "28f2170447e86afc17f7c14affde7f2dd410c256" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/28f2170447e86afc17f7c14affde7f2dd410c256; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/28f2170447e86afc17f7c14affde7f2dd410c256"; sha256 = "07y161rsf1j7s6pna2nsjm9jvzr9ai8i5hxwxd2q64labz0403z5"; }; "28f89206861167b3d68bb1c6d131985c152b757d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/28f89206861167b3d68bb1c6d131985c152b757d; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/28f89206861167b3d68bb1c6d131985c152b757d"; sha256 = "0rfkf21snlq5rsq39sfz9ala1qf4d85ns9qfy9k8sf274sr0z1sh"; }; "2914f32cdeac7870819661e0fe54b4833a9962c0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2914f32cdeac7870819661e0fe54b4833a9962c0; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2914f32cdeac7870819661e0fe54b4833a9962c0"; sha256 = "1rkl3b1j864x9j1rbw7h7hhnhdb9m4r7b17py9kqvy6mfhacjanr"; }; "292a8fbb5a1aff92533e52ded470f85af5ffd6c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/292a8fbb5a1aff92533e52ded470f85af5ffd6c4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/292a8fbb5a1aff92533e52ded470f85af5ffd6c4"; sha256 = "0flbsvx3d2x5qlxfj5fk9nsd6b2x9nn8mx65dqlwws2pvkw6ah8s"; }; "2944a0052b881a644f04844186daa4ae54aad523" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2944a0052b881a644f04844186daa4ae54aad523; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2944a0052b881a644f04844186daa4ae54aad523"; sha256 = "1fzmcs75y6q3fmlldrp6yk10bfw7vxmlg2swz995i9ry1avmjmq1"; }; "295f41723355e152d24716ed3125507d5155eccc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/295f41723355e152d24716ed3125507d5155eccc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/295f41723355e152d24716ed3125507d5155eccc"; sha256 = "1gzxs53jhaskdwkiqw5kxvhfh02b9vcyql1v1kzii23f3vv1kvx3"; }; "29681ec614276ed188ccfff2342d818c3503f114" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29681ec614276ed188ccfff2342d818c3503f114; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29681ec614276ed188ccfff2342d818c3503f114"; sha256 = "1f10r2iv2xq3zcl4bpcapzab9rkfscpxm83g23hszbp8yjs2bvi8"; }; "29ba225936b8addec463e591b235407a300ecaca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/29ba225936b8addec463e591b235407a300ecaca; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/29ba225936b8addec463e591b235407a300ecaca"; sha256 = "1rvhh8hxxy6dv23m8qhn1bvy409szfxj7yz73dv6bzj4kf8xhm05"; }; "29eae01c452b3ae340b64ad4266ea1152b4e6729" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29eae01c452b3ae340b64ad4266ea1152b4e6729; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29eae01c452b3ae340b64ad4266ea1152b4e6729"; sha256 = "1y4cmksxajljfgr8vmh7rvn7dlf43z2rw4hxfnxhri3bl55y5cg8"; }; "2a26f841843dd2551c447764a346353954884612" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/2a26f841843dd2551c447764a346353954884612; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/2a26f841843dd2551c447764a346353954884612"; sha256 = "0zn93s7bwy5z1cscs79bd27qxyjgdj6ry9j1nwkcvd9irw2ca14k"; }; "2aa18a35f72b72172e9b2c30c8ef7dbe2031303c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2aa18a35f72b72172e9b2c30c8ef7dbe2031303c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2aa18a35f72b72172e9b2c30c8ef7dbe2031303c"; sha256 = "0jj1cjhj4y50hjbsslxhrjc8byjngvcg4fllc6fysd01hdbzx267"; }; "2acb20ce30a8d1a5aa3f7506c94c9f8a93297c8d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2acb20ce30a8d1a5aa3f7506c94c9f8a93297c8d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2acb20ce30a8d1a5aa3f7506c94c9f8a93297c8d"; sha256 = "07pr5hm5pv8s1qw3lmgasg8ppsga50h6dhpbm7z5lcnc70nd5fkm"; }; "2b1ea22d749ba6df5bafa9119fe8a0c0d4ba68c1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2b1ea22d749ba6df5bafa9119fe8a0c0d4ba68c1; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2b1ea22d749ba6df5bafa9119fe8a0c0d4ba68c1"; sha256 = "1i5cvjjm2sjx77qahmk4p26gm30rri50fdm1jfypp45y0hqa34wn"; }; "2b2f6a55cc19d94c0130e833f2e70c29e8bfa2e4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2b2f6a55cc19d94c0130e833f2e70c29e8bfa2e4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2b2f6a55cc19d94c0130e833f2e70c29e8bfa2e4"; sha256 = "0z3vk2yn1afbkx5lni2pwii3v9by37rixz1brws112h79a2mnbd4"; }; "2b83155ddf092ccd8d8baeb9898fe084b587e82d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2488287-03e6f1d9f826475c81f3125cbcc669d9/2b83155ddf092ccd8d8baeb9898fe084b587e82d; + url = "http://cdn.unrealengine.com/dependencies/2488287-03e6f1d9f826475c81f3125cbcc669d9/2b83155ddf092ccd8d8baeb9898fe084b587e82d"; sha256 = "1jg06zvfzbz1s34wfnvcnkpjhad8kmlcf0byf61dyfacjw0rpfr0"; }; "2bac5c303baf3d4800852e359ebe06398d185cd9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2bac5c303baf3d4800852e359ebe06398d185cd9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2bac5c303baf3d4800852e359ebe06398d185cd9"; sha256 = "1wg72mlyh82ah0p7fxkj83wkllx6r8ya0x9adizvlaf8mw7ymhvj"; }; "2bc488cec0bae3f273fcf9d172b61b9a12489423" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/2bc488cec0bae3f273fcf9d172b61b9a12489423; + url = "http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/2bc488cec0bae3f273fcf9d172b61b9a12489423"; sha256 = "10bqvkyzynfi9k4s697i6qzpfc3p5dyw77k3wqsdm686kaaa035x"; }; "2c391f34048aae95fed7d9649088e50dc62d614a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2c391f34048aae95fed7d9649088e50dc62d614a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2c391f34048aae95fed7d9649088e50dc62d614a"; sha256 = "0k6vzh8kkfvgb8km5jd6qn3fw84snm9xz0fmx3jffc7g5n1jywsz"; }; "2c42aecf4d302508d97a42889f9c616197b1bd9d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2c42aecf4d302508d97a42889f9c616197b1bd9d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2c42aecf4d302508d97a42889f9c616197b1bd9d"; sha256 = "0f7h2w6pppdi7gp8h50528xf25d382fkf1mckckzfilvs3xvsqrn"; }; "2c6a334523bb0b39b337ae9f3754d787d930b6ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2c6a334523bb0b39b337ae9f3754d787d930b6ce; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2c6a334523bb0b39b337ae9f3754d787d930b6ce"; sha256 = "1537cbvm3byiz5yifw43236yv2ffr1h9xn5kn1m3x031q1lkrvj7"; }; "2c8420f6e48f529d116aafee46759cdf99e8a724" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2748148-aeba26080cd64d52aecc49d22cba05f4/2c8420f6e48f529d116aafee46759cdf99e8a724; + url = "http://cdn.unrealengine.com/dependencies/2748148-aeba26080cd64d52aecc49d22cba05f4/2c8420f6e48f529d116aafee46759cdf99e8a724"; sha256 = "01bc98a4q8h02f3iclrd99sg215jpznqr5dviakrhakvyg2qifm5"; }; "2ccd26d6297607f50e2fd8c1b54cde1f6e6509a5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2ccd26d6297607f50e2fd8c1b54cde1f6e6509a5; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2ccd26d6297607f50e2fd8c1b54cde1f6e6509a5"; sha256 = "12w39ljrf6nrvixky4dzx8q4izwba17a8bc65f561wp49305rq8j"; }; "2cd1739a082210f13445cb6acb076e89cb209759" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2cd1739a082210f13445cb6acb076e89cb209759; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2cd1739a082210f13445cb6acb076e89cb209759"; sha256 = "1g8miwfg84c0z6hxm2j7lqk7khbvk80jkzavb0fwygyml9xlwgfv"; }; "2cf7b40136915c48e206e1052021eb226c0050ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/2cf7b40136915c48e206e1052021eb226c0050ca; + url = "http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/2cf7b40136915c48e206e1052021eb226c0050ca"; sha256 = "0gs5ylym2j8sk1jg4b6217nchv10d9bigl1nd94amzss2d4aq86j"; }; "2d54103141e313b63ef5cf774325a15054e9ff39" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/2d54103141e313b63ef5cf774325a15054e9ff39; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/2d54103141e313b63ef5cf774325a15054e9ff39"; sha256 = "109gvy1i6g2bk3cj0q833gc2rc2mg5w34q6j4jx6ff956dvl9drb"; }; "2d883815049fa9361c8c5c425fbea36dcd903c7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2d883815049fa9361c8c5c425fbea36dcd903c7a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2d883815049fa9361c8c5c425fbea36dcd903c7a"; sha256 = "0g2ld1zbwck746j2i2gl61xplp4rg54vw7yk9rc81w60889z7zbh"; }; "2dc37c85bc4dd351cd3d177f7e6f986d186bd1f2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/2dc37c85bc4dd351cd3d177f7e6f986d186bd1f2; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/2dc37c85bc4dd351cd3d177f7e6f986d186bd1f2"; sha256 = "1nf42p4lzwz88g91wc9i4vcawsdnskjf4s93sha70mx38xbk82fd"; }; "2de8f1186afad5e4c4f23315078e4d2bf6df4264" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/2de8f1186afad5e4c4f23315078e4d2bf6df4264; + url = "http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/2de8f1186afad5e4c4f23315078e4d2bf6df4264"; sha256 = "1hcpcss34rv1q9cw8g3lnqfxhmd4gqb52zll1g44biid1ybhjyqj"; }; "2e01332dbabb9d7f2325d7f297f41fcd48933c46" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e01332dbabb9d7f2325d7f297f41fcd48933c46; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e01332dbabb9d7f2325d7f297f41fcd48933c46"; sha256 = "07j0r50lbva8dzkpp1cym72995p9lsbc3hxkczhdydaff2cxkbpp"; }; "2e09a8e7ade5fdf179f0918bc2abac9c18e85901" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2e09a8e7ade5fdf179f0918bc2abac9c18e85901; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2e09a8e7ade5fdf179f0918bc2abac9c18e85901"; sha256 = "1sh9srrwzs9fzy1ds452h8dzangi8q2kvnn9sq39b8cpgffjy1qc"; }; "2e601894255189d2db25a10b7d612d09c725aba7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e601894255189d2db25a10b7d612d09c725aba7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e601894255189d2db25a10b7d612d09c725aba7"; sha256 = "1y0pfngnbfzc7zlwalf7w1f97fx6aclrkhzl91axjdgnkwcnnp2f"; }; "2e6729373c277fcfd3a59532e1e7738523370fb8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e6729373c277fcfd3a59532e1e7738523370fb8; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e6729373c277fcfd3a59532e1e7738523370fb8"; sha256 = "12farscg3s037w3mylb5s7xnv4gzriqpbgadg7jxpl4znpdafdy2"; }; "2e6b877018994d97122a9b698eba651b59cbe02d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e6b877018994d97122a9b698eba651b59cbe02d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e6b877018994d97122a9b698eba651b59cbe02d"; sha256 = "1pgfa4bx7sy8x7dq1zy0jifkaj2jmw12v0fnd4wdcnkraw9wh25y"; }; "2e8c5279ef8b2e93ab8c738c3e9b8689fc63b839" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2e8c5279ef8b2e93ab8c738c3e9b8689fc63b839; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2e8c5279ef8b2e93ab8c738c3e9b8689fc63b839"; sha256 = "10hff6yk8q7kwn3557s4fbx7gbhwxsk44j7h8xqn26qzm6xbwd34"; }; "2ecfd27e7e8beaa971269c4d29040f148b7fdf07" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ecfd27e7e8beaa971269c4d29040f148b7fdf07; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ecfd27e7e8beaa971269c4d29040f148b7fdf07"; sha256 = "128y3l95zg1qxz9bwf3wzjb8hr89d3v74dix0c4qiv4srk300d1c"; }; "2eddeeafbb16203bad1207fe3c70aaf2e165ebea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2eddeeafbb16203bad1207fe3c70aaf2e165ebea; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2eddeeafbb16203bad1207fe3c70aaf2e165ebea"; sha256 = "1gr063b3z1q7d7q9ygvyj7qh1z922r8c2mh5aw2wq0s15sxjqq7p"; }; "2eebb65cf7012650afcab43c7f2f559c86b2f3a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2eebb65cf7012650afcab43c7f2f559c86b2f3a3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2eebb65cf7012650afcab43c7f2f559c86b2f3a3"; sha256 = "1v1kwg15r7fns0gash84zff9r25amphma6jfpzl2yr2qcydyqkdn"; }; "2efd964b62d457693b93d311acd7d54dc4e7f177" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2efd964b62d457693b93d311acd7d54dc4e7f177; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2efd964b62d457693b93d311acd7d54dc4e7f177"; sha256 = "1kd99v2l23ming81m799zz666pyk7pvzlykd9iqd9a1b8xi8q80l"; }; "2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2f143d8520d94bbf2cb250b35a8f79e3d3e8572c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2f143d8520d94bbf2cb250b35a8f79e3d3e8572c"; sha256 = "1wrzkwv1vl3r7hczgmyxw4gv2nlwjivds8x1myicrb3wqz85b2wr"; }; "2f3b66c8bc4bc7ba4a38982c19f7aea56a40fa44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f3b66c8bc4bc7ba4a38982c19f7aea56a40fa44; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f3b66c8bc4bc7ba4a38982c19f7aea56a40fa44"; sha256 = "1bz12dwy7yyg4niq822jqv7vi5g7mmfiscsdbay08184niw1a2fc"; }; "2f4b14734a09e63c0347c348f77cd0da3c72b561" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f4b14734a09e63c0347c348f77cd0da3c72b561; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f4b14734a09e63c0347c348f77cd0da3c72b561"; sha256 = "0ypvfnnsl2q15qmqkq9qs1mfmyk63jjxhr2w54v7xcxv40l2d0ah"; }; "2f8b4043d609acb0eee65a86210c9881d1e4a9b5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2f8b4043d609acb0eee65a86210c9881d1e4a9b5; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2f8b4043d609acb0eee65a86210c9881d1e4a9b5"; sha256 = "0yqildrca6fx0gvhb08s3m4dwfkrzbyq877nkcykzid687q6f2h6"; }; "2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f"; sha256 = "0jlakpvdmqscxgdwlgyrx69bdpfpx9bxinz56hwrfdqlsl13d6zp"; }; "2fbbb90552e28dbaf47f41fa63652c11c7b99c78" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2fbbb90552e28dbaf47f41fa63652c11c7b99c78; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2fbbb90552e28dbaf47f41fa63652c11c7b99c78"; sha256 = "1w8zvb659f0xd5fa0bhclmrkavb82nj8xwwcan1rwys38vvghl6h"; }; "2fda5ea89a82d953d04583ab86b387b1b3f3dd6f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2fda5ea89a82d953d04583ab86b387b1b3f3dd6f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2fda5ea89a82d953d04583ab86b387b1b3f3dd6f"; sha256 = "1l8slfjrais377xrpj9lm0058y2r4qb24yvh30fpxmw3alvw5wg2"; }; "2fdbf124501fb7d04dae2e4dea0e796f8a098f36" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2fdbf124501fb7d04dae2e4dea0e796f8a098f36; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2fdbf124501fb7d04dae2e4dea0e796f8a098f36"; sha256 = "1b4id5wcrfjl6b0qp5c1y1dq62g8sn7ln8j1idvi5ffwwrmsx8j3"; }; "2fe1fb9f98af4a68ceb9adee909fe7b67917ea81" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/2fe1fb9f98af4a68ceb9adee909fe7b67917ea81; + url = "http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/2fe1fb9f98af4a68ceb9adee909fe7b67917ea81"; sha256 = "0n35g4sb7wymb0k22n0frapdhw6zz1aiiv5xynjk8c99pivdnism"; }; "2ff8709ada5b8bbfe994f55ce697983225440813" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ff8709ada5b8bbfe994f55ce697983225440813; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ff8709ada5b8bbfe994f55ce697983225440813"; sha256 = "1h57h9z44acyrw5klcslbg9g7zxgxaz26d3ab18q2mp17mrw3wk3"; }; "3012eb0c18cf3faab0fd1a8290905b902456192c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3012eb0c18cf3faab0fd1a8290905b902456192c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3012eb0c18cf3faab0fd1a8290905b902456192c"; sha256 = "1halwqjmiprn659fqcdfw5g3ffanx34j0ri8n00xmbwv4hhkvsvh"; }; "307b166459a0b56cda3d5d3235e3c39b37b2e2e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/307b166459a0b56cda3d5d3235e3c39b37b2e2e7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/307b166459a0b56cda3d5d3235e3c39b37b2e2e7"; sha256 = "0hmc67ngk3s4by9k2kcl5kqi8vmkrqp0vaphd0v88z162vax44pk"; }; "30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b"; sha256 = "0cvfn3vv6jhhpimc8s9q37k041c3qc8rrh1fkab89y1d1g430mil"; }; "30e4e0e87aa3c6ed5b9d99e89c3e3986727405b4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/30e4e0e87aa3c6ed5b9d99e89c3e3986727405b4; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/30e4e0e87aa3c6ed5b9d99e89c3e3986727405b4"; sha256 = "0gpvcs6q6cprbirwndirz8a75d5xrsxdzplh9j2zknqkybwbdsyg"; }; "31513973d4d5ca51b8bb4b0b965dd53bed0284bf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31513973d4d5ca51b8bb4b0b965dd53bed0284bf; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31513973d4d5ca51b8bb4b0b965dd53bed0284bf"; sha256 = "1y1lnwvzs2v6yibnxb5lxcc74gn2pgarqdqhs26501hf35cw400m"; }; "31a9943db56acc38a4a6083517d5981accfd7b0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31a9943db56acc38a4a6083517d5981accfd7b0f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31a9943db56acc38a4a6083517d5981accfd7b0f"; sha256 = "0i6n6hhcjg2ccqxmajmb3nhwbfx2bkfszxycs1k4ip34yhb7fbcd"; }; "31b00e20c26ba53e1e4071f88ae88e478dddc667" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/31b00e20c26ba53e1e4071f88ae88e478dddc667; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/31b00e20c26ba53e1e4071f88ae88e478dddc667"; sha256 = "0n9fwvmp1r5h3z9sbqx1ywr1azm0ckrgk4j2557n06l4f539bah5"; }; "31d76d0dbcad8d9f1b4242247389a533fb8e3ca1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31d76d0dbcad8d9f1b4242247389a533fb8e3ca1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31d76d0dbcad8d9f1b4242247389a533fb8e3ca1"; sha256 = "1iwqppypjqvq32csylhbrq7kjcm1533fdaq4m6pdnb8cf3q0haa3"; }; "31dc2af99e1bb1eecb4ddcb3b2983a0563cde9f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31dc2af99e1bb1eecb4ddcb3b2983a0563cde9f6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31dc2af99e1bb1eecb4ddcb3b2983a0563cde9f6"; sha256 = "03awckc4gh0ypdkglzhy4fg79fik904nczmwpf4vwrd83xin7dp7"; }; "3227bc9c7feb2325ecd2c4144ae0feae8ddc8b90" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3227bc9c7feb2325ecd2c4144ae0feae8ddc8b90; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3227bc9c7feb2325ecd2c4144ae0feae8ddc8b90"; sha256 = "1k11sd1jsbbcgr71jn67vq4zjwxa96y8qknl4b9p3333skixvhmy"; }; "32860f0809372d37c40310daf0184877322fc636" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/32860f0809372d37c40310daf0184877322fc636; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/32860f0809372d37c40310daf0184877322fc636"; sha256 = "0dg7hjwhpbfbqxwn4dgclpfrbbrjn5l8xbdpx9n3fvsrr861zdxg"; }; "32bb97834c48d10d8115a0167b8372bca6b8b179" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/32bb97834c48d10d8115a0167b8372bca6b8b179; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/32bb97834c48d10d8115a0167b8372bca6b8b179"; sha256 = "04z8ppim2mh792m2fqw2xws7j1m6xrd1jp1pcn7lgfaiz98yxvr1"; }; "32d809d2943a46adfb06d390602d4be87fa510ba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/32d809d2943a46adfb06d390602d4be87fa510ba; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/32d809d2943a46adfb06d390602d4be87fa510ba"; sha256 = "04fn639135gmvmrq4i7jq0s6k8rfd3jj4a11740avbpbynw9gr25"; }; "32f81135ef65d05728ba2f1c5b5f3935a52334d7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/32f81135ef65d05728ba2f1c5b5f3935a52334d7; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/32f81135ef65d05728ba2f1c5b5f3935a52334d7"; sha256 = "0sczgfd4kksl69gw3zazx7r046vb3dxgbpb6njzv52yj5q13ha4f"; }; "330afd81b039c963aa95ebf7fcb5e01b8ce9ee3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/330afd81b039c963aa95ebf7fcb5e01b8ce9ee3f; + url = "http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/330afd81b039c963aa95ebf7fcb5e01b8ce9ee3f"; sha256 = "0fv2jyajl8p8v9vini5iqmj6gnzzccjvmgzk121vmnhnm4090p1m"; }; "330e7d22693575d7c1e3bc8598676d1ad936a018" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/330e7d22693575d7c1e3bc8598676d1ad936a018; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/330e7d22693575d7c1e3bc8598676d1ad936a018"; sha256 = "08s5fpxn14xppyif4yx6w1sgrxb74q2aw4ar126b9pc1ihlw2c0h"; }; "33450e05fddd79d7692866accaff42adf9cb9a97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/33450e05fddd79d7692866accaff42adf9cb9a97; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/33450e05fddd79d7692866accaff42adf9cb9a97"; sha256 = "0yg8i2hg1mrx6mppwm1xs3hwpdv9m20l5881vbncyvgpy9a37kgb"; }; "3347d72ae38994059c896549688eac5a145b35fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3347d72ae38994059c896549688eac5a145b35fe; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3347d72ae38994059c896549688eac5a145b35fe"; sha256 = "1pxfsdbmrhal911bb5pjmkk0j70nik0m5kc1b9i675v4h4ysfk3x"; }; "33870814a45b700847bc8d18c59c18d1daa72623" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/33870814a45b700847bc8d18c59c18d1daa72623; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/33870814a45b700847bc8d18c59c18d1daa72623"; sha256 = "015v4x2gkkcpnz7jf35gbq0z1x3b0drcyp21ignx3xz7w6cxz97m"; }; "33902cc01c7eda10161025651275a129da5ead6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33902cc01c7eda10161025651275a129da5ead6e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33902cc01c7eda10161025651275a129da5ead6e"; sha256 = "1g3i1zx14zg5dmbs6pcrrg0xw1rpsqavvbrxd79m5r09c90y6kbh"; }; "33d0a2949662b327b35a881192e85107ecafc8ac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33d0a2949662b327b35a881192e85107ecafc8ac; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33d0a2949662b327b35a881192e85107ecafc8ac"; sha256 = "1x60d939njwsak5r3mga01bkv2c2ggvq28hvqnx6s0z7icch7vib"; }; "342f323d0582f6c4897956e82b4549bbf9c47973" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/342f323d0582f6c4897956e82b4549bbf9c47973; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/342f323d0582f6c4897956e82b4549bbf9c47973"; sha256 = "1l6wr3rbkg5hs0wda43c1dk2gfg2a9r53rki2yls0i9xirhfmkd7"; }; "345fb7a468fc7c5315a11b86b2c600ac91955213" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/345fb7a468fc7c5315a11b86b2c600ac91955213; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/345fb7a468fc7c5315a11b86b2c600ac91955213"; sha256 = "1jw46pcrndls655pyx57acdj44v4kr3jg7b04ibmxc31j0mn1955"; }; "34901ceb8b3afa22d4a75f06c3c465a3292592d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/34901ceb8b3afa22d4a75f06c3c465a3292592d3; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/34901ceb8b3afa22d4a75f06c3c465a3292592d3"; sha256 = "1lmnfbi5l6fk6p4iaa30dpali392xm8r1fz1nd0jil0zr7d3kcll"; }; "349fb1419c99f4b260e3bb7b3a7cb5273c5b88dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/349fb1419c99f4b260e3bb7b3a7cb5273c5b88dc; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/349fb1419c99f4b260e3bb7b3a7cb5273c5b88dc"; sha256 = "0xdrf7zqci1ffn6w0pw8hq4ijbppbka72fb2lgrqjiawzmhh1i5h"; }; "34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7"; sha256 = "0fvrksn1668yxx9fbpchawvnah6n4zpicc865djhfqq1h5vfndfv"; }; "34b38730a025a0c75cff4caa03512a0054d0695c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/34b38730a025a0c75cff4caa03512a0054d0695c; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/34b38730a025a0c75cff4caa03512a0054d0695c"; sha256 = "03m8rvh9hrz1rp0004vav5gdkj2c79j2h3adhjlbgcx8llr3z3p4"; }; "34da962d8bda23fc14978d82c2c5fb761acc5815" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/34da962d8bda23fc14978d82c2c5fb761acc5815; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/34da962d8bda23fc14978d82c2c5fb761acc5815"; sha256 = "13xv0nb13z4f57xf9rvnnd73ssf8cx26mvagjmikzsi7chvbpbwn"; }; "34f9df3c5cbc087be9cf8b8b2084287fb9f3b2e2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/34f9df3c5cbc087be9cf8b8b2084287fb9f3b2e2; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/34f9df3c5cbc087be9cf8b8b2084287fb9f3b2e2"; sha256 = "0dywks9jrd72xlmxzvcgd5blphf89r98g5h6k76grmc9k2mswwv3"; }; "351da091078402bf85cff8964a50e1ecaf81e7ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/351da091078402bf85cff8964a50e1ecaf81e7ce; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/351da091078402bf85cff8964a50e1ecaf81e7ce"; sha256 = "1qx85bsc094gzng5x426d6gcbhfjnqhahly3s0dq3g3vw915jl2s"; }; "353076c56a6ecfb890a7ab5f30c881a73e09d508" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/353076c56a6ecfb890a7ab5f30c881a73e09d508; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/353076c56a6ecfb890a7ab5f30c881a73e09d508"; sha256 = "17lbpk2zkm36l67lfbrmf0wc8x47ywkji127592q707wc4zgh397"; }; "3579a812b187dc0ebafb13d5914b27deab2c4367" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3579a812b187dc0ebafb13d5914b27deab2c4367; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3579a812b187dc0ebafb13d5914b27deab2c4367"; sha256 = "0pnppnyx0nk9grvn2sqha2wmfky42f92mvnxs7scavg913zxi3sg"; }; "357fc4cd09e4eea77faa70a271346bfd5d0b8417" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/357fc4cd09e4eea77faa70a271346bfd5d0b8417; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/357fc4cd09e4eea77faa70a271346bfd5d0b8417"; sha256 = "05xfhmc9y3q31nrjsfnifx709l5yrss0qkilbw19da4lhxqknb6i"; }; "35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e; + url = "http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e"; sha256 = "1i88krwy1kxphjcl4l5bxfp4z8dyl4lgj9nrw09dvj8k7azzjvlx"; }; "35e0d2f1b5d56bea19aa9443dd5c41b4ef095b4e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/35e0d2f1b5d56bea19aa9443dd5c41b4ef095b4e; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/35e0d2f1b5d56bea19aa9443dd5c41b4ef095b4e"; sha256 = "16k5gkkwmwldbaf29yfshhawqxxq5ccpwylw8wklc56705ib3x96"; }; "35f95404a8393dcd6374b594b1c2bb5acce427ed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/35f95404a8393dcd6374b594b1c2bb5acce427ed; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/35f95404a8393dcd6374b594b1c2bb5acce427ed"; sha256 = "0qvh62961qhp0j46p18iiyv3fw783lrcljlxzr3vv3zszpvnqyhv"; }; "3639943c4bf99c8f284de9f812bf2cd6eff5d49b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2456855-d820875aa14148d6807c08cda631b764/3639943c4bf99c8f284de9f812bf2cd6eff5d49b; + url = "http://cdn.unrealengine.com/dependencies/2456855-d820875aa14148d6807c08cda631b764/3639943c4bf99c8f284de9f812bf2cd6eff5d49b"; sha256 = "00rdh4lcfb7mwlkqxzrpqd9g88znfajm1cbcd83zxdyc2jkipi18"; }; "363bd76bc4fa81ad344802f2fb8610153a5ca75f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/363bd76bc4fa81ad344802f2fb8610153a5ca75f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/363bd76bc4fa81ad344802f2fb8610153a5ca75f"; sha256 = "0sllg3pgm9jqq73i89l1smrl2y35cgd8667q05v1x9ilhlxpb2zs"; }; "36922d450606299836b10b930c0c66af1f780347" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/36922d450606299836b10b930c0c66af1f780347; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/36922d450606299836b10b930c0c66af1f780347"; sha256 = "0ribsanhwk7m3qvqydpkhvhi00js7n9wabi3c3l0jib6knndphsh"; }; "36923d3780cea992eb61b86d48b1a61297b44536" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/36923d3780cea992eb61b86d48b1a61297b44536; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/36923d3780cea992eb61b86d48b1a61297b44536"; sha256 = "0i4av37slygbl1xynai7h6cb7dsg773zgafdmy10jmc2bb8dp4ky"; }; "36af7f5290dd60c07f83b8a398eb9721c24a6154" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/36af7f5290dd60c07f83b8a398eb9721c24a6154; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/36af7f5290dd60c07f83b8a398eb9721c24a6154"; sha256 = "0rwi5y9sra4pnxdw5l8ykf6s26dg5clflr76f66vdppvipd38rf0"; }; "372698b3d3b17da23c0c53958fefda69c1198f54" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/372698b3d3b17da23c0c53958fefda69c1198f54; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/372698b3d3b17da23c0c53958fefda69c1198f54"; sha256 = "1824igxlj2yc3b2li4gapwlgzgx9gd3kw2gnlkcxdsw1m2h79npd"; }; "374b33734d17be020f3eec73cf16a100e905a8c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/374b33734d17be020f3eec73cf16a100e905a8c5; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/374b33734d17be020f3eec73cf16a100e905a8c5"; sha256 = "0d3ax4shw2y8bivqajmfgzmf3bg1syz6i91pk8jbl38i1007h4l1"; }; "376fa7bdb1a776f7100bfaa29f24a9b81bb5a97a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2701146-722550daa90f4e4996a6cdd478880969/376fa7bdb1a776f7100bfaa29f24a9b81bb5a97a; + url = "http://cdn.unrealengine.com/dependencies/2701146-722550daa90f4e4996a6cdd478880969/376fa7bdb1a776f7100bfaa29f24a9b81bb5a97a"; sha256 = "1znfn4asyx1spinx8jpc5r479a30n5cnbb4pvlas6sb3hy8q68hd"; }; "3779adbbb84b7918fcaa4bc8df4b64a45e50aa88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3779adbbb84b7918fcaa4bc8df4b64a45e50aa88; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3779adbbb84b7918fcaa4bc8df4b64a45e50aa88"; sha256 = "0g3gww1rq1z7lrnxw6gw3i33h799fbmh717qm599w47pq73xmffl"; }; "37a47bf076c47063d031b82f827412bf05a5f500" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2550873-dbd5ea4331fc461794c4770d56863ff2/37a47bf076c47063d031b82f827412bf05a5f500; + url = "http://cdn.unrealengine.com/dependencies/2550873-dbd5ea4331fc461794c4770d56863ff2/37a47bf076c47063d031b82f827412bf05a5f500"; sha256 = "0v71m3c03xv44f17rznw6jbn5k7vac2g3547wsvin7y1vr7jhy11"; }; "37d805efe0d2358727b0deeb9f5c56b3b68a8478" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/37d805efe0d2358727b0deeb9f5c56b3b68a8478; + url = "http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/37d805efe0d2358727b0deeb9f5c56b3b68a8478"; sha256 = "0chznyg2xnyx3zz2q9q6i9cdk26m6chcp6pjzm8lnvc4k7p2mbls"; }; "37f1c844684794da07d9c537b175855f8266fdbb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/37f1c844684794da07d9c537b175855f8266fdbb; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/37f1c844684794da07d9c537b175855f8266fdbb"; sha256 = "07ypy820rrps4d4icdv0bklaa6kyn50gyyaq5yspmwkn07rp5hbv"; }; "37ff9ca732f3611a92185cfbfd25e6eb7d3d2fde" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/37ff9ca732f3611a92185cfbfd25e6eb7d3d2fde; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/37ff9ca732f3611a92185cfbfd25e6eb7d3d2fde"; sha256 = "0lj5ajjx53k7d7m770hdm0mfanfi0kj7vhnfi7x5h75gpzihi6g6"; }; "3811b277d1080f2314e9ffd524da841aefd84ce0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/3811b277d1080f2314e9ffd524da841aefd84ce0; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/3811b277d1080f2314e9ffd524da841aefd84ce0"; sha256 = "1m9hjjiskwc6xnfkyzbg52mx2alxl8qh19cawykr1dnd1qs2ngz6"; }; "38c9a6c68be0ce7a36d83391a637010447ad3301" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/38c9a6c68be0ce7a36d83391a637010447ad3301; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/38c9a6c68be0ce7a36d83391a637010447ad3301"; sha256 = "08j52b49p3ps6i78v9h04gwxzcbibg41i5dcxqi47vq9ihhb1nsa"; }; "38e0e2e02bc165327038c973058790e3962d6079" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/38e0e2e02bc165327038c973058790e3962d6079; + url = "http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/38e0e2e02bc165327038c973058790e3962d6079"; sha256 = "0yb69a7b63sjcjha8lh1l86jlfxln1gz5y7gplqbj0m0c4qrg72v"; }; "38e6833dfb6b74f5acf23d984bb9ad01086e1f39" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/38e6833dfb6b74f5acf23d984bb9ad01086e1f39; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/38e6833dfb6b74f5acf23d984bb9ad01086e1f39"; sha256 = "10ln9haj9317g49zmi5jc4dq56qs0b4qr8g1g6rypiw8ndlm00rq"; }; "38e79fc7612d6ebd7278e23e7d0a9df3b95155d5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2739939-d1b07735d39c4b8c8427e05b6d9e3571/38e79fc7612d6ebd7278e23e7d0a9df3b95155d5; + url = "http://cdn.unrealengine.com/dependencies/2739939-d1b07735d39c4b8c8427e05b6d9e3571/38e79fc7612d6ebd7278e23e7d0a9df3b95155d5"; sha256 = "0w1lwm9dfrprxa3dcaln774c3l5b4ai2sssww81f8adjafbvzr7l"; }; "392d5e0536abeb83ccfc28ba9fb96e9d1d6507f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/392d5e0536abeb83ccfc28ba9fb96e9d1d6507f3; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/392d5e0536abeb83ccfc28ba9fb96e9d1d6507f3"; sha256 = "1b9a86drlml4cflilwa188i5ay69ydhpc3q477947vs5gbgc7ln7"; }; "3965204d2b18ccd0b4d2191500d373ac064180df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3965204d2b18ccd0b4d2191500d373ac064180df; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3965204d2b18ccd0b4d2191500d373ac064180df"; sha256 = "0k801x11n4zmfshdmb6sby0k29bjcd83hzcbwp0hg7vnnxqsmfm9"; }; "39935e746b413e3c60c9a519e893cd19db5425ed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/39935e746b413e3c60c9a519e893cd19db5425ed; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/39935e746b413e3c60c9a519e893cd19db5425ed"; sha256 = "1cr5666m83v6xkpwr2j51sf1c3a0q5kahh3j8ygrd74alm9v4wqd"; }; "3994a8a3195661395d89f209755bbab5ce1861c1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3994a8a3195661395d89f209755bbab5ce1861c1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3994a8a3195661395d89f209755bbab5ce1861c1"; sha256 = "1jybg0wg5n99rsmzd4i3a1bs1p78gngzar0qan131scdywcv8384"; }; "39e7e3f8feb9564c8b90f2f6d630bb8ba96f2eb9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/39e7e3f8feb9564c8b90f2f6d630bb8ba96f2eb9; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/39e7e3f8feb9564c8b90f2f6d630bb8ba96f2eb9"; sha256 = "098vn5ps7qv0qjs6fvrzyx9qiq9qw7pslnhy4djm4xzamxs0n49n"; }; "3a6db69d4f8128addbe24660128ecd2ed9fd6dd0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3a6db69d4f8128addbe24660128ecd2ed9fd6dd0; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3a6db69d4f8128addbe24660128ecd2ed9fd6dd0"; sha256 = "04kx57syka9vpvgh5mjlmc1gg8d2ng5snrv36vmw4gq3pm0dpfi5"; }; "3a7f7a47aca5ad86176f1ceafd77139a06b89e11" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3a7f7a47aca5ad86176f1ceafd77139a06b89e11; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3a7f7a47aca5ad86176f1ceafd77139a06b89e11"; sha256 = "06vrb7nwi09vdkv8b143g2wz0wvn1qbp0l3l95g9frp4xkd6j8cf"; }; "3ab17699ce95c427b0c0f3466b4226e2e30b92d0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ab17699ce95c427b0c0f3466b4226e2e30b92d0; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ab17699ce95c427b0c0f3466b4226e2e30b92d0"; sha256 = "0vl7np8bpwcylsgdlvy8hmkzapj1a8pqywy0n01vk7q0fi0wxmc8"; }; "3b07d6bb5a24bb96557c48982e8b3389df33cfef" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/3b07d6bb5a24bb96557c48982e8b3389df33cfef; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/3b07d6bb5a24bb96557c48982e8b3389df33cfef"; sha256 = "1fgkqm5f66x937nlmbsz2qx2lnd276f7rjhcyf073prv9hwhi2vh"; }; "3b14a44c8ac4cda934824f4a48fdf11ae6dc27fc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3b14a44c8ac4cda934824f4a48fdf11ae6dc27fc; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3b14a44c8ac4cda934824f4a48fdf11ae6dc27fc"; sha256 = "16y6n3nlpkccpafcbavp8qhcc9adyjfyw75wjafkaw5ixd7c89ag"; }; "3b1f533104a3f316e188203a3b20770df4580018" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3b1f533104a3f316e188203a3b20770df4580018; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3b1f533104a3f316e188203a3b20770df4580018"; sha256 = "1wmryvw8i7zvkcb2z2ajafsngnj66cls3918n91d2lqihsjp5x6c"; }; "3b5ec1d1c8209489d78b2eabab46ec59ea1f65b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5ec1d1c8209489d78b2eabab46ec59ea1f65b2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5ec1d1c8209489d78b2eabab46ec59ea1f65b2"; sha256 = "1qvjpm5sy6544wfvnlgd5qa2sw9q0nd3dvxqdqsvbjfzf1da6min"; }; "3b5feab7a5f46b3129c78ca6512692588d73eb8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5feab7a5f46b3129c78ca6512692588d73eb8a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5feab7a5f46b3129c78ca6512692588d73eb8a"; sha256 = "1q0is2ciaxcan8fzlf57pbwj096d1lhnym8653ifxbxii9jm7ng3"; }; "3b8d4ffa1666bbdbcc426ba6232275bc853755ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3b8d4ffa1666bbdbcc426ba6232275bc853755ea; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3b8d4ffa1666bbdbcc426ba6232275bc853755ea"; sha256 = "0mws36ydilcpavzhc32jzxllwgkxsk7d5yhrfa51j1b894wn60qp"; }; "3b9f2ea7dea75e5b70ff3776eb46e114725fed92" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b9f2ea7dea75e5b70ff3776eb46e114725fed92; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b9f2ea7dea75e5b70ff3776eb46e114725fed92"; sha256 = "054gxl8l03zzib7awcq2va0gh0xisl7yzz2x4rdpiv97zm0hlzx7"; }; "3ba6f94d6907237623e86c589cc6e9a1399e5a2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/3ba6f94d6907237623e86c589cc6e9a1399e5a2e; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/3ba6f94d6907237623e86c589cc6e9a1399e5a2e"; sha256 = "022lj7l1w267kw44flfjpbsq9qj99xinw5qqxk352h8py2nddm2a"; }; "3bbd878e5357ee3dc1e752b07819ba87b7230ef4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bbd878e5357ee3dc1e752b07819ba87b7230ef4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bbd878e5357ee3dc1e752b07819ba87b7230ef4"; sha256 = "146g6zzaiwj2lcfazn6ap8ldqxs16cfdm6larc93g3yys16c87y9"; }; "3bc0fb4bdfdd1b6c1c684583efe02591afadb98e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bc0fb4bdfdd1b6c1c684583efe02591afadb98e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bc0fb4bdfdd1b6c1c684583efe02591afadb98e"; sha256 = "1diniwvlf76vcfxb3cqxx2xdkwsvd486qwkdgfvwyx3np2kypk8b"; }; "3c01d8c58f5ec428fdb8057af5387b8bca2816eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c01d8c58f5ec428fdb8057af5387b8bca2816eb; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c01d8c58f5ec428fdb8057af5387b8bca2816eb"; sha256 = "0mrfagcmk325vzrhw1zb96ka5b0a37xm7g1k2b4s62xcl641qk55"; }; "3c048c63475cdefe078376d2fc1ab8294de64e58" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3c048c63475cdefe078376d2fc1ab8294de64e58; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3c048c63475cdefe078376d2fc1ab8294de64e58"; sha256 = "1gkh00i117krs57p2xwpi4s3vwby5na98nni0n5xf3aglqwa9anz"; }; "3c262ad594e83bd32b0d3a0f794b737101eb2874" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c262ad594e83bd32b0d3a0f794b737101eb2874; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c262ad594e83bd32b0d3a0f794b737101eb2874"; sha256 = "065r44gb0jsfz4m6zfvlj3w6wgh4fdmr52f353r5z1gxqqzqszr2"; }; "3c3769be5270bdf2ff4215c9f2f6c15d0ae05b7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/3c3769be5270bdf2ff4215c9f2f6c15d0ae05b7e; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/3c3769be5270bdf2ff4215c9f2f6c15d0ae05b7e"; sha256 = "0ia41s3fvywhfgb2riqxq9mhhzy477yjix2v1bzq034g19bp4s1i"; }; "3c3a62993361bbb928b7f5c0407be6bee08da734" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c3a62993361bbb928b7f5c0407be6bee08da734; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c3a62993361bbb928b7f5c0407be6bee08da734"; sha256 = "0qn8mkxlll5rg4vr22xlwr6dmbsmvvyniry3jv7d3cj3bajqgavp"; }; "3c477e2e63d3533e62d654e63f012e59da5a3edc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/3c477e2e63d3533e62d654e63f012e59da5a3edc; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/3c477e2e63d3533e62d654e63f012e59da5a3edc"; sha256 = "1f625rs8277bqv7wb6cpxpv1ry7zcy4an9q5gq5iz0f56qs3hyxc"; }; "3c65149be3cd5e4689b4eda6bf5569d16b149f6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3c65149be3cd5e4689b4eda6bf5569d16b149f6e; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3c65149be3cd5e4689b4eda6bf5569d16b149f6e"; sha256 = "1zs20c26z86jwjx18zsppkra3d147vynyigibx0klrp0g2lfkpdr"; }; "3c6fd2f94e3497924851a5d8254666518d47a633" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c6fd2f94e3497924851a5d8254666518d47a633; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c6fd2f94e3497924851a5d8254666518d47a633"; sha256 = "00rh0skjjx7b8pd8mmnd2v35vhmsly1f0pnrvwyr9d5pfzsnxb6j"; }; "3c70f43afffaaed52bb87c78f1ecf8de846ce76d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3c70f43afffaaed52bb87c78f1ecf8de846ce76d; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3c70f43afffaaed52bb87c78f1ecf8de846ce76d"; sha256 = "106bj18q36wr5f1k2fjfish63q6phzwavcl5fh6sq1vzlh6gggz4"; }; "3c8149ddaa7dec626f08fd4fc2d852a4536ddabc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/3c8149ddaa7dec626f08fd4fc2d852a4536ddabc; + url = "http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/3c8149ddaa7dec626f08fd4fc2d852a4536ddabc"; sha256 = "1zl5kv0d37dhvkrhzzs9xn5qx1zpfa5nzy3cc4dvmfhsp74bgf7y"; }; "3c9ccdfb5da6f595a26f2e1f746cfc9f639e57dd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2625762-5759dd47f697403cb15f8e48090b1010/3c9ccdfb5da6f595a26f2e1f746cfc9f639e57dd; + url = "http://cdn.unrealengine.com/dependencies/2625762-5759dd47f697403cb15f8e48090b1010/3c9ccdfb5da6f595a26f2e1f746cfc9f639e57dd"; sha256 = "17wp0p9miy3yll9wyl5kggdg8x1rlbjwpw1w8gyinbvlp87y41md"; }; "3cc84281c7db62939c39b08c06b3174dc52ae63f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3cc84281c7db62939c39b08c06b3174dc52ae63f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3cc84281c7db62939c39b08c06b3174dc52ae63f"; sha256 = "06da44vi1v0gcrq4q3aanrqbpywqjrcm12w6i38kkwa8w2m7fq9d"; }; "3cd0df317d9f5715cd35c147537107dc3a588008" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3cd0df317d9f5715cd35c147537107dc3a588008; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3cd0df317d9f5715cd35c147537107dc3a588008"; sha256 = "0ic2xh8327zzgrpgrcggdq10cx906sidv55ys6bn37yqcm86ihyr"; }; "3ce154ee1488f62d7804205c87d8e37504733e7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ce154ee1488f62d7804205c87d8e37504733e7a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ce154ee1488f62d7804205c87d8e37504733e7a"; sha256 = "1gn1lmmnz00cbrm054q8wf3hxb2i7dhi7vb38dmgy4zwk67qdf3y"; }; "3ce4d40ab5c9c0141c6b805ed0eaa638cacc0e8f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3ce4d40ab5c9c0141c6b805ed0eaa638cacc0e8f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3ce4d40ab5c9c0141c6b805ed0eaa638cacc0e8f"; sha256 = "1zv992b5bndxizgvcmxwdl1mrahg0xpn356s8y4xnbvf4ysimpiv"; }; "3d0b21a35355415e71e8fb7ea0012b306e2a037e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/3d0b21a35355415e71e8fb7ea0012b306e2a037e; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/3d0b21a35355415e71e8fb7ea0012b306e2a037e"; sha256 = "1zwykg73i0rnga0y6cal2x4jlz69n3c6iq3g7c1c7d7a4hsgpy76"; }; "3d2991e772cfa979508e25de5935a89210973591" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3d2991e772cfa979508e25de5935a89210973591; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3d2991e772cfa979508e25de5935a89210973591"; sha256 = "1cacv6pd0p5wmxmfxfp56v4qd3chz6r27c6kbax3p325b6cjf9kz"; }; "3d3ffa0f6b5db075797d9657c491f1cec7434474" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3d3ffa0f6b5db075797d9657c491f1cec7434474; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3d3ffa0f6b5db075797d9657c491f1cec7434474"; sha256 = "0gzfpaw0v6xxbwrj14k1hl6dzn3g532war2h0mbpk5x2zgf05ppw"; }; "3dae84206c49a13a781a04f072560fdaae772628" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2542875-37bf4143b09d4d7a88bd89c6cbba110c/3dae84206c49a13a781a04f072560fdaae772628; + url = "http://cdn.unrealengine.com/dependencies/2542875-37bf4143b09d4d7a88bd89c6cbba110c/3dae84206c49a13a781a04f072560fdaae772628"; sha256 = "027xmslcmb490svay10k7xhj8rsjlmqv13igafnrqw082fz2crvi"; }; "3e2b9f360e17b90289d6aa8e07f64f8bec445375" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/3e2b9f360e17b90289d6aa8e07f64f8bec445375; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/3e2b9f360e17b90289d6aa8e07f64f8bec445375"; sha256 = "0hpm43hbn6wj8gv2hr47cnbfky2732pbqpmhjd33lgd5zjm17ki5"; }; "3edebf50b702f5e5d08876bdea65dbffa3d1e98f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/3edebf50b702f5e5d08876bdea65dbffa3d1e98f; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/3edebf50b702f5e5d08876bdea65dbffa3d1e98f"; sha256 = "196mmj2w2dzp9d9gyllpivnmik2kg54kk1qini5c7va9v0iifh7l"; }; "3eeb2f03152b2114d56a8804fb8d634405321569" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3eeb2f03152b2114d56a8804fb8d634405321569; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3eeb2f03152b2114d56a8804fb8d634405321569"; sha256 = "1mr55cjp8l7jmql2lj146lw2rqgyxb7wff71nm2i8b5mp6w7fa5i"; }; "3ef09650cc8541a72fb0c287cf9008a6ed209a58" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3ef09650cc8541a72fb0c287cf9008a6ed209a58; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3ef09650cc8541a72fb0c287cf9008a6ed209a58"; sha256 = "0wmf0hxsyxqzbzj8r1d7f2pfrqjqwa56wj4i2nnp6cccb7z8vdh1"; }; "3f4cbf00af0438c956f74f514929e02e3e8d43bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/3f4cbf00af0438c956f74f514929e02e3e8d43bc; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/3f4cbf00af0438c956f74f514929e02e3e8d43bc"; sha256 = "0294prdqycf6w77hb88jxirl7jgm00sjgc4nzwkznpf6q32jc1if"; }; "3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09"; sha256 = "1yq7yamysw27k0znsji1p850gk56vq07lbhxs837x0j9mp2qbfml"; }; "3f77d7050ec7beb565e4f6d6ad5f1291b2a066e4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3f77d7050ec7beb565e4f6d6ad5f1291b2a066e4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3f77d7050ec7beb565e4f6d6ad5f1291b2a066e4"; sha256 = "1ibs8qdbh8vp9ba04qs3bziwss5hbqknylqsydafqzmsvg0qgm5k"; }; "3fb53e132dfce0a5c72b3b10fb63fd6b5b89b16d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3fb53e132dfce0a5c72b3b10fb63fd6b5b89b16d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3fb53e132dfce0a5c72b3b10fb63fd6b5b89b16d"; sha256 = "0lrs4n23klz5jqvchpzpflk3hyva9rr335qx3psd34q64hnkxs89"; }; "401dde870b0593ea8eb48a00e180d088dd331d41" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/401dde870b0593ea8eb48a00e180d088dd331d41; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/401dde870b0593ea8eb48a00e180d088dd331d41"; sha256 = "0ijdkqiymih4nm75gky9h6yycd496hjg60kimjnz73bdadanq4g5"; }; "4022d82d143e72ccce04e7825d3328a7b02fc901" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4022d82d143e72ccce04e7825d3328a7b02fc901; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4022d82d143e72ccce04e7825d3328a7b02fc901"; sha256 = "0f69a35zcjw4l68gd1qv21xnxhlwgx5fxi2msxfa5blg9i45vkvv"; }; "402bb37cf56e4ae0f047b4de8eed748f259c6a15" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402bb37cf56e4ae0f047b4de8eed748f259c6a15; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402bb37cf56e4ae0f047b4de8eed748f259c6a15"; sha256 = "0l3sgilafh4ri0mjz6jlx59bz82qbd6q119alb9wjpvlwgk19s9d"; }; "402bd33734002ac97efc2300bb3bcf9d2cad7bac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2514362-4164223ab78d4e529a0f07d941c2c537/402bd33734002ac97efc2300bb3bcf9d2cad7bac; + url = "http://cdn.unrealengine.com/dependencies/2514362-4164223ab78d4e529a0f07d941c2c537/402bd33734002ac97efc2300bb3bcf9d2cad7bac"; sha256 = "18p16j0jpavsdyv2mgif0s7xcqhw9574vfi95qs7q4pb4lpd89pq"; }; "402fa9c093561a043e89a83d3b0553126fdf2bb7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402fa9c093561a043e89a83d3b0553126fdf2bb7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402fa9c093561a043e89a83d3b0553126fdf2bb7"; sha256 = "1ga2xj4v20a28fj6n8byq7082psawipfr00f54mx33wr2flb6c7n"; }; "403c4174a81ed034269a740a7bb9739dd07b91da" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/403c4174a81ed034269a740a7bb9739dd07b91da; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/403c4174a81ed034269a740a7bb9739dd07b91da"; sha256 = "157xba3mjgw37m6i29chdk2l4jg4jmlp4fkmfsanl9g66z7aw4hg"; }; "4041329918332581cd573d410c6a163dcf7b7495" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4041329918332581cd573d410c6a163dcf7b7495; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4041329918332581cd573d410c6a163dcf7b7495"; sha256 = "1gvjy14zqhnyx4nnlcbj6649d2aw3vwaxhrls3ngrkw5jw74ckxj"; }; "409e09bd60df0765b85577118bd3da12988d97d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/409e09bd60df0765b85577118bd3da12988d97d9; + url = "http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/409e09bd60df0765b85577118bd3da12988d97d9"; sha256 = "0lq5lril4ylw3xg46djxzlkbvv109lpa4l0l7ag0q555yzhfcnp8"; }; "40b467567f62e9c6d0bf5cba7d2ff43cb9a687b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/40b467567f62e9c6d0bf5cba7d2ff43cb9a687b3; + url = "http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/40b467567f62e9c6d0bf5cba7d2ff43cb9a687b3"; sha256 = "02qslivwbnycygypvqicgv8syrsrdw9cv7bmz4zxp9ghbkmasx5g"; }; "40ddad780beeb95a141365c9ee5c50502ecf9a3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/40ddad780beeb95a141365c9ee5c50502ecf9a3f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/40ddad780beeb95a141365c9ee5c50502ecf9a3f"; sha256 = "0bd531adivbi47mb1nqmwm23plhsh6hbj54wrpnkyzbkciq24jd8"; }; "40f7222800bd5c3a14980a0f6e706ce2b8a6dc8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/40f7222800bd5c3a14980a0f6e706ce2b8a6dc8a; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/40f7222800bd5c3a14980a0f6e706ce2b8a6dc8a"; sha256 = "13rzkw224mz4qfsz7f3pywdl2nkly5k28jvrzqqhksrrddf4y78g"; }; "410e46447d67d73c00b681403bff72bd1c8db3e1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/410e46447d67d73c00b681403bff72bd1c8db3e1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/410e46447d67d73c00b681403bff72bd1c8db3e1"; sha256 = "0dahfv97qdxza2yjp60mkflmf541s99c8j0m119vigv5795nrp2l"; }; "4138035f335e8ef4c9bd7d4700011e8ce6bc06dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4138035f335e8ef4c9bd7d4700011e8ce6bc06dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4138035f335e8ef4c9bd7d4700011e8ce6bc06dc"; sha256 = "1fn99hdnba0zza6w416xkqj6vajgk57s5qphqbn2jsrf024kaal4"; }; "41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3"; sha256 = "0k259kbgvw1zm8dcs0mp21lh88zvkxzy1v2zyj8yb8hp94gdwp1r"; }; "416a2ef9e1d85c9801e1c11b5b75e6647f40b196" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/416a2ef9e1d85c9801e1c11b5b75e6647f40b196; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/416a2ef9e1d85c9801e1c11b5b75e6647f40b196"; sha256 = "1zxg97c2211hspph0d9jzaqlvrfd8cx49d40k5halnz3h682cl2d"; }; "416d80d6a7cfb22bb899d4a75a80c78ddd81ffbf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/416d80d6a7cfb22bb899d4a75a80c78ddd81ffbf; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/416d80d6a7cfb22bb899d4a75a80c78ddd81ffbf"; sha256 = "16xfnicsjfvhzcnzpf1rpbb9q42dq67kbxi84mb4gvdrqigkvmg5"; }; "4179740ad0fac203ef6afbed2ade36619667a9f2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4179740ad0fac203ef6afbed2ade36619667a9f2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4179740ad0fac203ef6afbed2ade36619667a9f2"; sha256 = "02kg5bp115via7359bkr3vgbk1nvylhzjc9szzqjbff3mb2fxgdn"; }; "418d45c49afe937049dd1f731516162b1f716dda" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/418d45c49afe937049dd1f731516162b1f716dda; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/418d45c49afe937049dd1f731516162b1f716dda"; sha256 = "05fqszk0lv9ynzpf6lr44jddhm5lr476naxiiqsvwj4g62i8nv6i"; }; "41b5b5efc87e1d57447016f701ab6688ba9bed94" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/41b5b5efc87e1d57447016f701ab6688ba9bed94; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/41b5b5efc87e1d57447016f701ab6688ba9bed94"; sha256 = "0gcfhbzh8hqhv5xzyfz20j01haxgyirilv8nphg74ky961y2sj2g"; }; "41d5dc73ef01e6cc21c028fba64a655a4f2d3d52" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/41d5dc73ef01e6cc21c028fba64a655a4f2d3d52; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/41d5dc73ef01e6cc21c028fba64a655a4f2d3d52"; sha256 = "13sdr479wysfckxv8lx7p3kh0mc9ajdyknkvzgklaxcxpl591y67"; }; "41e03d2c0ea9b66441ae01c7aa831107fba3ffed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/41e03d2c0ea9b66441ae01c7aa831107fba3ffed; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/41e03d2c0ea9b66441ae01c7aa831107fba3ffed"; sha256 = "0zfmpa24cl54f7zlpcmc6ki6kqh0qnv6g5kfi9jv51m9l2cg0x5g"; }; "41e5224b15d09a7227b36b443d5ad87d74e45b50" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/41e5224b15d09a7227b36b443d5ad87d74e45b50; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/41e5224b15d09a7227b36b443d5ad87d74e45b50"; sha256 = "1mpq5lifwddv3mg2lxh3973nz3k3j9bs6r0ma3zknc9pjzvhr6z4"; }; "41fd3f7a3fb916297e3f478f49ee73a7ef8b0eea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/41fd3f7a3fb916297e3f478f49ee73a7ef8b0eea; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/41fd3f7a3fb916297e3f478f49ee73a7ef8b0eea"; sha256 = "1m0san717x975926nnbinwbq8wchxbrj8w9pddq72s9k3h57a51q"; }; "41fddcc984061641cb8c27aba4b296bd158bb7b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/41fddcc984061641cb8c27aba4b296bd158bb7b6; + url = "http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/41fddcc984061641cb8c27aba4b296bd158bb7b6"; sha256 = "0pq8gl1n7anxky03fy135mwcp76y6270i5jjq7il985mhqa9n3xs"; }; "42325aa5f02bc9fc9310d7edd42e4e731ef6896a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/42325aa5f02bc9fc9310d7edd42e4e731ef6896a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/42325aa5f02bc9fc9310d7edd42e4e731ef6896a"; sha256 = "1r6fhxi4341408ibhgq92yw8hih2nq7m9klax7hsfmdr4di537hg"; }; "4245e1d2e7ad643f66f744a3ed38052789489640" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4245e1d2e7ad643f66f744a3ed38052789489640; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4245e1d2e7ad643f66f744a3ed38052789489640"; sha256 = "08fnw7apzsdwx44q2bc66r6gb24z5df5573zsf0fibnflz457zj0"; }; "427e2d72759a41c12424a8f41db8c46c533e7aad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/427e2d72759a41c12424a8f41db8c46c533e7aad; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/427e2d72759a41c12424a8f41db8c46c533e7aad"; sha256 = "1anhhx1xifzqa7lifb63jgrfdx0j5j3ngr7pd9acbwhf1fnz1xan"; }; "4287f776bff018fbd5847a483885c62661d3e8b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4287f776bff018fbd5847a483885c62661d3e8b7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4287f776bff018fbd5847a483885c62661d3e8b7"; sha256 = "0ka3mm4icsf0rvlq84s0zc2pyyymwfl7vidvhp6gphi9wb0gg0si"; }; "429bcf5d037539b13d24742b82d8b2e4dfc310a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/429bcf5d037539b13d24742b82d8b2e4dfc310a2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/429bcf5d037539b13d24742b82d8b2e4dfc310a2"; sha256 = "15609z8zkg3xf0374ccr3qw4c0y4l6via1c8vpn1g3n3aclgrcvr"; }; "42a2da181f0e0c22a37f4fd84ebb8992f5801a40" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/42a2da181f0e0c22a37f4fd84ebb8992f5801a40; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/42a2da181f0e0c22a37f4fd84ebb8992f5801a40"; sha256 = "134cik312f2mc2cm6syz3khm11j4z5mki1ajis11plp9yc4awlrb"; }; "42a53ede1b023f8c062f8cdda02e206b50d9b706" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42a53ede1b023f8c062f8cdda02e206b50d9b706; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42a53ede1b023f8c062f8cdda02e206b50d9b706"; sha256 = "0bf6waiwj827d6q4jlk84iz194gkrwyq62iqbh5k7via2xwq8j1w"; }; "42d3f4d56675451d30b582bc5dbd45fd3782d471" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42d3f4d56675451d30b582bc5dbd45fd3782d471; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42d3f4d56675451d30b582bc5dbd45fd3782d471"; sha256 = "1k865pqjyn2i29kypga3m3g705pclw082zcr50yx4pzb4gyx81ss"; }; "43024ccccfd7e2f51ab71730d53234756da7f75e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/43024ccccfd7e2f51ab71730d53234756da7f75e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/43024ccccfd7e2f51ab71730d53234756da7f75e"; sha256 = "0qiafmz9hg9g936y32jfi81whv6ijsbxi3wq2vjygwvw12z3pp7k"; }; "4325240311aaa4a187fdea78519062e5a4d7269b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4325240311aaa4a187fdea78519062e5a4d7269b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4325240311aaa4a187fdea78519062e5a4d7269b"; sha256 = "13im2y96y8wlfq6i85dw6rpbrzqypvzhbb5f6272zi8mg0vl68c4"; }; "434d698cf6b167859c6903ad11759566d8f57b0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/434d698cf6b167859c6903ad11759566d8f57b0e; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/434d698cf6b167859c6903ad11759566d8f57b0e"; sha256 = "1p1mx0lffkz0lb4ryrjv8nbvmb3vzr1yhd6bar6mgn9j26x68nhd"; }; "4358d2bea62c66562030e8970bcc999a9f049cd9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/4358d2bea62c66562030e8970bcc999a9f049cd9; + url = "http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/4358d2bea62c66562030e8970bcc999a9f049cd9"; sha256 = "10g40dfpwcmwid6x2zj4jsr8wlfaj19wncimrj64ma84x9asid6l"; }; "439b6b4397b03135c193062962f4e04f7efb2f97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/439b6b4397b03135c193062962f4e04f7efb2f97; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/439b6b4397b03135c193062962f4e04f7efb2f97"; sha256 = "0fxgi0m96lz8vsig99mi43bmkxj4zqhdrmcin3s15qgqv5fnpp0i"; }; "43af1512f9c03f740a4b1e5e5d430bc184358f2c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/43af1512f9c03f740a4b1e5e5d430bc184358f2c; + url = "http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/43af1512f9c03f740a4b1e5e5d430bc184358f2c"; sha256 = "0rllprr8x2wylsymvmwjbfxm5wc81q6hxz9xqz7ps99wnaa376vj"; }; "43ce938e9264c991f07b4ab978d5801d8b385c7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/43ce938e9264c991f07b4ab978d5801d8b385c7f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/43ce938e9264c991f07b4ab978d5801d8b385c7f"; sha256 = "1xlk578ab6r0jia0ipsznr8kb0r95ljzqxhlxbp2gizyad80rbvw"; }; "43d2fd6b8e568774d422003e4f1d8cbd90c8ad09" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d2fd6b8e568774d422003e4f1d8cbd90c8ad09; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d2fd6b8e568774d422003e4f1d8cbd90c8ad09"; sha256 = "1gz46rhfy3w67945dwrbj5364z3r5vfkq7kcsdvlam8sn31mban6"; }; "43d5b1f0c816ddc1a75dc7c9eba7e3861bfac93b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d5b1f0c816ddc1a75dc7c9eba7e3861bfac93b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d5b1f0c816ddc1a75dc7c9eba7e3861bfac93b"; sha256 = "05x9b14mm65v3kg0w3vknv0las5669dxqi863pj283gykai5y5j8"; }; "44550fffb2c3c4bd3e389a62349314f917149551" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44550fffb2c3c4bd3e389a62349314f917149551; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44550fffb2c3c4bd3e389a62349314f917149551"; sha256 = "0gwbyp4cz93dhp4lvlzb16ylkdkl1861q5sc9x8lzcfhrdlzbbqx"; }; "44988d061edf9fe35e6423243372b984f7bbc8ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44988d061edf9fe35e6423243372b984f7bbc8ce; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44988d061edf9fe35e6423243372b984f7bbc8ce"; sha256 = "1ijy29lal9bg8kwbjgzvzjc57f1vls2g073hvlgvha84a32qhd5f"; }; "44aea7fc4f0d356841e342fce80616815268e97c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44aea7fc4f0d356841e342fce80616815268e97c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44aea7fc4f0d356841e342fce80616815268e97c"; sha256 = "1xspkr7cq8whhk66z695yvgf0z1z4w6rck41n9jxr9c2xkycafvs"; }; "44bfee33fde62aa26954c1ac4481489a0997550f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44bfee33fde62aa26954c1ac4481489a0997550f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44bfee33fde62aa26954c1ac4481489a0997550f"; sha256 = "1r6zdd24m7m0rykn7qbl1bkbxmiwh2jmkkqva5nw0zyc33rhy6dz"; }; "44e185cd6baca3dd0931a5b2c536c61efdb62652" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44e185cd6baca3dd0931a5b2c536c61efdb62652; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44e185cd6baca3dd0931a5b2c536c61efdb62652"; sha256 = "10ji73zvb3wjsr9283r2may7kwjwrch0zdkw5qi845q1xdsy03qn"; }; "44f209fa07e3956ffbde948b34a35bca08039bf4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44f209fa07e3956ffbde948b34a35bca08039bf4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44f209fa07e3956ffbde948b34a35bca08039bf4"; sha256 = "19h5cpf1n828wxy77sa7ajfiy3pfg2hjnaprml3wl7g607zsb2wi"; }; "450752e8befdc19f8af240d074de7cfdff240ff6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/450752e8befdc19f8af240d074de7cfdff240ff6; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/450752e8befdc19f8af240d074de7cfdff240ff6"; sha256 = "03f7fvkqvbxi8xfqc5x6zzwa141rzjrvxfn4npcqifzv543zlwfl"; }; "451249045a83162ab51a602006391035d937b4fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/451249045a83162ab51a602006391035d937b4fe; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/451249045a83162ab51a602006391035d937b4fe"; sha256 = "1f594dpxyb2vln0bjj10yzxmxim88d27asaxb05b7msj8s4if4qz"; }; "457e4cce8cc3af1d0237efdf32e01dd8149d1366" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/457e4cce8cc3af1d0237efdf32e01dd8149d1366; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/457e4cce8cc3af1d0237efdf32e01dd8149d1366"; sha256 = "0ipki4pq2irfhy10sapsah9frp3nx6j33sjdi5a82sz5hc00czvy"; }; "458ce5eadcec7db6c79cc7c4785864957159d82d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/458ce5eadcec7db6c79cc7c4785864957159d82d; + url = "http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/458ce5eadcec7db6c79cc7c4785864957159d82d"; sha256 = "0xlz9ag4xxqza8c1bbx4aj73nphngqnqmb2g2kx4wzrsf60balqk"; }; "45b816b4d0f405c95179b48d4aef89b863be886b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/45b816b4d0f405c95179b48d4aef89b863be886b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/45b816b4d0f405c95179b48d4aef89b863be886b"; sha256 = "1b6n8l0xwxfpxysljvqgh2pccqxsv7hhsgvigk7bc7bfvm4f2bc5"; }; "45b8181ade7c5f9416382db55ebb9ff006a860ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/45b8181ade7c5f9416382db55ebb9ff006a860ae; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/45b8181ade7c5f9416382db55ebb9ff006a860ae"; sha256 = "0mns61vw4kv3v6pjmkqzad95x9sqlvkazr2qcxlp2pjl41h349jw"; }; "45b97a83e7de5add19253c91c6f9c3fca6133a0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/45b97a83e7de5add19253c91c6f9c3fca6133a0b; + url = "http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/45b97a83e7de5add19253c91c6f9c3fca6133a0b"; sha256 = "0bymag4rf1gnyc3yfn4xjmi1n22zkfqzqdpg09wbnrmghld92rhx"; }; "45c2f6d67121c2498bd3723b899243959da6e017" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/45c2f6d67121c2498bd3723b899243959da6e017; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/45c2f6d67121c2498bd3723b899243959da6e017"; sha256 = "1z8ks07y1q8ifi8mbb2n1igfa6a6dpmmzscn14mr860a8lh9lp1v"; }; "4653f71982a36f99d16331bbaebded3036eff50f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4653f71982a36f99d16331bbaebded3036eff50f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4653f71982a36f99d16331bbaebded3036eff50f"; sha256 = "05n5s7vhiiisamy7n1c31s68yy7iplfsr8q7qkjwijp6svpz3w4r"; }; "46cacf33335ca2ec60df0c71cc36af0602ca8bfb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/46cacf33335ca2ec60df0c71cc36af0602ca8bfb; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/46cacf33335ca2ec60df0c71cc36af0602ca8bfb"; sha256 = "117j7ps781wbi14cc9r5v0n64xsl7p8yr2ism8i4n8ij3i106cf7"; }; "46cea2f0ed5abe44ea23ba16c356889ae16636e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/46cea2f0ed5abe44ea23ba16c356889ae16636e3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/46cea2f0ed5abe44ea23ba16c356889ae16636e3"; sha256 = "1rsy2lac1ck6flh60jh5b640kns104f40qr5ffsf7mxj3zzc9h3w"; }; "46e1d0fc2b1da401fb554e93a9e7f69ba5b9857e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/46e1d0fc2b1da401fb554e93a9e7f69ba5b9857e; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/46e1d0fc2b1da401fb554e93a9e7f69ba5b9857e"; sha256 = "18vcpjb9qvy9xswrk2zna7g2xmj0dycpsnnpddydlby8mrda1vd0"; }; "47057afb3b675c9635a3a671c05a32525083c8c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/47057afb3b675c9635a3a671c05a32525083c8c4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/47057afb3b675c9635a3a671c05a32525083c8c4"; sha256 = "120gd17dy4m36r4y36ivjkmn9vvfgycfw0jna7vx85qys7f2qslx"; }; "471521a96267727393067d510fa208a9f090ee56" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/471521a96267727393067d510fa208a9f090ee56; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/471521a96267727393067d510fa208a9f090ee56"; sha256 = "043gl3chcbcyh3na9wcv26kag7hixk31yh8synihybml4bf30am1"; }; "4733ca75068a23a29a578352ecc8dddc16d714e6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4733ca75068a23a29a578352ecc8dddc16d714e6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4733ca75068a23a29a578352ecc8dddc16d714e6"; sha256 = "11g301j3gim04xisk1pzdsxv5ygj6mf39rkxw9hfrbzky4y5zfb5"; }; "476436af18523fd743894ca8676ceb74f5d392f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/476436af18523fd743894ca8676ceb74f5d392f4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/476436af18523fd743894ca8676ceb74f5d392f4"; sha256 = "1qld1qqnmmn6bcw8gxs8fi0227w5d2pwyk9hxqqwfvqazmbmrdra"; }; "4782725e3bb079fa03e2bc6e6d6ca44c9352c9ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4782725e3bb079fa03e2bc6e6d6ca44c9352c9ce; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4782725e3bb079fa03e2bc6e6d6ca44c9352c9ce"; sha256 = "002qq97afjmvpwa5vhpzyknywxfg4f6hm8f9z6vhcbc487j24dfx"; }; "47c3dd6d524f1923aa08644c2e4083ced4d481a0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/47c3dd6d524f1923aa08644c2e4083ced4d481a0; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/47c3dd6d524f1923aa08644c2e4083ced4d481a0"; sha256 = "093zcfgvnr9x6b50zi4dcvp0qp6dsp4y9z438gzf8cz41ilmk2mq"; }; "47cb5394541c26f3bab3e60fab36b8acba1d8907" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/47cb5394541c26f3bab3e60fab36b8acba1d8907; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/47cb5394541c26f3bab3e60fab36b8acba1d8907"; sha256 = "0aqwpc5krlqi81g2wcbq2591kbnnv01cgiq4qdyd9jlkfpk79ra3"; }; "485fd4e8653da37ae3302212c1ff6c808f2e1e7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/485fd4e8653da37ae3302212c1ff6c808f2e1e7a; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/485fd4e8653da37ae3302212c1ff6c808f2e1e7a"; sha256 = "10k9s21042a9gi2k03d9r5lg8h2gx07sa39wx8zrfs697g0g9082"; }; "486e59fe184e878bc399bc95f1f81b94c3e84237" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/486e59fe184e878bc399bc95f1f81b94c3e84237; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/486e59fe184e878bc399bc95f1f81b94c3e84237"; sha256 = "19ck4wmlzfj43w9b1l54na3ql62n0jx0h7ffb0ghizswnb36nvcv"; }; "487d06c15e88caec9f131b002ba4ced31ca8ea46" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/487d06c15e88caec9f131b002ba4ced31ca8ea46; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/487d06c15e88caec9f131b002ba4ced31ca8ea46"; sha256 = "1mfvbd2p8508f07dhh1dfqaq1a9n7c4l5dsfajzhcdndlzawrbbc"; }; "488efa1da7ed78314cdd0c95ad874f812853fcd7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/488efa1da7ed78314cdd0c95ad874f812853fcd7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/488efa1da7ed78314cdd0c95ad874f812853fcd7"; sha256 = "09jjzzvszqv7f7a70i8gib9x04h6967by6cs8dfqfb8ysfrx426n"; }; "489e5e0492743ad3dbfd8599a5d00f284d4b13d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/489e5e0492743ad3dbfd8599a5d00f284d4b13d3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/489e5e0492743ad3dbfd8599a5d00f284d4b13d3"; sha256 = "1szgnqakysr4r59zqi8i1sjqbpykjb7flvmw8p00mx0zqpw2qi6y"; }; "48a51059aeb73ec544e6c1ace7303ebc6143b782" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/48a51059aeb73ec544e6c1ace7303ebc6143b782; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/48a51059aeb73ec544e6c1ace7303ebc6143b782"; sha256 = "0w212ajaypf69mx8hc94kz61l1f64dvh99rpmzrycwllxk17il1w"; }; "48becdab8fce5451f3de26a98ad8c4b41c51c09e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/48becdab8fce5451f3de26a98ad8c4b41c51c09e; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/48becdab8fce5451f3de26a98ad8c4b41c51c09e"; sha256 = "1pb09gl5ji1c71nhg2bv6i3wknx11vnxcjjyfvlzgpfsw7mi9c99"; }; "48e9d691a3bd11810596fcf32aef9faa872a8fc3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/48e9d691a3bd11810596fcf32aef9faa872a8fc3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/48e9d691a3bd11810596fcf32aef9faa872a8fc3"; sha256 = "0anv20icv51j79f4vzzh7q1a9jwpk65zzs0brsylyfkylskd9wz7"; }; "4905bf362dac5be04631d1ce552b8184a6f9eb7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4905bf362dac5be04631d1ce552b8184a6f9eb7f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4905bf362dac5be04631d1ce552b8184a6f9eb7f"; sha256 = "0yf7x9wc9zwdpdpqh6x8kcrphmc63ij9xcb6ggfbihjhhfkq9m2y"; }; "493b6e580a2441b91435c406da869b799e031da2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/493b6e580a2441b91435c406da869b799e031da2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/493b6e580a2441b91435c406da869b799e031da2"; sha256 = "0ic4h663s8yyckvzrkbbhg8ih888igvcswsnnh66zwrl3h5wjshd"; }; "497e1a2128ecd56307d393c59ed4962de200412c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/497e1a2128ecd56307d393c59ed4962de200412c; + url = "http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/497e1a2128ecd56307d393c59ed4962de200412c"; sha256 = "0860mkkg6k4c2fjzq573xpf13cvcmn276z45hi146y0llsb9hpwf"; }; "49d7eaf76b4f243057c59f3fda3310c655144a0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/49d7eaf76b4f243057c59f3fda3310c655144a0e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/49d7eaf76b4f243057c59f3fda3310c655144a0e"; sha256 = "07sn2y8bzh0flhrkkw12x7rc9p78mmsx0dphsm0mxb9nkkznygq0"; }; "49e02b1078a769deaf14989f1731daeb927f2192" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/49e02b1078a769deaf14989f1731daeb927f2192; + url = "http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/49e02b1078a769deaf14989f1731daeb927f2192"; sha256 = "180yvr32wnhgivkz5i00l88wkw4l5v9d5vgmdxhjvndzv52ij00p"; }; "49ffdfd5801c4c8c2b51be4b2e51108595a340f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/49ffdfd5801c4c8c2b51be4b2e51108595a340f7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/49ffdfd5801c4c8c2b51be4b2e51108595a340f7"; sha256 = "0m0qv1wyslkdg75ymbba0ppp35ir9wmm51jqsaac3wxjacgwp85f"; }; "4a3c35cce04ee67dd38baa7ef7703dbd6fa6b14f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4a3c35cce04ee67dd38baa7ef7703dbd6fa6b14f; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4a3c35cce04ee67dd38baa7ef7703dbd6fa6b14f"; sha256 = "02kqv01gjhj6402i18cq5ihp9nbcl4ij7hanb2l6k3mw2f3h9202"; }; "4a6de8866429da8f1baf5ddaf3973c381e507f9f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4a6de8866429da8f1baf5ddaf3973c381e507f9f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4a6de8866429da8f1baf5ddaf3973c381e507f9f"; sha256 = "113qadrkv6calsid2bbb0lswimr3qasf0mzyvbxcg888q934dirp"; }; "4a996ed0676c92d061e923599186c0d592b8c180" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4a996ed0676c92d061e923599186c0d592b8c180; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4a996ed0676c92d061e923599186c0d592b8c180"; sha256 = "0gfmg2si5wmv99d0f3z82qdpcnkb377hvd9mjn29npvmzcxdk8xl"; }; "4aac38fbf89541859c14c7fbf320b1f9deb410f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4aac38fbf89541859c14c7fbf320b1f9deb410f4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4aac38fbf89541859c14c7fbf320b1f9deb410f4"; sha256 = "1snz21gw73zi27bha2jq2099j4hgk03xrn382rgc9l0j6zx1hcld"; }; "4ac1a3a1641db0a7d533dc58b147c50ee5e61f2d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/4ac1a3a1641db0a7d533dc58b147c50ee5e61f2d; + url = "http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/4ac1a3a1641db0a7d533dc58b147c50ee5e61f2d"; sha256 = "1b0wz0gz103l9vvg2g9xbds3nc65x3bv7nb4rw8k1lafnpypxvx4"; }; "4ac1a96d979c84bea010254903c746d8f0192931" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/4ac1a96d979c84bea010254903c746d8f0192931; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/4ac1a96d979c84bea010254903c746d8f0192931"; sha256 = "0p4zjrik6jbp25vsahv7g8jkpvydkh19winqiswiz91xfjzi7wfl"; }; "4adb6983f2858294dd67959dbb107cb141c93c74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4adb6983f2858294dd67959dbb107cb141c93c74; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4adb6983f2858294dd67959dbb107cb141c93c74"; sha256 = "07fbgdm1d6ymv6m046pmjh0af4syin13f3g36kyh19gbsf81gn51"; }; "4b0a3157b647ecf945962c64e6c1f2a4b0841404" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4b0a3157b647ecf945962c64e6c1f2a4b0841404; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4b0a3157b647ecf945962c64e6c1f2a4b0841404"; sha256 = "0qh7irvdj2ak0ixbq8mvgnyak9l378463ffgvh8a76rvajlmfw01"; }; "4b6a1631906e490aad98097955aaed303b835e4c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/4b6a1631906e490aad98097955aaed303b835e4c; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/4b6a1631906e490aad98097955aaed303b835e4c"; sha256 = "1c8mzirs8qbk2532ai7sj6gx98lhzl2r8c5w78p2zhxc44qds6cy"; }; "4b6f876e200503f43b0378c2bff4e3371dede19d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/4b6f876e200503f43b0378c2bff4e3371dede19d; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/4b6f876e200503f43b0378c2bff4e3371dede19d"; sha256 = "1wxz4zscc57j0h8jrdxiy7qjx5gyz5wv552hkx9swzl8zv1c4vxi"; }; "4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9"; sha256 = "10mgd6mhyp147v70vrjs2pni99f10wvjzzxgv4s1yb0kb1f3rx7m"; }; "4ba9e150400597410bcc2038b890c5ebfab59f97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ba9e150400597410bcc2038b890c5ebfab59f97; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ba9e150400597410bcc2038b890c5ebfab59f97"; sha256 = "11gnqjjjdjjlxnzsx2p2j08xjjpr28zy5g0y5ba2q9fzz1pmi0xd"; }; "4bb876b638318dcb891581ef5c5b60ab49f84a14" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4bb876b638318dcb891581ef5c5b60ab49f84a14; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4bb876b638318dcb891581ef5c5b60ab49f84a14"; sha256 = "0kabkyrgb8jbp90hbmksmh03r5bbfk9rk61rix4krk2dlcb0dazi"; }; "4bc5d5526880f85cc76aa4910df1d4cb262afea4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4bc5d5526880f85cc76aa4910df1d4cb262afea4; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4bc5d5526880f85cc76aa4910df1d4cb262afea4"; sha256 = "18g5sk5ck5yv7bm84c3hm4q1b05kwm4vv5dq5l54a0pkgp59grqv"; }; "4bdc7380f8fb8cd1f70702e4b5dd2f4ea262d125" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4bdc7380f8fb8cd1f70702e4b5dd2f4ea262d125; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4bdc7380f8fb8cd1f70702e4b5dd2f4ea262d125"; sha256 = "0j924pcmddwqap395nsygs3jzcsfp3f225waypzjzwzf0dqdwvdm"; }; "4be9c06ad3f3ec9e3ab2f093677c38c9a57609fd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4be9c06ad3f3ec9e3ab2f093677c38c9a57609fd; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4be9c06ad3f3ec9e3ab2f093677c38c9a57609fd"; sha256 = "0inyckyvag3cjbjw7yir3ga8qx6kly82xhi4ibrqs5anmlbvg6wn"; }; "4bf3ad76dabf85f8e9a2caef2ec4cc44035c1748" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2557508-14de7cde62764f07a29f3058b3db36e8/4bf3ad76dabf85f8e9a2caef2ec4cc44035c1748; + url = "http://cdn.unrealengine.com/dependencies/2557508-14de7cde62764f07a29f3058b3db36e8/4bf3ad76dabf85f8e9a2caef2ec4cc44035c1748"; sha256 = "0d9igj7ncm9bgx4z8sybfw5qa0vsslfp155wgycj77sqbk4vxw6f"; }; "4ca619b184d0aecc977846b5cb89a7789844736d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4ca619b184d0aecc977846b5cb89a7789844736d; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4ca619b184d0aecc977846b5cb89a7789844736d"; sha256 = "0x6km34gk5wmd1p3i2b9a8bhv32337dxmilaq2x9zg12g5j0ab76"; }; "4ca7aeb41838db40fce0bd1181781152f3273c85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ca7aeb41838db40fce0bd1181781152f3273c85; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ca7aeb41838db40fce0bd1181781152f3273c85"; sha256 = "1c47j2as7c67aa4y21gkli9qxzik75aq0abdvjln2mw2yidd9f6q"; }; "4cdfababde3088412ac7195d034c19f4f7e873cc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4cdfababde3088412ac7195d034c19f4f7e873cc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4cdfababde3088412ac7195d034c19f4f7e873cc"; sha256 = "0mqq1vbh9ikcrplnr5sa0lz73p45kl8wc1py3ylmycifymjcb7jk"; }; "4cf428f5e7b38cea3b24dce0380c776e1a06ecaf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4cf428f5e7b38cea3b24dce0380c776e1a06ecaf; + url = "http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4cf428f5e7b38cea3b24dce0380c776e1a06ecaf"; sha256 = "078yzqnwidsx5xqa5p9jvl4qqvhdmx5i2rv31azjc1s9bbyihnyg"; }; "4d0630a1e99d1c060c8dd45b809b2e6c5e6bde7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4d0630a1e99d1c060c8dd45b809b2e6c5e6bde7a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4d0630a1e99d1c060c8dd45b809b2e6c5e6bde7a"; sha256 = "0hrpqrb934z5qjxmvp2hpjqkbr80xwqrd8bxj63pdcz11axnk1c1"; }; "4d1f805d1ce7a7c6f0eb46295359f5ef01297c17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/4d1f805d1ce7a7c6f0eb46295359f5ef01297c17; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/4d1f805d1ce7a7c6f0eb46295359f5ef01297c17"; sha256 = "1fh46cz761wk4cy6xskjs07a58sb2im6n56gk20mmslw2iv8y1z2"; }; "4d65a777c9a440e869ef25b04b71a9d9a6ff7190" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2593226-b511ed7dda124055acab1a4474628222/4d65a777c9a440e869ef25b04b71a9d9a6ff7190; + url = "http://cdn.unrealengine.com/dependencies/2593226-b511ed7dda124055acab1a4474628222/4d65a777c9a440e869ef25b04b71a9d9a6ff7190"; sha256 = "0jv2bpb77dshi3kj0wlgzl0y7f5b1g0jr0h47fyraxk2mg10ry5q"; }; "4d6f9c6d7a261e35898225b1fade32da175cb530" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4d6f9c6d7a261e35898225b1fade32da175cb530; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4d6f9c6d7a261e35898225b1fade32da175cb530"; sha256 = "1kn5zg25rwl37vskaggw7hlb2yxxambk0lhaa4i0mlgj8050m2n6"; }; "4db41bf84756d686fc71e275d2c94c5c2299de97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4db41bf84756d686fc71e275d2c94c5c2299de97; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4db41bf84756d686fc71e275d2c94c5c2299de97"; sha256 = "17rijjf8k5fa827szbj2adz8ix8z6h607xpa0mg69hrl9jxbi7jp"; }; "4dbf88901817044507142dfafe605a1b527a5733" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2416381-a1125fd46e044645898de0a3f7870b3d/4dbf88901817044507142dfafe605a1b527a5733; + url = "http://cdn.unrealengine.com/dependencies/2416381-a1125fd46e044645898de0a3f7870b3d/4dbf88901817044507142dfafe605a1b527a5733"; sha256 = "0bsykmshh4677rlkgd7qx2j0alcskw8krkvfzardcq481zkv3i7n"; }; "4de19ef682be73fd5616348eafabda7e5b5c2614" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4de19ef682be73fd5616348eafabda7e5b5c2614; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4de19ef682be73fd5616348eafabda7e5b5c2614"; sha256 = "0m3phx8581x615y7dg98kg0bdkka07897pjcd759dxjfbvvy2fyl"; }; "4e0bab5bde5138bbeb03c118ed5450afb6087c8f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4e0bab5bde5138bbeb03c118ed5450afb6087c8f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4e0bab5bde5138bbeb03c118ed5450afb6087c8f"; sha256 = "1afci1zkw3skyih5ij2ld2z75xp3vf2q4ssdb39xgjw84hagxybl"; }; "4e10a129d42108f8b10039ca6b879fd30bfeb431" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4e10a129d42108f8b10039ca6b879fd30bfeb431; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4e10a129d42108f8b10039ca6b879fd30bfeb431"; sha256 = "0qyadw0q43aj15c699minvb2xbd6hlarwjy7gfsym9vbrv55fhjh"; }; "4e6e5e7b59b428c37f77a90e081f121a450cb039" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4e6e5e7b59b428c37f77a90e081f121a450cb039; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4e6e5e7b59b428c37f77a90e081f121a450cb039"; sha256 = "0vpr0k1mf4zg5k90jkx8jxm11dl0ky8jlyq17zcdl4v0ricadw57"; }; "4e7e810806daa53af602a84d64ae8277b20e8884" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/4e7e810806daa53af602a84d64ae8277b20e8884; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/4e7e810806daa53af602a84d64ae8277b20e8884"; sha256 = "1j4ms2b2g34d3hr2cwbimwlljpm9a08vwv6d644ryib170kiv8z2"; }; "4e98b65102ae8ae6833a82df09b1c4926070f680" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/4e98b65102ae8ae6833a82df09b1c4926070f680; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/4e98b65102ae8ae6833a82df09b1c4926070f680"; sha256 = "12np9i6rrfb72pzb53wqs9i2pi54gfd95sq5g1b5appj3qqvl5cw"; }; "4eacf8ae62800ea91a75533032d4a4abad00c1dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4eacf8ae62800ea91a75533032d4a4abad00c1dc; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4eacf8ae62800ea91a75533032d4a4abad00c1dc"; sha256 = "1i23518c07q9q9npwrbmxl1dxx0sxyviv4l9892s8kjj2gamf4kn"; }; "4ee7da06ece4e65e4b1f6c4f3f60b4f183a6b0cc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ee7da06ece4e65e4b1f6c4f3f60b4f183a6b0cc; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ee7da06ece4e65e4b1f6c4f3f60b4f183a6b0cc"; sha256 = "1pliz4710qi465vhy2z90w9br02jx6k3r192izn96njsnd02mm4x"; }; "4efa7b4c022fb3147eafad578190d50881927acd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4efa7b4c022fb3147eafad578190d50881927acd; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4efa7b4c022fb3147eafad578190d50881927acd"; sha256 = "1pic400nbygcarkrkzcdvhb00pq25iipn3bwlgcng38ihfay7wjm"; }; "4f65d69acee548a54f8329d2457356d425bee4a7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4f65d69acee548a54f8329d2457356d425bee4a7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4f65d69acee548a54f8329d2457356d425bee4a7"; sha256 = "1bl8arab79mh10qclam0gmf0bf7rqj4zbas3bsz2jq6mnw7hz7py"; }; "4f6a87f4bf05f150a09c25735784bc3739871dfb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/4f6a87f4bf05f150a09c25735784bc3739871dfb; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/4f6a87f4bf05f150a09c25735784bc3739871dfb"; sha256 = "0kal7sz290wjq3p8v76kyhj9l783h8br06cfyd8vr93xnrmxj18s"; }; "4f81cd7206cb477f1b15d71433f87035b8ef4b61" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4f81cd7206cb477f1b15d71433f87035b8ef4b61; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4f81cd7206cb477f1b15d71433f87035b8ef4b61"; sha256 = "0dkad05vjbxqvdhx3594j7vx7qjjckpzcsnbwmlb6jvlp7ki4qal"; }; "4f9629d19fa7928aaae10e4bb7c79195fb4f2436" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4f9629d19fa7928aaae10e4bb7c79195fb4f2436; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4f9629d19fa7928aaae10e4bb7c79195fb4f2436"; sha256 = "0w26dm0npmlbdg73j89rmbxpkr64i80wdm4zzgsafrh3vmaqs38n"; }; "4fb2c8f58c15b33818735ef8f75ba170a1b1f65d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4fb2c8f58c15b33818735ef8f75ba170a1b1f65d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4fb2c8f58c15b33818735ef8f75ba170a1b1f65d"; sha256 = "111hbfbikwl85iscj37k3wn35s47cd6qzpcsir1ylaxcb9q350j7"; }; "4fbda194b6083d60ec1a9e281eb6caad5716cf1e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2489751-c4626d8ec02a40d3817d364f1bc426a5/4fbda194b6083d60ec1a9e281eb6caad5716cf1e; + url = "http://cdn.unrealengine.com/dependencies/2489751-c4626d8ec02a40d3817d364f1bc426a5/4fbda194b6083d60ec1a9e281eb6caad5716cf1e"; sha256 = "0nfihbl3pwni0gpfrpcdi4xggdkr0m9d4lq788w9hfb4phfppkjh"; }; "4fe88f539e62bf77da44db73cb91ffe913569e34" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4fe88f539e62bf77da44db73cb91ffe913569e34; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4fe88f539e62bf77da44db73cb91ffe913569e34"; sha256 = "0vl7g23l199imd5n0ll78bf6bk5spx33r1sdzwbwyf439xd53zn5"; }; "4fecd0bf8aca3391671cf59243a551e7b58f745f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4fecd0bf8aca3391671cf59243a551e7b58f745f; + url = "http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4fecd0bf8aca3391671cf59243a551e7b58f745f"; sha256 = "0yzh9i84lm4gh8wsljsa66bg9g6p0xbff3vq5rk1nha0zwg0i7x1"; }; "502e3c3b4dcae339b71743fc346f2398f2d7a218" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/502e3c3b4dcae339b71743fc346f2398f2d7a218; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/502e3c3b4dcae339b71743fc346f2398f2d7a218"; sha256 = "1qirpjwv6cmx2g74dlswhd5haaqff9km47xv79m6rd3c4q5xn0xs"; }; "50606bde1b8f7f906c86dad14730c53cab06b477" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/50606bde1b8f7f906c86dad14730c53cab06b477; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/50606bde1b8f7f906c86dad14730c53cab06b477"; sha256 = "1kfvwbxhl69f08ryfh39105xda14vz06r6zhvi18d3cy50znamw4"; }; "508797aad17ea00c10d3c50bebc98d3981dd7bb9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/508797aad17ea00c10d3c50bebc98d3981dd7bb9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/508797aad17ea00c10d3c50bebc98d3981dd7bb9"; sha256 = "1r9csvlr703whm8dk759xnn89glrp1gbdxs60ahspls48yxj1syg"; }; "5098f795311987869f91ed638f4c0a395312211a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5098f795311987869f91ed638f4c0a395312211a; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5098f795311987869f91ed638f4c0a395312211a"; sha256 = "1j3k1vixg49ilcmvd9k82dq7lj0dlmf8iaz8zvsgzgril9azd3nw"; }; "50eea30641c70b731a2069bd514ef5f1709825de" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/50eea30641c70b731a2069bd514ef5f1709825de; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/50eea30641c70b731a2069bd514ef5f1709825de"; sha256 = "0p9k5jhmhv26i18c7axi9yvr29d4wzq4zr08875m1hcwhij3wyxg"; }; "51298934386bbe2da528af9262277810d6653396" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/51298934386bbe2da528af9262277810d6653396; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/51298934386bbe2da528af9262277810d6653396"; sha256 = "1yygwd8i6cp67rgz59g192x1klh3rxgsyzpmxcinj4b0iwihglvc"; }; "512f28040301a00935d7f1ded68e709b048d7f1d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/512f28040301a00935d7f1ded68e709b048d7f1d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/512f28040301a00935d7f1ded68e709b048d7f1d"; sha256 = "075szic2vp5f6c3kmy432xn8r81pb6c82dwhpigmyvjl0hjqqcf5"; }; "51413e0814803560ea68a0cdfa59ae901551ad14" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51413e0814803560ea68a0cdfa59ae901551ad14; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51413e0814803560ea68a0cdfa59ae901551ad14"; sha256 = "1cbb5a1drx313zi7llrbwsj7yqshinxs3i1q86y63vrjh9yimsb6"; }; "514684d898b2ab6135a63ae87054e6af91cac2ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/514684d898b2ab6135a63ae87054e6af91cac2ae; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/514684d898b2ab6135a63ae87054e6af91cac2ae"; sha256 = "0xha9la702szpf8nqrm9kril6qdfl3vxpl18npm8d3rxgsbrrj1p"; }; "5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61; + url = "http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61"; sha256 = "18p404kg10mqfh5d2rcwalxrgr5ihw0lp14rm5xf1aiw303mlf61"; }; "5152492459f57a1bb4d120be68d29ed666c87c33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5152492459f57a1bb4d120be68d29ed666c87c33; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5152492459f57a1bb4d120be68d29ed666c87c33"; sha256 = "17nfafsnk349q31cyrppz4w50z8c5n0ff2v6n5s3z8vzx4pj1zhg"; }; "519dd66ccb831a904959a155fd43639be5a97863" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/519dd66ccb831a904959a155fd43639be5a97863; + url = "http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/519dd66ccb831a904959a155fd43639be5a97863"; sha256 = "01rd9jvys40vi6xqpyf2r1dqj4r3gg61w58madq8wq7q0x4wvvcg"; }; "519e03a04b64bc3d14eefb416e21ae15c6f0121e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/519e03a04b64bc3d14eefb416e21ae15c6f0121e; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/519e03a04b64bc3d14eefb416e21ae15c6f0121e"; sha256 = "15gfg5klklnhbfbsx0jqy33zamc32l0aiji064mjbkliwv1hm51b"; }; "51f74fd271b725c13ee25b2dae5d9b5250116180" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51f74fd271b725c13ee25b2dae5d9b5250116180; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51f74fd271b725c13ee25b2dae5d9b5250116180"; sha256 = "1zn2lm64icq0bjnayczrl7a6d66jyxbv46cgnixlnvpa0dq1bx5m"; }; "51fd67fd01d7f93ebe372aa67ec66496e9ccf3b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/51fd67fd01d7f93ebe372aa67ec66496e9ccf3b1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/51fd67fd01d7f93ebe372aa67ec66496e9ccf3b1"; sha256 = "0xzjsdcfbzl41lwbblq00hy4w3kmjsbl8ai85xa5qdkzc8d8krsk"; }; "525da4df29fa810fe46aef9432572bbb5743b36f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/525da4df29fa810fe46aef9432572bbb5743b36f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/525da4df29fa810fe46aef9432572bbb5743b36f"; sha256 = "0y445vx9i0572y6cj5jbzl9gkcxgs8kn1qpc3zjzhn61ckdijc4s"; }; "5270c6b547cfda7e26cad076321fd7be0e5a061d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/5270c6b547cfda7e26cad076321fd7be0e5a061d; + url = "http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/5270c6b547cfda7e26cad076321fd7be0e5a061d"; sha256 = "14r1vw9hw6nlndj1iplwk0qfnr2y8b880g6fgnzwd31p0dbcim8s"; }; "52ad7360b0e7a95cc19aa7de2f2433ca955eac9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/52ad7360b0e7a95cc19aa7de2f2433ca955eac9b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/52ad7360b0e7a95cc19aa7de2f2433ca955eac9b"; sha256 = "0z164smiksv7hka7cj4d68cj5nmy4marwipq48nan3365g9j0r37"; }; "530b33d367b237887fd7f3666822b40a696806f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/530b33d367b237887fd7f3666822b40a696806f3; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/530b33d367b237887fd7f3666822b40a696806f3"; sha256 = "0vj4bax08c5iq035kqihrpksprrkh0nj6hyfswx5qqsca0znh4br"; }; "53190479c1e53af3a2670f6eeb1f4bda0ebd5a80" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/53190479c1e53af3a2670f6eeb1f4bda0ebd5a80; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/53190479c1e53af3a2670f6eeb1f4bda0ebd5a80"; sha256 = "0gncl86d1j8228hcrfckn6ap632ljkxfbkya8wpqq8cspr5xbb0k"; }; "536b4cf746322581a3abe99533df6307e7a9c2c7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/536b4cf746322581a3abe99533df6307e7a9c2c7; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/536b4cf746322581a3abe99533df6307e7a9c2c7"; sha256 = "08d2hxd3v469b39ra57cb13shkzv4dxk44ksy92dw3m5wnwpq6w8"; }; "53738d12a38995c76f4de6f5f064a567f0ff3ac8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/53738d12a38995c76f4de6f5f064a567f0ff3ac8; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/53738d12a38995c76f4de6f5f064a567f0ff3ac8"; sha256 = "1ba1ygd5xwwgciy93pvl8ibd79glh8h7z8mxd32c301n1g7zyh42"; }; "541bb03057456219ae8a2ab97be5603923921739" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/541bb03057456219ae8a2ab97be5603923921739; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/541bb03057456219ae8a2ab97be5603923921739"; sha256 = "0fc4a7yw1psd4qlbc95gkanynyl5jmwdg3ddz3w93i02cd4l3y42"; }; "541d949e247ee005e6e55562dc29055d6159fb64" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/541d949e247ee005e6e55562dc29055d6159fb64; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/541d949e247ee005e6e55562dc29055d6159fb64"; sha256 = "11bws26a0j9wa8amwmpq632glrwmcwkfc5pzapwrhkd3s4snc5x8"; }; "5435cf07dad1155ea3ddbd5178f3dd6013a507d8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/5435cf07dad1155ea3ddbd5178f3dd6013a507d8; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/5435cf07dad1155ea3ddbd5178f3dd6013a507d8"; sha256 = "1mkhn4q4rrf7pdi49fd1968hrikham7s4wx6ch22psfinn5ysda6"; }; "543ebe1dfdaff4a1590fbd156175d836ae2beb0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/543ebe1dfdaff4a1590fbd156175d836ae2beb0f; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/543ebe1dfdaff4a1590fbd156175d836ae2beb0f"; sha256 = "1mdp47id04fc4gb247k0g40byv4nidrjnmyavpgq977yljfpzwip"; }; "544dffe0e2da98dba3a519141a740f849c5ca7ee" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/544dffe0e2da98dba3a519141a740f849c5ca7ee; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/544dffe0e2da98dba3a519141a740f849c5ca7ee"; sha256 = "1kain6a7p6y533wl1075adfzh8733sdac87iq886hjqr89k5jdyx"; }; "5495c21514ee03fd9e7736742077960a79934c74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5495c21514ee03fd9e7736742077960a79934c74; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5495c21514ee03fd9e7736742077960a79934c74"; sha256 = "0n9cg673wa58r1xzspyxb4h3qa73jpw4sk9gc8d4dgl6z3q6lsji"; }; "54be461a1c72b36e4f01f2db78849473477d73dd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/54be461a1c72b36e4f01f2db78849473477d73dd; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/54be461a1c72b36e4f01f2db78849473477d73dd"; sha256 = "0zlp7nhdl0b9yhlbclx3d3r2g4cymppwaa5w168chd4gym8qnv44"; }; "551654d82bdacbe12dfe0a27ff7948b6ad1894b5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/551654d82bdacbe12dfe0a27ff7948b6ad1894b5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/551654d82bdacbe12dfe0a27ff7948b6ad1894b5"; sha256 = "1d1bxj880nyrap1vrxfp9fn1b3pz5dbz6f50ccw6bvfwjg4fwkv1"; }; "5525223a6059a69ca58ad0617598cac64d8659b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620872-38314c216e7741359375cb68452fb2b2/5525223a6059a69ca58ad0617598cac64d8659b8; + url = "http://cdn.unrealengine.com/dependencies/2620872-38314c216e7741359375cb68452fb2b2/5525223a6059a69ca58ad0617598cac64d8659b8"; sha256 = "1rvg2sgkbcnymrvp38847rw828ijr3mxl1zsa5706ndly6gysygb"; }; "553aa77e78f9ac7693e56c9b2ae642c4141aed66" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/553aa77e78f9ac7693e56c9b2ae642c4141aed66; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/553aa77e78f9ac7693e56c9b2ae642c4141aed66"; sha256 = "0nr6gsba11kk96l0r1hk08bbn2iy5z41hah14f85dcidcdfn8q3j"; }; "55575c3f7cb2cd14356f9dd1836e4beeb057941b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/55575c3f7cb2cd14356f9dd1836e4beeb057941b; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/55575c3f7cb2cd14356f9dd1836e4beeb057941b"; sha256 = "0g2x108hmsnfp3cgzxcdj91ikz3x3x4br6rl9vlry03dfvhzwvf3"; }; "5559dc18c6a3a435b34446daa5b51264cf9971fc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5559dc18c6a3a435b34446daa5b51264cf9971fc; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5559dc18c6a3a435b34446daa5b51264cf9971fc"; sha256 = "10dvc0spvjp7r6lsvhr0f9r6nxm29053pr4q712akak7jnqh6nrd"; }; "55d527b168c8ad85340fae2fb9b238e7a568f338" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/55d527b168c8ad85340fae2fb9b238e7a568f338; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/55d527b168c8ad85340fae2fb9b238e7a568f338"; sha256 = "1dcjnifabnbk2v3pwkmk1hn07svavjqsck694dh8ybqcxbkf4sbq"; }; "561af5c6ee4445a0c380bce19a7f5ee82b3fe756" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/561af5c6ee4445a0c380bce19a7f5ee82b3fe756; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/561af5c6ee4445a0c380bce19a7f5ee82b3fe756"; sha256 = "0r5p7rb865yrjag2wn1p8ps76ap6pa83c0lbq7fmsn4xr2m9aq8c"; }; "562c6d13b647a43c555b040ce69507c475089c24" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/562c6d13b647a43c555b040ce69507c475089c24; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/562c6d13b647a43c555b040ce69507c475089c24"; sha256 = "1lq7cl1rbh2xyg52p6260gbqd2l6n58cm0g1ny0fwgkaskbsbvwx"; }; "567807ac295099a07a6c59a7bff568f21dd14860" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2534734-323cf099317f457e9467fda2d086db9a/567807ac295099a07a6c59a7bff568f21dd14860; + url = "http://cdn.unrealengine.com/dependencies/2534734-323cf099317f457e9467fda2d086db9a/567807ac295099a07a6c59a7bff568f21dd14860"; sha256 = "1cimyysd3z3miz0zwvnmqc60s2cc5ymb2dj4dy88iw3zw1a75hsk"; }; "568dc16559220cee02d71db824805edd0d74a3d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/568dc16559220cee02d71db824805edd0d74a3d4; + url = "http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/568dc16559220cee02d71db824805edd0d74a3d4"; sha256 = "1gmfb8106wb12757plw73g6znwqazya41dygzlpmc6zfc5sfd9kw"; }; "56b3ac7ff0cfd2d96ea21ec3d48bce76e2720807" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/56b3ac7ff0cfd2d96ea21ec3d48bce76e2720807; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/56b3ac7ff0cfd2d96ea21ec3d48bce76e2720807"; sha256 = "0vf7hh0cav351qrpkvf897pwdlwnzwjhgfwr8dly6pjf0pqm4c3f"; }; "56d72a0ee05d644fc991dfc250a1534fdacb5b3e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/56d72a0ee05d644fc991dfc250a1534fdacb5b3e; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/56d72a0ee05d644fc991dfc250a1534fdacb5b3e"; sha256 = "0r2kc6cnijar4z50xbsdf6ma4zfjqs9mzklbdamjy3niyzjy5s32"; }; "5725149f4c8e211494463fc9280b6c10907ea321" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/5725149f4c8e211494463fc9280b6c10907ea321; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/5725149f4c8e211494463fc9280b6c10907ea321"; sha256 = "0ifxhhl3rrcaqcxy1izy0abpmii9jzgs55kd537ifmnspi02674i"; }; "57518e7a38c99e38c3bb12baa69c5124f3780152" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57518e7a38c99e38c3bb12baa69c5124f3780152; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57518e7a38c99e38c3bb12baa69c5124f3780152"; sha256 = "1fya8iyfyjnqs0vgqsh3zkdb85z8s9snc188qnwypmyfpy8mpwp5"; }; "57a803d869d2db9788911933ffa0282320e75170" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/57a803d869d2db9788911933ffa0282320e75170; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/57a803d869d2db9788911933ffa0282320e75170"; sha256 = "1gy1dyjmpr6qap6irs2mzfpzmkjhkrci2r4ak1855ggycvy98d12"; }; "57be8202d1bdd44a6b6686351edba4e653af9f01" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/57be8202d1bdd44a6b6686351edba4e653af9f01; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/57be8202d1bdd44a6b6686351edba4e653af9f01"; sha256 = "167dndrfslwss276i0m1dwavg8kk27rhhalj200wk5ywb7dm6xg5"; }; "57d629f9fb09a65be5be7697a5d33a20c2b557a4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/57d629f9fb09a65be5be7697a5d33a20c2b557a4; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/57d629f9fb09a65be5be7697a5d33a20c2b557a4"; sha256 = "0xq600178i6hih6ap7aydgp0xpmmgz56ix21acrawikj89ykv5aq"; }; "57ffba4219a312d7e7daab46237a0f61ddb3ad28" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57ffba4219a312d7e7daab46237a0f61ddb3ad28; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57ffba4219a312d7e7daab46237a0f61ddb3ad28"; sha256 = "1qnw6qn7ywd96pv9bi9g006lnib6c60p312dlhyclphsykbn0lzf"; }; "58031ce6c4634d8b348854a1ad4bc1c74d022c7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/58031ce6c4634d8b348854a1ad4bc1c74d022c7b; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/58031ce6c4634d8b348854a1ad4bc1c74d022c7b"; sha256 = "0lz5wd4qzy64c2sr841ky129z46ha3mxx2xx0l9icxmcxczgaxq7"; }; "5828edda3a662171a3c8e304b857dc7a745b85e4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/5828edda3a662171a3c8e304b857dc7a745b85e4; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/5828edda3a662171a3c8e304b857dc7a745b85e4"; sha256 = "0m3p8iz4n03nw97v6iia6cdgniqp5f9zqr0mqxziwss5hhvwhaf6"; }; "5890d07428ec2ee9086c9f8d07792db118a1b57b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5890d07428ec2ee9086c9f8d07792db118a1b57b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5890d07428ec2ee9086c9f8d07792db118a1b57b"; sha256 = "1x5bqq655j50zfn31kxbrl0zbvf3zjvfgkgsp2w816lg01bkbr97"; }; "58b4bdbc8f5686d4ece9cb4a18f6367d8222f073" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58b4bdbc8f5686d4ece9cb4a18f6367d8222f073; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58b4bdbc8f5686d4ece9cb4a18f6367d8222f073"; sha256 = "0cw0gw0ky6gal0zjlxqbivhsxb1ys7whjfgjbcph9wfmws0n9cnv"; }; "58c296582abb3dba4bc073aa6708c81bc8798ff7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58c296582abb3dba4bc073aa6708c81bc8798ff7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58c296582abb3dba4bc073aa6708c81bc8798ff7"; sha256 = "1197ridzhpvih14rs5gxhvpnbpaz1l52x3cpxnfs5hd80qk212l6"; }; "58c56183f54227469e3aba4fe40c8fc227c66e55" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58c56183f54227469e3aba4fe40c8fc227c66e55; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58c56183f54227469e3aba4fe40c8fc227c66e55"; sha256 = "1nz8qyfhd6a7chs3a44aa8da1y0p7ikgd45y9w09k1wlmjgzby5i"; }; "58cf115d701dba2092d2e4a3f0ed075cc6fe3069" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/58cf115d701dba2092d2e4a3f0ed075cc6fe3069; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/58cf115d701dba2092d2e4a3f0ed075cc6fe3069"; sha256 = "17h20ivmf3ks276vd96xc0z1ashyk3prk7f0p1w8z5vj7kv1y6wa"; }; "58db59892f8758da63e7b9c465b5615f6318634b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/58db59892f8758da63e7b9c465b5615f6318634b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/58db59892f8758da63e7b9c465b5615f6318634b"; sha256 = "151qdvx1kk3r2hisn32g63jpcz5ji5n65ql000wxmav75m25dl9s"; }; "58e46f1625d6b6603897665bac292c5a3566d565" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/58e46f1625d6b6603897665bac292c5a3566d565; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/58e46f1625d6b6603897665bac292c5a3566d565"; sha256 = "0hh2kg1qz3xvcp0gmfky73gm8v2in7593hm59rqcwzk18q9pzwcs"; }; "58e4e03689103981844fc3f19413c5d3eebe2489" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58e4e03689103981844fc3f19413c5d3eebe2489; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58e4e03689103981844fc3f19413c5d3eebe2489"; sha256 = "0h7qlwy4agc9130wb8j5a51pdy2ndvm6lbz1p55a3rjzxpmi7idf"; }; "58f1a93515f38b967b50196a9be74684efbca7b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/58f1a93515f38b967b50196a9be74684efbca7b7; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/58f1a93515f38b967b50196a9be74684efbca7b7"; sha256 = "1bwlqqs4pp20vzxvhs0cqpj3108bxbqk505q93rbgyvlif0kyidy"; }; "58f5f621564cce6f1eb3c9099a1645a0369ece56" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/58f5f621564cce6f1eb3c9099a1645a0369ece56; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/58f5f621564cce6f1eb3c9099a1645a0369ece56"; sha256 = "04finlmybwqzb146rkqmgyfrq34ql2ih5gmxhalfwn2lvlzkykgd"; }; "58f7288e0fe3a5997003f6a117a30579d15f5973" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58f7288e0fe3a5997003f6a117a30579d15f5973; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58f7288e0fe3a5997003f6a117a30579d15f5973"; sha256 = "00a351ajzmfjpc6pbj80dbm677mqrdnx1b7dsjhx91gcarxq8q26"; }; "5906155140815aedc94241abd916f56c6ab4564b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5906155140815aedc94241abd916f56c6ab4564b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5906155140815aedc94241abd916f56c6ab4564b"; sha256 = "12ywwixraayk1hvfq4i2hr5dgykv693sxv6vk6nigxq8kbg0rnqk"; }; "5925a9b0f257cc9517f224bec3dee7ecf883aa08" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5925a9b0f257cc9517f224bec3dee7ecf883aa08; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5925a9b0f257cc9517f224bec3dee7ecf883aa08"; sha256 = "0vglai3jkbls46qvss4l28h4b21ph5x79271hln3ypd2j4chswlx"; }; "59717f7d7697f047103bbfbca63b68088e7172bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/59717f7d7697f047103bbfbca63b68088e7172bd; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/59717f7d7697f047103bbfbca63b68088e7172bd"; sha256 = "1gfm6b9cypdsvndc4id9idainvddjb0zrsa601acy62h97b9gjpm"; }; "5977705c2272d0c3385b70ffc3e5f0a2983e986c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5977705c2272d0c3385b70ffc3e5f0a2983e986c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5977705c2272d0c3385b70ffc3e5f0a2983e986c"; sha256 = "08zlxija7h63j10nhchjnh7mclsfqny6lr6ay8rwcxcgfqz3kr0z"; }; "5983c069abdec3469db5b5874ac27c17341e3f27" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5983c069abdec3469db5b5874ac27c17341e3f27; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5983c069abdec3469db5b5874ac27c17341e3f27"; sha256 = "0f8y8vikn7a6f1rkqkp9y1vyvnx5g8y4pmc0gyvw5lj6hi0ph83w"; }; "598492be84474143365fa6267a0e73936ce8a248" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/598492be84474143365fa6267a0e73936ce8a248; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/598492be84474143365fa6267a0e73936ce8a248"; sha256 = "1s6cvk6p6m8j0w1g45gg2hdnjiwa1sf8zsaf8xvlr10jcwlnc802"; }; "59c4bec5e2957d30ef37c5198c4b90381f3ba20f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/59c4bec5e2957d30ef37c5198c4b90381f3ba20f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/59c4bec5e2957d30ef37c5198c4b90381f3ba20f"; sha256 = "1pxdkbji2wqh6dp648ikn4367zzxfxa8g0lbvdrvbq0a6s5px02r"; }; "59d5809fb3d0b096e7104e798b12b06dc68c750e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/59d5809fb3d0b096e7104e798b12b06dc68c750e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/59d5809fb3d0b096e7104e798b12b06dc68c750e"; sha256 = "1i9mqv3jngvibkby1bfxqjrhib4a1w63sjp4y68cc52gqkv02c22"; }; "5a001646d2ea8b208174c4b954cf99309889bac0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5a001646d2ea8b208174c4b954cf99309889bac0; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5a001646d2ea8b208174c4b954cf99309889bac0"; sha256 = "01gxymd2h4bm1b76yn6jpjpxnyw2ixax3rccmn7f36j8zjbnmcm0"; }; "5a2a13ad5533dc3b2172eb552b404c7c458983ac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5a2a13ad5533dc3b2172eb552b404c7c458983ac; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5a2a13ad5533dc3b2172eb552b404c7c458983ac"; sha256 = "1k2kjhx4y1zgz5sfnjsfdrqvjbr8vdqzg9q425ncd6zr198p5pl1"; }; "5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb"; sha256 = "1s2nlmd81bnk6a884hpmpkgbznnwvilmbbkmx74r8wxwnsnsq3fc"; }; "5a668ab8aef15368ff281ed35e8f730cc8ec5c7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5a668ab8aef15368ff281ed35e8f730cc8ec5c7f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5a668ab8aef15368ff281ed35e8f730cc8ec5c7f"; sha256 = "0ha9h8ghv84byrxy7f0jqqq6gzw777vk73sh9n9kxk994a7r2dc2"; }; "5ab07520be55c428c36c959bcc9d4738bcc55daf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/5ab07520be55c428c36c959bcc9d4738bcc55daf; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/5ab07520be55c428c36c959bcc9d4738bcc55daf"; sha256 = "029p4hajh92z6qf433kr6a4ahprqjj4cgbfqabf636q2d3cjwmxy"; }; "5b00e89032246f6937f2093a0f6510beb7eab715" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5b00e89032246f6937f2093a0f6510beb7eab715; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5b00e89032246f6937f2093a0f6510beb7eab715"; sha256 = "1svvf9jmhhjr36dwlw2lq6y1kl09vnhwcj2m2i8z5fbs2pa724bq"; }; "5b0c314a325c53eec5d98afdb50067ad99c6e99a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5b0c314a325c53eec5d98afdb50067ad99c6e99a; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5b0c314a325c53eec5d98afdb50067ad99c6e99a"; sha256 = "0g7yxicms3pkn4y90r14rf7m076fnf2vwq8rbb3wldqjl1yxmjik"; }; "5b37da6b06afe4b358305eda6827bea44e782b44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b37da6b06afe4b358305eda6827bea44e782b44; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b37da6b06afe4b358305eda6827bea44e782b44"; sha256 = "0d4k8ramsgvir0689dqxj79flqa1vls9lnjidhkwl8k7an5jf9p8"; }; "5b81c9f201693bb927130d9d31a3768f7143dfde" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b81c9f201693bb927130d9d31a3768f7143dfde; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b81c9f201693bb927130d9d31a3768f7143dfde"; sha256 = "1nk5jan996kb09v2cr1invjq8x3zlh4zmli57hik378x282isszz"; }; "5bbeebcd7d784670bb16f73b0bf59374d12e300d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5bbeebcd7d784670bb16f73b0bf59374d12e300d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5bbeebcd7d784670bb16f73b0bf59374d12e300d"; sha256 = "1i4xck1p3269fqa1p69pr7j5r5ssi4hf8p1iq988hhi10wnb74mn"; }; "5bd038cfe2a2f12f6753e85dee691c08d4fcb6e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/5bd038cfe2a2f12f6753e85dee691c08d4fcb6e3; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/5bd038cfe2a2f12f6753e85dee691c08d4fcb6e3"; sha256 = "184pccfp59sq2sg5wk7i20l2qxswv524nym06dpabm1fv9hi8v0m"; }; "5c42920f6f44c053dcf7e87f29ccef27b326822c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c42920f6f44c053dcf7e87f29ccef27b326822c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c42920f6f44c053dcf7e87f29ccef27b326822c"; sha256 = "1z5ii5hslidbijzjqbx66f8h087vn7aidw02m1840pas9dqj9mwc"; }; "5c4dd9ea4a964b483b1e90c4c6a70cedc63ac70b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5c4dd9ea4a964b483b1e90c4c6a70cedc63ac70b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5c4dd9ea4a964b483b1e90c4c6a70cedc63ac70b"; sha256 = "08d1f17f7prkw4c64xalywss6r0f3ab0q46hpamj5cb6xs4igccz"; }; "5c517712601cff542ae326efa6bdc3a7734755c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c517712601cff542ae326efa6bdc3a7734755c9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c517712601cff542ae326efa6bdc3a7734755c9"; sha256 = "0szgq7q7pf5chr81b1a021r6p2rlb30cyhyjazgq4snprx3f0ih2"; }; "5c53d41540d89216421c6738a2b0b389ab94ea8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/5c53d41540d89216421c6738a2b0b389ab94ea8a; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/5c53d41540d89216421c6738a2b0b389ab94ea8a"; sha256 = "0hcz2dj3aansxbyqcrhygsvksa3xlc156c4692rqgcfdawyz1yz2"; }; "5c65fc01f0d8703654412f609c5e78a363870079" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/5c65fc01f0d8703654412f609c5e78a363870079; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/5c65fc01f0d8703654412f609c5e78a363870079"; sha256 = "1v6vgkp5vvjb4zfipyy7a5y5fqafpckb2636fx0bcfqd2ggbqwqd"; }; "5c8363a3b4c54cf612de94a0521b30e565085fc8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c8363a3b4c54cf612de94a0521b30e565085fc8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c8363a3b4c54cf612de94a0521b30e565085fc8"; sha256 = "19fq6zfwiazkgra4dvpawh0fsk0c9278kl3jzanjlyxms9isncsf"; }; "5c9dc79aa298468ccc506369dd777f36e980e71e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5c9dc79aa298468ccc506369dd777f36e980e71e; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5c9dc79aa298468ccc506369dd777f36e980e71e"; sha256 = "0wxn9pw1h2ailgsvkpykrrjdffjdrhswhvznny0l49g7jy39asa2"; }; "5ca8bb4804169df408781649b3ef8a3d6dd2f414" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5ca8bb4804169df408781649b3ef8a3d6dd2f414; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5ca8bb4804169df408781649b3ef8a3d6dd2f414"; sha256 = "1nimfzwxc0nfyrp0avf0nhi7n8z21pgsr9321sk21rfv3ln74bab"; }; "5cf160a27902278f941572aa592a11cf80ac6972" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5cf160a27902278f941572aa592a11cf80ac6972; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5cf160a27902278f941572aa592a11cf80ac6972"; sha256 = "0x9ljwsb5jy434kpf0gkk6v1grsmksk691gv9ypn98r20rj1yix3"; }; "5d09c96c7e23adaab207052fa2fe12dea14e6a44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d09c96c7e23adaab207052fa2fe12dea14e6a44; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d09c96c7e23adaab207052fa2fe12dea14e6a44"; sha256 = "052z4i5naspmnvqlrnz13rvsgfm0qx6yiwq0w3lxwgp09ix612av"; }; "5d2198866f1b1047bb8a047bbeb38cc0622a4cfb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5d2198866f1b1047bb8a047bbeb38cc0622a4cfb; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5d2198866f1b1047bb8a047bbeb38cc0622a4cfb"; sha256 = "1qw4i3v9hfs04r9ys85074j0rdxadzmmjaf3fl6pvrqfprxl0x0x"; }; "5d8e7a77ae12035781174084d8cb9a4e1bcbfb0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d8e7a77ae12035781174084d8cb9a4e1bcbfb0b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d8e7a77ae12035781174084d8cb9a4e1bcbfb0b"; sha256 = "0xwnanfz1rxb8jkh27sirf7iv6dkb99i51q7my15amv5a6r9svrh"; }; "5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2489162-8b935a4b34ed4b3586d7fe3f6ce28b34/5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64; + url = "http://cdn.unrealengine.com/dependencies/2489162-8b935a4b34ed4b3586d7fe3f6ce28b34/5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64"; sha256 = "0kl73ymnq3w0wi630i3kdm2b0j60i708i5938qipq340cwjw4m7c"; }; "5e2314065445393471dbf0e9d3f2755a491d1bba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5e2314065445393471dbf0e9d3f2755a491d1bba; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5e2314065445393471dbf0e9d3f2755a491d1bba"; sha256 = "1i9v4q0r13jd9x4n4inkin8p2936qzlx9bkm6wl0ab9fy0bzl0lm"; }; "5e58fbb85b49d5886aa35ed06da2fc6788db1320" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2596395-e8e15c40b8f2449b881e17834a75d9f8/5e58fbb85b49d5886aa35ed06da2fc6788db1320; + url = "http://cdn.unrealengine.com/dependencies/2596395-e8e15c40b8f2449b881e17834a75d9f8/5e58fbb85b49d5886aa35ed06da2fc6788db1320"; sha256 = "05051mjf0ywp7h94g4sxcxdplm3vfq5nc2l52y08gyz4348s66a5"; }; "5e7d96af5e5b1cafa670bd77ae918457a118f7a5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5e7d96af5e5b1cafa670bd77ae918457a118f7a5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5e7d96af5e5b1cafa670bd77ae918457a118f7a5"; sha256 = "1p9phbl68bq2q7h0afa2q429pbyb0m2wprym4v1ydlz7c50mpkp9"; }; "5e9b459db24eeba207710184e58445974e211543" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5e9b459db24eeba207710184e58445974e211543; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5e9b459db24eeba207710184e58445974e211543"; sha256 = "0r3vxr2hi86v8fhpcr3n4hacaisqn92a9ayh84fym4y964zg5c2d"; }; "5ec11a04eda7f0d96f115e200ac8029b95d4115d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5ec11a04eda7f0d96f115e200ac8029b95d4115d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5ec11a04eda7f0d96f115e200ac8029b95d4115d"; sha256 = "06jfn17h59jc4d0f81s09yfjl2a12r7d9b5p4pn08h50zjkwwhac"; }; "5ef88b8b3029a7aa2ddaaaf702ab09e6f18a9ab1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/5ef88b8b3029a7aa2ddaaaf702ab09e6f18a9ab1; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/5ef88b8b3029a7aa2ddaaaf702ab09e6f18a9ab1"; sha256 = "18zs81swncyyff3a26dlc9c87gvq75b9c0sscwhqak2m18jz1xqs"; }; "5f026e163284ef4d1dd49f3e7ab1ddb74e2e8dbf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5f026e163284ef4d1dd49f3e7ab1ddb74e2e8dbf; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5f026e163284ef4d1dd49f3e7ab1ddb74e2e8dbf"; sha256 = "0rnhwgizkbxn5xdf63kbacsf9s54hzxl3zz6m72jzmlr0i3z17hh"; }; "5f116087ea09d4cd18e565462f0cb21da53cad86" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2407513-a097e3fe93574082b279540eec49fa58/5f116087ea09d4cd18e565462f0cb21da53cad86; + url = "http://cdn.unrealengine.com/dependencies/2407513-a097e3fe93574082b279540eec49fa58/5f116087ea09d4cd18e565462f0cb21da53cad86"; sha256 = "10blnrsjd5f90bkd48k4bqbz69xa0dd41yvkf4v21ffl4sdj184b"; }; "5f239795752cebffb0bd14bc3d14db541d74b95f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5f239795752cebffb0bd14bc3d14db541d74b95f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5f239795752cebffb0bd14bc3d14db541d74b95f"; sha256 = "17wnf2ps8abp04i6mkqz9wmfm58vwjy355pqqs216ap3bq7l7iw7"; }; "5f29467ca4107002987a75eafe3c02d49c0d3fc8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5f29467ca4107002987a75eafe3c02d49c0d3fc8; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5f29467ca4107002987a75eafe3c02d49c0d3fc8"; sha256 = "1irzs3c6qwh0xl7dhpyk24iwbdxyrmpn9qdly7zshgqqzgz26caj"; }; "5fa26a7a3b2978df4bee466d4c76c7b95497e4a4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/5fa26a7a3b2978df4bee466d4c76c7b95497e4a4; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/5fa26a7a3b2978df4bee466d4c76c7b95497e4a4"; sha256 = "03d8366sam4f1xjf7jg2awir5hd3h7hgggif3nisbpvg91nip0vb"; }; "5fe5595a5a46eab069dcd2d6813c1b68cd9ade4f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5fe5595a5a46eab069dcd2d6813c1b68cd9ade4f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5fe5595a5a46eab069dcd2d6813c1b68cd9ade4f"; sha256 = "0s3a3w3xd7w1c7x19nljmkp68xq2b1m2klx60i739y5lb2g7x0lv"; }; "6028c6247770e169982f50ed839356448f3d93f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6028c6247770e169982f50ed839356448f3d93f5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6028c6247770e169982f50ed839356448f3d93f5"; sha256 = "0fcg2pm4l5cg2vah26s2p0p5ljy3hk0vssc0f1f18pvw5zicv3g9"; }; "604e9fc9dd1c1b397add8f900213a87a9964ee51" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/604e9fc9dd1c1b397add8f900213a87a9964ee51; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/604e9fc9dd1c1b397add8f900213a87a9964ee51"; sha256 = "0xsns5k5165s37f4q2qy12958zz112487313n6mlgny6zrp1azf9"; }; "607c94b25b7e4fd2ad13dfdf210e43eca3abf392" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/607c94b25b7e4fd2ad13dfdf210e43eca3abf392; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/607c94b25b7e4fd2ad13dfdf210e43eca3abf392"; sha256 = "169603qzhzfnpmik6vaz14zggkvad57s3d46xlnc63hcq7ambj4a"; }; "60864e331c9e60034c81b9544ca30a14688574a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/60864e331c9e60034c81b9544ca30a14688574a3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/60864e331c9e60034c81b9544ca30a14688574a3"; sha256 = "1hqyxcf0nfwx83qb94534y5idxb0a3554nncbrxx9s4vigm4pdb7"; }; "6093beca3b21ddf0d2d599e6a841ea070ac01fae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6093beca3b21ddf0d2d599e6a841ea070ac01fae; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6093beca3b21ddf0d2d599e6a841ea070ac01fae"; sha256 = "1hxgib9wc4d9s8n0b4y8vaisxqpbhxa699ls5358nz4gdw8zr0q8"; }; "60c5bb5120f6c73b23af87c97dd5179f0ade011f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/60c5bb5120f6c73b23af87c97dd5179f0ade011f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/60c5bb5120f6c73b23af87c97dd5179f0ade011f"; sha256 = "0lcnjvklsxhfzcda286wkwjqdczyb7w0k8v9yybl0cj3ls1ikgnb"; }; "60d58acfdcf8d83f8a76a00017b7b2e18671b5a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/60d58acfdcf8d83f8a76a00017b7b2e18671b5a9; + url = "http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/60d58acfdcf8d83f8a76a00017b7b2e18671b5a9"; sha256 = "1gfl59bmrkvg038xw90xi2g1vmz6wzh84wmsk5g6mm8klpd57aw9"; }; "60f481b9e0149933c045fafa2e119c902e698d0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/60f481b9e0149933c045fafa2e119c902e698d0e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/60f481b9e0149933c045fafa2e119c902e698d0e"; sha256 = "0l9rq8fh7mmkj363gzl673rknaacjv32276y0b52vxxg0m8fylfc"; }; "6110e8d90324f6bac6bd3173bc69f6c58d459d08" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6110e8d90324f6bac6bd3173bc69f6c58d459d08; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6110e8d90324f6bac6bd3173bc69f6c58d459d08"; sha256 = "15rqyi5w0nklw3v2r7fagaa0v6am1p1rgvq7fpk0x98axp7nvx71"; }; "61402aec078bfe9e6535f5a6ae537710fa5e79b0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/61402aec078bfe9e6535f5a6ae537710fa5e79b0; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/61402aec078bfe9e6535f5a6ae537710fa5e79b0"; sha256 = "0f9yjkz2myf9qnnk21n2alsb4ibznl96hh9i57d1y9w425jg4a2x"; }; "61588d85e249c225350c50ef50608fa8b9f4941a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61588d85e249c225350c50ef50608fa8b9f4941a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61588d85e249c225350c50ef50608fa8b9f4941a"; sha256 = "0daalrsynapmicj8bbv2cvg4kijm3x0c8zkayjjzixw5qy8sada9"; }; "618449250b93c28bb8f15751ff6bb653143e5ff0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/618449250b93c28bb8f15751ff6bb653143e5ff0; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/618449250b93c28bb8f15751ff6bb653143e5ff0"; sha256 = "0zkpxgpqcmkfd1a8rsivfrw5qxkqlcw9apa2jkf46417m1k5w2k1"; }; "61a4313e93aab82bab5da58a1b601aad41ecbd60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61a4313e93aab82bab5da58a1b601aad41ecbd60; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61a4313e93aab82bab5da58a1b601aad41ecbd60"; sha256 = "1gf7d5hxdl8hyfs30b2y9f1h6d3b17jfb65jlrx8fbcg70brad42"; }; "61edd2f04c73c5c3eca0bfae13c92213516504e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61edd2f04c73c5c3eca0bfae13c92213516504e3; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61edd2f04c73c5c3eca0bfae13c92213516504e3"; sha256 = "1aslzizrnnibzn5ynspirz9zz7667mzpz4gfvqb8k0x6zk46j5xz"; }; "61ff058a4cd1eab2481a48a115063c62660b78ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61ff058a4cd1eab2481a48a115063c62660b78ca; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61ff058a4cd1eab2481a48a115063c62660b78ca"; sha256 = "08m4b9c2dyld2hr7c8mxpfgvxxdaxj7svaspdfsg91ghq42mscdd"; }; "622d9c355d2344266a6a9065ae16e911791d9ac2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/622d9c355d2344266a6a9065ae16e911791d9ac2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/622d9c355d2344266a6a9065ae16e911791d9ac2"; sha256 = "1i51r1bwfx7fsrykfbj5ylm1yjcp2q9a305vx070rig8m33qygla"; }; "6253baddbb265d8bcab9334e1bb48fee69c0a14c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6253baddbb265d8bcab9334e1bb48fee69c0a14c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6253baddbb265d8bcab9334e1bb48fee69c0a14c"; sha256 = "0xfz545zngq5jnji3zxr8wlwjf8y7c8wd6bmmwkkjf1a2pipywiy"; }; "62cfaf0ed5a8437e74ef0b7331f28a86942cc8c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/62cfaf0ed5a8437e74ef0b7331f28a86942cc8c8; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/62cfaf0ed5a8437e74ef0b7331f28a86942cc8c8"; sha256 = "1asb6h92cnh2xmwnggn6kk9qly4pzw43aax3v07zhs69d3jbhg2x"; }; "62d297add5bd88f5ea16b2ba6b97664dd888eef8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/62d297add5bd88f5ea16b2ba6b97664dd888eef8; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/62d297add5bd88f5ea16b2ba6b97664dd888eef8"; sha256 = "1ajrnfsz53imm4hcsnjznbq087yvbj87s30v948x2vxy7ja17hi2"; }; "62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e"; sha256 = "0jirs3ij917vqznqffqh5bisx4bvqfhbhr56fmlfyykckqwmq7i8"; }; "62e5d1e864e96e11f84e99dcab8cd16345641f43" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/62e5d1e864e96e11f84e99dcab8cd16345641f43; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/62e5d1e864e96e11f84e99dcab8cd16345641f43"; sha256 = "1s7k9h8vpg5j5jq9mc4mgnrb1lyp3y3lvgc7n7l76djm61amqchz"; }; "63574e974c45ae3f0e8fbfcc9d896c53798dd161" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/63574e974c45ae3f0e8fbfcc9d896c53798dd161; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/63574e974c45ae3f0e8fbfcc9d896c53798dd161"; sha256 = "181s6b5j1zqv1hf905paxxgl4j4k20s7ypnv1h7f05qp4sq6wia2"; }; "6359e2376de35d2b27246726788d28d678796a20" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6359e2376de35d2b27246726788d28d678796a20; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6359e2376de35d2b27246726788d28d678796a20"; sha256 = "006mdqfgkxgppxcx8fdfza7z9f80rq27gjncnqpgk3wawb9033r6"; }; "6372acc1b0c4c85801bbd2b0fc9bd17a043c1b67" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6372acc1b0c4c85801bbd2b0fc9bd17a043c1b67; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6372acc1b0c4c85801bbd2b0fc9bd17a043c1b67"; sha256 = "0c8fgaqy17nvsqx4lsiy4fd9z563rbf69sac18bkwyvw0wb4w1s6"; }; "637e6e050e0e294f4e7191f12ad96c9be75aa747" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/637e6e050e0e294f4e7191f12ad96c9be75aa747; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/637e6e050e0e294f4e7191f12ad96c9be75aa747"; sha256 = "1s1vx86pp7c7kabvi0jpvqqykjb5127qwf6ljz8r6awmx9k32yly"; }; "6393b6f72772149473aacbdd6425bc77b7146697" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/6393b6f72772149473aacbdd6425bc77b7146697; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/6393b6f72772149473aacbdd6425bc77b7146697"; sha256 = "0jpjsh7r1m4isbhmmijlysv7jmnf01f3rj9q8z3v6fdmbi6v0d68"; }; "6393ed28494cd0c7bbfc3d90ee14a3c4fb5ffe2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6393ed28494cd0c7bbfc3d90ee14a3c4fb5ffe2e; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6393ed28494cd0c7bbfc3d90ee14a3c4fb5ffe2e"; sha256 = "0972073k9di5s980ypdn4dww5y0drc1fsn7q5bk71ylz6pdx7ijh"; }; "639844a81c2400a43810b5674c144824ce23f3db" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2653253-b6a14aed15124b4891aa1fe8706033fb/639844a81c2400a43810b5674c144824ce23f3db; + url = "http://cdn.unrealengine.com/dependencies/2653253-b6a14aed15124b4891aa1fe8706033fb/639844a81c2400a43810b5674c144824ce23f3db"; sha256 = "0rflhgn3nxl5msfd7f8xmz56msgkqhadyh5n7b120lk34wa7bvw3"; }; "63b510d13c94072e9005674901d2b32ec9853167" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/63b510d13c94072e9005674901d2b32ec9853167; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/63b510d13c94072e9005674901d2b32ec9853167"; sha256 = "1j10rlxqrdy1zv5fpx0zk4hy73fbi93zk7qsq59cfgpbgsd9n79g"; }; "63ceab8331229d4e03c85aa9b5f4671eda2643f1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/63ceab8331229d4e03c85aa9b5f4671eda2643f1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/63ceab8331229d4e03c85aa9b5f4671eda2643f1"; sha256 = "05jv83mc7abw5zyad8wccnnh7q8f5ba82hq10w7d589gasdbj9s8"; }; "63fb6b15f90b5647d4e46169447beceac52a5dff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/63fb6b15f90b5647d4e46169447beceac52a5dff; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/63fb6b15f90b5647d4e46169447beceac52a5dff"; sha256 = "1bhljn5pai17hw9znr22kv87p0fl01sx8h231v4mb96f8d1037q3"; }; "645a1e3bcfcb7345c6416a0ed520fae63329b8b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/645a1e3bcfcb7345c6416a0ed520fae63329b8b3; + url = "http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/645a1e3bcfcb7345c6416a0ed520fae63329b8b3"; sha256 = "1mdx70n7hv42j7ychalbn2rwq8irm1nl1s0i5rgnbvsxb0z445pn"; }; "64e87def5324af1f8687a977b1aeca68f9ecf0a6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/64e87def5324af1f8687a977b1aeca68f9ecf0a6; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/64e87def5324af1f8687a977b1aeca68f9ecf0a6"; sha256 = "1alslkmk8i0vmg4v5bd8lizm1b51bp1mcy5bmwy03dfnpv9hd8yk"; }; "64f0b7d72766b49356b5948a55695a43f845be22" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/64f0b7d72766b49356b5948a55695a43f845be22; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/64f0b7d72766b49356b5948a55695a43f845be22"; sha256 = "0x7rh3sw20czicj5pb9p0z4xdhd7vc32562wlcwf5c9k0vdyddri"; }; "6522f3b24668a2691bee084b8ee44262dc6cc644" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6522f3b24668a2691bee084b8ee44262dc6cc644; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6522f3b24668a2691bee084b8ee44262dc6cc644"; sha256 = "0brl515h4axh92dypzyrcx5gjf3lzakmn48nn2aapk25l8lzw7fm"; }; "65578de12deaee566474c4d151d51dfbd4c073c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/65578de12deaee566474c4d151d51dfbd4c073c9; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/65578de12deaee566474c4d151d51dfbd4c073c9"; sha256 = "0n1rhn916zqr83fxzb6slwd3sj7xbxyi4j5371pndfq1ah8yynkr"; }; "6580420e45c35e3175f7714b91aa918b46c45984" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6580420e45c35e3175f7714b91aa918b46c45984; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6580420e45c35e3175f7714b91aa918b46c45984"; sha256 = "1xsyvsp7gr58v19k3b5d33ayhz38amckz6kcabv2jaj22d1m4zwv"; }; "658fa72e61b1133bc866dc68b7317dda0c190d51" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372492-7eda6cf2d68f471699ac1d302230bcd3/658fa72e61b1133bc866dc68b7317dda0c190d51; + url = "http://cdn.unrealengine.com/dependencies/2372492-7eda6cf2d68f471699ac1d302230bcd3/658fa72e61b1133bc866dc68b7317dda0c190d51"; sha256 = "0am1lpxk2jxhf015siabscd3b8i2p43xgg8p5bp0r0sxrcbxwy2j"; }; "65a719d77d9dbaa46e24a210a17ef22399982d13" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/65a719d77d9dbaa46e24a210a17ef22399982d13; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/65a719d77d9dbaa46e24a210a17ef22399982d13"; sha256 = "15wh8wv0fj30xy5lhz1vhw5a7d6fqk8pjpcivzmlc9qp48jaa9jr"; }; "65b78b6ca4fcbc234e459578f687f0a5f21ff467" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/65b78b6ca4fcbc234e459578f687f0a5f21ff467; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/65b78b6ca4fcbc234e459578f687f0a5f21ff467"; sha256 = "1xpkj42dfkpqa0bq1fvwwy8n4286h2xlwz0fm2m4yk3p7qs2yyn5"; }; "65c815431a222281ca4027a3409714aca969c404" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/65c815431a222281ca4027a3409714aca969c404; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/65c815431a222281ca4027a3409714aca969c404"; sha256 = "11n5ra9mwj06zlilmn58xwhqr081ml58f8jd57sz994f3ci78kf4"; }; "65f992d64db107757f6c8186765571a2f85d60d1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/65f992d64db107757f6c8186765571a2f85d60d1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/65f992d64db107757f6c8186765571a2f85d60d1"; sha256 = "1jfrsagmfvvjxji32w4p7qq6b2vyqfmn52d1xinxn11v575cmrxw"; }; "663723ac5cff1d4ea06e07da58676eda31ded8b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/663723ac5cff1d4ea06e07da58676eda31ded8b7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/663723ac5cff1d4ea06e07da58676eda31ded8b7"; sha256 = "0yc5wmplmj4nqfzlydrf3gcphnym0vdy5l8xsb6l6gjm1rzn3w61"; }; "66b5c49c095c24e8ff5576638e6f43f40b60e398" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/66b5c49c095c24e8ff5576638e6f43f40b60e398; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/66b5c49c095c24e8ff5576638e6f43f40b60e398"; sha256 = "1r4cq5hz5ciak42xy5h6jk8r55cy4a2am2x7nsm8n40pn1m86xg3"; }; "66e6d819829e7f036392ae108ecdedd0068b3fed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/66e6d819829e7f036392ae108ecdedd0068b3fed; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/66e6d819829e7f036392ae108ecdedd0068b3fed"; sha256 = "00h32jp49052x7fms634savpk88976q973s1ixnkcl4q10y3ygc3"; }; "675414213a5992bda8f4bf33aa2feac7508eadb9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/675414213a5992bda8f4bf33aa2feac7508eadb9; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/675414213a5992bda8f4bf33aa2feac7508eadb9"; sha256 = "0b20idjyc0m9dqrnpzxxdshw29l7nlj1g7fi5zhf9y0hh77v1ji3"; }; "6758891f27f3f1b33f508442151c2d1d4244cacf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6758891f27f3f1b33f508442151c2d1d4244cacf; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6758891f27f3f1b33f508442151c2d1d4244cacf"; sha256 = "0ixakp9gxjjn5c19mir7qxjh7ywx6n2pncqiv37mbhj5c9z5r7mb"; }; "676f25261064cf478cd211dd584b7a391376f599" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/676f25261064cf478cd211dd584b7a391376f599; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/676f25261064cf478cd211dd584b7a391376f599"; sha256 = "0f0ix6vbx89pa9bpvnf87kwhbnf7q34mxf8ycw6md4brrjps21js"; }; "677b668be4a2ec5fa834fa988bf502390ca975d1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2703853-c90e6f22156c41b6b1968b2a029d291e/677b668be4a2ec5fa834fa988bf502390ca975d1; + url = "http://cdn.unrealengine.com/dependencies/2703853-c90e6f22156c41b6b1968b2a029d291e/677b668be4a2ec5fa834fa988bf502390ca975d1"; sha256 = "16ppk310afb40np5slr1b7qy6ksq16d0pl2zavd4wrxr626c0yjb"; }; "67ebcec99338fbc806e98fe5ddcc80abd7cfe885" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/67ebcec99338fbc806e98fe5ddcc80abd7cfe885; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/67ebcec99338fbc806e98fe5ddcc80abd7cfe885"; sha256 = "1rhm5ziiax99nlnyz1y3gqai9wkkvi0lwmsjn64xsqhp2cm93sag"; }; "67f9a57842391bca1072e56b907d2adde02d2d34" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2609785-e83ceb61e76a4e4bb9b4dc17c52d07b1/67f9a57842391bca1072e56b907d2adde02d2d34; + url = "http://cdn.unrealengine.com/dependencies/2609785-e83ceb61e76a4e4bb9b4dc17c52d07b1/67f9a57842391bca1072e56b907d2adde02d2d34"; sha256 = "1i8aa40i83zlzydfdbf3k023329mlvlh32kwln6q9pg9998k5hr0"; }; "68290cfc4aa5f88785b355b66e5efa7ae2451f3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/68290cfc4aa5f88785b355b66e5efa7ae2451f3f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/68290cfc4aa5f88785b355b66e5efa7ae2451f3f"; sha256 = "1s6m4qakr8bzyhak2v7d6b7h3g75iy4wfxplbz0r1bk79mlzh8ch"; }; "682beb667137b4be322732642ec6bd7a7fb77a67" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/682beb667137b4be322732642ec6bd7a7fb77a67; + url = "http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/682beb667137b4be322732642ec6bd7a7fb77a67"; sha256 = "1sap6ri29l2cd8yw5g5g8axy9nz8gy4lhrkvp1fnnf5c68cqqhm4"; }; "684a26e9ee9814c8e55834710a5e5395db2acbf6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/684a26e9ee9814c8e55834710a5e5395db2acbf6; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/684a26e9ee9814c8e55834710a5e5395db2acbf6"; sha256 = "1g8alym478k5mla106h38zmspr1gvgbyckhc0hbjk950kffwg537"; }; "69435a1a9c544a85003dac3e715da698388e8cfe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/69435a1a9c544a85003dac3e715da698388e8cfe; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/69435a1a9c544a85003dac3e715da698388e8cfe"; sha256 = "1wb8slsppm2cz2g5qlccjgjayv3q8bl0p5hybz3gpicnjyhla1c0"; }; "694d6d6d33e802bd013aa60c6ceef225f1769a21" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/694d6d6d33e802bd013aa60c6ceef225f1769a21; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/694d6d6d33e802bd013aa60c6ceef225f1769a21"; sha256 = "100b3c46qf5nhw3758203khsqjk5jq9hi3s7hsjsjrrz03p2fclp"; }; "696aa11a029bfeebe1885750c0a1219698f45667" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/696aa11a029bfeebe1885750c0a1219698f45667; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/696aa11a029bfeebe1885750c0a1219698f45667"; sha256 = "0nbr429yjr1xi2zlqz0k33p62d4mq4pcc49xshkdjbqm8j76yg9r"; }; "69fc2b97ab8ad300bd86bdb295b868f7e2bce67e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/69fc2b97ab8ad300bd86bdb295b868f7e2bce67e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/69fc2b97ab8ad300bd86bdb295b868f7e2bce67e"; sha256 = "0538b6klq4k379vp6miha7y73sz3lbgj093hxhzl4jb7fqnrwpdr"; }; "6a0ea024e2030b5079a2b9e20aa262fcb1a4a4b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/6a0ea024e2030b5079a2b9e20aa262fcb1a4a4b3; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/6a0ea024e2030b5079a2b9e20aa262fcb1a4a4b3"; sha256 = "1i6rijsnpwq58ngwdak1kx0kv53w2bqgl0jfwww2mpm9nwr34dgk"; }; "6a12e8d5c57226c69cfd4eea779767ef39cc7040" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6a12e8d5c57226c69cfd4eea779767ef39cc7040; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6a12e8d5c57226c69cfd4eea779767ef39cc7040"; sha256 = "0fpbgjzi79f8y2k8dmj596kndbjrpkaqvld1mpfd8mfxjg435psd"; }; "6a471e2c9660b457b6c96bac1a80ff31694ca135" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/6a471e2c9660b457b6c96bac1a80ff31694ca135; + url = "http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/6a471e2c9660b457b6c96bac1a80ff31694ca135"; sha256 = "0ifvzqzrjf1ich2m8r75czl46kyr0y2aagsb6h5mqnxmqbznwkq0"; }; "6a50182277880d3cdd4488457883c08e6765df35" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2587672-91bd78b10f504d6789cdb334ed27eda0/6a50182277880d3cdd4488457883c08e6765df35; + url = "http://cdn.unrealengine.com/dependencies/2587672-91bd78b10f504d6789cdb334ed27eda0/6a50182277880d3cdd4488457883c08e6765df35"; sha256 = "1pr0sfpya1izpppfdpypkpyqsalr02v0azcxyn2p8jibnzkg4qqa"; }; "6a67f7a815e887377e17dc82a86617bcbfd74f12" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/6a67f7a815e887377e17dc82a86617bcbfd74f12; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/6a67f7a815e887377e17dc82a86617bcbfd74f12"; sha256 = "1wqf8h7wlwzwiv2syrs3c69lbiqr7505kkbfckrscj8ym2rgmqxl"; }; "6a6962c3f79f9f08e1b48bdf76659d8d0ac02e20" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/6a6962c3f79f9f08e1b48bdf76659d8d0ac02e20; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/6a6962c3f79f9f08e1b48bdf76659d8d0ac02e20"; sha256 = "01dlplk4r00san6hbw5mclppb0kapx51w4mv2piihx6vcdq2dv2w"; }; "6a8708499175f48f9ac6e36dcde1684f5908e594" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6a8708499175f48f9ac6e36dcde1684f5908e594; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6a8708499175f48f9ac6e36dcde1684f5908e594"; sha256 = "0v67h7q7wz0xa66l8m8kk7adrf7mr9arns5w5rdv3m6dq9730cz1"; }; "6a9c5875310b65c3a8a12766aa12d23c75256911" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/6a9c5875310b65c3a8a12766aa12d23c75256911; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/6a9c5875310b65c3a8a12766aa12d23c75256911"; sha256 = "1x5q67kq3jrxhcvnc4xj2ic28ssmiyld4yp3y612vl71z02rsaji"; }; "6b3a9a128f40523d7b4663b4aff1259e204dc2fa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/6b3a9a128f40523d7b4663b4aff1259e204dc2fa; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/6b3a9a128f40523d7b4663b4aff1259e204dc2fa"; sha256 = "1nhpvs47s221k07ix1i5sp4ba8mia36zmqfz66dz2x9yx87xm3gj"; }; "6b44b6d36ae3887d630357d09ac1f4655e43ca7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6b44b6d36ae3887d630357d09ac1f4655e43ca7b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6b44b6d36ae3887d630357d09ac1f4655e43ca7b"; sha256 = "0rmj38k1zz4q2ckwngs38jn6z5w9kaxrghckqv60ajjpn47dk008"; }; "6b67c4b93edd66dc6876acdfaf991559f2387756" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/6b67c4b93edd66dc6876acdfaf991559f2387756; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/6b67c4b93edd66dc6876acdfaf991559f2387756"; sha256 = "0mq7wi48fck0c8i1f08mkya5fjr5a2sip3g9lzzi4my3k6g0jdlc"; }; "6b6ea1539e3e10b995b117a201cd14188d7361cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528357-44d3814edbb84d09a5279fe4fd30ba86/6b6ea1539e3e10b995b117a201cd14188d7361cf; + url = "http://cdn.unrealengine.com/dependencies/2528357-44d3814edbb84d09a5279fe4fd30ba86/6b6ea1539e3e10b995b117a201cd14188d7361cf"; sha256 = "1y7r4z90rp10b9pqp54awmnxqibx8pr2924l52z2abm3hza7h6da"; }; "6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd"; sha256 = "1mwmkci1q5lk8vrqgcrng5p8vdg2y2k18g5x5csgfa0j0harwr20"; }; "6ba54736caaad91cbe96699871e5e369c615d477" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/6ba54736caaad91cbe96699871e5e369c615d477; + url = "http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/6ba54736caaad91cbe96699871e5e369c615d477"; sha256 = "093pf4kdkisr2k3xkz7qx88503mr70y3crx4170lblax8mji89ib"; }; "6be690bb0e769b3f7e8d0ea9dc261b06f0496249" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6be690bb0e769b3f7e8d0ea9dc261b06f0496249; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6be690bb0e769b3f7e8d0ea9dc261b06f0496249"; sha256 = "18cidvs8cv9air0l9g65s0010a677qpj3rjdx1z1p19mcr7w9ddz"; }; "6c0977b3790d44b85c497cbd724ffa4f744bd6b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6c0977b3790d44b85c497cbd724ffa4f744bd6b6; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6c0977b3790d44b85c497cbd724ffa4f744bd6b6"; sha256 = "0wcypa2p4wx0si460677y544hjp38vf81im61z5kq4scr5l4kwxs"; }; "6c431edb06befc6eec62ca59cc72f45697da876b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6c431edb06befc6eec62ca59cc72f45697da876b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6c431edb06befc6eec62ca59cc72f45697da876b"; sha256 = "0bm4r49wzm0bx5wa0xdpmld8y0cv6jin9wl3djlp7kwg0nix2fv8"; }; "6cac0ce67fc25ab9057de053ed68e469376a951a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6cac0ce67fc25ab9057de053ed68e469376a951a; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6cac0ce67fc25ab9057de053ed68e469376a951a"; sha256 = "04kbpf0pwsc1a5kz2yhg1azp0ng2zc4ff8dyhc58n543nyla68v2"; }; "6cb6768eacda17fd4b9089b3667e49c91b543347" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6cb6768eacda17fd4b9089b3667e49c91b543347; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6cb6768eacda17fd4b9089b3667e49c91b543347"; sha256 = "1wj29bzdnf3s0w5vymnj599jq926m5whdrllfx6869z32q8xasms"; }; "6d0a3530ef64aa77b0e3b1121ab3e5148367b843" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6d0a3530ef64aa77b0e3b1121ab3e5148367b843; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6d0a3530ef64aa77b0e3b1121ab3e5148367b843"; sha256 = "16brrbwwhh9ddjs22ijqkaxrz56n4bmzfbkshipmc74p6ildw05n"; }; "6d10bf18bc8be763d3e8f14a5f604b8bbc8ba92b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d10bf18bc8be763d3e8f14a5f604b8bbc8ba92b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d10bf18bc8be763d3e8f14a5f604b8bbc8ba92b"; sha256 = "12mw32xsaa1j0lcj5nbir2m7m3bp9sgvjf2022l5rxzs196kncdy"; }; "6d17b68e3ef2ba04421c03ad37c21c1871a7291b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468685-6ced80b1c43d4f92b6c325ead32ec577/6d17b68e3ef2ba04421c03ad37c21c1871a7291b; + url = "http://cdn.unrealengine.com/dependencies/2468685-6ced80b1c43d4f92b6c325ead32ec577/6d17b68e3ef2ba04421c03ad37c21c1871a7291b"; sha256 = "0lb1q5wp4px4kh5lkfbva078jk0jj2nli6nqf6501yq1gbq80q5v"; }; "6d2192770af113f0d25717171721654f92522bc7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d2192770af113f0d25717171721654f92522bc7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d2192770af113f0d25717171721654f92522bc7"; sha256 = "0x9ayw21alzjqp5xwlj291klnxdkhqqgbz1wvppklmnw3yrqbha2"; }; "6d263531086a2ac8abcd381816ca4bbebeb2bb89" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d263531086a2ac8abcd381816ca4bbebeb2bb89; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d263531086a2ac8abcd381816ca4bbebeb2bb89"; sha256 = "10wihlpfq2ilg2a3rj6hdj2109rwsvsnjfs4x9l8pmr0imn6w4pz"; }; "6d2b2990842e4e124fa1767f5e6fb10dc1c8f0bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/6d2b2990842e4e124fa1767f5e6fb10dc1c8f0bd; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/6d2b2990842e4e124fa1767f5e6fb10dc1c8f0bd"; sha256 = "1jvcscijpcpl4g17wl8h39p6jwngh8qys423najf9hxqxvx9l9w1"; }; "6d7357dd4987e9a687f666583450e9650b6bec3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/6d7357dd4987e9a687f666583450e9650b6bec3b; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/6d7357dd4987e9a687f666583450e9650b6bec3b"; sha256 = "0xzzdsb63zb9771lxm845390d23hihgax7ksyrlhjmvj30kxxkhk"; }; "6d8bf7bc3f485cc58257d2f301a88e430fe47518" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6d8bf7bc3f485cc58257d2f301a88e430fe47518; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6d8bf7bc3f485cc58257d2f301a88e430fe47518"; sha256 = "1pvs3fl5qschq6gk12ig84wd4568sgmv4gv05kdvda44pnz3fbnd"; }; "6d9e988311499cbfde8b162b1b772f3ab0826cfa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d9e988311499cbfde8b162b1b772f3ab0826cfa; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d9e988311499cbfde8b162b1b772f3ab0826cfa"; sha256 = "0bp2gbl6b2dimw4izmsa9cpsw2650g1a1apq5pv1j0a0ihahwfjn"; }; "6dbc1369cf4eb542c999ef1a7dc17798e967968e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6dbc1369cf4eb542c999ef1a7dc17798e967968e; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6dbc1369cf4eb542c999ef1a7dc17798e967968e"; sha256 = "15vl7c83w4l3jd366lxljgpjyh2dxi22s11sk83bkca9ig8p9rlb"; }; "6e12c754b5531592e7583c0ddf5ea9f617bc4393" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/6e12c754b5531592e7583c0ddf5ea9f617bc4393; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/6e12c754b5531592e7583c0ddf5ea9f617bc4393"; sha256 = "095hbf0bx9iwcyrljr23zg1dwd3n382s4pxgpvalpb6flk346i9l"; }; "6e4f2760b5d09171b1caf834191e8eff91e09092" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e4f2760b5d09171b1caf834191e8eff91e09092; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e4f2760b5d09171b1caf834191e8eff91e09092"; sha256 = "042615c1ssd8jd0swn6qxl55v619ilz3y5549qqaj2qbs2rxgda6"; }; "6e59a6401cd7e9537de8df24d6923df4897465b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6e59a6401cd7e9537de8df24d6923df4897465b2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6e59a6401cd7e9537de8df24d6923df4897465b2"; sha256 = "1pbk0lxx24w1bblnjnl2zvljy2pg4c8pad7xyfp5gwinz9ns045w"; }; "6e5a4c88769060bd4e1cc4b17dc6944cd5f3d5cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6e5a4c88769060bd4e1cc4b17dc6944cd5f3d5cf; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6e5a4c88769060bd4e1cc4b17dc6944cd5f3d5cf"; sha256 = "0y08zj57v9n6a1hp9rgrvx5zcj63kq3363xi2vfl5g0fl3n0rfn4"; }; "6e730e7ead3a2958afb3beeffb7961d98b372ba4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e730e7ead3a2958afb3beeffb7961d98b372ba4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e730e7ead3a2958afb3beeffb7961d98b372ba4"; sha256 = "1d5rkr6qa8h4kxqcxarmvwfmn49k1rnfljvrm4b72yscl3x89pri"; }; "6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce"; sha256 = "1ljwpklbqah13l6mvrgfbn4xxwpxqycb4cr2ibh90aigjyjbijni"; }; "6ebcf68520fb80c14bda307947650ecbe5ed0335" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6ebcf68520fb80c14bda307947650ecbe5ed0335; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6ebcf68520fb80c14bda307947650ecbe5ed0335"; sha256 = "1xq7g59xy3a25qiib3dv30in8yqg8667wpq940z64gapbsvjk106"; }; "6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34"; sha256 = "10iv45b9g9l3krxqs8cqkgad5zhvy64n84q94ghkyn86ilg6pmqb"; }; "6f05a4518d46fff2a081dfff843f2af3e163a983" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f05a4518d46fff2a081dfff843f2af3e163a983; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f05a4518d46fff2a081dfff843f2af3e163a983"; sha256 = "07qkvg5g4dnzwjv9s38gqjc5mzsa13xmv0g2d9wii4vwm9ray2sw"; }; "6f0e8b5effca878a55ca98bb70c7fc5b9c33a7ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f0e8b5effca878a55ca98bb70c7fc5b9c33a7ca; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f0e8b5effca878a55ca98bb70c7fc5b9c33a7ca"; sha256 = "1whaajzna61zci7cjpw0p3j7z1y3wiqz98qkn5s3lpl0j37l3pql"; }; "6f3fed4aa88e43e6ccbf7498ff502f8440e1d8b4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6f3fed4aa88e43e6ccbf7498ff502f8440e1d8b4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6f3fed4aa88e43e6ccbf7498ff502f8440e1d8b4"; sha256 = "0hcsv3588k6ra0cd5l1f64m5r35fl6wbs9a8p9j29nigy3vdmbvv"; }; "6f51406032cee2275e7da1c749608e097223bcb1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/6f51406032cee2275e7da1c749608e097223bcb1; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/6f51406032cee2275e7da1c749608e097223bcb1"; sha256 = "1lcaxdjbkx2nklln244ljdfyhi4b246zvk7pl6hg29kbjaxh3grw"; }; "6f7d171cf322dcfd650c55aad7573fb99f926026" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6f7d171cf322dcfd650c55aad7573fb99f926026; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6f7d171cf322dcfd650c55aad7573fb99f926026"; sha256 = "06yn4cdz4rrvh1h483fj06n6n0jamngx2z24mjc1raf63slidb07"; }; "6f920a415787627f9dc4c1ef92a2a039a21976a6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f920a415787627f9dc4c1ef92a2a039a21976a6; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f920a415787627f9dc4c1ef92a2a039a21976a6"; sha256 = "12szpcgm9mgddiyyf6yhs8rf6hlwa0kw0m9wzs9xdq1phxwwcvy6"; }; "701e08162a99eeb25b55b6133dfee51bf36e08d3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/701e08162a99eeb25b55b6133dfee51bf36e08d3; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/701e08162a99eeb25b55b6133dfee51bf36e08d3"; sha256 = "1mffiwbv7qbwadrj6jkm1n4hzkjl5m3fc4dgxdijz7i79d8pgyk1"; }; "7054b730a39f0d762ba1602fbca946a38a8811cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/7054b730a39f0d762ba1602fbca946a38a8811cf; + url = "http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/7054b730a39f0d762ba1602fbca946a38a8811cf"; sha256 = "1vmx4g2jyv97k5pbv6rayn8a0qd29dwmvbl60v266m2ld25mv59r"; }; "705da00d6ddc859d91abda6fb8299b957eb0d99f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/705da00d6ddc859d91abda6fb8299b957eb0d99f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/705da00d6ddc859d91abda6fb8299b957eb0d99f"; sha256 = "0sizr4r95pddbynh4kns28id4n99hb7cz5dxx5pj5ma8n3w5295f"; }; "7077b313799ab4557f8c8d9aa345313eb3c6fbae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/7077b313799ab4557f8c8d9aa345313eb3c6fbae; + url = "http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/7077b313799ab4557f8c8d9aa345313eb3c6fbae"; sha256 = "0mhm5c9z63i6v24bfkhci6zdzjzqwaimkd77p5whrnqrfw44iqz2"; }; "70bb4371a8b8f7a2118ee2f0a7604496b68eef9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bb4371a8b8f7a2118ee2f0a7604496b68eef9b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bb4371a8b8f7a2118ee2f0a7604496b68eef9b"; sha256 = "1sjrdhycvh0dy9c1b2abkpar8bjmm57xqpfp2qznah918mp43jds"; }; "70bd0e0e4dbec19c4cffb718ebb1ac84e037940e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bd0e0e4dbec19c4cffb718ebb1ac84e037940e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bd0e0e4dbec19c4cffb718ebb1ac84e037940e"; sha256 = "0banm0bvf6rsz8jpkx7ivghf47ds8wf6dbcfg17f7nbbcnjg125d"; }; "70f50e9df2d8e0011bf9748ea4c1df4c8c8c2202" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/70f50e9df2d8e0011bf9748ea4c1df4c8c8c2202; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/70f50e9df2d8e0011bf9748ea4c1df4c8c8c2202"; sha256 = "1cw8ykv8nzrvwc1rdr45ilr2cyl8f6crby374n8049dyx1bd2mmx"; }; "71031e888d4b28104016a406b7ab6e993322d9c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/71031e888d4b28104016a406b7ab6e993322d9c8; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/71031e888d4b28104016a406b7ab6e993322d9c8"; sha256 = "1ixxwv77kbnz8y8z64v0radxx3q7azbakcpq9nl84k8b93lzmp3z"; }; "716adbc60694f3f72ef5e25a38f3fb973fdc7a2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/716adbc60694f3f72ef5e25a38f3fb973fdc7a2e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/716adbc60694f3f72ef5e25a38f3fb973fdc7a2e"; sha256 = "1c8w4k96i6fgkd0jc9vwpmw31p4bcfw88x09c6781ri64qw1asl6"; }; "71a6745bfe2208e7c0eea0718fc3a06d9ebf12cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/71a6745bfe2208e7c0eea0718fc3a06d9ebf12cf; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/71a6745bfe2208e7c0eea0718fc3a06d9ebf12cf"; sha256 = "1q9ymfkjvbwv1bwvq5m5c31yb3kcvfwvgrsr803wqa6qm4s40zdd"; }; "71a806e6c281e55c56f6e0feb65e35d553d03b68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/71a806e6c281e55c56f6e0feb65e35d553d03b68; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/71a806e6c281e55c56f6e0feb65e35d553d03b68"; sha256 = "05065h1wgxihrmih7yc291vxgpyimcj2kgbqn4j8mly43llylp5f"; }; "71b05376f1ca6f9ebfddddb4cb2258620d57951f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/71b05376f1ca6f9ebfddddb4cb2258620d57951f; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/71b05376f1ca6f9ebfddddb4cb2258620d57951f"; sha256 = "09ccxpvjjs3yjc45ygjd6phff9ax7xa0lhr5sb5jzswfnblkb04i"; }; "71f91c9ee187d974e3f5da3d91a352d568c260a8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/71f91c9ee187d974e3f5da3d91a352d568c260a8; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/71f91c9ee187d974e3f5da3d91a352d568c260a8"; sha256 = "1j2jk0qb9wdczxww1wl3rm07rhz1q3b4n6z23jja3r1fqsn8w50v"; }; "7210d2acb28ac3185e52b3c854c02db46878b00b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2499790-9469133ca7fa466794728dd13190004c/7210d2acb28ac3185e52b3c854c02db46878b00b; + url = "http://cdn.unrealengine.com/dependencies/2499790-9469133ca7fa466794728dd13190004c/7210d2acb28ac3185e52b3c854c02db46878b00b"; sha256 = "15llgg0n7w2awbbkb0lvb90g8sjip1zj7knca21lyxgb86p4nfbq"; }; "7214bfbc3129849a9681c342e1873b66020b0420" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/7214bfbc3129849a9681c342e1873b66020b0420; + url = "http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/7214bfbc3129849a9681c342e1873b66020b0420"; sha256 = "0qpkvfjnmmf8bcvd8qddfyyf3hglkp3870z8rhpxcpyqbv5q644x"; }; "7221d90f16cb54cc4f5be63f68865da103cd4f5a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7221d90f16cb54cc4f5be63f68865da103cd4f5a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7221d90f16cb54cc4f5be63f68865da103cd4f5a"; sha256 = "0xzcfz1npvnf3qidc2yffx5xqs587spjmrxsnsra8fqmghy7y513"; }; "7228172fbb398b4f9cca6ca9b5db85d1a6644b4a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/7228172fbb398b4f9cca6ca9b5db85d1a6644b4a; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/7228172fbb398b4f9cca6ca9b5db85d1a6644b4a"; sha256 = "1d62b5vw3l58667k2nf2dvladpkwpaaa0ai9x58bh46x1gazfdyq"; }; "725d0cc30e3c4b6a9e3dfac3f320a6c9904dd8a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/725d0cc30e3c4b6a9e3dfac3f320a6c9904dd8a9; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/725d0cc30e3c4b6a9e3dfac3f320a6c9904dd8a9"; sha256 = "1lq5pdjpa6jgrywfzx92vczlkqp8ggr6mqlnly772c6a4p507xvi"; }; "72e906fb126222e8269f7d46e2d9f1ac603baa5e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/72e906fb126222e8269f7d46e2d9f1ac603baa5e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/72e906fb126222e8269f7d46e2d9f1ac603baa5e"; sha256 = "0by17bnb94wwv35bqbb7gxn64xppf6m88m50lm6dxyblclizk1sx"; }; "72e922640673b6171e86c8c7fcdfa148004c1301" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/72e922640673b6171e86c8c7fcdfa148004c1301; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/72e922640673b6171e86c8c7fcdfa148004c1301"; sha256 = "0xbd7jd9pj1g3yf4252dy84w1x7czlqa1gxalk6p6awn1n1va815"; }; "72fc2150939a11815cfa929001ecb00ad565ce7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/72fc2150939a11815cfa929001ecb00ad565ce7e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/72fc2150939a11815cfa929001ecb00ad565ce7e"; sha256 = "1jbhd6mcrxk21dbjavkz6mf610zdql9srkd6c4flb794kfxx0gir"; }; "72fee8305071d508698fa86e4a89c80f5ee236b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/72fee8305071d508698fa86e4a89c80f5ee236b3; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/72fee8305071d508698fa86e4a89c80f5ee236b3"; sha256 = "1dkbhigrqnbdpp7ixm8fwhn4x294n7zi33xijw9vngysc7kngx7g"; }; "7305d73041a77bded642dbf6567625ac3c0208fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/7305d73041a77bded642dbf6567625ac3c0208fe; + url = "http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/7305d73041a77bded642dbf6567625ac3c0208fe"; sha256 = "17l3s1kn54kzjg7ajxhx7rvmw6rsvk1ad748dp9mqi5qd80096bp"; }; "730822767c19d479de3afc2e926cfd7438e23852" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/730822767c19d479de3afc2e926cfd7438e23852; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/730822767c19d479de3afc2e926cfd7438e23852"; sha256 = "1hgcf7mzjamjjrs2636zdkz47knwy8hbvf1l4rm4slzi1mr2zrk1"; }; "7320897f4f1584c0e42fd2546557d85ca8f513db" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/7320897f4f1584c0e42fd2546557d85ca8f513db; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/7320897f4f1584c0e42fd2546557d85ca8f513db"; sha256 = "0r77s64pcx4585g5s3gbjksfsggbmp552fsipqzs4fv7qmanym5r"; }; "736ccee7ee45e606201ef7b7c643498cfa13d70e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/736ccee7ee45e606201ef7b7c643498cfa13d70e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/736ccee7ee45e606201ef7b7c643498cfa13d70e"; sha256 = "0p69pgkm72g46s76k1v8m2k77hh08sb0amx6lsszkipn86kx7ff4"; }; "73bae428e969b828d72a1c4b71208bd855b67233" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/73bae428e969b828d72a1c4b71208bd855b67233; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/73bae428e969b828d72a1c4b71208bd855b67233"; sha256 = "1x3ikd5ymqixs0zsny0lp6la3jhxay54iajw2m99w4bzfscqdkz5"; }; "73ee6ef047e32991fff9aeb313c0e8c7faf673dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/73ee6ef047e32991fff9aeb313c0e8c7faf673dc; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/73ee6ef047e32991fff9aeb313c0e8c7faf673dc"; sha256 = "06xm65k8i87crf0dq2iyj6mxwbyp0spmjwqha3n93fv63sgg3zrf"; }; "73ffe57844e03a4cafc0e9aa8819694c90e1522b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/73ffe57844e03a4cafc0e9aa8819694c90e1522b; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/73ffe57844e03a4cafc0e9aa8819694c90e1522b"; sha256 = "0j5ysqydqi51y5yv984wzs4q2y5d2d2cdrraw001yda5ghiidp4d"; }; "746b744c6a42c0f8af6feef784581873bde794e1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/746b744c6a42c0f8af6feef784581873bde794e1; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/746b744c6a42c0f8af6feef784581873bde794e1"; sha256 = "1wsmy3wazhzjk50yd2n3g9zrivzfwqvl2r5blcv7zvvqwyfhnpax"; }; "7491079d020d11f40f14eb94536fe09006ff2c16" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7491079d020d11f40f14eb94536fe09006ff2c16; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7491079d020d11f40f14eb94536fe09006ff2c16"; sha256 = "03aqvnhvbw15kh30384pyg01s4nixjqz22780yjja4hj51frxps3"; }; "749a111a54b3257ccd4600b6ece1fd86a57efe58" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/749a111a54b3257ccd4600b6ece1fd86a57efe58; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/749a111a54b3257ccd4600b6ece1fd86a57efe58"; sha256 = "09lf0sslsikg4jks8yzb6b9k3y9d0dbig5j45kfk58yjx90mgfhv"; }; "74a5411261270860b0b2d315c8398df07f956fa0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/74a5411261270860b0b2d315c8398df07f956fa0; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/74a5411261270860b0b2d315c8398df07f956fa0"; sha256 = "1c8zc6kryl6nn9bv77fim2ccd5ikqjnj5n0b75dii63znm8hlp2i"; }; "74bdfe7b7c5448f6b002b747a29ddf4eb214dc0a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/74bdfe7b7c5448f6b002b747a29ddf4eb214dc0a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/74bdfe7b7c5448f6b002b747a29ddf4eb214dc0a"; sha256 = "10kq66r73gc8ghb3b5jgahbgs9rnv2s3kbvd72vjbdbyz58wacrx"; }; "74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f"; sha256 = "176b4fv2dmppcs9zyci4yilvj0kmn92cxybbwjllp2cr9x2ard91"; }; "74df4c8f82ff3081bd49648cee83a06677495bd4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/74df4c8f82ff3081bd49648cee83a06677495bd4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/74df4c8f82ff3081bd49648cee83a06677495bd4"; sha256 = "12brl8hsdyv0gf4hggi7mf9j5q2r19w3najivicrq86rg0f2km1y"; }; "74f904f20ed3e1cd02cc9d0e07a2778948328274" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/74f904f20ed3e1cd02cc9d0e07a2778948328274; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/74f904f20ed3e1cd02cc9d0e07a2778948328274"; sha256 = "0169jszrsidkhbhz906yc8a10ffkcnp2kxz193r46j9qpv69dk2q"; }; "75124406de34db23633265523d08e569d7889164" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75124406de34db23633265523d08e569d7889164; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75124406de34db23633265523d08e569d7889164"; sha256 = "0709ach7hq7qn6452xd7n6jlqx6j5b597yyvzvmcfsbnp5nmn39k"; }; "751d2649bc4cf19cea075804463f00cf0ae61ed7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/751d2649bc4cf19cea075804463f00cf0ae61ed7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/751d2649bc4cf19cea075804463f00cf0ae61ed7"; sha256 = "1a5g17mvwa7f8ydwikgc0f4hf8wp8w491fhhzvnn4m4i6jam6hwn"; }; "753eb938736a4b412147164d4077e991f9c89950" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2618214-623983ec05b34939b08acd26ecfb4f92/753eb938736a4b412147164d4077e991f9c89950; + url = "http://cdn.unrealengine.com/dependencies/2618214-623983ec05b34939b08acd26ecfb4f92/753eb938736a4b412147164d4077e991f9c89950"; sha256 = "18zkl0jsx165akaxgxxzf3619jmclxc18nggcbyb1iwqmxrxpcak"; }; "759eb0a64477d1269a2089f229e3f0a2276fb531" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/759eb0a64477d1269a2089f229e3f0a2276fb531; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/759eb0a64477d1269a2089f229e3f0a2276fb531"; sha256 = "1v0wgzzv2d6mxmkb0s96q7jb9d5knnh2p0ja261kmqhyc6dlzlqr"; }; "75e0842c76b2e55a861da42ea1d7c4636ab53833" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75e0842c76b2e55a861da42ea1d7c4636ab53833; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75e0842c76b2e55a861da42ea1d7c4636ab53833"; sha256 = "05a3azlaw3y38ysr9rdrjk8mcrzm46q39k9xy75jxg52qpbdxmzi"; }; "76b0c3828b07ab86d995f91647a8fddeda00981a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/76b0c3828b07ab86d995f91647a8fddeda00981a; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/76b0c3828b07ab86d995f91647a8fddeda00981a"; sha256 = "1jybpkydwa8ry4197hxb43f6lgszv6sl9fnpbd335mipn5gs9das"; }; "76df9b164d66551812ce65dddef45a44604b8c8c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2736314-83d0b2c86e6940798eae7a6b4a7a011b/76df9b164d66551812ce65dddef45a44604b8c8c; + url = "http://cdn.unrealengine.com/dependencies/2736314-83d0b2c86e6940798eae7a6b4a7a011b/76df9b164d66551812ce65dddef45a44604b8c8c"; sha256 = "1knls10cjd66hr0z4988gw5p782q7f7lyagpx9f63zxbqjn0l3v3"; }; "7725a79a9a5f662ca2adf8ae2efb114d32ff45a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7725a79a9a5f662ca2adf8ae2efb114d32ff45a2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7725a79a9a5f662ca2adf8ae2efb114d32ff45a2"; sha256 = "1vszgcnacspqzz1fj0y38gjj54qavksbwswbz2cmyml0m77h8qfr"; }; "77352bcc40b2053c8db752c49772dbf0d158af62" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/77352bcc40b2053c8db752c49772dbf0d158af62; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/77352bcc40b2053c8db752c49772dbf0d158af62"; sha256 = "1pgz55g9wk1z146f00r6kbij5qkng7cb7ni22jgr6x3inblq28da"; }; "77464fb66258632d2799ac5491f4316d35cc346c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/77464fb66258632d2799ac5491f4316d35cc346c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/77464fb66258632d2799ac5491f4316d35cc346c"; sha256 = "0iixcb51kdjnl8llbqiib1dkcv421d8pi9hly1r00clds5b5bpf0"; }; "7756f8e0698993a2efb94e15819a1d1a22edd9aa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7756f8e0698993a2efb94e15819a1d1a22edd9aa; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7756f8e0698993a2efb94e15819a1d1a22edd9aa"; sha256 = "0pm34hr3jm8nsvaypl68nacmbpzi2ynfnxm02rkn589f03778sni"; }; "777419bfd692da1795221b0711a3b11467f5e4ad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/777419bfd692da1795221b0711a3b11467f5e4ad; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/777419bfd692da1795221b0711a3b11467f5e4ad"; sha256 = "1g2rl7j740zhf4y8pcbcdhpzxzw9hcp0vb82zm72nhfw8hp9z212"; }; "777fe4089b0a02f749411d577a2a17adf635dec1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/777fe4089b0a02f749411d577a2a17adf635dec1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/777fe4089b0a02f749411d577a2a17adf635dec1"; sha256 = "1lvj3lvc20rh4yvwbyafw270chkl16jlardv8pqavil085qz332f"; }; "77ab57479dfe164e72b8298375e3b9b577e6640d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/77ab57479dfe164e72b8298375e3b9b577e6640d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/77ab57479dfe164e72b8298375e3b9b577e6640d"; sha256 = "18qjd9d7d66qjk087xg246d6gssbiiv08y3rq2v1d7cddbsbbzda"; }; "785a36aff000132218d273b16e36412342def12d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/785a36aff000132218d273b16e36412342def12d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/785a36aff000132218d273b16e36412342def12d"; sha256 = "0235bgb8hzg5x5fhk8a5iasdjfbj5xzh0ccxx3iaadmadcn3xgxj"; }; "786040422666da11604af7280dd6eed639de30d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/786040422666da11604af7280dd6eed639de30d4; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/786040422666da11604af7280dd6eed639de30d4"; sha256 = "0na97fbmlgwl7kfp5asvj41llyrk6srn11argjq20vwrpzj9c0h4"; }; "788022e3bc41bf23e517d88df0ca24f715b1cad4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/788022e3bc41bf23e517d88df0ca24f715b1cad4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/788022e3bc41bf23e517d88df0ca24f715b1cad4"; sha256 = "1hhilba17whyl3iycd906nh0c4v9mia51pb8cgy7kqjiawypcp6k"; }; "788b132136ad4d08c5f03e4078824ec04b1ac0b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/788b132136ad4d08c5f03e4078824ec04b1ac0b9; + url = "http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/788b132136ad4d08c5f03e4078824ec04b1ac0b9"; sha256 = "1wf1kizj5s4nkkmyhc1xs1mqzzwc1b2vdybbnx3g7rn9p9rq3jgc"; }; "789b2bc3606dc2558b7cab5dbb62e8e76f20ef74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/789b2bc3606dc2558b7cab5dbb62e8e76f20ef74; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/789b2bc3606dc2558b7cab5dbb62e8e76f20ef74"; sha256 = "10pzb9ylqbsls482sa1frmk7r8ra7b6y0fjb7x97v482pdskh64r"; }; "79042a16d0ef7feeccc76315246c5ee6f36dfafe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/79042a16d0ef7feeccc76315246c5ee6f36dfafe; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/79042a16d0ef7feeccc76315246c5ee6f36dfafe"; sha256 = "1wn397vwkkakm5q0r2kk1axq3zxfrc1f65cbwqlixzfgpz8lybil"; }; "7927b5a5a5c57b3801e7d0d4a42fcb142f267b78" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2653252-2bb04ebcdd0e406596c1b14273fe0c06/7927b5a5a5c57b3801e7d0d4a42fcb142f267b78; + url = "http://cdn.unrealengine.com/dependencies/2653252-2bb04ebcdd0e406596c1b14273fe0c06/7927b5a5a5c57b3801e7d0d4a42fcb142f267b78"; sha256 = "14w4h37fsmj9mjsfa53hc4ymx9j6b9dfia3n4gwkwmbw5sj8l9gp"; }; "792a616c0f78fa0b294f67b56549092efbbbeff6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/792a616c0f78fa0b294f67b56549092efbbbeff6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/792a616c0f78fa0b294f67b56549092efbbbeff6"; sha256 = "1875sind4si5lwmbypjn3ssbdxn1w5a5wv61kllqw9a8iz76pc0x"; }; "79477f2a4147dd648f89b314306f5f0346278735" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/79477f2a4147dd648f89b314306f5f0346278735; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/79477f2a4147dd648f89b314306f5f0346278735"; sha256 = "180qwmv30vf5fx724mn44l8p9j6ipaqqs83fsiwyaifa1zn4kaf8"; }; "796f0c398bb010288b3688e6743420cfb681a4b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/796f0c398bb010288b3688e6743420cfb681a4b8; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/796f0c398bb010288b3688e6743420cfb681a4b8"; sha256 = "07mj9nfb7ganiv6pc4yz30zsbfbhqpap2x21nrq93f7r75jckssw"; }; "7983882382ee0785a3619bfda754358f8d6cd5c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/7983882382ee0785a3619bfda754358f8d6cd5c9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/7983882382ee0785a3619bfda754358f8d6cd5c9"; sha256 = "0z3jwzxdmsdwx623fbhzp5jif0yv8v31br3ipbv6d3d8kv0cw90w"; }; "7996e8351b085aa99ee962c9a0abbbe9b077e23c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/7996e8351b085aa99ee962c9a0abbbe9b077e23c; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/7996e8351b085aa99ee962c9a0abbbe9b077e23c"; sha256 = "1wsg1f8y22m01m1x8ryxzbyqzgrk0v8wssvpzcdg95ld4n46z6ps"; }; "79cbc648416e750ee538d57d6b608e3b7bd7717d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/79cbc648416e750ee538d57d6b608e3b7bd7717d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/79cbc648416e750ee538d57d6b608e3b7bd7717d"; sha256 = "1z5ibq34jhlyszxxllfn1ffmp8b0y7w7cqmxridnq78b1zirsj65"; }; "7a02f98f23ebb4382454f2813a70cbb932fb9e13" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7a02f98f23ebb4382454f2813a70cbb932fb9e13; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7a02f98f23ebb4382454f2813a70cbb932fb9e13"; sha256 = "0k8ayk7rh6kkxf8bk9hqy4wa7zh1m5gzbxfds6cc0zd4kr150sqg"; }; "7a7d7497e9f19ef7a2e4e35a37308b21cec9f982" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/7a7d7497e9f19ef7a2e4e35a37308b21cec9f982; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/7a7d7497e9f19ef7a2e4e35a37308b21cec9f982"; sha256 = "0ba05lnjy3ghs3jy519pcjyav5r75lpall461qns2bppzpm4a076"; }; "7a8446207acdf4eaf9676898ddacf9bdbf595de9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7a8446207acdf4eaf9676898ddacf9bdbf595de9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7a8446207acdf4eaf9676898ddacf9bdbf595de9"; sha256 = "1lndbrl5sp0gj7fasrzsc2yz4vmcr8q29yvp8cva2b9691q8gj4i"; }; "7ac1ecd1bdbc99aa980807c5645a78ae48ea9577" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/7ac1ecd1bdbc99aa980807c5645a78ae48ea9577; + url = "http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/7ac1ecd1bdbc99aa980807c5645a78ae48ea9577"; sha256 = "04m1a8g9w4hyclfx1nc6prd02kicjdsnzg4spwk63rgv3lamjqd0"; }; "7ad6959d0c1c635355409e72473d108d90869dab" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7ad6959d0c1c635355409e72473d108d90869dab; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7ad6959d0c1c635355409e72473d108d90869dab"; sha256 = "19nr57sy463g1m2fbrdhpb8p5yd5dls64gw9zq2zb4jyjj7y8fia"; }; "7adad32ec30d0be94dcf1a19012e273b9971057e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7adad32ec30d0be94dcf1a19012e273b9971057e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7adad32ec30d0be94dcf1a19012e273b9971057e"; sha256 = "13f8c98an8ycv27kglnc46jl6abgyvnq6dm8xpzzlh28fj88gbjk"; }; "7ae477712090513005fe5af06c6026b245d3c946" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7ae477712090513005fe5af06c6026b245d3c946; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7ae477712090513005fe5af06c6026b245d3c946"; sha256 = "1w1ihg63ks2ba8x4m04yblbc7d8ycgbczsjz2lp28j5dy7b10i48"; }; "7b091ff0e3269cd3b11fb00a394f82b1604095c7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b091ff0e3269cd3b11fb00a394f82b1604095c7; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b091ff0e3269cd3b11fb00a394f82b1604095c7"; sha256 = "10cysl5b6iagx699w1kw5xfa51flr433g4wl55bjz9bdjw4ln51r"; }; "7b6219b2124e3663a1f4383de616fd63676c9693" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b6219b2124e3663a1f4383de616fd63676c9693; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b6219b2124e3663a1f4383de616fd63676c9693"; sha256 = "0260b4p3ng5jdjb8z22cpp2376wahvh4gihjxcghlk3bal5k743c"; }; "7b7d2e469aa46e6b7a1550e355690591e4ac54fa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7b7d2e469aa46e6b7a1550e355690591e4ac54fa; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7b7d2e469aa46e6b7a1550e355690591e4ac54fa"; sha256 = "1nyx2fjbcpdfrlbqb966x2zd1rbk7kx9x61knrfhhz7r5kb1z5bm"; }; "7b83af4328df75db5202d9e02c057d139ca1a9dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7b83af4328df75db5202d9e02c057d139ca1a9dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7b83af4328df75db5202d9e02c057d139ca1a9dc"; sha256 = "1igfygl9hk0q3ndjiji6bfgb4p77038bbk31kgrdy4gvky3qz21l"; }; "7ba89ad415dac138be18aeefe3423e3ebd56c0ee" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/7ba89ad415dac138be18aeefe3423e3ebd56c0ee; + url = "http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/7ba89ad415dac138be18aeefe3423e3ebd56c0ee"; sha256 = "10yn9d19andj61gj8x771yyrl2y7l0rgqg22mm53hkbdkfghml8h"; }; "7bc9f224a762158a310d9dd9c355f21bc20cf5fb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7bc9f224a762158a310d9dd9c355f21bc20cf5fb; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7bc9f224a762158a310d9dd9c355f21bc20cf5fb"; sha256 = "1rxd81p9gd5rwqz9krv48bl5qzdqdb08xlc3ikn85mk847n6riyq"; }; "7bd4669f05c73f4cc2d165c712eeb0cca6711e7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7bd4669f05c73f4cc2d165c712eeb0cca6711e7c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7bd4669f05c73f4cc2d165c712eeb0cca6711e7c"; sha256 = "1ps1j2vywaxxcprmxbyzi3nzvks9gxviqjcvha4wv8p4igm7p861"; }; "7be14b1c31f9c742d61528f894b5a0faafdca608" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7be14b1c31f9c742d61528f894b5a0faafdca608; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7be14b1c31f9c742d61528f894b5a0faafdca608"; sha256 = "01snf2y4scl2vhbbmzs4hjayjp7hkydr7a2kbjgwc1kb41vcvvmg"; }; "7c8c84dac9bcec95152cac9aa9acac67f7702d08" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/7c8c84dac9bcec95152cac9aa9acac67f7702d08; + url = "http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/7c8c84dac9bcec95152cac9aa9acac67f7702d08"; sha256 = "0w0ry83bxhw07l0y2zw3s1szx6gbhh2zbvwnjnd3qhjdic8abvzy"; }; "7c963542515f21d8db5b961bee100b6412d597d1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2377358-53c9e09a80d741708f589736e8974c22/7c963542515f21d8db5b961bee100b6412d597d1; + url = "http://cdn.unrealengine.com/dependencies/2377358-53c9e09a80d741708f589736e8974c22/7c963542515f21d8db5b961bee100b6412d597d1"; sha256 = "0y6186f5l3glsnnqv23npj6b1m23jxy18j6mg30g38g4lr2vk0ad"; }; "7cc355b9c369e318b838b18f749c24e2afd259c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7cc355b9c369e318b838b18f749c24e2afd259c4; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7cc355b9c369e318b838b18f749c24e2afd259c4"; sha256 = "1jiz1n0wy6mqnv2m7v8mksrh3v6vwliqc8v6jjv7rxz1x4zclinz"; }; "7d8e31de63a57ce9a9e79c5263a63d5d46615baa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/7d8e31de63a57ce9a9e79c5263a63d5d46615baa; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/7d8e31de63a57ce9a9e79c5263a63d5d46615baa"; sha256 = "1iz5vbwxajss32yvjwdss1hfczp3viz8nfl9xsk35bh5q5az0mfx"; }; "7d9e9a2f89c7bbc7404f79811bf83f4076b5bc32" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7d9e9a2f89c7bbc7404f79811bf83f4076b5bc32; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7d9e9a2f89c7bbc7404f79811bf83f4076b5bc32"; sha256 = "1p37wspipadj5qicv6bs3rg3vqiqx49jkd6q3pgkb40bp0gs70ld"; }; "7db350110118d3076728f890e80db47042b1c9c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7db350110118d3076728f890e80db47042b1c9c4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7db350110118d3076728f890e80db47042b1c9c4"; sha256 = "1x5j73m7lvz6dacd7cl1g6x0206pmh394l650aidzmmywnmpni5y"; }; "7db51b6372a7e6ccd911890e40586056b5c3bf70" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/7db51b6372a7e6ccd911890e40586056b5c3bf70; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/7db51b6372a7e6ccd911890e40586056b5c3bf70"; sha256 = "003dg3cglf6dbljyfdamahznka718qcpsfbkvsk1kbysa6nz0kcd"; }; "7dc9a4ae40e2c039f47bfa781f706c6ba93f5e77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7dc9a4ae40e2c039f47bfa781f706c6ba93f5e77; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7dc9a4ae40e2c039f47bfa781f706c6ba93f5e77"; sha256 = "11bjnjh99mdh9fqcrnddnhgjr1znlhi11rbqajc1wjwk4zrs7h51"; }; "7ddc7ee608268e6d717f879cf6b6b7305f636cd2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7ddc7ee608268e6d717f879cf6b6b7305f636cd2; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7ddc7ee608268e6d717f879cf6b6b7305f636cd2"; sha256 = "16cz1bvq3za22myf04p2al6im72x6al6a2y5sv5mgz7nvnhi0q4d"; }; "7de52ed6339fe756210b171c838332e276370e70" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/7de52ed6339fe756210b171c838332e276370e70; + url = "http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/7de52ed6339fe756210b171c838332e276370e70"; sha256 = "076p1hj2bjysj1yk45ywrahrz9d9k8q0cvw52g0141985g9av8fs"; }; "7df9510763997f0e8873568712dd0de573058bf3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7df9510763997f0e8873568712dd0de573058bf3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7df9510763997f0e8873568712dd0de573058bf3"; sha256 = "0iy45rddw5cq5w9qm6vd6lxjnf2b4hm4abnna0ay7qnmdkcxy0zp"; }; "7e1d5652590c12db0c440eac59f69a777425f9bf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7e1d5652590c12db0c440eac59f69a777425f9bf; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7e1d5652590c12db0c440eac59f69a777425f9bf"; sha256 = "0j3f2saflmsylyi4i2w4z56kwzpdvimi9na49m3nfd16d5m50fnz"; }; "7e6ab4f547b9d8bf5f8a35a74d335d500588d8d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/7e6ab4f547b9d8bf5f8a35a74d335d500588d8d9; + url = "http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/7e6ab4f547b9d8bf5f8a35a74d335d500588d8d9"; sha256 = "0m45dhadisgl1n32vbj71vhj1avn9mcl3gx7dsrgd5pyj2cm0v2v"; }; "7e741bb7378733b67fd4bf594a5798fdbbf4c06b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7e741bb7378733b67fd4bf594a5798fdbbf4c06b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7e741bb7378733b67fd4bf594a5798fdbbf4c06b"; sha256 = "0090i1z4ggh0rjka4lk2nyh8vz6w5kbxrf5y8sb4lyhbggshypz4"; }; "7e74577c3774e9eb2328f96f667ae7df976b62e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/7e74577c3774e9eb2328f96f667ae7df976b62e7; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/7e74577c3774e9eb2328f96f667ae7df976b62e7"; sha256 = "03p73gsai1gzazyhi0s409d88b0vlnvap2dy5qas5xazhsj3s32v"; }; "7e929e26670125eb017b7f33f7906adcbf8cdbe9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/7e929e26670125eb017b7f33f7906adcbf8cdbe9; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/7e929e26670125eb017b7f33f7906adcbf8cdbe9"; sha256 = "04dx7sqs1s3h8msjfah395hjx4a2x51k0innh4np11zr0chw4rf0"; }; "7eab47f1da799465d08b68e26c7ae336a7b07a47" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/7eab47f1da799465d08b68e26c7ae336a7b07a47; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/7eab47f1da799465d08b68e26c7ae336a7b07a47"; sha256 = "1nkgnvif8ysz26rwhxmr3kfk5xajr7z5nbbx4givpv16fmr67hp1"; }; "7f0b7231a2a6fd1df206769a4acb8cb861b09f02" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7f0b7231a2a6fd1df206769a4acb8cb861b09f02; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7f0b7231a2a6fd1df206769a4acb8cb861b09f02"; sha256 = "0fbsqakyam8jacxw9kmifddmgilr1rlvcxp0dskvdlb31pfzzlx7"; }; "7f5b42e091a41c16eb4bfdfb2de3a36670854201" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7f5b42e091a41c16eb4bfdfb2de3a36670854201; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7f5b42e091a41c16eb4bfdfb2de3a36670854201"; sha256 = "1qbwixy33i07qcicgc2xra46nhb9jklal25pw0wrc0r7migxv9f9"; }; "7f8b724b75c6f29c33f33a1f310cb495e079aaa1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7f8b724b75c6f29c33f33a1f310cb495e079aaa1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7f8b724b75c6f29c33f33a1f310cb495e079aaa1"; sha256 = "0clv70849r47m9y7l5515xn9z2qn4vazkkpfpwdrgmbh8wjb0xnl"; }; "7fe64241b07105e31272f224ac763156f8b8296c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7fe64241b07105e31272f224ac763156f8b8296c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7fe64241b07105e31272f224ac763156f8b8296c"; sha256 = "1h4b430rjv86bv4vcrj6hrza71b5hrrivllxn7an78yi7rigc761"; }; "801295549915c66473e6cd436dc1623ad50a6868" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/801295549915c66473e6cd436dc1623ad50a6868; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/801295549915c66473e6cd436dc1623ad50a6868"; sha256 = "0d889wz1r7l3801gdcmdchnij3z3ch8adw0rn5rc613r3nz613hh"; }; "806cb366cb892bd749bb1e697026060f9943b794" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/806cb366cb892bd749bb1e697026060f9943b794; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/806cb366cb892bd749bb1e697026060f9943b794"; sha256 = "0k470mdbdk4r7ryrm7b2m2mnmiwg9bqn6xrm9f426vj6409sh3bp"; }; "8083297580223f34923e3ed275ba2082cb6ff1b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/8083297580223f34923e3ed275ba2082cb6ff1b6; + url = "http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/8083297580223f34923e3ed275ba2082cb6ff1b6"; sha256 = "0rl4vw9nnarpbg9in4kj08yjran73yk821q03kggxjs9kd3m6p9a"; }; "80cd8c5c566432905a991761c25be7e43613ea68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/80cd8c5c566432905a991761c25be7e43613ea68; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/80cd8c5c566432905a991761c25be7e43613ea68"; sha256 = "08d0cchndgs7z1m1iw78ri9b740z06daclbb1krnd9jbjbr72540"; }; "80cf2aada6b342c76be1c6617a893008f7a2e992" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/80cf2aada6b342c76be1c6617a893008f7a2e992; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/80cf2aada6b342c76be1c6617a893008f7a2e992"; sha256 = "1is1wl3m8l1gnfnhadnig3h4p3lg2dbrhx0j18zl01s5y5l5dz72"; }; "80fbbdd5d2b95966d99e270b260593880769871c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/80fbbdd5d2b95966d99e270b260593880769871c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/80fbbdd5d2b95966d99e270b260593880769871c"; sha256 = "1dcag3ris9wpm0vfk296902arm6xph496gi13xr1lv2ic0ay4ajh"; }; "8113584b3d880586f19985a5103712b5251a347d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8113584b3d880586f19985a5103712b5251a347d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8113584b3d880586f19985a5103712b5251a347d"; sha256 = "0qgsp5kjlbzmp2v979wnc30isn10mv8w42riynpkia2waqq1yypf"; }; "81306b38538d7e69e278eb4d4a1acb25c2d44dfc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2505717-ca6614fe3fb64e47b28005ce3736302b/81306b38538d7e69e278eb4d4a1acb25c2d44dfc; + url = "http://cdn.unrealengine.com/dependencies/2505717-ca6614fe3fb64e47b28005ce3736302b/81306b38538d7e69e278eb4d4a1acb25c2d44dfc"; sha256 = "1b3hfip5h2ra2cj3c80v87fyn5g52kfl8hi7l9ynx6rbh45jd7cp"; }; "81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/81594c92fcec0b95d7d0b47ad36aef8d2605c8b8; + url = "http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/81594c92fcec0b95d7d0b47ad36aef8d2605c8b8"; sha256 = "0cj2l82yi6yp8x2rsv5ga7cl5jrmnl7wv68608ymrdimnrg1l19j"; }; "815c7f4ed8653c23f02829438b553e4e310c1185" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/815c7f4ed8653c23f02829438b553e4e310c1185; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/815c7f4ed8653c23f02829438b553e4e310c1185"; sha256 = "1bd8y1165dgw5naxwzh92plkx24v468fz8i0afaxk8cpqvjcn4b4"; }; "815ceaba7a67e678c4a7187990c7367805ed6d7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/815ceaba7a67e678c4a7187990c7367805ed6d7c; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/815ceaba7a67e678c4a7187990c7367805ed6d7c"; sha256 = "0zrlxcqp7arscfbjsffganmr8ykjy9kavkq6r0sjv33nf2wahcxw"; }; "81bce187e69fb02baaecaa20027bd477eb1f990b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/81bce187e69fb02baaecaa20027bd477eb1f990b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/81bce187e69fb02baaecaa20027bd477eb1f990b"; sha256 = "1pmpm2dppzr71qvrfb8h5837mxgl654hiihymh2aw12bh1hl84dk"; }; "820a14581d58bc24e04e70e2d050e8568367b29f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/820a14581d58bc24e04e70e2d050e8568367b29f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/820a14581d58bc24e04e70e2d050e8568367b29f"; sha256 = "0h5kl259s20bv2y8k0pklvl5lpv4qc2y742nfyph04d8gh44i11r"; }; "823786b849304f4f046e804e4c7a9578b0e7dc4d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/823786b849304f4f046e804e4c7a9578b0e7dc4d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/823786b849304f4f046e804e4c7a9578b0e7dc4d"; sha256 = "1nxcnkv4p6m57rwr4wj4pz19z579sf9mqay6x64ddbnlc0d8ijfv"; }; "82752934d29486bef3008fe2e7e9953dacd3a238" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/82752934d29486bef3008fe2e7e9953dacd3a238; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/82752934d29486bef3008fe2e7e9953dacd3a238"; sha256 = "0i7l4yw0qrp29ax36lp3sgyqbqshv5v0y2y4jp9g8b996rr42ypp"; }; "82896a288bed5637b5e537aff3c81d9a146cad8b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82896a288bed5637b5e537aff3c81d9a146cad8b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82896a288bed5637b5e537aff3c81d9a146cad8b"; sha256 = "0g2nh96n0k2mv4fdaw6sqlav9diclhmljsixvfbp0550p44i3dhf"; }; "82921dd1135940696b085da4d09cdd25eb6b740d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82921dd1135940696b085da4d09cdd25eb6b740d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82921dd1135940696b085da4d09cdd25eb6b740d"; sha256 = "0i7yiz8d1qqiy7i6yy389b44v29i3zl479jarss0x77m7nzlpi7v"; }; "82b74cc467fe5e422dffc6ccdaa2746b68a52fde" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/82b74cc467fe5e422dffc6ccdaa2746b68a52fde; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/82b74cc467fe5e422dffc6ccdaa2746b68a52fde"; sha256 = "057npy7g6dvcqkj4yw89cpci8cizg636gah9qq82h00684215jsj"; }; "82db6fcd53c153656a49118fc20771a50c406e2c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/82db6fcd53c153656a49118fc20771a50c406e2c; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/82db6fcd53c153656a49118fc20771a50c406e2c"; sha256 = "0wmb1vn704srn9w5a61bs7mb3rp3azgv5bh6rl4hi7wa9wffwmbi"; }; "8305a66fae9404fe58331fbef287d0215d05f2b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8305a66fae9404fe58331fbef287d0215d05f2b3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8305a66fae9404fe58331fbef287d0215d05f2b3"; sha256 = "196zwpsd8fz1s6gkd35psacb4v6bik4zjgbaqy6ff2118bg3l19y"; }; "83080f6144d571a9ef0996315476290d9c3fff68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83080f6144d571a9ef0996315476290d9c3fff68; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83080f6144d571a9ef0996315476290d9c3fff68"; sha256 = "0rmk1xzs86dvr9k971mb3d5d9q0nbyxr6lh753pf5bqkjsrwirp8"; }; "83095c9481a4bebd25dad78e6ae747bd3674e086" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83095c9481a4bebd25dad78e6ae747bd3674e086; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83095c9481a4bebd25dad78e6ae747bd3674e086"; sha256 = "1r2p3xp0rv19i9dyrf0chc5n8f736d90w5paq90fdxvfzzzx562f"; }; "8309626bf9429a32adfd8e1526f7dcbfb250ca49" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2640065-e0e714c2e4584d65837eabf6f55a41ba/8309626bf9429a32adfd8e1526f7dcbfb250ca49; + url = "http://cdn.unrealengine.com/dependencies/2640065-e0e714c2e4584d65837eabf6f55a41ba/8309626bf9429a32adfd8e1526f7dcbfb250ca49"; sha256 = "02n8g65lp6zbqprxswz598076syxav2vy350yq2gvq6s2p1ad12y"; }; "831c19b0009bccd44d4c2837f3c8ba6e08753be0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/831c19b0009bccd44d4c2837f3c8ba6e08753be0; + url = "http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/831c19b0009bccd44d4c2837f3c8ba6e08753be0"; sha256 = "1b0gsmrzb0bh8mrjfmmxlp55867x5fhqm18wacqvzx2g62zmm0f3"; }; "8336cdf6f693aca7ab55371790ccf0bd5043c224" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/8336cdf6f693aca7ab55371790ccf0bd5043c224; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/8336cdf6f693aca7ab55371790ccf0bd5043c224"; sha256 = "0bqsgbzhsd8dfjlfafs1yx833gwa8pm9jhgq72ymnk83kijhj01x"; }; "835db4359138adfe88490eae6e8d8c90b322dba7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/835db4359138adfe88490eae6e8d8c90b322dba7; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/835db4359138adfe88490eae6e8d8c90b322dba7"; sha256 = "1wbs8pnhyyx84bb60ck5l18fljc37fma5131ijzmjqms84k34rqf"; }; "836ee88c57cc1b5617f36a2b9fb19db420285b69" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/836ee88c57cc1b5617f36a2b9fb19db420285b69; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/836ee88c57cc1b5617f36a2b9fb19db420285b69"; sha256 = "1yiypr57ik8wpq2w7x5yqib411j2qphk6mnpgpraqydfc22qypca"; }; "83960dda908738b13095ce2b7d9b31fde2baf36a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/83960dda908738b13095ce2b7d9b31fde2baf36a; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/83960dda908738b13095ce2b7d9b31fde2baf36a"; sha256 = "0dld18rdn6yjmqzpy3fg36ih3dzr63jma237skjb2nz2d554nkvp"; }; "83b8a24a4c385e1b384d645d948485842fc3cc76" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2426077-b850b68463b841e5964d120c64b8bf13/83b8a24a4c385e1b384d645d948485842fc3cc76; + url = "http://cdn.unrealengine.com/dependencies/2426077-b850b68463b841e5964d120c64b8bf13/83b8a24a4c385e1b384d645d948485842fc3cc76"; sha256 = "1z2a60b2h039a99ipx5gs299s5dbrmy23dgwpw4nrqksh0szzrhx"; }; "83c26e75614987b0816315db03de7aca670aae61" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/83c26e75614987b0816315db03de7aca670aae61; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/83c26e75614987b0816315db03de7aca670aae61"; sha256 = "0vsvf3yhc3gv4vcif0qlsakzmxdrziqjv575xpzbx421pk2sg809"; }; "83cf82ec1c25f57a747c78a0c0ee954463d3aaf8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/83cf82ec1c25f57a747c78a0c0ee954463d3aaf8; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/83cf82ec1c25f57a747c78a0c0ee954463d3aaf8"; sha256 = "180f440v26v4bmj6hbm162jj06vw9sd4kyvarnrazyiq4vmbx3wb"; }; "83d99abd11bcb8782d32661775471266e6254ae4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/83d99abd11bcb8782d32661775471266e6254ae4; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/83d99abd11bcb8782d32661775471266e6254ae4"; sha256 = "0h49cfl1ybxvxgg9p5jq0nb93rqjlqbjabhsjkdzhb4pv9gm1fcf"; }; "83da0ef16746ffdc1151ecbda04a0b161e3f119e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83da0ef16746ffdc1151ecbda04a0b161e3f119e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83da0ef16746ffdc1151ecbda04a0b161e3f119e"; sha256 = "0d4bximz6dkr5q5bbyzlnl2py330qij4i0w5pvgc76asyxl11s3n"; }; "83dc459b2d9c7905eb6f80c6ffd7c0c912a4b007" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83dc459b2d9c7905eb6f80c6ffd7c0c912a4b007; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83dc459b2d9c7905eb6f80c6ffd7c0c912a4b007"; sha256 = "1xshwv0v6bzkn2px64jy5kzbwsh9mqmc9salvqdhw7c594gi1lki"; }; "83e36792413d3e3b767aae667cc67fd3b02ee133" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/83e36792413d3e3b767aae667cc67fd3b02ee133; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/83e36792413d3e3b767aae667cc67fd3b02ee133"; sha256 = "1vpvk4r3bxrb54ibpjffrj3wg37zp44xf8mz9fk3cn4gz8v18g1n"; }; "83eae7ee8ccb30a23878582ea6466cd8487f17f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83eae7ee8ccb30a23878582ea6466cd8487f17f3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83eae7ee8ccb30a23878582ea6466cd8487f17f3"; sha256 = "1s011h62ql0w95lkwwa0pwk2x4d086apijgw0zgmh7cmlzknppvk"; }; "83fd339d2e91415631d3bbe960361fef5a8a1d1b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/83fd339d2e91415631d3bbe960361fef5a8a1d1b; + url = "http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/83fd339d2e91415631d3bbe960361fef5a8a1d1b"; sha256 = "06zcfs55vhpy9jh8330b1zrmsmf0j2f8w92kpxvgd8zi6xz5y9bs"; }; "841906d093cebbe152a1ae20fbab8decbd282e19" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/841906d093cebbe152a1ae20fbab8decbd282e19; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/841906d093cebbe152a1ae20fbab8decbd282e19"; sha256 = "1zjl5jvq80cgr8lb03k687slrq9l336dryn2dwvwsrfc32rnpynl"; }; "841af4efd38ead50b821af773faa68345269e26f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/841af4efd38ead50b821af773faa68345269e26f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/841af4efd38ead50b821af773faa68345269e26f"; sha256 = "0zrv8difxrfkkhhzni7qc91s1k30dwp6462c99iaxds8ly117p89"; }; "8460d3dfed9655b4e8ce53fc3cb879c8905b05f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/8460d3dfed9655b4e8ce53fc3cb879c8905b05f4; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/8460d3dfed9655b4e8ce53fc3cb879c8905b05f4"; sha256 = "07cgvrc4yhakjs4p2sbkx5c3mch26krvvdx6ag0ijm85mx0gdl8l"; }; "8463cbaaa73774638635ddfac40864bed92f3c29" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8463cbaaa73774638635ddfac40864bed92f3c29; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8463cbaaa73774638635ddfac40864bed92f3c29"; sha256 = "1si653ab54yh0fxfxh1wfwfzdq3v8wsxq2vzppl2l2wj96zc8cdr"; }; "848145830d667120c6b744edf11f9f6c7e2f8b7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/848145830d667120c6b744edf11f9f6c7e2f8b7a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/848145830d667120c6b744edf11f9f6c7e2f8b7a"; sha256 = "0vvbpaksh7qdgiwcahdm9h9skp51qxiipzg3gdadam8v10a1g1xx"; }; "84a55e9bd6ceea8c4b1ef30457675290b8de8b27" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/84a55e9bd6ceea8c4b1ef30457675290b8de8b27; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/84a55e9bd6ceea8c4b1ef30457675290b8de8b27"; sha256 = "16zjckcf8851kf9cnzij7mz6iwcvld7g7gxrs750gdp01i5wjpbn"; }; "84b6f854fbee939820a32e6dc3d2b219b84bd6a1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/84b6f854fbee939820a32e6dc3d2b219b84bd6a1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/84b6f854fbee939820a32e6dc3d2b219b84bd6a1"; sha256 = "1xd3hcs0nshn7c21kr1jhaskrslb6z91rp5rrlsq3pzclx740ssm"; }; "85317d647433d1e73e61ca6fe79b44f9b3abca42" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/85317d647433d1e73e61ca6fe79b44f9b3abca42; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/85317d647433d1e73e61ca6fe79b44f9b3abca42"; sha256 = "0ix9vagi91lpqgn224qfxb4h1wvjc6jf3yz5zx4asv6c1bdx7x8l"; }; "85393f1f0730c3ae240238686b47d7643899d34d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/85393f1f0730c3ae240238686b47d7643899d34d; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/85393f1f0730c3ae240238686b47d7643899d34d"; sha256 = "0yy91726kxdpifa3pfhf987m1yya025q6ybh8c3650i0h9z2hzsw"; }; "853b10bea00eac17238cb14c6b39474e5d2d1518" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/853b10bea00eac17238cb14c6b39474e5d2d1518; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/853b10bea00eac17238cb14c6b39474e5d2d1518"; sha256 = "0lhld9bb134mphx4g83abrxf9syz5dx2hmjm701dnx7dsayfl5i9"; }; "858f8eae96cc6e3a7d1fc624e44ef972c47011b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/858f8eae96cc6e3a7d1fc624e44ef972c47011b1; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/858f8eae96cc6e3a7d1fc624e44ef972c47011b1"; sha256 = "0j9h3ysp390psxrc3g71029qsfy21j9jlyqqxgdsns465q0fb031"; }; "85b191ae1844ad6da93fa57876c8850de342b4ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/85b191ae1844ad6da93fa57876c8850de342b4ca; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/85b191ae1844ad6da93fa57876c8850de342b4ca"; sha256 = "0v5i8fznarbq8zdgi9kvg8hl8kb2293vfj6504a3km1my7frww96"; }; "85ba3d3276f5f01cc86df8c39d7cd730ed3b9a4d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/85ba3d3276f5f01cc86df8c39d7cd730ed3b9a4d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/85ba3d3276f5f01cc86df8c39d7cd730ed3b9a4d"; sha256 = "1i53nv4v3wyy8vpgaglj865d8krmfd2yc8my9wq2yyyyiq9zvr3y"; }; "85ead6085f10e657e1a91326f3704d60b31164b3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/85ead6085f10e657e1a91326f3704d60b31164b3; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/85ead6085f10e657e1a91326f3704d60b31164b3"; sha256 = "1xqzxrys82qxihz27s1p811gqhhswqjalzgdfafk490diah527ss"; }; "85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c; + url = "http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c"; sha256 = "03qfjg299d6dx0xzgm822js1mwqs8n9v8hvw9mjc883y77piasgb"; }; "864bfa01d63681c131168385b66aa9d3e6b7e23b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/864bfa01d63681c131168385b66aa9d3e6b7e23b; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/864bfa01d63681c131168385b66aa9d3e6b7e23b"; sha256 = "0lfc8a5f5skbdx263jh5m55fqnslva2pkx3yvifnzsgf396872bk"; }; "86a3ef300ab5182d7d6f3c7e1dec1ab017621176" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/86a3ef300ab5182d7d6f3c7e1dec1ab017621176; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/86a3ef300ab5182d7d6f3c7e1dec1ab017621176"; sha256 = "1b8a7pm5bxf6gcrrx8d4ld19qgck19gd2nhp01dyjm7vqc8cl201"; }; "86ad290cb6e4e954f3e8ad5203151d7614279554" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/86ad290cb6e4e954f3e8ad5203151d7614279554; + url = "http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/86ad290cb6e4e954f3e8ad5203151d7614279554"; sha256 = "1spwcj4yb5hc94m0f2hx13yfjrzsvkhcvgbmlj10ak9bvpkyx96m"; }; "86c299a2f4f573039b2558718ba45d95ff08ade1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/86c299a2f4f573039b2558718ba45d95ff08ade1; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/86c299a2f4f573039b2558718ba45d95ff08ade1"; sha256 = "18qmy1kl7x4jvyj0d9rsyiaq9gszjpx2v0983vbgdqszbgics4ax"; }; "86cf1c73f3f607e472fa7ae7be4709c191878044" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/86cf1c73f3f607e472fa7ae7be4709c191878044; + url = "http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/86cf1c73f3f607e472fa7ae7be4709c191878044"; sha256 = "0avis11c8p42c28k8pdvfns3m397mraj21kk2bnbaw9hmv5difzv"; }; "86fca9c30e8dbd28a791714c1385aea7dc583091" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/86fca9c30e8dbd28a791714c1385aea7dc583091; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/86fca9c30e8dbd28a791714c1385aea7dc583091"; sha256 = "1a91dlqcfrqck0q5285cljzdr9zi14g5dgbzy9772gabc49c01fq"; }; "8741e3f2519f1221c2f8bdb966cfa4504f3ba5a7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/8741e3f2519f1221c2f8bdb966cfa4504f3ba5a7; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/8741e3f2519f1221c2f8bdb966cfa4504f3ba5a7"; sha256 = "028fhjrjcqnrjqx9i0v17mib24l20pd1bcpl8sc1bipa8yc0lk81"; }; "87758c549dbc2d3ff96e0ee0b82d6d99f20c0ab1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/87758c549dbc2d3ff96e0ee0b82d6d99f20c0ab1; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/87758c549dbc2d3ff96e0ee0b82d6d99f20c0ab1"; sha256 = "1jl52dabxi8rqhfadkwwrq68yiqxfvc2n82f9qvmc6viydjdrmpz"; }; "87925181e3a8b737757401a6114a8acf82625a49" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/87925181e3a8b737757401a6114a8acf82625a49; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/87925181e3a8b737757401a6114a8acf82625a49"; sha256 = "1xkykqs3fzvkwf7hm0qxrbhjx1cibyns81cm4lcpad2b4f4a29nd"; }; "879da85ee7839263b362a6d69f41f3d4477d2263" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/879da85ee7839263b362a6d69f41f3d4477d2263; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/879da85ee7839263b362a6d69f41f3d4477d2263"; sha256 = "1d89w13vkl8wjp0x22fsnz9yf7ln4jiadb3mfxfzykix884jr79w"; }; "8817e4ce5e9049b3ef1374d0f56fa509fa491f73" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8817e4ce5e9049b3ef1374d0f56fa509fa491f73; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8817e4ce5e9049b3ef1374d0f56fa509fa491f73"; sha256 = "1ip08vk00921qgz5q70v60zsykyapjjxg7hghn2lbw54ylfy755r"; }; "88192934143593f3b9bdf82185f4ac7a7373da7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/88192934143593f3b9bdf82185f4ac7a7373da7b; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/88192934143593f3b9bdf82185f4ac7a7373da7b"; sha256 = "0p4y1fi48k2jh288d2axriffynn4w824ngh0vfcd1wlrf988gcvp"; }; "883890e30ce2c617da8433831db3b480780ce910" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/883890e30ce2c617da8433831db3b480780ce910; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/883890e30ce2c617da8433831db3b480780ce910"; sha256 = "04knac1hybywc9rmd7cq11scg8hc3qn4yszf7hbak6z807j0abd0"; }; "885b477d70802077c49ab7c32a784bacd55ad24b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/885b477d70802077c49ab7c32a784bacd55ad24b; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/885b477d70802077c49ab7c32a784bacd55ad24b"; sha256 = "0acf1z7q9wyvshacv9mfgc55kkl1fa4c7a3gv94jmk0jccmf6lkd"; }; "888feb5c0fbff7928f650be69fab3ac123ebaa26" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/888feb5c0fbff7928f650be69fab3ac123ebaa26; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/888feb5c0fbff7928f650be69fab3ac123ebaa26"; sha256 = "1rj3434znf64z0cgi0dwx3pz5dhziqgm7gpcrx5ag2chkzixl7b0"; }; "88ea146643258d378d159b9f928c783774ea9c53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/88ea146643258d378d159b9f928c783774ea9c53; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/88ea146643258d378d159b9f928c783774ea9c53"; sha256 = "1wh8zfcswfp5ms94lgvl8yn0qjkbrznh95wln2hi9civ7594j3zs"; }; "88fb7a15bfd879a0c14ff7a16e321cc2b8896c38" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/88fb7a15bfd879a0c14ff7a16e321cc2b8896c38; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/88fb7a15bfd879a0c14ff7a16e321cc2b8896c38"; sha256 = "107xs4qhzjn2305hd84cbp2xnymba6sr8axd5snwwa9dzl39yaaz"; }; "8901801fb587b12a9aa6263540cdd95b46710f9c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8901801fb587b12a9aa6263540cdd95b46710f9c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8901801fb587b12a9aa6263540cdd95b46710f9c"; sha256 = "1msg49v9hyvfy5ms00lyq9x322qwvw6akzpz1v6kylrakri8nwvr"; }; "8906ef4c42cb5d492b620e5d8dc2118dd976ea12" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/8906ef4c42cb5d492b620e5d8dc2118dd976ea12; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/8906ef4c42cb5d492b620e5d8dc2118dd976ea12"; sha256 = "1xibvx905vvfvs0cdyjqbjy7wb3pvimzazd9ii5rwyvci6gj1vb8"; }; "89080b8cfede13b245eaadefec0b89e901ff8646" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89080b8cfede13b245eaadefec0b89e901ff8646; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89080b8cfede13b245eaadefec0b89e901ff8646"; sha256 = "1103qvaxr40xq97p20x8zfv32hkz3nnv53lc8624qkjyhnqwni8c"; }; "890adf51623c1e158f5c9f34db7f7f686e7005b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/890adf51623c1e158f5c9f34db7f7f686e7005b7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/890adf51623c1e158f5c9f34db7f7f686e7005b7"; sha256 = "00cb7r13zpgiw9x0ahiimx915ynikicv4ixlxgxrfyfvqvkb2w7b"; }; "890f859d20731989f0ce0e2ccc89da28cf0f8dbe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/890f859d20731989f0ce0e2ccc89da28cf0f8dbe; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/890f859d20731989f0ce0e2ccc89da28cf0f8dbe"; sha256 = "1sfsps751hwql9akgqvsxvbfp0hzzlgcxg4pf9wzv0fmsm5zk910"; }; "89550f66a2a48a9f1b9089703e9b33eb14a23ae5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89550f66a2a48a9f1b9089703e9b33eb14a23ae5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89550f66a2a48a9f1b9089703e9b33eb14a23ae5"; sha256 = "16bbs2r4i3bl6i0qp7snlifjh9s3gy33pdfjjpvnv0357wzama9g"; }; "89a680846da64558e5147c08cdce03270f11e7a4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89a680846da64558e5147c08cdce03270f11e7a4; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89a680846da64558e5147c08cdce03270f11e7a4"; sha256 = "119sjc3c9nqc1g8jij70kaa2rj2q4q6nd8dm4m4xmk32l9vf98rg"; }; "89be40342b7a93b0b11a6d495aa56ff3b8aebdbe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89be40342b7a93b0b11a6d495aa56ff3b8aebdbe; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89be40342b7a93b0b11a6d495aa56ff3b8aebdbe"; sha256 = "0lbq80772si922f6s3qahsx89hdyzvd8351j2pqr019pnasgpic6"; }; "89cf6e0f862a93ef9e543780d100517db3f3327b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605642-f320d1a5ef22435181fcba597b91c63e/89cf6e0f862a93ef9e543780d100517db3f3327b; + url = "http://cdn.unrealengine.com/dependencies/2605642-f320d1a5ef22435181fcba597b91c63e/89cf6e0f862a93ef9e543780d100517db3f3327b"; sha256 = "0b5p8gphgwx322ddyizq83mlwx318m8ndw8b6d10pvh6kfzf5ry8"; }; "89d28cf4154268be0856af7d9417e5f4018f65b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89d28cf4154268be0856af7d9417e5f4018f65b9; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89d28cf4154268be0856af7d9417e5f4018f65b9"; sha256 = "1mksxkj5hx9wbnswb3dal0qqijlnrcrxprc7ashz0cgs8svhvkj2"; }; "89e79ac4565d509ccc57badb152f9d534469f4e6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89e79ac4565d509ccc57badb152f9d534469f4e6; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89e79ac4565d509ccc57badb152f9d534469f4e6"; sha256 = "1vinxn36cb93zpri4zk8jxhbjnb11drb13fw7dxvjbivqdzakahl"; }; "8a1ff4c3dc8b96b41c8fca1325ddf964f3768446" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8a1ff4c3dc8b96b41c8fca1325ddf964f3768446; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8a1ff4c3dc8b96b41c8fca1325ddf964f3768446"; sha256 = "06gan1mbhj26z6flw0p1mw2qijv0nc8hpxl5q9dvwdmv5j1s937z"; }; "8a251169614945698a2c1990c0898641d380b289" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8a251169614945698a2c1990c0898641d380b289; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8a251169614945698a2c1990c0898641d380b289"; sha256 = "1bd15y5ka1pzmj0y0i19w5r4pvgx36py84sfq097gvsbffx3ik56"; }; "8a7c6b0f9cc883870556fb456f20715ed40367c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/8a7c6b0f9cc883870556fb456f20715ed40367c5; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/8a7c6b0f9cc883870556fb456f20715ed40367c5"; sha256 = "1gd8mxmr9874577fzyhl5cl6rrx0sl4g8c7j8is3jp97zcng853g"; }; "8a933dd63dadc44c26fb7afa83573b5ab52aaf33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8a933dd63dadc44c26fb7afa83573b5ab52aaf33; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8a933dd63dadc44c26fb7afa83573b5ab52aaf33"; sha256 = "19fjz78gjlp50xq490wfvkjzpay9rrf78jnv0x0gs6kpnyd56x35"; }; "8abd833e1a283680a6e19d7896cda23b4f559012" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8abd833e1a283680a6e19d7896cda23b4f559012; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8abd833e1a283680a6e19d7896cda23b4f559012"; sha256 = "0xq3c1hcmlki59g6y36zpfq6pm6cryg88sy364rayihlzgbc2dra"; }; "8ad5dea631af368fec9f5f42b6f235997a8131e9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8ad5dea631af368fec9f5f42b6f235997a8131e9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8ad5dea631af368fec9f5f42b6f235997a8131e9"; sha256 = "1hwnldwf0g7k34wg19yvzfz6939qc9kw9758fq7dsi0737cxykqc"; }; "8ad8c126595c03e31b971166788c82bdc9cf0544" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ad8c126595c03e31b971166788c82bdc9cf0544; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ad8c126595c03e31b971166788c82bdc9cf0544"; sha256 = "17vvcdpba4mijzlpi97xx7d022knpdw918npwq40vcmswmn758vg"; }; "8ae41d0c7d8fe2a00251726554c48ce1dec9ca04" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ae41d0c7d8fe2a00251726554c48ce1dec9ca04; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ae41d0c7d8fe2a00251726554c48ce1dec9ca04"; sha256 = "04dmv62qlczyj67rrfjnm790ksbpfwdgzl05zgqgi9lyrrsq3m8c"; }; "8af47f724bed2b5bd921d98f1d04d577d07ad781" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8af47f724bed2b5bd921d98f1d04d577d07ad781; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8af47f724bed2b5bd921d98f1d04d577d07ad781"; sha256 = "0jy4dvz4fdf50283w6mcycq1hd7rvc3nawv9zylvb0pgxs6bvlnm"; }; "8b025a64e2081e1caa1c37427ec0e6194ec0275a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2517611-d0c4506b0eb74bb5b22fcaa18bed9682/8b025a64e2081e1caa1c37427ec0e6194ec0275a; + url = "http://cdn.unrealengine.com/dependencies/2517611-d0c4506b0eb74bb5b22fcaa18bed9682/8b025a64e2081e1caa1c37427ec0e6194ec0275a"; sha256 = "1pm6inqkiqwjf1yjc38ncky6ibm22ha1pj9r84mpwxc1c7f9js6x"; }; "8b0519b8991a39be23e66177b1f881b62f967cb0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8b0519b8991a39be23e66177b1f881b62f967cb0; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8b0519b8991a39be23e66177b1f881b62f967cb0"; sha256 = "1x5zmgn9h2hxnjsrip75mvj8qs5q5mws8zb72v6rlw8iy7hjf8vh"; }; "8b3162447aae7621530652ee14ce8da1c287d6b0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b3162447aae7621530652ee14ce8da1c287d6b0; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b3162447aae7621530652ee14ce8da1c287d6b0"; sha256 = "0r2377k0a3jjn73x5fn1g4ppnjdywzkfxgdf801wk06zdkn41gpk"; }; "8b8340f444f8bcbe6806d7f4b2a6d3894354baf5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b8340f444f8bcbe6806d7f4b2a6d3894354baf5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b8340f444f8bcbe6806d7f4b2a6d3894354baf5"; sha256 = "0yqm3ib77952dsydjvw5dmw7fw94iny0zj1y4kkl8wpbcj414kk0"; }; "8bb26a65444fea08370321879198f39f86ba188c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8bb26a65444fea08370321879198f39f86ba188c; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8bb26a65444fea08370321879198f39f86ba188c"; sha256 = "09912hlzrsgd7pickg9kgrc4rag393h1xkxybm5vnr3iyhd20wk7"; }; "8bcf71af2f119d1ff9d3b09fe4ddcb08fc1a7d95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2700683-67efb93bd15f484599a98be1ae830afc/8bcf71af2f119d1ff9d3b09fe4ddcb08fc1a7d95; + url = "http://cdn.unrealengine.com/dependencies/2700683-67efb93bd15f484599a98be1ae830afc/8bcf71af2f119d1ff9d3b09fe4ddcb08fc1a7d95"; sha256 = "1zs71smgc45hh3sr3f22l98ch9k5f1z6hppx0dbs2lgg2s8bgkfn"; }; "8bdaed33beb2fa505dd0ba8f7d9ca94208ec44a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/8bdaed33beb2fa505dd0ba8f7d9ca94208ec44a9; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/8bdaed33beb2fa505dd0ba8f7d9ca94208ec44a9"; sha256 = "09x8k8apm7kly0kb04ladywwzyy90nzjvnd6hh476ir9mss1mjj0"; }; "8c062ee2e53c0fdeef88071aad2ed5ca1787cc1e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8c062ee2e53c0fdeef88071aad2ed5ca1787cc1e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8c062ee2e53c0fdeef88071aad2ed5ca1787cc1e"; sha256 = "1ymf1zl36xfsc0wmipsps3l90jx04qgz8ri7hmwpy4831hc7r594"; }; "8c220042a37dc4cc1b8b05afb13afadab972b12d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/8c220042a37dc4cc1b8b05afb13afadab972b12d; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/8c220042a37dc4cc1b8b05afb13afadab972b12d"; sha256 = "1hjg7wwfb217dansimncjya4ll7lsxshi0yvnyi2f2f9bm7jijd9"; }; "8c9f2e92d67f683596da321c8af36ece1d8ac774" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8c9f2e92d67f683596da321c8af36ece1d8ac774; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8c9f2e92d67f683596da321c8af36ece1d8ac774"; sha256 = "0hiq4c2w47msrn5fiqggb7gf6fn59rk708xxl92jid8wa4h6xipa"; }; "8ca8fc4f81c127e4c748fcb899af430506bd0b01" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8ca8fc4f81c127e4c748fcb899af430506bd0b01; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8ca8fc4f81c127e4c748fcb899af430506bd0b01"; sha256 = "0y551cnm9r4jm05iqiwi8ysglkny6c78mwxrmxssabknlh0v15vv"; }; "8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604000-fac6782aa4fd45888363b062a8353761/8cd8b767b771e6d10c8f1f0b54ab812881f22fcd; + url = "http://cdn.unrealengine.com/dependencies/2604000-fac6782aa4fd45888363b062a8353761/8cd8b767b771e6d10c8f1f0b54ab812881f22fcd"; sha256 = "1wp04cwi17h2y01is0wvv02nhcn8nyb1f8c28hcm7dqswyw738j5"; }; "8d5fa95a3df6eb36318fcf2a135f464a76257cc5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8d5fa95a3df6eb36318fcf2a135f464a76257cc5; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8d5fa95a3df6eb36318fcf2a135f464a76257cc5"; sha256 = "0axx62bip7rfrm0gbvdszdx1ik4mhxqxvi4ybmlbfhf2c1b26grg"; }; "8d8a695159bf666e16ab7b3558bb1d5e4e3b4698" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8d8a695159bf666e16ab7b3558bb1d5e4e3b4698; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8d8a695159bf666e16ab7b3558bb1d5e4e3b4698"; sha256 = "07c4p0dsl575zxamvvwh12hin7qnhk9lcd4aivnbbmrlhlrb23cf"; }; "8da60707e5826860752528702f9a7256a5d2ef81" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8da60707e5826860752528702f9a7256a5d2ef81; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8da60707e5826860752528702f9a7256a5d2ef81"; sha256 = "1701n4r1713crfxkaa0n2id346j1mf5nfg93givnr3c2qqlqz5yq"; }; "8db9bb91759363ec605c3d44273194136ce7dc1f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8db9bb91759363ec605c3d44273194136ce7dc1f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8db9bb91759363ec605c3d44273194136ce7dc1f"; sha256 = "06xajy55psab26x65cvxyji5bm4cxyh4qb1kcg9a9qpfjip7wfjg"; }; "8dbbbdecc05ee43425e31b4f4eafb33b90db30ac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dbbbdecc05ee43425e31b4f4eafb33b90db30ac; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dbbbdecc05ee43425e31b4f4eafb33b90db30ac"; sha256 = "1zch7l01gxhwwkm4i9a9dwa577rrp37vr6nkn1mkhakrjfirfams"; }; "8dd3bfc182e5277d4408943dba3520659e2928f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dd3bfc182e5277d4408943dba3520659e2928f4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dd3bfc182e5277d4408943dba3520659e2928f4"; sha256 = "02f3h1lsn8vkrixyb1lx1cbwffvby3i74ym71a05higvhw61mxaj"; }; "8ddadc13864ca20375d4b0f4ea443c123c3df3b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8ddadc13864ca20375d4b0f4ea443c123c3df3b7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8ddadc13864ca20375d4b0f4ea443c123c3df3b7"; sha256 = "10vbj0h5k6s3ka3dqzfwz796cpx1ic5dxbaipcwyc45k2vj6ni4x"; }; "8e039420fc01a77f694997d93310f9ae83f1b6cb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8e039420fc01a77f694997d93310f9ae83f1b6cb; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8e039420fc01a77f694997d93310f9ae83f1b6cb"; sha256 = "0jpxci1p47inn5qyp0jjh69ja0s7m5k07jhqvkpyvhy7pgdk0m56"; }; "8ec6e7ee9b649b9774e5429add4c5058fe492fd1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/8ec6e7ee9b649b9774e5429add4c5058fe492fd1; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/8ec6e7ee9b649b9774e5429add4c5058fe492fd1"; sha256 = "1b29i8b6fh4siq5h8s48d97s0az2761l77z8vzykb4h0psxpzmy1"; }; "8f4c0d2091f953f5c7ea8154eaa6e6d04add923a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/8f4c0d2091f953f5c7ea8154eaa6e6d04add923a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/8f4c0d2091f953f5c7ea8154eaa6e6d04add923a"; sha256 = "0sc09156h0vjc6jc67q1sp0khpzzkkvy9c8bh62rg7rbzlldlgiv"; }; "8f92c27e6fe54071ccf92649c25ae44991ea42c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8f92c27e6fe54071ccf92649c25ae44991ea42c8; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8f92c27e6fe54071ccf92649c25ae44991ea42c8"; sha256 = "1ndfkv2zcamf377pbg67f257c4rqxh7ri06r4x2xqc4a5q0s60zl"; }; "8fb54a6908a0bea0b6a901eb32dd120dd2360fe2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/8fb54a6908a0bea0b6a901eb32dd120dd2360fe2; + url = "http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/8fb54a6908a0bea0b6a901eb32dd120dd2360fe2"; sha256 = "07dgqsshhamlgi79884dllr4253yr29ni84dhnrcfn540vpxbs5k"; }; "8fbbdcccea26e1c7cbd56a84637ec3564aec691b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8fbbdcccea26e1c7cbd56a84637ec3564aec691b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8fbbdcccea26e1c7cbd56a84637ec3564aec691b"; sha256 = "1vnpb1d239wp1nyrvwiv57rr7qwr2rplws6zcxfnl3rxmmfhkman"; }; "8fc77c86e05ff31bec85d8974938b0b5aa12fd1a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/8fc77c86e05ff31bec85d8974938b0b5aa12fd1a; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/8fc77c86e05ff31bec85d8974938b0b5aa12fd1a"; sha256 = "1v92ggrafax000jrdc6yhysyr8mridvdcss8zjc8ib5bwism9sdm"; }; "8ff23362f6d2fe2b1e7f422a3f52c13797ef128e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8ff23362f6d2fe2b1e7f422a3f52c13797ef128e; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8ff23362f6d2fe2b1e7f422a3f52c13797ef128e"; sha256 = "0faigq1s7yjji1khqm2g5bi6fm6217lm7lk5gy61ddwxqz1jkf6k"; }; "901760156bc3f4720396fcb487ad396709e18d9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/901760156bc3f4720396fcb487ad396709e18d9b; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/901760156bc3f4720396fcb487ad396709e18d9b"; sha256 = "0sgp780bfy2gri238s8fsnbh7vbdrg5mdxla39j15nllfr1ybxfj"; }; "904a3b18b20eee856202f89aa46a20df12388dc1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/904a3b18b20eee856202f89aa46a20df12388dc1; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/904a3b18b20eee856202f89aa46a20df12388dc1"; sha256 = "0ncm73g11s6x5lp5pz5b4xm2kfn7254hp4nzdfxwd841l96b4b7s"; }; "90874ee4cf89c6b1658479cf16716dd6d9f3391f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/90874ee4cf89c6b1658479cf16716dd6d9f3391f; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/90874ee4cf89c6b1658479cf16716dd6d9f3391f"; sha256 = "0hjrsp0jq1qgm9v31kdh7l67z9w54415a9f73lznsb1zmw1phz22"; }; "90d2bac8a115eb18639fab5f7840138c63cf9b8d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/90d2bac8a115eb18639fab5f7840138c63cf9b8d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/90d2bac8a115eb18639fab5f7840138c63cf9b8d"; sha256 = "0ifayjg539ki273zzxx7b5jpjzdy50pyvb8d2a3r84216anww3qn"; }; "91475080ede727f0185da20abde65457b43d5476" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/91475080ede727f0185da20abde65457b43d5476; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/91475080ede727f0185da20abde65457b43d5476"; sha256 = "0z6ql3zfvpiay87g3h14pfv5dyjx6d4r7n7ks0pvx829yb2h0n4c"; }; "9148d7be7b0930b397ef995a2e8cfdc6c7e2617f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/9148d7be7b0930b397ef995a2e8cfdc6c7e2617f; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/9148d7be7b0930b397ef995a2e8cfdc6c7e2617f"; sha256 = "13cw8rzvf6rm9dvj1d7q86l5r3bs4q23z588yd6imlvpf2pp7f5m"; }; "914d43c1dd28877dfe0d8b3b2fe4dca1ea17a575" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/914d43c1dd28877dfe0d8b3b2fe4dca1ea17a575; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/914d43c1dd28877dfe0d8b3b2fe4dca1ea17a575"; sha256 = "1m7y3m9b1vvvvdw05g6hcs2hv9jh0947l9gjhr5zdj9adqf3aa72"; }; "9157e95d94d3ff3b40e3e507ef12528e8574f8d7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9157e95d94d3ff3b40e3e507ef12528e8574f8d7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9157e95d94d3ff3b40e3e507ef12528e8574f8d7"; sha256 = "0n825h58ygdqv93naavg0xm7p3ncxlyzp2c89dlfzzq4cs7mnvaz"; }; "91639ede60c084c481daea6546adf05ba88aeb17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2618867-a941974a307a4d11a35487de88a65fbe/91639ede60c084c481daea6546adf05ba88aeb17; + url = "http://cdn.unrealengine.com/dependencies/2618867-a941974a307a4d11a35487de88a65fbe/91639ede60c084c481daea6546adf05ba88aeb17"; sha256 = "0r2s4k616aj3y5q4cc6wmg1im4sd9qbi477kk4av2yxf1db078vg"; }; "919773af16fc549ebf79e9b9629c8d0c79d37927" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/919773af16fc549ebf79e9b9629c8d0c79d37927; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/919773af16fc549ebf79e9b9629c8d0c79d37927"; sha256 = "01xmmimdnzywvlnp3j9417iszkqmprjsb07gkh2rb6pqbabbjh3g"; }; "919cacfafb5826d92667b345276a3637499d8eac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/919cacfafb5826d92667b345276a3637499d8eac; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/919cacfafb5826d92667b345276a3637499d8eac"; sha256 = "00yyly9c0ggpl793mkzsa8dlbsh4drdagdhhv8vwdkldq666jizy"; }; "91eb46476dcb659fc2275fc18c2061796b561bed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/91eb46476dcb659fc2275fc18c2061796b561bed; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/91eb46476dcb659fc2275fc18c2061796b561bed"; sha256 = "020wajrnlvqk2c4pjpxf7562acryacxk1535fib0f6250wjhmh8r"; }; "91f1332208a164cfc7739215d515dc4574548eb4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f1332208a164cfc7739215d515dc4574548eb4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f1332208a164cfc7739215d515dc4574548eb4"; sha256 = "1mxhnjf7vda1cxny35rw3ib4kp9i3h09a5lv0r70pazqj1ir23zi"; }; "91f5cdeaacc7b2be3fe926cfc1b9d3a054e143f2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f5cdeaacc7b2be3fe926cfc1b9d3a054e143f2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f5cdeaacc7b2be3fe926cfc1b9d3a054e143f2"; sha256 = "0cvqrr7wvlgyvhh5bz61laigv9dy7ra65hdszi3sg467zy35b1dy"; }; "920bbd06b0082189854b0b43390a039f451bf843" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/920bbd06b0082189854b0b43390a039f451bf843; + url = "http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/920bbd06b0082189854b0b43390a039f451bf843"; sha256 = "0r4wh2iswm4w1zgnjbmw8x4jpgd9zr2c1azy2nvgwg2rcja73adw"; }; "922b2bdba29589b9fa7f0b9dd3668e5703e9c88c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/922b2bdba29589b9fa7f0b9dd3668e5703e9c88c; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/922b2bdba29589b9fa7f0b9dd3668e5703e9c88c"; sha256 = "1af3n4b4h1yd92y4w660kslpz0nkvpsvinfs3p9l5yv1jfrz2lxi"; }; "9230b9bb873b7a7cfc1fd2410d1749427c7c3499" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9230b9bb873b7a7cfc1fd2410d1749427c7c3499; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9230b9bb873b7a7cfc1fd2410d1749427c7c3499"; sha256 = "0c6c6rahp2x4n5vahs2csgx8gyzgqzajvzwx0dii1p44crb4cc2h"; }; "9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4"; sha256 = "0v7xa1wzsd2rif4dikbm7dzzzw2k7c70vr6rp7l0wv3d978p9fr1"; }; "925f53a8ddf5e922520fc19cf6a17b00419817e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/925f53a8ddf5e922520fc19cf6a17b00419817e7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/925f53a8ddf5e922520fc19cf6a17b00419817e7"; sha256 = "0p4l1r57w29bkir2k9y3pl50ycr5q3436ldrrm0dzzqb8ag5bkfd"; }; "926540c5a0b84439444ce2305aa3737763bb95a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/926540c5a0b84439444ce2305aa3737763bb95a3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/926540c5a0b84439444ce2305aa3737763bb95a3"; sha256 = "1m1bsgri6xi5ijpyhpybrir760qrqy2hmwrsbifw0j5yxwxlvyrz"; }; "9285328e0b04faaf9fdc22bd27b76ef259020492" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9285328e0b04faaf9fdc22bd27b76ef259020492; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9285328e0b04faaf9fdc22bd27b76ef259020492"; sha256 = "0c2jz4pjf5f62ga9nlac4m3q92n9wgccjcwbyvr2scangawjh7sq"; }; "92abcde8582abb2913e4531cf3ea720b0e8c7d33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/92abcde8582abb2913e4531cf3ea720b0e8c7d33; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/92abcde8582abb2913e4531cf3ea720b0e8c7d33"; sha256 = "1h66p5sp1j2l1jm4d6pjg34ng9k0d1796mns38gkcily554v4v6n"; }; "93423a9a78f3eaad42d062f8d2ff25e901ff455d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93423a9a78f3eaad42d062f8d2ff25e901ff455d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93423a9a78f3eaad42d062f8d2ff25e901ff455d"; sha256 = "1hc5hwd0pazkcscicn8dpyyy9dc0aysbz9z95fwjfqsz1l7hg9k2"; }; "935837a33fa46d5ef7713fd4a123c61845ce49e5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/935837a33fa46d5ef7713fd4a123c61845ce49e5; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/935837a33fa46d5ef7713fd4a123c61845ce49e5"; sha256 = "01dchcyd4z8a6vhk2j071a5rw3hv529cz5fhjkasplfqvl1dri7y"; }; "937a8d559bb1eaa790bd343ce8439885289660ad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/937a8d559bb1eaa790bd343ce8439885289660ad; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/937a8d559bb1eaa790bd343ce8439885289660ad"; sha256 = "17050dmx7pmsvxv4agmphln7xcy5bq058pmi47pqwlsf2njqskgm"; }; "93992b5277a20ed987f224c8f23f713677e0e25a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2546088-6cf476c573f0461594db3f64f59ec9cc/93992b5277a20ed987f224c8f23f713677e0e25a; + url = "http://cdn.unrealengine.com/dependencies/2546088-6cf476c573f0461594db3f64f59ec9cc/93992b5277a20ed987f224c8f23f713677e0e25a"; sha256 = "0v60rm9bh086p2agj0hl924lhmzsdbk6akycra97vvjf8riaznmd"; }; "93d5d44b151da63343cd4f052e5efab5039f13f8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93d5d44b151da63343cd4f052e5efab5039f13f8; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93d5d44b151da63343cd4f052e5efab5039f13f8"; sha256 = "0zq57rg4pw8ly7vr8wjshq5zjp93n4zgzzjqkwgh1lz542w8jrli"; }; "9402187f503c2f391c471ecb84988e49b0cac918" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2603097-3140b87e2cb94286beb08198353da9a9/9402187f503c2f391c471ecb84988e49b0cac918; + url = "http://cdn.unrealengine.com/dependencies/2603097-3140b87e2cb94286beb08198353da9a9/9402187f503c2f391c471ecb84988e49b0cac918"; sha256 = "0qvxgvjr3fk8v4i5fcsz8vlxzw07hdyy0q94psngzjpvp0f9943d"; }; "941fcfee8a4d9b5b95af5e64593a01405ed864b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/941fcfee8a4d9b5b95af5e64593a01405ed864b8; + url = "http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/941fcfee8a4d9b5b95af5e64593a01405ed864b8"; sha256 = "0ipyq7ycmysav0p4n285w49394nxrq4nqqpdmlmd6gcjppv2hsd2"; }; "9480aeff10931a3129abfc074e9d75dc46fb60b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9480aeff10931a3129abfc074e9d75dc46fb60b1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9480aeff10931a3129abfc074e9d75dc46fb60b1"; sha256 = "1mjpiaf4jh4fh8bld18gh97bnwhflyqyqb8zmawngbd0f686jhr6"; }; "948831f2786e73219fac5ebfe8a92939c3ea637f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/948831f2786e73219fac5ebfe8a92939c3ea637f; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/948831f2786e73219fac5ebfe8a92939c3ea637f"; sha256 = "0z6gh9j67d0as8x8v62n07w5xj2gj6x6k2pgynx01jp6z6k9x4dz"; }; "94ab4be561c4e5ce07253ce94aa3794090a44428" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/94ab4be561c4e5ce07253ce94aa3794090a44428; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/94ab4be561c4e5ce07253ce94aa3794090a44428"; sha256 = "0j0nwdwk46yskmmgx3y84wcr50ak801zdfj4mxwlai3bvb04f38n"; }; "94b9d86dc4aef7c178c2f9b2cd5360412b13b2df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/94b9d86dc4aef7c178c2f9b2cd5360412b13b2df; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/94b9d86dc4aef7c178c2f9b2cd5360412b13b2df"; sha256 = "0fmkvvqy0v4wsd58hqlgrcpvm4a4qsrasfy5fy5h5b7j8z5q3vcl"; }; "94cfed4a88c4801ef537b65413db4cc3326b0a89" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/94cfed4a88c4801ef537b65413db4cc3326b0a89; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/94cfed4a88c4801ef537b65413db4cc3326b0a89"; sha256 = "0smaxw3d54i6yymcil00mkdc5mp5yw95p18gc65sx0ir0yycviyc"; }; "954237c72446f3cdf8886043123658ca943e6a89" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/954237c72446f3cdf8886043123658ca943e6a89; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/954237c72446f3cdf8886043123658ca943e6a89"; sha256 = "11rrbx70dmjyd97sk964lzjbpcyjg07zjfjnvn25z6v9bv3a49xb"; }; "957337ec86f032a91c82dfc2f859843e3a1c1e88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/957337ec86f032a91c82dfc2f859843e3a1c1e88; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/957337ec86f032a91c82dfc2f859843e3a1c1e88"; sha256 = "0gz05g4nh8645h4zdvrhmkpw9m3jlddk8ggd2h203h4zx51l3aav"; }; "95b668ea9989cc5ca54f2f7db9aafc7ae8277fb8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/95b668ea9989cc5ca54f2f7db9aafc7ae8277fb8; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/95b668ea9989cc5ca54f2f7db9aafc7ae8277fb8"; sha256 = "1rprhq2rjgd5s4r8jn5f5nz6w20yckr79sh9mwmsfkx7zxkwda1b"; }; "95e4d7dc9cb01e3491442f9370e98e0d6361f556" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/95e4d7dc9cb01e3491442f9370e98e0d6361f556; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/95e4d7dc9cb01e3491442f9370e98e0d6361f556"; sha256 = "0w86a2dcdm4r0yqdy1ibdrmgmnb122znhacx9cz7jm2bsjb81nh6"; }; "95f7b61131b0b7361bd6b788845382016a65618d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/95f7b61131b0b7361bd6b788845382016a65618d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/95f7b61131b0b7361bd6b788845382016a65618d"; sha256 = "1li07rkzvnasm9qc4qza2y6vyw7xhx33wmjzqbc2gwmawxjpl6an"; }; "960e4509e3bf35c6ecf5e52ebd53c18379354b18" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/960e4509e3bf35c6ecf5e52ebd53c18379354b18; + url = "http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/960e4509e3bf35c6ecf5e52ebd53c18379354b18"; sha256 = "16y0ffz0kn1k723xmr4vmna8giqsl6pqgp83a7w1hp8slmg1z1xs"; }; "960f838a00eaece74604333768e1901f77dc91e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/960f838a00eaece74604333768e1901f77dc91e7; + url = "http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/960f838a00eaece74604333768e1901f77dc91e7"; sha256 = "08v86w4b8jx5af5agv2cyhxwc3a3w9xzr69lfvdljms51991qmkv"; }; "963f0fd12da9d6cf7d35a71dce090f7d5271d802" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/963f0fd12da9d6cf7d35a71dce090f7d5271d802; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/963f0fd12da9d6cf7d35a71dce090f7d5271d802"; sha256 = "133mrcxjpqhrffjbhiviwn91h3x5csqpk1fhhzlmc0spyf9bnswa"; }; "96421d48a3164d2d4259c4c9500dfbf44d9b90fb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/96421d48a3164d2d4259c4c9500dfbf44d9b90fb; + url = "http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/96421d48a3164d2d4259c4c9500dfbf44d9b90fb"; sha256 = "0kvplc4pwnjv7j240d2bcggwibrws3afamx6wh32lap5pps67d81"; }; "9653a9d2aef2e0fff14e4e16ca9058b38f172dd0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9653a9d2aef2e0fff14e4e16ca9058b38f172dd0; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9653a9d2aef2e0fff14e4e16ca9058b38f172dd0"; sha256 = "0d2z11fpnvx15yncyf840n7ww4vaaypyn4r7cg2ddscg8llp7056"; }; "9690133f46e7a766b46b38365897102baf062020" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9690133f46e7a766b46b38365897102baf062020; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9690133f46e7a766b46b38365897102baf062020"; sha256 = "1jim7i5ih76c4wjm06y75iqw9ldcmc5wr0gs5vichdhgdj1y0ay6"; }; "96a0e755dc47a57b85791e7d748fe25e7258173e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/96a0e755dc47a57b85791e7d748fe25e7258173e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/96a0e755dc47a57b85791e7d748fe25e7258173e"; sha256 = "1ibam8hh271ci3fp18baiw3jsll89i1w1q8z87gmi7y5qdasar02"; }; "96e618ee3726b5d13ee509923aeff0bb6272498c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/96e618ee3726b5d13ee509923aeff0bb6272498c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/96e618ee3726b5d13ee509923aeff0bb6272498c"; sha256 = "13xa397xfya40cypwl20j332bp0rcljyj66z8vwdc10vxwwrdqv1"; }; "96ec8bc282d262d4764767c1478400c10994bf5e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/96ec8bc282d262d4764767c1478400c10994bf5e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/96ec8bc282d262d4764767c1478400c10994bf5e"; sha256 = "00x67b5sd3230k6q08z8n0ad95ia3fxzk0mssz6lmbi0zqqsvvbl"; }; "973fb0c29b2e3a44d2d370a545ef1a38a81ed07f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/973fb0c29b2e3a44d2d370a545ef1a38a81ed07f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/973fb0c29b2e3a44d2d370a545ef1a38a81ed07f"; sha256 = "1n7kvxc135za5a2lzmrp18kpyka2gc2dynr30fpn1m1lfa09985b"; }; "97772a52cd613920ec0a84f0c8b57d0c8e88b1b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/97772a52cd613920ec0a84f0c8b57d0c8e88b1b6; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/97772a52cd613920ec0a84f0c8b57d0c8e88b1b6"; sha256 = "1l262n4qq78fbvgrd6qilmp70rx4x5ciw444nw6qdjvbxag2va6g"; }; "9788909a70709303adf419bf0340b73ab037600b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9788909a70709303adf419bf0340b73ab037600b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9788909a70709303adf419bf0340b73ab037600b"; sha256 = "1vw1a4nlwq6arcddbfiid9lmkfv8ylaakpggzb706hgr9jj1qi7h"; }; "980f3e90adc8557d71bfbef57bc146374612493f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/980f3e90adc8557d71bfbef57bc146374612493f; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/980f3e90adc8557d71bfbef57bc146374612493f"; sha256 = "1xvybmljiw3p3rwy91fi1dk7fmcpdys8b1c13yw4sij7ym0dqjkf"; }; "9851cf052473a71589aa7577f62e6b82f0298832" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9851cf052473a71589aa7577f62e6b82f0298832; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9851cf052473a71589aa7577f62e6b82f0298832"; sha256 = "0kd2bcr3n9l3qjxjij06gm0rgv5dhvrq3mdv6sqwmv3f28q1r8bq"; }; "985271d1e9b876cc6b98ce871d8efed7b2b3cbeb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/985271d1e9b876cc6b98ce871d8efed7b2b3cbeb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/985271d1e9b876cc6b98ce871d8efed7b2b3cbeb"; sha256 = "1mh8jr05wk2wg1830bv1yq30ifxngjrb8nnilw2hwl1g6dmss3g9"; }; "985fcff275609870f5fa9ace4a4e31fcdef7eb1f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/985fcff275609870f5fa9ace4a4e31fcdef7eb1f; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/985fcff275609870f5fa9ace4a4e31fcdef7eb1f"; sha256 = "03jw2kr34vxh4rpjq58rq00h0vv7mlbi3pc63aq6914yqwzvv36v"; }; "986472c357451eab93419161f5ccadfefcbdb41e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/986472c357451eab93419161f5ccadfefcbdb41e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/986472c357451eab93419161f5ccadfefcbdb41e"; sha256 = "05arp7raj4ins0azci930klihg54zmj2b0ykhmnp91z6mdqw3nx0"; }; "98bce6b328014cb7a038cf71a5c84a03c88f3b63" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/98bce6b328014cb7a038cf71a5c84a03c88f3b63; + url = "http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/98bce6b328014cb7a038cf71a5c84a03c88f3b63"; sha256 = "1b50jfk9cz2x13378pbyd8lcg0m9jahhjwc1a9zfg68y6pf08rbm"; }; "98d4e369b78b0733da5369ef5d9a3d0821224bd8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/98d4e369b78b0733da5369ef5d9a3d0821224bd8; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/98d4e369b78b0733da5369ef5d9a3d0821224bd8"; sha256 = "1mdsmf24lwsbybjy687lsqhifg0d1za7vc6vaggba2x4gbb2rh2s"; }; "98dd7a062fbe1436797395825aec70ab45a9e01f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/98dd7a062fbe1436797395825aec70ab45a9e01f; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/98dd7a062fbe1436797395825aec70ab45a9e01f"; sha256 = "05xrlniqxkkw7c08r8m5ph88pmwsz1jbp0y437nrh4lz7z8xk6i8"; }; "98eaec4f30d9a8b65a6d9865fe0b1e5b7df1e740" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98eaec4f30d9a8b65a6d9865fe0b1e5b7df1e740; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98eaec4f30d9a8b65a6d9865fe0b1e5b7df1e740"; sha256 = "0kkzj77y0n39diqyfzx29rdi47ayg0f5cr6yi2syyimbq9i8vmb2"; }; "98f6aead047382d81ea82cfcf7d678c3d279b6ad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98f6aead047382d81ea82cfcf7d678c3d279b6ad; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98f6aead047382d81ea82cfcf7d678c3d279b6ad"; sha256 = "0n6v34qn2v5cvqgzv1agp68hllcm9qjdl6928llln8mx56byr1y4"; }; "9905967a7ecb273ea4c135e170605bb12051e395" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/9905967a7ecb273ea4c135e170605bb12051e395; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/9905967a7ecb273ea4c135e170605bb12051e395"; sha256 = "1yn3gqiqdbbmxn1yn36d0cyf7cb8c74r0kq586fa9kyfq1kp6hcj"; }; "99408ec397e6f41cef3cc1118a42007c42240b73" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/99408ec397e6f41cef3cc1118a42007c42240b73; + url = "http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/99408ec397e6f41cef3cc1118a42007c42240b73"; sha256 = "07cx908z756kf2b7cbihipabh21zln8d58jaj0vh11fi7znwln7q"; }; "9960c14a54da2eea43d72be9aefeeb85b8cd4e7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9960c14a54da2eea43d72be9aefeeb85b8cd4e7c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9960c14a54da2eea43d72be9aefeeb85b8cd4e7c"; sha256 = "1wslww24dria8ka5d6a6by0ix81yg74783b2l8k59afjry3d4gn7"; }; "9974452a9032d4ef1911e1347776b088bf0f03df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2579446-f2ba68e6c4fe40608f55a21e4d359a29/9974452a9032d4ef1911e1347776b088bf0f03df; + url = "http://cdn.unrealengine.com/dependencies/2579446-f2ba68e6c4fe40608f55a21e4d359a29/9974452a9032d4ef1911e1347776b088bf0f03df"; sha256 = "1kvgca25l2bbp416cqqw7ghrjq9mmwgy33qhbmkd665kyi3xcx02"; }; "998f25b9ce65d4cd484598d5f49cfdb023205ace" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/998f25b9ce65d4cd484598d5f49cfdb023205ace; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/998f25b9ce65d4cd484598d5f49cfdb023205ace"; sha256 = "11m90pb307bpkd1cplzjavhbz76j8ywfwc1lrdp4zl5yb42avj7p"; }; "99985696491968b007dbff31cfeb9439637ad92d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/99985696491968b007dbff31cfeb9439637ad92d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/99985696491968b007dbff31cfeb9439637ad92d"; sha256 = "1n1rgz44hairjjvjc3937pin9rhxxa44sssi87z82965kbhqwmq3"; }; "9a10248ffa6ef2de0ff39750b0126e7d0b1557b6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a10248ffa6ef2de0ff39750b0126e7d0b1557b6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a10248ffa6ef2de0ff39750b0126e7d0b1557b6"; sha256 = "1j4m3dg8l69iyxhy9gz915rinaas4a5mflj9a70lwciq01py9fad"; }; "9a27b682ddf08347ffdd2673c005febde327223b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9a27b682ddf08347ffdd2673c005febde327223b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9a27b682ddf08347ffdd2673c005febde327223b"; sha256 = "050ywwrsm40br2mnqckg3jrgc2q31j8xf4h0za2l5ih2h3vq2ymn"; }; "9a6f36fd2204a5938bfaa23310ac94f3eac70d91" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/9a6f36fd2204a5938bfaa23310ac94f3eac70d91; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/9a6f36fd2204a5938bfaa23310ac94f3eac70d91"; sha256 = "0ybib9bi9lfdxfb9ql3jip9fbfglzczyp8r9fsycfbwin33nqn6s"; }; "9a709e39d73f4dd05adc8a171c9e771ca1facd83" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a709e39d73f4dd05adc8a171c9e771ca1facd83; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a709e39d73f4dd05adc8a171c9e771ca1facd83"; sha256 = "1qrv0r9srbrqqwzw96ndirkn54my1ypyinsd1vdfvrwd19amwdpa"; }; "9abf05827a71d1c0a15a65473fe44db0a9c8676b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9abf05827a71d1c0a15a65473fe44db0a9c8676b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9abf05827a71d1c0a15a65473fe44db0a9c8676b"; sha256 = "0x3kjyy72v9hx55bfj5yy5bhzip3i7fkpd0q6kgqi408wvz8345j"; }; "9ace33ad3d9ba29d499d254c077206230291f79a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ace33ad3d9ba29d499d254c077206230291f79a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ace33ad3d9ba29d499d254c077206230291f79a"; sha256 = "0jw0d0ck3p5h727apyp7190dm21q2mvf4kcipbaaa0rwdkynq70b"; }; "9ad3062b35efb39cfe52f02269e5e28c03df86f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ad3062b35efb39cfe52f02269e5e28c03df86f5; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ad3062b35efb39cfe52f02269e5e28c03df86f5"; sha256 = "16lg92frzz8jqnvdw2r9w6a3fjlgvmndr7m1jlhq66k034d7jwia"; }; "9aec8735040beb57da24cffa27ef5d254408275f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9aec8735040beb57da24cffa27ef5d254408275f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9aec8735040beb57da24cffa27ef5d254408275f"; sha256 = "1qgbkjhvhrsy7iy0r0gvs41m88har7i8m3ys03y5lrbmdazgb3q9"; }; "9b2025a39ed5dc7d0f745fd5f484fa5bd2f9b319" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2514423-e0ca01e1f08b4e2480fb868bca2e338b/9b2025a39ed5dc7d0f745fd5f484fa5bd2f9b319; + url = "http://cdn.unrealengine.com/dependencies/2514423-e0ca01e1f08b4e2480fb868bca2e338b/9b2025a39ed5dc7d0f745fd5f484fa5bd2f9b319"; sha256 = "1jnlw9ifq8iyfvz8yn2jigfdq5qmhviy48vh461kfpx3isl1wvq3"; }; "9b367562030fc7238553c6aebec57181c96d88fa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b367562030fc7238553c6aebec57181c96d88fa; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b367562030fc7238553c6aebec57181c96d88fa"; sha256 = "1jdr332ks1d1gqi9ygxdmjyr3lingzzb1pdgrnxkg7jbl9i7y4l7"; }; "9b622139c6c9738ed9a9c4bca74a20d18bea5a75" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2700727-ab54589e54a547ecb0e365d946b4351f/9b622139c6c9738ed9a9c4bca74a20d18bea5a75; + url = "http://cdn.unrealengine.com/dependencies/2700727-ab54589e54a547ecb0e365d946b4351f/9b622139c6c9738ed9a9c4bca74a20d18bea5a75"; sha256 = "11i6g22ncsjn50yq3fmhv2mm6inxw6zhi0zznv0y7gwdyjrisasy"; }; "9b6f3a80dd242ad667ee7c33f54385d4fa791086" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/9b6f3a80dd242ad667ee7c33f54385d4fa791086; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/9b6f3a80dd242ad667ee7c33f54385d4fa791086"; sha256 = "0lb42d3a79q1k35jfa3b1c1z8n774nxkcr918cp9bay4saifvfzw"; }; "9b85c2fa156837a820c7e7ae27d2ade465850441" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b85c2fa156837a820c7e7ae27d2ade465850441; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b85c2fa156837a820c7e7ae27d2ade465850441"; sha256 = "1klwhr444j1pqn44fnjyq2nvlaiaib04n0dwykx181bz2nkjqdqv"; }; "9b8fbaeb9433a52f4f65397b66bc6da378e067b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9b8fbaeb9433a52f4f65397b66bc6da378e067b7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9b8fbaeb9433a52f4f65397b66bc6da378e067b7"; sha256 = "1l4x5r8ghf70ddfyz1q6wpqlhrc10l41h33gmfhkjwm45fkvkxdh"; }; "9b97586a3c9bf005cab1870015b75587e39f94da" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9b97586a3c9bf005cab1870015b75587e39f94da; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9b97586a3c9bf005cab1870015b75587e39f94da"; sha256 = "0a2nw9ibdv51n2b7a9x0jnx8cqxilknm79x210pr3h8p3fjdzlb7"; }; "9bb171f0382c86c213e8f4d3ffafe1e676490b21" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2718426-3062c3938efa4be7b8cd7493e66818c4/9bb171f0382c86c213e8f4d3ffafe1e676490b21; + url = "http://cdn.unrealengine.com/dependencies/2718426-3062c3938efa4be7b8cd7493e66818c4/9bb171f0382c86c213e8f4d3ffafe1e676490b21"; sha256 = "1hgfyfwn19k47y6garrdfy4jlhis0mi1h7zfnab8x43w7pqjgjpv"; }; "9bb63a05f1dd1d7171eeb8018c29c90d81773605" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/9bb63a05f1dd1d7171eeb8018c29c90d81773605; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/9bb63a05f1dd1d7171eeb8018c29c90d81773605"; sha256 = "18cfpjnyamzwnrmz4i06iwir58dx6657gy4i8jgk8ga736j31vxr"; }; "9bdd5448dfc6229ba9d0261514a078236c882986" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9bdd5448dfc6229ba9d0261514a078236c882986; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9bdd5448dfc6229ba9d0261514a078236c882986"; sha256 = "129pclb41yip44m87pr8l1rhdajhgnzcarh84j5w2kgqqmma9h8r"; }; "9be02ac4f895d7559b0cba2d4b65f8ffb5626236" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9be02ac4f895d7559b0cba2d4b65f8ffb5626236; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9be02ac4f895d7559b0cba2d4b65f8ffb5626236"; sha256 = "0dh8vcf5dm36j4pjyc7m0i9f4947mk3r91ldbj6mhxfi90c6sn0j"; }; "9bfa76eaf50a585e99981b54ef5628fd89b397e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2499980-1bec026979484bddb8aa39afef8358b9/9bfa76eaf50a585e99981b54ef5628fd89b397e7; + url = "http://cdn.unrealengine.com/dependencies/2499980-1bec026979484bddb8aa39afef8358b9/9bfa76eaf50a585e99981b54ef5628fd89b397e7"; sha256 = "0rmv4ibakmvpllmq5cs1ihfkpvy1brkn8l42kmls66zlz478115l"; }; "9c2836065510901f9ba07928e4c7e319dd33b670" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/9c2836065510901f9ba07928e4c7e319dd33b670; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/9c2836065510901f9ba07928e4c7e319dd33b670"; sha256 = "1b6igbp0mn78hvjgg33xyi6v7gd7nqvl3f4hgq5wfr8dzghx5gky"; }; "9c2b99ebfed2e931067e8842161b2811d04206eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9c2b99ebfed2e931067e8842161b2811d04206eb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9c2b99ebfed2e931067e8842161b2811d04206eb"; sha256 = "0j0p40hjbc1v0ld3halwhic0573n1z58sgpy112rqb1m667q87q6"; }; "9c45f6155855d24fbb8f12e7a40895df1e55b205" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c45f6155855d24fbb8f12e7a40895df1e55b205; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c45f6155855d24fbb8f12e7a40895df1e55b205"; sha256 = "08rpzwbnxwpk5gvybxv7q0s9k25gn8vcm77k7s69r5wva0p8hl9r"; }; "9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c"; sha256 = "17jc44fj6vs0kqxk568vn6vjapyc1r7k9b88pc5l96m53bdkn7cm"; }; "9c8dc173e3087266551343fc43db0a118e573cd5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9c8dc173e3087266551343fc43db0a118e573cd5; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9c8dc173e3087266551343fc43db0a118e573cd5"; sha256 = "1np5grzkj4cib5mzwxksqh3crbfllwgsk3ss7jz03s5hgh8jk2fa"; }; "9cb4e1d5ca0e7935f8d937f678a9245ca0a8baf1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9cb4e1d5ca0e7935f8d937f678a9245ca0a8baf1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9cb4e1d5ca0e7935f8d937f678a9245ca0a8baf1"; sha256 = "0wpqjvls8rdi6g47w8xzs71ynfg1aiw7jw1g160wxk11qvn17rid"; }; "9cdfcaa36a081486e8c591d1b0de339f20e19712" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9cdfcaa36a081486e8c591d1b0de339f20e19712; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9cdfcaa36a081486e8c591d1b0de339f20e19712"; sha256 = "0y7h2ass8kgfabkvdwr3jcdi4znc6mcg4zklvw4yr3420d5h16x3"; }; "9cf547b1a8d0349c6997827cf3b1c76934a8f7e1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/9cf547b1a8d0349c6997827cf3b1c76934a8f7e1; + url = "http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/9cf547b1a8d0349c6997827cf3b1c76934a8f7e1"; sha256 = "1hh19pkjsnhjcsd8vj7d8l5nlk01iyp4kxf5hn2ymf0j1df0xns0"; }; "9d0629861bfc4948fc177763e87dc1ea3ac042ba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9d0629861bfc4948fc177763e87dc1ea3ac042ba; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9d0629861bfc4948fc177763e87dc1ea3ac042ba"; sha256 = "0bal97q5lyz4s5z39jnxbabhll2agydcdw3mx0sikwr666aa8hac"; }; "9d238c0aed4cd73464dbba5fbf034030858fe441" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/9d238c0aed4cd73464dbba5fbf034030858fe441; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/9d238c0aed4cd73464dbba5fbf034030858fe441"; sha256 = "1n3fj5dsc4b9i8jwb1nzlnk1vbjnzlva3ljwkd16z8xfcdq3aqjd"; }; "9d2a8629491c47d32fd852ad683ba3be0f91dca2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d2a8629491c47d32fd852ad683ba3be0f91dca2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d2a8629491c47d32fd852ad683ba3be0f91dca2"; sha256 = "0csiwyx12frg2bzyp72is2h6fi2vv961byc23k30p0yz22cybr6c"; }; "9d4088ad171c93938ed41b2c224a98da2eb8e600" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d4088ad171c93938ed41b2c224a98da2eb8e600; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d4088ad171c93938ed41b2c224a98da2eb8e600"; sha256 = "02z4578c3939zq6m6l9ckjf0kiyf9biq98yqb6dmp93lanr9sahc"; }; "9d48d62d8894986890f0f871523b546e25618a96" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d48d62d8894986890f0f871523b546e25618a96; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d48d62d8894986890f0f871523b546e25618a96"; sha256 = "12j6p2l09n1yv388h0ynxl0p1bply6217600ix7d8mpm4jjri9sa"; }; "9d6293584ce78fd938acc5ddf91597dead7b8ff0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9d6293584ce78fd938acc5ddf91597dead7b8ff0; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9d6293584ce78fd938acc5ddf91597dead7b8ff0"; sha256 = "1qxm6h3nl2aawl9z04gn1kzlaiaajccyh0b9gr85d6x8x2dwxjpg"; }; "9d8150632d85b43bd2be46924eb71dd19d5b444b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d8150632d85b43bd2be46924eb71dd19d5b444b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d8150632d85b43bd2be46924eb71dd19d5b444b"; sha256 = "14yw0xbyg1rq18xyfydfy3z0gnvkzr27f2vscsgiw1xmps0fsa6h"; }; "9d835adb6f30382cec8e1701c61f3a305fe5ebe5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9d835adb6f30382cec8e1701c61f3a305fe5ebe5; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9d835adb6f30382cec8e1701c61f3a305fe5ebe5"; sha256 = "0vq311bgcj0zcicb05l5d1pl5jw1vqbblfzmzk3h6nf0hgn2db24"; }; "9d8f4ef5363610f4b47829299c0824147fa3c486" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9d8f4ef5363610f4b47829299c0824147fa3c486; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9d8f4ef5363610f4b47829299c0824147fa3c486"; sha256 = "0p5kp49clxg0ws3l3dslff5j54gi11bdpbsks2nh9081pfddla5z"; }; "9da60f5683310aa2ed53d90b2a9a246879223099" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9da60f5683310aa2ed53d90b2a9a246879223099; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9da60f5683310aa2ed53d90b2a9a246879223099"; sha256 = "0zgiz6m2g1i5884izczyigh42bfw0xbkvf1r6jmavays26r83lb5"; }; "9dd86d52ca2bc2688244bec708a9054313d175c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9dd86d52ca2bc2688244bec708a9054313d175c5; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9dd86d52ca2bc2688244bec708a9054313d175c5"; sha256 = "0viis6zccnxasxwfbi34xpqf4rnzr0w439qsskx7mbhg3zi8p0hz"; }; "9ddf004692c477b60fed575d57551fabdb00997c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9ddf004692c477b60fed575d57551fabdb00997c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9ddf004692c477b60fed575d57551fabdb00997c"; sha256 = "1ij1pdln5llxl6cxsiz6kbfzsgqmk901mrgbzsdki3ibs75dzr1m"; }; "9de93e74f384195b52fb90f9e7767ece5fd84570" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9de93e74f384195b52fb90f9e7767ece5fd84570; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9de93e74f384195b52fb90f9e7767ece5fd84570"; sha256 = "1mj2syhcxq5qg23li9rh3814wiws421yasjw83j7b63yvpqbnyvl"; }; "9ded54d67930bcf5c3e95a10d2176c6106f2a3f8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ded54d67930bcf5c3e95a10d2176c6106f2a3f8; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ded54d67930bcf5c3e95a10d2176c6106f2a3f8"; sha256 = "0csk1i20kwp4rd1j6lci9v4wmc9jx3ji1i1m051iik0dy0553z3p"; }; "9e3075eea5e5e885d9aa9e6b2952ebe61a8b60a1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9e3075eea5e5e885d9aa9e6b2952ebe61a8b60a1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9e3075eea5e5e885d9aa9e6b2952ebe61a8b60a1"; sha256 = "10gxi4n3k6fjsigv12603xsjp097b09bl6lli308xngjkiz55syp"; }; "9e397995b47d5acc37d38c9fa4935abec922ba48" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9e397995b47d5acc37d38c9fa4935abec922ba48; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9e397995b47d5acc37d38c9fa4935abec922ba48"; sha256 = "0cqayf9ag0snn0fab83fz3l5fqbjhllv86ik3vzx09zmg4i0d7n5"; }; "9e728c35e842f7af53a3e822acd469326d7cd52f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2677283-a70890a1537c42869136794b62c332a4/9e728c35e842f7af53a3e822acd469326d7cd52f; + url = "http://cdn.unrealengine.com/dependencies/2677283-a70890a1537c42869136794b62c332a4/9e728c35e842f7af53a3e822acd469326d7cd52f"; sha256 = "1brpgrvcshwcrignfc257zg2jchav13kaz94n06i6i4fvd4la6ix"; }; "9e804a449e34aea4d5227c2a0cb3d96352a82de2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/9e804a449e34aea4d5227c2a0cb3d96352a82de2; + url = "http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/9e804a449e34aea4d5227c2a0cb3d96352a82de2"; sha256 = "1rfn257jpdl61g0qf92lqybhj9j81gxq7h8igb7x5kwswa74c7ws"; }; "9e9a678ef5fe8d87a10fc7621ae8dd3c501e6236" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9e9a678ef5fe8d87a10fc7621ae8dd3c501e6236; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9e9a678ef5fe8d87a10fc7621ae8dd3c501e6236"; sha256 = "1mijmzfvnxnii8z805a5hnhbiwwh3j16p8i7i0rhrmvkw5gnd68r"; }; "9ef14ed15fba71337b14c1e33972d9cd36fa9278" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ef14ed15fba71337b14c1e33972d9cd36fa9278; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ef14ed15fba71337b14c1e33972d9cd36fa9278"; sha256 = "157dz7i640q6scfpzqjw24i8qwlwjvrbdxqi60sx9hgkax1xw0n7"; }; "9ef93659a347d11fc1e9478c37043a0236e34ba5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9ef93659a347d11fc1e9478c37043a0236e34ba5; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9ef93659a347d11fc1e9478c37043a0236e34ba5"; sha256 = "0qn4vd5pyjrsaa75n5avy0ri1s71nwnnkgn66qcdc2x5fckq6p3j"; }; "9f07f59f3c436bdfae1916ca914e86d02a7239eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9f07f59f3c436bdfae1916ca914e86d02a7239eb; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9f07f59f3c436bdfae1916ca914e86d02a7239eb"; sha256 = "14qyjvd23zqc5dhv15z8sp9yl324fsfzy9p7x2nl35x14j667l8j"; }; "9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e"; sha256 = "1fiah07i0wyvya8dwnlkfyq6csg9f0yly1x51j9s6jazy45xffrb"; }; "9f67c39f021b4b42e5fa8aec0f0be533c8341cac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9f67c39f021b4b42e5fa8aec0f0be533c8341cac; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9f67c39f021b4b42e5fa8aec0f0be533c8341cac"; sha256 = "0p4a43z84i8qjpnpich9rdxg0gsycblmif3slsad8ydabj094vkp"; }; "9fb4a9e94f7c935385fd64a3d3c2f58144e7118a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9fb4a9e94f7c935385fd64a3d3c2f58144e7118a; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9fb4a9e94f7c935385fd64a3d3c2f58144e7118a"; sha256 = "03hyf8kladlf5hwc1rija042pqcyzlbmla0c3pysrla33h4ca5qc"; }; "9fc2d2e4632111eca96621a257b4547fddf03746" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/9fc2d2e4632111eca96621a257b4547fddf03746; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/9fc2d2e4632111eca96621a257b4547fddf03746"; sha256 = "0bmg6jvpwq02azazsh98mdh0x716lxslqai6g2b8icwxxi84p20s"; }; "a003e87a1243a65a9d38ce8666ba05cf9dff34df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/a003e87a1243a65a9d38ce8666ba05cf9dff34df; + url = "http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/a003e87a1243a65a9d38ce8666ba05cf9dff34df"; sha256 = "08cbncxgcr83mld0qv6zc6mzjc00jjx8za0ii2v8r7a5jhr7hcr7"; }; "a00af92cb7dfede2f60df7468c841462cd3ef7bd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a00af92cb7dfede2f60df7468c841462cd3ef7bd; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a00af92cb7dfede2f60df7468c841462cd3ef7bd"; sha256 = "13arcphd636ahrdbxlxwb6yrximqgm9ixl745yqp83aihk2wwls1"; }; "a037040fb7bcc432add0b7d65dc1d3b078b6f143" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a037040fb7bcc432add0b7d65dc1d3b078b6f143; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a037040fb7bcc432add0b7d65dc1d3b078b6f143"; sha256 = "1jjcbw831yijkabzavbi4vmw3ba8vk248dnaqsjm5gkcajgwagxp"; }; "a04dbee3efc3178e3a175b2fb572cc36210ba9ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/a04dbee3efc3178e3a175b2fb572cc36210ba9ce; + url = "http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/a04dbee3efc3178e3a175b2fb572cc36210ba9ce"; sha256 = "0xwqk4czfy62r9dh5yyan4kggijy5hgvbq084zbz3fc53cxrj3kc"; }; "a05558cf2d18454f06cd9c1a5b610a654ec0294d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a05558cf2d18454f06cd9c1a5b610a654ec0294d; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a05558cf2d18454f06cd9c1a5b610a654ec0294d"; sha256 = "0m9pngd6gnndqbww5xnwcfdf1gnkyipccixi6w4msps20s2bbkfr"; }; "a056afc246a9cdce5d7321930c97ccf0b9f19f15" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a056afc246a9cdce5d7321930c97ccf0b9f19f15; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a056afc246a9cdce5d7321930c97ccf0b9f19f15"; sha256 = "1y41y758jn47y9zy46f0inxlzl0h8wrdj4fm9937ypd2fyfw6nmg"; }; "a09bd78594e737689115679ea7f6a09ed557d18e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a09bd78594e737689115679ea7f6a09ed557d18e; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a09bd78594e737689115679ea7f6a09ed557d18e"; sha256 = "1b1kivdj0qz5cr5igqmzbcyrmhbygvdavmfrqlqlrs1775411b7x"; }; "a0d83db11d6b2a64fdb82cc496d07a03ccaa142f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a0d83db11d6b2a64fdb82cc496d07a03ccaa142f; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a0d83db11d6b2a64fdb82cc496d07a03ccaa142f"; sha256 = "1qqrpmmdc0zg13x6qvjzi6zk6wvq0khiml4ksrhbn60si3gr8li0"; }; "a0de04466a75125d3528739deb44e12686e7a970" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0de04466a75125d3528739deb44e12686e7a970; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0de04466a75125d3528739deb44e12686e7a970"; sha256 = "1k6ivx8bi63yivbw36lrpz8sv8gc2gzslb6pq2hq19jacl4v7xwy"; }; "a0f7010e4bf1452ec48d287d971a48198a78da69" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0f7010e4bf1452ec48d287d971a48198a78da69; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0f7010e4bf1452ec48d287d971a48198a78da69"; sha256 = "06s4hiwd7vr3n18p5pg34h1irzvq575n2pw9l2sskz6fj82m2fv8"; }; "a12df808dfee07a06515eabdd6c1b0124a7385d0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/a12df808dfee07a06515eabdd6c1b0124a7385d0; + url = "http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/a12df808dfee07a06515eabdd6c1b0124a7385d0"; sha256 = "1xnjwnfzaja205cm6c54nc53m3nbjfqk28ggi7h2rxg9cdjcv59y"; }; "a1820034a04f046e5f0c74444f653ee4869647c6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a1820034a04f046e5f0c74444f653ee4869647c6; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a1820034a04f046e5f0c74444f653ee4869647c6"; sha256 = "1mi6z4s5wz9j4y097b27xp9038nar7nn2gmc1x7yaw97kh2z76n8"; }; "a18cebf9d16dc2e5a99da03353e404d64bce3ae6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a18cebf9d16dc2e5a99da03353e404d64bce3ae6; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a18cebf9d16dc2e5a99da03353e404d64bce3ae6"; sha256 = "1g0arlnn0f4zhhj9lwmj3mjlwjwvj0gw8m8fbr2jw6rylmfag4av"; }; "a1c1fcef149d29408d496f35628d18dd9bd2e6df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1c1fcef149d29408d496f35628d18dd9bd2e6df; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1c1fcef149d29408d496f35628d18dd9bd2e6df"; sha256 = "1b66dsbjjvz4gm7vm4vaapykhv7ni2y5rkycbfahzcigi5kasf57"; }; "a1f9df46b4e95588043a59820ba65fc28a8eea7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1f9df46b4e95588043a59820ba65fc28a8eea7f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1f9df46b4e95588043a59820ba65fc28a8eea7f"; sha256 = "0fbzj0bkkbm7rxdi6lva7g2qhgqmj4y2mhg72z1iw842bikr4l2f"; }; "a1fc05440064b28d5deb42b383bf1960ca27cb3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/a1fc05440064b28d5deb42b383bf1960ca27cb3b; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/a1fc05440064b28d5deb42b383bf1960ca27cb3b"; sha256 = "1b0xagh5f596ww8g6yng6frrvkrs8vrhzzbnl59ab1cpbq3xn7dw"; }; "a21a78f021d580176e09c67d0643b83e80ca2744" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/a21a78f021d580176e09c67d0643b83e80ca2744; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/a21a78f021d580176e09c67d0643b83e80ca2744"; sha256 = "1xjclk357lm9rydmhzvznq8rd4yysr2jzh5y1bvrbpvxpx4hc3if"; }; "a243a00aa61675be8ae46cdba7db99c8e8195984" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/a243a00aa61675be8ae46cdba7db99c8e8195984; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/a243a00aa61675be8ae46cdba7db99c8e8195984"; sha256 = "1lvmwf0ajkjsdz68n22dhiihddv4ric0nch46ixvqg8di50fanj2"; }; "a24d76c382036592b023a22d61abbe88d52cb526" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a24d76c382036592b023a22d61abbe88d52cb526; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a24d76c382036592b023a22d61abbe88d52cb526"; sha256 = "0brdmg3xp6jgfhralw483pkyvgd305g3m4bcqcpg9vazsrwawypm"; }; "a2587b8104dccd8347dc49a52bb5643842856a16" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a2587b8104dccd8347dc49a52bb5643842856a16; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a2587b8104dccd8347dc49a52bb5643842856a16"; sha256 = "0j8pwamzj2icivglw0ylpvbx76c0xyys79l049l7lpirp95y0hb0"; }; "a260cd8d85a752caa55d8857af979f5ae8a68d97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/a260cd8d85a752caa55d8857af979f5ae8a68d97; + url = "http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/a260cd8d85a752caa55d8857af979f5ae8a68d97"; sha256 = "19fijnc4j8pr726j3v3c0x35k8mnswk8jfjjzmgxdn6s95c6q9pm"; }; "a2731fbc3c50dde19f92ac5706a3b73a2fb50c05" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/a2731fbc3c50dde19f92ac5706a3b73a2fb50c05; + url = "http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/a2731fbc3c50dde19f92ac5706a3b73a2fb50c05"; sha256 = "1adi6x27znln5qqkcl1x281csw27v5xd981n0az5wxqxfpssxriq"; }; "a2b0d085248240cde57087bc35816b078511c856" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a2b0d085248240cde57087bc35816b078511c856; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a2b0d085248240cde57087bc35816b078511c856"; sha256 = "0ksv63yssyqhphll4glyrizrsylkk2p82l2n653sw0jjrrbp5m20"; }; "a2b1b97c80248fb89a7ce7322cc399a4fdf3173c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a2b1b97c80248fb89a7ce7322cc399a4fdf3173c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a2b1b97c80248fb89a7ce7322cc399a4fdf3173c"; sha256 = "1908grxgwb9sy4rd02jzc4zyi543dkxhynx0wkc0imfw4x2l9ixa"; }; "a2ce002a2a6a420e4c746eae8f553665e409a116" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a2ce002a2a6a420e4c746eae8f553665e409a116; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a2ce002a2a6a420e4c746eae8f553665e409a116"; sha256 = "021q59y3gi3f6ygddr736l75japm8zky3lz21z4bzik7kmirxq98"; }; "a2d4c282439a7d50a9b7005e9c3feb136cc093e8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a2d4c282439a7d50a9b7005e9c3feb136cc093e8; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a2d4c282439a7d50a9b7005e9c3feb136cc093e8"; sha256 = "1wbn5yxpmfq5r20j9h27kpyc1v66a78dil39b83cpp4j7jkv687c"; }; "a333e2129a0a7518d47d81753d193ceecc5b881a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a333e2129a0a7518d47d81753d193ceecc5b881a; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a333e2129a0a7518d47d81753d193ceecc5b881a"; sha256 = "1ih9hbcsslfslb9wr1i5f2vk9746zczygn54lac2m108kf6y0jk4"; }; "a353e5dd34009fcbd0a5f9eced792d02ffd2cb97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2710757-d76358e2c5474af8a7d14e3262b517a4/a353e5dd34009fcbd0a5f9eced792d02ffd2cb97; + url = "http://cdn.unrealengine.com/dependencies/2710757-d76358e2c5474af8a7d14e3262b517a4/a353e5dd34009fcbd0a5f9eced792d02ffd2cb97"; sha256 = "1wf8zzpyp45c9bq2zwfcy5j33yj2gzf73zbfqcppxz89knyakic7"; }; "a36932c96e52dc3b154313d65c128fc6efa79367" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a36932c96e52dc3b154313d65c128fc6efa79367; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a36932c96e52dc3b154313d65c128fc6efa79367"; sha256 = "1j2qd8j6sp3vj2rm8cxbli2d0l741i786widws427bddp1ma805y"; }; "a37744cecf38c8c2ca371eb33120654f8a53b5a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a37744cecf38c8c2ca371eb33120654f8a53b5a3; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a37744cecf38c8c2ca371eb33120654f8a53b5a3"; sha256 = "1gi17xrvy9hl31z1bsxdq6awy93hllizvc4hbdc74xmpxdgnnqkx"; }; "a3891b8c154921b18b27b3c7915a8bab0b886565" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3891b8c154921b18b27b3c7915a8bab0b886565; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3891b8c154921b18b27b3c7915a8bab0b886565"; sha256 = "1ak3n4yyxpj34v9cjlglgpy0q292xrh7363p26xbkln39il8h51w"; }; "a3ea753b468f54a0a4c306c03130572f0ec0eee4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3ea753b468f54a0a4c306c03130572f0ec0eee4; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3ea753b468f54a0a4c306c03130572f0ec0eee4"; sha256 = "0fc6xv7d20c1nvzvw8dc1mwh1c51447y9fgl6z93c6xabvijc2q5"; }; "a3edc07dfea80da6d7d09067737fc4630c4bb81a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a3edc07dfea80da6d7d09067737fc4630c4bb81a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a3edc07dfea80da6d7d09067737fc4630c4bb81a"; sha256 = "11wh3glqpficz5wj9cgif1kjpmcbziapza719gzadkcrjc1vasbl"; }; "a41d00077f02fab1c6a05e4607094b4eea3b6ad0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a41d00077f02fab1c6a05e4607094b4eea3b6ad0; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a41d00077f02fab1c6a05e4607094b4eea3b6ad0"; sha256 = "1xrf0szqj7wxwqcw7lw43fpzqjq9lh3rr04jyfmnddasxd6qzfwz"; }; "a456f0111a1d9a6fb8045d0e5e9450b7c36f9374" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a456f0111a1d9a6fb8045d0e5e9450b7c36f9374; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a456f0111a1d9a6fb8045d0e5e9450b7c36f9374"; sha256 = "1p9bhg7sjvc70jsansrf9qa2wnxwk9dn4ic5k9jai9alcr48bjan"; }; "a46938a8170197df7ac0c8d9ca3c7e5aca696271" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a46938a8170197df7ac0c8d9ca3c7e5aca696271; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a46938a8170197df7ac0c8d9ca3c7e5aca696271"; sha256 = "01ipp4xnpgnnhlkqh1hpman6ifj77jij5b9mrra87dkcy83wd7j2"; }; "a4d7e28c74a63f10107957b9b6af00486f1e7358" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a4d7e28c74a63f10107957b9b6af00486f1e7358; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a4d7e28c74a63f10107957b9b6af00486f1e7358"; sha256 = "19ldb1kdwiji7bwjz6fx8rak2dk8gpnvib5b3s3ywl0dxa85yv13"; }; "a507276db67feeb197bacced284be29d92bfb2b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a507276db67feeb197bacced284be29d92bfb2b7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a507276db67feeb197bacced284be29d92bfb2b7"; sha256 = "1a46d8km3ci1jy1hgq7mxcq0bhkd2n8bqrdd7x1nyybvh5r7hjn7"; }; "a561c854b1abb49bc710438edd6a17feb5370e73" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a561c854b1abb49bc710438edd6a17feb5370e73; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a561c854b1abb49bc710438edd6a17feb5370e73"; sha256 = "0s9sw7kx3gj4xrckivfl2w2dvw2criwwm0bibh6dmajsj058pl84"; }; "a5a4b35f662228caee7476ddab2567611de6c35c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a5a4b35f662228caee7476ddab2567611de6c35c; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a5a4b35f662228caee7476ddab2567611de6c35c"; sha256 = "0580qlzrvf1vw8rfncc50vyy9y5g79rwcvj8rjaxvdwmg1n4dpw0"; }; "a6287affa4b828301aafa84f7bd9ce71935997b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/a6287affa4b828301aafa84f7bd9ce71935997b1; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/a6287affa4b828301aafa84f7bd9ce71935997b1"; sha256 = "06kdx9x2a4230k1c1b60cwkadarg62rnsbycgbqzhgbp6h4j8awn"; }; "a717434c111c75d501e35d8a5f4de2b75e299566" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a717434c111c75d501e35d8a5f4de2b75e299566; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a717434c111c75d501e35d8a5f4de2b75e299566"; sha256 = "1410w7shpi913irx8b48mk7004vdsf0xa3hrh21bvd70askxn4ci"; }; "a74403ad656c7c68733bf1d09d994d0e8dccd94e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a74403ad656c7c68733bf1d09d994d0e8dccd94e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a74403ad656c7c68733bf1d09d994d0e8dccd94e"; sha256 = "0b8kcrdcd4jmn2anxgd0x04szkf2k1gkqkl8srkbf4f5hh7aj27x"; }; "a744790bed001ed939d533b58c7d7132d8599ee6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a744790bed001ed939d533b58c7d7132d8599ee6; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a744790bed001ed939d533b58c7d7132d8599ee6"; sha256 = "15gxpbd7p0pj67b1dwgnsq841zdfmzw27qvpzpg15nbdsm4bqknq"; }; "a7460f75270bd4946c7e856b9cba426bfd756474" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a7460f75270bd4946c7e856b9cba426bfd756474; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a7460f75270bd4946c7e856b9cba426bfd756474"; sha256 = "1xl68yyf67zr08390y11p8il1g99crr9j71m7bqkps4sr236iv1l"; }; "a75892ec39777f5deec95c7ab34ac829e42f61f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a75892ec39777f5deec95c7ab34ac829e42f61f7; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a75892ec39777f5deec95c7ab34ac829e42f61f7"; sha256 = "1x83zbrnqx9856s515lqix9na8ir8991whgszbx84xjzs7507wag"; }; "a7675f8de766ef5fa71fd6c904b6000b880a463d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a7675f8de766ef5fa71fd6c904b6000b880a463d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a7675f8de766ef5fa71fd6c904b6000b880a463d"; sha256 = "0jmc22yiaw09cqx0wanyzbh46iblxpjzs9v1bl8hhicv360rq1ya"; }; "a7c85f34f7555c16973a534e2c21b5d0bf278e29" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a7c85f34f7555c16973a534e2c21b5d0bf278e29; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a7c85f34f7555c16973a534e2c21b5d0bf278e29"; sha256 = "1a7zbrmj2gdq61q2gw6jr6j3848mg85snj8hghmajndww1wspjlp"; }; "a8278a17fc9fa29308c59351a8c53b8330d33e88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/a8278a17fc9fa29308c59351a8c53b8330d33e88; + url = "http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/a8278a17fc9fa29308c59351a8c53b8330d33e88"; sha256 = "0d391bz9b9c73xdnkxm3l8zyz1zjb6nv0vn5m3ihpgb7hkdgfxgz"; }; "a82d5d8a7e63a42fa0e2414ad66c400a3beb640a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2498161-1c427a8c10084d53ae743a11e6148406/a82d5d8a7e63a42fa0e2414ad66c400a3beb640a; + url = "http://cdn.unrealengine.com/dependencies/2498161-1c427a8c10084d53ae743a11e6148406/a82d5d8a7e63a42fa0e2414ad66c400a3beb640a"; sha256 = "1cr9k5zlj9kl24ph9inczwm84rbch1vkvrkycs22yhqblgwf5zid"; }; "a84e9f4455088def00bab0652ca92a80ecce5e57" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a84e9f4455088def00bab0652ca92a80ecce5e57; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a84e9f4455088def00bab0652ca92a80ecce5e57"; sha256 = "1ks51i2490lymg2whdj1807z9asyl6gpsgbshw4bgdxd903aka1l"; }; "a8e8deae490071080b69408bf16c09b087801323" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a8e8deae490071080b69408bf16c09b087801323; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a8e8deae490071080b69408bf16c09b087801323"; sha256 = "1v0aaimfzl3f52cajgzv9v6wzjn4jpf95y40kalqbj2w7qvyzz4i"; }; "a980d01787b472fb299cc01e49a8a9da740ce81d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a980d01787b472fb299cc01e49a8a9da740ce81d; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a980d01787b472fb299cc01e49a8a9da740ce81d"; sha256 = "1laqjx21ik77p2xggii4pbcj7np9a6bpn8wlhivzk23zg0jnp0xz"; }; "a98192f145db4e2a545f79bc9d595f8f5c7fda34" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/a98192f145db4e2a545f79bc9d595f8f5c7fda34; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/a98192f145db4e2a545f79bc9d595f8f5c7fda34"; sha256 = "0kwb4jawlfvql1n1fbw04kqik33gmlzci7zc236gyhz4mhb86xd1"; }; "a98819bf37317dabf20f86b0fd6800a911717698" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a98819bf37317dabf20f86b0fd6800a911717698; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a98819bf37317dabf20f86b0fd6800a911717698"; sha256 = "0lh1288ab45p06082lb1a4cjh1k3gqmpxnbsilq5cgic98x7fwr9"; }; "a99daa4bfd46db4b416f47b4fc1972b221ea57e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a99daa4bfd46db4b416f47b4fc1972b221ea57e7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a99daa4bfd46db4b416f47b4fc1972b221ea57e7"; sha256 = "1mk3s8g5vgjpmhw6pb14akvipbm31il3887f4qqgfxcdfgkj261h"; }; "a9c62ffacb1508452705b057c5f796573d47c78d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a9c62ffacb1508452705b057c5f796573d47c78d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a9c62ffacb1508452705b057c5f796573d47c78d"; sha256 = "0c0gm8yqkwbzbdlx625bng0hwg9l8fnwf02fkm7mai8qg2xbb76z"; }; "a9c93107f208faee20ff396148c3b9954b33aa06" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9c93107f208faee20ff396148c3b9954b33aa06; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9c93107f208faee20ff396148c3b9954b33aa06"; sha256 = "0qrg2k8rf3ic7z9y0pv0mainwbqmhn4p5q6jajf08wndz2k3plr3"; }; "a9dfe0dbd869009eeca3fb67d49ce2c691877dc8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a9dfe0dbd869009eeca3fb67d49ce2c691877dc8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a9dfe0dbd869009eeca3fb67d49ce2c691877dc8"; sha256 = "0i84q4qa7jp3yils2hi8qd9mp0xpazdmnr93739sqhd8wrvi3isi"; }; "a9f9260691fe2d9ade072d9589f478dbce491a25" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9f9260691fe2d9ade072d9589f478dbce491a25; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9f9260691fe2d9ade072d9589f478dbce491a25"; sha256 = "1bkkfvnxxxscv1rglxn9174h7zfa093j0ilq3wpc682hlihg1c7s"; }; "aa0999ac4a6e388aa9547c455a6ea08c98d7036a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa0999ac4a6e388aa9547c455a6ea08c98d7036a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa0999ac4a6e388aa9547c455a6ea08c98d7036a"; sha256 = "004gm6cfkrv1hccsqwd9qzby37rjjb5cmhz8z8a4wyr52vcccp6f"; }; "aa212839e3606b3a1bbb68c9c1353c627853d8d5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa212839e3606b3a1bbb68c9c1353c627853d8d5; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa212839e3606b3a1bbb68c9c1353c627853d8d5"; sha256 = "166y3z7h9ncjz34g9ljbch4knqgi8syhsyl1gkh5wnqwkhsdkyjl"; }; "aa40eee6849fd0b67b4a01d245e14e6f9cb562fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2481391-2b0dc74bc6d44dd4917420631716dc19/aa40eee6849fd0b67b4a01d245e14e6f9cb562fe; + url = "http://cdn.unrealengine.com/dependencies/2481391-2b0dc74bc6d44dd4917420631716dc19/aa40eee6849fd0b67b4a01d245e14e6f9cb562fe"; sha256 = "1zhfxhr1ngxkigy2kbr0x19qa6bfh5jqh2kb04x6b5c5cl2rxnx0"; }; "aa7f77e42dedc93399b370b494f11d5cafe3ac1b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/aa7f77e42dedc93399b370b494f11d5cafe3ac1b; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/aa7f77e42dedc93399b370b494f11d5cafe3ac1b"; sha256 = "0zj2dqfl1zc15i511n89g5gbjkxgr7ivsvjjnyxdw6pdcbx3820c"; }; "aa92bb8c104afa015ba28312d3eb02c006426dc4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aa92bb8c104afa015ba28312d3eb02c006426dc4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aa92bb8c104afa015ba28312d3eb02c006426dc4"; sha256 = "0xw13lfrl0nbhjr1haz9k5yf6vra4h2q72mf213h5aar0h2sfivl"; }; "aab7c2855fd330fbd2d86fae15fb7fc38e8117a4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aab7c2855fd330fbd2d86fae15fb7fc38e8117a4; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aab7c2855fd330fbd2d86fae15fb7fc38e8117a4"; sha256 = "1g615imqp4nvryqr7fzdg2xd62nv6nkq0n6a9s4vfl8di3hfywaz"; }; "aad648813ec7c3909fab2cba04e54a790f99d97d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aad648813ec7c3909fab2cba04e54a790f99d97d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aad648813ec7c3909fab2cba04e54a790f99d97d"; sha256 = "1056xhjfdpyg3x778w33wmydzacgv24p9mrcsb0h1n09lkxbab5p"; }; "aadaaad6c3a74db06ec29a860e4cbdb518a7e965" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aadaaad6c3a74db06ec29a860e4cbdb518a7e965; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aadaaad6c3a74db06ec29a860e4cbdb518a7e965"; sha256 = "1xyx0sr4vgbkyizvmjsykn3lg7mg0rgs3ha8xcvkn4m4wzhciwxs"; }; "aaf3a012f48b24c193628af42ef3302d96784c3f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/aaf3a012f48b24c193628af42ef3302d96784c3f; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/aaf3a012f48b24c193628af42ef3302d96784c3f"; sha256 = "1idl0rsr7waqbgydsbnlq7bl26s202arhzv5bzmcghy2jlzgavj1"; }; "aafb65596f063aac27c03ad64646b10e9cbd9e5f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aafb65596f063aac27c03ad64646b10e9cbd9e5f; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aafb65596f063aac27c03ad64646b10e9cbd9e5f"; sha256 = "0gmi9sd9sgzb1bmwgyaghslz2rxyba96qyvzn9mdxnh661cwnwsk"; }; "aaff771bff40e67acec754ff6a73103840091d71" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/aaff771bff40e67acec754ff6a73103840091d71; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/aaff771bff40e67acec754ff6a73103840091d71"; sha256 = "15f92i5jph2hiihknkbyssif2gwlcm59vkqwj155c164g6fghdsc"; }; "ab091055311fa9bc429f0aacec0cc24290af3166" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ab091055311fa9bc429f0aacec0cc24290af3166; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ab091055311fa9bc429f0aacec0cc24290af3166"; sha256 = "124wr5mfd3n11k6rdd60177hfjbjicyn57fccwzn2sxhq3rdxl7p"; }; "ab0a48b5c47c246a0d31750e9ae6b073ad35963e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ab0a48b5c47c246a0d31750e9ae6b073ad35963e; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ab0a48b5c47c246a0d31750e9ae6b073ad35963e"; sha256 = "0ldkcyzq6jsjkb1w8qgrjjjz9sgpfa7syvmfnr4micv2jna867vc"; }; "ab0accca4b2e0942f55d408ed30bb84183371d99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ab0accca4b2e0942f55d408ed30bb84183371d99; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ab0accca4b2e0942f55d408ed30bb84183371d99"; sha256 = "0j2pc8bpm3ikwzlkssgmbk1wcqskkbv9akyb07742vl034vzzc5z"; }; "ab199653d5f9dea6b89095016907a7ada2eea972" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab199653d5f9dea6b89095016907a7ada2eea972; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab199653d5f9dea6b89095016907a7ada2eea972"; sha256 = "0fk560jgq4avnlqvrj6y3qbd9r1zcyjxpvvpdcbwr57kqxqgki5d"; }; "ab1c1bb528f1ce09f2cd32ba886bdf658ee6ef6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab1c1bb528f1ce09f2cd32ba886bdf658ee6ef6e; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab1c1bb528f1ce09f2cd32ba886bdf658ee6ef6e"; sha256 = "0jkdyzxqffi9zyfhi8pmh5z57z5cs4inn5cw92gbgh1fx760shx6"; }; "ab56f3655c7511b5ce622c56fc8f769b82720a77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab56f3655c7511b5ce622c56fc8f769b82720a77; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab56f3655c7511b5ce622c56fc8f769b82720a77"; sha256 = "10f5kb8yswwd8178104jz5ph7s5j3hzmicfggfsdmviw4760iplm"; }; "ab5d351cc1959e213540cc41dbe93cea75dda4d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab5d351cc1959e213540cc41dbe93cea75dda4d9; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab5d351cc1959e213540cc41dbe93cea75dda4d9"; sha256 = "1br599a6lsg7cq8a1zy7wicpjjmg1pvdmd9wph6xd4a4i5r5msh9"; }; "ab6ec6af0e90d693b32e063348193dfc34a5d608" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab6ec6af0e90d693b32e063348193dfc34a5d608; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab6ec6af0e90d693b32e063348193dfc34a5d608"; sha256 = "1saj3cr67jik0xfak36j394irs648w4ws8yg1bzb2i4kxl4x4qjf"; }; "ab9668aa1cb36fe03fd80ec800264850f247911e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ab9668aa1cb36fe03fd80ec800264850f247911e; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ab9668aa1cb36fe03fd80ec800264850f247911e"; sha256 = "1z3sq5jnxannf084xrd5sgm64d54n5w4vhh2jcrch53vylkkf771"; }; "abcd992f6c90c47b9150148778b5e5dd0be366f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/abcd992f6c90c47b9150148778b5e5dd0be366f5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/abcd992f6c90c47b9150148778b5e5dd0be366f5"; sha256 = "0sxcxwpz4xpxjnr5026xpp7m9jagvqb4ff0073r46a9jzp0y0nwh"; }; "abd31f5aa1a5bc7ad21bd97551365c4785a30537" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/abd31f5aa1a5bc7ad21bd97551365c4785a30537; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/abd31f5aa1a5bc7ad21bd97551365c4785a30537"; sha256 = "1si98cl159fdlqpqaagk3bsf8295nwbyf1x12fps78fw8svshhps"; }; "ac32cbcbb8641f87ce0f4e5e8ea11cdb33568e98" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2700710-7fab47bfec3142a7b4fa395fdd001748/ac32cbcbb8641f87ce0f4e5e8ea11cdb33568e98; + url = "http://cdn.unrealengine.com/dependencies/2700710-7fab47bfec3142a7b4fa395fdd001748/ac32cbcbb8641f87ce0f4e5e8ea11cdb33568e98"; sha256 = "0vvxrykslg2klrfmg8nczaxb2picf30fiz19vnwrmkc2hdx8ipj5"; }; "ac90a77a8f7a8cffa48d869e60f393981eeb2ff1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620418-84d187e8202a426594ec7cac6eeb85a1/ac90a77a8f7a8cffa48d869e60f393981eeb2ff1; + url = "http://cdn.unrealengine.com/dependencies/2620418-84d187e8202a426594ec7cac6eeb85a1/ac90a77a8f7a8cffa48d869e60f393981eeb2ff1"; sha256 = "093cl6yhppbc6xqgfiy46rm2wip3cpvnkzxgff0k7bbb8chxp3al"; }; "ac98ab61a879076754296cafc03b793203fb6701" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ac98ab61a879076754296cafc03b793203fb6701; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ac98ab61a879076754296cafc03b793203fb6701"; sha256 = "1jcm9grs9s7prn4qxhpaw5np56g6s6k0z2xa8ky64i1c9rq0dyx4"; }; "ace785dacecc7b1203d5fd7ca358003149131381" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ace785dacecc7b1203d5fd7ca358003149131381; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ace785dacecc7b1203d5fd7ca358003149131381"; sha256 = "1i5aiksqi4hvjyzlrflh9v3dw9n4n4f38aw62flr92psnfy0ahr0"; }; "acf6558b1e3950d55a31da4e8614e4a357aa653c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/acf6558b1e3950d55a31da4e8614e4a357aa653c; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/acf6558b1e3950d55a31da4e8614e4a357aa653c"; sha256 = "1gsdlhcwdd5dzl5qm8hsrgyg9bjmp0iyaa863fa4h40ammj0kg7a"; }; "ad4246832e88a45f0bdd6f9cafffd383ed378120" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ad4246832e88a45f0bdd6f9cafffd383ed378120; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ad4246832e88a45f0bdd6f9cafffd383ed378120"; sha256 = "00g2y2p4aavw5bfc116k4qj49qkw2gprg4cxv2mnp1ldj9jh81fc"; }; "ad48b0d39c84ad3a23ee670e06d009fd1ef406ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ad48b0d39c84ad3a23ee670e06d009fd1ef406ae; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ad48b0d39c84ad3a23ee670e06d009fd1ef406ae"; sha256 = "0a396fmil6q217fh2vr6wwm63wyq74j495dxj7y509swjsjf6zsc"; }; "ad735ce413f80f79900a87098c112c355b2269b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ad735ce413f80f79900a87098c112c355b2269b9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ad735ce413f80f79900a87098c112c355b2269b9"; sha256 = "1qgccwwrhkljak4xks9qnf0zq4j4q36n4134xs3nvmzbma9l6xw2"; }; "ad8485d0661bcc3b36bc884373baac7c82c1db1a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/ad8485d0661bcc3b36bc884373baac7c82c1db1a; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/ad8485d0661bcc3b36bc884373baac7c82c1db1a"; sha256 = "1w441r581slp32qhpnrpm2hacy3db8y7v5by2z0xycl2nfz25n1l"; }; "ada3dc17e0a699e9f0888f167ab43c95b9d087c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/ada3dc17e0a699e9f0888f167ab43c95b9d087c9; + url = "http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/ada3dc17e0a699e9f0888f167ab43c95b9d087c9"; sha256 = "0zzk3laz8wv0sd4gqc54p5hw86wvbjmy8vrdlq5hpfhg6z046cch"; }; "ada964ecffeda8e2a6db59b92272ea1e22dd17b5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ada964ecffeda8e2a6db59b92272ea1e22dd17b5; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ada964ecffeda8e2a6db59b92272ea1e22dd17b5"; sha256 = "0s23ag4qfdy2h7cz7184i2vzbbb3bm3j3655vs8yb8gfjj1rbiyx"; }; "adb1f445a4a127969356b6635da51f637f54a0ac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/adb1f445a4a127969356b6635da51f637f54a0ac; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/adb1f445a4a127969356b6635da51f637f54a0ac"; sha256 = "1h5siwqpjjgqi695gsmbkdj4qx9cd3w4378i7w59dxv512zgkgrz"; }; "ade00d1c90e8988488643bcf563040510c4be517" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ade00d1c90e8988488643bcf563040510c4be517; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ade00d1c90e8988488643bcf563040510c4be517"; sha256 = "07wc8b6i06hqp5mas7jjhs71ag0lb00z3w5gs25zrmz36ly898hl"; }; "adeb881928e136d07bc7684746ce44d02956f822" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/adeb881928e136d07bc7684746ce44d02956f822; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/adeb881928e136d07bc7684746ce44d02956f822"; sha256 = "1bs2z2aw2pqiygq6ykznncfd029v483za1ii6sxbxdg59am4brii"; }; "ae2770ddebf925141015b1cd4b1bb15fe7ece06c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2659695-e878a65d22304b68a9e6878b07b5db24/ae2770ddebf925141015b1cd4b1bb15fe7ece06c; + url = "http://cdn.unrealengine.com/dependencies/2659695-e878a65d22304b68a9e6878b07b5db24/ae2770ddebf925141015b1cd4b1bb15fe7ece06c"; sha256 = "074dv8w0rkv95qcjxrwsbr6imx41w5ywfx7vcd73l3llzdgfk46l"; }; "ae70c01ba3575e5558b7bde673a82e53494df34b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ae70c01ba3575e5558b7bde673a82e53494df34b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ae70c01ba3575e5558b7bde673a82e53494df34b"; sha256 = "14qd1wbnp3zkfb2ni0dghjbgca4w6c8mnh90f0ijfxwnywk1myba"; }; "ae8089d30509415ded81477eb41b29f55a431272" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ae8089d30509415ded81477eb41b29f55a431272; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ae8089d30509415ded81477eb41b29f55a431272"; sha256 = "10y28v1pfxz5vdjxvb5kah2756lsl70z9grmda57l5wd4s9qmy91"; }; "ae874d3eb1af9a5081c94361a989f0b77e0ecf1b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ae874d3eb1af9a5081c94361a989f0b77e0ecf1b; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ae874d3eb1af9a5081c94361a989f0b77e0ecf1b"; sha256 = "1r3a0qndxy43pgwsjcc7ia3njip4zvh0419wbm502006amj07yrl"; }; "ae901fb15f84f70cf6979dafda0d8f5dbcc5c269" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ae901fb15f84f70cf6979dafda0d8f5dbcc5c269; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ae901fb15f84f70cf6979dafda0d8f5dbcc5c269"; sha256 = "1jipsy7d39z9qmz27ib75yixmgp0qqfazljgmisiw7kyii1m5fpp"; }; "aecbc01c44a31c0809a43e68b99e44ed1a66bd00" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/aecbc01c44a31c0809a43e68b99e44ed1a66bd00; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/aecbc01c44a31c0809a43e68b99e44ed1a66bd00"; sha256 = "0vxvjjpr0hvivfsszf94ii8xl67xnb262mxfwm5xmml7472xzhsn"; }; "aeeedf07121752bb79af7caf8438e5c3d612cd7f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/aeeedf07121752bb79af7caf8438e5c3d612cd7f; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/aeeedf07121752bb79af7caf8438e5c3d612cd7f"; sha256 = "1dk4xvniy7cr3xss4s9nrbjgbmibbsb9s7plw20hlg0gzcyg24pn"; }; "af0b9f348ea115df7f34f8c6a13da31e75e76e16" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/af0b9f348ea115df7f34f8c6a13da31e75e76e16; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/af0b9f348ea115df7f34f8c6a13da31e75e76e16"; sha256 = "00y3h6bw7ljrnvy1d9fxff6ncsvgpqaj3hyp44q41w3xlwilsyq7"; }; "af0da89763358318771d8aefcb742e3416f57423" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/af0da89763358318771d8aefcb742e3416f57423; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/af0da89763358318771d8aefcb742e3416f57423"; sha256 = "18xak3xnl38n8mbqa5rv3m70595y36yy2l5rwlhy1k9g66lfvwf8"; }; "af313d299a6ace9cd07fe010e73680f12b0b5147" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/af313d299a6ace9cd07fe010e73680f12b0b5147; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/af313d299a6ace9cd07fe010e73680f12b0b5147"; sha256 = "151bsqly7rqy1isklgjvy39bnbxqd3vyjbqaf60lgs6h81ggj5fn"; }; "af32114b8b970d1d65271ed99052f0de3d4651eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/af32114b8b970d1d65271ed99052f0de3d4651eb; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/af32114b8b970d1d65271ed99052f0de3d4651eb"; sha256 = "1pg0r81c1rg9r6m80k3907s77j9mqh8xy2zaym734r3zvjamwf54"; }; "af412e3bcac064293cc367941ad02eddcc3e5a44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/af412e3bcac064293cc367941ad02eddcc3e5a44; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/af412e3bcac064293cc367941ad02eddcc3e5a44"; sha256 = "1gzy8vni5d61pp6v5ns1ykmg2xcgcrm6gd2w90bxgjn7fjxbm6y0"; }; "af915ecf45e7ce1cfbc694f16a90c5131e953240" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/af915ecf45e7ce1cfbc694f16a90c5131e953240; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/af915ecf45e7ce1cfbc694f16a90c5131e953240"; sha256 = "192x7nbj1mkzvwcjmhaw65wpq0gkjsyx709dh4mkcrm6djw2si6v"; }; "afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d"; sha256 = "0zqjqww51znppvgkgqinxa91zpwva3jwc8rd7x78f319f3wpka24"; }; "afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753"; sha256 = "0z2c3ac6ja8r82wr7fgbh6j9gpma7p1wxrwgqxdwysgys39z7dvr"; }; "afc1c36f600c80efcf810f3f49289880b32ab502" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/afc1c36f600c80efcf810f3f49289880b32ab502; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/afc1c36f600c80efcf810f3f49289880b32ab502"; sha256 = "1clkj01cmpgx51zlqbypjdarm1anispwmch98y87gsmhpbgmgm7l"; }; "afd3591b1c847bb2dca52c7bab74b7f00043a210" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621658-dcc28ef36e554dd28b121fd140f310e9/afd3591b1c847bb2dca52c7bab74b7f00043a210; + url = "http://cdn.unrealengine.com/dependencies/2621658-dcc28ef36e554dd28b121fd140f310e9/afd3591b1c847bb2dca52c7bab74b7f00043a210"; sha256 = "1ymdczzqabd5alr8j3gmisrljfvdlncb79d8n62dkxkgp0f894ix"; }; "aff26a6b13744512c90c853c58676ace9431b24a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/aff26a6b13744512c90c853c58676ace9431b24a; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/aff26a6b13744512c90c853c58676ace9431b24a"; sha256 = "0g66byknihd0fkcd7h1bb7vbgzz8rsyjnkgf61sxbidxdis9v722"; }; "affb2ac1292b281f85114871becaf2e7a7adfa7e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/affb2ac1292b281f85114871becaf2e7a7adfa7e; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/affb2ac1292b281f85114871becaf2e7a7adfa7e"; sha256 = "0s90sfpjphy4zs3ccwfhhxjh9irr0x4sijjg1k9r5ixzn19klb77"; }; "b05b1e539b6610459cb8b45e8d0b48d4de00fa44" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b05b1e539b6610459cb8b45e8d0b48d4de00fa44; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b05b1e539b6610459cb8b45e8d0b48d4de00fa44"; sha256 = "0ac90aqnhkm3dvcm5ql5wg959v8y7pyjibppgran58sf0jph91v8"; }; "b08e33bfe04cad899bb61fb3d822e79b9203df59" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b08e33bfe04cad899bb61fb3d822e79b9203df59; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b08e33bfe04cad899bb61fb3d822e79b9203df59"; sha256 = "126xswxfgsv1yp33hvpxjfk4m22j3dvs4dhr83rpwqvyw139bxc8"; }; "b0ad17ab6dad98419386251c9553b4a5d0a73fad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/b0ad17ab6dad98419386251c9553b4a5d0a73fad; + url = "http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/b0ad17ab6dad98419386251c9553b4a5d0a73fad"; sha256 = "08rnn13hqbz2j70ldigc3ksa99jmc8gg9x5a2am545s5qw6p5myr"; }; "b0b3d44fba913897d01ea2ef6e8089c64f988ac6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b0b3d44fba913897d01ea2ef6e8089c64f988ac6; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b0b3d44fba913897d01ea2ef6e8089c64f988ac6"; sha256 = "0lq9vbdkw3cqn0w7zd78n1wpnldxkr3azp02786gqrcx3lgwxffr"; }; "b0f0802f90e19b137dfc3482c478ce06deda9019" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b0f0802f90e19b137dfc3482c478ce06deda9019; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b0f0802f90e19b137dfc3482c478ce06deda9019"; sha256 = "0ivpnd7z9pl4pkdxsmfn0qnxh5ny19zxh2jvsdkwzj6qk49r7w8x"; }; "b10f9ee97120ca6711610befa4e7fab7977b88e9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/b10f9ee97120ca6711610befa4e7fab7977b88e9; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/b10f9ee97120ca6711610befa4e7fab7977b88e9"; sha256 = "0mf5w54jw7vsk1l8x613zhq9060cd6xj03cjk93pbmkizvy0hxc1"; }; "b1554d1196eebddea596b1a7274981d7a2670be4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b1554d1196eebddea596b1a7274981d7a2670be4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b1554d1196eebddea596b1a7274981d7a2670be4"; sha256 = "0rsf740756cc4samd688c81y49fsw1bkiipvahpj1h4kpqys8w4v"; }; "b16036ff8aa037d50175f1e65bd5504964b26e9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b16036ff8aa037d50175f1e65bd5504964b26e9a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b16036ff8aa037d50175f1e65bd5504964b26e9a"; sha256 = "034rljnxdmy11xhr3rpgzv4sdab87z3ybbrww0gvl0av3chmga5g"; }; "b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/b176340bbc5d5b5bac78f855162c5a3ff0ba19ce; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/b176340bbc5d5b5bac78f855162c5a3ff0ba19ce"; sha256 = "1ckgycqh4s28c0yq593d8405cz1g7pnmjpnnfvn3y8gn0yh8qb56"; }; "b176ee25e0ebb7afdb44613dac3f4254dc99ce2a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b176ee25e0ebb7afdb44613dac3f4254dc99ce2a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b176ee25e0ebb7afdb44613dac3f4254dc99ce2a"; sha256 = "0jb1vsabmj29s03ghc2g48r9sjz2h4s96lvhkf6xgfgqi26nx0vq"; }; "b17f3e987930d01e04a825ded615a345c7af5ef7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b17f3e987930d01e04a825ded615a345c7af5ef7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b17f3e987930d01e04a825ded615a345c7af5ef7"; sha256 = "1d4ibb02h26i5za5z7a9sj2cirvz8y93h2jxrb0llq9hfazzzgpv"; }; "b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b1bc628c3ffbbceef6e1ef0dfb467b793da712dc; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b1bc628c3ffbbceef6e1ef0dfb467b793da712dc"; sha256 = "1li9rf71003ixz42k3gcavfnnjjfgbp69qzxmddv7w8iykas5vli"; }; "b1cdfd2a0b486252f482eca80d3408be44b15168" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b1cdfd2a0b486252f482eca80d3408be44b15168; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b1cdfd2a0b486252f482eca80d3408be44b15168"; sha256 = "03ipjskn7j0ar4hz9n9w8r6m1wp3ag35n21sx3v594b332ma25cg"; }; "b1dfb94e146a98148e1f9ba9a56d7114a84628a8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b1dfb94e146a98148e1f9ba9a56d7114a84628a8; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b1dfb94e146a98148e1f9ba9a56d7114a84628a8"; sha256 = "09imd5nsrina53my95vsd4jm9400qz0kc7vik3aafga9648h5nj6"; }; "b1f44610d6ce19e42537f436c4bfc70e275b432a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b1f44610d6ce19e42537f436c4bfc70e275b432a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b1f44610d6ce19e42537f436c4bfc70e275b432a"; sha256 = "1bfgybl30pgmjzvxiisy0bm6anh2nif2gc67a43ij0gxmbiigwyd"; }; "b20c27d04963b4b8e0c5dcfd81e51dfc59e30db2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b20c27d04963b4b8e0c5dcfd81e51dfc59e30db2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b20c27d04963b4b8e0c5dcfd81e51dfc59e30db2"; sha256 = "1sfrx4dnqmp5d7j7xid8p0iv6fglbv7zsas1d1ig0knda2gc5c05"; }; "b24bbd337d9a9cf1085d4cd1df1e43e928749b90" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b24bbd337d9a9cf1085d4cd1df1e43e928749b90; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b24bbd337d9a9cf1085d4cd1df1e43e928749b90"; sha256 = "0qsi9g0vn6q49w8xkfghkrjhb32jczinnjiyp5isyb19802zc6vm"; }; "b2b40485507860ae0f1ba756693b78123347a60b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b2b40485507860ae0f1ba756693b78123347a60b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b2b40485507860ae0f1ba756693b78123347a60b"; sha256 = "1y9i6ly60x5cyqf429ay00sy3f796ha65wcinjvsmixpgsqivm8h"; }; "b33175575bd5fbb07b2308fa24fbf8f548763435" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b33175575bd5fbb07b2308fa24fbf8f548763435; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b33175575bd5fbb07b2308fa24fbf8f548763435"; sha256 = "120489jn9bnsj3v4v6icl3pvcpzm27g3900l3k8f263b8qz52jpy"; }; "b33dbe936d08959ce00d8d551c9861052b05a0e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b33dbe936d08959ce00d8d551c9861052b05a0e3; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b33dbe936d08959ce00d8d551c9861052b05a0e3"; sha256 = "13l63iipsscfz4iqm9jsp68y0w1l2pmmg2skv5mnmlfm4ryq5dc5"; }; "b3643e64562cf8928fe74794820c500f305fac17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/b3643e64562cf8928fe74794820c500f305fac17; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/b3643e64562cf8928fe74794820c500f305fac17"; sha256 = "1gy3p72p0v67psb8n5gqmw6skxavcamq7c5i3mgc5pmys2jmspqd"; }; "b386d93988dde07a87de09757eacd3a2ecfd6202" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b386d93988dde07a87de09757eacd3a2ecfd6202; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b386d93988dde07a87de09757eacd3a2ecfd6202"; sha256 = "1nmsqsm0g8zz3x4x5h3m2nf5ii5cqpr5x3kpcs5x9dpcsz1z5q9f"; }; "b3a267c43c45f392523e300a6f61318f4ae52d99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b3a267c43c45f392523e300a6f61318f4ae52d99; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b3a267c43c45f392523e300a6f61318f4ae52d99"; sha256 = "1grivshi7cgmin5cab447s30byjlapnlcg010assxx36vgkhpihp"; }; "b3ba54dd3b4a9c7c235223aca9ad7d6007559484" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b3ba54dd3b4a9c7c235223aca9ad7d6007559484; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b3ba54dd3b4a9c7c235223aca9ad7d6007559484"; sha256 = "15as68yknbf35zv5638qfc8j4pwry8zbmhn8k0ycjzyi7c5gqqpv"; }; "b3df044bb928c0123e3067b6ca07bc8db2c7c93c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610298-3f4939c916b54d799ac5de807895697f/b3df044bb928c0123e3067b6ca07bc8db2c7c93c; + url = "http://cdn.unrealengine.com/dependencies/2610298-3f4939c916b54d799ac5de807895697f/b3df044bb928c0123e3067b6ca07bc8db2c7c93c"; sha256 = "1zcc27kh9mwhawpkfxishqhkngwp0ixasw091g0ydxvsawq7wikb"; }; "b4179284c669b70deca0e515159443b89dced17a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4179284c669b70deca0e515159443b89dced17a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4179284c669b70deca0e515159443b89dced17a"; sha256 = "1yi9jlqh5chhq5zrsi6581d20hy4wva56dwvik7p5azcwkv7jh2i"; }; "b4411a92ba0b237e9dee0988897930e64daca1a7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b4411a92ba0b237e9dee0988897930e64daca1a7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b4411a92ba0b237e9dee0988897930e64daca1a7"; sha256 = "17ffzs8zmcwf3znbc8jzja6db4kcgj4mnzf90g061k6bx29rrnxi"; }; "b44f92d2adf2245433cfea594b8718a8a1d0935a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b44f92d2adf2245433cfea594b8718a8a1d0935a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b44f92d2adf2245433cfea594b8718a8a1d0935a"; sha256 = "0r5mqhyn811cbwspbi6l9yssx2w8pg6brv52g8qhwjiapr70p6xf"; }; "b453a1dc5c79a3ef309710fa63d80177fdb4c947" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b453a1dc5c79a3ef309710fa63d80177fdb4c947; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b453a1dc5c79a3ef309710fa63d80177fdb4c947"; sha256 = "0c331fw0hzzh15b0s1i0x52bmdlwwzyjxr9gj1rflm9i0h83xqk6"; }; "b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f"; sha256 = "18r4lblc3zg86sfj27izlbgjdap2aw1hhx64s9aykj32k0slhq3k"; }; "b49270a6fb0733c3b9a3e6627fdc96c5b2b400f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b49270a6fb0733c3b9a3e6627fdc96c5b2b400f7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b49270a6fb0733c3b9a3e6627fdc96c5b2b400f7"; sha256 = "11v6h8xgr5lj7x8aakirdny73fsdidshg9ijhck7lq25sqrpg681"; }; "b49ba6bcffb62e7245700758aeb276ae404637e1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/b49ba6bcffb62e7245700758aeb276ae404637e1; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/b49ba6bcffb62e7245700758aeb276ae404637e1"; sha256 = "083hj8s2ihr85gb1lpy6zy2xfd7ilr3yr46jvv62i2v8v551y2ri"; }; "b4a7011b1f4b663e34e08b5caa1fe927463eb914" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615623-07d97909df1d48be99bb54a411313382/b4a7011b1f4b663e34e08b5caa1fe927463eb914; + url = "http://cdn.unrealengine.com/dependencies/2615623-07d97909df1d48be99bb54a411313382/b4a7011b1f4b663e34e08b5caa1fe927463eb914"; sha256 = "1442aqg7ds4xxq80jsk7y2bhj2dgnm4bk8ma0kcdhy8qnmhwwvz3"; }; "b4b01b3870e9301073475bb924e5463d76e87c0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4b01b3870e9301073475bb924e5463d76e87c0f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4b01b3870e9301073475bb924e5463d76e87c0f"; sha256 = "0720v8f1mgqrkxgdk85w3bj68kai90xy6i5gc5b9sbg3dgw1giss"; }; "b5b76e5c16852517072b42a8cb51945d692252b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b5b76e5c16852517072b42a8cb51945d692252b7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b5b76e5c16852517072b42a8cb51945d692252b7"; sha256 = "0cxz5vh3j0mf2vfr94v535zl3aa41m0ynydw3phmi45nws9rqck1"; }; "b5d004587689d2ebd79e34905d174a376e575f5f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b5d004587689d2ebd79e34905d174a376e575f5f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b5d004587689d2ebd79e34905d174a376e575f5f"; sha256 = "0gj82721n05pymy3fpghics0v2pi5ck1liqv0d6976y89anz7vlj"; }; "b63ccd1617b08574d0129948ec7ad1e48f94a220" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b63ccd1617b08574d0129948ec7ad1e48f94a220; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b63ccd1617b08574d0129948ec7ad1e48f94a220"; sha256 = "1i1l5aq5da080145qxraaj8mh5hpjwk3l6cdl1k3acn3y8rdyb27"; }; "b66bb0fd25eed1110f4b97f5f4c3cccd294cb884" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b66bb0fd25eed1110f4b97f5f4c3cccd294cb884; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b66bb0fd25eed1110f4b97f5f4c3cccd294cb884"; sha256 = "166m1j21yq89qpf3g8h7rdkcdzcnhcj6aps29n5yx1zgay6kq9sd"; }; "b66faabd2faed41ddcfaa83fbc45e1c038712800" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b66faabd2faed41ddcfaa83fbc45e1c038712800; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b66faabd2faed41ddcfaa83fbc45e1c038712800"; sha256 = "0lg35984x9q9y0binxrkdwnj4c910nj8wj41bsggwsmfdxz3vi1b"; }; "b6774cdd5b050cfcaac3143c0a8f89705c6bde71" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b6774cdd5b050cfcaac3143c0a8f89705c6bde71; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b6774cdd5b050cfcaac3143c0a8f89705c6bde71"; sha256 = "0xllvgabdrafyy0gh1plqnzbr9lwxw5xn357dc4bpz7a8nllnzpl"; }; "b6aa88050eb1fb1e9317e28c1342c6ea4ab7dbad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b6aa88050eb1fb1e9317e28c1342c6ea4ab7dbad; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b6aa88050eb1fb1e9317e28c1342c6ea4ab7dbad"; sha256 = "1yxxvjhrj20m6jj26y53azikjw1jmdb1sc0l5876bkmwadl7rkyh"; }; "b6e51c5ce4619cf24deb50699e19457246a65fde" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/b6e51c5ce4619cf24deb50699e19457246a65fde; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/b6e51c5ce4619cf24deb50699e19457246a65fde"; sha256 = "00q6pplg3rq5wy73nj9gi0h14dvcnvsi0b51xbbbsvd6qnpgf9in"; }; "b751385c56ed5ce096df337d0a736bdb517071c0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b751385c56ed5ce096df337d0a736bdb517071c0; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b751385c56ed5ce096df337d0a736bdb517071c0"; sha256 = "134snqqpd11yd05jgw199fpv41pnw94kh8fig3gmkv2rc0ppdrqc"; }; "b76100c79e2052b6a9156a3a3b44dc46b73ba80b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/b76100c79e2052b6a9156a3a3b44dc46b73ba80b; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/b76100c79e2052b6a9156a3a3b44dc46b73ba80b"; sha256 = "02igaa6r8rs8qk7235jvbryycz2v3cl4pd08ifwhg471w65zrwz9"; }; "b774b3a6af176fe17e8988b8ce8aae6fac0081c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b774b3a6af176fe17e8988b8ce8aae6fac0081c8; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b774b3a6af176fe17e8988b8ce8aae6fac0081c8"; sha256 = "1vjz9m66hfr3anm75vfb815i0al393rq0y0w0nbi8l5nxayl2fr4"; }; "b792f771ba89b6e97aa0da38cab7975e31240901" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/b792f771ba89b6e97aa0da38cab7975e31240901; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/b792f771ba89b6e97aa0da38cab7975e31240901"; sha256 = "0wjqqiaj00ngyl6mzxqqpk4jbb4xngk6zcahs9jgiiwvr0fs31gr"; }; "b7cac0682cd1b758954a6990731d98ac60e931f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b7cac0682cd1b758954a6990731d98ac60e931f4; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b7cac0682cd1b758954a6990731d98ac60e931f4"; sha256 = "1sjhah3cj62frm38rqs3v3mm0jmab39qx0ys39kgq15wl4gyhrs3"; }; "b7d98916d7231a6cc8fa4b5ba6d9a123af873b7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b7d98916d7231a6cc8fa4b5ba6d9a123af873b7c; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b7d98916d7231a6cc8fa4b5ba6d9a123af873b7c"; sha256 = "1y0iwjm5hkwqxz17b69xfvl200nsyf86i2fdm4kcyf8wq99a905r"; }; "b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2386906-35f20c2d3732491bab9f172643aaf695/b7e5e66ec2b311c32f25563c90d3883eaf9d7f01; + url = "http://cdn.unrealengine.com/dependencies/2386906-35f20c2d3732491bab9f172643aaf695/b7e5e66ec2b311c32f25563c90d3883eaf9d7f01"; sha256 = "02c5s02nj5zab4w019bawz9xf3z253w2kjwsnxx0pjzcgzn5dsic"; }; "b8063b5f31f092324c94ccf41e3dbbca020714c6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8063b5f31f092324c94ccf41e3dbbca020714c6; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8063b5f31f092324c94ccf41e3dbbca020714c6"; sha256 = "0sx6wmnjqmka3838541dwi668lxdyf4z8ddyy3x94qcg7xr67hx8"; }; "b8147ae4f4e48c66013e2ce160e307bdbf8bb643" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8147ae4f4e48c66013e2ce160e307bdbf8bb643; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8147ae4f4e48c66013e2ce160e307bdbf8bb643"; sha256 = "0p9sv64h64pjq8g2p2wb7yvmfma1d3dyp1p26vq9pxyx5vaj6c0h"; }; "b8280b60d889420165c4849a608f2f77a636a96e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b8280b60d889420165c4849a608f2f77a636a96e; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b8280b60d889420165c4849a608f2f77a636a96e"; sha256 = "0vqj80qdwi1dfxgijzjgk9wwfkvf07khgyjjw05801vkkjj75nyb"; }; "b832b94004977756477412eec3019f6cb37e62d1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/b832b94004977756477412eec3019f6cb37e62d1; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/b832b94004977756477412eec3019f6cb37e62d1"; sha256 = "1vja9zxjlil78d20bmwq1cnzb99q2k3g2g75bpz51v6g5smnwwzm"; }; "b8394a23db9e6efd8594d13cde39d95e60a2b46d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8394a23db9e6efd8594d13cde39d95e60a2b46d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8394a23db9e6efd8594d13cde39d95e60a2b46d"; sha256 = "199qs2a3ii5353ijcg7vrd2qjz1ig0zs58qpywjkqq5gcx1h3d3a"; }; "b8692885cc79308225c50faa58244e7006dadf91" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/b8692885cc79308225c50faa58244e7006dadf91; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/b8692885cc79308225c50faa58244e7006dadf91"; sha256 = "0dmjw6wr6mb0y6ika02fnqngk9lghkm4hdwl2khlhzp25hn2ki6f"; }; "b88c8f32e5693eade30c534bf94f295df40e1d87" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/b88c8f32e5693eade30c534bf94f295df40e1d87; + url = "http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/b88c8f32e5693eade30c534bf94f295df40e1d87"; sha256 = "0br9zqlnczmdcnay2lja9j6wahsi13182jvd823q0c5rz8r7y9ha"; }; "b8b07927a65a87a42232ceb51c98a8b5d6893348" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8b07927a65a87a42232ceb51c98a8b5d6893348; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8b07927a65a87a42232ceb51c98a8b5d6893348"; sha256 = "03kgb1qbibsrhf1h1xx6zlm0dckjymxbjkd0rr3r896xg10rgr5i"; }; "b8ddc52b5bf66003c85e7e259287f4741bfe8119" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8ddc52b5bf66003c85e7e259287f4741bfe8119; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8ddc52b5bf66003c85e7e259287f4741bfe8119"; sha256 = "1207ryz0lz26nw1vjnhicxn94xzf6i55h312xqgl3w1mz3l6m4pw"; }; "b8e153475935a408d91ca55c8e98030d5cc99ceb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2435859-13d694fe2b4f4b1b838326ec956dab4d/b8e153475935a408d91ca55c8e98030d5cc99ceb; + url = "http://cdn.unrealengine.com/dependencies/2435859-13d694fe2b4f4b1b838326ec956dab4d/b8e153475935a408d91ca55c8e98030d5cc99ceb"; sha256 = "1rv2kj03nacyhh3bddn2vsvh98ld3f1rizx71hg5q5qx5ikihabp"; }; "b8e9ff6bec00725cf169b237001ce72af9342600" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b8e9ff6bec00725cf169b237001ce72af9342600; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b8e9ff6bec00725cf169b237001ce72af9342600"; sha256 = "19cv6afmrykdhfwci6532yx560pc1l6a4z9k7fjh2y9zcgz5v38h"; }; "b8fd57460311ef331feabf98c510f76f80053855" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/b8fd57460311ef331feabf98c510f76f80053855; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/b8fd57460311ef331feabf98c510f76f80053855"; sha256 = "0xki6y0slv4g5wg8z323pa09z2s0v14pkmkas9h7j1z8jh2wczwi"; }; "b94c9f0d77457d47a979c48f936f9be3c11930e0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b94c9f0d77457d47a979c48f936f9be3c11930e0; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b94c9f0d77457d47a979c48f936f9be3c11930e0"; sha256 = "1nlg8bv50idaxxhawrxnwdr9s2cq31ac46s383lqmnxmbiyinx9q"; }; "b955f5ba1db0d7a6f27b22a2a79e008593d687e4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b955f5ba1db0d7a6f27b22a2a79e008593d687e4; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b955f5ba1db0d7a6f27b22a2a79e008593d687e4"; sha256 = "0ywsp3g116w2cbavbm6hiv6sm60zm74lix5j1ipliq9nlkkjfd6a"; }; "b9e5928d9d628a4f6a0795a3f4947e59fd82874e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b9e5928d9d628a4f6a0795a3f4947e59fd82874e; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b9e5928d9d628a4f6a0795a3f4947e59fd82874e"; sha256 = "1p3sb9hzqi7isqpw3a4mzra1a56qrzvhrsc483qb8dpj85a134cr"; }; "ba2567e2e68ba6bc101c3614005d68fd1d0ac2c0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2624272-fa13935f6af5491e88fc623f350f6d60/ba2567e2e68ba6bc101c3614005d68fd1d0ac2c0; + url = "http://cdn.unrealengine.com/dependencies/2624272-fa13935f6af5491e88fc623f350f6d60/ba2567e2e68ba6bc101c3614005d68fd1d0ac2c0"; sha256 = "055hiysma8dhw6fxclbc87s8r24sqrs8hddri0alc3x3ckgx1xvr"; }; "ba59a62dae63fc2d143e0cf4c7c65185055b6cfc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ba59a62dae63fc2d143e0cf4c7c65185055b6cfc; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ba59a62dae63fc2d143e0cf4c7c65185055b6cfc"; sha256 = "0ds72np4k5a83wdianr988wl3l83ml4mmrv7xhq7knmxga11zgww"; }; "ba6332a94c99ed09c2a9e428e54763da5b1576f9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ba6332a94c99ed09c2a9e428e54763da5b1576f9; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ba6332a94c99ed09c2a9e428e54763da5b1576f9"; sha256 = "0hq06wfzqwddzmji8iwl93gn1h7bsrm5wydfhd2jdkvbchdjrng9"; }; "ba6a5b201e1374856d563e960e0a5f7a935cf37d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ba6a5b201e1374856d563e960e0a5f7a935cf37d; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ba6a5b201e1374856d563e960e0a5f7a935cf37d"; sha256 = "0i3lsazrz4d5y8k4569jc9qyr45r5mkp1bkm705ah2ykli1mwvgn"; }; "ba8f3a342d5ba472b330c322376f9f3d7921dcd3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ba8f3a342d5ba472b330c322376f9f3d7921dcd3; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ba8f3a342d5ba472b330c322376f9f3d7921dcd3"; sha256 = "1m04gn311csvzbn4qmass7v0zpwgc6gb9bh76xk1nqirzm1sqjjx"; }; "bad3d27e656261f89d7bfe9409032b1623077a17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bad3d27e656261f89d7bfe9409032b1623077a17; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bad3d27e656261f89d7bfe9409032b1623077a17"; sha256 = "0j6q8pjr2iazpk2ljdxaa0f4m4nsw1bvgpqbnl3l7s8514r98yj5"; }; "bb049becabe678eba91b10ef8dceac666811ba85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bb049becabe678eba91b10ef8dceac666811ba85; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bb049becabe678eba91b10ef8dceac666811ba85"; sha256 = "1gzd6j43gq4w5zrib4ww8ipdhkh8zmzfkiq55wwmfk6jpqqxyaxv"; }; "bb258d693db2159bec8923eb69e53769e0082936" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bb258d693db2159bec8923eb69e53769e0082936; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bb258d693db2159bec8923eb69e53769e0082936"; sha256 = "0pgvj37zvrrxrpkd3a3iwp7d2kyd5c854vsbksq24cpjbdmdiazf"; }; "bb2be5134bddeb480f0a728bd702988afdd4811f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bb2be5134bddeb480f0a728bd702988afdd4811f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bb2be5134bddeb480f0a728bd702988afdd4811f"; sha256 = "0z85frk7i22ql1flrnyipp5vwlyy2j5fw6nyx04pjhv8i0d86ims"; }; "bb5ab39ad700a8ef35bb3bbd27b4c382839c69ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/bb5ab39ad700a8ef35bb3bbd27b4c382839c69ea; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/bb5ab39ad700a8ef35bb3bbd27b4c382839c69ea"; sha256 = "1p8q27cjb4mxn8y3x4l61z880bxs0swn6a8zgrmyzdmcxxnrkbck"; }; "bb77f99554309b937e1c3bc3c0569d3ef0568a00" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/bb77f99554309b937e1c3bc3c0569d3ef0568a00; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/bb77f99554309b937e1c3bc3c0569d3ef0568a00"; sha256 = "12kyhxb2sxk0n0j7xnsqccrmf6svsblpmg9hgx5p84qr1wwi3l8g"; }; "bbb17328cc23f4bf942377d41807a13a7b852229" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bbb17328cc23f4bf942377d41807a13a7b852229; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bbb17328cc23f4bf942377d41807a13a7b852229"; sha256 = "13nj59zrhss1z8czcahqsljdgjbpcrn7ajyz2v0nvhlxv5zvqk56"; }; "bbcf231dbaac1a61eba6aa76798c72923c7ddc56" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bbcf231dbaac1a61eba6aa76798c72923c7ddc56; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bbcf231dbaac1a61eba6aa76798c72923c7ddc56"; sha256 = "1zqi6x73wj86nzsnq3gc19f25s0hzjc72zhhn3k2mmmzg6c5rk06"; }; "bbd3ed12cac3a5812ed814525f0d0018011bcd2f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/bbd3ed12cac3a5812ed814525f0d0018011bcd2f; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/bbd3ed12cac3a5812ed814525f0d0018011bcd2f"; sha256 = "13k4nj6cls0bm9fbfznanlpaxi6rf5cl96fjzdh5knakhr5pg4vb"; }; "bbdc2b6ed549549505ee1860ea5068ae5bfc7db2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/bbdc2b6ed549549505ee1860ea5068ae5bfc7db2; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/bbdc2b6ed549549505ee1860ea5068ae5bfc7db2"; sha256 = "04vf62h854l2bby4a101c4wcngvzh04n0agv8kckjbxd4484kqkh"; }; "bc249eda4e4d0e13fd0e6a660e8cb471ace80c0a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/bc249eda4e4d0e13fd0e6a660e8cb471ace80c0a; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/bc249eda4e4d0e13fd0e6a660e8cb471ace80c0a"; sha256 = "01saqqwf52fg5cv3cbf7kx80pa5lp6n70wjc1vzkx322sz1d37wc"; }; "bc927fee31049f8467d1a02704ac805cef57cb71" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bc927fee31049f8467d1a02704ac805cef57cb71; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bc927fee31049f8467d1a02704ac805cef57cb71"; sha256 = "03zny0fk95qr83wrdhhnb6knygc8m4y4z1b45m89gvxjz3s7qz9g"; }; "bca8b698f2e07aaa627a4e94587fdef669602b23" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/bca8b698f2e07aaa627a4e94587fdef669602b23; + url = "http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/bca8b698f2e07aaa627a4e94587fdef669602b23"; sha256 = "1rdpv3fci2l9q3802wajkr1b8as0g17g1mnzyzndsr68jwafn4sf"; }; "bcb92df46de5890dc5538dd7f0256a6504653c01" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcb92df46de5890dc5538dd7f0256a6504653c01; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcb92df46de5890dc5538dd7f0256a6504653c01"; sha256 = "1rfdcc2ap488hr67sbpdafc3g4kpxhqv49yjqm9aygj9pb237amw"; }; "bcc1b9fa37b696e2b1e09da24ada79401007ef3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcc1b9fa37b696e2b1e09da24ada79401007ef3b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcc1b9fa37b696e2b1e09da24ada79401007ef3b"; sha256 = "1g113bj35nm7nm0xabfdsrbx5p02cqynp2xr5m656k3iln0q57fg"; }; "bcc352fe44e93b30ce97deea8345406542f840d7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bcc352fe44e93b30ce97deea8345406542f840d7; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bcc352fe44e93b30ce97deea8345406542f840d7"; sha256 = "0m5vf9x58s47bm4x1vrrs0hrv4pjiy1a6qxx36qrsrqfv6shb6k0"; }; "bcd0cabdfbee7db486a249459af2c96bbe597c9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/bcd0cabdfbee7db486a249459af2c96bbe597c9b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/bcd0cabdfbee7db486a249459af2c96bbe597c9b"; sha256 = "1gl16fgzp7ljwablwn7n7l6d27m2vfiwycwpqag3nmvcqmsa236c"; }; "bd11c74bd2655f16eff2974a9ea3299f642a52cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd11c74bd2655f16eff2974a9ea3299f642a52cf; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd11c74bd2655f16eff2974a9ea3299f642a52cf"; sha256 = "168rzxjij3dpqjymrqyqqgablffs3mgqfhmi4fnd31mpq1cmx7lf"; }; "bd969e12b2d210ce0b8817860e18034a3a30c510" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd969e12b2d210ce0b8817860e18034a3a30c510; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd969e12b2d210ce0b8817860e18034a3a30c510"; sha256 = "0yal1m4cpkd4nqfarccf5z7szaz46k1cflv9v0797dlk81zgrwjh"; }; "bdd022a7d16d25b6d56f693ab8ddb909273da156" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bdd022a7d16d25b6d56f693ab8ddb909273da156; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bdd022a7d16d25b6d56f693ab8ddb909273da156"; sha256 = "1zqrs5nan5ipaxf392f25ynyppxfc5zq9nafq15ic4z7a5az2nz7"; }; "be2367fa9ac1bcb508f247e19ea18ae92e277583" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/be2367fa9ac1bcb508f247e19ea18ae92e277583; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/be2367fa9ac1bcb508f247e19ea18ae92e277583"; sha256 = "1pffz2clg1ql5d14an4y6g6i148vxiai2kq2hzkbvv23hgmhczlz"; }; "be250ea55f51ad2bfa64247db8ab7f7ba22bcc99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/be250ea55f51ad2bfa64247db8ab7f7ba22bcc99; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/be250ea55f51ad2bfa64247db8ab7f7ba22bcc99"; sha256 = "1hrj2ggi584mlc8nxpniczsyj4xcgygf3adi7xql5vmmb5h8gvim"; }; "be6492e4410913060da03bbab7fc0ce412e8bb38" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/be6492e4410913060da03bbab7fc0ce412e8bb38; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/be6492e4410913060da03bbab7fc0ce412e8bb38"; sha256 = "0mpw68bffg01n0g5706nllhck685n32fy1fbg4fs6hk199ddz252"; }; "be6c1ac56f7b742b9f733b29f46549c5b46f7644" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/be6c1ac56f7b742b9f733b29f46549c5b46f7644; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/be6c1ac56f7b742b9f733b29f46549c5b46f7644"; sha256 = "1m4kszd8nqb7xwgmbf14d5ndfpjf1li2w7wsg00km3d5plsl1458"; }; "be8aba4af0c0804bb17d6ce660ccc3973fb6c35d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/be8aba4af0c0804bb17d6ce660ccc3973fb6c35d; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/be8aba4af0c0804bb17d6ce660ccc3973fb6c35d"; sha256 = "0y77nmzw5hg874iw4y69qmyiz5xg0kr685gprs4nhx09ia4j0c91"; }; "bee8e68740f8d36a56d9f09e880ff29b5adf0496" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bee8e68740f8d36a56d9f09e880ff29b5adf0496; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bee8e68740f8d36a56d9f09e880ff29b5adf0496"; sha256 = "1xkdq0792shkjmgf48j4cy4pf3d710zx91g2xmbjfax892n5k1lc"; }; "bf03069e8d65f6b224763824352cf754ebcbc339" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf03069e8d65f6b224763824352cf754ebcbc339; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf03069e8d65f6b224763824352cf754ebcbc339"; sha256 = "1kv8kfwh0bki0zdfimhkrhib56p2bj02by25dmhqvg39r480rs36"; }; "bf03cada636a04cf211c2e10d586f47b2dda7902" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/bf03cada636a04cf211c2e10d586f47b2dda7902; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/bf03cada636a04cf211c2e10d586f47b2dda7902"; sha256 = "085zw12vjkdg9r3lki1wnzm8981d7mlzvsgihb7v34zh77idy2vd"; }; "bf30590744b68cebf21b6124ffdccdf6964f7163" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf30590744b68cebf21b6124ffdccdf6964f7163; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf30590744b68cebf21b6124ffdccdf6964f7163"; sha256 = "08dd0mg3p60gmzqh0dyfj65icyaa7q44daidqwdbd62h9yxxf9c3"; }; "bf49c9dd965903acaa8c00eba5613c4de5fe0250" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf49c9dd965903acaa8c00eba5613c4de5fe0250; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf49c9dd965903acaa8c00eba5613c4de5fe0250"; sha256 = "08ga8yhh586h0yc0i2n3a28wmwbzlhz57va40rq269dx93gap3mn"; }; "bf4dda70b776a7efb6c3302f7abb3d24e90652d7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/bf4dda70b776a7efb6c3302f7abb3d24e90652d7; + url = "http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/bf4dda70b776a7efb6c3302f7abb3d24e90652d7"; sha256 = "0m11crr85b0315yvb4n4pwvzg24zdwgqzw0c5yf1kvjdzkm1z8w7"; }; "bf920c60bfd2a78e29432783f56c62f419515f85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bf920c60bfd2a78e29432783f56c62f419515f85; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bf920c60bfd2a78e29432783f56c62f419515f85"; sha256 = "1rvkpgzckmwrn4bndlq6zc38kc0wj4y6lv0xv26harw3z467fzbp"; }; "bfed7e9e92de3969ace22aefdf5d85a45b2068c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bfed7e9e92de3969ace22aefdf5d85a45b2068c5; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bfed7e9e92de3969ace22aefdf5d85a45b2068c5"; sha256 = "0srdb9aahfik14g4s2b7j6ff73g139iqx36fnm86nalf09digdnp"; }; "bff70448477367ce462c3ee06f051b1f047549ad" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/bff70448477367ce462c3ee06f051b1f047549ad; + url = "http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/bff70448477367ce462c3ee06f051b1f047549ad"; sha256 = "1z2jva1iph244fay5f84srg2wpji4gyfv6qss3130i0yzwlbkpqd"; }; "c0078092106c7019d3c1a17afb492202a59101b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/c0078092106c7019d3c1a17afb492202a59101b2; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/c0078092106c7019d3c1a17afb492202a59101b2"; sha256 = "0k2i5d1lylbjq7wzi7hzazq5hhyiav9yjpc5y26dz5d2l06nc43i"; }; "c007855aa7a0479a01364a56f831920abf69f840" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c007855aa7a0479a01364a56f831920abf69f840; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c007855aa7a0479a01364a56f831920abf69f840"; sha256 = "1cjd5amlgpgqr7fm98g515qd3hl169mw4lg7i7hv9h4d6jrynxrh"; }; "c02b5a7580fbfb67eb000c6b641d7431e90ce87f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c02b5a7580fbfb67eb000c6b641d7431e90ce87f; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c02b5a7580fbfb67eb000c6b641d7431e90ce87f"; sha256 = "1iri4r9nrv07sd060d1iy31pp584svm3470rxb0a82wdifh592k5"; }; "c0476a6a0442712d3245a0babbf62c40e8e75b95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/c0476a6a0442712d3245a0babbf62c40e8e75b95; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/c0476a6a0442712d3245a0babbf62c40e8e75b95"; sha256 = "134j96dp2yy1n19mbh15cdbwwfi5kfi37bb36vc3jbpbispgbiw7"; }; "c05811bfedda9e7307a79810ed22e36c9b1e3639" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2728442-495b054ed4db444082c281db65b26f74/c05811bfedda9e7307a79810ed22e36c9b1e3639; + url = "http://cdn.unrealengine.com/dependencies/2728442-495b054ed4db444082c281db65b26f74/c05811bfedda9e7307a79810ed22e36c9b1e3639"; sha256 = "11jrzgkzjhnvzl26rq4cg64rn1w354fivkp0kmpn4l323ih89hlw"; }; "c059220dd6a95113a01bfba79f5ed3d5e1766535" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c059220dd6a95113a01bfba79f5ed3d5e1766535; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c059220dd6a95113a01bfba79f5ed3d5e1766535"; sha256 = "1hlhsmrqkmivz7cgsj1r7g041fkgjqvff5dcafm6zfh9invjminv"; }; "c0890e191c0abbf571bc8e71dd0996ecee557a66" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c0890e191c0abbf571bc8e71dd0996ecee557a66; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c0890e191c0abbf571bc8e71dd0996ecee557a66"; sha256 = "0gnmkajymhhvkygd35qbqbdfza3msjpsziwapr4l7fkzwn9nw4b6"; }; "c0c041729c29323273ff25722a4fde1aa90a2b9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2388509-1346da53605048a5b86087c481124153/c0c041729c29323273ff25722a4fde1aa90a2b9a; + url = "http://cdn.unrealengine.com/dependencies/2388509-1346da53605048a5b86087c481124153/c0c041729c29323273ff25722a4fde1aa90a2b9a"; sha256 = "1kg32w0qqnsz45fpwj9vqcnnvn03f6m7ngswi5gni3asg3xxnlfa"; }; "c0c56d20bbce88d3e626d132185502535d37ae8c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c0c56d20bbce88d3e626d132185502535d37ae8c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c0c56d20bbce88d3e626d132185502535d37ae8c"; sha256 = "1zijd325z8zvmz78qi34vn7bwc6glw0bv07av8kyxxl3q08yyi5y"; }; "c1023e403c67693d0cda4a7067f08cc4868b331f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c1023e403c67693d0cda4a7067f08cc4868b331f; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c1023e403c67693d0cda4a7067f08cc4868b331f"; sha256 = "1z1ridxkw4v62r7wpy8p3a2pvbbk5s6fvnb3pj6risyd2nalnx84"; }; "c1348ebfc2f62edbbaf065a9987835d16f3faebe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c1348ebfc2f62edbbaf065a9987835d16f3faebe; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c1348ebfc2f62edbbaf065a9987835d16f3faebe"; sha256 = "1rbz1jawc4rga0r0153w48n10b5gvamv0356iw79pjag6naylb2z"; }; "c1621ab3068dbffadc595d03ef2ca486f7a5d484" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c1621ab3068dbffadc595d03ef2ca486f7a5d484; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c1621ab3068dbffadc595d03ef2ca486f7a5d484"; sha256 = "005d8nk35149kqw2jy0bmfkgs036ymj6khdpgyhybafyqns3kxl5"; }; "c16c7518b7bf0b8838fb4ec5d024020f7d7dcd2c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c16c7518b7bf0b8838fb4ec5d024020f7d7dcd2c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c16c7518b7bf0b8838fb4ec5d024020f7d7dcd2c"; sha256 = "0v3frxr6pb15y1m6lvkblhhy08k67vbcnjxb0r6pldqqgr10w74d"; }; "c18d93c3fb088e46dc560285a889e191b2350e3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c18d93c3fb088e46dc560285a889e191b2350e3b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c18d93c3fb088e46dc560285a889e191b2350e3b"; sha256 = "1gpivr38hx21v5vclbgrbzjdg0ly1ksrdx03vnkjzm2f2564qany"; }; "c1aea1c747a9068d40e613d94eaf43b511d8008c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c1aea1c747a9068d40e613d94eaf43b511d8008c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c1aea1c747a9068d40e613d94eaf43b511d8008c"; sha256 = "0b7vs9yh0hl73zn5q7lxgwj898rh3qmphsmrab9b2byfbj4mk76k"; }; "c1d09face93090ba4fb6700351d2c5202a35a2f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c1d09face93090ba4fb6700351d2c5202a35a2f7; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c1d09face93090ba4fb6700351d2c5202a35a2f7"; sha256 = "117cl93bgd91lpp7xd6sr87xcr1j8bsam637khgdcw8mj5k3npqz"; }; "c25bec168e93ab9183b4187a3172187d41e8b094" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c25bec168e93ab9183b4187a3172187d41e8b094; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c25bec168e93ab9183b4187a3172187d41e8b094"; sha256 = "0pgzkljpjj8r7l7b6bqqrvqhqcv67r4drbdlq0fqw1cgpspvk9zi"; }; "c260984388b36733a83e5c5a2d1bddf9202de51e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c260984388b36733a83e5c5a2d1bddf9202de51e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c260984388b36733a83e5c5a2d1bddf9202de51e"; sha256 = "1qd8vzscnfygqbmwxf61df75j565jr052igscsrq2jy79ls6gndz"; }; "c28e42653d329ca15b9b65ef130aa7e18df44da4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/c28e42653d329ca15b9b65ef130aa7e18df44da4; + url = "http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/c28e42653d329ca15b9b65ef130aa7e18df44da4"; sha256 = "0bsbd40nwyx5592fs2clf6bf7am52fswa68lkpqdimq5srabwcyf"; }; "c299da387c827b828bdc3e81fb617c8992d1ffbe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c299da387c827b828bdc3e81fb617c8992d1ffbe; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c299da387c827b828bdc3e81fb617c8992d1ffbe"; sha256 = "1lfv6s7cjfibbyn89pwc15xfmz0ismcsd8hjna9a9isbi9bfqf8r"; }; "c2b5d2cc4aa67357f3ee15def8c1d137016f723e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/c2b5d2cc4aa67357f3ee15def8c1d137016f723e; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/c2b5d2cc4aa67357f3ee15def8c1d137016f723e"; sha256 = "0y15qbgnfx0av2qlnff4xj0n1njnq00agxlr7sr0xwqabkkzlm9y"; }; "c2c0e9b8e4352e01ad72f4a6d2ce4e6c0c26878e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c2c0e9b8e4352e01ad72f4a6d2ce4e6c0c26878e; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c2c0e9b8e4352e01ad72f4a6d2ce4e6c0c26878e"; sha256 = "1b50br0m1ff7haidcqhnn3ggxa0jf57bsnzq1h90320ciszkk3rj"; }; "c2d1aa057a438fe3a8996316005b4f584d087df7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/c2d1aa057a438fe3a8996316005b4f584d087df7; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/c2d1aa057a438fe3a8996316005b4f584d087df7"; sha256 = "1fdgibvi2aiy9xd3xjvv6fm5qvz2bsmax9v648sb8gdlvp1a2s1i"; }; "c3390a1d1d84fd03f5aa0a105422b669c9f6ab91" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/c3390a1d1d84fd03f5aa0a105422b669c9f6ab91; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/c3390a1d1d84fd03f5aa0a105422b669c9f6ab91"; sha256 = "16gmb4j6ky53h7lzyccd59aidqxyvjiq9bh43m326jwvbnmcr7lg"; }; "c3a4ce7861427e417e289e118620ba02ecec6995" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c3a4ce7861427e417e289e118620ba02ecec6995; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c3a4ce7861427e417e289e118620ba02ecec6995"; sha256 = "03qqa0w3p8isci9243jsivlrzzw0scf5w6371jfs4h109fw0qg6b"; }; "c40ca2cfe00fdc980844d0a02dfb2571b7fe48c3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c40ca2cfe00fdc980844d0a02dfb2571b7fe48c3; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c40ca2cfe00fdc980844d0a02dfb2571b7fe48c3"; sha256 = "0cxr3qncsx37g69labw8lz622yn9rjxybagd6wrf1bgvacg9f8kv"; }; "c430a47ee45e5afb9a0831bf2ea38b466b497549" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c430a47ee45e5afb9a0831bf2ea38b466b497549; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c430a47ee45e5afb9a0831bf2ea38b466b497549"; sha256 = "1bz6j9s06jn1nwyiczama8axg707vd5ny6p44i905z7z2r46s5nj"; }; "c431002fc0e408cf00a8650910c2f4bb3b85df53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c431002fc0e408cf00a8650910c2f4bb3b85df53; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c431002fc0e408cf00a8650910c2f4bb3b85df53"; sha256 = "01dc7m14cdf4dmc389d3wng39chqj7wiisxzzm83knbjdihrhfrp"; }; "c461017451f8ce7d5833a200e5d6fa969138fc0f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/c461017451f8ce7d5833a200e5d6fa969138fc0f; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/c461017451f8ce7d5833a200e5d6fa969138fc0f"; sha256 = "1bm0alxlmrkzrrv23s2qab55wxccl3vkhq2srzcw2fnvi407gzif"; }; "c467b9d4b67580014c04e62e822a99d7cd7a6dbb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c467b9d4b67580014c04e62e822a99d7cd7a6dbb; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c467b9d4b67580014c04e62e822a99d7cd7a6dbb"; sha256 = "0jw6ppirc57wqn41x1c4c9x6i8xrxy8yjwk999rz0swf4dwambx0"; }; "c4ac8e5f2224886f32727c69401d26eaf54e6d17" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4ac8e5f2224886f32727c69401d26eaf54e6d17; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4ac8e5f2224886f32727c69401d26eaf54e6d17"; sha256 = "05lsv3lpg7sa57q6vm98iskxmmza487nppahzqnc4g7h16k7x0v9"; }; "c4d70abc45c0067c48d200a7195e87cb07990867" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4d70abc45c0067c48d200a7195e87cb07990867; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4d70abc45c0067c48d200a7195e87cb07990867"; sha256 = "12lbg924x6g1zq6bq0ah54k1vgj5bplayizb4ihrn28sgfmc9y29"; }; "c54921d21c20e7c27fee9dadcf212291b32f32de" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c54921d21c20e7c27fee9dadcf212291b32f32de; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c54921d21c20e7c27fee9dadcf212291b32f32de"; sha256 = "0yb7amg4pnaz7fjqwmjsydz6wig9rqig5wv74zpmc9yalxyfym5k"; }; "c57259f627108af7691176d6a5ab0a8bdb504fe8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c57259f627108af7691176d6a5ab0a8bdb504fe8; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c57259f627108af7691176d6a5ab0a8bdb504fe8"; sha256 = "0426ssgyxinyvqq69hcah4ddl249ic412bdvlgwfx10m636h7nk4"; }; "c58fa62bd83bf317b52d835b43fe31cb0a5fed9c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c58fa62bd83bf317b52d835b43fe31cb0a5fed9c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c58fa62bd83bf317b52d835b43fe31cb0a5fed9c"; sha256 = "0s66g3ggy0zz70p6vs4qwkwgv3jnk2b2y3a7rh58385gg3dk4ccm"; }; "c596e1a5af08148c69666476cb7a935d5b860e04" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c596e1a5af08148c69666476cb7a935d5b860e04; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c596e1a5af08148c69666476cb7a935d5b860e04"; sha256 = "0sglq3myrvkw38gah4pgpslrsfrx7j1h9dxbx8dbykzjzprf3i0j"; }; "c620a0e05618810252d4b0f8e82fe97a677dde26" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c620a0e05618810252d4b0f8e82fe97a677dde26; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c620a0e05618810252d4b0f8e82fe97a677dde26"; sha256 = "1i95wlgkq1d3m7k4qdfm5h6vs2m0f45d6hpcg3dj8jxy5zvqsgmq"; }; "c63b8b65198dbac3e3764c69e57b85f011332ea1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c63b8b65198dbac3e3764c69e57b85f011332ea1; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c63b8b65198dbac3e3764c69e57b85f011332ea1"; sha256 = "0ybhwi57ic2c0xshlj2jw9y0rmmnn9yy22dff4c51mj08g9xqjr0"; }; "c64839804e94445b7c1ac409d5d0f8f1ea36e54c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c64839804e94445b7c1ac409d5d0f8f1ea36e54c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c64839804e94445b7c1ac409d5d0f8f1ea36e54c"; sha256 = "00s8l1sr0cfkchqyhfvp0ix3fpf10a2smj93xibimkh9lfaz6i35"; }; "c650d7a313cf559c35793ae4885bfb7ab7e24cd2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/c650d7a313cf559c35793ae4885bfb7ab7e24cd2; + url = "http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/c650d7a313cf559c35793ae4885bfb7ab7e24cd2"; sha256 = "1j9rkf1zys5sygijb650s5si25s95hfh6v5z2ahii1gylkrn7lh5"; }; "c653b9ebfd67dfad854b519e55534735d82f73f2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c653b9ebfd67dfad854b519e55534735d82f73f2; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c653b9ebfd67dfad854b519e55534735d82f73f2"; sha256 = "0s2fq88ay1080qqf3qlvh7g0sddbbs8a0jvb6992wbbb0y23839a"; }; "c705af8ab47f089acd3efa03df30ad116079209c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c705af8ab47f089acd3efa03df30ad116079209c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c705af8ab47f089acd3efa03df30ad116079209c"; sha256 = "0dmpf4agrq74ga9sgp8qlb4wsps3fg33jiv0x8mj82d9h064y4li"; }; "c77e5ef4d0349554ba75af77135182db3577571a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/c77e5ef4d0349554ba75af77135182db3577571a; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/c77e5ef4d0349554ba75af77135182db3577571a"; sha256 = "03gir460iljc089y523fqlxvbp7sq1n9v6ldi6ij52fpm6wvzid1"; }; "c78d32aaf4ea80b2746ac7ad1692b021b1b548b7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c78d32aaf4ea80b2746ac7ad1692b021b1b548b7; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c78d32aaf4ea80b2746ac7ad1692b021b1b548b7"; sha256 = "1gwakfigb6bxjjr2scx753kjjvxy32npc5s5l3jqiidw27mbwrjh"; }; "c7945d9532844fa35363f33da23f208a629dbe28" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7945d9532844fa35363f33da23f208a629dbe28; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7945d9532844fa35363f33da23f208a629dbe28"; sha256 = "1g43sj9v065rvg73jynaycnp3jlw9cngbzr0lv4jyiip8ycd9m7z"; }; "c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b"; sha256 = "1nh8drrb4sk4sid00m2l41pwz01n752jxn7xcxdjfgf1qri7gmfp"; }; "c7d451a7ac00e4726f44c4fb551c45dfd4614302" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c7d451a7ac00e4726f44c4fb551c45dfd4614302; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c7d451a7ac00e4726f44c4fb551c45dfd4614302"; sha256 = "0fmsf826chnq5lsfqgp8ndys4aa6v9gpsq3jcwwak3kl8vni21x8"; }; "c7ea7e43fc1d7ff54a1a54b74c3962098d7851bb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7ea7e43fc1d7ff54a1a54b74c3962098d7851bb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7ea7e43fc1d7ff54a1a54b74c3962098d7851bb"; sha256 = "0gxk8c51f6hsx98sx6f4laqmcc3ln3sslr8848blqwvnhwy3fqfn"; }; "c7fb09c7cbdf7c014549eb2b9c1345a0f2ac3770" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/c7fb09c7cbdf7c014549eb2b9c1345a0f2ac3770; + url = "http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/c7fb09c7cbdf7c014549eb2b9c1345a0f2ac3770"; sha256 = "1c51kddffr04xf65sykxy8lmx25066gcrz881m7iwx20l5rnlc1m"; }; "c840da0835818272e18eacdd15f50e802453c69c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c840da0835818272e18eacdd15f50e802453c69c; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c840da0835818272e18eacdd15f50e802453c69c"; sha256 = "137193jraim288jy64k6sinwg4pqhc6cchspxjzzn8h7dzfbmyjr"; }; "c874ee18eb2aefe1e6d4345996da6c6ce2087d43" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/c874ee18eb2aefe1e6d4345996da6c6ce2087d43; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/c874ee18eb2aefe1e6d4345996da6c6ce2087d43"; sha256 = "09i5kmida7s8zw8az2b1wxnsradjfv47hiy20fkrdqhpz0ra8lh7"; }; "c884f0dbf617ea1c10f5b347fd4f19d3d87befb2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c884f0dbf617ea1c10f5b347fd4f19d3d87befb2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c884f0dbf617ea1c10f5b347fd4f19d3d87befb2"; sha256 = "1nhrhkzlvfdb4lp0v2syiwpd13sjx0z390wh404197p31xjwjvyq"; }; "c88fb38c74260fca80491abeaa7a26fd116fba25" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c88fb38c74260fca80491abeaa7a26fd116fba25; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c88fb38c74260fca80491abeaa7a26fd116fba25"; sha256 = "0bk6g0fns1g08zghm5nf2wipbcxzwprcg106d9rifgsq4w1bxk7i"; }; "c8fcf9a784756d66ad119b3e642423161380add6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/c8fcf9a784756d66ad119b3e642423161380add6; + url = "http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/c8fcf9a784756d66ad119b3e642423161380add6"; sha256 = "1ixadgvvl3w9wirikl6fsj3g7lkbji4pa67pplys3fxd3rwflzqg"; }; "c939abca16161626114a6afa440cfb71ae87dc6d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c939abca16161626114a6afa440cfb71ae87dc6d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c939abca16161626114a6afa440cfb71ae87dc6d"; sha256 = "1mqhplp4zkxr2qzcl4xdqgh8ng5yhgrmjqsm5g04zlyn1xb46ghi"; }; "c93c98cb950c9d8f504bea894ad865f29b9991ec" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/c93c98cb950c9d8f504bea894ad865f29b9991ec; + url = "http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/c93c98cb950c9d8f504bea894ad865f29b9991ec"; sha256 = "006lrid8py6qhn21gi6n80nfd4y7v29xpjz8c80q8a4p1klayvkr"; }; "c93f0a56e40373b70b8f6cfcd57796df6e3e5d64" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c93f0a56e40373b70b8f6cfcd57796df6e3e5d64; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c93f0a56e40373b70b8f6cfcd57796df6e3e5d64"; sha256 = "0s7dgwc50q78b20l33ra8wrlxkqf0666ldxqb4isx6bk973yf7kv"; }; "c9440b326c43f4ba6af0b71b1ca029ae223ecabb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c9440b326c43f4ba6af0b71b1ca029ae223ecabb; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c9440b326c43f4ba6af0b71b1ca029ae223ecabb"; sha256 = "1wzfk57gnly1qafvjcy7jxa5nbq3fm89fjna9h7xfaf382kwviwm"; }; "c946526ac2560a1cf84cb7a63c24bc9994fed050" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c946526ac2560a1cf84cb7a63c24bc9994fed050; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c946526ac2560a1cf84cb7a63c24bc9994fed050"; sha256 = "117i8fkym78xq4ssk9hvhfw51myx69xnxm9zxd8mvsa7yrfd3420"; }; "c95cdaed781fb020898a671e373b60aa382404ff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c95cdaed781fb020898a671e373b60aa382404ff; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c95cdaed781fb020898a671e373b60aa382404ff"; sha256 = "19626mhx070k3myam8g2s9dvqqx82pv7jbrdnnkbiz3kc0i65xzm"; }; "c96e9cd94a86b222bed132142b65c1d90314445d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2441582-104388acf6d34237af496ee648a9c7db/c96e9cd94a86b222bed132142b65c1d90314445d; + url = "http://cdn.unrealengine.com/dependencies/2441582-104388acf6d34237af496ee648a9c7db/c96e9cd94a86b222bed132142b65c1d90314445d"; sha256 = "1vp5lzll11hhn6qwn21qnidhlr6md2mm4cnafpbgsj7ci5jy9i8v"; }; "c9b2fa52f0b68b4de48806e71af562ddd9ab8363" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2501204-f81f6b4f13824670853a18474a99a9e4/c9b2fa52f0b68b4de48806e71af562ddd9ab8363; + url = "http://cdn.unrealengine.com/dependencies/2501204-f81f6b4f13824670853a18474a99a9e4/c9b2fa52f0b68b4de48806e71af562ddd9ab8363"; sha256 = "1lhr1k6qj5v1j3h4g6q4cwmswpk96l3v26gbq5hj2alab6r5chvs"; }; "c9f7bd390be6e2f50469fcf024ace928b624a38d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c9f7bd390be6e2f50469fcf024ace928b624a38d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c9f7bd390be6e2f50469fcf024ace928b624a38d"; sha256 = "1rsbwbgiqgvck30gd86p2sh53gykb68sfgyfpflqng9psffzxfja"; }; "ca146ad3bcc63037df80affd27568080de042fd2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ca146ad3bcc63037df80affd27568080de042fd2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ca146ad3bcc63037df80affd27568080de042fd2"; sha256 = "0dd3piwj2g5zfiidysy219xvcdypdmdqfccwv0ib4ddb6yxa0csd"; }; "ca3317bb9d7ae47177c0d9362f17d53c865d8b92" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ca3317bb9d7ae47177c0d9362f17d53c865d8b92; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ca3317bb9d7ae47177c0d9362f17d53c865d8b92"; sha256 = "17vb8vrkc7y3rspnbd6nw34v58ifi8dr206kcf2ah8zpfbpqqkcd"; }; "ca72923ffc518f8f79ad2bb67a376e8c4e51c3ff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ca72923ffc518f8f79ad2bb67a376e8c4e51c3ff; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ca72923ffc518f8f79ad2bb67a376e8c4e51c3ff"; sha256 = "0zk6xryzk7d8g0f148n4n2zk92jspi71v530bp50nqpjzclv4j7f"; }; "ca83db39ca850bdf08a4e3bda07b207534365c24" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ca83db39ca850bdf08a4e3bda07b207534365c24; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ca83db39ca850bdf08a4e3bda07b207534365c24"; sha256 = "10a9vl982ni45wj3mnky56n2yljvha2xic4mf2n3vrmrr1aqxrah"; }; "caafa6d602fb6dfd386f6eb601ff8ed2b2e74234" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/caafa6d602fb6dfd386f6eb601ff8ed2b2e74234; + url = "http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/caafa6d602fb6dfd386f6eb601ff8ed2b2e74234"; sha256 = "1r4vjwkkckaj25ajhw3csn351lppwgb46dc6im023dy8lj5fvc5d"; }; "cad827e1f1025fed382fad69988e6878edf449bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cad827e1f1025fed382fad69988e6878edf449bc; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cad827e1f1025fed382fad69988e6878edf449bc"; sha256 = "0fz5m8ab4xa5zm8n9w8a4yrzhzjfq7wald118r8s50r4fwsnm517"; }; "cb540e992bfeed51b40d2faa7209ebc16384c2cc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cb540e992bfeed51b40d2faa7209ebc16384c2cc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cb540e992bfeed51b40d2faa7209ebc16384c2cc"; sha256 = "145pgs42bmwr56r4fkjf40l24j9imhcf1f004k2bbmjn8518h4nb"; }; "cb5e9b0f8eb95171fa01852fb15eabf2845a79f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/cb5e9b0f8eb95171fa01852fb15eabf2845a79f5; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/cb5e9b0f8eb95171fa01852fb15eabf2845a79f5"; sha256 = "0yy29b05a07h2zk1zy298i1ydlh3vr9mmjawqb34fgff18m1xy3w"; }; "cb73a430e097bac42d93ec902203b7888ed0b681" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cb73a430e097bac42d93ec902203b7888ed0b681; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cb73a430e097bac42d93ec902203b7888ed0b681"; sha256 = "1nysj9pxf2kwsh7v8iqz305slwy2s6ysmg9ra76ysmns7rh9rvap"; }; "cb81a778a0190199a4c52ec5e9e3f749c532fdf8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cb81a778a0190199a4c52ec5e9e3f749c532fdf8; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cb81a778a0190199a4c52ec5e9e3f749c532fdf8"; sha256 = "1hl7yhy7ysg35vrq5y4ngq4aiqfkb5h74zd6x7qay1k588k3af7g"; }; "cbafcbe19329c889151577a995439d8c09b69f61" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cbafcbe19329c889151577a995439d8c09b69f61; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cbafcbe19329c889151577a995439d8c09b69f61"; sha256 = "194zad942iv7rr5fngyk0kpckafip987mhgl1bk2fflvxvs5nckg"; }; "cbe9427bf8fe34234353780bf7d7188dbd5673af" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/cbe9427bf8fe34234353780bf7d7188dbd5673af; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/cbe9427bf8fe34234353780bf7d7188dbd5673af"; sha256 = "18ri7fwgvyp6p3qm4qn32dyiiwl2vw3f4j5g0dgv4k8p29cpx7d3"; }; "cc2764b781992363c5941eb2399962b3dc251c9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cc2764b781992363c5941eb2399962b3dc251c9a; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cc2764b781992363c5941eb2399962b3dc251c9a"; sha256 = "0sxvjqbyz3bvppf090vpwggb0f758mxh16m0f5lf3z6xv917vbqw"; }; "cc6c17f5d19462048695c62e88e553ff08996aea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cc6c17f5d19462048695c62e88e553ff08996aea; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cc6c17f5d19462048695c62e88e553ff08996aea"; sha256 = "0mi2m0f6j89dj3qbm43clcih8d06z943iv585ni8rp8dpvm733xn"; }; "ccb1bc3ca1edbf4177b3c0d1784bfcb61f87daae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ccb1bc3ca1edbf4177b3c0d1784bfcb61f87daae; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ccb1bc3ca1edbf4177b3c0d1784bfcb61f87daae"; sha256 = "0lxc3imyakyqxphhyw7xxjlinyvvhpq050xwnydks6bja2nqjrvx"; }; "ccbf9e16dbb06aba05b68b87bd827f67b8eac84b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ccbf9e16dbb06aba05b68b87bd827f67b8eac84b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ccbf9e16dbb06aba05b68b87bd827f67b8eac84b"; sha256 = "1v65rdr6f3a5l8k9pa6aqnarv279ik4g82m3arnndlhs8d1fwry4"; }; "cd0d52d3a393b848c4524f8d20e9c3d772779d50" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/cd0d52d3a393b848c4524f8d20e9c3d772779d50; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/cd0d52d3a393b848c4524f8d20e9c3d772779d50"; sha256 = "1b1vccn5jhy79k1h1ilj572j0nkrv6imb3m3fk9zy897fp8phm86"; }; "cd136c8c017886023a62be7a07da35d0a4af997e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd136c8c017886023a62be7a07da35d0a4af997e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd136c8c017886023a62be7a07da35d0a4af997e"; sha256 = "0aw9ipcqp0iq706nw26rriqn1jvsczypwj46yk3sjxmcp7bzf0rg"; }; "cd20dd95dc2f4e182bbf98e7f0d6a7cd87f10df6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd20dd95dc2f4e182bbf98e7f0d6a7cd87f10df6; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd20dd95dc2f4e182bbf98e7f0d6a7cd87f10df6"; sha256 = "06ba9m6rcvia5rr1pghi1x4z7xjvw1rj9p9hpd7yvzbn02vx58y1"; }; "cd28a4a14b5471b45eae79e893b8acbc4f7e1f94" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cd28a4a14b5471b45eae79e893b8acbc4f7e1f94; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cd28a4a14b5471b45eae79e893b8acbc4f7e1f94"; sha256 = "110936dirzdy78nxcplpnz8z2hnqpcwdbgb6yfsg9w7a9x0290pd"; }; "cd31abaa21b8f9ec03052817bf36f6c16178f5e5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cd31abaa21b8f9ec03052817bf36f6c16178f5e5; + url = "http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cd31abaa21b8f9ec03052817bf36f6c16178f5e5"; sha256 = "0imni7w08al0d35nis2xz501zl5qz1dmc4myhhabvm0l6cf3x4ig"; }; "cd5ab248342e1a8cf9bd3f635151bfdd3d41ad3b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd5ab248342e1a8cf9bd3f635151bfdd3d41ad3b; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd5ab248342e1a8cf9bd3f635151bfdd3d41ad3b"; sha256 = "173d24jramz5i4h5pvm4v22jiqnw87b4g1bg0y2v79n313k4p87g"; }; "ce44b880be5cb6a25056be3c177c866b85aee1d5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ce44b880be5cb6a25056be3c177c866b85aee1d5; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ce44b880be5cb6a25056be3c177c866b85aee1d5"; sha256 = "0gcvwwwzyl8s91fxvzaqnxvkz9kpw08643gra8acmbvplx2r92sj"; }; "ce8de3d894102a4bb85d1eaaa271f605239a2fd1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ce8de3d894102a4bb85d1eaaa271f605239a2fd1; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ce8de3d894102a4bb85d1eaaa271f605239a2fd1"; sha256 = "1m385wpp8zv140c51yq0bybpja4j7rgy837myqb7xsi3cmwsmrdz"; }; "ced0e06e0c817a6519c5a995d3ba2743df02ecdf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced0e06e0c817a6519c5a995d3ba2743df02ecdf; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced0e06e0c817a6519c5a995d3ba2743df02ecdf"; sha256 = "0hfxs8i2cjifry6sbyqhw5f54ngbl3dnhzmikvhci0mz1np1blah"; }; "ced6c6d11883cd80b95d5f522d9526e6467945e5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced6c6d11883cd80b95d5f522d9526e6467945e5; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced6c6d11883cd80b95d5f522d9526e6467945e5"; sha256 = "0ii9010n609i4i4zip2mgjqnhpfb7imfxviqi8kbax35mkfv38ci"; }; "ceefcb84598a9a4c5ce8d34e749d52d7511a8013" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/ceefcb84598a9a4c5ce8d34e749d52d7511a8013; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/ceefcb84598a9a4c5ce8d34e749d52d7511a8013"; sha256 = "0rynh9y2scir13ffmgwqcdvcm21p2n0q4i3di1aval7r690b0wz1"; }; "cefd87d67f6688e869ab62068aa16c5f02113c8c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cefd87d67f6688e869ab62068aa16c5f02113c8c; + url = "http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cefd87d67f6688e869ab62068aa16c5f02113c8c"; sha256 = "0nli07f78bpmjk6bxaa2x32m1l7ds6d4rh8iycciywm8fwbw0ak6"; }; "cf4a635ba3a4c070a83394e45c5bae8ef8651afe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/cf4a635ba3a4c070a83394e45c5bae8ef8651afe; + url = "http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/cf4a635ba3a4c070a83394e45c5bae8ef8651afe"; sha256 = "0pb38cbss34md3pn9j1rzhwanq1dwqw2jpaygsb9fzxnrgypismr"; }; "cf5e1ce959a11e3674cc1a7c352dc878022c2eff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/cf5e1ce959a11e3674cc1a7c352dc878022c2eff; + url = "http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/cf5e1ce959a11e3674cc1a7c352dc878022c2eff"; sha256 = "0lyp1iavwk61iv47nlaw7s3bdfr469in0d9rngp7mr9w1b367szx"; }; "cf784788aae211d789405fe0a7308e059e15627c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cf784788aae211d789405fe0a7308e059e15627c; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cf784788aae211d789405fe0a7308e059e15627c"; sha256 = "02cl56q4232l8y34ajl04s0zxq8mdbvbx7bad1q4f2fcx6g395x7"; }; "cfaa6e2212f937f340e867175482030d495675ed" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/cfaa6e2212f937f340e867175482030d495675ed; + url = "http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/cfaa6e2212f937f340e867175482030d495675ed"; sha256 = "0wdpkcnlnkj6bwv1q4g3i3yn2j7rv98h6l58y323h4bn2hn8f90y"; }; "cfc8c6e323848f57580a531e48fc4b81cdd17efd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/cfc8c6e323848f57580a531e48fc4b81cdd17efd; + url = "http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/cfc8c6e323848f57580a531e48fc4b81cdd17efd"; sha256 = "1bjsd26ckak6212lvb706653raz8sn8b380n5dp653frbsagnmgw"; }; "cff332b0fe6e7874406db49746b5a2be18f822f5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/cff332b0fe6e7874406db49746b5a2be18f822f5; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/cff332b0fe6e7874406db49746b5a2be18f822f5"; sha256 = "15w6kfv1pxzswr71knkkyw8zc7i1ibk9rapgp7s9ybkfkdfwrfjn"; }; "cffe52e7d9b8a547c321247c96a680a061a7c077" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/cffe52e7d9b8a547c321247c96a680a061a7c077; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/cffe52e7d9b8a547c321247c96a680a061a7c077"; sha256 = "1ha9z55y46lm88zai4dh9404gab7kfkcl95fm0ch22mv3ps94a86"; }; "d00340b56c80a33987bae91b824e43fa883353b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/d00340b56c80a33987bae91b824e43fa883353b9; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/d00340b56c80a33987bae91b824e43fa883353b9"; sha256 = "1f9nz3vjw21gvg9s4ycmjcjp3kb79q0inirjnbp0wbxmmd0w102i"; }; "d01535f7276e94b02b13cc27f3966f8867e79101" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/d01535f7276e94b02b13cc27f3966f8867e79101; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/d01535f7276e94b02b13cc27f3966f8867e79101"; sha256 = "05mzb8x5rhs4z9cdfsgv43ggigvpnhkq6jfd5apvsqqyzsrxpn48"; }; "d04d874a8a5abeb10db060dd59e268c16687663b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d04d874a8a5abeb10db060dd59e268c16687663b; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d04d874a8a5abeb10db060dd59e268c16687663b"; sha256 = "1qaspy0c182xnbpplw4bmnahd52l47g3gmws77gic0ls9dlm98b2"; }; "d0566c823351a86a79411b3b8d001317aa356284" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d0566c823351a86a79411b3b8d001317aa356284; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d0566c823351a86a79411b3b8d001317aa356284"; sha256 = "1i2fxmzs90wjsaxrc26jjmy045gq08p8a3k7z8p9lxkk9xnvvq49"; }; "d0916b22915dc03f3e2bae8097e2ad696e7c8f4e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620197-1c557d2f91dd4277b16fd1ed8715aab3/d0916b22915dc03f3e2bae8097e2ad696e7c8f4e; + url = "http://cdn.unrealengine.com/dependencies/2620197-1c557d2f91dd4277b16fd1ed8715aab3/d0916b22915dc03f3e2bae8097e2ad696e7c8f4e"; sha256 = "06fl6qfyax8nkccimh3r771l6a36q9rkihdqhn13ax0klab27cmv"; }; "d0ac4798d087f4f67f533a8d8cc04a7685a380aa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/d0ac4798d087f4f67f533a8d8cc04a7685a380aa; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/d0ac4798d087f4f67f533a8d8cc04a7685a380aa"; sha256 = "1fbzjkmizabaxrjipsfx5y4qlsd0vddb0b20cwxx8q74q2m2ai63"; }; "d110f2213c54503001102b5f9a81fc0743ba32c0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d110f2213c54503001102b5f9a81fc0743ba32c0; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d110f2213c54503001102b5f9a81fc0743ba32c0"; sha256 = "12l3jzkrlqfkxrq9nk7ksyzy4ffawci9hlbfnrcwrckiz107360z"; }; "d111d246a5dff2d0eed94cb2592bfe277ad9e0ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d111d246a5dff2d0eed94cb2592bfe277ad9e0ea; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d111d246a5dff2d0eed94cb2592bfe277ad9e0ea"; sha256 = "0qjagdpy4wx39jg31ib87dh1gfyyhd06aa1g044jnc9zjdx47n7a"; }; "d1450a3f59e35f9d62efa518fa3ecc4e3ce0b0ef" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1450a3f59e35f9d62efa518fa3ecc4e3ce0b0ef; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1450a3f59e35f9d62efa518fa3ecc4e3ce0b0ef"; sha256 = "0i7hjlykmzasgyxpw5sx7nrcpi6nmqj3ckcr1ayaym7j2d2dljpw"; }; "d165f29f588eae8d8a55d377f73b67973713c670" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/d165f29f588eae8d8a55d377f73b67973713c670; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/d165f29f588eae8d8a55d377f73b67973713c670"; sha256 = "0gqsm4h2bzvp7pm77z3alrm21pf8vp4m4ihlc9qqwv2jm98gmfi6"; }; "d1a31fc8df90aed8358e255ead086de9df9b8eea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622268-4534504e79af46a28b290d0661d1cc42/d1a31fc8df90aed8358e255ead086de9df9b8eea; + url = "http://cdn.unrealengine.com/dependencies/2622268-4534504e79af46a28b290d0661d1cc42/d1a31fc8df90aed8358e255ead086de9df9b8eea"; sha256 = "0gfbvm7l4skz5snpbk39hr9ccmja5fxkvnrr5278l9ways2d2ilg"; }; "d1cc40fc311b1fe882b059047a6c7f53925c9827" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1cc40fc311b1fe882b059047a6c7f53925c9827; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1cc40fc311b1fe882b059047a6c7f53925c9827"; sha256 = "0lxfzdv2gwjscqmxsdhdli5sg1mr08djq7ik8a26h96mvxwqna4j"; }; "d1e8035d7cb1c18606f75bf22a42e813f926497a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1e8035d7cb1c18606f75bf22a42e813f926497a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1e8035d7cb1c18606f75bf22a42e813f926497a"; sha256 = "0il1fg83apcy0hvr78gfginpw3y522vqky8523wkbvrbipzqps1g"; }; "d25faf54b177d399192ede835440a8eb4948ab59" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d25faf54b177d399192ede835440a8eb4948ab59; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d25faf54b177d399192ede835440a8eb4948ab59"; sha256 = "1fwd7slxj50zh75lcj8i17mijsah1gqnid4mvhvyh33fmgbmwc10"; }; "d27c0f6b2f82d4e0112056dc4963a251ad84b3c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2482054-e6ea3bde29504ce5b51935e2939eefee/d27c0f6b2f82d4e0112056dc4963a251ad84b3c5; + url = "http://cdn.unrealengine.com/dependencies/2482054-e6ea3bde29504ce5b51935e2939eefee/d27c0f6b2f82d4e0112056dc4963a251ad84b3c5"; sha256 = "1f6h8h1aaffy0hn17mlzynfaammkm8whsbjlbb31czgpiq445h9w"; }; "d27cda6ec1c697039954ff45ad0d4bc809382324" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d27cda6ec1c697039954ff45ad0d4bc809382324; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d27cda6ec1c697039954ff45ad0d4bc809382324"; sha256 = "119vqrcws2yfw532n7gykqbgh4p0jhx8vfyc7vkzfrj0ynrda9m6"; }; "d280f17be242e85379048663a32b3f86bfcd6625" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2629494-07ea5ec481884143ac3af33e276b7492/d280f17be242e85379048663a32b3f86bfcd6625; + url = "http://cdn.unrealengine.com/dependencies/2629494-07ea5ec481884143ac3af33e276b7492/d280f17be242e85379048663a32b3f86bfcd6625"; sha256 = "1lfm6gjsz8y3z90ix3prmvpmx0ps8g4rpzflwd8p1wk8h8kqr4jy"; }; "d28b2e8946d305dc75d30be04ee1c9bfec7bf72a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d28b2e8946d305dc75d30be04ee1c9bfec7bf72a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d28b2e8946d305dc75d30be04ee1c9bfec7bf72a"; sha256 = "15yjgzhi621bj13nz1wrs9m7jy2v0mjgx3w59fyv5vgf94mj6nyq"; }; "d292729e71bdf7b0dfe9367148d16b19fa7a5da7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/d292729e71bdf7b0dfe9367148d16b19fa7a5da7; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/d292729e71bdf7b0dfe9367148d16b19fa7a5da7"; sha256 = "0g7z09z0rxrjf82y9m30qc2a2gbz34gf0hvwxyb3pwzgfbsapxh1"; }; "d2a00e055f1285c1fa4a975781d66bcdc44da301" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2a00e055f1285c1fa4a975781d66bcdc44da301; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2a00e055f1285c1fa4a975781d66bcdc44da301"; sha256 = "0ndhbjbcr9mhjzzvfqxx38a84ch7jpb4vik096i71kji8pbby5my"; }; "d2dbfcbb4a4a5cb2324c962101ba1ae4ebedc502" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d2dbfcbb4a4a5cb2324c962101ba1ae4ebedc502; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d2dbfcbb4a4a5cb2324c962101ba1ae4ebedc502"; sha256 = "0ywl10w2xkcm1nc7zcwzsz1q3j25w37hhyrkkvhg41vqjdnibx2p"; }; "d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0"; sha256 = "16d5d8n5m1srr2iddf0hvigpaybpyiwr3w2850sgn1qskbx5n2gb"; }; "d324c1434b20b5ef66a2937ab08337f78c5646a0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d324c1434b20b5ef66a2937ab08337f78c5646a0; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d324c1434b20b5ef66a2937ab08337f78c5646a0"; sha256 = "0xnx3clcsxg0b5hmq22dz8wplhfvmckiz921arnl1hbwgfgjiwis"; }; "d338b1e7e6160d0f539aa12687e23db81cce61c4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2623227-c4b8ee6a09664c9dac75b68f4d1629d4/d338b1e7e6160d0f539aa12687e23db81cce61c4; + url = "http://cdn.unrealengine.com/dependencies/2623227-c4b8ee6a09664c9dac75b68f4d1629d4/d338b1e7e6160d0f539aa12687e23db81cce61c4"; sha256 = "1zpbqrzxnmiq1wsvxr5gxv2gyf1kip08d8zpgfz6952bxh2ql2d2"; }; "d347f6ee6f9955b5ddb428582f0a5694be416663" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d347f6ee6f9955b5ddb428582f0a5694be416663; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d347f6ee6f9955b5ddb428582f0a5694be416663"; sha256 = "0a67s7r0gnpnb11p4dlz61zqmrk6jm3s2q6n6vz3sak9q046wiz6"; }; "d3603561d5e25d4f17d441b894b6b532ac8ca892" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745458-2d2488161ce24ccca70e5ce98643ad1d/d3603561d5e25d4f17d441b894b6b532ac8ca892; + url = "http://cdn.unrealengine.com/dependencies/2745458-2d2488161ce24ccca70e5ce98643ad1d/d3603561d5e25d4f17d441b894b6b532ac8ca892"; sha256 = "1farglicxvs0xvrlkp8vhj8zad9c2zm7m7bwwgs35nbmk7ii3hvv"; }; "d3c4fc80dcded70862e182185119d810e694728f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d3c4fc80dcded70862e182185119d810e694728f; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d3c4fc80dcded70862e182185119d810e694728f"; sha256 = "1g15fbqvwz35hy6czvwb23wv3hv8z62c2hzgnh6wpyliz8hvwvsm"; }; "d3fa6eb331487a41362af20fc809e610469ecc14" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d3fa6eb331487a41362af20fc809e610469ecc14; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d3fa6eb331487a41362af20fc809e610469ecc14"; sha256 = "1n15651kjzdp4nhxv8rl331gqa9drj2h2lz590ldcqngc27gdm7r"; }; "d40c0edc4a86159f31ffdeb1c868655892857c27" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/d40c0edc4a86159f31ffdeb1c868655892857c27; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/d40c0edc4a86159f31ffdeb1c868655892857c27"; sha256 = "08k3m19bgb2l0c7r1680gg3rhprinr9gr1qnmqw9vkpaclkbmhya"; }; "d43babee559c0a43f3cdfe93ac68d127740c7c60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d43babee559c0a43f3cdfe93ac68d127740c7c60; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d43babee559c0a43f3cdfe93ac68d127740c7c60"; sha256 = "16by5ci4078gbm4qq84np3z1gl6p9g1988nqzwavb1gmcd5l39lp"; }; "d48b4b394816bf765766cfb0de720c2fcf3dbe91" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d48b4b394816bf765766cfb0de720c2fcf3dbe91; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d48b4b394816bf765766cfb0de720c2fcf3dbe91"; sha256 = "03r22czm4w4l1cz5i9dl5v5nbij3zs4bkh5kgxbq9jd4vqkg15n0"; }; "d570076bdc206ebe525e4fdc41a05520d5f706fd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/d570076bdc206ebe525e4fdc41a05520d5f706fd; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/d570076bdc206ebe525e4fdc41a05520d5f706fd"; sha256 = "1bs1j3rya8w5xlmpws006dyzl6ma498qmjpbvy46588zv6id0h9d"; }; "d59bfb566ff92e983f4a66e10ce13ac21e90924d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/d59bfb566ff92e983f4a66e10ce13ac21e90924d; + url = "http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/d59bfb566ff92e983f4a66e10ce13ac21e90924d"; sha256 = "0wgw0q5ln0cz34jc1pn2pqk49b2cbkxljw1c7cyixw81mq0750z3"; }; "d5cc1b80671cb302ce39ef82a91478483444777a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/d5cc1b80671cb302ce39ef82a91478483444777a; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/d5cc1b80671cb302ce39ef82a91478483444777a"; sha256 = "1klyngm5zxnswi2cxj5sd6lcnxmxmj894mpzkbj5fc9l5k9zzh4f"; }; "d5f5f1dab637b46122ba0000804b82a3466d4f57" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d5f5f1dab637b46122ba0000804b82a3466d4f57; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d5f5f1dab637b46122ba0000804b82a3466d4f57"; sha256 = "0wzzk0xm9q17myvgk7mbv21gnyjgms4cr397gxkdjfjljbb78n9b"; }; "d613d9e9dacb47de3549938a8e516310c73c64bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/d613d9e9dacb47de3549938a8e516310c73c64bc; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/d613d9e9dacb47de3549938a8e516310c73c64bc"; sha256 = "17rskdgxjwdlq1v17l756z7fj1l0r96fkzpbagsp7w4h7lxkr3ii"; }; "d63c4c238a195e3f8e062b2a9cf0757f0ed55587" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d63c4c238a195e3f8e062b2a9cf0757f0ed55587; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d63c4c238a195e3f8e062b2a9cf0757f0ed55587"; sha256 = "0waid6qlkmm5avzmd63j7dapq2c5kad6727aalc66kf3bxqqk628"; }; "d65a42fdc8154793ead3cde82b7ec619bd249478" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d65a42fdc8154793ead3cde82b7ec619bd249478; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d65a42fdc8154793ead3cde82b7ec619bd249478"; sha256 = "097124ah7iynh2xq14wlarnqj5kqay45mcsfzy57fkr49kl9q31x"; }; "d6c884c9dad1608090dcb5009a5146b5e2cb307d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d6c884c9dad1608090dcb5009a5146b5e2cb307d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d6c884c9dad1608090dcb5009a5146b5e2cb307d"; sha256 = "1z0nixzhmi07w3nfn2zb81qlq3hgc8x1n42rdafq7m4ddgaccp5b"; }; "d717fddace1fd0e9b4a4b2c78118ebb0c354e35a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2620878-145fecd6dbcb4cf59f55c309f12ff608/d717fddace1fd0e9b4a4b2c78118ebb0c354e35a; + url = "http://cdn.unrealengine.com/dependencies/2620878-145fecd6dbcb4cf59f55c309f12ff608/d717fddace1fd0e9b4a4b2c78118ebb0c354e35a"; sha256 = "0a25mfvkjyycc6ybffg5a453vvzgs0lxs11iwgbd366p1q1a9fc5"; }; "d777e45fe21ea823174bd647cf6817128035cf2d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d777e45fe21ea823174bd647cf6817128035cf2d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d777e45fe21ea823174bd647cf6817128035cf2d"; sha256 = "1p363fd1fdl04md3cwpl8sk4n8vs1kbzlvf1m5hfjwjpwf4nrflr"; }; "d79b515a8ffc174a508593ce109108ecb9e44813" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d79b515a8ffc174a508593ce109108ecb9e44813; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d79b515a8ffc174a508593ce109108ecb9e44813"; sha256 = "0wxp8x8f1s961vxlrr507rmngqqwaikj3i09zwzzif54gip02g2x"; }; "d7a56916778ad1fa03472f47ec92e8a9eed66219" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/d7a56916778ad1fa03472f47ec92e8a9eed66219; + url = "http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/d7a56916778ad1fa03472f47ec92e8a9eed66219"; sha256 = "06w8nb6bzpc98brswfk1ciikgghvx575w6il3l3p7yjx87093vbx"; }; "d7ae2a94509bb8a9d5e77006c5538cd11b721439" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/d7ae2a94509bb8a9d5e77006c5538cd11b721439; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/d7ae2a94509bb8a9d5e77006c5538cd11b721439"; sha256 = "12cwb2ajb3ikrr2pnk9djd9c4cyh2prigfy7x3q2kdni28dw4v9i"; }; "d7cd467675e181dbeba3cf24443590ebb76f9515" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d7cd467675e181dbeba3cf24443590ebb76f9515; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d7cd467675e181dbeba3cf24443590ebb76f9515"; sha256 = "0d6s9lk446ixhiivxxrxv3s8l6xxlxqljkcj1ynyxcfcm9q6d29r"; }; "d7df186da35e7874ec3096cafd37119085cf5ce5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d7df186da35e7874ec3096cafd37119085cf5ce5; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d7df186da35e7874ec3096cafd37119085cf5ce5"; sha256 = "0l553fq2pmm2jpv9kag039kg8mjspnqaf9ja2g6ylgbkclm8sc60"; }; "d7eaad8d8e27e59910b9a915de128b42dda290db" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d7eaad8d8e27e59910b9a915de128b42dda290db; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d7eaad8d8e27e59910b9a915de128b42dda290db"; sha256 = "1l641nqdiyp8wvpiydmanb1i32da6naad7fiwggjk8y9dd035j3z"; }; "d814756dd80360682458cdbeed8859d522418bd2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d814756dd80360682458cdbeed8859d522418bd2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d814756dd80360682458cdbeed8859d522418bd2"; sha256 = "0lmvilkzvcipf1favy33khkfdg285l6cvfykzprljyff1jgqb16w"; }; "d82a48c7d5dec9cc59dfa1a8ee7298c7e787cee7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2627198-ce999b21af1d474180ef48e136faa3d2/d82a48c7d5dec9cc59dfa1a8ee7298c7e787cee7; + url = "http://cdn.unrealengine.com/dependencies/2627198-ce999b21af1d474180ef48e136faa3d2/d82a48c7d5dec9cc59dfa1a8ee7298c7e787cee7"; sha256 = "1lvp57nm4y0xfc09wqckfd6736qf994sgdwhvzd3a39xnjcm1zcf"; }; "d841bdc828b7ed9f4a76d474d455264dcaadbe38" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d841bdc828b7ed9f4a76d474d455264dcaadbe38; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d841bdc828b7ed9f4a76d474d455264dcaadbe38"; sha256 = "0vi449pj78607r89y2zbx2dm5qdk0njdnws55cmx6wv7p13wiwq4"; }; "d852eca7663f1c36dab87cbd527dbfac895faf97" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d852eca7663f1c36dab87cbd527dbfac895faf97; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d852eca7663f1c36dab87cbd527dbfac895faf97"; sha256 = "09y0jdcsxnj6wmb1q60a79dfpn0qq9laxsh20glpgw00a302917z"; }; "d87a6dc2de5d3e0f991324f8edf80b016f15f204" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d87a6dc2de5d3e0f991324f8edf80b016f15f204; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d87a6dc2de5d3e0f991324f8edf80b016f15f204"; sha256 = "08bmfkq48m62gahq3c9gjkjvwg1f7986kiq82xzr0vd15742l3vh"; }; "d889e4d65d962a36e5839fedc6a70a00ac10fafd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d889e4d65d962a36e5839fedc6a70a00ac10fafd; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d889e4d65d962a36e5839fedc6a70a00ac10fafd"; sha256 = "15f3gbgqfjhcnmqqcbklp5qh5l4jrcb0mfg0gf4njaprb479274r"; }; "d8a13d14cf5b0d5bd31f2b05c3b53dbffdedc49c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d8a13d14cf5b0d5bd31f2b05c3b53dbffdedc49c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d8a13d14cf5b0d5bd31f2b05c3b53dbffdedc49c"; sha256 = "13hipnkqpzlxkx87yy49303fxs8mpna2947yaf06nyjwphy9y554"; }; "d8abbf7642437f66197d216a0eceef1ccce557c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d8abbf7642437f66197d216a0eceef1ccce557c9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d8abbf7642437f66197d216a0eceef1ccce557c9"; sha256 = "0jdfxmw3bqp1nws33hrch9j7irnln19ac5cf21bnzavsvkvfrwhv"; }; "d8f99844942adf5e16059b6743f25804288ee4ca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/d8f99844942adf5e16059b6743f25804288ee4ca; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/d8f99844942adf5e16059b6743f25804288ee4ca"; sha256 = "14fihk8cpbsdf26vfvhfx5finmvz6ckbxmhbkm7qh34wi6h10v6r"; }; "d904eb14d805f07ce46163d3b8b20c434fe0db0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d904eb14d805f07ce46163d3b8b20c434fe0db0b; + url = "http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d904eb14d805f07ce46163d3b8b20c434fe0db0b"; sha256 = "0pwnpnmca2s8qg2k27malnw6d20si50dp3rlqcciaihn6dbjn8qh"; }; "d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d92734f6a18a11d0dfbf8c9e12f63f2180c5225d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d92734f6a18a11d0dfbf8c9e12f63f2180c5225d"; sha256 = "1m8yai075pib0imrh5dlwifdgbzsijk0vcgz8n8yzgq4j7k6rk16"; }; "d9a9e14ffd76c4ec3dd9ed97fe543c3169480ecb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d9a9e14ffd76c4ec3dd9ed97fe543c3169480ecb; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d9a9e14ffd76c4ec3dd9ed97fe543c3169480ecb"; sha256 = "009fzivb39c6wx2mv4z6kjkfqr51fhkx6w08h8d9g0z0kin4hffl"; }; "d9b01b6ec88b6bdfbdb3493b4881158a6b4c8d81" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d9b01b6ec88b6bdfbdb3493b4881158a6b4c8d81; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d9b01b6ec88b6bdfbdb3493b4881158a6b4c8d81"; sha256 = "1nnk36bh320bblcnd8zvhfvgd9q456a007zwk8l11akx4yd645pj"; }; "d9eb718a9365d9af9b6cc77b440a8da1ea6c1bc1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/d9eb718a9365d9af9b6cc77b440a8da1ea6c1bc1; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/d9eb718a9365d9af9b6cc77b440a8da1ea6c1bc1"; sha256 = "15z0bl57iixqyghm5ac3gy8czvx03spwbm5m6i13nk48dvlfyh8w"; }; "d9edee7f1f74e5386558b4a961fca4552e02ed53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d9edee7f1f74e5386558b4a961fca4552e02ed53; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d9edee7f1f74e5386558b4a961fca4552e02ed53"; sha256 = "17gkslrvbvdkkdapsqpck8q3rczk4cam00c9yhyi137j7n1lkpyk"; }; "da1a0a91f4e47865a8becf9da734feefa1851a0e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/da1a0a91f4e47865a8becf9da734feefa1851a0e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/da1a0a91f4e47865a8becf9da734feefa1851a0e"; sha256 = "0lz6gkyn0vcwpgd3ln60cm4nnsz01g20h7qz00pgjczpa4j2qas4"; }; "da7b12758710d9e2c5869e221e94cef9c9eedfc1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/da7b12758710d9e2c5869e221e94cef9c9eedfc1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/da7b12758710d9e2c5869e221e94cef9c9eedfc1"; sha256 = "03pxq5gncfxllslif2vsfacwxv3wpfgajsgdx0s62slsqrfgrm1h"; }; "da7ba6ca87d1fd789d7ec8278b87f5eb53200dae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/da7ba6ca87d1fd789d7ec8278b87f5eb53200dae; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/da7ba6ca87d1fd789d7ec8278b87f5eb53200dae"; sha256 = "1xx0kk0n7lmd7llildsw03a7zbfd3dr3jcjjm2ljb3x2zxksapwz"; }; "da8b24eeab7203c68fbffbc306797cd5a0ad0a21" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622247-8eee96f5d21944c4aceb4b5731ec49c7/da8b24eeab7203c68fbffbc306797cd5a0ad0a21; + url = "http://cdn.unrealengine.com/dependencies/2622247-8eee96f5d21944c4aceb4b5731ec49c7/da8b24eeab7203c68fbffbc306797cd5a0ad0a21"; sha256 = "0h522mjxnb25w077j7vfd7vw588w2wj3lhvb740hmzs8hg50grbf"; }; "db0072b27b24bda3fd51a10fdc7e99e0cd839029" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621850-a9425aa00359454986fe050ca270f1f8/db0072b27b24bda3fd51a10fdc7e99e0cd839029; + url = "http://cdn.unrealengine.com/dependencies/2621850-a9425aa00359454986fe050ca270f1f8/db0072b27b24bda3fd51a10fdc7e99e0cd839029"; sha256 = "16py0ri5wzfyxi5yv673wwx4cvqdgibgf8g5gndwkvbxdk1901i1"; }; "db0399e0ca29f1327956d92769300c29b37b2b11" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/db0399e0ca29f1327956d92769300c29b37b2b11; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/db0399e0ca29f1327956d92769300c29b37b2b11"; sha256 = "1rn19ggfrq07xpwv7hxlqsq01rz4s5aw8jyyk9jpgwm8951mdk0m"; }; "db1ce685def3bdbdaa34985a4bcc7f9397fe18c5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/db1ce685def3bdbdaa34985a4bcc7f9397fe18c5; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/db1ce685def3bdbdaa34985a4bcc7f9397fe18c5"; sha256 = "1jvh0j9208qp3msz14gg2dliasys859zfkwagwgcpwzz8r9750dg"; }; "db49a1753cbbba64d471588023c076a11c7f8ed0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2515540-18724700a05d4a0c889f39065edf2969/db49a1753cbbba64d471588023c076a11c7f8ed0; + url = "http://cdn.unrealengine.com/dependencies/2515540-18724700a05d4a0c889f39065edf2969/db49a1753cbbba64d471588023c076a11c7f8ed0"; sha256 = "19jb6xz05mnypcs43ld8lf2jvybkj8xr2mmbrhkpvwbxj0gz9mgq"; }; "dbaad381a8fe78e42dee5bc0259045658757985f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dbaad381a8fe78e42dee5bc0259045658757985f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dbaad381a8fe78e42dee5bc0259045658757985f"; sha256 = "10g36av438yi4gif8c1r35z2jfpqynkqw65nyhy3pnxhwph92hk8"; }; "dbd67380af0391a17ceebc816f623b42e665cd2d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/dbd67380af0391a17ceebc816f623b42e665cd2d; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/dbd67380af0391a17ceebc816f623b42e665cd2d"; sha256 = "11cdb6rm97vvmfhnf50sl1bcyrg3zki3v5vdhm3w4bzazmvw4d6b"; }; "dbe75239cd713a39f272a0de6cac2dfb95039ebb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dbe75239cd713a39f272a0de6cac2dfb95039ebb; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dbe75239cd713a39f272a0de6cac2dfb95039ebb"; sha256 = "0sy95z08ps7hmkzyg0ym20q9b2f2d1mfs8wp9zbcqixlbkgna90l"; }; "dc103daa4b0245c15f666e3b82ee1ca395c26e15" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc103daa4b0245c15f666e3b82ee1ca395c26e15; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc103daa4b0245c15f666e3b82ee1ca395c26e15"; sha256 = "1xy9yz8nrk8b1l64x0jq6cgdk10xjf1mmm4g62fqg6sn0zcl5ai0"; }; "dc8af4beee95a25b1c0cab56a5b11a66babc6a87" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc8af4beee95a25b1c0cab56a5b11a66babc6a87; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc8af4beee95a25b1c0cab56a5b11a66babc6a87"; sha256 = "1shf8pf5xyqsjqslnj9m7a93xm9f6lydsf35vhq81p2sll5786kr"; }; "dc999c480c689209d1072c9b4435243a1121150a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/dc999c480c689209d1072c9b4435243a1121150a; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/dc999c480c689209d1072c9b4435243a1121150a"; sha256 = "0lg507q9kwc16hn0f9dapahd0iymywswrn2iqd26lx7g6lvnckd0"; }; "dccb30d618cfef75cf0ac5c9e91b08be0183d1c6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/dccb30d618cfef75cf0ac5c9e91b08be0183d1c6; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/dccb30d618cfef75cf0ac5c9e91b08be0183d1c6"; sha256 = "1z6qy8hsnznrdfx3k6fqnnb8flv8s894ljrglppmr0f0sdbrvavk"; }; "dcd771e85d726f704215a4feaa632c6ad6472de7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dcd771e85d726f704215a4feaa632c6ad6472de7; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dcd771e85d726f704215a4feaa632c6ad6472de7"; sha256 = "0yqwa73qvwi1rmv4qlgwcn4fp88yqwijd4qw510abfljqgvkwnh5"; }; "dd2d043a6fefc80a25ca78d62c7e8ac26e471cc5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd2d043a6fefc80a25ca78d62c7e8ac26e471cc5; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd2d043a6fefc80a25ca78d62c7e8ac26e471cc5"; sha256 = "10i0f74cgc3n0yiv88vggiwpsf8jjxg0jvqnqfcmpapd8m6f9s99"; }; "dd37156cd306b8d31089c3a93edede1ffb0d3293" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd37156cd306b8d31089c3a93edede1ffb0d3293; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd37156cd306b8d31089c3a93edede1ffb0d3293"; sha256 = "0qldw0lnwx6qnlis7gxpgzdag2sk9cyg2myy8phmmd0407a4l6pl"; }; "dd67559046c4cec3957fcc155765827a5c36dfb2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd67559046c4cec3957fcc155765827a5c36dfb2; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd67559046c4cec3957fcc155765827a5c36dfb2"; sha256 = "1fxk257fjj23k4vx0p6fydbg0kmqd8lx0fbn0fiy94binwym6aiq"; }; "dd6aa88361efd8c13bc630db41c40d185f94dafa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dd6aa88361efd8c13bc630db41c40d185f94dafa; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dd6aa88361efd8c13bc630db41c40d185f94dafa"; sha256 = "1cd1knbxhzzjddavdnd996n53km3nrq0183nrvh7kmy7jp51b6i7"; }; "dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae"; sha256 = "1vlzi62gws4dby85aan2aw96gd9n1frrwvkym5jw9cn7m3rp7di3"; }; "dd8ef40e0195694f7f018da7e80a520807402c9b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/dd8ef40e0195694f7f018da7e80a520807402c9b; + url = "http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/dd8ef40e0195694f7f018da7e80a520807402c9b"; sha256 = "030hfr8vk0rn374h9gav0j3x8mvm5r8ggq37h666q4fswazqa2cv"; }; "ddad05592e192eebafd8842ac556d92572eef1aa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddad05592e192eebafd8842ac556d92572eef1aa; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddad05592e192eebafd8842ac556d92572eef1aa"; sha256 = "000r1d5nifky1yczl7p2fdygrl8yn9n5ajqbxmx2ccmavxr2wqjz"; }; "ddc5b08945cb44c8aa6434129c3f898bd87a41af" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ddc5b08945cb44c8aa6434129c3f898bd87a41af; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ddc5b08945cb44c8aa6434129c3f898bd87a41af"; sha256 = "0gr5ra1izhksappm1k4s4n632dyzfxdlxv1ilnmfmcs4vhjphpg6"; }; "ddcc2181537ebf3c5cf4ba351f0960b885372aa9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ddcc2181537ebf3c5cf4ba351f0960b885372aa9; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ddcc2181537ebf3c5cf4ba351f0960b885372aa9"; sha256 = "0hp5d6xj8dh033801j5bl07wji2489v4ci6fl0jljhsfwh9r9zcf"; }; "ddef4f0acf5f073d28dd6a38c4fa58630d3a68f8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ddef4f0acf5f073d28dd6a38c4fa58630d3a68f8; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ddef4f0acf5f073d28dd6a38c4fa58630d3a68f8"; sha256 = "1p8ag7dgnrnpj2cj7l94ic98gghhs5xc1qsmwmr5m5v6ra6mkm3s"; }; "ddffea76154050032a408a3890c07633f1ba3b0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddffea76154050032a408a3890c07633f1ba3b0b; + url = "http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddffea76154050032a408a3890c07633f1ba3b0b"; sha256 = "1bfwfwg9hn4sh5nqwpd8nfjbqkkyp5nzns2cw47cqvrrz9m645hw"; }; "de0049c6936b76d5da37bb69dd25ac91e83514c3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/de0049c6936b76d5da37bb69dd25ac91e83514c3; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/de0049c6936b76d5da37bb69dd25ac91e83514c3"; sha256 = "1abk2d6mp27rya7yp3dhvgwr18z7yny9l024l9wv2dzgfhw4mlmr"; }; "de01c69dad3bc654ab534e5eedcd2b8374f2a2e0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/de01c69dad3bc654ab534e5eedcd2b8374f2a2e0; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/de01c69dad3bc654ab534e5eedcd2b8374f2a2e0"; sha256 = "1dggg7qwqsfzcnr296qcw0k5k7bisg2nlxic185qydca0y844khg"; }; "de04f7b02c49aa87b2b6da18c62a5ff36858352c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/de04f7b02c49aa87b2b6da18c62a5ff36858352c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/de04f7b02c49aa87b2b6da18c62a5ff36858352c"; sha256 = "1fljk9j3l64v4yf4by4n22pfdxa63frilac93wbw663nb7w5hrw6"; }; "de2d73029d96c42d88f7765a10be8b6af0007eb8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2701057-ddd66ac9b77f4863be4b1dc8e90d0e10/de2d73029d96c42d88f7765a10be8b6af0007eb8; + url = "http://cdn.unrealengine.com/dependencies/2701057-ddd66ac9b77f4863be4b1dc8e90d0e10/de2d73029d96c42d88f7765a10be8b6af0007eb8"; sha256 = "10hc364qj9mav9nqa8jvkiwmmrmx24xqpn8gknra4iw7nqhp43c8"; }; "de40a1a3ef4f09ae9523868d74d8cc9af2745ec8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/de40a1a3ef4f09ae9523868d74d8cc9af2745ec8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/de40a1a3ef4f09ae9523868d74d8cc9af2745ec8"; sha256 = "16jhqdx31vid1knbfldhwf3d4vlap6p815q6ri64fb5g0drny9zn"; }; "de7be9bd446cca2c3d817d2f1d7042e9a6f27378" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/de7be9bd446cca2c3d817d2f1d7042e9a6f27378; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/de7be9bd446cca2c3d817d2f1d7042e9a6f27378"; sha256 = "139pvk98m51s0i31s4621x83cdx81459fw5jj7sr1kby3g900adh"; }; "dea23be7b0f4c3aec67d1c95e616bc04d4e99100" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dea23be7b0f4c3aec67d1c95e616bc04d4e99100; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dea23be7b0f4c3aec67d1c95e616bc04d4e99100"; sha256 = "09z1az90fg35rp8rfsnlqh5bhgrw1pdw14lkavnhz1kcpxzg429h"; }; "debdde2d089368f9ec40b6d50aed4cab14a4e785" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2533444-8b800f9092dc4a4c822daa186a0dd399/debdde2d089368f9ec40b6d50aed4cab14a4e785; + url = "http://cdn.unrealengine.com/dependencies/2533444-8b800f9092dc4a4c822daa186a0dd399/debdde2d089368f9ec40b6d50aed4cab14a4e785"; sha256 = "1gvk274y842is0k67pancjpbw7s0yqv1lqz36ar2l84b7mky9ncq"; }; "debfd2113b48ed4529163d952262d80fe8cc11f1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/debfd2113b48ed4529163d952262d80fe8cc11f1; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/debfd2113b48ed4529163d952262d80fe8cc11f1"; sha256 = "0ijv1i1xdsj15b63dvj1j248bcqylbp62cncza464jzpf1mgmjl1"; }; "df2925eb96fbc24fb45e29b8553772c650ff8c53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/df2925eb96fbc24fb45e29b8553772c650ff8c53; + url = "http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/df2925eb96fbc24fb45e29b8553772c650ff8c53"; sha256 = "1msa6jm9c3x8150sci2bbs47l424xchjfgg5ixr388q5fiqjwv50"; }; "df3e6640f45ebf0909095b9ae74a7cb7404e447d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/df3e6640f45ebf0909095b9ae74a7cb7404e447d; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/df3e6640f45ebf0909095b9ae74a7cb7404e447d"; sha256 = "1rg63nvywdrzwvslzpq8z53wkhfm3fgw8x7lzxkqay58v3npdz44"; }; "df4ccc222a9b196a9484691be86f2d14462b2357" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df4ccc222a9b196a9484691be86f2d14462b2357; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df4ccc222a9b196a9484691be86f2d14462b2357"; sha256 = "17gf45g193ind6i7m49ckwxrfffryi1xp3dl8gkgfj8q9yvlh01n"; }; "df5437931a8964c846c6c9377f381c0213082e22" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df5437931a8964c846c6c9377f381c0213082e22; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df5437931a8964c846c6c9377f381c0213082e22"; sha256 = "0hllda7r7v1nvffb504djzc2l6l6bg1ldl3fgn5dz152jgvylq95"; }; "df54fb21975e218c1da9d209d52b225e78430abf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/df54fb21975e218c1da9d209d52b225e78430abf; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/df54fb21975e218c1da9d209d52b225e78430abf"; sha256 = "0cdj50yxdl4lfpmhydkymzc5p1zb07z86cgqmsyqs3b4xp7a410n"; }; "df6d4711f83f1c570af30ec97dd418f0664398b5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df6d4711f83f1c570af30ec97dd418f0664398b5; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df6d4711f83f1c570af30ec97dd418f0664398b5"; sha256 = "03vr4pvvr03nwwf4jp3q0fps1kaybk327z6r80cf934q8dq1hmam"; }; "df7074a5b6e12f2c024e07d5dd9fdcd863f0553a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2574758-8fd9f8c50854489f98b3664933c83100/df7074a5b6e12f2c024e07d5dd9fdcd863f0553a; + url = "http://cdn.unrealengine.com/dependencies/2574758-8fd9f8c50854489f98b3664933c83100/df7074a5b6e12f2c024e07d5dd9fdcd863f0553a"; sha256 = "0m9mk7mr9i2i0rly7jb9vbz000rpxmpgrlawa1isvgpp98nq9jx9"; }; "df877ce5674ccd5af752d839ce7729c724750815" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df877ce5674ccd5af752d839ce7729c724750815; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df877ce5674ccd5af752d839ce7729c724750815"; sha256 = "087wfyc54y7ay8bh5ml8g46402pk42mmimzvlpskq6vz6hwqbwg1"; }; "dfd7ec76ea282f899f489dcf84e86c17e2d5176b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dfd7ec76ea282f899f489dcf84e86c17e2d5176b; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dfd7ec76ea282f899f489dcf84e86c17e2d5176b"; sha256 = "0yhnv54lb22ksa1b9rd12jwrpbfia6v46j60qszgp3wfzh927b7p"; }; "dfdacbcbdca178e9cf577d37637399e02c80c006" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/dfdacbcbdca178e9cf577d37637399e02c80c006; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/dfdacbcbdca178e9cf577d37637399e02c80c006"; sha256 = "1k16n6jf7jv3ja47faf27vkbhcwn99y6rgfzk5d9m5r18326m6is"; }; "e002d0958c673752ae43a0801b444a2ce1624b4a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/e002d0958c673752ae43a0801b444a2ce1624b4a; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/e002d0958c673752ae43a0801b444a2ce1624b4a"; sha256 = "14wkqdp6bwy7i9dx9lb7fxrhwsspxwn9hpsxc3qqd43gbff6vmg0"; }; "e02e3dbebd645b7ffc82cb42b41d79fd60a268cd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2634392-be4d7ed7261341cdaeeca1438154a993/e02e3dbebd645b7ffc82cb42b41d79fd60a268cd; + url = "http://cdn.unrealengine.com/dependencies/2634392-be4d7ed7261341cdaeeca1438154a993/e02e3dbebd645b7ffc82cb42b41d79fd60a268cd"; sha256 = "1gj5921y97f0f64iqf566hpsmm8gf39p0x51ps67r5hk89k52gj8"; }; "e03589b69f1b5cdf2431809897f2a1287d4d1db2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e03589b69f1b5cdf2431809897f2a1287d4d1db2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e03589b69f1b5cdf2431809897f2a1287d4d1db2"; sha256 = "0bwr0lf8b523kwgrakm6cj2rpcaw1ql213xsa4gmaxbqjxmhjwn9"; }; "e0a2c1da63edd46fd58df91cebed0a6ba9d4e2ba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0a2c1da63edd46fd58df91cebed0a6ba9d4e2ba; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0a2c1da63edd46fd58df91cebed0a6ba9d4e2ba"; sha256 = "1wlxk5v5jabmdg4i6nm91kqgx4lak68455chgyyzw83n3921cwc6"; }; "e0b52177b69db23587e60178455553700fca7a3e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0b52177b69db23587e60178455553700fca7a3e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0b52177b69db23587e60178455553700fca7a3e"; sha256 = "1dpp1ixnl806d5b7ag0chzd771nrlqpr0vp0xg6sqz77y9f64jdc"; }; "e0da56b57fd7c9eadf21a0c6bcaa75267e6eddd0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/e0da56b57fd7c9eadf21a0c6bcaa75267e6eddd0; + url = "http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/e0da56b57fd7c9eadf21a0c6bcaa75267e6eddd0"; sha256 = "05phccb0fvx9li9yr689l2wxbana6hvzljwsn1a2113rkh794gql"; }; "e10e19c255056c096d6105cfbff767f6749ffeea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e10e19c255056c096d6105cfbff767f6749ffeea; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e10e19c255056c096d6105cfbff767f6749ffeea"; sha256 = "0356fyglgynnlm1myic04f0g9c1yz12zz8z4vi7j8plypnsanqs8"; }; "e119a785ae743089d9760220e95431e5b5a828c3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e119a785ae743089d9760220e95431e5b5a828c3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e119a785ae743089d9760220e95431e5b5a828c3"; sha256 = "1vqrm60v9jgd3xdvdwkavxfapl1424pcwm0w9zn4gypbkwfigs8g"; }; "e1a0aba6fa5c1c2bd71eb9f8b6fa3b6bd0c08378" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e1a0aba6fa5c1c2bd71eb9f8b6fa3b6bd0c08378; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e1a0aba6fa5c1c2bd71eb9f8b6fa3b6bd0c08378"; sha256 = "1qvnscdxnyyps3sm2625hjvb2glkcaxj3kd4qhcpaw99p22cp61z"; }; "e1a2109b7b2cea0b5a275ee93d3ec4dd15bda288" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1a2109b7b2cea0b5a275ee93d3ec4dd15bda288; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1a2109b7b2cea0b5a275ee93d3ec4dd15bda288"; sha256 = "0b1namzxfx0pshfcixvzwpm19d29ma70wbsb5v37jx79bwplxvly"; }; "e1fb2b61f5ab2e0ded49292c3ba53d25ee0e31d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1fb2b61f5ab2e0ded49292c3ba53d25ee0e31d4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1fb2b61f5ab2e0ded49292c3ba53d25ee0e31d4"; sha256 = "04xd0vdrqrlnakxg94racp4q4rqq8z383n6jyg798g386gd2nkyw"; }; "e214f8d9834372bc3a68863ed9b25f6d3468aab6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e214f8d9834372bc3a68863ed9b25f6d3468aab6; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e214f8d9834372bc3a68863ed9b25f6d3468aab6"; sha256 = "1x8alx8qywjysqs8fznf7f2rgz47ryi02711fj2vdifhiazl81z6"; }; "e2e2347e195fcb6908121d1d8252b675c0225733" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e2e2347e195fcb6908121d1d8252b675c0225733; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e2e2347e195fcb6908121d1d8252b675c0225733"; sha256 = "0am2g2w1p9gbdc4r75gib8kadfkzxk0pl93bkggrvbc04gaajq0y"; }; "e2f498b239aa783a65b663c31fbe397e04857c5f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e2f498b239aa783a65b663c31fbe397e04857c5f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e2f498b239aa783a65b663c31fbe397e04857c5f"; sha256 = "1abyxjalrqhvinl4agkhc5mwyvi18hip7v6rjvvzxi6c6jvlfbsf"; }; "e2f8447f74d7ae894d6ebc37fd1de2b774b15bb2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e2f8447f74d7ae894d6ebc37fd1de2b774b15bb2; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e2f8447f74d7ae894d6ebc37fd1de2b774b15bb2"; sha256 = "08j2hxs3grsfk5y3xfq4ch1z4hd9rwgn5yfzd2h31ldrpyx4r39y"; }; "e2ff2a15b3b4f835c8275051591b9d4de07df86b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e2ff2a15b3b4f835c8275051591b9d4de07df86b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e2ff2a15b3b4f835c8275051591b9d4de07df86b"; sha256 = "0q77kjwr6xi1drxv0kqxc4kbm93r42ygsyxfyk2rqjfa30v72496"; }; "e3adc0e94fdc76e94c4297ae60dc8b7678ff6d13" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/e3adc0e94fdc76e94c4297ae60dc8b7678ff6d13; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/e3adc0e94fdc76e94c4297ae60dc8b7678ff6d13"; sha256 = "1cihl2vayvhqd8g2jvnzirfv2a2c7dadyvg2cmkd8rdcf7ry7r7m"; }; "e3e99323ec9693b9c6beafc30a7c439d27d51019" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/e3e99323ec9693b9c6beafc30a7c439d27d51019; + url = "http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/e3e99323ec9693b9c6beafc30a7c439d27d51019"; sha256 = "1dw27yqsfdh6d8p4d9afwn9pz8dhd1lw1y72vw6vj15ns1m1hsj3"; }; "e3f2410485eaec849a562752ca8348217b12f390" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/e3f2410485eaec849a562752ca8348217b12f390; + url = "http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/e3f2410485eaec849a562752ca8348217b12f390"; sha256 = "17n58ay2q59xc7d02dxzx4lxcqf1fm92pyz07w6fjlwiqlr30pz6"; }; "e412f545b4a58b60e62cd1dcf57ca25871356b05" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2515174-63b13cf90d1f431ebc611d28340ef4ba/e412f545b4a58b60e62cd1dcf57ca25871356b05; + url = "http://cdn.unrealengine.com/dependencies/2515174-63b13cf90d1f431ebc611d28340ef4ba/e412f545b4a58b60e62cd1dcf57ca25871356b05"; sha256 = "19vbfalid5jpg1x9dbxip4fbdvpvyrhdjz8wfk9ysiw8nbk1xyj2"; }; "e4328c9505893ca9157deacf1baf1aea7d01f8d4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4328c9505893ca9157deacf1baf1aea7d01f8d4; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4328c9505893ca9157deacf1baf1aea7d01f8d4"; sha256 = "0ksgc1abgwmhgz9j557l6kj6awdfzivm08dfk0n4bspc8dmdp728"; }; "e458507f455e3bac9232d632426fc4b75f29841d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e458507f455e3bac9232d632426fc4b75f29841d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e458507f455e3bac9232d632426fc4b75f29841d"; sha256 = "1y3w5h0ss3iq6sv0pmzw8n62s3asp616j6n3fqy8vja3bm6s57hr"; }; "e465c13305ee8aa9186e587aed90d1007e5b31e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e465c13305ee8aa9186e587aed90d1007e5b31e7; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e465c13305ee8aa9186e587aed90d1007e5b31e7"; sha256 = "04ig4zfzv4g24yr882hfrx4570jvhd3abvpig9mc1d7x6hg2vnn3"; }; "e4770351a3cb31df020fd6bff26ce03237621428" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4770351a3cb31df020fd6bff26ce03237621428; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4770351a3cb31df020fd6bff26ce03237621428"; sha256 = "1sza989jj7mhwv60ridbqpypskddsyx97vrlpflwq4i8xk8f0qhn"; }; "e4db89beb65b004392150dc83a65a28ea62cb155" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/e4db89beb65b004392150dc83a65a28ea62cb155; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/e4db89beb65b004392150dc83a65a28ea62cb155"; sha256 = "14b951ymdf4difjjrcc9n6kg5ib5wks26kdagrr04bdb0qpv6m5s"; }; "e4e9b76a89d03aea789e6df7b7dcbc13cc7ca8cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/e4e9b76a89d03aea789e6df7b7dcbc13cc7ca8cf; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/e4e9b76a89d03aea789e6df7b7dcbc13cc7ca8cf"; sha256 = "1v9ldnkaq65zym2d439zbqvybfvpwj30hj6mdhwny84mf71kimmi"; }; "e4fa82ded20830726a04678904111f9fa6f26954" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/e4fa82ded20830726a04678904111f9fa6f26954; + url = "http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/e4fa82ded20830726a04678904111f9fa6f26954"; sha256 = "0r22snlddx333vbz83h776njmycshb8kmx2biw7hs4qfyvj99y0j"; }; "e50119c064462a0e056574db4e21f359f7f0c159" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e50119c064462a0e056574db4e21f359f7f0c159; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e50119c064462a0e056574db4e21f359f7f0c159"; sha256 = "0gb1rbclzkxs1c63ylabam1il1nw85xvrd7n3s3gjb7s7dq5mmwb"; }; "e5146f66274a1f5409227f94447af2a1f4bfafd9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/e5146f66274a1f5409227f94447af2a1f4bfafd9; + url = "http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/e5146f66274a1f5409227f94447af2a1f4bfafd9"; sha256 = "0vcn9fr140kvc5z65ra6qjymfzc4dmgmds4mnzg7n29bfkvmsxff"; }; "e55d8897009789617d8b961ae3c6c1d00a845bb3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e55d8897009789617d8b961ae3c6c1d00a845bb3; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e55d8897009789617d8b961ae3c6c1d00a845bb3"; sha256 = "1rc7xs76q551a7vcy9642jrgvbl97y98gkdqkrb62ibpv3c2g4ps"; }; "e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8"; sha256 = "19w1q3wxbskznn1yiyzmds6dsnnb5ik31lhdqsxzqzjm0hl01m1w"; }; "e62a73c1c93258f0b94c3cc46e35318469afe84e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e62a73c1c93258f0b94c3cc46e35318469afe84e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e62a73c1c93258f0b94c3cc46e35318469afe84e"; sha256 = "1yrwbvldncip3xpcxq2n9q707z21zg85yxhgvp37j24nqagm6wfi"; }; "e65191a9b59946c7f04782468840b7352ab5c96b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e65191a9b59946c7f04782468840b7352ab5c96b; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e65191a9b59946c7f04782468840b7352ab5c96b"; sha256 = "0q8qnncfb723n9ljzfsyi7v44q2301v37c2yjcaqdvs6vaij517x"; }; "e67a9dfa527d0eeb0ed24ef9d5e22b41baa25251" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e67a9dfa527d0eeb0ed24ef9d5e22b41baa25251; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e67a9dfa527d0eeb0ed24ef9d5e22b41baa25251"; sha256 = "0vplmbsk6zpr416x96fdshakjymwa631y78c0sr24gqd853w88b4"; }; "e6a8b07d1017a517555ae184a3ce22fa2b948c72" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e6a8b07d1017a517555ae184a3ce22fa2b948c72; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e6a8b07d1017a517555ae184a3ce22fa2b948c72"; sha256 = "0wvi5d9ndis8zrbxgy62m6hmr3bvgygfw4hmq6gqay12z78rvchy"; }; "e6b8c05e76abc49f7a2264f2b95199b825fa851c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e6b8c05e76abc49f7a2264f2b95199b825fa851c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e6b8c05e76abc49f7a2264f2b95199b825fa851c"; sha256 = "0m4dwy0mmyr0f1vjk8grqiapwc1q36cj3ischp2gf2ibj1xxiixa"; }; "e6fda4b3f8fe12c3bbe8ccf91bdcc8d759ea1ea2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e6fda4b3f8fe12c3bbe8ccf91bdcc8d759ea1ea2; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e6fda4b3f8fe12c3bbe8ccf91bdcc8d759ea1ea2"; sha256 = "0ggsvrwnfp10h4ns5vadpxnxm6m0nf5i0zr3i57k2h2kxx7vn192"; }; "e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/e70061ffc85b6027a648cac0b1c8c6ef7d4e3106; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/e70061ffc85b6027a648cac0b1c8c6ef7d4e3106"; sha256 = "0y2lka9gippprgffs4w1p6yh3kvj8m3d749ysbc8lwjvijhh0dyg"; }; "e70429fd818fe983008a06e931d39724ea7a382c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e70429fd818fe983008a06e931d39724ea7a382c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e70429fd818fe983008a06e931d39724ea7a382c"; sha256 = "0vhfpdbbv46z7kdl1dlnn7mlcpvygn4k6fb8wdgykavp0phzhj4j"; }; "e76c34cb7cbdb14d92e415c4af5ccdc344c4c58d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e76c34cb7cbdb14d92e415c4af5ccdc344c4c58d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e76c34cb7cbdb14d92e415c4af5ccdc344c4c58d"; sha256 = "0jkx8w6p77l53233cac8gzbwdmbbs3znkw588g8mcvwzkpszwbxi"; }; "e77064e9ba8339459d66bc680e55880bbcc5991f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/e77064e9ba8339459d66bc680e55880bbcc5991f; + url = "http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/e77064e9ba8339459d66bc680e55880bbcc5991f"; sha256 = "1fc9jnqb7l5v20asz6cqyrp8vr0617n35k41wrqdcsy0qib9alkn"; }; "e7808a43acaf99637e43857c76760d74f77d6ae5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7808a43acaf99637e43857c76760d74f77d6ae5; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7808a43acaf99637e43857c76760d74f77d6ae5"; sha256 = "0s88msrsnmcqnjyzk7afzf6wikwyajjlybq7jsjyfaax4vaj1cbv"; }; "e7a4ddc64af2a43bf5c7d439244636d60a7dae07" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/e7a4ddc64af2a43bf5c7d439244636d60a7dae07; + url = "http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/e7a4ddc64af2a43bf5c7d439244636d60a7dae07"; sha256 = "13i3cnkrkk0z01bf0prl77wmx4qbnckihgbxjv34lizv3mhd1yzg"; }; "e7fdcefcd4a8853ab010e1eb4f2d88b5bd9726a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7fdcefcd4a8853ab010e1eb4f2d88b5bd9726a9; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7fdcefcd4a8853ab010e1eb4f2d88b5bd9726a9"; sha256 = "1v4yq5b9rng7p1jsvhlnqvcxpnfd1iwmnmd9ygq25prxirlklx8z"; }; "e85ad2ef6896adbbc28a46b023af6b64deb29b88" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e85ad2ef6896adbbc28a46b023af6b64deb29b88; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e85ad2ef6896adbbc28a46b023af6b64deb29b88"; sha256 = "1albg4m9z0g6rv7bqd3mzb8k6r07n6hin3s05gzhl21qqiarwf95"; }; "e902a543218c50ffc9cd9a41bd8d53d0df1939c2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e902a543218c50ffc9cd9a41bd8d53d0df1939c2; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e902a543218c50ffc9cd9a41bd8d53d0df1939c2"; sha256 = "17b3c4kp6a9kbs2k473zygn7w2xmmb19z3sk08alcp658isby3l4"; }; "e997f5bba3b4d4b283427ec3ca644a876f6dee7d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e997f5bba3b4d4b283427ec3ca644a876f6dee7d; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e997f5bba3b4d4b283427ec3ca644a876f6dee7d"; sha256 = "1gc2rzz40ipkjy17fz6qiwsv2wxi4qmblmp0rbvafg8mgrhs2jnf"; }; "e9a64dd557215b53134c33355716c8a4bd1e22f7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/e9a64dd557215b53134c33355716c8a4bd1e22f7; + url = "http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/e9a64dd557215b53134c33355716c8a4bd1e22f7"; sha256 = "1kjvf0spvmp1r8yh75n39a64w3xp1qiw17w8fv6lip3df8dbjywi"; }; "e9b508ed95c44a9c9e0d979b1ae02f7dcd5590a6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9b508ed95c44a9c9e0d979b1ae02f7dcd5590a6; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9b508ed95c44a9c9e0d979b1ae02f7dcd5590a6"; sha256 = "01dl9z60593mizz76sg55zhc949sgxcdp60vkfhrdkhl1l212sga"; }; "e9c7b3390ef65a90310c9cd4a97594bff007303c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/e9c7b3390ef65a90310c9cd4a97594bff007303c; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/e9c7b3390ef65a90310c9cd4a97594bff007303c"; sha256 = "0jnx4b7pkycly81dka9vn01ky96j0xnzxg0f4z5fpfl8z8al3cgh"; }; "e9cec016ae177e586ef08f408aec2f7c4de9afdc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e9cec016ae177e586ef08f408aec2f7c4de9afdc; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e9cec016ae177e586ef08f408aec2f7c4de9afdc"; sha256 = "0k193y1kbmjq6yjxdgv59w1dn9f1b8i7yr2dbzwi2cr57wx3h483"; }; "e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2"; sha256 = "0k3rw21ngsf677m8q4n1zil9fmbsdd97sxss3jv6hkyjq5r6djxl"; }; "e9f10cc1fed35407864f324f08f3c9fcb5a2847f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e9f10cc1fed35407864f324f08f3c9fcb5a2847f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e9f10cc1fed35407864f324f08f3c9fcb5a2847f"; sha256 = "1fz73zsa0f4dma3v47s0dcgdzz8aniryvmpx9rpx955rckrrawsg"; }; "ea58f8314459f7bf1d36a672ccc1f2c60c4e0eba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ea58f8314459f7bf1d36a672ccc1f2c60c4e0eba; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ea58f8314459f7bf1d36a672ccc1f2c60c4e0eba"; sha256 = "1xlyfkxpk86w2ik8ppx6czlx6b5jfvz33k6in9y0zvpi1mvkvam3"; }; "ea7cb20f21cb971f2f7da29210e7bba16e97a53f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ea7cb20f21cb971f2f7da29210e7bba16e97a53f; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ea7cb20f21cb971f2f7da29210e7bba16e97a53f"; sha256 = "1vl4hy09jqhb9h43gn6ymnq2027yc7cfvwh5bn860mj5syayjznl"; }; "eaceaa2d359d151c5394522df962ce393938a21b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/eaceaa2d359d151c5394522df962ce393938a21b; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/eaceaa2d359d151c5394522df962ce393938a21b"; sha256 = "124s81bi0y3sx8r6f4qp7mb5294bivjickw7izg0qym3r35vpvy8"; }; "eaea434c65e3ccf8cec643ea1ec391bdddbc6fac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/eaea434c65e3ccf8cec643ea1ec391bdddbc6fac; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/eaea434c65e3ccf8cec643ea1ec391bdddbc6fac"; sha256 = "0mdxz6820gcwgzaaipg8k0psddp4i5k0kgl4771kp3my736zsdp1"; }; "eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3"; sha256 = "02768h2a16rzwn5d1qrcbxydi0nijyaf301aac32ngsp92y24ycg"; }; "eb942c482591c680356ad05c627b9153756a5c8a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/eb942c482591c680356ad05c627b9153756a5c8a; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/eb942c482591c680356ad05c627b9153756a5c8a"; sha256 = "05vpd0hwalasgjskblzqba8xadmrj10mjsvqis7chdq0am7g66r9"; }; "ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8"; sha256 = "0k1w16kh1fbk255qg9lhnbb192lifjskv5mqkd95rmzacpk1vypi"; }; "ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74"; sha256 = "0iqxilmibqdpcl0k2qvcipw1nphvxykqi0b04si2mls71lawrklz"; }; "ebf62a48af4d0a972019aca5d8365670d7260bdd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf62a48af4d0a972019aca5d8365670d7260bdd; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf62a48af4d0a972019aca5d8365670d7260bdd"; sha256 = "14gfqpfqr5nnj8q26vxa10c5p793zkf57j60563bk5ijm2rxrmgp"; }; "ebf8732591def396954f78bf472667f690877f95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf8732591def396954f78bf472667f690877f95; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf8732591def396954f78bf472667f690877f95"; sha256 = "13p11mvlnanlc64ap1xmq69m0gqgcks2jvh0f3j546dgw9x36yvc"; }; "ec13b2ec5777dbbd7c22e1e2bdcb3e127496b370" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/ec13b2ec5777dbbd7c22e1e2bdcb3e127496b370; + url = "http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/ec13b2ec5777dbbd7c22e1e2bdcb3e127496b370"; sha256 = "0fqy9izbfficxmzf1pbw9w4yasvs55dawm0186afpkg7gcc8rqvd"; }; "ec35da884d7ee63a6b73a14153ebc0ef84e83072" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ec35da884d7ee63a6b73a14153ebc0ef84e83072; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ec35da884d7ee63a6b73a14153ebc0ef84e83072"; sha256 = "0vg8qmf8v73d2zg51yixzhsrgd92d03s5lfviympplshychims77"; }; "ec59e3143dfd3d4c018548a31a6481bc3f9e1137" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/ec59e3143dfd3d4c018548a31a6481bc3f9e1137; + url = "http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/ec59e3143dfd3d4c018548a31a6481bc3f9e1137"; sha256 = "1qfg4cmvb07q61rkj8ca6wzly9zzfaqbx77jlvy5gc0yn4mpijfy"; }; "ec5de1727c79fc933c910e364d19af5e7ebcbf99" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ec5de1727c79fc933c910e364d19af5e7ebcbf99; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ec5de1727c79fc933c910e364d19af5e7ebcbf99"; sha256 = "1cppbmy26118b0gxz6j4zk0zi9rlnd2v1pcbkj1ba86mh6b2d1bh"; }; "ec6d576df884aeea2ed37256df7caa8cc8040d6e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ec6d576df884aeea2ed37256df7caa8cc8040d6e; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ec6d576df884aeea2ed37256df7caa8cc8040d6e"; sha256 = "1139k9957gbripd65125gp72lg303z10j7yzkfafpbkkixbsi4n1"; }; "eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77"; sha256 = "1xd4y3y13qw8nm29d7w55k2cdy50j3jsndm7yhay2ciwwl9jqlhp"; }; "ed023b655c8dbac838b64bf7e6103b7e9d563ad0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed023b655c8dbac838b64bf7e6103b7e9d563ad0; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed023b655c8dbac838b64bf7e6103b7e9d563ad0"; sha256 = "0d53hk0wkgrr8nwa74326ni3z00fmwvifq1i1fj4wca0n3qlgq3j"; }; "ed23ade7aa2af09963a993ee53ab33389aae2e80" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ed23ade7aa2af09963a993ee53ab33389aae2e80; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ed23ade7aa2af09963a993ee53ab33389aae2e80"; sha256 = "1215la804zb4hnc6ily5vjzyrvzb0npyjfjl19kb8qrmcyiymfpz"; }; "ed2c9b990f683ecb84050df89e925e9f65e3883f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed2c9b990f683ecb84050df89e925e9f65e3883f; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed2c9b990f683ecb84050df89e925e9f65e3883f"; sha256 = "1aixypsgvv780pyy8ncizmmysfx1hjym9rbb3m0h4xiizcl4q5ym"; }; "ed384e6a16f79979d70b9926060a68eeb610de53" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/ed384e6a16f79979d70b9926060a68eeb610de53; + url = "http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/ed384e6a16f79979d70b9926060a68eeb610de53"; sha256 = "0bx62ijccnfyrknqrcw3ymvzvdjgc0qpllzaqn9vhnygxsjy4w2f"; }; "ed8d4fee989f83055b4947da8ddd5639f8168782" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ed8d4fee989f83055b4947da8ddd5639f8168782; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ed8d4fee989f83055b4947da8ddd5639f8168782"; sha256 = "1gf587b6qa3n3m3abshiw26nypr4wnzzj4i9qycfr33aasasgckg"; }; "edcad0b0c2862c776fa60784960b9a3a8b3ce6ef" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/edcad0b0c2862c776fa60784960b9a3a8b3ce6ef; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/edcad0b0c2862c776fa60784960b9a3a8b3ce6ef"; sha256 = "10ffm3i1lbyx05ffl8mksp58kagfwdh8kqfgplyxnlxpn2qxf48f"; }; "edd66f69f77a99b2383d34436d6be71565769a43" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/edd66f69f77a99b2383d34436d6be71565769a43; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/edd66f69f77a99b2383d34436d6be71565769a43"; sha256 = "0h7giabjphgikhdrc6r662xb0ahw4spr89jhckzgplr4l8z8nzz5"; }; "ee33cb45be04ea08ab507a4058d81bcdd1da7746" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/ee33cb45be04ea08ab507a4058d81bcdd1da7746; + url = "http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/ee33cb45be04ea08ab507a4058d81bcdd1da7746"; sha256 = "0n99fhb5qng2x0y5rxp4x88jsdcyqliqi1z078lj6qhsjd8dmqlh"; }; "ee8662030dbca92bd70af3ba1550ece5c275d13e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ee8662030dbca92bd70af3ba1550ece5c275d13e; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ee8662030dbca92bd70af3ba1550ece5c275d13e"; sha256 = "00hfl5h4yk3mc8dhxrlk0zg8nyfgrnmzzhglk0vgzi3mkcvc7jv1"; }; "eeaa24c1e61cc4b0806496b256349c44f84c02bc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/eeaa24c1e61cc4b0806496b256349c44f84c02bc; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/eeaa24c1e61cc4b0806496b256349c44f84c02bc"; sha256 = "10kzf6q01v3xd9s7d594biwjy4zzq4wgnqq0ib50ii62rsvli112"; }; "eef24b0bf5f818f43c64498f50e0a79f5b683883" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/eef24b0bf5f818f43c64498f50e0a79f5b683883; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/eef24b0bf5f818f43c64498f50e0a79f5b683883"; sha256 = "0sg9nyp4gvcqmxdx842nr9szfk1fmi4nrwxmmyvqhs774xavxw4d"; }; "ef8182b6df585c7dd91f05618e06fd8ee15be5f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ef8182b6df585c7dd91f05618e06fd8ee15be5f3; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ef8182b6df585c7dd91f05618e06fd8ee15be5f3"; sha256 = "1xrjsspjnfapf26k3ppjx3fzlfcq7qdnxwhvfhn4669spw0a8zgi"; }; "ef923ee8da67064c7a03f02651b14c309db14a3c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ef923ee8da67064c7a03f02651b14c309db14a3c; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ef923ee8da67064c7a03f02651b14c309db14a3c"; sha256 = "1rc0v251migvcrhvxc7cmv3c5qp1a51fzff6whl7h1qqbzc82ick"; }; "efd4413cfd5173a82811ede79b4a13bad5f6a450" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/efd4413cfd5173a82811ede79b4a13bad5f6a450; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/efd4413cfd5173a82811ede79b4a13bad5f6a450"; sha256 = "1f76f939x8xkp5z2k8p0i70ig6i2m4ryj9lrc3x393sjlj26nqaa"; }; "efd812740856e722b88087211add0e268de83d7a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/efd812740856e722b88087211add0e268de83d7a; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/efd812740856e722b88087211add0e268de83d7a"; sha256 = "0yj404y245zicyqgwg2bs9l14gr9vlaakrawk3hdrr24m4lczyz9"; }; "efe81a03fc4e327388573f361faff5b233243834" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/efe81a03fc4e327388573f361faff5b233243834; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/efe81a03fc4e327388573f361faff5b233243834"; sha256 = "1hd7zv4pv604pfbvfya15g3rba9ip6pbzqm6vazi7q7znigzxyql"; }; "eff7dae5ebb303e1c5f823e0de1accf1075e8402" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/eff7dae5ebb303e1c5f823e0de1accf1075e8402; + url = "http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/eff7dae5ebb303e1c5f823e0de1accf1075e8402"; sha256 = "0fa1ikjab52kxkrxb5lnajvwa2ims8d5sm7mi52sx1f67gb3dnb3"; }; "f0263ddc2018e02536d900df1e275809633e73a5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f0263ddc2018e02536d900df1e275809633e73a5; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f0263ddc2018e02536d900df1e275809633e73a5"; sha256 = "0likfdcz1k5acs9w9gxb4r7236ws01cwllrq8qnz3sc2ym111bm1"; }; "f04bb0803c834328c048cff05056081b1d0e8120" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f04bb0803c834328c048cff05056081b1d0e8120; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f04bb0803c834328c048cff05056081b1d0e8120"; sha256 = "0rncg0q01swbkl9pwr7jia19vgpx2yyl1bmyf6l9gz9sfmin1a1i"; }; "f0887df1b56e17573badb6af33d52f7ec6fb6138" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f0887df1b56e17573badb6af33d52f7ec6fb6138; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f0887df1b56e17573badb6af33d52f7ec6fb6138"; sha256 = "1n0gg5af4i0bm854fbv7bvinwgjqda7fbr12q4zm0wqw41r19l3s"; }; "f0ae004e1cc9e390958b1988391d02b9c74849c3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f0ae004e1cc9e390958b1988391d02b9c74849c3; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f0ae004e1cc9e390958b1988391d02b9c74849c3"; sha256 = "1k3gdybbilnkpsd2qf14gn6a0klb8ggdahmlp6wa373pvxf71vz6"; }; "f0d6a898c18d4750e572c04c2dc290f0628f238c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f0d6a898c18d4750e572c04c2dc290f0628f238c; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f0d6a898c18d4750e572c04c2dc290f0628f238c"; sha256 = "1a3ymsi7x4aw0dgb5i1yfq517x9i9fs01mb51irxaamiavxw2zdq"; }; "f13495e23590f813c800280c335b159a2f568a9d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13495e23590f813c800280c335b159a2f568a9d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13495e23590f813c800280c335b159a2f568a9d"; sha256 = "14d25nmaic3j24dl6viy09alqi63q8vw71wzi7yxyhvgzy51ajv9"; }; "f1372e2ede9021ff61444ea132b18024ee271b60" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f1372e2ede9021ff61444ea132b18024ee271b60; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f1372e2ede9021ff61444ea132b18024ee271b60"; sha256 = "113m23b78k218ag72040ggm73846xdyyyfqjc83pzx5g7gfzswyk"; }; "f13adaffef53d65d806c3eb02f96c6c7f0ac7272" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13adaffef53d65d806c3eb02f96c6c7f0ac7272; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13adaffef53d65d806c3eb02f96c6c7f0ac7272"; sha256 = "1i7kv84qdf1srg0828yl4a984pc0c5gh6iqlh2wngxrk79vpvrmh"; }; "f14abb295c0159f6c8c07119ef3cd201b5062479" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f14abb295c0159f6c8c07119ef3cd201b5062479; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f14abb295c0159f6c8c07119ef3cd201b5062479"; sha256 = "05vakydf2xgpc07262dgv8h0761jswjcpz5z4gp6kan550zx46z4"; }; "f18da05b89b485f1870ff2b88125f3c1511f8805" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f18da05b89b485f1870ff2b88125f3c1511f8805; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f18da05b89b485f1870ff2b88125f3c1511f8805"; sha256 = "1xp77cwjj0iav25hk3w7n25mzchsbxbbkqhlicvqh41y4q489sxd"; }; "f199d69df437b77400f96b6d2d4f02360535404c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f199d69df437b77400f96b6d2d4f02360535404c; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f199d69df437b77400f96b6d2d4f02360535404c"; sha256 = "1cm14f0i1k92l4flbc00gwvqnvpiwhyyx0g0rf4ssnyp2is9jhy3"; }; "f1e035fa0d8b44b2b3aeb9958e9dea3862744d82" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f1e035fa0d8b44b2b3aeb9958e9dea3862744d82; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f1e035fa0d8b44b2b3aeb9958e9dea3862744d82"; sha256 = "10k3dhgg4h26kjxrvqbvzx6vxq5v9qyi4iwk2csjpyp6xpwzb74q"; }; "f2374c3116e4d1fae6b4cbd246c9033e282a6c10" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f2374c3116e4d1fae6b4cbd246c9033e282a6c10; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f2374c3116e4d1fae6b4cbd246c9033e282a6c10"; sha256 = "07bjgb6ip8gzyckhsjwi1nlby9059givw8i7gxx09j9xmq6s6n15"; }; "f24d05b616e3f50a24367e32f8c42d68d40797a3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/f24d05b616e3f50a24367e32f8c42d68d40797a3; + url = "http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/f24d05b616e3f50a24367e32f8c42d68d40797a3"; sha256 = "01an1abvb6w7id44avc3fp35919avvqspmgl24ygp872xz6g5glh"; }; "f268daf62521a638834ffec5779bd359e0ffe63d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f268daf62521a638834ffec5779bd359e0ffe63d; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f268daf62521a638834ffec5779bd359e0ffe63d"; sha256 = "0z4zbyjm9vlzk14r80j9ka8hdinylnbmf43mpna4rva27rqwsprh"; }; "f279ae70e30f66de7b592409e9ed96993301657f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f279ae70e30f66de7b592409e9ed96993301657f; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f279ae70e30f66de7b592409e9ed96993301657f"; sha256 = "057dpl4pgjd8p98vik95gwdj2z42al9ibr210h1j92jdvyjxg99z"; }; "f286035c2605a855fb9dda2fc06bb71648b1dbe6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/f286035c2605a855fb9dda2fc06bb71648b1dbe6; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/f286035c2605a855fb9dda2fc06bb71648b1dbe6"; sha256 = "10vsqbadg5y58skq4p79vdxlkwqqfvac5v91kq4dflgcs4h05960"; }; "f288cbb85cc9eecfcf90abe6376c32c54435f879" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f288cbb85cc9eecfcf90abe6376c32c54435f879; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f288cbb85cc9eecfcf90abe6376c32c54435f879"; sha256 = "077rd0cqcpl629niwgs2qldrh4ld2xyiskg5x32m9igfwkq8dxyv"; }; "f2c0ebdd94707b207218226a42b19201386b9713" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/f2c0ebdd94707b207218226a42b19201386b9713; + url = "http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/f2c0ebdd94707b207218226a42b19201386b9713"; sha256 = "126bhrrj1q7b04wpbiyk1c8j9dpnkinfmm47z330jwis5mblrzzy"; }; "f2cc42adcfafd68a62e7d1b7e6af4e4968c0be10" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/f2cc42adcfafd68a62e7d1b7e6af4e4968c0be10; + url = "http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/f2cc42adcfafd68a62e7d1b7e6af4e4968c0be10"; sha256 = "0kqv0iiy4fmcnbizc17kl3h8jv1knvn0h687fdjk68jhpkfh1fmv"; }; "f2dfdcb3b2d9423b17c83e2bf5fea37b9bee4681" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f2dfdcb3b2d9423b17c83e2bf5fea37b9bee4681; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f2dfdcb3b2d9423b17c83e2bf5fea37b9bee4681"; sha256 = "1p8dafdpjr058agppmhm2b5flsgk43f7rzisiplhw3qbmxn8s98x"; }; "f2e462f932cdcf953218a6d7c9cf6aeebf7dbfe4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/f2e462f932cdcf953218a6d7c9cf6aeebf7dbfe4; + url = "http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/f2e462f932cdcf953218a6d7c9cf6aeebf7dbfe4"; sha256 = "07ypkcwj25x76055p99z54qramz975wlk3px6wy827i79zpgfx7s"; }; "f3543f8286961b827b3ed3afa8f7663b98d38b90" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/f3543f8286961b827b3ed3afa8f7663b98d38b90; + url = "http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/f3543f8286961b827b3ed3afa8f7663b98d38b90"; sha256 = "09lc3lpn3d0hqpldqld38l7lgdj9xscnnsamly8bxcajm3y3d9vr"; }; "f355e6bd836583380c61a5ed5a0c5d6150fe7542" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f355e6bd836583380c61a5ed5a0c5d6150fe7542; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f355e6bd836583380c61a5ed5a0c5d6150fe7542"; sha256 = "1pblr5r97iwmyv1j54hgsisdp4f7vp3l8mwj8zkiggk7nih7yi03"; }; "f380b2adccc3afba7a9a9a501560525a8359a651" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f380b2adccc3afba7a9a9a501560525a8359a651; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f380b2adccc3afba7a9a9a501560525a8359a651"; sha256 = "0dh4k513j0q3h4ja144825fcc4cib1pfzjcpsr79kaj0villfp6i"; }; "f38889741341129aaa57f66f2c36e093673c46ea" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f38889741341129aaa57f66f2c36e093673c46ea; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f38889741341129aaa57f66f2c36e093673c46ea"; sha256 = "0nazhgzcmmrkkdjfqp29q2m01ca09cg2wwa23nvrjxra1bx394p4"; }; "f3a58411dee61c2a7993eb792fffd09b343e42eb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f3a58411dee61c2a7993eb792fffd09b343e42eb; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f3a58411dee61c2a7993eb792fffd09b343e42eb"; sha256 = "1xffc2cbd8ccs1sw7yy8vvqy9pvngg5jwlp4g8hnyvvf2jpd0532"; }; "f441f0d4f281e728c3ca0c5b5f0e5838637eefba" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f441f0d4f281e728c3ca0c5b5f0e5838637eefba; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f441f0d4f281e728c3ca0c5b5f0e5838637eefba"; sha256 = "122bsyzki9w8b2yz5l68k6yz9r4w7zs1949ii0ccy2d5dd707zzk"; }; "f44c1c4d05656c9a8e943d8738705031cef49e0b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f44c1c4d05656c9a8e943d8738705031cef49e0b; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f44c1c4d05656c9a8e943d8738705031cef49e0b"; sha256 = "0piwkmqxqgp7i6r5z39xv1yqwx4v7k01yy2l4j70fbqa8zcvikdw"; }; "f4569ad2ff2b2fc1e09a93d172caa5084bdfe887" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4569ad2ff2b2fc1e09a93d172caa5084bdfe887; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4569ad2ff2b2fc1e09a93d172caa5084bdfe887"; sha256 = "0hnzdxvy9l3jwp6mp9hfvgks9mikpbhkdnv9dc3ydyw46f8d8m6f"; }; "f49df27b644738c41a183cbea4451a65d6ed937d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f49df27b644738c41a183cbea4451a65d6ed937d; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f49df27b644738c41a183cbea4451a65d6ed937d"; sha256 = "1j2y6x1yilb35snqpsfz4d253hry23zbc2i1cas05yz7j06d248a"; }; "f4ac5ca56e38b43436485f6d2a480e5bc47d1e3c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f4ac5ca56e38b43436485f6d2a480e5bc47d1e3c; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f4ac5ca56e38b43436485f6d2a480e5bc47d1e3c"; sha256 = "1cpdciik3mh3nh4z255yja75fpvsq1bfiwd5zlia95ypvfvvabyf"; }; "f4b57562abffd4d02b186411d743d78de996f9c1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/f4b57562abffd4d02b186411d743d78de996f9c1; + url = "http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/f4b57562abffd4d02b186411d743d78de996f9c1"; sha256 = "0lih22kxxnrnq7bg6hgmcszrjqidh89z6kz38c607wfgqks3f3fm"; }; "f4e5c321293ab07639b720b5f3c43e81d2476f5d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f4e5c321293ab07639b720b5f3c43e81d2476f5d; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f4e5c321293ab07639b720b5f3c43e81d2476f5d"; sha256 = "1rrzw4yms3rfdxb51sz6lfzh7w34v79fb6nlmqhs7zgjqg7nj5rq"; }; "f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74"; sha256 = "1ynp6x1zwx4kahvjp7c3k62f5kimg37l28v1jxrk42c6c590a9k1"; }; "f4f52945149f9b540099572fcd29c911f8f8fc18" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f4f52945149f9b540099572fcd29c911f8f8fc18; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f4f52945149f9b540099572fcd29c911f8f8fc18"; sha256 = "05jp9y3bsm2a5vyr6azbgn6isiw00wld1vbyw8f5sc7j4rbr2c8c"; }; "f51cdb5d1eca4ab02befd826a9ff14a8d168ba9d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f51cdb5d1eca4ab02befd826a9ff14a8d168ba9d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f51cdb5d1eca4ab02befd826a9ff14a8d168ba9d"; sha256 = "0089lky37w6yfm4xlwqdlrdj3jj6k3bkyhw3nbhprlf94r8h8s5s"; }; "f56a72b63003eb41d4300d8b2b39b21f53acfc8c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f56a72b63003eb41d4300d8b2b39b21f53acfc8c; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f56a72b63003eb41d4300d8b2b39b21f53acfc8c"; sha256 = "0a0f4vfpncifw87j6h0ajnzwhk9d0s35l5s5dad6rp0ijh6d5axv"; }; "f56edcc07a586e9b6792c219e9e8eca444362bfa" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f56edcc07a586e9b6792c219e9e8eca444362bfa; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f56edcc07a586e9b6792c219e9e8eca444362bfa"; sha256 = "1nk5jxlgscmsv9hnjqprsbkvc2g3wcdqx04xhnzcr992b4xr7p9a"; }; "f5a791771dabe2848c00de5551dea8e2ec534cc5" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f5a791771dabe2848c00de5551dea8e2ec534cc5; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f5a791771dabe2848c00de5551dea8e2ec534cc5"; sha256 = "0wrs36vv55lzbzn2ixqyjnf15mf41xzbw7fvfgzcdxcmpscc76cy"; }; "f5a8823af793b1af1d0d25d57df351ef32bf3d40" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f5a8823af793b1af1d0d25d57df351ef32bf3d40; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f5a8823af793b1af1d0d25d57df351ef32bf3d40"; sha256 = "171lmzp6i9l2inwhpcif35v8j00dg44ipfkq1fxay58iinqjk9x1"; }; "f5d3ceb33b27c7cfc4a8e4689a6b49f594aea8e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/f5d3ceb33b27c7cfc4a8e4689a6b49f594aea8e3; + url = "http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/f5d3ceb33b27c7cfc4a8e4689a6b49f594aea8e3"; sha256 = "0pfplb9yqmhzxzkafhi8j5c8s7y9wqywrzxs7av8hnrhxxj0nasa"; }; "f602c209a799d0cc6814312718f806f70e09062b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f602c209a799d0cc6814312718f806f70e09062b; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f602c209a799d0cc6814312718f806f70e09062b"; sha256 = "1kjb7vbq5xqz9wdbcwsyayr6mrl5r6zczqb7pjpgavwx7kfk5xw8"; }; "f65aee70832fe31db72589b465574d372fa46ea9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f65aee70832fe31db72589b465574d372fa46ea9; + url = "http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f65aee70832fe31db72589b465574d372fa46ea9"; sha256 = "14vany0873b0hsa28g724fj1zrk2ls4jwjrhs379wxmddhllrrfv"; }; "f6fadd3d388c12b5d7246b025244646c62920fdc" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f6fadd3d388c12b5d7246b025244646c62920fdc; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f6fadd3d388c12b5d7246b025244646c62920fdc"; sha256 = "1qx4xdscnfg5aha11sfvkqrp5w7db2idwhak9vph9fd5r2kg9anx"; }; "f6fdc33805bc89e2eaff8003a996f6bf8f880789" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f6fdc33805bc89e2eaff8003a996f6bf8f880789; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f6fdc33805bc89e2eaff8003a996f6bf8f880789"; sha256 = "1r5hx97nasmk8m37pw490im1fq85q35khjpm5kq36byly3f6nvph"; }; "f7301b809afdfc0f640f1ae1c5683ff024e82766" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f7301b809afdfc0f640f1ae1c5683ff024e82766; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f7301b809afdfc0f640f1ae1c5683ff024e82766"; sha256 = "1bnbh14kj5ywifry0xnbzz1j9shnxizwamvi94ddjxidxacg8byh"; }; "f7543772618d958884a94ad5d6a90a39de6049c2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f7543772618d958884a94ad5d6a90a39de6049c2; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f7543772618d958884a94ad5d6a90a39de6049c2"; sha256 = "1hl95yhmxgs6qwrg4fjlk1klqdf7wdssid60ysm7dyqcaf0pxq1s"; }; "f7a44be87cd8b2cc22a5c6580998902cd597ffac" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/f7a44be87cd8b2cc22a5c6580998902cd597ffac; + url = "http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/f7a44be87cd8b2cc22a5c6580998902cd597ffac"; sha256 = "0zcdg0hyrb57wl3hy3w5mh1jibd31k9lcj3sa1bqx1wvgy3axs35"; }; "f7f52ad80e2bfa86c133febe8231fb1c1f321c68" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f7f52ad80e2bfa86c133febe8231fb1c1f321c68; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f7f52ad80e2bfa86c133febe8231fb1c1f321c68"; sha256 = "1wmasx8b2vjprs16iz2mm6djd0f9j5j2jp9mii9s55hqlc2x3zlv"; }; "f7ff067e31d48918ce41494b39f2f30c48890e55" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f7ff067e31d48918ce41494b39f2f30c48890e55; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f7ff067e31d48918ce41494b39f2f30c48890e55"; sha256 = "1xz599vrazq3gk6jcdnsrvg20dy6dfsjacm71fgi61ja9mb85kbx"; }; "f859df604a7deb221be8fb75f5eabac9a4518834" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/f859df604a7deb221be8fb75f5eabac9a4518834; + url = "http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/f859df604a7deb221be8fb75f5eabac9a4518834"; sha256 = "1mh460676fcx2557fjkfkvwl2ahxwadqyfa5axaf07fss3dnj865"; }; "f859fcf20b1d5912f1dd1fba6f9bd4393a014968" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f859fcf20b1d5912f1dd1fba6f9bd4393a014968; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f859fcf20b1d5912f1dd1fba6f9bd4393a014968"; sha256 = "0nqg6j8kxhs5qrriaycj0ihv5hwwj8h5w4a9zjs2c23982cxgd6y"; }; "f8a7fca733ca940a07647121bde451787b5afb66" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f8a7fca733ca940a07647121bde451787b5afb66; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f8a7fca733ca940a07647121bde451787b5afb66"; sha256 = "18kg4v54a769z22py9zzm4llz6r8kf38nm1i54704mkm5py2h35l"; }; "f8deb83eeba474abd3c4332328d32de585f40d2e" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f8deb83eeba474abd3c4332328d32de585f40d2e; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f8deb83eeba474abd3c4332328d32de585f40d2e"; sha256 = "0ra7znx005gdyzybn66246bwjdkx3bwmzi99k0wqc8h3np0x3vh4"; }; "f938e9fb108c5df460b316ad63f8e4d43de264a9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f938e9fb108c5df460b316ad63f8e4d43de264a9; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f938e9fb108c5df460b316ad63f8e4d43de264a9"; sha256 = "0xy3y79i0arjb3qcmq1psd3xbync91zbdfyxg2w542iviwcqx8b9"; }; "f9b69d517e1417f8099af43fbb448801dd00c40d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2539301-e5e4001afc404628b562e71e48fbe47f/f9b69d517e1417f8099af43fbb448801dd00c40d; + url = "http://cdn.unrealengine.com/dependencies/2539301-e5e4001afc404628b562e71e48fbe47f/f9b69d517e1417f8099af43fbb448801dd00c40d"; sha256 = "1813v1a3aaxpsa8fwfkwc5ik9fks5fcs1xy1spdag422iqg7752r"; }; "f9c0960de898d46640b7767a29c2119310539a4c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/f9c0960de898d46640b7767a29c2119310539a4c; + url = "http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/f9c0960de898d46640b7767a29c2119310539a4c"; sha256 = "0vj3giryjmh9g43bngrimn0qm7lv41hsgwd034db6n341q2dcpsc"; }; "fa0f4ef2e4265e7a8b79791ead562e32bf436c05" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/fa0f4ef2e4265e7a8b79791ead562e32bf436c05; + url = "http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/fa0f4ef2e4265e7a8b79791ead562e32bf436c05"; sha256 = "1570238pvmaj2id29whvch7hn8914b2d8adf0gy6mcckgrjlx8d9"; }; "fa392f24144f8018b8a29676f4cae4fe188e7a7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/fa392f24144f8018b8a29676f4cae4fe188e7a7b; + url = "http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/fa392f24144f8018b8a29676f4cae4fe188e7a7b"; sha256 = "024xcvz6jh5zvx65rrip7wwrixpzdc3ww1kp6711w15qdv5nsqhk"; }; "fa3c3cf43525a5cf7e63f9b4de6d7441a0e826af" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fa3c3cf43525a5cf7e63f9b4de6d7441a0e826af; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fa3c3cf43525a5cf7e63f9b4de6d7441a0e826af"; sha256 = "172birg7k18453hdz4smcr28n1dg3pvb8p3w8knjqmmg8kgy6lqv"; }; "fab186b2b42815a73845c32093d591f8d4623f0a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fab186b2b42815a73845c32093d591f8d4623f0a; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fab186b2b42815a73845c32093d591f8d4623f0a"; sha256 = "1h55af59wbw1rq5gxrca12k1f9n65kxrqnp5bczvlmcm1nb3gi1h"; }; "fab30d459fc6efe51b656ac70e86c70a8772e5ae" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/fab30d459fc6efe51b656ac70e86c70a8772e5ae; + url = "http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/fab30d459fc6efe51b656ac70e86c70a8772e5ae"; sha256 = "0zfymfssbgb22ixpqsiylyzygs331w5dnkjwqs1i6nwi5i2i83ds"; }; "fac6370a5441886d40a7aa7b4494da0c3304b397" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fac6370a5441886d40a7aa7b4494da0c3304b397; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fac6370a5441886d40a7aa7b4494da0c3304b397"; sha256 = "1y3b4rs1ca5v0imxx7iijr9lzxawf4brjdm62haxv6wadaqd27qm"; }; "fb092729cca1243487ce2f17b83e612ee2e645f0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb092729cca1243487ce2f17b83e612ee2e645f0; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb092729cca1243487ce2f17b83e612ee2e645f0"; sha256 = "136ddzazdpyzk4178g7c88adh50c91bcnv993z87fny2yzc71rh8"; }; "fb175aabdcfafb6d77b5b7bad0de2c37cbabac81" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fb175aabdcfafb6d77b5b7bad0de2c37cbabac81; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fb175aabdcfafb6d77b5b7bad0de2c37cbabac81"; sha256 = "06hxp3g03bk3dvwnif9f5yhl6fc4dah722x5sabhi9pphq0z3ckc"; }; "fb4d3c4309ce988d3ebc299d517c232e83fdfe7b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fb4d3c4309ce988d3ebc299d517c232e83fdfe7b; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fb4d3c4309ce988d3ebc299d517c232e83fdfe7b"; sha256 = "1qkg8zi3czwsija16npjjgfkb2k15q6zrrp3f6nz6mn6443248my"; }; "fb634cba7663cb05cb4751272114071ba34cc677" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb634cba7663cb05cb4751272114071ba34cc677; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb634cba7663cb05cb4751272114071ba34cc677"; sha256 = "0qd9raqdaw6ayza6ii6hs79ah97pb957bb22azvijmk6p2a81krz"; }; "fb807fd862137423f4c6611e8ee553e2b04a62e7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fb807fd862137423f4c6611e8ee553e2b04a62e7; + url = "http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fb807fd862137423f4c6611e8ee553e2b04a62e7"; sha256 = "14b8pbm93xd7nrb7spwb1wpsiyrqksb25y4mfn2inaismakzxq8p"; }; "fb8b95b64656d46eb01aeb66dc7607697828e39f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb8b95b64656d46eb01aeb66dc7607697828e39f; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb8b95b64656d46eb01aeb66dc7607697828e39f"; sha256 = "1bznalkd43vbl6x5p0mwpnjmjvs91l2v0nscling0csxkkkrna1w"; }; "fbc4c9072ed5c93f777e5f6fe6f43486862fa0b8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2613671-efa8cb7212aa45139aff99785a99f6c2/fbc4c9072ed5c93f777e5f6fe6f43486862fa0b8; + url = "http://cdn.unrealengine.com/dependencies/2613671-efa8cb7212aa45139aff99785a99f6c2/fbc4c9072ed5c93f777e5f6fe6f43486862fa0b8"; sha256 = "0kxdjzwk81ixnxxfp4wmn19qq2lbdgv1xic01mpdp00naxzw6s68"; }; "fc571a1d0a7202a062ecd269c06a2308ab378cb4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc571a1d0a7202a062ecd269c06a2308ab378cb4; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc571a1d0a7202a062ecd269c06a2308ab378cb4"; sha256 = "1zfdsd060m1njrkx2hlw7bcwpff23pggyklza2hpdj9k6h3jmdn2"; }; "fc71358f88c1a01c32f496b064386dba3145a36a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc71358f88c1a01c32f496b064386dba3145a36a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc71358f88c1a01c32f496b064386dba3145a36a"; sha256 = "1sq6f7zpmbqq9b27irf4xx8zg9p906xfpgsdxyrzgwf15vqc3cxc"; }; "fc72803a9439e161de25108be11e5429ed900f77" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc72803a9439e161de25108be11e5429ed900f77; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc72803a9439e161de25108be11e5429ed900f77"; sha256 = "1nhbsry6l2wb1w8rv4lkzp42r0iqfhd5r21ckxz10gsngf9v8d5z"; }; "fc7b29cbf72c69bffecb661d7345ac5be329c14d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/fc7b29cbf72c69bffecb661d7345ac5be329c14d; + url = "http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/fc7b29cbf72c69bffecb661d7345ac5be329c14d"; sha256 = "0gqb44kivk31lyrmvnfff65sb0llaqi04vc3270366x5h4sii9n9"; }; "fc97754c9af277910c57351443a42a210b2eb8a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc97754c9af277910c57351443a42a210b2eb8a2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc97754c9af277910c57351443a42a210b2eb8a2"; sha256 = "047psrjpddw50plbk1al6wgapzcdhzs8a7g0h2pypwiknxkw09cy"; }; "fc9d37a2c0ab6854c6b039c509d86b9459982472" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc9d37a2c0ab6854c6b039c509d86b9459982472; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc9d37a2c0ab6854c6b039c509d86b9459982472"; sha256 = "1p8j4q0blxpi9lblbyvix6w0vnds1yxn7ydq4z3qqaxmnixv9kvf"; }; "fcaba3584b9391b167f49dfe53afe253623ada36" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/fcaba3584b9391b167f49dfe53afe253623ada36; + url = "http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/fcaba3584b9391b167f49dfe53afe253623ada36"; sha256 = "11dfccim0y3z9pw8hy0z0pqam8wcs3pn5sdr3yjd3g097hz2firp"; }; "fd441937ce92861563e4bd9e3619d5d9cdf73a55" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fd441937ce92861563e4bd9e3619d5d9cdf73a55; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fd441937ce92861563e4bd9e3619d5d9cdf73a55"; sha256 = "0fbyr6sax9j9mxfa86waw8v499yzb3sk4pqfsykcamy9dvzav6hm"; }; "fd44fdad76da5efbaf3bced1a5d2bf12eb028b35" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd44fdad76da5efbaf3bced1a5d2bf12eb028b35; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd44fdad76da5efbaf3bced1a5d2bf12eb028b35"; sha256 = "141rnzqcg3p51saqqd54bl5nj7f5kkm6ysvbcmlcpd5qmxg0swqb"; }; "fd521968de6928ff3ba9e7a3568d3190fc56573a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd521968de6928ff3ba9e7a3568d3190fc56573a; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd521968de6928ff3ba9e7a3568d3190fc56573a"; sha256 = "0gxwqdk6d6lg3akvn5ydvr2jr2ywq4w38ql0ck1xxj8p5jnwh90m"; }; "fd5c39fee72ecaed24e8e462a4a71a69c06e4509" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fd5c39fee72ecaed24e8e462a4a71a69c06e4509; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fd5c39fee72ecaed24e8e462a4a71a69c06e4509"; sha256 = "0jfdv5cbgqczza53gd35qgxykxa1660rj5r7p57kbyfhhn116785"; }; "fd621bb2eef661c744d767a89b7b835495af2a90" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fd621bb2eef661c744d767a89b7b835495af2a90; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fd621bb2eef661c744d767a89b7b835495af2a90"; sha256 = "14pfnxzc77k809m22l6arqpi2rzdm8f5s07hkqn7ikvddyh55snq"; }; "fd63513879784b9901479056b82fc51c57ba8666" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fd63513879784b9901479056b82fc51c57ba8666; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fd63513879784b9901479056b82fc51c57ba8666"; sha256 = "0qcxd2x5lhj2vkpc99y8yh0knsx0cnbr6h6zpv35ympybxffdm9r"; }; "fd9f084abed9009fd3d7585637980961e5ac37c9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/fd9f084abed9009fd3d7585637980961e5ac37c9; + url = "http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/fd9f084abed9009fd3d7585637980961e5ac37c9"; sha256 = "1q21jh1pnq2hnc5pyx2bvjivly9d83mf3kh5xsvxgz73sviqr42h"; }; "fdb6c138bd7f73ccfc7a2324408b8199fe18c5c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdb6c138bd7f73ccfc7a2324408b8199fe18c5c8; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdb6c138bd7f73ccfc7a2324408b8199fe18c5c8"; sha256 = "1sapx3lsi13mz76vljdiwddq5say5ing9jpckjpsg9vvzwpmd03k"; }; "fdddaa298c770236e8e0ae3fa46d56ab464ff590" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdddaa298c770236e8e0ae3fa46d56ab464ff590; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdddaa298c770236e8e0ae3fa46d56ab464ff590"; sha256 = "0psr2i314z03ispws9cr2wfk6vq9l0fwcw1vz65rcns7i24l4bii"; }; "fdea9eb5b7adc1f8cdca84ff533afa9978bc74e2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdea9eb5b7adc1f8cdca84ff533afa9978bc74e2; + url = "http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdea9eb5b7adc1f8cdca84ff533afa9978bc74e2"; sha256 = "17pnggfb9aj0lahbbs0blfiywdz53bszbrh4bx0n86viyls5g36r"; }; "fe108abb775ce219aed6c508fa1d8d9ec9710c50" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe108abb775ce219aed6c508fa1d8d9ec9710c50; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe108abb775ce219aed6c508fa1d8d9ec9710c50"; sha256 = "0qknlj971xn147z7992idp3hbwif2fqy02ml8jbxah4v82d1ssdk"; }; "fe26cc5b44599296ab8cca48bf52350d32f5ccf3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe26cc5b44599296ab8cca48bf52350d32f5ccf3; + url = "http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe26cc5b44599296ab8cca48bf52350d32f5ccf3"; sha256 = "154jg46kbbfn7ipjap4s8bgfjhzazj3pd2n7yd009drw2l1ald1q"; }; "fe2fd0043d9dceb3bd974fd46a7f657222f0068f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/fe2fd0043d9dceb3bd974fd46a7f657222f0068f; + url = "http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/fe2fd0043d9dceb3bd974fd46a7f657222f0068f"; sha256 = "0rq7hnir60k0ncfk0qzin2fk8w2m9l9259qzx7cryf9hvssy1vxq"; }; "fe34956f65e0611aa1584ca611b7843e22e3e29f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fe34956f65e0611aa1584ca611b7843e22e3e29f; + url = "http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fe34956f65e0611aa1584ca611b7843e22e3e29f"; sha256 = "1hnasgpz4ml4095nnr1936jfx09vfajib3g9szrwdy0bf9rcrdh8"; }; "fe39e5851d68399087d05d9c22da12a1fdd7b6de" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fe39e5851d68399087d05d9c22da12a1fdd7b6de; + url = "http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fe39e5851d68399087d05d9c22da12a1fdd7b6de"; sha256 = "1rfaalg6rbc1w45b5iipb81n6y0mdqkf1ylfphzbchpqliipl5ba"; }; "fe79883294e7b730b4ea0e6e72c662ced28e999b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/fe79883294e7b730b4ea0e6e72c662ced28e999b; + url = "http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/fe79883294e7b730b4ea0e6e72c662ced28e999b"; sha256 = "0rc7vagcgn74cg4vkzhkhy0jyv5wphacb3kd8kfxzidb1v92k4br"; }; "fe94f39680410922eeef278b013e20b5ee27e7fe" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/fe94f39680410922eeef278b013e20b5ee27e7fe; + url = "http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/fe94f39680410922eeef278b013e20b5ee27e7fe"; sha256 = "0wllmwfggykl56kwb92jdz8rcfvrn4hxvj9mav19sc9fg2dibfzf"; }; "fecddbf47598e42c13644ce42253e7ca8178eb29" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fecddbf47598e42c13644ce42253e7ca8178eb29; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fecddbf47598e42c13644ce42253e7ca8178eb29"; sha256 = "0xwi7xa1jm012lmxhz3al7yhwwv33qz332bqvwamcza63ir6zpw9"; }; "fed2a12f5d40235d6295fed1092707889ff01b08" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fed2a12f5d40235d6295fed1092707889ff01b08; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fed2a12f5d40235d6295fed1092707889ff01b08"; sha256 = "08cyqg80grwpmv9fkm7nldz8p12nzssg08cyijc4d5afx6xddym4"; }; "ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d"; sha256 = "03vknw5a43n6kl3llyk7czg5a0w4fkic29b6d8i0q71jxknizf50"; }; "ff61432b09f3c5882ed0f5f932a0537f38cde5cf" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ff61432b09f3c5882ed0f5f932a0537f38cde5cf; + url = "http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ff61432b09f3c5882ed0f5f932a0537f38cde5cf"; sha256 = "08qcnz8qrxqrrhsll0n9k49cp6fqiacl85n0jhq53jsh805hlw2b"; }; "ff66ba394c099b33decda558509ec6f4fdb43892" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ff66ba394c099b33decda558509ec6f4fdb43892; + url = "http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ff66ba394c099b33decda558509ec6f4fdb43892"; sha256 = "12qmiff7fynifhpaivsyg23v6jm89i903dhqqs2xiihbd77ln8lb"; }; "ffd25a14ee418633d47a558d3a953c501f56e2f3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ffd25a14ee418633d47a558d3a953c501f56e2f3; + url = "http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ffd25a14ee418633d47a558d3a953c501f56e2f3"; sha256 = "0kclig15z3ywc7mb0xyv5pvijkzzj4llimij5hqagwwdgi31rirg"; }; "ffe1832c9002fb490bd976e6906fe43792e2e487" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ffe1832c9002fb490bd976e6906fe43792e2e487; + url = "http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ffe1832c9002fb490bd976e6906fe43792e2e487"; sha256 = "1n5q3v765kblvn9z74jdgxj1f1qdqpnypx1i00xf8ni5if5w183d"; }; "ffe4b29f6febe2e6345b292bd341aefed751ae1d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/ffe4b29f6febe2e6345b292bd341aefed751ae1d; + url = "http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/ffe4b29f6febe2e6345b292bd341aefed751ae1d"; sha256 = "159bff8wiz2smjl34l7d581wyy9ihxr576s4blq8hdqkm1wl0va9"; }; "025037991170960704b2d2a49e7bf37cebf06b85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/025037991170960704b2d2a49e7bf37cebf06b85; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/025037991170960704b2d2a49e7bf37cebf06b85"; sha256 = "05p86qn4g7qg9wzz62piksf2xi599hyim2bqi38158qrmfmqigdw"; }; "091a839006f281b7b12ee0d1bd0fff225f0ac73a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/091a839006f281b7b12ee0d1bd0fff225f0ac73a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/091a839006f281b7b12ee0d1bd0fff225f0ac73a"; sha256 = "0m79g350p4gv3yb13i5921gbcc7bx852p5lmivfpwx3wqvghd5pz"; }; "09dbd9ce439ba4adad23922f5b9002fa4e759bd1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/09dbd9ce439ba4adad23922f5b9002fa4e759bd1; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/09dbd9ce439ba4adad23922f5b9002fa4e759bd1"; sha256 = "188f2j0ik5c2cmw5ck386diabc24p57yhqrb4c7303d13dnqr1mm"; }; "0c416ae48c3e2ad2be1333ccc20f6992ce982aa4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/0c416ae48c3e2ad2be1333ccc20f6992ce982aa4; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/0c416ae48c3e2ad2be1333ccc20f6992ce982aa4"; sha256 = "1bm210fw20prl3k51dr9gai3asdg3kq30diln70lgm9wyk18kiv4"; }; "117189ccfc8241744b0cde19d866507341334ea0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/117189ccfc8241744b0cde19d866507341334ea0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/117189ccfc8241744b0cde19d866507341334ea0"; sha256 = "1nv2s6g8i7scqgwbqgsyicys2cwaf3mkvcqqvpc807ag2ad3rxl6"; }; "12164f23f40b93eb0a4cf6f0acb58596becc8f2f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/12164f23f40b93eb0a4cf6f0acb58596becc8f2f; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/12164f23f40b93eb0a4cf6f0acb58596becc8f2f"; sha256 = "0px9qidckfldj9b9znxg31alsqrzzgpfjixr003lv410hbn099ir"; }; "1580d9078ae389f2cea6d568fc4ea0b0ebd5d183" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1580d9078ae389f2cea6d568fc4ea0b0ebd5d183; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1580d9078ae389f2cea6d568fc4ea0b0ebd5d183"; sha256 = "1xffqr3bhd4x5h36vk4dnz0hmc64gjg273ysnn68x9k2zdqgdmj0"; }; "1c44fa7c763743e619fef130346733eb5f107049" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1c44fa7c763743e619fef130346733eb5f107049; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1c44fa7c763743e619fef130346733eb5f107049"; sha256 = "05nms6yrclw38v6180b4bqswwdmlb7l2l388wj4f7i0zi9cc0z1d"; }; "1f209ff22ef667820d2143b0bef1783612c2dc33" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1f209ff22ef667820d2143b0bef1783612c2dc33; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1f209ff22ef667820d2143b0bef1783612c2dc33"; sha256 = "1w6prwjci9fbp4jln2dl0pdjjiis30r982cjk261jb7ryrzm1bc6"; }; "2a13498d62f2897b95a2fde8f9117caf2213369d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2a13498d62f2897b95a2fde8f9117caf2213369d; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2a13498d62f2897b95a2fde8f9117caf2213369d"; sha256 = "11khy0pbyqbchzksfp51ihw8ahgpf9kvby6jp2spwf4cqglr4yzj"; }; "2c0a73c42dae723ea6ada9f3a83b520b4094655f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2c0a73c42dae723ea6ada9f3a83b520b4094655f; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2c0a73c42dae723ea6ada9f3a83b520b4094655f"; sha256 = "1gm11rsybfsdsbzbyrfwvp1wpy9x84plgwayv59qmn4j15hz7hya"; }; "2ea89fc7cf11ce2e9f8bd6df71dd99eff85bcc15" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2ea89fc7cf11ce2e9f8bd6df71dd99eff85bcc15; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2ea89fc7cf11ce2e9f8bd6df71dd99eff85bcc15"; sha256 = "1zn4b57cf0w74m125iihbn2yjba95v22pn8gxq49qrfg5aci928r"; }; "2f7a26433cf0506c014fcc5694c194b28a811006" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2f7a26433cf0506c014fcc5694c194b28a811006; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2f7a26433cf0506c014fcc5694c194b28a811006"; sha256 = "0ikgmmv133lamgmm5dah5sy50pr5g1125bw8rx4l27mgbz5yq276"; }; "316245a9c9d050b2bce9f47deafb0baa66af6347" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/316245a9c9d050b2bce9f47deafb0baa66af6347; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/316245a9c9d050b2bce9f47deafb0baa66af6347"; sha256 = "1389lmbg8dby7g14yq8jphvzdzswnwhkpm8aqa3h74ivnpabnpni"; }; "3536f544f9e91433e6939163fb611c524a5f468f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3536f544f9e91433e6939163fb611c524a5f468f; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3536f544f9e91433e6939163fb611c524a5f468f"; sha256 = "0wm2djjaksndivynjdz0f2c56a792r6q13vi19baipm0hglbaq3w"; }; "3663f96dbca6fd930e000a6617a3bb214a6ee0f0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3663f96dbca6fd930e000a6617a3bb214a6ee0f0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3663f96dbca6fd930e000a6617a3bb214a6ee0f0"; sha256 = "0qhpfkja24fxnzgl6vihwz2ilvz0jsdk04g5jn5r08iv90klj5c8"; }; "3d32ebca9fef4352a99f2e0636ac45e9d3b35d03" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3d32ebca9fef4352a99f2e0636ac45e9d3b35d03; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3d32ebca9fef4352a99f2e0636ac45e9d3b35d03"; sha256 = "02dsfahlg3fcvzb9aqxiycwd5vcb0q205gbzrh3x5m989flyrs1y"; }; "44c8dbacafb32300e6af2a0cf5897e5145c2b7f4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/44c8dbacafb32300e6af2a0cf5897e5145c2b7f4; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/44c8dbacafb32300e6af2a0cf5897e5145c2b7f4"; sha256 = "1vjyvp13qbfmv5jgdbicikhjq6wm9216ikqk23w1qsz0xzbn9wb9"; }; "4511815cd4297243a8afd7a2e799c60880a6ea95" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4511815cd4297243a8afd7a2e799c60880a6ea95; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4511815cd4297243a8afd7a2e799c60880a6ea95"; sha256 = "1rw6h3sc30ypr6304mjg6pzh841wmn5gjd4a3xv4y681nqys30li"; }; "4d9e2249062c1ccd50913501cbc7ea2fdb8cc94c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4d9e2249062c1ccd50913501cbc7ea2fdb8cc94c; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4d9e2249062c1ccd50913501cbc7ea2fdb8cc94c"; sha256 = "0z86cczszfk05fmcd7dwfahnv0cm1wj7xq0yr0i332a7jr0g5s6d"; }; "4e3bb620861aa7c3d996fd8ee7cd3a40c2096bb0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4e3bb620861aa7c3d996fd8ee7cd3a40c2096bb0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4e3bb620861aa7c3d996fd8ee7cd3a40c2096bb0"; sha256 = "0l9bfkanklr3zywkyn4lb5lzfpqkhr4c4n6kvw9gi4nzg063ifnh"; }; "574e359a11791294117e7f4ad4f677a99424170a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/574e359a11791294117e7f4ad4f677a99424170a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/574e359a11791294117e7f4ad4f677a99424170a"; sha256 = "1vhnylasbla79d2syx41804pshyd7w8ph1y88yyjp5w9g8zbcy0g"; }; "5756967d4a6019de75418949a564995c64fd81b1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5756967d4a6019de75418949a564995c64fd81b1; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5756967d4a6019de75418949a564995c64fd81b1"; sha256 = "1fy2h21myp9yzc60545appg75in12f13rslhr7bpmsssgjrrz2fg"; }; "5c884c59ad7491166618894713300acc03499f45" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5c884c59ad7491166618894713300acc03499f45; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5c884c59ad7491166618894713300acc03499f45"; sha256 = "19zrbvfnmhivs7gy0bm92kn04fqyc8179mkir5v4wycx7q24w938"; }; "5ea84c79c69cb4f20a2cbde31b1e9655f352f1c8" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5ea84c79c69cb4f20a2cbde31b1e9655f352f1c8; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5ea84c79c69cb4f20a2cbde31b1e9655f352f1c8"; sha256 = "02rhs442s9y67kb8gympr42yl3xxx3d34iwqz926gr5721if0gh0"; }; "60be604621599e16ffec1f76e08339b6f9d89f8d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/60be604621599e16ffec1f76e08339b6f9d89f8d; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/60be604621599e16ffec1f76e08339b6f9d89f8d"; sha256 = "1nyll0lj0fmdphmah4zd5n6bn2zgy2sgff6mnwch2mm6bvxmgzlm"; }; "659b18633abf461608be32b8b565f4b70725ee20" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/659b18633abf461608be32b8b565f4b70725ee20; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/659b18633abf461608be32b8b565f4b70725ee20"; sha256 = "00jywmppclqm62q0zq3b1dww6f27blblc633kcskyxc9f2i8p3qs"; }; "6f25ee59e861b5697b41d487ab19360684b2079b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/6f25ee59e861b5697b41d487ab19360684b2079b; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/6f25ee59e861b5697b41d487ab19360684b2079b"; sha256 = "0y3fiwflj6qfmmpgpyi3xkyn6dls620iwcwq5cdpz4jhzhz5vbqm"; }; "723429357fc93c212749453abdecffa83625ce63" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/723429357fc93c212749453abdecffa83625ce63; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/723429357fc93c212749453abdecffa83625ce63"; sha256 = "126ncm0szxkskfgwfbx5mhnbdpxl395gn62dv3rdg7xm4wjg3s07"; }; "73163f4d3a1f9f7015cad45b8b2fe49ee716aed2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/73163f4d3a1f9f7015cad45b8b2fe49ee716aed2; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/73163f4d3a1f9f7015cad45b8b2fe49ee716aed2"; sha256 = "1lkd1i92yc8lyfpnxp9gkgrklmxfj0p3zj1j0png50a4v6qyw55d"; }; "74ee06b2cb0a84dec755ca05d0b832517a58db9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/74ee06b2cb0a84dec755ca05d0b832517a58db9a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/74ee06b2cb0a84dec755ca05d0b832517a58db9a"; sha256 = "10xp24ija0l7dn3xd690dk6a342ma4iafmcywinvh111xcwkvvql"; }; "77c1ef425fc9a747ed3815f78a2616fee747fd12" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77c1ef425fc9a747ed3815f78a2616fee747fd12; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77c1ef425fc9a747ed3815f78a2616fee747fd12"; sha256 = "0gspscdvrnvj0ps5z2ckga2ji00y8m9kj3zaqpl06kywyz5p1q1l"; }; "77cf0dabcf5441932f1317ec4ee4e28bf2039a85" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77cf0dabcf5441932f1317ec4ee4e28bf2039a85; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77cf0dabcf5441932f1317ec4ee4e28bf2039a85"; sha256 = "1mdngkvkss3ia9g6kjiybvqj4w7q39iif1kqfjxzr1gs098q23ng"; }; "80d27f0c38fd20a082015a2b069457560f523b57" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/80d27f0c38fd20a082015a2b069457560f523b57; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/80d27f0c38fd20a082015a2b069457560f523b57"; sha256 = "1s2cxkgwnzisbj9r55ciwkv42m423cq7nhkywd7d80hy2wrpir5p"; }; "817fe5e5ddfde58d79455a8b2cf70079f0642770" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/817fe5e5ddfde58d79455a8b2cf70079f0642770; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/817fe5e5ddfde58d79455a8b2cf70079f0642770"; sha256 = "03dh02fjc2ksdhifwx92qfvcaymvkhc5cf4m8jlg9v3lkz1dxa2z"; }; "81cf86d27a982faf7f6331f91b6b5634cfaa00d0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/81cf86d27a982faf7f6331f91b6b5634cfaa00d0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/81cf86d27a982faf7f6331f91b6b5634cfaa00d0"; sha256 = "0n9ra5ynq4kqpd5gsdx72qk8nn8nh9bffbqvyp1jwkbc7vbf6rn1"; }; "82368148bbcf9a6d07bead1e678bfee5f8631cfb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/82368148bbcf9a6d07bead1e678bfee5f8631cfb; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/82368148bbcf9a6d07bead1e678bfee5f8631cfb"; sha256 = "06f7ysl5zxx15x2mc0yl2qxdfydnaclr7zwffip03s1szjfdf078"; }; "85df0b8a16e3e1c2b99bd8d8703a8c00f80c4ffd" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/85df0b8a16e3e1c2b99bd8d8703a8c00f80c4ffd; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/85df0b8a16e3e1c2b99bd8d8703a8c00f80c4ffd"; sha256 = "0gl18m1fqb2gyd0fnf5bvq77bqvlyngqvqbjikdr1vhj78jp8l2p"; }; "8a73223e8d37b2fb9151a753a24139f37818e434" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8a73223e8d37b2fb9151a753a24139f37818e434; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8a73223e8d37b2fb9151a753a24139f37818e434"; sha256 = "0sk5l8ijfjrys0l3mj6ypgx4araw0hnxz0cjzm9bk8y605331znx"; }; "8ab79f2416da3c5f785bf291971680dbfdb62e26" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ab79f2416da3c5f785bf291971680dbfdb62e26; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ab79f2416da3c5f785bf291971680dbfdb62e26"; sha256 = "1xlnzpljknkmbw85xz35a48h2fdv9c2ijf0nm7cdc489699v9gfv"; }; "8c09c7e57e2bc1a99df552e75f3bc3033364bbd1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8c09c7e57e2bc1a99df552e75f3bc3033364bbd1; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8c09c7e57e2bc1a99df552e75f3bc3033364bbd1"; sha256 = "168yb57ri0wibsy1gr940y8sxdc9s2vcniizkk4dykpnkay0izl1"; }; "8e02b6fe5eaaad154d3b7677458a9f52c538129f" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8e02b6fe5eaaad154d3b7677458a9f52c538129f; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8e02b6fe5eaaad154d3b7677458a9f52c538129f"; sha256 = "0zlz81qm00klwfmnc1133c8q1jgxn1w6b5fajs8jigmhwqahi806"; }; "8ef45e913784e24ac5b05d020bb1c90e5e1f65b4" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ef45e913784e24ac5b05d020bb1c90e5e1f65b4; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ef45e913784e24ac5b05d020bb1c90e5e1f65b4"; sha256 = "13rd7mvzc3vxgz7zpa89rdfidflvaxzlv60m1ngcsjigwank5a52"; }; "8f31c3a2ca87728958356ef279d797c21ff800d2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8f31c3a2ca87728958356ef279d797c21ff800d2; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8f31c3a2ca87728958356ef279d797c21ff800d2"; sha256 = "10vqrm360csnbncrhkyy45nnl9md88jl0f9lmvlav19m60cdxazi"; }; "90647a14bfb8f6e8cbcc8d8ecce7d8e2500818b9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/90647a14bfb8f6e8cbcc8d8ecce7d8e2500818b9; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/90647a14bfb8f6e8cbcc8d8ecce7d8e2500818b9"; sha256 = "0hlknlph7dw2c74pmg99apbhdfd844vq77navnynxm890nrjzqs0"; }; "a0032cd8280294edff61604e9bf0312230cfd79b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a0032cd8280294edff61604e9bf0312230cfd79b; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a0032cd8280294edff61604e9bf0312230cfd79b"; sha256 = "026b18ka0nsb1ri7wk0iqnjz60fsnr11c22lvhq2wiqh9jqsl9f6"; }; "a038a78206b6b0572fa3a86e5a96e3fee0d32b04" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a038a78206b6b0572fa3a86e5a96e3fee0d32b04; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a038a78206b6b0572fa3a86e5a96e3fee0d32b04"; sha256 = "0ahhkyb4h23apy04jjif0ys6nqjjrzf27w7h3xvw93mzasc4x515"; }; "a27eb78abbdabe194ad5b4c1bfe56dfca38e43b0" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a27eb78abbdabe194ad5b4c1bfe56dfca38e43b0; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a27eb78abbdabe194ad5b4c1bfe56dfca38e43b0"; sha256 = "0bba6vpl4lk376yhjjlgxc81m20i9qq9b7kr2bf7lg76fx485ydq"; }; "a2e5471c647ec896793c1df59ec6c214756b7644" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a2e5471c647ec896793c1df59ec6c214756b7644; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a2e5471c647ec896793c1df59ec6c214756b7644"; sha256 = "05n7fnxpg01xg4b8k323h0lbhlqxq2b432454rg5lj5ydd71w9vd"; }; "a6f1cf388c274ffbbbf5ee9f678d2fd2c982ac9d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a6f1cf388c274ffbbbf5ee9f678d2fd2c982ac9d; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a6f1cf388c274ffbbbf5ee9f678d2fd2c982ac9d"; sha256 = "0l0fdmypq1h5whfnk1132z77sbnmgwqhizss8pgjwi9k0qgahgcc"; }; "afad2bca0d8075378f5239206210c90bc449f66d" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/afad2bca0d8075378f5239206210c90bc449f66d; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/afad2bca0d8075378f5239206210c90bc449f66d"; sha256 = "13944ai93z6md86wq4ghjhlgnw3xd5xf64ski1n0imxy3xnclki9"; }; "b49b4db86170da54d36c9f77345132f501569443" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b49b4db86170da54d36c9f77345132f501569443; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b49b4db86170da54d36c9f77345132f501569443"; sha256 = "1dm4ln3cky50hzwpfb8hyzj3wyiwnjzpwybmri7sp51yhfjbssh4"; }; "b928e6544636d28eb1f1fad8cbfb3a508d6b523b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b928e6544636d28eb1f1fad8cbfb3a508d6b523b; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b928e6544636d28eb1f1fad8cbfb3a508d6b523b"; sha256 = "0a2lgynlylx99aj6jlzkbid6sq8sc1y9sblr3vjdc0rxpzyr7saf"; }; "bac3a42148c64a342e3a138e254acfc37baf7f7c" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bac3a42148c64a342e3a138e254acfc37baf7f7c; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bac3a42148c64a342e3a138e254acfc37baf7f7c"; sha256 = "0z3vq7qnjjihk5h7rr4sjgiyqvqvm64ivra2bdb89hklycawz6c5"; }; "bf6954d37d21ccd063ce7829bdbf17a34a5972f6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bf6954d37d21ccd063ce7829bdbf17a34a5972f6; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bf6954d37d21ccd063ce7829bdbf17a34a5972f6"; sha256 = "1wmm2rhf0c1351y9mjdyi4dxq2jmsl893ijm99f4zr64nqgxh76b"; }; "c48ea333ebc4208f44ca53ccec1b4a9224234423" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c48ea333ebc4208f44ca53ccec1b4a9224234423; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c48ea333ebc4208f44ca53ccec1b4a9224234423"; sha256 = "0q536yk3rncy3gf6ch5mmsvjizq1n5lkk8nfhg1lrvg7mhxsd257"; }; "c4ab35a8f3c52c8999804559d5a506f4a4ea28d6" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c4ab35a8f3c52c8999804559d5a506f4a4ea28d6; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c4ab35a8f3c52c8999804559d5a506f4a4ea28d6"; sha256 = "03id4awm9lnrrk92d9vdzlwy5g6bai9ig4i5lsk90f814vhz11nq"; }; "c5f44e9ae34828343c5c6eb3e73c2c451120da78" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c5f44e9ae34828343c5c6eb3e73c2c451120da78; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c5f44e9ae34828343c5c6eb3e73c2c451120da78"; sha256 = "15qbc27xc2gp431i3hhslwbgsgg3az37swvc37rarqw8jaayfdzw"; }; "c97e1a685bb16bacc741e943d668230b044da28b" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c97e1a685bb16bacc741e943d668230b044da28b; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c97e1a685bb16bacc741e943d668230b044da28b"; sha256 = "1an5cdb74lspq3v15xdksjld444saw7b62nx8c9vy8hq0qkxmyg0"; }; "ceed10f922981467ca264e2f3c1ba9a6834ee9fb" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ceed10f922981467ca264e2f3c1ba9a6834ee9fb; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ceed10f922981467ca264e2f3c1ba9a6834ee9fb"; sha256 = "0lsghjsy1dxr94crqd4z28vgl1fzwbw2q02k7yh2hzq3p5w5n08s"; }; "d657a675c488b3ceece090f664b8b3890c0f72c7" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d657a675c488b3ceece090f664b8b3890c0f72c7; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d657a675c488b3ceece090f664b8b3890c0f72c7"; sha256 = "1ddbjh67h2iz3pm0sfj77yc907zcfrzmn0bzyaa4rkz234zzp6hl"; }; "d80b9d2bef36dbe0669cfea717fe30315568ba9a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d80b9d2bef36dbe0669cfea717fe30315568ba9a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d80b9d2bef36dbe0669cfea717fe30315568ba9a"; sha256 = "11p1dbc3zrakwhmw7xi2wdshsbm6azdix8gy81gf8icy55ggg8ma"; }; "d87b8c33d15b51b773c6f091853c54f865561e64" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d87b8c33d15b51b773c6f091853c54f865561e64; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d87b8c33d15b51b773c6f091853c54f865561e64"; sha256 = "0qx0pb86fw6v50nl1p59d375bmc3x35cwd0qvbsbszr5w0wla0w2"; }; "d995c76652895e51297226aedf32dd0c715582e3" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d995c76652895e51297226aedf32dd0c715582e3; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d995c76652895e51297226aedf32dd0c715582e3"; sha256 = "0pgwg8w2svxvnw1p7cp233p866f4kpmfsgaw1ids8z37dw8qa7h0"; }; "de6a3578fbc96909e587a897c860f56738c9a027" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/de6a3578fbc96909e587a897c860f56738c9a027; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/de6a3578fbc96909e587a897c860f56738c9a027"; sha256 = "1vpm2s3ndg9nqnady3kswfh4bwcrmx1x37m79kcvbpaalbb1w7cr"; }; "e0a272e2ea952c9c27d010098f6ed3be34d70023" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e0a272e2ea952c9c27d010098f6ed3be34d70023; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e0a272e2ea952c9c27d010098f6ed3be34d70023"; sha256 = "1cw0bn4lrk11nynab2s56i982fljd39ibczp92lwv6f9crpbxqqd"; }; "e18cf443cf050171be2dafbb7847b1eef470d743" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e18cf443cf050171be2dafbb7847b1eef470d743; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e18cf443cf050171be2dafbb7847b1eef470d743"; sha256 = "10pf020vhki6wv2a8ja4gx5lr4l8fc6fhbyvkmjw6fszf4qkmgzd"; }; "e89e8d979ec25d6a66f7a72b8390aaa876cb54b2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e89e8d979ec25d6a66f7a72b8390aaa876cb54b2; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e89e8d979ec25d6a66f7a72b8390aaa876cb54b2"; sha256 = "0x7mcg0rfx0nvr9356yk4lzilz5x732bhir53qis4z7rfjhdi3fn"; }; "ecee7a937781e9f7f6528b7bf03dd4cdc12bbd1a" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ecee7a937781e9f7f6528b7bf03dd4cdc12bbd1a; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ecee7a937781e9f7f6528b7bf03dd4cdc12bbd1a"; sha256 = "16l5vasgq7iykpgrhr2q5x5rp780fy5nhzg459varwpr2ixlj640"; }; "eef376599acf8af872a7ecceb89b8afc1dc53cca" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/eef376599acf8af872a7ecceb89b8afc1dc53cca; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/eef376599acf8af872a7ecceb89b8afc1dc53cca"; sha256 = "10kjixb4gsdy2m0zj0v4sd38qqjbxcy4wmiwvpbpj95nyckf4695"; }; "f32b43ead099376849798c829e67335923b6f5df" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f32b43ead099376849798c829e67335923b6f5df; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f32b43ead099376849798c829e67335923b6f5df"; sha256 = "0bzabjvzamnadzx2idzviiyzhv3nkbp7w2wcq20lpzmszk0lxdn5"; }; "f6efa02b7fe9e154763f4e74a2d13e6016651478" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f6efa02b7fe9e154763f4e74a2d13e6016651478; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f6efa02b7fe9e154763f4e74a2d13e6016651478"; sha256 = "1qwgrh9pdhp5rsiimwm6v0hvmi9v3fbijx4pkdgklm6c7mxfmh6g"; }; "f82d0258fa61f3050a7ec0c48a72a14882f4f9ff" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f82d0258fa61f3050a7ec0c48a72a14882f4f9ff; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f82d0258fa61f3050a7ec0c48a72a14882f4f9ff"; sha256 = "10yqzj12sma2xqcxvqdh3s24dl5pwk9wlplxiaplkwm802fn95sw"; }; "fd8eb71773dfc69f5da73a588a9487e8155eb7d9" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fd8eb71773dfc69f5da73a588a9487e8155eb7d9; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fd8eb71773dfc69f5da73a588a9487e8155eb7d9"; sha256 = "1xfvsj2rsbmnhmgv67j7xkc41n3c61ikvmlglj47iyqxlrcp15hs"; }; "fe7abbfa12319d22b0735b908af92eafc25d27a2" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fe7abbfa12319d22b0735b908af92eafc25d27a2; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fe7abbfa12319d22b0735b908af92eafc25d27a2"; sha256 = "0f6cvhhba05slb5wxyymx46syb7v1ggbgcvisifiaf8wnivh46f9"; }; "ff648984dc86f826cc03f174f5a1b26e33268529" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ff648984dc86f826cc03f174f5a1b26e33268529; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ff648984dc86f826cc03f174f5a1b26e33268529"; sha256 = "0l2p41n9w4iap9nixxivn6vlzbl5bb3x47pkr250lgd3s81slhg5"; }; "ffcb54fe4e2f0e1ee2f22f84cff4ddc49da010f1" = fetchurl { - url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ffcb54fe4e2f0e1ee2f22f84cff4ddc49da010f1; + url = "http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ffcb54fe4e2f0e1ee2f22f84cff4ddc49da010f1"; sha256 = "1irjabajfblyl5s36lasq5rclxagc1finwb7y68wsj3w5195gihg"; }; } diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix index 5eb97e99189..643779cf5fd 100644 --- a/pkgs/games/ue4/default.nix +++ b/pkgs/games/ue4/default.nix @@ -74,7 +74,7 @@ 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; + 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 ]; diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 2020066ee65..24c98f7d774 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -50,7 +50,7 @@ let meta = { description = "Unreal Engine 4 Linux demos"; - homepage = https://wiki.unrealengine.com/Linux_Demos; + homepage = "https://wiki.unrealengine.com/Linux_Demos"; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index beff8ada96b..94a12774a43 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = "-lgcc_s"; # to avoid occasional runtime error in finding libgcc_s.so.1 meta = { - homepage = http://ufoai.org; + 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]; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index df80b3a555f..6eb4725897f 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -4,7 +4,7 @@ pkgconfig}: stdenv.mkDerivation { name = "ultimate-stunts-0.7.6.1"; src = fetchurl { - url = mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz; + url = "mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz"; sha256 = "0rd565ml6l927gyq158klhni7myw8mgllhv0xl1fg9m8hlzssgrv"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.ultimatestunts.nl/; + 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]; diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index feaf6cabf32..3e17dfdf644 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { dontPatchELF = true; meta = with stdenv.lib; { - homepage = http://ultrastardx.sourceforge.net/; + homepage = "http://ultrastardx.sourceforge.net/"; description = "Free and open source karaoke game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ Profpatsch ]; diff --git a/pkgs/games/unnethack/default.nix b/pkgs/games/unnethack/default.nix index ee3890aeea5..1ac87c1d41b 100644 --- a/pkgs/games/unnethack/default.nix +++ b/pkgs/games/unnethack/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fork of NetHack"; - homepage = https://unnethack.wordpress.com/; + homepage = "https://unnethack.wordpress.com/"; license = "nethack"; platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index 3944050e983..523ae354b76 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { - to adapt the code so that people can more easily make their own spin-offs, thereby making zillions more people happy! ''; - homepage = http://sc2.sourceforge.net/; + homepage = "http://sc2.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = with lib.maintainers; [ jcumming aszlig ]; platforms = with lib.platforms; linux; diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 98ef32b0472..ccc20281302 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { tactical shooter; somewhat realism based, but the motto is "fun over realism". This results in a very unique, enjoyable and addictive game. ''; - homepage = http://www.urbanterror.info; + homepage = "http://www.urbanterror.info"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl fpletz ]; platforms = platforms.linux; diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix index 1790f083063..cb7c0208f10 100644 --- a/pkgs/games/ut2004/demo.nix +++ b/pkgs/games/ut2004/demo.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A first-person shooter video game developed by Epic Games and Digital Extreme -- demo version"; - homepage = http://www.unrealtournament2004.com; + homepage = "http://www.unrealtournament2004.com"; license = licenses.unfree; maintainers = with maintainers; [ abbradar ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix index 2e4fdf1af96..a8d345151d6 100644 --- a/pkgs/games/vapor/default.nix +++ b/pkgs/games/vapor/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation { platforms = platforms.linux; license = licenses.zlib; maintainers = with maintainers; [ leenaars ]; - downloadPage = http://vapor.love2d.org/; + downloadPage = "http://vapor.love2d.org/"; }; } diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 84984fcbb58..55848d91fab 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open-source boardgame engine"; - homepage = http://www.vassalengine.org/; + homepage = "http://www.vassalengine.org/"; license = licenses.lgpl21; maintainers = with maintainers; [ tvestelind ]; platforms = platforms.linux; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 3002216b9d4..99475af49e1 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -20,8 +20,8 @@ let sha256 = "001wq3c4n9wzxqfpq40b1jcl16sxbqv2zbkpy9rq2wf9h417q6hg"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; + nativeBuildInputs = [ pkgconfig scons.py2 ]; + buildInputs = [ libGLU libGL SDL2 SDL2_image libvorbis bullet curl gettext ]; patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; @@ -34,7 +34,7 @@ let meta = { description = "Car racing game"; - homepage = http://vdrift.net/; + homepage = "http://vdrift.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/vectoroids/default.nix b/pkgs/games/vectoroids/default.nix index f1e9c13f86b..01e787b8d91 100644 --- a/pkgs/games/vectoroids/default.nix +++ b/pkgs/games/vectoroids/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "vectoroids-1.1.0"; src = fetchurl { - url = ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/vectoroids-1.1.0.tar.gz; + url = "ftp://ftp.tuxpaint.org/unix/x/vectoroids/src/vectoroids-1.1.0.tar.gz"; sha256 = "0bkvd4a1v496w0vlvqyi1a6p25ssgpkchxxxi8899sb72wlds54d"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.newbreedsoftware.com/vectoroids/; + 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; diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 483912bab45..4e0337fa1b4 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { causing. Vessel is a game about a man with the power to bring ordinary matter to life, and all the consequences that ensue. ''; - homepage = http://www.strangeloopgames.com; + homepage = "http://www.strangeloopgames.com"; license = licenses.unfree; maintainers = with maintainers; [ jcumming ]; }; diff --git a/pkgs/games/vitetris/default.nix b/pkgs/games/vitetris/default.nix index fdc28d3a539..2b9c77cd467 100644 --- a/pkgs/games/vitetris/default.nix +++ b/pkgs/games/vitetris/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Terminal-based Tetris clone by Victor Nilsson"; - homepage = http://www.victornils.net/tetris/; + homepage = "http://www.victornils.net/tetris/"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ siers ]; diff --git a/pkgs/games/vms-empire/default.nix b/pkgs/games/vms-empire/default.nix index 33e342de3b4..d0920b0c68d 100644 --- a/pkgs/games/vms-empire/default.nix +++ b/pkgs/games/vms-empire/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec{ expand/explore/exploit/exterminate games, including Civilization and Master of Orion. ''; - homepage = http://catb.org/~esr/vms-empire/; + homepage = "http://catb.org/~esr/vms-empire/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index d8c16c9b7ce..93f7e9bffa6 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://voxelands.com/; + homepage = "http://voxelands.com/"; description = "Infinite-world block sandbox game based on Minetest"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/games/warmux/default.nix b/pkgs/games/warmux/default.nix index c3896f6cf71..dc8b53d09ad 100644 --- a/pkgs/games/warmux/default.nix +++ b/pkgs/games/warmux/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = with licenses; [ gpl2 ufl ]; - homepage = https://github.com/fluxer/warmux; + homepage = "https://github.com/fluxer/warmux"; }; } diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 6282658fc15..4c2cd1b5a28 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { completely free fast-paced first-person shooter (FPS) for Windows, Linux and macOS. ''; - homepage = http://www.warsow.net; + homepage = "http://www.warsow.net"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ astsmtl abbradar ]; platforms = warsow-engine.meta.platforms; diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix index c42aa319825..19c368671e6 100644 --- a/pkgs/games/warsow/engine.nix +++ b/pkgs/games/warsow/engine.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation (libs // rec { meta = with stdenv.lib; { description = "Multiplayer FPS game designed for competitive gaming (engine only)"; - homepage = http://www.warsow.net; + homepage = "http://www.warsow.net"; license = licenses.gpl2; maintainers = with maintainers; [ astsmtl abbradar ]; platforms = platforms.linux; diff --git a/pkgs/games/warzone2100/default.nix b/pkgs/games/warzone2100/default.nix index d99a7c44240..3d7be936f1b 100644 --- a/pkgs/games/warzone2100/default.nix +++ b/pkgs/games/warzone2100/default.nix @@ -60,7 +60,7 @@ mkDerivation rec { technologies, combined with the unit design system, allows for a wide variety of possible units and tactics. ''; - homepage = http://wz2100.net; + homepage = "http://wz2100.net"; license = licenses.gpl2Plus; maintainers = [ maintainers.astsmtl ]; platforms = platforms.linux; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index 0889e52d8f8..f8f84f48f71 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { Balls who live in the beautiful World of Goo don't know that they are in a game, or that they are extremely delicious. ''; - homepage = http://worldofgoo.com; + homepage = "http://worldofgoo.com"; license = licenses.unfree; maintainers = with maintainers; [ jcumming ]; }; diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix index 4a8e7188ce8..9f3303578da 100644 --- a/pkgs/games/xboard/default.nix +++ b/pkgs/games/xboard/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { inherit (s) version; description = ''GUI for chess engines''; - homepage = https://www.gnu.org/software/xboard/; + homepage = "https://www.gnu.org/software/xboard/"; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/games/xbomb/default.nix b/pkgs/games/xbomb/default.nix index 54d6c320f18..0754905ce50 100644 --- a/pkgs/games/xbomb/default.nix +++ b/pkgs/games/xbomb/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.gedanken.org.uk/software/xbomb/; + homepage = "http://www.gedanken.org.uk/software/xbomb/"; description = "Minesweeper for X11 with various grid sizes and shapes"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 34c9bf1f06d..eb561d27a2f 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Obstacled race game"; - homepage = http://xmoto.tuxfamily.org; + homepage = "http://xmoto.tuxfamily.org"; maintainers = with maintainers; [ raskin pSub ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index f4ce3c86a64..5f36ab4fb9f 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -1,73 +1,31 @@ -{ stdenv, fetchurl +{ lib, stdenv, fetchurl, fetchzip, makeWrapper, runCommandNoCC, makeDesktopItem +, xonotic-data , # required for both unzip, libjpeg, zlib, libvorbis, curl , # glx libX11, libGLU, libGL, libXpm, libXext, libXxf86vm, alsaLib , # sdl SDL2 -}: - -stdenv.mkDerivation rec { - name = "xonotic-0.8.2"; - src = fetchurl { - url = "https://dl.xonotic.org/${name}.zip"; - sha256 = "1mcs6l4clvn7ibfq3q69k2p0z6ww75rxvnngamdq5ic6yhq74bx2"; - }; +, withSDL ? true +, withGLX ? false +, withDedicated ? true +}: - buildInputs = [ - # required for both - unzip libjpeg - # glx - libX11 libGLU libGL libXpm libXext libXxf86vm alsaLib - # sdl - SDL2 - zlib libvorbis curl - ]; - - sourceRoot = "Xonotic/source/darkplaces"; - - # "debug", "release", "profile" - target = "release"; - - dontStrip = target != "release"; - - buildPhase = '' - DP_FS_BASEDIR="$out/share/xonotic" - make DP_FS_BASEDIR=$DP_FS_BASEDIR cl-${target} - make DP_FS_BASEDIR=$DP_FS_BASEDIR sdl-${target} - make DP_FS_BASEDIR=$DP_FS_BASEDIR sv-${target} - ''; - enableParallelBuilding = true; - - installPhase = '' - mkdir -p "$out/bin" - cp darkplaces-dedicated "$out/bin/xonotic-dedicated" - cp darkplaces-sdl "$out/bin/xonotic-sdl" - cp darkplaces-glx "$out/bin/xonotic-glx" - cd ../.. - mkdir -p "$out/share/xonotic" - mv data "$out/share/xonotic" - - # default to sdl - ln -s "$out/bin/xonotic-sdl" "$out/bin/xonotic" - ''; - - # Xonotic needs to find libcurl.so at runtime for map downloads - dontPatchELF = true; - postFixup = '' - patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-dedicated - patchelf \ - --add-needed ${curl.out}/lib/libcurl.so \ - --add-needed ${libvorbis}/lib/libvorbisfile.so \ - --add-needed ${libvorbis}/lib/libvorbis.so \ - $out/bin/xonotic-glx - patchelf \ - --add-needed ${curl.out}/lib/libcurl.so \ - --add-needed ${libvorbis}/lib/libvorbisfile.so \ - --add-needed ${libvorbis}/lib/libvorbis.so \ - $out/bin/xonotic-sdl - ''; +let + pname = "xonotic"; + version = "0.8.2"; + name = "${pname}-${version}"; + variant = + if withSDL && withGLX then + "" + else if withSDL then + "-sdl" + else if withGLX then + "-glx" + else if withDedicated then + "-dedicated" + else "-what-even-am-i"; meta = { description = "A free fast-paced first-person shooter"; @@ -79,10 +37,121 @@ stdenv.mkDerivation rec { Nexuiz project with years of development between them, and it aims to become the best possible open-source FPS of its kind. ''; - homepage = http://www.xonotic.org; + homepage = "https://www.xonotic.org/"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [ astsmtl zalakain ]; + maintainers = with stdenv.lib.maintainers; [ astsmtl zalakain petabyteboy ]; platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; }; + + desktopItem = makeDesktopItem { + name = "xonotic"; + exec = "$out/bin/xonotic"; + comment = meta.description; + desktopName = "Xonotic"; + categories = "Game;"; + icon = "xonotic"; + startupNotify = "false"; + }; + + xonotic-unwrapped = stdenv.mkDerivation rec { + pname = "xonotic${variant}-unwrapped"; + inherit version; + + src = fetchurl { + url = "https://dl.xonotic.org/${name}-source.zip"; + sha256 = "0axxw04fyz6jlfqd0kp7hdrqa0li31sx1pbipf2j5qp9wvqicsay"; + }; + + buildInputs = [ unzip libjpeg zlib libvorbis curl ] + ++ lib.optional withGLX [ libX11.dev libGLU.dev libGL.dev libXpm.dev libXext.dev libXxf86vm.dev alsaLib.dev ] + ++ lib.optional withSDL [ SDL2.dev ]; + + sourceRoot = "Xonotic/source/darkplaces"; + + # "debug", "release", "profile" + target = "release"; + + dontStrip = target != "release"; + + buildPhase = lib.optionalString withDedicated '' + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sv-${target} + '' + lib.optionalString withGLX '' + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES cl-${target} + '' + lib.optionalString withSDL '' + make -j $NIX_BUILD_CORES -l $NIX_BUILD_CORES sdl-${target} + ''; + + enableParallelBuilding = true; + + installPhase = '' + install -Dm644 ../../misc/logos/icons_png/xonotic_128.png $out/share/pixmaps/xonotic.png + '' + lib.optionalString withDedicated '' + install -Dm755 darkplaces-dedicated "$out/bin/xonotic-dedicated" + '' + lib.optionalString withGLX '' + install -Dm755 darkplaces-glx "$out/bin/xonotic-glx" + '' + lib.optionalString withSDL '' + install -Dm755 darkplaces-sdl "$out/bin/xonotic-sdl" + ''; + + # Xonotic needs to find libcurl.so at runtime for map downloads + dontPatchELF = true; + postFixup = lib.optionalString withDedicated '' + patchelf --add-needed ${curl.out}/lib/libcurl.so $out/bin/xonotic-dedicated + '' + lib.optionalString withGLX '' + patchelf \ + --add-needed ${curl.out}/lib/libcurl.so \ + --add-needed ${libvorbis}/lib/libvorbisfile.so \ + --add-needed ${libvorbis}/lib/libvorbis.so \ + --add-needed ${libGL.out}/lib/libGL.so \ + $out/bin/xonotic-glx + '' + lib.optionalString withSDL '' + patchelf \ + --add-needed ${curl.out}/lib/libcurl.so \ + --add-needed ${libvorbis}/lib/libvorbisfile.so \ + --add-needed ${libvorbis}/lib/libvorbis.so \ + $out/bin/xonotic-sdl + ''; + }; + +in rec { + xonotic-data = fetchzip { + name = "xonotic-data-${version}"; + url = "https://dl.xonotic.org/${name}.zip"; + sha256 = "1ygkh0v68y4sd1w5vpk8dgb65h5jm599hwszdfgjp3ax4d3ml81x"; + extraPostFetch = '' + cd $out + rm -rf $(ls | grep -v "^data$") + ''; + meta.hydraPlatforms = []; + passthru.version = version; + }; + + xonotic = runCommandNoCC "xonotic${variant}-${version}" { + inherit xonotic-unwrapped; + buildInputs = [ makeWrapper ]; + passthru = { + inherit version; + meta = meta // { + hydraPlatforms = []; + }; + }; + } ('' + mkdir -p $out/bin + '' + lib.optionalString withDedicated '' + ln -s ${xonotic-unwrapped}/bin/xonotic-dedicated $out/bin/ + '' + lib.optionalString withGLX '' + ln -s ${xonotic-unwrapped}/bin/xonotic-glx $out/bin/xonotic-glx + ln -s $out/bin/xonotic-glx $out/bin/xonotic + '' + lib.optionalString withSDL '' + ln -s ${xonotic-unwrapped}/bin/xonotic-sdl $out/bin/xonotic-sdl + ln -sf $out/bin/xonotic-sdl $out/bin/xonotic + '' + lib.optionalString (withSDL || withGLX) '' + mkdir -p $out/share + ln -s ${xonotic-unwrapped}/share/pixmaps $out/share/pixmaps + ${desktopItem.buildCommand} + '' + '' + for binary in $out/bin/xonotic-*; do + wrapProgram $binary --add-flags "-basedir ${xonotic-data}" + done + ''); } diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 4a1c25ee12e..4de27b1f18d 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = ''A multiplayer space combat game (client part)''; - homepage = http://bloodspilot.sf.net/; + homepage = "http://bloodspilot.sf.net/"; license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/games/xpilot/bloodspilot-server.nix b/pkgs/games/xpilot/bloodspilot-server.nix index 2f37680bbaa..6b0a0603af5 100644 --- a/pkgs/games/xpilot/bloodspilot-server.nix +++ b/pkgs/games/xpilot/bloodspilot-server.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multiplayer X11 space combat game (server part)"; - homepage = http://bloodspilot.sf.net/; + homepage = "http://bloodspilot.sf.net/"; license = licenses.gpl2Plus ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 7d83dece333..8803806547b 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { description = "A multiplayer X11 space combat game"; - homepage = http://xpilot.sf.net/; + homepage = "http://xpilot.sf.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 086aaded9aa..5fa91a0395c 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.free; longDescription = ''Play the german card game Skat against the AI or over IRC.''; - homepage = http://www.xskat.de/; + homepage = "http://www.xskat.de/"; }; } diff --git a/pkgs/games/xsnow/default.nix b/pkgs/games/xsnow/default.nix index b3011fbce77..c64d8bf568f 100644 --- a/pkgs/games/xsnow/default.nix +++ b/pkgs/games/xsnow/default.nix @@ -19,7 +19,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/; + homepage = "http://janswaal.home.xs4all.nl/Xsnow/"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.robberer ]; }; diff --git a/pkgs/games/xsok/default.nix b/pkgs/games/xsok/default.nix index 62cdaccc297..30579e399b8 100644 --- a/pkgs/games/xsok/default.nix +++ b/pkgs/games/xsok/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = https://tracker.debian.org/pkg/xsok; + homepage = "https://tracker.debian.org/pkg/xsok"; }; } diff --git a/pkgs/games/xtris/default.nix b/pkgs/games/xtris/default.nix index 8f5f832058c..c9421b23a82 100644 --- a/pkgs/games/xtris/default.nix +++ b/pkgs/games/xtris/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A multi-player version of the classical game of Tetris, for the X Window system"; - homepage = https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html; + homepage = "https://web.archive.org/web/20120315061213/http://www.iagora.com/~espel/xtris/xtris.html"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index 3f1ebb69618..e7200ff22e9 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://zandronum.com/; + homepage = "https://zandronum.com/"; description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software"; maintainers = with maintainers; [ lassulus MP2E ]; license = licenses.unfreeRedistributable; diff --git a/pkgs/games/zandronum/fmod.nix b/pkgs/games/zandronum/fmod.nix index 3d5160bb591..5eebcd4a38e 100644 --- a/pkgs/games/zandronum/fmod.nix +++ b/pkgs/games/zandronum/fmod.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming library and toolkit for the creation and playback of interactive audio"; - homepage = http://www.fmod.org/; + homepage = "http://www.fmod.org/"; license = licenses.unfreeRedistributable; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = [ maintainers.lassulus ]; diff --git a/pkgs/games/zandronum/sqlite.nix b/pkgs/games/zandronum/sqlite.nix index 3d60dab6fe0..7f4556c8751 100644 --- a/pkgs/games/zandronum/sqlite.nix +++ b/pkgs/games/zandronum/sqlite.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.sqlite.org/; + 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; maintainers = [ lib.maintainers.lassulus ]; diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix index 2a1219e66ea..ae7a4ae6f42 100644 --- a/pkgs/games/zdoom/bcc-git.nix +++ b/pkgs/games/zdoom/bcc-git.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compiler for Doom/Hexen scripts (ACS, BCS)"; - homepage = https://github.com/wormt/bcc; + homepage = "https://github.com/wormt/bcc"; license = licenses.mit; maintainers = with maintainers; [ertes]; }; diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix index f6fde241129..646021eb2fc 100644 --- a/pkgs/games/zdoom/default.nix +++ b/pkgs/games/zdoom/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://zdoom.org/; + homepage = "http://zdoom.org/"; description = "Enhanced port of the official DOOM source code"; # Doom source license, MAME license license = licenses.unfreeRedistributable; diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix index 430d5269a68..e86ebd6dbc2 100644 --- a/pkgs/games/zdoom/zdbsp.nix +++ b/pkgs/games/zdoom/zdbsp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ZDoom's internal node builder for DOOM maps"; - homepage = https://zdoom.org/wiki/ZDBSP; + homepage = "https://zdoom.org/wiki/ZDBSP"; license = licenses.gpl2Plus; maintainers = with maintainers; [ertes]; platforms = platforms.linux; diff --git a/pkgs/games/zod/default.nix b/pkgs/games/zod/default.nix index 888b7bd3d6a..d50218af241 100644 --- a/pkgs/games/zod/default.nix +++ b/pkgs/games/zod/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { description = "Multiplayer remake of ZED"; - homepage = http://zod.sourceforge.net/; + homepage = "http://zod.sourceforge.net/"; license = stdenv.lib.licenses.gpl3Plus; /* Says the web */ }; } diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index ead87f6fab4..664fa8fcb88 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -48,7 +48,7 @@ let enableParallelBuilding = false; meta = with lib; { - homepage = https://github.com/ARM-software/arm-trusted-firmware; + homepage = "https://github.com/ARM-software/arm-trusted-firmware"; description = "A reference implementation of secure world software for ARMv8-A"; license = licenses.bsd3; maintainers = [ maintainers.lopsided98 ]; diff --git a/pkgs/misc/base16-shell-preview/default.nix b/pkgs/misc/base16-shell-preview/default.nix index 72b7de3b9a2..15e0596e410 100644 --- a/pkgs/misc/base16-shell-preview/default.nix +++ b/pkgs/misc/base16-shell-preview/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Browse and preview Base16 Shell themes in your terminal"; - homepage = https://github.com/nvllsvm/base16-shell-preview; + homepage = "https://github.com/nvllsvm/base16-shell-preview"; license = licenses.mit; maintainers = [ maintainers.rencire ]; }; diff --git a/pkgs/misc/beep/default.nix b/pkgs/misc/beep/default.nix index b98560992e3..40a8849ba3f 100644 --- a/pkgs/misc/beep/default.nix +++ b/pkgs/misc/beep/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "beep-1.3"; src = fetchurl { - url = http://www.johnath.com/beep/beep-1.3.tar.gz; + url = "http://www.johnath.com/beep/beep-1.3.tar.gz"; sha256 = "0bgch6jq5cahakk3kbr9549iysf2dik09afixxy5brbxk1xfzb2r"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { description = "The advanced PC speaker beeper"; - homepage = http://www.johnath.com/beep/; + homepage = "http://www.johnath.com/beep/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix index 618bc6d8505..81f00d59f69 100644 --- a/pkgs/misc/calaos/installer/default.nix +++ b/pkgs/misc/calaos/installer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Calaos Installer, a tool to create calaos configuration"; - homepage = https://www.calaos.fr/; + homepage = "https://www.calaos.fr/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = with maintainers; [ tiramiseb ]; diff --git a/pkgs/misc/cups/cups-pk-helper.nix b/pkgs/misc/cups/cups-pk-helper.nix index 6534d300e82..3151bace558 100644 --- a/pkgs/misc/cups/cups-pk-helper.nix +++ b/pkgs/misc/cups/cups-pk-helper.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PolicyKit helper to configure cups with fine-grained privileges"; - homepage = http://www.freedesktop.org/wiki/Software/cups-pk-helper/; + homepage = "http://www.freedesktop.org/wiki/Software/cups-pk-helper/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 6786623fee3..f229ced8936 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://cups.org/; + homepage = "https://cups.org/"; description = "A standards-based printing system for UNIX"; license = licenses.gpl2; # actually LGPL for the library and GPL for the rest maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index 4464b5ba11b..5faf6a2198b 100644 --- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 CUPS wrapper driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 2df3cfe6733..985de63637c 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother BrGenML1 LPR driver"; - homepage = http://www.brother.com; + homepage = "http://www.brother.com"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.unfreeRedistributable; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index bf0f4ef8279..5e44c8dc493 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { Brother MFC-L2710DW Lenovo M7605D ''; - homepage = https://github.com/pdewacht/brlaser; + homepage = "https://github.com/pdewacht/brlaser"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ StijnDW ]; diff --git a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix index f101ffef95b..de93a5a7f8b 100644 --- a/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix +++ b/pkgs/misc/cups/drivers/brother/mfcl3770cdw/default.nix @@ -47,7 +47,7 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.steveej ]; @@ -79,7 +79,7 @@ in rec { meta = { description = "Brother ${lib.strings.toUpper model} CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.steveej ]; diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index adc4ead94b7..dbc6390ef49 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -216,7 +216,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "CUPS Linux drivers for Canon printers"; - homepage = http://www.canon.com/; + homepage = "http://www.canon.com/"; license = licenses.unfree; maintainers = with maintainers; [ kylesferrazza diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 364a7336bf3..323163bed33 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the MG7500, MG6700, MG6600, MG5600, MG2900, MB2000, MB2300, iB4000, MB5000, MB5300, iP110, E450, MX490, E480, MG7700, MG6900, MG6800, MG5700, MG3600, and G3000 series."; - homepage = http://support-th.canon-asia.com/contents/TH/EN/0100712901.html; + homepage = "http://support-th.canon-asia.com/contents/TH/EN/0100712901.html"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix index a09311a8292..2cb3fe01ddb 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_2_80/default.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the iP5400, MP520, MP210, MP140, iP3500, and MP610 series. (MP520 drivers also work for MX700.)"; - homepage = http://support-asia.canon-asia.com/content/EN/0100084101.html; + homepage = "http://support-asia.canon-asia.com/content/EN/0100084101.html"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ jerith666 ]; diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 8866b425ca8..679d8906994 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -142,7 +142,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Canon InkJet printer drivers for the MG2400 MG2500 MG3500 MG5500 MG6400 MG6500 MG7100 and P200 series."; - homepage = https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072; + homepage = "https://www.canon-europe.com/support/consumer_products/products/fax__multifunctionals/inkjet/pixma_mg_series/pixma_mg5550.aspx?type=drivers&driverdetailid=tcm:13-1094072"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ chpatrick ]; diff --git a/pkgs/misc/cups/drivers/cups-bjnp/default.nix b/pkgs/misc/cups/drivers/cups-bjnp/default.nix index 0c91b782117..e9fac1c73e2 100644 --- a/pkgs/misc/cups/drivers/cups-bjnp/default.nix +++ b/pkgs/misc/cups/drivers/cups-bjnp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { BJNP protocol. This back-end allows Cups to print over the network to a Canon printer. The design is based on reverse engineering of the protocol. ''; - homepage = http://cups-bjnp.sourceforge.net; + homepage = "http://cups-bjnp.sourceforge.net"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/cups/drivers/dymo/default.nix b/pkgs/misc/cups/drivers/dymo/default.nix index c2b912007d8..eccbae60104 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 = "http://www.dymo.com/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ makefu ]; }; diff --git a/pkgs/misc/cups/drivers/estudio/default.nix b/pkgs/misc/cups/drivers/estudio/default.nix index ad8b0089a87..9aaae31488d 100644 --- a/pkgs/misc/cups/drivers/estudio/default.nix +++ b/pkgs/misc/cups/drivers/estudio/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "7.89"; src = fetchurl { - url = http://business.toshiba.com/downloads/KB/f1Ulds/15178/TOSHIBA_ColorMFP_CUPS.tar; + url = "http://business.toshiba.com/downloads/KB/f1Ulds/15178/TOSHIBA_ColorMFP_CUPS.tar"; sha256 = "0qz4r7q55i0adf4fv3aqnfqgi2pz3jb1jixkqm9x6nk4vanyjf4r"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation { TOSHIBA e-STUDIO6540C, TOSHIBA e-STUDIO6550C, TOSHIBA e-STUDIO6560C, TOSHIBA e-STUDIO6570C and TOSHIBA e-STUDIO7506AC. ''; - homepage = http://business.toshiba.com/support/downloads/index.html; + homepage = "http://business.toshiba.com/support/downloads/index.html"; license = licenses.unfree; maintainers = [ maintainers.jpotier ]; }; diff --git a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix index 23651a57df8..30d73787104 100644 --- a/pkgs/misc/cups/drivers/fxlinuxprint/default.nix +++ b/pkgs/misc/cups/drivers/fxlinuxprint/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { DocuCentre-VI C2271/C3370/C3371/C4471/C5571/C6671/C7771 DocuPrint 3205 d/3208 d/3505 d/3508 d/4405 d/4408 d ''; - homepage = https://onlinesupport.fujixerox.com; + homepage = "https://onlinesupport.fujixerox.com"; license = licenses.unfree; maintainers = with maintainers; [ delan ]; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/googlecloudprint/default.nix b/pkgs/misc/cups/drivers/googlecloudprint/default.nix index 0dcd518de84..9b612c43a00 100644 --- a/pkgs/misc/cups/drivers/googlecloudprint/default.nix +++ b/pkgs/misc/cups/drivers/googlecloudprint/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Google Cloud Print driver for CUPS, allows printing to printers hosted on Google Cloud Print"; - homepage = http://ccp.niftiestsoftware.com; + homepage = "http://ccp.niftiestsoftware.com"; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/misc/cups/drivers/hl1110/default.nix b/pkgs/misc/cups/drivers/hl1110/default.nix index 701d4b6a100..194ef6cc327 100644 --- a/pkgs/misc/cups/drivers/hl1110/default.nix +++ b/pkgs/misc/cups/drivers/hl1110/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother HL1110 printer driver"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/cups/drivers/hl3140cw/default.nix b/pkgs/misc/cups/drivers/hl3140cw/default.nix index 001a3c1eac0..9dabf053fd6 100644 --- a/pkgs/misc/cups/drivers/hl3140cw/default.nix +++ b/pkgs/misc/cups/drivers/hl3140cw/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother hl3140cw printer driver"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/cups/drivers/hll2340dw/default.nix b/pkgs/misc/cups/drivers/hll2340dw/default.nix index 653f72a0b61..a291f166288 100644 --- a/pkgs/misc/cups/drivers/hll2340dw/default.nix +++ b/pkgs/misc/cups/drivers/hll2340dw/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother hl-l2340dw printer driver"; license = licenses.unfree; platforms = platforms.linux; diff --git a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix index 90f9a8e943a..0a55ee0c8bb 100644 --- a/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix +++ b/pkgs/misc/cups/drivers/hll2390dw-cups/default.nix @@ -60,11 +60,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother HL-L2390DW combined print driver"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us_ot&lang=en&prod=hll2390dw_us&os=128"; maintainers = [ maintainers.samueldr ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix index c7484e6d30b..23ee927a3bf 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW CUPS wrapper driver"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128; + 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 ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix index befafd855bc..31b5c1dbd37 100644 --- a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother MFC-J470DW LPR driver"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128; + 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 ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix index 4ec9e3fc6c8..8a5c9644512 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwcupswrapper/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; description = "Brother MFC-J6510DW CUPS wrapper driver"; license = with licenses; gpl2; platforms = with platforms; linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; maintainers = with maintainers; [ ramkromberg ]; }; } diff --git a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix index b12ef18e46c..46ce7abb28e 100644 --- a/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcj6510dwlpr/default.nix @@ -80,8 +80,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brother MFC-J6510DW LPR driver"; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128; - homepage = http://www.brother.com/; + downloadPage = "http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj6510dw_all&os=128"; + homepage = "http://www.brother.com/"; license = with licenses; unfree; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; linux; diff --git a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix index 1673c2d5c5c..27cb40a9e4f 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dncupswrapper/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix index 91110104bc9..24d3e5cab7f 100644 --- a/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2700dnlpr/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2700DN LPR driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.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 b58e7b4faa4..8a2ce7edf26 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwcupswrapper/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.xeji ]; diff --git a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix index b4b16563610..0dc9eed2ac0 100644 --- a/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2720dwlpr/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2720DW lpr driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.xeji ]; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix index f2303a45a2f..f2143df321c 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwcupswrapper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.enzime ]; diff --git a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix index c2209806724..74571611b44 100644 --- a/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl2740dwlpr/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L2740DW lpr driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ stdenv.lib.maintainers.enzime ]; diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix index 50f3b583e42..d82c0ad9a86 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwcupswrapper/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW CUPS wrapper driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.fuzzy-id ]; diff --git a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix index 0e088401c0a..9e3c529e898 100644 --- a/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix +++ b/pkgs/misc/cups/drivers/mfcl8690cdwlpr/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Brother MFC-L8690CDW LPR printer driver"; - homepage = http://www.brother.com/; + homepage = "http://www.brother.com/"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.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 8c906db642e..308be5337d0 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -104,8 +104,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unified Linux Driver for Samsung printers and scanners"; - homepage = http://www.bchemnet.com/suldr; - downloadPage = http://www.bchemnet.com/suldr/driver/; + homepage = "http://www.bchemnet.com/suldr"; + downloadPage = "http://www.bchemnet.com/suldr/driver/"; license = licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index 9135441a6e7..b7e75c2a16a 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -87,8 +87,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unified Linux Driver for Samsung printers and scanners"; - homepage = http://www.bchemnet.com/suldr; - downloadPage = http://www.bchemnet.com/suldr/driver/; + homepage = "http://www.bchemnet.com/suldr"; + downloadPage = "http://www.bchemnet.com/suldr/driver/"; license = licenses.unfree; # Tested on linux-x86_64. Might work on linux-i386. 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 5dc39793070..c3c3613bbda 100644 --- a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix +++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; - homepage = http://www.samsung.com/; + homepage = "http://www.samsung.com/"; license = licenses.unfree; platforms = platforms.linux; broken = true; # libscmssc.so and libmfp.so can't find their library dependencies at run-time diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index f81fa27503f..755003e4d30 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Samsung's Linux printing drivers; includes binaries without source code"; - homepage = http://www.samsung.com/; + homepage = "http://www.samsung.com/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ joko ]; diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix index e227de086de..c65ca401d60 100644 --- a/pkgs/misc/cups/drivers/splix/default.nix +++ b/pkgs/misc/cups/drivers/splix/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CUPS drivers for SPL (Samsung Printer Language) printers"; - homepage = http://splix.ap2c.org; + homepage = "http://splix.ap2c.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau peti ]; diff --git a/pkgs/misc/cups/drivers/zj-58/default.nix b/pkgs/misc/cups/drivers/zj-58/default.nix index 87a023af1ca..67df20df491 100644 --- a/pkgs/misc/cups/drivers/zj-58/default.nix +++ b/pkgs/misc/cups/drivers/zj-58/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "CUPS filter for thermal printer Zjiang ZJ-58"; - homepage = https://github.com/klirichek/zj-58; + homepage = "https://github.com/klirichek/zj-58"; platforms = platforms.linux; maintainers = with maintainers; [ makefu ]; license = licenses.bsd2; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 76f68e50750..217f0c7f0da 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation rec { doCheck = false; # fails 4 out of 6 tests meta = { - homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; + 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; diff --git a/pkgs/misc/documentation-highlighter/default.nix b/pkgs/misc/documentation-highlighter/default.nix index a9fbcc178bb..72f1da6b0de 100644 --- a/pkgs/misc/documentation-highlighter/default.nix +++ b/pkgs/misc/documentation-highlighter/default.nix @@ -2,7 +2,7 @@ runCommand "documentation-highlighter" { meta = { description = "Highlight.js sources for the Nix Ecosystem's documentation."; - homepage = https://highlightjs.org; + homepage = "https://highlightjs.org"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.grahamc ]; diff --git a/pkgs/misc/doge/default.nix b/pkgs/misc/doge/default.nix index 37acfbf4a8a..37a3b4be706 100644 --- a/pkgs/misc/doge/default.nix +++ b/pkgs/misc/doge/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/thiderman/doge; + homepage = "https://github.com/thiderman/doge"; description = "wow very terminal doge"; license = licenses.mit; maintainers = with maintainers; [ Gonzih ]; diff --git a/pkgs/misc/drivers/epson-201106w/default.nix b/pkgs/misc/drivers/epson-201106w/default.nix index 448bac92ae8..95eb59f7167 100644 --- a/pkgs/misc/drivers/epson-201106w/default.nix +++ b/pkgs/misc/drivers/epson-201106w/default.nix @@ -49,7 +49,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://www.openprinting.org/driver/epson-201106w; + homepage = "https://www.openprinting.org/driver/epson-201106w"; description = "Epson printer driver (BX535WD, BX630FW, BX635FWD, ME940FW, NX530, NX635, NX635, SX535WD, WorkForce 545, WorkForce 645"; longDescription = '' This software is a filter program used with the Common UNIX Printing diff --git a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix index 0cc5537180b..e06a0c91162 100644 --- a/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix +++ b/pkgs/misc/drivers/epson-workforce-635-nx625-series/default.nix @@ -94,7 +94,7 @@ in stdenv.mkDerivation rec { drivers = [ pkgs.${name} ]; }; ''; - downloadPage = https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f; + downloadPage = "https://download.ebz.epson.net/dsc/du/02/DriverDownloadInfo.do?LG2=EN&CN2=&DSCMI=16857&DSCCHK=4334d3487503d7f916ccf5d58071b05b7687294f"; license = with lib.licenses; [ lgpl21 epson ]; maintainers = [ lib.maintainers.jorsn ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/misc/drivers/epson_201207w/default.nix b/pkgs/misc/drivers/epson_201207w/default.nix index fc854c00796..6a9782715d2 100644 --- a/pkgs/misc/drivers/epson_201207w/default.nix +++ b/pkgs/misc/drivers/epson_201207w/default.nix @@ -47,7 +47,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://www.openprinting.org/driver/epson-201207w; + homepage = "https://www.openprinting.org/driver/epson-201207w"; description = "Epson printer driver (L110, L210, L300, L350, L355, L550, L555)"; longDescription = '' This software is a filter program used with the Common UNIX Printing diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 6cf754192f8..4adb96e1299 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { name = "cups-gutenprint-binary-5.0.1"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb; + url = "https://www.openprinting.org/download/printdriver/debian/dists/lsb3.1/main/binary-amd64/gutenprint_5.0.1-1lsb3.1_amd64.deb"; sha256 = "0an5gba6r6v54r53s2gj2fjk8fzpl4lrksjas2333528b0k8gbbc"; } else throw "TODO"; # get from openprint.com -> drivers -> gutenprint diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 7c8750905d9..96c0968882d 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ghostscript and cups printer drivers"; - homepage = https://sourceforge.net/projects/gimp-print/; + homepage = "https://sourceforge.net/projects/gimp-print/"; license = licenses.gpl2; platforms = platforms.linux; isGutenprint = true; diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 3b03c300db3..452c2c425c1 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -181,8 +181,8 @@ python2Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = http://hplipopensource.com/; - downloadPage = https://sourceforge.net/projects/hplip/files/hplip/; + homepage = "http://hplipopensource.com/"; + downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index ab1794c1251..80cd39b9233 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -213,8 +213,8 @@ python2Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = https://developers.hp.com/hp-linux-imaging-and-printing; - downloadPage = https://sourceforge.net/projects/hplip/files/hplip/; + homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; + downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 4678442abd9..b1853e28589 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -220,8 +220,8 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; - homepage = https://developers.hp.com/hp-linux-imaging-and-printing; - downloadPage = https://sourceforge.net/projects/hplip/files/hplip/; + homepage = "https://developers.hp.com/hp-linux-imaging-and-printing"; + downloadPage = "https://sourceforge.net/projects/hplip/files/hplip/"; license = if withPlugin then licenses.unfree else with licenses; [ mit bsd2 gpl2Plus ]; diff --git a/pkgs/misc/drivers/m33-linux/default.nix b/pkgs/misc/drivers/m33-linux/default.nix index 492488f675f..cb78bd3498a 100644 --- a/pkgs/misc/drivers/m33-linux/default.nix +++ b/pkgs/misc/drivers/m33-linux/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/donovan6000/M3D-Linux; + homepage = "https://github.com/donovan6000/M3D-Linux"; description = "A Linux program that can communicate with the Micro 3D printer"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/moltengamepad/default.nix b/pkgs/misc/drivers/moltengamepad/default.nix index 2dd32a93219..e5b3b5bab22 100644 --- a/pkgs/misc/drivers/moltengamepad/default.nix +++ b/pkgs/misc/drivers/moltengamepad/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/jgeumlek/MoltenGamepad; + homepage = "https://github.com/jgeumlek/MoltenGamepad"; description = "Flexible Linux input device translator, geared for gamepads"; license = licenses.mit; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/misc/drivers/postscript-lexmark/default.nix b/pkgs/misc/drivers/postscript-lexmark/default.nix index cd322bf8fdb..74b7c68d38e 100644 --- a/pkgs/misc/drivers/postscript-lexmark/default.nix +++ b/pkgs/misc/drivers/postscript-lexmark/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.openprinting.org/driver/Postscript-Lexmark/; + homepage = "http://www.openprinting.org/driver/Postscript-Lexmark/"; description = "Lexmark Postscript Drivers"; platforms = platforms.linux; }; diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix index b977b2c0c15..4de6e54cd5f 100644 --- a/pkgs/misc/drivers/sc-controller/default.nix +++ b/pkgs/misc/drivers/sc-controller/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/kozec/sc-controller; + homepage = "https://github.com/kozec/sc-controller"; # donations: https://www.patreon.com/kozec description = "User-mode driver and GUI for Steam Controller and other controllers"; license = licenses.gpl2; diff --git a/pkgs/misc/drivers/steamcontroller/default.nix b/pkgs/misc/drivers/steamcontroller/default.nix index 4b19932450e..ca5607b5307 100644 --- a/pkgs/misc/drivers/steamcontroller/default.nix +++ b/pkgs/misc/drivers/steamcontroller/default.nix @@ -27,7 +27,7 @@ buildPythonApplication { meta = with stdenv.lib; { description = "A standalone Steam controller driver"; - homepage = https://github.com/ynsta/steamcontroller; + homepage = "https://github.com/ynsta/steamcontroller"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix index 5b1641a098d..b94a0978284 100644 --- a/pkgs/misc/drivers/sundtek/default.nix +++ b/pkgs/misc/drivers/sundtek/default.nix @@ -46,6 +46,6 @@ in maintainers = [ maintainers.simonvandel ]; platforms = platforms.unix; license = licenses.unfree; - homepage = https://support.sundtek.com/index.php/topic,1573.0.html; + homepage = "https://support.sundtek.com/index.php/topic,1573.0.html"; }; } diff --git a/pkgs/misc/drivers/utsushi/default.nix b/pkgs/misc/drivers/utsushi/default.nix index ad7659d060a..294bb8a0203 100644 --- a/pkgs/misc/drivers/utsushi/default.nix +++ b/pkgs/misc/drivers/utsushi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, autoreconfHook, pkg-config, boost, gtkmm2 -, imagemagick, sane-backends, tesseract4, udev, libusb}: +, imagemagick, sane-backends, tesseract4, udev, libusb1}: stdenv.mkDerivation rec { pname = "utsushi"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { imagemagick sane-backends udev.dev - libusb.dev + libusb1.dev ]; NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations -Wno-error=parentheses -Wno-error=unused-variable"; diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix index e2f2bcc2f24..eb0511b0c4e 100644 --- a/pkgs/misc/drivers/xboxdrv/default.nix +++ b/pkgs/misc/drivers/xboxdrv/default.nix @@ -13,12 +13,12 @@ in stdenv.mkDerivation { }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons libX11 libusb1 boost glib dbus-glib ]; + nativeBuildInputs = [ pkgconfig scons.py2 ]; + buildInputs = [ libX11 libusb1 boost glib dbus-glib ]; dontUseSconsInstall = true; meta = with stdenv.lib; { - homepage = https://pingus.seul.org/~grumbel/xboxdrv/; + homepage = "https://pingus.seul.org/~grumbel/xboxdrv/"; description = "Xbox/Xbox360 (and more) gamepad driver for Linux that works in userspace"; license = licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/misc/drivers/xow/default.nix b/pkgs/misc/drivers/xow/default.nix new file mode 100644 index 00000000000..8702c480457 --- /dev/null +++ b/pkgs/misc/drivers/xow/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, libusb1 }: + +stdenv.mkDerivation rec { + pname = "xow"; + version = "0.4"; + + src = fetchFromGitHub { + owner = "medusalix"; + repo = "xow"; + rev = "v${version}"; + sha256 = "1xkwcx2gqip9v2h3zjmrn7sgcck3midl5alhsmr3zivgdipamynv"; + }; + + 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" + ]; + enableParallelBuilding = true; + buildInputs = [ libusb1 ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/medusalix/xow"; + description = "Linux driver for the Xbox One wireless dongle"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.jansol ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/drivers/xp-pen-g430/default.nix b/pkgs/misc/drivers/xp-pen-g430/default.nix new file mode 100644 index 00000000000..c382239f26a --- /dev/null +++ b/pkgs/misc/drivers/xp-pen-g430/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }: +stdenv.mkDerivation rec { + pname = "xp-pen-G430"; + version = "20190820"; + + src = fetchzip { + url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip"; + sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby"; + } + /Linux_Pentablet_V1.3.0.0.tar.gz; + + nativeBuildInputs = [ + autoPatchelfHook + wrapQtAppsHook + ]; + + buildInputs = [ + libusb1 + libX11 + libXtst + qtbase + libglvnd + stdenv.cc.cc.lib + ]; + + installPhase = '' + mkdir -p $out/bin + cp {Pentablet_Driver,config.xml} "$out"/bin + ''; + + meta = with stdenv.lib; { + homepage = "https://www.xp-pen.com/download-46.html"; + description = "Driver for the XP-PEN G430 drawing tablet"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/pkgs/misc/drivers/xwiimote/default.nix b/pkgs/misc/drivers/xwiimote/default.nix index a21584afa4c..3b7b42990af 100644 --- a/pkgs/misc/drivers/xwiimote/default.nix +++ b/pkgs/misc/drivers/xwiimote/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-doxygen=no" ]; meta = { - homepage = http://dvdhrm.github.io/xwiimote; + 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; diff --git a/pkgs/misc/emulators/atari++/default.nix b/pkgs/misc/emulators/atari++/default.nix index 2e6ccd0a491..768c7ae7098 100644 --- a/pkgs/misc/emulators/atari++/default.nix +++ b/pkgs/misc/emulators/atari++/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec{ ''; meta = { - homepage = http://www.xl-project.com/; + homepage = "http://www.xl-project.com/"; description = "An enhanced, cycle-accurated Atari emulator"; longDescription = '' The Atari++ Emulator is a Unix based emulator of the Atari eight diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index 38dc54ea9d7..bb6323d18e0 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub, autoreconfHook , unzip, zlib, SDL, readline, libGLU, libGL, libX11 }: with stdenv.lib; stdenv.mkDerivation rec{ pname = "atari800"; - version = "4.0.0"; + version = "4.2.0"; - src = fetchurl { - url = "mirror://sourceforge/atari800/atari800/${version}/${pname}-${version}.tar.gz"; - sha256 = "1dcynsf8i52y7zyg62bkbhl3rdd22ss95zs2s9jm4y5jvn4vks88"; + src = fetchFromGitHub { + owner = "atari800"; + repo = "atari800"; + rev = "ATARI800_${replaceChars ["."] ["_"] version}"; + sha256 = "15l08clqqayi9izrgsz9achan6gl4x57wqsc8mad3yn0xayzz3qy"; }; + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ unzip zlib SDL readline libGLU libGL libX11 ]; configureFlags = [ @@ -23,10 +27,8 @@ stdenv.mkDerivation rec{ "--enable-riodevice" ]; - preConfigure = "cd src"; - meta = { - homepage = http://atari800.sourceforge.net/; + homepage = "https://atari800.github.io/"; description = "An Atari 8-bit emulator"; longDescription = '' Atari800 is the emulator of Atari 8-bit computer systems and diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 6c47109fb65..18c78c84d6c 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A frontend for arcade cabinets and media PCs"; - homepage = http://attractmode.org; + homepage = "http://attractmode.org"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; diff --git a/pkgs/misc/emulators/blastem/default.nix b/pkgs/misc/emulators/blastem/default.nix index 0d4c7ab7216..f4cef93141d 100644 --- a/pkgs/misc/emulators/blastem/default.nix +++ b/pkgs/misc/emulators/blastem/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.retrodev.com/blastem/; + homepage = "https://www.retrodev.com/blastem/"; description = "The fast and accurate Genesis emulator"; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/misc/emulators/bsod/default.nix b/pkgs/misc/emulators/bsod/default.nix index 8575d654feb..56b85227cda 100644 --- a/pkgs/misc/emulators/bsod/default.nix +++ b/pkgs/misc/emulators/bsod/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "bsod-0.1"; src = fetchurl { - url = https://www.vanheusden.com/bsod/bsod-0.1.tgz; + url = "https://www.vanheusden.com/bsod/bsod-0.1.tgz"; sha256 = "0hqwacazyq5rhc04j8w8w0j0dgb6ca8k66c9lxf6bsyi6wvbhvmd"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { microsoft windows experience. Bsod displays the famous windows xp 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/; + homepage = "http://www.vanheusden.com/bsod/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.antono ]; diff --git a/pkgs/misc/emulators/ccemux/default.nix b/pkgs/misc/emulators/ccemux/default.nix index 12777032870..fc5d4c81388 100644 --- a/pkgs/misc/emulators/ccemux/default.nix +++ b/pkgs/misc/emulators/ccemux/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A modular ComputerCraft emulator"; - homepage = https://github.com/CCEmuX/CCEmuX; + homepage = "https://github.com/CCEmuX/CCEmuX"; license = licenses.mit; maintainers = with maintainers; [ CrazedProgrammer ]; }; diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix index e587151d3e7..f493faaac54 100644 --- a/pkgs/misc/emulators/cdemu/base.nix +++ b/pkgs/misc/emulators/cdemu/base.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation ({ Optical media emulated by CDemu can be mounted within Linux. Automounting is also allowed. ''; - homepage = http://cdemu.sourceforge.net/; + homepage = "http://cdemu.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ bendlas ]; diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index df25fb96eb1..9723e53a8fd 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides a Virtual (SCSI) HBA"; - homepage = http://cdemu.sourceforge.net/about/vhba/; + homepage = "http://cdemu.sourceforge.net/about/vhba/"; platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ bendlas ]; diff --git a/pkgs/misc/emulators/citra/default.nix b/pkgs/misc/emulators/citra/default.nix index ca6ad37b5aa..efe4770a7b0 100644 --- a/pkgs/misc/emulators/citra/default.nix +++ b/pkgs/misc/emulators/citra/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: +{ stdenv, mkDerivation, lib, fetchgit, cmake, SDL2, qtbase, qtmultimedia, boost }: -stdenv.mkDerivation { +mkDerivation { pname = "citra"; - version = "2019-10-05"; + version = "2020-03-21"; # Submodules src = fetchgit { url = "https://github.com/citra-emu/citra"; - rev = "35690e3ac7a340d941d3bf56080cf5aa6187c5c3"; - sha256 = "11a4mdjabn3qrh0nn4pjl5fxs9nhf1k27wd486csfx88q2q9jvq8"; + rev = "8722b970c52f2c0d8e82561477edb62a53ae9dbb"; + sha256 = "0c1zn1f84h4f6n6p0aqz905yvv5qpdmkj2z58yla6bfgbzabfyrj"; }; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/darcnes/default.nix b/pkgs/misc/emulators/darcnes/default.nix index bdec34e396f..3ea98c571e8 100644 --- a/pkgs/misc/emulators/darcnes/default.nix +++ b/pkgs/misc/emulators/darcnes/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin darcnes"; meta = { - homepage = https://web.archive.org/web/20130502171725/http://www.dridus.com/~nyef/darcnes/; + 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; diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index d5d63cc2694..27c1a2cb9c3 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { roms. DeSmuME is also able to emulate nearly all of the commercial nds rom titles which other DS Emulators aren't. ''; - homepage = http://www.desmume.com ; + homepage = "http://www.desmume.com"; license = licenses.gpl1Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/dlx/default.nix b/pkgs/misc/emulators/dlx/default.nix index ad111a61514..215f2ee46f9 100644 --- a/pkgs/misc/emulators/dlx/default.nix +++ b/pkgs/misc/emulators/dlx/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.davidviner.com/dlx.php; + homepage = "http://www.davidviner.com/dlx.php"; description = "DLX Simulator"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index cc49ef2aa1d..b460aa7a485 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,17 +1,44 @@ -{ stdenv, lib, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib -, libGLU, libGL , gettext, libpthreadstubs, libXrandr, libXext, readline -, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev -, wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml -, libpulseaudio ? null }: +{ stdenv +, lib +, fetchpatch +, pkgconfig +, cmake +, bluez +, ffmpeg +, libao +, gtk2 +, glib +, libGLU +, libGL +, gettext +, libpthreadstubs +, libXrandr +, libXext +, readline +, openal +, libXdmcp +, portaudio +, fetchFromGitHub +, libusb1 +, libevdev +, wxGTK30 +, soundtouch +, miniupnpc +, mbedtls +, curl +, lzo +, sfml +, libpulseaudio ? null +}: stdenv.mkDerivation rec { pname = "dolphin-emu"; version = "5.0"; src = fetchFromGitHub { - owner = "dolphin-emu"; - repo = "dolphin"; - rev = version; + owner = "dolphin-emu"; + repo = "dolphin"; + rev = version; sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; }; @@ -44,15 +71,45 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake bluez ffmpeg libao libGLU libGL gtk2 glib - gettext libpthreadstubs libXrandr libXext readline openal - libevdev libXdmcp portaudio libusb libpulseaudio - libevdev libXdmcp portaudio libusb libpulseaudio - wxGTK30 soundtouch miniupnpc mbedtls curl lzo sfml ]; + nativeBuildInputs = [ + pkgconfig + cmake + ]; + + buildInputs = [ + bluez + ffmpeg + libao + libGLU + libGL + gtk2 + glib + gettext + libpthreadstubs + libXrandr + libXext + readline + openal + libevdev + libXdmcp + portaudio + libpulseaudio + libevdev + libXdmcp + portaudio + libusb1 + libpulseaudio + wxGTK30 + soundtouch + miniupnpc + mbedtls + curl + lzo + sfml + ]; meta = with lib; { - homepage = https://dolphin-emu.org/; + homepage = "https://dolphin-emu.org/"; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARMv8"; license = licenses.gpl2Plus; maintainers = with maintainers; [ MP2E ashkitten ]; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index e6e19e81242..aa77356600b 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeDesktopItem, pkgconfig, cmake , wrapQtAppsHook, qtbase, bluez, ffmpeg, libao, libGLU, libGL, pcre, gettext -, libXrandr, libusb, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama +, libXrandr, libusb1, lzo, libpthreadstubs, libXext, libXxf86vm, libXinerama , libSM, libXdmcp, readline, openal, udev, libevdev, portaudio, curl, alsaLib , miniupnpc, enet, mbedtls, soundtouch, sfml , vulkan-loader ? null, libpulseaudio ? null @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-11608"; + version = "5.0-11824"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "69ee15e5ef369d51681540e6714f02554e3bd8a6"; - sha256 = "1svi9mnddhjcv64xh3y9l68k3rix7wimq8b0mqf5hp7qrda07lx8"; + rev = "1b97f081b8eff9012132a4124537968bdb0e03e0"; + sha256 = "1v96hcn34040vjsw83k8p0r0nb8rrdcz80h4ngirxzm36b3l7w6m"; }; enableParallelBuilding = true; @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { buildInputs = [ curl ffmpeg libao libGLU libGL pcre gettext libpthreadstubs libpulseaudio libXrandr libXext libXxf86vm libXinerama libSM readline openal libXdmcp lzo - portaudio libusb libpng hidapi miniupnpc enet mbedtls soundtouch sfml + portaudio libusb1 libpng hidapi miniupnpc enet mbedtls soundtouch sfml qtbase ] ++ lib.optionals stdenv.isLinux [ bluez udev libevdev alsaLib vulkan-loader diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 5b770a6471a..b70f0e058c0 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://www.dosbox.com/; + homepage = "http://www.dosbox.com/"; description = "A DOS emulator"; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index 722f6b25429..af83d4b9f34 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = { description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; - homepage = https://emulationstation.org; + homepage = "https://emulationstation.org"; maintainers = [ stdenv.lib.maintainers.edwtjo ]; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix index 81202008db1..493cf4c2628 100644 --- a/pkgs/misc/emulators/epsxe/default.nix +++ b/pkgs/misc/emulators/epsxe/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://epsxe.com/; + homepage = "http://epsxe.com/"; description = "Enhanced PSX (PlayStation 1) emulator"; license = licenses.unfree; maintainers = with maintainers; [ yegortimoshenko ]; diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index 704cef52e5e..d7c8a185a09 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "fakenes-0.5.9b3"; src = fetchurl { - url = mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz; + url = "mirror://sourceforge/fakenes/fakenes-0.5.9-beta3.tar.gz"; sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { patches = [ ./build.patch ]; meta = { - homepage = http://fakenes.sourceforge.net/; + homepage = "http://fakenes.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "Portable Open Source NES Emulator"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix index 58a6a1dd442..0d4b4cd3576 100644 --- a/pkgs/misc/emulators/fceux/default.nix +++ b/pkgs/misc/emulators/fceux/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "A Nintendo Entertainment System (NES) Emulator"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.scubed2 ]; - homepage = http://www.fceux.com/; + homepage = "http://www.fceux.com/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index 079af05e794..583e692e133 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/nspire-emus/firebird; + 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 ]; diff --git a/pkgs/misc/emulators/fuse-emulator/default.nix b/pkgs/misc/emulators/fuse-emulator/default.nix index a3a379eb2cf..e2334a62a13 100644 --- a/pkgs/misc/emulators/fuse-emulator/default.nix +++ b/pkgs/misc/emulators/fuse-emulator/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = http://fuse-emulator.sourceforge.net/; + homepage = "http://fuse-emulator.sourceforge.net/"; description = "ZX Spectrum emulator"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 4120ec7ba6a..a9449808d52 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gens-gs-7"; src = fetchurl { - url = http://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz; + url = "http://retrocdn.net/images/6/6d/Gens-gs-r7.tar.gz"; sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE"; meta = with stdenv.lib; { - homepage = https://segaretro.org/Gens/GS; + homepage = "https://segaretro.org/Gens/GS"; description = "A Genesis/Mega Drive emulator"; platforms = [ "i686-linux" ]; license = licenses.gpl2Plus; diff --git a/pkgs/misc/emulators/gxemul/default.nix b/pkgs/misc/emulators/gxemul/default.nix index 04c5b441f01..e742fde90ac 100644 --- a/pkgs/misc/emulators/gxemul/default.nix +++ b/pkgs/misc/emulators/gxemul/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { and serial controllers. The emulation is working well enough to allow several unmodified "guest" operating systems to run. ''; - homepage = http://gxemul.sourceforge.net/; + homepage = "http://gxemul.sourceforge.net/"; }; } diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 278d8d8dc5f..db1a6664c54 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib SDL cmake ]; meta = { - homepage = http://hatari.tuxfamily.org/; + homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index c1e64d26b47..f77ce6635f2 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl -, p7zip, pkgconfig +, p7zip, pkgconfig, libicns , libX11, libXv , udev , libGLU, libGL, SDL +, Carbon, Cocoa, OpenGL, OpenAL , libao, openal, libpulseaudio , gtk2, gtksourceview , runtimeShell }: @@ -21,11 +22,24 @@ stdenv.mkDerivation rec { }; patches = [ ./0001-change-flags.diff ]; - postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp"; + postPatch = '' + sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp + + for file in icarus/GNUmakefile higan/target-tomoko/GNUmakefile; do + substituteInPlace "$file" \ + --replace 'sips -s format icns data/$(name).png --out out/$(name).app/Contents/Resources/$(name).icns' \ + 'png2icns out/$(name).app/Contents/Resources/$(name).icns data/$(name).png' + done + ''; + + nativeBuildInputs = [ p7zip pkgconfig ] + ++ optional stdenv.isDarwin [ libicns ]; buildInputs = - [ p7zip pkgconfig libX11 libXv udev libGLU libGL - SDL libao openal libpulseaudio gtk2 gtksourceview ]; + [ SDL libao ] + ++ optionals stdenv.isLinux [ openal libpulseaudio udev libX11 libXv libGLU libGL gtk2 gtksourceview ] + ++ optionals stdenv.isDarwin [ Carbon Cocoa OpenGL OpenAL ] + ; unpackPhase = '' 7z x $src @@ -38,27 +52,36 @@ stdenv.mkDerivation rec { ''; # Now the cheats file will be distributed separately - installPhase = '' - install -dm 755 $out/bin $out/share/applications $out/share/higan $out/share/pixmaps - install -m 755 icarus/out/icarus $out/bin/ - install -m 755 higan/out/higan $out/bin/ - install -m 644 higan/data/higan.desktop $out/share/applications/ - install -m 644 higan/data/higan.png $out/share/pixmaps/higan-icon.png - install -m 644 higan/resource/logo/higan.png $out/share/pixmaps/higan-logo.png + installPhase = (if !stdenv.isDarwin then '' + mkdir -p "$out"/bin "$out"/share/applications "$out"/share/pixmaps + install -m 755 icarus/out/icarus "$out"/bin/ + install -m 755 higan/out/higan "$out"/bin/ + install -m 644 higan/data/higan.desktop "$out"/share/applications/ + install -m 644 higan/data/higan.png "$out"/share/pixmaps/higan-icon.png + install -m 644 higan/resource/logo/higan.png "$out"/share/pixmaps/higan-logo.png + '' else '' + mkdir "$out" + mv higan/out/higan.app "$out"/ + mv icarus/out/icarus.app "$out"/ + '') + '' + mkdir -p "$out"/share/higan cp --recursive --no-dereference --preserve='links' --no-preserve='ownership' \ - higan/systems/* $out/share/higan/ + higan/systems/* "$out"/share/higan/ ''; - fixupPhase = '' + fixupPhase = let + dest = if !stdenv.isDarwin then "\\$HOME/.local/share/higan" else "\\$HOME/Library/Application Support/higan"; + in '' # A dirty workaround, suggested by @cpages: # we create a first-run script to populate # the local $HOME with all the auxiliary # stuff needed by higan at runtime + mkdir -p "$out"/bin cat <<EOF > $out/bin/higan-init.sh #!${runtimeShell} - cp --recursive --update $out/share/higan/*.sys \$HOME/.local/share/higan/ + cp --recursive --update $out/share/higan/*.sys "${dest}"/ EOF @@ -77,7 +100,7 @@ stdenv.mkDerivation rec { - NEC's PC Engine, SuperGrafx; - Bandai's WonderSwan, WonderSwan Color. ''; - homepage = https://byuu.org/emulation/higan/; + homepage = "https://byuu.org/emulation/higan/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix index da6a7c8bf2f..0b6fb0dea54 100644 --- a/pkgs/misc/emulators/kega-fusion/default.nix +++ b/pkgs/misc/emulators/kega-fusion/default.nix @@ -70,7 +70,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Sega SG1000, SC3000, SF7000, Master System, Game Gear, Genesis/Megadrive, SVP, Pico, SegaCD/MegaCD and 32X emulator"; - homepage = https://www.carpeludum.com/kega-fusion/; + homepage = "https://www.carpeludum.com/kega-fusion/"; maintainers = with maintainers; [ abbradar ]; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" ]; diff --git a/pkgs/misc/emulators/libdsk/default.nix b/pkgs/misc/emulators/libdsk/default.nix index cb64c30be49..6a2f94e77e6 100644 --- a/pkgs/misc/emulators/libdsk/default.nix +++ b/pkgs/misc/emulators/libdsk/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library for accessing discs and disc image files"; - homepage = http://www.seasip.info/Unix/LibDsk/; + homepage = "http://www.seasip.info/Unix/LibDsk/"; license = licenses.gpl2Plus; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index a0455b88bec..9b2204869b2 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -1,14 +1,17 @@ { stdenv, mkDerivation, fetchFromGitHub, makeDesktopItem, makeWrapper , python, pkgconfig, SDL2, SDL2_ttf, alsaLib, which, qtbase, libXinerama +, libpcap, CoreAudioKit, ForceFeedback , installShellFiles }: +with stdenv; + let majorVersion = "0"; - minorVersion = "218"; + minorVersion = "219"; desktopItem = makeDesktopItem { name = "MAME"; - exec = "mame${stdenv.lib.optionalString stdenv.is64bit "64"}"; + exec = "mame${lib.optionalString stdenv.is64bit "64"}"; desktopName = "MAME"; genericName = "MAME is a multi-purpose emulation framework"; categories = "System;Emulator;"; @@ -23,17 +26,26 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "11qschyxhi45pbpf9q3k71kybqxmcfhjml8axqpi43sv4q2ack6q"; + sha256 = "048ar1j2vsrvqqc3spy9qcch2lbxn0ycd9lv4ig5wfnvjkdjdvgr"; }; hardeningDisable = [ "fortify" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=maybe-uninitialized" "-Wno-error=missing-braces" ]; - makeFlags = [ "TOOLS=1" ]; + makeFlags = [ + "TOOLS=1" + "USE_LIBSDL=1" + ] + ++ lib.optionals stdenv.cc.isClang [ "CC=clang" "CXX=clang++" ] + ; dontWrapQtApps = true; - buildInputs = [ SDL2 SDL2_ttf alsaLib qtbase libXinerama ]; + buildInputs = + [ SDL2 SDL2_ttf qtbase libXinerama ] + ++ lib.optional stdenv.isLinux alsaLib + ++ lib.optionals stdenv.isDarwin [ libpcap CoreAudioKit ForceFeedback ] + ; nativeBuildInputs = [ python pkgconfig which makeWrapper installShellFiles ]; # by default MAME assumes that paths with stock resources @@ -58,16 +70,18 @@ in mkDerivation { installManPage ${dest}/docs/man/*.1 ${dest}/docs/man/*.6 mv artwork plugins samples ${dest} - + '' + lib.optionalString stdenv.isLinux '' mkdir -p $out/share ln -s ${desktopItem}/share/applications $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Is a multi-purpose emulation framework"; - homepage = https://www.mamedev.org/; + homepage = "https://www.mamedev.org/"; license = with licenses; [ bsd3 gpl2Plus ]; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = platforms.unix; + # makefile needs fixes for install target + badPlatforms = [ "aarch64-linux" ]; maintainers = with maintainers; [ gnidorah ]; }; } diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 777c9f043f4..feedfc2603e 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mednafen"; - version = "1.22.2"; + version = "1.24.1"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "159gvzrf4as1fp74czzc14vamhd6s3hlnvwglfgdd5j6d6n37m7s"; + sha256 = "1rszcy5lgfrw0f9b62sd69kgz1xziki3d55vpqh6k9jdmwzxyym4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index 59773764661..5611b344cb1 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mgba.io; + homepage = "https://mgba.io"; description = "A modern GBA emulator with a focus on accuracy"; longDescription = '' diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index ee3aab1834a..621559627a7 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Nintendo 64 Emulator"; license = licenses.gpl2Plus; - homepage = http://www.mupen64plus.org/; + homepage = "http://www.mupen64plus.org/"; maintainers = [ maintainers.sander ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 20c7c39312a..5050df007f6 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://0ldsk00l.ca/nestopia/; + homepage = "http://0ldsk00l.ca/nestopia/"; description = "NES emulator with a focus on accuracy"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index 6ac6f93750e..68b464f4d35 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -6,16 +6,17 @@ , freetype, tcl, zlib }: -stdenv.mkDerivation { +with stdenv.lib; +stdenv.mkDerivation rec { pname = "openmsx"; - version = "git-2017-11-02"; + version = "0.15.0"; src = fetchFromGitHub { owner = "openMSX"; repo = "openMSX"; - rev = "eeb74206ae347a3b17e9b99f91f2b4682c5db22c"; - sha256 = "170amj7k6wjhwx6psbplqljvckvhxxbv3aw72jrdxl1fb8zlnq3s"; + rev = "RELEASE_0_15_0"; + sha256 = "1lv5kdw0812mkf7k20z2djzk0pbs792xq2mibbnz9rfjf02whi7l"; fetchSubmodules = true; }; @@ -35,13 +36,13 @@ stdenv.mkDerivation { # for providing support to Nixpkgs :) TCL_CONFIG="${tcl}/lib/"; - meta = with stdenv.lib; { + meta = { description = "A MSX emulator"; longDescription = '' OpenMSX is an emulator for the MSX home computer system. Its goal is to emulate all aspects of the MSX with 100% accuracy. ''; - homepage = https://openmsx.org; + homepage = "https://openmsx.org"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; }; diff --git a/pkgs/misc/emulators/pcsxr/default.nix b/pkgs/misc/emulators/pcsxr/default.nix index 1035061d057..ae608f56312 100644 --- a/pkgs/misc/emulators/pcsxr/default.nix +++ b/pkgs/misc/emulators/pcsxr/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Playstation 1 emulator"; - homepage = https://pcsxr.codeplex.com/; + homepage = "https://pcsxr.codeplex.com/"; maintainers = with maintainers; [ rardiol ]; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/misc/emulators/qmc2/default.nix b/pkgs/misc/emulators/qmc2/default.nix index 660eba5fd03..1242a1ef11a 100644 --- a/pkgs/misc/emulators/qmc2/default.nix +++ b/pkgs/misc/emulators/qmc2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Qt frontend for MAME/MESS"; - homepage = https://qmc2.batcom-it.net; + homepage = "https://qmc2.batcom-it.net"; license = licenses.gpl2; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index b1d01e12b62..0ebd2b82a9a 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -22,7 +22,7 @@ let makeFlags = [ "platform=${{ linux = "unix"; - darwin = "unix"; + darwin = "osx"; windows = "win"; }.${stdenv.hostPlatform.parsed.kernel.name} or stdenv.hostPlatform.parsed.kernel.name}" "ARCH=${{ @@ -51,7 +51,7 @@ let meta = with stdenv.lib; { inherit (a) description license; broken = a.broken or false; - homepage = https://www.libretro.com/; + homepage = "https://www.libretro.com/"; maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; platforms = platforms.unix; }; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 02d09865432..a91e2de8593 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { preFixup = "rm $out/bin/retroarch-cg2glsl"; meta = { - homepage = https://libretro.com; + homepage = "https://libretro.com"; description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix index 44571de3489..d2c904723b1 100644 --- a/pkgs/misc/emulators/retrofe/default.nix +++ b/pkgs/misc/emulators/retrofe/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { version = "0.6.169"; src = fetchhg { - url = https://bitbucket.org/teamretro/retrofe; + url = "https://bitbucket.org/teamretro/retrofe"; rev = "8793e03"; sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm"; }; @@ -70,7 +70,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A frontend for arcade cabinets and media PCs"; - homepage = http://retrofe.com; + homepage = "http://retrofe.com"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hrdinka ]; platforms = with platforms; linux; diff --git a/pkgs/misc/emulators/rpcs3/default.nix b/pkgs/misc/emulators/rpcs3/default.nix index 674222dc355..4e022b2868f 100644 --- a/pkgs/misc/emulators/rpcs3/default.nix +++ b/pkgs/misc/emulators/rpcs3/default.nix @@ -1,22 +1,22 @@ -{ stdenv, lib, fetchgit, cmake, pkgconfig, git -, qt5, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python27 +{ mkDerivation, lib, fetchgit, cmake, pkgconfig, git +, qtbase, qtquickcontrols, openal, glew, vulkan-loader, libpng, ffmpeg, libevdev, python3 , pulseaudioSupport ? true, libpulseaudio , waylandSupport ? true, wayland , alsaSupport ? true, alsaLib }: let - majorVersion = "0.0.6"; - gitVersion = "8187-790962425"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) + majorVersion = "0.0.8"; + gitVersion = "9300-341fdf7eb"; # echo $(git rev-list HEAD --count)-$(git rev-parse --short HEAD) in -stdenv.mkDerivation { +mkDerivation { pname = "rpcs3"; version = "${majorVersion}-${gitVersion}"; src = fetchgit { url = "https://github.com/RPCS3/rpcs3"; - rev = "790962425cfb893529f72b3ef0dd1424fcc42973"; - sha256 = "154ys29b9xdws3bp4b7rb3kc0h9hd49g2yf3z9268cdq8aclahaa"; + rev = "341fdf7eb14763fd06e2eab9a4b2b8f1adf9fdbd"; + sha256 = "1qx97zkkjl6bmv5rhfyjqynbz0v8h40b2wxqnl59g287wj0yk3y1"; }; preConfigure = '' @@ -36,14 +36,14 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig git ]; buildInputs = [ - qt5.qtbase qt5.qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python27 + qtbase qtquickcontrols openal glew vulkan-loader libpng ffmpeg libevdev python3 ] ++ lib.optional pulseaudioSupport libpulseaudio ++ lib.optional alsaSupport alsaLib ++ lib.optional waylandSupport wayland; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "PS3 emulator/debugger"; homepage = "https://rpcs3.net/"; maintainers = with maintainers; [ abbradar nocent ]; diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index c2d98cda060..72dc48c1f4d 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, SDL2 }: +{ stdenv, fetchFromGitHub, pkgconfig, SDL2 }: with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "4.6.1"; + version = "6.1.1"; - src = fetchurl { - url = "mirror://sourceforge/project/stella/stella/${version}/${pname}-${version}-src.tar.gz"; - sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1"; + src = fetchFromGitHub { + owner = "stella-emu"; + repo = "stella"; + rev = version; + sha256 = "1iwhslrkq887v035j68lhblybww8r792515rp2m5qzmdgnjzsvbb"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ SDL2 ]; + + enableParallelBuilding = true; meta = { description = "An open-source Atari 2600 VCS emulator"; @@ -23,7 +27,7 @@ stdenv.mkDerivation rec { maintained by Stephen Anthony. As of its 3.5 release, Stella is officially donationware. ''; - homepage = http://stella.sourceforge.net/; + homepage = "http://stella-emu.github.io/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index 313b61b393e..7b52430aa01 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Ultimate/Unix/Unusable Amiga Emulator"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/; + homepage = "http://web.archive.org/web/20130901222855/http://www.amigaemulator.org/"; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index e44b45dbb4b..2aae72b3e20 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { description = "A merge of the original Visual Boy Advance forks"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; - homepage = http://vba-m.com/; + homepage = "https://vba-m.com/"; platforms = stdenv.lib.platforms.linux; badPlatforms = [ "aarch64-linux" ]; }; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index cb083c0aa0d..ca3149785a4 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "vice-3.1"; src = fetchurl { - url = mirror://sourceforge/vice-emu/vice-3.1.tar.gz; + url = "mirror://sourceforge/vice-emu/vice-3.1.tar.gz"; sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = { description = "Commodore 64, 128 and other emulators"; - homepage = http://www.viceteam.org; + homepage = "http://www.viceteam.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 06b3a950ba0..0e3eb2ce698 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -39,16 +39,16 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "5.0"; - url = "https://dl.winehq.org/wine/source/5.0/wine-${version}.tar.xz"; - sha256 = "1d0kcy338radq07hrnzcpc9lc9j2fvzjh37q673002x8d6x5058q"; + version = "5.5"; + url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz"; + sha256 = "1z7mvl6fgk7cg8vmy157r8azcz89srnckbzvsc6cva7a1fdi7qx0"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "054m2glvav29qnlgr3p36kahyv3kbxzba82djzqpc7cmsrin0d3f"; + sha256 = "0wcj73xcxsk5897m5fg14cjir2md167m09jjjv9z9n6157bfr9fw"; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix index 76606edf53c..444ef29b784 100644 --- a/pkgs/misc/emulators/wine/winetricks.nix +++ b/pkgs/misc/emulators/wine/winetricks.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to install DLLs needed to work around problems in Wine"; license = stdenv.lib.licenses.lgpl21; - homepage = https://github.com/Winetricks/winetricks; + homepage = "https://github.com/Winetricks/winetricks"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index 2416ddd65b7..4e90a524aa7 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation { meta = { description = "GUI for the Mupen64Plus 2.0 emulator"; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://bitbucket.org/auria/wxmupen64plus/wiki/Home; + homepage = "https://bitbucket.org/auria/wxmupen64plus/wiki/Home"; }; } diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index abceb752b2f..d29d7b1e7b8 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An open-source Sega Saturn emulator"; - homepage = https://yabause.org/; + homepage = "https://yabause.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 55fe49895c9..142a49b8d18 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation { description = "A Super Nintendo Entertainment System Emulator"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; - homepage = http://www.zsnes.com; + homepage = "http://www.zsnes.com"; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index abf4970c616..830d5bea36a 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonApplication, fetchFromGitHub, python3Packages, pyqtwebengine, lilypond }: buildPythonApplication rec { - name = "frescobaldi-${version}"; + pname = "frescobaldi"; version = "3.1.1"; src = fetchFromGitHub { @@ -28,7 +28,7 @@ buildPythonApplication rec { ]; meta = with lib; { - homepage = http://frescobaldi.org/; + homepage = "https://frescobaldi.org/"; description = ''Frescobaldi is a LilyPond sheet music text editor''; longDescription = '' Powerful text editor with syntax highlighting and automatic completion, diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 37974e41080..161ee8471bc 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { passthru = { inherit version; }; meta = { - homepage = https://www.ghostscript.com/; + homepage = "https://www.ghostscript.com/"; description = "PostScript interpreter (mainline version)"; longDescription = '' diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index 56dfe2f19f8..5a4eb1e7f33 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://savannah.gnu.org/projects/gnash; + homepage = "https://savannah.gnu.org/projects/gnash"; description = "A flash (SWF) player and browser plugin"; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/misc/gnuk/generic.nix b/pkgs/misc/gnuk/generic.nix index e592b945a40..c7bbb3b530d 100644 --- a/pkgs/misc/gnuk/generic.nix +++ b/pkgs/misc/gnuk/generic.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.fsij.org/pages/gnuk; + homepage = "http://www.fsij.org/pages/gnuk"; description = "An implementation of USB cryptographic token for gpg"; license = licenses.gpl3; platforms = with platforms; linux; diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix index f6eaa553bb2..d5007560762 100644 --- a/pkgs/misc/jackaudio/default.nix +++ b/pkgs/misc/jackaudio/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = { description = "JACK audio connection kit, version 2 with jackdbus"; - homepage = https://jackaudio.org; + homepage = "https://jackaudio.org"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/misc/jackaudio/jack1.nix b/pkgs/misc/jackaudio/jack1.nix index 39c0d7d50c7..2b5d0d960ca 100644 --- a/pkgs/misc/jackaudio/jack1.nix +++ b/pkgs/misc/jackaudio/jack1.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "JACK audio connection kit"; - homepage = https://jackaudio.org; + homepage = "https://jackaudio.org"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.unix; }; diff --git a/pkgs/misc/lguf-brightness/default.nix b/pkgs/misc/lguf-brightness/default.nix index 297ca955e86..02ce011c59d 100644 --- a/pkgs/misc/lguf-brightness/default.nix +++ b/pkgs/misc/lguf-brightness/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Adjust brightness for LG UltraFine 4K display (cross platform)"; - homepage = https://github.com/periklis/lguf-brightness; + homepage = "https://github.com/periklis/lguf-brightness"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ periklis ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index a0a29f95aba..d3f284a2ddb 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -16,7 +16,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; meta = with stdenv.lib; { - homepage = https://www.elastic.co/products/beats; + homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; platforms = platforms.linux; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index adcbdddfc3a..cdc8417a9c1 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -16,7 +16,7 @@ let beat = package : extraArgs : buildGoPackage (rec { subPackages = [ package ]; meta = with stdenv.lib; { - homepage = https://www.elastic.co/products/beats; + homepage = "https://www.elastic.co/products/beats"; license = licenses.asl20; maintainers = with maintainers; [ fadenb basvandijk ]; platforms = platforms.linux; diff --git a/pkgs/misc/long-shebang/default.nix b/pkgs/misc/long-shebang/default.nix index 5af75be690c..753e1f490bb 100644 --- a/pkgs/misc/long-shebang/default.nix +++ b/pkgs/misc/long-shebang/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation { meta = { description = "A tool for #! scripts with more than one argument"; - homepage = https://github.com/shlevy/long-shebang; + homepage = "https://github.com/shlevy/long-shebang"; license = stdenv.lib.licenses.mit; diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix index d701bd654d2..a5a621435ee 100644 --- a/pkgs/misc/mxt-app/default.nix +++ b/pkgs/misc/mxt-app/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "Command line utility for Atmel maXTouch devices"; - homepage = https://github.com/atmel-maxtouch/mxt-app; + homepage = "https://github.com/atmel-maxtouch/mxt-app"; license = licenses.bsd2; maintainers = [ maintainers.colemickens ]; platforms = platforms.linux; diff --git a/pkgs/misc/riscv-pk/default.nix b/pkgs/misc/riscv-pk/default.nix index e724869b235..3e1f63e5e30 100644 --- a/pkgs/misc/riscv-pk/default.nix +++ b/pkgs/misc/riscv-pk/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { meta = { description = "RISC-V Proxy Kernel and Bootloader."; - homepage = https://github.com/riscv/riscv-pk; + homepage = "https://github.com/riscv/riscv-pk"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.riscv; maintainers = [ stdenv.lib.maintainers.shlevy ]; diff --git a/pkgs/misc/rkdeveloptool/default.nix b/pkgs/misc/rkdeveloptool/default.nix index e877629bcb0..8ce4fd8e14c 100644 --- a/pkgs/misc/rkdeveloptool/default.nix +++ b/pkgs/misc/rkdeveloptool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "rkdeveloptool"; - version = "1.3"; + version = "unstable-2019-07-01"; src = fetchFromGitHub { owner = "rockchip-linux"; repo = "rkdeveloptool"; - rev = "081d237ad5bf8f03170c9d60bd94ceefa0352aaf"; - sha256 = "05hh7j3xgb8l1k1v2lis3nvlc0gp87ihzg6jci7m5lkkm5qgv3ji"; + rev = "6e92ebcf8b1812da02663494a68972f956e490d3"; + sha256 = "0zwrkqfxd671iy69v3q0844gfdpm1yk51i9qh2rqc969bd8glxga"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation { buildInputs = [ libusb1 ]; meta = with stdenv.lib; { - homepage = https://github.com/rockchip-linux/rkdeveloptool; + homepage = "https://github.com/rockchip-linux/rkdeveloptool"; description = "A tool from Rockchip to communicate with Rockusb devices"; license = licenses.gpl2; maintainers = [ maintainers.lopsided98 ]; diff --git a/pkgs/misc/sailsd/default.nix b/pkgs/misc/sailsd/default.nix index 49d86491aa0..0dca0701098 100644 --- a/pkgs/misc/sailsd/default.nix +++ b/pkgs/misc/sailsd/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simulator daemon for autonomous sailing boats"; - homepage = https://github.com/sails-simulator/sailsd; + homepage = "https://github.com/sails-simulator/sailsd"; license = licenses.gpl3; longDescription = '' Sails is a simulator designed to test the AI of autonomous sailing diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index 6e5822b5a6f..c47825f9010 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display and control Android devices over USB or TCP/IP"; - homepage = https://github.com/Genymobile/scrcpy; + homepage = "https://github.com/Genymobile/scrcpy"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ deltaevo lukeadams ]; diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 59d5a146e16..c9340b2503e 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "alock-${date}"; src = fetchgit { - url = https://github.com/Arkq/alock; + url = "https://github.com/Arkq/alock"; rev = "2035e1d4a2293432f5503e82d10f899232eb0f38"; sha256 = "1by954fjn0ryqda89zlmq3gclakg3gz7zy1wjrbgw4lzsk538va6"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/Arkq/alock; + homepage = "https://github.com/Arkq/alock"; description = "Simple screen lock application for X server"; longDescription = '' alock locks the X server until the user enters a password diff --git a/pkgs/misc/screensavers/betterlockscreen/default.nix b/pkgs/misc/screensavers/betterlockscreen/default.nix index d25f253bd00..36f89819570 100644 --- a/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Betterlockscreen is a simple minimal lock screen which allows you to cache images with different filters and lockscreen with blazing speed."; - homepage = https://github.com/pavanjadhaw/betterlockscreen; + homepage = "https://github.com/pavanjadhaw/betterlockscreen"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ eyjhb ]; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index b36f8bf98de..71a248bcfa1 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Electric Sheep, a distributed screen saver for evolving artificial organisms"; - homepage = https://electricsheep.org/; + homepage = "https://electricsheep.org/"; maintainers = with maintainers; [ nand0p fpletz ]; platforms = platforms.linux; license = licenses.gpl1; diff --git a/pkgs/misc/screensavers/i3lock-pixeled/default.nix b/pkgs/misc/screensavers/i3lock-pixeled/default.nix index ae61291b087..5ffe5f72265 100644 --- a/pkgs/misc/screensavers/i3lock-pixeled/default.nix +++ b/pkgs/misc/screensavers/i3lock-pixeled/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple i3lock helper which pixels a screenshot by scaling it down and up to get a pixeled version of the screen when the lock is active."; - homepage = https://gitlab.com/Ma27/i3lock-pixeled; + homepage = "https://gitlab.com/Ma27/i3lock-pixeled"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index 9763949cf98..4d257650338 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/the-cavalry/light-locker; + homepage = "https://github.com/the-cavalry/light-locker"; description = "A simple session-locker for LightDM"; longDescription = '' A simple locker (forked from gnome-screensaver) that aims to diff --git a/pkgs/misc/screensavers/pipes/default.nix b/pkgs/misc/screensavers/pipes/default.nix index fb80f9922ce..211b7614f3b 100644 --- a/pkgs/misc/screensavers/pipes/default.nix +++ b/pkgs/misc/screensavers/pipes/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pipeseroni/pipes.sh; + homepage = "https://github.com/pipeseroni/pipes.sh"; description = "Animated pipes terminal screensaver"; license = licenses.mit; maintainers = [ maintainers.matthiasbeyer ]; diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix index 9dadd085067..7df635c10c7 100644 --- a/pkgs/misc/screensavers/slock/default.nix +++ b/pkgs/misc/screensavers/slock/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://tools.suckless.org/slock; + homepage = "https://tools.suckless.org/slock"; description = "Simple X display locker"; longDescription = '' Simple X display locker. This is the simplest X screen locker. diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index ae89bbd53cc..83d82e2b3b3 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "vlock-2.2.2"; src = fetchurl { - url = mirror://debian/pool/main/v/vlock/vlock_2.2.2.orig.tar.gz; + url = "mirror://debian/pool/main/v/vlock/vlock_2.2.2.orig.tar.gz"; sha256 = "1b9gv7hmlb8swda5bn40lp1yki8b8wv29vdnhcjqfl6ir98551za"; }; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index f18099d3840..2c39ed599e2 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screen locker for the X Window System"; - homepage = http://sillycycle.com/xlockmore.html; + homepage = "http://sillycycle.com/xlockmore.html"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 1937874a49c..1dd09852d27 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "5.43"; + version = "5.44"; pname = "xscreensaver"; src = fetchurl { url = "https://www.jwz.org/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1571pj1a9998sq14y9366s2rw9wd2kq3l3dvvsk610vyd0fki3qm"; + sha256 = "15bv05vpfjwsrqbazrjmm382jd7vvw0mp6y9vasn6wvxzjf0in3k"; }; buildInputs = @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ; meta = { - homepage = https://www.jwz.org/xscreensaver/; + 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 diff --git a/pkgs/misc/screensavers/xssproxy/default.nix b/pkgs/misc/screensavers/xssproxy/default.nix index a278e6dc949..cff03f3bed0 100644 --- a/pkgs/misc/screensavers/xssproxy/default.nix +++ b/pkgs/misc/screensavers/xssproxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Forward freedesktop.org Idle Inhibition Service calls to Xss"; - homepage = https://github.com/timakro/xssproxy; + homepage = "https://github.com/timakro/xssproxy"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ benley ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/misc/screensavers/xtrlock-pam/default.nix b/pkgs/misc/screensavers/xtrlock-pam/default.nix index 1aa1f347ab4..ca4623e3068 100644 --- a/pkgs/misc/screensavers/xtrlock-pam/default.nix +++ b/pkgs/misc/screensavers/xtrlock-pam/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/aanatoly/xtrlock-pam; + homepage = "https://github.com/aanatoly/xtrlock-pam"; description = "PAM based X11 screen locker"; license = "unknown"; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index 7ca9843e2e3..aea4da3eaeb 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,12 +1,10 @@ { stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo , ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123 , alsaUtils, vorbis-tools, csound, lilypond -, makeWrapper +, wrapGAppsHook }: -let - inherit (pythonPackages) python pygtk; -in stdenv.mkDerivation rec { +pythonPackages.buildPythonApplication rec { name = "solfege-3.22.2"; src = fetchurl { @@ -14,10 +12,9 @@ in stdenv.mkDerivation rec { sha256 = "1r4g93ka7i8jh5glii5nza0zq0wy4sw0gfzpvkcrhj9yr1h0jsp4"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python pygtk gettext texinfo - ghostscript librsvg gdk-pixbuf txt2man makeWrapper - ]; + nativeBuildInputs = [ gettext texinfo pkgconfig wrapGAppsHook ]; + buildInputs = [ librsvg ]; + propagatedBuildInputs = [ pythonPackages.pygtk ]; preBuild = '' sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \ @@ -29,16 +26,13 @@ in stdenv.mkDerivation rec { default.config ''; - postInstall = '' - set -x - wrapProgram "$out/bin/solfege" \ - --prefix PYTHONPATH ':' "$PYTHONPATH" \ - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" - ''; + format = "other"; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Ear training program"; - homepage = http://www.solfege.org/; + homepage = "http://www.solfege.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/misc/sound-of-sorting/default.nix b/pkgs/misc/sound-of-sorting/default.nix index 1072bac7816..6b1c91d088e 100644 --- a/pkgs/misc/sound-of-sorting/default.nix +++ b/pkgs/misc/sound-of-sorting/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib;{ description = "Audibilization and Visualization of Sorting Algorithms"; - homepage = http://panthema.net/2013/sound-of-sorting/; + homepage = "http://panthema.net/2013/sound-of-sorting/"; license = with licenses; gpl3; maintainers = with maintainers; [ AndersonTorres ]; }; diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix index d0d3fbdf2d7..17ef047ede7 100644 --- a/pkgs/misc/stabber/default.nix +++ b/pkgs/misc/stabber/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Stubbed XMPP Server"; - homepage = https://github.com/boothj5/stabber; + homepage = "https://github.com/boothj5/stabber"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ hschaeidt ]; diff --git a/pkgs/misc/talkfilters/default.nix b/pkgs/misc/talkfilters/default.nix index 8154e417e06..a622eca7795 100644 --- a/pkgs/misc/talkfilters/default.nix +++ b/pkgs/misc/talkfilters/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "Converts English text into text that mimics a stereotyped or humorous dialect"; - homepage = http://www.hyperrealm.com/talkfilters/talkfilters.html; + 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; diff --git a/pkgs/misc/tmux-plugins/default.nix b/pkgs/misc/tmux-plugins/default.nix index 0d10b44ab1e..23c513ea175 100644 --- a/pkgs/misc/tmux-plugins/default.nix +++ b/pkgs/misc/tmux-plugins/default.nix @@ -1,6 +1,5 @@ -{ fetchgit +{ lib , fetchFromGitHub -, lib , pkgs , reattach-to-user-namespace , stdenv @@ -30,7 +29,7 @@ let ... }: addRtp "${rtpPath}/${path}" rtpFilePath a (stdenv.mkDerivation (a // { - name = namePrefix + pluginName; + pname = namePrefix + pluginName; inherit pluginName unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; @@ -56,54 +55,66 @@ in rec { battery = mkDerivation { pluginName = "battery"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-battery"; - rev = "09be78c35ee84f858f724442b94ad045ade23eb0"; - sha256 = "0gm6qiay0k5b3yzrabfmh4inyh9r6rfhja2l3r4cixcvc8sgvh8l"; + version = "unstable-2019-07-04"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-battery"; + rev = "f8b8e8451990365e0c98c38c184962e4f83b793b"; + sha256 = "1bhdzsx3kdjqjmm1q4j8937lrpkzf71irr3fqhdbddsghwrrmwim"; }; }; continuum = mkDerivation { pluginName = "continuum"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-continuum"; - rev = "90f4a00c41de094864dd4e29231253bcd80d4409"; - sha256 = "1hviqz62mnq5h4vgcy9bl5004q18yz5b90bnih0ibsna877x3nbc"; + version = "unstable-2018-02-23"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-continuum"; + rev = "1531b3770a7cf7373d15fedd239c5331b99342d1"; + sha256 = "1w3f7gzvv1k25yfr6d1snr2z88p8f87cahrbaslmyphdxpy0fa4m"; }; dependencies = [ resurrect ]; }; copycat = mkDerivation { pluginName = "copycat"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-copycat"; - rev = "6f9b9cd2d93872cef60e3ea7f7ae89598569ed25"; - sha256 = "12dgn5wnzrhd6sqa64w875ld3lrrny8xvdq6b6lzxyain9q49mrf"; + version = "unstable-2020-01-09"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-copycat"; + rev = "77ca3aab2aed8ede3e2b941079b1c92dd221cf5f"; + sha256 = "1bchwzhai8k5rk32n4lrmh56rw944jqxr8imjk74hyaa7bbn81ds"; }; }; cpu = mkDerivation { pluginName = "cpu"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-cpu"; - rev = "12f7a74e25bf59701456e2c0d98b39bb19ec7039"; - sha256 = "0qxn8ngg297980lj6w8ih2m8m8bxxdbcz5hsjmlia92h5rdkm5kl"; + version = "unstable-2020-04-05"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-cpu"; + rev = "8858050756e1fc3c081d37894b441f05ea893a67"; + sha256 = "1bydzrnd9y5y46hjr844p4ylx2dpijn6pv3w94yyvwbyswmirhff"; }; }; - ctrlw = mkDerivation { + ctrlw = mkDerivation rec { pluginName = "ctrlw"; - src = fetchgit { - url = "https://github.com/eraserhd/tmux-ctrlw"; - rev = "b456977125c640cd587b786c6a79cb5c7b0f900d"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "eraserhd"; + repo = "tmux-ctrlw"; + rev = "v${version}"; sha256 = "1kv5pqfjczd6z7i9jf6j5xmcai50l9bn5p2p1w1l5fi6cj8cz1k1"; }; }; fpp = mkDerivation { pluginName = "fpp"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-fpp"; + version = "unstable-2016-03-08"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-fpp"; rev = "ca125d5a9c80bb156ac114ac3f3d5951a795c80e"; sha256 = "1b89s6mfzifi7s5iwf22w7niddpq28w48nmqqy00dv38z4yga5ws"; }; @@ -116,18 +127,22 @@ in rec { fzf-tmux-url = mkDerivation { pluginName = "fzf-tmux-url"; rtpFilePath = "fzf-url.tmux"; - src = fetchgit { - url = "https://github.com/wfxr/tmux-fzf-url"; - rev = "ecd518eec1067234598c01e655b048ff9d06ef2f"; - sha256 = "0png8hdv91y2nivq5vdii2192mb2qcrkwwn69lzxrdnbfa27qrgv"; + version = "unstable-2019-12-02"; + src = fetchFromGitHub { + owner = "wfxr"; + repo = "tmux-fzf-url"; + rev = "2baa410bf7a0f6ceb62a83770baf90d570406ac0"; + sha256 = "0rjzzlmxgjrr8g19bg2idcqr9ny07mrq2s39vndg24n0m7znh3fz"; }; }; gruvbox = mkDerivation { pluginName = "gruvbox"; rtpFilePath = "gruvbox-tpm.tmux"; - src = fetchgit { - url = "https://github.com/egel/tmux-gruvbox"; + version = "unstable-2019-05-05"; + src = fetchFromGitHub { + owner = "egel"; + repo = "tmux-gruvbox"; rev = "6149fd8b5d6924925b4d5aa6935039780e94f3d6"; sha256 = "1ykr4yardavd0x7yfrnshd4b0gi8p31pji7i79ib0nss134zncpb"; }; @@ -135,26 +150,32 @@ in rec { logging = mkDerivation { pluginName = "logging"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-logging"; - rev = "b2706119cd587230beae02980d3d7fa2d5afebe9"; - sha256 = "1w1ymscfbz87lypaxgjdva1rg7jw2jyf7nnfgyngghw9m1l2xk2c"; + version = "unstable-2019-04-19"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-logging"; + rev = "b085ad423b5d59a2c8b8d71772352e7028b8e1d0"; + sha256 = "0p0sawysalhi8k2a5hdxniqx6kb24kd8rnvfzkjqigzid5ik37js"; }; }; net-speed = mkDerivation { pluginName = "net-speed"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-net-speed"; - rev = "536d2bdd053a3bdfcc5cf7680c0dba76127c95ca"; - sha256 = "1bly5f40dgiym378jkfwm7qag9xl6qvziqiqnj65yblqd5py325z"; + version = "unstable-2018-12-02"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-net-speed"; + rev = "58abb615971cb617821e2e7e41c660334f55a92d"; + sha256 = "1aj06gdhzcxsydjzf21n9kyxigwf38kh2rg8hh7gnjk260ydqlrc"; }; }; maildir-counter = mkDerivation { pluginName = "maildir-counter"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-maildir-counter"; + version = "unstable-2016-11-25"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-maildir-counter"; rev = "9415f0207e71e37cbd870c9443426dbea6da78b9"; sha256 = "0dwvqhiv9bjwr01hsi5c57n55jyv5ha5m5q1aqgglf4wyhbnfms4"; }; @@ -162,8 +183,10 @@ in rec { online-status = mkDerivation { pluginName = "online-status"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-online-status"; + version = "unstable-2018-11-30"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-online-status"; rev = "ea86704ced8a20f4a431116aa43f57edcf5a6312"; sha256 = "1hy3vg8v2sir865ylpm2r4ip1zgd4wlrf24jbwh16m23qdcvc19r"; }; @@ -171,28 +194,33 @@ in rec { open = mkDerivation { pluginName = "open"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-open"; - rev = "f99d3189c445188eae5fa9bfeabc95df16deca92"; - sha256 = "13q3zd5jv7akkjjwhgimmfylrvalxdn54fnpfb14g6xam6h8808m"; + version = "unstable-2019-12-02"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-open"; + rev = "cedb4584908bd8458fadc8d3e64101d3cbb48d46"; + sha256 = "10s0xdhmg0dhpj13ybcq72pw3xgb2dq5v5h2mwidzqyh9g17wndh"; }; }; pain-control = mkDerivation { pluginName = "pain-control"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-pain-control"; - rev = "731667692da46d51a6a9dffb4c43384a5d68ff28"; - sha256 = "1ihpl5wgjmhfgcrasgnydd7vpsar865sx2whra19gpfm4bglmdzl"; + version = "unstable-2020-02-18"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-pain-control"; + rev = "2db63de3b08fc64831d833240749133cecb67d92"; + sha256 = "0w7a6n4n86ysiqcqj12j2hg9r5fznvbp3dz8pzas9q1k3avlk0zk"; }; }; - plumb = mkDerivation { + plumb = mkDerivation rec { pluginName = "plumb"; + version = "0.1.1"; src = fetchFromGitHub { owner = "eraserhd"; repo = "tmux-plumb"; - rev = "v0.1.1"; + rev = "v${version}"; sha256 = "1c6k4fdl0az9811r6k164mgd4w5la75xr6x7nabmy046xc0z5i2r"; }; postInstall = '' @@ -202,26 +230,32 @@ in rec { prefix-highlight = mkDerivation { pluginName = "prefix-highlight"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-prefix-highlight"; - rev = "34f7125ae46e5123bedad03e08027332d1186186"; - sha256 = "16z8sm8pifg1m9lmv0z50fb0ws9mk5zqs7a1ddl2bfwkqi7yc0c0"; + version = "unstable-2020-03-26"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-prefix-highlight"; + rev = "1db6e735aad54503b076391d791c56e1af213917"; + sha256 = "0ws9blzg00zhz548m51cm6zbrkqlz7jazkr5029vka1f6qk36x0g"; }; }; resurrect = mkDerivation { pluginName = "resurrect"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-resurrect"; - rev = "7c77c70483b818d331e46c4cf64c716ded09a152"; - sha256 = "08gjxwdmfy16xpgi87rp9dj5338imqsy392pixf7xcnr05413ap1"; + version = "unstable-2020-03-21"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-resurrect"; + rev = "327c0481ad20c429b4e692e092659f8b3346b08f"; + sha256 = "0nxfqazww36wwv49dzd39kq4jfls20834hf1458sf5pvmv5cmbyw"; }; }; sensible = mkDerivation { pluginName = "sensible"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-sensible"; + version = "unstable-2017-09-05"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-sensible"; rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5"; sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx"; }; @@ -232,8 +266,10 @@ in rec { sessionist = mkDerivation { pluginName = "sessionist"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-sessionist"; + version = "unstable-2017-12-03"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-sessionist"; rev = "09ec86be38eae98ffc27bd0dde605ed10ae0dc89"; sha256 = "030q2mmj8akbc26jnqn8n7fckg1025p0ildx4wr401b6p1snnlw4"; }; @@ -241,15 +277,18 @@ in rec { sidebar = mkDerivation { pluginName = "sidebar"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-sidebar"; - rev = "23014524cab53f8d36373983500fe05a527a444d"; - sha256 = "1w363587isdip1r81h0vkp5163lpa83lvasg8l04h43sbip2y6i8"; + version = "unstable-2018-11-30"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-sidebar"; + rev = "aacbdb45bc5ab69db448a72de4155d0b8dbac677"; + sha256 = "1bp90zbv19kbbiik0bgb893ybss1jqsnk3353a631993xjwsih7c"; }; }; sysstat = mkDerivation { pluginName = "sysstat"; + version = "unstable-2017-12-12"; src = fetchFromGitHub { owner = "samoshkin"; repo = "tmux-plugin-sysstat"; @@ -260,6 +299,7 @@ in rec { tmux-colors-solarized = mkDerivation { pluginName = "tmuxcolors"; + version = "unstable-2019-07-14"; src = fetchFromGitHub { owner = "seebi"; repo = "tmux-colors-solarized"; @@ -270,8 +310,10 @@ in rec { urlview = mkDerivation { pluginName = "urlview"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-urlview"; + version = "unstable-2016-01-06"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-urlview"; rev = "b84c876cffdd22990b4ab51247e795cbd7813d53"; sha256 = "1jp4jq57cn116b3i34v6yy69izd8s6mp2ijr260cw86g0470k0fn"; }; @@ -284,19 +326,23 @@ in rec { vim-tmux-navigator = mkDerivation { pluginName = "vim-tmux-navigator"; rtpFilePath = "vim-tmux-navigator.tmux"; - src = fetchgit { - url = "https://github.com/christoomey/vim-tmux-navigator"; - rev = "4e1a877f51a17a961b8c2a285ee80aebf05ccf42"; - sha256 = "1b8sgbzl4pcpaabqk254n97mjz767ganrmqbsr6rqzz3j9a3s1fv"; + version = "unstable-2019-12-10"; + src = fetchFromGitHub { + owner = "christoomey"; + repo = "vim-tmux-navigator"; + rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306"; + sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac"; }; }; yank = mkDerivation { pluginName = "yank"; - src = fetchgit { - url = "https://github.com/tmux-plugins/tmux-yank"; - rev = "feb9611b7d1c323ca54cd8a5111a53e3e8265b59"; - sha256 = "1ywbm09jfh6cm2m6gracmdc3pp5p2dwraalbhfaafqaydjr22qc3"; + version = "unstable-2019-12-02"; + src = fetchFromGitHub { + owner = "tmux-plugins"; + repo = "tmux-yank"; + rev = "648005db64d9bf3c4650eff694ecb6cf3e42b0c8"; + sha256 = "1zg9k8yk1iw01vl8m44w4sv20lln4l0lq9dafc09lxmgxm9dllj4"; }; }; diff --git a/pkgs/misc/tpm2-pkcs11/default.nix b/pkgs/misc/tpm2-pkcs11/default.nix index 9e3be1101a6..a089488b0e0 100644 --- a/pkgs/misc/tpm2-pkcs11/default.nix +++ b/pkgs/misc/tpm2-pkcs11/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "tpm2-pkcs11"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "tpm2-software"; repo = pname; rev = version; - sha256 = "0gqbbxh1y2vcznxw96xn1wpcvg613zzzrbbfrqbw3p7spbn65yfq"; + sha256 = "0ydd88jc4pyf1v7008h2gf0napv6xpw4jn5w87slj9fphjdkwjiz"; }; patches = lib.singleton ( diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 29dfb6558a9..06da268ff53 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -80,7 +80,7 @@ let dontStrip = true; meta = with lib; { - homepage = http://www.denx.de/wiki/U-Boot/; + homepage = "http://www.denx.de/wiki/U-Boot/"; description = "Boot loader for embedded systems"; license = licenses.gpl2; maintainers = with maintainers; [ dezgeg samueldr lopsided98 ]; diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index a0b6be3a418..031b65a1ef6 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An operating function"; - homepage = https://urbit.org; + homepage = "https://urbit.org"; license = licenses.mit; maintainers = with maintainers; [ mudri ]; platforms = with platforms; linux; diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/misc/vim-plugins/aliases.nix index cfdd629369c..4cfb6ccd372 100644 --- a/pkgs/misc/vim-plugins/aliases.nix +++ b/pkgs/misc/vim-plugins/aliases.nix @@ -30,12 +30,17 @@ let (removeRecurseForDerivations (checkInPkgs n alias))) aliases; -in -mapAliases { + deprecations = lib.mapAttrs (old: info: + throw "${old} was renamed to ${info.new} on ${info.date}. Please update to ${info.new}." + ) (builtins.fromJSON (builtins.readFile ./deprecated.json)); + +in +mapAliases ({ airline = vim-airline; alternative = a-vim; # backwards compat, added 2014-10-21 bats = bats-vim; + BufOnly = BufOnly-vim; calendar = calendar-vim; coffee-script = vim-coffee-script; coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18 @@ -67,7 +72,7 @@ mapAliases { ghc-mod-vim = ghcmod-vim; ghcmod = ghcmod-vim; goyo = goyo-vim; - Gist = gist-vim; + Gist = vim-gist; gitgutter = vim-gitgutter; gundo = gundo-vim; Gundo = gundo-vim; # backwards compat, added 2015-10-03 @@ -133,7 +138,6 @@ mapAliases { wombat256 = wombat256-vim; # backwards compat, added 2015-7-8 yankring = YankRing-vim; Yankring = YankRing-vim; - YouCompleteMe = youcompleteme; xterm-color-table = xterm-color-table-vim; zeavim = zeavim-vim; -} +} // deprecations) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 20cbbf275c3..e6bca9484a2 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -11,7 +11,6 @@ let # TL;DR # * Add your plugin to ./vim-plugin-names - # * sort -udf ./vim-plugin-names > sorted && mv sorted vim-plugin-names # * run ./update.py # # If additional modifications to the build process are required, diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json new file mode 100644 index 00000000000..2af94f5df3d --- /dev/null +++ b/pkgs/misc/vim-plugins/deprecated.json @@ -0,0 +1,18 @@ +{ + "gist-vim": { + "date": "2020-03-27", + "new": "vim-gist" + }, + "vim-jade": { + "date": "2020-03-27", + "new": "vim-pug" + }, + "vundle": { + "date": "2020-03-27", + "new": "Vundle-vim" + }, + "youcompleteme": { + "date": "2020-03-27", + "new": "YouCompleteMe" + } +} diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 2a5d2eb0dfd..68d2aae23ce 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -63,7 +63,7 @@ let pname = "ale"; version = "2020-03-11"; src = fetchFromGitHub { - owner = "w0rp"; + owner = "dense-analysis"; repo = "ale"; rev = "bbe5153fcb36dec9860ced33ae8ff0b5d76ac02a"; sha256 = "1xvmh66lgii98z6f4lk1mjs73ysrvs55xdlcmf224k3as822jmw0"; @@ -235,6 +235,17 @@ let }; }; + BufOnly-vim = buildVimPluginFrom2Nix { + pname = "BufOnly-vim"; + version = "2010-10-18"; + src = fetchFromGitHub { + owner = "vim-scripts"; + repo = "BufOnly.vim"; + rev = "43dd92303979bdb234a3cb2f5662847f7a3affe7"; + sha256 = "1gvpaqvvxjma0dl1zai68bpv42608api4054appwkw9pgczkkcdl"; + }; + }; + calendar-vim = buildVimPluginFrom2Nix { pname = "calendar-vim"; version = "2020-02-14"; @@ -294,7 +305,7 @@ let pname = "clang_complete"; version = "2018-09-19"; src = fetchFromGitHub { - owner = "Rip-Rip"; + owner = "xavierd"; repo = "clang_complete"; rev = "0b98d7533ad967aac3fc4c1a5b0508dafa8a676f"; sha256 = "04mdhc1kbv66blkn6qn98iyj659dac4z49nmpf3anglz8dgcxjgc"; @@ -378,6 +389,17 @@ let }; }; + coc-fzf = buildVimPluginFrom2Nix { + pname = "coc-fzf"; + version = "2020-03-06"; + src = fetchFromGitHub { + owner = "antoinemadec"; + repo = "coc-fzf"; + rev = "ca394b48ac9c78ce95d6cdf3807927a7b6bcfcbe"; + sha256 = "1nsqdp2zma7rlzynm58z43vk5hyrcz8kn7ak32979p4a3fvdyj5c"; + }; + }; + coc-highlight = buildVimPluginFrom2Nix { pname = "coc-highlight"; version = "2019-10-18"; @@ -622,12 +644,12 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-03-09"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "dae0cc36b0245a601d4431ae8dd2319eaa919058"; - sha256 = "1559c0hwyknz1j6vbigywg1fjads4wf8by59z0sri6aah9q77q2z"; + rev = "54bea1ec1ab44802a155f876a4d1cc2c44b2bc42"; + sha256 = "0npjc7c3x9mdqc6asav1f2wwv4p6lb5hk7c1p9b7m3vjg21w0k22"; }; }; @@ -900,7 +922,7 @@ let pname = "denite-extra"; version = "2019-03-29"; src = fetchFromGitHub { - owner = "chemzqm"; + owner = "neoclide"; repo = "denite-extra"; rev = "af18257544027ce89269dba70c12aba1f5b9e23c"; sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a"; @@ -911,7 +933,7 @@ let pname = "denite-git"; version = "2020-03-02"; src = fetchFromGitHub { - owner = "chemzqm"; + owner = "neoclide"; repo = "denite-git"; rev = "88b5323a6fc0ace197eed5205215d80f3b613f91"; sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13"; @@ -920,12 +942,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-03-18"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "a184e87b7df5e8f35aee115153b37f178e47718c"; - sha256 = "1na637k62sgpqx69r6j5prad4qdc9dp3psq75jhqyvhm3yq2432w"; + rev = "c3206a06508a197650ee4e1d85da39ff24e3a56b"; + sha256 = "1yy6j5zpja8jr1j8sghwc1l0fkb47r8cvv36ckf75x9x5gpylb5m"; }; }; @@ -944,7 +966,7 @@ let pname = "deoplete-clang"; version = "2019-11-10"; src = fetchFromGitHub { - owner = "zchee"; + owner = "deoplete-plugins"; repo = "deoplete-clang"; rev = "2ea262e98edcb66e828f9077fcc844100320eb63"; sha256 = "1wvk61f8ph2vpl6llzmir3qs3zwaw3lrphs16d1j7ljkdl3bk49k"; @@ -1000,7 +1022,7 @@ let pname = "deoplete-go"; version = "2020-01-01"; src = fetchFromGitHub { - owner = "zchee"; + owner = "deoplete-plugins"; repo = "deoplete-go"; rev = "4f1ccd2ed70211fd025d052ec725c0b835bea487"; sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08"; @@ -1132,12 +1154,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-03-18"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "db7d2dc5f416634c9917054bcd6e1e5d925bb4d7"; - sha256 = "1d34zy81j47icsrnbxpp4x9f35ihrmd0lnd0vphi216kdlkxk37b"; + rev = "1439c621dc94016c504e1732ce8270081a42768f"; + sha256 = "1c8qx839zmf52cfazlbbnlhxw6cvnsr3ds0rclawgycbl4s1qy8f"; }; }; @@ -1408,17 +1430,6 @@ let }; }; - gist-vim = buildVimPluginFrom2Nix { - pname = "gist-vim"; - version = "2020-01-29"; - src = fetchFromGitHub { - owner = "mattn"; - repo = "gist-vim"; - rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79"; - sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4"; - }; - }; - gitignore-vim = buildVimPluginFrom2Nix { pname = "gitignore-vim"; version = "2014-03-16"; @@ -1463,6 +1474,17 @@ let }; }; + gruvbox-community = buildVimPluginFrom2Nix { + pname = "gruvbox-community"; + version = "2020-02-24"; + src = fetchFromGitHub { + owner = "gruvbox-community"; + repo = "gruvbox"; + rev = "f5711c15480b83378bde13306fa997057c0c81cd"; + sha256 = "0vx289a7av31dxm58c6kmfdnsrwnq1rzj5rwci2pqjdac8ds2qm0"; + }; + }; + gundo-vim = buildVimPluginFrom2Nix { pname = "gundo-vim"; version = "2020-01-15"; @@ -1827,6 +1849,17 @@ let }; }; + lightline-bufferline = buildVimPluginFrom2Nix { + pname = "lightline-bufferline"; + version = "2020-02-14"; + src = fetchFromGitHub { + owner = "mengelbrecht"; + repo = "lightline-bufferline"; + rev = "17683bc5802de7f295f2583a15461e2bc662f98b"; + sha256 = "1rlamxwk2gm9pyxl9vym9w6rhgimzqa2hjghy3qdqwvif6w8ir6l"; + }; + }; + lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; version = "2020-03-16"; @@ -2038,12 +2071,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-03-03"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "69140aedb7da5a5a0b25b82e7f756f91d08170ea"; - sha256 = "132ksy20rb01xm18zwwl3lv5zapfhfvaf5zz6md8dnr5hvkvvrgx"; + rev = "d02b169e70bd6d2b2365bf6cda721967616a30bf"; + sha256 = "1cya26wfqc7l7dqy854m4kwrq3w66knmn2cgviqh9cnsjzhwxs0d"; }; }; @@ -2161,7 +2194,7 @@ let pname = "nerdcommenter"; version = "2020-02-19"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "preservim"; repo = "nerdcommenter"; rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8"; sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs"; @@ -2172,7 +2205,7 @@ let pname = "nerdtree"; version = "2020-02-20"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "preservim"; repo = "nerdtree"; rev = "e67324fdea7a192c7ce1b4c6b3c3b9f82f11eee7"; sha256 = "0y7hd69k0i21cqgs11n80ljv6cl0gfcjjwa0dvdywpd8mmn1ad4k"; @@ -2269,12 +2302,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-03-19"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "6d5e81c71bb90568b3bf9ca061980b9b30cdbc15"; - sha256 = "1va480pw7nk650bmh4z7rvr2a5sqd4q86y19341p6mj12p2r2fcv"; + rev = "4fe58ec4e1fa3500c7ef98464174bf6c4cb8ce67"; + sha256 = "1xyqbr0f2pgvbbk0cpg92pswavff910hy8rjkm05grhqw43vkzcg"; }; }; @@ -2458,7 +2491,7 @@ let pname = "purescript-vim"; version = "2018-12-10"; src = fetchFromGitHub { - owner = "raichoo"; + owner = "purescript-contrib"; repo = "purescript-vim"; rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f"; sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8"; @@ -2601,7 +2634,7 @@ let pname = "riv-vim"; version = "2020-02-17"; src = fetchFromGitHub { - owner = "Rykka"; + owner = "gu-fan"; repo = "riv.vim"; rev = "d52844691ca2f139e4b634db65aa49c57a0fc2b3"; sha256 = "0s4jvqwlnmmh2zw9v9rlwynwx44ypdrzhhyfb20sippxg9g6z0c5"; @@ -2707,6 +2740,17 @@ let }; }; + SimpylFold = buildVimPluginFrom2Nix { + pname = "SimpylFold"; + version = "2017-06-13"; + src = fetchFromGitHub { + owner = "tmhedberg"; + repo = "SimpylFold"; + rev = "aa0371d9d708388f3ba385ccc67a7504586a20d9"; + sha256 = "1gjv78x2cgh79a04l411kdhkm53f93czs54p07kadpa9659z93ss"; + }; + }; + sky-color-clock-vim = buildVimPluginFrom2Nix { pname = "sky-color-clock-vim"; version = "2018-11-03"; @@ -2806,6 +2850,17 @@ let }; }; + splitjoin-vim = buildVimPluginFrom2Nix { + pname = "splitjoin-vim"; + version = "2020-03-10"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "splitjoin.vim"; + rev = "fef5079e9dee55c2cf879ce2a4412fb5dcb40808"; + sha256 = "1v6cm86klzbmzx2grzxprpxci3001yjfbnwdd1891rfggjlm4wj9"; + }; + }; + starsearch-vim = buildVimPluginFrom2Nix { pname = "starsearch-vim"; version = "2014-09-21"; @@ -2832,7 +2887,7 @@ let pname = "sved"; version = "2019-01-25"; src = fetchFromGitHub { - owner = "peder2tm"; + owner = "peterbjorgensen"; repo = "sved"; rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; @@ -2854,7 +2909,7 @@ let pname = "syntastic"; version = "2020-01-29"; src = fetchFromGitHub { - owner = "scrooloose"; + owner = "vim-syntastic"; repo = "syntastic"; rev = "f3766538720116f099a8b1517f76ae2f094afd20"; sha256 = "1bzjav87fcibwlp8siqnx6x8wv8w3mwrrqrd5w19ny9scr5x2a65"; @@ -3579,12 +3634,12 @@ let vim-codefmt = buildVimPluginFrom2Nix { pname = "vim-codefmt"; - version = "2020-02-26"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "google"; repo = "vim-codefmt"; - rev = "6d69f933f243ed3d7797641bd41c0e65d245c931"; - sha256 = "0vzzyz7v03ihky3vx12rji4l1r6vbxgslvc1fvi4dznfqn5m9gfn"; + rev = "d6676620f7a85fa49e8893cad041df59497fd845"; + sha256 = "01wrlq9h2wzngi8qna0zrwycrp0iqp7qsijyby287zbckrs25rnd"; }; }; @@ -3878,7 +3933,7 @@ let pname = "vim-elixir"; version = "2020-03-11"; src = fetchFromGitHub { - owner = "elixir-lang"; + owner = "elixir-editors"; repo = "vim-elixir"; rev = "088cfc407460dea7b81c10b29db23843f85e7919"; sha256 = "1w9w4arzlbjhd5kcvyv5fykq9djc4n4j1nc75qqlzsfggbjjwhbk"; @@ -4052,11 +4107,11 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-03-12"; + version = "2020-03-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "9a4d730270882f9d39a411eb126143eda4d46963"; + rev = "0e35c9bbc78159318e7b7ffd228f09a96afb8fde"; sha256 = "098fz3lmfysv6gr5cjwgqsdzxjxygwc0x4ak1sxj3h6djys5x66b"; }; }; @@ -4072,6 +4127,17 @@ let }; }; + vim-gist = buildVimPluginFrom2Nix { + pname = "vim-gist"; + version = "2020-01-29"; + src = fetchFromGitHub { + owner = "mattn"; + repo = "vim-gist"; + rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79"; + sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4"; + }; + }; + vim-gista = buildVimPluginFrom2Nix { pname = "vim-gista"; version = "2020-01-04"; @@ -4129,12 +4195,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-03-17"; + version = "2020-03-20"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "f5d34f40d6757470f40600000c9c08de142d7ced"; - sha256 = "0a2g8f9xza2m07qm4pcj2aqjh1yvs9cxn8f3zima06swfw2ahdh8"; + rev = "50d52bafa00448ca8cde2b0e05b0fe71c9397762"; + sha256 = "1c8dwllscwxiqp409zy7ajwz84bn8g7p9gldqrhx8i9l7q382z0w"; }; }; @@ -4391,17 +4457,6 @@ let }; }; - vim-jade = buildVimPluginFrom2Nix { - pname = "vim-jade"; - version = "2019-09-23"; - src = fetchFromGitHub { - owner = "digitaltoad"; - repo = "vim-jade"; - rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3"; - sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam"; - }; - }; - vim-janah = buildVimPluginFrom2Nix { pname = "vim-janah"; version = "2018-10-01"; @@ -4513,6 +4568,17 @@ let }; }; + vim-kitty-navigator = buildVimPluginFrom2Nix { + pname = "vim-kitty-navigator"; + version = "2019-11-04"; + src = fetchFromGitHub { + owner = "knubie"; + repo = "vim-kitty-navigator"; + rev = "c32357892f10117291461631d51a6bfd20e72b9a"; + sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; + }; + }; + vim-lastplace = buildVimPluginFrom2Nix { pname = "vim-lastplace"; version = "2020-01-20"; @@ -4625,12 +4691,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-02-11"; + version = "2020-03-22"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "62c6f6aa227b1b3ef5e7cf7df9f0a9c1d855d7fe"; - sha256 = "1qimz08rqm4ch6dr0znwxl328593kmz0yxdqq15g1yrw4ig0fi22"; + rev = "3dd7a19e8689847956266e0be1bbfb4ca12da746"; + sha256 = "0dj1b8v9iz67m833x1z3s7jac0jpfxgs43ylc6m0v3al67qcb0mj"; }; }; @@ -4975,6 +5041,17 @@ let }; }; + vim-pico8-syntax = buildVimPluginFrom2Nix { + pname = "vim-pico8-syntax"; + version = "2016-10-30"; + src = fetchFromGitHub { + owner = "justinj"; + repo = "vim-pico8-syntax"; + rev = "dbdd92fad0533eeaeaea844815d4de11e9507ce7"; + sha256 = "0say0bb74rdbabgsf7rrbm8x841pmgh80fwr6kn94fgphr3vhm0s"; + }; + }; + vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; version = "2020-01-27"; @@ -5063,6 +5140,17 @@ let }; }; + vim-pug = buildVimPluginFrom2Nix { + pname = "vim-pug"; + version = "2019-09-23"; + src = fetchFromGitHub { + owner = "digitaltoad"; + repo = "vim-pug"; + rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3"; + sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam"; + }; + }; + vim-puppet = buildVimPluginFrom2Nix { pname = "vim-puppet"; version = "2019-09-16"; @@ -5074,6 +5162,17 @@ let }; }; + vim-python-pep8-indent = buildVimPluginFrom2Nix { + pname = "vim-python-pep8-indent"; + version = "2019-05-13"; + src = fetchFromGitHub { + owner = "hynek"; + repo = "vim-python-pep8-indent"; + rev = "b3a7395ce49b13145bbb54b1cdbfe6a33585bfe9"; + sha256 = "0gkbjcwdizqivsrn0p1gdn1170jimkk1vyxhyr286nb5qxj2n8hh"; + }; + }; + vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; version = "2019-12-20"; @@ -5538,12 +5637,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-03-17"; + version = "2020-03-21"; src = fetchFromGitHub { - owner = "janko-m"; + owner = "janko"; repo = "vim-test"; - rev = "d878e9d61f186140f18a7a8a8badc0605d8955ba"; - sha256 = "06kihjif3g00bibx304vz22w2w9z84v0g6a55cxs1hqlc4ygnl8v"; + rev = "b302a325116d8708dc0721b7cd97ff59536f4e75"; + sha256 = "099dzadzhfkhf92lv5cmfk0iawbp40v1rz9xxp462hxxcn3p3c97"; }; }; @@ -5866,6 +5965,17 @@ let }; }; + vimacs = buildVimPluginFrom2Nix { + pname = "vimacs"; + version = "2016-03-24"; + src = fetchFromGitHub { + owner = "andrep"; + repo = "vimacs"; + rev = "7b8e297722d55089f0f0535fe6422533c98112fb"; + sha256 = "0x92jcpdlvxhhdpwkv7ig9ya7s96yqjy6ms9xnx8djkf12xql16f"; + }; + }; + vimagit = buildVimPluginFrom2Nix { pname = "vimagit"; version = "2020-01-12"; @@ -5956,12 +6066,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-03-17"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "16b23314b31862510d3feb8a2569199062b083ac"; - sha256 = "0vibfwsyamp4jqbaaa872m922yg89fx7k0cfa6kfhr5ks4vhpya5"; + rev = "8c59031d50feeec8b4f3549f70f82564975265f0"; + sha256 = "16a7qpp19gci8hq8h2999pwv0gd6x0mqgifv325mlb0jj5lxy7m1"; }; }; @@ -6009,12 +6119,12 @@ let }; }; - vundle = buildVimPluginFrom2Nix { - pname = "vundle"; + Vundle-vim = buildVimPluginFrom2Nix { + pname = "Vundle-vim"; version = "2019-08-17"; src = fetchFromGitHub { - owner = "gmarik"; - repo = "vundle"; + owner = "VundleVim"; + repo = "Vundle.vim"; rev = "b255382d6242d7ea3877bf059d2934125e0c4d95"; sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6"; }; @@ -6110,22 +6220,22 @@ let yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-03-02"; + version = "2020-03-21"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "68ef9623656fe9aaa53c1d9ab906f09c2c095f06"; - sha256 = "0cn1k8lda71vm4gx14ly9gdvk1j17jds0axx9jvjp4w9jid6ksqk"; + rev = "4d3f69a3a5f56bae9475a96c3291ffdcbd9ff0b1"; + sha256 = "0f3dq4lrm9xzh780fd471b7ddibfzb9vfq1k6gn53pmqpiw6a498"; fetchSubmodules = true; }; }; - youcompleteme = buildVimPluginFrom2Nix { - pname = "youcompleteme"; + YouCompleteMe = buildVimPluginFrom2Nix { + pname = "YouCompleteMe"; version = "2020-03-18"; src = fetchFromGitHub { - owner = "valloric"; - repo = "youcompleteme"; + owner = "ycm-core"; + repo = "YouCompleteMe"; rev = "cf4a76acaeed27eb3ca1dca5adf1115b6abbcfa3"; sha256 = "0si9by2ag2f7xgxidp5215d6wkg1mdhq9j5c4icdpsly9gv3w5s8"; fetchSubmodules = true; @@ -6169,7 +6279,7 @@ let pname = "zig-vim"; version = "2020-02-10"; src = fetchFromGitHub { - owner = "zig-lang"; + owner = "ziglang"; repo = "zig.vim"; rev = "55b690029791022fd7818ebd0ee395e8976899fe"; sha256 = "10xkrn4yhjda187mpw1y3qw0s6bp7aklk87pansaa3fvysdf3b6c"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index e4710e27193..28aabd1baa0 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -393,22 +393,10 @@ self: super: { configurePhase = "cd plugins/nvim"; }); - gist-vim = super.gist-vim.overrideAttrs(old: { + vim-gist = super.vim-gist.overrideAttrs(old: { dependencies = with super; [ webapi-vim ]; }); - gruvbox-community = buildVimPluginFrom2Nix { - pname = "gruvbox-community"; - version = "2019-05-31"; - src = fetchFromGitHub { - owner = "gruvbox-community"; - repo = "gruvbox"; - rev = "e122091dad968a5524f3e8136615a479c7b6f247"; - sha256 = "1hncjyfi1gbw62b2pngy5qxyzibrhbyzgfmm9a58sdh1272l8ls8"; - }; - meta.maintainers = with stdenv.lib.maintainers; [ minijackson ]; - }; - meson = buildVimPluginFrom2Nix { inherit (meson) pname version src; preInstall = "cd data/syntax-highlighting/vim"; @@ -460,6 +448,21 @@ self: super: { }; }); + vimacs = super.vimacs.overrideAttrs(old: { + buildPhase = '' + substituteInPlace bin/vim \ + --replace '/usr/bin/vim' 'vim' \ + --replace '/usr/bin/gvim' 'gvim' + # remove unnecessary duplicated bin wrapper script + rm -r plugin/vimacs + ''; + meta = with stdenv.lib; { + 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 ]; + }; + }); vimshell-vim = super.vimshell-vim.overrideAttrs(old: { dependencies = with super; [ vimproc-vim ]; @@ -531,7 +534,7 @@ self: super: { dependencies = with super; [ vim-misc ]; patches = [ (fetchpatch { # https://github.com/xolox/vim-easytags/pull/170 fix version detection for universal-ctags - url = https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch; + url = "https://github.com/xolox/vim-easytags/commit/46e4709500ba3b8e6cf3e90aeb95736b19e49be9.patch"; sha256 = "0x0xabb56xkgdqrg1mpvhbi3yw4d829n73lsnnyj5yrxjffy4ax4"; }) ]; @@ -640,7 +643,7 @@ self: super: { sourceRoot = "."; }); - youcompleteme = super.youcompleteme.overrideAttrs(old: { + YouCompleteMe = super.YouCompleteMe.overrideAttrs(old: { buildPhase = '' substituteInPlace plugin/youcompleteme.vim \ --replace "'ycm_path_to_python_interpreter', '''" \ @@ -691,7 +694,7 @@ self: super: { unicode-vim = let unicode-data = fetchurl { - url = http://www.unicode.org/Public/UNIDATA/UnicodeData.txt; + url = "http://www.unicode.org/Public/UNIDATA/UnicodeData.txt"; sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }; in super.unicode-vim.overrideAttrs(old: { diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index 0ef93ac569a..fe8cb90d103 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -p nix-prefetch-git -p python3 nix -i python3 +#!nix-shell -p nix-prefetch-git -p python3 -p python3Packages.GitPython nix -i python3 # format: # $ nix run nixpkgs.python3Packages.black -c black update.py @@ -10,12 +10,14 @@ import argparse import functools +import http import json import os import subprocess import sys import traceback import urllib.error +import urllib.parse import urllib.request import xml.etree.ElementTree as ET from datetime import datetime @@ -25,6 +27,8 @@ from typing import Dict, List, Optional, Tuple, Union, Any, Callable from urllib.parse import urljoin, urlparse from tempfile import NamedTemporaryFile +import git + ATOM_ENTRY = "{http://www.w3.org/2005/Atom}entry" # " vim gets confused here ATOM_LINK = "{http://www.w3.org/2005/Atom}link" # " ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " @@ -32,6 +36,7 @@ ATOM_UPDATED = "{http://www.w3.org/2005/Atom}updated" # " ROOT = Path(__file__).parent DEFAULT_IN = ROOT.joinpath("vim-plugin-names") DEFAULT_OUT = ROOT.joinpath("generated.nix") +DEPRECATED = ROOT.joinpath("deprecated.json") import time from functools import wraps @@ -71,9 +76,11 @@ def retry(ExceptionToCheck: Any, tries: int = 4, delay: float = 3, backoff: floa class Repo: - def __init__(self, owner: str, name: str) -> None: + def __init__(self, owner: str, name: str, alias: Optional[str]) -> None: self.owner = owner self.name = name + self.alias = alias + self.redirect: Dict[str, str] = {} def url(self, path: str) -> str: return urljoin(f"https://github.com/{self.owner}/{self.name}/", path) @@ -96,7 +103,9 @@ class Repo: @retry(urllib.error.URLError, tries=4, delay=3, backoff=2) def latest_commit(self) -> Tuple[str, datetime]: - with urllib.request.urlopen(self.url("commits/master.atom"), timeout=10) as req: + commit_url = self.url("commits/master.atom") + with urllib.request.urlopen(commit_url, timeout=10) as req: + self.check_for_redirect(commit_url, req) xml = req.read() root = ET.fromstring(xml) latest_entry = root.find(ATOM_ENTRY) @@ -111,6 +120,19 @@ class Repo: updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ") return Path(str(url.path)).name, updated + def check_for_redirect(self, url: str, req: http.client.HTTPResponse): + response_url = req.geturl() + if url != response_url: + new_owner, new_name = ( + urllib.parse.urlsplit(response_url).path.strip("/").split("/")[:2] + ) + end_line = "\n" if self.alias is None else f" as {self.alias}\n" + plugin_line = "{owner}/{name}" + end_line + + old_plugin = plugin_line.format(owner=self.owner, name=self.name) + new_plugin = plugin_line.format(owner=new_owner, name=new_name) + self.redirect[old_plugin] = new_plugin + def prefetch_git(self, ref: str) -> str: data = subprocess.check_output( ["nix-prefetch-git", "--fetch-submodules", self.url(""), ref] @@ -197,15 +219,17 @@ def get_current_plugins() -> List[Plugin]: return plugins -def prefetch_plugin(user: str, repo_name: str, alias: str, cache: "Cache") -> Plugin: - repo = Repo(user, repo_name) +def prefetch_plugin( + user: str, repo_name: str, alias: Optional[str], cache: "Optional[Cache]" = None +) -> Tuple[Plugin, Dict[str, str]]: + repo = Repo(user, repo_name, alias) commit, date = repo.latest_commit() has_submodules = repo.has_submodules() - cached_plugin = cache[commit] + cached_plugin = cache[commit] if cache else None if cached_plugin is not None: cached_plugin.name = alias or repo_name cached_plugin.date = date - return cached_plugin + return cached_plugin, repo.redirect print(f"prefetch {user}/{repo_name}") if has_submodules: @@ -213,7 +237,15 @@ def prefetch_plugin(user: str, repo_name: str, alias: str, cache: "Cache") -> Pl else: sha256 = repo.prefetch_github(commit) - return Plugin(alias or repo_name, commit, has_submodules, sha256, date=date) + return ( + Plugin(alias or repo_name, commit, has_submodules, sha256, date=date), + repo.redirect, + ) + + +def fetch_plugin_from_pluginline(plugin_line: str) -> Plugin: + plugin, _ = prefetch_plugin(*parse_plugin_line(plugin_line)) + return plugin def print_download_error(plugin: str, ex: Exception): @@ -227,20 +259,22 @@ def print_download_error(plugin: str, ex: Exception): def check_results( - results: List[Tuple[str, str, Union[Exception, Plugin]]] -) -> List[Tuple[str, str, Plugin]]: + results: List[Tuple[str, str, Union[Exception, Plugin], Dict[str, str]]] +) -> Tuple[List[Tuple[str, str, Plugin]], Dict[str, str]]: failures: List[Tuple[str, Exception]] = [] plugins = [] - for (owner, name, result) in results: + redirects: Dict[str, str] = {} + for (owner, name, result, redirect) in results: if isinstance(result, Exception): failures.append((name, result)) else: plugins.append((owner, name, result)) + redirects.update(redirect) print(f"{len(results) - len(failures)} plugins were checked", end="") if len(failures) == 0: print() - return plugins + return plugins, redirects else: print(f", {len(failures)} plugin(s) could not be downloaded:\n") @@ -328,15 +362,15 @@ class Cache: def prefetch( args: Tuple[str, str, str], cache: Cache -) -> Tuple[str, str, Union[Exception, Plugin]]: +) -> Tuple[str, str, Union[Exception, Plugin], dict]: assert len(args) == 3 owner, repo, alias = args try: - plugin = prefetch_plugin(owner, repo, alias, cache) + plugin, redirect = prefetch_plugin(owner, repo, alias, cache) cache[plugin.commit] = plugin - return (owner, repo, plugin) + return (owner, repo, plugin, redirect) except Exception as e: - return (owner, repo, e) + return (owner, repo, e, {}) header = ( @@ -386,6 +420,37 @@ in lib.fix' (lib.extends overrides packages) print(f"updated {outfile}") +def rewrite_input( + input_file: Path, redirects: Dict[str, str] = None, append: Tuple = () +): + with open(input_file, "r") as f: + lines = f.readlines() + + lines.extend(append) + + if redirects: + lines = [redirects.get(line, line) for line in lines] + + cur_date_iso = datetime.now().strftime("%Y-%m-%d") + with open(DEPRECATED, "r") as f: + deprecations = json.load(f) + for old, new in redirects.items(): + old_plugin = fetch_plugin_from_pluginline(old) + new_plugin = fetch_plugin_from_pluginline(new) + if old_plugin.normalized_name != new_plugin.normalized_name: + deprecations[old_plugin.normalized_name] = { + "new": new_plugin.normalized_name, + "date": cur_date_iso, + } + with open(DEPRECATED, "w") as f: + json.dump(deprecations, f, indent=4, sort_keys=True) + + lines = sorted(lines, key=str.casefold) + + with open(input_file, "w") as f: + f.writelines(lines) + + def parse_args(): parser = argparse.ArgumentParser( description=( @@ -394,6 +459,13 @@ def parse_args(): ) ) parser.add_argument( + "--add", + dest="add_plugins", + default=[], + action="append", + help="Plugin to add to vimPlugins from Github in the form owner/repo", + ) + parser.add_argument( "--input-names", "-i", dest="input_file", @@ -407,30 +479,77 @@ def parse_args(): default=DEFAULT_OUT, help="Filename to save generated nix code", ) - + parser.add_argument( + "--proc", + "-p", + dest="proc", + type=int, + default=30, + help="Number of concurrent processes to spawn.", + ) return parser.parse_args() -def main() -> None: +def commit(repo: git.Repo, message: str, files: List[Path]) -> None: + files_staged = repo.index.add([str(f.resolve()) for f in files]) - args = parse_args() - plugin_names = load_plugin_spec(args.input_file) - current_plugins = get_current_plugins() - cache = Cache(current_plugins) + if files_staged: + print(f'committing to nixpkgs "{message}"') + repo.index.commit(message) + else: + print("no changes in working tree to commit") - prefetch_with_cache = functools.partial(prefetch, cache=cache) - try: - # synchronous variant for debugging - # results = list(map(prefetch_with_cache, plugin_names)) - pool = Pool(processes=30) - results = pool.map(prefetch_with_cache, plugin_names) - finally: - cache.store() +def get_update(input_file: str, outfile: str, proc: int): + cache: Cache = Cache(get_current_plugins()) + _prefetch = functools.partial(prefetch, cache=cache) + + def update() -> dict: + plugin_names = load_plugin_spec(input_file) + + try: + pool = Pool(processes=proc) + results = pool.map(_prefetch, plugin_names) + finally: + cache.store() - plugins = check_results(results) + plugins, redirects = check_results(results) - generate_nix(plugins, args.outfile) + generate_nix(plugins, outfile) + + return redirects + + return update + + +def main(): + args = parse_args() + nixpkgs_repo = git.Repo(ROOT, search_parent_directories=True) + update = get_update(args.input_file, args.outfile, args.proc) + + redirects = update() + rewrite_input(args.input_file, redirects) + commit(nixpkgs_repo, "vimPlugins: update", [args.outfile]) + + if redirects: + update() + commit( + nixpkgs_repo, + "vimPlugins: resolve github repository redirects", + [args.outfile, args.input_file, DEPRECATED], + ) + + for plugin_line in args.add_plugins: + rewrite_input(args.input_file, append=(plugin_line + "\n",)) + update() + plugin = fetch_plugin_from_pluginline(plugin_line) + commit( + nixpkgs_repo, + "vimPlugins.{name}: init at {version}".format( + name=plugin.normalized_name, version=plugin.version + ), + [args.outfile, args.input_file], + ) if __name__ == "__main__": diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 86d9912e4ed..f2a68ab5a79 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -9,10 +9,13 @@ alvan/vim-closetag alx741/vim-hindent alx741/vim-stylishask amiorin/ctrlp-z +andrep/vimacs andreshazard/vim-logreview +AndrewRadev/splitjoin.vim andsild/peskcolor.vim andviro/flake8-vim andys8/vim-elm-syntax +antoinemadec/coc-fzf ap/vim-css-color arcticicestudio/nord-vim artur-shaik/vim-javacomplete2 @@ -20,8 +23,8 @@ autozimu/LanguageClient-neovim ayu-theme/ayu-vim bazelbuild/vim-bazel bbchung/clighter8 -benmills/vimux benizi/vim-automkdir +benmills/vimux bhurlow/vim-parinfer bitc/vim-hdevtools bkad/camelcasemotion @@ -35,8 +38,6 @@ brooth/far.vim carlitux/deoplete-ternjs ccarpita/rtorrent-syntax-file cespare/vim-toml -chemzqm/denite-extra -chemzqm/denite-git Chiel92/vim-autoformat chikatoike/concealedyank.vim chikatoike/sourcemap.vim @@ -57,22 +58,25 @@ cocopon/iceberg.vim cohama/lexima.vim ctjhoa/spacevim ctrlpvim/ctrlp.vim -dag/vim2hs dag/vim-fish +dag/vim2hs dannyob/quickfixstatus darfink/starsearch.vim dart-lang/dart-vim-plugin david-a-wheeler/vim-metamath davidhalter/jedi-vim dcharbon/vim-flatbuffers +dense-analysis/ale +deoplete-plugins/deoplete-clang deoplete-plugins/deoplete-dictionary +deoplete-plugins/deoplete-go deoplete-plugins/deoplete-jedi deoplete-plugins/deoplete-zsh derekelkins/agda-vim derekwyatt/vim-scala dhruvasagar/vim-prosession dhruvasagar/vim-table-mode -digitaltoad/vim-jade +digitaltoad/vim-pug direnv/direnv.vim dleonard0/pony-vim-syntax dracula/vim @@ -85,7 +89,7 @@ easymotion/vim-easymotion editorconfig/editorconfig-vim ehamberg/vim-cute-python eikenb/acp -elixir-lang/vim-elixir +elixir-editors/vim-elixir elmcast/elm-vim elzr/vim-json embear/vim-localvimrc @@ -108,7 +112,6 @@ garbas/vim-snipmate gentoo/gentoo-syntax gibiansky/vim-textobj-haskell glts/vim-textobj-comment -gmarik/vundle godlygeek/csapprox godlygeek/tabular google/vim-codefmt @@ -117,6 +120,8 @@ google/vim-maktaba gorkunov/smartpairs.vim gotcha/vimelette gregsexton/gitv +gruvbox-community/gruvbox as gruvbox-community +gu-fan/riv.vim guns/vim-clojure-highlight guns/vim-clojure-static guns/vim-sexp @@ -133,6 +138,7 @@ honza/vim-snippets hotwatermorning/auto-git-diff hsanson/vim-android hsitz/VimOrganizer +hynek/vim-python-pep8-indent iamcco/coc-spell-checker ianks/vim-tsx icymind/NeoSolarized @@ -147,7 +153,7 @@ itchyny/vim-cursorword itchyny/vim-gitbranch ivanov/vim-ipython jacoborus/tender.vim -janko-m/vim-test +janko/vim-test jaredgorski/SpaceCamp JazzCore/ctrlp-cmatcher jceb/vim-hier @@ -203,6 +209,7 @@ kchmck/vim-coffee-script KeitaNakamura/neodark.vim keith/swift.vim kien/rainbow_parentheses.vim +knubie/vim-kitty-navigator konfekt/fastfold kristijanhusak/defx-git kristijanhusak/defx-icons @@ -259,7 +266,7 @@ markonm/traces.vim martinda/Jenkinsfile-vim-syntax mattn/calendar-vim as mattn-calendar-vim mattn/emmet-vim -mattn/gist-vim +mattn/vim-gist mattn/webapi-vim matze/vim-move maximbaz/lightline-ale @@ -267,6 +274,7 @@ MaxMEllon/vim-jsx-pretty mbbill/undotree megaannum/forms megaannum/self +mengelbrecht/lightline-bufferline mfukar/robotframework-vim mg979/vim-visual-multi mhinz/vim-grepper @@ -314,8 +322,8 @@ neoclide/coc-neco neoclide/coc-pairs neoclide/coc-prettier neoclide/coc-python -neoclide/coc-rls neoclide/coc-r-lsp +neoclide/coc-rls neoclide/coc-smartf neoclide/coc-snippets neoclide/coc-solargraph @@ -329,12 +337,14 @@ neoclide/coc-vimtex neoclide/coc-wxml neoclide/coc-yaml neoclide/coc-yank +neoclide/denite-extra +neoclide/denite-git neoclide/vim-easygit neomake/neomake +neovim/nvim-lsp +neovim/nvimdev.nvim neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim -neovim/nvimdev.nvim -neovim/nvim-lsp neutaaaaan/iosvkem nfnty/vim-nftables nicoe/deoplete-khard @@ -355,7 +365,7 @@ osyo-manga/vim-watchdogs pangloss/vim-javascript parsonsmatt/intero-neovim pearofducks/ansible-vim -peder2tm/sved +peterbjorgensen/sved peterhoeg/vim-qml phanviet/vim-monokai-pro plasticboy/vim-markdown @@ -363,7 +373,10 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +preservim/nerdcommenter +preservim/nerdtree ptzz/lf.vim +purescript-contrib/purescript-vim python-mode/python-mode qnighy/lalrpop.vim qpkorr/vim-bufkill @@ -372,16 +385,15 @@ racer-rust/vim-racer rafaqz/ranger.vim rafi/awesome-vim-colorschemes raghur/vim-ghost -raichoo/purescript-vim Raimondi/delimitMate rakr/vim-one rbgrouleff/bclose.vim reedes/vim-pencil +justinj/vim-pico8-syntax reedes/vim-wordy rhysd/committia.vim rhysd/vim-grammarous rhysd/vim-operator-surround -Rip-Rip/clang_complete rodjek/vim-puppet romainl/vim-cool ron89/thesaurus_query.vim @@ -391,15 +403,11 @@ roxma/nvim-yarp RRethy/vim-illuminate rust-lang/rust.vim ryanoasis/vim-devicons -Rykka/riv.vim ryvnf/readline.vim sakhnik/nvim-gdb saltstack/salt-vim samoshkin/vim-mergetool sbdchd/neoformat -scrooloose/nerdcommenter -scrooloose/nerdtree -scrooloose/syntastic sebastianmarkow/deoplete-rust SevereOverfl0w/deoplete-github sheerun/vim-polyglot @@ -443,6 +451,7 @@ ternjs/tern_for_vim terryma/vim-expand-region terryma/vim-multiple-cursors tex/vimpreviewpandoc +tmhedberg/SimpylFold thinca/vim-ft-diff_fold thinca/vim-prettyprint thinca/vim-quickrun @@ -501,22 +510,20 @@ uarun/vim-protobuf udalov/kotlin-vim ujihisa/neco-look unblevable/quick-scope -valloric/youcompleteme Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim vim-airline/vim-airline vim-airline/vim-airline-themes -vimlab/split-term.vim -vimoutliner/vimoutliner vim-pandoc/vim-pandoc vim-pandoc/vim-pandoc-after vim-pandoc/vim-pandoc-syntax vim-ruby/vim-ruby +vim-scripts/a.vim vim-scripts/align vim-scripts/argtextobj.vim vim-scripts/autoload_cscope.vim -vim-scripts/a.vim vim-scripts/bats.vim +vim-scripts/BufOnly.vim vim-scripts/changeColorScheme.vim vim-scripts/Colour-Sampler-Pack vim-scripts/DoxygenToolkit.vim @@ -537,12 +544,15 @@ vim-scripts/taglist.vim vim-scripts/utl.vim vim-scripts/wombat256.vim vim-scripts/YankRing.vim +vim-syntastic/syntastic vim-utils/vim-husk +vimlab/split-term.vim +vimoutliner/vimoutliner vimwiki/vimwiki vito-c/jq.vim vmchale/ats-vim vmchale/dhall-vim -w0rp/ale +VundleVim/Vundle.vim wakatime/vim-wakatime wannesm/wmgraphviz.vim wellle/targets.vim @@ -551,11 +561,11 @@ will133/vim-dirdiff wincent/command-t wincent/ferret wsdjeg/vim-fetch +xavierd/clang_complete xolox/vim-easytags xolox/vim-misc xuhdev/vim-latex-live-preview +ycm-core/YouCompleteMe Yggdroot/indentLine zah/nim.vim -zchee/deoplete-clang -zchee/deoplete-go -zig-lang/zig.vim +ziglang/zig.vim diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index d129bda33f4..77cf28c552e 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -83,8 +83,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.26.3"; - sha256 = "1rwyvqk3gp5f75x73d33biqvq67xx2vz1lmh3y3ax8kaf9z8jfvr"; + version = "0.27.0"; + sha256 = "06l25fjlcj0m7f7883afbh0x2ikgkqi768kv8y4qi1jc1gxndpm0"; }; buildInputs = [ diff --git a/pkgs/misc/vscode-extensions/python/default.nix b/pkgs/misc/vscode-extensions/python/default.nix index 604d0fa3ad9..8f5a92e4722 100644 --- a/pkgs/misc/vscode-extensions/python/default.nix +++ b/pkgs/misc/vscode-extensions/python/default.nix @@ -41,8 +41,8 @@ in vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "python"; publisher = "ms-python"; - version = "2020.3.69010"; - sha256 = "1dg8wfc3yl0msg6c9ccbvwc78f559109slsagi0lgnbc40v6v24b"; + version = "2020.3.71659"; + sha256 = "1smhnhkfchmljz8aj1br70023ysgd2hj6pm1ncn1jxphf89qi1ja"; }; buildInputs = [ diff --git a/pkgs/misc/vscode-extensions/remote-ssh/default.nix b/pkgs/misc/vscode-extensions/remote-ssh/default.nix index fe053dd7ea3..e58ea98a606 100644 --- a/pkgs/misc/vscode-extensions/remote-ssh/default.nix +++ b/pkgs/misc/vscode-extensions/remote-ssh/default.nix @@ -7,7 +7,7 @@ let inherit (vscode-utils) buildVscodeMarketplaceExtension; - + # patch runs on remote machine hence use of which # links to local node if version is 12 patch = '' @@ -36,8 +36,8 @@ in mktplcRef = { name = "remote-ssh"; publisher = "ms-vscode-remote"; - version = "0.48.0"; - sha256 = "04q53gljqh5snkrdf5l69g0ahn1s5z35a4ipfcbf1rsjjmm85a19"; + version = "0.50.0"; + sha256 = "01pyd6759p5nkjhjy3iplrl748xblr54l1jphk2g02s1n5ds2qb9"; }; postPatch = '' diff --git a/pkgs/misc/vscode-extensions/vscode-utils.nix b/pkgs/misc/vscode-extensions/vscode-utils.nix index df8f24fcce7..5d446b025d7 100644 --- a/pkgs/misc/vscode-extensions/vscode-utils.nix +++ b/pkgs/misc/vscode-extensions/vscode-utils.nix @@ -51,12 +51,15 @@ let buildVscodeMarketplaceExtension = a@{ name ? "", src ? null, + vsix ? null, mktplcRef, ... }: assert "" == name; assert null == src; - buildVscodeExtension ((removeAttrs a [ "mktplcRef" ]) // { + buildVscodeExtension ((removeAttrs a [ "mktplcRef" "vsix" ]) // { name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}"; - src = fetchVsixFromVscodeMarketplace mktplcRef; + src = if (vsix != null) + then vsix + else fetchVsixFromVscodeMarketplace mktplcRef; vscodeExtUniqueId = "${mktplcRef.publisher}.${mktplcRef.name}"; }); diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index a841acdca94..561f915d663 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Displays text on your screen"; - homepage = https://sourceforge.net/projects/libxosd; + homepage = "https://sourceforge.net/projects/libxosd"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 1aee5c8c35e..368f2938064 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -96,7 +96,7 @@ let meta = { broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets - homepage = http://www.opensource.apple.com/source/cctools/; + 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 ]; diff --git a/pkgs/os-specific/darwin/chunkwm/default.nix b/pkgs/os-specific/darwin/chunkwm/default.nix index 12b35812651..d94f66969f4 100644 --- a/pkgs/os-specific/darwin/chunkwm/default.nix +++ b/pkgs/os-specific/darwin/chunkwm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tiling window manager for macOS based on plugin architecture"; - homepage = https://github.com/koekeishiya/chunkwm; + homepage = "https://github.com/koekeishiya/chunkwm"; platforms = platforms.darwin; maintainers = with maintainers; [ lnl7 ]; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/goku/default.nix b/pkgs/os-specific/darwin/goku/default.nix index e374bd2f11c..f6834fca735 100644 --- a/pkgs/os-specific/darwin/goku/default.nix +++ b/pkgs/os-specific/darwin/goku/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Karabiner configurator"; - homepage = https://github.com/yqrashawn/GokuRakuJoudo; + homepage = "https://github.com/yqrashawn/GokuRakuJoudo"; license = licenses.gpl3; maintainers = [ maintainers.nikitavoloboev ]; platforms = platforms.darwin; diff --git a/pkgs/os-specific/darwin/iproute2mac/default.nix b/pkgs/os-specific/darwin/iproute2mac/default.nix index e82636fce1f..edf1583de9a 100644 --- a/pkgs/os-specific/darwin/iproute2mac/default.nix +++ b/pkgs/os-specific/darwin/iproute2mac/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/brona/iproute2mac; + homepage = "https://github.com/brona/iproute2mac"; description = "CLI wrapper for basic network utilites on Mac OS X inspired with iproute2 on Linux systems - ip command."; license = licenses.mit; maintainers = with maintainers; [ flokli ]; diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index 90f92b0b644..b09b65f33d5 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { patches = [ # Fixes build issues, remove with >3.0.0 (fetchpatch { - url = https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch; + url = "https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch"; sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np"; }) ]; @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple modal hotkey daemon for OSX"; - homepage = https://github.com/koekeishiya/khd; - downloadPage = https://github.com/koekeishiya/khd/releases; + homepage = "https://github.com/koekeishiya/khd"; + downloadPage = "https://github.com/koekeishiya/khd/releases"; platforms = platforms.darwin; maintainers = with maintainers; [ lnl7 ]; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix index c3fa76f5096..8c412aa68ed 100644 --- a/pkgs/os-specific/darwin/kwm/default.nix +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tiling window manager with focus follows mouse for OSX"; - homepage = https://github.com/koekeishiya/kwm; - downloadPage = https://github.com/koekeishiya/kwm/releases; + homepage = "https://github.com/koekeishiya/kwm"; + downloadPage = "https://github.com/koekeishiya/kwm/releases"; platforms = platforms.darwin; maintainers = with maintainers; [ lnl7 ]; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/lsusb/default.nix b/pkgs/os-specific/darwin/lsusb/default.nix index 02821fe61ef..799a4761fbd 100644 --- a/pkgs/os-specific/darwin/lsusb/default.nix +++ b/pkgs/os-specific/darwin/lsusb/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/jlhonora/lsusb; + homepage = "https://github.com/jlhonora/lsusb"; description = "lsusb command for Mac OS X"; platforms = stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.mit; diff --git a/pkgs/os-specific/darwin/m-cli/default.nix b/pkgs/os-specific/darwin/m-cli/default.nix index 12bf02bf89f..2699bb8e140 100644 --- a/pkgs/os-specific/darwin/m-cli/default.nix +++ b/pkgs/os-specific/darwin/m-cli/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Swiss Army Knife for macOS"; inherit (src.meta) homepage; - repositories.git = git://github.com/rgcr/m-cli.git; + repositories.git = "git://github.com/rgcr/m-cli.git"; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/maloader/default.nix b/pkgs/os-specific/darwin/maloader/default.nix index d1df820615d..0de94c92388 100644 --- a/pkgs/os-specific/darwin/maloader/default.nix +++ b/pkgs/os-specific/darwin/maloader/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Mach-O loader for Linux"; - homepage = https://github.com/shinh/maloader; + homepage = "https://github.com/shinh/maloader"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.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 23b5ded1fe6..26af46a171f 100644 --- a/pkgs/os-specific/darwin/opencflite/default.nix +++ b/pkgs/os-specific/darwin/opencflite/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross platform port of the macOS CoreFoundation"; - homepage = https://sourceforge.net/projects/opencflite/; + homepage = "https://sourceforge.net/projects/opencflite/"; license = stdenv.lib.licenses.apsl20; }; } diff --git a/pkgs/os-specific/darwin/osxfuse/default.nix b/pkgs/os-specific/darwin/osxfuse/default.nix index e1a00c71cb8..e13a0842012 100644 --- a/pkgs/os-specific/darwin/osxfuse/default.nix +++ b/pkgs/os-specific/darwin/osxfuse/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { buildInputs = [ headers ]; meta = with stdenv.lib; { - homepage = https://osxfuse.github.io; + homepage = "https://osxfuse.github.io"; description = "C-based FUSE for macOS SDK"; platforms = platforms.darwin; license = licenses.gpl2; diff --git a/pkgs/os-specific/darwin/osxsnarf/default.nix b/pkgs/os-specific/darwin/osxsnarf/default.nix index e391be1807c..d9a0de6c7f1 100644 --- a/pkgs/os-specific/darwin/osxsnarf/default.nix +++ b/pkgs/os-specific/darwin/osxsnarf/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A Plan 9-inspired way to share your OS X clipboard."; - homepage = https://github.com/eraserhd/osxsnarf; + homepage = "https://github.com/eraserhd/osxsnarf"; license = licenses.unlicense; platforms = platforms.darwin; maintainers = [ maintainers.eraserhd ]; diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix index 21b0d605021..f231ee57167 100644 --- a/pkgs/os-specific/darwin/qes/default.nix +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Quartz Event Synthesizer"; - homepage = https://github.com/koekeishiya/qes; + homepage = "https://github.com/koekeishiya/qes"; platforms = platforms.darwin; maintainers = with maintainers; [ lnl7 ]; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index ba5d3e9255b..f4a9991f8ee 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple hotkey daemon for macOS"; - homepage = https://github.com/koekeishiya/skhd; + homepage = "https://github.com/koekeishiya/skhd"; platforms = platforms.darwin; maintainers = with maintainers; [ lnl7 periklis ]; license = licenses.mit; diff --git a/pkgs/os-specific/darwin/smimesign/default.nix b/pkgs/os-specific/darwin/smimesign/default.nix index 6e799f1caaa..fff3a3b43fd 100644 --- a/pkgs/os-specific/darwin/smimesign/default.nix +++ b/pkgs/os-specific/darwin/smimesign/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, libobjc, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "smimesign"; @@ -13,14 +13,12 @@ buildGoModule rec { modSha256 = "1k3gnjzblfk14y19zhlvwysx045nbw0xr5nngh7zj1wcqxhhm206"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Security ]; - buildFlagsArray = "-ldflags=-X main.versionString=${version}"; - meta = with stdenv.lib; { + meta = with lib; { description = "An S/MIME signing utility for macOS and Windows that is compatible with Git."; - homepage = https://github.com/github/smimesign; + homepage = "https://github.com/github/smimesign"; license = licenses.mit; platforms = platforms.darwin; maintainers = [ maintainers.enorris ]; diff --git a/pkgs/os-specific/darwin/trash/default.nix b/pkgs/os-specific/darwin/trash/default.nix index 50c6d4fd2f4..205391a52da 100644 --- a/pkgs/os-specific/darwin/trash/default.nix +++ b/pkgs/os-specific/darwin/trash/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/ali-rantakari/trash; + 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; diff --git a/pkgs/os-specific/darwin/wifi-password/default.nix b/pkgs/os-specific/darwin/wifi-password/default.nix index 801e180f734..2dfc97dec1b 100644 --- a/pkgs/os-specific/darwin/wifi-password/default.nix +++ b/pkgs/os-specific/darwin/wifi-password/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/rauchg/wifi-password; + 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; diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix index 282afe13c34..1144232fba2 100644 --- a/pkgs/os-specific/darwin/xcode/default.nix +++ b/pkgs/os-specific/darwin/xcode/default.nix @@ -32,7 +32,7 @@ let requireXcode = version: sha256: ''; }; meta = with stdenv.lib; { - homepage = https://developer.apple.com/downloads/; + homepage = "https://developer.apple.com/downloads/"; description = "Apple's XCode SDK"; license = licenses.unfree; platforms = platforms.darwin ++ platforms.linux; diff --git a/pkgs/os-specific/linux/915resolution/default.nix b/pkgs/os-specific/linux/915resolution/default.nix index ce21887f19f..906ea04293f 100644 --- a/pkgs/os-specific/linux/915resolution/default.nix +++ b/pkgs/os-specific/linux/915resolution/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installPhase = "mkdir -p $out/sbin; cp 915resolution $out/sbin/"; meta = with stdenv.lib; { - homepage = http://915resolution.mango-lang.org/; + homepage = "http://915resolution.mango-lang.org/"; description = "A tool to modify Intel 800/900 video BIOS"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.publicDomain; diff --git a/pkgs/os-specific/linux/acpi-call/default.nix b/pkgs/os-specific/linux/acpi-call/default.nix index bd12373da88..bb3aef885a7 100644 --- a/pkgs/os-specific/linux/acpi-call/default.nix +++ b/pkgs/os-specific/linux/acpi-call/default.nix @@ -1,43 +1,33 @@ -{ stdenv, fetchgit, fetchpatch, kernel }: +{ stdenv, fetchFromGitHub, kernel }: -stdenv.mkDerivation { - name = "acpi-call-${kernel.version}"; +stdenv.mkDerivation rec { + pname = "acpi-call"; + version = "2020-04-07-${kernel.version}"; - src = fetchgit { - url = "git://github.com/mkottman/acpi_call.git"; - rev = "ac67445bc75ec4fcf46ceb195fb84d74ad350d51"; - sha256 = "0jl19irz9x9pxab2qp4z8c3jijv2m30zhmnzi6ygbrisqqlg4c75"; + src = fetchFromGitHub { + owner = "nix-community"; + repo = "acpi_call"; + rev = "3d7c9fe5ed3fc5ed5bafd39d54b1fdc7a09ce710"; + sha256 = "09kp8zl392h99wjwzqrdw2xcfnsc944hzmfwi8n1y7m2slpdybv3"; }; - patches = [ - (fetchpatch { - url = "https://github.com/mkottman/acpi_call/pull/67.patch"; - sha256 = "0z07apvdl8nvl8iwfk1sl1iidfjyx12fc0345bmp2nq1537kpbri"; - }) - ]; - hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - preBuild = '' - sed -e 's/break/true/' -i examples/turn_off_gpu.sh - sed -e 's@/bin/bash@.bin/sh@' -i examples/turn_off_gpu.sh - sed -e "s@/lib/modules/\$(.*)@${kernel.dev}/lib/modules/${kernel.modDirVersion}@" -i Makefile - sed -e 's@acpi/acpi[.]h@linux/acpi.h@g' -i acpi_call.c - ''; + makeFlags = [ + "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + ]; installPhase = '' - mkdir -p $out/lib/modules/${kernel.modDirVersion}/misc - cp acpi_call.ko $out/lib/modules/${kernel.modDirVersion}/misc - mkdir -p $out/bin - cp examples/turn_off_gpu.sh $out/bin/test_discrete_video_off.sh - chmod a+x $out/bin/test_discrete_video_off.sh + install -D acpi_call.ko $out/lib/modules/${kernel.modDirVersion}/misc/acpi_call.ko + install -D -m755 examples/turn_off_gpu.sh $out/bin/test_discrete_video_off.sh ''; - meta = { - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + maintainers = with maintainers; [ raskin mic92 ]; + inherit (src.meta) homepage; + platforms = platforms.linux; description = "A module allowing arbitrary ACPI calls; use case: hybrid video"; }; } diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix index cc7317f5520..69a36d7bf52 100644 --- a/pkgs/os-specific/linux/acpi/default.nix +++ b/pkgs/os-specific/linux/acpi/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { the "old" `apm' command on ACPI systems. It includes battery and thermal information. ''; - homepage = https://sourceforge.net/projects/acpiclient/; + homepage = "https://sourceforge.net/projects/acpiclient/"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ ]; diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index d58aec4a97c..5ef5e2724b2 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/acpid2/; + homepage = "https://sourceforge.net/projects/acpid2/"; description = "A daemon for delivering ACPI events to userspace programs"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix index 86e6b54906a..9f2ad5b5c03 100644 --- a/pkgs/os-specific/linux/acpitool/default.nix +++ b/pkgs/os-specific/linux/acpitool/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation rec { meta = { description = "A small, convenient command-line ACPI client with a lot of features"; - homepage = https://sourceforge.net/projects/acpitool/; + homepage = "https://sourceforge.net/projects/acpitool/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.guibert ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/os-specific/linux/afuse/default.nix b/pkgs/os-specific/linux/afuse/default.nix index 67c5ff14087..758c57bb9e1 100644 --- a/pkgs/os-specific/linux/afuse/default.nix +++ b/pkgs/os-specific/linux/afuse/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "afuse-0.4.1"; src = fetchurl { - url = https://github.com/pcarrier/afuse/archive/v0.4.1.tar.gz; + url = "https://github.com/pcarrier/afuse/archive/v0.4.1.tar.gz"; sha256 = "1sfhicmxppkvdd4z9klfn63snb71gr9hff6xij1gzk94xg6m0ycc"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "Automounter in userspace"; - homepage = https://github.com/pcarrier/afuse; + homepage = "https://github.com/pcarrier/afuse"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/alsa-firmware/default.nix b/pkgs/os-specific/linux/alsa-firmware/default.nix index d0a3d7645b3..01955534bfc 100644 --- a/pkgs/os-specific/linux/alsa-firmware/default.nix +++ b/pkgs/os-specific/linux/alsa-firmware/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.alsa-project.org/; + homepage = "http://www.alsa-project.org/"; description = "Soundcard firmwares from the alsa project"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 8dcddf4baf9..95189465284 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; meta = with stdenv.lib; { - homepage = http://www.alsa-project.org/; + homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture libraries"; longDescription = '' diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix index 77b351a1998..774dc3d8d67 100644 --- a/pkgs/os-specific/linux/alsa-oss/default.nix +++ b/pkgs/os-specific/linux/alsa-oss/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "ASOUND_STATE_DIR=$(TMPDIR)/dummy" ]; meta = with stdenv.lib; { - homepage = http://www.alsa-project.org/; + homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture alsa-oss emulation"; longDescription = '' diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 743e8f3576b..151549aa67b 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.alsa-project.org/; + homepage = "http://www.alsa-project.org/"; description = "ALSA, the Advanced Linux Sound Architecture tools"; longDescription = '' diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index b72944a49eb..32763fcded5 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -173,7 +173,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "AMDGPU-PRO drivers"; - homepage = http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx ; + homepage = "http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ corngood ]; diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index 0012c3de989..5f8ca7ac46f 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { }.${stdenv.system} or null; meta = with stdenv.lib; { - homepage = https://anbox.io; + homepage = "https://anbox.io"; description = "Android in a box"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/os-specific/linux/anbox/kmod.nix b/pkgs/os-specific/linux/anbox/kmod.nix index 0888f2c5414..6eb74ca25f6 100644 --- a/pkgs/os-specific/linux/anbox/kmod.nix +++ b/pkgs/os-specific/linux/anbox/kmod.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Anbox ashmem and binder drivers."; - homepage = https://github.com/anbox/anbox-modules; + homepage = "https://github.com/anbox/anbox-modules"; license = licenses.gpl2; platforms = platforms.linux; broken = (versionOlder kernel.version "4.4") || (kernel.features.grsecurity); diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix index 2aa71b92beb..0c659b41fdb 100644 --- a/pkgs/os-specific/linux/android-udev-rules/default.nix +++ b/pkgs/os-specific/linux/android-udev-rules/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/M0Rf30/android-udev-rules; + homepage = "https://github.com/M0Rf30/android-udev-rules"; description = "Android udev rules list aimed to be the most comprehensive on the net"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/os-specific/linux/apparmor/cross.patch b/pkgs/os-specific/linux/apparmor/cross.patch deleted file mode 100644 index f7e95ecfb40..00000000000 --- a/pkgs/os-specific/linux/apparmor/cross.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/parser/libapparmor_re/Makefile 2018-10-14 07:38:06.000000000 +0800 -+++ b/parser/libapparmor_re/Makefile 2019-06-28 16:16:33.741916660 +0800 -@@ -10,6 +10,7 @@ - - TARGET=libapparmor_re.a - -+AR ?= ar - CFLAGS ?= -g -Wall -O2 ${EXTRA_CFLAGS} -std=gnu++0x - CXXFLAGS := ${CFLAGS} ${INCLUDE_APPARMOR} - -@@ -22,7 +23,7 @@ - UNITTESTS = tst_parse - - libapparmor_re.a: parse.o expr-tree.o hfa.o chfa.o aare_rules.o -- ar ${ARFLAGS} $@ $^ -+ ${AR} ${ARFLAGS} $@ $^ - - expr-tree.o: expr-tree.cc expr-tree.h - diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index de9601dc85e..d661b2172b3 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -14,11 +14,11 @@ let apparmor-series = "2.13"; - apparmor-patchver = "3"; + apparmor-patchver = "4"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { - homepage = http://apparmor.net/; + homepage = "https://apparmor.net/"; description = "A mandatory access control system - ${component}"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom thoughtpolice joachifm ]; @@ -27,7 +27,7 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "0fbnk9fzjsffwcijsv2wwykmybvfdckpqk99qlib3kb89him6w16"; + sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; }; prePatchCommon = '' @@ -49,13 +49,6 @@ let sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; }) # (alpine patches {1,4,5,6,8} are needed for apparmor 2.11, but not 2.12) - ] ++ [ - ./cross.patch - # Support Python 3.8 - (fetchpatch { - url = https://gitlab.com/apparmor/apparmor/commit/ccbf1e0bf1bf5c3bbab47029fbbc5415ef73bac1.patch; - sha256 = "0kfzc0wyjybj38n10yvwakaaqvglalzigd3kk7gcrbp1xdn70pq2"; - }) ]; # Set to `true` after the next FIXME gets fixed or this gets some diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index a391f73391f..63f9b5399da 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -128,7 +128,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ATI Catalyst display drivers"; - homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; + homepage = "http://support.amd.com/us/gpudownload/Pages/index.aspx"; license = licenses.unfree; maintainers = with maintainers; [ marcweber offline jerith666 ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/atop/default.nix b/pkgs/os-specific/linux/atop/default.nix index 5144add3a37..0d8392cbcd8 100644 --- a/pkgs/os-specific/linux/atop/default.nix +++ b/pkgs/os-specific/linux/atop/default.nix @@ -43,6 +43,6 @@ stdenv.mkDerivation rec { ''; inherit version; license = licenses.gpl2; - downloadPage = http://atoptool.nl/downloadatop.php; + downloadPage = "http://atoptool.nl/downloadatop.php"; }; } diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index dab95049643..f77d71c823b 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "Audit Library"; - homepage = https://people.redhat.com/sgrubb/audit/; + homepage = "https://people.redhat.com/sgrubb/audit/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/os-specific/linux/autofs/default.nix b/pkgs/os-specific/linux/autofs/default.nix index 591a9a8792f..baf3cc6ad55 100644 --- a/pkgs/os-specific/linux/autofs/default.nix +++ b/pkgs/os-specific/linux/autofs/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation { meta = { description = "Kernel-based automounter"; - homepage = https://www.kernel.org/pub/linux/daemons/autofs/; + homepage = "https://www.kernel.org/pub/linux/daemons/autofs/"; license = stdenv.lib.licenses.gpl2Plus; executables = [ "automount" ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index fa2be46688c..c1fb3ef5ee1 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + 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 ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 57bafb398d1..5767c4aa72c 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + 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 ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 796be1e5d48..8985949a012 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.open-mesh.org/projects/batman-adv/wiki/Wiki; + 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 ]; diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index 4b914860068..eea8d31f24d 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A module for powering off hybrid GPUs"; platforms = [ "x86_64-linux" "i686-linux" ]; - homepage = https://github.com/Bumblebee-Project/bbswitch; + homepage = "https://github.com/Bumblebee-Project/bbswitch"; maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 949d953c3bd..79e32a05f46 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -4,8 +4,8 @@ }: python.pkgs.buildPythonApplication rec { + pname = "bcc"; version = "0.13.0"; - name = "bcc-${version}"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; @@ -67,7 +67,7 @@ python.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Dynamic Tracing Tools for Linux"; - homepage = https://iovisor.github.io/bcc/; + homepage = "https://iovisor.github.io/bcc/"; license = licenses.asl20; maintainers = with maintainers; [ ragge mic92 thoughtpolice ]; }; diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 844a9faf739..78d88d941e8 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "bluez"; - version = "5.53"; + version = "5.54"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${pname}-${version}.tar.xz"; - sha256 = "1g1qg6dz6hl3csrmz75ixr12lwv836hq3ckb259svvrg62l2vaiq"; + sha256 = "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8"; }; pythonPath = with python3.pkgs; [ @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { homepage = "http://www.bluez.org/"; license = with licenses; [ gpl2 lgpl21 ]; platforms = platforms.linux; - repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git; + repositories.git = "https://git.kernel.org/pub/scm/bluetooth/bluez.git"; }; } diff --git a/pkgs/os-specific/linux/bolt/default.nix b/pkgs/os-specific/linux/bolt/default.nix index 3a4c2ef7d9f..114a90129ac 100644 --- a/pkgs/os-specific/linux/bolt/default.nix +++ b/pkgs/os-specific/linux/bolt/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Thunderbolt 3 device management daemon"; - homepage = https://gitlab.freedesktop.org/bolt/bolt; + homepage = "https://gitlab.freedesktop.org/bolt/bolt"; license = licenses.lgpl21Plus; maintainers = [ maintainers.callahad ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 9eb9c53b8dd..2772ecec710 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-level tracing language for Linux eBPF"; - homepage = https://github.com/iovisor/bpftrace; + homepage = "https://github.com/iovisor/bpftrace"; license = licenses.asl20; maintainers = with maintainers; [ rvl thoughtpolice ]; }; diff --git a/pkgs/os-specific/linux/bridge-utils/default.nix b/pkgs/os-specific/linux/bridge-utils/default.nix index e3207fdf37d..1aeb4a907fb 100644 --- a/pkgs/os-specific/linux/bridge-utils/default.nix +++ b/pkgs/os-specific/linux/bridge-utils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "https://sourceforge.net/projects/bridge/"; - homepage = https://wiki.linuxfoundation.org/networking/bridge; + homepage = "https://wiki.linuxfoundation.org/networking/bridge"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/brillo/default.nix b/pkgs/os-specific/linux/brillo/default.nix index 1262260664c..5baaa0752aa 100644 --- a/pkgs/os-specific/linux/brillo/default.nix +++ b/pkgs/os-specific/linux/brillo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Backlight and Keyboard LED control tool"; - homepage = https://gitlab.com/cameronnemo/brillo; + homepage = "https://gitlab.com/cameronnemo/brillo"; license = [ licenses.gpl3 licenses.bsd0 ]; platforms = platforms.linux; maintainers = [ maintainers.alexarice ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index e24171dfefe..f1b560e9f8b 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { meta = { description = "Kernel module driver for some Broadcom's wireless cards"; - homepage = http://www.broadcom.com/support/802.11/linux_sta.php; + 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; diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix index d2e5d91e365..4e94151a812 100644 --- a/pkgs/os-specific/linux/btfs/default.nix +++ b/pkgs/os-specific/linux/btfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bittorrent filesystem based on FUSE"; - homepage = https://github.com/johang/btfs; + homepage = "https://github.com/johang/btfs"; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 41ac6e94ab3..430066831b8 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tiny versions of common UNIX utilities in a single small executable"; - homepage = https://busybox.net/; + homepage = "https://busybox.net/"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/cachefilesd/default.nix b/pkgs/os-specific/linux/cachefilesd/default.nix index 44c2cfff5a2..27fd8c9613a 100644 --- a/pkgs/os-specific/linux/cachefilesd/default.nix +++ b/pkgs/os-specific/linux/cachefilesd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Local network file caching management daemon"; - homepage = https://people.redhat.com/dhowells/fscache/; + homepage = "https://people.redhat.com/dhowells/fscache/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/can-utils/default.nix b/pkgs/os-specific/linux/can-utils/default.nix index 1451a4e96c0..2b6b82591b5 100644 --- a/pkgs/os-specific/linux/can-utils/default.nix +++ b/pkgs/os-specific/linux/can-utils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "CAN userspace utilities and tools (for use with Linux SocketCAN)"; - homepage = https://github.com/linux-can/can-utils; + homepage = "https://github.com/linux-can/can-utils"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/os-specific/linux/cgmanager/default.nix b/pkgs/os-specific/linux/cgmanager/default.nix index 6ba86036a52..d890ef44f74 100644 --- a/pkgs/os-specific/linux/cgmanager/default.nix +++ b/pkgs/os-specific/linux/cgmanager/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://linuxcontainers.org/cgmanager/introduction/; + homepage = "https://linuxcontainers.org/cgmanager/introduction/"; description = "A central privileged daemon that manages all your cgroups"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix index 1ee7ece0537..ad136b811df 100644 --- a/pkgs/os-specific/linux/cifs-utils/default.nix +++ b/pkgs/os-specific/linux/cifs-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "root_sbindir=$(out)/sbin" ]; meta = with stdenv.lib; { - homepage = http://www.samba.org/linux-cifs/cifs-utils/; + homepage = "http://www.samba.org/linux-cifs/cifs-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 0f24b1a18e9..dd54df77c34 100644 --- a/pkgs/os-specific/linux/compsize/default.nix +++ b/pkgs/os-specific/linux/compsize/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "btrfs: Find compression type/ratio on a file or set of files"; - homepage = https://github.com/kilobyte/compsize; + homepage = "https://github.com/kilobyte/compsize"; license = licenses.gpl2; maintainers = with maintainers; [ CrazedProgrammer ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index f826ddd423d..14f17da55a7 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://conky.sourceforge.net/; + homepage = "http://conky.sourceforge.net/"; description = "Advanced, highly configurable system monitor based on torsmo"; maintainers = [ maintainers.guibert ]; license = licenses.gpl3Plus; diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 20c441ffae2..8346fb1c73c 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex bison pkgconfig ]; meta = with stdenv.lib; { - homepage = http://conntrack-tools.netfilter.org/; + homepage = "http://conntrack-tools.netfilter.org/"; description = "Connection tracking userspace tools"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/consoletools/default.nix b/pkgs/os-specific/linux/consoletools/default.nix index c46af5fba85..83de8f5ae1a 100644 --- a/pkgs/os-specific/linux/consoletools/default.nix +++ b/pkgs/os-specific/linux/consoletools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=\"\"" ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/linuxconsole/; + homepage = "https://sourceforge.net/projects/linuxconsole/"; description = "A set of tools for joysticks and serial peripherals"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index 04da31176da..4c0515e94b3 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to display or change the CPU governor settings"; - homepage = http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html; + homepage = "http://ftp.be.debian.org/pub/linux/utils/kernel/cpufreq/cpufrequtils.html"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/cpupower/default.nix b/pkgs/os-specific/linux/cpupower/default.nix index 601810f2600..b6ecaa11de2 100644 --- a/pkgs/os-specific/linux/cpupower/default.nix +++ b/pkgs/os-specific/linux/cpupower/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to examine and tune power saving features"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/cpuset/default.nix b/pkgs/os-specific/linux/cpuset/default.nix index 5791145d52a..0a9b38f2888 100644 --- a/pkgs/os-specific/linux/cpuset/default.nix +++ b/pkgs/os-specific/linux/cpuset/default.nix @@ -20,7 +20,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Cpuset is a Python application that forms a wrapper around the standard Linux filesystem calls to make using the cpusets facilities in the Linux kernel easier."; - homepage = https://github.com/wykurz/cpuset; + homepage = "https://github.com/wykurz/cpuset"; license = licenses.gpl2; maintainers = with maintainers; [ wykurz ]; }; diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index d183bb25cb5..eb04761eef4 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cramfsswap-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://debian/pool/main/c/cramfsswap/cramfsswap_1.4.1.tar.gz; + url = "mirror://debian/pool/main/c/cramfsswap/cramfsswap_1.4.1.tar.gz"; sha256 = "0c6lbx1inkbcvvhh3y6fvfaq3w7d1zv7psgpjs5f3zjk1jysi9qd"; }; diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix index 501b1fb1884..5811e9358b0 100644 --- a/pkgs/os-specific/linux/crda/default.nix +++ b/pkgs/os-specific/linux/crda/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { to the system configuration. ''; - homepage = http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/; + homepage = "http://drvbp1.linux-foundation.org/~mcgrof/rel-html/crda/"; license = licenses.free; # "copyleft-next 0.3.0", as yet without a web site platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 3210a0106a6..4f7dae930aa 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Userspace checkpoint/restore for Linux"; - homepage = https://criu.org; + homepage = "https://criu.org"; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.thoughtpolice ]; diff --git a/pkgs/os-specific/linux/cryptodev/default.nix b/pkgs/os-specific/linux/cryptodev/default.nix index c146e18f68d..321f00b0ef2 100644 --- a/pkgs/os-specific/linux/cryptodev/default.nix +++ b/pkgs/os-specific/linux/cryptodev/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Device that allows access to Linux kernel cryptographic drivers"; - homepage = http://cryptodev-linux.org/; + homepage = "http://cryptodev-linux.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; broken = !stdenv.lib.versionOlder kernel.version "4.13"; diff --git a/pkgs/os-specific/linux/cryptsetup/default.nix b/pkgs/os-specific/linux/cryptsetup/default.nix index 9c621d28ed2..06be9f3432e 100644 --- a/pkgs/os-specific/linux/cryptsetup/default.nix +++ b/pkgs/os-specific/linux/cryptsetup/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://gitlab.com/cryptsetup/cryptsetup/; + homepage = "https://gitlab.com/cryptsetup/cryptsetup/"; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index b61d99cead1..d84676bcda6 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux D-Bus Message Broker"; - homepage = https://github.com/bus1/dbus-broker/wiki; + homepage = "https://github.com/bus1/dbus-broker/wiki"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/os-specific/linux/ddcci/default.nix b/pkgs/os-specific/linux/ddcci/default.nix index a399ad7029f..c977db64ee8 100644 --- a/pkgs/os-specific/linux/ddcci/default.nix +++ b/pkgs/os-specific/linux/ddcci/default.nix @@ -2,28 +2,26 @@ stdenv.mkDerivation rec { pname = "ddcci-driver"; - version = "0.3.2"; + version = "0.3.3"; name = "${pname}-${kernel.version}-${version}"; src = fetchFromGitLab { owner = "${pname}-linux"; repo = "${pname}-linux"; rev = "v${version}"; - sha256 = "0jl4l3vvxn85cbqr80p6bgyhf2vx9kbadrwx086wkj9ni8k6x5m6"; + sha256 = "0vkkja3ykjil783zjpwp0vz7jy2fp9ccazzi3afd4fjk8gldin7f"; }; hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - NIX_CFLAGS_COMPILE = [ "-Wno-error=incompatible-pointer-types" ]; - prePatch = '' substituteInPlace ./ddcci/Makefile \ - --replace 'SUBDIRS="$(src)"' 'M=$(PWD)' \ + --replace '"$(src)"' '$(PWD)' \ --replace depmod \# substituteInPlace ./ddcci-backlight/Makefile \ - --replace 'SUBDIRS="$(src)"' 'M=$(PWD)' \ + --replace '"$(src)"' '$(PWD)' \ --replace depmod \# ''; diff --git a/pkgs/os-specific/linux/device-tree/raspberrypi.nix b/pkgs/os-specific/linux/device-tree/raspberrypi.nix index 5e99e870ac8..b5886f6bd11 100644 --- a/pkgs/os-specific/linux/device-tree/raspberrypi.nix +++ b/pkgs/os-specific/linux/device-tree/raspberrypi.nix @@ -30,4 +30,7 @@ stdenvNoCC.mkDerivation { # Compatible overlays that may be used overlays = "${raspberrypifw}/share/raspberrypi/boot/overlays"; }; + meta = with stdenvNoCC.lib; { + platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; + }; } diff --git a/pkgs/os-specific/linux/devmem2/default.nix b/pkgs/os-specific/linux/devmem2/default.nix index 77fa7fe3b1b..9115601e357 100644 --- a/pkgs/os-specific/linux/devmem2/default.nix +++ b/pkgs/os-specific/linux/devmem2/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple program to read/write from/to any location in memory"; - homepage = http://lartmaker.nl/lartware/port/; + homepage = "http://lartmaker.nl/lartware/port/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/os-specific/linux/directvnc/default.nix b/pkgs/os-specific/linux/directvnc/default.nix index a880f699b69..c7937190915 100644 --- a/pkgs/os-specific/linux/directvnc/default.nix +++ b/pkgs/os-specific/linux/directvnc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "DirectFB VNC client"; - homepage = http://drinkmilk.github.io/directvnc/; + homepage = "http://drinkmilk.github.io/directvnc/"; license = licenses.gpl2; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index 46ebc923e3b..b2ae930f193 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "disk-indicator-2014-05-19"; src = fetchgit { - url = git://github.com/MeanEYE/Disk-Indicator.git; + url = "git://github.com/MeanEYE/Disk-Indicator.git"; rev = "51ef4afd8141b8d0659cbc7dc62189c56ae9c2da"; sha256 = "10jx6mx9qarn21p2l2jayxkn1gmqhvck1wymgsr4jmbwxl8ra5kd"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/MeanEYE/Disk-Indicator; + homepage = "https://github.com/MeanEYE/Disk-Indicator"; description = "A program that will turn a LED into a hard disk indicator"; longDescription = '' Small program for Linux that will turn your Scroll, Caps or Num Lock LED diff --git a/pkgs/os-specific/linux/dmidecode/default.nix b/pkgs/os-specific/linux/dmidecode/default.nix index 55dcba378ca..97ad75851a6 100644 --- a/pkgs/os-specific/linux/dmidecode/default.nix +++ b/pkgs/os-specific/linux/dmidecode/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://www.nongnu.org/dmidecode/; + homepage = "https://www.nongnu.org/dmidecode/"; description = "A tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/dpdk/default.nix b/pkgs/os-specific/linux/dpdk/default.nix index 414f276a210..8ad703bdd4b 100644 --- a/pkgs/os-specific/linux/dpdk/default.nix +++ b/pkgs/os-specific/linux/dpdk/default.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Set of libraries and drivers for fast packet processing"; - homepage = http://dpdk.org/; + homepage = "http://dpdk.org/"; license = with licenses; [ lgpl21 gpl2 bsd2 ]; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar magenbluten orivej ]; diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix index 02b8afa721f..bbf2535ce3d 100644 --- a/pkgs/os-specific/linux/drbd/default.nix +++ b/pkgs/os-specific/linux/drbd/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.drbd.org/; + homepage = "http://www.drbd.org/"; description = "Distributed Replicated Block Device, a distributed storage system for Linux"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/dstat/default.nix b/pkgs/os-specific/linux/dstat/default.nix index 25d0eb1fd02..2e235e27f36 100644 --- a/pkgs/os-specific/linux/dstat/default.nix +++ b/pkgs/os-specific/linux/dstat/default.nix @@ -15,7 +15,7 @@ python2Packages.buildPythonApplication rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://dag.wieers.com/home-made/dstat/; + homepage = "http://dag.wieers.com/home-made/dstat/"; description = "Versatile resource statistics tool"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix index 38ef803d8e5..ea17c287a29 100644 --- a/pkgs/os-specific/linux/e1000e/default.nix +++ b/pkgs/os-specific/linux/e1000e/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Linux kernel drivers for Intel Ethernet adapters and LOMs (LAN On Motherboard)"; - homepage = http://e1000.sf.net/; + homepage = "http://e1000.sf.net/"; license = stdenv.lib.licenses.gpl2; }; } diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix index 96283af40d0..2585c5b3c2f 100644 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ b/pkgs/os-specific/linux/earlyoom/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Early OOM Daemon for Linux"; - homepage = https://github.com/rfjakob/earlyoom; + homepage = "https://github.com/rfjakob/earlyoom"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ]; diff --git a/pkgs/os-specific/linux/ebtables/default.nix b/pkgs/os-specific/linux/ebtables/default.nix index 3f025ca7504..d3705195f59 100644 --- a/pkgs/os-specific/linux/ebtables/default.nix +++ b/pkgs/os-specific/linux/ebtables/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A filtering tool for Linux-based bridging firewalls"; - homepage = http://ebtables.sourceforge.net/; + homepage = "http://ebtables.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/edac-utils/default.nix b/pkgs/os-specific/linux/edac-utils/default.nix index eabd0848553..fb0a6dbf62e 100644 --- a/pkgs/os-specific/linux/edac-utils/default.nix +++ b/pkgs/os-specific/linux/edac-utils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/grondo/edac-utils; + homepage = "https://github.com/grondo/edac-utils"; description = "Handles the reporting of hardware-related memory errors"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index e811dc1bc38..69c1f8de2ea 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.28"; + version = "0.30"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "1am3ghji271364vmf2w5sxskvlhh4r2mwakza7vjjph16cvsv6a7"; + sha256 = "0kiglgc02a6hqi1nhnl4d8lxax8b1fljp50pvqswrnbh7pgb5676"; }; patches = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://01.org/ell; + homepage = "https://01.org/ell"; description = "Embedded Linux Library"; longDescription = '' The Embedded Linux* Library (ELL) provides core, low-level functionality for system daemons. It typically has no dependencies other than the Linux kernel, C standard library, and libdl (for dynamic linking). While ELL is designed to be efficient and compact enough for use on embedded Linux platforms, it is not limited to resource-constrained systems. diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 9b5d82b9f7b..de3bc092faa 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Amazon Elastic Network Adapter (ENA) driver for Linux"; - homepage = https://github.com/amzn/amzn-drivers; + homepage = "https://github.com/amzn/amzn-drivers"; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/extrace/default.nix b/pkgs/os-specific/linux/extrace/default.nix index 0d00eaa3ac8..23a9c68b5d5 100644 --- a/pkgs/os-specific/linux/extrace/default.nix +++ b/pkgs/os-specific/linux/extrace/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/leahneukirchen/extrace; + homepage = "https://github.com/leahneukirchen/extrace"; description = "Trace exec() calls system-wide"; license = with licenses; [ gpl2 bsd2 ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix index 99e72c33983..223f766aa22 100644 --- a/pkgs/os-specific/linux/facetimehd/default.nix +++ b/pkgs/os-specific/linux/facetimehd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel }: # facetimehd is not supported for kernels older than 3.19"; assert stdenv.lib.versionAtLeast kernel.version "3.19"; @@ -44,18 +44,23 @@ stdenv.mkDerivation rec { ''; hardeningDisable = [ "pic" ]; - + nativeBuildInputs = kernel.moduleBuildDependencies; + preBuild = lib.optionalString (stdenv.lib.versionAtLeast kernel.version "5.6") + '' + sed -i 's/ioremap_nocache/ioremap_cache/g' fthd_drv.c + ''; + makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; meta = with stdenv.lib; { - homepage = https://github.com/patjak/bcwc_pcie; + homepage = "https://github.com/patjak/bcwc_pcie"; description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam"; license = licenses.gpl2; - maintainers = with maintainers; [ womfoo grahamc ]; + maintainers = with maintainers; [ womfoo grahamc kraem ]; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix index b99f719f836..69d1afad8a6 100644 --- a/pkgs/os-specific/linux/fatrace/default.nix +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Report system-wide file access events"; - homepage = https://launchpad.net/fatrace/; + homepage = "https://launchpad.net/fatrace/"; license = licenses.gpl3Plus; longDescription = '' fatrace reports file access events from all running processes. diff --git a/pkgs/os-specific/linux/fbterm/default.nix b/pkgs/os-specific/linux/fbterm/default.nix index d56b254d382..2b049bc6df5 100644 --- a/pkgs/os-specific/linux/fbterm/default.nix +++ b/pkgs/os-specific/linux/fbterm/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit (s) version; description = "Framebuffer terminal emulator"; - homepage = https://code.google.com/archive/p/fbterm/; + homepage = "https://code.google.com/archive/p/fbterm/"; maintainers = [ maintainers.raskin ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index 3d2c6ae6dae..5dc5086a8c6 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -1,21 +1,41 @@ -{ stdenv, fetchurl, scons, pkgconfig, which, makeWrapper, python3 -, libraw1394, libconfig, libavc1394, libiec61883, libxmlxx3 +{ stdenv +, mkDerivation +, dbus +, dbus_cplusplus +, desktop-file-utils +, fetchurl , glibmm -, dbus, dbus_cplusplus +, kernel +, libavc1394 +, libconfig +, libiec61883 +, libraw1394 +, libxmlxx3 +, pkgconfig +, python3 +, scons +, which +, wrapQtAppsHook }: let inherit (python3.pkgs) pyqt5 dbus-python; python = python3.withPackages (pkgs: with pkgs; [ pyqt5 dbus-python ]); -in stdenv.mkDerivation rec { +in +mkDerivation rec { pname = "ffado"; - version = "2.4.1"; + version = "2.4.2"; src = fetchurl { url = "http://www.ffado.org/files/libffado-${version}.tgz"; - sha256 = "0byr3kv58d1ryy60vr69fd868zlfkvl2gq9hl94dqdn485l9pq9y"; + sha256 = "09dxy6fkfnvzk45lpr74hkqymii8a45jzlq6054f3jz65m8qvj3d"; }; + prePatch = '' + substituteInPlace ./support/tools/ffado-diag.in \ + --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/" + ''; + patches = [ # fix installing metainfo file ./fix-build.patch @@ -23,13 +43,21 @@ in stdenv.mkDerivation rec { outputs = [ "out" "bin" "dev" ]; - nativeBuildInputs = [ scons pkgconfig which makeWrapper python pyqt5 ]; + nativeBuildInputs = [ + desktop-file-utils + scons.py2 + pkgconfig + which + python + pyqt5 + wrapQtAppsHook + ]; prefixKey = "PREFIX="; sconsFlags = [ "DEBUG=False" "ENABLE_ALL=True" - "BUILD_TESTS=False" + "BUILD_TESTS=True" "WILL_DEAL_WITH_XDG_MYSELF=True" "BUILD_MIXER=True" "UDEVDIR=${placeholder "out"}/lib/udev/rules.d" @@ -40,29 +68,41 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - libraw1394 - libconfig - libavc1394 - libiec61883 dbus dbus_cplusplus + glibmm + libavc1394 + libconfig + libiec61883 + libraw1394 libxmlxx3 python - glibmm ]; enableParallelBuilding = true; + dontWrapQtApps = true; postInstall = '' + desktop="$bin/share/applications/ffado-mixer.desktop" + install -DT -m 444 support/xdg/ffado.org-ffadomixer.desktop $desktop + substituteInPlace "$desktop" \ + --replace Exec=ffado-mixer "Exec=$bin/bin/ffado-mixer" \ + --replace hi64-apps-ffado ffado-mixer + install -DT -m 444 support/xdg/hi64-apps-ffado.png "$bin/share/icons/hicolor/64x64/apps/ffado-mixer.png" + # prevent build tools from leaking into closure echo 'See `nix-store --query --tree ${placeholder "out"}`.' > $out/lib/libffado/static_info.txt ''; + preFixup = '' + wrapQtApp $bin/bin/ffado-mixer + ''; + meta = with stdenv.lib; { - homepage = http://www.ffado.org; + homepage = "http://www.ffado.org"; description = "FireWire audio drivers"; license = licenses.gpl3; - maintainers = with maintainers; [ goibhniu ]; + maintainers = with maintainers; [ goibhniu michojel ]; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 678592c0379..8c7a109cb76 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -36,10 +36,27 @@ stdenv.mkDerivation { sed -e "s@/etc/@$out/etc/@g" -e "/chmod u+s/d" -i Makefile ''; - # We need to set the directory for the .local override files to - # /etc/firejail so we can actually override them + # The profile files provided with the firejail distribution include `.local` + # profile files using relative paths. The way firejail works when it comes to + # handling includes is by looking target files up in `~/.config/firejail` + # first, and then trying `SYSCONFDIR`. The latter normally points to + # `/etc/filejail`, but in the case of nixos points to the nix store. This + # makes it effectively impossible to place any profile files in + # `/etc/firejail`. + # + # The workaround applied below is by creating a set of `.local` files which + # only contain respective includes to `/etc/firejail`. This way + # `~/.config/firejail` still takes precedence, but `/etc/firejail` will also + # be searched in second order. This replicates the behaviour from + # non-nixos platforms. + # + # See https://github.com/netblue30/firejail/blob/e4cb6b42743ad18bd11d07fd32b51e8576239318/src/firejail/profile.c#L68-L83 + # for the profile file lookup implementation. postInstall = '' - sed -E -e 's@^include (.*.local)$@include /etc/firejail/\1@g' -i $out/etc/firejail/*.profile + for local in $(grep -Eh '^include.*local$' $out/etc/firejail/*.profile | awk '{print $2}' | sort | uniq) + do + echo "include /etc/firejail/$local" >$out/etc/firejail/$local + done ''; # At high parallelism, the build sometimes fails with: @@ -52,7 +69,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://firejail.wordpress.com/; + homepage = "https://firejail.wordpress.com/"; downloadPage = "https://sourceforge.net/projects/firejail/files/firejail/"; }; } 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 8aa78e65dec..7cb5d2a9a40 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -14,7 +14,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; + homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; license = stdenv.lib.licenses.free; platforms = stdenv.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 58cd88b4dce..4f03f58b11f 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 @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { description = "Firmware for cards supported by the b43 kernel module"; - homepage = http://wireless.kernel.org/en/users/Drivers/b43; + homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; license = stdenv.lib.licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 959c0c74618..3972e52977f 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Firmware for cards supported by the b43 kernel module"; - homepage = http://wireless.kernel.org/en/users/Drivers/b43; - downloadPage = http://www.lwfinger.com/b43-firmware; + homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; + downloadPage = "http://www.lwfinger.com/b43-firmware"; license = licenses.unfree; }; } diff --git a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix index 4d5271a9ddf..314a6b7521b 100644 --- a/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/broadcom-bt-firmware/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Firmware for Broadcom WIDCOMM® Bluetooth devices"; - homepage = http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth; + homepage = "http://www.catalog.update.microsoft.com/Search.aspx?q=Broadcom+bluetooth"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ zraexy ]; 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 9a99881be46..5b4506a10ea 100644 --- a/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix +++ b/pkgs/os-specific/linux/firmware/bt-fw-converter/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/winterheart/broadcom-bt-firmware/; + homepage = "https://github.com/winterheart/broadcom-bt-firmware/"; description = "A tool that converts hex to hcd based on inf file"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix index 1a1c1ec39d7..7d735e69f56 100644 --- a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "facetimehd firmware"; - homepage = https://support.apple.com/kb/DL1877; + homepage = "https://support.apple.com/kb/DL1877"; license = licenses.unfree; maintainers = with maintainers; [ womfoo grahamc ]; platforms = [ "i686-linux" "x86_64-linux" ]; 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 1a454cb8957..77be6317b6c 100644 --- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix +++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Binary firmware collection packaged by kernel.org"; - homepage = http://packages.debian.org/sid/firmware-linux-nonfree; + homepage = "http://packages.debian.org/sid/firmware-linux-nonfree"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index 372be2d71f2..c9b1d7c5f0a 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -17,7 +17,7 @@ fetchzip { meta = with lib; { description = "Firmware for Intel 2200BG cards"; - homepage = http://ipw2200.sourceforge.net/firmware.php; + homepage = "http://ipw2200.sourceforge.net/firmware.php"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ sternenseemann ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix index 421a3300f7b..ff0081a71e1 100644 --- a/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/openelec-dvb-firmware/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DVB firmware from OpenELEC"; - homepage = https://github.com/OpenELEC/dvb-firmware; + homepage = "https://github.com/OpenELEC/dvb-firmware"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; priority = 7; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix index 392ddda6f57..23338684764 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi-wireless/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Firmware for builtin Wifi/Bluetooth devices in the Raspberry Pi 3 and Zero W"; - homepage = https://github.com/RPi-Distro/firmware-nonfree; + homepage = "https://github.com/RPi-Distro/firmware-nonfree"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; maintainers = with maintainers; [ lopsided98 ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix index a8c4bd559d3..bd9c58d33c9 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/default.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Firmware for the Raspberry Pi board"; - homepage = https://github.com/raspberrypi/firmware; + homepage = "https://github.com/raspberrypi/firmware"; license = licenses.unfreeRedistributableFirmware; # See https://github.com/raspberrypi/firmware/blob/master/boot/LICENCE.broadcom platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ dezgeg tavyc ]; diff --git a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix index 1ea2b5e4e3d..e3fa90ac388 100644 --- a/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix +++ b/pkgs/os-specific/linux/firmware/raspberrypi/tools.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Userland tools for the Raspberry Pi board"; - homepage = https://github.com/raspberrypi/userland; + homepage = "https://github.com/raspberrypi/userland"; license = licenses.bsd3; platforms = [ "armv6l-linux" "armv7l-linux" "aarch64-linux" ]; maintainers = with maintainers; [ dezgeg tavyc ]; diff --git a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix index d8d4c37fd88..9b68a49266f 100644 --- a/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8192su-firmware/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Firmware for Realtek RTL8188SU/RTL8191SU/RTL8192SU"; - homepage = https://github.com/chunkeey/rtl8192su; + homepage = "https://github.com/chunkeey/rtl8192su"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ mic92 ]; platforms = with platforms; linux; diff --git a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix index eea6f2893f2..f95d1efcef7 100644 --- a/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/rtl8723bs-firmware/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Firmware for RealTek 8723bs"; - homepage = https://github.com/hadess/rtl8723bs; + homepage = "https://github.com/hadess/rtl8723bs"; license = licenses.unfreeRedistributableFirmware; maintainers = with maintainers; [ elitak ]; platforms = with platforms; linux; diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 2c9db47539f..d6963c8eb78 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -17,7 +17,7 @@ in fetchzip rec { meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; - homepage = https://sourceforge.net/projects/zd1211/; + homepage = "https://sourceforge.net/projects/zd1211/"; license = "GPL"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/flashbench/default.nix b/pkgs/os-specific/linux/flashbench/default.nix index bf3d2ef8d6d..70ad779c239 100644 --- a/pkgs/os-specific/linux/flashbench/default.nix +++ b/pkgs/os-specific/linux/flashbench/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Testing tool for flash based memory devices"; - homepage = https://github.com/bradfa/flashbench; + homepage = "https://github.com/bradfa/flashbench"; platforms = platforms.linux; license = licenses.gpl2; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index b7f47f12b15..53a1bdbc4c7 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Neat and simple webcam app"; - homepage = http://www.sanslogic.co.uk/fswebcam; + homepage = "http://www.sanslogic.co.uk/fswebcam"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix index 4d283d5dc0c..d7791cd1a62 100644 --- a/pkgs/os-specific/linux/ftop/default.nix +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Show progress of open files and file systems"; - homepage = https://code.google.com/archive/p/ftop/; + homepage = "https://code.google.com/archive/p/ftop/"; license = licenses.gpl3Plus; longDescription = '' ftop is to files what top is to processes. The progress of all open files diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index c230ecaae79..76ec3c691d0 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.02.00"; + version = "20.03.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "1mplv4866w3w1vixn7abq9cgh8gxgzhdyxsvj952vkhv3b8in4jq"; + sha256 = "0h56lclvs8l5jf6zh790ki9k4mp9r8sqv2pynnciqlkz8nj71qah"; stripRoot = false; }; diff --git a/pkgs/os-specific/linux/fxload/default.nix b/pkgs/os-specific/linux/fxload/default.nix index 61bd2a229ab..e77983254e4 100644 --- a/pkgs/os-specific/linux/fxload/default.nix +++ b/pkgs/os-specific/linux/fxload/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "fxload-2002_04_11"; src = fetchurl { - url = mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz; + url = "mirror://sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz"; sha256 = "1hql93bp3dxrv1p67nc63xsbqwljyynm997ysldrc3n9ifi6s48m"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://linux-hotplug.sourceforge.net/?selected=usb; + homepage = "http://linux-hotplug.sourceforge.net/?selected=usb"; description = "Tool to upload firmware to Cypress EZ-USB microcontrollers"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/os-specific/linux/g15daemon/default.nix new file mode 100644 index 00000000000..d00bf2f7433 --- /dev/null +++ b/pkgs/os-specific/linux/g15daemon/default.nix @@ -0,0 +1,88 @@ +{ stdenv +, lib +, fetchFromGitHub +, fetchurl +, fetchpatch +, patchelf +, freetype +, libusb +}: +let + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ peterhoeg ]; + + g15src = { pname, version, sha256 }: fetchurl { + url = "mirror://sourceforge/g15tools/${pname}/${version}/${pname}-${version}.tar.bz2"; + inherit sha256; + }; + + libg15 = stdenv.mkDerivation rec { + pname = "libg15"; + version = "1.2.7"; + + src = g15src { + inherit pname version; + sha256 = "1mkrf622n0cmz57lj8w9q82a9dcr1lmyyxbnrghrxzb6gvifnbqk"; + }; + + buildInputs = [ libusb ]; + + enableParallelBuilding = true; + + meta = { + description = "Provides low-level access to Logitech G11/G15 keyboards and Z10 speakers"; + inherit license maintainers; + }; + }; + + libg15render = stdenv.mkDerivation rec { + pname = "libg15render"; + version = "1.2"; + + src = g15src { + inherit pname version; + sha256 = "03yjb78j1fnr2fwklxy54sdljwi0imvp29m8kmwl9v0pdapka8yj"; + }; + + buildInputs = [ libg15 ]; + + enableParallelBuilding = true; + + meta = { + description = "A small graphics library optimised for drawing on an LCD"; + inherit license maintainers; + }; + }; +in +stdenv.mkDerivation rec { + pname = "g15daemon"; + version = "1.9.5.3"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/G15Daemon%201.9x/${version}/${pname}-${version}.tar.bz2"; + sha256 = "1613gsp5dgilwbshqxxhiyw73ksngnam7n1iw6yxdjkp9fyd2a3d"; + }; + + patches = let + patch = fname: sha256: fetchurl rec { + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/${pname}-${version}-${fname}.patch?h=packages/${pname}"; + name = "${fname}.patch"; + inherit sha256; + }; + in + [ + (patch "uinput" "1misfff7a1vg0qgfk3n25y7drnm86a4gq96iflpcwr5x3lw7q0h7") + (patch "config-write" "0jkrbqvzqrvxr14h5qi17cb4d32caq7vw9kzlz3qwpxdgxjrjvy2") + (patch "recv-oob-answer" "1f67iqpj5hcgpakagi7gbw1xviwhy5vizs546l9bfjimx8r2d29g") + ./pid_location.patch + ]; + + buildInputs = [ libg15 libg15render ]; + + enableParallelBuilding = true; + + meta = { + description = "A daemon that makes it possible to use the Logitech keyboard G-Buttons and draw on various Logitech LCDs"; + inherit license maintainers; + }; +} diff --git a/pkgs/os-specific/linux/g15daemon/pid_location.patch b/pkgs/os-specific/linux/g15daemon/pid_location.patch new file mode 100644 index 00000000000..f88c4a80962 --- /dev/null +++ b/pkgs/os-specific/linux/g15daemon/pid_location.patch @@ -0,0 +1,25 @@ +diff --git a/g15daemon/main.c b/g15daemon/main.c +index e674475..97b8242 100644 +--- a/g15daemon/main.c ++++ b/g15daemon/main.c +@@ -574,7 +574,7 @@ exitnow: + g15daemon_quit_refresh(); + uf_conf_write(lcdlist,"/etc/g15daemon.conf"); + uf_conf_free(lcdlist); +- unlink("/var/run/g15daemon.pid"); ++ unlink("/run/g15daemon/g15daemon.pid"); + } + return 0; + } +diff --git a/g15daemon/utility_funcs.c b/g15daemon/utility_funcs.c +index c93d164..2e9c679 100644 +--- a/g15daemon/utility_funcs.c ++++ b/g15daemon/utility_funcs.c +@@ -48,7 +48,7 @@ + + extern unsigned int g15daemon_debug; + extern volatile int leaving; +-#define G15DAEMON_PIDFILE "/var/run/g15daemon.pid" ++#define G15DAEMON_PIDFILE "/run/g15daemon/g15daemon.pid" + + pthread_cond_t lcd_refresh = PTHREAD_COND_INITIALIZER; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index 942cafd0343..a4584304f58 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; - url = https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz; + url = "https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz"; sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; }; patches = [./gcc46-include-fix.patch ./config-paths.patch ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://ipv6.ernet.in/Tunnel_broker; + homepage = "https://ipv6.ernet.in/Tunnel_broker"; description = "Client to connect to the Freenet6 IPv6 tunnel broker service"; maintainers = [ maintainers.bluescreen303 ]; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix index 6037f35ba86..e04b8314350 100644 --- a/pkgs/os-specific/linux/google-authenticator/default.nix +++ b/pkgs/os-specific/linux/google-authenticator/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/google/google-authenticator-libpam; + homepage = "https://github.com/google/google-authenticator-libpam"; description = "Two-step verification, with pam module"; license = licenses.asl20; maintainers = with maintainers; [ aneeshusa ]; diff --git a/pkgs/os-specific/linux/gpu-switch/default.nix b/pkgs/os-specific/linux/gpu-switch/default.nix index ea1051c5f05..17452a5e244 100644 --- a/pkgs/os-specific/linux/gpu-switch/default.nix +++ b/pkgs/os-specific/linux/gpu-switch/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = with lib; { description = "Application that allows to switch between the graphic cards of dual-GPU MacBook Pro models"; - homepage = https://github.com/0xbb/gpu-switch; + homepage = "https://github.com/0xbb/gpu-switch"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.msiedlarek ]; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 8e6db2a5774..e87768a9ff1 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple interface for devices supported by the linux UVC driver"; - homepage = http://guvcview.sourceforge.net; + homepage = "http://guvcview.sourceforge.net"; maintainers = [ maintainers.coconnor ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/hal-flash/default.nix b/pkgs/os-specific/linux/hal-flash/default.nix index 27b85fbfc89..c3463851fd3 100644 --- a/pkgs/os-specific/linux/hal-flash/default.nix +++ b/pkgs/os-specific/linux/hal-flash/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { preConfigure = "libtoolize && aclocal && autoconf && automake --add-missing"; meta = with stdenv.lib; { - homepage = https://github.com/cshorler/hal-flash; + homepage = "https://github.com/cshorler/hal-flash"; description = "libhal stub library to satisfy the Flash Player DRM requirements"; longDescription = '' diff --git a/pkgs/os-specific/linux/hd-idle/default.nix b/pkgs/os-specific/linux/hd-idle/default.nix index 91185438416..5e32e220b2f 100644 --- a/pkgs/os-specific/linux/hd-idle/default.nix +++ b/pkgs/os-specific/linux/hd-idle/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Spins down external disks after a period of idle time"; - homepage = http://hd-idle.sourceforge.net/; + homepage = "http://hd-idle.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 2aa928e8119..99464b67db1 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to get/set ATA/SATA drive parameters under Linux"; - homepage = https://sourceforge.net/projects/hdparm/; + homepage = "https://sourceforge.net/projects/hdparm/"; platforms = platforms.linux; license = licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/os-specific/linux/hibernate/default.nix b/pkgs/os-specific/linux/hibernate/default.nix index 3d759001d01..8fc6bfdbdcf 100644 --- a/pkgs/os-specific/linux/hibernate/default.nix +++ b/pkgs/os-specific/linux/hibernate/default.nix @@ -40,7 +40,7 @@ in ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://www.tuxonice.net/; + homepage = "http://www.tuxonice.net/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index b1251a4396f..869a394cefb 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -70,8 +70,8 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://hostap.epitest.fi; - repositories.git = git://w1.fi/hostap.git; + homepage = "https://hostap.epitest.fi"; + repositories.git = "git://w1.fi/hostap.git"; description = "A user space daemon for access point and authentication servers"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom ninjatrappeur ]; diff --git a/pkgs/os-specific/linux/hwdata/default.nix b/pkgs/os-specific/linux/hwdata/default.nix index 38335682ddb..2f6e6cd5cc9 100644 --- a/pkgs/os-specific/linux/hwdata/default.nix +++ b/pkgs/os-specific/linux/hwdata/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputHash = "0g2w4jr4p1hykracp2za7jb0rcr51kks1m43pzcaf7g99x8669ww"; meta = { - homepage = https://github.com/vcrhonek/hwdata; + 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; diff --git a/pkgs/os-specific/linux/i2c-tools/default.nix b/pkgs/os-specific/linux/i2c-tools/default.nix index 1b87619faa3..3a00dbefa63 100644 --- a/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/pkgs/os-specific/linux/i2c-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of I2C tools for Linux"; - homepage = https://i2c.wiki.kernel.org/index.php/I2C_Tools; + homepage = "https://i2c.wiki.kernel.org/index.php/I2C_Tools"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/i7z/default.nix b/pkgs/os-specific/linux/i7z/default.nix index 2f792cb7ea7..2e00e9eedc3 100644 --- a/pkgs/os-specific/linux/i7z/default.nix +++ b/pkgs/os-specific/linux/i7z/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A better i7 (and now i3, i5) reporting tool for Linux"; - homepage = https://github.com/DimitryAndric/i7z; - repositories.git = https://github.com/DimitryAndric/i7z.git; + homepage = "https://github.com/DimitryAndric/i7z"; + repositories.git = "https://github.com/DimitryAndric/i7z.git"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 ]; # broken on ARM diff --git a/pkgs/os-specific/linux/i810switch/default.nix b/pkgs/os-specific/linux/i810switch/default.nix index 2f4511bcbc4..5b65f2a16fd 100644 --- a/pkgs/os-specific/linux/i810switch/default.nix +++ b/pkgs/os-specific/linux/i810switch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { "; src = fetchurl { - url = http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz; + url = "http://www16.plala.or.jp/mano-a-mano/i810switch/i810switch-0.6.5.tar.gz"; sha256 = "d714840e3b14e1fa9c432c4be0044b7c008d904dece0d611554655b979cad4c3"; }; 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; + homepage = "http://www16.plala.or.jp/mano-a-mano/i810switch.html"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.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 a1d488adcfa..95f555cef8c 100644 --- a/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Proxy for sending IIO sensor data to D-Bus"; - homepage = https://github.com/hadess/iio-sensor-proxy; + homepage = "https://github.com/hadess/iio-sensor-proxy"; license = licenses.gpl3 ; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ima-evm-utils/default.nix b/pkgs/os-specific/linux/ima-evm-utils/default.nix index 69ec6560d83..246c109faf3 100644 --- a/pkgs/os-specific/linux/ima-evm-utils/default.nix +++ b/pkgs/os-specific/linux/ima-evm-utils/default.nix @@ -19,7 +19,7 @@ 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/; + homepage = "https://sourceforge.net/projects/linux-ima/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/os-specific/linux/input-utils/default.nix b/pkgs/os-specific/linux/input-utils/default.nix index c6248ee9083..97c7b8b23f2 100644 --- a/pkgs/os-specific/linux/input-utils/default.nix +++ b/pkgs/os-specific/linux/input-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Input layer utilities, includes lsinput"; - homepage = https://www.kraxel.org/blog/linux/input/; + homepage = "https://www.kraxel.org/blog/linux/input/"; license = licenses.gpl2; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 308b5bb1fcf..869041256b6 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/intel/compute-runtime; + homepage = "https://github.com/intel/compute-runtime"; description = "Intel Graphics Compute Runtime for OpenCL. Replaces Beignet for Gen8 (Broadwell) and beyond."; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/intel-ocl/default.nix b/pkgs/os-specific/linux/intel-ocl/default.nix index 1f67208db8b..95a2cfbd846 100644 --- a/pkgs/os-specific/linux/intel-ocl/default.nix +++ b/pkgs/os-specific/linux/intel-ocl/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = { description = "Official OpenCL runtime for Intel CPUs"; - homepage = https://software.intel.com/en-us/articles/opencl-drivers; + homepage = "https://software.intel.com/en-us/articles/opencl-drivers"; license = stdenv.lib.licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.kierdavis ]; diff --git a/pkgs/os-specific/linux/intel-speed-select/default.nix b/pkgs/os-specific/linux/intel-speed-select/default.nix index cf0dd75a8a4..12536130a86 100644 --- a/pkgs/os-specific/linux/intel-speed-select/default.nix +++ b/pkgs/os-specific/linux/intel-speed-select/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to enumerate and control the Intel Speed Select Technology features"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific }; diff --git a/pkgs/os-specific/linux/iomelt/default.nix b/pkgs/os-specific/linux/iomelt/default.nix index 7b41b095091..860a7b44632 100644 --- a/pkgs/os-specific/linux/iomelt/default.nix +++ b/pkgs/os-specific/linux/iomelt/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "A simple yet effective way to benchmark disk IO in Linux systems"; - homepage = http://www.iomelt.com; + homepage = "http://www.iomelt.com"; maintainers = with maintainers; [ cstrahan ]; license = licenses.artistic2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ioport/default.nix b/pkgs/os-specific/linux/ioport/default.nix index c14d9f146eb..fad85335200 100644 --- a/pkgs/os-specific/linux/ioport/default.nix +++ b/pkgs/os-specific/linux/ioport/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { buildInputs = [ perl ]; meta = with stdenv.lib; { description = "Direct access to I/O ports from the command line"; - homepage = https://people.redhat.com/rjones/ioport/; + homepage = "https://people.redhat.com/rjones/ioport/"; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ maintainers.cleverca22 ]; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index cb882a0dc1f..8f742aa01be 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec { patches = [ (fetchpatch { - url = https://repo.or.cz/iotop.git/patch/99c8d7cedce81f17b851954d94bfa73787300599; + url = "https://repo.or.cz/iotop.git/patch/99c8d7cedce81f17b851954d94bfa73787300599"; sha256 = "0rdgz6xpmbx77lkr1ixklliy1aavdsjmfdqvzwrjylbv0xh5wc8z"; }) ]; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A tool to find out the processes doing the most IO"; - homepage = http://guichaz.free.fr/iotop; + homepage = "http://guichaz.free.fr/iotop"; license = licenses.gpl2; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 8e753121b7f..5fcf362bc8b 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf }: +{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf, libmnl }: stdenv.mkDerivation rec { pname = "iproute2"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { "CONFDIR=$(out)/etc/iproute2" ]; - buildInputs = [ db iptables libelf ]; + buildInputs = [ db iptables libelf libmnl ]; nativeBuildInputs = [ bison flex pkgconfig ]; enableParallelBuilding = true; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wiki.linuxfoundation.org/networking/iproute2; + homepage = "https://wiki.linuxfoundation.org/networking/iproute2"; description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/iproute/mptcp.nix b/pkgs/os-specific/linux/iproute/mptcp.nix index 90503c21c04..4a58ae9e046 100644 --- a/pkgs/os-specific/linux/iproute/mptcp.nix +++ b/pkgs/os-specific/linux/iproute/mptcp.nix @@ -12,7 +12,7 @@ iproute.overrideAttrs (oa: rec { }; meta = with stdenv.lib; { - homepage = https://github.com/multipath-tcp/iproute-mptcp; + homepage = "https://github.com/multipath-tcp/iproute-mptcp"; description = "IP-Route extensions for MultiPath TCP"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ipsec-tools/default.nix b/pkgs/os-specific/linux/ipsec-tools/default.nix index 551fc61f814..bff356ccb6c 100644 --- a/pkgs/os-specific/linux/ipsec-tools/default.nix +++ b/pkgs/os-specific/linux/ipsec-tools/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://ipsec-tools.sourceforge.net/; + homepage = "http://ipsec-tools.sourceforge.net/"; description = "Port of KAME's IPsec utilities to the Linux-2.6 IPsec implementation"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index f556d7368e9..7502769c3ae 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to configure the Linux IP packet filtering ruleset"; - homepage = https://www.netfilter.org/projects/iptables/index.html; + homepage = "https://www.netfilter.org/projects/iptables/index.html"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/iptstate/default.nix b/pkgs/os-specific/linux/iptstate/default.nix index 5a0555f6680..cd290113e00 100644 --- a/pkgs/os-specific/linux/iptstate/default.nix +++ b/pkgs/os-specific/linux/iptstate/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Conntrack top like tool"; - homepage = https://github.com/jaymzh/iptstate; + homepage = "https://github.com/jaymzh/iptstate"; platforms = platforms.linux; maintainers = with maintainers; [ trevorj ]; downloadPage = "https://github.com/jaymzh/iptstate/releases"; diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 3944a7b37fb..12784638348 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { ++ optional (!stdenv.hostPlatform.isMusl) libidn2; meta = { - homepage = https://github.com/iputils/iputils; + homepage = "https://github.com/iputils/iputils"; description = "A set of small useful utilities for Linux networking"; license = with licenses; [ gpl2Plus bsd3 sunAsIsLicense ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index 98dab0e62d7..5f91fa5dccd 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux Virtual Server support programs"; - homepage = http://www.linuxvirtualserver.org/software/ipvs.html; + homepage = "http://www.linuxvirtualserver.org/software/ipvs.html"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 27f176f6a72..4c4e1ff025d 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/Irqbalance/irqbalance; + 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; diff --git a/pkgs/os-specific/linux/it87/default.nix b/pkgs/os-specific/linux/it87/default.nix index c115eab1503..c48de130e5a 100644 --- a/pkgs/os-specific/linux/it87/default.nix +++ b/pkgs/os-specific/linux/it87/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Patched module for IT87xx superio chip sensors support"; - homepage = https://github.com/hannesha/it87; + homepage = "https://github.com/hannesha/it87"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ yorickvp ]; diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index 930f77437ac..585bbfd165e 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { The old tool iwconfig, which uses Wireless Extensions interface, is deprecated and it's strongly recommended to switch to iw and nl80211. ''; - homepage = https://wireless.wiki.kernel.org/en/users/Documentation/iw; + 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; diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index f6e98b047df..02bd83d9da6 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.5"; + version = "1.6"; src = fetchgit { - url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; + url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "09viyfv5j2rl6ly52b2xlc2zbmb6i22dv89jc6823bzdjjimkrg6"; + sha256 = "0c38c7a234cwdd5y1brq4w56xszs8zlp57rr3nvgp8z8djcy1qvx"; }; nativeBuildInputs = [ @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git; + homepage = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; description = "Wireless daemon for Linux"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ixgbevf/default.nix b/pkgs/os-specific/linux/ixgbevf/default.nix index 8a860cc1467..67b9a66a8ab 100644 --- a/pkgs/os-specific/linux/ixgbevf/default.nix +++ b/pkgs/os-specific/linux/ixgbevf/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Intel 82599 Virtual Function Driver"; - homepage = https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/; + homepage = "https://sourceforge.net/projects/e1000/files/ixgbevf%20stable/"; license = licenses.gpl2; priority = 20; # kernels ship ixgbevf driver for a long time already, maybe switch to a newest kernel? diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix index 58e058196bd..f8e211fb289 100644 --- a/pkgs/os-specific/linux/jfbview/default.nix +++ b/pkgs/os-specific/linux/jfbview/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { - Asynchronous background rendering of the next page - Customizable multi-threaded caching ''; - homepage = https://seasonofcode.com/pages/jfbview.html; + homepage = "https://seasonofcode.com/pages/jfbview.html"; license = licenses.asl20; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 58b1b53d52f..2d6e624fee6 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.jool.mx/; + homepage = "https://www.jool.mx/"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 8d170583a6c..69c0da33136 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.jool.mx/; + homepage = "https://www.jool.mx/"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/jujuutils/default.nix b/pkgs/os-specific/linux/jujuutils/default.nix index 617dad8bddd..86b24fe6a5b 100644 --- a/pkgs/os-specific/linux/jujuutils/default.nix +++ b/pkgs/os-specific/linux/jujuutils/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ linuxHeaders ]; meta = { - homepage = https://github.com/cladisch/linux-firewire-utils; + 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; diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index 3386a7f9206..7ee449ff33e 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { makeFlags = [ "setowner=" ]; meta = with stdenv.lib; { - homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/; + homepage = "ftp://ftp.altlinux.org/pub/people/legion/kbd/"; description = "Linux keyboard utilities and keyboard maps"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/kbdlight/default.nix b/pkgs/os-specific/linux/kbdlight/default.nix index 6df3e4fffe7..bc2d53b5e5d 100644 --- a/pkgs/os-specific/linux/kbdlight/default.nix +++ b/pkgs/os-specific/linux/kbdlight/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/hobarrera/kbdlight; + homepage = "https://github.com/hobarrera/kbdlight"; description = "A very simple application that changes MacBooks' keyboard backlight level"; license = licenses.isc; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index aa75c125da4..70083eb6cc4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.174"; + version = "4.14.175"; # 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 = "12ai2lc2ny38s93d0m5ngrv030vwv1h2hhzp0fs6fhjxasikq8jc"; + sha256 = "0b12w0d21sk261jr4p1pm32v0r20a5c2j1p5hasdqw80sb2hli6b"; }; } // (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 65f93a0f924..c7e55b1c9f8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.113"; + version = "4.19.114"; # 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 = "1rf0jz7r1f4rb4k0g3glssfa1hm2ka6vlbwjlkmsx1bybxnmg85m"; + sha256 = "03hz6vg5bg728ilbm4z997pf52cgxzsxb03vz5cs55gwdbfa0h0y"; }; } // (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 69156f577f6..6f0baf2a53b 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: buildLinux (args // rec { - version = "4.4.217"; + version = "4.4.218"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0vsjchywznmjn01flgvm9vsja5zqni319rfwgy997afcbz0c9spx"; + sha256 = "0qzhcy8i111jbpnkpzq7hqf9nkwq4s7smi820hfvnmd2ky7cns7a"; }; } // (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 98d203e481f..3b6a68b7c03 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: buildLinux (args // rec { - version = "4.9.217"; + version = "4.9.218"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "06b8av9f9pk2yp95nzv4322k0d5wsg40sxd9kfim1xzb093abckg"; + sha256 = "1ka98c8sbfipzll6ss9fcsn26lh4cy60372yfw27pif4brhnwfnz"; }; } // (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 2471962404e..e18048ef4c9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.28"; + version = "5.4.31"; # 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 = "197p7rjmbs229ncj1y8s80f7n4bm8g9w0jrv1109m3rl8q9wqqy8"; + sha256 = "1svf4wf4j1vqhdpgx63ry4c99fc54d9nfi4d1xm7z209z3w86451"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix index aa15a42d2c4..3b6555bde53 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5.13"; + version = "5.5.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; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1qjf18qywzrfdzwpgpf6m0w0bil8rbc9hby8473ckzvbl0a3cfqz"; + sha256 = "0207yw1vkyzvnvbfbkyam6nac1dd9p4hmmbqw09ljki0ia531yw5"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix new file mode 100644 index 00000000000..052343467db --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.6.3"; + + # 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 = "1ajh1iw3bplm6ckcycg45wfmmqkvfiqmh6i3m1895dfapfd6h4qx"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index c6e850c9907..d167a89ea83 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17387"; - sha256 = "1a62n326xsbb8r8y610d4k698n3la22rnhlxa56c2zki2q5697h3"; + rev = "17402"; + sha256 = "1g151h6hdiwpvpip1r2rhbma8j13xghcyxddh0ppg9h548wwwack"; } , ... }: @@ -22,7 +22,8 @@ in linux.override { name = "${linux.name}-libre-src"; src = linux.src; buildPhase = '' - ${scripts}/${majorMinor}/deblob-${majorMinor} \ + # --force flag to skip empty files after deblobbing + ${scripts}/${majorMinor}/deblob-${majorMinor} --force \ ${major} ${minor} ${patch} ''; checkPhase = '' diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index f4b9e5b8da6..456913c5e6d 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // { - version = "5.2.2019.10.12"; - modDirVersion = "5.2.0"; + version = "5.3.2020.04.04"; + modDirVersion = "5.3.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "de906c3e2eddad291d46bd0e7c81c68eaadcd08a"; - sha256 = "1ahabp8pd9slf4lchkbyfkagg9vhic0cw3kwvwryzaxxxjmf2hkk"; + rev = "a27d7265e75f6d65c2b972ce4ac27abfc153c230"; + sha256 = "0wnjl4xs7073d5ipcsplv5qpcxb7zpfqd5gqvh3mhqc5j3qn816x"; }; extraConfig = "BCACHEFS_FS m"; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 4098c30c744..e63fe96be6b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6-rc5"; + version = "5.6-rc7"; extraMeta.branch = "5.6"; # 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 = "0ys4wdv1rf9vshras1n6syy2pgg8kv50f27nprfzhrllni044whr"; + sha256 = "0wv3ipfm970y2pyadwn5g7hd9bj117qk8jl8sdhrasbsy1p8936i"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 0538511c528..71505840b86 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -269,8 +269,8 @@ let + stdenv.lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"); license = stdenv.lib.licenses.gpl2; - homepage = https://www.kernel.org/; - repositories.git = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git; + homepage = "https://www.kernel.org/"; + repositories.git = "https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"; maintainers = [ maintainers.thoughtpolice ]; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2af64c2ddc4..2b718551cc7 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -43,7 +43,7 @@ name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command"; patch = fetchpatch { name = name + ".patch"; - url = https://bugzilla.kernel.org/attachment.cgi?id=260597; + url = "https://bugzilla.kernel.org/attachment.cgi?id=260597"; sha256 = "09096npxpgvlwdz3pb3m9brvxh7vy0xc9z9p8hh85xyczyzcsjhr"; }; }; @@ -53,7 +53,7 @@ name = "xen-netfront_fix_mismatched_rtnl_unlock"; patch = fetchpatch { name = name + ".patch"; - url = https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch; + url = "https://github.com/torvalds/linux/commit/cb257783c2927b73614b20f915a91ff78aa6f3e8.patch"; sha256 = "0xhblx2j8wi3kpnfpgjjwlcwdry97ji2aaq54r3zirk5g5p72zs8"; }; }; @@ -63,7 +63,7 @@ name = "xen-netfront_update_features_after_registering_netdev"; patch = fetchpatch { name = name + ".patch"; - url = https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch; + url = "https://github.com/torvalds/linux/commit/45c8184c1bed1ca8a7f02918552063a00b909bf5.patch"; sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 07dd8c78f42..a3558244297 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://perf.wiki.kernel.org/; + 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; diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix index 4e9007c7362..b1abf50f5f1 100644 --- a/pkgs/os-specific/linux/kexectools/default.nix +++ b/pkgs/os-specific/linux/kexectools/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://horms.net/projects/kexec/kexec-tools; + homepage = "http://horms.net/projects/kexec/kexec-tools"; description = "Tools related to the kexec Linux feature"; platforms = platforms.linux; badPlatforms = [ diff --git a/pkgs/os-specific/linux/keyutils/default.nix b/pkgs/os-specific/linux/keyutils/default.nix index 887aee45aa8..76869bfde5b 100644 --- a/pkgs/os-specific/linux/keyutils/default.nix +++ b/pkgs/os-specific/linux/keyutils/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://people.redhat.com/dhowells/keyutils/; + homepage = "https://people.redhat.com/dhowells/keyutils/"; description = "Tools used to control the Linux kernel key management system"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix index 55ae78219d1..e14e190cd7c 100644 --- a/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix +++ b/pkgs/os-specific/linux/kmod-blacklist-ubuntu/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://packages.ubuntu.com/source/zesty/kmod; + homepage = "https://packages.ubuntu.com/source/zesty/kmod"; description = "Linux kernel module blacklists from Ubuntu"; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix index 07ab0427b22..f0f41331727 100644 --- a/pkgs/os-specific/linux/kmod-debian-aliases/default.nix +++ b/pkgs/os-specific/linux/kmod-debian-aliases/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://packages.debian.org/source/sid/kmod; + homepage = "https://packages.debian.org/source/sid/kmod"; description = "Linux configuration file for modprobe"; maintainers = with lib.maintainers; [ mathnerd314 ]; platforms = with lib.platforms; linux; diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix index 052ab3061c1..de025b436f5 100644 --- a/pkgs/os-specific/linux/kmod/default.nix +++ b/pkgs/os-specific/linux/kmod/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.kernel.org/pub/linux/utils/kernel/kmod/; + homepage = "https://www.kernel.org/pub/linux/utils/kernel/kmod/"; description = "Tools for loading and managing Linux kernel modules"; license = licenses.lgpl21; platforms = platforms.unix; diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index fd16acaa3a9..a79f762a8a2 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "KMS/DRM based System Console"; - homepage = http://www.freedesktop.org/wiki/Software/kmscon/; + homepage = "http://www.freedesktop.org/wiki/Software/kmscon/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 12463c736a6..e2e63bc10a1 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "kmscube-2018-06-17"; src = fetchgit { - url = git://anongit.freedesktop.org/mesa/kmscube; + url = "git://anongit.freedesktop.org/mesa/kmscube"; rev = "9dcce71e603616ee7a54707e932f962cdf8fb20a"; sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Example OpenGL app using KMS/GBM"; - homepage = https://gitlab.freedesktop.org/mesa/kmscube; + homepage = "https://gitlab.freedesktop.org/mesa/kmscube"; license = licenses.mit; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 93d2ac8b031..40095e543b4 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses glib gtk2 ]; meta = { - homepage = http://latencytop.org; + homepage = "http://latencytop.org"; description = "Tool to show kernel reports on latencies (LATENCYTOP option)"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/os-specific/linux/ldm/default.nix b/pkgs/os-specific/linux/ldm/default.nix index ce76e31a920..603d2855f56 100644 --- a/pkgs/os-specific/linux/ldm/default.nix +++ b/pkgs/os-specific/linux/ldm/default.nix @@ -4,7 +4,7 @@ assert mountPath != ""; let version = "0.5"; - git = https://github.com/LemonBoy/ldm.git; + git = "https://github.com/LemonBoy/ldm.git"; in stdenv.mkDerivation rec { pname = "ldm"; diff --git a/pkgs/os-specific/linux/ledger-udev-rules/default.nix b/pkgs/os-specific/linux/ledger-udev-rules/default.nix index e61bac510e6..e85eb02f8c8 100644 --- a/pkgs/os-specific/linux/ledger-udev-rules/default.nix +++ b/pkgs/os-specific/linux/ledger-udev-rules/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { license = licenses.asl20; maintainers = with maintainers; [ asymmetric ]; platforms = platforms.linux; - homepage = https://github.com/LedgerHQ/udev-rules; + homepage = "https://github.com/LedgerHQ/udev-rules"; }; } diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 792568e8b57..63d446319d6 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; patches = [ (fetchpatch { - url = https://pagure.io/libaio/c/da47c32b2ff39e52fbed1622c34b86bc88d7c217.patch; + url = "https://pagure.io/libaio/c/da47c32b2ff39e52fbed1622c34b86bc88d7c217.patch"; sha256 = "1kqpiswjn549s3w3m89bw5qkl7bw5pvq6gp5cdzd926ymlgivj5c"; }) ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for asynchronous I/O in Linux"; - homepage = http://lse.sourceforge.net/io/aio.html; + homepage = "http://lse.sourceforge.net/io/aio.html"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/os-specific/linux/libatasmart/default.nix b/pkgs/os-specific/linux/libatasmart/default.nix index 018f8c62435..cf5fc54ed65 100644 --- a/pkgs/os-specific/linux/libatasmart/default.nix +++ b/pkgs/os-specific/linux/libatasmart/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ udev ]; meta = with stdenv.lib; { - homepage = http://0pointer.de/blog/projects/being-smart.html; + homepage = "http://0pointer.de/blog/projects/being-smart.html"; description = "Library for querying ATA SMART status"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix index 476c5931d4d..c9b061fe03b 100644 --- a/pkgs/os-specific/linux/libcap-ng/default.nix +++ b/pkgs/os-specific/linux/libcap-ng/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = let inherit (stdenv.lib) platforms licenses; in { description = "Library for working with POSIX capabilities"; - homepage = https://people.redhat.com/sgrubb/libcap-ng/; + homepage = "https://people.redhat.com/sgrubb/libcap-ng/"; platforms = platforms.linux; license = licenses.lgpl21; }; diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix index 61380115ab5..551352fa46c 100644 --- a/pkgs/os-specific/linux/libnl/default.nix +++ b/pkgs/os-specific/linux/libnl/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; - homepage = http://www.infradead.org/~tgr/libnl/; + homepage = "http://www.infradead.org/~tgr/libnl/"; description = "Linux Netlink interface library suite"; license = licenses.lgpl21; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/os-specific/linux/libratbag/default.nix b/pkgs/os-specific/linux/libratbag/default.nix index 63220846f0c..22763130aee 100644 --- a/pkgs/os-specific/linux/libratbag/default.nix +++ b/pkgs/os-specific/linux/libratbag/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configuration library for gaming mice"; - homepage = https://github.com/libratbag/libratbag; + homepage = "https://github.com/libratbag/libratbag"; license = licenses.mit; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index b31554d6cee..497961af11b 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SELinux binary policy manipulation library"; - homepage = http://userspace.selinuxproject.org; + homepage = "http://userspace.selinuxproject.org"; platforms = platforms.linux; maintainers = [ maintainers.phreedom ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/os-specific/linux/libsmbios/default.nix b/pkgs/os-specific/linux/libsmbios/default.nix index 81f5fe49d55..268588f53ab 100644 --- a/pkgs/os-specific/linux/libsmbios/default.nix +++ b/pkgs/os-specific/linux/libsmbios/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { preFixup = ''rm -rf "$(pwd)" ''; # Hack to avoid TMPDIR in RPATHs meta = with stdenv.lib; { - homepage = https://github.com/dell/libsmbios; + homepage = "https://github.com/dell/libsmbios"; description = "A library to obtain BIOS information"; license = with licenses; [ osl21 gpl2Plus ]; maintainers = with maintainers; [ ]; diff --git a/pkgs/os-specific/linux/libudev0-shim/default.nix b/pkgs/os-specific/linux/libudev0-shim/default.nix index ecdc658f2f1..2073f9f6f56 100644 --- a/pkgs/os-specific/linux/libudev0-shim/default.nix +++ b/pkgs/os-specific/linux/libudev0-shim/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Shim to preserve libudev.so.0 compatibility"; - homepage = https://github.com/archlinux/libudev0-shim; + homepage = "https://github.com/archlinux/libudev0-shim"; platforms = platforms.linux; license = licenses.lgpl21; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/libvolume_id/default.nix b/pkgs/os-specific/linux/libvolume_id/default.nix index 14c152dc10e..e54dee10c1d 100644 --- a/pkgs/os-specific/linux/libvolume_id/default.nix +++ b/pkgs/os-specific/linux/libvolume_id/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libvolume_id-0.81.1"; src = fetchurl { - url = https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2; + url = "https://www.marcuscom.com/downloads/libvolume_id-0.81.1.tar.bz2"; sha256 = "029z04vdxxsl8gycm9whcljhv6dy4b12ybsxdb99jr251gl1ifs5"; }; diff --git a/pkgs/os-specific/linux/light/default.nix b/pkgs/os-specific/linux/light/default.nix index e9ee69ca03e..45af4e7ae8e 100644 --- a/pkgs/os-specific/linux/light/default.nix +++ b/pkgs/os-specific/linux/light/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU/Linux application to control backlights"; - homepage = https://haikarainen.github.io/light/; + homepage = "https://haikarainen.github.io/light/"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ puffnfresh dtzWill ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/lightum/default.nix b/pkgs/os-specific/linux/lightum/default.nix index 3eaf4363195..3c37b66d231 100644 --- a/pkgs/os-specific/linux/lightum/default.nix +++ b/pkgs/os-specific/linux/lightum/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "lightum-2014-06-07"; src = fetchgit { - url = https://github.com/poliva/lightum; + url = "https://github.com/poliva/lightum"; rev = "123e6babe0669b23d4c1dfa5511088608ff2baa8"; sha256 = "01x24rcrkgksyvqpgkr9zafg3jgs8nqng8yf0hx0kbmcimar8dbp"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "MacBook automatic light sensor daemon"; - homepage = https://github.com/poliva/lightum; + homepage = "https://github.com/poliva/lightum"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/lksctp-tools/default.nix b/pkgs/os-specific/linux/lksctp-tools/default.nix index 6c644c9482a..bef74cd33ba 100644 --- a/pkgs/os-specific/linux/lksctp-tools/default.nix +++ b/pkgs/os-specific/linux/lksctp-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux Kernel Stream Control Transmission Protocol Tools."; - homepage = http://lksctp.sourceforge.net/; + homepage = "http://lksctp.sourceforge.net/"; license = with licenses; [ gpl2 lgpl21 ]; # library is lgpl21 platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/lsiutil/default.nix b/pkgs/os-specific/linux/lsiutil/default.nix index 63155e66678..da45e202c02 100644 --- a/pkgs/os-specific/linux/lsiutil/default.nix +++ b/pkgs/os-specific/linux/lsiutil/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { installPhase = "true"; meta = { - homepage = http://www.lsi.com/; + homepage = "http://www.lsi.com/"; description = "LSI Logic Fusion MPT command line management tool"; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 46c8dec8889..30d4a29b166 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux kernel modules for LTTng tracing"; - homepage = https://lttng.org/; + homepage = "https://lttng.org/"; license = with licenses; [ lgpl21 gpl2 mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 7eac8fad64c..c7925bae558 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://sourceware.org/lvm2/; + homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = platforms.linux; license = with licenses; [ gpl2 bsd2 lgpl21 ]; diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 741d4ab1482..d8aff40eefd 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "1x63nbfsicqxckq62ga3k0g8fm4qgcpn45ianj6m7rvw4lnaxwxk"; + sha256 = "178kqjz0n5nnjw0z8ac5lbfpqprna9xfd9ckakp34zq9vz0smfvh"; }; nativeBuildInputs = [ @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://linuxcontainers.org/; + homepage = "https://linuxcontainers.org/"; description = "Userspace tools for Linux Containers, a lightweight virtualization system"; license = licenses.lgpl21Plus; diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 15a3fa5f04f..65615f5c240 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-4.0.0"; + name = "lxcfs-4.0.1"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "0p9fl7zya65wsxg2vabdc0jrhw6mdz081cacd7np4zrppv16v6dx"; + sha256 = "09y26ln2wxpi809kd3r352my64aal0yz2a5kin0i25gnvivl32cs"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1f1c4b4d7c1..29d2a3914a2 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "A utility for viewing/manipulating the MAC address of network interfaces"; maintainers = with maintainers; [ joachifm ma27 ]; license = licenses.gpl2Plus; - homepage = https://www.gnu.org/software/macchanger; + homepage = "https://www.gnu.org/software/macchanger"; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 7c72c8a2dbf..f48a3dbb62f 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MacBook Air 6,1 and 6,2 (mid 2013) backlight driver"; - homepage = https://github.com/patjak/mba6x_bl; + homepage = "https://github.com/patjak/mba6x_bl"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.simonvandel ]; diff --git a/pkgs/os-specific/linux/mbpfan/default.nix b/pkgs/os-specific/linux/mbpfan/default.nix index 4e2e31606c5..675d9417a01 100644 --- a/pkgs/os-specific/linux/mbpfan/default.nix +++ b/pkgs/os-specific/linux/mbpfan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Daemon that uses input from coretemp module and sets the fan speed using the applesmc module"; - homepage = https://github.com/dgraziotin/mbpfan; + homepage = "https://github.com/dgraziotin/mbpfan"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix index c5b94d2d0c5..c224595a984 100644 --- a/pkgs/os-specific/linux/mcelog/default.nix +++ b/pkgs/os-specific/linux/mcelog/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { including bad page offlining and automatic cache error handling. All errors are logged to /var/log/mcelog or syslog or the journal. ''; - homepage = http://mcelog.org/; + homepage = "http://mcelog.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 8638ac9f798..6a71196157b 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programs for managing RAID arrays under Linux"; - homepage = http://neil.brown.name/blog/mdadm; + homepage = "http://neil.brown.name/blog/mdadm"; license = licenses.gpl2; maintainers = with maintainers; [ ekleog ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index 1a24ae3b9a2..a1a37db9dd6 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "AMD Processor microcode patch"; - homepage = http://www.amd64.org/support/microcode.html; + homepage = "http://www.amd64.org/support/microcode.html"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 70b2580b664..4bf1c02d2df 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.intel.com/; + homepage = "http://www.intel.com/"; description = "Microcode for Intel processors"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/microcode/iucode-tool.nix b/pkgs/os-specific/linux/microcode/iucode-tool.nix index c81a0c9097a..65cb01c84a5 100644 --- a/pkgs/os-specific/linux/microcode/iucode-tool.nix +++ b/pkgs/os-specific/linux/microcode/iucode-tool.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Intel® 64 and IA-32 processor microcode tool"; - homepage = https://gitlab.com/iucode-tool/iucode-tool; + homepage = "https://gitlab.com/iucode-tool/iucode-tool"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix index a29a0373424..775910d30d6 100644 --- a/pkgs/os-specific/linux/mingetty/default.nix +++ b/pkgs/os-specific/linux/mingetty/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "mingetty-1.08"; src = fetchurl { - url = mirror://sourceforge/mingetty/mingetty-1.08.tar.gz; + url = "mirror://sourceforge/mingetty/mingetty-1.08.tar.gz"; sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/mingetty; + homepage = "https://sourceforge.net/projects/mingetty"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/miraclecast/default.nix b/pkgs/os-specific/linux/miraclecast/default.nix index 6b67401b9b2..d04695ef619 100644 --- a/pkgs/os-specific/linux/miraclecast/default.nix +++ b/pkgs/os-specific/linux/miraclecast/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Connect external monitors via Wi-Fi"; - homepage = https://github.com/albfan/miraclecast; + homepage = "https://github.com/albfan/miraclecast"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix index 1b5925a5581..8a20a2f733a 100644 --- a/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix +++ b/pkgs/os-specific/linux/mkinitcpio-nfs-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://archlinux.org/; + homepage = "https://archlinux.org/"; description = "ipconfig and nfsmount tools for root on NFS, ported from klibc"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix index 16c73377cb4..61ad327c394 100644 --- a/pkgs/os-specific/linux/mmc-utils/default.nix +++ b/pkgs/os-specific/linux/mmc-utils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Configure MMC storage devices from userspace"; - homepage = http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/; + homepage = "http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/molly-guard/default.nix b/pkgs/os-specific/linux/molly-guard/default.nix index 9b412d9d7ed..c9bdff9de3e 100644 --- a/pkgs/os-specific/linux/molly-guard/default.nix +++ b/pkgs/os-specific/linux/molly-guard/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Attempts to prevent you from accidentally shutting down or rebooting machines"; - homepage = https://salsa.debian.org/debian/molly-guard; + homepage = "https://salsa.debian.org/debian/molly-guard"; license = licenses.artistic2; platforms = platforms.linux; maintainers = with maintainers; [ DerTim1 ]; diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix index 9a76e5873d4..7e5ce115db4 100644 --- a/pkgs/os-specific/linux/multipath-tools/default.nix +++ b/pkgs/os-specific/linux/multipath-tools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for the Linux multipathing driver"; - homepage = http://christophe.varoqui.free.fr/; + homepage = "http://christophe.varoqui.free.fr/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index 93e9ba614f8..d31a75fbba0 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { patches = [ # Minor touchup to build system making dynamic linker symlink relative (fetchurl { - url = https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch; + url = "https://raw.githubusercontent.com/openwrt/openwrt/87606e25afac6776d1bbc67ed284434ec5a832b4/toolchain/musl/patches/300-relative.patch"; sha256 = "0hfadrycb60sm6hb6by4ycgaqc9sgrhh42k39v8xpmcvdzxrsq2n"; }) ]; diff --git a/pkgs/os-specific/linux/mwprocapture/default.nix b/pkgs/os-specific/linux/mwprocapture/default.nix index 9490bc91181..acb4676a3f5 100644 --- a/pkgs/os-specific/linux/mwprocapture/default.nix +++ b/pkgs/os-specific/linux/mwprocapture/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.magewell.com/; + homepage = "http://www.magewell.com/"; description = "Linux driver for the Magewell Pro Capture family"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ MP2E ]; diff --git a/pkgs/os-specific/linux/mxu11x0/default.nix b/pkgs/os-specific/linux/mxu11x0/default.nix index 76e60ec80ff..ab0b927f1bd 100644 --- a/pkgs/os-specific/linux/mxu11x0/default.nix +++ b/pkgs/os-specific/linux/mxu11x0/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MOXA UPort 11x0 USB to Serial Hub driver"; - homepage = https://www.moxa.com/en/products/industrial-edge-connectivity/usb-to-serial-converters-usb-hubs/usb-to-serial-converters/uport-1000-series; + homepage = "https://www.moxa.com/en/products/industrial-edge-connectivity/usb-to-serial-converters-usb-hubs/usb-to-serial-converters/uport-1000-series"; license = licenses.gpl2Plus; maintainers = with maintainers; [ uralbash ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/ndiswrapper/default.nix b/pkgs/os-specific/linux/ndiswrapper/default.nix index bdb52c0c091..34c77bc3e6a 100644 --- a/pkgs/os-specific/linux/ndiswrapper/default.nix +++ b/pkgs/os-specific/linux/ndiswrapper/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = { description = "Ndis driver wrapper for the Linux kernel"; - homepage = https://sourceforge.net/projects/ndiswrapper; + homepage = "https://sourceforge.net/projects/ndiswrapper"; license = "GPL"; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/os-specific/linux/net-tools/default.nix b/pkgs/os-specific/linux/net-tools/default.nix index 3cd8f224ce4..9095b652b42 100644 --- a/pkgs/os-specific/linux/net-tools/default.nix +++ b/pkgs/os-specific/linux/net-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "net-tools"; - version = "1.60_p20170221182432"; + version = "1.60_p20180626073013"; src = fetchurl { url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz"; - sha256 = "08r4r2a24g5bm8jwgfa998gs1fld7fgbdf7pilrpsw1m974xn04a"; + sha256 = "0mzsjjmz5kn676w2glmxwwd8bj0xy9dhhn21aplb435b767045q4"; }; preBuild = @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://net-tools.sourceforge.net/; + 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; diff --git a/pkgs/os-specific/linux/net-tools/mptcp.nix b/pkgs/os-specific/linux/net-tools/mptcp.nix index 700bc5cb7f1..6e798e6807d 100644 --- a/pkgs/os-specific/linux/net-tools/mptcp.nix +++ b/pkgs/os-specific/linux/net-tools/mptcp.nix @@ -12,7 +12,7 @@ nettools.overrideAttrs(oa: rec { }; meta = with stdenv.lib; { - homepage = https://github.com/multipath-tcp/net-tools; + homepage = "https://github.com/multipath-tcp/net-tools"; description = "A set of tools for controlling the network subsystem in Linux"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/netatop/default.nix b/pkgs/os-specific/linux/netatop/default.nix index 718cf4815ba..93bb1316d20 100644 --- a/pkgs/os-specific/linux/netatop/default.nix +++ b/pkgs/os-specific/linux/netatop/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Network monitoring module for atop"; - homepage = https://www.atoptool.nl/downloadnetatop.php; + homepage = "https://www.atoptool.nl/downloadnetatop.php"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index 74363be47f4..719ded4d70f 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, fetchpatch, lib, pkgconfig, utillinux, libcap, libtirpc, libevent , sqlite, kerberos, kmod, libuuid, keyutils, lvm2, systemd, coreutils, tcp_wrappers , python3, buildPackages, nixosTests +, enablePython ? true }: let @@ -25,8 +26,7 @@ stdenv.mkDerivation rec { buildInputs = [ libtirpc libcap libevent sqlite lvm2 libuuid keyutils kerberos tcp_wrappers - python3 - ]; + ] ++ lib.optional enablePython python3; enableParallelBuilding = true; @@ -96,6 +96,9 @@ stdenv.mkDerivation rec { -e "s,/sbin/modprobe,${kmod}/bin/modprobe,g" \ -e "s,/usr/sbin,$out/bin,g" \ $out/etc/systemd/system/* + '' + lib.optionalString (!enablePython) '' + # Remove all scripts that require python (currently mountstats and nfsiostat) + grep -l /usr/bin/python $out/bin/* | xargs -I {} rm -v {} ''; # One test fails on mips. @@ -120,7 +123,7 @@ stdenv.mkDerivation rec { daemons. ''; - homepage = https://linux-nfs.org/; + homepage = "https://linux-nfs.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix index c23eb19a482..74369060ba9 100644 --- a/pkgs/os-specific/linux/nss_ldap/default.nix +++ b/pkgs/os-specific/linux/nss_ldap/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "nss_ldap-265"; src = fetchurl { - url = http://www.padl.com/download/nss_ldap-265.tar.gz; + url = "http://www.padl.com/download/nss_ldap-265.tar.gz"; sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp"; }; diff --git a/pkgs/os-specific/linux/numactl/default.nix b/pkgs/os-specific/linux/numactl/default.nix index f2188ee37cb..8505fbc750f 100644 --- a/pkgs/os-specific/linux/numactl/default.nix +++ b/pkgs/os-specific/linux/numactl/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library and tools for non-uniform memory access (NUMA) machines"; - homepage = https://github.com/numactl/numactl; + homepage = "https://github.com/numactl/numactl"; license = with licenses; [ gpl2 lgpl21 ]; # libnuma is lgpl21 platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; diff --git a/pkgs/os-specific/linux/numad/default.nix b/pkgs/os-specific/linux/numad/default.nix index 0d5dd118798..47af20152db 100644 --- a/pkgs/os-specific/linux/numad/default.nix +++ b/pkgs/os-specific/linux/numad/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A user-level daemon that monitors NUMA topology and processes resource consumption to facilitate good NUMA resource access"; - homepage = https://fedoraproject.org/wiki/Features/numad; + homepage = "https://fedoraproject.org/wiki/Features/numad"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = with maintainers; [ domenkozar ]; diff --git a/pkgs/os-specific/linux/numatop/default.nix b/pkgs/os-specific/linux/numatop/default.nix index 80f14b568ed..57ee511bbad 100644 --- a/pkgs/os-specific/linux/numatop/default.nix +++ b/pkgs/os-specific/linux/numatop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for runtime memory locality characterization and analysis of processes and threads on a NUMA system"; - homepage = https://01.org/numatop; + homepage = "https://01.org/numatop"; license = licenses.bsd3; maintainers = with maintainers; [ dtzWill ]; platforms = [ diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 9a9c48a7908..e195bf587ee 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,4 +1,4 @@ -{ lib, callPackage, fetchurl, stdenv }: +{ lib, callPackage, fetchpatch, fetchurl, stdenv }: let @@ -22,10 +22,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 = "440.59"; - sha256_64bit = "162gq6w44l8sgnn4qnl2rdlx8c008p04zv4c3i1ps20p21n1mjv1"; - settingsSha256 = "0vxhmirqzyav5ljf0f04yk0az48ir5v0817dq9z9kyqfdvnby93g"; - persistencedSha256 = "0npjh7nashasydp8q6bbcp21w8fc1dycgjy50ics775hjnvm61qn"; + version = "440.82"; + sha256_64bit = "13km9800skyraa0s312fc4hwyw5pzb0jfkrv1yg6anppyan1bm7d"; + settingsSha256 = "15psxvd65wi6hmxmd2vvsp2v0m07axw613hb355nh15r1dpkr3ma"; + persistencedSha256 = "13izz9p2kg9g38gf57g3s2sw7wshp1i9m5pzljh9v82c4c22x1fw"; } else legacy_390; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index 9e2ee6e834c..1d73ab8171a 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -89,7 +89,7 @@ let }; meta = with stdenv.lib; { - homepage = https://www.nvidia.com/object/unix.html; + homepage = "https://www.nvidia.com/object/unix.html"; description = "X.org driver and kernel module for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index 4f8a0b68664..de36ad06c60 100644 --- a/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.nvidia.com/object/unix.html; + homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index 533a74fcffd..b1250e56ee0 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation { }; meta = with stdenv.lib; { - homepage = https://www.nvidia.com/object/unix.html; + homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; license = licenses.unfreeRedistributable; platforms = nvidia_x11.meta.platforms; diff --git a/pkgs/os-specific/linux/nvidiabl/default.nix b/pkgs/os-specific/linux/nvidiabl/default.nix index 02161f7133c..08af09d3d05 100644 --- a/pkgs/os-specific/linux/nvidiabl/default.nix +++ b/pkgs/os-specific/linux/nvidiabl/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Linux driver for setting the backlight brightness on laptops using NVIDIA GPU"; - homepage = https://github.com/guillaumezin/nvidiabl; + homepage = "https://github.com/guillaumezin/nvidiabl"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ yorickvp ]; diff --git a/pkgs/os-specific/linux/odp-dpdk/default.nix b/pkgs/os-specific/linux/odp-dpdk/default.nix index e1acda12025..39bb2f3e411 100644 --- a/pkgs/os-specific/linux/odp-dpdk/default.nix +++ b/pkgs/os-specific/linux/odp-dpdk/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open Data Plane optimized for DPDK"; - homepage = https://www.opendataplane.org; + homepage = "https://www.opendataplane.org"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.abuibrahim ]; diff --git a/pkgs/os-specific/linux/ofp/default.nix b/pkgs/os-specific/linux/ofp/default.nix index 855754a6bc1..7467f7d8713 100644 --- a/pkgs/os-specific/linux/ofp/default.nix +++ b/pkgs/os-specific/linux/ofp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High performance TCP/IP stack"; - homepage = http://www.openfastpath.org; + homepage = "http://www.openfastpath.org"; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.abuibrahim ]; diff --git a/pkgs/os-specific/linux/open-isns/default.nix b/pkgs/os-specific/linux/open-isns/default.nix index 6a0273afbdd..1617696e00e 100644 --- a/pkgs/os-specific/linux/open-isns/default.nix +++ b/pkgs/os-specific/linux/open-isns/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "iSNS server and client for Linux"; license = stdenv.lib.licenses.lgpl21; - homepage = https://github.com/gonzoleeman/open-isns; + homepage = "https://github.com/gonzoleeman/open-isns"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index 4f3f4c5c172..358a8b39917 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { support distribution across multiple physical servers similar to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. ''; - homepage = https://www.openvswitch.org/; + homepage = "https://www.openvswitch.org/"; license = licenses.asl20; maintainers = with maintainers; [ netixx kmcopper ]; }; diff --git a/pkgs/os-specific/linux/otpw/default.nix b/pkgs/os-specific/linux/otpw/default.nix index a0464e1996a..c9597ab0fe4 100644 --- a/pkgs/os-specific/linux/otpw/default.nix +++ b/pkgs/os-specific/linux/otpw/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "stackprotector" ]; meta = { - homepage = http://www.cl.cam.ac.uk/~mgk25/otpw.html; + 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; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index e4429cc3bd7..2e44a887d69 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with stdenv.lib; { - homepage = http://www.linux-pam.org/; + homepage = "http://www.linux-pam.org/"; description = "Pluggable Authentication Modules, a flexible mechanism for authenticating user"; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/os-specific/linux/pam_ccreds/default.nix b/pkgs/os-specific/linux/pam_ccreds/default.nix index 012750c22ad..c4abfe5c44c 100644 --- a/pkgs/os-specific/linux/pam_ccreds/default.nix +++ b/pkgs/os-specific/linux/pam_ccreds/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam openssl db ]; meta = with stdenv.lib; { - homepage = https://www.padl.com/OSS/pam_ccreds.html; + homepage = "https://www.padl.com/OSS/pam_ccreds.html"; description = "PAM module to locally authenticate using an enterprise identity when the network is unavailable"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix index 3b23c286e19..1f7562b987e 100644 --- a/pkgs/os-specific/linux/pam_krb5/default.nix +++ b/pkgs/os-specific/linux/pam_krb5/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam kerberos ]; meta = with stdenv.lib; { - homepage = https://www.eyrie.org/~eagle/software/pam-krb5/; + homepage = "https://www.eyrie.org/~eagle/software/pam-krb5/"; description = "PAM module allowing PAM-aware applications to authenticate users by performing an AS exchange with a Kerberos KDC"; longDescription = '' pam_krb5 can optionally convert Kerberos 5 credentials to Kerberos IV diff --git a/pkgs/os-specific/linux/pam_ldap/default.nix b/pkgs/os-specific/linux/pam_ldap/default.nix index 2b3a300ecca..e327a551b23 100644 --- a/pkgs/os-specific/linux/pam_ldap/default.nix +++ b/pkgs/os-specific/linux/pam_ldap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ pam openldap ]; meta = { - homepage = https://www.padl.com/OSS/pam_ldap.html; + homepage = "https://www.padl.com/OSS/pam_ldap.html"; description = "LDAP backend for PAM"; longDescription = '' The pam_ldap module provides the means for Solaris and Linux servers and diff --git a/pkgs/os-specific/linux/pam_mount/default.nix b/pkgs/os-specific/linux/pam_mount/default.nix index 4bda93baddc..18bc84effa0 100644 --- a/pkgs/os-specific/linux/pam_mount/default.nix +++ b/pkgs/os-specific/linux/pam_mount/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pam-mount.sourceforge.net/; + homepage = "http://pam-mount.sourceforge.net/"; description = "PAM module to mount volumes for a user session"; maintainers = [ maintainers.tstrobel ]; license = with licenses; [ gpl2 gpl3 lgpl21 lgpl3 ]; diff --git a/pkgs/os-specific/linux/pam_pgsql/default.nix b/pkgs/os-specific/linux/pam_pgsql/default.nix index a1c91516ce0..6aa1c3be1e2 100644 --- a/pkgs/os-specific/linux/pam_pgsql/default.nix +++ b/pkgs/os-specific/linux/pam_pgsql/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Support to authenticate against PostgreSQL for PAM-enabled appliations"; - homepage = https://github.com/pam-pgsql/pam-pgsql; + homepage = "https://github.com/pam-pgsql/pam-pgsql"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; 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 b47ad4815b5..3ab1ae28a7b 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://pamsshagentauth.sourceforge.net/; + homepage = "http://pamsshagentauth.sourceforge.net/"; description = "PAM module for authentication through the SSH agent"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 6e9ab379dbc..30acb86d860 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/pam-u2f/; + homepage = "https://developers.yubico.com/pam-u2f/"; description = "A PAM module for allowing authentication with a U2F device"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index 9b915725514..3e01b1bd455 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://pamusb.org/; + homepage = "http://pamusb.org/"; description = "Authentication using USB Flash Drives"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/pcm/default.nix b/pkgs/os-specific/linux/pcm/default.nix index c00bd67f95c..cc5c2efd46e 100644 --- a/pkgs/os-specific/linux/pcm/default.nix +++ b/pkgs/os-specific/linux/pcm/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "201902"; + version = "202003"; pname = "pcm"; src = fetchFromGitHub { owner = "opcm"; repo = "pcm"; rev = version; - sha256 = "15kh5ry2w1zj2mbg98hlayw8g53jy79q2ixj2wm48g8vagamv77z"; + sha256 = "1f83dhzrzgcyv5j5xxibvywvpg8sgf1g72f5x40cdb4149nwbfra"; }; installPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Processor counter monitor"; - homepage = https://www.intel.com/software/pcm; + homepage = "https://www.intel.com/software/pcm"; license = licenses.bsd3; maintainers = with maintainers; [ roosemberth ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/pcmciautils/default.nix b/pkgs/os-specific/linux/pcmciautils/default.nix index 75c32577a00..820ef7f9612 100644 --- a/pkgs/os-specific/linux/pcmciautils/default.nix +++ b/pkgs/os-specific/linux/pcmciautils/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { '') firmware; meta = { - homepage = https://www.kernel.org/pub/linux/utils/kernel/pcmcia/; + homepage = "https://www.kernel.org/pub/linux/utils/kernel/pcmcia/"; longDescription = " PCMCIAutils contains the initialization tools necessary to allow the PCMCIA subsystem to behave (almost) as every other diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index ef8e8c7b34a..1a18c6ea272 100644 --- a/pkgs/os-specific/linux/perf-tools/default.nix +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { platforms = platforms.linux; - homepage = https://github.com/brendangregg/perf-tools; + homepage = "https://github.com/brendangregg/perf-tools"; description = "Performance analysis tools based on Linux perf_events (aka perf) and ftrace"; maintainers = [ maintainers.eelco ]; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index 75fce129e93..2d5d149292c 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation rec { while noticably reducing fan noise. This driver works only on supported Intel architectures. ''; - homepage = http://www.linux-phc.org/; + homepage = "http://www.linux-phc.org/"; downloadPage = "http://www.linux-phc.org/forum/viewtopic.php?f=7&t=267"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 4eb1b2c8c14..f097f3e5465 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK frontend for ratbagd mouse config daemon"; - homepage = https://github.com/libratbag/piper; + homepage = "https://github.com/libratbag/piper"; license = licenses.gpl2; maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pipework/default.nix b/pkgs/os-specific/linux/pipework/default.nix index 044f75cbd6f..14d1eb85998 100644 --- a/pkgs/os-specific/linux/pipework/default.nix +++ b/pkgs/os-specific/linux/pipework/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with lib; { description = "Software-Defined Networking tools for LXC"; - homepage = https://github.com/jpetazzo/pipework; + homepage = "https://github.com/jpetazzo/pipework"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 3312f230247..41db6e93661 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Traffic generator powered by DPDK"; - homepage = http://dpdk.org/; + homepage = "http://dpdk.org/"; license = licenses.bsdOriginal; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.abuibrahim ]; diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix index 42739e53fda..1d98cfb0cd1 100644 --- a/pkgs/os-specific/linux/ply/default.nix +++ b/pkgs/os-specific/linux/ply/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "dynamic Tracing in Linux"; - homepage = https://wkz.github.io/ply/; + homepage = "https://wkz.github.io/ply/"; license = [ licenses.gpl2 ]; maintainers = with maintainers; [ mic92 mbbx6spp ]; }; diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index b074c6d7244..b4c4909cac5 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -26,37 +26,35 @@ stdenv.mkDerivation rec { -e "s#plymouththemedir=.*#plymouththemedir=/etc/plymouth/themes#" \ -e "s#plymouthpolicydir=.*#plymouthpolicydir=/etc/plymouth/#" \ configure.ac + ''; - configureFlags=" - --prefix=$out - --bindir=$out/bin - --sbindir=$out/sbin - --exec-prefix=$out - --libdir=$out/lib - --libexecdir=$out/lib - --sysconfdir=/etc - --with-systemdunitdir=$out/etc/systemd/system - --localstatedir=/var - --with-logo=/etc/plymouth/logo.png - --with-background-color=0x000000 - --with-background-start-color-stop=0x000000 - --with-background-end-color-stop=0x000000 - --with-release-file=/etc/os-release - --without-system-root-install - --without-rhgb-compat-link - --enable-tracing - --enable-systemd-integration - --enable-pango - --enable-gdm-transition - --enable-gtk" + configureFlags = [ + "--sysconfdir=/etc" + "--with-systemdunitdir=${placeholder "out"}/etc/systemd/system" + "--localstatedir=/var" + "--with-logo=/etc/plymouth/logo.png" + "--with-background-color=0x000000" + "--with-background-start-color-stop=0x000000" + "--with-background-end-color-stop=0x000000" + "--with-release-file=/etc/os-release" + "--without-system-root-install" + "--without-rhgb-compat-link" + "--enable-tracing" + "--enable-systemd-integration" + "--enable-pango" + "--enable-gdm-transition" + "--enable-gtk" + ]; - installFlags=" - plymouthd_defaultsdir=$out/share/plymouth - plymouthd_confdir=$out/etc/plymouth" - ''; + configurePlatforms = [ "host" ]; + + installFlags = [ + "plymouthd_defaultsdir=$(out)/share/plymouth" + "plymouthd_confdir=$(out)/etc/plymouth" + ]; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/Plymouth; + homepage = "http://www.freedesktop.org/wiki/Software/Plymouth"; description = "A graphical boot animation"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index b314e8db837..1d8314923d3 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://pm-utils.freedesktop.org/wiki/; + 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; diff --git a/pkgs/os-specific/linux/pmount/default.nix b/pkgs/os-specific/linux/pmount/default.nix index 0981a0b5a4b..63d0c88c1f8 100644 --- a/pkgs/os-specific/linux/pmount/default.nix +++ b/pkgs/os-specific/linux/pmount/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 1 out of 1 tests with "Error: could not open fstab-type file: No such file or directory" meta = { - homepage = https://bazaar.launchpad.net/~fourmond/pmount/main/files; + 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; diff --git a/pkgs/os-specific/linux/pommed-light/default.nix b/pkgs/os-specific/linux/pommed-light/default.nix index 06ea49034a0..31697823e52 100644 --- a/pkgs/os-specific/linux/pommed-light/default.nix +++ b/pkgs/os-specific/linux/pommed-light/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ambient light sensor support removed, optimized for use with dwm and the like. ''; - homepage = https://github.com/bytbox/pommed-light; + homepage = "https://github.com/bytbox/pommed-light"; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 691b216073f..d57b511af34 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Analyze power consumption on Intel-based laptops"; - homepage = https://01.org/powertop; + homepage = "https://01.org/powertop"; license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix index f50bfcec781..fd5225c5cfe 100644 --- a/pkgs/os-specific/linux/pps-tools/default.nix +++ b/pkgs/os-specific/linux/pps-tools/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib;{ description = "User-space tools for LinuxPPS"; - homepage = http://linuxpps.org/; + homepage = "http://linuxpps.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ sorki ]; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 09e4cbc438b..e71dcb497a2 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Parallels Tools for Linux guests"; - homepage = https://parallels.com; + homepage = "https://parallels.com"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.unfree; # I was making this package blindly and requesting testing from the real user, diff --git a/pkgs/os-specific/linux/procdump/default.nix b/pkgs/os-specific/linux/procdump/default.nix index d24f665cc7c..74ee1533e46 100644 --- a/pkgs/os-specific/linux/procdump/default.nix +++ b/pkgs/os-specific/linux/procdump/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "procdump"; - version = "1.1"; + version = "1.1.1"; src = fetchFromGitHub { owner = "Microsoft"; repo = "ProcDump-for-Linux"; rev = version; - sha256 = "1pcf6cpslpazla0na0q680dih9wb811q5irr7d2zmw0qmxm33jw2"; + sha256 = "0h5fhk39d10kjbinzw1yp6nr8w8l300mn9qxrkpivdkyfn6bpq2f"; }; nativeBuildInputs = [ zlib ]; diff --git a/pkgs/os-specific/linux/procps-ng/default.nix b/pkgs/os-specific/linux/procps-ng/default.nix index 62a6b645c2c..466e66a8713 100644 --- a/pkgs/os-specific/linux/procps-ng/default.nix +++ b/pkgs/os-specific/linux/procps-ng/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { '' else null; meta = { - homepage = https://gitlab.com/procps-ng/procps; + homepage = "https://gitlab.com/procps-ng/procps"; description = "Utilities that give information about processes using the /proc filesystem"; priority = 11; # less than coreutils, which also provides "kill" and "uptime" license = lib.licenses.gpl2; diff --git a/pkgs/os-specific/linux/pscircle/default.nix b/pkgs/os-specific/linux/pscircle/default.nix index f8eb8c0a969..9dd4ba6cd37 100644 --- a/pkgs/os-specific/linux/pscircle/default.nix +++ b/pkgs/os-specific/linux/pscircle/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://gitlab.com/mildlyparallel/pscircle; + homepage = "https://gitlab.com/mildlyparallel/pscircle"; description = "Visualize Linux processes in a form of a radial tree"; license = licenses.gpl2; maintainers = [ maintainers.ldesgoui ]; diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 999df37706d..4379ee3ae49 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gitlab.com/psmisc/psmisc; + homepage = "https://gitlab.com/psmisc/psmisc"; description = "A set of small useful utilities that use the proc filesystem (such as fuser, killall and pstree)"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix index c013a0107ea..3d26914d4f9 100644 --- a/pkgs/os-specific/linux/radeontop/default.nix +++ b/pkgs/os-specific/linux/radeontop/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { is also valid for OpenCL loads; the other blocks are only useful for GL loads. Requires root rights or other permissions to read /dev/mem. ''; - homepage = https://github.com/clbr/radeontop; + homepage = "https://github.com/clbr/radeontop"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ rycee ]; diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index b16b230ce27..2d929707859 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "27.0"; + version = "28.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "04mhcrcmbwxcjhswlkhnr6m5nl2389jgjv6aqhd4v0x555cwnfvw"; + sha256 = "0az2is6p5gkyphi2b978kwn7knry60y33kn6p7cxz49ca79a42cy"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; @@ -26,11 +26,6 @@ in stdenv.mkDerivation { ]; postPatch = '' - substituteInPlace providers/rxe/rxe_cfg.in \ - --replace ethtool "${ethtool}/bin/ethtool" \ - --replace 'ip addr' "${iproute}/bin/ip addr" \ - --replace 'ip link' "${iproute}/bin/ip link" - substituteInPlace srp_daemon/srp_daemon.sh.in \ --replace /bin/rm rm ''; @@ -50,7 +45,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "RDMA Core Userspace Libraries and Daemons"; - homepage = https://github.com/linux-rdma/rdma-core; + homepage = "https://github.com/linux-rdma/rdma-core"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ markuskowa ]; diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix index 815005ae290..36020d831ac 100644 --- a/pkgs/os-specific/linux/read-edid/default.nix +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for reading and parsing EDID data from monitors"; - homepage = http://www.polypux.org/projects/read-edid/; + homepage = "http://www.polypux.org/projects/read-edid/"; license = licenses.bsd2; # Quoted: "This is an unofficial license. Let's call it BSD-like." maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/regionset/default.nix b/pkgs/os-specific/linux/regionset/default.nix index 3cb964f364d..15030d1b19a 100644 --- a/pkgs/os-specific/linux/regionset/default.nix +++ b/pkgs/os-specific/linux/regionset/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { inherit version; - homepage = http://linvdr.org/projects/regionset/; + homepage = "http://linvdr.org/projects/regionset/"; description = "Tool for changing the region code setting of DVD players"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/reptyr/default.nix b/pkgs/os-specific/linux/reptyr/default.nix index 1635dc064be..0e635583d64 100644 --- a/pkgs/os-specific/linux/reptyr/default.nix +++ b/pkgs/os-specific/linux/reptyr/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [raskin]; license = lib.licenses.mit; description = "Reparent a running program to a new terminal"; - homepage = https://github.com/nelhage/reptyr; + homepage = "https://github.com/nelhage/reptyr"; }; } diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix index 710eba642cb..a852e43b38f 100644 --- a/pkgs/os-specific/linux/rewritefs/default.nix +++ b/pkgs/os-specific/linux/rewritefs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = ''A FUSE filesystem intended to be used like Apache mod_rewrite''; - homepage = https://github.com/sloonz/rewritefs; + homepage = "https://github.com/sloonz/rewritefs"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix index 80b5ce01243..10d46a84821 100644 --- a/pkgs/os-specific/linux/rfkill/default.nix +++ b/pkgs/os-specific/linux/rfkill/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://wireless.kernel.org/en/users/Documentation/rfkill; + homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; description = "A tool to query, enable and disable wireless devices"; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/os-specific/linux/rfkill/udev.nix b/pkgs/os-specific/linux/rfkill/udev.nix index 0575c46e28e..3ee112126ac 100644 --- a/pkgs/os-specific/linux/rfkill/udev.nix +++ b/pkgs/os-specific/linux/rfkill/udev.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = http://wireless.kernel.org/en/users/Documentation/rfkill; + homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; description = "Rules+hook for udev to catch rfkill state changes"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/roccat-tools/default.nix b/pkgs/os-specific/linux/roccat-tools/default.nix index 1f5b31d0deb..5c4848980a9 100644 --- a/pkgs/os-specific/linux/roccat-tools/default.nix +++ b/pkgs/os-specific/linux/roccat-tools/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools to configure ROCCAT devices"; - homepage = http://roccat.sourceforge.net/; + homepage = "http://roccat.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index 4ad454437f5..1b1e99e752b 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lrt"; meta = with stdenv.lib; { - homepage = http://0pointer.de/blog/projects/rtkit; + homepage = "http://0pointer.de/blog/projects/rtkit"; description = "A daemon that hands out real-time priority to processes"; license = with licenses; [ gpl3 bsd0 ]; # lib is bsd license platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/rtl8192eu/default.nix b/pkgs/os-specific/linux/rtl8192eu/default.nix index f24921c7ce6..909a972efa3 100644 --- a/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "Realtek rtl8192eu driver"; - homepage = https://github.com/Mange/rtl8192eu-linux-driver; + homepage = "https://github.com/Mange/rtl8192eu-linux-driver"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.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 f468196dc73..323d6a82073 100644 --- a/pkgs/os-specific/linux/rtl8723bs/default.nix +++ b/pkgs/os-specific/linux/rtl8723bs/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "Realtek SDIO Wi-Fi driver"; - homepage = https://github.com/hadess/rtl8723bs; + homepage = "https://github.com/hadess/rtl8723bs"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; broken = (! versionOlder kernel.version "4.12"); # Now in kernel staging drivers diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index edec5932e7f..99afd575eee 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = https://github.com/zebulon2/rtl8812au-driver-5.2.20; + homepage = "https://github.com/zebulon2/rtl8812au-driver-5.2.20"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ danielfullmer ]; diff --git a/pkgs/os-specific/linux/rtl8814au/default.nix b/pkgs/os-specific/linux/rtl8814au/default.nix index c54d4577342..99d22e2f999 100644 --- a/pkgs/os-specific/linux/rtl8814au/default.nix +++ b/pkgs/os-specific/linux/rtl8814au/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Realtek 8814AU USB WiFi driver"; - homepage = https://github.com/zebulon2/rtl8814au; + homepage = "https://github.com/zebulon2/rtl8814au"; license = licenses.gpl2; maintainers = [ maintainers.lassulus ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/os-specific/linux/rtl8821au/default.nix b/pkgs/os-specific/linux/rtl8821au/default.nix index 1829bd6763f..f3d68cf7919 100644 --- a/pkgs/os-specific/linux/rtl8821au/default.nix +++ b/pkgs/os-specific/linux/rtl8821au/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "rtl8821AU, rtl8812AU and rtl8811AU chipset driver with firmware"; - homepage = https://github.com/zebulon2/rtl8812au; + homepage = "https://github.com/zebulon2/rtl8812au"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ plchldr ]; diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix index 200e66cb4d8..74bf913df98 100644 --- a/pkgs/os-specific/linux/s6-linux-utils/default.nix +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-linux-utils"; - version = "2.5.1.1"; - sha256 = "00nw2phd9prgv29hzqzwjnh4y0ivkzhx3srn6n1rlyr4ydhikxi5"; + version = "2.5.1.2"; + sha256 = "0w4jms9qyb5kx9zcyd3gzri60rrii2rbmh08s59ckg4awy27py86"; description = "A set of minimalistic Linux-specific system utilities"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/sch_cake/default.nix b/pkgs/os-specific/linux/sch_cake/default.nix index 68fc8a6e017..ef2ebaa0362 100644 --- a/pkgs/os-specific/linux/sch_cake/default.nix +++ b/pkgs/os-specific/linux/sch_cake/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with lib; { description = "The cake qdisc scheduler"; - homepage = https://www.bufferbloat.net/projects/codel/wiki/Cake/; + homepage = "https://www.bufferbloat.net/projects/codel/wiki/Cake/"; license = with licenses; [ bsd3 gpl2 ]; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/schedtool/default.nix b/pkgs/os-specific/linux/schedtool/default.nix index 316c9800079..de947a9cd34 100644 --- a/pkgs/os-specific/linux/schedtool/default.nix +++ b/pkgs/os-specific/linux/schedtool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Query or alter a process' scheduling policy under Linux"; - homepage = http://freequaos.host.sk/schedtool/; + homepage = "http://freequaos.host.sk/schedtool/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix index 613a7fd51e6..cf09f047676 100644 --- a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix +++ b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix @@ -23,13 +23,13 @@ in runCommandCC "sdnotify-wrapper" { mkdir -p $bin/bin mkdir $out - # just dynamic for now + # the -lskarnet has to come at the end to support static builds $CC \ -o $bin/bin/sdnotify-wrapper \ -I${skalibs.dev}/include \ -L${skalibs.lib}/lib \ - -lskarnet \ - ${src} + ${src} \ + -lskarnet mkdir -p $doc/share/doc/sdnotify-wrapper # copy the documentation comment diff --git a/pkgs/os-specific/linux/selinux-python/default.nix b/pkgs/os-specific/linux/selinux-python/default.nix index 2ca88c32f13..57aa5d49fac 100644 --- a/pkgs/os-specific/linux/selinux-python/default.nix +++ b/pkgs/os-specific/linux/selinux-python/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "SELinux policy core utilities written in Python"; license = licenses.gpl2; - homepage = https://selinuxproject.org; + homepage = "https://selinuxproject.org"; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/selinux-sandbox/default.nix b/pkgs/os-specific/linux/selinux-sandbox/default.nix index 5343c5fae1a..387db08e1d6 100644 --- a/pkgs/os-specific/linux/selinux-sandbox/default.nix +++ b/pkgs/os-specific/linux/selinux-sandbox/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "SELinux sandbox utility"; license = licenses.gpl2; - homepage = https://selinuxproject.org; + homepage = "https://selinuxproject.org"; platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index 138b54b0224..ae632c072cb 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { meta = { description = "SELinux Policy Analysis Tools"; - homepage = https://github.com/SELinuxProject/setools; + homepage = "https://github.com/SELinuxProject/setools"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/seturgent/default.nix b/pkgs/os-specific/linux/seturgent/default.nix index 15582574ecb..8cfc9d35940 100644 --- a/pkgs/os-specific/linux/seturgent/default.nix +++ b/pkgs/os-specific/linux/seturgent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.linux; description = "Set an application's urgency hint (or not)"; maintainers = [ stdenv.lib.maintainers.yarr ]; - homepage = https://github.com/hiltjo/seturgent; + homepage = "https://github.com/hiltjo/seturgent"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index c2547ce262a..fbcecf05f18 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -11,7 +11,7 @@ let else assert stdenv.hostPlatform.libc == "glibc"; stdenv.cc.libc; dots_in_usernames = fetchpatch { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch; + url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-apps/shadow/files/shadow-4.1.3-dots-in-usernames.patch"; sha256 = "1fj3rg6x3jppm5jvi9y7fhd2djbi4nc5pgwisw00xlh4qapgz692"; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/shadow-maint; + homepage = "https://github.com/shadow-maint"; description = "Suite containing authentication-related tools such as passwd and su"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 32761970d81..71bd887535b 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://tools.suckless.org/sinit; + homepage = "https://tools.suckless.org/sinit"; downloadPage = "https://git.suckless.org/sinit"; }; } diff --git a/pkgs/os-specific/linux/smem/default.nix b/pkgs/os-specific/linux/smem/default.nix index f40652922d8..cace3e22ae7 100644 --- a/pkgs/os-specific/linux/smem/default.nix +++ b/pkgs/os-specific/linux/smem/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.selenic.com/smem/; + homepage = "https://www.selenic.com/smem/"; description = "A memory usage reporting tool that takes shared memory into account"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.eelco ]; diff --git a/pkgs/os-specific/linux/speedometer/default.nix b/pkgs/os-specific/linux/speedometer/default.nix index 6f2e6306003..e4d374b0c41 100644 --- a/pkgs/os-specific/linux/speedometer/default.nix +++ b/pkgs/os-specific/linux/speedometer/default.nix @@ -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 = "http://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 3dbdb99549a..22e2da79c8c 100644 --- a/pkgs/os-specific/linux/sssd/default.nix +++ b/pkgs/os-specific/linux/sssd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, augeas, dnsutils, c-ares, curl, +{ 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, pcre, kerberos, cifs-utils, glib, keyutils, dbus, fakeroot, libxslt, libxml2, @@ -18,6 +18,13 @@ stdenv.mkDerivation rec { url = "https://fedorahosted.org/released/sssd/${pname}-${version}.tar.gz"; sha256 = "0ngr7cgimyjc6flqkm7psxagp1m4jlzpqkn28pliifbmdg6i5ckb"; }; + patches = [ + # Fix build failure against samba 4.12.0rc1 + (fetchpatch { + url = "https://github.com/SSSD/sssd/commit/bc56b10aea999284458dcc293b54cf65288e325d.patch"; + sha256 = "0q74sx5n41srq3kdn55l5j1sq4xrjsnl5y4v8yh5mwsijj74yh4g"; + }) + ]; # Something is looking for <libxml/foo.h> instead of <libxml2/libxml/foo.h> NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2"; @@ -83,7 +90,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System Security Services Daemon"; - homepage = https://fedorahosted.org/sssd/; + homepage = "https://fedorahosted.org/sssd/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.e-user ]; diff --git a/pkgs/os-specific/linux/syscall_limiter/default.nix b/pkgs/os-specific/linux/syscall_limiter/default.nix index ef13e5ded02..0354abf46e1 100644 --- a/pkgs/os-specific/linux/syscall_limiter/default.nix +++ b/pkgs/os-specific/linux/syscall_limiter/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Start Linux programs with only selected syscalls enabled"; - homepage = https://github.com/vi/syscall_limiter; + homepage = "https://github.com/vi/syscall_limiter"; license = licenses.mit; maintainers = with maintainers; [ obadz ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 61a51afa3a7..b0becd82d19 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.26.5"; + version = "0.26.6"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "145mwg6izrpi4r1qrygi4yb7qd68g4k64i3qmamk0671wxhjqi3c"; + sha256 = "1rw9s5lamr02036z26vfmnp5dnn97f00hcnp4xv6gdxim6rpmbz7"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/os-specific/linux/sysfsutils/default.nix b/pkgs/os-specific/linux/sysfsutils/default.nix index 485f3d94a73..3b2d54bc83a 100644 --- a/pkgs/os-specific/linux/sysfsutils/default.nix +++ b/pkgs/os-specific/linux/sysfsutils/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://linux-diag.sourceforge.net/Sysfsutils.html; + homepage = "http://linux-diag.sourceforge.net/Sysfsutils.html"; longDescription = '' These are a set of utilites built upon sysfs, a new virtual diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix index 213394e5ecc..c8378f2a0cb 100644 --- a/pkgs/os-specific/linux/sysklogd/default.nix +++ b/pkgs/os-specific/linux/sysklogd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "sysklogd-1.5.1"; src = fetchurl { - url = http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz; + url = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz"; sha256 = "00f2wy6f0qng7qzga4iicyzl9j8b7mp6mrpfky5jxj93ms2w2rji"; }; diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index ed901b21ac1..ddeb9ed6de0 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.syslinux.org/; + homepage = "http://www.syslinux.org/"; description = "A lightweight bootloader"; license = licenses.gpl2; maintainers = [ maintainers.samueldr ]; diff --git a/pkgs/os-specific/linux/systemd-wait/default.nix b/pkgs/os-specific/linux/systemd-wait/default.nix index 114f4c2444e..348549a1bc6 100644 --- a/pkgs/os-specific/linux/systemd-wait/default.nix +++ b/pkgs/os-specific/linux/systemd-wait/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - homepage = https://github.com/Stebalien/systemd-wait; + homepage = "https://github.com/Stebalien/systemd-wait"; license = lib.licenses.gpl3; description = "Wait for a systemd unit to enter a specific state"; maintainers = [ lib.maintainers.benley ]; diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix index e3a8baa7da3..0fc5acba4da 100644 --- a/pkgs/os-specific/linux/sysvinit/default.nix +++ b/pkgs/os-specific/linux/sysvinit/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.nongnu.org/sysvinit/; + homepage = "https://www.nongnu.org/sysvinit/"; description = "Utilities related to booting and shutdown"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/targetcli/default.nix b/pkgs/os-specific/linux/targetcli/default.nix index aa670aba727..65d46ad34c1 100644 --- a/pkgs/os-specific/linux/targetcli/default.nix +++ b/pkgs/os-specific/linux/targetcli/default.nix @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A command shell for managing the Linux LIO kernel target"; - homepage = https://github.com/open-iscsi/targetcli-fb; + homepage = "https://github.com/open-iscsi/targetcli-fb"; license = licenses.asl20; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/tbs/default.nix b/pkgs/os-specific/linux/tbs/default.nix index bb640e6fa5e..6502cc9c38e 100644 --- a/pkgs/os-specific/linux/tbs/default.nix +++ b/pkgs/os-specific/linux/tbs/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { ''; meta = with lib; { - homepage = https://www.tbsdtv.com/; + homepage = "https://www.tbsdtv.com/"; description = "Linux driver for TBSDTV cards"; license = licenses.gpl2; maintainers = with maintainers; [ ck3d ]; diff --git a/pkgs/os-specific/linux/tcp-wrappers/default.nix b/pkgs/os-specific/linux/tcp-wrappers/default.nix index 309d69ebad5..b3d59cf5a6a 100644 --- a/pkgs/os-specific/linux/tcp-wrappers/default.nix +++ b/pkgs/os-specific/linux/tcp-wrappers/default.nix @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { addition to the traditional BSD sockets. ''; - homepage = ftp://ftp.porcupine.org/pub/security/index.html; + homepage = "ftp://ftp.porcupine.org/pub/security/index.html"; license = "BSD-style"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/os-specific/linux/thunderbolt/default.nix b/pkgs/os-specific/linux/thunderbolt/default.nix index 299ac8ad220..d9817a6c04b 100644 --- a/pkgs/os-specific/linux/thunderbolt/default.nix +++ b/pkgs/os-specific/linux/thunderbolt/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Thunderbolt(TM) user-space components"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.ryantrinkle ]; - homepage = https://01.org/thunderbolt-sw; + homepage = "https://01.org/thunderbolt-sw"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/tiptop/default.nix b/pkgs/os-specific/linux/tiptop/default.nix index bfcf58a3530..03db9e3bb0e 100644 --- a/pkgs/os-specific/linux/tiptop/default.nix +++ b/pkgs/os-specific/linux/tiptop/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Performance monitoring tool for Linux"; - homepage = http://tiptop.gforge.inria.fr; + homepage = "http://tiptop.gforge.inria.fr"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/os-specific/linux/tiscamera/default.nix b/pkgs/os-specific/linux/tiscamera/default.nix index ebd17de892a..fb2773b4d3a 100644 --- a/pkgs/os-specific/linux/tiscamera/default.nix +++ b/pkgs/os-specific/linux/tiscamera/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The Linux sources and UVC firmwares for The Imaging Source cameras"; - homepage = https://github.com/TheImagingSource/tiscamera; + homepage = "https://github.com/TheImagingSource/tiscamera"; license = with licenses; [ asl20 ]; platforms = platforms.linux; maintainers = with maintainers; [ jraygauthier ]; diff --git a/pkgs/os-specific/linux/tmon/default.nix b/pkgs/os-specific/linux/tmon/default.nix index 690eb8b2eab..f8438f8d40f 100644 --- a/pkgs/os-specific/linux/tmon/default.nix +++ b/pkgs/os-specific/linux/tmon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Monitoring and Testing Tool for Linux kernel thermal subsystem"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/tomb/default.nix b/pkgs/os-specific/linux/tomb/default.nix index 4a47ed8868d..150c64a0451 100644 --- a/pkgs/os-specific/linux/tomb/default.nix +++ b/pkgs/os-specific/linux/tomb/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File encryption on GNU/Linux"; - homepage = https://www.dyne.org/software/tomb/; + homepage = "https://www.dyne.org/software/tomb/"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix index e22263bc2db..5e0e9c539ea 100644 --- a/pkgs/os-specific/linux/tp_smapi/default.nix +++ b/pkgs/os-specific/linux/tp_smapi/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = { description = "IBM ThinkPad hardware functions driver"; - homepage = https://github.com/evgeni/tp_smapi; + homepage = "https://github.com/evgeni/tp_smapi"; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; # driver is only ment for linux thinkpads i think bellow platforms should cover it. diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index 5ec5fbb7c22..a80635c53ce 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "User-space tools for the Linux kernel ftrace subsystem"; - homepage = https://kernelshark.org/; + homepage = "https://kernelshark.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice basvandijk ]; diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 5e355ac7c9a..3a280b8af0b 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -32,7 +32,7 @@ mkDerivation { meta = with stdenv.lib; { description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem"; - homepage = https://kernelshark.org/; + homepage = "https://kernelshark.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ basvandijk ]; diff --git a/pkgs/os-specific/linux/trinity/default.nix b/pkgs/os-specific/linux/trinity/default.nix index b855f0547ba..6d9848ab712 100644 --- a/pkgs/os-specific/linux/trinity/default.nix +++ b/pkgs/os-specific/linux/trinity/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Linux System call fuzz tester"; - homepage = https://codemonkey.org.uk/projects/trinity/; + homepage = "https://codemonkey.org.uk/projects/trinity/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/tunctl/default.nix b/pkgs/os-specific/linux/tunctl/default.nix index ded9ec0281d..c20c3e98f55 100644 --- a/pkgs/os-specific/linux/tunctl/default.nix +++ b/pkgs/os-specific/linux/tunctl/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "tunctl-1.5"; src = fetchurl { - url = mirror://sourceforge/tunctl/tunctl-1.5.tar.gz; + url = "mirror://sourceforge/tunctl/tunctl-1.5.tar.gz"; sha256 = "aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://tunctl.sourceforge.net/; + 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; diff --git a/pkgs/os-specific/linux/turbostat/default.nix b/pkgs/os-specific/linux/turbostat/default.nix index 10074f490b8..4207589aaff 100644 --- a/pkgs/os-specific/linux/turbostat/default.nix +++ b/pkgs/os-specific/linux/turbostat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Report processor frequency and idle statistics"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific }; diff --git a/pkgs/os-specific/linux/udisks-glue/default.nix b/pkgs/os-specific/linux/udisks-glue/default.nix index 29e3fd2e2a8..60a1f8a619d 100644 --- a/pkgs/os-specific/linux/udisks-glue/default.nix +++ b/pkgs/os-specific/linux/udisks-glue/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { preConfigure = "sh autogen.sh"; meta = { - homepage = https://github.com/fernandotcl/udisks-glue; + 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]; diff --git a/pkgs/os-specific/linux/udisks/1-default.nix b/pkgs/os-specific/linux/udisks/1-default.nix index 60bf2b9bc24..f8876e5d155 100644 --- a/pkgs/os-specific/linux/udisks/1-default.nix +++ b/pkgs/os-specific/linux/udisks/1-default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--localstatedir=/var" "--enable-lvm2" ]; meta = with stdenv.lib; { - homepage = http://www.freedesktop.org/wiki/Software/udisks; + homepage = "http://www.freedesktop.org/wiki/Software/udisks"; description = "A daemon and command-line utility for querying and manipulating storage devices"; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2Plus ]; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 1d967b38eb9..526def78bb2 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, substituteAll, libtool, pkgconfig, gettext, gnused +{ stdenv, fetchFromGitHub, fetchpatch, substituteAll, libtool, pkgconfig, gettext, gnused , gtk-doc, acl, systemd, glib, libatasmart, polkit, coreutils, bash, which , expat, libxslt, docbook_xsl, utillinux, mdadm, libgudev, libblockdev, parted , gobject-introspection, docbook_xml_dtd_412, docbook_xml_dtd_43, autoconf, automake @@ -37,6 +37,12 @@ stdenv.mkDerivation rec { xfsprogs ntfs3g parted utillinux ]; }) + + # Fix tests: https://github.com/storaged-project/udisks/issues/724 + (fetchpatch { + url = "https://github.com/storaged-project/udisks/commit/60a0c1c967821d317046d9494e45b9a8e4e7a1c1.patch"; + sha256 = "tWl49mSc1zDyB3kV6SKlhHFPi/Kg7mg6OWDlY7vGj2Y="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/os-specific/linux/undervolt/default.nix b/pkgs/os-specific/linux/undervolt/default.nix index eb8f55ac665..696625761b1 100644 --- a/pkgs/os-specific/linux/undervolt/default.nix +++ b/pkgs/os-specific/linux/undervolt/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.2.9"; + version = "0.2.11"; pname = "undervolt"; src = fetchFromGitHub { owner = "georgewhewell"; repo = "undervolt"; rev = version; - sha256 = "1d934lp8yczrfslmwff6fxzd4arja2vg00s5kwdr949bxpa6w59c"; + sha256 = "18mnf3x687qal7k8yk2sdxzgbyn3rqchgflbi1sksryznmksqqw5"; }; meta = with stdenv.lib; { - homepage = https://github.com/georgewhewell/undervolt/; + homepage = "https://github.com/georgewhewell/undervolt/"; description = "A program for undervolting Intel CPUs on Linux"; longDescription = '' diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index ab7f65925ee..e9d9eff007c 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { outputs = [ "out" "dev" ]; src = fetchurl { - url = https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz; + url = "https://gitlab.freedesktop.org/upower/upower/uploads/93cfe7c8d66ed486001c4f3f55399b7a/upower-0.99.11.tar.xz"; sha256 = "1vxxvmz2cxb1qy6ibszaz5bskqdy9nd9fxspj9fv3gfmrjzzzdb4"; }; @@ -63,7 +63,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = https://upower.freedesktop.org/; + homepage = "https://upower.freedesktop.org/"; description = "A D-Bus service for power management"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index f927eaefb4e..ffd33b6ff85 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/torvalds/linux/tree/master/tools/usb/usbip; + homepage = "https://github.com/torvalds/linux/tree/master/tools/usb/usbip"; description = "allows to pass USB device from server to client over the network"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix index 2627286ccff..41db602bce5 100644 --- a/pkgs/os-specific/linux/usbutils/default.nix +++ b/pkgs/os-specific/linux/usbutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.linux-usb.org/; + homepage = "http://www.linux-usb.org/"; description = "Tools for working with USB devices, such as lsusb"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix index ec58d513b09..4acf1e3faa1 100644 --- a/pkgs/os-specific/linux/usermount/default.nix +++ b/pkgs/os-specific/linux/usermount/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/tom5760/usermount; + 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; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index baaa90e431b..f0cc6fd5a9b 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://www.kernel.org/pub/linux/utils/util-linux/; + homepage = "https://www.kernel.org/pub/linux/utils/util-linux/"; description = "A set of system utilities for Linux"; license = licenses.gpl2; # also contains parts under more permissive licenses platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/uvcdynctrl/default.nix b/pkgs/os-specific/linux/uvcdynctrl/default.nix index cfb93684f3b..f022023fcbb 100644 --- a/pkgs/os-specific/linux/uvcdynctrl/default.nix +++ b/pkgs/os-specific/linux/uvcdynctrl/default.nix @@ -15,14 +15,21 @@ stdenv.mkDerivation { buildInputs = [ libxml2 ]; prePatch = '' - substituteInPlace uvcdynctrl/CMakeLists.txt \ - --replace "/etc/udev" "$out/etc/udev" \ - --replace "/lib/udev" "$out/lib/udev" + local fixup_list=( + uvcdynctrl/CMakeLists.txt + uvcdynctrl/udev/rules/80-uvcdynctrl.rules + uvcdynctrl/udev/scripts/uvcdynctrl + ) + for f in "''${fixup_list[@]}"; do + substituteInPlace "$f" \ + --replace "/etc/udev" "$out/etc/udev" \ + --replace "/lib/udev" "$out/lib/udev" + done ''; meta = with stdenv.lib; { description = "A simple interface for devices supported by the linux UVC driver"; - homepage = http://guvcview.sourceforge.net; + homepage = "http://guvcview.sourceforge.net"; license = licenses.gpl3Plus; maintainers = [ maintainers.puffnfresh ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 050e7eaec47..73944bd6eb7 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "V4L utils and libv4l, provide common image formats regardless of the v4l device"; - homepage = https://linuxtv.org/projects.php; + homepage = "https://linuxtv.org/projects.php"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ codyopel ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 275372b8309..e56f9b51dbd 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A kernel module to create V4L2 loopback devices"; - homepage = https://github.com/umlaeute/v4l2loopback; + homepage = "https://github.com/umlaeute/v4l2loopback"; license = licenses.gpl2; maintainers = [ maintainers.domenkozar ]; platforms = platforms.linux; diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 073a6ded998..ec0c318042a 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A daemon to run x86 code in an emulated environment"; - homepage = https://github.com/mjanusz/v86d; + homepage = "https://github.com/mjanusz/v86d"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel ]; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 8672aeb22fd..890c774081b 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "0.0.20200318"; + version = "1.0.20200401"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1syl3p37fvfxvp4apvfnlp632pg3xwslj9r3s54mpxbxc6d8s3v6"; + sha256 = "1q4gfpbvbyracnl219xqfz5yqfc08i6g41z6bn2skx5x8jbll3aq"; }; preConfigure = '' diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/os-specific/linux/wooting-udev-rules/default.nix index 49da843e3ad..0093603c250 100644 --- a/pkgs/os-specific/linux/wooting-udev-rules/default.nix +++ b/pkgs/os-specific/linux/wooting-udev-rules/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wooting.helpscoutdocs.com/article/34-linux-udev-rules; + homepage = "https://wooting.helpscoutdocs.com/article/34-linux-udev-rules"; description = "udev rules that give NixOS permission to communicate with Wooting keyboards"; platforms = platforms.linux; license = "unknown"; diff --git a/pkgs/os-specific/linux/wpa_supplicant/default.nix b/pkgs/os-specific/linux/wpa_supplicant/default.nix index dc5b4289a45..5cd440bcdfc 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/default.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://hostap.epitest.fi/wpa_supplicant/; + homepage = "https://hostap.epitest.fi/wpa_supplicant/"; description = "A tool for connecting to WPA and WPA2-protected wireless networks"; license = licenses.bsd3; maintainers = with maintainers; [ marcweber ]; diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index d02901e0cc1..d60ff7f364c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -25,7 +25,7 @@ mkDerivation { meta = with stdenv.lib; { description = "Qt-based GUI for wpa_supplicant"; - homepage = https://hostap.epitest.fi/wpa_supplicant/; + homepage = "https://hostap.epitest.fi/wpa_supplicant/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix index b4997714cea..880456afbde 100644 --- a/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix +++ b/pkgs/os-specific/linux/x86_energy_perf_policy/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Set the energy versus performance policy preference bias on recent X86 processors"; - homepage = https://www.kernel.org/; + homepage = "https://www.kernel.org/"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; # x86-specific }; diff --git a/pkgs/os-specific/linux/x86info/default.nix b/pkgs/os-specific/linux/x86info/default.nix index 1c2aaa8ee01..9b745315b1c 100644 --- a/pkgs/os-specific/linux/x86info/default.nix +++ b/pkgs/os-specific/linux/x86info/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; platforms = [ "i686-linux" "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; - homepage = http://codemonkey.org.uk/projects/x86info/; + homepage = "http://codemonkey.org.uk/projects/x86info/"; maintainers = with stdenv.lib.maintainers; [jcumming]; }; } diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index ac095ffaf89..8a7541afa69 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { maintainers = [ maintainers.goibhniu ]; description = "Wacom digitizer driver for X11"; - homepage = http://linuxwacom.sourceforge.net; + homepage = "http://linuxwacom.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; # Probably, works with other unices as well }; diff --git a/pkgs/os-specific/linux/xf86-video-nested/default.nix b/pkgs/os-specific/linux/xf86-video-nested/default.nix index 69a10673d24..c117293d3ad 100644 --- a/pkgs/os-specific/linux/xf86-video-nested/default.nix +++ b/pkgs/os-specific/linux/xf86-video-nested/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xf86-video-nested-2017-06-12"; src = fetchgit { - url = git://anongit.freedesktop.org/xorg/driver/xf86-video-nested; + url = "git://anongit.freedesktop.org/xorg/driver/xf86-video-nested"; rev = "6a48b385c41ea89354d0b2ee7f4649a1d1d9ec70"; sha256 = "133rd2kvr2q2wmwpx82bb93qbi8wm8qp1vlmbhgc7aslz0j4cqqv"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { CFLAGS = "-I${pixman}/include/pixman-1"; meta = { - homepage = https://cgit.freedesktop.org/xorg/driver/xf86-video-nested; + homepage = "https://cgit.freedesktop.org/xorg/driver/xf86-video-nested"; description = "A driver to run Xorg on top of Xorg or something else"; maintainers = [ stdenv.lib.maintainers.goibhniu ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index 8fdf7f23cf8..bc1d803bb10 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -1,21 +1,21 @@ -{ stdenv, kernel, fetchFromGitHub }: +{ stdenv, kernel, fetchFromGitHub, fetchpatch }: stdenv.mkDerivation rec { pname = "zenpower"; - version = "0.1.5"; + version = "0.1.10"; src = fetchFromGitHub { owner = "ocerman"; repo = "zenpower"; rev = "v${version}"; - sha256 = "1ay1q666bc7czgc95invw523c0ds2gj85wxypc3wi418vfaha5vy"; + sha256 = "1fqqaj7fq49yi2yip518036w80r9w7mkxpbkrxqzlydpma1x9v5m"; }; hardeningDisable = [ "pic" ]; nativeBuildInputs = kernel.moduleBuildDependencies; - makeFlags = "KERNEL_BUILD=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + makeFlags = [ "KERNEL_BUILD=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ]; installPhase = '' install -D zenpower.ko -t "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/hwmon/zenpower/" @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ocerman/zenpower"; license = licenses.gpl2; maintainers = with maintainers; [ alexbakker ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; broken = versionOlder kernel.version "4.14"; }; } diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 738171bb5ec..563735deeeb 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils +{ stdenv, fetchFromGitHub, fetchpatch +, autoreconfHook, utillinux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -11,6 +12,7 @@ # Kernel dependencies , kernel ? null +, enablePython ? true }: with stdenv.lib; @@ -40,7 +42,12 @@ let inherit rev sha256; }; - patches = extraPatches; + patches = [ (fetchpatch { + # https://github.com/openzfs/zfs/pull/9961#issuecomment-585827288 + # will be included in zfs 0.5.4 as well + url = "https://gist.githubusercontent.com/satmandu/67cbae9c4d461be0e64428a1707aef1c/raw/ba0fb65f17ccce5b710e4ce86a095de577f7dfe1/k5.6.3.patch"; + sha256 = "0zay7cz078v7wcnk7xl96blp7j6y64q1migb91c7h66zkpikqvgb"; + }) ] ++ extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts @@ -51,7 +58,12 @@ let '' + optionalString buildUser '' substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" \ --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${nfs-utils}/bin/exportfs" + substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${ + # We don't *need* python support, but we set it like this to minimize closure size: + # If it's disabled by default, no need to enable it, even if we have python enabled + # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure + nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) + }/bin/exportfs" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" @@ -86,7 +98,8 @@ let nativeBuildInputs = [ autoreconfHook nukeReferences ] ++ optionals buildKernel (kernel.moduleBuildDependencies ++ [ perl ]); buildInputs = optionals buildUser [ zlib libuuid attr ] - ++ optionals (buildUser) [ openssl python3 ] + ++ optional buildUser openssl + ++ optional (buildUser && enablePython) python3 ++ optional stdenv.hostPlatform.isMusl libtirpc; # for zdb to get the rpath to libgcc_s, needed for pthread_cancel to work @@ -96,7 +109,7 @@ let configureFlags = [ "--with-config=${configFile}" - (withFeatureAs buildUser "python" python3.interpreter) + (withFeatureAs (buildUser && enablePython) "python" python3.interpreter) ] ++ optionals buildUser [ "--with-dracutdir=$(out)/lib/dracut" "--with-udevdir=$(out)/lib/udev" @@ -164,7 +177,7 @@ let Copy-On-Write filesystem with data integrity detection and repair, snapshotting, cloning, block devices, deduplication, and more. ''; - homepage = https://zfsonlinux.org/; + homepage = "https://zfsonlinux.org/"; license = licenses.cddl; platforms = platforms.linux; maintainers = with maintainers; [ jcumming wizeman fpletz globin ]; diff --git a/pkgs/os-specific/windows/cygwin-setup/default.nix b/pkgs/os-specific/windows/cygwin-setup/default.nix index a6c74d029c5..16b07507695 100644 --- a/pkgs/os-specific/windows/cygwin-setup/default.nix +++ b/pkgs/os-specific/windows/cygwin-setup/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://sourceware.org/cygwin-apps/setup.html; + homepage = "https://sourceware.org/cygwin-apps/setup.html"; description = "A tool for installing Cygwin"; license = licenses.gpl2Plus; }; diff --git a/pkgs/os-specific/windows/jom/default.nix b/pkgs/os-specific/windows/jom/default.nix index 0ddec9282e6..1f42330be35 100644 --- a/pkgs/os-specific/windows/jom/default.nix +++ b/pkgs/os-specific/windows/jom/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "jom-1.0.11"; src = fetchgit { - url = git://gitorious.org/qt-labs/jom.git; + url = "git://gitorious.org/qt-labs/jom.git"; rev = "c91a204b05f97eef3c73aaaba3036e20f79fd487"; sha256 = "6d3ac84f83bb045213903d9d5340c0447c8fe41671d1dcdeae5c40b66d62ccbf"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://qt-project.org/wiki/jom; + 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. }; diff --git a/pkgs/os-specific/windows/wxMSW-2.8/default.nix b/pkgs/os-specific/windows/wxMSW-2.8/default.nix index 2764c4232c1..4dc886915b7 100644 --- a/pkgs/os-specific/windows/wxMSW-2.8/default.nix +++ b/pkgs/os-specific/windows/wxMSW-2.8/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "wxMSW-2.8.11"; src = fetchurl { - url = mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz; + url = "mirror://sourceforge/wxwindows/wxWidgets-2.8.11.tar.gz"; sha256 = "0icxd21g18d42n1ygshkpw0jnflm03iqki6r623pb5hhd7fm2ksj"; }; diff --git a/pkgs/servers/amqp/qpid-cpp/default.nix b/pkgs/servers/amqp/qpid-cpp/default.nix index 02c2e03d90f..4f7186f3140 100644 --- a/pkgs/servers/amqp/qpid-cpp/default.nix +++ b/pkgs/servers/amqp/qpid-cpp/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, cmake, python2, boost, libuuid, ruby, buildEnv, buildPythonPackage, qpid-python }: let - name = "qpid-cpp-${version}"; + pname = "qpid-cpp"; + name = "${pname}-${version}"; version = "1.39.0"; src = fetchurl { @@ -10,9 +11,9 @@ let }; meta = with stdenv.lib; { - homepage = http://qpid.apache.org; - repositories.git = git://git.apache.org/qpid.git; - repositories.svn = http://svn.apache.org/repos/asf/qpid; + homepage = "http://qpid.apache.org"; + repositories.git = "git://git.apache.org/qpid.git"; + repositories.svn = "http://svn.apache.org/repos/asf/qpid"; description = "An AMQP message broker and a C++ messaging API"; license = licenses.asl20; platforms = platforms.linux; @@ -20,7 +21,7 @@ let }; qpid-cpp = stdenv.mkDerivation { - inherit src meta name; + inherit src meta pname version; nativeBuildInputs = [ cmake ]; buildInputs = [ boost libuuid ruby python2 ]; @@ -46,7 +47,7 @@ let }; python-frontend = buildPythonPackage { - inherit name meta src; + inherit pname version meta src; sourceRoot = "${name}/management/python"; diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix index 769f5f79a77..a8baefa98ea 100644 --- a/pkgs/servers/apache-kafka/default.nix +++ b/pkgs/servers/apache-kafka/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://kafka.apache.org; + homepage = "http://kafka.apache.org"; description = "A high-throughput distributed messaging system"; license = licenses.asl20; maintainers = [ maintainers.ragge ]; diff --git a/pkgs/servers/apcupsd/default.nix b/pkgs/servers/apcupsd/default.nix index bec61d460a7..ad047ba31f8 100644 --- a/pkgs/servers/apcupsd/default.nix +++ b/pkgs/servers/apcupsd/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Daemon for controlling APC UPSes"; - homepage = http://www.apcupsd.com/; + homepage = "http://www.apcupsd.com/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 1e5ba46d382..a5934827a20 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -72,24 +72,24 @@ let meta = with stdenv.lib; { description = "Software implementation of a telephone private branch exchange (PBX)"; - homepage = https://www.asterisk.org/; + homepage = "https://www.asterisk.org/"; license = licenses.gpl2; maintainers = with maintainers; [ auntie DerTim1 yorickvp ]; }; }; pjproject_2_7_1 = fetchurl { - url = https://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2; + url = "https://www.pjsip.org/release/2.7.1/pjproject-2.7.1.tar.bz2"; sha256 = "09ii5hgl5s7grx4fiimcl3s77i385h7b3kwpfa2q0arbl1ibryjr"; }; pjproject_2_8 = fetchurl { - url = https://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2; + url = "https://www.pjsip.org/release/2.8/pjproject-2.8.tar.bz2"; sha256 = "0ybg0113rp3fk49rm2v0pcgqb28h3dv1pdy9594w2ggiz7bhngah"; }; mp3-202 = fetchsvn { - url = http://svn.digium.com/svn/thirdparty/mp3/trunk; + url = "http://svn.digium.com/svn/thirdparty/mp3/trunk"; rev = "202"; sha256 = "1s9idx2miwk178sa731ig9r4fzx4gy1q8xazfqyd7q4lfd70s1cy"; }; diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index db5baf6e5af..d8410c87b76 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.2.1"; + version = "7.3.4"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "1d37hiabph56frsp8jrn80fmglgw6k1dlc4x8p7m82fb3vild049"; + sha256 = "13d0vnsvyl8cjdxnp2w284814bnqgbksl8mq7lkjms1x083mhnzi"; }; buildPhase = '' diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix index 81b90091e66..556380df464 100644 --- a/pkgs/servers/atlassian/crowd.nix +++ b/pkgs/servers/atlassian/crowd.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Single sign-on and identity management tool"; - homepage = https://www.atlassian.com/software/crowd; + homepage = "https://www.atlassian.com/software/crowd"; license = licenses.unfree; maintainers = with maintainers; [ fpletz globin ]; }; diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index 611db53d645..d0d95d24068 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -1,15 +1,18 @@ -{ stdenv, lib, fetchurl +{ stdenv +, lib +, fetchurl +, gawk , enableSSO ? false , crowdProperties ? null }: stdenv.mkDerivation rec { pname = "atlassian-jira"; - version = "8.7.1"; + version = "8.8.0"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; - sha256 = "0f46j94xjb5a5f74fsykjif64s9w2yd9ccy9098yrzaa8lbwdgpz"; + sha256 = "1gn0iknli8pi3c3kxb8hdn19wzn2fx0193ppf0niw3cqf1h2c5cz"; }; buildPhase = '' @@ -18,6 +21,8 @@ stdenv.mkDerivation rec { rm -r logs; ln -sf /run/atlassian-jira/logs/ . rm -r work; ln -sf /run/atlassian-jira/work/ . rm -r temp; ln -sf /run/atlassian-jira/temp/ . + substituteInPlace bin/check-java.sh \ + --replace "awk" "${gawk}/bin/gawk" '' + lib.optionalString enableSSO '' substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \ --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \ diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix index 58ebbf88f78..40e6267bd7b 100644 --- a/pkgs/servers/beanstalkd/default.nix +++ b/pkgs/servers/beanstalkd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "fortify" ]; meta = with stdenv.lib; { - homepage = http://kr.github.io/beanstalkd/; + homepage = "http://kr.github.io/beanstalkd/"; description = "A simple, fast work queue"; license = licenses.mit; maintainers = [ maintainers.zimbatm ]; diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix index 2cc27eda1d4..e90445e29c8 100644 --- a/pkgs/servers/bird/default.nix +++ b/pkgs/servers/bird/default.nix @@ -36,7 +36,7 @@ let meta = { description = "BIRD Internet Routing Daemon"; - homepage = http://bird.network.cz; + homepage = "http://bird.network.cz"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz globin ]; platforms = platforms.linux; diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index ee8925e1170..b6c5b2a60af 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.tinkerforge.com/; + 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; diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 8b51e584e3e..bcd4b7065b5 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "caddy"; @@ -16,8 +16,6 @@ buildGoModule rec { }; modSha256 = "1gc0xvsihr4zp7hkrdfrplvzkaphz1y4q53rgwn2jhd8s98l57an"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preBuild = '' cat << EOF > caddy/main.go package main diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index 7330388a785..35c1f497850 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -1,8 +1,8 @@ -{ stdenv, callPackage, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, callPackage, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "caddy"; - version = "2.0.0-beta10"; + version = "2.0.0-rc.1"; goPackagePath = "github.com/caddyserver/caddy"; @@ -12,11 +12,9 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "1vagcw6ibri4nbx1n60xp7rffcfr64a2202hjaijyjzc8wcl80na"; + sha256 = "0ir394nmdrqvslghqky4d2py65ff77fqsp0nmxdlsdps49szwh7h"; }; - modSha256 = "1sb8w6n84cpya2rjm0zm798kzf5vjpkr5440j1gfnnnr07jl2aqn"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0sqnw81l73gssnpd4dsl3vd10584riq0417z4dvbhjnc8b3z4xwv"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; diff --git a/pkgs/servers/cayley/default.nix b/pkgs/servers/cayley/default.nix index c9a39b691e7..c62a28e41bd 100644 --- a/pkgs/servers/cayley/default.nix +++ b/pkgs/servers/cayley/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { ''; meta = { - homepage = https://cayley.io/; + 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; diff --git a/pkgs/servers/clickhouse/default.nix b/pkgs/servers/clickhouse/default.nix index 40760093462..9521d470a0f 100644 --- a/pkgs/servers/clickhouse/default.nix +++ b/pkgs/servers/clickhouse/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "clickhouse"; - version = "19.17.8.54"; + version = "19.17.9.60"; src = fetchFromGitHub { owner = "yandex"; repo = "ClickHouse"; rev = "v${version}-stable"; - sha256 = "0ck6kcifj7y4i2j1jj1a9vf5nfpp9mxk5x8y8557zp9yayjm9qyr"; + sha256 = "0k1ncn7i4szpw4jlhv3zmw6mrkkm8qfs39nj1zbawjqrkgnw70kg"; }; nativeBuildInputs = [ cmake libtool lldClang.bintools ninja ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = https://clickhouse.yandex/; + homepage = "https://clickhouse.yandex/"; description = "Column-oriented database management system"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/servers/cloud-print-connector/default.nix b/pkgs/servers/cloud-print-connector/default.nix index 2fb5b403508..e8199310027 100644 --- a/pkgs/servers/cloud-print-connector/default.nix +++ b/pkgs/servers/cloud-print-connector/default.nix @@ -54,7 +54,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Share printers from your Windows, Linux, FreeBSD or macOS computer with ChromeOS and Android devices, using the Cloud Print Connector"; - homepage = https://github.com/google/cloud-print-connector; + homepage = "https://github.com/google/cloud-print-connector"; license = licenses.bsd3; maintainers = with maintainers; [ hodapp ]; # TODO: Fix broken build on macOS. The GitHub presently lists the diff --git a/pkgs/servers/computing/slurm-spank-x11/default.nix b/pkgs/servers/computing/slurm-spank-x11/default.nix index 13fad7059af..bb7885025d1 100644 --- a/pkgs/servers/computing/slurm-spank-x11/default.nix +++ b/pkgs/servers/computing/slurm-spank-x11/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/hautreux/slurm-spank-x11; + homepage = "https://github.com/hautreux/slurm-spank-x11"; description = "Plugin for SLURM to allow for interactive X11 sessions"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 18ef3bf3fa5..1554fb69f19 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.schedmd.com/; + homepage = "http://www.schedmd.com/"; description = "Simple Linux Utility for Resource Management"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 8335e40de98..d55dd14601e 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = http://storm.apache.org; + homepage = "http://storm.apache.org"; description = "Distributed realtime computation system"; license = licenses.asl20; maintainers = with maintainers; [ edwtjo vizanto ]; diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 8eb12a1b811..37c8d32ab6a 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.adaptivecomputing.com/products/open-source/torque; + homepage = "http://www.adaptivecomputing.com/products/open-source/torque"; description = "Resource management system for submitting and controlling jobs on supercomputers, clusters, and grids"; platforms = platforms.linux; license = "TORQUEv1.1"; diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 93794ce7052..52023b39812 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.confluent.io/; + homepage = "https://www.confluent.io/"; description = "Confluent event streaming platform based on Apache Kafka"; license = licenses.asl20; maintainers = [ maintainers.offline ]; diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 2a4361d99d2..8703e76cb71 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "consul"; - version = "1.6.2"; + version = "1.7.2"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "0r9wqxhgspgypvp9xdv931r8g28gjg9njdignp84rrbxljix25my"; + sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4"; }; preBuild = '' @@ -28,7 +28,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Tool for service discovery, monitoring and configuration"; - homepage = https://www.consul.io/; + homepage = "https://www.consul.io/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 ]; diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix index 2d7acda90af..5a209549d35 100644 --- a/pkgs/servers/corosync/default.nix +++ b/pkgs/servers/corosync/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://corosync.org/; + homepage = "http://corosync.org/"; description = "A Group Communication System with features for implementing high availability within applications"; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 2fbd0bbfb3d..24dc256ba69 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./pure-configure.patch ]; meta = with stdenv.lib; { - homepage = https://coturn.net/; + homepage = "https://coturn.net/"; license = with licenses; [ bsd3 ]; description = "A TURN server"; platforms = platforms.all; diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix index 07ff725f7c9..40941123ebc 100644 --- a/pkgs/servers/couchpotato/default.nix +++ b/pkgs/servers/couchpotato/default.nix @@ -36,7 +36,7 @@ buildPythonApplication rec { meta = { description = "Automatic movie downloading via NZBs and torrents"; license = lib.licenses.gpl3; - homepage = https://couchpota.to/; + homepage = "https://couchpota.to/"; maintainers = with lib.maintainers; [ fadenb ]; }; } diff --git a/pkgs/servers/demoit/default.nix b/pkgs/servers/demoit/default.nix index 29d00caa023..514b6873a1a 100644 --- a/pkgs/servers/demoit/default.nix +++ b/pkgs/servers/demoit/default.nix @@ -17,7 +17,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Live coding demos without Context Switching"; - homepage = https://github.com/dgageot/demoit; + homepage = "https://github.com/dgageot/demoit"; license = licenses.asl20; maintainers = [ maintainers.freezeboy ]; }; diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index d2a6dc9df15..ea549cd7967 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flexible dictionary server and client implementing RFC 2229"; - homepage = https://www.gnu.org/software/dico/; + homepage = "https://www.gnu.org/software/dico/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.linux; diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix index b4ad70f8277..fbffecbafaf 100644 --- a/pkgs/servers/dict/default.nix +++ b/pkgs/servers/dict/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dictd"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { url = "mirror://sourceforge/dict/dictd-${version}.tar.gz"; - sha256 = "0min6v60b6z5mrymyjfwzx8nv6rdm8pd8phlwl6v2jl5vkngcdx2"; + sha256 = "1r413a78sa3mcrgddgdj1za34dj6mnd4dg66csqv2yz8fypm3fpf"; }; buildInputs = [ libmaa zlib ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dict protocol server and client"; - homepage = http://www.dict.org; + homepage = "http://www.dict.org"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 442ef45d1bf..3ff36d4c62e 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -29,35 +29,35 @@ let }; in rec { deu2eng = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/deu-eng.tar.gz; + url = "mirror://sourceforge/freedict/deu-eng.tar.gz"; sha256 = "0dqrhv04g4f5s84nbgisgcfwk5x0rpincif0yfhfh4sc1bsvzsrb"; }) "deu-eng" "de_DE"; eng2deu = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-deu.tar.gz; + url = "mirror://sourceforge/freedict/eng-deu.tar.gz"; sha256 = "01x12p72sa3071iff3jhzga8588440f07zr56r3x98bspvdlz73r"; }) "eng-deu" "en_EN"; nld2eng = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/nld-eng.tar.gz; + url = "mirror://sourceforge/freedict/nld-eng.tar.gz"; sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07"; }) "nld-eng" "nl_NL"; eng2nld = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-nld.tar.gz; + url = "mirror://sourceforge/freedict/eng-nld.tar.gz"; sha256 = "0rcg28ldykv0w2mpxc6g4rqmfs33q7pbvf68ssy1q9gpf6mz7vcl"; }) "eng-nld" "en_UK"; eng2rus = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-rus.tar.gz; + url = "mirror://sourceforge/freedict/eng-rus.tar.gz"; sha256 = "15409ivhww1wsfjr05083pv6mg10bak8v5pg1wkiqybk7ck61rry"; }) "eng-rus" "en_UK"; fra2eng = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/fra-eng.tar.gz; + url = "mirror://sourceforge/freedict/fra-eng.tar.gz"; sha256 = "0sdd88s2zs5whiwdf3hd0s4pzzv75sdsccsrm1wxc87l3hjm85z3"; }) "fra-eng" "fr_FR"; eng2fra = makeDictdDBFreedict (fetchurl { - url = mirror://sourceforge/freedict/eng-fra.tar.gz; + url = "mirror://sourceforge/freedict/eng-fra.tar.gz"; sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m"; }) "eng-fra" "en_UK"; mueller_eng2rus_pkg = makeDictdDB (fetchurl { - url = mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz; + url = "mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz"; sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq"; }) "mueller-eng-rus" "mueller-dict-*/dict" "en_UK"; mueller_enru_abbr = { diff --git a/pkgs/servers/dict/dictd-wiktionary.nix b/pkgs/servers/dict/dictd-wiktionary.nix index b7dbf04026d..2207f2c36df 100644 --- a/pkgs/servers/dict/dictd-wiktionary.nix +++ b/pkgs/servers/dict/dictd-wiktionary.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "DICT version of English Wiktionary"; - homepage = http://en.wiktionary.org/; + homepage = "http://en.wiktionary.org/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/servers/dict/dictd-wordnet.nix b/pkgs/servers/dict/dictd-wordnet.nix index 2c97101d9cb..0afdf442d23 100644 --- a/pkgs/servers/dict/dictd-wordnet.nix +++ b/pkgs/servers/dict/dictd-wordnet.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { the wordnet data available to dictd and by extension for lookup with the dict command. ''; - homepage = https://wordnet.princeton.edu/; + homepage = "https://wordnet.princeton.edu/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index bdbff4c00f7..b641699c733 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { doCheck = false; # requires root and the net meta = with stdenv.lib; { - homepage = https://www.isc.org/downloads/bind/; + homepage = "https://www.isc.org/downloads/bind/"; description = "Domain name server"; license = licenses.mpl20; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix index 8388968298e..cbf29b5d7c7 100644 --- a/pkgs/servers/dns/coredns/default.nix +++ b/pkgs/servers/dns/coredns/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "coredns"; - version = "1.6.7"; + version = "1.6.9"; goPackagePath = "github.com/coredns/coredns"; @@ -10,12 +10,10 @@ buildGoModule rec { owner = "coredns"; repo = "coredns"; rev = "v${version}"; - sha256 = "05r0dm8h23s5dafxisya48izc2ywpn5ywvhf9q6m20qkpwr8gd10"; + sha256 = "18c02ss0sxxg8lkhdmyaac2x5alfxsizf6jqhck8bqkf6hiyv5hc"; }; - modSha256 = "0wlffk6wkcyn2lphw2vmdsmzag0wxljcxrvm7sv3i124x2x3yvy4"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "07mlprwa37s6qpg5wvpljbvkiqcvrcljr27qsdwz49wldhdp6im6"; meta = with stdenv.lib; { homepage = "https://coredns.io"; diff --git a/pkgs/servers/dns/doh-proxy/default.nix b/pkgs/servers/dns/doh-proxy/default.nix index d94f34ebd21..e65021599ad 100644 --- a/pkgs/servers/dns/doh-proxy/default.nix +++ b/pkgs/servers/dns/doh-proxy/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://facebookexperimental.github.io/doh-proxy/; + homepage = "https://facebookexperimental.github.io/doh-proxy/"; description = "A proof of concept DNS-Over-HTTPS proxy"; license = licenses.bsd3; maintainers = [ maintainers.qyliss ]; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 7756c5fa3f1..73881ff1092 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Authoritative-only DNS server from .cz domain registry"; - homepage = https://knot-dns.cz; + homepage = "https://knot-dns.cz"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.vcunat ]; diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index ccb9a859059..b0be6c9b3b3 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -85,7 +85,7 @@ unwrapped = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Caching validating DNS resolver, from .cz domain registry"; - homepage = https://knot-resolver.cz; + homepage = "https://knot-resolver.cz"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.vcunat /* upstream developer */ ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix index 129fec2895b..b1eae68b891 100644 --- a/pkgs/servers/dns/powerdns/default.nix +++ b/pkgs/servers/dns/powerdns/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Authoritative DNS server"; - homepage = https://www.powerdns.com; + homepage = "https://www.powerdns.com"; platforms = platforms.unix; broken = stdenv.isDarwin; license = licenses.gpl2; diff --git a/pkgs/servers/documize-community/default.nix b/pkgs/servers/documize-community/default.nix index a6477d61e98..88cafa4d291 100644 --- a/pkgs/servers/documize-community/default.nix +++ b/pkgs/servers/documize-community/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs, Security }: +{ lib, buildGoModule, fetchFromGitHub, go-bindata, go-bindata-assetfs }: buildGoModule rec { pname = "documize-community"; @@ -15,8 +15,6 @@ buildGoModule rec { nativeBuildInputs = [ go-bindata go-bindata-assetfs ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "edition/community.go" ]; postInstall = '' @@ -25,10 +23,10 @@ buildGoModule rec { mv $out/bin/community $out/bin/documize ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Open source Confluence alternative for internal & external docs built with Golang + EmberJS"; license = licenses.agpl3; maintainers = with maintainers; [ ma27 elseym ]; - homepage = https://www.documize.com/; + homepage = "https://www.documize.com/"; }; } diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index ae6057c3469..a8f9ad8a912 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule { pname = "echoip"; @@ -13,8 +13,6 @@ buildGoModule { modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - outputs = [ "out" "index" ]; postInstall = '' @@ -22,8 +20,8 @@ buildGoModule { cp $src/index.html $index/index.html ''; - meta = with stdenv.lib; { - homepage = https://github.com/mpolden/echoip; + meta = with lib; { + homepage = "https://github.com/mpolden/echoip"; license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; diff --git a/pkgs/servers/elasticmq/default.nix b/pkgs/servers/elasticmq/default.nix index c1216becaf3..1ea669f573f 100644 --- a/pkgs/servers/elasticmq/default.nix +++ b/pkgs/servers/elasticmq/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/adamw/elasticmq; + homepage = "https://github.com/adamw/elasticmq"; description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; longDescription = '' diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 5a693fd7529..a5083a20cb7 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { meta = { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; - homepage = https://coreos.com/etcd/; + homepage = "https://coreos.com/etcd/"; maintainers = with maintainers; [offline]; platforms = with platforms; linux; }; diff --git a/pkgs/servers/exhibitor/default.nix b/pkgs/servers/exhibitor/default.nix index 1e05c856ab5..2d1ccaf6e26 100644 --- a/pkgs/servers/exhibitor/default.nix +++ b/pkgs/servers/exhibitor/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { mvn package --offline -Dmaven.repo.local=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd)/.m2 ''; meta = with stdenv.lib; { - homepage = https://github.com/soabase/exhibitor; + homepage = "https://github.com/soabase/exhibitor"; description = "ZooKeeper co-process for instance monitoring, backup/recovery, cleanup and visualization"; license = licenses.asl20; platforms = platforms.unix; diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index c8ddcf438f7..cd4d3116213 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://nginx.localdomain.pl/wiki/FcgiWrap; + homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap"; description = "Simple server for running CGI applications over FastCGI"; maintainers = with maintainers; [ lethalman ]; platforms = with platforms; linux; diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 7be7416d04d..38dad5e6fe8 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "An OSGi gateway"; - homepage = https://felix.apache.org; + homepage = "https://felix.apache.org"; license = licenses.asl20; maintainers = [ maintainers.sander ]; }; diff --git a/pkgs/servers/fileshare/default.nix b/pkgs/servers/fileshare/default.nix index 42f280eed23..721efb313eb 100644 --- a/pkgs/servers/fileshare/default.nix +++ b/pkgs/servers/fileshare/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.2.4"; src = fetchgit { - url = https://git.tkolb.de/Public/fileshare.git; + url = "https://git.tkolb.de/Public/fileshare.git"; rev = "v${version}"; sha256 = "03jrhk4vj6bc2w3lsrfjpfflb4laihysgs5i4cv097nr5cz32hyk"; }; @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small HTTP Server for quickly sharing files over the network"; longDescription = "Fileshare is a simple tool for sharing the contents of a directory via a webserver and optionally allowing uploads."; - homepage = https://git.tkolb.de/Public/fileshare; + homepage = "https://git.tkolb.de/Public/fileshare"; license = licenses.mit; maintainers = [ maintainers.esclear ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index d80508bfe44..063eaec7ded 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { meta = { description = "SQL relational database management system"; - homepage = https://www.firebirdnews.org; + homepage = "https://www.firebirdnews.org"; license = ["IDPL" "Interbase-1.0"]; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/foundationdb/cmake.nix b/pkgs/servers/foundationdb/cmake.nix index 512842b3a6a..7ad27e78d3a 100644 --- a/pkgs/servers/foundationdb/cmake.nix +++ b/pkgs/servers/foundationdb/cmake.nix @@ -121,7 +121,7 @@ let meta = with stdenv.lib; { description = "Open source, distributed, transactional key-value store"; - homepage = https://www.foundationdb.org; + homepage = "https://www.foundationdb.org"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/servers/foundationdb/python.nix b/pkgs/servers/foundationdb/python.nix index e4256fab0fa..29d1f0906df 100644 --- a/pkgs/servers/foundationdb/python.nix +++ b/pkgs/servers/foundationdb/python.nix @@ -16,7 +16,7 @@ buildPythonPackage { meta = with lib; { description = "Python bindings for FoundationDB"; - homepage = https://www.foundationdb.org; + homepage = "https://www.foundationdb.org"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/servers/foundationdb/vsmake.nix b/pkgs/servers/foundationdb/vsmake.nix index a7eedb8408b..262ea39ca5b 100644 --- a/pkgs/servers/foundationdb/vsmake.nix +++ b/pkgs/servers/foundationdb/vsmake.nix @@ -141,7 +141,7 @@ let meta = with gcc6Stdenv.lib; { description = "Open source, distributed, transactional key-value store"; - homepage = https://www.foundationdb.org; + homepage = "https://www.foundationdb.org"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index c7d6c509f09..9c80b7e7db3 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "man" "doc" ]; meta = with stdenv.lib; { - homepage = https://freeradius.org/; + homepage = "https://freeradius.org/"; description = "A modular, high performance free RADIUS suite"; license = licenses.gpl2; maintainers = with maintainers; [ sheenobu willibutz fpletz lheckemann elseym ]; diff --git a/pkgs/servers/ftp/bftpd/default.nix b/pkgs/servers/ftp/bftpd/default.nix index 34757462a17..bb35ec075dd 100644 --- a/pkgs/servers/ftp/bftpd/default.nix +++ b/pkgs/servers/ftp/bftpd/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { inherit version; description = "A minimal ftp server"; downloadPage = "http://bftpd.sf.net/download.html"; - homepage = http://bftpd.sf.net/; + homepage = "http://bftpd.sf.net/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 5f6e7d466cf..020d2967f3e 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, secure, production-quality and standard-conformant FTP server"; - homepage = https://www.pureftpd.org; + homepage = "https://www.pureftpd.org"; license = licenses.isc; # with some parts covered by BSD3(?) maintainers = [ maintainers.lethalman ]; platforms = platforms.linux; diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index e66d5581b3c..ff59ad53ed1 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security, enableStatic ? false }: +{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; @@ -14,10 +14,8 @@ buildGoModule rec { modSha256 = "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildPhase = '' - make build${stdenv.lib.optionalString enableStatic "-static"} + make build${lib.optionalString enableStatic "-static"} ''; installPhase = '' @@ -27,7 +25,7 @@ buildGoModule rec { cp -r config $out/share ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Modern & minimalistic load balancer for the Сloud era"; homepage = "http://gobetween.io"; license = licenses.mit; diff --git a/pkgs/servers/gopher/gofish/default.nix b/pkgs/servers/gopher/gofish/default.nix index 1bec32e5125..d8091c4e98d 100644 --- a/pkgs/servers/gopher/gofish/default.nix +++ b/pkgs/servers/gopher/gofish/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight Gopher server"; - homepage = http://gofish.sourceforge.net/; + homepage = "http://gofish.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 3e5dfc87f0e..35c6e145243 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "gortr"; @@ -12,9 +12,7 @@ buildGoModule rec { }; modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "The RPKI-to-Router server used at Cloudflare"; homepage = "https://github.com/cloudflare/gortr/"; license = licenses.gpl3; diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 275aaa5d68b..f2014aac9fd 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -1,11 +1,11 @@ { stdenv , buildGoPackage +, lib , fetchFromGitHub , buildGoModule , packr , sqlite , callPackage -, Security }: buildGoModule rec { @@ -28,8 +28,7 @@ buildGoModule rec { --replace 'Version = "unknown"' 'Version = "${version}"' ''; - buildInputs = [ sqlite ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ sqlite ]; nativeBuildInputs = [ packr ]; diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index a9cf6c1da47..e7d0e6f7c65 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Share your terminal as a web application"; - homepage = https://github.com/yudai/gotty; + homepage = "https://github.com/yudai/gotty"; maintainers = with maintainers; [ ]; license = licenses.mit; }; diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix index 3cd36858204..1a5032772ab 100644 --- a/pkgs/servers/gpm/default.nix +++ b/pkgs/servers/gpm/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.nico.schottelius.org/software/gpm/; + homepage = "https://www.nico.schottelius.org/software/gpm/"; description = "A daemon that provides mouse support on the Linux console"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.cygwin; diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 8ea060a8255..4d66e666ed5 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - scons pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc + scons.py2 pkgconfig docbook_xml_dtd_412 docbook_xsl xmlto bc python2Packages.python python2Packages.wrapPython ]; @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { diagnostic monitoring and profiling of receivers and feeding location-aware applications GPS/AIS logs for diagnostic purposes. ''; - homepage = http://catb.org/gpsd/; + homepage = "http://catb.org/gpsd/"; license = "BSD-style"; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor rasendubi ]; diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 718d4b1bcde..2694765a948 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "2.6.1"; + version = "2.6.2"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "1fq1zlxxhpcxj67xxlgf20dia95xcimgnm13cr56sy9f2vjx58m6"; + sha256 = "1cjkyv50vwx24xb1mxgy51mr4qqsqgixjww06rql77d9czmmd94k"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index ff127e705e5..b7f56cfe446 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Java SQL database"; - homepage = http://www.h2database.com/html/main.html; + homepage = "http://www.h2database.com/html/main.html"; license = licenses.mpl20; platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ mahe ]; diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index 3d05933f513..e964e956c55 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "A distributed, scalable, big data store"; - homepage = https://hbase.apache.org; + homepage = "https://hbase.apache.org"; license = licenses.asl20; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/headphones/default.nix b/pkgs/servers/headphones/default.nix index aab651d5a4a..7259104d145 100644 --- a/pkgs/servers/headphones/default.nix +++ b/pkgs/servers/headphones/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { - name = "headphones-${version}"; + pname = "headphones"; version = "0.5.19"; src = fetchFromGitHub { diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix index 442796b8065..c81cd80eb7a 100644 --- a/pkgs/servers/hitch/default.nix +++ b/pkgs/servers/hitch/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hitch is a libev-based high performance SSL/TLS proxy by Varnish Software"; - homepage = https://hitch-tls.org/; + homepage = "https://hitch-tls.org/"; license = licenses.bsd2; maintainers = [ maintainers.jflanglois ]; platforms = platforms.linux; diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch new file mode 100644 index 00000000000..52d2daf80b0 --- /dev/null +++ b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -0,0 +1,46 @@ +From 80f39643bb4d25f8ffcbd92804844961b303f4d0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> +Date: Thu, 9 Apr 2020 07:20:46 +0100 +Subject: [PATCH] setup.py: relax dependencies +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jörg Thalheim <joerg@thalheim.io> +--- + setup.py | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/setup.py b/setup.py +index f53af0ee1..ff4227487 100755 +--- a/setup.py ++++ b/setup.py +@@ -32,10 +32,10 @@ PROJECT_URLS = { + PACKAGES = find_packages(exclude=["tests", "tests.*"]) + + REQUIRES = [ +- "aiohttp==3.6.1", ++ "aiohttp>=3.6.1", + "astral==1.10.1", + "async_timeout==3.0.1", +- "attrs==19.3.0", ++ "attrs>=19.3.0", + "bcrypt==3.1.7", + "certifi>=2019.11.28", + "ciso8601==2.1.3", +@@ -47,9 +47,9 @@ REQUIRES = [ + "pip>=8.0.3", + "python-slugify==4.0.0", + "pytz>=2019.03", +- "pyyaml==5.3.1", +- "requests==2.23.0", +- "ruamel.yaml==0.15.100", ++ "pyyaml>=5.2", ++ "requests>=2.22", ++ "ruamel.yaml>=0.15.100", + "voluptuous==0.11.7", + "voluptuous-serialize==2.3.0", + ] +-- +2.25.1 + diff --git a/pkgs/servers/home-assistant/appdaemon.nix b/pkgs/servers/home-assistant/appdaemon.nix index 258e46db199..2c0854d0a8b 100644 --- a/pkgs/servers/home-assistant/appdaemon.nix +++ b/pkgs/servers/home-assistant/appdaemon.nix @@ -63,7 +63,7 @@ in python.pkgs.buildPythonApplication rec { meta = with lib; { description = "Sandboxed python execution environment for writing automation apps for Home Assistant"; - homepage = https://github.com/home-assistant/appdaemon; + homepage = "https://github.com/home-assistant/appdaemon"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg dotlambda ]; }; diff --git a/pkgs/servers/home-assistant/cli.nix b/pkgs/servers/home-assistant/cli.nix index 419462dcf85..17e5559821e 100644 --- a/pkgs/servers/home-assistant/cli.nix +++ b/pkgs/servers/home-assistant/cli.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Command-line tool for Home Assistant"; - homepage = https://github.com/home-assistant/home-assistant-cli; + homepage = "https://github.com/home-assistant/home-assistant-cli"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda ]; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 6b18dd30f30..906ba777a6b 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 = "0.106.6"; + version = "0.108.2"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -15,8 +15,7 @@ "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: alarmdecoder - "alarmdotcom" = ps: with ps; [ ]; # missing inputs: pyalarmdotcom + "alarmdecoder" = ps: with ps; [ alarmdecoder]; "alert" = ps: with ps; [ ]; "alexa" = ps: with ps; [ aiohttp-cors]; "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond @@ -55,9 +54,10 @@ "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy "auth" = ps: with ps; [ aiohttp-cors]; "automatic" = ps: with ps; [ aiohttp-cors]; # missing inputs: aioautomatic - "automation" = ps: with ps; [ aiohttp-cors]; + "automation" = ps: with ps; [ ]; "avea" = ps: with ps; [ ]; # missing inputs: avea "avion" = ps: with ps; [ ]; # missing inputs: avion + "avri" = ps: with ps; [ ]; # missing inputs: avri-api "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore "axis" = ps: with ps; [ ]; # missing inputs: axis @@ -83,9 +83,10 @@ "bluetooth_tracker" = ps: with ps; [ bt_proximity]; # missing inputs: pybluez "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi + "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop - "braviatv" = ps: with ps; [ getmac]; # missing inputs: bravia-tv + "braviatv" = ps: with ps; [ bravia-tv getmac]; "broadlink" = ps: with ps; [ broadlink]; "brother" = ps: with ps; [ ]; # missing inputs: brother "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan @@ -155,7 +156,7 @@ "dialogflow" = ps: with ps; [ aiohttp-cors]; "digital_ocean" = ps: with ps; [ digital-ocean]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower - "directv" = ps: with ps; [ ]; # missing inputs: directpy + "directv" = ps: with ps; [ ]; # missing inputs: directv "discogs" = ps: with ps; [ discogs_client]; "discord" = ps: with ps; [ discordpy]; "discovery" = ps: with ps; [ netdisco]; @@ -187,6 +188,7 @@ "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan] "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax + "edl21" = ps: with ps; [ ]; # missing inputs: pysml "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox "efergy" = ps: with ps; [ ]; "egardia" = ps: with ps; [ ]; # missing inputs: pythonegardia @@ -217,6 +219,7 @@ "eufy" = ps: with ps; [ ]; # missing inputs: lakeside "everlights" = ps: with ps; [ ]; # missing inputs: pyeverlights "evohome" = ps: with ps; [ ]; # missing inputs: evohome-async + "ezviz" = ps: with ps; [ ]; # missing inputs: pyezviz "facebook" = ps: with ps; [ ]; "facebox" = ps: with ps; [ ]; "fail2ban" = ps: with ps; [ ]; @@ -299,6 +302,7 @@ "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality + "griddy" = ps: with ps; [ ]; # missing inputs: griddypower "group" = ps: with ps; [ ]; "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player @@ -307,7 +311,7 @@ "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr "harmony" = ps: with ps; [ ]; # missing inputs: aioharmony - "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "hassio" = ps: with ps; [ aiohttp-cors]; "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC @@ -318,14 +322,13 @@ "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1 "history" = ps: with ps; [ aiohttp-cors sqlalchemy]; - "history_graph" = ps: with ps; [ aiohttp-cors sqlalchemy]; "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy]; "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "homeassistant" = ps: with ps; [ ]; "homekit" = ps: with ps; [ ]; # missing inputs: HAP-python - "homekit_controller" = ps: with ps; [ ]; # missing inputs: homekit[IP] + "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP] "homematic" = ps: with ps; [ pyhomematic]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks @@ -342,6 +345,7 @@ "hydrawise" = ps: with ps; [ ]; # missing inputs: hydrawiser "hyperion" = ps: with ps; [ ]; "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm + "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink "icloud" = ps: with ps; [ pyicloud]; "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py @@ -368,6 +372,7 @@ "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma + "ipp" = ps: with ps; [ ]; # missing inputs: pyipp "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator @@ -427,7 +432,7 @@ "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy "lovelace" = ps: with ps; [ ]; - "luci" = ps: with ps; [ ]; # missing inputs: openwrt-luci-rpc + "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 @@ -452,7 +457,7 @@ "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate "meraki" = ps: with ps; [ aiohttp-cors]; "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird - "met" = ps: with ps; [ ]; # missing inputs: pyMetno + "met" = ps: with ps; [ pymetno]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance vigilancemeteo "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint @@ -466,7 +471,7 @@ "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ getmac]; # missing inputs: mcstatus + "minecraft_server" = ps: with ps; [ aiodns getmac]; # missing inputs: mcstatus "minio" = ps: with ps; [ minio]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; @@ -477,7 +482,6 @@ "mold_indicator" = ps: with ps; [ ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; - "mopar" = ps: with ps; [ ]; # missing inputs: motorparts "mpchc" = ps: with ps; [ ]; "mpd" = ps: with ps; [ mpd2]; "mqtt" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; @@ -496,7 +500,7 @@ "n26" = ps: with ps; [ ]; # missing inputs: n26 "nad" = ps: with ps; [ ]; # missing inputs: nad_receiver "namecheapdns" = ps: with ps; [ defusedxml]; - "nanoleaf" = ps: with ps; [ ]; # missing inputs: pynanoleaf + "nanoleaf" = ps: with ps; [ pynanoleaf]; "neato" = ps: with ps; [ pybotvac]; "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi "nello" = ps: with ps; [ ]; # missing inputs: pynello @@ -508,7 +512,9 @@ "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio + "nexia" = ps: with ps; [ ]; # missing inputs: nexia "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext + "nextcloud" = ps: with ps; [ ]; # missing inputs: nextcloudmonitor "nfandroidtv" = ps: with ps; [ ]; "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient @@ -517,7 +523,7 @@ "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ ]; "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa - "norway_air" = ps: with ps; [ ]; # missing inputs: pyMetno + "norway_air" = ps: with ps; [ pymetno]; "notify" = ps: with ps; [ ]; "notion" = ps: with ps; [ ]; # missing inputs: aionotion "nsw_fuel_station" = ps: with ps; [ ]; # missing inputs: nsw-fuel-api-client @@ -584,6 +590,7 @@ "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint + "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client]; @@ -600,6 +607,7 @@ "pushover" = ps: with ps; [ pushover-complete]; "pushsafer" = ps: with ps; [ ]; "pvoutput" = ps: with ps; [ ]; + "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ restrictedpython]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent @@ -607,6 +615,7 @@ "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar "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]; # missing inputs: rachiopy "radarr" = ps: with ps; [ ]; @@ -635,7 +644,7 @@ "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api "rmvtransport" = ps: with ps; [ ]; # missing inputs: PyRMVtransport "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API - "roku" = ps: with ps; [ ]; # missing inputs: roku + "roku" = ps: with ps; [ roku]; "roomba" = ps: with ps; [ ]; # missing inputs: roombapy "route53" = ps: with ps; [ boto3]; # missing inputs: ipify "rova" = ps: with ps; [ ]; # missing inputs: rova @@ -652,9 +661,10 @@ "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj "salt" = ps: with ps; [ ]; # missing inputs: saltbox - "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] + "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket] "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; + "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter "scrape" = ps: with ps; [ beautifulsoup4]; "script" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate @@ -677,7 +687,7 @@ "shopping_list" = ps: with ps; [ aiohttp-cors]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 "sigfox" = ps: with ps; [ ]; - "sighthound" = ps: with ps; [ ]; # missing inputs: simplehound + "sighthound" = ps: with ps; [ pillow]; # missing inputs: simplehound "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python @@ -687,7 +697,7 @@ "sky_hub" = ps: with ps; [ ]; "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] "skybell" = ps: with ps; [ ]; # missing inputs: skybellpy - "slack" = ps: with ps; [ ]; # missing inputs: slacker + "slack" = ps: with ps; [ ]; # missing inputs: slackclient "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ ]; # missing inputs: pysma @@ -760,6 +770,7 @@ "tado" = ps: with ps; [ ]; # missing inputs: python-tado "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility + "tankerkoenig" = ps: with ps; [ ]; # missing inputs: pytankerkoenig "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli "tcp" = ps: with ps; [ ]; @@ -865,7 +876,6 @@ "waze_travel_time" = ps: with ps; [ WazeRouteCalculator]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors]; - "weblink" = ps: with ps; [ ]; "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv "websocket_api" = ps: with ps; [ aiohttp-cors]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 2b571fe96bf..51b6d94860c 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.106.6"; + hassVersion = "0.108.2"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -75,7 +75,9 @@ in with py.pkgs; buildPythonApplication rec { disabled = pythonOlder "3.5"; - patches = [ ./relax-importlib-metadata-pyaml.patch ]; + patches = [ + ./0001-setup.py-relax-dependencies.patch + ]; inherit availableComponents; @@ -84,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "11kv5lmm8nxp7yv3w43mzmgzkafddy0z6wl2878p96iyil1w7qhb"; + sha256 = "0v4i1ak7pkpycas0mzdmxgc42xgfymwx2b0a2a4h13c4z46pbs2l"; }; propagatedBuildInputs = [ @@ -93,38 +95,33 @@ in with py.pkgs; buildPythonApplication rec { pyjwt cryptography pip python-slugify pytz pyyaml requests ruamel_yaml setuptools voluptuous voluptuous-serialize # From http, frontend and recorder components and auth.mfa_modules.totp - sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode + sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601 ] ++ componentBuildInputs ++ extraBuildInputs; checkInputs = [ - asynctest pytest pytest-aiohttp requests-mock pydispatcher aiohue netdisco - hass-nabucasa defusedxml + asynctest pytest pytest-aiohttp requests-mock hass-nabucasa netdisco pydispatcher ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "aiohttp==3.6.1" "aiohttp" \ - --replace "attrs==19.2.0" "attrs" \ - --replace "ruamel.yaml==0.15.100" "ruamel.yaml" - ''; - checkPhase = '' # - components' dependencies are not included, so they cannot be tested # - test_merge_id_schema requires pyqwikswitch + # - test_loader.py tries to load not-packaged dependencies # - unclear why test_merge fails: assert merge_log_err.call_count != 0 - py.test --ignore tests/components -k "not test_merge_id_schema and not test_merge" + # - test_setup_safe_mode_if_no_frontend: requires dependencies for components we have not packaged + py.test --ignore tests/components --ignore tests/test_loader.py -k "not test_setup_safe_mode_if_no_frontend and not test_merge_id_schema and not test_merge" + # Some basic components should be tested however py.test \ - tests/components/{api,config,configurator,demo,discovery,frontend,group,history,history_graph} \ + tests/components/{api,config,configurator,demo,discovery,frontend,group,history} \ tests/components/{homeassistant,http,logger,script,shell_command,system_log,websocket_api} ''; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; meta = with lib; { - homepage = https://home-assistant.io/; + homepage = "https://home-assistant.io/"; description = "Open-source home automation platform running on Python 3"; license = licenses.asl20; - maintainers = with maintainers; [ dotlambda globin ]; + maintainers = with maintainers; [ dotlambda globin mic92 ]; }; } diff --git a/pkgs/servers/home-assistant/esphome.nix b/pkgs/servers/home-assistant/esphome.nix index 12b36de4965..2dc023df5a2 100644 --- a/pkgs/servers/home-assistant/esphome.nix +++ b/pkgs/servers/home-assistant/esphome.nix @@ -33,11 +33,9 @@ in python.pkgs.buildPythonApplication rec { protobuf ]; + # remove all version pinning (E.g tornado==5.1.1 -> tornado) postPatch = '' - substituteInPlace setup.py \ - --replace "protobuf==3.10.0" "protobuf~=3.10" \ - --replace "paho-mqtt==1.4.0" "paho-mqtt~=1.4" \ - --replace "tornado==5.1.1" "tornado~=5.1" + sed -i -e "s/==[0-9.]*//" setup.py ''; makeWrapperArgs = [ @@ -49,11 +47,14 @@ in python.pkgs.buildPythonApplication rec { ]; # Platformio will try to access the network - doCheck = false; + # Instead, run the executable + checkPhase = '' + $out/bin/esphome --help > /dev/null + ''; meta = with lib; { description = "Make creating custom firmwares for ESP32/ESP8266 super easy"; - homepage = https://esphome.io/; + homepage = "https://esphome.io/"; license = licenses.mit; maintainers = with maintainers; [ dotlambda globin ]; }; diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 1446518fbc5..9e12016320c 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200220.5"; + version = "20200407.2"; src = fetchPypi { inherit pname version; - sha256 = "0nc44r5ybq0prsz2yid622i0xr7q0qrc4ymbk69bqg6jrmjpbdl1"; + sha256 = "0krwn67bkybjb69daik6dki5hm36xs4nbfwqkh0q7ami1xr1f56d"; }; # no Python tests implemented @@ -16,7 +16,7 @@ buildPythonPackage rec { meta = with lib; { description = "Polymer frontend for Home Assistant"; - homepage = https://github.com/home-assistant/home-assistant-polymer; + homepage = "https://github.com/home-assistant/home-assistant-polymer"; license = licenses.asl20; maintainers = with maintainers; [ dotlambda globin ]; }; diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index a5c6e9d0961..1467c3b528c 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -36,7 +36,9 @@ PKG_PREFERENCES = { # Use python3Packages.youtube-dl-light instead of python3Packages.youtube-dl "youtube-dl": "youtube-dl-light", "tensorflow-bin": "tensorflow", + "tensorflow-bin_2": "tensorflow", "tensorflowWithoutCuda": "tensorflow", + "tensorflow-build_2": "tensorflow", } @@ -79,7 +81,8 @@ def parse_components(version: str = "master"): # Recursively get the requirements of a component and its dependencies def get_reqs(components, component): requirements = set(components[component]["requirements"]) - for dependency in components[component]["dependencies"]: + deps = components[component].get("dependencies", []) + for dependency in deps: requirements.update(get_reqs(components, dependency)) return requirements diff --git a/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch b/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch deleted file mode 100644 index d35e05c6cd7..00000000000 --- a/pkgs/servers/home-assistant/relax-importlib-metadata-pyaml.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/setup.py b/setup.py -index 7f9155d9a..f90a0d965 100755 ---- a/setup.py -+++ b/setup.py -@@ -38,7 +38,7 @@ REQUIRES = [ - "attrs==19.3.0", - "bcrypt==3.1.7", - "certifi>=2019.11.28", -- "importlib-metadata==1.5.0", -+ "importlib-metadata>=1.3.0", - "jinja2>=2.10.3", - "PyJWT==1.7.1", - # PyJWT has loose dependency. We want the latest one. -@@ -46,7 +46,7 @@ REQUIRES = [ - "pip>=8.0.3", - "python-slugify==4.0.0", - "pytz>=2019.03", -- "pyyaml==5.3", -+ "pyyaml>=5.2", - "requests==2.22.0", - "ruamel.yaml==0.15.100", - "voluptuous==0.11.7", diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 252365098dd..2e3d936bbe1 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Apache HTTPD, the world's most popular web server"; - homepage = http://httpd.apache.org/; + homepage = "http://httpd.apache.org/"; license = licenses.asl20; platforms = stdenv.lib.platforms.linux ++ stdenv.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 6bad43a62f0..d696ece8267 100644 --- a/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix +++ b/pkgs/servers/http/apache-modules/mod_auth_mellon/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/UNINETT/mod_auth_mellon; + homepage = "https://github.com/UNINETT/mod_auth_mellon"; description = "An Apache module with a simple SAML 2.0 service provider"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index d681146eee5..58314018132 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://0pointer.de/lennart/projects/mod_dnssd; + homepage = "http://0pointer.de/lennart/projects/mod_dnssd"; description = "Provide Zeroconf support via DNS-SD using Avahi"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix index 2b8693f7379..9abd08baa09 100644 --- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix +++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { name = "mod_evasive-1.10.1"; src = fetchurl { - url = http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz; + url = "http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz"; sha256 = "0rsnx50rjv6xygbp9r0gyss7xqdkcb0hy3wh9949jf1im8wm3i07"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.zdziarski.com/blog/?page_id=442; + 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; }; diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index a6f4f992671..4922076266b 100644 --- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/FastCGI-Archives/mod_fastcgi; + homepage = "https://github.com/FastCGI-Archives/mod_fastcgi"; description = "Provide support for the FastCGI protocol"; longDescription = '' diff --git a/pkgs/servers/http/apache-modules/mod_python/default.nix b/pkgs/servers/http/apache-modules/mod_python/default.nix index 6aed1481ddf..39c568d1d49 100644 --- a/pkgs/servers/http/apache-modules/mod_python/default.nix +++ b/pkgs/servers/http/apache-modules/mod_python/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ apacheHttpd python2 ]; meta = { - homepage = http://modpython.org/; + homepage = "http://modpython.org/"; description = "An Apache module that embeds the Python interpreter within the server"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix index 0e4804c1a39..c8f95e685ab 100644 --- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix +++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/GrahamDumpleton/mod_wsgi; + 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; diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 65ec2510d34..99dd63c7ce6 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A caching proxy specialized for linux distribution files"; - homepage = https://www.unix-ag.uni-kl.de/~bloch/acng/; + homepage = "https://www.unix-ag.uni-kl.de/~bloch/acng/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.makefu ]; diff --git a/pkgs/servers/http/couchdb/2.0.0.nix b/pkgs/servers/http/couchdb/2.0.0.nix index a9d806f9de8..3f6f00e1bdb 100644 --- a/pkgs/servers/http/couchdb/2.0.0.nix +++ b/pkgs/servers/http/couchdb/2.0.0.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = http://couchdb.apache.org; + homepage = "http://couchdb.apache.org"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index f2e5e67dd7a..b8807532181 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; - homepage = http://couchdb.apache.org; + homepage = "http://couchdb.apache.org"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ ]; diff --git a/pkgs/servers/http/darkhttpd/default.nix b/pkgs/servers/http/darkhttpd/default.nix index 42de9904f90..4bcb16a04ea 100644 --- a/pkgs/servers/http/darkhttpd/default.nix +++ b/pkgs/servers/http/darkhttpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small and secure static webserver"; - homepage = https://unix4lyfe.org/darkhttpd/; + homepage = "https://unix4lyfe.org/darkhttpd/"; license = licenses.bsd3; maintainers = with maintainers; [ bobvanderlinden ]; platforms = platforms.all; diff --git a/pkgs/servers/http/gatling/default.nix b/pkgs/servers/http/gatling/default.nix index 395504e4970..bf69d902aa5 100644 --- a/pkgs/servers/http/gatling/default.nix +++ b/pkgs/servers/http/gatling/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance web server"; - homepage = http://www.fefe.de/gatling/; + homepage = "http://www.fefe.de/gatling/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.the-kenny ]; diff --git a/pkgs/servers/http/h2o/default.nix b/pkgs/servers/http/h2o/default.nix index d599956cfda..999016e4bd9 100644 --- a/pkgs/servers/http/h2o/default.nix +++ b/pkgs/servers/http/h2o/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimized HTTP/1 and HTTP/2 server"; - homepage = https://h2o.examp1e.net; + homepage = "https://h2o.examp1e.net"; license = licenses.mit; maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/servers/http/hiawatha/default.nix b/pkgs/servers/http/hiawatha/default.nix index 4e799774569..b731d4d0b34 100644 --- a/pkgs/servers/http/hiawatha/default.nix +++ b/pkgs/servers/http/hiawatha/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.hiawatha-webserver.org; + homepage = "https://www.hiawatha-webserver.org"; description = "An advanced and secure webserver"; license = licenses.gpl2; platforms = platforms.unix; # "Hiawatha runs perfectly on Linux, BSD and MacOS X" diff --git a/pkgs/servers/http/hyp/default.nix b/pkgs/servers/http/hyp/default.nix index 3a1eb50f05b..6a16ee412f5 100644 --- a/pkgs/servers/http/hyp/default.nix +++ b/pkgs/servers/http/hyp/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { - name = "hyp-server-${version}"; + pname = "hyp-server"; version = "1.2.0"; - src = fetchurl { - url = "mirror://pypi/h/hyp-server/${name}.tar.gz"; + src = python3Packages.fetchPypi { + inherit pname version; sha256 = "1lafjdcn9nnq6xc3hhyizfwh6l69lc7rixn6dx65aq71c913jc15"; }; meta = with stdenv.lib; { description = "Hyperminimal https server"; - homepage = https://github.com/rnhmjoj/hyp; + homepage = "https://github.com/rnhmjoj/hyp"; license = with licenses; [gpl3Plus mit]; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index c5702132d28..b470a127aee 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "jboss-as-7.1.1.Final"; src = fetchurl { - url = https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz; + url = "https://download.jboss.org/jbossas/7.1/jboss-as-7.1.1.Final/jboss-as-7.1.1.Final.tar.gz"; sha256 = "1bdjw0ib9qr498vpfbg8klqw6rl11vbz7vwn6gp1r5gpqkd3zzc8"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.jboss.org/; + homepage = "http://www.jboss.org/"; description = "Open Source J2EE application server"; license = licenses.lgpl21; maintainers = [ maintainers.sander ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 462151400fd..01a07a9f502 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight high-performance web server"; - homepage = http://www.lighttpd.net/; + homepage = "http://www.lighttpd.net/"; license = stdenv.lib.licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix index 37a0a98d4e0..98bb27221c3 100644 --- a/pkgs/servers/http/mini-httpd/default.nix +++ b/pkgs/servers/http/mini-httpd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://mini-httpd.nongnu.org/; + homepage = "http://mini-httpd.nongnu.org/"; description = "minimalistic high-performance web server"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index 3c29ddb8e0a..be659114d47 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { built-in features. Share your files in minutes! ''; - homepage = https://www.gnu.org/software/myserver/; + homepage = "https://www.gnu.org/software/myserver/"; license = lib.licenses.gpl3Plus; diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 31a501332ff..67a914b6a98 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -135,7 +135,7 @@ stdenv.mkDerivation { meta = if meta != null then meta else { description = "A reverse proxy and lightweight webserver"; - homepage = http://nginx.org; + homepage = "http://nginx.org"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ]; diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 8626dd4a762..b382d2891f9 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.17.8"; - sha256 = "0nwn4md8sxhks2j77qq1nvk5pfz3yykfhh2b507b6l2idp7kxllp"; + version = "1.17.9"; + sha256 = "12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx"; } diff --git a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch b/pkgs/servers/http/nginx/nix-etag-1.15.4.patch index c1473ccdb1b..d001b842f33 100644 --- a/pkgs/servers/http/nginx/nix-etag-1.15.4.patch +++ b/pkgs/servers/http/nginx/nix-etag-1.15.4.patch @@ -2,38 +2,35 @@ This patch makes it possible to serve static content from Nix store paths, by using the hash of the store path for the ETag header. diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c -index cb49ef74..f88dc77c 100644 +index cb49ef74..7b456993 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c -@@ -1583,6 +1583,7 @@ ngx_http_set_etag(ngx_http_request_t *r) +@@ -1583,6 +1583,8 @@ ngx_http_set_etag(ngx_http_request_t *r) { ngx_table_elt_t *etag; ngx_http_core_loc_conf_t *clcf; + u_char *real, *ptr1, *ptr2; ++ ngx_err_t err; clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); -@@ -1598,16 +1599,62 @@ ngx_http_set_etag(ngx_http_request_t *r) +@@ -1598,16 +1600,60 @@ ngx_http_set_etag(ngx_http_request_t *r) etag->hash = 1; ngx_str_set(&etag->key, "ETag"); - etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3); - if (etag->value.data == NULL) { +- etag->hash = 0; +- return NGX_ERROR; ++ err = ngx_errno; + real = ngx_realpath(clcf->root.data, NULL); ++ ngx_set_errno(err); + -+ if (real == NULL) { - etag->hash = 0; - return NGX_ERROR; - } - -- etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"", -- r->headers_out.last_modified_time, -- r->headers_out.content_length_n) -- - etag->value.data; + #define NIX_STORE_DIR "@nixStoreDir@" + #define NIX_STORE_LEN @nixStoreDirLen@ + + if (r->headers_out.last_modified_time == 1 ++ && real != NULL + && !ngx_strncmp(real, NIX_STORE_DIR, NIX_STORE_LEN) + && real[NIX_STORE_LEN] == '/' + && real[NIX_STORE_LEN + 1] != '\0') @@ -76,8 +73,12 @@ index cb49ef74..f88dc77c 100644 + r->headers_out.last_modified_time, + r->headers_out.content_length_n) + - etag->value.data; -+ } -+ + } + +- etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"", +- r->headers_out.last_modified_time, +- r->headers_out.content_length_n) +- - etag->value.data; + ngx_free(real); r->headers_out.etag = etag; diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 4b5b4259ca4..0e87b971985 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -37,7 +37,7 @@ callPackage ../nginx/generic.nix args rec { meta = { description = "A fast web application server built on Nginx"; - homepage = http://openresty.org; + homepage = "http://openresty.org"; license = lib.licenses.bsd2; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ]; diff --git a/pkgs/servers/http/pshs/default.nix b/pkgs/servers/http/pshs/default.nix index 19d0b9a2641..f83ab4642f0 100644 --- a/pkgs/servers/http/pshs/default.nix +++ b/pkgs/servers/http/pshs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Pretty small HTTP server - a command-line tool to share files"; - homepage = https://github.com/mgorny/pshs; + homepage = "https://github.com/mgorny/pshs"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/http/redstore/default.nix b/pkgs/servers/http/redstore/default.nix index 7d592d0256b..80f2434e529 100644 --- a/pkgs/servers/http/redstore/default.nix +++ b/pkgs/servers/http/redstore/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "An HTTP interface to Redland RDF store"; - homepage = https://www.aelius.com/njh/redstore/; + homepage = "https://www.aelius.com/njh/redstore/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = with stdenv.lib.platforms; linux ++ freebsd ++ gnu; diff --git a/pkgs/servers/http/showoff/Gemfile.lock b/pkgs/servers/http/showoff/Gemfile.lock index ccf0415d440..34b90b3fd2f 100644 --- a/pkgs/servers/http/showoff/Gemfile.lock +++ b/pkgs/servers/http/showoff/Gemfile.lock @@ -70,4 +70,4 @@ DEPENDENCIES showoff BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/servers/http/showoff/default.nix b/pkgs/servers/http/showoff/default.nix index 136fcb3e07c..0a10c806e5e 100644 --- a/pkgs/servers/http/showoff/default.nix +++ b/pkgs/servers/http/showoff/default.nix @@ -10,7 +10,7 @@ bundlerApp { meta = with lib; { description = "A slideshow presentation tool with a twist"; longDescription = "It runs as a web application, with audience interactivity features. This means that your audience can follow along in their own browsers, can download supplemental materials, can participate in quizzes or polls, post questions for the presenter, etc. By default, their slideshows will synchronize with the presenter, but they can switch to self-navigation mode"; - homepage = https://puppetlabs.github.io/showoff/; + homepage = "https://puppetlabs.github.io/showoff/"; license = with licenses; mit; platforms = platforms.unix; maintainers = with maintainers; [ mwilsoninsight nicknovitski ]; diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 1eeb5a8c4dd..1593ad0c06f 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { meta = { description = "A web server based on Nginx and has many advanced features, originated by Taobao."; - homepage = https://tengine.taobao.org; + homepage = "https://tengine.taobao.org"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix index b72439bc37a..6ff1026ba0c 100644 --- a/pkgs/servers/http/thttpd/default.nix +++ b/pkgs/servers/http/thttpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny/turbo/throttling HTTP server"; - homepage = http://www.acme.com/software/thttpd/; + homepage = "http://www.acme.com/software/thttpd/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 3908db5ea71..78e108d8c8d 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -21,7 +21,7 @@ let ''; meta = { - homepage = https://tomcat.apache.org/; + homepage = "https://tomcat.apache.org/"; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; platforms = with lib.platforms; all; maintainers = with lib.maintainers; [ danbst ]; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index c56e994ed54..1e3ddb4ad8f 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses -, withPHP72 ? false, php72 -, withPHP73 ? true, php73 +, withPHP72 ? false, php72base +, withPHP73 ? true, php73base , withPerl528 ? false, perl528 , withPerl530 ? true, perl530 , withPerldevel ? false, perldevel @@ -16,7 +16,19 @@ with stdenv.lib; -stdenv.mkDerivation rec { +let + phpConfig = { + config.php.embed = true; + config.php.apxs2 = false; + config.php.systemd = false; + config.php.phpdbg = false; + config.php.cgi = false; + config.php.fpm = false; + }; + + php72-unit = php72base.override phpConfig; + php73-unit = php73base.override phpConfig; +in stdenv.mkDerivation rec { version = "1.16.0"; pname = "unit"; @@ -37,8 +49,8 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optional withPython2 python2 ++ optionals withPython3 [ python3 ncurses ] - ++ optional withPHP72 php72 - ++ optional withPHP73 php73 + ++ optional withPHP72 php72-unit + ++ optional withPHP73 php73-unit ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 ++ optional withPerldevel perldevel @@ -59,8 +71,8 @@ stdenv.mkDerivation rec { postConfigure = '' ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"} ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"} - ${optionalString withPHP72 "./configure php --module=php72 --config=${php72.dev}/bin/php-config --lib-path=${php72}/lib"} - ${optionalString withPHP73 "./configure php --module=php73 --config=${php73.dev}/bin/php-config --lib-path=${php73}/lib"} + ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.dev}/bin/php-config --lib-path=${php72-unit}/lib"} + ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.dev}/bin/php-config --lib-path=${php73-unit}/lib"} ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} @@ -71,7 +83,7 @@ stdenv.mkDerivation rec { meta = { description = "Dynamic web and application server, designed to run applications in multiple languages."; - homepage = https://unit.nginx.org/; + homepage = "https://unit.nginx.org/"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/servers/http/webfs/default.nix b/pkgs/servers/http/webfs/default.nix index 79c7d9e9eca..cb95673b5bb 100644 --- a/pkgs/servers/http/webfs/default.nix +++ b/pkgs/servers/http/webfs/default.nix @@ -2,7 +2,7 @@ let # Let's not pull the whole apache httpd package mime_file = fetchurl { - url = https://raw.githubusercontent.com/apache/httpd/906e419c1f703360e2e8ec077b393347f993884f/docs/conf/mime.types; + url = "https://raw.githubusercontent.com/apache/httpd/906e419c1f703360e2e8ec077b393347f993884f/docs/conf/mime.types"; sha256 = "ef972fc545cbff4c0daa2b2e6b440859693b3c10435ee90f10fa6fffad800c16"; }; in @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP server for purely static content"; - homepage = http://linux.bytesex.org/misc/webfs.html; + homepage = "http://linux.bytesex.org/misc/webfs.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ zimbatm ]; diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix index 707b4878648..d40adb171a6 100644 --- a/pkgs/servers/http/webhook/default.nix +++ b/pkgs/servers/http/webhook/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with lib; { - homepage = https://github.com/adnanh/webhook; + homepage = "https://github.com/adnanh/webhook"; license = [ licenses.mit ]; description = "incoming webhook server that executes shell commands"; }; diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index 109f7bc06dc..301aec5c34b 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A high performance HTTP 1.1 server in Erlang"; - homepage = http://yaws.hyber.org; + homepage = "http://yaws.hyber.org"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu the-kenny ]; diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 289ae59d379..21e39b5f2e2 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -89,8 +89,8 @@ stdenv.mkDerivation { postInstallCheck = ''. ${./post-install-check.sh}''; meta = { description = "enterprise-class system for sending and receiving facsimiles"; - downloadPage = https://hylafax.sourceforge.io/download.php; - homepage = https://hylafax.sourceforge.io; + downloadPage = "https://hylafax.sourceforge.io/download.php"; + homepage = "https://hylafax.sourceforge.io"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.yarny ]; platforms = lib.platforms.linux; diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 55ec611d605..c7046ea8247 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { open standards for commuincation and interaction. ''; - homepage = http://www.icecast.org; + homepage = "http://www.icecast.org"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ jcumming ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/servers/identd/nullidentdmod/default.nix b/pkgs/servers/identd/nullidentdmod/default.nix index 8171f61c112..4fdc7f6d503 100644 --- a/pkgs/servers/identd/nullidentdmod/default.nix +++ b/pkgs/servers/identd/nullidentdmod/default.nix @@ -18,7 +18,7 @@ meta = with stdenv.lib; { description = "Simple identd that just replies with a random string or customized userid"; license = licenses.gpl2; - homepage = http://acidhub.click/NullidentdMod; + homepage = "http://acidhub.click/NullidentdMod"; maintainers = with maintainers; [ das_j ]; platforms = platforms.linux; # Must be run by systemd }; diff --git a/pkgs/servers/identd/oidentd/default.nix b/pkgs/servers/identd/oidentd/default.nix index 85d1186f525..e0ff9f8de38 100644 --- a/pkgs/servers/identd/oidentd/default.nix +++ b/pkgs/servers/identd/oidentd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configurable Ident protocol server"; - homepage = https://oidentd.janikrabe.com/; + homepage = "https://oidentd.janikrabe.com/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index c7d0d910ac1..faaad1ac7a7 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -1,28 +1,27 @@ -{ stdenv, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection, Security }: +{ lib, buildGoModule, fetchFromGitHub, pkg-config, vips, gobject-introspection }: buildGoModule rec { pname = "imgproxy"; - version = "2.8.1"; + version = "2.11.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "00hhgh6nrzg2blc6yl8rph5h5w7swlkbh0zgsj7xr0lkm10879pc"; + sha256 = "1n91snf5sxsiy2r8y2nksw4ah70f70nxamy7k0ylgkpfxp4dxwb8"; rev = "v${version}"; }; - modSha256 = "0kgd8lwcdns3skvd4bj4z85mq6hkk79mb0zzwky0wqxni8f73s6w"; + modSha256 = "1fm3s1ksah0w86xv8xjhrbf5ia0ynfg2qgajnldy3dpdbxa3yh7s"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gobject-introspection vips ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ gobject-introspection vips ]; preBuild = '' export CGO_LDFLAGS_ALLOW='-(s|w)' ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast and secure on-the-fly image processing server written in Go"; homepage = "https://imgproxy.net"; license = licenses.mit; diff --git a/pkgs/servers/irc/atheme/default.nix b/pkgs/servers/irc/atheme/default.nix index d7aa0610240..06119861b9f 100644 --- a/pkgs/servers/irc/atheme/default.nix +++ b/pkgs/servers/irc/atheme/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of services for IRC networks"; - homepage = https://atheme.github.io/; + homepage = "https://atheme.github.io/"; license = licenses.isc; platforms = platforms.unix; maintainers = with maintainers; [ leo60228 ]; diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index ecbedcfbec8..ebc0b47f8b7 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IRCv3 server designed to be highly scalable"; - homepage = https://github.com/charybdis-ircd/charybdis; + homepage = "https://github.com/charybdis-ircd/charybdis"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index cf5b572c9eb..8b65c7870f9 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { meta = { description = "An IPv6-capable IRC server"; platforms = stdenv.lib.platforms.unix; - homepage = http://www.ircd-hybrid.org/; + homepage = "http://www.ircd-hybrid.org/"; }; } diff --git a/pkgs/servers/irc/ngircd/default.nix b/pkgs/servers/irc/ngircd/default.nix index 5194ab278bf..b564a9b5c96 100644 --- a/pkgs/servers/irc/ngircd/default.nix +++ b/pkgs/servers/irc/ngircd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Next Generation IRC Daemon"; - homepage = https://ngircd.barton.de; + homepage = "https://ngircd.barton.de"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index c056a543aa1..f91b5a73b7d 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "IRC client that runs as a daemon accepting notification requests"; - homepage = https://gitlab.com/esr/irker; + homepage = "https://gitlab.com/esr/irker"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.unix; diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 16655509958..bb9302479e9 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -31,7 +31,7 @@ with python2.pkgs; buildPythonApplication rec { meta = with stdenv.lib; { description = "A commenting server similar to Disqus"; - homepage = https://posativ.org/isso/; + homepage = "https://posativ.org/isso/"; license = licenses.mit; maintainers = with maintainers; [ fgaz ]; }; diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 9d9ae4e25b4..1b01ffe5d69 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.13.467"; + version = "0.14.365"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; - sha256 = "1hjihafb8w9gcqdi2i8dmimbbg17c5hwwqhav3avfizq2drsrv5c"; + sha256 = "0xvlknjhc75km12d8li50ifqpfyl6whymb6gd7ccwyd9lv9xxm27"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 6cac79bdd4e..a64bd0dfc78 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.5.0"; + version = "10.5.3"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "1r6ljl535f8jchm5zvrwfl4aqjk5bg7sqbwr03yyjxgriqgf36lp"; + sha256 = "04fq3g6yddyqiixgk45x3c90zjdhkm7glahlb71fyx8ivf1qkcvs"; }; buildInputs = [ @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Free Software Media System"; - homepage = https://jellyfin.github.io/; + homepage = "https://jellyfin.github.io/"; license = licenses.gpl2; maintainers = with maintainers; [ nyanloutre minijackson ]; }; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 5fe684cfe31..b5fec49b910 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "9.0.0"; + version = "9.0.2"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "1w2d76v1rjghvdks1w32qi08gh88cd37vbf6vx0kq9a2gnhn7hip"; + sha256 = "0yavkmwhjb8i4j3g57nda77simlf1dj1m751xzbgxxq6nd0q73lw"; }; nativeBuildInputs = [ makeWrapper ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keycloak.org/"; description = "Identity and access management for modern applications and services"; license = licenses.asl20; + platforms = jre.meta.platforms; maintainers = [ maintainers.ngerstle ]; }; diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index bec8ccbbf18..e91c35538a2 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -49,7 +49,7 @@ let postInstall = "$out/bin/twistd --help > /dev/null"; meta = with stdenv.lib; { - homepage = https://twistedmatrix.com/; + homepage = "https://twistedmatrix.com/"; description = "Twisted, an event-driven networking engine written in Python"; longDescription = '' Twisted is an event-driven networking engine written in Python @@ -86,7 +86,7 @@ in stdenv.mkDerivation rec { passthru.twisted = twisted_13; meta = with stdenv.lib; { - homepage = https://github.com/desaster/kippo; + homepage = "https://github.com/desaster/kippo"; description = "SSH Honeypot"; longDescription = '' Default port is 2222. Recommend using something like this for port redirection to default SSH port: diff --git a/pkgs/servers/livepeer/default.nix b/pkgs/servers/livepeer/default.nix index 547a106a398..d401d3ada5e 100644 --- a/pkgs/servers/livepeer/default.nix +++ b/pkgs/servers/livepeer/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Official Go implementation of the Livepeer protocol"; - homepage = https://livepeer.org; + homepage = "https://livepeer.org"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/servers/ma1sd/default.nix b/pkgs/servers/ma1sd/default.nix index f35bc3bb302..a4a95197d0d 100644 --- a/pkgs/servers/ma1sd/default.nix +++ b/pkgs/servers/ma1sd/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "a federated matrix identity server; fork of mxisd"; - homepage = https://github.com/ma1uta/ma1sd; + homepage = "https://github.com/ma1uta/ma1sd"; license = licenses.agpl3; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix index 55cc4c121f0..962d5603e47 100644 --- a/pkgs/servers/mail/archiveopteryx/default.nix +++ b/pkgs/servers/mail/archiveopteryx/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://archiveopteryx.org/; + homepage = "http://archiveopteryx.org/"; description = "An advanced PostgreSQL-based IMAP/POP server"; license = licenses.postgresql; maintainers = [ maintainers.phunehehe ]; diff --git a/pkgs/servers/mail/clamsmtp/default.nix b/pkgs/servers/mail/clamsmtp/default.nix index 7214c08d242..327e545adce 100644 --- a/pkgs/servers/mail/clamsmtp/default.nix +++ b/pkgs/servers/mail/clamsmtp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SMTP filter that allows to check for viruses using the ClamAV anti-virus software"; - homepage = http://thewalter.net/stef/software/clamsmtp/; + homepage = "http://thewalter.net/stef/software/clamsmtp/"; license = licenses.bsd3; maintainers = [ maintainers.ekleog ]; platforms = platforms.all; diff --git a/pkgs/servers/mail/dkimproxy/default.nix b/pkgs/servers/mail/dkimproxy/default.nix index d4bfd3c6ca5..376beac7e36 100644 --- a/pkgs/servers/mail/dkimproxy/default.nix +++ b/pkgs/servers/mail/dkimproxy/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SMTP-proxy that signs and/or verifies emails"; - homepage = http://dkimproxy.sourceforge.net/; + homepage = "http://dkimproxy.sourceforge.net/"; license = licenses.gpl2Plus; maintainers = [ maintainers.ekleog ]; platforms = platforms.all; diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 44e2223960a..6a0db5f8f8b 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -99,7 +99,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://nuclearelephant.com/; + homepage = "http://nuclearelephant.com/"; description = "Community Driven Antispam Filter"; license = licenses.agpl3; platforms = platforms.linux; diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix index dd4d1850b59..5c73042e6cb 100644 --- a/pkgs/servers/mail/exim/default.nix +++ b/pkgs/servers/mail/exim/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://exim.org/; + homepage = "http://exim.org/"; description = "A mail transfer agent (MTA)"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix index b4f671862f8..5f027c89af8 100644 --- a/pkgs/servers/mail/freepops/default.nix +++ b/pkgs/servers/mail/freepops/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "freepops-0.2.9"; src = fetchurl { - url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz; + url = "mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz"; sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae"; }; nativeBuildInputs = [ pkgconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation { FreePOPs is an extensible pop3 server. Its main purpose is to provide a pop3 interface to a webmail. ''; - homepage = http://www.freepops.org/; + homepage = "http://www.freepops.org/"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pierron ]; broken = true; diff --git a/pkgs/servers/mail/mailhog/default.nix b/pkgs/servers/mail/mailhog/default.nix index 429d735ffcd..10b23061307 100644 --- a/pkgs/servers/mail/mailhog/default.nix +++ b/pkgs/servers/mail/mailhog/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Web and API based SMTP testing"; - homepage = https://github.com/mailhog/MailHog; + homepage = "https://github.com/mailhog/MailHog"; maintainers = with maintainers; [ disassembler ]; license = licenses.mit; }; diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index d6b73aea3da..8443a1968fd 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { dontWrapPythonPrograms = true; meta = { - homepage = https://www.gnu.org/software/mailman/; + 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 ]; diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index bcb92051fc8..5f542b9036e 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { doCheck = false; meta = { - homepage = https://www.gnu.org/software/mailman/; + 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 ]; diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index 2c1c07e502a..4caa9e8bfef 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://mlmmj.org; + homepage = "http://mlmmj.org"; description = "Mailing List Management Made Joyful"; maintainers = [ maintainers.edwtjo ]; platforms = platforms.linux; diff --git a/pkgs/servers/mail/nullmailer/default.nix b/pkgs/servers/mail/nullmailer/default.nix index 7738c4eb3d4..6744d1ffac1 100644 --- a/pkgs/servers/mail/nullmailer/default.nix +++ b/pkgs/servers/mail/nullmailer/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://untroubled.org/nullmailer/; + homepage = "http://untroubled.org/nullmailer/"; description = '' A sendmail/qmail/etc replacement MTA for hosts which relay to a fixed set of smart relays. It is designed to be simple to configure, secure, and easily extendable. diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 76b247cfd84..134913e85a8 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.opensmtpd.org/; + homepage = "https://www.opensmtpd.org/"; description = '' A free implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 14d36ad6554..803ba0ee6c7 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { " -L${libmysqlclient}/lib/mysql"; meta = with stdenv.lib; { - homepage = https://www.opensmtpd.org/; + homepage = "https://www.opensmtpd.org/"; description = "Extra plugins for the OpenSMTPD mail server"; license = licenses.isc; platforms = platforms.linux; diff --git a/pkgs/servers/mail/petidomo/default.nix b/pkgs/servers/mail/petidomo/default.nix index c97d8e4ccf3..146160b79c3 100644 --- a/pkgs/servers/mail/petidomo/default.nix +++ b/pkgs/servers/mail/petidomo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://petidomo.sourceforge.net/; + homepage = "http://petidomo.sourceforge.net/"; description = "A simple and easy to administer mailing list server"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/servers/mail/popa3d/default.nix b/pkgs/servers/mail/popa3d/default.nix index e14b62a8597..998dce88286 100644 --- a/pkgs/servers/mail/popa3d/default.nix +++ b/pkgs/servers/mail/popa3d/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configurePhase = ''makeFlags="PREFIX=$out MANDIR=$out/share/man"''; meta = { - homepage = http://www.openwall.com/popa3d/; + homepage = "http://www.openwall.com/popa3d/"; description = "Tiny POP3 daemon with security as the primary goal"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix index 9fb441a92de..40a2d7fe092 100644 --- a/pkgs/servers/mail/postfix/pfixtools.nix +++ b/pkgs/servers/mail/postfix/pfixtools.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { meta = { description = "A collection of postfix-related tools"; license = with lib.licenses; [ bsd3 ]; - homepage = https://github.com/Fruneau/pfixtools; + homepage = "https://github.com/Fruneau/pfixtools"; platforms = stdenv.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 8f85bc5f6d6..e6451cddec6 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -26,7 +26,7 @@ perlPackages.buildPerlPackage rec { ''; meta = { - homepage = http://jimsun.linxnet.com/postfix_contrib.html; + homepage = "http://jimsun.linxnet.com/postfix_contrib.html"; maintainers = with stdenv.lib.maintainers; [ schneefux ]; description = "Postfix activity overview"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix index 0abfc00fdd6..dffe0191a0a 100644 --- a/pkgs/servers/mail/postgrey/default.nix +++ b/pkgs/servers/mail/postgrey/default.nix @@ -17,7 +17,7 @@ in runCommand name { }; meta = with stdenv.lib; { description = "A postfix policy server to provide greylisting"; - homepage = https://postgrey.schweikert.ch/; + homepage = "https://postgrey.schweikert.ch/"; platforms = postfix.meta.platforms; license = licenses.gpl2; }; diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix index 49854927e57..845c4237432 100644 --- a/pkgs/servers/mail/postsrsd/default.nix +++ b/pkgs/servers/mail/postsrsd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake help2man ]; meta = with stdenv.lib; { - homepage = https://github.com/roehling/postsrsd; + homepage = "https://github.com/roehling/postsrsd"; description = "Postfix Sender Rewriting Scheme daemon"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/servers/mail/pypolicyd-spf/default.nix b/pkgs/servers/mail/pypolicyd-spf/default.nix index 5da94ca8026..cbc63ff535a 100644 --- a/pkgs/servers/mail/pypolicyd-spf/default.nix +++ b/pkgs/servers/mail/pypolicyd-spf/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://launchpad.net/pypolicyd-spf/; + homepage = "https://launchpad.net/pypolicyd-spf/"; description = "Postfix policy engine for Sender Policy Framework (SPF) checking"; maintainers = with maintainers; [ abbradar ]; license = licenses.asl20; diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 79020ce7848..7b9e766f246 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -10,13 +10,13 @@ assert withHyperscan -> stdenv.isx86_64; stdenv.mkDerivation rec { pname = "rspamd"; - version = "2.4"; + version = "2.5"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - sha256 = "15rdxcvnfn3fzjpjz6z2ljrzhlmhn2y4sxz09z2789k442n4m1qv"; + sha256 = "01fhh07dddc6v7a5kq6h1z221vl0d4af43cchqkf54ycyxxxw06h"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/servers/mail/spamassassin/default.nix b/pkgs/servers/mail/spamassassin/default.nix index 6980dca9403..c474c501cee 100644 --- a/pkgs/servers/mail/spamassassin/default.nix +++ b/pkgs/servers/mail/spamassassin/default.nix @@ -33,7 +33,7 @@ perlPackages.buildPerlPackage rec { ''; meta = { - homepage = http://spamassassin.apache.org/; + homepage = "http://spamassassin.apache.org/"; description = "Open-Source Spam Filter"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/mail/sympa/default.nix b/pkgs/servers/mail/sympa/default.nix index 46cbcc61f94..c5c9b440049 100644 --- a/pkgs/servers/mail/sympa/default.nix +++ b/pkgs/servers/mail/sympa/default.nix @@ -1,5 +1,4 @@ -{ stdenv, perl, fetchFromGitHub, autoreconfHook -}: +{ stdenv, perl, fetchFromGitHub, autoreconfHook, nixosTests }: let dataDir = "/var/lib/sympa"; @@ -64,16 +63,17 @@ let in stdenv.mkDerivation rec { pname = "sympa"; - version = "6.2.52"; + version = "6.2.54"; src = fetchFromGitHub { owner = "sympa-community"; repo = pname; rev = version; - sha256 = "071kx6ryifs2f6fhfky9g297frzp5584kn444af1vb2imzydsbnh"; + sha256 = "07wfvr8rrg7pwkl2zglrdri7n42rl9gwrjbaffb8m37wq67s7fca"; }; configureFlags = [ + "--enable-fhs" "--without-initdir" "--without-unitsdir" "--without-smrshdir" @@ -106,6 +106,10 @@ stdenv.mkDerivation rec { rm -rf "$TMP/bin" ''; + passthru.tests = { + inherit (nixosTests) sympa; + }; + meta = with stdenv.lib; { description = "Open source mailing list manager"; homepage = "https://www.sympa.org"; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f0c8a0d4f81..87c6b6a6cc9 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.12.0"; + version = "1.12.1"; src = fetchPypi { inherit pname version; - sha256 = "18wavnb47w4hfh8dc7g77bfhz03zh1xzl58mxlfi0000qsbkz680"; + sha256 = "0l3a5dvnahrzwqh8p0cnfr019bxxgd769jk2wprfvfd65h7p0g1r"; }; patches = [ @@ -85,7 +85,7 @@ in buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://matrix.org; + homepage = "https://matrix.org"; description = "Matrix reference homeserver"; license = licenses.asl20; maintainers = with maintainers; [ ralith roblabla ekleog pacien ma27 ]; diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 2eec5d52bb9..1f39278de62 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchurl, Security }: +{ stdenv, buildGoModule, fetchurl }: buildGoModule rec { pname = "matterbridge"; - version = "1.16.5"; + version = "1.17.1"; goPackagePath = "github.com/42wim/matterbridge"; - modSha256 = "0nnp9jxdsr2bs1pg00vd7wpv452iyxws8g3ljzypkb7hzlphcxqh"; + modSha256 = "1mqp8dlwa4p70iv9ksq3pxx5zbxdh56xyksvd98zk0vkrz4f1rij"; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; - sha256 = "15wgjzy9l3xlgih2zb56l4jmval4nhcs42wn9axvz2h7kqfbmw3d"; + sha256 = "0xf0s1bvlzqnxz2kvqx1h9gmgqxdlf34s27s3zradi8fwd8hriv6"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; homepage = "https://github.com/42wim/matterbridge"; diff --git a/pkgs/servers/mattermost/default.nix b/pkgs/servers/mattermost/default.nix index 00f74e7a01e..6327921aaac 100644 --- a/pkgs/servers/mattermost/default.nix +++ b/pkgs/servers/mattermost/default.nix @@ -50,7 +50,7 @@ in meta = with stdenv.lib; { description = "Open-source, self-hosted Slack-alternative"; - homepage = https://www.mattermost.org; + homepage = "https://www.mattermost.org"; license = with licenses; [ agpl3 asl20 ]; maintainers = with maintainers; [ fpletz ryantm ]; platforms = platforms.unix; diff --git a/pkgs/servers/mautrix-telegram/default.nix b/pkgs/servers/mautrix-telegram/default.nix index 73a008d3fe7..1b64fb73184 100644 --- a/pkgs/servers/mautrix-telegram/default.nix +++ b/pkgs/servers/mautrix-telegram/default.nix @@ -4,12 +4,12 @@ with python3.pkgs; buildPythonPackage rec { pname = "mautrix-telegram"; - version = "0.7.1"; + version = "0.7.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1yi4h37lhlpa095hzd0gwn1ifbycq8878kj5n2sjhw8kk6nblda9"; + sha256 = "1ahchkhrhyd160fwlg6g0d2v8v56j9f3h9rnm71nxibgfjcb6m3n"; }; postPatch = '' @@ -54,7 +54,7 @@ buildPythonPackage rec { ]; meta = with lib; { - homepage = https://github.com/tulir/mautrix-telegram; + homepage = "https://github.com/tulir/mautrix-telegram"; description = "A Matrix-Telegram hybrid puppeting/relaybot bridge"; license = licenses.agpl3Plus; platforms = platforms.linux; diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index b94eb00547a..b0178a18213 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,22 +1,20 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-02-09"; + version = "2020-04-02"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "260555b69ccd20f247405e4d8cab3d49fabda070"; - sha256 = "1ykhwrp8bvhzzw4lg4m1w430ybgzd0zqgrs4jrvfd1m0als2iff7"; + rev = "064b5b8fedb6896d04509aa0e094a8d9f83426c2"; + sha256 = "1xky31x5jk7yxh875nk20vvsn9givy6vxdqhqg5qwf4xjj2zqh2p"; }; - modSha256 = "0ypj79rjwj5bls6aq2cz0d034dnv1sddl43iz51b4fl2bfv0drm9"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0qcxxhfp3fkx90r3lwhi0lkzg3digwrnxk8cack11k717szg7zrd"; meta = with stdenv.lib; { - homepage = https://github.com/tulir/mautrix-whatsapp; + homepage = "https://github.com/tulir/mautrix-whatsapp"; description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge"; license = licenses.agpl3; maintainers = with maintainers; [ vskilet ma27 ]; diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index 33151c4063b..17bfdef2a30 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { pkgconfig autoreconfHook ]; meta = with stdenv.lib; { - homepage = http://mediatomb.cc; - repositories.git = git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb; + homepage = "http://mediatomb.cc"; + repositories.git = "git://mediatomb.git.sourceforge.net/gitroot/mediatomb/mediatomb"; description = "UPnP MediaServer with a web user interface"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 0449144b07a..89d3220aa69 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, cyrus_sasl, libevent}: +{stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.2"; + version = "1.6.3"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "12qn8m0jdvdckz53m2akrvixbrn64g5kv6r4hl5vx286qhc02wh6"; + sha256 = "0h0mlg3xz1y889xj6lcsb4sz9bar1birc2wzjf7x4ig31qib6r0w"; }; configureFlags = [ @@ -21,10 +21,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A distributed memory object caching system"; - repositories.git = https://github.com/memcached/memcached.git; + repositories.git = "https://github.com/memcached/memcached.git"; homepage = "http://memcached.org/"; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; platforms = platforms.linux ++ platforms.darwin; }; + passthru.tests = { + smoke-tests = nixosTests.memcached; + }; } diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 2a4ac3e1776..b2e040748ab 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.34.3"; + version = "0.35.1"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "0kvjqdzr9zb65c2kaqb39x8s71ynpp56aax2h1x37rds4zxdg2yg"; + sha256 = "1c8mxadf8siakhgdkbw5d8r6ph9lqxrw5wlrrc8a5ycp43h0z226"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index dd06c358358..bb841da74d2 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Minimalist and opinionated feed reader"; - homepage = https://miniflux.app/; + homepage = "https://miniflux.app/"; license = licenses.asl20; maintainers = with maintainers; [ rvolosatovs benpye ]; }; diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 1fae973066a..953cc9fb77c 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "minio"; - version = "2020-03-06T22-23-56Z"; + version = "2020-03-25T07-03-04Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0h5zsdxm2b2by6lzqaa7jj0z773kjr89cl13gq9ddabml34f0kxh"; + sha256 = "0xdflc7pfx1misbh695x8kmqpysi5iydsarr9mwmjragf5b1kbl5"; }; - modSha256 = "0ikid628v673f7lvp3psk05s3liqlyc3arppg33lfi2cmbaf8hmr"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; + modSha256 = "09kbibsfa7qq55paqr7wcs4gpwk6g5pknc5fjssmd12nm2cji96k"; subPackages = [ "." ]; @@ -22,7 +20,7 @@ buildGoModule rec { '']; meta = with stdenv.lib; { - homepage = https://www.minio.io/; + homepage = "https://www.minio.io/"; description = "An S3-compatible object storage server"; maintainers = with maintainers; [ eelco bachp ]; platforms = platforms.unix; diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index d8501878435..2c529ef7b32 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Personal media streamer"; - homepage = https://airsonic.github.io; + homepage = "https://airsonic.github.io"; license = stdenv.lib.licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ disassembler ]; diff --git a/pkgs/servers/misc/subsonic/default.nix b/pkgs/servers/misc/subsonic/default.nix index a7041fc57d0..9f7559872b9 100644 --- a/pkgs/servers/misc/subsonic/default.nix +++ b/pkgs/servers/misc/subsonic/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://subsonic.org; + homepage = "http://subsonic.org"; description = "Personal media streamer"; license = licenses.unfree; maintainers = with maintainers; [ telotortium ]; diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix index 0ab921a6f6f..e5024e6694e 100644 --- a/pkgs/servers/misc/taskserver/default.nix +++ b/pkgs/servers/misc/taskserver/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Server for synchronising Taskwarrior clients"; - homepage = https://taskwarrior.org; + homepage = "https://taskwarrior.org"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ]; diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 957bb59b121..22c741024b2 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "Time Series Alerting Framework"; license = licenses.mit; - homepage = https://bosun.org; + homepage = "https://bosun.org"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index 715a52ec99c..426dd2ad2a2 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Analyzes resource usage and performance characteristics of running docker containers"; - homepage = https://github.com/google/cadvisor; + homepage = "https://github.com/google/cadvisor"; license = licenses.asl20; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index cafccfeb8f2..9bece7cb2e0 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; - homepage = https://github.com/AcalephStorage/consul-alerts; + homepage = "https://github.com/AcalephStorage/consul-alerts"; # As per README platforms = platforms.linux ++ platforms.freebsd ++ platforms.darwin; license = licenses.gpl2; diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index 572535b7fcd..b738e36cf89 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { metrics from a DigitalOcean Droplet (on which the program runs) and sends them to DigitalOcean to provide resource usage graphs and alerting. ''; - homepage = https://github.com/digitalocean/do-agent; + homepage = "https://github.com/digitalocean/do-agent"; license = licenses.asl20; maintainers = with maintainers; [ yvt ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/fusion-inventory/default.nix b/pkgs/servers/monitoring/fusion-inventory/default.nix index 27e3cfdab9d..42b07e605a0 100644 --- a/pkgs/servers/monitoring/fusion-inventory/default.nix +++ b/pkgs/servers/monitoring/fusion-inventory/default.nix @@ -17,12 +17,12 @@ perlPackages.buildPerlPackage rec { ./remove_software_test.patch # support for os-release file (fetchurl { - url = https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff; + url = "https://github.com/fusioninventory/fusioninventory-agent/pull/396.diff"; sha256 = "0bxrjmff80ab01n23xggci32ajsah6zvcmz5x4hj6ayy6dzwi6jb"; }) # support for Nix software inventory (fetchurl { - url = https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff; + url = "https://github.com/fusioninventory/fusioninventory-agent/pull/397.diff"; sha256 = "0pyf7mp0zsb3zcqb6yysr1zfp54p9ciwjn1pzayw6s9flmcgrmbw"; }) ]; @@ -85,7 +85,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; meta = with stdenv.lib; { - homepage = http://www.fusioninventory.org; + homepage = "http://www.fusioninventory.org"; description = "FusionInventory unified Agent for UNIX, Linux, Windows and MacOSX"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.phile314 ]; diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 502ff10b092..24756cc8bd2 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = { description = "PDF report generator from a Grafana dashboard"; - homepage = https://github.com/IzakMarais/reporter; + homepage = "https://github.com/IzakMarais/reporter"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; }; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ff283396e22..ac50717208a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.7.1"; + version = "6.7.2"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0isidfnny4rds9mq7gfm3qmsjsg9higiqliri5zy5bc68lz1gnbz"; + sha256 = "03f6f9caxphrfbps0ljwwiq246vfjlznd8xs7a7va7kb823ff5li"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0pa5g9pgifdi49vklcxnip2a156f5x64i9r2pshdg4gxfdqbxkxy"; + sha256 = "0sgpc34jfldi0hkbqx9idkzm1n1jy82yhg29kdsvndxvi44z49lv"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/heapster/default.nix b/pkgs/servers/monitoring/heapster/default.nix index 39c04857638..2460cc633eb 100644 --- a/pkgs/servers/monitoring/heapster/default.nix +++ b/pkgs/servers/monitoring/heapster/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = with lib; { description = "Compute Resource Usage Analysis and Monitoring of Container Clusters"; license = licenses.asl20; - homepage = https://github.com/kubernetes/heapster; + homepage = "https://github.com/kubernetes/heapster"; maintainers = with maintainers; [ offline ]; platforms = docker.meta.platforms; }; diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index f33a418fe5c..eb4face42aa 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with lib; { description = "Open source framework for processing, monitoring, and alerting on time series data"; license = licenses.mit; - homepage = https://influxdata.com/time-series-platform/kapacitor/; + homepage = "https://influxdata.com/time-series-platform/kapacitor/"; maintainers = with maintainers; [offline]; platforms = with platforms; linux; }; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index cc67bdfa56d..927c7945b91 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client/server suite for controlling a wide variety of LCD devices"; - homepage = http://lcdproc.org/; + homepage = "http://lcdproc.org/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index b5e63a3aed4..a4117d923e3 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { - version = "1.3.0"; + version = "1.4.0"; pname = "grafana-loki"; goPackagePath = "github.com/grafana/loki"; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "0b1dpb3vh5i18467qk8kpb5ic14p4p1dfyr8hjkznf6bs7g8ka1q"; + sha256 = "0dz0icbkwpmysl5jyljmj783xdzrbbxbfxfkizw7gcs8jjxbqvfl"; }; postPatch = '' diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 5459d58ceb9..c5c284b7f02 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.linode.com/longview; + homepage = "https://www.linode.com/longview"; description = "Longview collects all of your system-level metrics and sends them to Linode"; license = licenses.gpl2Plus; maintainers = [ maintainers.rvl ]; diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 75b58b65a9c..64966e183fe 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "mtail"; @@ -14,8 +14,6 @@ buildGoModule rec { modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi"; subPackages = [ "cmd/mtail" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - preBuild = '' go generate -x ./internal/vm/ ''; @@ -24,7 +22,7 @@ buildGoModule rec { "-ldflags=-X main.Version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { license = licenses.asl20; homepage = "https://github.com/google/mtail"; description = "Tool for extracting metrics from application logs"; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 22f768b94e1..02a81bfe33c 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.51"; + version = "2.0.59"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "1r018lbk1dncg6v3ai7wvnk1qr4ddsjc5g605dq086z0l0xg7ras"; + sha256 = "1i28ba53gh9z0mb3fk0y3cb88wh73qdlbg7rl5g9mc6iwqrbvg97"; }; buildInputs = [ @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { interface. Munin can help analyze resource trends and 'what just happened to kill our performance?' problems. ''; - homepage = http://munin-monitoring.org/; + homepage = "http://munin-monitoring.org/"; license = licenses.gpl2; maintainers = [ maintainers.domenkozar maintainers.bjornfor ]; platforms = platforms.linux; diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index 006d91ef74e..dc0ad6ae2cf 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A host, service and network monitoring program"; - homepage = https://www.nagios.org/; + homepage = "https://www.nagios.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice relrod ]; diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index ed2abbc7fc8..3c8005a16df 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Clients and server for the SNMP network monitoring protocol"; - homepage = http://net-snmp.sourceforge.net/; + homepage = "http://net-snmp.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix index 2dc1bdf9681..9413b5e73b6 100644 --- a/pkgs/servers/monitoring/newrelic-sysmond/default.nix +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System-wide monitoring for newrelic"; - homepage = https://newrelic.com/; + homepage = "https://newrelic.com/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ lnl7 ]; diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index f72fa16cd12..8f1c08bebd8 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -78,7 +78,7 @@ _EOF meta = { description = "Official monitoring plugins for Nagios/Icinga/Sensu and others."; - homepage = https://www.monitoring-plugins.org; + homepage = "https://www.monitoring-plugins.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice relrod ]; diff --git a/pkgs/servers/monitoring/plugins/esxi.nix b/pkgs/servers/monitoring/plugins/esxi.nix index dfa13c805e5..897d6395f95 100644 --- a/pkgs/servers/monitoring/plugins/esxi.nix +++ b/pkgs/servers/monitoring/plugins/esxi.nix @@ -30,7 +30,7 @@ in python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ pywbem ]; meta = with stdenv.lib; { - homepage = https://www.claudiokuenzler.com/nagios-plugins/; + homepage = "https://www.claudiokuenzler.com/nagios-plugins/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/servers/monitoring/plugins/labs_consol_de.nix b/pkgs/servers/monitoring/plugins/labs_consol_de.nix index a703c80b61a..8464d4f1b2f 100644 --- a/pkgs/servers/monitoring/plugins/labs_consol_de.nix +++ b/pkgs/servers/monitoring/plugins/labs_consol_de.nix @@ -43,7 +43,7 @@ let ''; meta = with stdenv.lib; { - homepage = https://labs.consol.de/; + homepage = "https://labs.consol.de/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; inherit description; diff --git a/pkgs/servers/monitoring/plugins/uptime.nix b/pkgs/servers/monitoring/plugins/uptime.nix index 9b4f3144a37..d4861309fe5 100644 --- a/pkgs/servers/monitoring/plugins/uptime.nix +++ b/pkgs/servers/monitoring/plugins/uptime.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Uptime check plugin for Sensu/Nagios/others"; - homepage = https://github.com/madrisan/nagios-plugins-uptime; + homepage = "https://github.com/madrisan/nagios-plugins-uptime"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 759d2abfad0..de6d834c4d6 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -31,7 +31,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Alert dispatcher for the Prometheus monitoring system"; - homepage = https://github.com/prometheus/alertmanager; + homepage = "https://github.com/prometheus/alertmanager"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/bind-exporter.nix b/pkgs/servers/monitoring/prometheus/bind-exporter.nix index 07c8a14ce0b..d27fd094aa6 100644 --- a/pkgs/servers/monitoring/prometheus/bind-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bind-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter for bind9 server"; - homepage = https://github.com/digitalocean/bind_exporter; + homepage = "https://github.com/digitalocean/bind_exporter"; license = licenses.asl20; maintainers = with maintainers; [ rtreffer ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index ce4bacfc9b7..95b6c064034 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; - homepage = https://github.com/prometheus/collectd_exporter; + homepage = "https://github.com/prometheus/collectd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/consul-exporter.nix b/pkgs/servers/monitoring/prometheus/consul-exporter.nix index aaee2e8d770..4267d8d34c1 100644 --- a/pkgs/servers/monitoring/prometheus/consul-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/consul-exporter.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter for Consul metrics"; - homepage = https://github.com/prometheus/consul_exporter; + homepage = "https://github.com/prometheus/consul_exporter"; license = licenses.asl20; maintainers = with maintainers; [ hectorj ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index a01f4559a11..d0b413a10a0 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: let - version = "2.16.0"; + version = "2.17.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "1bfcl3bvjb991ic8jw6y6i9pn7y03v8gwzzc78j1k5lhpqzbxkzd"; + sha256 = "0ai9l7gx25x5m07617c0cjzwxknywwq822fn2q5b850hvs48whyv"; }; webui = mkYarnPackage { diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index 773fddd311b..c8013e6bc15 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "dnsmasq_exporter"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A dnsmasq exporter for Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix index 95b0db7dbc6..997b8784a1c 100644 --- a/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/fritzbox-exporter.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus Exporter for FRITZ!Box (TR64 and UPnP)"; - homepage = https://github.com/ndecker/fritzbox_exporter; + homepage = "https://github.com/ndecker/fritzbox_exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp flokli ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index 4a84db38f78..aaff022df89 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; - homepage = https://github.com/prometheus/haproxy_exporter; + homepage = "https://github.com/prometheus/haproxy_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix index ca1dc83e96a..05e0d4cb079 100644 --- a/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix +++ b/pkgs/servers/monitoring/prometheus/jmx-httpserver.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/prometheus/jmx_exporter; + homepage = "https://github.com/prometheus/jmx_exporter"; description = "A process for exposing JMX Beans via HTTP for Prometheus consumption"; license = licenses.asl20; maintainers = [ maintainers.offline ]; diff --git a/pkgs/servers/monitoring/prometheus/json-exporter.nix b/pkgs/servers/monitoring/prometheus/json-exporter.nix index 4d92532c90e..c020817edc0 100644 --- a/pkgs/servers/monitoring/prometheus/json-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/json-exporter.nix @@ -23,7 +23,7 @@ buildGoPackage { meta = with lib; { description = "A prometheus exporter which scrapes remote JSON by JSONPath"; - homepage = https://github.com/kawamuray/prometheus-json-exporter; + homepage = "https://github.com/kawamuray/prometheus-json-exporter"; license = licenses.asl20; maintainers = with maintainers; [ willibutz ]; }; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index 04fbc7fbed9..ce040462805 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Export Mesos metrics to Prometheus"; - homepage = https://github.com/prometheus/mesos_exporter; + homepage = "https://github.com/prometheus/mesos_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 96526d246a6..12341eee911 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mikrotik-exporter-unstable"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { inherit (src.meta) homepage; description = "Prometheus MikroTik device(s) exporter"; diff --git a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix index 7d460773802..c329050d4d1 100644 --- a/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/minio-exporter/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A Prometheus exporter for Minio cloud storage server"; - homepage = https://github.com/joe-pll/minio-exporter; + homepage = "https://github.com/joe-pll/minio-exporter"; license = licenses.asl20; maintainers = with maintainers; [ bachp ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index f5c438a87dc..3ef947b2873 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; - homepage = https://github.com/prometheus/mysqld_exporter; + homepage = "https://github.com/prometheus/mysqld_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley globin ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/node-exporter.nix b/pkgs/servers/monitoring/prometheus/node-exporter.nix index 857a7667c13..584382b47b7 100644 --- a/pkgs/servers/monitoring/prometheus/node-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/node-exporter.nix @@ -25,7 +25,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter for machine metrics"; - homepage = https://github.com/prometheus/node_exporter; + homepage = "https://github.com/prometheus/node_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz globin ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index c101e55bc87..101a53e7bb3 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; - homepage = https://github.com/prometheus/prom2json; + homepage = "https://github.com/prometheus/prom2json"; license = licenses.asl20; maintainers = with maintainers; [ benley ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0a707519c64..0cb41f099c6 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -41,7 +41,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Allows ephemeral and batch jobs to expose metrics to Prometheus"; - homepage = https://github.com/prometheus/pushgateway; + homepage = "https://github.com/prometheus/pushgateway"; license = licenses.asl20; maintainers = with maintainers; [ benley fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index c6af09743ce..915a481ad0f 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -18,7 +18,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Prometheus exporter for RabbitMQ"; - homepage = https://github.com/kbudde/rabbitmq_exporter; + homepage = "https://github.com/kbudde/rabbitmq_exporter"; license = licenses.mit; maintainers = with maintainers; [ ocharles ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix index 612066edb6d..ed2ed29ab89 100644 --- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "SNMP Exporter for Prometheus"; - homepage = https://github.com/prometheus/snmp_exporter; + homepage = "https://github.com/prometheus/snmp_exporter"; license = licenses.asl20; maintainers = with maintainers; [ oida willibutz ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix index f4aa8344f77..cc6b55cac22 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-exporter.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; - homepage = https://github.com/prometheus/statsd_exporter; + homepage = "https://github.com/prometheus/statsd_exporter"; license = licenses.asl20; maintainers = with maintainers; [ benley ivan ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix index 07b5055831e..8502b76f708 100644 --- a/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/surfboard-exporter.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Arris Surfboard signal metrics exporter"; - homepage = https://github.com/ipstatic/surfboard_exporter; + homepage = "https://github.com/ipstatic/surfboard_exporter"; license = licenses.mit; maintainers = with maintainers; [ disassembler ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/pkgs/servers/monitoring/prometheus/tor-exporter.nix index ef971ce0474..9fa79884687 100644 --- a/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Prometheus exporter that exposes metrics from a Tor daemon"; - homepage = https://github.com/atx/prometheus-tor_exporter; + homepage = "https://github.com/atx/prometheus-tor_exporter"; license = licenses.mit; maintainers = with maintainers; [ delroth ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix index 5682c3ccd2a..b4f58d789f6 100644 --- a/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix +++ b/pkgs/servers/monitoring/prometheus/unifi-exporter/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Prometheus exporter that exposes metrics from a Ubiquiti UniFi Controller and UniFi devices"; - homepage = https://github.com/mdlayher/unifi_exporter; + homepage = "https://github.com/mdlayher/unifi_exporter"; license = licenses.mit; maintainers = with maintainers; [ bachp globin ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index a0e3c6b1783..d7767567195 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, varnish, Security }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, varnish }: buildGoModule rec { pname = "prometheus_varnish_exporter"; @@ -15,8 +15,6 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - postInstall = '' wrapProgram $out/bin/prometheus_varnish_exporter \ --prefix PATH : "${varnish}/bin" @@ -24,10 +22,10 @@ buildGoModule rec { doCheck = true; - meta = with stdenv.lib; { + meta = { homepage = "https://github.com/jonnenauha/prometheus_varnish_exporter"; description = "Varnish exporter for Prometheus"; - license = licenses.mit; - maintainers = with maintainers; [ MostAwesomeDude willibutz ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; }; } diff --git a/pkgs/servers/monitoring/prometheus/webui-package.json b/pkgs/servers/monitoring/prometheus/webui-package.json index 71b9a45f906..5ae33ae62df 100644 --- a/pkgs/servers/monitoring/prometheus/webui-package.json +++ b/pkgs/servers/monitoring/prometheus/webui-package.json @@ -18,6 +18,7 @@ "@types/react-resize-detector": "^4.0.2", "@types/sanitize-html": "^1.20.2", "bootstrap": "^4.2.1", + "css.escape": "^1.5.1", "downshift": "^3.2.2", "enzyme-to-json": "^3.4.3", "fuzzy": "^0.1.3", @@ -33,7 +34,7 @@ "react-copy-to-clipboard": "^5.0.1", "react-dom": "^16.7.0", "react-resize-detector": "^4.2.1", - "react-scripts": "^3.2.0", + "react-scripts": "^3.4.0", "react-test-renderer": "^16.9.0", "reactstrap": "^8.0.1", "sanitize-html": "^1.20.1", diff --git a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 1793b4a5c3f..0d8652982cd 100644 --- a/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -2,771 +2,811 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.5.5.tgz"; - sha1 = "bc0782f6d69f7b7d49531219699b988f669a8f9d"; + name = "_babel_code_frame___code_frame_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; + sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; }; } { - name = "_babel_core___core_7.6.0.tgz"; + name = "_babel_compat_data___compat_data_7.8.5.tgz"; path = fetchurl { - name = "_babel_core___core_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.6.0.tgz"; - sha1 = "9b00f73554edd67bebc86df8303ef678be3d7b48"; + name = "_babel_compat_data___compat_data_7.8.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.8.5.tgz"; + sha1 = "d28ce872778c23551cbb9432fc68d28495b613b9"; }; } { - name = "_babel_core___core_7.6.4.tgz"; + name = "_babel_core___core_7.8.4.tgz"; path = fetchurl { - name = "_babel_core___core_7.6.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz"; - sha1 = "6ebd9fe00925f6c3e177bb726a188b5f578088ff"; + name = "_babel_core___core_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz"; + sha1 = "d496799e5c12195b3602d0fddd77294e3e38e80e"; }; } { - name = "_babel_generator___generator_7.6.4.tgz"; + name = "_babel_generator___generator_7.8.4.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.6.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.6.4.tgz"; - sha1 = "a4f8437287bf9671b07f483b76e3bb731bc97671"; + name = "_babel_generator___generator_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.4.tgz"; + sha1 = "35bbc74486956fe4251829f9f6c48330e8d0985e"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz"; - sha1 = "323d39dd0b50e10c7c06ca7d7638e6864d8c5c32"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; + sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz"; - sha1 = "6b69628dfe4087798e0c4ed98e3d4a6b2fbd2f5f"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; + sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503"; }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; - sha1 = "a1ac95a5d2b3e88ae5e54846bf462eeb81b318a4"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.8.3.tgz"; + sha1 = "dee98d7d79cc1f003d80b76fe01c7f8945665ff6"; }; } { - name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; + name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_call_delegate___helper_call_delegate_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz"; - sha1 = "87c1f8ca19ad552a736a7a27b1c1fcf8b1ff1f43"; + name = "_babel_helper_call_delegate___helper_call_delegate_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz"; + sha1 = "de82619898aa605d409c42be6ffb8d7204579692"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.6.0.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz"; - sha1 = "769711acca889be371e9bc2eb68641d55218021f"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.4.tgz"; + sha1 = "03d7ecd454b7ebe19a254f76617e61770aed2c88"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz"; - sha1 = "3dec32c2046f37e09b28c93eb0b103fd2a25d369"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.3.tgz"; + sha1 = "5b94be88c255f140fd2c10dd151e7f98f4bff397"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz"; - sha1 = "537fa13f6f1674df745b0c00ec8fe4e99681c8f6"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.3.tgz"; + sha1 = "c774268c95ec07ee92476a3862b75cc2839beb79"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; + name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; - sha1 = "a0ceb01685f73355d4360c1247f582bfafc8ff53"; + name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; + sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; - sha1 = "83572d4320e2a4657263734113c42868b64e49c3"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; + sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz"; - sha1 = "0298b5f25c8c09c53102d52ac4a98f773eb2850a"; + name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz"; + sha1 = "eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz"; - sha1 = "1fb5b8ec4453a93c439ee9fe3aeea4a84b76b590"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; + sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz"; - sha1 = "96081b7111e486da4d2cd971ad1a4fe216cc2e3d"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; + sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz"; - sha1 = "f84ff8a09038dcbca1fd4355661a500937165b4a"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; + sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz"; - sha1 = "a2920c5702b073c15de51106200aa8cad20497d5"; + name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; + sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz"; - sha1 = "bbb3fbee98661c569034237cc03967ba99b4f250"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.8.3.tgz"; + sha1 = "d305e35d02bee720fbc2c3c3623aa0c316c01590"; }; } { - name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.5.5.tgz"; - sha1 = "0aa6824f7100a2e0e89c1527c23936c152cab351"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; + sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz"; - sha1 = "361d80821b6f38da75bd3f0785ece20a88c5fe7f"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; + sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; + name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz"; - sha1 = "f84ce43df031222d2bad068d2626cb5799c34bc2"; + name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; + sha1 = "139772607d51b93f23effe72105b319d2a4c6965"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz"; - sha1 = "65eeb954c8c245beaa4e859da6188f39d71e585c"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; + sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; - sha1 = "ff94894a340be78f53f06af038b205c49d993677"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.3.tgz"; + sha1 = "91192d25f6abbcd41da8a989d4492574fb1530bc"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz"; - sha1 = "c4e0012445769e2815b55296ead43a958549f6fa"; + name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; + sha1 = "7f8109928b4dab4654076986af575231deb639ae"; }; } { - name = "_babel_helpers___helpers_7.6.2.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.6.2.tgz"; - sha1 = "681ffe489ea4dcc55f23ce469e58e59c1c045153"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; + sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; }; } { - name = "_babel_highlight___highlight_7.5.0.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.5.0.tgz"; - sha1 = "56d11312bd9248fa619591d02472be6e8cb32540"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; + sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"; }; } { - name = "_babel_parser___parser_7.6.4.tgz"; + name = "_babel_helpers___helpers_7.8.4.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.6.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.6.4.tgz"; - sha1 = "cb9b36a7482110282d5cb6dd424ec9262b473d81"; + name = "_babel_helpers___helpers_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.8.4.tgz"; + sha1 = "754eb3ee727c165e0a240d6c207de7c455f36f73"; }; } { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; + name = "_babel_highlight___highlight_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz"; - sha1 = "b289b306669dce4ad20b0252889a15768c9d417e"; + name = "_babel_highlight___highlight_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; + sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; }; } { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; + name = "_babel_parser___parser_7.8.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz"; - sha1 = "a974cfae1e37c3110e71f3c6a2e48b8e71958cd4"; + name = "_babel_parser___parser_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.4.tgz"; + sha1 = "d1dbe64691d60358a974295fa53da074dd2ce8e8"; }; } { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.6.0.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.6.0.tgz"; - sha1 = "6659d2572a17d70abd68123e89a12a43d90aa30c"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; + sha1 = "bad329c670b382589721b27540c7d288601c6e6f"; }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz"; - sha1 = "e532202db4838723691b10a67b8ce509e397c506"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.8.3.tgz"; + sha1 = "5e06654af5cd04b608915aada9b2a6788004464e"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz"; - sha1 = "568ecc446c6148ae6b267f02551130891e29f317"; + name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.8.3.tgz"; + sha1 = "2156860ab65c5abf068c3f67042184041066543e"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.5.5.tgz"; - sha1 = "61939744f71ba76a3ae46b5eea18a54c16d22e58"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz"; + sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054"; }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz"; - sha1 = "8ffccc8f3a6545e9f78988b6bf4fe881b88e8096"; + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; + sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz"; - sha1 = "135d81edb68a081e55e56ec48541ece8065c38f5"; + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2"; }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz"; - sha1 = "05413762894f41bfe42b9a5e80919bd575dcc802"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz"; + sha1 = "5d6769409699ec9b3b68684cd8116cedff93bad8"; }; } { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz"; - sha1 = "69e1f0db34c6f5a0cf7e2b3323bf159a76c8cb7f"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz"; + sha1 = "eb5ae366118ddca67bed583b53d7554cad9951bb"; }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.2.0.tgz"; - sha1 = "c50b1b957dcc69e4b1127b65e1c33eef61570c1b"; + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; + sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9"; }; } { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz"; - sha1 = "69c159ffaf4998122161ad8ebc5e6d1f55df8612"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz"; + sha1 = "ae10b3214cb25f7adb1f3bc87ba42ca10b7e2543"; }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz"; - sha1 = "a765f061f803bc48f240c26f8747faf97c26bf7c"; + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz"; + sha1 = "b646c3adea5f98800c9ab45105ac34d06cd4a47f"; }; } { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz"; - sha1 = "72bd13f6ffe1d25938129d2a186b11fd62951470"; + name = "_babel_plugin_syntax_async_generators___plugin_syntax_async_generators_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"; + sha1 = "a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"; }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz"; - sha1 = "0b85a3b4bc7cdf4cc4b8bf236335b907ca22e7c7"; + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz"; + sha1 = "8d2c15a9f1af624b0025f961682a9d53d3001bda"; }; } { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz"; - sha1 = "3b7a3e733510c57e820b9142a6579ac8b0dfad2e"; + name = "_babel_plugin_syntax_dynamic_import___plugin_syntax_dynamic_import_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"; + sha1 = "62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"; }; } { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz"; - sha1 = "a94013d6eda8908dfe6a477e7f9eda85656ecf5c"; + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz"; + sha1 = "f2c883bd61a6316f2c89380ae5122f923ba4527f"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.3.3.tgz"; + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.3.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.3.3.tgz"; - sha1 = "a7cc3f66119a9f7ebe2de5383cce193473d65991"; + name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"; + sha1 = "01ca21b668cd8218c9e640cb6dd88c5412b2c96a"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz"; - sha1 = "9aeafbe4d6ffc6563bf8f8372091628f00779550"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz"; + sha1 = "521b06c83c40480f1e58b4fd33b92eceb1d6ea94"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz"; - sha1 = "89a3848a0166623b5bc481164b5936ab947e887e"; + name = "_babel_plugin_syntax_nullish_coalescing_operator___plugin_syntax_nullish_coalescing_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"; + sha1 = "167ed70368886081f74b5c36c65a88c03b66d1a9"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz"; - sha1 = "5d3cc11e8d5ddd752aa64c9148d0db6cb79fd190"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; + sha1 = "0e3fb63e09bea1b11e96467271c8308007e7c41f"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.6.3.tgz"; + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz"; - sha1 = "6e854e51fbbaa84351b15d4ddafe342f3a5d542a"; + name = "_babel_plugin_syntax_object_rest_spread___plugin_syntax_object_rest_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"; + sha1 = "60e225edcbd98a640332a2e72dd3e66f1af55871"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz"; - sha1 = "d094299d9bd680a14a2a0edae38305ad60fb4de9"; + name = "_babel_plugin_syntax_optional_catch_binding___plugin_syntax_optional_catch_binding_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"; + sha1 = "6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz"; - sha1 = "83a7df6a658865b1c8f641d510c6f3af220216da"; + name = "_babel_plugin_syntax_optional_chaining___plugin_syntax_optional_chaining_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"; + sha1 = "4f69c2ab95167e0180cd5336613f8c5788f7d48a"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.6.0.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz"; - sha1 = "44bbe08b57f4480094d57d9ffbcd96d309075ba6"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz"; + sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.6.2.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz"; - sha1 = "44abb948b88f0199a627024e1508acaf8dc9b2f9"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz"; + sha1 = "c1f659dda97711a569cef75275f7e15dcaa6cabc"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz"; - sha1 = "c5dbf5106bf84cdf691222c0974c12b1df931853"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; + sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz"; - sha1 = "a63868289e5b4007f7054d46491af51435766008"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; + sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086"; }; } { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.4.4.tgz"; - sha1 = "d267a081f49a8705fc9146de0768c6b58dccd8f7"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; + sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3"; }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz"; - sha1 = "0267fc735e24c808ba173866c6c4d1440fc3c556"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; + sha1 = "97d35dab66857a437c166358b91d09050c868f3a"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz"; - sha1 = "e1436116abb0610c2259094848754ac5230922ad"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.3.tgz"; + sha1 = "46fd7a9d2bb9ea89ce88720477979fe0d71b21b8"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz"; - sha1 = "690353e81f9267dad4fd8cfd77eafa86aba53ea1"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; + sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz"; - sha1 = "fa10aa5c58a2cb6afcf2c9ffa8cb4d8b3d489a2d"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz"; + sha1 = "20ddfbd9e4676906b1056ee60af88590cc7aaa0b"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz"; - sha1 = "ef00435d46da0a5961aa728a1d2ecff063e4fb91"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; + sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.6.0.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz"; - sha1 = "39dfe957de4420445f1fcf88b68a2e4aa4515486"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; + sha1 = "8d12df309aa537f272899c565ea1768e286e21f1"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz"; - sha1 = "e75266a13ef94202db2a0620977756f51d52d249"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; + sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz"; - sha1 = "7678ce75169f0877b8eb2235538c074268dd01ae"; + name = "_babel_plugin_transform_flow_strip_types___plugin_transform_flow_strip_types_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.8.3.tgz"; + sha1 = "da705a655466b2a9b36046b57bf0cbcd53551bd4"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.6.3.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz"; - sha1 = "aaa6e409dd4fb2e50b6e2a91f7e3a3149dbce0cf"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.4.tgz"; + sha1 = "6fe8eae5d6875086ee185dd0b098a8513783b47d"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz"; - sha1 = "18d120438b0cc9ee95a47f2c72bc9768fbed60a5"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; + sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.5.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz"; - sha1 = "c70021df834073c65eb613b8679cc4a381d1a9f9"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; + sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz"; - sha1 = "7556cf03f318bd2719fe4c922d2d808be5571e16"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz"; + sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz"; - sha1 = "03e33f653f5b25c4eb572c98b9485055b389e905"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz"; + sha1 = "65606d44616b50225e76f5578f33c568a0b876a5"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.6.3.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.6.3.tgz"; - sha1 = "9fc9ea060b983c7c035acbe481cbe1fb1245bfff"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz"; + sha1 = "df251706ec331bd058a34bdd72613915f82928a5"; }; } { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz"; - sha1 = "ebfaed87834ce8dc4279609a4f0c324c156e3eb0"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz"; + sha1 = "d8bbf222c1dbe3661f440f2f00c16e9bb7d0d420"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz"; - sha1 = "461e21ad9478f1031dd5e276108d027f1b5240ba"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz"; + sha1 = "592d578ce06c52f5b98b02f913d653ffe972661a"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz"; - sha1 = "583b10c49cf057e237085bcbd8cc960bd83bd96b"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; + sha1 = "a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.3.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; - sha1 = "f2cab99026631c767e2745a5368b331cfe8f5290"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; + sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.4.5.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz"; - sha1 = "629dc82512c55cee01341fb27bdfcb210354680f"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; + sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz"; - sha1 = "4792af87c998a49367597d07fedf02636d2e1634"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz"; + sha1 = "1d5155de0b65db0ccf9971165745d3bb990d77d3"; }; } { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.6.0.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.0.tgz"; - sha1 = "85a3cce402b28586138e368fce20ab3019b9713e"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz"; + sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263"; }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz"; - sha1 = "6333aee2f8d6ee7e28615457298934a3b46198f0"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.8.3.tgz"; + sha1 = "784c25294bddaad2323eb4ff0c9f4a3f6c87d6bc"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.6.2.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz"; - sha1 = "fc77cf798b24b10c46e1b51b1b88c2bf661bb8dd"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.8.3.tgz"; + sha1 = "70ded987c91609f78353dd76d2fb2a0bb991e8e5"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz"; - sha1 = "a1e454b5995560a9c1e0d537dfc15061fd2687e1"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.8.3.tgz"; + sha1 = "c4f178b2aa588ecfa8d077ea80d4194ee77ed702"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.4.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz"; - sha1 = "9d28fea7bbce637fb7612a0750989d8321d4bcb0"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.8.3.tgz"; + sha1 = "951e75a8af47f9f120db731be095d2b2c34920e0"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz"; - sha1 = "117d2bcec2fbf64b4b59d1f9819894682d29f2b2"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.8.3.tgz"; + sha1 = "4220349c0390fdefa505365f68c103562ab2fc4a"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.6.3.tgz"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.3.tgz"; - sha1 = "dddb50cf3b8b2ef70b22e5326e9a91f05a1db13b"; + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz"; + sha1 = "b31031e8059c07495bf23614c97f3d9698bc6ec8"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.6.2.tgz"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.6.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz"; - sha1 = "b692aad888a7e8d8b1b214be6b9dc03d5031f698"; + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz"; + sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5"; }; } { - name = "_babel_preset_env___preset_env_7.6.0.tgz"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.0.tgz"; - sha1 = "aae4141c506100bb2bfaa4ac2a5c12b395619e50"; + name = "_babel_plugin_transform_runtime___plugin_transform_runtime_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.8.3.tgz"; + sha1 = "c0153bc0a5375ebc1f1591cb7eea223adea9f169"; }; } { - name = "_babel_preset_env___preset_env_7.6.3.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz"; - sha1 = "9e1bf05a2e2d687036d24c40e4639dc46cef2271"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; + sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8"; }; } { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.0.0.tgz"; - sha1 = "e86b4b3d99433c7b3e9e91747e2653958bc6b3c0"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; + sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"; }; } { - name = "_babel_preset_react___preset_react_7.6.3.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.6.3.tgz"; - sha1 = "d5242c828322520205ae4eda5d4f4f618964e2f6"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; + sha1 = "be7a1290f81dae767475452199e1f76d6175b100"; }; } { - name = "_babel_preset_typescript___preset_typescript_7.6.0.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; path = fetchurl { - name = "_babel_preset_typescript___preset_typescript_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.6.0.tgz"; - sha1 = "25768cb8830280baf47c45ab1a519a9977498c98"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; + sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80"; }; } { - name = "_babel_runtime___runtime_7.6.0.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.0.tgz"; - sha1 = "4fc1d642a9fd0299754e8b5de62c631cf5568205"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; + sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412"; }; } { - name = "_babel_runtime___runtime_7.6.3.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.3.tgz"; - sha1 = "935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.8.3.tgz"; + sha1 = "be6f01a7ef423be68e65ace1f04fc407e6d88917"; }; } { - name = "_babel_template___template_7.6.0.tgz"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; path = fetchurl { - name = "_babel_template___template_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.6.0.tgz"; - sha1 = "7f0159c7f5012230dad64cca42ec9bdb5c9536e6"; + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; + sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad"; }; } { - name = "_babel_traverse___traverse_7.6.3.tgz"; + name = "_babel_preset_env___preset_env_7.8.4.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.6.3.tgz"; - sha1 = "66d7dba146b086703c0fb10dd588b7364cec47f9"; + name = "_babel_preset_env___preset_env_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.4.tgz"; + sha1 = "9dac6df5f423015d3d49b6e9e5fa3413e4a72c4e"; }; } { - name = "_babel_types___types_7.6.3.tgz"; + name = "_babel_preset_react___preset_react_7.8.3.tgz"; path = fetchurl { - name = "_babel_types___types_7.6.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.6.3.tgz"; - sha1 = "3f07d96f854f98e2fbd45c64b0cb942d11e8ba09"; + name = "_babel_preset_react___preset_react_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.8.3.tgz"; + sha1 = "23dc63f1b5b0751283e04252e78cf1d6589273d2"; }; } { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; + name = "_babel_preset_typescript___preset_typescript_7.8.3.tgz"; path = fetchurl { - name = "_cnakazawa_watch___watch_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.3.tgz"; - sha1 = "099139eaec7ebf07a27c1786a3ff64f39464d2ef"; + name = "_babel_preset_typescript___preset_typescript_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.8.3.tgz"; + sha1 = "90af8690121beecd9a75d0cc26c6be39d1595d13"; + }; + } + { + name = "_babel_runtime___runtime_7.8.4.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz"; + sha1 = "d79f5a2040f7caa24d53e563aad49cbc05581308"; + }; + } + { + name = "_babel_template___template_7.8.3.tgz"; + path = fetchurl { + name = "_babel_template___template_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.3.tgz"; + sha1 = "e02ad04fe262a657809327f578056ca15fd4d1b8"; + }; + } + { + name = "_babel_traverse___traverse_7.8.4.tgz"; + path = fetchurl { + name = "_babel_traverse___traverse_7.8.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.4.tgz"; + sha1 = "f0845822365f9d5b0e312ed3959d3f827f869e3c"; + }; + } + { + name = "_babel_types___types_7.8.3.tgz"; + path = fetchurl { + name = "_babel_types___types_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.8.3.tgz"; + sha1 = "5a383dffa5416db1b73dedffd311ffd0788fb31c"; + }; + } + { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + path = fetchurl { + name = "_cnakazawa_watch___watch_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/@cnakazawa/watch/-/watch-1.0.4.tgz"; + sha1 = "f864ae85004d0fcab6f50be9141c4da368d1656a"; }; } { @@ -778,51 +818,51 @@ }; } { - name = "_csstools_normalize.css___normalize.css_9.0.1.tgz"; + name = "_csstools_normalize.css___normalize.css_10.1.0.tgz"; path = fetchurl { - name = "_csstools_normalize.css___normalize.css_9.0.1.tgz"; - url = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-9.0.1.tgz"; - sha1 = "c27b391d8457d1e893f1eddeaf5e5412d12ffbb5"; + name = "_csstools_normalize.css___normalize.css_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-10.1.0.tgz"; + sha1 = "f0950bba18819512d42f7197e56c518aa491cf18"; }; } { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.25.tgz"; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.27.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.25.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.25.tgz"; - sha1 = "6df015905081f2762e5cfddeb7a20d2e9b16c786"; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.27.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.27.tgz"; + sha1 = "19706345859fc46adf3684ed01d11b40903b87e9"; }; } { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.25.tgz"; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.27.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.25.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.25.tgz"; - sha1 = "24b03391d14f0c6171e8cad7057c687b74049790"; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.27.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.27.tgz"; + sha1 = "e4db8e3be81a40988213507c3e3d0c158a6641a3"; }; } { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.11.2.tgz"; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.12.1.tgz"; path = fetchurl { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.11.2.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.11.2.tgz"; - sha1 = "2f2f1459743a27902b76655a0d0bc5ec4d945631"; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.12.1.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.12.1.tgz"; + sha1 = "76b6f958a3471821ff146f8f955e6d7cfe87147c"; }; } { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.6.tgz"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz"; path = fetchurl { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.6.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.6.tgz"; - sha1 = "b798b96401e25d07c30bbe1b9ec0e6d8a33760a5"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.8.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.8.tgz"; + sha1 = "cb6d4dd3aeec45b6ff2d48c812317a6627618511"; }; } { - name = "_hapi_address___address_2.1.2.tgz"; + name = "_hapi_address___address_2.1.4.tgz"; path = fetchurl { - name = "_hapi_address___address_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz"; - sha1 = "1c794cd6dbf2354d1eb1ef10e0303f573e1c7222"; + name = "_hapi_address___address_2.1.4.tgz"; + url = "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz"; + sha1 = "5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"; }; } { @@ -834,11 +874,11 @@ }; } { - name = "_hapi_hoek___hoek_8.3.1.tgz"; + name = "_hapi_hoek___hoek_8.5.1.tgz"; path = fetchurl { - name = "_hapi_hoek___hoek_8.3.1.tgz"; - url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.3.1.tgz"; - sha1 = "227d29efdb158e4a64590224add90c820f94d20e"; + name = "_hapi_hoek___hoek_8.5.1.tgz"; + url = "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.5.1.tgz"; + sha1 = "fde96064ca446dec8c55a8c2f130957b070c6e06"; }; } { @@ -954,27 +994,19 @@ }; } { - name = "_reach_auto_id___auto_id_0.2.0.tgz"; + name = "_reach_router___router_1.3.1.tgz"; path = fetchurl { - name = "_reach_auto_id___auto_id_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/@reach/auto-id/-/auto-id-0.2.0.tgz"; - sha1 = "97f9e48fe736aa5c6f4f32cf73c1f19d005f8550"; + name = "_reach_router___router_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.1.tgz"; + sha1 = "0a49f75fa9621323d6e21c803447bcfcde1713b2"; }; } { - name = "_reach_router___router_1.2.1.tgz"; + name = "_sinonjs_commons___commons_1.7.1.tgz"; path = fetchurl { - name = "_reach_router___router_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/@reach/router/-/router-1.2.1.tgz"; - sha1 = "34ae3541a5ac44fa7796e5506a5d7274a162be4e"; - }; - } - { - name = "_sinonjs_commons___commons_1.6.0.tgz"; - path = fetchurl { - name = "_sinonjs_commons___commons_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.6.0.tgz"; - sha1 = "ec7670432ae9c8eb710400d112c201a362d83393"; + name = "_sinonjs_commons___commons_1.7.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.1.tgz"; + sha1 = "da5fd19a5f71177a53778073978873964f49acf1"; }; } { @@ -1106,35 +1138,35 @@ }; } { - name = "_svgr_webpack___webpack_4.3.2.tgz"; + name = "_svgr_webpack___webpack_4.3.3.tgz"; path = fetchurl { - name = "_svgr_webpack___webpack_4.3.2.tgz"; - url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.2.tgz"; - sha1 = "319d4471c8f3d5c3af35059274834d9b5b8fb956"; + name = "_svgr_webpack___webpack_4.3.3.tgz"; + url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-4.3.3.tgz"; + sha1 = "13cc2423bf3dff2d494f16b17eb7eacb86895017"; }; } { - name = "_testing_library_react_hooks___react_hooks_3.1.1.tgz"; + name = "_testing_library_react_hooks___react_hooks_3.2.1.tgz"; path = fetchurl { - name = "_testing_library_react_hooks___react_hooks_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.1.1.tgz"; - sha1 = "5c93e463c0252bea6ac237ec8d9c982c27d67208"; + name = "_testing_library_react_hooks___react_hooks_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.2.1.tgz"; + sha1 = "19b6caa048ef15faa69d439c469033873ea01294"; }; } { - name = "_types_babel__core___babel__core_7.1.3.tgz"; + name = "_types_babel__core___babel__core_7.1.5.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.3.tgz"; - sha1 = "e441ea7df63cd080dfcd02ab199e6d16a735fc30"; + name = "_types_babel__core___babel__core_7.1.5.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.5.tgz"; + sha1 = "e4d84704b4df868b3ad538365a13da2fa6dbc023"; }; } { - name = "_types_babel__generator___babel__generator_7.6.0.tgz"; + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; path = fetchurl { - name = "_types_babel__generator___babel__generator_7.6.0.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.0.tgz"; - sha1 = "f1ec1c104d1bb463556ecb724018ab788d0c172a"; + name = "_types_babel__generator___babel__generator_7.6.1.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz"; + sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04"; }; } { @@ -1146,19 +1178,19 @@ }; } { - name = "_types_babel__traverse___babel__traverse_7.0.7.tgz"; + name = "_types_babel__traverse___babel__traverse_7.0.9.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.7.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.7.tgz"; - sha1 = "2496e9ff56196cc1429c72034e07eab6121b6f3f"; + name = "_types_babel__traverse___babel__traverse_7.0.9.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.9.tgz"; + sha1 = "be82fab304b141c3eee81a4ce3b034d0eba1590a"; }; } { - name = "_types_cheerio___cheerio_0.22.13.tgz"; + name = "_types_cheerio___cheerio_0.22.16.tgz"; path = fetchurl { - name = "_types_cheerio___cheerio_0.22.13.tgz"; - url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.13.tgz"; - sha1 = "5eecda091a24514185dcba99eda77e62bf6523e6"; + name = "_types_cheerio___cheerio_0.22.16.tgz"; + url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.16.tgz"; + sha1 = "c748a97b8a6f781b04bbda4a552e11b35bcc77e4"; }; } { @@ -1178,19 +1210,19 @@ }; } { - name = "_types_enzyme_adapter_react_16___enzyme_adapter_react_16_1.0.5.tgz"; + name = "_types_enzyme_adapter_react_16___enzyme_adapter_react_16_1.0.6.tgz"; path = fetchurl { - name = "_types_enzyme_adapter_react_16___enzyme_adapter_react_16_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.5.tgz"; - sha1 = "1bf30a166f49be69eeda4b81e3f24113c8b4e9d5"; + name = "_types_enzyme_adapter_react_16___enzyme_adapter_react_16_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.6.tgz"; + sha1 = "8aca7ae2fd6c7137d869b6616e696d21bb8b0cec"; }; } { - name = "_types_enzyme___enzyme_3.10.3.tgz"; + name = "_types_enzyme___enzyme_3.10.5.tgz"; path = fetchurl { - name = "_types_enzyme___enzyme_3.10.3.tgz"; - url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.3.tgz"; - sha1 = "02b6c5ac7d0472005944a652e79045e2f6c66804"; + name = "_types_enzyme___enzyme_3.10.5.tgz"; + url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.5.tgz"; + sha1 = "fe7eeba3550369eed20e7fb565bfb74eec44f1f0"; }; } { @@ -1202,6 +1234,14 @@ }; } { + name = "_types_events___events_3.0.0.tgz"; + path = fetchurl { + name = "_types_events___events_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; + sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; + }; + } + { name = "_types_flot___flot_0.0.31.tgz"; path = fetchurl { name = "_types_flot___flot_0.0.31.tgz"; @@ -1210,11 +1250,19 @@ }; } { - name = "_types_history___history_4.7.3.tgz"; + name = "_types_glob___glob_7.1.1.tgz"; + path = fetchurl { + name = "_types_glob___glob_7.1.1.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; + sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + }; + } + { + name = "_types_history___history_4.7.5.tgz"; path = fetchurl { - name = "_types_history___history_4.7.3.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.3.tgz"; - sha1 = "856c99cdc1551d22c22b18b5402719affec9839a"; + name = "_types_history___history_4.7.5.tgz"; + url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz"; + sha1 = "527d20ef68571a4af02ed74350164e7a67544860"; }; } { @@ -1234,11 +1282,11 @@ }; } { - name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; path = fetchurl { - name = "_types_istanbul_lib_report___istanbul_lib_report_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz"; - sha1 = "e5471e7fa33c61358dd38426189c037a58433b8c"; + name = "_types_istanbul_lib_report___istanbul_lib_report_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"; + sha1 = "c14c24f18ea8190c118ee7562b7ff99a36552686"; }; } { @@ -1250,35 +1298,35 @@ }; } { - name = "_types_jest_diff___jest_diff_20.0.1.tgz"; + name = "_types_jest___jest_24.9.1.tgz"; path = fetchurl { - name = "_types_jest_diff___jest_diff_20.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/jest-diff/-/jest-diff-20.0.1.tgz"; - sha1 = "35cc15b9c4f30a18ef21852e255fdb02f6d59b89"; + name = "_types_jest___jest_24.9.1.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz"; + sha1 = "02baf9573c78f1b9974a5f36778b366aa77bd534"; }; } { - name = "_types_jest___jest_24.0.20.tgz"; + name = "_types_jquery___jquery_3.3.32.tgz"; path = fetchurl { - name = "_types_jest___jest_24.0.20.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.20.tgz"; - sha1 = "729d5fe8684e7fb06368d3bd557ac6d91289d861"; + name = "_types_jquery___jquery_3.3.32.tgz"; + url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.32.tgz"; + sha1 = "93e27fdc45dd38ee07f2f0acf34b59c1ccee036f"; }; } { - name = "_types_jquery___jquery_3.3.31.tgz"; + name = "_types_json_schema___json_schema_7.0.4.tgz"; path = fetchurl { - name = "_types_jquery___jquery_3.3.31.tgz"; - url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.31.tgz"; - sha1 = "27c706e4bf488474e1cb54a71d8303f37c93451b"; + name = "_types_json_schema___json_schema_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; + sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; }; } { - name = "_types_json_schema___json_schema_7.0.3.tgz"; + name = "_types_minimatch___minimatch_3.0.3.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz"; - sha1 = "bdfd69d61e464dcc81b25159c270d75a73c1a636"; + name = "_types_minimatch___minimatch_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"; }; } { @@ -1290,11 +1338,27 @@ }; } { - name = "_types_node___node_12.11.1.tgz"; + name = "_types_node___node_13.7.4.tgz"; + path = fetchurl { + name = "_types_node___node_13.7.4.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-13.7.4.tgz"; + sha1 = "76c3cb3a12909510f52e5dc04a6298cdf9504ffd"; + }; + } + { + name = "_types_node___node_12.12.28.tgz"; path = fetchurl { - name = "_types_node___node_12.11.1.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.11.1.tgz"; - sha1 = "1fd7b821f798b7fa29f667a1be8f3442bb8922a3"; + name = "_types_node___node_12.12.28.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.28.tgz"; + sha1 = "3a2b5f8d21f96ace690a8832ae9779114612575f"; + }; + } + { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + path = fetchurl { + name = "_types_parse_json___parse_json_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz"; + sha1 = "2f8bb441434d163b35fb8ffdccd7138927ffb8c0"; }; } { @@ -1314,11 +1378,11 @@ }; } { - name = "_types_reach__router___reach__router_1.2.6.tgz"; + name = "_types_reach__router___reach__router_1.3.0.tgz"; path = fetchurl { - name = "_types_reach__router___reach__router_1.2.6.tgz"; - url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.2.6.tgz"; - sha1 = "b14cf1adbd1a365d204bbf6605cd9dd7b8816c87"; + name = "_types_reach__router___reach__router_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.0.tgz"; + sha1 = "4c05a947ccecca05c72bb335a0f7bb43fec12446"; }; } { @@ -1330,43 +1394,43 @@ }; } { - name = "_types_react_dom___react_dom_16.9.2.tgz"; + name = "_types_react_dom___react_dom_16.9.5.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.2.tgz"; - sha1 = "90f9e6c161850be1feb31d2f448121be2a4f3b47"; + name = "_types_react_dom___react_dom_16.9.5.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.5.tgz"; + sha1 = "5de610b04a35d07ffd8f44edad93a71032d9aaa7"; }; } { - name = "_types_react_resize_detector___react_resize_detector_4.0.2.tgz"; + name = "_types_react_resize_detector___react_resize_detector_4.2.0.tgz"; path = fetchurl { - name = "_types_react_resize_detector___react_resize_detector_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react-resize-detector/-/react-resize-detector-4.0.2.tgz"; - sha1 = "5c046301a881fe9af741536e0dd4c34dfb155c6e"; + name = "_types_react_resize_detector___react_resize_detector_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/react-resize-detector/-/react-resize-detector-4.2.0.tgz"; + sha1 = "ee8802e25cfb34439aa7f52626932ea62dc5792e"; }; } { - name = "_types_react_test_renderer___react_test_renderer_16.9.1.tgz"; + name = "_types_react_test_renderer___react_test_renderer_16.9.2.tgz"; path = fetchurl { - name = "_types_react_test_renderer___react_test_renderer_16.9.1.tgz"; - url = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.1.tgz"; - sha1 = "9d432c46c515ebe50c45fa92c6fb5acdc22e39c4"; + name = "_types_react_test_renderer___react_test_renderer_16.9.2.tgz"; + url = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.2.tgz"; + sha1 = "e1c408831e8183e5ad748fdece02214a7c2ab6c5"; }; } { - name = "_types_react___react_16.9.9.tgz"; + name = "_types_react___react_16.9.21.tgz"; path = fetchurl { - name = "_types_react___react_16.9.9.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.9.tgz"; - sha1 = "a62c6f40f04bc7681be5e20975503a64fe783c3a"; + name = "_types_react___react_16.9.21.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.21.tgz"; + sha1 = "99e274e2ecfab6bb93920e918341daa3198b348d"; }; } { - name = "_types_reactstrap___reactstrap_8.0.5.tgz"; + name = "_types_reactstrap___reactstrap_8.4.1.tgz"; path = fetchurl { - name = "_types_reactstrap___reactstrap_8.0.5.tgz"; - url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.0.5.tgz"; - sha1 = "6c6429bcfcc1d97d9a89bcb73a07bbb698bfe945"; + name = "_types_reactstrap___reactstrap_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.1.tgz"; + sha1 = "6dff4d1fdf59233877925e3caec406272050b632"; }; } { @@ -1378,11 +1442,11 @@ }; } { - name = "_types_sinon___sinon_7.5.0.tgz"; + name = "_types_sinon___sinon_7.5.1.tgz"; path = fetchurl { - name = "_types_sinon___sinon_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.0.tgz"; - sha1 = "f5a10c27175465a0b001b68d8b9f761582967cc6"; + name = "_types_sinon___sinon_7.5.1.tgz"; + url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.1.tgz"; + sha1 = "d27b81af0d1cfe1f9b24eebe7a24f74ae40f5b7c"; }; } { @@ -1402,91 +1466,59 @@ }; } { - name = "_types_testing_library__react_hooks___testing_library__react_hooks_2.0.0.tgz"; - path = fetchurl { - name = "_types_testing_library__react_hooks___testing_library__react_hooks_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-2.0.0.tgz"; - sha1 = "7b289d64945517ae8ba9cbcb0c5b282432aaeffa"; - }; - } - { - name = "_types_yargs_parser___yargs_parser_13.1.0.tgz"; - path = fetchurl { - name = "_types_yargs_parser___yargs_parser_13.1.0.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz"; - sha1 = "c563aa192f39350a1d18da36c5a8da382bbd8228"; - }; - } - { - name = "_types_yargs___yargs_13.0.3.tgz"; - path = fetchurl { - name = "_types_yargs___yargs_13.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz"; - sha1 = "76482af3981d4412d65371a318f992d33464a380"; - }; - } - { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.5.0.tgz"; - path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.5.0.tgz"; - sha1 = "101d96743ce3365b3223df73d641078c9b775903"; - }; - } - { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.4.0.tgz"; + name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.2.0.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.4.0.tgz"; - sha1 = "aaf6b542ff75b78f4191a8bf1c519184817caa24"; + name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.2.0.tgz"; + sha1 = "52f3a109bef06080e3b1e3ae7ea1c014ce859897"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.4.0.tgz"; + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.4.0.tgz"; - sha1 = "dd8f3f466be25c3610a06fed22cfb6e6aa17f6d9"; + name = "_types_yargs_parser___yargs_parser_15.0.0.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz"; + sha1 = "cb3f9f741869e20cce330ffbeb9271590483882d"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.5.0.tgz"; + name = "_types_yargs___yargs_13.0.8.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.5.0.tgz"; - sha1 = "383a97ded9a7940e5053449f6d73995e782b8fb1"; + name = "_types_yargs___yargs_13.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz"; + sha1 = "a38c22def2f1c2068f8971acb3ea734eb3c64a99"; }; } { - name = "_typescript_eslint_parser___parser_2.5.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.5.0.tgz"; - sha1 = "858030ddd808fbbe88e03f42e5971efaccb8218a"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.20.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.20.0.tgz"; + sha1 = "a522d0e1e4898f7c9c6a8e1ed3579b60867693fa"; }; } { - name = "_typescript_eslint_parser___parser_2.4.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.4.0.tgz"; - sha1 = "fe43ed5fec14af03d3594fce2c3b7ec4c8df0243"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.20.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.20.0.tgz"; + sha1 = "3b6fa5a6b8885f126d5a4280e0d44f0f41e73e32"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.4.0.tgz"; + name = "_typescript_eslint_parser___parser_2.20.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.4.0.tgz"; - sha1 = "722c95493e1b7682893edaaaec0e69f36917feef"; + name = "_typescript_eslint_parser___parser_2.20.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.20.0.tgz"; + sha1 = "608e5bb06ba98a415b64ace994c79ab20f9772a9"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.5.0.tgz"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.5.0.tgz"; - sha1 = "40ada624d6217ef092a3a79ed30d947ad4f212ce"; + name = "_typescript_eslint_typescript_estree___typescript_estree_2.20.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.20.0.tgz"; + sha1 = "90a0f5598826b35b966ca83483b1a621b1a4d0c9"; }; } { @@ -1650,11 +1682,11 @@ }; } { - name = "abab___abab_2.0.2.tgz"; + name = "abab___abab_2.0.3.tgz"; path = fetchurl { - name = "abab___abab_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.2.tgz"; - sha1 = "a2fba1b122c69a85caa02d10f9270c7219709a9d"; + name = "abab___abab_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; + sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; }; } { @@ -1706,11 +1738,11 @@ }; } { - name = "acorn___acorn_6.3.0.tgz"; + name = "acorn___acorn_6.4.0.tgz"; path = fetchurl { - name = "acorn___acorn_6.3.0.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.3.0.tgz"; - sha1 = "0087509119ffa4fc0a0041d1e93a417e68cb856e"; + name = "acorn___acorn_6.4.0.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz"; + sha1 = "b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"; }; } { @@ -1738,6 +1770,14 @@ }; } { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + path = fetchurl { + name = "aggregate_error___aggregate_error_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; + sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; + }; + } + { name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz"; path = fetchurl { name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz"; @@ -1762,11 +1802,11 @@ }; } { - name = "ajv___ajv_6.10.2.tgz"; + name = "ajv___ajv_6.11.0.tgz"; path = fetchurl { - name = "ajv___ajv_6.10.2.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz"; - sha1 = "d3cea04d6b017b2894ad69040fec8b623eb4bd52"; + name = "ajv___ajv_6.11.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz"; + sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; }; } { @@ -1794,11 +1834,11 @@ }; } { - name = "ansi_escapes___ansi_escapes_4.2.1.tgz"; + name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; path = fetchurl { - name = "ansi_escapes___ansi_escapes_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.2.1.tgz"; - sha1 = "4dccdb846c3eee10f6d64dea66273eab90c37228"; + name = "ansi_escapes___ansi_escapes_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz"; + sha1 = "a4ce2b33d6b214b7950d8595c212f12ac9cc569d"; }; } { @@ -1834,6 +1874,14 @@ }; } { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } + { name = "ansi_styles___ansi_styles_2.2.1.tgz"; path = fetchurl { name = "ansi_styles___ansi_styles_2.2.1.tgz"; @@ -1970,11 +2018,11 @@ }; } { - name = "array_includes___array_includes_3.0.3.tgz"; + name = "array_includes___array_includes_3.1.1.tgz"; path = fetchurl { - name = "array_includes___array_includes_3.0.3.tgz"; - url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz"; - sha1 = "184b48f62d92d7452bb31b323165c7f8bd02266d"; + name = "array_includes___array_includes_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz"; + sha1 = "cdd67e6852bdf9c1215460786732255ed2459348"; }; } { @@ -2010,11 +2058,11 @@ }; } { - name = "array.prototype.flat___array.prototype.flat_1.2.2.tgz"; + name = "array.prototype.flat___array.prototype.flat_1.2.3.tgz"; path = fetchurl { - name = "array.prototype.flat___array.prototype.flat_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.2.tgz"; - sha1 = "8f3c71d245ba349b6b64b4078f76f5576f1fd723"; + 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"; }; } { @@ -2138,11 +2186,11 @@ }; } { - name = "autoprefixer___autoprefixer_9.6.5.tgz"; + name = "autoprefixer___autoprefixer_9.7.4.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_9.6.5.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.5.tgz"; - sha1 = "98f4afe7e93cccf323287515d426019619775e5e"; + name = "autoprefixer___autoprefixer_9.7.4.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz"; + sha1 = "f8bf3e06707d047f0641d87aee8cfb174b2a5378"; }; } { @@ -2154,19 +2202,19 @@ }; } { - name = "aws4___aws4_1.8.0.tgz"; + name = "aws4___aws4_1.9.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.8.0.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz"; - sha1 = "f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"; + name = "aws4___aws4_1.9.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; + sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; }; } { - name = "axobject_query___axobject_query_2.0.2.tgz"; + name = "axobject_query___axobject_query_2.1.2.tgz"; path = fetchurl { - name = "axobject_query___axobject_query_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.0.2.tgz"; - sha1 = "ea187abe5b9002b377f925d8bf7d1c561adf38f9"; + name = "axobject_query___axobject_query_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; + sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; }; } { @@ -2234,19 +2282,19 @@ }; } { - name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz"; + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; path = fetchurl { - name = "babel_plugin_macros___babel_plugin_macros_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz"; - sha1 = "41f7ead616fc36f6a93180e89697f69f51671181"; + name = "babel_plugin_macros___babel_plugin_macros_2.8.0.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; + sha1 = "0f958a7cc6556b1e65344465d99111a1e5e10138"; }; } { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.4.tgz"; + name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz"; path = fetchurl { - name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.4.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.4.tgz"; - sha1 = "4a8fc30e9a3e2b1f5ed36883386ab2d84e1089bd"; + name = "babel_plugin_named_asset_import___babel_plugin_named_asset_import_0.3.6.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.6.tgz"; + sha1 = "c9750a1b38d85112c9e166bf3ef7c5dbc605f4be"; }; } { @@ -2282,11 +2330,11 @@ }; } { - name = "babel_preset_react_app___babel_preset_react_app_9.0.2.tgz"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz"; path = fetchurl { - name = "babel_preset_react_app___babel_preset_react_app_9.0.2.tgz"; - url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.0.2.tgz"; - sha1 = "247d37e883d6d6f4b4691e5f23711bb2dd80567d"; + name = "babel_preset_react_app___babel_preset_react_app_9.1.1.tgz"; + url = "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-9.1.1.tgz"; + sha1 = "d1ceb47cbe48b285fdd5c562c54c432ed5a41e0e"; }; } { @@ -2370,11 +2418,19 @@ }; } { - name = "bluebird___bluebird_3.7.1.tgz"; + name = "bindings___bindings_1.5.0.tgz"; + path = fetchurl { + name = "bindings___bindings_1.5.0.tgz"; + url = "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz"; + sha1 = "10353c9e945334bc0511a6d90b38fbc7c9c504df"; + }; + } + { + name = "bluebird___bluebird_3.7.2.tgz"; path = fetchurl { - name = "bluebird___bluebird_3.7.1.tgz"; - url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz"; - sha1 = "df70e302b471d7473489acf26a93d63b53f874de"; + name = "bluebird___bluebird_3.7.2.tgz"; + url = "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz"; + sha1 = "9f229c15be272454ffa973ace0dbee79a1b0c36f"; }; } { @@ -2410,11 +2466,11 @@ }; } { - name = "bootstrap___bootstrap_4.3.1.tgz"; + name = "bootstrap___bootstrap_4.4.1.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_4.3.1.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz"; - sha1 = "280ca8f610504d99d7b6b4bfc4b68cec601704ac"; + name = "bootstrap___bootstrap_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz"; + sha1 = "8582960eea0c5cd2bede84d8b0baf3789c3e8b01"; }; } { @@ -2514,27 +2570,27 @@ }; } { - name = "browserslist___browserslist_4.7.0.tgz"; + name = "browserslist___browserslist_4.8.6.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.0.tgz"; - sha1 = "9ee89225ffc07db03409f2fee524dc8227458a17"; + name = "browserslist___browserslist_4.8.6.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.6.tgz"; + sha1 = "96406f3f5f0755d272e27a66f4163ca821590a7e"; }; } { - name = "browserslist___browserslist_4.7.1.tgz"; + name = "browserslist___browserslist_4.8.7.tgz"; path = fetchurl { - name = "browserslist___browserslist_4.7.1.tgz"; - url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.7.1.tgz"; - sha1 = "bd400d1aea56538580e8c4d5f1c54ac11b5ab468"; + name = "browserslist___browserslist_4.8.7.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.7.tgz"; + sha1 = "ec8301ff415e6a42c949d0e66b405eb539c532d0"; }; } { - name = "bser___bser_2.1.0.tgz"; + name = "bser___bser_2.1.1.tgz"; path = fetchurl { - name = "bser___bser_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/bser/-/bser-2.1.0.tgz"; - sha1 = "65fc784bf7f87c009b973c12db6546902fa9c7b5"; + name = "bser___bser_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz"; + sha1 = "e6787da20ece9d07998533cfd9de6f5c38f4bc05"; }; } { @@ -2562,11 +2618,11 @@ }; } { - name = "buffer___buffer_4.9.1.tgz"; + name = "buffer___buffer_4.9.2.tgz"; path = fetchurl { - name = "buffer___buffer_4.9.1.tgz"; - url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + name = "buffer___buffer_4.9.2.tgz"; + url = "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz"; + sha1 = "230ead344002988644841ab0244af8c44bbe3ef8"; }; } { @@ -2602,6 +2658,14 @@ }; } { + name = "cacache___cacache_13.0.1.tgz"; + path = fetchurl { + name = "cacache___cacache_13.0.1.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz"; + sha1 = "a8000c21697089082f85287a1aec6e382024a71c"; + }; + } + { name = "cache_base___cache_base_1.0.1.tgz"; path = fetchurl { name = "cache_base___cache_base_1.0.1.tgz"; @@ -2650,11 +2714,11 @@ }; } { - name = "camel_case___camel_case_3.0.0.tgz"; + name = "camel_case___camel_case_4.1.1.tgz"; path = fetchurl { - name = "camel_case___camel_case_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; - sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + name = "camel_case___camel_case_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz"; + sha1 = "1fc41c854f00e2f7d0139dfeba1542d6896fe547"; }; } { @@ -2666,14 +2730,6 @@ }; } { - name = "camelcase___camelcase_4.1.0.tgz"; - path = fetchurl { - name = "camelcase___camelcase_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz"; - sha1 = "d545635be1e33c542649c69173e5de6acfae34dd"; - }; - } - { name = "camelcase___camelcase_5.3.1.tgz"; path = fetchurl { name = "camelcase___camelcase_5.3.1.tgz"; @@ -2690,11 +2746,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30000999.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30000999.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000999.tgz"; - sha1 = "427253a69ad7bea4aa8d8345687b8eec51ca0e43"; + name = "caniuse_lite___caniuse_lite_1.0.30001028.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001028.tgz"; + sha1 = "f2241242ac70e0fa9cda55c2776d32a0867971c2"; }; } { @@ -2706,11 +2762,11 @@ }; } { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz"; + name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz"; path = fetchurl { - name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.2.0.tgz"; - sha1 = "3371ef6365ef9c25fa4b81c16ace0e9c7dc58c3e"; + name = "case_sensitive_paths_webpack_plugin___case_sensitive_paths_webpack_plugin_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz"; + sha1 = "23ac613cc9a856e4f88ff8bb73bbb5e989825cf7"; }; } { @@ -2762,19 +2818,19 @@ }; } { - name = "chokidar___chokidar_3.2.2.tgz"; + name = "chokidar___chokidar_3.3.1.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.2.2.tgz"; - sha1 = "a433973350021e09f2b853a2287781022c0dc935"; + name = "chokidar___chokidar_3.3.1.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz"; + sha1 = "c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"; }; } { - name = "chownr___chownr_1.1.3.tgz"; + name = "chownr___chownr_1.1.4.tgz"; path = fetchurl { - name = "chownr___chownr_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz"; - sha1 = "42d837d5239688d55f303003a508230fa6727142"; + name = "chownr___chownr_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz"; + sha1 = "6fc9d7b42d32a583596337666e7d08084da2cc6b"; }; } { @@ -2818,19 +2874,27 @@ }; } { - name = "clean_css___clean_css_4.2.1.tgz"; + name = "clean_css___clean_css_4.2.3.tgz"; path = fetchurl { - name = "clean_css___clean_css_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz"; - sha1 = "2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"; + name = "clean_css___clean_css_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; + sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; }; } { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; + name = "clean_stack___clean_stack_2.2.0.tgz"; path = fetchurl { - name = "cli_cursor___cli_cursor_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz"; - sha1 = "b35dac376479facc3e94747d41d0d0f5238ffcb5"; + name = "clean_stack___clean_stack_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz"; + sha1 = "ee8472dbb129e727b31e8a10a427dee9dfe4008b"; + }; + } + { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + path = fetchurl { + name = "cli_cursor___cli_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz"; + sha1 = "264305a7ae490d1d03bf0c9ba7c925d1753af307"; }; } { @@ -2954,22 +3018,6 @@ }; } { - name = "commander___commander_2.17.1.tgz"; - path = fetchurl { - name = "commander___commander_2.17.1.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz"; - sha1 = "bd77ab7de6de94205ceacc72f1716d29f20a77bf"; - }; - } - { - name = "commander___commander_2.20.0.tgz"; - path = fetchurl { - name = "commander___commander_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz"; - sha1 = "d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"; - }; - } - { name = "commander___commander_2.20.3.tgz"; path = fetchurl { name = "commander___commander_2.20.3.tgz"; @@ -2978,11 +3026,11 @@ }; } { - name = "commander___commander_2.19.0.tgz"; + name = "commander___commander_4.1.1.tgz"; path = fetchurl { - name = "commander___commander_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz"; - sha1 = "f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"; + name = "commander___commander_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; + sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068"; }; } { @@ -3018,11 +3066,11 @@ }; } { - name = "compressible___compressible_2.0.17.tgz"; + name = "compressible___compressible_2.0.18.tgz"; path = fetchurl { - name = "compressible___compressible_2.0.17.tgz"; - url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.17.tgz"; - sha1 = "6e8c108a16ad58384a977f3a482ca20bff2f38c1"; + name = "compressible___compressible_2.0.18.tgz"; + url = "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz"; + sha1 = "af53cca6b070d4c3c0750fbd77286a6d7cc46fba"; }; } { @@ -3034,11 +3082,11 @@ }; } { - name = "compute_scroll_into_view___compute_scroll_into_view_1.0.11.tgz"; + name = "compute_scroll_into_view___compute_scroll_into_view_1.0.13.tgz"; path = fetchurl { - name = "compute_scroll_into_view___compute_scroll_into_view_1.0.11.tgz"; - url = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.11.tgz"; - sha1 = "7ff0a57f9aeda6314132d8994cce7aeca794fecf"; + name = "compute_scroll_into_view___compute_scroll_into_view_1.0.13.tgz"; + url = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.13.tgz"; + sha1 = "be1b1663b0e3f56cd5f7713082549f562a3477e2"; }; } { @@ -3074,11 +3122,11 @@ }; } { - name = "console_browserify___console_browserify_1.1.0.tgz"; + name = "console_browserify___console_browserify_1.2.0.tgz"; path = fetchurl { - name = "console_browserify___console_browserify_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz"; - sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10"; + name = "console_browserify___console_browserify_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz"; + sha1 = "67063cef57ceb6cf4993a2ab3a55840ae8c49336"; }; } { @@ -3122,11 +3170,11 @@ }; } { - name = "convert_source_map___convert_source_map_1.6.0.tgz"; + name = "convert_source_map___convert_source_map_1.7.0.tgz"; path = fetchurl { - name = "convert_source_map___convert_source_map_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz"; - sha1 = "51b537a8c43e0f04dec1993bffcdd504e758ac20"; + name = "convert_source_map___convert_source_map_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha1 = "17a2cb882d7f77d3490585e2ce6c524424a3a442"; }; } { @@ -3170,43 +3218,35 @@ }; } { - name = "copy_to_clipboard___copy_to_clipboard_3.2.0.tgz"; + name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz"; path = fetchurl { - name = "copy_to_clipboard___copy_to_clipboard_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz"; - sha1 = "d2724a3ccbfed89706fac8a894872c979ac74467"; + name = "copy_to_clipboard___copy_to_clipboard_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.2.1.tgz"; + sha1 = "b1a1137100e5665d5a96015cb579e30e90e07c44"; }; } { - name = "core_js_compat___core_js_compat_3.3.2.tgz"; + name = "core_js_compat___core_js_compat_3.6.4.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.3.2.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.3.2.tgz"; - sha1 = "1096c989c1b929ede06b5b6b4768dc4439078c03"; + name = "core_js_compat___core_js_compat_3.6.4.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz"; + sha1 = "938476569ebb6cda80d339bcf199fae4f16fff17"; }; } { - name = "core_js___core_js_3.2.1.tgz"; + name = "core_js___core_js_2.6.11.tgz"; path = fetchurl { - name = "core_js___core_js_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.2.1.tgz"; - sha1 = "cd41f38534da6cc59f7db050fe67307de9868b09"; + 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_1.2.7.tgz"; + name = "core_js___core_js_3.6.4.tgz"; path = fetchurl { - name = "core_js___core_js_1.2.7.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz"; - sha1 = "652294c14651db28fa93bd2d5ff2983a4f08c636"; - }; - } - { - name = "core_js___core_js_2.6.10.tgz"; - path = fetchurl { - name = "core_js___core_js_2.6.10.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz"; - sha1 = "8a5b8391f8cc7013da703411ce5b585706300d7f"; + name = "core_js___core_js_3.6.4.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz"; + sha1 = "440a83536b458114b9cb2ac1580ba377dc470647"; }; } { @@ -3226,6 +3266,14 @@ }; } { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + path = fetchurl { + name = "cosmiconfig___cosmiconfig_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz"; + sha1 = "da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"; + }; + } + { name = "create_ecdh___create_ecdh_4.0.3.tgz"; path = fetchurl { name = "create_ecdh___create_ecdh_4.0.3.tgz"; @@ -3250,14 +3298,6 @@ }; } { - name = "create_react_context___create_react_context_0.2.3.tgz"; - path = fetchurl { - name = "create_react_context___create_react_context_0.2.3.tgz"; - url = "https://registry.yarnpkg.com/create-react-context/-/create-react-context-0.2.3.tgz"; - sha1 = "9ec140a6914a22ef04b8b09b7771de89567cb6f3"; - }; - } - { name = "create_react_context___create_react_context_0.3.0.tgz"; path = fetchurl { name = "create_react_context___create_react_context_0.3.0.tgz"; @@ -3274,6 +3314,14 @@ }; } { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz"; + sha1 = "0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"; + }; + } + { name = "cross_spawn___cross_spawn_6.0.5.tgz"; path = fetchurl { name = "cross_spawn___cross_spawn_6.0.5.tgz"; @@ -3322,11 +3370,11 @@ }; } { - name = "css_loader___css_loader_2.1.1.tgz"; + name = "css_loader___css_loader_3.4.2.tgz"; path = fetchurl { - name = "css_loader___css_loader_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-loader/-/css-loader-2.1.1.tgz"; - sha1 = "d8254f72e412bb2238bb44dd674ffbef497333ea"; + name = "css_loader___css_loader_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.2.tgz"; + sha1 = "d3fdb3358b43f233b78501c5ed7b1c6da6133202"; }; } { @@ -3354,43 +3402,43 @@ }; } { - name = "css_select___css_select_2.0.2.tgz"; + name = "css_select___css_select_2.1.0.tgz"; path = fetchurl { - name = "css_select___css_select_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/css-select/-/css-select-2.0.2.tgz"; - sha1 = "ab4386cec9e1f668855564b17c3733b43b2a5ede"; + name = "css_select___css_select_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz"; + sha1 = "6a34653356635934a81baca68d0255432105dbef"; }; } { - name = "css_tree___css_tree_1.0.0_alpha.29.tgz"; + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.29.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.29.tgz"; - sha1 = "3fa9d4ef3142cbd1c301e7664c1f352bd82f5a39"; + name = "css_tree___css_tree_1.0.0_alpha.37.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz"; + sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; }; } { - name = "css_tree___css_tree_1.0.0_alpha.33.tgz"; + name = "css_what___css_what_2.1.3.tgz"; path = fetchurl { - name = "css_tree___css_tree_1.0.0_alpha.33.tgz"; - url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.33.tgz"; - sha1 = "970e20e5a91f7a378ddd0fc58d0b6c8d4f3be93e"; + name = "css_what___css_what_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz"; + sha1 = "a6d7604573365fe74686c3f311c56513d88285f2"; }; } { - name = "css_unit_converter___css_unit_converter_1.1.1.tgz"; + name = "css_what___css_what_3.2.1.tgz"; path = fetchurl { - name = "css_unit_converter___css_unit_converter_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz"; - sha1 = "d9b9281adcfd8ced935bdbaba83786897f64e996"; + name = "css_what___css_what_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz"; + sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1"; }; } { - name = "css_what___css_what_2.1.3.tgz"; + name = "css.escape___css.escape_1.5.1.tgz"; path = fetchurl { - name = "css_what___css_what_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz"; - sha1 = "a6d7604573365fe74686c3f311c56513d88285f2"; + name = "css.escape___css.escape_1.5.1.tgz"; + url = "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz"; + sha1 = "42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"; }; } { @@ -3474,11 +3522,11 @@ }; } { - name = "csso___csso_3.5.1.tgz"; + name = "csso___csso_4.0.2.tgz"; path = fetchurl { - name = "csso___csso_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz"; - sha1 = "7b9eb8be61628973c1b261e169d2f024008e758b"; + name = "csso___csso_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz"; + sha1 = "e5f81ab3a56b8eefb7f0092ce7279329f454de3d"; }; } { @@ -3490,11 +3538,11 @@ }; } { - name = "cssom___cssom_0.4.1.tgz"; + name = "cssom___cssom_0.4.4.tgz"; path = fetchurl { - name = "cssom___cssom_0.4.1.tgz"; - url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.1.tgz"; - sha1 = "b24111d236b6dbd00cdfacb5ab67a20473381fe3"; + name = "cssom___cssom_0.4.4.tgz"; + url = "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz"; + sha1 = "5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"; }; } { @@ -3506,19 +3554,19 @@ }; } { - name = "cssstyle___cssstyle_2.0.0.tgz"; + name = "cssstyle___cssstyle_2.2.0.tgz"; path = fetchurl { - name = "cssstyle___cssstyle_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.0.0.tgz"; - sha1 = "911f0fe25532db4f5d44afc83f89cc4b82c97fe3"; + name = "cssstyle___cssstyle_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.2.0.tgz"; + sha1 = "e4c44debccd6b7911ed617a4395e5754bba59992"; }; } { - name = "csstype___csstype_2.6.7.tgz"; + name = "csstype___csstype_2.6.9.tgz"; path = fetchurl { - name = "csstype___csstype_2.6.7.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.7.tgz"; - sha1 = "20b0024c20b6718f4eda3853a1f5a1cce7f5e4a5"; + name = "csstype___csstype_2.6.9.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz"; + sha1 = "05141d0cd557a56b8891394c1911c40c8a98d098"; }; } { @@ -3538,11 +3586,11 @@ }; } { - name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; path = fetchurl { - name = "damerau_levenshtein___damerau_levenshtein_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz"; - sha1 = "780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"; + name = "damerau_levenshtein___damerau_levenshtein_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz"; + sha1 = "143c1641cb3d85c60c32329e26899adea8701791"; }; } { @@ -3562,14 +3610,6 @@ }; } { - name = "date_now___date_now_0.1.4.tgz"; - path = fetchurl { - name = "date_now___date_now_0.1.4.tgz"; - url = "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz"; - sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; - }; - } - { name = "debug___debug_2.6.9.tgz"; path = fetchurl { name = "debug___debug_2.6.9.tgz"; @@ -3602,14 +3642,6 @@ }; } { - name = "decamelize___decamelize_2.0.0.tgz"; - path = fetchurl { - name = "decamelize___decamelize_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz"; - sha1 = "656d7bbc8094c4c788ea53c5840908c9c7d063c7"; - }; - } - { name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; path = fetchurl { name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; @@ -3618,11 +3650,11 @@ }; } { - name = "deep_equal___deep_equal_1.1.0.tgz"; + name = "deep_equal___deep_equal_1.1.1.tgz"; path = fetchurl { - name = "deep_equal___deep_equal_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.0.tgz"; - sha1 = "3103cdf8ab6d32cf4a8df7865458f2b8d33f3745"; + name = "deep_equal___deep_equal_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz"; + sha1 = "b5c98c942ceffaf7cb051e24e1434a25a2e6076a"; }; } { @@ -3682,11 +3714,11 @@ }; } { - name = "del___del_3.0.0.tgz"; + name = "del___del_4.1.1.tgz"; path = fetchurl { - name = "del___del_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz"; - sha1 = "53ecf699ffcbcb39637691ab13baf160819766e5"; + name = "del___del_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz"; + sha1 = "9e8f117222ea44a31ff3a156c049b99052a9f0b4"; }; } { @@ -3714,11 +3746,11 @@ }; } { - name = "des.js___des.js_1.0.0.tgz"; + name = "des.js___des.js_1.0.1.tgz"; path = fetchurl { - name = "des.js___des.js_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz"; - sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"; + name = "des.js___des.js_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz"; + sha1 = "5382142e1bdc53f85d86d53e5f4aa7deb91e0843"; }; } { @@ -3866,11 +3898,11 @@ }; } { - name = "dom_serializer___dom_serializer_0.2.1.tgz"; + name = "dom_serializer___dom_serializer_0.2.2.tgz"; path = fetchurl { - name = "dom_serializer___dom_serializer_0.2.1.tgz"; - url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.1.tgz"; - sha1 = "13650c850daffea35d8b626a4cfc4d3a17643fdb"; + name = "dom_serializer___dom_serializer_0.2.2.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; }; } { @@ -3938,11 +3970,19 @@ }; } { - name = "dot_prop___dot_prop_4.2.0.tgz"; + name = "dot_case___dot_case_3.0.3.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_prop___dot_prop_5.2.0.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz"; - sha1 = "1f19e0c2e1aa0e32797c49799f2837ac6af69c57"; + name = "dot_prop___dot_prop_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; + sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; }; } { @@ -3954,19 +3994,19 @@ }; } { - name = "dotenv___dotenv_6.2.0.tgz"; + name = "dotenv___dotenv_8.2.0.tgz"; path = fetchurl { - name = "dotenv___dotenv_6.2.0.tgz"; - url = "https://registry.yarnpkg.com/dotenv/-/dotenv-6.2.0.tgz"; - sha1 = "941c0410535d942c8becf28d3f357dbd9d476064"; + name = "dotenv___dotenv_8.2.0.tgz"; + url = "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz"; + sha1 = "97e619259ada750eea3e4ea3e26bceea5424b16a"; }; } { - name = "downshift___downshift_3.3.5.tgz"; + name = "downshift___downshift_3.4.8.tgz"; path = fetchurl { - name = "downshift___downshift_3.3.5.tgz"; - url = "https://registry.yarnpkg.com/downshift/-/downshift-3.3.5.tgz"; - sha1 = "635f465ab45f577814a98901024873637649ce6f"; + name = "downshift___downshift_3.4.8.tgz"; + url = "https://registry.yarnpkg.com/downshift/-/downshift-3.4.8.tgz"; + sha1 = "06b7ad9e9c423a58e8a9049b2a00a5d19c7ef954"; }; } { @@ -4002,19 +4042,19 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.284.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.284.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.284.tgz"; - sha1 = "b24359fa4f49b3a7c52afc005d59ec3aa9f6796e"; + name = "electron_to_chromium___electron_to_chromium_1.3.356.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.356.tgz"; + sha1 = "fb985ee0f3023e6e11b97547ff3f738bdd8643d2"; }; } { - name = "elliptic___elliptic_6.5.1.tgz"; + name = "elliptic___elliptic_6.5.2.tgz"; path = fetchurl { - name = "elliptic___elliptic_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.1.tgz"; - sha1 = "c380f5f909bf1b9b4428d028cd18d3b0efd6b52b"; + name = "elliptic___elliptic_6.5.2.tgz"; + url = "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.2.tgz"; + sha1 = "05c5678d7173c049d8ca433552224a495d0e3762"; }; } { @@ -4026,6 +4066,14 @@ }; } { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { name = "emojis_list___emojis_list_2.1.0.tgz"; path = fetchurl { name = "emojis_list___emojis_list_2.1.0.tgz"; @@ -4034,19 +4082,19 @@ }; } { - name = "encodeurl___encodeurl_1.0.2.tgz"; + name = "emojis_list___emojis_list_3.0.0.tgz"; path = fetchurl { - name = "encodeurl___encodeurl_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + name = "emojis_list___emojis_list_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz"; + sha1 = "5570662046ad29e2e916e71aae260abdff4f6a78"; }; } { - name = "encoding___encoding_0.1.12.tgz"; + name = "encodeurl___encodeurl_1.0.2.tgz"; path = fetchurl { - name = "encoding___encoding_0.1.12.tgz"; - url = "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + name = "encodeurl___encodeurl_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; }; } { @@ -4082,43 +4130,43 @@ }; } { - name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.1.tgz"; + name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.2.tgz"; path = fetchurl { - name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.1.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.1.tgz"; - sha1 = "8ad55332be7091dc53a25d7d38b3485fc2ba50d5"; + name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.2.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz"; + sha1 = "b16db2f0ea424d58a808f9df86ab6212895a4501"; }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.12.1.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.12.1.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.1.tgz"; - sha1 = "e828e0d038e2b1efa4b9619ce896226f85c9dd88"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz"; + sha1 = "01c885dde2114b4690bf741f8dc94cee3060eb78"; }; } { - name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.0.tgz"; + name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.1.tgz"; path = fetchurl { - name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.0.tgz"; - sha1 = "d8e4603495e6ea279038eef05a4bf4887b55dc69"; + name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz"; + sha1 = "7afe03db3801c9b76de8440694096412a8d9d49e"; }; } { - name = "enzyme_to_json___enzyme_to_json_3.4.3.tgz"; + name = "enzyme_to_json___enzyme_to_json_3.4.4.tgz"; path = fetchurl { - name = "enzyme_to_json___enzyme_to_json_3.4.3.tgz"; - url = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.4.3.tgz"; - sha1 = "ed4386f48768ed29e2d1a2910893542c34e7e0af"; + name = "enzyme_to_json___enzyme_to_json_3.4.4.tgz"; + url = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.4.4.tgz"; + sha1 = "b30726c59091d273521b6568c859e8831e94d00e"; }; } { - name = "enzyme___enzyme_3.10.0.tgz"; + name = "enzyme___enzyme_3.11.0.tgz"; path = fetchurl { - name = "enzyme___enzyme_3.10.0.tgz"; - url = "https://registry.yarnpkg.com/enzyme/-/enzyme-3.10.0.tgz"; - sha1 = "7218e347c4a7746e133f8e964aada4a3523452f6"; + name = "enzyme___enzyme_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/enzyme/-/enzyme-3.11.0.tgz"; + sha1 = "71d680c580fe9349f6f5ac6c775bc3e6b7a79c28"; }; } { @@ -4138,35 +4186,27 @@ }; } { - name = "es_abstract___es_abstract_1.15.0.tgz"; + name = "es_abstract___es_abstract_1.17.4.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.15.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.15.0.tgz"; - sha1 = "8884928ec7e40a79e3c9bc812d37d10c8b24cc57"; + name = "es_abstract___es_abstract_1.17.4.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz"; + sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184"; }; } { - name = "es_abstract___es_abstract_1.16.0.tgz"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.16.0.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz"; - sha1 = "d3a26dc9c3283ac9750dca569586e976d9dcc06d"; + name = "es_to_primitive___es_to_primitive_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha1 = "e55cd4c9cdc188bcefb03b366c736323fc5c898a"; }; } { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; + name = "es5_ext___es5_ext_0.10.53.tgz"; path = fetchurl { - name = "es_to_primitive___es_to_primitive_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha1 = "edf72478033456e8dda8ef09e00ad9650707f377"; - }; - } - { - name = "es5_ext___es5_ext_0.10.51.tgz"; - path = fetchurl { - name = "es5_ext___es5_ext_0.10.51.tgz"; - url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.51.tgz"; - sha1 = "ed2d7d9d48a12df86e0299287e93a09ff478842f"; + name = "es5_ext___es5_ext_0.10.53.tgz"; + url = "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz"; + sha1 = "93c5a3acfdbef275220ad72644ad02ee18368de1"; }; } { @@ -4178,11 +4218,11 @@ }; } { - name = "es6_symbol___es6_symbol_3.1.2.tgz"; + name = "es6_symbol___es6_symbol_3.1.3.tgz"; path = fetchurl { - name = "es6_symbol___es6_symbol_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.2.tgz"; - sha1 = "859fdd34f32e905ff06d752e7171ddd4444a7ed1"; + name = "es6_symbol___es6_symbol_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz"; + sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; }; } { @@ -4194,6 +4234,14 @@ }; } { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"; + sha1 = "a30304e99daa32e23b2fd20f51babd07cffca344"; + }; + } + { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; path = fetchurl { name = "escape_string_regexp___escape_string_regexp_1.0.5.tgz"; @@ -4202,51 +4250,51 @@ }; } { - name = "escodegen___escodegen_1.12.0.tgz"; + name = "escodegen___escodegen_1.14.1.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz"; - sha1 = "f763daf840af172bb3a2b6dd7219c0e17f7ff541"; + name = "escodegen___escodegen_1.14.1.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; + sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; }; } { - name = "eslint_config_prettier___eslint_config_prettier_6.4.0.tgz"; + name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz"; path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.4.0.tgz"; - sha1 = "0a04f147e31d33c6c161b2dd0971418ac52d0477"; + name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz"; + sha1 = "7b15e303bf9c956875c948f6b21500e48ded6a7f"; }; } { - name = "eslint_config_react_app___eslint_config_react_app_5.0.2.tgz"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz"; path = fetchurl { - name = "eslint_config_react_app___eslint_config_react_app_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.0.2.tgz"; - sha1 = "df40d73a1402986030680c040bbee520db5a32a4"; + name = "eslint_config_react_app___eslint_config_react_app_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-5.2.0.tgz"; + sha1 = "135110ba56a9e378f7acfe5f36e2ae76a2317899"; }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz"; - sha1 = "58f15fb839b8d0576ca980413476aab2472db66a"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; + sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; }; } { - name = "eslint_loader___eslint_loader_3.0.2.tgz"; + name = "eslint_loader___eslint_loader_3.0.3.tgz"; path = fetchurl { - name = "eslint_loader___eslint_loader_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-3.0.2.tgz"; - sha1 = "5a627316a51d6f41d357b9f6f0554e91506cdd6e"; + name = "eslint_loader___eslint_loader_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-3.0.3.tgz"; + sha1 = "e018e3d2722381d982b1201adb56819c73b480ca"; }; } { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz"; - sha1 = "7b4675875bf96b0dbf1b21977456e5bb1f5e018c"; + name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz"; + sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708"; }; } { @@ -4258,11 +4306,27 @@ }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.18.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz"; - sha1 = "02f1180b90b077b33d447a17a2326ceb400aceb6"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.6.0.tgz"; + sha1 = "82b2bd6f21770e0e5deede0228e456cb35308451"; + }; + } + { + name = "eslint_plugin_import___eslint_plugin_import_2.20.0.tgz"; + path = fetchurl { + name = "eslint_plugin_import___eslint_plugin_import_2.20.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz"; + sha1 = "d749a7263fb6c29980def8e960d380a6aa6aecaa"; + }; + } + { + name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; + path = fetchurl { + name = "eslint_plugin_import___eslint_plugin_import_2.20.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz"; + sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3"; }; } { @@ -4274,11 +4338,11 @@ }; } { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.1.tgz"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.2.tgz"; path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.1.tgz"; - sha1 = "507b8562410d02a03f0ddc949c616f877852f2ba"; + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz"; + sha1 = "432e5a667666ab84ce72f945c72f77d996a5c9ba"; }; } { @@ -4290,19 +4354,19 @@ }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.18.0.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.14.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz"; - sha1 = "911030dd7e98ba49e1b2208599571846a66bdf13"; + name = "eslint_plugin_react___eslint_plugin_react_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.0.tgz"; + sha1 = "2317831284d005b30aff8afb7c4e906f13fa8e7e"; }; } { - name = "eslint_plugin_react___eslint_plugin_react_7.16.0.tgz"; + name = "eslint_plugin_react___eslint_plugin_react_7.18.3.tgz"; path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.16.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.16.0.tgz"; - sha1 = "9928e4f3e2122ed3ba6a5b56d0303ba3e41d8c09"; + name = "eslint_plugin_react___eslint_plugin_react_7.18.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz"; + sha1 = "8be671b7f6be095098e79d27ac32f9580f599bc8"; }; } { @@ -4322,11 +4386,11 @@ }; } { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; path = fetchurl { - name = "eslint_utils___eslint_utils_1.4.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.2.tgz"; - sha1 = "166a5180ef6ab7eb462f162fd0e6f2463d7309ab"; + name = "eslint_utils___eslint_utils_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz"; + sha1 = "74fec7c54d0776b6f67e0251040b5806564e981f"; }; } { @@ -4338,27 +4402,19 @@ }; } { - name = "eslint___eslint_6.5.1.tgz"; - path = fetchurl { - name = "eslint___eslint_6.5.1.tgz"; - url = "https://registry.yarnpkg.com/eslint/-/eslint-6.5.1.tgz"; - sha1 = "828e4c469697d43bb586144be152198b91e96ed6"; - }; - } - { - name = "espree___espree_6.1.1.tgz"; + name = "eslint___eslint_6.8.0.tgz"; path = fetchurl { - name = "espree___espree_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz"; - sha1 = "7f80e5f7257fc47db450022d723e356daeb1e5de"; + name = "eslint___eslint_6.8.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz"; + sha1 = "62262d6729739f9275723824302fb227c8c93ffb"; }; } { - name = "esprima___esprima_3.1.3.tgz"; + name = "espree___espree_6.1.2.tgz"; path = fetchurl { - name = "esprima___esprima_3.1.3.tgz"; - url = "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + name = "espree___espree_6.1.2.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz"; + sha1 = "6c272650932b4f91c3714e5e7b5f5e2ecf47262d"; }; } { @@ -4370,11 +4426,11 @@ }; } { - name = "esquery___esquery_1.0.1.tgz"; + name = "esquery___esquery_1.1.0.tgz"; path = fetchurl { - name = "esquery___esquery_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz"; - sha1 = "406c51658b1f5991a5f9b62b1dc25b00e3e5c708"; + name = "esquery___esquery_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz"; + sha1 = "c5c0b66f383e7656404f86b31334d72524eddb48"; }; } { @@ -4418,11 +4474,11 @@ }; } { - name = "events___events_3.0.0.tgz"; + name = "events___events_3.1.0.tgz"; path = fetchurl { - name = "events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz"; - sha1 = "9a0a0dfaf62893d92b875b8f2698ca4114973e88"; + name = "events___events_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz"; + sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"; }; } { @@ -4442,11 +4498,11 @@ }; } { - name = "exec_sh___exec_sh_0.3.2.tgz"; + name = "exec_sh___exec_sh_0.3.4.tgz"; path = fetchurl { - name = "exec_sh___exec_sh_0.3.2.tgz"; - url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz"; - sha1 = "6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"; + name = "exec_sh___exec_sh_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.4.tgz"; + sha1 = "3a018ceb526cc6f6df2bb504b2bfe8e3a4934ec5"; }; } { @@ -4490,6 +4546,14 @@ }; } { + name = "ext___ext_1.4.0.tgz"; + path = fetchurl { + name = "ext___ext_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz"; + sha1 = "89ae7a07158f79d35517882904324077e4379244"; + }; + } + { name = "extend_shallow___extend_shallow_2.0.1.tgz"; path = fetchurl { name = "extend_shallow___extend_shallow_2.0.1.tgz"; @@ -4546,11 +4610,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"; - sha1 = "7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"; + name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; + sha1 = "545145077c501491e33b15ec408c294376e94ae4"; }; } { @@ -4570,11 +4634,11 @@ }; } { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; path = fetchurl { - name = "fast_json_stable_stringify___fast_json_stable_stringify_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"; - sha1 = "d5142c0caee6b1189f87d3a76111064f86c8bbf2"; + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; }; } { @@ -4602,19 +4666,11 @@ }; } { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; path = fetchurl { - name = "fb_watchman___fb_watchman_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.0.tgz"; - sha1 = "54e9abf7dfa2f26cd9b1636c588c1afc05de5d58"; - }; - } - { - name = "fbjs___fbjs_0.8.17.tgz"; - path = fetchurl { - name = "fbjs___fbjs_0.8.17.tgz"; - url = "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.17.tgz"; - sha1 = "c4d598ead6949112653d6588b01a5cdcd9f90fdd"; + name = "fb_watchman___fb_watchman_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz"; + sha1 = "fc84fb39d2709cf3ff6d743706157bb5708a8a85"; }; } { @@ -4626,11 +4682,11 @@ }; } { - name = "figures___figures_2.0.0.tgz"; + name = "figures___figures_3.2.0.tgz"; path = fetchurl { - name = "figures___figures_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + name = "figures___figures_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz"; + sha1 = "625c18bd293c604dc4a8ddb2febf0c88341746af"; }; } { @@ -4642,19 +4698,27 @@ }; } { - name = "file_loader___file_loader_3.0.1.tgz"; + name = "file_loader___file_loader_4.3.0.tgz"; + path = fetchurl { + name = "file_loader___file_loader_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/file-loader/-/file-loader-4.3.0.tgz"; + sha1 = "780f040f729b3d18019f20605f723e844b8a58af"; + }; + } + { + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; path = fetchurl { - name = "file_loader___file_loader_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz"; - sha1 = "f8e0ba0b599918b51adfe45d66d1e771ad560faa"; + name = "file_uri_to_path___file_uri_to_path_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz"; + sha1 = "553a7b8446ff6f684359c445f1e37a05dacc33dd"; }; } { - name = "filesize___filesize_3.6.1.tgz"; + name = "filesize___filesize_6.0.1.tgz"; path = fetchurl { - name = "filesize___filesize_3.6.1.tgz"; - url = "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz"; - sha1 = "090bb3ee01b6f801a8a8be99d31710b3422bb317"; + name = "filesize___filesize_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/filesize/-/filesize-6.0.1.tgz"; + sha1 = "f850b509909c7c86f7e450ea19006c31c2ed3d2f"; }; } { @@ -4698,11 +4762,19 @@ }; } { - name = "find_up___find_up_3.0.0.tgz"; + name = "find_cache_dir___find_cache_dir_3.2.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 = "find_cache_dir___find_cache_dir_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz"; + sha1 = "e7fe44c1abc1299f516146e563108fd1006c1874"; + }; + } + { + name = "find_up___find_up_4.1.0.tgz"; + path = fetchurl { + name = "find_up___find_up_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz"; + sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; }; } { @@ -4722,6 +4794,14 @@ }; } { + 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 = "flat_cache___flat_cache_2.0.1.tgz"; path = fetchurl { name = "flat_cache___flat_cache_2.0.1.tgz"; @@ -4738,19 +4818,11 @@ }; } { - name = "flatten___flatten_1.0.2.tgz"; - path = fetchurl { - name = "flatten___flatten_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz"; - sha1 = "dae46a9d78fbe25292258cc1e780a41d95c03782"; - }; - } - { - name = "flot___flot_3.2.13.tgz"; + name = "flatten___flatten_1.0.3.tgz"; path = fetchurl { - name = "flot___flot_3.2.13.tgz"; - url = "https://registry.yarnpkg.com/flot/-/flot-3.2.13.tgz"; - sha1 = "f4457fd6042fe4ac4e4e124e7a7c7256e69f5362"; + name = "flatten___flatten_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz"; + sha1 = "c1283ac9f27b368abc1e36d1ff7b04501a30356b"; }; } { @@ -4762,11 +4834,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.9.0.tgz"; + name = "follow_redirects___follow_redirects_1.10.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.9.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.9.0.tgz"; - sha1 = "8d5bcdc65b7108fe1508649c79c12d732dcedb4f"; + name = "follow_redirects___follow_redirects_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz"; + sha1 = "01f5263aee921c6a54fb91667f08f4155ce169eb"; }; } { @@ -4802,11 +4874,11 @@ }; } { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz"; + name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz"; path = fetchurl { - name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-1.5.0.tgz"; - sha1 = "ce1d77190b44d81a761b10b6284a373795e41f0c"; + name = "fork_ts_checker_webpack_plugin___fork_ts_checker_webpack_plugin_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-3.1.1.tgz"; + sha1 = "a1642c0d3e65f50c2cc1742e9c0a80f441f86b19"; }; } { @@ -4850,14 +4922,6 @@ }; } { - name = "fs_extra___fs_extra_7.0.1.tgz"; - path = fetchurl { - name = "fs_extra___fs_extra_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; - sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; - }; - } - { name = "fs_extra___fs_extra_4.0.3.tgz"; path = fetchurl { name = "fs_extra___fs_extra_4.0.3.tgz"; @@ -4866,6 +4930,14 @@ }; } { + name = "fs_extra___fs_extra_7.0.1.tgz"; + path = fetchurl { + name = "fs_extra___fs_extra_7.0.1.tgz"; + url = "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz"; + sha1 = "4f189c44aa123b895f722804f55ea23eadc348e9"; + }; + } + { name = "fs_extra___fs_extra_8.1.0.tgz"; path = fetchurl { name = "fs_extra___fs_extra_8.1.0.tgz"; @@ -4882,6 +4954,14 @@ }; } { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + path = fetchurl { + name = "fs_minipass___fs_minipass_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz"; + sha1 = "7f5036fdbf12c63c169190cbe4199c852271f9fb"; + }; + } + { name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; path = fetchurl { name = "fs_write_stream_atomic___fs_write_stream_atomic_1.0.10.tgz"; @@ -4898,27 +4978,19 @@ }; } { - name = "fsevents___fsevents_2.0.7.tgz"; + name = "fsevents___fsevents_2.1.2.tgz"; path = fetchurl { - name = "fsevents___fsevents_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz"; - sha1 = "382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"; + name = "fsevents___fsevents_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.2.tgz"; + sha1 = "4c0a1fb34bc68e543b4b82a9ec392bfbda840805"; }; } { - name = "fsevents___fsevents_1.2.9.tgz"; + name = "fsevents___fsevents_1.2.11.tgz"; path = fetchurl { - name = "fsevents___fsevents_1.2.9.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz"; - sha1 = "3f5ed66583ccd6f400b5a00db6f7e861363e388f"; - }; - } - { - name = "fsevents___fsevents_2.1.1.tgz"; - path = fetchurl { - name = "fsevents___fsevents_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.1.tgz"; - sha1 = "74c64e21df71721845d0c44fe54b7f56b82995a9"; + name = "fsevents___fsevents_1.2.11.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.11.tgz"; + sha1 = "67bf57f4758f02ede88fb2a1712fef4d15358be3"; }; } { @@ -4930,11 +5002,11 @@ }; } { - name = "function.prototype.name___function.prototype.name_1.1.1.tgz"; + name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; path = fetchurl { - name = "function.prototype.name___function.prototype.name_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.1.tgz"; - sha1 = "6d252350803085abc2ad423d4fe3be2f9cbda392"; + name = "function.prototype.name___function.prototype.name_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.2.tgz"; + sha1 = "5cdf79d7c05db401591dfde83e3b70c5123e9a45"; }; } { @@ -4946,11 +5018,11 @@ }; } { - name = "functions_have_names___functions_have_names_1.2.0.tgz"; + name = "functions_have_names___functions_have_names_1.2.1.tgz"; path = fetchurl { - name = "functions_have_names___functions_have_names_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.0.tgz"; - sha1 = "83da7583e4ea0c9ac5ff530f73394b033e0bf77d"; + name = "functions_have_names___functions_have_names_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.1.tgz"; + sha1 = "a981ac397fa0c9964551402cdc5533d7a4d52f91"; }; } { @@ -4970,6 +5042,14 @@ }; } { + name = "gensync___gensync_1.0.0_beta.1.tgz"; + path = fetchurl { + name = "gensync___gensync_1.0.0_beta.1.tgz"; + url = "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz"; + sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; + }; + } + { name = "get_caller_file___get_caller_file_1.0.3.tgz"; path = fetchurl { name = "get_caller_file___get_caller_file_1.0.3.tgz"; @@ -4986,11 +5066,11 @@ }; } { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.1.tgz"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { - name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.1.tgz"; - sha1 = "6f7764f88ea11e0b514bd9bd860a132259992ca4"; + name = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz"; + sha1 = "b5fde77f22cbe35f390b4e089922c50bce6ef664"; }; } { @@ -5050,11 +5130,11 @@ }; } { - name = "glob___glob_7.1.4.tgz"; + name = "glob___glob_7.1.6.tgz"; path = fetchurl { - name = "glob___glob_7.1.4.tgz"; - url = "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz"; - sha1 = "aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"; + name = "glob___glob_7.1.6.tgz"; + url = "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz"; + sha1 = "141f33b81a7c2492e125594307480c46679278a6"; }; } { @@ -5082,6 +5162,14 @@ }; } { + name = "globals___globals_12.3.0.tgz"; + path = fetchurl { + name = "globals___globals_12.3.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz"; + sha1 = "1e564ee5c4dded2ab098b0f88f24702a3c56be13"; + }; + } + { name = "globby___globby_8.0.2.tgz"; path = fetchurl { name = "globby___globby_8.0.2.tgz"; @@ -5098,11 +5186,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.2.tgz"; + name = "graceful_fs___graceful_fs_4.2.3.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.2.tgz"; - sha1 = "6f0952605d0140c1cfdb138ed005775b92d67b02"; + name = "graceful_fs___graceful_fs_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; + sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; }; } { @@ -5138,14 +5226,6 @@ }; } { - name = "handlebars___handlebars_4.4.3.tgz"; - path = fetchurl { - name = "handlebars___handlebars_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/handlebars/-/handlebars-4.4.3.tgz"; - sha1 = "180bae52c1d0e9ec0c15d7e82a4362d662762f6e"; - }; - } - { name = "har_schema___har_schema_2.0.0.tgz"; path = fetchurl { name = "har_schema___har_schema_2.0.0.tgz"; @@ -5186,11 +5266,19 @@ }; } { - name = "has_symbols___has_symbols_1.0.0.tgz"; + name = "has_flag___has_flag_4.0.0.tgz"; path = fetchurl { - name = "has_symbols___has_symbols_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz"; - sha1 = "ba1a8f1af2a0fc39650f5c850367704122063b44"; + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } + { + name = "has_symbols___has_symbols_1.0.1.tgz"; + path = fetchurl { + name = "has_symbols___has_symbols_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz"; + sha1 = "9f5214758a44196c406d9bd76cebf81ec2dd31e8"; }; } { @@ -5322,11 +5410,11 @@ }; } { - name = "html_element_map___html_element_map_1.1.0.tgz"; + name = "html_element_map___html_element_map_1.2.0.tgz"; path = fetchurl { - name = "html_element_map___html_element_map_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.1.0.tgz"; - sha1 = "e5aab9a834caf883b421f8bd9eaedcaac887d63c"; + name = "html_element_map___html_element_map_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/html-element-map/-/html-element-map-1.2.0.tgz"; + sha1 = "dfbb09efe882806af63d990cf6db37993f099f22"; }; } { @@ -5346,19 +5434,27 @@ }; } { - name = "html_minifier___html_minifier_3.5.21.tgz"; + name = "html_escaper___html_escaper_2.0.0.tgz"; path = fetchurl { - name = "html_minifier___html_minifier_3.5.21.tgz"; - url = "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz"; - sha1 = "d0040e054730e354db008463593194015212d20c"; + name = "html_escaper___html_escaper_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz"; + sha1 = "71e87f931de3fe09e56661ab9a29aadec707b491"; }; } { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz"; + name = "html_minifier_terser___html_minifier_terser_5.0.4.tgz"; path = fetchurl { - name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.5.tgz"; - url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.5.tgz"; - sha1 = "2c53083c1151bfec20479b1f8aaf0039e77b5513"; + name = "html_minifier_terser___html_minifier_terser_5.0.4.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.4.tgz"; + sha1 = "e8cc02748acb983bd7912ea9660bd31c0702ec32"; + }; + } + { + name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz"; + path = fetchurl { + name = "html_webpack_plugin___html_webpack_plugin_4.0.0_beta.11.tgz"; + url = "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-beta.11.tgz"; + sha1 = "3059a69144b5aecef97708196ca32f9e68677715"; }; } { @@ -5458,14 +5554,6 @@ }; } { - name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; - path = fetchurl { - name = "icss_replace_symbols___icss_replace_symbols_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz"; - sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; - }; - } - { name = "icss_utils___icss_utils_4.1.1.tgz"; path = fetchurl { name = "icss_utils___icss_utils_4.1.1.tgz"; @@ -5546,11 +5634,11 @@ }; } { - name = "import_fresh___import_fresh_3.1.0.tgz"; + name = "import_fresh___import_fresh_3.2.1.tgz"; path = fetchurl { - name = "import_fresh___import_fresh_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.1.0.tgz"; - sha1 = "6d33fa1dcef6df930fae003446f33415af905118"; + name = "import_fresh___import_fresh_3.2.1.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz"; + sha1 = "633ff618506e793af5ac91bf48b72677e15cbe66"; }; } { @@ -5578,6 +5666,14 @@ }; } { + name = "indent_string___indent_string_4.0.0.tgz"; + path = fetchurl { + name = "indent_string___indent_string_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz"; + sha1 = "624f8f4497d619b2d9768531d58f4122854d7251"; + }; + } + { name = "indexes_of___indexes_of_1.0.1.tgz"; path = fetchurl { name = "indexes_of___indexes_of_1.0.1.tgz"; @@ -5634,19 +5730,11 @@ }; } { - name = "inquirer___inquirer_6.5.0.tgz"; + name = "inquirer___inquirer_7.0.4.tgz"; path = fetchurl { - name = "inquirer___inquirer_6.5.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.0.tgz"; - sha1 = "2303317efc9a4ea7ec2e2df6f86569b734accf42"; - }; - } - { - name = "inquirer___inquirer_6.5.2.tgz"; - path = fetchurl { - name = "inquirer___inquirer_6.5.2.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz"; - sha1 = "ad50942375d036d327ff528c08bd5fab089928ca"; + name = "inquirer___inquirer_7.0.4.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz"; + sha1 = "99af5bde47153abca23f5c7fc30db247f39da703"; }; } { @@ -5658,6 +5746,14 @@ }; } { + name = "internal_slot___internal_slot_1.0.2.tgz"; + path = fetchurl { + name = "internal_slot___internal_slot_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz"; + sha1 = "9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"; + }; + } + { name = "invariant___invariant_2.2.4.tgz"; path = fetchurl { name = "invariant___invariant_2.2.4.tgz"; @@ -5714,6 +5810,14 @@ }; } { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + path = fetchurl { + name = "is_absolute_url___is_absolute_url_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz"; + sha1 = "96c6a22b6a23929b11ea0afb1836c36ad4a5d698"; + }; + } + { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; path = fetchurl { name = "is_accessor_descriptor___is_accessor_descriptor_0.1.6.tgz"; @@ -5770,11 +5874,11 @@ }; } { - name = "is_boolean_object___is_boolean_object_1.0.0.tgz"; + name = "is_boolean_object___is_boolean_object_1.0.1.tgz"; path = fetchurl { - name = "is_boolean_object___is_boolean_object_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz"; - sha1 = "98f8b28030684219a95f375cfbd88ce3405dff93"; + name = "is_boolean_object___is_boolean_object_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.1.tgz"; + sha1 = "10edc0900dd127697a92f6f9807c7617d68ac48e"; }; } { @@ -5786,11 +5890,11 @@ }; } { - name = "is_callable___is_callable_1.1.4.tgz"; + name = "is_callable___is_callable_1.1.5.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz"; - sha1 = "1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"; + name = "is_callable___is_callable_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; + sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; }; } { @@ -5826,11 +5930,11 @@ }; } { - name = "is_date_object___is_date_object_1.0.1.tgz"; + name = "is_date_object___is_date_object_1.0.2.tgz"; path = fetchurl { - name = "is_date_object___is_date_object_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz"; - sha1 = "9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"; + name = "is_date_object___is_date_object_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz"; + sha1 = "bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"; }; } { @@ -5858,6 +5962,14 @@ }; } { + name = "is_docker___is_docker_2.0.0.tgz"; + path = fetchurl { + name = "is_docker___is_docker_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz"; + sha1 = "2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"; + }; + } + { name = "is_extendable___is_extendable_0.1.1.tgz"; path = fetchurl { name = "is_extendable___is_extendable_0.1.1.tgz"; @@ -5898,6 +6010,14 @@ }; } { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; path = fetchurl { name = "is_generator_fn___is_generator_fn_2.1.0.tgz"; @@ -5922,11 +6042,11 @@ }; } { - name = "is_number_object___is_number_object_1.0.3.tgz"; + name = "is_number_object___is_number_object_1.0.4.tgz"; path = fetchurl { - name = "is_number_object___is_number_object_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz"; - sha1 = "f265ab89a9f445034ef6aff15a8f00b00f551799"; + name = "is_number_object___is_number_object_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz"; + sha1 = "36ac95e741cf18b283fc1ddf5e83da798e3ec197"; }; } { @@ -5954,27 +6074,35 @@ }; } { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; + name = "is_obj___is_obj_2.0.0.tgz"; + path = fetchurl { + name = "is_obj___is_obj_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz"; + sha1 = "473fb05d973705e3fd9620545018ca8e22ef4982"; + }; + } + { + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; path = fetchurl { - name = "is_path_cwd___is_path_cwd_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz"; - sha1 = "d225ec23132e89edd38fda767472e62e65f1106d"; + name = "is_path_cwd___is_path_cwd_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz"; + sha1 = "67d43b82664a7b5191fd9119127eb300048a9fdb"; }; } { - name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; path = fetchurl { - name = "is_path_in_cwd___is_path_in_cwd_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz"; - sha1 = "5ac48b345ef675339bd6c7a48a912110b241cf52"; + name = "is_path_in_cwd___is_path_in_cwd_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz"; + sha1 = "bfe2dca26c69f397265a4009963602935a053acb"; }; } { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; + name = "is_path_inside___is_path_inside_2.1.0.tgz"; path = fetchurl { - name = "is_path_inside___is_path_inside_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz"; - sha1 = "8ef5b7de50437a3fdca6b4e865ef7aa55cb48036"; + name = "is_path_inside___is_path_inside_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-2.1.0.tgz"; + sha1 = "7c9810587d659a40d27bcdb4d5616eab059494b2"; }; } { @@ -6002,11 +6130,11 @@ }; } { - name = "is_regex___is_regex_1.0.4.tgz"; + name = "is_regex___is_regex_1.0.5.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz"; - sha1 = "5517489b547091b0930e095654ced25ee97e9491"; + name = "is_regex___is_regex_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; + sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; }; } { @@ -6042,11 +6170,11 @@ }; } { - name = "is_string___is_string_1.0.4.tgz"; + name = "is_string___is_string_1.0.5.tgz"; path = fetchurl { - name = "is_string___is_string_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.4.tgz"; - sha1 = "cc3a9b69857d621e963725a24caeec873b826e64"; + name = "is_string___is_string_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz"; + sha1 = "40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"; }; } { @@ -6066,11 +6194,11 @@ }; } { - name = "is_symbol___is_symbol_1.0.2.tgz"; + name = "is_symbol___is_symbol_1.0.3.tgz"; path = fetchurl { - name = "is_symbol___is_symbol_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz"; - sha1 = "a055f6ae57192caee329e7a860118b497a950f38"; + name = "is_symbol___is_symbol_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz"; + sha1 = "38e1014b9e6329be0de9d24a414fd7441ec61937"; }; } { @@ -6098,6 +6226,14 @@ }; } { + name = "is_wsl___is_wsl_2.1.1.tgz"; + path = fetchurl { + name = "is_wsl___is_wsl_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz"; + sha1 = "4a1c152d429df3d441669498e2486d3596ebaf1d"; + }; + } + { name = "isarray___isarray_0.0.1.tgz"; path = fetchurl { name = "isarray___isarray_0.0.1.tgz"; @@ -6138,14 +6274,6 @@ }; } { - name = "isomorphic_fetch___isomorphic_fetch_2.2.1.tgz"; - path = fetchurl { - name = "isomorphic_fetch___isomorphic_fetch_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz"; - sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; - }; - } - { name = "isstream___isstream_0.1.2.tgz"; path = fetchurl { name = "isstream___isstream_0.1.2.tgz"; @@ -6186,11 +6314,11 @@ }; } { - name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; path = fetchurl { - name = "istanbul_reports___istanbul_reports_2.2.6.tgz"; - url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.6.tgz"; - sha1 = "7b4f2660d82b29303a8fe6091f8ca4bf058da1af"; + name = "istanbul_reports___istanbul_reports_2.2.7.tgz"; + url = "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-2.2.7.tgz"; + sha1 = "5d939f6237d7b48393cc0959eab40cd4fd056931"; }; } { @@ -6242,11 +6370,11 @@ }; } { - name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz"; + name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz"; path = fetchurl { - name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_0.1.0.tgz"; - url = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-0.1.0.tgz"; - sha1 = "aad6393a9d4b565b69a609109bf469f62bf18ccc"; + name = "jest_environment_jsdom_fourteen___jest_environment_jsdom_fourteen_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/jest-environment-jsdom-fourteen/-/jest-environment-jsdom-fourteen-1.0.1.tgz"; + sha1 = "4cd0042f58b4ab666950d96532ecb2fc188f96fb"; }; } { @@ -6410,11 +6538,11 @@ }; } { - name = "jest_watch_typeahead___jest_watch_typeahead_0.4.0.tgz"; + name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz"; path = fetchurl { - name = "jest_watch_typeahead___jest_watch_typeahead_0.4.0.tgz"; - url = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.4.0.tgz"; - sha1 = "4d5356839a85421588ce452d2440bf0d25308397"; + name = "jest_watch_typeahead___jest_watch_typeahead_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/jest-watch-typeahead/-/jest-watch-typeahead-0.4.2.tgz"; + sha1 = "e5be959698a7fa2302229a5082c488c3c8780a4a"; }; } { @@ -6434,6 +6562,14 @@ }; } { + name = "jest_worker___jest_worker_25.1.0.tgz"; + path = fetchurl { + name = "jest_worker___jest_worker_25.1.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz"; + sha1 = "75d038bad6fdf58eba0d2ec1835856c497e3907a"; + }; + } + { name = "jest___jest_24.9.0.tgz"; path = fetchurl { name = "jest___jest_24.9.0.tgz"; @@ -6458,14 +6594,6 @@ }; } { - name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; - path = fetchurl { - name = "js_levenshtein___js_levenshtein_1.1.6.tgz"; - url = "https://registry.yarnpkg.com/js-levenshtein/-/js-levenshtein-1.1.6.tgz"; - sha1 = "c6cee58eb3550372df8deb85fad5ce66ce01d59d"; - }; - } - { name = "js_tokens___js_tokens_4.0.0.tgz"; path = fetchurl { name = "js_tokens___js_tokens_4.0.0.tgz"; @@ -6514,11 +6642,11 @@ }; } { - name = "jsdom___jsdom_15.2.0.tgz"; + name = "jsdom___jsdom_15.2.1.tgz"; path = fetchurl { - name = "jsdom___jsdom_15.2.0.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.0.tgz"; - sha1 = "4baead4f464e733533ed6ac607ce440918cf5cbb"; + name = "jsdom___jsdom_15.2.1.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz"; + sha1 = "d2feb1aef7183f86be521b8c6833ff5296d07ec5"; }; } { @@ -6634,11 +6762,11 @@ }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.1.tgz"; - sha1 = "4d4973ebf8b9d2837ee91a8208cc66f3a2776cfb"; + name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; + sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; }; } { @@ -6690,11 +6818,11 @@ }; } { - name = "kind_of___kind_of_6.0.2.tgz"; + name = "kind_of___kind_of_6.0.3.tgz"; path = fetchurl { - name = "kind_of___kind_of_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz"; - sha1 = "01146b36a6218e64e58f3a8d66de5d7fc6f6d051"; + name = "kind_of___kind_of_6.0.3.tgz"; + url = "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz"; + sha1 = "07c05034a6c349fa06e24fa35aa76db4580ce4dd"; }; } { @@ -6754,6 +6882,14 @@ }; } { + name = "levenary___levenary_1.1.1.tgz"; + path = fetchurl { + name = "levenary___levenary_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/levenary/-/levenary-1.1.1.tgz"; + sha1 = "842a9ee98d2075aa7faeedbe32679e9205f46f77"; + }; + } + { name = "levn___levn_0.3.0.tgz"; path = fetchurl { name = "levn___levn_0.3.0.tgz"; @@ -6762,6 +6898,14 @@ }; } { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + path = fetchurl { + name = "lines_and_columns___lines_and_columns_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz"; + sha1 = "1c00c743b433cd0a4e80758f7b64a57440d9ff00"; + }; + } + { name = "load_json_file___load_json_file_2.0.0.tgz"; path = fetchurl { name = "load_json_file___load_json_file_2.0.0.tgz"; @@ -6802,6 +6946,14 @@ }; } { + name = "loader_utils___loader_utils_1.4.0.tgz"; + path = fetchurl { + name = "loader_utils___loader_utils_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz"; + sha1 = "c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"; + }; + } + { name = "locate_path___locate_path_2.0.0.tgz"; path = fetchurl { name = "locate_path___locate_path_2.0.0.tgz"; @@ -6818,6 +6970,14 @@ }; } { + name = "locate_path___locate_path_5.0.0.tgz"; + path = fetchurl { + name = "locate_path___locate_path_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz"; + sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; + }; + } + { name = "lodash_es___lodash_es_4.17.15.tgz"; path = fetchurl { name = "lodash_es___lodash_es_4.17.15.tgz"; @@ -6874,22 +7034,6 @@ }; } { - name = "lodash.isfunction___lodash.isfunction_3.0.9.tgz"; - path = fetchurl { - name = "lodash.isfunction___lodash.isfunction_3.0.9.tgz"; - url = "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz"; - sha1 = "06de25df4db327ac931981d1bdb067e5af68d051"; - }; - } - { - name = "lodash.isobject___lodash.isobject_3.0.2.tgz"; - path = fetchurl { - name = "lodash.isobject___lodash.isobject_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; - sha1 = "3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"; - }; - } - { name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; path = fetchurl { name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; @@ -6946,22 +7090,6 @@ }; } { - name = "lodash.tonumber___lodash.tonumber_4.0.3.tgz"; - path = fetchurl { - name = "lodash.tonumber___lodash.tonumber_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/lodash.tonumber/-/lodash.tonumber-4.0.3.tgz"; - sha1 = "0b96b31b35672793eb7f5a63ee791f1b9e9025d9"; - }; - } - { - name = "lodash.unescape___lodash.unescape_4.0.1.tgz"; - path = fetchurl { - name = "lodash.unescape___lodash.unescape_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz"; - sha1 = "bf2249886ce514cda112fae9218cdc065211fc9c"; - }; - } - { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; @@ -6978,11 +7106,11 @@ }; } { - name = "loglevel___loglevel_1.6.4.tgz"; + name = "loglevel___loglevel_1.6.7.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.4.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.4.tgz"; - sha1 = "f408f4f006db8354d0577dcf6d33485b3cb90d56"; + name = "loglevel___loglevel_1.6.7.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz"; + sha1 = "b3e034233188c68b889f5b862415306f565e2c56"; }; } { @@ -6994,6 +7122,14 @@ }; } { + name = "lolex___lolex_5.1.2.tgz"; + path = fetchurl { + name = "lolex___lolex_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz"; + sha1 = "953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"; + }; + } + { name = "loose_envify___loose_envify_1.4.0.tgz"; path = fetchurl { name = "loose_envify___loose_envify_1.4.0.tgz"; @@ -7002,11 +7138,11 @@ }; } { - name = "lower_case___lower_case_1.1.4.tgz"; + name = "lower_case___lower_case_2.0.1.tgz"; path = fetchurl { - name = "lower_case___lower_case_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; - sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + name = "lower_case___lower_case_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz"; + sha1 = "39eeb36e396115cc05e29422eaea9e692c9408c7"; }; } { @@ -7026,6 +7162,14 @@ }; } { + name = "make_dir___make_dir_3.0.2.tgz"; + path = fetchurl { + name = "make_dir___make_dir_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz"; + sha1 = "04a1acbf22221e1d6ef43559f43e05a90dbb4392"; + }; + } + { name = "makeerror___makeerror_1.0.11.tgz"; path = fetchurl { name = "makeerror___makeerror_1.0.11.tgz"; @@ -7082,14 +7226,6 @@ }; } { - name = "mdn_data___mdn_data_1.1.4.tgz"; - path = fetchurl { - name = "mdn_data___mdn_data_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-1.1.4.tgz"; - sha1 = "50b5d4ffc4575276573c4eedb8780812a8419f01"; - }; - } - { name = "media_typer___media_typer_0.3.0.tgz"; path = fetchurl { name = "media_typer___media_typer_0.3.0.tgz"; @@ -7186,27 +7322,19 @@ }; } { - name = "mime_db___mime_db_1.40.0.tgz"; - path = fetchurl { - name = "mime_db___mime_db_1.40.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz"; - sha1 = "a65057e998db090f732a68f6c276d387d4126c32"; - }; - } - { - name = "mime_db___mime_db_1.42.0.tgz"; + name = "mime_db___mime_db_1.43.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.42.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.42.0.tgz"; - sha1 = "3e252907b4c7adb906597b4b65636272cf9e7bac"; + name = "mime_db___mime_db_1.43.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; + sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58"; }; } { - name = "mime_types___mime_types_2.1.24.tgz"; + name = "mime_types___mime_types_2.1.26.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.24.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz"; - sha1 = "b6f8d0b3e951efb77dedeca194cff6d16f676f81"; + name = "mime_types___mime_types_2.1.26.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; + sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06"; }; } { @@ -7226,14 +7354,6 @@ }; } { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - path = fetchurl { - name = "mimic_fn___mimic_fn_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz"; - sha1 = "820c86a39334640e99516928bd03fca88057d022"; - }; - } - { name = "mimic_fn___mimic_fn_2.1.0.tgz"; path = fetchurl { name = "mimic_fn___mimic_fn_2.1.0.tgz"; @@ -7242,11 +7362,11 @@ }; } { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.0.tgz"; + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; path = fetchurl { - name = "mini_css_extract_plugin___mini_css_extract_plugin_0.8.0.tgz"; - url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz"; - sha1 = "81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1"; + name = "mini_css_extract_plugin___mini_css_extract_plugin_0.9.0.tgz"; + url = "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.9.0.tgz"; + sha1 = "47f2cf07aa165ab35733b1fc97d4c46c0564339e"; }; } { @@ -7290,11 +7410,27 @@ }; } { - name = "minimist___minimist_0.0.10.tgz"; + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + path = fetchurl { + name = "minipass_collect___minipass_collect_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz"; + sha1 = "22b813bf745dc6edba2576b940022ad6edc8c617"; + }; + } + { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + path = fetchurl { + name = "minipass_flush___minipass_flush_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz"; + sha1 = "82e7135d7e89a50ffe64610a787953c4c4cbb373"; + }; + } + { + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; path = fetchurl { - name = "minimist___minimist_0.0.10.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz"; + sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; }; } { @@ -7306,6 +7442,14 @@ }; } { + name = "minipass___minipass_3.1.1.tgz"; + path = fetchurl { + name = "minipass___minipass_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; + sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; + }; + } + { name = "minizlib___minizlib_1.3.3.tgz"; path = fetchurl { name = "minizlib___minizlib_1.3.3.tgz"; @@ -7370,11 +7514,11 @@ }; } { - name = "moo___moo_0.4.3.tgz"; + name = "moo___moo_0.5.1.tgz"; path = fetchurl { - name = "moo___moo_0.4.3.tgz"; - url = "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz"; - sha1 = "3f847a26f31cf625a956a87f2b10fbc013bfd10e"; + name = "moo___moo_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz"; + sha1 = "7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"; }; } { @@ -7426,11 +7570,11 @@ }; } { - name = "mute_stream___mute_stream_0.0.7.tgz"; + name = "mute_stream___mute_stream_0.0.8.tgz"; path = fetchurl { - name = "mute_stream___mute_stream_0.0.7.tgz"; - url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + name = "mute_stream___mute_stream_0.0.8.tgz"; + url = "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz"; + sha1 = "1630c42b2251ff81e2a283de96a5497ea92e5e0d"; }; } { @@ -7458,19 +7602,19 @@ }; } { - name = "nearley___nearley_2.19.0.tgz"; + name = "nearley___nearley_2.19.1.tgz"; path = fetchurl { - name = "nearley___nearley_2.19.0.tgz"; - url = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.0.tgz"; - sha1 = "37717781d0fd0f2bfc95e233ebd75678ca4bda46"; + name = "nearley___nearley_2.19.1.tgz"; + url = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.1.tgz"; + sha1 = "4af4006e16645ff800e9f993c3af039857d9dbdc"; }; } { - name = "needle___needle_2.4.0.tgz"; + name = "needle___needle_2.3.2.tgz"; path = fetchurl { - name = "needle___needle_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz"; - sha1 = "6833e74975c444642590e15a750288c5f939b57c"; + name = "needle___needle_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/needle/-/needle-2.3.2.tgz"; + sha1 = "3342dea100b7160960a450dc8c22160ac712a528"; }; } { @@ -7506,19 +7650,19 @@ }; } { - name = "nise___nise_1.5.2.tgz"; + name = "nise___nise_1.5.3.tgz"; path = fetchurl { - name = "nise___nise_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/nise/-/nise-1.5.2.tgz"; - sha1 = "b6d29af10e48b321b307e10e065199338eeb2652"; + name = "nise___nise_1.5.3.tgz"; + url = "https://registry.yarnpkg.com/nise/-/nise-1.5.3.tgz"; + sha1 = "9d2cfe37d44f57317766c6e9408a359c5d3ac1f7"; }; } { - name = "no_case___no_case_2.3.2.tgz"; + name = "no_case___no_case_3.0.3.tgz"; path = fetchurl { - name = "no_case___no_case_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; - sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + name = "no_case___no_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz"; + sha1 = "c21b434c1ffe48b39087e86cfb4d2582e9df18f8"; }; } { @@ -7530,14 +7674,6 @@ }; } { - name = "node_fetch___node_fetch_1.7.3.tgz"; - path = fetchurl { - name = "node_fetch___node_fetch_1.7.3.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz"; - sha1 = "980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"; - }; - } - { name = "node_forge___node_forge_0.9.0.tgz"; path = fetchurl { name = "node_forge___node_forge_0.9.0.tgz"; @@ -7578,19 +7714,19 @@ }; } { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; + name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; path = fetchurl { - name = "node_pre_gyp___node_pre_gyp_0.12.0.tgz"; - url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz"; - sha1 = "39ba4bb1439da030295f899e3b520b7785766149"; + name = "node_pre_gyp___node_pre_gyp_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz"; + sha1 = "9a0596533b877289bcad4e143982ca3d904ddc83"; }; } { - name = "node_releases___node_releases_1.1.36.tgz"; + name = "node_releases___node_releases_1.1.49.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.36.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.36.tgz"; - sha1 = "44b7cb8254138e87bdbfa47761d0f825e20900b4"; + name = "node_releases___node_releases_1.1.49.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.49.tgz"; + sha1 = "67ba5a3fac2319262675ef864ed56798bb33b93e"; }; } { @@ -7650,19 +7786,27 @@ }; } { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; + name = "npm_bundled___npm_bundled_1.1.1.tgz"; path = fetchurl { - name = "npm_bundled___npm_bundled_1.0.6.tgz"; - url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz"; - sha1 = "e7ba9aadcef962bb61248f91721cd932b3fe6bdd"; + name = "npm_bundled___npm_bundled_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz"; + sha1 = "1edd570865a94cdb1bc8220775e29466c9fb234b"; }; } { - name = "npm_packlist___npm_packlist_1.4.6.tgz"; + name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; path = fetchurl { - name = "npm_packlist___npm_packlist_1.4.6.tgz"; - url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.6.tgz"; - sha1 = "53ba3ed11f8523079f1457376dd379ee4ea42ff4"; + name = "npm_normalize_package_bin___npm_normalize_package_bin_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz"; + sha1 = "6e79a41f23fd235c0623218228da7d9c23b8f6e2"; + }; + } + { + name = "npm_packlist___npm_packlist_1.4.8.tgz"; + path = fetchurl { + name = "npm_packlist___npm_packlist_1.4.8.tgz"; + url = "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz"; + sha1 = "56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"; }; } { @@ -7706,11 +7850,11 @@ }; } { - name = "nwsapi___nwsapi_2.1.4.tgz"; + name = "nwsapi___nwsapi_2.2.0.tgz"; path = fetchurl { - name = "nwsapi___nwsapi_2.1.4.tgz"; - url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.1.4.tgz"; - sha1 = "e006a878db23636f8e8a67d33ca0e4edf61a842f"; + name = "nwsapi___nwsapi_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz"; + sha1 = "204879a9e3d068ff2a55139c2c772780681a38b7"; }; } { @@ -7738,27 +7882,27 @@ }; } { - name = "object_hash___object_hash_1.3.1.tgz"; + name = "object_hash___object_hash_2.0.3.tgz"; path = fetchurl { - name = "object_hash___object_hash_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz"; - sha1 = "fde452098a951cb145f039bb7d455449ddc126df"; + name = "object_hash___object_hash_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz"; + sha1 = "d12db044e03cd2ca3d77c0570d87225b02e1e6ea"; }; } { - name = "object_inspect___object_inspect_1.6.0.tgz"; + name = "object_inspect___object_inspect_1.7.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz"; - sha1 = "c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"; + name = "object_inspect___object_inspect_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; + sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; }; } { - name = "object_is___object_is_1.0.1.tgz"; + name = "object_is___object_is_1.0.2.tgz"; path = fetchurl { - name = "object_is___object_is_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.1.tgz"; - sha1 = "0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6"; + name = "object_is___object_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz"; + sha1 = "6b80eb84fe451498f65007982f035a5b445edec4"; }; } { @@ -7794,27 +7938,27 @@ }; } { - name = "object.entries___object.entries_1.1.0.tgz"; + name = "object.entries___object.entries_1.1.1.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.0.tgz"; - sha1 = "2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519"; + name = "object.entries___object.entries_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; + sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; }; } { - name = "object.fromentries___object.fromentries_2.0.1.tgz"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; path = fetchurl { - name = "object.fromentries___object.fromentries_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.1.tgz"; - sha1 = "050f077855c7af8ae6649f45c80b16ee2d31e704"; + name = "object.fromentries___object.fromentries_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz"; + sha1 = "4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"; }; } { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz"; - sha1 = "8758c846f5b407adab0f236e0986f14b051caa16"; + name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz"; + sha1 = "369bf1f9592d8ab89d712dced5cb81c7c5352649"; }; } { @@ -7826,11 +7970,11 @@ }; } { - name = "object.values___object.values_1.1.0.tgz"; + name = "object.values___object.values_1.1.1.tgz"; path = fetchurl { - name = "object.values___object.values_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz"; - sha1 = "bf6810ef5da3e5325790eaaa2be213ea84624da9"; + name = "object.values___object.values_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz"; + sha1 = "68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"; }; } { @@ -7866,19 +8010,19 @@ }; } { - name = "onetime___onetime_2.0.1.tgz"; + name = "onetime___onetime_5.1.0.tgz"; path = fetchurl { - name = "onetime___onetime_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + name = "onetime___onetime_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; + sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; }; } { - name = "open___open_6.4.0.tgz"; + name = "open___open_7.0.2.tgz"; path = fetchurl { - name = "open___open_6.4.0.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz"; - sha1 = "5c13e96d0dc894686164f18965ecfe889ecfc8a9"; + name = "open___open_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.0.2.tgz"; + sha1 = "fb3681f11f157f2361d2392307548ca1792960e8"; }; } { @@ -7890,14 +8034,6 @@ }; } { - name = "optimist___optimist_0.6.1.tgz"; - path = fetchurl { - name = "optimist___optimist_0.6.1.tgz"; - url = "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - } - { name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz"; path = fetchurl { name = "optimize_css_assets_webpack_plugin___optimize_css_assets_webpack_plugin_5.0.3.tgz"; @@ -7906,11 +8042,11 @@ }; } { - name = "optionator___optionator_0.8.2.tgz"; + name = "optionator___optionator_0.8.3.tgz"; path = fetchurl { - name = "optionator___optionator_0.8.2.tgz"; - url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + name = "optionator___optionator_0.8.3.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz"; + sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; }; } { @@ -8002,11 +8138,11 @@ }; } { - name = "p_limit___p_limit_2.2.1.tgz"; + name = "p_limit___p_limit_2.2.2.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz"; - sha1 = "aa07a788cc3151c939b5131f63570f0dd2009537"; + name = "p_limit___p_limit_2.2.2.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; + sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; }; } { @@ -8026,11 +8162,27 @@ }; } { - name = "p_map___p_map_1.2.0.tgz"; + name = "p_locate___p_locate_4.1.0.tgz"; + path = fetchurl { + name = "p_locate___p_locate_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz"; + sha1 = "a3428bb7088b3a60292f66919278b7c297ad4f07"; + }; + } + { + name = "p_map___p_map_2.1.0.tgz"; path = fetchurl { - name = "p_map___p_map_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz"; - sha1 = "e4e94f311eabbc8633a1e79908165fca26241b6b"; + name = "p_map___p_map_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz"; + sha1 = "310928feef9c9ecc65b68b17693018a665cea175"; + }; + } + { + name = "p_map___p_map_3.0.0.tgz"; + path = fetchurl { + name = "p_map___p_map_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz"; + sha1 = "d704d9af8a2ba684e2600d9a215983d4141a979d"; }; } { @@ -8042,6 +8194,14 @@ }; } { + name = "p_retry___p_retry_3.0.1.tgz"; + path = fetchurl { + name = "p_retry___p_retry_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz"; + sha1 = "316b4c8893e2c8dc1cfa891f406c4b422bebf328"; + }; + } + { name = "p_try___p_try_1.0.0.tgz"; path = fetchurl { name = "p_try___p_try_1.0.0.tgz"; @@ -8058,11 +8218,11 @@ }; } { - name = "pako___pako_1.0.10.tgz"; + name = "pako___pako_1.0.11.tgz"; path = fetchurl { - name = "pako___pako_1.0.10.tgz"; - url = "https://registry.yarnpkg.com/pako/-/pako-1.0.10.tgz"; - sha1 = "4328badb5086a426aa90f541977d4955da5c9732"; + name = "pako___pako_1.0.11.tgz"; + url = "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz"; + sha1 = "6c9599d340d54dfd3946380252a35705a6b992bf"; }; } { @@ -8074,11 +8234,11 @@ }; } { - name = "param_case___param_case_2.1.1.tgz"; + name = "param_case___param_case_3.0.3.tgz"; path = fetchurl { - name = "param_case___param_case_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; - sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + name = "param_case___param_case_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz"; + sha1 = "4be41f8399eff621c56eebb829a5e451d9801238"; }; } { @@ -8114,6 +8274,14 @@ }; } { + name = "parse_json___parse_json_5.0.0.tgz"; + path = fetchurl { + name = "parse_json___parse_json_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; + sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + }; + } + { name = "parse5___parse5_4.0.0.tgz"; path = fetchurl { name = "parse5___parse5_4.0.0.tgz"; @@ -8146,6 +8314,14 @@ }; } { + name = "pascal_case___pascal_case_3.1.1.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 = "pascalcase___pascalcase_0.1.1.tgz"; path = fetchurl { name = "pascalcase___pascalcase_0.1.1.tgz"; @@ -8186,6 +8362,14 @@ }; } { + name = "path_exists___path_exists_4.0.0.tgz"; + path = fetchurl { + name = "path_exists___path_exists_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz"; + sha1 = "513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"; + }; + } + { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; path = fetchurl { name = "path_is_absolute___path_is_absolute_1.0.1.tgz"; @@ -8210,6 +8394,14 @@ }; } { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } + { name = "path_parse___path_parse_1.0.6.tgz"; path = fetchurl { name = "path_parse___path_parse_1.0.6.tgz"; @@ -8226,11 +8418,11 @@ }; } { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; path = fetchurl { - name = "path_to_regexp___path_to_regexp_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + name = "path_to_regexp___path_to_regexp_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; + sha1 = "887b3ba9d84393e87a0a0b9f4cb756198b53548a"; }; } { @@ -8250,6 +8442,14 @@ }; } { + name = "path_type___path_type_4.0.0.tgz"; + path = fetchurl { + name = "path_type___path_type_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz"; + sha1 = "84ed01c0a7ba380afe09d90a8c180dcd9d03043b"; + }; + } + { name = "pbkdf2___pbkdf2_3.0.17.tgz"; path = fetchurl { name = "pbkdf2___pbkdf2_3.0.17.tgz"; @@ -8266,11 +8466,11 @@ }; } { - name = "picomatch___picomatch_2.0.7.tgz"; + name = "picomatch___picomatch_2.2.1.tgz"; path = fetchurl { - name = "picomatch___picomatch_2.0.7.tgz"; - url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz"; - sha1 = "514169d8c7cd0bdbeecc8a2609e34a7163de69f6"; + name = "picomatch___picomatch_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz"; + sha1 = "21bac888b6ed8601f831ce7816e335bc779f0a4a"; }; } { @@ -8346,11 +8546,19 @@ }; } { - name = "pkg_up___pkg_up_2.0.0.tgz"; + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + path = fetchurl { + name = "pkg_dir___pkg_dir_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz"; + sha1 = "f099133df7ede422e81d1d8448270eeb3e4261f3"; + }; + } + { + name = "pkg_up___pkg_up_3.1.0.tgz"; path = fetchurl { - name = "pkg_up___pkg_up_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + name = "pkg_up___pkg_up_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz"; + sha1 = "100ec235cc150e4fd42519412596a28512a0def5"; }; } { @@ -8362,19 +8570,19 @@ }; } { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.0.tgz"; path = fetchurl { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.5.0.tgz"; - url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.5.0.tgz"; - sha1 = "62a1cd3068f46d564bb33c56eb250e4d586676eb"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.0.tgz"; + url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.0.tgz"; + sha1 = "d5c068013a2fdc82224ca50ed179c8fba9036a8e"; }; } { - name = "popper.js___popper.js_1.16.0.tgz"; + name = "popper.js___popper.js_1.16.1.tgz"; path = fetchurl { - name = "popper.js___popper.js_1.16.0.tgz"; - url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.0.tgz"; - sha1 = "2e1816bcbbaa518ea6c2e15a466f4cb9c6e2fbb3"; + name = "popper.js___popper.js_1.16.1.tgz"; + url = "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz"; + sha1 = "2a223cb3dc7b6213d740e40372be40de43e65b1b"; }; } { @@ -8394,27 +8602,27 @@ }; } { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz"; + name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz"; path = fetchurl { - name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz"; - sha1 = "b2a721a0d279c2f9103a36331c88981526428cc7"; + name = "postcss_attribute_case_insensitive___postcss_attribute_case_insensitive_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.2.tgz"; + sha1 = "d93e46b504589e94ac7277b0463226c68041a880"; }; } { - name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz"; + name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz"; path = fetchurl { - name = "postcss_browser_comments___postcss_browser_comments_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-2.0.0.tgz"; - sha1 = "dc48d6a8ddbff188a80a000b7393436cb18aed88"; + name = "postcss_browser_comments___postcss_browser_comments_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-browser-comments/-/postcss-browser-comments-3.0.0.tgz"; + sha1 = "1248d2d935fb72053c8e1f61a84a57292d9f65e9"; }; } { - name = "postcss_calc___postcss_calc_7.0.1.tgz"; + name = "postcss_calc___postcss_calc_7.0.2.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz"; - sha1 = "36d77bab023b0ecbb9789d84dcb23c4941145436"; + name = "postcss_calc___postcss_calc_7.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz"; + sha1 = "504efcd008ca0273120568b0792b16cdcde8aac1"; }; } { @@ -8602,11 +8810,11 @@ }; } { - name = "postcss_initial___postcss_initial_3.0.1.tgz"; + name = "postcss_initial___postcss_initial_3.0.2.tgz"; path = fetchurl { - name = "postcss_initial___postcss_initial_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.1.tgz"; - sha1 = "99d319669a13d6c06ef8e70d852f68cb1b399b61"; + name = "postcss_initial___postcss_initial_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz"; + sha1 = "f018563694b3c16ae8eaabe3c585ac6319637b2d"; }; } { @@ -8706,27 +8914,27 @@ }; } { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz"; - sha1 = "dd9953f6dd476b5fd1ef2d8830c8929760b56e63"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; + sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915"; }; } { - name = "postcss_modules_scope___postcss_modules_scope_2.1.0.tgz"; + name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz"; path = fetchurl { - name = "postcss_modules_scope___postcss_modules_scope_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz"; - sha1 = "ad3f5bf7856114f6fcab901b0502e2a2bc39d4eb"; + name = "postcss_modules_scope___postcss_modules_scope_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz"; + sha1 = "33d4fc946602eb5e9355c4165d68a10727689dba"; }; } { - name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; path = fetchurl { - name = "postcss_modules_values___postcss_modules_values_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz"; - sha1 = "479b46dc0c5ca3dc7fa5270851836b9ec7152f64"; + name = "postcss_modules_values___postcss_modules_values_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; + sha1 = "5b5000d6ebae29b4255301b4a3a54574423e7f10"; }; } { @@ -8810,11 +9018,11 @@ }; } { - name = "postcss_normalize___postcss_normalize_7.0.1.tgz"; + name = "postcss_normalize___postcss_normalize_8.0.1.tgz"; path = fetchurl { - name = "postcss_normalize___postcss_normalize_7.0.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-7.0.1.tgz"; - sha1 = "eb51568d962b8aa61a8318383c8bb7e54332282e"; + name = "postcss_normalize___postcss_normalize_8.0.1.tgz"; + url = "https://registry.yarnpkg.com/postcss-normalize/-/postcss-normalize-8.0.1.tgz"; + sha1 = "90e80a7763d7fdf2da6f2f0f82be832ce4f66776"; }; } { @@ -8914,11 +9122,11 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz"; - sha1 = "4f875f4afb0c96573d5cf4d74011aee250a7e865"; + name = "postcss_selector_parser___postcss_selector_parser_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.2.tgz"; + sha1 = "b310f5c4c0fdaf76f94902bbaa30db6aa84f5270"; }; } { @@ -8962,11 +9170,11 @@ }; } { - name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz"; + name = "postcss_value_parser___postcss_value_parser_4.0.3.tgz"; path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz"; - sha1 = "482282c09a42706d1fc9a069b73f44ec08391dc9"; + name = "postcss_value_parser___postcss_value_parser_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; + sha1 = "651ff4593aa9eda8d5d0d66593a2417aeaeb325d"; }; } { @@ -8978,19 +9186,19 @@ }; } { - name = "postcss___postcss_7.0.14.tgz"; + name = "postcss___postcss_7.0.21.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.14.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz"; - sha1 = "4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"; + name = "postcss___postcss_7.0.21.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz"; + sha1 = "06bb07824c19c2021c5d056d5b10c35b989f7e17"; }; } { - name = "postcss___postcss_7.0.18.tgz"; + name = "postcss___postcss_7.0.27.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.18.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz"; - sha1 = "4b9cda95ae6c069c67a4d933029eddd4838ac233"; + name = "postcss___postcss_7.0.27.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz"; + sha1 = "cc67cdc6b0daa375105b7c424a85567345fc54d9"; }; } { @@ -9018,11 +9226,11 @@ }; } { - name = "prettier___prettier_1.18.2.tgz"; + name = "prettier___prettier_1.19.1.tgz"; path = fetchurl { - name = "prettier___prettier_1.18.2.tgz"; - url = "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz"; - sha1 = "6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea"; + name = "prettier___prettier_1.19.1.tgz"; + url = "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz"; + sha1 = "f7d7f5ff8a9cd872a7be4ca142095956a60797cb"; }; } { @@ -9106,19 +9314,11 @@ }; } { - name = "promise___promise_7.3.1.tgz"; - path = fetchurl { - name = "promise___promise_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz"; - sha1 = "064b72602b18f90f29192b8b1bc418ffd1ebd3bf"; - }; - } - { - name = "prompts___prompts_2.2.1.tgz"; + name = "prompts___prompts_2.3.1.tgz"; path = fetchurl { - name = "prompts___prompts_2.2.1.tgz"; - url = "https://registry.yarnpkg.com/prompts/-/prompts-2.2.1.tgz"; - sha1 = "f901dd2a2dfee080359c0e20059b24188d75ad35"; + name = "prompts___prompts_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/prompts/-/prompts-2.3.1.tgz"; + sha1 = "b63a9ce2809f106fa9ae1277c275b167af46ea05"; }; } { @@ -9154,11 +9354,11 @@ }; } { - name = "psl___psl_1.4.0.tgz"; + name = "psl___psl_1.7.0.tgz"; path = fetchurl { - name = "psl___psl_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.4.0.tgz"; - sha1 = "5dd26156cdb69fa1fdb8ab1991667d3f80ced7c2"; + name = "psl___psl_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; + sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"; }; } { @@ -9346,59 +9546,51 @@ }; } { - name = "react_app_polyfill___react_app_polyfill_1.0.4.tgz"; - path = fetchurl { - name = "react_app_polyfill___react_app_polyfill_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.4.tgz"; - sha1 = "4dd2636846b585c2d842b1e44e1bc29044345874"; - }; - } - { - name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.1.tgz"; + name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; path = fetchurl { - name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz"; - sha1 = "8eae107bb400be73132ed3b6a7b4fb156090208e"; + name = "react_app_polyfill___react_app_polyfill_1.0.6.tgz"; + url = "https://registry.yarnpkg.com/react-app-polyfill/-/react-app-polyfill-1.0.6.tgz"; + sha1 = "890f8d7f2842ce6073f030b117de9130a5f385f0"; }; } { - name = "react_dev_utils___react_dev_utils_9.1.0.tgz"; + name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.2.tgz"; path = fetchurl { - name = "react_dev_utils___react_dev_utils_9.1.0.tgz"; - url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-9.1.0.tgz"; - sha1 = "3ad2bb8848a32319d760d0a84c56c14bdaae5e81"; + name = "react_copy_to_clipboard___react_copy_to_clipboard_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.2.tgz"; + sha1 = "d82a437e081e68dfca3761fbd57dbf2abdda1316"; }; } { - name = "react_dom___react_dom_16.10.2.tgz"; + name = "react_dev_utils___react_dev_utils_10.2.0.tgz"; path = fetchurl { - name = "react_dom___react_dom_16.10.2.tgz"; - url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.10.2.tgz"; - sha1 = "4840bce5409176bc3a1f2bd8cb10b92db452fda6"; + name = "react_dev_utils___react_dev_utils_10.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-10.2.0.tgz"; + sha1 = "b11cc48aa2be2502fb3c27a50d1dfa95cfa9dfe0"; }; } { - name = "react_error_overlay___react_error_overlay_6.0.3.tgz"; + name = "react_dom___react_dom_16.12.0.tgz"; path = fetchurl { - name = "react_error_overlay___react_error_overlay_6.0.3.tgz"; - url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.3.tgz"; - sha1 = "c378c4b0a21e88b2e159a3e62b2f531fd63bf60d"; + name = "react_dom___react_dom_16.12.0.tgz"; + url = "https://registry.yarnpkg.com/react-dom/-/react-dom-16.12.0.tgz"; + sha1 = "0da4b714b8d13c2038c9396b54a92baea633fe11"; }; } { - name = "react_is___react_is_16.11.0.tgz"; + name = "react_error_overlay___react_error_overlay_6.0.6.tgz"; path = fetchurl { - name = "react_is___react_is_16.11.0.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.11.0.tgz"; - sha1 = "b85dfecd48ad1ce469ff558a882ca8e8313928fa"; + name = "react_error_overlay___react_error_overlay_6.0.6.tgz"; + url = "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.6.tgz"; + sha1 = "ac4d9dc4c1b5c536c2c312bf66aa2b09bfa384e2"; }; } { - name = "react_is___react_is_16.10.2.tgz"; + name = "react_is___react_is_16.12.0.tgz"; path = fetchurl { - name = "react_is___react_is_16.10.2.tgz"; - url = "https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz"; - sha1 = "984120fd4d16800e9a738208ab1fba422d23b5ab"; + name = "react_is___react_is_16.12.0.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz"; + sha1 = "2cc0fe0fba742d97fd527c42a13bec4eeb06241c"; }; } { @@ -9410,11 +9602,11 @@ }; } { - name = "react_popper___react_popper_1.3.4.tgz"; + name = "react_popper___react_popper_1.3.7.tgz"; path = fetchurl { - name = "react_popper___react_popper_1.3.4.tgz"; - url = "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.4.tgz"; - sha1 = "f0cd3b0d30378e1f663b0d79bcc8614221652ced"; + name = "react_popper___react_popper_1.3.7.tgz"; + url = "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.7.tgz"; + sha1 = "f6a3471362ef1f0d10a4963673789de1baca2324"; }; } { @@ -9426,19 +9618,19 @@ }; } { - name = "react_scripts___react_scripts_3.2.0.tgz"; + name = "react_scripts___react_scripts_3.4.0.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.2.0.tgz"; - sha1 = "58ccd6b4ffa27f1b4d2986cbdcaa916660e9e33c"; + name = "react_scripts___react_scripts_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.0.tgz"; + sha1 = "f413680f0b5b937c8879ba1ffdae9b8c5b364bf5"; }; } { - name = "react_test_renderer___react_test_renderer_16.11.0.tgz"; + name = "react_test_renderer___react_test_renderer_16.12.0.tgz"; path = fetchurl { - name = "react_test_renderer___react_test_renderer_16.11.0.tgz"; - url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.11.0.tgz"; - sha1 = "72574566496462c808ac449b0287a4c0a1a7d8f8"; + name = "react_test_renderer___react_test_renderer_16.12.0.tgz"; + url = "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.12.0.tgz"; + sha1 = "11417ffda579306d4e841a794d32140f3da1b43f"; }; } { @@ -9450,19 +9642,19 @@ }; } { - name = "react___react_16.10.2.tgz"; + name = "react___react_16.12.0.tgz"; path = fetchurl { - name = "react___react_16.10.2.tgz"; - url = "https://registry.yarnpkg.com/react/-/react-16.10.2.tgz"; - sha1 = "a5ede5cdd5c536f745173c8da47bda64797a4cf0"; + name = "react___react_16.12.0.tgz"; + url = "https://registry.yarnpkg.com/react/-/react-16.12.0.tgz"; + sha1 = "0c0a9c6a142429e3614834d5a778e18aa78a0b83"; }; } { - name = "reactstrap___reactstrap_8.0.1.tgz"; + name = "reactstrap___reactstrap_8.4.1.tgz"; path = fetchurl { - name = "reactstrap___reactstrap_8.0.1.tgz"; - url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.0.1.tgz"; - sha1 = "0b663c8195f540bc1d6d5dbcbcf73cab56fe7c79"; + name = "reactstrap___reactstrap_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.4.1.tgz"; + sha1 = "c7f63b9057f58b52833061711ebe235b9ec4e3e5"; }; } { @@ -9498,19 +9690,19 @@ }; } { - name = "readable_stream___readable_stream_2.3.6.tgz"; + name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_2.3.6.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz"; - sha1 = "b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"; + 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 = "readable_stream___readable_stream_3.4.0.tgz"; + name = "readable_stream___readable_stream_3.6.0.tgz"; path = fetchurl { - name = "readable_stream___readable_stream_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.4.0.tgz"; - sha1 = "a51c26754658e0a3c21dbf59163bd45ba6f447fc"; + name = "readable_stream___readable_stream_3.6.0.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz"; + sha1 = "337bbda3adc0706bd3e024426a286d4b4b2c9198"; }; } { @@ -9522,11 +9714,11 @@ }; } { - name = "readdirp___readdirp_3.2.0.tgz"; + name = "readdirp___readdirp_3.3.0.tgz"; path = fetchurl { - name = "readdirp___readdirp_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.2.0.tgz"; - sha1 = "c30c33352b12c96dfb4b895421a49fd5a9593839"; + name = "readdirp___readdirp_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz"; + sha1 = "984458d13a1e42e2e9f5841b129e162f369aff17"; }; } { @@ -9570,14 +9762,6 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; - }; - } - { name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; path = fetchurl { name = "regenerator_runtime___regenerator_runtime_0.11.1.tgz"; @@ -9586,6 +9770,14 @@ }; } { + name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.3.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; + sha1 = "7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"; + }; + } + { name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; path = fetchurl { name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; @@ -9610,11 +9802,11 @@ }; } { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; path = fetchurl { - name = "regexp.prototype.flags___regexp.prototype.flags_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz"; - sha1 = "6b30724e306a27833eeb171b66ac8890ba37e41c"; + name = "regexp.prototype.flags___regexp.prototype.flags_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz"; + sha1 = "7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"; }; } { @@ -9626,6 +9818,14 @@ }; } { + name = "regexpp___regexpp_3.0.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz"; + sha1 = "dd63982ee3300e67b41c1956f850aa680d9d330e"; + }; + } + { name = "regexpu_core___regexpu_core_4.6.0.tgz"; path = fetchurl { name = "regexpu_core___regexpu_core_4.6.0.tgz"; @@ -9634,19 +9834,19 @@ }; } { - name = "regjsgen___regjsgen_0.5.0.tgz"; + name = "regjsgen___regjsgen_0.5.1.tgz"; path = fetchurl { - name = "regjsgen___regjsgen_0.5.0.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.0.tgz"; - sha1 = "a7634dc08f89209c2049adda3525711fb97265dd"; + name = "regjsgen___regjsgen_0.5.1.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; + sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; }; } { - name = "regjsparser___regjsparser_0.6.0.tgz"; + name = "regjsparser___regjsparser_0.6.3.tgz"; path = fetchurl { - name = "regjsparser___regjsparser_0.6.0.tgz"; - url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.0.tgz"; - sha1 = "f1e6ae8b7da2bae96c99399b868cd6c933a2ba9c"; + name = "regjsparser___regjsparser_0.6.3.tgz"; + url = "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.3.tgz"; + sha1 = "74192c5805d35e9f5ebe3c1fb5b40d40a8a38460"; }; } { @@ -9690,27 +9890,27 @@ }; } { - name = "request_promise_core___request_promise_core_1.1.2.tgz"; + name = "request_promise_core___request_promise_core_1.1.3.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.2.tgz"; - sha1 = "339f6aababcafdb31c799ff158700336301d3346"; + name = "request_promise_core___request_promise_core_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz"; + sha1 = "e9a3c081b51380dfea677336061fea879a829ee9"; }; } { - name = "request_promise_native___request_promise_native_1.0.7.tgz"; + name = "request_promise_native___request_promise_native_1.0.8.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.7.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.7.tgz"; - sha1 = "a49868a624bdea5069f1251d0a836e0d89aa2c59"; + name = "request_promise_native___request_promise_native_1.0.8.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz"; + sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36"; }; } { - name = "request___request_2.88.0.tgz"; + name = "request___request_2.88.2.tgz"; path = fetchurl { - name = "request___request_2.88.0.tgz"; - url = "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz"; - sha1 = "9c2fca4f7d35b592efe57c7f0a55e81052124fef"; + name = "request___request_2.88.2.tgz"; + url = "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz"; + sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; }; } { @@ -9778,11 +9978,11 @@ }; } { - name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz"; + name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; path = fetchurl { - name = "resolve_url_loader___resolve_url_loader_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.0.tgz"; - sha1 = "54d8181d33cd1b66a59544d05cadf8e4aa7d37cc"; + name = "resolve_url_loader___resolve_url_loader_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.1.tgz"; + sha1 = "28931895fa1eab9be0647d3b2958c100ae3c0bf0"; }; } { @@ -9802,19 +10002,27 @@ }; } { - name = "resolve___resolve_1.12.0.tgz"; + name = "resolve___resolve_1.15.0.tgz"; + path = fetchurl { + name = "resolve___resolve_1.15.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.0.tgz"; + sha1 = "1b7ca96073ebb52e741ffd799f6b39ea462c67f5"; + }; + } + { + name = "resolve___resolve_1.15.1.tgz"; path = fetchurl { - name = "resolve___resolve_1.12.0.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz"; - sha1 = "3fc644a35c84a48554609ff26ec52b66fa577df6"; + name = "resolve___resolve_1.15.1.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz"; + sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"; }; } { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; + name = "restore_cursor___restore_cursor_3.1.0.tgz"; path = fetchurl { - name = "restore_cursor___restore_cursor_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + name = "restore_cursor___restore_cursor_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz"; + sha1 = "39f67c54b3a7a58cea5236d95cf0034239631f7e"; }; } { @@ -9826,6 +10034,14 @@ }; } { + name = "retry___retry_0.12.0.tgz"; + path = fetchurl { + name = "retry___retry_0.12.0.tgz"; + url = "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz"; + sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + }; + } + { name = "rework_visit___rework_visit_1.0.0.tgz"; path = fetchurl { name = "rework_visit___rework_visit_1.0.0.tgz"; @@ -9914,11 +10130,11 @@ }; } { - name = "rxjs___rxjs_6.5.3.tgz"; + name = "rxjs___rxjs_6.5.4.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.5.3.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz"; - sha1 = "510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"; + name = "rxjs___rxjs_6.5.4.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz"; + sha1 = "e0777fe0d184cec7872df147f303572d414e211c"; }; } { @@ -9962,19 +10178,27 @@ }; } { - name = "sanitize_html___sanitize_html_1.20.1.tgz"; + name = "sanitize_html___sanitize_html_1.21.1.tgz"; path = fetchurl { - name = "sanitize_html___sanitize_html_1.20.1.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.20.1.tgz"; - sha1 = "f6effdf55dd398807171215a62bfc21811bacf85"; + name = "sanitize_html___sanitize_html_1.21.1.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.21.1.tgz"; + sha1 = "1647d15c0c672901aa41eac1b86d0c38146d30ce"; }; } { - name = "sass_loader___sass_loader_7.2.0.tgz"; + name = "sanitize.css___sanitize.css_10.0.0.tgz"; path = fetchurl { - name = "sass_loader___sass_loader_7.2.0.tgz"; - url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.2.0.tgz"; - sha1 = "e34115239309d15b2527cb62b5dfefb62a96ff7f"; + name = "sanitize.css___sanitize.css_10.0.0.tgz"; + url = "https://registry.yarnpkg.com/sanitize.css/-/sanitize.css-10.0.0.tgz"; + sha1 = "b5cb2547e96d8629a60947544665243b1dc3657a"; + }; + } + { + name = "sass_loader___sass_loader_8.0.2.tgz"; + path = fetchurl { + name = "sass_loader___sass_loader_8.0.2.tgz"; + url = "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.2.tgz"; + sha1 = "debecd8c3ce243c76454f2e8290482150380090d"; }; } { @@ -9994,19 +10218,11 @@ }; } { - name = "scheduler___scheduler_0.16.2.tgz"; + name = "scheduler___scheduler_0.18.0.tgz"; path = fetchurl { - name = "scheduler___scheduler_0.16.2.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.16.2.tgz"; - sha1 = "f74cd9d33eff6fc554edfb79864868e4819132c1"; - }; - } - { - name = "scheduler___scheduler_0.17.0.tgz"; - path = fetchurl { - name = "scheduler___scheduler_0.17.0.tgz"; - url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz"; - sha1 = "7c9c673e4ec781fac853927916d1c426b6f3ddfe"; + name = "scheduler___scheduler_0.18.0.tgz"; + url = "https://registry.yarnpkg.com/scheduler/-/scheduler-0.18.0.tgz"; + sha1 = "5901ad6659bc1d8f3fdaf36eb7a67b0d6746b1c4"; }; } { @@ -10018,11 +10234,11 @@ }; } { - name = "schema_utils___schema_utils_2.5.0.tgz"; + name = "schema_utils___schema_utils_2.6.4.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.5.0.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.5.0.tgz"; - sha1 = "8f254f618d402cc80257486213c8970edfd7c22f"; + name = "schema_utils___schema_utils_2.6.4.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz"; + sha1 = "a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53"; }; } { @@ -10058,6 +10274,14 @@ }; } { + name = "semver___semver_7.0.0.tgz"; + path = fetchurl { + name = "semver___semver_7.0.0.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz"; + sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; + }; + } + { name = "send___send_0.17.1.tgz"; path = fetchurl { name = "send___send_0.17.1.tgz"; @@ -10066,11 +10290,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_1.9.1.tgz"; + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz"; - sha1 = "cfc200aef77b600c47da9bb8149c943e798c2fdb"; + name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; + sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; }; } { @@ -10162,6 +10386,14 @@ }; } { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { name = "shebang_regex___shebang_regex_1.0.0.tgz"; path = fetchurl { name = "shebang_regex___shebang_regex_1.0.0.tgz"; @@ -10170,6 +10402,14 @@ }; } { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { name = "shell_quote___shell_quote_1.7.2.tgz"; path = fetchurl { name = "shell_quote___shell_quote_1.7.2.tgz"; @@ -10186,6 +10426,14 @@ }; } { + name = "side_channel___side_channel_1.0.2.tgz"; + path = fetchurl { + name = "side_channel___side_channel_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; + sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; + }; + } + { name = "signal_exit___signal_exit_3.0.2.tgz"; path = fetchurl { name = "signal_exit___signal_exit_3.0.2.tgz"; @@ -10210,11 +10458,11 @@ }; } { - name = "sisteransi___sisteransi_1.0.3.tgz"; + name = "sisteransi___sisteransi_1.0.4.tgz"; path = fetchurl { - name = "sisteransi___sisteransi_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.3.tgz"; - sha1 = "98168d62b79e3a5e758e27ae63c4a053d748f4eb"; + name = "sisteransi___sisteransi_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.4.tgz"; + sha1 = "386713f1ef688c7c0304dc4c0632898941cad2e3"; }; } { @@ -10274,14 +10522,6 @@ }; } { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; - path = fetchurl { - name = "sockjs_client___sockjs_client_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.3.0.tgz"; - sha1 = "12fc9d6cb663da5739d3dc5fb6e8687da95cb177"; - }; - } - { name = "sockjs_client___sockjs_client_1.4.0.tgz"; path = fetchurl { name = "sockjs_client___sockjs_client_1.4.0.tgz"; @@ -10314,19 +10554,19 @@ }; } { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; path = fetchurl { - name = "source_map_resolve___source_map_resolve_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz"; - sha1 = "72e2cc34095543e43b2c62b2c4c10d4a9054f259"; + name = "source_map_resolve___source_map_resolve_0.5.3.tgz"; + url = "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz"; + sha1 = "190866bece7553e1f8f267a2ee82c606b5509a1a"; }; } { - name = "source_map_support___source_map_support_0.5.13.tgz"; + name = "source_map_support___source_map_support_0.5.16.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.13.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz"; - sha1 = "31b24a9c2e73c2de85066c0feb7d44767ed52932"; + name = "source_map_support___source_map_support_0.5.16.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; + sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042"; }; } { @@ -10442,6 +10682,14 @@ }; } { + name = "ssri___ssri_7.1.0.tgz"; + path = fetchurl { + name = "ssri___ssri_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz"; + sha1 = "92c241bf6de82365b5c7fb4bd76e975522e1294d"; + }; + } + { name = "stable___stable_0.1.8.tgz"; path = fetchurl { name = "stable___stable_0.1.8.tgz"; @@ -10506,11 +10754,11 @@ }; } { - name = "stream_shift___stream_shift_1.0.0.tgz"; + name = "stream_shift___stream_shift_1.0.1.tgz"; path = fetchurl { - name = "stream_shift___stream_shift_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz"; - sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; + name = "stream_shift___stream_shift_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz"; + sha1 = "d7088281559ab2778424279b0877da3c392d5a3d"; }; } { @@ -10562,27 +10810,43 @@ }; } { - name = "string.prototype.trim___string.prototype.trim_1.2.0.tgz"; + name = "string_width___string_width_4.2.0.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + }; + } + { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + path = fetchurl { + name = "string.prototype.matchall___string.prototype.matchall_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz"; + sha1 = "48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"; + }; + } + { + name = "string.prototype.trim___string.prototype.trim_1.2.1.tgz"; path = fetchurl { - name = "string.prototype.trim___string.prototype.trim_1.2.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.0.tgz"; - sha1 = "75a729b10cfc1be439543dae442129459ce61e3d"; + name = "string.prototype.trim___string.prototype.trim_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz"; + sha1 = "141233dff32c82bfad80684d7e5f0869ee0fb782"; }; } { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz"; - sha1 = "6cc47f0d7eb8d62b0f3701611715a3954591d634"; + name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; + sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"; }; } { - name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; + name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz"; - sha1 = "669d164be9df9b6f7559fa8e89945b168a5a6c58"; + name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; + sha1 = "440314b15996c866ce8a0341894d45186200c5d9"; }; } { @@ -10610,11 +10874,11 @@ }; } { - name = "strip_ansi___strip_ansi_5.2.0.tgz"; + name = "strip_ansi___strip_ansi_6.0.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 = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; }; } { @@ -10634,6 +10898,14 @@ }; } { + 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 = "strip_bom___strip_bom_3.0.0.tgz"; path = fetchurl { name = "strip_bom___strip_bom_3.0.0.tgz"; @@ -10674,11 +10946,11 @@ }; } { - name = "style_loader___style_loader_1.0.0.tgz"; + name = "style_loader___style_loader_0.23.1.tgz"; path = fetchurl { - name = "style_loader___style_loader_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.0.tgz"; - sha1 = "1d5296f9165e8e2c85d24eee0b7caf9ec8ca1f82"; + name = "style_loader___style_loader_0.23.1.tgz"; + url = "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz"; + sha1 = "cb9154606f3e771ab6c4ab637026a1049174d925"; }; } { @@ -10714,19 +10986,27 @@ }; } { - name = "svg_parser___svg_parser_2.0.2.tgz"; + name = "supports_color___supports_color_7.1.0.tgz"; path = fetchurl { - name = "svg_parser___svg_parser_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.2.tgz"; - sha1 = "d134cc396fa2681dc64f518330784e98bd801ec8"; + name = "supports_color___supports_color_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; + sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; }; } { - name = "svgo___svgo_1.3.0.tgz"; + name = "svg_parser___svg_parser_2.0.3.tgz"; path = fetchurl { - name = "svgo___svgo_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.0.tgz"; - sha1 = "bae51ba95ded9a33a36b7c46ce9c359ae9154313"; + name = "svg_parser___svg_parser_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/svg-parser/-/svg-parser-2.0.3.tgz"; + sha1 = "a38f2e4e5442986f7ecb554c11f1411cfcf8c2b9"; + }; + } + { + name = "svgo___svgo_1.3.2.tgz"; + path = fetchurl { + name = "svgo___svgo_1.3.2.tgz"; + url = "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz"; + sha1 = "b6dc511c063346c9e415b81e43401145b96d4167"; }; } { @@ -10778,19 +11058,27 @@ }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.4.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.1.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz"; - sha1 = "61b18e40eaee5be97e771cdbb10ed1280888c2b4"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.4.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.4.tgz"; + sha1 = "ac045703bd8da0936ce910d8fb6350d0e1dee5fe"; }; } { - name = "terser___terser_4.3.9.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; path = fetchurl { - name = "terser___terser_4.3.9.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.3.9.tgz"; - sha1 = "e4be37f80553d02645668727777687dad26bbca8"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; + sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; + }; + } + { + name = "terser___terser_4.6.3.tgz"; + path = fetchurl { + name = "terser___terser_4.6.3.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.6.3.tgz"; + sha1 = "e33aa42461ced5238d352d2df2a67f21921f8d87"; }; } { @@ -10954,14 +11242,6 @@ }; } { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - path = fetchurl { - name = "tough_cookie___tough_cookie_2.4.3.tgz"; - url = "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz"; - sha1 = "53f36da3f47783b0925afa06ff9f3b165280f781"; - }; - } - { name = "tr46___tr46_1.0.1.tgz"; path = fetchurl { name = "tr46___tr46_1.0.1.tgz"; @@ -10970,19 +11250,27 @@ }; } { - name = "ts_pnp___ts_pnp_1.1.4.tgz"; + name = "ts_pnp___ts_pnp_1.1.5.tgz"; + path = fetchurl { + name = "ts_pnp___ts_pnp_1.1.5.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.5.tgz"; + sha1 = "840e0739c89fce5f3abd9037bb091dbff16d9dec"; + }; + } + { + name = "ts_pnp___ts_pnp_1.1.6.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.4.tgz"; - sha1 = "ae27126960ebaefb874c6d7fa4729729ab200d90"; + name = "ts_pnp___ts_pnp_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz"; + sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a"; }; } { - name = "tslib___tslib_1.10.0.tgz"; + name = "tslib___tslib_1.11.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz"; - sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; + name = "tslib___tslib_1.11.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz"; + sha1 = "f1f3528301621a53220d58373ae510ff747a66bc"; }; } { @@ -11034,11 +11322,11 @@ }; } { - name = "type_fest___type_fest_0.5.2.tgz"; + name = "type_fest___type_fest_0.8.1.tgz"; path = fetchurl { - name = "type_fest___type_fest_0.5.2.tgz"; - url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.5.2.tgz"; - sha1 = "d6ef42a0356c6cd45f49485c3b6281fc148e48a2"; + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; }; } { @@ -11058,6 +11346,14 @@ }; } { + name = "type___type_2.0.0.tgz"; + path = fetchurl { + name = "type___type_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; + sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; + }; + } + { name = "typed_styles___typed_styles_0.0.7.tgz"; path = fetchurl { name = "typed_styles___typed_styles_0.0.7.tgz"; @@ -11074,35 +11370,11 @@ }; } { - name = "typescript___typescript_3.7.2.tgz"; - path = fetchurl { - name = "typescript___typescript_3.7.2.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.7.2.tgz"; - sha1 = "27e489b95fa5909445e9fef5ee48d81697ad18fb"; - }; - } - { - name = "ua_parser_js___ua_parser_js_0.7.20.tgz"; - path = fetchurl { - name = "ua_parser_js___ua_parser_js_0.7.20.tgz"; - url = "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.20.tgz"; - sha1 = "7527178b82f6a62a0f243d1f94fd30e3e3c21098"; - }; - } - { - name = "uglify_js___uglify_js_3.4.10.tgz"; - path = fetchurl { - name = "uglify_js___uglify_js_3.4.10.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz"; - sha1 = "9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"; - }; - } - { - name = "uglify_js___uglify_js_3.6.2.tgz"; + name = "typescript___typescript_3.8.2.tgz"; path = fetchurl { - name = "uglify_js___uglify_js_3.6.2.tgz"; - url = "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.2.tgz"; - sha1 = "fd8048c86d990ddd29fe99d3300e0cb329103f4d"; + name = "typescript___typescript_3.8.2.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.2.tgz"; + sha1 = "91d6868aaead7da74f493c553aeff76c0c0b1d5a"; }; } { @@ -11218,14 +11490,6 @@ }; } { - name = "upper_case___upper_case_1.1.3.tgz"; - path = fetchurl { - name = "upper_case___upper_case_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; - sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; - }; - } - { name = "uri_js___uri_js_4.2.2.tgz"; path = fetchurl { name = "uri_js___uri_js_4.2.2.tgz"; @@ -11242,11 +11506,11 @@ }; } { - name = "url_loader___url_loader_2.1.0.tgz"; + name = "url_loader___url_loader_2.3.0.tgz"; path = fetchurl { - name = "url_loader___url_loader_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.1.0.tgz"; - sha1 = "bcc1ecabbd197e913eca23f5e0378e24b4412961"; + name = "url_loader___url_loader_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/url-loader/-/url-loader-2.3.0.tgz"; + sha1 = "e0e2ef658f003efb8ca41b0f3ffbf76bab88658b"; }; } { @@ -11290,6 +11554,14 @@ }; } { + name = "util.promisify___util.promisify_1.0.1.tgz"; + path = fetchurl { + name = "util.promisify___util.promisify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz"; + sha1 = "6baf7774b80eeb0f7520d8b81d07982a59abbaee"; + }; + } + { name = "util___util_0.10.3.tgz"; path = fetchurl { name = "util___util_0.10.3.tgz"; @@ -11322,11 +11594,11 @@ }; } { - name = "uuid___uuid_3.3.3.tgz"; + name = "uuid___uuid_3.4.0.tgz"; path = fetchurl { - name = "uuid___uuid_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz"; - sha1 = "4568f0216e78760ee1dbf3a4d2cf53e224112866"; + name = "uuid___uuid_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz"; + sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; }; } { @@ -11354,11 +11626,11 @@ }; } { - name = "vendors___vendors_1.0.3.tgz"; + name = "vendors___vendors_1.0.4.tgz"; path = fetchurl { - name = "vendors___vendors_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.3.tgz"; - sha1 = "a6467781abd366217c050f8202e7e50cc9eef8c0"; + name = "vendors___vendors_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz"; + sha1 = "e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"; }; } { @@ -11370,11 +11642,11 @@ }; } { - name = "vm_browserify___vm_browserify_1.1.0.tgz"; + name = "vm_browserify___vm_browserify_1.1.2.tgz"; path = fetchurl { - name = "vm_browserify___vm_browserify_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.0.tgz"; - sha1 = "bd76d6a23323e2ca8ffa12028dc04559c75f9019"; + name = "vm_browserify___vm_browserify_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz"; + sha1 = "78641c488b8e6ca91a75f511e7a3b32a86e5dda0"; }; } { @@ -11402,14 +11674,6 @@ }; } { - name = "warning___warning_3.0.0.tgz"; - path = fetchurl { - name = "warning___warning_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/warning/-/warning-3.0.0.tgz"; - sha1 = "32e5377cb572de4ab04753bdf8821c01ed605b7c"; - }; - } - { name = "warning___warning_4.0.3.tgz"; path = fetchurl { name = "warning___warning_4.0.3.tgz"; @@ -11450,11 +11714,11 @@ }; } { - name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.10.2.tgz"; path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz"; - sha1 = "1b45ce3ecfc55b6ebe5e36dab2777c02bc508c4e"; + name = "webpack_dev_server___webpack_dev_server_3.10.2.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.2.tgz"; + sha1 = "3403287d674c7407aab6d9b3f72259ecd0aa0874"; }; } { @@ -11466,11 +11730,11 @@ }; } { - name = "webpack_manifest_plugin___webpack_manifest_plugin_2.1.1.tgz"; + name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz"; path = fetchurl { - name = "webpack_manifest_plugin___webpack_manifest_plugin_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.1.1.tgz"; - sha1 = "6b3e280327815b83152c79f42d0ca13b665773c4"; + name = "webpack_manifest_plugin___webpack_manifest_plugin_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-manifest-plugin/-/webpack-manifest-plugin-2.2.0.tgz"; + sha1 = "19ca69b435b0baec7e29fbe90fb4015de2de4f16"; }; } { @@ -11482,11 +11746,11 @@ }; } { - name = "webpack___webpack_4.41.0.tgz"; + name = "webpack___webpack_4.41.5.tgz"; path = fetchurl { - name = "webpack___webpack_4.41.0.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.0.tgz"; - sha1 = "db6a254bde671769f7c14e90a1a55e73602fc70b"; + name = "webpack___webpack_4.41.5.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz"; + sha1 = "3210f1886bce5310e62bb97204d18c263341b77c"; }; } { @@ -11546,11 +11810,11 @@ }; } { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; + name = "whatwg_url___whatwg_url_7.1.0.tgz"; path = fetchurl { - name = "whatwg_url___whatwg_url_7.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz"; - sha1 = "fde926fa54a599f3adf82dff25a9f7be02dc6edd"; + name = "whatwg_url___whatwg_url_7.1.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.1.0.tgz"; + sha1 = "c2c492f1eca612988efd3d2266be1b9fc6170d06"; }; } { @@ -11570,27 +11834,27 @@ }; } { - name = "wide_align___wide_align_1.1.3.tgz"; + name = "which___which_2.0.2.tgz"; path = fetchurl { - name = "wide_align___wide_align_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; - sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; }; } { - name = "wordwrap___wordwrap_0.0.3.tgz"; + name = "wide_align___wide_align_1.1.3.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_0.0.3.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + name = "wide_align___wide_align_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz"; + sha1 = "ae074e6bdc0c14a431e804e624549c633b000457"; }; } { - name = "wordwrap___wordwrap_1.0.0.tgz"; + name = "word_wrap___word_wrap_1.2.3.tgz"; path = fetchurl { - name = "wordwrap___wordwrap_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; }; } { @@ -11794,11 +12058,11 @@ }; } { - name = "ws___ws_7.1.2.tgz"; + name = "ws___ws_7.2.1.tgz"; path = fetchurl { - name = "ws___ws_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.1.2.tgz"; - sha1 = "c672d1629de8bb27a9699eb599be47aeeedd8f73"; + name = "ws___ws_7.2.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.2.1.tgz"; + sha1 = "03ed52423cd744084b2cf42ed197c8b65a936b8e"; }; } { @@ -11818,14 +12082,6 @@ }; } { - name = "xregexp___xregexp_4.0.0.tgz"; - path = fetchurl { - name = "xregexp___xregexp_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz"; - sha1 = "e698189de49dd2a18cc5687b05e17c8e43943020"; - }; - } - { name = "xtend___xtend_4.0.2.tgz"; path = fetchurl { name = "xtend___xtend_4.0.2.tgz"; @@ -11850,11 +12106,27 @@ }; } { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } + { + name = "yaml___yaml_1.7.2.tgz"; + path = fetchurl { + name = "yaml___yaml_1.7.2.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz"; + sha1 = "f26aabf738590ab61efaca502358e48dc9f348b2"; + }; + } + { + name = "yargs_parser___yargs_parser_11.1.1.tgz"; path = fetchurl { - name = "yargs_parser___yargs_parser_10.1.0.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz"; - sha1 = "7202265b89f7e9e9f2e5765e0fe735a905edbaa8"; + name = "yargs_parser___yargs_parser_11.1.1.tgz"; + url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz"; + sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; }; } { @@ -11866,11 +12138,11 @@ }; } { - name = "yargs___yargs_12.0.2.tgz"; + name = "yargs___yargs_12.0.5.tgz"; path = fetchurl { - name = "yargs___yargs_12.0.2.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz"; - sha1 = "fe58234369392af33ecbef53819171eff0f5aadc"; + name = "yargs___yargs_12.0.5.tgz"; + url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz"; + sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; }; } { diff --git a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix index b4626b9e8f8..240dc626331 100644 --- a/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "wireguard-exporter"; - version = "3.2.4"; + version = "3.3.0"; src = fetchFromGitHub { owner = "MindFlavor"; repo = "prometheus_wireguard_exporter"; rev = version; - sha256 = "15his6mv3vmzfg972fb8m01h2m3jxmaqz3zw2krfr136mvg2rvjw"; + sha256 = "1c6zadqnn4b83yglcdn1hw54jj1c4makbdy6fli3cfb7sha1ynml"; }; - cargoSha256 = "0ajkpshjv0im6falgjrsc2jdbvm2rhibl4v8rcmb2fg3kx7xc8vf"; + cargoSha256 = "148982ypkxhab2kmijk9zwwi5l6nk4rcdwaz0r1j9fni47q49f35"; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock index ed780f6ce4b..51e1bcc7948 100644 --- a/pkgs/servers/monitoring/riemann-dash/Gemfile.lock +++ b/pkgs/servers/monitoring/riemann-dash/Gemfile.lock @@ -35,4 +35,4 @@ DEPENDENCIES riemann-dash (= 0.2.14) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/servers/monitoring/riemann-dash/default.nix b/pkgs/servers/monitoring/riemann-dash/default.nix index 943fa0af63f..f6c11703fce 100644 --- a/pkgs/servers/monitoring/riemann-dash/default.nix +++ b/pkgs/servers/monitoring/riemann-dash/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A javascript, websockets-powered dashboard for Riemann"; - homepage = https://github.com/riemann/riemann-dash; + homepage = "https://github.com/riemann/riemann-dash"; license = licenses.mit; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 295a7592880..644af1492cd 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://riemann.io/; + homepage = "http://riemann.io/"; description = "A network monitoring system"; license = licenses.epl10; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index adba0277bf7..f109b08d1a6 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: let generic = { subPackages, pname, postInstall ? "" }: @@ -20,8 +20,6 @@ let modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; in '' @@ -30,11 +28,11 @@ let -X ${versionPkg}.BuildSHA=${shortRev} ''; - meta = with stdenv.lib; { + meta = { homepage = "https://sensu.io"; description = "Open source monitoring tool for ephemeral infrastructure & distributed applications"; - license = licenses.mit; - maintainers = with maintainers; [ thefloweringash ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thefloweringash ]; }; }; in diff --git a/pkgs/servers/monitoring/sensu/Gemfile.lock b/pkgs/servers/monitoring/sensu/Gemfile.lock index 2d0b31e999f..9b36bb090f6 100644 --- a/pkgs/servers/monitoring/sensu/Gemfile.lock +++ b/pkgs/servers/monitoring/sensu/Gemfile.lock @@ -159,4 +159,4 @@ DEPENDENCIES sensu-plugins-systemd BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/servers/monitoring/sensu/default.nix b/pkgs/servers/monitoring/sensu/default.nix index 82c52b18d40..42f6e395c2d 100644 --- a/pkgs/servers/monitoring/sensu/default.nix +++ b/pkgs/servers/monitoring/sensu/default.nix @@ -46,7 +46,7 @@ bundlerApp { meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; - homepage = https://sensuapp.org/; + homepage = "https://sensuapp.org/"; license = licenses.mit; maintainers = with maintainers; [ theuni peterhoeg manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index 5312ecb0692..e926d797f9f 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An alerting dashboard for Graphite"; - homepage = https://github.com/scobal/seyren; + homepage = "https://github.com/scobal/seyren"; license = licenses.asl20; maintainers = [ maintainers.offline ]; platforms = platforms.all; diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index c6189e12471..4785d78ab18 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "telegraf"; - version = "1.13.4"; + version = "1.14.0"; goPackagePath = "github.com/influxdata/telegraf"; @@ -13,22 +13,22 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "influxdata"; repo = "telegraf"; - rev = version; - sha256 = "031hq9dg87cqj4am7qkbgfan2s6bqc2hf48h0gnrv78hbz8icxa1"; + rev = "v${version}"; + sha256 = "062j4sm7im4iv5i9afr771724srvwwcqbhkyznlzncaz06mk1sn7"; }; + modSha256 = "1q7il1x1pfyz15z23cs0kk7zyacn6b3y28b1q52bqi30l1x8bdbp"; + buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} '' ]; passthru.tests = { inherit (nixosTests) telegraf; }; - goDeps = ./deps.nix; - meta = with lib; { description = "The plugin-driven server agent for collecting & reporting metrics."; license = licenses.mit; - homepage = https://www.influxdata.com/time-series-platform/telegraf/; + homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; maintainers = with maintainers; [ mic92 roblabla foxit64 ]; }; } diff --git a/pkgs/servers/monitoring/telegraf/deps.nix b/pkgs/servers/monitoring/telegraf/deps.nix deleted file mode 100644 index 4292d9aa791..00000000000 --- a/pkgs/servers/monitoring/telegraf/deps.nix +++ /dev/null @@ -1,1344 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "c728a003b238b26cef9ab6753a5dc424b331c3ad"; - sha256 = "010bxkx0gkbsn7xi6632xp2nq0577zx7imw16irxv8hzvq49q38i"; - }; - } - { - goPackagePath = "code.cloudfoundry.org/clock"; - fetch = { - type = "git"; - url = "https://github.com/cloudfoundry/clock"; - rev = "02e53af36e6c978af692887ed449b74026d76fec"; - sha256 = "0bpfxf21flb9lqwjr95skaw58zajb54s62g3h68lcxxcp4gfdba4"; - }; - } - { - goPackagePath = "collectd.org"; - fetch = { - type = "git"; - url = "https://github.com/collectd/go-collectd"; - rev = "2ce144541b8903101fb8f1483cc0497a68798122"; - sha256 = "0rr9rnc777jk27a7yxhdb7vgkj493158a8k6q44x51s30dkp78x3"; - }; - } - { - goPackagePath = "contrib.go.opencensus.io/exporter/stackdriver"; - fetch = { - type = "git"; - url = "https://github.com/census-ecosystem/opencensus-go-exporter-stackdriver"; - rev = "2b93072101d466aa4120b3c23c2e1b08af01541c"; - sha256 = "0qhxpfmzn5jsh1qrq7w2zkg87xvalqam2ciq65qfq38mfkssda3v"; - }; - } - { - goPackagePath = "github.com/Azure/azure-pipeline-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-pipeline-go"; - rev = "b8e3409182fd52e74f7d7bdfbff5833591b3b655"; - sha256 = "0p2m31l893377na7dmsjfpjd5swqnb7p0vhsng3vyn237i8f1336"; - }; - } - { - goPackagePath = "github.com/Azure/azure-storage-queue-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-storage-queue-go"; - rev = "6ed74e755687d1a74f08d9aab5a9e3f2fbe7d162"; - sha256 = "0zw9hcbgsbzy2k3ipbnv95kfp7f24qbr3hgw89pnsf29hld27hba"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "3492b2aff5036c67228ab3c7dba3577c871db200"; - sha256 = "0ih4vjcfsgd575971cdkmpbpk0s1j562ryl5qrh9f4ddn2l85x74"; - }; - } - { - goPackagePath = "github.com/Microsoft/ApplicationInsights-Go"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/ApplicationInsights-Go"; - rev = "d2df5d440eda5372f24fcac03839a64d6cb5f7e5"; - sha256 = "0lr7cq5ghphm94y13injczg2fzxljql0xlw5sj61hfba50lvmbs5"; - }; - } - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "a6d595ae73cf27a1b8fc32930668708f45ce1c85"; - sha256 = "1plx73f1hm6czcdwcw2sl9xqyq3dnsrd92m2y2yzhcy5y369dijj"; - }; - } - { - goPackagePath = "github.com/Shopify/sarama"; - fetch = { - type = "git"; - url = "https://github.com/Shopify/sarama"; - rev = "675b0b1ff204c259877004140a540d6adf38db17"; - sha256 = "0h63maidp2yzjvrk4pd9b51frdw8yym91k6s1vcqzmcx4956gq72"; - }; - } - { - goPackagePath = "github.com/StackExchange/wmi"; - fetch = { - type = "git"; - url = "https://github.com/StackExchange/wmi"; - rev = "5d049714c4a64225c3c79a7cf7d02f7fb5b96338"; - sha256 = "1slw6v1fl8i0hz4db9lph55pbhnrxhqyndq6vm27dgvpj22k29fk"; - }; - } - { - goPackagePath = "github.com/aerospike/aerospike-client-go"; - fetch = { - type = "git"; - url = "https://github.com/aerospike/aerospike-client-go"; - rev = "1dc8cf203d24cd454e71ce40ab4cd0bf3112df90"; - sha256 = "0mzw88fdggmrab6yavq702lq2x2k785gy6ag5ryl5n5k6bqnlp13"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/amir/raidman"; - fetch = { - type = "git"; - url = "https://github.com/amir/raidman"; - rev = "1ccc43bfb9c93cb401a4025e49c64ba71e5e668b"; - sha256 = "074ckbyslrwn23q4x01hn3j7c3xngagn36lbli2g51n9j3x14jxr"; - }; - } - { - goPackagePath = "github.com/apache/thrift"; - fetch = { - type = "git"; - url = "https://github.com/apache/thrift"; - rev = "f2867c24984aa53edec54a138c03db934221bdea"; - sha256 = "1k72gjsxa2xzwn5rikc5pm5n025bkr3hl2nhv0x65i7rp3bda2qb"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "5312c8dac9067d339c4e68d7e0dd5507b2f01849"; - sha256 = "1ddm89qbnmnr6dh040m7093mn2zk15ncvdnw9w1ifj75sn5q69pn"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/caio/go-tdigest"; - fetch = { - type = "git"; - url = "https://github.com/caio/go-tdigest"; - rev = "f3c8d94f65d3096ac96eda54ffcd10c0fe1477f1"; - sha256 = "0w3imv58rhb34x63w8m0k18yr6bnc2bf2rpz23dh82yvdg57nl6r"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "2ea60e5f094469f9e65adb9cd103795b73ae743e"; - sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; - }; - } - { - goPackagePath = "github.com/cisco-ie/nx-telemetry-proto"; - fetch = { - type = "git"; - url = "https://github.com/cisco-ie/nx-telemetry-proto"; - rev = "82441e232cf6af9be0f808bf0c6421ee8519880e"; - sha256 = "15l4a71hmw6w9pkq2dh1lpjb7sjq0v57qn8wkdhsyls3f2bczw9p"; - }; - } - { - goPackagePath = "github.com/couchbase/go-couchbase"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/go-couchbase"; - rev = "16db1f1fe037412f12738fa4d8448c549c4edd77"; - sha256 = "0ivlzin23a3s9jj8764mr9rwy3hw5bd97gfv0zc2vzdd3psi28g2"; - }; - } - { - goPackagePath = "github.com/couchbase/gomemcached"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/gomemcached"; - rev = "0da75df145308b9a4e6704d762ca9d9b77752efc"; - sha256 = "0sscy1n3vpi1gcpzw2vh8a7mnvg8nlxc37b6580k6h7xbpx1mq9z"; - }; - } - { - goPackagePath = "github.com/couchbase/goutils"; - fetch = { - type = "git"; - url = "https://github.com/couchbase/goutils"; - rev = "e865a1461c8ac0032bd37e2d4dab3289faea3873"; - sha256 = "1306m4gbm555akni5rwwgafkq7j1ps8k40lfrvib5jv5pgdygrcd"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; - }; - } - { - goPackagePath = "github.com/denisenkom/go-mssqldb"; - fetch = { - type = "git"; - url = "https://github.com/denisenkom/go-mssqldb"; - rev = "2be1aa521ff4499e74b7861a2779ba1e96e3e2c5"; - sha256 = "0c502ycxg7sdnpvwky5wm2xbxw03lspsjxbmvpabp78dlf3gnmhb"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; - sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; - }; - } - { - goPackagePath = "github.com/dimchansky/utfbom"; - fetch = { - type = "git"; - url = "https://github.com/dimchansky/utfbom"; - rev = "d2133a1ce379ef6fa992b0514a77146c60db9d1c"; - sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"; - sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "ed7b6428c133e7c59404251a09b7d6b02fa83cc2"; - sha256 = "0da19ndf29jsy3w0ddw05hnw8m5hmrr9p70g02z3icjydl387mrs"; - }; - } - { - goPackagePath = "github.com/docker/go-connections"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-connections"; - rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d"; - sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0"; - }; - } - { - goPackagePath = "github.com/docker/go-units"; - fetch = { - type = "git"; - url = "https://github.com/docker/go-units"; - rev = "47565b4f722fb6ceae66b95f853feed578a4a51c"; - sha256 = "0npxsb3pp89slwf4a73fxm20hykad8xggij6i6hcd5jy19bjrd93"; - }; - } - { - goPackagePath = "github.com/docker/libnetwork"; - fetch = { - type = "git"; - url = "https://github.com/docker/libnetwork"; - rev = "d7b61745d16675c9f548b19f06fda80d422a74f0"; - sha256 = "1mbdhgy14gl8263cynfv210ag6gm6i6yply9i022ib3y2s5ffxhd"; - }; - } - { - goPackagePath = "github.com/eapache/go-resiliency"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-resiliency"; - rev = "ea41b0fad31007accc7f806884dcdf3da98b79ce"; - sha256 = "1zmgw3c4w5r6m2r340n4jc5l5ll3m3nbszqrmrgbqc2xixxyk2gx"; - }; - } - { - goPackagePath = "github.com/eapache/go-xerial-snappy"; - fetch = { - type = "git"; - url = "https://github.com/eapache/go-xerial-snappy"; - rev = "040cc1a32f578808623071247fdbd5cc43f37f5f"; - sha256 = "1y3gs5ghf8wza8k85hcy98g9ygcfb6k3zhiac4nnyrahwckf5whz"; - }; - } - { - goPackagePath = "github.com/eapache/queue"; - fetch = { - type = "git"; - url = "https://github.com/eapache/queue"; - rev = "44cc805cf13205b55f69e14bcb69867d1ae92f98"; - sha256 = "07dp54n94gn3gsvdcki56yqh7py7wqqigxbamhxwgbr05n61fqyg"; - }; - } - { - goPackagePath = "github.com/eclipse/paho.mqtt.golang"; - fetch = { - type = "git"; - url = "https://github.com/eclipse/paho.mqtt.golang"; - rev = "adca289fdcf8c883800aafa545bc263452290bae"; - sha256 = "1f81ia8pkfz2084bla4kirrh7yrfg8dy11gsi84m75j25nf762zn"; - }; - } - { - goPackagePath = "github.com/ericchiang/k8s"; - fetch = { - type = "git"; - url = "https://github.com/ericchiang/k8s"; - rev = "d1bbc0cffaf9849ddcae7b9efffae33e2dd52e9a"; - sha256 = "1qv7iggr4144g4bwqm1slnnjp6zs2dh370p4yfqp7id3sxk3893n"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "25d852aebe32c875e9c044af3eef9c7dc6bc777f"; - sha256 = "1w9yq0bxzygc4qwkwwiy7k1k1yviaspcqqv18255k2xkjv5ipccz"; - }; - } - { - goPackagePath = "github.com/glinton/ping"; - fetch = { - type = "git"; - url = "https://github.com/glinton/ping"; - rev = "d3c0ecf4df108179eccdff2176f4ff569c3aab37"; - sha256 = "172h22kv78ickxdhvl0lhaffylhg11ab4wb4nn15vcc164d6lwil"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "07c9b44f60d7ffdfb7d8efe1ad539965737836dc"; - sha256 = "06smxc112xmixz78nyvk3b2hmc7wasf2sl5vxj1xz62kqcq9lzm9"; - }; - } - { - goPackagePath = "github.com/go-ole/go-ole"; - fetch = { - type = "git"; - url = "https://github.com/go-ole/go-ole"; - rev = "a41e3c4b706f6ae8dfbff342b06e40fa4d2d0506"; - sha256 = "114h8x7dh4jp7w7k678fm98lr9icavsf74v6jfipyq7q35bsfr1p"; - }; - } - { - goPackagePath = "github.com/go-redis/redis"; - fetch = { - type = "git"; - url = "https://github.com/go-redis/redis"; - rev = "83fb42932f6145ce52df09860384a4653d2d332a"; - sha256 = "0zrp1w6jcbnhk8q5fl3fm11j9s4yjyks2hzi6kwjhngzhjmdn1sh"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "72cd26f257d44c1114970e19afddcd812016007e"; - sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "5ccd90ef52e1e632236f7326478d4faa74f99438"; - sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; - }; - } - { - goPackagePath = "github.com/gofrs/uuid"; - fetch = { - type = "git"; - url = "https://github.com/gofrs/uuid"; - rev = "3a54a6416087bae7aa0ac32dd79fe1bf87bc99e4"; - sha256 = "0b0hnr7d8zxwk0djifffp8y8x71vv1i03r8y1wpzp79v54jz28m3"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "636bf0302bc95575d69441b25a2603156ffdddf1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "9fa652df1129bef0e734c9cf9bf6dbae9ef3b9fa"; - sha256 = "0wxsjz98v2df4cy1p297cyphdaja0bgg4d2w4kbhsaky022vn7g2"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "b4deda0973fb4c70b50d226b1af49f3da59f5265"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "2e65f85255dbc3072edf28d6b5b8efc472979f5a"; - sha256 = "05w6mpc4qcy0pv8a2bzng8nf4s5rf5phfang4jwy9rgf808q0nxf"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "3af367b6b30c263d47e8895973edcca9a49cf029"; - sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "7462feb2032c2da9e3b85e9b04e6853a6e9e14ca"; - sha256 = "1sk43llk5fgb00l99rmrmfrk81da2gsvjl1m6r1k1chpjaghxj11"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "44c6ddd0a2342c386950e880b658017258da92fc"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "064e2069ce9c359c118179501254f67d7d37ba24"; - sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "317e0006254c44a0ac427cc52a0e083ff0b9622f"; - sha256 = "0h92x579vbrv2fka8q2ddy1kq6a63qbqa8zc09ygl6skzn9gw1dh"; - }; - } - { - goPackagePath = "github.com/gorilla/context"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; - }; - } - { - goPackagePath = "github.com/hailocab/go-hostpool"; - fetch = { - type = "git"; - url = "https://github.com/hailocab/go-hostpool"; - rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"; - sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; - }; - } - { - goPackagePath = "github.com/harlow/kinesis-consumer"; - fetch = { - type = "git"; - url = "https://github.com/harlow/kinesis-consumer"; - rev = "2f58b136fee036f5de256b81a8461cc724fdf9df"; - sha256 = "1m8ns5gipxxs2fkln494gqy1axhz8393cjan5wkdxc6xfchd0wa5"; - }; - } - { - goPackagePath = "github.com/hashicorp/consul"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/consul"; - rev = "39f93f011e591c842acc8053a7f5972aa6e592fd"; - sha256 = "0l255iy37m3mycdzk90629n8zjvi3cj8k2sxpm40h2r539ayawly"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "d5fe4b57a186c716b0e00b8c301cbd9b4182694d"; - sha256 = "1m20y90syky4xr81sm3980jpil81nnpzmi6kv0vjr6p584gl1hn8"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "6bb64b370b90e7ef1fa532be9e591a81c3493e00"; - sha256 = "1a81fcm1i0ji2iva0dcimiichgwpbcb7lx0vyaks87zj5wf04qy9"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "4f571afc59f3043a65f8fe6bf46d887b10a01d43"; - sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; - }; - } - { - goPackagePath = "github.com/hashicorp/serf"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/serf"; - rev = "d6574a5bb1226678d7010325fb6c985db20ee458"; - sha256 = "1arakjvhyasrk52vhxas2ghlrby3i3wj59r7sjrkbpln2cdbqnlx"; - }; - } - { - goPackagePath = "github.com/influxdata/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/go-syslog"; - rev = "0cd00a9f0a5e5607d5ef9a294c260f77a74e3b5a"; - sha256 = "0a8xbghb1s59viiqs8s8vd4ydqrf7z7nh020si4aqwmsm9gchkzz"; - }; - } - { - goPackagePath = "github.com/influxdata/tail"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/tail"; - rev = "c43482518d410361b6c383d7aebce33d0471d7bc"; - sha256 = "0kf155nz9wvwawsbgaa76q4r975l7945nlvnh4ig60xm0jv8580b"; - }; - } - { - goPackagePath = "github.com/influxdata/toml"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/toml"; - rev = "270119a8ce653b297f12189c9099ef1409979f2b"; - sha256 = "1dprq2nx1kh78fqr6awir27ankjkbsjw2rza07ri5m2pxd3kxhsv"; - }; - } - { - goPackagePath = "github.com/influxdata/wlog"; - fetch = { - type = "git"; - url = "https://github.com/influxdata/wlog"; - rev = "7c63b0a71ef8300adc255344d275e10e5c3a71ec"; - sha256 = "04kw4kivxvr3kkmghj3427b1xyhzbhnfr971qfn3lv2vvhs8kpfl"; - }; - } - { - goPackagePath = "github.com/jackc/pgx"; - fetch = { - type = "git"; - url = "https://github.com/jackc/pgx"; - rev = "c73e7d75061bb42b0282945710f344cfe1113d10"; - sha256 = "1am1iggch89mn4a99bxnawjhc5yrgd8fjlmzq0b9l9qy5w1gzr1f"; - }; - } - { - goPackagePath = "github.com/jcmturner/gofork"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/gofork"; - rev = "dc7c13fece037a4a36e2b3c69db4991498d30692"; - sha256 = "0xzsnjqv3d59w9pgqzf6550wdwaqnac7zcdgqfd25w65yhcffzhr"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e84"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/kardianos/service"; - fetch = { - type = "git"; - url = "https://github.com/kardianos/service"; - rev = "56787a3ea05e9b262708192e7ce3b500aba73561"; - sha256 = "0srikxxl78grkn85w1chxpxi0bc9zhsfl4794k1qsgykgipkz078"; - }; - } - { - goPackagePath = "github.com/karrick/godirwalk"; - fetch = { - type = "git"; - url = "https://github.com/karrick/godirwalk"; - rev = "532e518bccc921708e14b29e16503b1bf5c898cc"; - sha256 = "0d1w72w99aqxzlf4w0s9s0ji4w01xfry207q1pm4wlllk7m2mh1c"; - }; - } - { - goPackagePath = "github.com/kballard/go-shellquote"; - fetch = { - type = "git"; - url = "https://github.com/kballard/go-shellquote"; - rev = "95032a82bc518f77982ea72343cc1ade730072f0"; - sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; - }; - } - { - goPackagePath = "github.com/klauspost/compress"; - fetch = { - type = "git"; - url = "https://github.com/klauspost/compress"; - rev = "4e96aec082898e4dad17d8aca1a7e2d01362ff6c"; - sha256 = "12bxybwcgkfi1a32d60y0v1s7s58q1xgavrf428lnzljsm1cak2n"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/kubernetes/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "d41becfba9ee9bf8e55cec1dd3934cd7cfc04b99"; - sha256 = "0d7akj020fahqgmicig39vfbs1nvkxachwbyw8wk2w90pfsicff1"; - }; - } - { - goPackagePath = "github.com/leodido/ragel-machinery"; - fetch = { - type = "git"; - url = "https://github.com/leodido/ragel-machinery"; - rev = "299bdde78165d4ca4bc7d064d8d6a4f39ac6de8c"; - sha256 = "0ir7gf9a9p99pgsz3b5qijhkz41xqk4axlbx0cl4w2rwv2spvyw5"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "efc7eb8984d6655c26b5c9d2e65c024e5767c37c"; - sha256 = "02wzdl0hxkqvim1ymnp7s0d0ysw0ba2mdsrkhi7k93zs2wf1wswd"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mdlayher/apcupsd"; - fetch = { - type = "git"; - url = "https://github.com/mdlayher/apcupsd"; - rev = "eb3dd99a75fe58389e357b732691320dcf706b5f"; - sha256 = "0s1m6l4pnazqiymb8y89ajbxfl2cn0ahvhws10nvxvc4jjivlbbq"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "f4db2ca6edc3af0ee51bf332099cc480bcf3ef9d"; - sha256 = "1mr9ia1r2ai9gwrljycj6i64r1i612nxp0n8fk1ajkkf7dwnjk33"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "af06845cf3004701891bf4fdb884bfe4920b3727"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "f15292f7a699fcc1a38a80977f80a046874ba8ac"; - sha256 = "0zm3nhdvmj3f8q0vg2sjfw1sm3pwsw0ggz501awz95w99664a8al"; - }; - } - { - goPackagePath = "github.com/multiplay/go-ts3"; - fetch = { - type = "git"; - url = "https://github.com/multiplay/go-ts3"; - rev = "d0d44555495c8776880a17e439399e715a4ef319"; - sha256 = "04n2rkbbgs09m47w24i9x7ah2a3mdwq378ayhsizyzjv3a0xhd9b"; - }; - } - { - goPackagePath = "github.com/naoina/go-stringutil"; - fetch = { - type = "git"; - url = "https://github.com/naoina/go-stringutil"; - rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; - sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; - }; - } - { - goPackagePath = "github.com/nats-io/gnatsd"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/gnatsd"; - rev = "6608e9ac3be979dcb0614b772cc86a87b71acaa3"; - sha256 = "186xywzdrmvlhlh9wgjs71rqvgab8vinlr3gkzkknny82nv7hcjw"; - }; - } - { - goPackagePath = "github.com/nats-io/go-nats"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/go-nats"; - rev = "062418ea1c2181f52dc0f954f6204370519a868b"; - sha256 = "1sccsfvfhwaqpkr4j3c1sa1jkjwqhkhr35br3iaw2qzlidhdypml"; - }; - } - { - goPackagePath = "github.com/nats-io/nuid"; - fetch = { - type = "git"; - url = "https://github.com/nats-io/nuid"; - rev = "289cccf02c178dc782430d534e3c1f5b72af807f"; - sha256 = "1dpk8qzl43gfdaj2nbw52a0xyrmpmq26a9v9dfl27vkijssb20p4"; - }; - } - { - goPackagePath = "github.com/nsqio/go-nsq"; - fetch = { - type = "git"; - url = "https://github.com/nsqio/go-nsq"; - rev = "eee57a3ac4174c55924125bb15eeeda8cffb6e6f"; - sha256 = "194wdmgsc0qhdjx95ka7blly58r9bj2vc0bgls7jawzszfpsbx8x"; - }; - } - { - goPackagePath = "github.com/openconfig/gnmi"; - fetch = { - type = "git"; - url = "https://github.com/openconfig/gnmi"; - rev = "33a1865c302903e7a2e06f35960e6bc31e84b9f6"; - sha256 = "0yzsda16k9kwhq4kvsixsg6cb67vyn177x0h5n1s9zrrdxbvm05c"; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - }; - } - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "d60099175f88c47cd379c4738d158884749ed235"; - sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; - }; - } - { - goPackagePath = "github.com/opentracing-contrib/go-observer"; - fetch = { - type = "git"; - url = "https://github.com/opentracing-contrib/go-observer"; - rev = "a52f2342449246d5bcc273e65cbdcfa5f7d6c63c"; - sha256 = "1q7z458m2vh3bzml4x9vm2paffqn1jcgiydbisl0zg2asfniq7k3"; - }; - } - { - goPackagePath = "github.com/opentracing/opentracing-go"; - fetch = { - type = "git"; - url = "https://github.com/opentracing/opentracing-go"; - rev = "1949ddbfd147afd4d964a9f00b24eb291e0e7c38"; - sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9"; - }; - } - { - goPackagePath = "github.com/openzipkin/zipkin-go-opentracing"; - fetch = { - type = "git"; - url = "https://github.com/openzipkin/zipkin-go-opentracing"; - rev = "26cf9707480e6b90e5eff22cf0bbf05319154232"; - sha256 = "1yiyqh0k72985hxwc7hh639cyyg7igkx9bg9923x4knq635m2f32"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "1958fd8fff7f115e79725b1288e0b878b3e06b00"; - sha256 = "1c4xi40bvcp91a3lw9nw1hylvdmb51hviwrqv5f6zj1sswkv24ps"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "505eaef017263e299324067d40ca2c48f6a2cf50"; - sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "7600349dcfe1abd18d72d3a1770870d9800a7801"; - sha256 = "0lsp94dqpj35dny4m4x15kg4wgwawlm3in7cnpajkkacgyxagk5f"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "ae68e2d4c00fed4943b5f6698d504a5fe083da8a"; - sha256 = "04sar4k99w8nvq3kwx6chz0mbp4s6xfjfxww7aqfd950xgs2jv5f"; - }; - } - { - goPackagePath = "github.com/rcrowley/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/rcrowley/go-metrics"; - rev = "e2704e165165ec55d062f5919b4b29494e9fa790"; - sha256 = "1yvvwqyfdnnjgnc3j4y0g1b897ad0wwlgn6x4dx83s20ax2lyz2q"; - }; - } - { - goPackagePath = "github.com/safchain/ethtool"; - fetch = { - type = "git"; - url = "https://github.com/safchain/ethtool"; - rev = "f459e2d136648a780248aba0fcac44740fe3b500"; - sha256 = "0zhxq588vkicxy4cbjjd20l4n1pzpi7q734595y6zz4zljsp24cs"; - }; - } - { - goPackagePath = "github.com/samuel/go-zookeeper"; - fetch = { - type = "git"; - url = "https://github.com/samuel/go-zookeeper"; - rev = "c4fab1ac1bec58281ad0667dc3f0907a9476ac47"; - sha256 = "0i7mxg9hz8ymglq2xcwwswy1pvcr53qd57lzcdlf3d5bjki73a4w"; - }; - } - { - goPackagePath = "github.com/satori/go.uuid"; - fetch = { - type = "git"; - url = "https://github.com/satori/go.uuid"; - rev = "b2ce2384e17bbe0c6d34077efa39dbab3e09123b"; - sha256 = "1yz4cx02377ijlf8mnn84j1dcmlwh8ncx7y3kw1zg2qw0z4x119c"; - }; - } - { - goPackagePath = "github.com/shirou/gopsutil"; - fetch = { - type = "git"; - url = "https://github.com/shirou/gopsutil"; - rev = "fc7e5e7af6052e36e83e5539148015ed2c09d8f9"; - sha256 = "1p51r5qwbv7dkk3k3ndhz77hi08b76zpz9ik8qakgg5l6p5h8n7l"; - }; - } - { - goPackagePath = "github.com/shirou/w32"; - fetch = { - type = "git"; - url = "https://github.com/shirou/w32"; - rev = "bb4de0191aa41b5507caa14b0650cdbddcd9280b"; - sha256 = "0xh5vqblhr2c3mlaswawx6nipi4rc2x73rbdvlkakmgi0nnl50m4"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"; - sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz"; - }; - } - { - goPackagePath = "github.com/soniah/gosnmp"; - fetch = { - type = "git"; - url = "https://github.com/soniah/gosnmp"; - rev = "40eae407a1f8cbbe3f3f14c57bde0b16db1cfe85"; - sha256 = "1da492l2d9rc9nfc482fmyx8z9a3gmwca87kbizpwibkix9b7b02"; - }; - } - { - goPackagePath = "github.com/streadway/amqp"; - fetch = { - type = "git"; - url = "https://github.com/streadway/amqp"; - rev = "e5adc2ada8b8efff032bf61173a233d143e9318e"; - sha256 = "0qc5h9h1fcyblpiprbijrlc92fdbbnzf87648k20afgfjv8kciab"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/tidwall/gjson"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/gjson"; - rev = "d7c940e59395fdcaff4584cb442b2e7808f6711e"; - sha256 = "14x1g5gnziyh3vpr5mxpw2r5h65mncn548xdvamrpzngjm1idzhi"; - }; - } - { - goPackagePath = "github.com/tidwall/match"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/match"; - rev = "1731857f09b1f38450e2c12409748407822dc6be"; - sha256 = "14nv96h0mjki5q685qx8y331h4yga6hlfh3z9nz6acvnv284q578"; - }; - } - { - goPackagePath = "github.com/tidwall/pretty"; - fetch = { - type = "git"; - url = "https://github.com/tidwall/pretty"; - rev = "1166b9ac2b65e46a43d8618d30d1554f4652d49b"; - sha256 = "1jwpj5903lh8hsj9apm2gwd70809zq0gjgmivkxaq4iq29wnv0n9"; - }; - } - { - goPackagePath = "github.com/vishvananda/netlink"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netlink"; - rev = "b2de5d10e38ecce8607e6b438b6d174f389a004e"; - sha256 = "06kic677b2q752sgvk3lyjfh8gmq7bpfl38h8k1jsz92fav1y8gl"; - }; - } - { - goPackagePath = "github.com/vishvananda/netns"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netns"; - rev = "13995c7128ccc8e51e9a6bd2b551020a27180abd"; - sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; - }; - } - { - goPackagePath = "github.com/vjeantet/grok"; - fetch = { - type = "git"; - url = "https://github.com/vjeantet/grok"; - rev = "ce01e59abcf6fbc9833b7deb5e4b8ee1769bcc53"; - sha256 = "172j83ndkmh5dhglgskpsg5csz31ah5mnprqhcra5x7dczc2f8hv"; - }; - } - { - goPackagePath = "github.com/vmware/govmomi"; - fetch = { - type = "git"; - url = "https://github.com/vmware/govmomi"; - rev = "3617f28d167d448f93f282a867870f109516d2a5"; - sha256 = "1a82g4vzfgzp8ppcq3dhgv8van85am467ckx788yqk7rj4c3i5ir"; - }; - } - { - goPackagePath = "github.com/wavefronthq/wavefront-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/wavefronthq/wavefront-sdk-go"; - rev = "fa87530cd02a8ad08bd179e1c39fb319a0cc0dae"; - sha256 = "000ynkkpg2m4xynkmdx47asydw66nzp94f276gifws1a90yacay0"; - }; - } - { - goPackagePath = "github.com/wvanbergen/kafka"; - fetch = { - type = "git"; - url = "https://github.com/wvanbergen/kafka"; - rev = "e2edea948ddfee841ea9a263b32ccca15f7d6c2f"; - sha256 = "1m712xywbx6nja2rbmrphwxbwfzkhadq139k5d19m8964695sp10"; - }; - } - { - goPackagePath = "github.com/wvanbergen/kazoo-go"; - fetch = { - type = "git"; - url = "https://github.com/wvanbergen/kazoo-go"; - rev = "f72d8611297a7cf105da904c04198ad701a60101"; - sha256 = "05yx57kbjm9v54j46zi2c21zb3d239lzv996b2qqxpkfbqadqyxm"; - }; - } - { - goPackagePath = "github.com/yuin/gopher-lua"; - fetch = { - type = "git"; - url = "https://github.com/yuin/gopher-lua"; - rev = "46796da1b0b4794e1e341883a399f12cc7574b55"; - sha256 = "0yq5ks1smqx0kgmwyl6xxd2mn9bvdi8qz7di4xs0xy5cs7f2zanw"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "79993219becaa7e29e3b60cb67f5b8e82dee11d6"; - sha256 = "0y2jzm1b5dw8x5s9fjy2aj1gd0wwkhl71wj3ysby86g60ja5lp1z"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://github.com/golang/crypto.git"; - rev = "87dc89f01550277dc22b74ffcf4cd89fa2f40f4c"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://github.com/golang/net.git"; - rev = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1"; - sha256 = "018zmn4kmg2mbngcciqal54slc3pl4ry5vlv0bw36fcxvnazxnbp"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://github.com/golang/oauth2.git"; - rev = "d2e6202438beef2727060aa7cabdd924d92ebfd9"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://github.com/golang/sync.git"; - rev = "42b317875d0fa942474b76e1b46a6060d720ae6e"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://github.com/golang/sys.git"; - rev = "51ab0e2deafac1f46c46ad59cf0921be2f180c3d"; - sha256 = "0xdhpckbql3bsqkpc2k5b1cpnq3q1qjqjjq2j3p707rfwb8nm91a"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://github.com/golang/text.git"; - rev = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "19ff8768a5c0b8e46ea281065664787eefc24121"; - sha256 = "0b34xb74pnwawlf911w6f0dhb95i8vi20i799asnvrmyn1lm2ldk"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "b1f26356af11148e710935ed1ac8a7f5702c7612"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "fedd2861243fd1a8152376292b921b394c7bef7e"; - sha256 = "08324j170skzacglhjmpkpsivp9gwcvmljx1nq6a2d2h2qksfdbp"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8"; - sha256 = "0d8vj372ri55mrqfc0rhjl3albp5ykwfjhda1s5cgm5n40v70pr3"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-asn1-ber/asn1-ber"; - rev = "379148ca0225df7a432012b8df0355c2a2063ac0"; - sha256 = "1y8bvzbxpw0lfnn7pbcdwzqj4l90qj6xf88dvv9pxd9yl5g6cskx"; - }; - } - { - goPackagePath = "gopkg.in/fatih/pool.v2"; - fetch = { - type = "git"; - url = "https://github.com/fatih/pool"; - rev = "010e0b745d12eaf8426c95f9c3924d81dd0b668f"; - sha256 = "0dxsq7058w47d6ynbwjlfgnwcf5bf1q7m23dsgljd01sd8ilrq9x"; - }; - } - { - goPackagePath = "gopkg.in/fsnotify.v1"; - fetch = { - type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"; - sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; - }; - } - { - goPackagePath = "gopkg.in/gorethink/gorethink.v3"; - fetch = { - type = "git"; - url = "https://github.com/gorethink/gorethink"; - rev = "7f5bdfd858bb064d80559b2a32b86669c5de5d3b"; - sha256 = "1k4flhx93jbrcsi8k35dcdm7rcq3r8i8my4h8zhf5y9ayhcyph1m"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://github.com/go-inf/inf"; - rev = "d2d2541c53f18d2a059457998ce2876cc8e67cbf"; - sha256 = "00k5iqjcp371fllqxncv7jkf80hn1zww92zm78cclbcn4ybigkng"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/aescts.v1"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/aescts"; - rev = "f6abebb3171c4c1b1fea279cb7c7325020a26290"; - sha256 = "0rbq4zf3db48xa2gqdp2swws7wizmbwagigqkr1zxzd1ramps6rv"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/dnsutils.v1"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/dnsutils"; - rev = "13eeb8d49ffb74d7a75784c35e4d900607a3943c"; - sha256 = "0l543c64pyzbnrc00jspg21672l3a0kjjw9pbdxwna93w8d8m927"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/gokrb5.v7"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/gokrb5"; - rev = "363118e62befa8a14ff01031c025026077fe5d6d"; - sha256 = "08mbag2283q1pyfi696g80521r9n1id3804r6sssrhf3kxzkfhnv"; - }; - } - { - goPackagePath = "gopkg.in/jcmturner/rpc.v1"; - fetch = { - type = "git"; - url = "https://github.com/jcmturner/rpc"; - rev = "99a8ce2fbf8b8087b6ed12a37c61b10f04070043"; - sha256 = "0hkmvf8qdcifnzym8kv1xhq7lq0wpr0i6gzff159lh9xn0wfg175"; - }; - } - { - goPackagePath = "gopkg.in/ldap.v3"; - fetch = { - type = "git"; - url = "https://github.com/go-ldap/ldap"; - rev = "caa044a2bfa324b735baee1722e8e2e372f76864"; - sha256 = "000jfdx38k10irfy9952jjzqn04ji3lnlfpvabvq9l78zs96n91p"; - }; - } - { - goPackagePath = "gopkg.in/mgo.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-mgo/mgo"; - rev = "9856a29383ce1c59f308dd1cf0363a79b5bef6b5"; - sha256 = "1gfbcmvpwwf1lydxj3g42wv2g9w3pf0y02igqk4f4f21h02sazkw"; - }; - } - { - goPackagePath = "gopkg.in/olivere/elastic.v5"; - fetch = { - type = "git"; - url = "https://github.com/olivere/elastic"; - rev = "52741dc2ce53629cbe1e673869040d886cba2cd5"; - sha256 = "11dgj31jxmp9fdnnwzzwg08p3iwrbnd63kyf6drvlw4qsgslk4lh"; - }; - } - { - goPackagePath = "gopkg.in/tomb.v1"; - fetch = { - type = "git"; - url = "https://github.com/go-tomb/tomb"; - rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; - sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://github.com/go-yaml/yaml"; - rev = "5420a8b6744d3b0345ab293f6fcba19c978f1183"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } -] \ No newline at end of file diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index a246249d7d7..f307032f414 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; version = "0.11.0"; @@ -12,8 +12,6 @@ buildGoModule rec { modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = "cmd/thanos"; buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index 95f8ca4432b..065af0079b0 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A Dashboard for the sensu monitoring framework"; - homepage = http://sensuapp.org/; + homepage = "http://sensuapp.org/"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 2e7afe5266e..2b7fb972c90 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,12 +1,12 @@ generic: { v44 = generic { - version = "4.4.6"; - sha256 = "03mf4sklnw1x0ixp41vnibkz0794yi9jhws7ixld8jj2czk2ifr2"; + version = "4.4.7"; + sha256 = "13gckz5ysmqr257mcmbbbf8l43f1jdk4iyn6a3ad8xjmj3kqyys9"; }; v40 = generic { - version = "4.0.18"; - sha256 = "105f0mifgm56dd1y8vychq8m2f2wx9a7gv380xv0hrs1q038i1ki"; + version = "4.0.19"; + sha256 = "0csiva0iddzdf18lii7vwlvp91kh3vfl8r90jpcsnsivaqwfnkbr"; }; v30 = generic { diff --git a/pkgs/servers/monitoring/zipkin/default.nix b/pkgs/servers/monitoring/zipkin/default.nix index fe90d4d6408..c9b2e36d873 100644 --- a/pkgs/servers/monitoring/zipkin/default.nix +++ b/pkgs/servers/monitoring/zipkin/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Zipkin distributed tracing system"; - homepage = https://zipkin.io/; + homepage = "https://zipkin.io/"; license = licenses.asl20; platforms = platforms.unix; maintainers = [ maintainers.hectorj ]; diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index f19d3a1e18a..cb02a768478 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client library for MPD (music player daemon)"; - homepage = https://www.musicpd.org/libs/libmpdclient/; + homepage = "https://www.musicpd.org/libs/libmpdclient/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index e328a79afa6..4f97e3fc783 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -102,13 +102,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.21.20"; + version = "0.21.21"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "05148zwaf1ix369i1n1fx84j66qa1ab1p3m7781lk3dz5hqf185x"; + sha256 = "0ysyjlmmfm1y5jqyv83bs9p7zqr9pgj1hmdq2b7kx9kridclbnng"; }; buildInputs = [ glib boost ] diff --git a/pkgs/servers/mtprotoproxy/default.nix b/pkgs/servers/mtprotoproxy/default.nix index 4838fed47fb..9faa7ec56bf 100644 --- a/pkgs/servers/mtprotoproxy/default.nix +++ b/pkgs/servers/mtprotoproxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Async MTProto proxy for Telegram"; license = licenses.mit; - homepage = https://github.com/alexbers/mtprotoproxy; + homepage = "https://github.com/alexbers/mtprotoproxy"; platforms = python.meta.platforms; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/servers/mxisd/default.nix b/pkgs/servers/mxisd/default.nix index c5841d4d1a8..6e9ab2ca99a 100644 --- a/pkgs/servers/mxisd/default.nix +++ b/pkgs/servers/mxisd/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "a federated matrix identity server"; - homepage = https://github.com/kamax-matrix/mxisd; + homepage = "https://github.com/kamax-matrix/mxisd"; license = licenses.agpl3; maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; diff --git a/pkgs/servers/nas/default.nix b/pkgs/servers/nas/default.nix index 0b6451d104f..2e8b8b14d44 100644 --- a/pkgs/servers/nas/default.nix +++ b/pkgs/servers/nas/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A network transparent, client/server audio transport system"; - homepage = http://radscan.com/nas.html; + homepage = "http://radscan.com/nas.html"; license = licenses.mit; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index 7f75579b51c..3685589fa70 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { description = "High-Performance server for NATS"; license = licenses.asl20; maintainers = [ maintainers.swdunlop ]; - homepage = https://nats.io/; + homepage = "https://nats.io/"; platforms = platforms.all; }; } diff --git a/pkgs/servers/nats-streaming-server/default.nix b/pkgs/servers/nats-streaming-server/default.nix index 29f0f29a1bc..efaec689a1a 100644 --- a/pkgs/servers/nats-streaming-server/default.nix +++ b/pkgs/servers/nats-streaming-server/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { description = "NATS Streaming System Server"; license = licenses.asl20; maintainers = [ maintainers.swdunlop ]; - homepage = https://nats.io/; + homepage = "https://nats.io/"; platforms = platforms.all; }; } diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index de317ada6e4..3b360e308b5 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Near Field Communication manager"; - homepage = https://01.org/linux-nfc; + homepage = "https://01.org/linux-nfc"; license = licenses.gpl2; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.unix; diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 0f1a8e120f6..76ce8d2d573 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { buildInputs = [ pcre]; meta = { - homepage = http://leafnode.sourceforge.net/; + homepage = "http://leafnode.sourceforge.net/"; description = "Leafnode implements a store & forward NNTP proxy"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 008d6bbde39..f8a7823e092 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -17,7 +17,7 @@ let meta = with stdenv.lib; { description = "Sharing solution for files, calendars, contacts and more"; - homepage = https://nextcloud.com; + homepage = "https://nextcloud.com"; maintainers = with maintainers; [ schneefux bachp globin fpletz ma27 ]; license = licenses.agpl3Plus; platforms = with platforms; unix; @@ -31,7 +31,7 @@ in { }; nextcloud18 = generic { - version = "18.0.2"; - sha256 = "10fbdq0366iai2kpw6v6p78mnn9gz8x0xzsbqrp109yx4c4nccyh"; + version = "18.0.3"; + sha256 = "0wpxa35zj81i541j3cjq6klsjwwc5slryzvjjl7zjc32004yfrvv"; }; } diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix index 0fcb5047549..dd7e8e4879c 100644 --- a/pkgs/servers/nextcloud/news-updater.nix +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Fast parallel feed updater for the Nextcloud news app"; - homepage = https://github.com/nextcloud/news-updater; + homepage = "https://github.com/nextcloud/news-updater"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ schneefux ]; }; diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index 10a0c99996d..e9bd705ffa9 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nginx-sso"; - version = "0.24.0"; + version = "0.24.1"; rev = "v${version}"; goPackagePath = "github.com/Luzifer/nginx-sso"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "Luzifer"; repo = "nginx-sso"; - sha256 = "0jkmd1hdr40i1wd3001ixjv1nminsxmwhvnhcgfqcdn5gnaradwn"; + sha256 = "1wij0a5ban2l6ahfra4n4dji7i5ndkqk1mgrblwm2ski7bl8yszx"; }; postInstall = '' @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "SSO authentication provider for the auth_request nginx module"; - homepage = https://github.com/Luzifer/nginx-sso; + homepage = "https://github.com/Luzifer/nginx-sso"; license = licenses.asl20; maintainers = with maintainers; [ delroth ]; platforms = platforms.unix; diff --git a/pkgs/servers/nosql/aerospike/default.nix b/pkgs/servers/nosql/aerospike/default.nix index b7b43edc1cd..73a07ec057e 100644 --- a/pkgs/servers/nosql/aerospike/default.nix +++ b/pkgs/servers/nosql/aerospike/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flash-optimized, in-memory, NoSQL database"; - homepage = http://aerospike.com/; + homepage = "http://aerospike.com/"; license = licenses.agpl3; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ kalbasit ]; diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix index f3d5d121c38..bd7f9a36c9c 100644 --- a/pkgs/servers/nosql/apache-jena/binary.nix +++ b/pkgs/servers/nosql/apache-jena/binary.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://jena.apache.org; + homepage = "http://jena.apache.org"; downloadPage = "http://archive.apache.org/dist/jena/binaries/"; updateWalker = true; downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$"; diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix index 05153a7f859..135fd31ea3d 100644 --- a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix +++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://jena.apache.org; + 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/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index e41930a2f48..54d5e8484bc 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -45,7 +45,7 @@ let enableParallelBuilding = true; meta = with lib; { - homepage = https://www.arangodb.com; + homepage = "https://www.arangodb.com"; description = "A native multi-model database with flexible data models for documents, graphs, and key-values"; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index fd0a97d029d..6ccd2e1c8dd 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://cassandra.apache.org/; + homepage = "http://cassandra.apache.org/"; description = "A massively scalable open source NoSQL database"; platforms = platforms.unix; license = licenses.asl20; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 3669df47ee2..5dfcb3d56c5 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with lib; { description = "An open-source distributed time series database"; license = licenses.mit; - homepage = https://influxdata.com/; + homepage = "https://influxdata.com/"; maintainers = with maintainers; [ offline zimbatm ]; }; } diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index b4b6334c13f..e3d277ba5af 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { inherit sha256; }; - nativeBuildInputs = [ scons ]; + nativeBuildInputs = [ scons.py2 ]; buildInputs = [ boost curl diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index 98dd604c76d..743553f5f61 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A highly scalable, robust (fully ACID) native graph database"; - homepage = http://www.neo4j.org/; + homepage = "http://www.neo4j.org/"; license = licenses.gpl3; maintainers = [ maintainers.offline ]; diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index 63c1b3b5fd7..46a23ed2529 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { query language that supports really useful queries like table joins and group by, and is easy to setup and learn. ''; - homepage = http://www.rethinkdb.com; + homepage = "http://www.rethinkdb.com"; license = stdenv.lib.licenses.agpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice bluescreen303 ]; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index f85c4aebd51..75d309fe909 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -1,21 +1,18 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.33.1"; + version = "1.34.5"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1irc3zahp72631ai9rafc8n7vayr4hzlh8qla05chlsb2fwzqrrd"; + sha256 = "0isifyvbrv0f6l32dycka67cpnizwh2c9ns2q8pz6r2myzbdsf3s"; }; - modSha256 = "0qzh3jmj7ps6xmnnmfr8bnq97kdkn58p6dxppmlypanar3zsn7vk"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + modSha256 = "0fr5yah4qicqjfgina1ghflaz8dlzsqk3rrpsvg5l68jb6l7nxkb"; + meta = with lib; { homepage = "https://victoriametrics.com/"; description = "fast, cost-effective and scalable time series database, long-term remote storage for Prometheus"; license = licenses.asl20; diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index d094fda84b4..d0a57198820 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "A reverse proxy that provides authentication with Google, Github or other provider"; - homepage = https://github.com/pusher/oauth2_proxy/; + homepage = "https://github.com/pusher/oauth2_proxy/"; license = licenses.mit; maintainers = [ maintainers.yorickvp ]; }; diff --git a/pkgs/servers/openafs/1.6/default.nix b/pkgs/servers/openafs/1.6/default.nix index a1e56ca161e..4dcc7b5e05d 100644 --- a/pkgs/servers/openafs/1.6/default.nix +++ b/pkgs/servers/openafs/1.6/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { outputsToInstall = [ "out" "doc" "man" ]; description = "Open AFS client"; - homepage = https://www.openafs.org; + homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; diff --git a/pkgs/servers/openafs/1.6/module.nix b/pkgs/servers/openafs/1.6/module.nix index 0d61b1cd104..f1acdfcce5a 100644 --- a/pkgs/servers/openafs/1.6/module.nix +++ b/pkgs/servers/openafs/1.6/module.nix @@ -66,7 +66,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open AFS client kernel module"; - homepage = https://www.openafs.org; + homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix index 5fe4cad021f..07f5560ff20 100644 --- a/pkgs/servers/openafs/1.8/default.nix +++ b/pkgs/servers/openafs/1.8/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { outputsToInstall = [ "out" "doc" "man" ]; description = "Open AFS client"; - homepage = https://www.openafs.org; + homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix index dab97f10bee..4aecc851b86 100644 --- a/pkgs/servers/openafs/1.8/module.nix +++ b/pkgs/servers/openafs/1.8/module.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open AFS client kernel module"; - homepage = https://www.openafs.org; + homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; maintainers = [ maintainers.maggesi maintainers.spacefrogg ]; diff --git a/pkgs/servers/openxpki/default.nix b/pkgs/servers/openxpki/default.nix index 7bd0ee2eede..9b952938e89 100644 --- a/pkgs/servers/openxpki/default.nix +++ b/pkgs/servers/openxpki/default.nix @@ -73,7 +73,7 @@ perlPackages.buildPerlPackage { doCheck = false; meta = { - homepage = http://www.openxpki.org; + homepage = "http://www.openxpki.org"; description = "Enterprise-grade PKI/Trustcenter software"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ tstrobel ]; diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix index b744c58d4fb..fe3e3c06285 100644 --- a/pkgs/servers/osrm-backend/default.nix +++ b/pkgs/servers/osrm-backend/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { postInstall = "mkdir -p $out/share/osrm-backend && cp -r ../profiles $out/share/osrm-backend/profiles"; meta = { - homepage = https://github.com/Project-OSRM/osrm-backend/wiki; + 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 ]; diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix index 67e125d7a8c..f209a2d2aa6 100644 --- a/pkgs/servers/p910nd/default.nix +++ b/pkgs/servers/p910nd/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { the AppSocket protocol and has the scheme socket://. LPRng also supports this protocol and the syntax is lp=remotehost%9100 in /etc/printcap. ''; - homepage = http://p910nd.sourceforge.net/; - downloadPage = https://sourceforge.net/projects/p910nd/; + homepage = "http://p910nd.sourceforge.net/"; + downloadPage = "https://sourceforge.net/projects/p910nd/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index a113d583cb1..201ff3296fa 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/pies/; + homepage = "https://www.gnu.org/software/pies/"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index d4dd993b329..ea01919ce20 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.18.8.2527-740d4c206"; + version = "1.19.1.2645-ccb6eb67e"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "05543nkhmp6wq88vz5cnv3cfd5hbd8rqs1rylfy7njgvb0pxl107"; + sha256 = "0ivv6apavkgy4zryhwam20jjfgy8sxpccqp0bi5ylh33jpxhm096"; }; outputs = [ "out" "basedb" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontAutoPatchelf = true; meta = with stdenv.lib; { - homepage = https://plex.tv/; + homepage = "https://plex.tv/"; license = licenses.unfree; platforms = platforms.linux; maintainers = with maintainers; [ diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix index a6b65cde89f..444705d85d0 100644 --- a/pkgs/servers/polipo/default.nix +++ b/pkgs/servers/polipo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "LOCAL_ROOT=$(out)/share/polipo/www" ]; meta = with stdenv.lib; { - homepage = http://www.pps.jussieu.fr/~jch/software/polipo/; + homepage = "http://www.pps.jussieu.fr/~jch/software/polipo/"; description = "A small and fast caching web proxy"; license = licenses.mit; maintainers = with maintainers; [ phreedom ehmry ]; diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index 8fb71f72721..8609648378a 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://code.causal.agency/june/pounce; + homepage = "https://code.causal.agency/june/pounce"; description = "Simple multi-client TLS-only IRC bouncer"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 95fbe446bb2..8bc40cb73cc 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lpam"; meta = { - homepage = http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/; + 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; diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix index 7e6b92a0376..2288942ebf3 100644 --- a/pkgs/servers/ps3netsrv/default.nix +++ b/pkgs/servers/ps3netsrv/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "C++ implementation of the ps3netsrv server"; - homepage = https://github.com/dirkvdb/ps3netsrv--; + homepage = "https://github.com/dirkvdb/ps3netsrv--"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 49909510d2e..b9fb104d5f6 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -17,7 +17,7 @@ , airtunesSupport ? false -, bluetoothSupport ? false +, bluetoothSupport ? true , remoteControlSupport ? false @@ -121,7 +121,7 @@ stdenv.mkDerivation rec { meta = { description = "Sound server for POSIX and Win32 systems"; - homepage = http://www.pulseaudio.org/; + homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lovek323 ]; platforms = lib.platforms.unix; diff --git a/pkgs/servers/pulseaudio/qpaeq.nix b/pkgs/servers/pulseaudio/qpaeq.nix index c84cc29f652..1f50022a918 100644 --- a/pkgs/servers/pulseaudio/qpaeq.nix +++ b/pkgs/servers/pulseaudio/qpaeq.nix @@ -13,7 +13,7 @@ let icon = "audio-volume-high"; desktopName = "qpaeq"; genericName = "Audio equalizer"; - categories = "Music;Sound;"; + categories = "AudioVideo;Audio;Mixer;"; startupNotify = "false"; }; in @@ -46,7 +46,7 @@ mkDerivation rec { meta = { description = "An equalizer interface for pulseaudio's equalizer sinks"; - homepage = http://www.pulseaudio.org/; + homepage = "http://www.pulseaudio.org/"; license = lib.licenses.lgpl2Plus; maintainers = with lib.maintainers; [ lovek323 mkg20001 ]; platforms = lib.platforms.unix; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index bd679fd3ff8..5bff70878d3 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { It is more than a routed replacement, it can be used as a Route Server and a Route Reflector. ''; - homepage = https://www.nongnu.org/quagga/; + homepage = "https://www.nongnu.org/quagga/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ tavyc ]; diff --git a/pkgs/servers/radicale/1.x.nix b/pkgs/servers/radicale/1.x.nix index 83fa2506800..96c94c2bc6b 100644 --- a/pkgs/servers/radicale/1.x.nix +++ b/pkgs/servers/radicale/1.x.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { doCheck = !pythonPackages.isPy3k; meta = with stdenv.lib; { - homepage = http://www.radicale.org/; + homepage = "http://www.radicale.org/"; description = "CalDAV CardDAV server"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix index da55131773b..fc98795bbc7 100644 --- a/pkgs/servers/radicale/default.nix +++ b/pkgs/servers/radicale/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://www.radicale.org/; + homepage = "https://www.radicale.org/"; description = "CalDAV CardDAV server"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV diff --git a/pkgs/servers/rippled/data-api.nix b/pkgs/servers/rippled/data-api.nix index 04d520b412c..2d1db24474b 100644 --- a/pkgs/servers/rippled/data-api.nix +++ b/pkgs/servers/rippled/data-api.nix @@ -10,7 +10,7 @@ in nodePackages.buildNodePackage rec { rev = "c56b860105f36c1c44ae011189d495272648c589"; src = fetchgit { - url = https://github.com/ripple/ripple-data-api.git; + url = "https://github.com/ripple/ripple-data-api.git"; inherit rev; sha256 = "1iygp26ilradxj268g1l2y93cgrpchqwn71qdag67lv273dbq48m"; }; @@ -19,7 +19,7 @@ in nodePackages.buildNodePackage rec { meta = { description = "Historical ripple data"; - homepage = https://github.com/ripple/ripple-data-api; + homepage = "https://github.com/ripple/ripple-data-api"; maintainers = with maintainers; [ offline ]; }; } diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 905e776ea36..69a54a1202d 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -149,7 +149,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ripple P2P payment network reference server"; - homepage = https://github.com/ripple/rippled; + homepage = "https://github.com/ripple/rippled"; maintainers = with maintainers; [ ehmry offline ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/rippled/validator-keys-tool.nix b/pkgs/servers/rippled/validator-keys-tool.nix index 684e070292c..ec5794d1509 100644 --- a/pkgs/servers/rippled/validator-keys-tool.nix +++ b/pkgs/servers/rippled/validator-keys-tool.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generate master and ephemeral rippled validator keys"; - homepage = https://github.com/ripple/validator-keys-tool; + homepage = "https://github.com/ripple/validator-keys-tool"; maintainers = with maintainers; [ offline ]; license = licenses.isc; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index 64b212eb49f..49eaa26c294 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { description = "The music player for music lovers."; - homepage = https://roonlabs.com; + homepage = "https://roonlabs.com"; license = licenses.unfree; maintainers = with maintainers; [ steell ]; platforms = platforms.linux; diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 00d01b01efe..52197a6afaa 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { description = "ONC RPC portmapper"; license = licenses.bsd3; platforms = platforms.unix; - homepage = https://linux-nfs.org/; + homepage = "https://linux-nfs.org/"; maintainers = with maintainers; [ abbradar ]; longDescription = '' Universal addresses to RPC program number mapper. diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 57c774ebcb0..54d327d5fc4 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Usenet NZB downloader, par2 repairer and auto extracting server"; - homepage = https://sabnzbd.org; + homepage = "https://sabnzbd.org"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with stdenv.lib.maintainers; [ fridh ]; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index d24a9b9748a..1d6951bb8c1 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,22 +1,44 @@ -{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen +{ stdenv +, fetchurl +, python +, pkgconfig +, bison +, flex +, perl +, libxslt +, docbook_xsl +, rpcgen , fixDarwinDylibNames -, docbook_xml_dtd_42, readline -, popt, iniparser, libbsd, libarchive, libiconv, gettext -, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, liburing, fam, libceph, glusterfs -, gnutls, ncurses, libunwind, systemd, jansson, lmdb, gpgme, libuuid +, docbook_xml_dtd_45 +, readline +, popt +, libbsd +, libarchive +, zlib +, liburing +, fam +, gnutls +, libunwind +, systemd +, jansson +, libtasn1 +, tdb +, cmocka -, enableLDAP ? false -, enablePrinting ? false -, enableMDNS ? false -, enableDomainController ? false -, enableRegedit ? true -, enableCephFS ? false -, enableGlusterFS ? false -, enableAcl ? (!stdenv.isDarwin) -, enablePam ? (!stdenv.isDarwin) +, enableLDAP ? false, openldap +, enablePrinting ? false, cups +, enableProfiling ? true +, enableMDNS ? false, avahi +, enableDomainController ? false, gpgme, lmdb +, enableKerberos ? true, krb5Full +, enableRegedit ? true, ncurses +, enableCephFS ? false, libceph +, enableGlusterFS ? false, glusterfs, libuuid +, enableAcl ? (!stdenv.isDarwin), acl +, enablePam ? (!stdenv.isDarwin), pam }: -with lib; +with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; @@ -36,17 +58,40 @@ stdenv.mkDerivation rec { ./4.x-fix-makeflags-parsing.patch ]; - nativeBuildInputs = [ pkgconfig perl perl.pkgs.ParseYapp libxslt docbook_xsl docbook_xml_dtd_42 ] - ++ optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ]; + nativeBuildInputs = [ + pkgconfig + bison + flex + perl + perl.pkgs.ParseYapp + libxslt + docbook_xsl + docbook_xml_dtd_45 + cmocka + ] ++ optionals stdenv.isDarwin [ + rpcgen + fixDarwinDylibNames + ]; buildInputs = [ - python readline popt iniparser jansson - libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls - ] ++ optionals stdenv.isLinux [ libaio liburing systemd ] + python + readline + popt + jansson + libbsd + libarchive + zlib + fam + libunwind + gnutls + libtasn1 + tdb + ] ++ optionals stdenv.isLinux [ liburing systemd ] ++ optional enableLDAP openldap ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi ++ optionals enableDomainController [ gpgme lmdb ] + ++ optional enableKerberos krb5Full ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] @@ -66,8 +111,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-static-modules=NONE" "--with-shared-modules=ALL" - "--with-system-mitkrb5" - "--with-system-mitkdc" krb5Full "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" @@ -75,7 +118,13 @@ stdenv.mkDerivation rec { ] ++ singleton (if enableDomainController then "--with-experimental-mit-ad-dc" else "--without-ad-dc") - ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] + ++ optionals enableKerberos [ + "--with-system-mitkrb5" + "--with-system-mitkdc=${krb5Full}" + ] ++ optionals (!enableLDAP) [ + "--without-ldap" + "--without-ads" + ] ++ optional enableProfiling "--with-profiling-data" ++ optional (!enableAcl) "--without-acl-support" ++ optional (!enablePam) "--without-pam"; diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index ad3654f17df..8e086ac5e66 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -41,7 +41,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with stdenv.lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-icu; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/analysis-icu"; description = "The ICU Analysis plugin integrates the Lucene ICU module into elasticsearch"; license = licenses.asl20; }; @@ -58,7 +58,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; + homepage = "https://github.com/vhyza/elasticsearch-analysis-lemmagen"; description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter"; license = licenses.asl20; }; @@ -75,7 +75,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2"; description = "The EC2 discovery plugin uses the AWS API for unicast discovery."; license = licenses.asl20; }; @@ -92,7 +92,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/ingest-attachment; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/ingest-attachment"; description = "Ingest processor that uses Apache Tika to extract contents"; license = licenses.asl20; }; @@ -109,7 +109,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-s3; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/repository-s3"; description = "The S3 repository plugin adds support for using AWS S3 as a repository for Snapshot/Restore."; license = licenses.asl20; }; @@ -126,7 +126,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-gcs; + homepage = "https://github.com/elastic/elasticsearch/tree/master/plugins/repository-gcs"; description = "The GCS repository plugin adds support for using Google Cloud Storage as a repository for Snapshot/Restore."; license = licenses.asl20; }; @@ -149,7 +149,7 @@ in { else throw "unsupported version ${version} for plugin ${pluginName}"; }; meta = with lib; { - homepage = https://search-guard.com; + homepage = "https://search-guard.com"; description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; license = licenses.asl20; }; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 57f3b2e0f1b..40d59611da2 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "9.1.2"; + version = "10.0.0"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "0zj9zribkg4x6c6175pwl4i6jpxg045bca1ywfrfcdsxkjllvk7g"; + sha256 = "01wacd9rijnjydshsl7z0waasr87gxkwr0kr647chczcxlh1b9gr"; }; buildInputs = with stdenv.lib; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { installCheckPhase = "$out/bin/groonga --version"; meta = with stdenv.lib; { - homepage = https://groonga.org/; + homepage = "https://groonga.org/"; description = "An open-source fulltext search engine and column store"; license = licenses.lgpl21; maintainers = [ maintainers.ericsagnes ]; diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 701d3880cbd..0da61861207 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.4.1"; + version = "8.5.0"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "00a35a6ppd4ngp80dxak3bqrp8vmx0wixr4x2h2p9qxj4khf2fgc"; + sha256 = "1pb1vja9spybkp2qw150kymy47njy06b5pic7mrfjq5as0d72m4y"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/search/sphinxsearch/default.nix b/pkgs/servers/search/sphinxsearch/default.nix index 5c29d8b4780..47547f07fb4 100644 --- a/pkgs/servers/search/sphinxsearch/default.nix +++ b/pkgs/servers/search/sphinxsearch/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "An open source full text search server"; - homepage = http://sphinxsearch.com; + homepage = "http://sphinxsearch.com"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ ederoyd46 valodim ]; diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 585fc2b73ef..8129cb5ad8e 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Tool for service orchestration and management"; - homepage = https://www.serf.io/; + homepage = "https://www.serf.io/"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index 03d86c209f0..6b1fdd10990 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://serviio.org; + homepage = "http://serviio.org"; description = "UPnP Media Streaming Server"; longDescription = '' Serviio is a free media server. It allows you to stream your media files (music, video or images) @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.thpham ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index fe1837e907a..279cfa3300b 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/shellinabox/shellinabox; + homepage = "https://github.com/shellinabox/shellinabox"; description = "Web based AJAX terminal emulator"; license = licenses.gpl2; maintainers = with maintainers; [ tomberek lihop ]; diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 060b58d18b1..41543c325a6 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.gnu.org/software/shishi/; + homepage = "https://www.gnu.org/software/shishi/"; description = "An implementation of the Kerberos 5 network security system"; license = licenses.gpl3Plus; maintainers = with maintainers; [ bjg lovek323 ]; diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index 8df674111ad..cd98af51e08 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.21.17"; + version = "0.21.22"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "0hyrsxaill7x9g4bp6mri9i3ll75y7j1xxc226gw2c817zc6ayms"; + sha256 = "16jwvg9mcv0yr94ldncfs6bczyv4n3q9v7g7v0ssrkrnkxh722zx"; }; dontBuild = true; diff --git a/pkgs/servers/sickbeard/sickrage.nix b/pkgs/servers/sickbeard/sickrage.nix index cbde11e3dc0..9ff44fade82 100644 --- a/pkgs/servers/sickbeard/sickrage.nix +++ b/pkgs/servers/sickbeard/sickrage.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, python2, makeWrapper }: python2.pkgs.buildPythonApplication rec { - name = "sickrage-${version}"; + pname = "sickrage"; version = "v2018.07.21-1"; src = fetchFromGitHub { @@ -28,7 +28,7 @@ python2.pkgs.buildPythonApplication rec { description = "Automatic Video Library Manager for TV Shows"; longDescription = "It watches for new episodes of your favorite shows, and when they are posted it does its magic."; license = licenses.gpl3; - homepage = https://sickrage.github.io; + homepage = "https://sickrage.github.io"; maintainers = with maintainers; [ sterfield ]; }; } diff --git a/pkgs/servers/silc-server/default.nix b/pkgs/servers/silc-server/default.nix index fdb1dcbd1cf..084d60ba6a5 100644 --- a/pkgs/servers/silc-server/default.nix +++ b/pkgs/servers/silc-server/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://silcnet.org/; + homepage = "http://silcnet.org/"; description = "Secure Internet Live Conferencing server"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/servers/simplehttp2server/default.nix b/pkgs/servers/simplehttp2server/default.nix index 3ac32509ba3..58b04b316b3 100644 --- a/pkgs/servers/simplehttp2server/default.nix +++ b/pkgs/servers/simplehttp2server/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/GoogleChromeLabs/simplehttp2server; + homepage = "https://github.com/GoogleChromeLabs/simplehttp2server"; description = "HTTP/2 server for development purposes"; license = licenses.asl20; maintainers = with maintainers; [ yrashk ]; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index f6791d01088..04ad685403b 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; - homepage = https://freeswitch.org/; + homepage = "https://freeswitch.org/"; license = stdenv.lib.licenses.mpl11; maintainers = with stdenv.lib.maintainers; [ misuzu ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/servers/sip/sipwitch/default.nix b/pkgs/servers/sip/sipwitch/default.nix index 1252153b79a..33c888ba35e 100644 --- a/pkgs/servers/sip/sipwitch/default.nix +++ b/pkgs/servers/sip/sipwitch/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure peer-to-peer VoIP server that uses the SIP protocol"; - homepage = https://www.gnu.org/software/sipwitch/; + homepage = "https://www.gnu.org/software/sipwitch/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/servers/slimserver/default.nix b/pkgs/servers/slimserver/default.nix index d755f864d4e..254825c862e 100644 --- a/pkgs/servers/slimserver/default.nix +++ b/pkgs/servers/slimserver/default.nix @@ -93,7 +93,7 @@ perlPackages.buildPerlPackage rec { outputs = [ "out" ]; meta = with stdenv.lib; { - homepage = https://github.com/Logitech/slimserver; + homepage = "https://github.com/Logitech/slimserver"; description = "Server for Logitech Squeezebox players. This server is also called Logitech Media Server"; # the firmware is not under a free license! # https://github.com/Logitech/slimserver/blob/public/7.9/License.txt diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix index 730d1bbdddc..e725e6243f0 100644 --- a/pkgs/servers/smcroute/default.nix +++ b/pkgs/servers/smcroute/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Static multicast routing daemon"; - homepage = http://troglobit.com/smcroute.html; + homepage = "http://troglobit.com/smcroute.html"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz ]; platforms = with platforms; (linux ++ freebsd ++ netbsd ++ openbsd); diff --git a/pkgs/servers/softether/4.25.nix b/pkgs/servers/softether/4.25.nix index 2b21bef7d6f..65e21010e75 100644 --- a/pkgs/servers/softether/4.25.nix +++ b/pkgs/servers/softether/4.25.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; - homepage = https://www.softether.org/; + homepage = "https://www.softether.org/"; license = licenses.gpl2; maintainers = [ maintainers.rick68 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/softether/4.29.nix b/pkgs/servers/softether/4.29.nix index 1d80752a41a..b1ef8643aa3 100644 --- a/pkgs/servers/softether/4.29.nix +++ b/pkgs/servers/softether/4.29.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An Open-Source Free Cross-platform Multi-protocol VPN Program"; - homepage = https://www.softether.org/; + homepage = "https://www.softether.org/"; license = licenses.asl20; maintainers = [ maintainers.rick68 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix new file mode 100644 index 00000000000..f7feda5e916 --- /dev/null +++ b/pkgs/servers/sozu/default.nix @@ -0,0 +1,22 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "sozu"; + version = "0.11.46"; + + src = fetchFromGitHub { + owner = "sozu-proxy"; + repo = pname; + rev = version; + sha256 = "0anng5qvdx9plxs9qqr5wmjjz0gx5113jq28xwbxaaklvd4ni7cm"; + }; + + cargoSha256 = "19c2s9h4jk9pff72wdqw384mvrf40d8x4sx7qysnpb4hayq2ijh3"; + + meta = with stdenv.lib; { + description = "Open Source HTTP Reverse Proxy built in Rust for Immutable Infrastructures"; + homepage = "https://sozu.io"; + license = licenses.agpl3; + maintainers = with maintainers; [ filalex77 ]; + }; +} \ No newline at end of file diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 6637a75ea2f..8f3d2a7b285 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -57,7 +57,7 @@ buildGoPackage rec { outputs = [ "bin" "man" "out" ]; meta = with stdenv.lib; { - homepage = https://www.cockroachlabs.com; + homepage = "https://www.cockroachlabs.com"; description = "A scalable, survivable, strongly-consistent SQL database"; license = licenses.asl20; platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 27ab7d444bf..6f7f81f2378 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, lib, buildGoModule }: buildGoModule rec { pname = "dolt"; - version = "0.15.0"; + version = "0.15.2"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "1zn5ws6x42niwq9rscn63ddpp0558k0lgncmf01p243jlkdnfsg3"; + sha256 = "0av21czfxpwy4y7n9x6hy6m2fliqcazjx7ww0rwm6kdwxipq1xsz"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - modSha256 = "04bsj8mfamnbq3y2aqbx1605azi8v15nbdh1zk5grni0ihlal75a"; + modSha256 = "0c120gkkswg0cqvvhjkxvalr4fsjv81khwg0x0fm8fr6lipkfksn"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Relational database with version control and CLI a-la Git."; homepage = "https://github.com/liquidata-inc/dolt"; license = licenses.asl20; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 2b287c8f6ff..ea11faf1efc 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,9 +1,12 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy +{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl -, libaio, libevent, jemalloc, cracklib, systemd, perl +, libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl +, bzip2, lz4, lzo, snappy, xz, zlib, zstd , fixDarwinDylibNames, cctools, CoreServices, less , numactl # NUMA Support , withStorageMroonga ? true, kytea, msgpack, zeromq +, withStorageRocks ? true +, withStorageToku ? true }: with stdenv.lib; @@ -34,9 +37,11 @@ common = rec { # attributes common to both builds nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - ncurses openssl zlib pcre jemalloc libiconv curl + ncurses openssl zlib pcre libiconv curl ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] - ++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; + ++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ] + ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ jemalloc450 ] + ++ optional (!stdenv.hostPlatform.isDarwin && !withStorageToku) [ jemalloc ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt @@ -80,8 +85,6 @@ common = rec { # attributes common to both builds # to pass in java explicitly. "-DCONNECT_WITH_JDBC=OFF" "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib" - ] ++ optionals stdenv.hostPlatform.isMusl [ - "-DWITHOUT_TOKUDB=1" # mariadb docs say disable this for musl ]; postInstall = '' @@ -99,8 +102,9 @@ common = rec { # attributes common to both builds passthru.mysqlVersion = "5.7"; meta = { + description = "An enhanced, drop-in replacement for MySQL"; - homepage = https://mariadb.org/; + homepage = "https://mariadb.org/"; license = licenses.gpl2; maintainers = with maintainers; [ thoughtpolice ]; platforms = platforms.all; @@ -138,11 +142,11 @@ server = stdenv.mkDerivation (common // { outputs = [ "out" "man" ]; - nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper; + nativeBuildInputs = common.nativeBuildInputs ++ [ bison boost.dev ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper; buildInputs = common.buildInputs ++ [ - xz lzo lz4 bzip2 snappy - libxml2 boost judy libevent cracklib + bzip2 lz4 lzo snappy xz zstd + libxml2 judy libevent cracklib ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl ++ optionals withStorageMroonga [ kytea msgpack zeromq ] ++ optional stdenv.hostPlatform.isLinux linux-pam @@ -166,10 +170,17 @@ server = stdenv.mkDerivation (common // { ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) [ "-DWITH_NUMA=ON" ] ++ optional (!withStorageMroonga) [ - "-DWITHOUT_MROONGA=ON" - ] ++ optionals stdenv.hostPlatform.isDarwin [ - "-DWITHOUT_OQGRAPH=1" + "-DWITHOUT_MROONGA=1" + ] ++ optional (!withStorageRocks) [ + "-DWITHOUT_ROCKSDB=1" + ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageRocks) [ + "-DWITH_ROCKSDB_JEMALLOC=ON" + ] ++ optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isMusl || !withStorageToku) [ "-DWITHOUT_TOKUDB=1" + ] ++ optional (!stdenv.hostPlatform.isDarwin && withStorageToku) [ + "-DWITH_JEMALLOC=static" + ] ++ optional stdenv.hostPlatform.isDarwin [ + "-DWITHOUT_OQGRAPH=1" ]; preConfigure = optionalString (!stdenv.hostPlatform.isDarwin) '' diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 73d37ba11a2..a6ce8f4b047 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Galera 3 wsrep provider library"; - homepage = https://galeracluster.com/; + homepage = "https://galeracluster.com/"; license = licenses.lgpl2; maintainers = with maintainers; [ izorkin ]; platforms = platforms.all; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index 062de0c2368..b14b3d9f6ad 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { meta = { description = "Oracle Database Express Edition"; - homepage = http://www.oracle.com/technetwork/products/express-edition/; + homepage = "http://www.oracle.com/technetwork/products/express-edition/"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/servers/sql/percona/5.6.x.nix b/pkgs/servers/sql/percona/5.6.x.nix index 860c1f8e94f..43c1de7ea84 100644 --- a/pkgs/servers/sql/percona/5.6.x.nix +++ b/pkgs/servers/sql/percona/5.6.x.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { passthru.mysqlVersion = "5.6"; meta = with stdenv.lib; { - homepage = https://www.percona.com; + homepage = "https://www.percona.com"; description = "a free, fully compatible, enhanced, open source drop-in replacement for MySQL that provides superior performance, scalability and instrumentation"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/servers/sql/pgpool/default.nix b/pkgs/servers/sql/pgpool/default.nix index 32c30836f6d..7c2f3521a08 100644 --- a/pkgs/servers/sql/pgpool/default.nix +++ b/pkgs/servers/sql/pgpool/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://pgpool.net/mediawiki/index.php; + homepage = "http://pgpool.net/mediawiki/index.php"; description = "A middleware that works between postgresql servers and postgresql clients"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 129292e8890..ec325fc3e42 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -141,7 +141,7 @@ let }; meta = with lib; { - homepage = https://www.postgresql.org; + homepage = "https://www.postgresql.org"; description = "A powerful, open source object-relational database system"; license = licenses.postgresql; maintainers = with maintainers; [ ocharles thoughtpolice danbst globin ]; diff --git a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix index 8bd50c3974c..5525fc9f965 100644 --- a/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/cstore_fdw.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Columnar storage for PostgreSQL"; - homepage = https://www.citusdata.com/; + homepage = "https://www.citusdata.com/"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 1e5824d60d8..4af950973b2 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Run Cron jobs through PostgreSQL"; - homepage = https://github.com/citusdata/pg_cron; + homepage = "https://github.com/citusdata/pg_cron"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/pkgs/servers/sql/postgresql/ext/pg_hll.nix b/pkgs/servers/sql/postgresql/ext/pg_hll.nix index deac1072e65..7630e2e32ba 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_hll.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_hll.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HyperLogLog for PostgreSQL"; - homepage = https://www.citusdata.com/; + homepage = "https://www.citusdata.com/"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 2edc07c1d29..ee59e683ce8 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Partition management extension for PostgreSQL"; - homepage = https://github.com/pgpartman/pg_partman; + homepage = "https://github.com/pgpartman/pg_partman"; maintainers = with maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/pkgs/servers/sql/postgresql/ext/pg_topn.nix b/pkgs/servers/sql/postgresql/ext/pg_topn.nix index b6300f78af2..0f8e2f61a6e 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_topn.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_topn.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Efficient querying of 'top values' for PostgreSQL"; - homepage = https://github.com/citusdata/postgresql-topn; + homepage = "https://github.com/citusdata/postgresql-topn"; maintainers = with maintainers; [ thoughtpolice ]; platforms = postgresql.meta.platforms; license = licenses.agpl3; diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 13aa5d942e5..5f1b6b819e8 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PostgreSQL/PostGIS extension that provides geospatial routing functionality"; - homepage = https://pgrouting.org/; + homepage = "https://pgrouting.org/"; maintainers = [ maintainers.steve-chavez ]; platforms = postgresql.meta.platforms; license = licenses.gpl2; diff --git a/pkgs/servers/sql/postgresql/ext/pgtap.nix b/pkgs/servers/sql/postgresql/ext/pgtap.nix index 54e92b977bc..d86c7098401 100644 --- a/pkgs/servers/sql/postgresql/ext/pgtap.nix +++ b/pkgs/servers/sql/postgresql/ext/pgtap.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It can also be used in the xUnit testing style. ''; maintainers = with maintainers; [ willibutz ]; - homepage = https://pgtap.org; + homepage = "https://pgtap.org"; inherit (postgresql.meta) platforms; license = licenses.mit; }; diff --git a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix index 4a80e5cafcb..3bca35095c4 100644 --- a/pkgs/servers/sql/postgresql/ext/pipelinedb.nix +++ b/pkgs/servers/sql/postgresql/ext/pipelinedb.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-performance time-series aggregation for PostgreSQL"; - homepage = https://www.pipelinedb.com/; + homepage = "https://www.pipelinedb.com/"; license = licenses.asl20; platforms = postgresql.meta.platforms; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/servers/sql/postgresql/ext/postgis.nix b/pkgs/servers/sql/postgresql/ext/postgis.nix index 70ba715cf66..c8e26b5a82b 100644 --- a/pkgs/servers/sql/postgresql/ext/postgis.nix +++ b/pkgs/servers/sql/postgresql/ext/postgis.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Geographic Objects for PostgreSQL"; - homepage = https://postgis.net/; + homepage = "https://postgis.net/"; changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS"; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; diff --git a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix index ddefaea1549..70b8dd30927 100644 --- a/pkgs/servers/sql/postgresql/ext/tds_fdw.nix +++ b/pkgs/servers/sql/postgresql/ext/tds_fdw.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A PostgreSQL foreign data wrapper to connect to TDS databases (Sybase and Microsoft SQL Server)"; - homepage = https://github.com/tds-fdw/tds_fdw; + homepage = "https://github.com/tds-fdw/tds_fdw"; maintainers = [ maintainers.steve-chavez ]; platforms = postgresql.meta.platforms; license = licenses.postgresql; diff --git a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix index 7a4b1ed88fc..eaf63fcba6e 100644 --- a/pkgs/servers/sql/postgresql/ext/temporal_tables.nix +++ b/pkgs/servers/sql/postgresql/ext/temporal_tables.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Temporal Tables PostgreSQL Extension "; - homepage = https://github.com/mlt/temporal_tables; + homepage = "https://github.com/mlt/temporal_tables"; maintainers = with maintainers; [ ggpeti ]; platforms = postgresql.meta.platforms; license = licenses.bsd2; diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 42a8d9de49e..606eaeb65ac 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scales PostgreSQL for time-series data via automatic partitioning across time and space"; - homepage = https://www.timescale.com/; + homepage = "https://www.timescale.com/"; maintainers = with maintainers; [ volth marsam ]; platforms = postgresql.meta.platforms; license = licenses.asl20; diff --git a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix index 77e4cd9df7a..f05fa6312d8 100644 --- a/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix +++ b/pkgs/servers/sql/postgresql/ext/tsearch_extras.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Provides a few PostgreSQL functions for a lower-level data full text search"; - homepage = https://github.com/zulip/tsearch_extras/; + homepage = "https://github.com/zulip/tsearch_extras/"; license = licenses.postgresql; platforms = postgresql.meta.platforms; maintainers = with maintainers; [ DerTim1 ]; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 0daf7533a60..efd8cd02a15 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; - homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; + homepage = "http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 17ec49d1613..bca1aae82e5 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; - homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; + homepage = "http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/"; #configure: The current version [...] can only be built on 64bit platforms platforms = [ "x86_64-linux" ]; license = licenses.gpl2; diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index 8452adcf222..a5274c855f7 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A caching proxy for the Web supporting HTTP, HTTPS, FTP, and more"; - homepage = http://www.squid-cache.org; + homepage = "http://www.squid-cache.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ fpletz raskin ]; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index f7b4dd84d32..cbeacece3e1 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"; license = licenses.gpl2Plus; - homepage = https://www.rutschle.net/tech/sslh/README.html; + homepage = "https://www.rutschle.net/tech/sslh/README.html"; maintainers = with maintainers; [ koral fpletz ]; platforms = platforms.all; }; diff --git a/pkgs/servers/syncserver/default.nix b/pkgs/servers/syncserver/default.nix index d4192375801..24c093fde50 100644 --- a/pkgs/servers/syncserver/default.nix +++ b/pkgs/servers/syncserver/default.nix @@ -39,7 +39,7 @@ in python.pkgs.buildPythonPackage rec { meta = with lib; { description = "Run-Your-Own Firefox Sync Server"; - homepage = https://github.com/mozilla-services/syncserver; + homepage = "https://github.com/mozilla-services/syncserver"; platforms = platforms.unix; license = licenses.mpl20; maintainers = with maintainers; [ nadrieril ]; diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index ac3dccdab73..7dc32972fe4 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://www.tegola.io/; + homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; maintainers = with maintainers; [ ingenieroariel ]; platforms = platforms.unix; diff --git a/pkgs/servers/tmate-ssh-server/default.nix b/pkgs/servers/tmate-ssh-server/default.nix index 836fa33f3f7..ca188ee951d 100644 --- a/pkgs/servers/tmate-ssh-server/default.nix +++ b/pkgs/servers/tmate-ssh-server/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://tmate.io/; + homepage = "https://tmate.io/"; description = "tmate SSH Server"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index f3c97e8adcc..d2a784cdf13 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -31,7 +31,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://traefik.io; + homepage = "https://traefik.io"; description = "A modern reverse proxy"; license = licenses.mit; maintainers = with maintainers; [ hamhut1066 vdemeester ]; diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index c1694316f3e..4478c4ab8d7 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based news feed (RSS/Atom) aggregator"; license = licenses.gpl2Plus; - homepage = https://tt-rss.org; + homepage = "https://tt-rss.org"; maintainers = with maintainers; [ globin zohl ]; platforms = platforms.all; }; diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index 0600640155b..14e6eaa77ae 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Plugin for TT-RSS to authenticate users via ldap"; license = licenses.asl20; - homepage = https://github.com/hydrian/TTRSS-Auth-LDAP; + homepage = "https://github.com/hydrian/TTRSS-Auth-LDAP"; maintainers = with maintainers; [ mic92 ]; platforms = platforms.all; }; diff --git a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix index 7c3d6a5b57e..a6f47c1ccbf 100644 --- a/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix +++ b/pkgs/servers/tt-rss/plugin-tumblr-gdpr/default.nix @@ -23,7 +23,7 @@ The name of the plugin in TT-RSS is 'tumblr_gdpr'. ''; license = licenses.gpl3; - homepage = https://github.com/GregThib/ttrss-tumblr-gdpr; + homepage = "https://github.com/GregThib/ttrss-tumblr-gdpr"; maintainers = with maintainers; [ das_j ]; platforms = platforms.all; }; diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index 3358973fc4e..bee9b0e9a7c 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Share your terminal over the web"; - homepage = https://github.com/tsl0922/ttyd; + homepage = "https://github.com/tsl0922/ttyd"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 9a01bf3eed6..009dd9bfc43 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation { Tvheadend is a TV streaming server and recorder for Linux, FreeBSD and Android supporting DVB-S, DVB-S2, DVB-C, DVB-T, ATSC, IPTV, SAT>IP and HDHomeRun as input sources. Tvheadend offers the HTTP (VLC, MPlayer), HTSP (Kodi, Movian) and SAT>IP streaming.''; - homepage = https://tvheadend.org; + homepage = "https://tvheadend.org"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ simonvandel ]; diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 4f5d9636fe6..3dea897971a 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "u9fs-20110513"; src = fetchhg { - url = https://bitbucket.org/plan9-from-bell-labs/u9fs; + url = "https://bitbucket.org/plan9-from-bell-labs/u9fs"; rev = "9474edb23b11"; sha256 = "0irwyk8vnvx0fmz8lmbdb2jrlvas8imr61jr76a1pkwi9wpf2wv6"; }; @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Serve 9P from Unix"; - homepage = http://plan9.bell-labs.com/magic/man2html/4/u9fs; + homepage = "http://plan9.bell-labs.com/magic/man2html/4/u9fs"; license = licenses.free; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix index cddfdf9f48f..2849f8c7e74 100644 --- a/pkgs/servers/udpt/default.nix +++ b/pkgs/servers/udpt/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { description = "A lightweight UDP torrent tracker"; - homepage = https://naim94a.github.io/udpt; + homepage = "https://naim94a.github.io/udpt"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 13e7fb7b93b..d049991036f 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted UDP based FTP with multicast"; - homepage = http://uftp-multicast.sourceforge.net/; + homepage = "http://uftp-multicast.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.fadenb ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index 11dd5449b4b..05c67b0ce1c 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High performance peer-to-peer hub for the ADC network"; - homepage = https://www.uhub.org/; + homepage = "https://www.uhub.org/"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; diff --git a/pkgs/servers/unfs3/default.nix b/pkgs/servers/unfs3/default.nix index 4304dc229e3..c2a0fbbd1c2 100644 --- a/pkgs/servers/unfs3/default.nix +++ b/pkgs/servers/unfs3/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { server. ''; - homepage = http://unfs3.sourceforge.net/; + homepage = "http://unfs3.sourceforge.net/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index f86ae9d7cec..bfee1c81870 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -30,7 +30,7 @@ let ''; meta = with stdenv.lib; { - homepage = http://www.ubnt.com/; + homepage = "http://www.ubnt.com/"; description = "Controller for Ubiquiti UniFi access points"; license = licenses.unfree; platforms = platforms.unix; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 7669053d229..29b807f1792 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -4,10 +4,15 @@ , pam, withPAM ? stdenv.isLinux , systemd, withSystemd ? stdenv.isLinux , python2, python3, ncurses -, ruby, php-embed, libmysqlclient +, ruby, php, libmysqlclient }: -let pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { +let php-embed = php.override { + config.php.embed = true; + config.php.apxs2 = false; + }; + + pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { interpreter = pkg.interpreter; path = "plugins/python"; inputs = [ pkg ncurses ]; @@ -92,7 +97,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = toString (lib.optional withSystemd "-lsystemd" ++ lib.concatMap (x: x.NIX_CFLAGS_LINK or []) needed); meta = with stdenv.lib; { - homepage = https://uwsgi-docs.readthedocs.org/en/latest/; + homepage = "https://uwsgi-docs.readthedocs.org/en/latest/"; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar schneefux globin ]; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 8d49846cbc0..27e0edfcc2b 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -32,7 +32,7 @@ let meta = with stdenv.lib; { description = "Web application accelerator also known as a caching HTTP reverse proxy"; - homepage = https://www.varnish-cache.org; + homepage = "https://www.varnish-cache.org"; license = licenses.bsd2; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/varnish/digest.nix b/pkgs/servers/varnish/digest.nix index f11c577288f..8d69451f8b5 100644 --- a/pkgs/servers/varnish/digest.nix +++ b/pkgs/servers/varnish/digest.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Digest and HMAC vmod"; - homepage = https://github.com/varnish/libvmod-digest; + homepage = "https://github.com/varnish/libvmod-digest"; inherit (varnish.meta) license platforms maintainers; }; } diff --git a/pkgs/servers/varnish/dynamic.nix b/pkgs/servers/varnish/dynamic.nix index 7db4680ac62..c43f00b7a6b 100644 --- a/pkgs/servers/varnish/dynamic.nix +++ b/pkgs/servers/varnish/dynamic.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dynamic director similar to the DNS director from Varnish 3"; - homepage = https://github.com/nigoroll/libvmod-dynamic; + homepage = "https://github.com/nigoroll/libvmod-dynamic"; inherit (varnish.meta) license platforms maintainers; }; } diff --git a/pkgs/servers/varnish/modules.nix b/pkgs/servers/varnish/modules.nix index 32c462e4a77..69ee7028de8 100644 --- a/pkgs/servers/varnish/modules.nix +++ b/pkgs/servers/varnish/modules.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Collection of Varnish Cache modules (vmods) by Varnish Software"; - homepage = https://github.com/varnish/varnish-modules; + homepage = "https://github.com/varnish/varnish-modules"; inherit (varnish.meta) license platforms maintainers; }; } diff --git a/pkgs/servers/web-apps/frab/default.nix b/pkgs/servers/web-apps/frab/default.nix index 0b0583f1fb6..88e95be4619 100644 --- a/pkgs/servers/web-apps/frab/default.nix +++ b/pkgs/servers/web-apps/frab/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Web-based conference planning and management system"; - homepage = https://github.com/frab/frab; + homepage = "https://github.com/frab/frab"; license = licenses.mit; broken = true; # 2018-09-08; no successful hydra build since 2018-02-14 }; diff --git a/pkgs/servers/web-apps/matomo/default.nix b/pkgs/servers/web-apps/matomo/default.nix index 90a9a88986e..372bda4061b 100644 --- a/pkgs/servers/web-apps/matomo/default.nix +++ b/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "3.13.3"; - sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz"; + version = "3.13.4"; + sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw"; }; matomo-beta = { - version = "3.13.3"; + version = "3.13.4"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "11mv7q33nhlz9ylsmwrhs315p14imr7sgr70gdbmi9p8jxc7kxrz"; + sha256 = "0yd24hn3ajj5bhzv8f5xr6wpgh2ma9zilzbm9c1n225q553scgjw"; }; }; common = pname: { version, sha256, beta ? null }: @@ -100,7 +100,7 @@ let meta = with stdenv.lib; { description = "A real-time web analytics application"; license = licenses.gpl3Plus; - homepage = https://matomo.org/; + homepage = "https://matomo.org/"; platforms = platforms.all; maintainers = with maintainers; [ florianjacob kiwi ]; }; diff --git a/pkgs/servers/web-apps/mediawiki/default.nix b/pkgs/servers/web-apps/mediawiki/default.nix index d16d59af6b9..c23fb685c60 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.34.0"; + version = "1.34.1"; src = with stdenv.lib; fetchurl { url = "https://releases.wikimedia.org/mediawiki/${versions.majorMinor version}/${pname}-${version}.tar.gz"; - sha256 = "1lckjnharwxh9xb7gxdxrkb0r3xgd0dh4019cnbixn5mmzgc696y"; + sha256 = "0jg1ls5xy2bmvvd63lpvnkj53rfmik6sy2px14mphxba3gbcpf5c"; }; prePatch = '' diff --git a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix index 1b61632824f..8fea1f99256 100644 --- a/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix +++ b/pkgs/servers/web-apps/pgpkeyserver-lite/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/mattrude/pgpkeyserver-lite; + homepage = "https://github.com/mattrude/pgpkeyserver-lite"; description = "A lightweight static front-end for a sks keyserver."; license = licenses.gpl3; maintainers = with maintainers; [ calbrecht globin ]; diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index 5c105e85a87..0dca4acc6b9 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based kanban board"; license = licenses.osl3; - homepage = http://restya.com; + homepage = "http://restya.com"; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index 6545151df23..d0ff1391796 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -4,37 +4,40 @@ with python3Packages; buildPythonApplication rec { pname = "searx"; - version = "0.15.0"; + version = "0.16.0"; # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "05si0fn57z1g80l6003cs0ypag2m6zyi3dgsi06pvjp066xbrjvd"; + sha256 = "0hfa4nmis98yvghxw866rzjpmhb2ln8l6l8g9yx4m79b2lk76xcs"; }; postPatch = '' substituteInPlace requirements.txt \ - --replace 'certifi==2017.11.5' 'certifi' \ - --replace 'flask==1.0.2' 'flask==1.0.*' \ - --replace 'flask-babel==0.11.2' 'flask-babel==0.11.*' \ - --replace 'lxml==4.2.3' 'lxml==4.2.*' \ - --replace 'idna==2.7' 'idna' \ + --replace 'certifi==2019.3.9' 'certifi' \ + --replace 'flask==1.0.2' 'flask' \ + --replace 'flask-babel==0.12.2' 'flask-babel' \ + --replace 'jinja2==2.10.1' 'jinja2' \ + --replace 'lxml==4.3.3' 'lxml' \ + --replace 'idna==2.8' 'idna' \ --replace 'pygments==2.1.3' 'pygments>=2.1,<3.0' \ - --replace 'pyopenssl==18.0.0' 'pyopenssl' \ - --replace 'python-dateutil==2.7.3' 'python-dateutil==2.7.*' + --replace 'pyopenssl==19.0.0' 'pyopenssl' \ + --replace 'python-dateutil==2.8.0' 'python-dateutil==2.8.*' \ + --replace 'pyyaml==5.1' 'pyyaml' substituteInPlace requirements-dev.txt \ --replace 'plone.testing==5.0.0' 'plone.testing' \ - --replace 'pep8==1.7.1' 'pep8==1.7.*' \ - --replace 'splinter==0.7.5' 'splinter' \ - --replace 'selenium==3.5.0' 'selenium' + --replace 'pep8==1.7.0' 'pep8==1.7.*' \ + --replace 'splinter==0.11.0' 'splinter' \ + --replace 'selenium==3.141.0' 'selenium' ''; propagatedBuildInputs = [ pyyaml lxml grequests flaskbabel flask requests gevent speaklater Babel pytz dateutil pygments pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks + jinja2 ]; checkInputs = [ @@ -44,13 +47,12 @@ buildPythonApplication rec { preCheck = '' rm tests/test_robot.py # A variable that is imported is commented out - rm tests/unit/engines/pubmed.py ''; meta = with lib; { - homepage = https://github.com/asciimoo/searx; + homepage = "https://github.com/asciimoo/searx"; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz globin ]; + maintainers = with maintainers; [ matejc fpletz globin danielfullmer ]; }; } diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix index f6000fc4211..e54f9d74c1d 100644 --- a/pkgs/servers/web-apps/selfoss/default.nix +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based news feed (RSS/Atom) aggregator"; - homepage = https://selfoss.aditu.de; + homepage = "https://selfoss.aditu.de"; license = licenses.gpl3; maintainers = with maintainers; [ jtojnar regnat ]; platforms = platforms.all; diff --git a/pkgs/servers/web-apps/shaarli/default.nix b/pkgs/servers/web-apps/shaarli/default.nix index f5bce90c234..288c30734fe 100644 --- a/pkgs/servers/web-apps/shaarli/default.nix +++ b/pkgs/servers/web-apps/shaarli/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The personal, minimalist, super-fast, database free, bookmarking service"; license = licenses.gpl3Plus; - homepage = https://github.com/shaarli/Shaarli; + homepage = "https://github.com/shaarli/Shaarli"; maintainers = with maintainers; [ schneefux ]; platforms = platforms.all; }; diff --git a/pkgs/servers/web-apps/shaarli/material-theme.nix b/pkgs/servers/web-apps/shaarli/material-theme.nix index b0829fce733..bce08646a3b 100644 --- a/pkgs/servers/web-apps/shaarli/material-theme.nix +++ b/pkgs/servers/web-apps/shaarli/material-theme.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { broken = true; description = "A theme base on Google's Material Design for Shaarli, the superfast delicious clone"; license = licenses.mit; - homepage = https://github.com/kalvn/Shaarli-Material; + homepage = "https://github.com/kalvn/Shaarli-Material"; maintainers = with maintainers; [ ]; platforms = platforms.all; }; diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index bd17f2f267c..dd4cdc08287 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "shiori"; @@ -13,8 +13,6 @@ buildGoModule rec { sha256 = "13and7gh2882khqppwz3wwq44p7az4bfdfjvlnqcpqyi8xa28pmq"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Simple bookmark manager built with Go"; homepage = "https://github.com/go-shiori/shiori"; diff --git a/pkgs/servers/web-apps/virtlyst/default.nix b/pkgs/servers/web-apps/virtlyst/default.nix index 4be14b37bd2..69270afb76b 100644 --- a/pkgs/servers/web-apps/virtlyst/default.nix +++ b/pkgs/servers/web-apps/virtlyst/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Web interface to manage virtual machines with libvirt"; - homepage = https://github.com/cutelyst/Virtlyst; + homepage = "https://github.com/cutelyst/Virtlyst"; license = licenses.agpl3Plus; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix index a105531ff4e..e4f1a3009ee 100644 --- a/pkgs/servers/web-apps/wallabag/default.nix +++ b/pkgs/servers/web-apps/wallabag/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { After a package upgrade, empty the `var/cache` folder. ''; license = licenses.mit; - homepage = http://wallabag.org; + homepage = "http://wallabag.org"; maintainers = with maintainers; [ schneefux ]; platforms = platforms.all; }; diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 00ea34829aa..9cab8c4a9ba 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.3.2"; + version = "5.4"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "0rq1j431x0fvcpry721hxglszql4c80qr26fglcdlm51h9z6i1p1"; + sha256 = "10zjgbr96ri87r5v7860vg5ndbnjfhjhily4m9nyl60f1lbjdhrr"; }; installPhase = '' diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 97506ce7447..8f3c1b64485 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -9,7 +9,7 @@ lib.makeScope newScope (self: with self; { name = "appres-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/appres-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/appres-1.0.5.tar.bz2"; sha256 = "0a2r4sxky3k7b3kdb5pbv709q9b5zi3gxjz336wl66f828vqkbgz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -22,7 +22,7 @@ lib.makeScope newScope (self: with self; { name = "bdftopcf-1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2; + url = "mirror://xorg/individual/app/bdftopcf-1.1.tar.bz2"; sha256 = "18hiscgljrz10zjcws25bis32nyrg3hzgmiq6scrh7izqmgz0kab"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -35,7 +35,7 @@ lib.makeScope newScope (self: with self; { name = "bitmap-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/bitmap-1.0.9.tar.gz; + url = "mirror://xorg/individual/app/bitmap-1.0.9.tar.gz"; sha256 = "0kzbv5wh02798l77y9y8d8sjkmzm9cvsn3rjh8a86v5waj50apsb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -48,7 +48,7 @@ lib.makeScope newScope (self: with self; { name = "editres-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/editres-1.0.7.tar.bz2; + url = "mirror://xorg/individual/app/editres-1.0.7.tar.bz2"; sha256 = "04awfwmy3f9f0bchidc4ssbgrbicn5gzasg3jydpfnp5513d76h8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -61,7 +61,7 @@ lib.makeScope newScope (self: with self; { name = "encodings-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/encodings-1.0.5.tar.bz2; + url = "mirror://xorg/individual/font/encodings-1.0.5.tar.bz2"; sha256 = "0caafx0yqqnqyvbalxhh3mb0r9v36xmcy5zjhygb2i508dhy35mx"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -74,7 +74,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-100dpi-1.0.3.tar.bz2"; sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -88,7 +88,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-75dpi-1.0.3.tar.bz2"; sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -102,7 +102,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-utopia-100dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.4.tar.bz2"; sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -116,7 +116,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-utopia-75dpi-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.4.tar.bz2"; sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -130,7 +130,7 @@ lib.makeScope newScope (self: with self; { name = "font-adobe-utopia-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.4.tar.bz2"; sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -144,7 +144,7 @@ lib.makeScope newScope (self: with self; { name = "font-alias-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-alias-1.0.3.tar.bz2"; sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -157,7 +157,7 @@ lib.makeScope newScope (self: with self; { name = "font-arabic-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-arabic-misc-1.0.3.tar.bz2"; sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -171,7 +171,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.3.tar.bz2"; sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -185,7 +185,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.3.tar.bz2"; sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -199,7 +199,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-lucidatypewriter-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2"; sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -213,7 +213,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-lucidatypewriter-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2"; sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -227,7 +227,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-ttf-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-ttf-1.0.3.tar.bz2"; sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -241,7 +241,7 @@ lib.makeScope newScope (self: with self; { name = "font-bh-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bh-type1-1.0.3.tar.bz2"; sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -255,7 +255,7 @@ lib.makeScope newScope (self: with self; { name = "font-bitstream-100dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.3.tar.bz2"; sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -269,7 +269,7 @@ lib.makeScope newScope (self: with self; { name = "font-bitstream-75dpi-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.3.tar.bz2"; sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -283,7 +283,7 @@ lib.makeScope newScope (self: with self; { name = "font-bitstream-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.3.tar.bz2"; sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -297,7 +297,7 @@ lib.makeScope newScope (self: with self; { name = "font-cronyx-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.3.tar.bz2"; sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -311,7 +311,7 @@ lib.makeScope newScope (self: with self; { name = "font-cursor-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-cursor-misc-1.0.3.tar.bz2"; sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -325,7 +325,7 @@ lib.makeScope newScope (self: with self; { name = "font-daewoo-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-daewoo-misc-1.0.3.tar.bz2"; sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -339,7 +339,7 @@ lib.makeScope newScope (self: with self; { name = "font-dec-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-dec-misc-1.0.3.tar.bz2"; sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -353,7 +353,7 @@ lib.makeScope newScope (self: with self; { name = "font-ibm-type1-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-ibm-type1-1.0.3.tar.bz2"; sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -367,7 +367,7 @@ lib.makeScope newScope (self: with self; { name = "font-isas-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-isas-misc-1.0.3.tar.bz2"; sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -381,7 +381,7 @@ lib.makeScope newScope (self: with self; { name = "font-jis-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-jis-misc-1.0.3.tar.bz2"; sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -395,7 +395,7 @@ lib.makeScope newScope (self: with self; { name = "font-micro-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-micro-misc-1.0.3.tar.bz2"; sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -409,7 +409,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.3.tar.bz2"; sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -423,7 +423,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-ethiopic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.3.tar.bz2"; sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -437,7 +437,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-meltho-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-misc-meltho-1.0.3.tar.bz2"; sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -451,7 +451,7 @@ lib.makeScope newScope (self: with self; { name = "font-misc-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2; + url = "mirror://xorg/individual/font/font-misc-misc-1.1.2.tar.bz2"; sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -465,7 +465,7 @@ lib.makeScope newScope (self: with self; { name = "font-mutt-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-mutt-misc-1.0.3.tar.bz2"; sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -479,7 +479,7 @@ lib.makeScope newScope (self: with self; { name = "font-schumacher-misc-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2; + url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.2.tar.bz2"; sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -493,7 +493,7 @@ lib.makeScope newScope (self: with self; { name = "font-screen-cyrillic-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.4.tar.bz2"; sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -507,7 +507,7 @@ lib.makeScope newScope (self: with self; { name = "font-sony-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-sony-misc-1.0.3.tar.bz2"; sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -521,7 +521,7 @@ lib.makeScope newScope (self: with self; { name = "font-sun-misc-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-sun-misc-1.0.3.tar.bz2"; sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -535,7 +535,7 @@ lib.makeScope newScope (self: with self; { name = "fonttosfnt-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/fonttosfnt-1.0.5.tar.bz2"; sha256 = "00w5in1gznai141wishz8ng7spvi5274n16zj0pdl1ma2vsmy2n8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -548,7 +548,7 @@ lib.makeScope newScope (self: with self; { name = "font-util-1.3.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-util-1.3.1.tar.bz2; + url = "mirror://xorg/individual/font/font-util-1.3.1.tar.bz2"; sha256 = "08drjb6cf84pf5ysghjpb4i7xkd2p86k3wl2a0jxs1jif6qbszma"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -561,7 +561,7 @@ lib.makeScope newScope (self: with self; { name = "font-winitzki-cyrillic-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2; + url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.3.tar.bz2"; sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -575,7 +575,7 @@ lib.makeScope newScope (self: with self; { name = "font-xfree86-type1-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2; + url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.4.tar.bz2"; sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -589,7 +589,7 @@ lib.makeScope newScope (self: with self; { name = "gccmakedep-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2; + url = "mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2"; sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -602,7 +602,7 @@ lib.makeScope newScope (self: with self; { name = "iceauth-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2; + url = "mirror://xorg/individual/app/iceauth-1.0.8.tar.bz2"; sha256 = "1ik0mdidmyvy48hn8p2hwvf3535rf3m96hhf0mvcqrbj44x23vp6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -615,7 +615,7 @@ lib.makeScope newScope (self: with self; { name = "ico-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/ico-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/ico-1.0.5.tar.bz2"; sha256 = "0gvpwfk9kvlfn631dgizc45qc2qqjn9pavdp2q7qb3drkvr64fyp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -628,7 +628,7 @@ lib.makeScope newScope (self: with self; { name = "imake-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/imake-1.0.8.tar.bz2; + url = "mirror://xorg/individual/util/imake-1.0.8.tar.bz2"; sha256 = "00m7l90ws72k1qm101sd2rx92ckd50cszyng5d4dd77jncbf9lmq"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -641,7 +641,7 @@ lib.makeScope newScope (self: with self; { name = "libAppleWM-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2; + url = "mirror://xorg/individual/lib/libAppleWM-1.4.1.tar.bz2"; sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -654,7 +654,7 @@ lib.makeScope newScope (self: with self; { name = "libFS-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2; + url = "mirror://xorg/individual/lib/libFS-1.0.8.tar.bz2"; sha256 = "03xxyvpfa3rhqcld4p2chkil482jn9cp80hj17jdybcv2hkkgqf8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -667,7 +667,7 @@ lib.makeScope newScope (self: with self; { name = "libICE-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2; + url = "mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2"; sha256 = "0j638yvmyna2k4mz465jywgdybgdchdqppfx6xfazg7l5khxr1kg"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -680,7 +680,7 @@ lib.makeScope newScope (self: with self; { name = "libSM-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2; + url = "mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2"; sha256 = "1fwwfq9v3sqmpzpscymswxn76xhxnysa24pfim1mcpxhvjcl89id"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -693,7 +693,7 @@ lib.makeScope newScope (self: with self; { name = "libWindowsWM-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2; + url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2"; sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -706,7 +706,7 @@ lib.makeScope newScope (self: with self; { name = "libX11-1.6.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2; + url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2"; sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -719,7 +719,7 @@ lib.makeScope newScope (self: with self; { name = "libXScrnSaver-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.3.tar.bz2"; sha256 = "1y4vx1vabg7j9hamp0vrfrax5b0lmgm3h0lbgbb3hnkv3dd0f5zr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -732,7 +732,7 @@ lib.makeScope newScope (self: with self; { name = "libXTrap-1.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2; + url = "mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2"; sha256 = "0bi5wxj6avim61yidh9fd3j4n8czxias5m8vss9vhxjnk1aksdwg"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -745,7 +745,7 @@ lib.makeScope newScope (self: with self; { name = "libXau-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2; + url = "mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2"; sha256 = "1v3krc6x0zliaa66qq1bf9j60x5nqfy68v8axaiglxpnvgqcpy6c"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -758,7 +758,7 @@ lib.makeScope newScope (self: with self; { name = "libXaw-1.0.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2; + url = "mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2"; sha256 = "1kdhxplwrn43d9jp3v54llp05kwx210lrsdvqb6944jp29rhdy4f"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -771,7 +771,7 @@ lib.makeScope newScope (self: with self; { name = "libXaw3d-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2"; sha256 = "0i653s8g25cc0mimkwid9366bqkbyhdyjhckx7bw77j20hzrkfid"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -784,7 +784,7 @@ lib.makeScope newScope (self: with self; { name = "libXcomposite-0.4.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2; + url = "mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2"; sha256 = "13sfcglvz87vl58hd9rszwr73z0z4nwga3c12rfh7f5s2ln8l8dk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -797,7 +797,7 @@ lib.makeScope newScope (self: with self; { name = "libXcursor-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2; + url = "mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2"; sha256 = "10l7c9fm0jmpkm9ab9dz8r6m1pr87vvgqjnbx1psz50h4pwfklrs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -810,7 +810,7 @@ lib.makeScope newScope (self: with self; { name = "libXdamage-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2; + url = "mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2"; sha256 = "0igaw2akjf712y3rv7lx473jigxmcv9rs9y8sbrvbhya8f30cd5p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -823,7 +823,7 @@ lib.makeScope newScope (self: with self; { name = "libXdmcp-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXdmcp-1.1.3.tar.bz2"; sha256 = "0ab53h0rkq721ihk5hi469x500f3pgbkm1wy01yf24x5m923nli0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -836,7 +836,7 @@ lib.makeScope newScope (self: with self; { name = "libXext-1.3.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXext-1.3.4.tar.bz2"; sha256 = "0azqxllcsfxc3ilhz6kwc6x7m8wc477p59ir9p0yrsldx766zbar"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -849,7 +849,7 @@ lib.makeScope newScope (self: with self; { name = "libXfixes-5.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXfixes-5.0.3.tar.bz2"; sha256 = "1miana3y4hwdqdparsccmygqr3ic3hs5jrqfzp70hvi2zwxd676y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -862,7 +862,7 @@ lib.makeScope newScope (self: with self; { name = "libXfont-1.5.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2"; sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -875,7 +875,7 @@ lib.makeScope newScope (self: with self; { name = "libXfont2-2.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXfont2-2.0.4.tar.bz2"; sha256 = "1rk9pjxcm01lbr1dxhnvk4f2qrn6zp068qjbvvz5w0z5d0rin5bd"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -888,7 +888,7 @@ lib.makeScope newScope (self: with self; { name = "libXft-2.3.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXft-2.3.3.tar.bz2"; sha256 = "05lja9s54090xwh31r0bqms4v3pimng5xr09g2rdnafx2vk6hp12"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -901,7 +901,7 @@ lib.makeScope newScope (self: with self; { name = "libXi-1.7.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2; + url = "mirror://xorg/individual/lib/libXi-1.7.10.tar.bz2"; sha256 = "0q8hz3slga3w3ch8wp0k7ay9ilhz315qnab0w1y2x9w3cf7hv8rn"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -914,7 +914,7 @@ lib.makeScope newScope (self: with self; { name = "libXinerama-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXinerama-1.1.4.tar.bz2"; sha256 = "086p0axqj57nvkaqa6r00dnr9kyrn1m8blgf0zjy25zpxkbxn200"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -927,7 +927,7 @@ lib.makeScope newScope (self: with self; { name = "libXmu-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXmu-1.1.3.tar.bz2"; sha256 = "0cdpqnx6258i4l6qhphvkdiyspysg0i5caqjy820kp63wwjk4d4w"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -940,7 +940,7 @@ lib.makeScope newScope (self: with self; { name = "libXp-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXp-1.0.3.tar.bz2"; sha256 = "0mwc2jwmq03b1m9ihax5c6gw2ln8rc70zz4fsj3kb7440nchqdkz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -953,7 +953,7 @@ lib.makeScope newScope (self: with self; { name = "libXpm-3.5.13"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2; + url = "mirror://xorg/individual/lib/libXpm-3.5.13.tar.bz2"; sha256 = "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -966,7 +966,7 @@ lib.makeScope newScope (self: with self; { name = "libXpresent-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2; + url = "mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2"; sha256 = "12kvvar3ihf6sw49h6ywfdiwmb8i1gh8wasg1zhzp6hs2hay06n1"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -979,7 +979,7 @@ lib.makeScope newScope (self: with self; { name = "libXrandr-1.5.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2; + url = "mirror://xorg/individual/lib/libXrandr-1.5.2.tar.bz2"; sha256 = "08z0mqywrm7ij8bxlfrx0d2wy6kladdmkva1nw5k6qix82z0xsla"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -992,7 +992,7 @@ lib.makeScope newScope (self: with self; { name = "libXrender-0.9.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2; + url = "mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2"; sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1005,7 +1005,7 @@ lib.makeScope newScope (self: with self; { name = "libXres-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2; + url = "mirror://xorg/individual/lib/libXres-1.2.0.tar.bz2"; sha256 = "1m0jr0lbz9ixpp9ihk68349q0i7ry2379lnfzdy4mrl86ijc2xgz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1018,7 +1018,7 @@ lib.makeScope newScope (self: with self; { name = "libXt-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2; + url = "mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2"; sha256 = "0cbqlyssr8aia88c8i7z59z9d0kp3p2hp6683xhz9ndyv8qza7dk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1031,7 +1031,7 @@ lib.makeScope newScope (self: with self; { name = "libXtst-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2; + url = "mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2"; sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1044,7 +1044,7 @@ lib.makeScope newScope (self: with self; { name = "libXv-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2; + url = "mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2"; sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1057,7 +1057,7 @@ lib.makeScope newScope (self: with self; { name = "libXvMC-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2; + url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2"; sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1070,7 +1070,7 @@ lib.makeScope newScope (self: with self; { name = "libXxf86dga-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2; + url = "mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2"; sha256 = "00vjvcdlc1sga251jkxn6gkxmx9h5n290ffxxpa40qbca1gvr61b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1083,7 +1083,7 @@ lib.makeScope newScope (self: with self; { name = "libXxf86misc-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2"; sha256 = "107k593sx27vjz3v7gbb223add9i7w0bjc90gbb3jqpin3i07758"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1096,7 +1096,7 @@ lib.makeScope newScope (self: with self; { name = "libXxf86vm-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2; + url = "mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2"; sha256 = "0mydhlyn72i7brjwypsqrpkls3nm6vxw0li8b2nw0caz7kwjgvmg"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1109,7 +1109,7 @@ lib.makeScope newScope (self: with self; { name = "libdmx-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2; + url = "mirror://xorg/individual/lib/libdmx-1.1.4.tar.bz2"; sha256 = "0hvjfhrcym770cr0zpqajdy3cda30aiwbjzv16iafkqkbl090gr5"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1122,7 +1122,7 @@ lib.makeScope newScope (self: with self; { name = "libfontenc-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2; + url = "mirror://xorg/individual/lib/libfontenc-1.1.4.tar.bz2"; sha256 = "0y90170dp8wsidr1dzza0grxr1lfh30ji3b5vkjz4j6x1n0wxz1c"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1135,7 +1135,7 @@ lib.makeScope newScope (self: with self; { name = "libpciaccess-0.16"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2; + url = "mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2"; sha256 = "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1148,7 +1148,7 @@ lib.makeScope newScope (self: with self; { name = "libpthread-stubs-0.4"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2; + url = "https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2"; sha256 = "0cz7s9w8lqgzinicd4g36rjg08zhsbyngh0w68c3np8nlc8mkl74"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1161,7 +1161,7 @@ lib.makeScope newScope (self: with self; { name = "libxcb-1.13.1"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2; + url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2"; sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1174,7 +1174,7 @@ lib.makeScope newScope (self: with self; { name = "libxkbfile-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2; + url = "mirror://xorg/individual/lib/libxkbfile-1.1.0.tar.bz2"; sha256 = "1irq9crvscd3yb8sr802dhvvfr35jdy1n2yz094xplmd42mbv3bm"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1187,7 +1187,7 @@ lib.makeScope newScope (self: with self; { name = "libxshmfence-1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2; + url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1200,7 +1200,7 @@ lib.makeScope newScope (self: with self; { name = "listres-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/listres-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/listres-1.0.4.tar.bz2"; sha256 = "041bxkvv6f92sm3hhm977c4gdqdv5r1jyxjqcqfi8vkrg3s2j4ka"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1213,7 +1213,7 @@ lib.makeScope newScope (self: with self; { name = "lndir-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/lndir-1.0.3.tar.bz2; + url = "mirror://xorg/individual/util/lndir-1.0.3.tar.bz2"; sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1226,7 +1226,7 @@ lib.makeScope newScope (self: with self; { name = "luit-20190106"; builder = ./builder.sh; src = fetchurl { - url = https://invisible-mirror.net/archives/luit/luit-20190106.tgz; + url = "https://invisible-mirror.net/archives/luit/luit-20190106.tgz"; sha256 = "081rrajj5hpgx3pvm43grqzscnq5kl320q0wq6zzhf6wrijhz41b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1239,7 +1239,7 @@ lib.makeScope newScope (self: with self; { name = "makedepend-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2; + url = "mirror://xorg/individual/util/makedepend-1.0.6.tar.bz2"; sha256 = "072h9nzh8s5vqfz35dli4fba36fnr219asjrb7p89n8ph0paan6m"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1252,7 +1252,7 @@ lib.makeScope newScope (self: with self; { name = "mkfontscale-1.2.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2; + url = "mirror://xorg/individual/app/mkfontscale-1.2.1.tar.bz2"; sha256 = "1ixsnsm2mn0zy9ksdid0lj6irnhvasfik9mz8bbrs5sajzmra16a"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1265,7 +1265,7 @@ lib.makeScope newScope (self: with self; { name = "oclock-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/oclock-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/oclock-1.0.4.tar.bz2"; sha256 = "1zmfzfmdp42nvapf0qz1bc3i3waq5sjrpkgfw64qs4nmq30wy86c"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1278,7 +1278,7 @@ lib.makeScope newScope (self: with self; { name = "sessreg-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2; + url = "mirror://xorg/individual/app/sessreg-1.1.2.tar.bz2"; sha256 = "0crczl25zynkrslmm8sjaxszhrh4i33m7h5fg4wfdb3k8aarxjyz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1291,7 +1291,7 @@ lib.makeScope newScope (self: with self; { name = "setxkbmap-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2; + url = "mirror://xorg/individual/app/setxkbmap-1.3.2.tar.bz2"; sha256 = "1xdrxs65v7d0rw1yaz0vsz55w4hxym99216p085ya9978j379wlg"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1304,7 +1304,7 @@ lib.makeScope newScope (self: with self; { name = "smproxy-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/smproxy-1.0.6.tar.bz2"; sha256 = "0rkjyzmsdqmlrkx8gy2j4q6iksk58hcc92xzdprkf8kml9ar3wbc"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1317,7 +1317,7 @@ lib.makeScope newScope (self: with self; { name = "transset-1.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/transset-1.0.2.tar.bz2; + url = "mirror://xorg/individual/app/transset-1.0.2.tar.bz2"; sha256 = "088v8p0yfn4r3azabp6662hqikfs2gjb9xmjjd45gnngwwp19b2b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1330,7 +1330,7 @@ lib.makeScope newScope (self: with self; { name = "twm-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/twm-1.0.10.tar.bz2; + url = "mirror://xorg/individual/app/twm-1.0.10.tar.bz2"; sha256 = "1ms5cj1w3g26zg6bxdv1j9hl0pxr4300qnv003cz1q3cl7ffljb4"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1343,7 +1343,7 @@ lib.makeScope newScope (self: with self; { name = "util-macros-1.19.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2; + url = "mirror://xorg/individual/util/util-macros-1.19.2.tar.bz2"; sha256 = "04p7ydqxgq37jklnfj18b70zsifiz4h50wvrk94i2112mmv37r6p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1356,7 +1356,7 @@ lib.makeScope newScope (self: with self; { name = "viewres-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/viewres-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/viewres-1.0.5.tar.bz2"; sha256 = "1mz319kfmvcrdpi22dmdr91mif1j0j3ck1f8mmnz5g1r9kl1in2y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1369,7 +1369,7 @@ lib.makeScope newScope (self: with self; { name = "x11perf-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2; + url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2"; sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1382,7 +1382,7 @@ lib.makeScope newScope (self: with self; { name = "xauth-1.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xauth-1.1.tar.bz2; + url = "mirror://xorg/individual/app/xauth-1.1.tar.bz2"; sha256 = "032klzzw8r09z36x1272ssd79bcisz8j5p8gbdy111fiknvx27bd"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1395,7 +1395,7 @@ lib.makeScope newScope (self: with self; { name = "xbacklight-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2; + url = "mirror://xorg/individual/app/xbacklight-1.2.3.tar.bz2"; sha256 = "1plssg0s3pbslg6rfzxp9sx8ryvn8l32zyvc8zp9zsbsfwjg69rs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1408,7 +1408,7 @@ lib.makeScope newScope (self: with self; { name = "xbitmaps-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2; + url = "mirror://xorg/individual/data/xbitmaps-1.1.2.tar.bz2"; sha256 = "1vh73sc13s7w5r6gnc6irca56s7998bja7wgdivkfn8jccawgw5r"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1421,7 +1421,7 @@ lib.makeScope newScope (self: with self; { name = "xcalc-1.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2; + url = "mirror://xorg/individual/app/xcalc-1.1.0.tar.bz2"; sha256 = "1sxmlcb0sb3h4z05kl5l0kxnhrc0h8c74p9m3zdc7bv58jaldmym"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1434,7 +1434,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-proto-1.13"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2"; sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1447,7 +1447,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2"; sha256 = "1sahmrgbpyki4bb72hxym0zvxwnycmswsxiisgqlln9vrdlr9r26"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1460,7 +1460,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-cursor-0.1.3"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2"; sha256 = "0krr4rcw6r42cncinzvzzdqnmxk3nrgpnadyg2h8k9x10q3hm885"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1473,7 +1473,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-errors-1.0"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2"; sha256 = "158rm913dg3hxrrhyvvxr8bcm0pjy5jws70dhy2s12w1krv829k8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1486,7 +1486,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-image-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-image-0.4.0.tar.bz2"; sha256 = "1z1gxacg7q4cw6jrd26gvi5y04npsyavblcdad1xccc8swvnmf9d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1499,7 +1499,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-keysyms-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-keysyms-0.4.0.tar.bz2"; sha256 = "1nbd45pzc1wm6v5drr5338j4nicbgxa5hcakvsvm5pnyy47lky0f"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1512,7 +1512,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-renderutil-0.3.9"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2"; sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1525,7 +1525,7 @@ lib.makeScope newScope (self: with self; { name = "xcb-util-wm-0.4.1"; builder = ./builder.sh; src = fetchurl { - url = https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2; + url = "https://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2"; sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1538,7 +1538,7 @@ lib.makeScope newScope (self: with self; { name = "xclock-1.0.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xclock-1.0.9.tar.bz2; + url = "mirror://xorg/individual/app/xclock-1.0.9.tar.bz2"; sha256 = "1fr3q4rszgx7x2zxy2ip592a3fgx20hfwac49p2l5b7jqsr1ying"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1551,7 +1551,7 @@ lib.makeScope newScope (self: with self; { name = "xcmsdb-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xcmsdb-1.0.5.tar.bz2"; sha256 = "1ik7gzlp2igz183x70883000ygp99r20x3aah6xhaslbpdhm6n75"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1564,7 +1564,7 @@ lib.makeScope newScope (self: with self; { name = "xcompmgr-1.1.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2; + url = "mirror://xorg/individual/app/xcompmgr-1.1.8.tar.bz2"; sha256 = "0hvjkanrdlvk3ln5a1jx3c9ggziism2jr1na7jl3zyk0y3sdm28b"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1577,7 +1577,7 @@ lib.makeScope newScope (self: with self; { name = "xconsole-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2; + url = "mirror://xorg/individual/app/xconsole-1.0.7.tar.bz2"; sha256 = "1q2ib1626i5da0nda09sp3vzppjrcn82fff83cw7hwr0vy14h56i"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1590,7 +1590,7 @@ lib.makeScope newScope (self: with self; { name = "xcursorgen-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2; + url = "mirror://xorg/individual/app/xcursorgen-1.0.7.tar.bz2"; sha256 = "0ggbv084cavp52hjgcz3vdj0g018axs0m23c03lpc5sgn92gidim"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1603,7 +1603,7 @@ lib.makeScope newScope (self: with self; { name = "xcursor-themes-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2; + url = "mirror://xorg/individual/data/xcursor-themes-1.0.6.tar.bz2"; sha256 = "16a96li0s0ggg60v7f6ywxmsrmxdfizcw55ccv7sp4qjfisca7pf"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1616,7 +1616,7 @@ lib.makeScope newScope (self: with self; { name = "xdm-1.1.12"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdm-1.1.12.tar.bz2; + url = "mirror://xorg/individual/app/xdm-1.1.12.tar.bz2"; sha256 = "1x17hdymf6rd8jmh4n1sd4g5a8ayr5w94nwjw84qs2fs5pvq7lhd"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1629,7 +1629,7 @@ lib.makeScope newScope (self: with self; { name = "xdpyinfo-1.3.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2; + url = "mirror://xorg/individual/app/xdpyinfo-1.3.2.tar.bz2"; sha256 = "0ldgrj4w2fa8jng4b3f3biaj0wyn8zvya88pnk70d7k12pcqw8rh"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1642,7 +1642,7 @@ lib.makeScope newScope (self: with self; { name = "xdriinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xdriinfo-1.0.6.tar.bz2"; sha256 = "0lcx8h3zd11m4w8wf7dyp89826d437iz78cyrix436bqx31x5k6r"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1655,7 +1655,7 @@ lib.makeScope newScope (self: with self; { name = "xev-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xev-1.2.3.tar.bz2; + url = "mirror://xorg/individual/app/xev-1.2.3.tar.bz2"; sha256 = "02ddsdx138g7szhwklpbzi0cxr34871iay3k28kdcihrz8f4zg36"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1668,7 +1668,7 @@ lib.makeScope newScope (self: with self; { name = "xeyes-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2; + url = "mirror://xorg/individual/app/xeyes-1.1.2.tar.bz2"; sha256 = "0lq5j7fryx1wn998jq6h3icz1h6pqrsbs3adskjzjyhn5l6yrg2p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1681,7 +1681,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-evdev-2.10.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2"; sha256 = "1h1y0fwnawlp4yc5llr1l7hwfcxxpln2fxhy6arcf6w6h4z0f9l7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1694,7 +1694,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-joystick-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2"; sha256 = "1awfq496d082brgjbr60lhm6jvr9537rflwxqdfqwfzjy3n6jxly"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1707,7 +1707,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-keyboard-1.9.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2"; sha256 = "12032yg412kyvnmc5fha1in7mpi651d8sa1bk4138s2j2zr01jgp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1720,7 +1720,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-libinput-0.28.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2"; sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1733,7 +1733,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-mouse-1.9.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2"; sha256 = "1iawr1wyl2qch1mqszcs0s84i92mh4xxprflnycbw1adc18b7v4k"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1746,7 +1746,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-synaptics-1.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2"; sha256 = "0xhm03qywwfgkpfl904d08lx00y28m1b6lqmks5nxizixwk3by3s"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1759,7 +1759,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-vmmouse-13.1.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2"; sha256 = "06ckn4hlkpig5vnivl0zj8a7ykcgvrsj8b3iccl1pgn1gaamix8a"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1772,7 +1772,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-input-void-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-input-void-1.4.1.tar.bz2"; sha256 = "171k8b8s42s3w73l7ln9jqwk88w4l7r1km2blx1vy898c854yvpr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1785,7 +1785,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-amdgpu-19.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-amdgpu-19.0.1.tar.bz2"; sha256 = "1mf6s7i423b2xyl469kwnakrpp5fr41sm8hh7vli5jxdd8crg8da"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1798,7 +1798,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-apm-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-apm-1.3.0.tar.bz2"; sha256 = "0znwqfc8abkiha98an8hxsngnz96z6cd976bc4bsvz1km6wqk0c0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1811,7 +1811,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-ark-0.7.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2"; sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1824,7 +1824,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-ast-1.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2"; sha256 = "1pm2cy81ma7ldsw0yfk28b33h9z2hcj5rccrxhfxfgvxsiavrnqy"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1837,7 +1837,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-ati-19.0.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-ati-19.0.1.tar.bz2"; sha256 = "1c31g5q5p3nk9nscwikh1vvfnhdwsxiw7j8v678nlm34hrfh3djw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1850,7 +1850,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-chips-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-chips-1.4.0.tar.bz2"; sha256 = "1gqzy7q9v824m7hqkbbmncxg082zm0d4mafgc97c4skyiwgf9wq7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1863,7 +1863,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-cirrus-1.5.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2"; sha256 = "1asifc6ld2g9kap15vfhvsvyl69lj7pw3d9ra9mi4najllh7pj7d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1876,7 +1876,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2"; sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1889,7 +1889,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-fbdev-0.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-fbdev-0.5.0.tar.bz2"; sha256 = "16a66zr0l1lmssa07i3rzy07djxnb45c17ks8c71h8l06xgxihyw"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1902,7 +1902,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-geode-2.11.19"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-geode-2.11.19.tar.bz2"; sha256 = "0zn9gb49grds5mcs1dlrx241k2w1sgqmx4i5x7v6159xxqhlqsf6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1915,7 +1915,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-glide-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2"; sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1928,7 +1928,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2"; sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1941,7 +1941,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-i128-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-i128-1.4.0.tar.bz2"; sha256 = "1snhpv1igrhifcls3r498kjd14ml6x2xvih7zk9xlsd1ymmhlb4g"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1954,7 +1954,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-i740-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-i740-1.4.0.tar.bz2"; sha256 = "0l3s1m95bdsg4gki943qipq8agswbb84dzcflpxa3vlckwhh3r26"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1967,7 +1967,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2"; sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1980,7 +1980,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-mach64-6.9.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-mach64-6.9.6.tar.bz2"; sha256 = "171wg8r6py1l138s58rlapin3rlpwsg9spmvhc7l68mm3g3hf1vs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -1993,7 +1993,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-mga-2.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-mga-2.0.0.tar.bz2"; sha256 = "0yaxpgyyj9398nzzr5vnsfxcis76z46p9814yzj8179yl7hld296"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2006,7 +2006,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-neomagic-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-neomagic-1.3.0.tar.bz2"; sha256 = "0r4h673kw8fl7afc30anwbjlbhp82mg15fvaxf470xg7z983k0wk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2019,7 +2019,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-newport-0.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-newport-0.2.4.tar.bz2"; sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2032,7 +2032,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-nouveau-1.0.15"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-nouveau-1.0.15.tar.bz2"; sha256 = "0k0xah72ryjwak4dc4crszxrlkmi9x1s7p3sd4la642n77yi1pmf"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2045,7 +2045,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2"; sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2058,7 +2058,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-omap-0.4.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-omap-0.4.5.tar.bz2"; sha256 = "0nmbrx6913dc724y8wj2p6vqfbj5zdjfmsl037v627jj0whx9rwk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2071,7 +2071,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-openchrome-0.6.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-openchrome-0.6.0.tar.bz2"; sha256 = "0x9gq3hw6k661k82ikd1y2kkk4dmgv310xr5q59dwn4k6z37aafs"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2084,7 +2084,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2"; sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2097,7 +2097,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-r128-6.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-r128-6.11.0.tar.bz2"; sha256 = "0snvwmrh8dqyyaq7ggicym6yrsg4brygkx9156r0m095m7fp3rav"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2110,7 +2110,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-rendition-4.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-rendition-4.2.7.tar.bz2"; sha256 = "0yzqcdfrnnyaaaa76d4hpwycpq4x2j8qvg9m4q19lj4xbicwc4cm"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2123,7 +2123,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-s3virge-1.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-s3virge-1.11.0.tar.bz2"; sha256 = "06d1v5s7xf00y18x12cz11sk00rgn0yq95w66kmgzy465pzxvj84"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2136,7 +2136,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2"; sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2149,7 +2149,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2"; sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2162,7 +2162,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-sis-0.11.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-sis-0.11.0.tar.bz2"; sha256 = "0srvrhydjnynfb7b1s145rgmsk4f71iz0ag4icpmb05944d90xr1"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2175,7 +2175,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-sisusb-0.9.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2"; sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2188,7 +2188,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2"; sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2201,7 +2201,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-sunffb-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2"; sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2214,7 +2214,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-sunleo-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2"; sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2227,7 +2227,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-tdfx-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-tdfx-1.5.0.tar.bz2"; sha256 = "0qc5wzwf1n65si9rc37bh224pzahh7gp67vfimbxs0b9yvhq0i9g"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2240,7 +2240,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-tga-1.2.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2"; sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2253,7 +2253,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2"; sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2266,7 +2266,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-v4l-0.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-v4l-0.3.0.tar.bz2"; sha256 = "084x4p4avy72mgm2vnnvkicw3419i6pp3wxik8zqh7gmq4xv5z75"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2279,7 +2279,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-vboxvideo-1.0.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-vboxvideo-1.0.0.tar.bz2"; sha256 = "195z1js3i51qgxvhfw4bxb4dw3jcrrx2ynpm2y3475dypjzs7dkz"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2292,7 +2292,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-vesa-2.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-vesa-2.4.0.tar.bz2"; sha256 = "1373vsxn6qh00na0s9c09kf09gj78rzi98zq93id8v5zsya3qi5z"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2305,7 +2305,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-vmware-13.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-vmware-13.3.0.tar.bz2"; sha256 = "0v06qhm059klq40m2yx4wypzb7h53aaassbjfmm6clcyclj1k5s7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2318,7 +2318,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-voodoo-1.2.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-voodoo-1.2.5.tar.bz2"; sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2331,7 +2331,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-wsfb-0.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2"; sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2344,7 +2344,7 @@ lib.makeScope newScope (self: with self; { name = "xf86-video-xgi-1.6.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2; + url = "mirror://xorg/individual/driver/xf86-video-xgi-1.6.1.tar.bz2"; sha256 = "10xd2vah0pnpw5spn40n4p95mpmgvdkly4i1cz51imnlfsw7g8si"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2357,7 +2357,7 @@ lib.makeScope newScope (self: with self; { name = "xfd-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfd-1.1.3.tar.bz2; + url = "mirror://xorg/individual/app/xfd-1.1.3.tar.bz2"; sha256 = "0n6r1v8sm0z0ycqch035xpm46nv5v4mav3kxh36883l3ln5r6bqr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2370,7 +2370,7 @@ lib.makeScope newScope (self: with self; { name = "xfontsel-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xfontsel-1.0.6.tar.bz2"; sha256 = "0700lf6hx7dg88wq1yll7zjvf9gbwh06xff20yffkxb289y0pai5"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2383,7 +2383,7 @@ lib.makeScope newScope (self: with self; { name = "xfs-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfs-1.2.0.tar.bz2; + url = "mirror://xorg/individual/app/xfs-1.2.0.tar.bz2"; sha256 = "0q4q4rbzx159sfn2n52y039fki6nc6a39qdfxa78yjc3aw8i48nv"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2396,7 +2396,7 @@ lib.makeScope newScope (self: with self; { name = "xfsinfo-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xfsinfo-1.0.6.tar.bz2"; sha256 = "1mmir5i7gm71xc0ba8vnizi4744vsd31hknhi4cmgvg6kadqngla"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2409,7 +2409,7 @@ lib.makeScope newScope (self: with self; { name = "xgamma-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xgamma-1.0.6.tar.bz2"; sha256 = "1lr2nb1fhg5fk2fchqxdxyl739602ggwhmgl2wiv5c8qbidw7w8f"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2422,7 +2422,7 @@ lib.makeScope newScope (self: with self; { name = "xgc-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xgc-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xgc-1.0.5.tar.bz2"; sha256 = "0pigvjd3i9fchmj1inqy151aafz3dr0vq1h2zizdb2imvadqv0hl"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2435,7 +2435,7 @@ lib.makeScope newScope (self: with self; { name = "xhost-1.0.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xhost-1.0.8.tar.bz2; + url = "mirror://xorg/individual/app/xhost-1.0.8.tar.bz2"; sha256 = "15n3mnd4i5kh4z32qv11580qjgvnng0wry2y753ljrqkkrbkrp52"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2448,7 +2448,7 @@ lib.makeScope newScope (self: with self; { name = "xinit-1.4.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinit-1.4.1.tar.bz2; + url = "mirror://xorg/individual/app/xinit-1.4.1.tar.bz2"; sha256 = "1fdbakx59vyh474skjydj1bbglpby3y03nl7mxn0z9v8gdhqz6yy"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2461,7 +2461,7 @@ lib.makeScope newScope (self: with self; { name = "xinput-1.6.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xinput-1.6.3.tar.bz2; + url = "mirror://xorg/individual/app/xinput-1.6.3.tar.bz2"; sha256 = "1vb6xdd1xmk5f7pwc5zcbxfray5sf1vbnscqwf2yl8lv7gfq38im"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2474,7 +2474,7 @@ lib.makeScope newScope (self: with self; { name = "xkbcomp-1.4.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2; + url = "mirror://xorg/individual/app/xkbcomp-1.4.2.tar.bz2"; sha256 = "0944rrkkf0dxp07vhh9yr4prslxhqyw63qmbjirbv1bypswvrn3d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2487,7 +2487,7 @@ lib.makeScope newScope (self: with self; { name = "xkbevd-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2; + url = "mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2"; sha256 = "0sprjx8i86ljk0l7ldzbz2xlk8916z5zh78cafjv8k1a63js4c14"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2500,7 +2500,7 @@ lib.makeScope newScope (self: with self; { name = "xkbprint-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/xkbprint-1.0.4.tar.bz2"; sha256 = "04iyv5z8aqhabv7wcpvbvq0ji0jrz1666vw6gvxkvl7szswalgqb"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2513,7 +2513,7 @@ lib.makeScope newScope (self: with self; { name = "xkbutils-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2"; sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2526,7 +2526,7 @@ lib.makeScope newScope (self: with self; { name = "xkeyboard-config-2.27"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2; + url = "mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.27.tar.bz2"; sha256 = "07wh443lhwv1j0q6xnxnji7f7ahh7xphxj90fv02cdd6zv4aw3b9"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2539,7 +2539,7 @@ lib.makeScope newScope (self: with self; { name = "xkill-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xkill-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xkill-1.0.5.tar.bz2"; sha256 = "0szzd9nzn0ybkhnfyizb876irwnjsnb78rcaxx6prb71jmmbpw65"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2552,7 +2552,7 @@ lib.makeScope newScope (self: with self; { name = "xload-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xload-1.1.3.tar.bz2; + url = "mirror://xorg/individual/app/xload-1.1.3.tar.bz2"; sha256 = "01sr6yd6yhyyfgn88l867w6h9dn5ikcynaz5rwji6xqxhw1lhkpk"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2565,7 +2565,7 @@ lib.makeScope newScope (self: with self; { name = "xlsatoms-1.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2; + url = "mirror://xorg/individual/app/xlsatoms-1.1.3.tar.bz2"; sha256 = "10m3a046jvaw5ywx4y65kl84lsxqan70gww1g1r7cf96ijaqz1jp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2578,7 +2578,7 @@ lib.makeScope newScope (self: with self; { name = "xlsclients-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2; + url = "mirror://xorg/individual/app/xlsclients-1.1.4.tar.bz2"; sha256 = "1h8931sn34mcip6vpi4v7hdmr1r58gkbw4s2p97w98kykks2lgvp"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2591,7 +2591,7 @@ lib.makeScope newScope (self: with self; { name = "xlsfonts-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xlsfonts-1.0.6.tar.bz2"; sha256 = "0s6kxgv78chkwsqmhw929f4pf91gq63f4yvixxnan1h00cx0pf49"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2604,7 +2604,7 @@ lib.makeScope newScope (self: with self; { name = "xmag-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmag-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xmag-1.0.6.tar.bz2"; sha256 = "0qg12ifbbk9n8fh4jmyb625cknn8ssj86chd6zwdiqjin8ivr8l7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2617,7 +2617,7 @@ lib.makeScope newScope (self: with self; { name = "xmessage-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xmessage-1.0.5.tar.bz2"; sha256 = "0a90kfm0qz8cn2pbpqfyqrc5s9bfvvy14nj848ynvw56wy0zng9p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2630,7 +2630,7 @@ lib.makeScope newScope (self: with self; { name = "xmodmap-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2; + url = "mirror://xorg/individual/app/xmodmap-1.0.10.tar.bz2"; sha256 = "0z28331i2pm16x671fa9qwsfqdmr6a43bzwmp0dm17a3sx0hjgs7"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2643,7 +2643,7 @@ lib.makeScope newScope (self: with self; { name = "xmore-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xmore-1.0.3.tar.bz2; + url = "mirror://xorg/individual/app/xmore-1.0.3.tar.bz2"; sha256 = "06r514p30v87vx00ddlck9mwazaqk9bx08ip866p1mw2a46iwjk4"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2656,7 +2656,7 @@ lib.makeScope newScope (self: with self; { name = "xorg-cf-files-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2; + url = "mirror://xorg/individual/util/xorg-cf-files-1.0.6.tar.bz2"; sha256 = "0kckng0zs1viz0nr84rdl6dswgip7ndn4pnh5nfwnviwpsfmmksd"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2669,7 +2669,7 @@ lib.makeScope newScope (self: with self; { name = "xorg-docs-1.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2; + url = "mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2"; sha256 = "0jrc4jmb4raqawx0j9jmhgasr0k6sxv0bm2hrxjh9hb26iy6gf14"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2682,7 +2682,7 @@ lib.makeScope newScope (self: with self; { name = "xorgproto-2019.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2; + url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2"; sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2695,7 +2695,7 @@ lib.makeScope newScope (self: with self; { name = "xorg-server-1.20.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2; + url = "mirror://xorg/individual/xserver/xorg-server-1.20.7.tar.bz2"; sha256 = "18bfl04ihw1jr3h0fs522nnxxq5ixjay77y9dcymnkzk23q8cndx"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2708,7 +2708,7 @@ lib.makeScope newScope (self: with self; { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2; + url = "mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2"; sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2721,7 +2721,7 @@ lib.makeScope newScope (self: with self; { name = "xpr-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xpr-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xpr-1.0.5.tar.bz2"; sha256 = "07qy9lwjvxighcmg6qvjkgagad3wwvidrfx0jz85lgynz3qy0dmr"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2734,7 +2734,7 @@ lib.makeScope newScope (self: with self; { name = "xprop-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xprop-1.2.4.tar.bz2; + url = "mirror://xorg/individual/app/xprop-1.2.4.tar.bz2"; sha256 = "0lzp7kyhpwd5hm83j2zm6j3w3z1z5i4ykgg2nwr01ij6dq4znxwc"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2747,7 +2747,7 @@ lib.makeScope newScope (self: with self; { name = "xrandr-1.5.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2; + url = "mirror://xorg/individual/app/xrandr-1.5.0.tar.bz2"; sha256 = "1kaih7rmzxr1vp5a5zzjhm5x7dn9mckya088sqqw026pskhx9ky1"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2760,7 +2760,7 @@ lib.makeScope newScope (self: with self; { name = "xrdb-1.2.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2; + url = "mirror://xorg/individual/app/xrdb-1.2.0.tar.bz2"; sha256 = "0ik9gh6363c47pr0dp7q22nfs8vmavjg2v4bsr0604ppl77nafpj"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2773,7 +2773,7 @@ lib.makeScope newScope (self: with self; { name = "xrefresh-1.0.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2; + url = "mirror://xorg/individual/app/xrefresh-1.0.6.tar.bz2"; sha256 = "0lv3rlshh7s0z3aqx5ahnnf8cl082m934bk7gv881mz8nydznz98"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2786,7 +2786,7 @@ lib.makeScope newScope (self: with self; { name = "xset-1.2.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xset-1.2.4.tar.bz2; + url = "mirror://xorg/individual/app/xset-1.2.4.tar.bz2"; sha256 = "0my987wjvra7l92ry6q44ky383yg3phzxhdbn3lqhapm1ll9bzg4"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2799,7 +2799,7 @@ lib.makeScope newScope (self: with self; { name = "xsetroot-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2; + url = "mirror://xorg/individual/app/xsetroot-1.1.2.tar.bz2"; sha256 = "0z21mqvmdl6rl63q77479wgkfygnll57liza1i3va7sr4fx45i0h"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2812,7 +2812,7 @@ lib.makeScope newScope (self: with self; { name = "xsm-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xsm-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/xsm-1.0.4.tar.bz2"; sha256 = "09a4ss1fnrh1sgm21r4n5pivawf34paci3rn6mscyljf7a4vcd4r"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2825,7 +2825,7 @@ lib.makeScope newScope (self: with self; { name = "xstdcmap-1.0.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2; + url = "mirror://xorg/individual/app/xstdcmap-1.0.4.tar.bz2"; sha256 = "12vgzsxv4rw25frkgjyli6w6hy10lgpvsx9wzw2v5l5a3qzqp286"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2838,7 +2838,7 @@ lib.makeScope newScope (self: with self; { name = "xtrans-1.4.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2; + url = "mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2"; sha256 = "0wyp0yc6gi72hwc3kjmvm3vkj9p6s407cb6dxx37jh9wb68l8z1p"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2851,7 +2851,7 @@ lib.makeScope newScope (self: with self; { name = "xtrap-1.0.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2; + url = "mirror://xorg/individual/app/xtrap-1.0.3.tar.bz2"; sha256 = "0sqm4j1zflk1s94iq4waa70hna1xcys88v9a70w0vdw66czhvj2j"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2864,7 +2864,7 @@ lib.makeScope newScope (self: with self; { name = "xvinfo-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2; + url = "mirror://xorg/individual/app/xvinfo-1.1.4.tar.bz2"; sha256 = "0gz7fvxavqlrqynpfbrm2nc9yx8h0ksnbnv34fj7n1q6cq6j4lq3"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2877,7 +2877,7 @@ lib.makeScope newScope (self: with self; { name = "xwd-1.0.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xwd-1.0.7.tar.bz2; + url = "mirror://xorg/individual/app/xwd-1.0.7.tar.bz2"; sha256 = "1537i8q8pgf0sjklakzfvjwrq5b246qjywrx9ll8xfg0p6w1as6d"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2890,7 +2890,7 @@ lib.makeScope newScope (self: with self; { name = "xwininfo-1.1.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2; + url = "mirror://xorg/individual/app/xwininfo-1.1.4.tar.bz2"; sha256 = "00avrpw4h5mr1klp41lv2j4dmq465v6l5kb5bhm4k5ml8sm9i543"; }; hardeningDisable = [ "bindnow" "relro" ]; @@ -2903,7 +2903,7 @@ lib.makeScope newScope (self: with self; { name = "xwud-1.0.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/app/xwud-1.0.5.tar.bz2; + url = "mirror://xorg/individual/app/xwud-1.0.5.tar.bz2"; sha256 = "1a8hdgy40smvblnh3s9f0vkqckl68nmivx7d48zk34m8z18p16cr"; }; hardeningDisable = [ "bindnow" "relro" ]; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 58ebc6d984e..e398b9b5d65 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -291,7 +291,7 @@ self: super: libxshmfence = super.libxshmfence.overrideAttrs (attrs: { name = "libxshmfence-1.3"; src = fetchurl { - url = mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2; + url = "mirror://xorg/individual/lib/libxshmfence-1.3.tar.bz2"; sha256 = "1ir0j92mnd1nk37mrv9bz5swnccqldicgszvfsh62jd14q6k115q"; }; outputs = [ "out" "dev" ]; # mainly to avoid propagation @@ -571,7 +571,7 @@ self: super: name = "xorg-server-1.17.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2; + url = "mirror://xorg/individual/xserver/xorg-server-1.17.4.tar.bz2"; sha256 = "0mv4ilpqi5hpg182mzqn766frhi6rw48aba3xfbaj4m82v0lajqc"; }; nativeBuildInputs = [ pkgconfig ]; @@ -581,7 +581,7 @@ self: super: name = "xorg-server-1.18.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; + url = "mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2"; sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/x11/xorg/xcb-util-xrm.nix b/pkgs/servers/x11/xorg/xcb-util-xrm.nix index af526730ca9..e868dbab7f6 100644 --- a/pkgs/servers/x11/xorg/xcb-util-xrm.nix +++ b/pkgs/servers/x11/xorg/xcb-util-xrm.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XCB utility functions for the X resource manager"; - homepage = https://github.com/Airblader/xcb-util-xrm; + homepage = "https://github.com/Airblader/xcb-util-xrm"; license = licenses.mit; # X11 variant platforms = with platforms; unix; }; diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index d033f211c3a..a60025b7977 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -31,7 +31,7 @@ xorgserver.overrideAttrs (oldAttrs: { meta = { description = "An X server for interfacing X11 apps with the Wayland protocol"; - homepage = https://wayland.freedesktop.org/xserver.html; + homepage = "https://wayland.freedesktop.org/xserver.html"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 445c6c57bbf..ebe927a85d8 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Secure replacement for inetd"; platforms = stdenv.lib.platforms.linux; - homepage = http://xinetd.org; + homepage = "http://xinetd.org"; license = stdenv.lib.licenses.free; }; } diff --git a/pkgs/servers/xmpp/biboumi/default.nix b/pkgs/servers/xmpp/biboumi/default.nix index c25c4baf13b..e1cec51e4ab 100644 --- a/pkgs/servers/xmpp/biboumi/default.nix +++ b/pkgs/servers/xmpp/biboumi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; louiz_catch = fetchgit { - url = https://lab.louiz.org/louiz/Catch.git; + url = "https://lab.louiz.org/louiz/Catch.git"; rev = "0a34cc201ef28bf25c88b0062f331369596cb7b7"; # v2.2.1 sha256 = "0ad0sjhmzx61a763d2ali4vkj8aa1sbknnldks7xlf4gy83jfrbl"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern XMPP IRC gateway"; platforms = platforms.unix; - homepage = https://lab.louiz.org/louiz/biboumi; + homepage = "https://lab.louiz.org/louiz/biboumi"; license = licenses.zlib; maintainers = [ maintainers.woffs ]; }; diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix index 0ac216b8e52..2cf4d9465ae 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 utillinux procps ]; in stdenv.mkDerivation rec { - version = "20.01"; + version = "20.03"; pname = "ejabberd"; src = fetchurl { - url = "https://www.process-one.net/downloads/ejabberd/${version}/${pname}-${version}.tgz"; - sha256 = "14bgwa6y17bhnwhcqb2hdl7psds0iqkcawb4kpaw6d7lzzsx4ay6"; + url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/${pname}-${version}.tgz"; + sha256 = "0i013l9cygmgainfid298n6llhs3mblfklry3jw2a6irvhffym0s"; }; nativeBuildInputs = [ fakegit ]; @@ -76,7 +76,7 @@ in stdenv.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "097c84qp00dq8x7ngfqcrv9fa0wm0k94grashmi1fxlasgbvxh18"; + outputHash = "0xwgi9hy6y0m8mwznl6px98kdmkcxg98k62zgqbaqd4paks5zwqa"; }; configureFlags = @@ -113,7 +113,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open-source XMPP application server written in Erlang"; license = licenses.gpl2; - homepage = https://www.ejabberd.im; + homepage = "https://www.ejabberd.im"; platforms = platforms.linux; maintainers = with maintainers; [ sander abbradar ajs124 ]; broken = withElixir; diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 8becdcd6a45..0d552e9e112 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -14,12 +14,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "0.11.3"; # also update communityModules + version = "0.11.5"; # also update communityModules pname = "prosody"; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; - sha256 = "11xz4milv2962qf75vrdwsvd8sy2332nf69202rmvz5989pvvnng"; + sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m"; }; # A note to all those merging automated updates: Please also update this @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { # version. communityModules = fetchhg { url = "https://hg.prosody.im/prosody-modules"; - rev = "b54e98d5c4a1"; - sha256 = "0bzn92j48krb2zhp9gn5bbn5sg0qv15j5lpxfszwqdln3lpmrvzg"; + rev = "acd231e2b46f"; + sha256 = "1b33lsxrrrvarknqz9xs7j7f19bzxxymmfdhch7k70x3yyiwmfsy"; }; buildInputs = [ @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "Open-source XMPP application server written in Lua"; license = licenses.mit; - homepage = https://prosody.im; + homepage = "https://prosody.im"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz globin ]; }; diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix index e4584535901..b0685d7f954 100644 --- a/pkgs/servers/zookeeper/default.nix +++ b/pkgs/servers/zookeeper/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://zookeeper.apache.org; + homepage = "http://zookeeper.apache.org"; description = "Apache Zookeeper"; license = licenses.asl20; maintainers = with maintainers; [ nathan-gs cstrahan pradeepchhetri ]; diff --git a/pkgs/shells/any-nix-shell/default.nix b/pkgs/shells/any-nix-shell/default.nix index d2b7a4929e1..bab39aef244 100644 --- a/pkgs/shells/any-nix-shell/default.nix +++ b/pkgs/shells/any-nix-shell/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "fish and zsh support for nix-shell"; license = licenses.mit; - homepage = https://github.com/haslersn/any-nix-shell; + homepage = "https://github.com/haslersn/any-nix-shell"; maintainers = with maintainers; [ haslersn ]; }; -} \ No newline at end of file +} diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 7ca57ac0156..4cb3c14a9a0 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/bash/; + homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + (if interactive then " (for interactive use)" else ""); diff --git a/pkgs/shells/bash/5.0.nix b/pkgs/shells/bash/5.0.nix index 05aaf39b340..09030493fb6 100644 --- a/pkgs/shells/bash/5.0.nix +++ b/pkgs/shells/bash/5.0.nix @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/bash/; + homepage = "https://www.gnu.org/software/bash/"; description = "GNU Bourne-Again Shell, the de facto standard shell on Linux" + (if interactive then " (for interactive use)" else ""); diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index a741633340d..8efada3413a 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/scop/bash-completion; + homepage = "https://github.com/scop/bash-completion"; description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/shells/dash/default.nix b/pkgs/shells/dash/default.nix index f8d592748b3..7aedd0189e4 100644 --- a/pkgs/shells/dash/default.nix +++ b/pkgs/shells/dash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://gondor.apana.org.au/~herbert/dash/; + homepage = "http://gondor.apana.org.au/~herbert/dash/"; description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible"; platforms = platforms.unix; license = with licenses; [ bsd3 gpl2 ]; diff --git a/pkgs/shells/dgsh/default.nix b/pkgs/shells/dgsh/default.nix index e2fd845c286..0314180e2d5 100644 --- a/pkgs/shells/dgsh/default.nix +++ b/pkgs/shells/dgsh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Directed Graph Shell"; - homepage = http://www.dmst.aueb.gr/dds/sw/dgsh; + homepage = "http://www.dmst.aueb.gr/dds/sw/dgsh"; license = with licenses; asl20; maintainers = with maintainers; [ vrthra ]; platforms = with platforms; all; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 228692efe85..4b9e4817ee8 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "elvish"; - version = "0.13"; + version = "0.13.1"; goPackagePath = "github.com/elves/elvish"; excludedPackages = [ "website" ]; @@ -15,13 +15,11 @@ buildGoModule rec { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "0fprii430p9w8x4wq93iqkgkwi5kypwwlnzgvlcz0mkksayk8bzg"; + sha256 = "0lz9lf1swrn67kymcp2wh67lh3c0ifqm9035gpkd3zynlq3wzqfm"; }; modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "A friendly and expressive command shell"; longDescription = '' @@ -29,7 +27,7 @@ buildGoModule rec { language. It runs on Linux, BSDs, macOS and Windows. Despite its pre-1.0 status, it is already suitable for most daily interactive use. ''; - homepage = https://elv.sh/; + homepage = "https://elv.sh/"; license = licenses.bsd2; maintainers = with maintainers; [ vrthra AndersonTorres ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/shells/es/default.nix b/pkgs/shells/es/default.nix index 446f28ba652..761846843fe 100644 --- a/pkgs/shells/es/default.nix +++ b/pkgs/shells/es/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { functional programming languages, such as Scheme, and the Tcl embeddable programming language. ''; - homepage = http://wryun.github.io/es-shell/; + homepage = "http://wryun.github.io/es-shell/"; license = licenses.publicDomain; maintainers = with maintainers; [ sjmackenzie ttuegel ]; platforms = platforms.all; diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 013cebfd7ec..0ea8dce4405 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -171,7 +171,7 @@ let meta = with stdenv.lib; { description = "Smart and user-friendly command line shell"; - homepage = http://fishshell.com/; + homepage = "http://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ ocharles ]; diff --git a/pkgs/shells/ion/default.nix b/pkgs/shells/ion/default.nix index c58302df210..ca2f7a6d515 100644 --- a/pkgs/shells/ion/default.nix +++ b/pkgs/shells/ion/default.nix @@ -1,29 +1,24 @@ { stdenv, fetchFromGitHub, rustPlatform }: -with rustPlatform; - -buildRustPackage rec { +rustPlatform.buildRustPackage rec { pname = "ion"; - version = "1.0.5"; + version = "unstable-2020-03-22"; src = fetchFromGitHub { owner = "redox-os"; repo = "ion"; - rev = version; - sha256 = "0i0acl5nw254mw8dbfmb4792rr71is98a5wg32yylfnlrk7zlf8z"; + rev = "1fbd29a6d539faa6eb0f3186a361e208d0a0bc05"; + sha256 = "0r5c87cs8jlc9kpb6bi2aypldw1lngf6gzjirf13gi7iy4q08ik7"; }; - cargoSha256 = "0f266kygvw2id771g49s25qsbqb6a0gr1r0czkcj96n5r0wg8wrn"; + cargoSha256 = "1ph3r3vspy700mb8pica8478v9arqz07k2nzpbrdkdkqgfcwlgcg"; meta = with stdenv.lib; { description = "Modern system shell with simple (and powerful) syntax"; - homepage = https://github.com/redox-os/ion; + homepage = "https://gitlab.redox-os.org/redox-os/ion"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; - # This has not had a release since 2017, and no longer compiles with the - # latest Rust compiler. - broken = false; }; passthru = { diff --git a/pkgs/shells/jush/default.nix b/pkgs/shells/jush/default.nix index 833947a6ddb..9894c90bb69 100644 --- a/pkgs/shells/jush/default.nix +++ b/pkgs/shells/jush/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "just a useless shell"; - homepage = https://github.com/troglobit/jush; + homepage = "https://github.com/troglobit/jush"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/shells/ksh/default.nix b/pkgs/shells/ksh/default.nix index 108d1a58758..e27732226f5 100644 --- a/pkgs/shells/ksh/default.nix +++ b/pkgs/shells/ksh/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { provides access to the UNIX system and to many other systems, on the many different computers and workstations on which it is implemented. ''; - homepage = https://github.com/att/ast; + homepage = "https://github.com/att/ast"; license = licenses.cpl10; maintainers = with maintainers; [ ]; platforms = platforms.all; diff --git a/pkgs/shells/liquidprompt/default.nix b/pkgs/shells/liquidprompt/default.nix index 62efabb022c..d6d655d1f17 100644 --- a/pkgs/shells/liquidprompt/default.nix +++ b/pkgs/shells/liquidprompt/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A full-featured & carefully designed adaptive prompt for Bash & Zsh"; - homepage = https://github.com/nojhan/liquidprompt; + homepage = "https://github.com/nojhan/liquidprompt"; license = licenses.agpl3; platforms = platforms.all; maintainers = with maintainers; [ gerschtli ]; diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index 9b48c5c68a1..d817ade9eb6 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also to be readily available under other UNIX(R)-like operating systems. ''; - homepage = https://www.mirbsd.org/mksh.htm; + homepage = "https://www.mirbsd.org/mksh.htm"; license = licenses.bsd3; maintainers = with maintainers; [ AndersonTorres joachifm ]; platforms = platforms.unix; diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 9f3f0da75c9..43e0d2cb56a 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "06w1118cxr5x3l7cq2wc092xvsfkgga8b6kz1gcmhwq0gf7fqirz"; + sha256 = "0cy3rm0yr4ay4hcgw202w5k1sqw09kd75a0yyk0s0v0cxpmssf5n"; }; - cargoSha256 = "1bpb4p4j7lwb70qjsssbr878mfalil4xh8r954aaa2rlcf97fmb7"; + cargoSha256 = "0q89841jwbsvl4c90sl8wgnjjl8q0bb3kw7sl7k9dpnfmj5j144x"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; diff --git a/pkgs/shells/pash/default.nix b/pkgs/shells/pash/default.nix index 8b8601e326c..c646c1c3f9b 100644 --- a/pkgs/shells/pash/default.nix +++ b/pkgs/shells/pash/default.nix @@ -17,7 +17,7 @@ buildDotnetPackage { meta = with stdenv.lib; { description = "An open source implementation of Windows PowerShell"; - homepage = https://github.com/Pash-Project/Pash; + homepage = "https://github.com/Pash-Project/Pash"; maintainers = [ maintainers.fornever maintainers.vrthra ]; platforms = platforms.all; license = with licenses; [ bsd3 gpl3 ]; diff --git a/pkgs/shells/rc/default.nix b/pkgs/shells/rc/default.nix index a8a7d4f6e77..cd5ed860b2e 100644 --- a/pkgs/shells/rc/default.nix +++ b/pkgs/shells/rc/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The Plan 9 shell"; longDescription = "Byron Rakitzis' UNIX reimplementation of Tom Duff's Plan 9 shell."; - homepage = http://tobold.org/article/rc; + homepage = "http://tobold.org/article/rc"; license = with licenses; zlib; maintainers = with maintainers; [ ramkromberg ]; platforms = with platforms; all; diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix index ecefbff7d22..b2bec51a95e 100644 --- a/pkgs/shells/rssh/default.nix +++ b/pkgs/shells/rssh/default.nix @@ -18,42 +18,42 @@ stdenv.mkDerivation rec { # Patches from AUR (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0001-fail-logging.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-fail-logging.patch?h=rssh"; name = "0001-fail-logging.patch"; sha256 = "d30f2f4fdb1b57f94773f5b0968a4da3356b14a040efe69ec1e976c615035c65"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0002-info-to-debug.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-info-to-debug.patch?h=rssh"; name = "0002-info-to-debug.patch"; sha256 = "86f6ecf34f62415b0d6204d4cbebc47322dc2ec71732d06aa27758e35d688fcd"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0003-man-page-spelling.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0003-man-page-spelling.patch?h=rssh"; name = "0003-man-page-spelling.patch"; sha256 = "455b3bbccddf1493999d00c2cd46e62930ef4fd8211e0b7d3a89d8010d6a5431"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0004-mkchroot.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0004-mkchroot.patch?h=rssh"; name = "0004-mkchroot.patch"; sha256 = "f7fd8723d2aa94e64e037c13c2f263a52104af680ab52bfcaea73dfa836457c2"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0005-mkchroot-arch.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0005-mkchroot-arch.patch?h=rssh"; name = "0005-mkchroot-arch.patch"; sha256 = "ac8894c4087a063ae8267d2fdfcde69c2fe6b67a8ff5917e4518b8f73f08ba3f"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0006-mkchroot-symlink.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0006-mkchroot-symlink.patch?h=rssh"; name = "0006-mkchroot-symlink.patch"; sha256 = "bce98728cb9b55c92182d4901c5f9adf49376a07c5603514b0004e3d1c85e9c7"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0007-destdir.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0007-destdir.patch?h=rssh"; name = "0007-destdir.patch"; sha256 = "7fa03644f81dc37d77cc7e2cad994f17f91b2b8a49b1a74e41030a4ac764385e"; }) (fetchurl { - url = https://aur.archlinux.org/cgit/aur.git/plain/0008-rsync-protocol.patch?h=rssh; + url = "https://aur.archlinux.org/cgit/aur.git/plain/0008-rsync-protocol.patch?h=rssh"; name = "0008-rsync-protocol.patch"; sha256 = "0c772afe9088eeded129ead86775ef18e58c318bbc58fc3e2585e7ff09cc5e91"; }) @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { longDescription = '' rssh also includes support for rsync and cvs. For example, if you have a server which you only want to allow users to copy files off of via scp, without providing shell access, you can use rssh to do that. ''; - homepage = http://www.pizzashack.org/rssh/; + homepage = "http://www.pizzashack.org/rssh/"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ arobyn ]; diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index 9db36bc85fc..f9e15d4a0b4 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sftp-server or scp, that lack this ability. ''; - homepage = https://www.gnu.org/software/rush/; + homepage = "https://www.gnu.org/software/rush/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bjg ]; diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index 110beb82804..e22811828fc 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, fetchpatch , ncurses }: +with stdenv.lib; stdenv.mkDerivation rec { pname = "tcsh"; - version = "6.21.00"; + version = "6.22.02"; src = fetchurl { urls = [ @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { "ftp://ftp.astron.com/pub/tcsh/${pname}-${version}.tar.gz" "ftp://ftp.funet.fi/pub/unix/shells/tcsh/${pname}-${version}.tar.gz" ]; - sha256 = "0wp9cqkzdj5ahfyg9bn5z1wnyblqyv9vz4sc5aqmj7rp91a34f64"; + sha256 = "0nw8prz1n0lmr82wnpyhrzmki630afn7p9cfgr3vl00vr9c72a7d"; }; buildInputs = [ ncurses ]; @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67"; }); - meta = with stdenv.lib;{ + meta = { description = "An enhanced version of the Berkeley UNIX C shell (csh)"; longDescription = '' tcsh is an enhanced but completely compatible version of the @@ -37,7 +38,7 @@ stdenv.mkDerivation rec { - history mechanism - job control ''; - homepage = https://www.tcsh.org/; + homepage = "https://www.tcsh.org/"; license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 2a1688480db..dc0a45c3e52 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -1,23 +1,21 @@ { stdenv , fetchFromGitHub -, fetchpatch , python3Packages , glibcLocales , coreutils , git -, python3 }: python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.14"; + version = "0.9.17"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "03g8ilg4dxin3v3rzccdxx9zf8rvyqpxakn1dlpqbgsnwdwa19p4"; + sha256 = "0ynfnphbp69am390m5zfzk5rzj1749vs7rzyq310f6mk7xdq6j4v"; }; LC_ALL = "en_US.UTF-8"; @@ -46,7 +44,8 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A Python-ish, BASHwards-compatible shell"; - homepage = https://xon.sh/; + homepage = "https://xon.sh/"; + changelog = "https://github.com/xonsh/xonsh/releases/tag/${version}"; license = licenses.bsd3; maintainers = with maintainers; [ spwhitt vrthra ]; platforms = platforms.all; diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index c0ae5e03e6c..cc4726a3cb4 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "antibody"; - version = "4.3.1"; + version = "6.0.0"; src = fetchFromGitHub { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "1cxg0173d3xnpyzbisj926vh3qql9rw3q4j1z900m34gw7cvsdpf"; + sha256 = "0m7c879b3f402av20jsybq2dhhckbknlvn2n1csp7xmcz4zcyn1n"; }; - modSha256 = "08k4mzqcva7yq1zmfxhlqnd8kk70zry6cfghxl1bgmhnfjqh61qr"; + modSha256 = "0yny1p8vll1wdqdlwyxf9m4kd5njdm7nq527blqqa680zf2k4h8b"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; diff --git a/pkgs/shells/zsh/antigen/default.nix b/pkgs/shells/zsh/antigen/default.nix index c754d7bbe58..b4812428adf 100644 --- a/pkgs/shells/zsh/antigen/default.nix +++ b/pkgs/shells/zsh/antigen/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "The plugin manager for zsh."; - homepage = http://antigen.sharats.me; + homepage = "http://antigen.sharats.me"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix index 8e050acef1f..3b346e4e44b 100644 --- a/pkgs/shells/zsh/default.nix +++ b/pkgs/shells/zsh/default.nix @@ -81,7 +81,7 @@ EOF a host of other features. ''; license = "MIT-like"; - homepage = http://www.zsh.org/; + homepage = "http://www.zsh.org/"; maintainers = with stdenv.lib.maintainers; [ pSub ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix index e97ef1074f1..075707f425c 100644 --- a/pkgs/shells/zsh/fzf-zsh/default.nix +++ b/pkgs/shells/zsh/fzf-zsh/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/wyntau/fzf-zsh; + homepage = "https://github.com/wyntau/fzf-zsh"; description = "wrap fzf to use in oh-my-zsh"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/shells/zsh/gradle-completion/default.nix b/pkgs/shells/zsh/gradle-completion/default.nix index d13fd8aee00..72667d862a8 100644 --- a/pkgs/shells/zsh/gradle-completion/default.nix +++ b/pkgs/shells/zsh/gradle-completion/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gradle tab completion for bash and zsh"; - homepage = https://github.com/gradle/gradle-completion; + homepage = "https://github.com/gradle/gradle-completion"; license = licenses.mit; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index d23999abf3d..e76ca684210 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "grml's zsh setup"; - homepage = http://grml.org/zsh/; + homepage = "http://grml.org/zsh/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ msteen rvolosatovs ]; diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index 1794979bedf..0f244c4d686 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A ZSH theme optimized for people who use Git & Unicode-compatible fonts and terminals"; - homepage = https://github.com/halfo/lambda-mod-zsh-theme/; + homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/shells/zsh/nix-zsh-completions/default.nix b/pkgs/shells/zsh/nix-zsh-completions/default.nix index 036c388fbda..016cf7205bd 100644 --- a/pkgs/shells/zsh/nix-zsh-completions/default.nix +++ b/pkgs/shells/zsh/nix-zsh-completions/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/spwhitt/nix-zsh-completions; + homepage = "https://github.com/spwhitt/nix-zsh-completions"; description = "ZSH completions for Nix, NixOS, and NixOps"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 5a61cd2e90a..95cc597a57a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { $ cp -v $(nix-env -q --out-path oh-my-zsh | cut -d' ' -f3)/share/oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc ''; - homepage = https://ohmyz.sh/; + homepage = "https://ohmyz.sh/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ scolobb nequissimus ]; diff --git a/pkgs/shells/zsh/spaceship-prompt/default.nix b/pkgs/shells/zsh/spaceship-prompt/default.nix index 0e7536b4fa1..e1839d5dd07 100644 --- a/pkgs/shells/zsh/spaceship-prompt/default.nix +++ b/pkgs/shells/zsh/spaceship-prompt/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Zsh prompt for Astronauts"; - homepage = https://github.com/denysdovhan/spaceship-prompt/; + homepage = "https://github.com/denysdovhan/spaceship-prompt/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ nyanloutre ]; diff --git a/pkgs/shells/zsh/zplug/default.nix b/pkgs/shells/zsh/zplug/default.nix new file mode 100644 index 00000000000..d35eb345dda --- /dev/null +++ b/pkgs/shells/zsh/zplug/default.nix @@ -0,0 +1,30 @@ +{ stdenv, lib, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "zplug"; + version = "2.4.2"; + + src = fetchFromGitHub { + owner = "zplug"; + repo = pname; + rev = version; + sha256 = "0hci1pbs3k5icwfyfw5pzcgigbh9vavprxxvakg1xm19n8zb61b3"; + }; + + dontConfigure = true; + dontBuild = true; + dontPatch = true; + + installPhase = '' + mkdir -p $out + cp -r $src/* $out/ + ''; + + meta = with lib; { + description = "A next-generation plugin manager for zsh"; + homepage = "https://github.com/zplug/zplug"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.s1341 ]; + }; +} diff --git a/pkgs/shells/zsh/zsh-autosuggestions/default.nix b/pkgs/shells/zsh/zsh-autosuggestions/default.nix index 8c9c65c24e4..58e560d2fa4 100644 --- a/pkgs/shells/zsh/zsh-autosuggestions/default.nix +++ b/pkgs/shells/zsh/zsh-autosuggestions/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fish shell autosuggestions for Zsh"; - homepage = https://github.com/zsh-users/zsh-autosuggestions; + homepage = "https://github.com/zsh-users/zsh-autosuggestions"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.loskutov ]; diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix index 6228b97685a..3ef210a0281 100644 --- a/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/pkgs/shells/zsh/zsh-command-time/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Plugin that output time: xx after long commands"; - homepage = https://github.com/popstas/zsh-command-time; + homepage = "https://github.com/popstas/zsh-command-time"; license = licenses.mit; platforms = platforms.unix; }; diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index 35355fe374d..03f6146df7c 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Additional completion definitions for zsh"; - homepage = https://github.com/zsh-users/zsh-completions; + homepage = "https://github.com/zsh-users/zsh-completions"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/shells/zsh/zsh-history-substring-search/default.nix b/pkgs/shells/zsh/zsh-history-substring-search/default.nix index fcd294f4dce..9890993eed6 100644 --- a/pkgs/shells/zsh/zsh-history-substring-search/default.nix +++ b/pkgs/shells/zsh/zsh-history-substring-search/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Fish shell history-substring-search for Zsh"; - homepage = https://github.com/zsh-users/zsh-history-substring-search; + homepage = "https://github.com/zsh-users/zsh-history-substring-search"; license = licenses.bsd3; maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index 382b76916d3..f839cf7cf2e 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests, Security }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles, nixosTests }: buildGoModule rec { pname = "zsh-history"; @@ -13,8 +13,6 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; goPackagePath = "github.com/b4b4r07/history"; @@ -24,10 +22,10 @@ buildGoModule rec { installShellCompletion --zsh --name _history $out/share/zsh/completions/_history ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI to provide enhanced history for your ZSH shell"; license = licenses.mit; - homepage = https://github.com/b4b4r07/history; + homepage = "https://github.com/b4b4r07/history"; platforms = platforms.unix; maintainers = with maintainers; [ kampka ]; }; diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/shells/zsh/zsh-nix-shell/default.nix new file mode 100644 index 00000000000..c424cc33483 --- /dev/null +++ b/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgs }: + +# To make use of this derivation, use +# `programs.zsh.interactiveShellInit = "source ${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh";` + +stdenv.mkDerivation rec { + pname = "zsh-nix-shell-unstable"; + version = "2019-12-20"; + + src = fetchFromGitHub { + owner = "chisui"; + repo = "zsh-nix-shell"; + rev = "a65382a353eaee5a98f068c330947c032a1263bb"; + sha256 = "0l41ac5b7p8yyjvpfp438kw7zl9dblrpd7icjg1v3ig3xy87zv0n"; + }; + + installPhase = '' + install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh-nix-shell + install -D scripts/* --target-directory=$out/share/zsh-nix-shell/scripts + ''; + + meta = with stdenv.lib; { + description = "zsh plugin that lets you use zsh in nix-shell shell"; + homepage = src.meta.homepage; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ aw ]; + }; +} diff --git a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix index c80ff0da60a..676f9458675 100644 --- a/pkgs/shells/zsh/zsh-powerlevel9k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel9k/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A beautiful theme for zsh"; - homepage = https://github.com/bhilburn/powerlevel9k; + homepage = "https://github.com/bhilburn/powerlevel9k"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/shells/zsh/zsh-prezto/default.nix b/pkgs/shells/zsh/zsh-prezto/default.nix index 383d1967531..ec6288a6e63 100644 --- a/pkgs/shells/zsh/zsh-prezto/default.nix +++ b/pkgs/shells/zsh/zsh-prezto/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.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."; - homepage = https://github.com/sorin-ionescu/prezto; + homepage = "https://github.com/sorin-ionescu/prezto"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = with platforms; unix; diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix index 91cf34268ac..13e3bbdc038 100644 --- a/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/MichaelAquilina/zsh-you-should-use; + homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; license = licenses.gpl3; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix index ff0eec893f2..252783cce47 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64-musl.nix @@ -1,11 +1,11 @@ { busybox = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox; + url = "https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/busybox"; sha256 = "01s6bwq84wyrjh3rdsgxni9gkzp7ss8rghg0cmp8zd87l79y8y4g"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz; + url = "https://wdtz.org/files/wjzsj9cmdkc70f78yh072483x8656nci-stdenv-bootstrap-tools-aarch64-unknown-linux-musl/on-server/bootstrap-tools.tar.xz"; sha256 = "0pbqrw9z4ifkijpfpx15l2dzi00rq8c5zg9ghimz5qgr5dx7f7cl"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix index 85a5dd373ab..592f8ee6bef 100644 --- a/pkgs/stdenv/linux/bootstrap-files/aarch64.nix +++ b/pkgs/stdenv/linux/bootstrap-files/aarch64.nix @@ -1,11 +1,11 @@ { busybox = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/aarch64/bb3ef8a95c9659596b8a34d27881cd30ffea2f9f/busybox; + url = "http://tarballs.nixos.org/stdenv-linux/aarch64/bb3ef8a95c9659596b8a34d27881cd30ffea2f9f/busybox"; sha256 = "12qcml1l67skpjhfjwy7gr10nc86gqcwjmz9ggp7knss8gq8pv7f"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/aarch64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz; + url = "http://tarballs.nixos.org/stdenv-linux/aarch64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz"; sha256 = "d3f1bf2a1495b97f45359d5623bdb1f8eb75db43d3bf2059fc127b210f059358"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix index 45ac0d5f9ac..e445a7bba4d 100644 --- a/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/armv6l-musl.nix @@ -1,11 +1,11 @@ { busybox = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/busybox; + url = "https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/busybox"; sha256 = "01d0hp1xgrriiy9w0sd9vbqzwxnpwiyah80pi4vrpcmbwji36j1i"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/bootstrap-tools.tar.xz; + url = "https://wdtz.org/files/xmz441m69qrlfdw47l2k10zf87fsya6r-stdenv-bootstrap-tools-armv6l-unknown-linux-musleabihf/on-server/bootstrap-tools.tar.xz"; sha256 = "1r9mz9w8y5jd7gfwfsrvs20qarzxy7bvrp5dlm41hnx6z617if1h"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/i686.nix b/pkgs/stdenv/linux/bootstrap-files/i686.nix index 81dede2c80e..112d37670c8 100644 --- a/pkgs/stdenv/linux/bootstrap-files/i686.nix +++ b/pkgs/stdenv/linux/bootstrap-files/i686.nix @@ -1,12 +1,12 @@ { busybox = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/busybox; + url = "http://tarballs.nixos.org/stdenv-linux/i686/4907fc9e8d0d82b28b3c56e3a478a2882f1d700f/busybox"; sha256 = "ef4c1be6c7ae57e4f654efd90ae2d2e204d6769364c46469fa9ff3761195cba1"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/i686/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz; + url = "http://tarballs.nixos.org/stdenv-linux/i686/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz"; sha256 = "b9bf20315f8c5c0411679c5326084420b522046057a0850367c67d9514794f1c"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix index 543c1c83849..98a65bd7764 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64-musl.nix @@ -1,11 +1,11 @@ { busybox = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/busybox; + url = "https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/busybox"; sha256 = "0779c2wn00467h76xpqil678gfi1y2p57c7zq2d917jsv2qj5009"; executable = true; }; bootstrapTools = import <nix/fetchurl.nix> { - url = https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz; + url = "https://wdtz.org/files/gywxhjgl70sxippa0pxs0vj5qcgz1wi8-stdenv-bootstrap-tools/on-server/bootstrap-tools.tar.xz"; sha256 = "1dwiqw4xvnm0b5fdgl89lz2qq45f6s9icwxn6n6ams71xw0dbqyi"; }; } diff --git a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix index 2800d571c40..bdfa98c89cb 100644 --- a/pkgs/stdenv/linux/bootstrap-files/x86_64.nix +++ b/pkgs/stdenv/linux/bootstrap-files/x86_64.nix @@ -3,7 +3,7 @@ { bootstrapTools = import <nix/fetchurl.nix> { - url = http://tarballs.nixos.org/stdenv-linux/x86_64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz; + url = "http://tarballs.nixos.org/stdenv-linux/x86_64/c5aabb0d603e2c1ea05f5a93b3be82437f5ebf31/bootstrap-tools.tar.xz"; sha256 = "a5ce9c155ed09397614646c9717fc7cd94b1023d7b76b618d409e4fefd6e9d39"; }; } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 60c0730dce1..6c396b27746 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,13 +16,11 @@ armv7l-linux = import ./bootstrap-files/armv7l.nix; aarch64-linux = import ./bootstrap-files/aarch64.nix; mipsel-linux = import ./bootstrap-files/loongson2f.nix; - powerpc64le-linux = import ./bootstrap-files/ppc64le.nix; }; musl = { aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; armv6l-linux = import ./bootstrap-files/armv6l-musl.nix; x86_64-linux = import ./bootstrap-files/x86_64-musl.nix; - powerpc64le-linux = import ./bootstrap-files/ppc64le-musl.nix; }; }; diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 4efd86ca63f..28c8efffa2a 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuild = true; meta = with stdenv.lib; { - homepage = https://github.com/sagb/alttab; + homepage = "https://github.com/sagb/alttab"; description = "X11 window switcher designed for minimalistic window managers or standalone X11 session"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix index 51f2f5ec249..94e3ac36d07 100644 --- a/pkgs/tools/X11/arandr/default.nix +++ b/pkgs/tools/X11/arandr/default.nix @@ -5,8 +5,11 @@ let inherit (python3Packages) buildPythonApplication docutils pygobject3; + pname = "arandr"; + version = "0.1.10"; + name = "${pname}-${version}"; in buildPythonApplication rec { - name = "arandr-0.1.10"; + inherit pname version; src = fetchurl { url = "https://christian.amsuess.com/tools/arandr/files/${name}.tar.gz"; @@ -29,7 +32,7 @@ in buildPythonApplication rec { propagatedBuildInputs = [ xrandr pygobject3 ]; meta = { - homepage = http://christian.amsuess.com/tools/arandr/; + 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 ]; diff --git a/pkgs/tools/X11/autocutsel/default.nix b/pkgs/tools/X11/autocutsel/default.nix index db17788cea0..ece42502d81 100644 --- a/pkgs/tools/X11/autocutsel/default.nix +++ b/pkgs/tools/X11/autocutsel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - homepage = https://www.nongnu.org/autocutsel/; + 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; diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index f5a8fd24f5e..8540cf6975d 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -134,7 +134,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Bumblebee-Project/Bumblebee; + homepage = "https://github.com/Bumblebee-Project/Bumblebee"; description = "Daemon for managing Optimus videocards (power-on/off, spawns xservers)"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 1948dd2b9c5..dc665bf9c41 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compiles a XKB keyboard description to a keymap suitable for loadkeys"; - homepage = https://salsa.debian.org/installer-team/console-setup; + homepage = "https://salsa.debian.org/installer-team/console-setup"; license = licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ dezgeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix index 9387c62c2a5..af8188883d9 100644 --- a/pkgs/tools/X11/dex/default.nix +++ b/pkgs/tools/X11/dex/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch; + url = "https://github.com/jceb/dex/commit/107358ddf5e1ca4fa56ef1a7ab161dc3b6adc45a.patch"; sha256 = "06dfkfzxp8199by0jc5wim8g8qw38j09dq9p6n9w4zaasla60pjq"; }) ]; meta = with stdenv.lib; { description = "A program to generate and execute DesktopEntry files of the Application type"; - homepage = https://github.com/jceb/dex; + homepage = "https://github.com/jceb/dex"; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix index 7c1457d3e2a..fccb28489ef 100644 --- a/pkgs/tools/X11/dispad/default.nix +++ b/pkgs/tools/X11/dispad/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small daemon for disabling trackpads while typing"; - homepage = https://github.com/BlueDragonX/dispad; + homepage = "https://github.com/BlueDragonX/dispad"; license = licenses.gpl2; maintainers = with maintainers; [ zimbatm ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/dragon-drop/default.nix b/pkgs/tools/X11/dragon-drop/default.nix index 54ece6a9a16..86c867b16ba 100644 --- a/pkgs/tools/X11/dragon-drop/default.nix +++ b/pkgs/tools/X11/dragon-drop/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple drag-and-drop source/sink for X"; - homepage = https://github.com/mwh/dragon; + homepage = "https://github.com/mwh/dragon"; maintainers = with maintainers; [ jb55 markus1189 ]; license = licenses.gpl3; platforms = with platforms; unix; diff --git a/pkgs/tools/X11/ffcast/default.nix b/pkgs/tools/X11/ffcast/default.nix index ff84dde6f99..1378d5e6b98 100644 --- a/pkgs/tools/X11/ffcast/default.nix +++ b/pkgs/tools/X11/ffcast/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Run commands on rectangular screen regions"; - homepage = https://github.com/lolilolicon/FFcast; + homepage = "https://github.com/lolilolicon/FFcast"; license = licenses.gpl3; maintainers = [ maintainers.guyonvarch ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/grobi/default.nix b/pkgs/tools/X11/grobi/default.nix index 976cabc33f8..a2cca87edc0 100644 --- a/pkgs/tools/X11/grobi/default.nix +++ b/pkgs/tools/X11/grobi/default.nix @@ -14,7 +14,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/fd0/grobi; + homepage = "https://github.com/fd0/grobi"; description = "Automatically configure monitors/outputs for Xorg via RANDR"; license = with licenses; [ bsd2 ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index 6bae355812c..3bfe98a7a21 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # See https://bugs.gentoo.org/show_bug.cgi?id=504056 underlinkingPatch = fetchurl { - url = http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch; + url = "http://www.gtlib.gatech.edu/pub/gentoo/gentoo-x86-portage/x11-misc/hsetroot/files/hsetroot-1.0.2-underlinking.patch"; name = "hsetroot-1.0.2-underlinking.patch"; sha256 = "1px1p3wz7ji725z9nlwb0x0h6lnnvnpz15sblzzq7zrijl3wz65x"; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows you to compose wallpapers ('root pixmaps') for X"; - homepage = https://thegraveyard.org/hsetroot.html; + homepage = "https://thegraveyard.org/hsetroot.html"; license = licenses.gpl2Plus; maintainers = [ maintainers.henrytill ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/jumpapp/default.nix b/pkgs/tools/X11/jumpapp/default.nix index 23ba445b674..c152a72a23d 100644 --- a/pkgs/tools/X11/jumpapp/default.nix +++ b/pkgs/tools/X11/jumpapp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/mkropat/jumpapp; + homepage = "https://github.com/mkropat/jumpapp"; description = "A run-or-raise application switcher for any X11 desktop"; license = lib.licenses.mit; maintainers = [ lib.maintainers.matklad ]; diff --git a/pkgs/tools/X11/keynav/default.nix b/pkgs/tools/X11/keynav/default.nix index 5eb74a26798..64684cf73df 100644 --- a/pkgs/tools/X11/keynav/default.nix +++ b/pkgs/tools/X11/keynav/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Generate X11 mouse clicks from keyboard"; - homepage = https://www.semicomplete.com/projects/keynav/; + homepage = "https://www.semicomplete.com/projects/keynav/"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index 95aa15840da..057288fbaa3 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { multi-head with Xinerama. Wallpapers are browsable with a convenient GUI, and settings are stored in a human-readable config file. ''; - homepage = https://github.com/l3ib/nitrogen; + homepage = "https://github.com/l3ib/nitrogen"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.auntie ]; diff --git a/pkgs/tools/X11/nx-libs/default.nix b/pkgs/tools/X11/nx-libs/default.nix index 07b58bcfad6..42444e5fca1 100644 --- a/pkgs/tools/X11/nx-libs/default.nix +++ b/pkgs/tools/X11/nx-libs/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { description = "NX X server based on Xnest"; - homepage = https://github.com/ArcticaProject/nx-libs; + homepage = "https://github.com/ArcticaProject/nx-libs"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ jD91mZM2 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 6b1b353b09b..809e3614f0b 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "GUI configuration tool for openbox"; - homepage = http://openbox.org/wiki/ObConf; + homepage = "http://openbox.org/wiki/ObConf"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lhvwb ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index 13d7e06c730..f4c2c9efc49 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Low-overhead client-side GPU offloading"; - homepage = https://github.com/amonakov/primus; + homepage = "https://github.com/amonakov/primus"; platforms = [ "i686-linux" "x86_64-linux" ]; license = licenses.bsd2; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/X11/ratmen/default.nix b/pkgs/tools/X11/ratmen/default.nix index aa5e346334a..f6042622674 100644 --- a/pkgs/tools/X11/ratmen/default.nix +++ b/pkgs/tools/X11/ratmen/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.free ; # 9menu derivative with 9menu license maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = http://www.update.uu.se/~zrajm/programs/; + 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 fc0068e6e27..aae09d49b3d 100644 --- a/pkgs/tools/X11/run-scaled/default.nix +++ b/pkgs/tools/X11/run-scaled/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Run an X application scaled via xpra"; - homepage = https://github.com/kaueraal/run_scaled; + homepage = "https://github.com/kaueraal/run_scaled"; maintainers = [ maintainers.snaar ]; license = licenses.bsd3; platforms = platforms.unix; diff --git a/pkgs/tools/X11/runningx/default.nix b/pkgs/tools/X11/runningx/default.nix index 31e2320e1b9..55f99c63365 100644 --- a/pkgs/tools/X11/runningx/default.nix +++ b/pkgs/tools/X11/runningx/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.fiction.net/blong/programs/mutt/; + 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; diff --git a/pkgs/tools/X11/sct/default.nix b/pkgs/tools/X11/sct/default.nix index 9f45bbe3087..3f6291417e5 100644 --- a/pkgs/tools/X11/sct/default.nix +++ b/pkgs/tools/X11/sct/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "sct"; src = fetchurl { - url = http://www.tedunangst.com/flak/files/sct.c; + url = "http://www.tedunangst.com/flak/files/sct.c"; sha256 = "01f3ndx3s6d2qh2xmbpmhd4962dyh8yp95l87xwrs4plqdz6knhd"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installPhase = "install -Dt $out/bin sct"; meta = with stdenv.lib; { - homepage = https://www.tedunangst.com/flak/post/sct-set-color-temperature; + homepage = "https://www.tedunangst.com/flak/post/sct-set-color-temperature"; description = "A minimal utility to set display colour temperature"; maintainers = [ maintainers.raskin ]; license = licenses.publicDomain; diff --git a/pkgs/tools/X11/setroot/default.nix b/pkgs/tools/X11/setroot/default.nix index a9b5f17af83..56c356b20d5 100644 --- a/pkgs/tools/X11/setroot/default.nix +++ b/pkgs/tools/X11/setroot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple X background setter inspired by imlibsetroot and feh"; - homepage = https://github.com/ttzhou/setroot; + homepage = "https://github.com/ttzhou/setroot"; license = licenses.gpl3Plus; maintainers = [ maintainers.vyp ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/sselp/default.nix b/pkgs/tools/X11/sselp/default.nix index 30f99cd40f2..81893fd2be8 100644 --- a/pkgs/tools/X11/sselp/default.nix +++ b/pkgs/tools/X11/sselp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://tools.suckless.org/sselp; + 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 ]; diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index c0956fb1dec..741043a9e53 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libvdpau ]; meta = with stdenv.lib; { - homepage = https://people.freedesktop.org/~aplattner/vdpau/; + homepage = "https://people.freedesktop.org/~aplattner/vdpau/"; description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; license = licenses.mit; # expat version platforms = platforms.unix; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index 92afa30e616..a2a7e5e6922 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.virtualgl.org/; + homepage = "http://www.virtualgl.org/"; description = "X11 GL rendering in a remote computer with full 3D hw acceleration"; license = licenses.wxWindows; platforms = platforms.linux; diff --git a/pkgs/tools/X11/wayv/default.nix b/pkgs/tools/X11/wayv/default.nix index f906a6d403e..55f6eede0fa 100644 --- a/pkgs/tools/X11/wayv/default.nix +++ b/pkgs/tools/X11/wayv/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://github.com/mikemb/wayV; + homepage = "https://github.com/mikemb/wayV"; }; } diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index e4cb70c8f24..64f8627a2ef 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patches = [ ./64-bit-data.patch ]; meta = { - homepage = https://sites.google.com/site/tstyblo/wmctrl; + 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; diff --git a/pkgs/tools/X11/wmutils-core/default.nix b/pkgs/tools/X11/wmutils-core/default.nix index fe5c70f6ce2..fdf805f8099 100644 --- a/pkgs/tools/X11/wmutils-core/default.nix +++ b/pkgs/tools/X11/wmutils-core/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of window manipulation tools"; - homepage = https://github.com/wmutils/core; + homepage = "https://github.com/wmutils/core"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/pkgs/tools/X11/wmutils-opt/default.nix b/pkgs/tools/X11/wmutils-opt/default.nix index c1230303862..39f26b95cdb 100644 --- a/pkgs/tools/X11/wmutils-opt/default.nix +++ b/pkgs/tools/X11/wmutils-opt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optional addons to wmutils"; - homepage = https://github.com/wmutils/opt; + homepage = "https://github.com/wmutils/opt"; license = licenses.isc; maintainers = with maintainers; [ vifino ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/x11spice/default.nix b/pkgs/tools/X11/x11spice/default.nix index 513149049fa..23af2ac44ca 100644 --- a/pkgs/tools/X11/x11spice/default.nix +++ b/pkgs/tools/X11/x11spice/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { x11spice will enable a running X11 desktop to be available via a Spice server ''; - homepage = https://gitlab.freedesktop.org/spice/x11spice; + homepage = "https://gitlab.freedesktop.org/spice/x11spice"; platforms = platforms.linux; license = licenses.gpl3; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/tools/X11/x11vnc/default.nix b/pkgs/tools/X11/x11vnc/default.nix index acf0fc9aabf..2f7b0d7697e 100644 --- a/pkgs/tools/X11/x11vnc/default.nix +++ b/pkgs/tools/X11/x11vnc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A VNC server connected to a real X11 screen"; - homepage = https://github.com/LibVNC/x11vnc/; + homepage = "https://github.com/LibVNC/x11vnc/"; platforms = platforms.linux; license = licenses.gpl2; maintainers = with maintainers; [ OPNA2608 ]; diff --git a/pkgs/tools/X11/x2vnc/default.nix b/pkgs/tools/X11/x2vnc/default.nix index 6075f0070f9..65d45e23396 100644 --- a/pkgs/tools/X11/x2vnc/default.nix +++ b/pkgs/tools/X11/x2vnc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "x2vnc-1.7.2"; src = fetchurl { - url = https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz; + url = "https://fredrik.hubbe.net/x2vnc/x2vnc-1.7.2.tar.gz"; sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = http://fredrik.hubbe.net/x2vnc.html; + homepage = "http://fredrik.hubbe.net/x2vnc.html"; description = "A program to control a remote VNC server"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/X11/x2x/default.nix b/pkgs/tools/X11/x2x/default.nix index 5c8e3d4f8fb..deada6ae2d1 100644 --- a/pkgs/tools/X11/x2x/default.nix +++ b/pkgs/tools/X11/x2x/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Allows the keyboard, mouse on one X display to be used to control another X display"; - homepage = https://github.com/dottedmag/x2x; + homepage = "https://github.com/dottedmag/x2x"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/tools/X11/xannotate/default.nix b/pkgs/tools/X11/xannotate/default.nix index d52698b0ed7..b1e070673c6 100644 --- a/pkgs/tools/X11/xannotate/default.nix +++ b/pkgs/tools/X11/xannotate/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://bitbucket.org/blais/xannotate; + homepage = "https://bitbucket.org/blais/xannotate"; }; } diff --git a/pkgs/tools/X11/xautomation/default.nix b/pkgs/tools/X11/xautomation/default.nix index a648eefcdde..0a31d5fb865 100644 --- a/pkgs/tools/X11/xautomation/default.nix +++ b/pkgs/tools/X11/xautomation/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libpng libX11 libXext libXi libXtst ]; meta = { - homepage = https://www.hoopajoo.net/projects/xautomation.html; + 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 ]; diff --git a/pkgs/tools/X11/xbindkeys-config/default.nix b/pkgs/tools/X11/xbindkeys-config/default.nix index bb83effe601..35961aff178 100644 --- a/pkgs/tools/X11/xbindkeys-config/default.nix +++ b/pkgs/tools/X11/xbindkeys-config/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = https://packages.debian.org/source/xbindkeys-config; + 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]; diff --git a/pkgs/tools/X11/xbindkeys/default.nix b/pkgs/tools/X11/xbindkeys/default.nix index 23e0ce63e5b..e844f444309 100644 --- a/pkgs/tools/X11/xbindkeys/default.nix +++ b/pkgs/tools/X11/xbindkeys/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ libX11 guile ]; meta = { - homepage = https://www.nongnu.org/xbindkeys/xbindkeys.html; + 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]; diff --git a/pkgs/tools/X11/xbrightness/default.nix b/pkgs/tools/X11/xbrightness/default.nix index e196411ce41..cbf4d2c9400 100644 --- a/pkgs/tools/X11/xbrightness/default.nix +++ b/pkgs/tools/X11/xbrightness/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "xbrightness-0.3-mika-akk"; src = fetchurl { - url = https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz; + url = "https://shallowsky.com/software/xbrightness/xbrightness-0.3-mika-akk.tar.gz"; sha256 = "2564dbd393544657cdabe4cbf535d9cfb9abe8edddb1b8cdb1ed4d12f358626e"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "X11 brigthness and gamma software control"; - homepage = http://shallowsky.com/software; + homepage = "http://shallowsky.com/software"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/X11/xcape/default.nix b/pkgs/tools/X11/xcape/default.nix index d1b6f9b23b6..eefaad82b1a 100644 --- a/pkgs/tools/X11/xcape/default.nix +++ b/pkgs/tools/X11/xcape/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { is to generate the Escape key when Left Control is pressed and released on its own. ''; - homepage = https://github.com/alols/xcape; + homepage = "https://github.com/alols/xcape"; license = licenses.gpl3 ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xchainkeys/default.nix b/pkgs/tools/X11/xchainkeys/default.nix index f06b4cc6b37..238b8c7b2b2 100644 --- a/pkgs/tools/X11/xchainkeys/default.nix +++ b/pkgs/tools/X11/xchainkeys/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 ]; meta = { - homepage = http://henning-bekel.de/xchainkeys/; + 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; diff --git a/pkgs/tools/X11/xcwd/default.nix b/pkgs/tools/X11/xcwd/default.nix index f2fadd71427..c0e8cf5d35b 100644 --- a/pkgs/tools/X11/xcwd/default.nix +++ b/pkgs/tools/X11/xcwd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { description = '' A simple tool which print the current working directory of the currently focused window ''; - homepage = https://github.com/schischi/xcwd; + homepage = "https://github.com/schischi/xcwd"; maintainers = [ maintainers.grburst ]; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 066b566be1f..9ad3db80805 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://freedesktop.org/wiki/Software/xdg-user-dirs; + homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs"; description = "A tool to help manage well known user directories like the desktop folder and the music folder"; license = licenses.gpl2; maintainers = with maintainers; [ lethalman ]; diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix index 99d5df2591a..64b205bada5 100644 --- a/pkgs/tools/X11/xdg-utils/default.nix +++ b/pkgs/tools/X11/xdg-utils/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.freedesktop.org/wiki/Software/xdg-utils/; + homepage = "https://www.freedesktop.org/wiki/Software/xdg-utils/"; description = "A set of command line tools that assist applications with a variety of desktop integration tasks"; license = if mimiSupport then licenses.gpl2 else licenses.free; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 6fa185dfeab..6785d10258f 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = https://www.semicomplete.com/projects/xdotool/; + 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]; diff --git a/pkgs/tools/X11/xgeometry-select/default.nix b/pkgs/tools/X11/xgeometry-select/default.nix index 76493dfb73e..ed3b460dcb6 100644 --- a/pkgs/tools/X11/xgeometry-select/default.nix +++ b/pkgs/tools/X11/xgeometry-select/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Select a region with mouse and prints geometry information (x/y/w/h)"; - homepage = https://bbs.archlinux.org/viewtopic.php?pid=660837; + homepage = "https://bbs.archlinux.org/viewtopic.php?pid=660837"; maintainers = with maintainers; [ obadz ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/X11/xidlehook/default.nix b/pkgs/tools/X11/xidlehook/default.nix index a4bc2295f1b..e15bee331a8 100644 --- a/pkgs/tools/X11/xidlehook/default.nix +++ b/pkgs/tools/X11/xidlehook/default.nix @@ -3,7 +3,7 @@ rustPlatform.buildRustPackage rec { pname = "xidlehook"; - version = "0.8.0"; + version = "0.8.2"; doCheck = false; @@ -12,11 +12,11 @@ rustPlatform.buildRustPackage rec { repo = "xidlehook"; rev = version; - sha256 = "127b20y86xs2wq5ka236057nyrh87fgzhjqbl6azf002afnbsn5m"; + sha256 = "1zvr3vk76x0gsq6z5rrnliv2bvshsm8bhkspc41bbj4kniz4h5bw"; }; cargoBuildFlags = lib.optionals (!stdenv.isLinux) ["--no-default-features" "--features" "pulse"]; - cargoSha256 = "0wakw3pqgwfwarjfb3h0a2javrhnf509v3j547a7p9k5kbjb5np0"; + cargoSha256 = "0dxz5mbdc93xb02vnmd29i2kdh05c7vx9h28x5qgs3jvddyb3xmn"; buildInputs = [ xlibsWrapper xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security; nativeBuildInputs = [ pkgconfig patchelf python3 ]; @@ -28,9 +28,10 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "xautolock rewrite in Rust, with a few extra features"; - homepage = https://github.com/jD91mZM2/xidlehook; + homepage = "https://github.com/jD91mZM2/xidlehook"; license = licenses.mit; maintainers = with maintainers; [ jD91mZM2 ]; platforms = platforms.unix; + badPlatforms = platforms.darwin; }; } diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix index 9aee0d778c4..9e11c948f40 100644 --- a/pkgs/tools/X11/xinput_calibrator/default.nix +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorgproto libXi autoconf automake libtool m4 xlibsWrapper ]; meta = { - homepage = https://github.com/tias/xinput_calibrator; + 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 ]; diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix index a837e73983f..3b69ec88054 100644 --- a/pkgs/tools/X11/xkb-switch/default.nix +++ b/pkgs/tools/X11/xkb-switch/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Switch your X keyboard layouts from the command line"; - homepage = https://github.com/ierton/xkb-switch; + homepage = "https://github.com/ierton/xkb-switch"; license = licenses.gpl2Plus; maintainers = with maintainers; [ smironov ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 7f3d9cfda56..47a2c8f3f3e 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Detects and arranges linux display outputs, using XRandR for detection and xrandr for arrangement"; - homepage = https://github.com/alex-courtis/xlayoutdisplay; + homepage = "https://github.com/alex-courtis/xlayoutdisplay"; maintainers = with maintainers; [ dtzWill ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xmagnify/default.nix b/pkgs/tools/X11/xmagnify/default.nix index dfd28e31771..710c9b83dbd 100644 --- a/pkgs/tools/X11/xmagnify/default.nix +++ b/pkgs/tools/X11/xmagnify/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tiny screen magnifier for X11"; - homepage = https://gitlab.com/amiloradovsky/magnify; + homepage = "https://gitlab.com/amiloradovsky/magnify"; license = licenses.mit; # or GPL2+, optionally maintainers = with maintainers; [ amiloradovsky ]; platforms = platforms.all; diff --git a/pkgs/tools/X11/xmousepasteblock/default.nix b/pkgs/tools/X11/xmousepasteblock/default.nix index 0cace7f452b..094b26d1f55 100644 --- a/pkgs/tools/X11/xmousepasteblock/default.nix +++ b/pkgs/tools/X11/xmousepasteblock/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { description = "Middle mouse button primary X selection/clipboard paste disabler"; - homepage = https://github.com/milaq/XMousePasteBlock; + homepage = "https://github.com/milaq/XMousePasteBlock"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.petercommand ]; }; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index f8f48ea4cdb..ae057c76984 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/xnee/; + homepage = "https://www.gnu.org/software/xnee/"; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix index 4dbe31df03c..6f6d38932df 100644 --- a/pkgs/tools/X11/xpointerbarrier/default.nix +++ b/pkgs/tools/X11/xpointerbarrier/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = { - homepage = https://uninformativ.de/git/xpointerbarrier; + 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 ]; diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch b/pkgs/tools/X11/xpra/0002-Constant-DPI.patch index f91e53d1e49..f91e53d1e49 100644 --- a/pkgs/tools/X11/xpra/xf86videodummy/0002-Constant-DPI.patch +++ b/pkgs/tools/X11/xpra/0002-Constant-DPI.patch diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch b/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch index 3dbb6fd179f..3dbb6fd179f 100644 --- a/pkgs/tools/X11/xpra/xf86videodummy/0003-fix-pointer-limits.patch +++ b/pkgs/tools/X11/xpra/0003-fix-pointer-limits.patch diff --git a/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch b/pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch index 567db3fc386..567db3fc386 100644 --- a/pkgs/tools/X11/xpra/xf86videodummy/0005-support-for-30-bit-depth-in-dummy-driver.patch +++ b/pkgs/tools/X11/xpra/0005-support-for-30-bit-depth-in-dummy-driver.patch diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index cef8bd49163..1f9efc31061 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 +{ stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig, writeText , xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which , ffmpeg_4, x264, libvpx, libwebp, x265 @@ -11,14 +11,30 @@ with lib; let inherit (python3.pkgs) cython buildPythonApplication; - xf86videodummy = callPackage ./xf86videodummy { }; + xf86videodummy = xorg.xf86videodummy.overrideDerivation (p: { + patches = [ + ./0002-Constant-DPI.patch + ./0003-fix-pointer-limits.patch + ./0005-support-for-30-bit-depth-in-dummy-driver.patch + ]; + }); + + xorgModulePaths = writeText "module-paths" '' + Section "Files" + ModulePath "${xorgserver}/lib/xorg/modules" + ModulePath "${xorgserver}/lib/xorg/modules/extensions" + ModulePath "${xorgserver}/lib/xorg/modules/drivers" + ModulePath "${xf86videodummy}/lib/xorg/modules/drivers" + EndSection + ''; + in buildPythonApplication rec { pname = "xpra"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { url = "https://xpra.org/src/${pname}-${version}.tar.xz"; - sha256 = "0i4c5cdr5prbz54jinsinhvb60s5s5yskjzjg47zbw0if17sp26w"; + sha256 = "0d78bn7s03nwnyc4ryznxaivbg55kvsb26q75p8747j3562s9p2b"; }; patches = [ @@ -81,6 +97,11 @@ in buildPythonApplication rec { ) ''; + # append module paths to xorg.conf + postInstall = '' + cat ${xorgModulePaths} >> $out/etc/xpra/xorg.conf + ''; + doCheck = false; enableParallelBuilding = true; diff --git a/pkgs/tools/X11/xpra/libfakeXinerama.nix b/pkgs/tools/X11/xpra/libfakeXinerama.nix index 770024aa4ba..712f47fb2c8 100644 --- a/pkgs/tools/X11/xpra/libfakeXinerama.nix +++ b/pkgs/tools/X11/xpra/libfakeXinerama.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://xpra.org/; + homepage = "http://xpra.org/"; description = "fakeXinerama for Xpra"; platforms = platforms.linux; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/X11/xpra/xf86videodummy/default.nix b/pkgs/tools/X11/xpra/xf86videodummy/default.nix deleted file mode 100644 index 4e9f8860892..00000000000 --- a/pkgs/tools/X11/xpra/xf86videodummy/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, lib, fetchurl -, xorgproto, xorgserver -, pkgconfig }: - -with lib; - -stdenv.mkDerivation rec { - version = "0.3.8"; - suffix = "1"; - name = "xpra-xf86videodummy-${version}-${suffix}"; - builder = ../../../../servers/x11/xorg/builder.sh; - src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-video-dummy-${version}.tar.bz2"; - sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; - }; - patches = [ - ./0002-Constant-DPI.patch - ./0003-fix-pointer-limits.patch - ./0005-support-for-30-bit-depth-in-dummy-driver.patch - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ xorgproto xorgserver ]; - - meta = { - description = "Dummy driver for Xorg with xpra patches"; - homepage = https://xpra.org/trac/wiki/Xdummy; - license = licenses.gpl2; - platforms = platforms.unix; - maintainers = with maintainers; [ numinit ]; - }; -} diff --git a/pkgs/tools/X11/xprintidle-ng/default.nix b/pkgs/tools/X11/xprintidle-ng/default.nix index 4ae457dab4a..c7bb2bc348b 100644 --- a/pkgs/tools/X11/xprintidle-ng/default.nix +++ b/pkgs/tools/X11/xprintidle-ng/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { inherit version; description = ''A command-line tool to print idle time from libXss''; - homepage = http://taktoa.me/xprintidle-ng/; + homepage = "http://taktoa.me/xprintidle-ng/"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/X11/xrectsel/default.nix b/pkgs/tools/X11/xrectsel/default.nix index 4712192eacf..e2f9fdf4a43 100644 --- a/pkgs/tools/X11/xrectsel/default.nix +++ b/pkgs/tools/X11/xrectsel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print the geometry of a rectangular screen region"; - homepage = https://github.com/lolilolicon/xrectsel; + homepage = "https://github.com/lolilolicon/xrectsel"; license = licenses.gpl3; maintainers = [ maintainers.guyonvarch ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xrestop/default.nix b/pkgs/tools/X11/xrestop/default.nix index 6f75d2360cf..a28fc50c1e7 100644 --- a/pkgs/tools/X11/xrestop/default.nix +++ b/pkgs/tools/X11/xrestop/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "0.4"; src = fetchurl { - url = mirror://gentoo/distfiles/xrestop-0.4.tar.gz; + url = "mirror://gentoo/distfiles/xrestop-0.4.tar.gz"; sha256 = "0mz27jpij8am1s32i63mdm58znfijcpfhdqq1npbmvgclyagrhk7"; }; diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 548101c34c3..effdd76ce9d 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "X11 screen lock utility with security in mind"; - homepage = https://github.com/google/xsecurelock; + homepage = "https://github.com/google/xsecurelock"; license = licenses.asl20; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix index bee6cdb748f..10abd957e39 100644 --- a/pkgs/tools/X11/xsettingsd/default.nix +++ b/pkgs/tools/X11/xsettingsd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Provides settings to X11 applications via the XSETTINGS specification"; - homepage = https://github.com/derat/xsettingsd; + homepage = "https://github.com/derat/xsettingsd"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/X11/xtruss/default.nix b/pkgs/tools/X11/xtruss/default.nix index 043514ebb43..7d490571f48 100644 --- a/pkgs/tools/X11/xtruss/default.nix +++ b/pkgs/tools/X11/xtruss/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "easy-to-use X protocol tracing program"; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/xtruss; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/xtruss"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index 3c1dc3de2b4..6c61133077e 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { facility to enter characters onto other clients (softwares) by clicking on a keyboard displayed on the screen. ''; - homepage = http://t-sato.in.coocan.jp/xvkbd; + homepage = "http://t-sato.in.coocan.jp/xvkbd"; license = licenses.gpl2Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; diff --git a/pkgs/tools/X11/xwinwrap/default.nix b/pkgs/tools/X11/xwinwrap/default.nix index b9d48f54574..89b2fdd3dcf 100644 --- a/pkgs/tools/X11/xwinwrap/default.nix +++ b/pkgs/tools/X11/xwinwrap/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit version; src = fetchbzr { - url = https://code.launchpad.net/~shantanu-goel/xwinwrap/devel; + url = "https://code.launchpad.net/~shantanu-goel/xwinwrap/devel"; rev = version; sha256 = "1annhqc71jcgx5zvcy31c1c488ygx4q1ygrwyy2y0ww743smbchw"; }; @@ -48,7 +48,7 @@ stdenv.mkDerivation { it is, in its new avatar “Shantz XWinWrap”. ''; license = licenses.hpnd; - homepage = https://shantanugoel.com/2008/09/03/shantz-xwinwrap/; + homepage = "https://shantanugoel.com/2008/09/03/shantz-xwinwrap/"; maintainers = with maintainers; [ infinisil ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 25a92f1117b..8d4863757ad 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; version = "2.8.5"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { socat openssl curl + dnsutils (if stdenv.isLinux then iproute else unixtools.netstat) ] }" @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pure Unix shell script implementing ACME client protocol"; - homepage = https://acme.sh/; + homepage = "https://acme.sh/"; license = licenses.gpl3; maintainers = [ maintainers.yorickvp ]; }; diff --git a/pkgs/tools/admin/adtool/default.nix b/pkgs/tools/admin/adtool/default.nix index 5522fd7a68b..f239b18aec9 100644 --- a/pkgs/tools/admin/adtool/default.nix +++ b/pkgs/tools/admin/adtool/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Active Directory administration utility for Unix"; - homepage = https://gp2x.org/adtool; + homepage = "https://gp2x.org/adtool"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix index b3e688c681d..b36daefa16b 100644 --- a/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix +++ b/pkgs/tools/admin/amazon-ecr-credential-helper/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with lib; { description = "The Amazon ECR Docker Credential Helper is a credential helper for the Docker daemon that makes it easier to use Amazon Elastic Container Registry"; - homepage = https://github.com/awslabs/amazon-ecr-credential-helper; + homepage = "https://github.com/awslabs/amazon-ecr-credential-helper"; license = licenses.asl20 ; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 830dcee26e4..228aa5a26a2 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Easily rotate your AWS key"; - homepage = https://github.com/Fullscreen/aws-rotate-key; + homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; maintainers = [maintainers.mbode]; platforms = platforms.unix; diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 3e145f73236..48a1de61cd8 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, fetchFromGitHub, Security }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "aws-vault"; version = "5.3.2"; @@ -13,15 +13,13 @@ buildGoModule rec { modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9"; subPackages = [ "." ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - # set the version. see: aws-vault's Makefile buildFlagsArray = '' -ldflags= -X main.Version=v${version} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A vault for securely storing and accessing AWS credentials in development environments"; homepage = "https://github.com/99designs/aws-vault"; diff --git a/pkgs/tools/admin/aws_shell/default.nix b/pkgs/tools/admin/aws_shell/default.nix index b9169691808..104c2f1e44a 100644 --- a/pkgs/tools/admin/aws_shell/default.nix +++ b/pkgs/tools/admin/aws_shell/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/awslabs/aws-shell; + homepage = "https://github.com/awslabs/aws-shell"; description = "An integrated shell for working with the AWS CLI"; license = licenses.asl20; maintainers = [ ]; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 08843d5bca9..d64736bc2c5 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -57,7 +57,7 @@ in with py.pkgs; buildPythonApplication rec { passthru.python = py; # for aws_shell meta = with lib; { - homepage = https://aws.amazon.com/cli/; + homepage = "https://aws.amazon.com/cli/"; description = "Unified tool to manage your AWS services"; license = licenses.asl20; maintainers = with maintainers; [ muflax ]; diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index 92b6d62a8a2..4a33d742076 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/jorgebastida/awslogs; + homepage = "https://github.com/jorgebastida/awslogs"; description = "AWS CloudWatch logs for Humans"; maintainers = with maintainers; [ dbrock ]; license = licenses.bsd3; diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 1ea54953701..661747c2fd0 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "awsweeper"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A tool to clean out your AWS account"; homepage = "https://github.com/cloudetc/awsweeper/"; license = licenses.mpl20; diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index cbec7e86a63..3c598e67a71 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -11,10 +11,7 @@ let ''; # Prevent these __init__'s from violating PEP420, only needed for python2 - postInstall = (attrs.postInstall or "") + '' - rm $out/${python.sitePackages}/azure/{,__pycache__/}__init__.* \ - $out/${python.sitePackages}/azure/cli/{,__pycache__/}__init__.* - ''; + pythonNamespaces = [ "azure.cli" ]; checkInputs = [ mock pytest ] ++ (attrs.checkInputs or []); checkPhase = attrs.checkPhase or '' @@ -39,9 +36,7 @@ let ''; # force PEP420 - postInstall = '' - rm -f $out/${py.sitePackages}/azure/{,mgmt/}__init__.py - ''; + pythonNamespaces = [ "azure.mgmt" ]; }); py = python.override { @@ -116,6 +111,9 @@ let ''; }; + azure-batch = overrideAzureMgmtPackage super.azure-batch "8.0.0" "zip" + "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi"; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; @@ -277,9 +275,7 @@ let propagatedBuildInputs = with self; [ azure-common azure-nspkg msrest msrestazure cryptography ]; - postInstall = '' - rm -f $out/${self.python.sitePackages}/azure/__init__.py - ''; + pythonNamespaces = [ "azure" ]; pythonImportsCheck = [ ]; }); diff --git a/pkgs/tools/admin/bash-my-aws/default.nix b/pkgs/tools/admin/bash-my-aws/default.nix index 8c0dd306743..b99f031f416 100644 --- a/pkgs/tools/admin/bash-my-aws/default.nix +++ b/pkgs/tools/admin/bash-my-aws/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://bash-my-aws.org; + homepage = "https://bash-my-aws.org"; description = "CLI commands for AWS"; license = licenses.mit; maintainers = with maintainers; [ tomberek ]; diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index d088184f7a1..c1c46da41b7 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "berglas"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "A tool for managing secrets on Google Cloud"; homepage = "https://github.com/GoogleCloudPlatform/berglas"; diff --git a/pkgs/tools/admin/bubblewrap/default.nix b/pkgs/tools/admin/bubblewrap/default.nix index 8e2ef7c87e1..b98cadd57d1 100644 --- a/pkgs/tools/admin/bubblewrap/default.nix +++ b/pkgs/tools/admin/bubblewrap/default.nix @@ -2,18 +2,19 @@ stdenv.mkDerivation rec { pname = "bubblewrap"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { - url = "https://github.com/projectatomic/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "08r0f4c3fjkb4zjrb4kkax1zfcgcgic702vb62sjjw5xfhppvzp5"; + url = "https://github.com/containers/bubblewrap/releases/download/v${version}/${pname}-${version}.tar.xz"; + sha256 = "00ycgi6q2yngh06bnz50wkvar6r2jnjf3j158grhi9k13jdrpimr"; }; - nativeBuildInputs = [ libcap libxslt docbook_xsl ]; + nativeBuildInputs = [ libxslt docbook_xsl ]; + buildInputs = [ libcap ]; meta = with stdenv.lib; { description = "Unprivileged sandboxing tool"; - homepage = https://github.com/projectatomic/bubblewrap; + homepage = "https://github.com/containers/bubblewrap"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch b/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch index 62351a70160..789efd185ca 100644 --- a/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch +++ b/pkgs/tools/admin/certbot/0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch @@ -22,18 +22,16 @@ ValueError: invalid version number '41.4.0.post20191022' 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/certbot/setup.py b/certbot/setup.py -index c1bf914..7456bf2 100644 +index d19327e5e..ac1524793 100644 --- a/certbot/setup.py +++ b/certbot/setup.py -@@ -3,7 +3,6 @@ import os +@@ -1,5 +1,4 @@ + import codecs +-from distutils.version import StrictVersion + import os import re import sys - --from distutils.version import StrictVersion - from setuptools import find_packages, setup, __version__ as setuptools_version - from setuptools.command.test import test as TestCommand - -@@ -56,20 +55,8 @@ install_requires = [ +@@ -58,20 +57,8 @@ install_requires = [ # Add pywin32 on Windows platforms to handle low-level system calls. # This dependency needs to be added using environment markers to avoid its installation on Linux. @@ -54,7 +52,7 @@ index c1bf914..7456bf2 100644 +install_requires.append(pywin32_req + " ; sys_platform == 'win32'") dev_extras = [ - 'astroid==1.6.5', + 'coverage', -- 2.24.1 diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix index 8fdbfd12778..cabf335fb69 100644 --- a/pkgs/tools/admin/certbot/default.nix +++ b/pkgs/tools/admin/certbot/default.nix @@ -1,22 +1,27 @@ -{ stdenv, python37Packages, fetchFromGitHub, fetchurl, dialog, autoPatchelfHook }: +{ lib +, buildPythonApplication +, fetchFromGitHub +, ConfigArgParse, acme, configobj, cryptography, distro, josepy, parsedatetime, pyRFC3339, pyopenssl, pytz, requests, six, zope_component, zope_interface +, dialog, mock, gnureadline +, pytest_xdist, pytest, dateutil +}: - -python37Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "certbot"; - version = "1.0.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "180x7gcpfbrzw8k654s7b5nxdy2yg61lq513dykyn3wz4gssw465"; + sha256 = "1nzp1l63f64qqp89y1vyd4lgfhykfp5dkr6iwfiyf273y7sjwpsa"; }; patches = [ ./0001-Don-t-use-distutils.StrictVersion-that-cannot-handle.patch ]; - propagatedBuildInputs = with python37Packages; [ + propagatedBuildInputs = [ ConfigArgParse acme configobj @@ -24,26 +29,21 @@ python37Packages.buildPythonApplication rec { distro josepy parsedatetime - psutil pyRFC3339 pyopenssl pytz + requests six zope_component zope_interface ]; - buildInputs = [ dialog ] ++ (with python37Packages; [ mock gnureadline ]); + buildInputs = [ dialog mock gnureadline ]; - checkInputs = with python37Packages; [ - pytest_xdist - pytest - dateutil - ]; + checkInputs = [ pytest_xdist pytest dateutil ]; - postPatch = '' + preBuild = '' cd certbot - substituteInPlace certbot/_internal/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail" ''; postInstall = '' @@ -55,11 +55,11 @@ python37Packages.buildPythonApplication rec { doCheck = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = src.meta.homepage; description = "ACME client that can obtain certs and extensibly update server configurations"; platforms = platforms.unix; - maintainers = [ maintainers.domenkozar ]; - license = licenses.asl20; + maintainers = with maintainers; [ domenkozar ]; + license = with licenses; [ asl20 ]; }; } diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 89c6b8996fa..5474cb25429 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "certigo"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "A utility to examine and validate certificates in a variety of formats"; homepage = "https://github.com/square/certigo"; diff --git a/pkgs/tools/admin/chkcrontab/default.nix b/pkgs/tools/admin/chkcrontab/default.nix index a4b119f126a..0740b0c1be6 100644 --- a/pkgs/tools/admin/chkcrontab/default.nix +++ b/pkgs/tools/admin/chkcrontab/default.nix @@ -15,6 +15,6 @@ buildPythonApplication rec { description = "A tool to detect crontab errors"; license = licenses.asl20; maintainers = with maintainers; [ ma27 ]; - homepage = https://github.com/lyda/chkcrontab; + homepage = "https://github.com/lyda/chkcrontab"; }; } diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index a12b8abe120..3f4d00736ad 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz, Security }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper, rpm, xz }: buildGoModule rec { pname = "clair"; @@ -13,16 +13,14 @@ buildGoModule rec { modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - nativeBuildInputs = [ makeWrapper ]; postInstall = '' wrapProgram $out/bin/clair \ - --prefix PATH : "${stdenv.lib.makeBinPath [ rpm xz ]}" + --prefix PATH : "${lib.makeBinPath [ rpm xz ]}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Vulnerability Static Analysis for Containers"; homepage = "https://github.com/quay/clair"; license = licenses.asl20; diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index 8195207ef60..0ba4593f6a5 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -18,7 +18,7 @@ buildGoPackage { meta = with lib; { description = "CLI tool for the Amazon Route 53 DNS service"; - homepage = https://github.com/barnybug/cli53; + homepage = "https://github.com/barnybug/cli53"; license = licenses.mit; maintainers = with maintainers; [ benley ]; }; diff --git a/pkgs/tools/admin/daemontools/default.nix b/pkgs/tools/admin/daemontools/default.nix index 7e8c1bccc3e..660563d9757 100644 --- a/pkgs/tools/admin/daemontools/default.nix +++ b/pkgs/tools/admin/daemontools/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.publicDomain; - homepage = https://cr.yp.to/daemontools.html; + homepage = "https://cr.yp.to/daemontools.html"; description = "A collection of tools for managing UNIX services."; maintainers = with stdenv.lib.maintainers; [ kevincox ]; diff --git a/pkgs/tools/admin/docker-credential-gcr/default.nix b/pkgs/tools/admin/docker-credential-gcr/default.nix index a71958f8a09..741d6525969 100644 --- a/pkgs/tools/admin/docker-credential-gcr/default.nix +++ b/pkgs/tools/admin/docker-credential-gcr/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "docker-credential-gcr"; - version = "1.4.3"; + version = "2.0.1"; goPackagePath = "github.com/GoogleCloudPlatform/docker-credential-gcr"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "GoogleCloudPlatform"; repo = "docker-credential-gcr"; rev = "v${version}"; - sha256 = "1xb88xjyyrdmjcgfv7fqdkv1ip3dpzsdif5vm7vkqvn83s5wj5df"; + sha256 = "0zazbfjbwclkz848vsyb6zhn95gngwrdhivaiw0m9f8a9xm4bp9r"; }; meta = with stdenv.lib; { @@ -20,7 +20,7 @@ buildGoPackage rec { helper. It allows for Docker clients v1.11+ to easily make authenticated requests to GCR's repositories (gcr.io, eu.gcr.io, etc.). ''; - homepage = https://github.com/GoogleCloudPlatform/docker-credential-gcr; + homepage = "https://github.com/GoogleCloudPlatform/docker-credential-gcr"; license = licenses.asl20; maintainers = with maintainers; [ suvash ]; }; diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index c700e4f397c..fdb03b50feb 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "eksctl"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1193i30k2m7cibn79xw51i2lxg90f5i97h8sbjiv0hr9g502r2qf"; + sha256 = "067q2cj4iwhiijv6nd9crjfncn67829f4d2ls07lwdcsvgi1cyfi"; }; - modSha256 = "0f8dlcp3q84fa5dnnzx4347ngb1raw1mxkcqpz2s3zq6d1kv0nvf"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "187jv78asav97cbvn7336ycflqa0c2alvkhvlyv2mp5f3crygagy"; subPackages = [ "cmd/eksctl" ]; @@ -27,7 +25,7 @@ buildGoModule rec { $out/bin/eksctl completion zsh > "$out/share/zsh/site-functions/_eksctl" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A CLI for Amazon EKS"; homepage = "https://github.com/weaveworks/eksctl"; license = licenses.asl20; diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index 8d8f9070499..88ae57251b7 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -58,7 +58,7 @@ buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/elastic/curator; + homepage = "https://github.com/elastic/curator"; description = "Curate, or manage, your Elasticsearch indices and snapshots"; license = licenses.asl20; longDescription = '' diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index e3cfc580fab..c8c7a0117e5 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -156,4 +156,4 @@ DEPENDENCIES fastlane BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/admin/fastlane/default.nix b/pkgs/tools/admin/fastlane/default.nix index 1cdc969ea2e..01f2d237407 100644 --- a/pkgs/tools/admin/fastlane/default.nix +++ b/pkgs/tools/admin/fastlane/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to automate building and releasing iOS and Android apps"; longDescription = "fastlane is a tool for iOS and Android developers to automate tedious tasks like generating screenshots, dealing with provisioning profiles, and releasing your application."; - homepage = https://github.com/fastlane/fastlane; + homepage = "https://github.com/fastlane/fastlane"; license = licenses.mit; maintainers = with maintainers; [ peterromfeldhk diff --git a/pkgs/tools/admin/gixy/default.nix b/pkgs/tools/admin/gixy/default.nix index bbec64c0aee..118457d4080 100644 --- a/pkgs/tools/admin/gixy/default.nix +++ b/pkgs/tools/admin/gixy/default.nix @@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec { Gixy is a tool to analyze Nginx configuration. The main goal of Gixy is to prevent security misconfiguration and automate flaw detection. ''; - homepage = https://github.com/yandex/gixy; + homepage = "https://github.com/yandex/gixy"; license = licenses.mpl20; maintainers = [ maintainers.willibutz ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index 95878ef09ab..fb7870eac95 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -21,12 +21,12 @@ let sources = name: system: { x86_64-darwin = { url = "${baseUrl}/${name}-darwin-x86_64.tar.gz"; - sha256 = "0hg4823dlnf9ahqh9dr05wsi6cdxn9mbwhg65jng3d2aws3ski6r"; + sha256 = "0v83faz0jwnx603acmkc3bsl7vg2xxsm1jfw88fmnj6zcsa5b9ql"; }; x86_64-linux = { url = "${baseUrl}/${name}-linux-x86_64.tar.gz"; - sha256 = "00ziqr60q1la716c9cy3hjpyq3hiw3m75d4wry6prn5655jw4ph6"; + sha256 = "1z9liqzgwfavh3m3q1s871gxnwnsxdbny2vqzh9sjlwdk26f76gi"; }; }.${system}; @@ -34,7 +34,7 @@ let in stdenv.mkDerivation rec { pname = "google-cloud-sdk"; - version = "281.0.0"; + version = "286.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 37a27127bab..afaa237d342 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK VNC widget"; - homepage = https://wiki.gnome.org/Projects/gtk-vnc; + homepage = "https://wiki.gnome.org/Projects/gtk-vnc"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ raskin offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index 6a1ec948d90..96c49b58d0b 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -1,9 +1,11 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "iamy"; version = "2.3.2"; + goPackagePath = "github.com/99designs/iamy"; + src = fetchFromGitHub { owner = "99designs"; repo = "iamy"; @@ -13,15 +15,13 @@ buildGoModule rec { modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [''-ldflags= -X main.Version=v${version} -s -w '']; meta = with stdenv.lib; { description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; - homepage = https://github.com/99designs/iamy; + homepage = "https://github.com/99designs/iamy"; license = licenses.mit; maintainers = with maintainers; [ suvash ]; }; diff --git a/pkgs/tools/admin/intecture/agent.nix b/pkgs/tools/admin/intecture/agent.nix index 7fc3da2f19c..1c2d84836eb 100644 --- a/pkgs/tools/admin/intecture/agent.nix +++ b/pkgs/tools/admin/intecture/agent.nix @@ -22,7 +22,7 @@ buildRustPackage rec { meta = with lib; { description = "Authentication client/server for Intecture components"; - homepage = https://intecture.io; + homepage = "https://intecture.io"; license = licenses.mpl20; maintainers = [ maintainers.rushmorem ]; }; diff --git a/pkgs/tools/admin/intecture/auth.nix b/pkgs/tools/admin/intecture/auth.nix index f60cbaf7b6e..0d7443d3225 100644 --- a/pkgs/tools/admin/intecture/auth.nix +++ b/pkgs/tools/admin/intecture/auth.nix @@ -22,7 +22,7 @@ buildRustPackage rec { meta = with lib; { description = "Authentication client/server for Intecture components"; - homepage = https://intecture.io; + homepage = "https://intecture.io"; license = licenses.mpl20; maintainers = [ maintainers.rushmorem ]; }; diff --git a/pkgs/tools/admin/intecture/cli.nix b/pkgs/tools/admin/intecture/cli.nix index 73865bdea78..5a841b92040 100644 --- a/pkgs/tools/admin/intecture/cli.nix +++ b/pkgs/tools/admin/intecture/cli.nix @@ -25,7 +25,7 @@ buildRustPackage rec { meta = with lib; { description = "A developer friendly, language agnostic configuration management tool for server systems"; - homepage = https://intecture.io; + homepage = "https://intecture.io"; license = licenses.mpl20; maintainers = [ maintainers.rushmorem ]; }; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 0cb614c12d1..72c61ceecaf 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "lego"; @@ -14,13 +14,11 @@ buildGoModule rec { modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii"; subPackages = [ "cmd/lego" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 4f6db4169a1..31705d1e79c 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Manipulate DNS records on various DNS providers in a standardized way."; - homepage = https://github.com/AnalogJ/lexicon; + homepage = "https://github.com/AnalogJ/lexicon"; maintainers = with maintainers; [ flyfloh ]; license = licenses.mit; }; diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index efd6db395f2..f85a61be4a8 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -9,13 +9,13 @@ buildGoPackage rec { pname = "lxd"; - version = "3.23"; + version = "4.0.0"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1zbm736m9g4c40r55s6rg3xrgw9bysslr992sa80vlrxfmwfiqg4"; + sha256 = "00kydp6aysggng9a7m0q3zj3591yk6jgcibbqxx4ki20pd4vmqnb"; }; preBuild = '' @@ -49,7 +49,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Daemon based on liblxc offering a REST API to manage containers"; - homepage = https://linuxcontainers.org/lxd/; + homepage = "https://linuxcontainers.org/lxd/"; license = licenses.asl20; maintainers = with maintainers; [ fpletz wucke13 ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index 7414b83b16e..42c790d1ada 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { Rich command-line interface for MySQL with auto-completion and syntax highlighting. ''; - homepage = http://mycli.net; + homepage = "http://mycli.net"; license = lib.licenses.bsd3; maintainers = [ lib.maintainers.jojosch ]; }; diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index 9e93b5f2f75..b999c65f6f6 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -77,10 +77,10 @@ in meta = with stdenv.lib; { description = "NoMachine remote desktop client (nxplayer)"; - homepage = https://www.nomachine.com/; + homepage = "https://www.nomachine.com/"; license = { fullName = "NoMachine 6 End-User License Agreement"; - url = https://www.nomachine.com/licensing-6; + url = "https://www.nomachine.com/licensing-6"; free = false; }; maintainers = with maintainers; [ talyz ]; diff --git a/pkgs/tools/admin/oxidized/Gemfile.lock b/pkgs/tools/admin/oxidized/Gemfile.lock index 0832bce6d2e..64bc02cafc3 100644 --- a/pkgs/tools/admin/oxidized/Gemfile.lock +++ b/pkgs/tools/admin/oxidized/Gemfile.lock @@ -77,4 +77,4 @@ DEPENDENCIES oxidized-web (= 0.13.1) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/admin/oxidized/default.nix b/pkgs/tools/admin/oxidized/default.nix index a11906e80f0..01129c5afb1 100644 --- a/pkgs/tools/admin/oxidized/default.nix +++ b/pkgs/tools/admin/oxidized/default.nix @@ -12,7 +12,7 @@ bundlerApp { meta = with lib; { description = "Oxidized is a network device configuration backup tool. It's a RANCID replacement!"; - homepage = https://github.com/ytti/oxidized; + homepage = "https://github.com/ytti/oxidized"; license = licenses.asl20; maintainers = with maintainers; [ willibutz nicknovitski ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index d6fc6e8a837..07ad2d95f14 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { buildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; meta = { - homepage = https://pulumi.io/; + homepage = "https://pulumi.io/"; description = "Pulumi is a cloud development platform that makes creating cloud programs easy and productive"; license = with licenses; [ asl20 ]; platforms = builtins.attrNames data.pulumiPkgs; diff --git a/pkgs/tools/admin/s3bro/default.nix b/pkgs/tools/admin/s3bro/default.nix index 9f383a8638d..154b4aae966 100644 --- a/pkgs/tools/admin/s3bro/default.nix +++ b/pkgs/tools/admin/s3bro/default.nix @@ -16,8 +16,8 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "A handy s3 cli tool"; - homepage = https://github.com/rsavordelli/s3bro; + homepage = "https://github.com/rsavordelli/s3bro"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index c94686c93c1..b648cdb2512 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -41,7 +41,7 @@ pythonPackages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://saltstack.com/; + homepage = "https://saltstack.com/"; description = "Portable, distributed, remote execution and configuration management system"; maintainers = with maintainers; [ aneeshusa ]; license = licenses.asl20; diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index 4bf24e3092d..e2cfa806f95 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "A CLI front-end to a running salt-api system"; - homepage = https://github.com/saltstack/pepper; + homepage = "https://github.com/saltstack/pepper"; maintainers = [ maintainers.pierrer ]; license = licenses.asl20; }; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 3365d87bba4..68c20493d19 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec{ meta = with stdenv.lib; { description = "Interact with Scaleway API from the command line"; - homepage = https://github.com/scaleway/scaleway-cli; + homepage = "https://github.com/scaleway/scaleway-cli"; license = licenses.mit; maintainers = with maintainers; [ nickhu ]; platforms = platforms.all; diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index f6f5923eb4a..c1ae07c0fda 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://simple-evcorr.github.io; + homepage = "https://simple-evcorr.github.io"; license = stdenv.lib.licenses.gpl2; description = "Simple Event Correlator"; maintainers = [ stdenv.lib.maintainers.tv ]; diff --git a/pkgs/tools/admin/sewer/default.nix b/pkgs/tools/admin/sewer/default.nix index 776ba89e48c..471a8788a95 100644 --- a/pkgs/tools/admin/sewer/default.nix +++ b/pkgs/tools/admin/sewer/default.nix @@ -2,17 +2,17 @@ python3Packages.buildPythonApplication rec { pname = "sewer"; - version = "0.7.9"; + version = "0.8.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "c083223d8aa66d4fc6801452d291a98540d1ee41557ce3e1754c62e73f7c9738"; + sha256 = "0s8f0w6nv8dcs5yw7rn49981b3c9mnnx4f6wzqw4zha0rpp60z22"; }; propagatedBuildInputs = with python3Packages; [ pyopenssl requests tldextract ]; meta = with stdenv.lib; { - homepage = https://github.com/komuw/sewer; + homepage = "https://github.com/komuw/sewer"; description = "ACME client"; license = licenses.mit; maintainers = with maintainers; [ kevincox ]; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index eaefba36545..6ff547ab532 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ acme setuptools_scm josepy idna ]; meta = with stdenv.lib; { - homepage = https://github.com/zenhack/simp_le; + homepage = "https://github.com/zenhack/simp_le"; description = "Simple Let's Encrypt client"; license = licenses.gpl3; maintainers = with maintainers; [ gebner makefu ]; diff --git a/pkgs/tools/admin/ssl-cert-check/default.nix b/pkgs/tools/admin/ssl-cert-check/default.nix index e6a83c397c5..b94d77bdf70 100644 --- a/pkgs/tools/admin/ssl-cert-check/default.nix +++ b/pkgs/tools/admin/ssl-cert-check/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "a Bourne shell script that can be used to report on expiring SSL certificates"; - homepage = https://github.com/Matty9191/ssl-cert-check; + homepage = "https://github.com/Matty9191/ssl-cert-check"; license = licenses.gpl2; maintainers = [ maintainers.ryantm ]; platforms = platforms.linux; diff --git a/pkgs/tools/admin/swiftclient/default.nix b/pkgs/tools/admin/swiftclient/default.nix index 788a64f928a..91860d2df08 100644 --- a/pkgs/tools/admin/swiftclient/default.nix +++ b/pkgs/tools/admin/swiftclient/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "3.6.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0sv6z72zdwzwdjng0djk3l2maryn9pz3khf69yq5ig2ycz8hh0qv"; + sha256 = "0xx3v5kk8jp352rydy3jxndy1b9kl2zmkj1gi14fjxjc5r4rf82g"; }; propagatedBuildInputs = [ requests six pbr setuptools ]; @@ -24,7 +24,7 @@ buildPythonApplication rec { doCheck = false; meta = with lib; { - homepage = https://github.com/openstack/python-swiftclient; + homepage = "https://github.com/openstack/python-swiftclient"; description = "Python bindings to the OpenStack Object Storage API"; license = licenses.asl20; maintainers = with maintainers; [ c0deaddict ]; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 1a65c31102e..7dc416c8efd 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "tightvnc-1.3.10"; src = fetchurl { - url = mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2; + url = "mirror://sourceforge/vnc-tight/tightvnc-1.3.10_unixsrc.tar.bz2"; sha256 = "f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d"; }; @@ -69,7 +69,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; - homepage = http://vnc-tight.sourceforge.net/; + homepage = "http://vnc-tight.sourceforge.net/"; description = "Improved version of VNC"; longDescription = '' diff --git a/pkgs/tools/admin/virtscreen/default.nix b/pkgs/tools/admin/virtscreen/default.nix index 73a81fcff87..3c5fb64f722 100644 --- a/pkgs/tools/admin/virtscreen/default.nix +++ b/pkgs/tools/admin/virtscreen/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Make your iPad/tablet/computer as a secondary monitor on Linux"; - homepage = https://github.com/kbumsik/VirtScreen; + homepage = "https://github.com/kbumsik/VirtScreen"; license = licenses.gpl3; maintainers = with maintainers; [ borisbabic ]; }; diff --git a/pkgs/tools/admin/vncdo/default.nix b/pkgs/tools/admin/vncdo/default.nix index 3dd7a45aa2b..5ca633a944b 100644 --- a/pkgs/tools/admin/vncdo/default.nix +++ b/pkgs/tools/admin/vncdo/default.nix @@ -23,7 +23,7 @@ python2Packages.buildPythonPackage { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/sibson/vncdotool; + homepage = "https://github.com/sibson/vncdotool"; description = "A command line VNC client and python library"; license = licenses.mit; maintainers = with maintainers; [ elitak ]; diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index 8d1e28fed29..e2fe3d90ee6 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = { - homepage = http://members.chello.nl/~k.holtman/afio.html; + homepage = "http://members.chello.nl/~k.holtman/afio.html"; description = "Fault tolerant cpio archiver targeting backups"; platforms = stdenv.lib.platforms.all; /* diff --git a/pkgs/tools/archivers/atool/default.nix b/pkgs/tools/archivers/atool/default.nix index 64a606a4cb5..0d24ead456a 100644 --- a/pkgs/tools/archivers/atool/default.nix +++ b/pkgs/tools/archivers/atool/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "atool-0.39.0"; src = fetchurl { - url = mirror://savannah/atool/atool-0.39.0.tar.gz; + url = "mirror://savannah/atool/atool-0.39.0.tar.gz"; sha256 = "aaf60095884abb872e25f8e919a8a63d0dabaeca46faeba87d12812d6efc703b"; }; @@ -11,7 +11,7 @@ stdenv.mkDerivation { configureScript = "${bash}/bin/bash configure"; meta = { - homepage = https://www.nongnu.org/atool; + homepage = "https://www.nongnu.org/atool"; description = "Archive command line helper"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix index d8a874d0b2e..14c4ede5004 100644 --- a/pkgs/tools/archivers/cabextract/default.nix +++ b/pkgs/tools/archivers/cabextract/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.cabextract.org.uk/; + homepage = "https://www.cabextract.org.uk/"; description = "Free Software for extracting Microsoft cabinet files"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 3f6b3ba4598..a196ddcaa30 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/cpio/; + homepage = "https://www.gnu.org/software/cpio/"; description = "A program to create or extract from cpio archives"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/archivers/cromfs/default.nix b/pkgs/tools/archivers/cromfs/default.nix index 57a8a8e9738..e0eb11aa9a6 100644 --- a/pkgs/tools/archivers/cromfs/default.nix +++ b/pkgs/tools/archivers/cromfs/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FUSE Compressed ROM filesystem with lzma"; - homepage = https://bisqwit.iki.fi/source/cromfs.html; + homepage = "https://bisqwit.iki.fi/source/cromfs.html"; license = licenses.gpl3; maintainers = [ maintainers.viric ]; platforms = platforms.linux; diff --git a/pkgs/tools/archivers/fsarchiver/default.nix b/pkgs/tools/archivers/fsarchiver/default.nix index 3f958f7f958..31341e41787 100644 --- a/pkgs/tools/archivers/fsarchiver/default.nix +++ b/pkgs/tools/archivers/fsarchiver/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { checksummed in the archive in order to protect the data. If the archive is corrupt, you just loose the current file, not the whole archive. ''; - homepage = http://www.fsarchiver.org/; + homepage = "http://www.fsarchiver.org/"; license = licenses.lgpl2; maintainers = [ maintainers.etu ]; platforms = platforms.linux; diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index caf507670f4..749f795c449 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/tar/; + homepage = "https://www.gnu.org/software/tar/"; description = "GNU implementation of the `tar' archiver"; longDescription = '' diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix index 6a8c8c71274..5dab1950145 100644 --- a/pkgs/tools/archivers/innoextract/default.nix +++ b/pkgs/tools/archivers/innoextract/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool to unpack installers created by Inno Setup"; - homepage = https://constexpr.org/innoextract/; + homepage = "https://constexpr.org/innoextract/"; license = licenses.zlib; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/archivers/ndstool/default.nix b/pkgs/tools/archivers/ndstool/default.nix index 7af30e313f4..9a6350a8df1 100644 --- a/pkgs/tools/archivers/ndstool/default.nix +++ b/pkgs/tools/archivers/ndstool/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = https://github.com/devkitPro/ndstool; + 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; diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 465bc474a9e..f44791ce021 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = { - homepage = http://p7zip.sourceforge.net/; + homepage = "http://p7zip.sourceforge.net/"; description = "A port of the 7-zip archiver"; # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/archivers/pxattr/default.nix b/pkgs/tools/archivers/pxattr/default.nix index b507b60287c..74ad0669d69 100644 --- a/pkgs/tools/archivers/pxattr/default.nix +++ b/pkgs/tools/archivers/pxattr/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.lesbonscomptes.com/pxattr/index.html; + 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 ]; diff --git a/pkgs/tools/archivers/s-tar/default.nix b/pkgs/tools/archivers/s-tar/default.nix index 48e5cc6c436..30ff2bc36a2 100644 --- a/pkgs/tools/archivers/s-tar/default.nix +++ b/pkgs/tools/archivers/s-tar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { The way star acts may be modified by additional options. Note that unpacking tar archives may be a security risk because star may overwrite existing files. ''; - homepage = http://cdrtools.sourceforge.net/private/star.html; + homepage = "http://cdrtools.sourceforge.net/private/star.html"; license = stdenv.lib.licenses.cddl; maintainers = [ stdenv.lib.maintainers.wucke13 ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index b4fc2377f0e..aefe4f87eb4 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { by a copy of the shell. unshar may also process files containing concatenated shell archives. ''; - homepage = https://www.gnu.org/software/sharutils/; + homepage = "https://www.gnu.org/software/sharutils/"; license = licenses.gpl3Plus; maintainers = []; platforms = platforms.all; diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 1104548f77f..259238cdec5 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://unarchiver.c3.cx/unarchiver; + homepage = "http://unarchiver.c3.cx/unarchiver"; description = "An archive unpacker program"; longDescription = '' The Unarchiver is an archive unpacker program with support for the popular \ diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix index 72be49d9792..79b861de485 100644 --- a/pkgs/tools/archivers/undmg/default.nix +++ b/pkgs/tools/archivers/undmg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/matthewbauer/undmg; + homepage = "https://github.com/matthewbauer/undmg"; description = "Extract a DMG file"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/archivers/unp/default.nix b/pkgs/tools/archivers/unp/default.nix index 82e83a8c6a3..afe00972141 100644 --- a/pkgs/tools/archivers/unp/default.nix +++ b/pkgs/tools/archivers/unp/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Command line tool for unpacking archives easily"; - homepage = https://packages.qa.debian.org/u/unp.html; + homepage = "https://packages.qa.debian.org/u/unp.html"; license = with licenses; [ gpl2 ]; maintainers = [ maintainers.timor ]; platforms = platforms.all; diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 44e55a271fd..9396267b3a1 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unrar"; - version = "5.9.1"; + version = "5.9.2"; src = fetchurl { url = "https://www.rarlab.com/rar/unrarsrc-${version}.tar.gz"; - sha256 = "0071inswykarjbg4a80fz4n9xdinjfvxd9kmwz5gq0i1w2wd3c8f"; + sha256 = "19nsxdvf9ll99hvgzq6f89ymxhwki224lygjdabrg8ghikqvmlvk"; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility for RAR archives"; - homepage = https://www.rarlab.com/; + homepage = "https://www.rarlab.com/"; license = licenses.unfreeRedistributable; maintainers = [ maintainers.ehmry ]; platforms = platforms.all; diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index cfab2443032..dbcb2b24f10 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool and library to extract CAB files from InstallShield installers"; - homepage = https://github.com/twogood/unshield; + homepage = "https://github.com/twogood/unshield"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index b8f649fbdcb..b3b150637d6 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "unzip-6.0"; src = fetchurl { - url = mirror://sourceforge/infozip/unzip60.tar.gz; + url = "mirror://sourceforge/infozip/unzip60.tar.gz"; sha256 = "0dxx11knh3nk95p2gg2ak777dd11pr7jx5das2g49l262scrcv83"; }; @@ -72,7 +72,7 @@ stdenv.mkDerivation { setupHook = ./setup-hook.sh; meta = { - homepage = http://www.info-zip.org; + 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; diff --git a/pkgs/tools/archivers/wimlib/default.nix b/pkgs/tools/archivers/wimlib/default.nix index 9d58bf5c2f8..da01602cca4 100644 --- a/pkgs/tools/archivers/wimlib/default.nix +++ b/pkgs/tools/archivers/wimlib/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://wimlib.net; + homepage = "https://wimlib.net"; description = "A library and program to extract, create, and modify WIM files"; platforms = platforms.unix; maintainers = with maintainers; [ andir ]; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 1a05c1ba269..fd53cd9b54b 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { 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; + homepage = "https://github.com/ib/xarchiver"; maintainers = [ stdenv.lib.maintainers.domenkozar ]; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 09ba6510707..173f4812109 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { src = fetchurl { urls = [ - ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz - https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz + "ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz" + "https://src.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz" ]; sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Compressor/archiver for creating and modifying zipfiles"; - homepage = http://www.info-zip.org; + homepage = "http://www.info-zip.org"; license = licenses.bsdOriginal; platforms = platforms.all; maintainers = [ ]; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 09c4e914bd8..dbdcdf5cada 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Incremental journaling backup utility and archiver"; - homepage = http://mattmahoney.net/dc/zpaq.html; + homepage = "http://mattmahoney.net/dc/zpaq.html"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/abcm2ps/default.nix b/pkgs/tools/audio/abcm2ps/default.nix index 4a824050c9f..302654f7715 100644 --- a/pkgs/tools/audio/abcm2ps/default.nix +++ b/pkgs/tools/audio/abcm2ps/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ freetype pango ]; meta = with stdenv.lib; { - homepage = http://moinejf.free.fr/; + homepage = "http://moinejf.free.fr/"; license = licenses.gpl3; description = "A command line program which converts ABC to music sheet in PostScript or SVG format"; platforms = platforms.unix; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index b0b65a560bf..0ccfaa081c9 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.02.12"; + version = "2020.03.25"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "1h0ixdbhxdfvii9in9pdidkdv12qfwbhjy3diknywl0yvaa40xw0"; + sha256 = "0rzif8idsja8ryhx0y4zdk8lhn36h10ahfjqa8bmif0rdbyab0kv"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://abc.sourceforge.net/abcMIDI/"; - downloadPage = https://ifdo.ca/~seymour/runabc/top.html; + downloadPage = "https://ifdo.ca/~seymour/runabc/top.html"; license = licenses.gpl2Plus; description = "Utilities for converting between abc and MIDI"; platforms = platforms.unix; diff --git a/pkgs/tools/audio/accuraterip-checksum/default.nix b/pkgs/tools/audio/accuraterip-checksum/default.nix index 4590a0dfbc3..efd44025647 100644 --- a/pkgs/tools/audio/accuraterip-checksum/default.nix +++ b/pkgs/tools/audio/accuraterip-checksum/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program for computing the AccurateRip checksum of singletrack WAV files"; - homepage = https://github.com/leo-bogert/accuraterip-checksum; + homepage = "https://github.com/leo-bogert/accuraterip-checksum"; license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = with platforms; linux; diff --git a/pkgs/tools/audio/acoustid-fingerprinter/default.nix b/pkgs/tools/audio/acoustid-fingerprinter/default.nix index 7b92b973df4..e2824bc07b6 100644 --- a/pkgs/tools/audio/acoustid-fingerprinter/default.nix +++ b/pkgs/tools/audio/acoustid-fingerprinter/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://acoustid.org/fingerprinter; + homepage = "https://acoustid.org/fingerprinter"; description = "Audio fingerprinting tool using chromaprint"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/tools/audio/alsaequal/caps_9.x.patch b/pkgs/tools/audio/alsaequal/caps_9.x.patch new file mode 100644 index 00000000000..282e0404974 --- /dev/null +++ b/pkgs/tools/audio/alsaequal/caps_9.x.patch @@ -0,0 +1,21 @@ +--- ./ctl_equal.c ++++ ./ctl_equal.c +@@ -167,7 +167,7 @@ + snd_ctl_equal_t *equal; + const char *controls = ".alsaequal.bin"; + const char *library = "/usr/lib/ladspa/caps.so"; +- const char *module = "Eq"; ++ const char *module = "Eq10"; + long channels = 2; + const char *sufix = " Playback Volume"; + int err, i, index; +--- ./pcm_equal.c ++++ ./pcm_equal.c +@@ -151,7 +151,7 @@ + snd_config_t *sconf = NULL; + const char *controls = ".alsaequal.bin"; + const char *library = "/usr/lib/ladspa/caps.so"; +- const char *module = "Eq"; ++ const char *module = "Eq10"; + long channels = 2; + int err; diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix new file mode 100644 index 00000000000..9498baca991 --- /dev/null +++ b/pkgs/tools/audio/alsaequal/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl +, alsaLib, caps +}: + +stdenv.mkDerivation rec { + name = "alsaequal"; + version = "0.6"; + + src = fetchurl { + url = "https://thedigitalmachine.net/tools/alsaequal-${version}.tar.bz2"; + sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli"; + }; + + buildInputs = [ alsaLib ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + # Borrowed from Arch Linux's AUR + patches = [ + # Adds executable permissions to resulting libraries + # and changes their destination directory from "usr/lib/alsa-lib" to "lib/alsa-lib" to better align with nixpkgs filesystem hierarchy. + ./makefile.patch + # Fixes control port check, which resulted in false error. + ./false_error.patch + # Fixes name change of an "Eq" to "Eq10" method in version 9 of caps library. + ./caps_9.x.patch + ]; + + postPatch = '' + sed -i 's#/usr/lib/ladspa/caps\.so#${caps}/lib/ladspa/caps\.so#g' ctl_equal.c pcm_equal.c + ''; + + preInstall = '' + mkdir -p "$out/lib/alsa-lib" + ''; + + meta = with stdenv.lib; { + description = "Real-time adjustable equalizer plugin for ALSA"; + homepage = "https://thedigitalmachine.net/alsaequal.html"; + license = licenses.gpl2; + maintainers = with maintainers; [ ymeister ]; + }; +} diff --git a/pkgs/tools/audio/alsaequal/false_error.patch b/pkgs/tools/audio/alsaequal/false_error.patch new file mode 100644 index 00000000000..1a8413da274 --- /dev/null +++ b/pkgs/tools/audio/alsaequal/false_error.patch @@ -0,0 +1,13 @@ +--- ./ctl_equal.c ++++ ./ctl_equal.c +@@ -263,8 +263,8 @@ + for(i = 0; i < equal->num_input_controls; i++) { + if(equal->control_data->control[i].type == LADSPA_CNTRL_INPUT) { + index = equal->control_data->control[i].index; +- if(equal->klass->PortDescriptors[index] != +- (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) { ++ if(equal->klass->PortDescriptors[index] & ++ (LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL) == 0) { + SNDERR("Problem with control file %s, %d.", controls, index); + return -1; + } diff --git a/pkgs/tools/audio/alsaequal/makefile.patch b/pkgs/tools/audio/alsaequal/makefile.patch new file mode 100644 index 00000000000..ee8aa170d60 --- /dev/null +++ b/pkgs/tools/audio/alsaequal/makefile.patch @@ -0,0 +1,13 @@ +--- ./Makefile ++++ ./Makefile +@@ -45,8 +45,8 @@ + + install: all + @echo Installing... +- $(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/ +- $(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/ ++ $(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/lib/alsa-lib/ ++ $(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/lib/alsa-lib/ + + uninstall: + @echo Un-installing... diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 75d8975ab32..fdad7dd8984 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Beets plugin to manage external files"; - homepage = https://github.com/geigerzaehler/beets-alternatives; + homepage = "https://github.com/geigerzaehler/beets-alternatives"; maintainers = [ stdenv.lib.maintainers.aszlig ]; license = stdenv.lib.licenses.mit; }; diff --git a/pkgs/tools/audio/beets/check-plugin.nix b/pkgs/tools/audio/beets/check-plugin.nix index 49ee97ead06..241dcdad452 100644 --- a/pkgs/tools/audio/beets/check-plugin.nix +++ b/pkgs/tools/audio/beets/check-plugin.nix @@ -28,7 +28,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Beets plugin to Verify and store checksums in your library"; - homepage = https://github.com/geigerzaehler/beets-check; + homepage = "https://github.com/geigerzaehler/beets-check"; license = licenses.mit; maintainers = with maintainers; [ lovesegfault ]; }; diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix index fac37962f3c..9432cb9bd0b 100644 --- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix +++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication { meta = { description = "Beets plugin to move non-music files during the import process"; - homepage = https://github.com/sbarakat/beets-copyartifacts; + homepage = "https://github.com/sbarakat/beets-copyartifacts"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 1eb8dd114f5..71ebe7ceb81 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -172,6 +172,13 @@ in pythonPackages.buildPythonApplication rec { nose rarfile responses + # Although considered as plugin dependencies, they are needed for the + # tests, for disabling them via an override makes the build fail. see: + # https://github.com/beetbox/beets/blob/v1.4.9/setup.py + pylast + mpd2 + discogs_client + pyxdg ]; patches = [ @@ -257,7 +264,7 @@ in pythonPackages.buildPythonApplication rec { meta = { description = "Music tagger and library organizer"; - homepage = http://beets.io; + homepage = "http://beets.io"; license = licenses.mit; maintainers = with maintainers; [ aszlig domenkozar pjones ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/darkice/default.nix b/pkgs/tools/audio/darkice/default.nix index c5f7bcd5a71..89b93b02865 100644 --- a/pkgs/tools/audio/darkice/default.nix +++ b/pkgs/tools/audio/darkice/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://darkice.org/; + homepage = "http://darkice.org/"; description = "Live audio streamer"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ ikervagyok fpletz ]; diff --git a/pkgs/tools/audio/dir2opus/default.nix b/pkgs/tools/audio/dir2opus/default.nix index d6c988ef0be..87200654703 100644 --- a/pkgs/tools/audio/dir2opus/default.nix +++ b/pkgs/tools/audio/dir2opus/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { postFixup = "wrapPythonPrograms"; meta = with stdenv.lib; { - homepage = https://github.com/ehmry/dir2opus; + homepage = "https://github.com/ehmry/dir2opus"; maintainers = [ maintainers.ehmry ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/audio/ezstream/default.nix b/pkgs/tools/audio/ezstream/default.nix index fbf90d2211c..02a6e9d37f3 100644 --- a/pkgs/tools/audio/ezstream/default.nix +++ b/pkgs/tools/audio/ezstream/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { from standard input without reencoding and thus requires only very little CPU resources. ''; - homepage = http://icecast.org/ezstream/; + homepage = "http://icecast.org/ezstream/"; license = licenses.gpl2; maintainers = [ maintainers.barrucadu ]; platforms = platforms.all; diff --git a/pkgs/tools/audio/glyr/default.nix b/pkgs/tools/audio/glyr/default.nix index 2acca151040..41490381487 100644 --- a/pkgs/tools/audio/glyr/default.nix +++ b/pkgs/tools/audio/glyr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.lgpl3; description = "A music related metadata searchengine"; - homepage = https://github.com/sahib/glyr; + homepage = "https://github.com/sahib/glyr"; maintainers = [ maintainers.sternenseemann ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/audio/google-music-scripts/default.nix b/pkgs/tools/audio/google-music-scripts/default.nix index f7e96971ab1..f95dcc8bb6d 100644 --- a/pkgs/tools/audio/google-music-scripts/default.nix +++ b/pkgs/tools/audio/google-music-scripts/default.nix @@ -1,17 +1,22 @@ { lib, python3 }: -python3.pkgs.buildPythonApplication rec { +with python3.pkgs; + +buildPythonApplication rec { pname = "google-music-scripts"; - version = "4.0.1"; + version = "4.3.0"; - src = python3.pkgs.fetchPypi { + src = fetchPypi { inherit pname version; - sha256 = "5b2e9fdde8781a6d226984f0b61add2415a3804123ceeecb20fcc8527de9389d"; + sha256 = "0dykjhqklbpqr1lvls0bgf6xkwvslj37lx4q8522hjbs150pwjmq"; }; - patches = [ ./loguru.patch ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "audio-metadata>=0.8,<0.9" "audio-metadata" + ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = [ appdirs audio-metadata google-music @@ -24,10 +29,12 @@ python3.pkgs.buildPythonApplication rec { ]; # No tests - doCheck = false; + checkPhase = '' + $out/bin/gms --help >/dev/null + ''; meta = with lib; { - homepage = https://github.com/thebigmunch/google-music-scripts; + homepage = "https://github.com/thebigmunch/google-music-scripts"; description = "A CLI utility for interacting with Google Music"; license = licenses.mit; maintainers = with maintainers; [ jakewaksbaum ]; diff --git a/pkgs/tools/audio/google-music-scripts/loguru.patch b/pkgs/tools/audio/google-music-scripts/loguru.patch deleted file mode 100644 index 141ce044c43..00000000000 --- a/pkgs/tools/audio/google-music-scripts/loguru.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -24,7 +24,7 @@ audio-metadata = "^0.4" - google-music = "^3.0" - google-music-proto = "^2.4" - google-music-utils = "^2.1" --loguru = "^0.2" -+loguru = "^0.3" - pendulum = "^2.0" - natsort = ">=5.0,<7.0" - tomlkit = "^0.5" ---- a/setup.py -+++ b/setup.py -@@ -16,7 +16,7 @@ install_requires = \ - 'google-music-proto>=2.4,<3.0', - 'google-music-utils>=2.1,<3.0', - 'google-music>=3.0,<4.0', -- 'loguru>=0.2,<0.3', -+ 'loguru>=0.3,<0.4', - 'natsort>=5.0,<7.0', - 'pendulum>=2.0,<3.0', - 'tomlkit>=0.5,<0.6'] diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 9029eb38b06..5190699be08 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "A simple and lightweight volume icon that sits in your system tray"; - homepage = https://github.com/Unia/gvolicon; + homepage = "https://github.com/Unia/gvolicon"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.bennofs ]; diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix index f69e60117ce..2aa01dfe073 100644 --- a/pkgs/tools/audio/liquidsoap/full.nix +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Swiss-army knife for multimedia streaming"; - homepage = https://www.liquidsoap.info/; + homepage = "https://www.liquidsoap.info/"; maintainers = with maintainers; [ ehmry ]; license = licenses.gpl2; platforms = ocamlPackages.ocaml.meta.platforms or []; diff --git a/pkgs/tools/audio/midicsv/default.nix b/pkgs/tools/audio/midicsv/default.nix new file mode 100644 index 00000000000..e5f3f6124b9 --- /dev/null +++ b/pkgs/tools/audio/midicsv/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "midicsv-1.1"; + + src = fetchurl { + url = "http://www.fourmilab.ch/webtools/midicsv/${name}.tar.gz"; + sha256 = "1vvhk2nf9ilfw0wchmxy8l13hbw9cnpz079nsx5srsy4nnd78nkw"; + }; + + postPatch = '' + substituteInPlace Makefile --replace /usr/local $out + ''; + + meta = with stdenv.lib; { + description = "Losslessly translate MIDI to CSV and back"; + homepage = "http://www.fourmilab.ch/webtools/midicsv/"; + license = licenses.publicDomain; + maintainers = with maintainers; [ orivej ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/audio/mp3cat/default.nix b/pkgs/tools/audio/mp3cat/default.nix index acd11bc75e6..e7a1d004a01 100644 --- a/pkgs/tools/audio/mp3cat/default.nix +++ b/pkgs/tools/audio/mp3cat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { only outputs MP3 frames with valid headers, even if there is extra garbage in its input stream ''; - homepage = https://github.com/tomclegg/mp3cat; + homepage = "https://github.com/tomclegg/mp3cat"; license = licenses.gpl2; maintainers = [ maintainers.omnipotententity ]; platforms = platforms.all; diff --git a/pkgs/tools/audio/mpdas/default.nix b/pkgs/tools/audio/mpdas/default.nix index bfb4f81c816..507e62b0dae 100644 --- a/pkgs/tools/audio/mpdas/default.nix +++ b/pkgs/tools/audio/mpdas/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Music Player Daemon AudioScrobbler"; - homepage = https://50hz.ws/mpdas/; + homepage = "https://50hz.ws/mpdas/"; license = licenses.bsd3; maintainers = [ maintainers.taketwo ]; platforms = platforms.all; diff --git a/pkgs/tools/audio/mpdcron/Gemfile.lock b/pkgs/tools/audio/mpdcron/Gemfile.lock index 39df4ddec9f..603a9cfdafb 100644 --- a/pkgs/tools/audio/mpdcron/Gemfile.lock +++ b/pkgs/tools/audio/mpdcron/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES nokogiri BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/audio/mpdcron/default.nix b/pkgs/tools/audio/mpdcron/default.nix index a791a81db35..c083c60a962 100644 --- a/pkgs/tools/audio/mpdcron/default.nix +++ b/pkgs/tools/audio/mpdcron/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A cron like daemon for mpd"; - homepage = http://alip.github.io/mpdcron/; + homepage = "http://alip.github.io/mpdcron/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 manveru ]; diff --git a/pkgs/tools/audio/mpdris2/default.nix b/pkgs/tools/audio/mpdris2/default.nix index 0dbdcd7d25a..029dcd127f1 100644 --- a/pkgs/tools/audio/mpdris2/default.nix +++ b/pkgs/tools/audio/mpdris2/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "MPRIS 2 support for mpd"; - homepage = https://github.com/eonpatapon/mpDris2/; + homepage = "https://github.com/eonpatapon/mpDris2/"; license = licenses.gpl3; maintainers = with maintainers; []; platforms = platforms.unix; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 782ea314359..648dcad42ba 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PulseAudio system tray"; - homepage = https://github.com/christophgysin/pasystray; + homepage = "https://github.com/christophgysin/pasystray"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ exlevan kamilchm ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/picotts/default.nix b/pkgs/tools/audio/picotts/default.nix index d1b055f1d5f..023bf457774 100644 --- a/pkgs/tools/audio/picotts/default.nix +++ b/pkgs/tools/audio/picotts/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { preConfigure = "./autogen.sh"; meta = { description = "Text to speech voice sinthesizer from SVox."; - homepage = https://github.com/naggety/picotts; + homepage = "https://github.com/naggety/picotts"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.canndrew ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index 8392228cef4..3541453bafe 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line utility and library for controlling media players that implement MPRIS"; - homepage = https://github.com/acrisci/playerctl; + homepage = "https://github.com/acrisci/playerctl"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = with maintainers; [ puffnfresh ]; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 5b27a00a955..c1e40ae5dbb 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib gtk3 glib libnotify libX11 pcre ]; meta = with stdenv.lib; { - homepage = https://github.com/nicklan/pnmixer; + homepage = "https://github.com/nicklan/pnmixer"; description = "ALSA volume mixer for the system tray"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/audio/pulsemixer/default.nix b/pkgs/tools/audio/pulsemixer/default.nix index 051743b46e7..3cca6f68ffe 100644 --- a/pkgs/tools/audio/pulsemixer/default.nix +++ b/pkgs/tools/audio/pulsemixer/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cli and curses mixer for pulseaudio"; - homepage = https://github.com/GeorgeFilipkin/pulsemixer; + homepage = "https://github.com/GeorgeFilipkin/pulsemixer"; license = licenses.mit; maintainers = [ maintainers.woffs ]; platforms = platforms.all; diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index bdc431bcb92..86ef7f050b2 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -1,30 +1,24 @@ -{ mkDerivation, lib, fetchurl, cmake, alsaLib, udev, qtbase, qtsvg, qttools }: +{ mkDerivation, lib, fetchFromGitLab, cmake, alsaLib, udev, qtbase, qtsvg, qttools }: -let - version = "0.21.0"; -in - -mkDerivation { +mkDerivation rec { pname = "qastools"; - inherit version; + version = "0.22.0"; - src = fetchurl { - url = "mirror://sourceforge/project/qastools/${version}/qastools_${version}.tar.bz2"; - sha256 = "1zl9cn5h43n63yp3z1an87xvw554k9hlcz75ddb30lvpcczkmwrh"; + src = fetchFromGitLab { + owner = "sebholt"; + repo = pname; + rev = "v${version}"; + sha256 = "0px4fcn8dagivq5fyi5gy84yj86f6x0lk805mc4ry58d0wsbn68v"; }; - buildInputs = [ - alsaLib udev qtbase qtsvg qttools - ]; nativeBuildInputs = [ cmake ]; - - cmakeFlags = [ - "-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h" - ]; + buildInputs = [ alsaLib udev qtbase qtsvg qttools ]; meta = with lib; { description = "Collection of desktop applications for ALSA configuration"; - license = licenses.gpl3; + homepage = "https://gitlab.com/sebholt/qastools"; + license = licenses.mit; + maintainers = with maintainers; [ orivej ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch b/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch new file mode 100644 index 00000000000..1854a43a249 --- /dev/null +++ b/pkgs/tools/audio/trx/add_bctoolbox_ldlib.patch @@ -0,0 +1,15 @@ +diff --git a/Makefile b/Makefile +index ffcd883..c4b4ff7 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,8 +12,9 @@ CFLAGS += -MMD -Wall + LDLIBS_ASOUND ?= -lasound + LDLIBS_OPUS ?= -lopus + LDLIBS_ORTP ?= -lortp ++LDLIBS_BCTOOLBOX ?= -lbctoolbox + +-LDLIBS += $(LDLIBS_ASOUND) $(LDLIBS_OPUS) $(LDLIBS_ORTP) ++LDLIBS += $(LDLIBS_ASOUND) $(LDLIBS_OPUS) $(LDLIBS_ORTP) $(LDLIBS_BCTOOLBOX) + + .PHONY: all install dist clean + diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix index 1d052adbba9..6a23b6caead 100644 --- a/pkgs/tools/audio/trx/default.nix +++ b/pkgs/tools/audio/trx/default.nix @@ -2,19 +2,25 @@ stdenv.mkDerivation rec { pname = "trx"; - version = "0.4"; + version = "0.5"; src = fetchurl { url = "https://www.pogo.org.uk/~mark/trx/releases/${pname}-${version}.tar.gz"; - sha256 = "1wsrkbqc090px8i9p8awz38znxjcqjb1dzjjdd8xkjmiprayjhkl"; + sha256 = "1jjgca92nifjhcr3n0fmpfr6f5gxlqyal2wmgdlgd7hx834r1if7"; }; + # Makefile is currently missing -lbctoolbox so the build fails when linking + # the libraries. This patch adds that flag. + patches = [ + ./add_bctoolbox_ldlib.patch + ]; + buildInputs = [ alsaLib libopus ortp bctoolbox ]; makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "A simple toolset for broadcasting live audio using RTP/UDP and Opus"; - homepage = http://www.pogo.org.uk/~mark/trx/; + homepage = "http://www.pogo.org.uk/~mark/trx/"; license = licenses.gpl2; maintainers = [ maintainers.hansjoergschurr ]; platforms = platforms.linux; diff --git a/pkgs/tools/audio/volumeicon/default.nix b/pkgs/tools/audio/volumeicon/default.nix index 3871bbd39a1..50290881dc7 100644 --- a/pkgs/tools/audio/volumeicon/default.nix +++ b/pkgs/tools/audio/volumeicon/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A lightweight volume control that sits in your systray"; - homepage = http://softwarebakery.com/maato/volumeicon.html; + homepage = "http://softwarebakery.com/maato/volumeicon.html"; platforms = pkgs.lib.platforms.linux; maintainers = with maintainers; [ bobvanderlinden ]; license = pkgs.lib.licenses.gpl3; diff --git a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix index 3d219eed012..a872060ce21 100644 --- a/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix +++ b/pkgs/tools/backup/amazon-glacier-cmd-interface/default.nix @@ -25,7 +25,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Command line interface for Amazon Glacier"; - homepage = https://github.com/uskudnik/amazon-glacier-cmd-interface; + homepage = "https://github.com/uskudnik/amazon-glacier-cmd-interface"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; diff --git a/pkgs/tools/backup/automysqlbackup/default.nix b/pkgs/tools/backup/automysqlbackup/default.nix index 44c14f2dc32..acdf31e47d8 100644 --- a/pkgs/tools/backup/automysqlbackup/default.nix +++ b/pkgs/tools/backup/automysqlbackup/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A script to run daily, weekly and monthly backups for your MySQL database"; - homepage = https://sourceforge.net/projects/automysqlbackup/; + homepage = "https://sourceforge.net/projects/automysqlbackup/"; platforms = platforms.linux; maintainers = [ maintainers.aanderse ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index f40d54adfc8..a9fd2f19b89 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, sqlite, postgresql, zlib, acl, ncurses, openssl, readline }: stdenv.mkDerivation rec { - name = "bacula-9.6.2"; + name = "bacula-9.6.3"; src = fetchurl { url = "mirror://sourceforge/bacula/${name}.tar.gz"; - sha256 = "0hw7wvgh7ymyyar5diqjn9kflhcb8a9kjgz6phb0x9r06j8yahaw"; + sha256 = "02jvijwfw8nqrq61pyr5b9d5zjpmrsimkg6dq42rbd71g2k6a4zc"; }; buildInputs = [ postgresql sqlite zlib ncurses openssl readline ] diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 949e45de5e1..53de4853c62 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.bareos.org/; + homepage = "http://www.bareos.org/"; description = "A fork of the bacula project"; license = licenses.agpl3; platforms = platforms.unix; diff --git a/pkgs/tools/backup/bdsync/default.nix b/pkgs/tools/backup/bdsync/default.nix index be8746932ca..53704ce39d4 100644 --- a/pkgs/tools/backup/bdsync/default.nix +++ b/pkgs/tools/backup/bdsync/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast block device synchronizing tool"; - homepage = https://github.com/TargetHolding/bdsync; + homepage = "https://github.com/TargetHolding/bdsync"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index a12cc368ee5..de69a8db3de 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "A deduplicating backup program (attic fork)"; - homepage = https://www.borgbackup.org; + homepage = "https://www.borgbackup.org"; license = licenses.bsd3; platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage maintainers = with maintainers; [ flokli dotlambda globin ]; diff --git a/pkgs/tools/backup/btar/default.nix b/pkgs/tools/backup/btar/default.nix index 89f577e93ad..3727a4b7f42 100644 --- a/pkgs/tools/backup/btar/default.nix +++ b/pkgs/tools/backup/btar/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "Tar-compatible block-based archiver"; license = stdenv.lib.licenses.gpl3Plus; - homepage = http://viric.name/cgi-bin/btar; + homepage = "http://viric.name/cgi-bin/btar"; platforms = with stdenv.lib.platforms; all; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index ce43ebb5720..ca043692788 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A backup tool for btrfs subvolumes"; - homepage = https://digint.ch/btrbk; + homepage = "https://digint.ch/btrbk"; license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ asymmetric the-kenny ]; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 4788091a5f4..182e37283df 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/bup/bup; + homepage = "https://github.com/bup/bup"; description = "Efficient file backup system based on the git packfile format"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index 5c0be4a2de7..d9b4df98790 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "BURP - BackUp and Restore Program"; - homepage = https://burp.grke.org; + homepage = "https://burp.grke.org"; license = licenses.agpl3; maintainers = with maintainers; [ tokudan ]; platforms = platforms.all; diff --git a/pkgs/tools/backup/chunksync/default.nix b/pkgs/tools/backup/chunksync/default.nix index 736a3122a6f..6885f3f8265 100644 --- a/pkgs/tools/backup/chunksync/default.nix +++ b/pkgs/tools/backup/chunksync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "Space-efficient incremental backups of large files or block devices"; - homepage = http://chunksync.florz.de/; + homepage = "http://chunksync.florz.de/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix index 05a43604926..db9a05fcfde 100644 --- a/pkgs/tools/backup/dedup/default.nix +++ b/pkgs/tools/backup/dedup/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Data deduplication program"; - homepage = https://git.2f30.org/dedup/file/README.html; + homepage = "https://git.2f30.org/dedup/file/README.html"; license = with licenses; [ bsd0 isc ]; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/backup/dirvish/default.nix b/pkgs/tools/backup/dirvish/default.nix index 0127e32fe93..9b138d48f21 100644 --- a/pkgs/tools/backup/dirvish/default.nix +++ b/pkgs/tools/backup/dirvish/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dirvish is a fast, disk based, rotating network backup system"; - homepage = http://dirvish.org/; + homepage = "http://dirvish.org/"; license = stdenv.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 b2ef04dcffc..81209444455 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Rsync for block devices and disk images"; - homepage = https://github.com/dop251/diskrsync; + homepage = "https://github.com/dop251/diskrsync"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ jluttine ]; diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix index d7a248b7a49..1d754e4324d 100644 --- a/pkgs/tools/backup/duplicacy/default.nix +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { ''; meta = with lib; { - homepage = https://duplicacy.com; + homepage = "https://duplicacy.com"; description = "A new generation cloud backup tool"; platforms = platforms.linux ++ platforms.darwin; license = lib.licenses.unfree; diff --git a/pkgs/tools/backup/duplicati/default.nix b/pkgs/tools/backup/duplicati/default.nix index bb24cb35d87..e2a5cc1c4cf 100644 --- a/pkgs/tools/backup/duplicati/default.nix +++ b/pkgs/tools/backup/duplicati/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free backup client that securely stores encrypted, incremental, compressed backups on cloud storage services and remote file servers"; - homepage = https://www.duplicati.com/; + homepage = "https://www.duplicati.com/"; license = licenses.lgpl21; maintainers = with maintainers; [ nyanloutre ]; platforms = platforms.all; diff --git a/pkgs/tools/backup/duply/default.nix b/pkgs/tools/backup/duply/default.nix index 3e4375cb76c..7808a0925b1 100644 --- a/pkgs/tools/backup/duply/default.nix +++ b/pkgs/tools/backup/duply/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { implementing backup job profiles, batch commands and more. Who says secure backups on non-trusted spaces are no child's play? ''; - homepage = https://duply.net/; + homepage = "https://duply.net/"; license = licenses.gpl2; maintainers = [ maintainers.bjornfor ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/backup/easysnap/default.nix b/pkgs/tools/backup/easysnap/default.nix index a56d1274f92..9b5450ba7a3 100644 --- a/pkgs/tools/backup/easysnap/default.nix +++ b/pkgs/tools/backup/easysnap/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "easysnap"; - version = "unstable-2019-02-17"; + version = "unstable-2020-04-04"; src = fetchFromGitHub { owner = "sjau"; repo = "easysnap"; - rev = "9ef5d1ff51ccf9939a88b7b32b4959d27cf61ecc"; - sha256 = "0m0217ni909nham15w5vxg8y7cw2zwjibnhvgnpxxsap8zkhv1m4"; + rev = "26f89c0c3cda01e2595ee19ae5fb8518da25b4ef"; + sha256 = "sha256:1k49k1m7y8s099wyiiz8411i77j1156ncirynmjfyvdhmhcyp5rw"; }; installPhase = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/sjau/easysnap; + homepage = "https://github.com/sjau/easysnap"; description = "Customizable ZFS Snapshotting tool with zfs send/recv pulling"; license = licenses.gpl3; maintainers = with maintainers; [ sjau ]; diff --git a/pkgs/tools/backup/flockit/default.nix b/pkgs/tools/backup/flockit/default.nix index 8d71671f6fe..53baa6a6d93 100644 --- a/pkgs/tools/backup/flockit/default.nix +++ b/pkgs/tools/backup/flockit/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { Also see the following blog post: https://www.swiftstack.com/blog/2012/08/15/old-school-monkeypatching/ ''; - homepage = https://github.com/smerritt/flockit; + homepage = "https://github.com/smerritt/flockit"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.basvandijk ]; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index c8093f4453e..64a711606f8 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Crawler for web archiving with WARC output"; - homepage = https://github.com/ArchiveTeam/grab-site; + homepage = "https://github.com/ArchiveTeam/grab-site"; license = licenses.mit; maintainers = with maintainers; [ ivan ]; platforms = platforms.all; diff --git a/pkgs/tools/backup/hpe-ltfs/default.nix b/pkgs/tools/backup/hpe-ltfs/default.nix index d289febe1f0..e34155bb238 100644 --- a/pkgs/tools/backup/hpe-ltfs/default.nix +++ b/pkgs/tools/backup/hpe-ltfs/default.nix @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HPE's implementation of the open-source tape filesystem standard ltfs"; - homepage = https://support.hpe.com/hpesc/public/km/product/1009214665/Product; + homepage = "https://support.hpe.com/hpesc/public/km/product/1009214665/Product"; license = licenses.lgpl21; maintainers = [ maintainers.redvers ]; platforms = platforms.linux; - downloadPage = https://github.com/nix-community/hpe-ltfs; + downloadPage = "https://github.com/nix-community/hpe-ltfs"; }; } diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index 6fe614195a4..6e2b92e8128 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Easy-to-use offline browser / website mirroring utility"; - homepage = http://www.httrack.com; + homepage = "http://www.httrack.com"; license = licenses.gpl3; maintainers = with maintainers; [ the-kenny ]; platforms = with platforms; unix; diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index 8cf3eb29462..fe5b965e570 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Easy-to-use offline browser / website mirroring utility - QT frontend"; - homepage = http://www.httrack.com; + homepage = "http://www.httrack.com"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; unix; diff --git a/pkgs/tools/backup/lvmsync/Gemfile.lock b/pkgs/tools/backup/lvmsync/Gemfile.lock index 1fe903f1508..5faac235679 100644 --- a/pkgs/tools/backup/lvmsync/Gemfile.lock +++ b/pkgs/tools/backup/lvmsync/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES lvmsync BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/tools/backup/lvmsync/default.nix b/pkgs/tools/backup/lvmsync/default.nix index a52c6bf1ba7..75962c98f8b 100644 --- a/pkgs/tools/backup/lvmsync/default.nix +++ b/pkgs/tools/backup/lvmsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimised synchronisation of LVM snapshots over a network"; - homepage = https://theshed.hezmatt.org/lvmsync/; + homepage = "https://theshed.hezmatt.org/lvmsync/"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ jluttine nicknovitski ]; diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix new file mode 100644 index 00000000000..5d086abf780 --- /dev/null +++ b/pkgs/tools/backup/monolith/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "monolith"; + version = "2.2.2"; + + src = fetchFromGitHub { + owner = "Y2Z"; + repo = pname; + rev = "v${version}"; + sha256 = "08xbpn6kdfiyvz5pwx9hkzbgb40z6dicmiry7frclw0aibal9avi"; + }; + + cargoSha256 = "10zwyg54f05m6ldpnchqzxjkb6rlpcl80crdnk8s6wkf18qny4i3"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + checkPhase = "cargo test -- --skip tests::cli"; + + meta = with stdenv.lib; { + description = "Bundle any web page into a single HTML file"; + homepage = "https://github.com/Y2Z/monolith"; + license = licenses.unlicense; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/backup/mt-st/default.nix b/pkgs/tools/backup/mt-st/default.nix index 0b7b7469af1..57201d69dba 100644 --- a/pkgs/tools/backup/mt-st/default.nix +++ b/pkgs/tools/backup/mt-st/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { longDescription = '' Fork of the standard "mt" tool with additional Linux-specific IOCTLs. ''; - homepage = https://github.com/iustin/mt-st; + homepage = "https://github.com/iustin/mt-st"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.redvers ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/mtx/default.nix b/pkgs/tools/backup/mtx/default.nix index 46f213a6ef4..2a2dd80c566 100644 --- a/pkgs/tools/backup/mtx/default.nix +++ b/pkgs/tools/backup/mtx/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { that they properly report the MChanger bit as required by the SCSI T-10 SMC specification. ''; - homepage = https://sourceforge.net/projects/mtx/; + homepage = "https://sourceforge.net/projects/mtx/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.redvers ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 7160e7f1950..88a72762990 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''High-perfomance MySQL backup tool''; - homepage = https://github.com/maxbube/mydumper; + homepage = "https://github.com/maxbube/mydumper"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/tools/backup/ori/default.nix b/pkgs/tools/backup/ori/default.nix index 30ee0041c7c..e3b4a0fb537 100644 --- a/pkgs/tools/backup/ori/default.nix +++ b/pkgs/tools/backup/ori/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A secure distributed file system"; - homepage = http://ori.scs.stanford.edu/; + homepage = "http://ori.scs.stanford.edu/"; license = licenses.mit; platforms = platforms.unix; broken = true; # 2018-04-11 diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index fa4346c8ccc..2a325046123 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition. ''; - homepage = https://partclone.org; + homepage = "https://partclone.org"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 4a18deeb57c..51a1a05fe6c 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; + url = "mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2"; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = { description = "Opensource disk backup software"; - homepage = http://www.partimage.org; + homepage = "http://www.partimage.org"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/percona-xtrabackup/default.nix b/pkgs/tools/backup/percona-xtrabackup/default.nix index 98eae9cc670..a610bb8e13a 100644 --- a/pkgs/tools/backup/percona-xtrabackup/default.nix +++ b/pkgs/tools/backup/percona-xtrabackup/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Non-blocking backup tool for MySQL"; - homepage = http://www.percona.com/software/percona-xtrabackup; + homepage = "http://www.percona.com/software/percona-xtrabackup"; license = licenses.lgpl2; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/tools/backup/rdedup/default.nix b/pkgs/tools/backup/rdedup/default.nix index 1ed5bfd9ef8..e2d415d92f6 100644 --- a/pkgs/tools/backup/rdedup/default.nix +++ b/pkgs/tools/backup/rdedup/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Data deduplication with compression and public key encryption"; - homepage = https://github.com/dpc/rdedup; + homepage = "https://github.com/dpc/rdedup"; license = licenses.mpl20; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index f3910893b7b..a23be69f4cf 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -4,7 +4,7 @@ python2Packages.buildPythonApplication { name = "rdiff-backup-1.3.3"; src = fetchurl { - url = mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz; + url = "mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz"; sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf"; }; @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication { meta = { description = "Backup system trying to combine best a mirror and an incremental backup system"; - homepage = http://rdiff-backup.nongnu.org/; + homepage = "http://rdiff-backup.nongnu.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 345d14fd10b..f8dbeadff09 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { ''; meta = with lib; { - homepage = https://restic.net; + homepage = "https://restic.net"; description = "A backup program that is fast, efficient and secure"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd2; diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix index 17397ce838f..c0a06e1b9ae 100644 --- a/pkgs/tools/backup/rotate-backups/default.nix +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Simple command line interface for backup rotation"; - homepage = https://github.com/xolox/python-rotate-backups; + homepage = "https://github.com/xolox/python-rotate-backups"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/pkgs/tools/backup/rsbep/default.nix b/pkgs/tools/backup/rsbep/default.nix index 90a8c665cd4..d7967c018a2 100644 --- a/pkgs/tools/backup/rsbep/default.nix +++ b/pkgs/tools/backup/rsbep/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Create resilient backups with Reed-Solomon error correction and byte-spreading"; - homepage = https://www.thanassis.space/rsbep.html; + homepage = "https://www.thanassis.space/rsbep.html"; license = licenses.gpl3; maintainers = [ maintainers.earvstedt ]; }; diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix index eebdcf7ba91..0503dc3b657 100644 --- a/pkgs/tools/backup/rsnapshot/default.nix +++ b/pkgs/tools/backup/rsnapshot/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A filesystem snapshot utility for making backups of local and remote systems"; - homepage = https://rsnapshot.org/; + homepage = "https://rsnapshot.org/"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/backup/stenc/default.nix b/pkgs/tools/backup/stenc/default.nix index ed4f944a960..11859c4f8be 100644 --- a/pkgs/tools/backup/stenc/default.nix +++ b/pkgs/tools/backup/stenc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "SCSI Tape Encryption Manager"; - homepage = https://github.com/scsitape/stenc; + homepage = "https://github.com/scsitape/stenc"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ woffs ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index a0f568b16b3..bd1c0d802aa 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = { description = "A backup suite that stores files on other disks"; - homepage = https://savannah.nongnu.org/projects/storebackup; + homepage = "https://savannah.nongnu.org/projects/storebackup"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/tsm-client/default.nix b/pkgs/tools/backup/tsm-client/default.nix index a1f7b1aba84..c432d47becd 100644 --- a/pkgs/tools/backup/tsm-client/default.nix +++ b/pkgs/tools/backup/tsm-client/default.nix @@ -53,8 +53,8 @@ let meta = { - homepage = https://www.ibm.com/us-en/marketplace/data-protection-and-recovery; - downloadPage = https://www-01.ibm.com/support/docview.wss?uid=swg21239415; + homepage = "https://www.ibm.com/us-en/marketplace/data-protection-and-recovery"; + downloadPage = "https://www-01.ibm.com/support/docview.wss?uid=swg21239415"; platforms = [ "x86_64-linux" ]; license = lib.licenses.unfree; maintainers = [ lib.maintainers.yarny ]; diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix index 8f93474f8f1..f763296e1d6 100644 --- a/pkgs/tools/backup/ugarit-manifest-maker/default.nix +++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix @@ -22,7 +22,7 @@ in with pkgs; eggDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/; + homepage = "https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/"; description = "A tool for generating import manifests for Ugarit"; license = licenses.bsd3; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix index e8f0ea22df1..bc69662dc2b 100644 --- a/pkgs/tools/backup/ugarit/default.nix +++ b/pkgs/tools/backup/ugarit/default.nix @@ -32,7 +32,7 @@ in with pkgs; eggDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.kitten-technologies.co.uk/project/ugarit/; + homepage = "https://www.kitten-technologies.co.uk/project/ugarit/"; description = "A backup/archival system based around content-addressible storage"; license = licenses.bsd3; maintainers = [ maintainers.ebzzry ]; diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix index 9c7cb0a83fd..af1506bff6e 100644 --- a/pkgs/tools/backup/wal-e/default.nix +++ b/pkgs/tools/backup/wal-e/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "A Postgres WAL-shipping disaster recovery and replication toolkit"; - homepage = https://github.com/wal-e/wal-e; + homepage = "https://github.com/wal-e/wal-e"; maintainers = []; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/backup/zbackup/default.nix b/pkgs/tools/backup/zbackup/default.nix index d7a160328ed..5de58c56f00 100644 --- a/pkgs/tools/backup/zbackup/default.nix +++ b/pkgs/tools/backup/zbackup/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake protobufc ]; meta = { description = "A versatile deduplicating backup tool"; - homepage = http://zbackup.org/; + homepage = "http://zbackup.org/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index 1cb7e647441..ff2f6062554 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/alunduil/zfs-replicate; + homepage = "https://github.com/alunduil/zfs-replicate"; description = "ZFS Snapshot Replication"; license = licenses.bsd2; maintainers = with maintainers; [ alunduil ]; diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index b44564efb82..90ed1068ca6 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "High performance open source ZFS backup with mbuffer and ssh support"; - homepage = http://www.znapzend.org; + homepage = "http://www.znapzend.org"; license = licenses.gpl3; maintainers = with maintainers; [ otwieracz ]; platforms = platforms.all; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index e351867ca1b..69db0053cfa 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/blueman-project/blueman; + homepage = "https://github.com/blueman-project/blueman"; description = "GTK-based Bluetooth Manager"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 5c8f65ae514..15661d6e360 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wiki.muiline.com/obex-data-server; + homepage = "http://wiki.muiline.com/obex-data-server"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix index 0771505b726..c235c99d762 100644 --- a/pkgs/tools/bluetooth/obexd/default.nix +++ b/pkgs/tools/bluetooth/obexd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = http://www.bluez.org/; + homepage = "http://www.bluez.org/"; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix index 81d0849b408..1c24697c689 100644 --- a/pkgs/tools/bluetooth/obexfs/default.nix +++ b/pkgs/tools/bluetooth/obexfs/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse obexftp bluez ]; meta = with stdenv.lib; { - homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFs; + homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFs"; description = "A tool to mount OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix index 3e40c7d8ef6..69779557300 100644 --- a/pkgs/tools/bluetooth/obexftp/default.nix +++ b/pkgs/tools/bluetooth/obexftp/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp; + homepage = "http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp"; description = "A library and tool to access files on OBEX-based devices (such as Bluetooth phones)"; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index e3a360818e6..ccf2eee1bb1 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dev.zuckschwerdt.org/openobex/; + homepage = "http://dev.zuckschwerdt.org/openobex/"; description = "An open source implementation of the Object Exchange (OBEX) protocol"; platforms = platforms.linux; license = licenses.lgpl2Plus; diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix index 398641faf15..5c7c68d9d9e 100644 --- a/pkgs/tools/bootloaders/refind/default.nix +++ b/pkgs/tools/bootloaders/refind/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { runtime makes it very easy to use, particularly when paired with Linux kernels that provide EFI stub support. ''; - homepage = http://refind.sourceforge.net/; + homepage = "http://refind.sourceforge.net/"; maintainers = with maintainers; [ AndersonTorres samueldr ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; license = licenses.gpl3Plus; diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix index ccf632dfe5a..9b232be8ce0 100644 --- a/pkgs/tools/cd-dvd/bashburn/default.nix +++ b/pkgs/tools/cd-dvd/bashburn/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { - manipulate ISO-files - and probably more... ''; - homepage = http://bashburn.dose.se/; + homepage = "http://bashburn.dose.se/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index b4f0d1039ed..df63ced882f 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://he.fi/bchunk/; + homepage = "http://he.fi/bchunk/"; description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix index a9f5b321d3d..cdc19887333 100644 --- a/pkgs/tools/cd-dvd/brasero/default.nix +++ b/pkgs/tools/cd-dvd/brasero/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Gnome CD/DVD Burner"; - homepage = https://wiki.gnome.org/Apps/Brasero; + homepage = "https://wiki.gnome.org/Apps/Brasero"; maintainers = [ maintainers.bdimcheff ]; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/ccd2iso/default.nix b/pkgs/tools/cd-dvd/ccd2iso/default.nix index c7aab91adbe..a6ba7fd332f 100644 --- a/pkgs/tools/cd-dvd/ccd2iso/default.nix +++ b/pkgs/tools/cd-dvd/ccd2iso/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CloneCD to ISO converter"; - homepage = https://sourceforge.net/projects/ccd2iso/; + homepage = "https://sourceforge.net/projects/ccd2iso/"; license = licenses.gpl2; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.unix; diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix index 00a1864b035..9d7336663a8 100644 --- a/pkgs/tools/cd-dvd/cdi2iso/default.nix +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format"; - homepage = https://sourceforge.net/projects/cdi2iso.berlios; + homepage = "https://sourceforge.net/projects/cdi2iso.berlios"; license = licenses.gpl2; maintainers = with maintainers; [ hrdinka ]; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/cdimgtools/default.nix b/pkgs/tools/cd-dvd/cdimgtools/default.nix index ece45944c5c..fde9eb1a332 100644 --- a/pkgs/tools/cd-dvd/cdimgtools/default.nix +++ b/pkgs/tools/cd-dvd/cdimgtools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install-doc" ]; meta = with stdenv.lib; { - homepage = https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html; + homepage = "https://repo.or.cz/cdimgtools.git/blob_plain/refs/heads/release:/README.html"; description = "Tools to inspect and manipulate CD/DVD optical disc images"; license = licenses.gpl2; maintainers = with maintainers; [ hhm ]; diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index 908808b79f3..d0d12c34c05 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "cdrdao-1.2.3"; src = fetchurl { - url = mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2; + url = "mirror://sourceforge/cdrdao/cdrdao-1.2.3.tar.bz2"; sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool for recording audio or data CD-Rs in disk-at-once (DAO) mode"; - homepage = http://cdrdao.sourceforge.net/; + homepage = "http://cdrdao.sourceforge.net/"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/tools/cd-dvd/cdrkit/default.nix b/pkgs/tools/cd-dvd/cdrkit/default.nix index 7de086dba60..251eee66f9c 100644 --- a/pkgs/tools/cd-dvd/cdrkit/default.nix +++ b/pkgs/tools/cd-dvd/cdrkit/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { independent project. ''; - homepage = http://cdrkit.org/; + homepage = "http://cdrkit.org/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/cd-dvd/cue2pops/default.nix b/pkgs/tools/cd-dvd/cue2pops/default.nix index 2ee69682a1d..87e633c504a 100644 --- a/pkgs/tools/cd-dvd/cue2pops/default.nix +++ b/pkgs/tools/cd-dvd/cue2pops/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Convert CUE to ISO suitable to POPStarter"; - homepage = https://github.com/makefu/cue2pops-linux; + homepage = "https://github.com/makefu/cue2pops-linux"; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; }; diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix index e4e34aa919b..ebc63152177 100644 --- a/pkgs/tools/cd-dvd/cuetools/default.nix +++ b/pkgs/tools/cd-dvd/cuetools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of utilities for working with cue files and toc files"; - homepage = https://github.com/svend/cuetools; + homepage = "https://github.com/svend/cuetools"; license = licenses.gpl2; maintainers = with maintainers; [ codyopel jcumming ]; platforms = platforms.all; diff --git a/pkgs/tools/cd-dvd/dvd-vr/default.nix b/pkgs/tools/cd-dvd/dvd-vr/default.nix index 2cb90129ed9..aef0c3a636f 100644 --- a/pkgs/tools/cd-dvd/dvd-vr/default.nix +++ b/pkgs/tools/cd-dvd/dvd-vr/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://www.pixelbeat.org/programs/dvd-vr/; - downloadPage = https://www.pixelbeat.org/programs/dvd-vr/; + homepage = "https://www.pixelbeat.org/programs/dvd-vr/"; + downloadPage = "https://www.pixelbeat.org/programs/dvd-vr/"; description = "A utility to identify and optionally copy recordings from a DVD-VR format disc"; license = licenses.gpl2; maintainers = with maintainers; [ fgaz ]; diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix index 6a4161ba1fa..5a3828d8013 100644 --- a/pkgs/tools/cd-dvd/dvdisaster/default.nix +++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://dvdisaster.net/; + homepage = "http://dvdisaster.net/"; description = "Data loss/scratch/aging protection for CD/DVD media"; longDescription = '' Dvdisaster provides a margin of safety against data loss on CD and diff --git a/pkgs/tools/cd-dvd/ecm-tools/default.nix b/pkgs/tools/cd-dvd/ecm-tools/default.nix index 922ab39063a..2ebf8e65551 100644 --- a/pkgs/tools/cd-dvd/ecm-tools/default.nix +++ b/pkgs/tools/cd-dvd/ecm-tools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility to uncompress ECM files to BIN CD format"; - homepage = https://github.com/alucryd/ecm-tools; + homepage = "https://github.com/alucryd/ecm-tools"; license = licenses.gpl3; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.all; diff --git a/pkgs/tools/cd-dvd/isomd5sum/default.nix b/pkgs/tools/cd-dvd/isomd5sum/default.nix index 3bc1f886ccd..0c30f0fe980 100644 --- a/pkgs/tools/cd-dvd/isomd5sum/default.nix +++ b/pkgs/tools/cd-dvd/isomd5sum/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { installTargets = [ "install-bin" "install-devel" ]; meta = with stdenv.lib; { - homepage = https://github.com/rhinstaller/isomd5sum; + homepage = "https://github.com/rhinstaller/isomd5sum"; description = "Utilities for working with md5sum implanted in ISO images"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/cd-dvd/lsdvd/default.nix b/pkgs/tools/cd-dvd/lsdvd/default.nix index 09fbc8b38c8..39d0ab5fc2d 100644 --- a/pkgs/tools/cd-dvd/lsdvd/default.nix +++ b/pkgs/tools/cd-dvd/lsdvd/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/lsdvd/; + homepage = "https://sourceforge.net/projects/lsdvd/"; description = "Display information about audio, video, and subtitle tracks on a DVD"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/nrg2iso/default.nix b/pkgs/tools/cd-dvd/nrg2iso/default.nix index 43ed7ea7d38..082dada85fd 100644 --- a/pkgs/tools/cd-dvd/nrg2iso/default.nix +++ b/pkgs/tools/cd-dvd/nrg2iso/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A linux utils for converting CD (or DVD) image generated by Nero Burning Rom to ISO format"; - homepage = http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html; + homepage = "http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/cd-dvd/sacd/default.nix b/pkgs/tools/cd-dvd/sacd/default.nix new file mode 100644 index 00000000000..a3ce3d36182 --- /dev/null +++ b/pkgs/tools/cd-dvd/sacd/default.nix @@ -0,0 +1,41 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +}: + +stdenv.mkDerivation rec { + pname = "sacd"; + version = "19.7.16.37"; + + src = fetchFromGitHub { + owner = "Sound-Linux-More"; + repo = "sacd"; + rev = version; + sha256 = "03s7jr75pzqj1xd41rkgbszlgf9zx6vzhd0nizc05wyf0fxq5xif"; + }; + + patches = [ + # Makefile prefix, otherwise `/usr` prefix is enforced + (fetchpatch { + url = "https://github.com/Sound-Linux-More/sacd/pull/1.patch"; + name = "makefile-prefix.patch"; + sha256 = "0a7r4x0yqpg6l4vr84dq4wbrypabqm4vvcjv91am068gqjiw6w64"; + }) + ]; + + makeFlagsArray = [ + "PREFIX=$(out)" + ]; + + meta = with stdenv.lib; { + description = "Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. Handles both DST and DSD streams. "; + longDescription = '' + Super Audio CD decoder. Converts SACD image files, Philips DSDIFF and Sony DSF files to 24-bit high resolution wave files. + Handles both DST and DSD streams. + ''; + homepage = "https://github.com/Sound-Linux-More/sacd"; + license = licenses.gpl3; + maintainers = [ maintainers.doronbehar ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix index 94cd09674da..8efc50c4493 100644 --- a/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix +++ b/pkgs/tools/cd-dvd/srt-to-vtt-cl/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Convert SRT files to VTT"; license = licenses.mit; maintainers = with maintainers; [ ericdallo ]; - homepage = https://github.com/nwoltman/srt-to-vtt-cl; + homepage = "https://github.com/nwoltman/srt-to-vtt-cl"; platforms = platforms.linux; }; } diff --git a/pkgs/tools/cd-dvd/unetbootin/default.nix b/pkgs/tools/cd-dvd/unetbootin/default.nix index ec8ef6c1651..d81790d66a8 100644 --- a/pkgs/tools/cd-dvd/unetbootin/default.nix +++ b/pkgs/tools/cd-dvd/unetbootin/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://unetbootin.sourceforge.net/; + homepage = "http://unetbootin.sourceforge.net/"; description = "A tool to create bootable live USB drives from ISO images"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/cd-dvd/vobcopy/default.nix b/pkgs/tools/cd-dvd/vobcopy/default.nix index 48a58c0c7d1..2b918c4ffeb 100644 --- a/pkgs/tools/cd-dvd/vobcopy/default.nix +++ b/pkgs/tools/cd-dvd/vobcopy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "Copies DVD .vob files to harddisk, decrypting them on the way"; - homepage = http://vobcopy.org/projects/c/c.shtml; + homepage = "http://vobcopy.org/projects/c/c.shtml"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/tools/cd-dvd/vobsub2srt/default.nix b/pkgs/tools/cd-dvd/vobsub2srt/default.nix index fe7a1a04414..9e5ee52fca8 100644 --- a/pkgs/tools/cd-dvd/vobsub2srt/default.nix +++ b/pkgs/tools/cd-dvd/vobsub2srt/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchgit { inherit rev; - url = https://github.com/ruediger/VobSub2SRT.git; + url = "https://github.com/ruediger/VobSub2SRT.git"; sha256 = "1rpanrv8bgdh95v2320qbd44xskncvq6y84cbbfc86gw0qxpd9cb"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ tesseract ]; meta = { - homepage = https://github.com/ruediger/VobSub2SRT; + homepage = "https://github.com/ruediger/VobSub2SRT"; description = "Converts VobSub subtitles into SRT subtitles"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 901b0c329c5..b3f268214db 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/xorriso/; + homepage = "https://www.gnu.org/software/xorriso/"; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/advancecomp/default.nix b/pkgs/tools/compression/advancecomp/default.nix index 46c8f4338c6..fb027c4e2d5 100644 --- a/pkgs/tools/compression/advancecomp/default.nix +++ b/pkgs/tools/compression/advancecomp/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3 ; maintainers = [ maintainers.raskin ]; platforms = platforms.linux ++ platforms.darwin; - homepage = https://github.com/amadvance/advancecomp; + homepage = "https://github.com/amadvance/advancecomp"; }; } diff --git a/pkgs/tools/compression/bsc/default.nix b/pkgs/tools/compression/bsc/default.nix index c1ddb242dad..384cbfc3839 100644 --- a/pkgs/tools/compression/bsc/default.nix +++ b/pkgs/tools/compression/bsc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High performance block-sorting data compression library"; - homepage = http://libbsc.com/; + homepage = "http://libbsc.com/"; # Later commits changed the licence to Apache2 (no release yet, though) license = with licenses; [ lgpl3Plus ]; platforms = platforms.unix; diff --git a/pkgs/tools/compression/dejsonlz4/default.nix b/pkgs/tools/compression/dejsonlz4/default.nix index 53b968c5134..7520fc824c0 100644 --- a/pkgs/tools/compression/dejsonlz4/default.nix +++ b/pkgs/tools/compression/dejsonlz4/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Decompress Mozilla Firefox bookmarks backup files"; - homepage = https://github.com/avih/dejsonlz4; + homepage = "https://github.com/avih/dejsonlz4"; license = licenses.bsd2; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.linux; diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 19bc2fdc176..81a446066d9 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -26,7 +26,7 @@ in pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Do The Right Extraction: A tool for taking the hassle out of extracting archives"; - homepage = https://brettcsmith.org/2007/dtrx/; + homepage = "https://brettcsmith.org/2007/dtrx/"; license = licenses.gpl3Plus; maintainers = [ maintainers.spwhitt ]; platforms = platforms.all; diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index e6409f05122..10cfa086860 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "SHELL=/bin/sh" "GREP=grep" ]; meta = { - homepage = https://www.gnu.org/software/gzip/; + homepage = "https://www.gnu.org/software/gzip/"; description = "GNU zip compression program"; longDescription = diff --git a/pkgs/tools/compression/gzrt/default.nix b/pkgs/tools/compression/gzrt/default.nix index 6ce50bb3d99..4367f4b6d61 100644 --- a/pkgs/tools/compression/gzrt/default.nix +++ b/pkgs/tools/compression/gzrt/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.urbanophile.com/arenn/hacking/gzrt/; + homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; description = "The gzip Recovery Toolkit"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix index 6fcff7b2928..f68b0cdc751 100644 --- a/pkgs/tools/compression/kzipmix/default.nix +++ b/pkgs/tools/compression/kzipmix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "kzipmix-20091108"; src = fetchurl { - url = http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz; + url = "http://static.jonof.id.au/dl/kenutils/kzipmix-20091108-linux.tar.gz"; sha256 = "19gyn8pblffdz1bf3xkbpzx8a8wn3xb0v411pqzmz5g5l6pm5gph"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A tool that aggressively optimizes the sizes of Zip archives"; license = stdenv.lib.licenses.unfree; - homepage = http://advsys.net/ken/utils.htm; + homepage = "http://advsys.net/ken/utils.htm"; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix index 64a9ad7f656..edf42266acd 100644 --- a/pkgs/tools/compression/lhasa/default.nix +++ b/pkgs/tools/compression/lhasa/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "lhasa-0.3.1"; src = fetchurl { - url = https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz; + url = "https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz"; sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; }; meta = { @@ -14,7 +14,7 @@ stdenv.mkDerivation { the tool is a library, so that it can be reused for other purposes. ''; license = stdenv.lib.licenses.isc; - homepage = http://fragglet.github.io/lhasa; + homepage = "http://fragglet.github.io/lhasa"; maintainers = with stdenv.lib; [ maintainers.sander ]; platforms = with stdenv.lib.platforms; linux ++ darwin; }; diff --git a/pkgs/tools/compression/lrzip/default.nix b/pkgs/tools/compression/lrzip/default.nix index 2c6765b2e83..aaddb6299c4 100644 --- a/pkgs/tools/compression/lrzip/default.nix +++ b/pkgs/tools/compression/lrzip/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib lzo bzip2 nasm perl ]; meta = { - homepage = http://ck.kolivas.org/apps/lrzip/; + homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; license = stdenv.lib.licenses.gpl2Plus; inherit version; diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix index fd967fce9c6..6bc365b8e1e 100644 --- a/pkgs/tools/compression/lz4/default.nix +++ b/pkgs/tools/compression/lz4/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { pname = "lz4"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { - sha256 = "1l1caxrik1hqs40vj3bpv1pikw6b74cfazv5c0v6g48zpcbmshl0"; + sha256 = "0lpaypmk70ag2ks3kf2dl4ac3ba40n5kc1ainkp9wfjawz76mh61"; rev = "v${version}"; repo = pname; owner = pname; }; - patches = [ - # Fix detection of Darwin - (fetchpatch { - url = "https://github.com/lz4/lz4/commit/024216ef7394b6411eeaa5b52d0cec9953a44249.patch"; - sha256 = "0j0j2pr6pkplxf083hlwl5q4cfp86q3wd8mc64bcfcr7ysc5pzl3"; - }) - ]; - # TODO(@Ericson2314): Separate binaries and libraries outputs = [ "bin" "out" "dev" ]; @@ -61,7 +53,7 @@ stdenv.mkDerivation rec { multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. ''; - homepage = https://lz4.github.io/lz4/; + homepage = "https://lz4.github.io/lz4/"; license = with licenses; [ bsd2 gpl2Plus ]; platforms = platforms.all; }; diff --git a/pkgs/tools/compression/lzfse/default.nix b/pkgs/tools/compression/lzfse/default.nix index 0c54c3b452b..72560c1d9ae 100644 --- a/pkgs/tools/compression/lzfse/default.nix +++ b/pkgs/tools/compression/lzfse/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { enableParallelBuilding = false; #bug meta = with stdenv.lib; { - homepage = https://github.com/lzfse/lzfse; + homepage = "https://github.com/lzfse/lzfse"; description = "a reference C implementation of the LZFSE compressor"; longDescription = '' This is a reference C implementation of the LZFSE compressor introduced in the Compression library with OS X 10.11 and iOS 9. diff --git a/pkgs/tools/compression/lzham/default.nix b/pkgs/tools/compression/lzham/default.nix index 0aa30ceb663..9c18e4d69fe 100644 --- a/pkgs/tools/compression/lzham/default.nix +++ b/pkgs/tools/compression/lzham/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lossless data compression codec with LZMA-like ratios but 1.5x-8x faster decompression speed"; - homepage = https://github.com/richgel999/lzham_codec; + homepage = "https://github.com/richgel999/lzham_codec"; license = with licenses; [ mit ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix index 4ec40deab6c..62f57a8cca7 100644 --- a/pkgs/tools/compression/lzip/default.nix +++ b/pkgs/tools/compression/lzip/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.nongnu.org/lzip/lzip.html; + 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; diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index 00eb5f265aa..48645942038 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ lzo ]; meta = with stdenv.lib; { - homepage = http://www.lzop.org; + homepage = "http://www.lzop.org"; description = "Fast file compressor"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/compression/mozlz4a/default.nix b/pkgs/tools/compression/mozlz4a/default.nix index 28c7c1d69f7..04323f8c49e 100644 --- a/pkgs/tools/compression/mozlz4a/default.nix +++ b/pkgs/tools/compression/mozlz4a/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5; + homepage = "https://gist.githubusercontent.com/Tblue/62ff47bef7f894e92ed5"; }; } diff --git a/pkgs/tools/compression/ncompress/default.nix b/pkgs/tools/compression/ncompress/default.nix index 8e55d24fc98..b60a23e660c 100644 --- a/pkgs/tools/compression/ncompress/default.nix +++ b/pkgs/tools/compression/ncompress/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://ncompress.sourceforge.net/; + homepage = "http://ncompress.sourceforge.net/"; license = stdenv.lib.licenses.publicDomain; description = "A fast, simple LZW file compressor"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/compression/pbzip2/default.nix b/pkgs/tools/compression/pbzip2/default.nix index 3314544084f..1c78d27654d 100644 --- a/pkgs/tools/compression/pbzip2/default.nix +++ b/pkgs/tools/compression/pbzip2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=reserved-user-defined-literal"; meta = with stdenv.lib; { - homepage = http://compression.ca/pbzip2/; + homepage = "http://compression.ca/pbzip2/"; description = "A parallel implementation of bzip2 for multi-core machines"; license = licenses.bsd2; maintainers = with maintainers; [viric]; diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 1fabedaf62d..1953b793657 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.zlib.net/pigz/; + homepage = "http://www.zlib.net/pigz/"; description = "A parallel implementation of gzip for multi-core machines"; license = licenses.zlib; platforms = platforms.unix; diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix index f9ca3aa1857..e731d91f6d6 100644 --- a/pkgs/tools/compression/pxz/default.nix +++ b/pkgs/tools/compression/pxz/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://jnovy.fedorapeople.org/pxz/; + homepage = "https://jnovy.fedorapeople.org/pxz/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [pashev]; description = ''Parallel XZ is a compression utility that takes advantage of diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index 8773121e646..fe4ac14ad02 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "rzip-2.1"; src = fetchurl { - url = mirror://samba/rzip/rzip-2.1.tar.gz; + url = "mirror://samba/rzip/rzip-2.1.tar.gz"; sha256 = "4bb96f4d58ccf16749ed3f836957ce97dbcff3e3ee5fd50266229a48f89815b7"; }; buildInputs = [ bzip2 ]; @@ -11,13 +11,13 @@ stdenv.mkDerivation { patches = [ (fetchpatch { name = "CVE-2017-8364-fill-buffer.patch"; - url = https://sources.debian.net/data/main/r/rzip/2.1-4.1/debian/patches/80-CVE-2017-8364-fill-buffer.patch; + url = "https://sources.debian.net/data/main/r/rzip/2.1-4.1/debian/patches/80-CVE-2017-8364-fill-buffer.patch"; sha256 = "0jcjlx9ksdvxvjyxmyzscx9ar9992iy5icw0sc3n0p09qi4d6x1r"; }) ]; meta = { - homepage = https://rzip.samba.org/; + homepage = "https://rzip.samba.org/"; description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index f602a52d85a..06dcaa26077 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://upx.github.io/; + homepage = "https://upx.github.io/"; description = "The Ultimate Packer for eXecutables"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix index 691f3a8ee5d..b877f78b8c3 100644 --- a/pkgs/tools/compression/xar/default.nix +++ b/pkgs/tools/compression/xar/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { preConfigure = "./autogen.sh"; meta = { - homepage = https://mackyle.github.io/xar/; + homepage = "https://mackyle.github.io/xar/"; description = "Extensible Archiver"; longDescription = diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix index 8251d7a497e..2420f3fab61 100644 --- a/pkgs/tools/compression/xdelta/default.nix +++ b/pkgs/tools/compression/xdelta/default.nix @@ -54,7 +54,7 @@ in stdenv.mkDerivation rec { file differences. This is similar to diff and patch, but it is targeted for binary files and does not generate human readable output. ''; - homepage = http://xdelta.org/; + homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix index bf2601dd373..ae4a5ebac3e 100644 --- a/pkgs/tools/compression/xdelta/unstable.nix +++ b/pkgs/tools/compression/xdelta/unstable.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { file differences. This is similar to diff and patch, but it is targeted for binary files and does not generate human readable output. ''; - homepage = http://xdelta.org/; + homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 0ff349e96e8..545384c396d 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, enableStatic ? false }: stdenv.mkDerivation rec { - name = "xz-5.2.4"; + name = "xz-5.2.5"; src = fetchurl { url = "https://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "1gxpayfagb4v7xfhs2w6h7k56c6hwwav1rk48bj8hggljlmgs4rk"; + sha256 = "1ps2i8i212n0f4xpq6clp7h13q7m1y8slqvxha9i8d0bj0qgj5si"; }; outputs = [ "bin" "dev" "out" "man" "doc" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/doc"; meta = with stdenv.lib; { - homepage = https://tukaani.org/xz/; + homepage = "https://tukaani.org/xz/"; description = "XZ, general-purpose data compression software, successor of LZMA"; longDescription = diff --git a/pkgs/tools/compression/zdelta/default.nix b/pkgs/tools/compression/zdelta/default.nix index 20748c31ab8..b59e7d5708b 100644 --- a/pkgs/tools/compression/zdelta/default.nix +++ b/pkgs/tools/compression/zdelta/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.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 82a6a3a8a53..50cbc731365 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { speed is preserved and remain roughly the same at all settings, a property shared by most LZ compression algorithms, such as zlib. ''; - homepage = https://facebook.github.io/zstd/; + homepage = "https://facebook.github.io/zstd/"; license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only. platforms = platforms.all; diff --git a/pkgs/tools/compression/zsync/default.nix b/pkgs/tools/compression/zsync/default.nix index 830e5f10ef6..7984e2bd589 100644 --- a/pkgs/tools/compression/zsync/default.nix +++ b/pkgs/tools/compression/zsync/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; meta = { - homepage = http://zsync.moria.org.uk/; + 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]; diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index b9c5c55a8e4..9664526761b 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - homepage = https://github.com/mischief/9pfs; + homepage = "https://github.com/mischief/9pfs"; description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/filesystems/aefs/default.nix b/pkgs/tools/filesystems/aefs/default.nix index 1be33e1299d..ea94c26248e 100644 --- a/pkgs/tools/filesystems/aefs/default.nix +++ b/pkgs/tools/filesystems/aefs/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse ]; meta = with stdenv.lib; { - homepage = https://github.com/edolstra/aefs; + homepage = "https://github.com/edolstra/aefs"; description = "A cryptographic filesystem implemented in userspace using FUSE"; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix index 7f8a8c4f931..3340bdba0e6 100644 --- a/pkgs/tools/filesystems/afpfs-ng/default.nix +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ fuse readline libgcrypt gmp ]; meta = with stdenv.lib; { - homepage = https://github.com/simonvetter/afpfs-ng; + homepage = "https://github.com/simonvetter/afpfs-ng"; description = "A client implementation of the Apple Filing Protocol"; license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/tools/filesystems/android-file-transfer/default.nix b/pkgs/tools/filesystems/android-file-transfer/default.nix index 001e644b7e7..48e964bf687 100644 --- a/pkgs/tools/filesystems/android-file-transfer/default.nix +++ b/pkgs/tools/filesystems/android-file-transfer/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Reliable MTP client with minimalistic UI"; - homepage = https://whoozle.github.io/android-file-transfer-linux/; + homepage = "https://whoozle.github.io/android-file-transfer-linux/"; license = licenses.lgpl21; maintainers = [ maintainers.xaverdh ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index b66d67fbc9f..2df5043867a 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://avf.sourceforge.net/; + homepage = "http://avf.sourceforge.net/"; description = "Virtual filesystem that allows browsing of compressed files"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index d449bf1266a..5aeff6baaa9 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/jamielinux/bashmount; + homepage = "https://github.com/jamielinux/bashmount"; description = "A menu-driven bash script for the management of removable media with udisks"; maintainers = [ maintainers.koral ]; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/bcache-tools/default.nix b/pkgs/tools/filesystems/bcache-tools/default.nix index d3e790a3cf1..749aa04ebc7 100644 --- a/pkgs/tools/filesystems/bcache-tools/default.nix +++ b/pkgs/tools/filesystems/bcache-tools/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { User documentation is in Documentation/bcache.txt in the Linux kernel tree. ''; - homepage = https://bcache.evilpiepirate.org/; + homepage = "https://bcache.evilpiepirate.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 144ed0a3845..26158b0361d 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -1,30 +1,58 @@ { stdenv, fetchgit, pkgconfig, attr, libuuid, libscrypt, libsodium, keyutils -, liburcu, zlib, libaio, zstd, lz4 }: +, liburcu, zlib, libaio, zstd, lz4, valgrind, python3Packages +, fuseSupport ? false, fuse3 ? null }: + +assert fuseSupport -> fuse3 != null; stdenv.mkDerivation { pname = "bcachefs-tools"; - version = "2019-10-12"; + version = "2020-04-04"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "6e696ea08703eecd0d1c7b8c520b6f62f06f4f26"; - sha256 = "0m3valm68vc73b4kydlga17fglxa9bldrjaszlladzl5bd0zb967"; + rev = "5d6e237b728cfb7c3bf2cb1a613e64bdecbd740d"; + sha256 = "1syym9k3njb0bk2mg6832cbf6r42z6y8b6hjv7dg4gmv2h7v7l7g"; }; - enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ attr libuuid libscrypt libsodium keyutils liburcu zlib libaio zstd lz4 ]; - installFlags = [ "PREFIX=${placeholder "out"}" ]; - - preInstall = '' + postPatch = '' substituteInPlace Makefile \ + --replace "pytest-3" "pytest --verbose" \ --replace "INITRAMFS_DIR=/etc/initramfs-tools" \ "INITRAMFS_DIR=${placeholder "out"}/etc/initramfs-tools" ''; + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkgconfig + ]; + + buildInputs = [ + libuuid libscrypt libsodium keyutils liburcu zlib libaio + zstd lz4 python3Packages.pytest + ] ++ stdenv.lib.optional fuseSupport fuse3; + + doCheck = true; + + checkFlags = [ + "BCACHEFS_TEST_USE_VALGRIND=no" + ]; + + checkInputs = [ + valgrind + ]; + + preCheck = stdenv.lib.optionalString fuseSupport '' + rm tests/test_fuse.py + ''; + + installFlags = [ + "PREFIX=${placeholder "out"}" + ]; + meta = with stdenv.lib; { description = "Tool for managing bcachefs filesystems"; - homepage = https://bcachefs.org/; + homepage = "https://bcachefs.org/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak chiiruno ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 834aa7290ab..065a673eb03 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.3"; + version = "1.14.4"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "09csi8brp6v98gy9xcl6lkbz1wgs796wch1qviw2wa1n16wd91vw"; + sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7"; }; dontStrip = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A FUSE filesystem for mounting a directory to another location"; - homepage = https://bindfs.org; + homepage = "https://bindfs.org"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/filesystems/bonnie/default.nix b/pkgs/tools/filesystems/bonnie/default.nix index 57dc51e4111..ab49ce02225 100644 --- a/pkgs/tools/filesystems/bonnie/default.nix +++ b/pkgs/tools/filesystems/bonnie/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; meta = { - homepage = http://www.coker.com.au/bonnie++/; + 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; diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix index 3ddc9527397..5dba4b4bbf1 100644 --- a/pkgs/tools/filesystems/boxfs/default.nix +++ b/pkgs/tools/filesystems/boxfs/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { the terminal and in your browser. When you've done using your files, unmount the file system with `fusermount -u mountpoint`. ''; - homepage = https://github.com/drotiro/boxfs2; + homepage = "https://github.com/drotiro/boxfs2"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e3545315d6f..9b4bf479967 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; + homepage = "https://btrfs.wiki.kernel.org/"; license = licenses.gpl2; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/buttersink/default.nix b/pkgs/tools/filesystems/buttersink/default.nix index 791d59b7ac2..aa0f317787f 100644 --- a/pkgs/tools/filesystems/buttersink/default.nix +++ b/pkgs/tools/filesystems/buttersink/default.nix @@ -23,7 +23,7 @@ python2.pkgs.buildPythonApplication rec { Sources and destinations can be local btrfs file systems, remote btrfs file systems over SSH, or S3 buckets. ''; - homepage = https://github.com/AmesCornish/buttersink/wiki; + homepage = "https://github.com/AmesCornish/buttersink/wiki"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch b/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch deleted file mode 100644 index 9604da87fb5..00000000000 --- a/pkgs/tools/filesystems/ceph/0000-dont-check-cherrypy-version.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/src/pybind/mgr/dashboard/module.py b/src/pybind/mgr/dashboard/module.py -index a8a3ec07c1..bcc9b86c37 100644 ---- a/src/pybind/mgr/dashboard/module.py -+++ b/src/pybind/mgr/dashboard/module.py -@@ -25,40 +25,6 @@ except ImportError: - - from .services.sso import load_sso_db - --# The SSL code in CherryPy 3.5.0 is buggy. It was fixed long ago, --# but 3.5.0 is still shipping in major linux distributions --# (Fedora 27, Ubuntu Xenial), so we must monkey patch it to get SSL working. --if cherrypy is not None: -- v = StrictVersion(cherrypy.__version__) -- # It was fixed in 3.7.0. Exact lower bound version is probably earlier, -- # but 3.5.0 is what this monkey patch is tested on. -- if StrictVersion("3.5.0") <= v < StrictVersion("3.7.0"): -- from cherrypy.wsgiserver.wsgiserver2 import HTTPConnection,\ -- CP_fileobject -- -- def fixed_init(hc_self, server, sock, makefile=CP_fileobject): -- hc_self.server = server -- hc_self.socket = sock -- hc_self.rfile = makefile(sock, "rb", hc_self.rbufsize) -- hc_self.wfile = makefile(sock, "wb", hc_self.wbufsize) -- hc_self.requests_seen = 0 -- -- HTTPConnection.__init__ = fixed_init -- --# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify --# that the ports its listening on are in fact bound. When using the any address --# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes) --# ipv6 isn't yet configured / supported and CherryPy throws an uncaught --# exception. --if cherrypy is not None: -- v = StrictVersion(cherrypy.__version__) -- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on -- # centos:7) and back to at least 3.0.0. -- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"): -- # https://github.com/cherrypy/cherrypy/issues/1100 -- from cherrypy.process import servers -- servers.wait_for_occupied_port = lambda host, port: None -- - if 'COVERAGE_ENABLED' in os.environ: - import coverage - __cov = coverage.Coverage(config_file="{}/.coveragerc".format(os.path.dirname(__file__)), -diff --git a/src/pybind/mgr/prometheus/module.py b/src/pybind/mgr/prometheus/module.py -index b7fecf8d85..dfd4160591 100644 ---- a/src/pybind/mgr/prometheus/module.py -+++ b/src/pybind/mgr/prometheus/module.py -@@ -18,20 +18,6 @@ from rbd import RBD - DEFAULT_ADDR = '::' - DEFAULT_PORT = 9283 - --# When the CherryPy server in 3.2.2 (and later) starts it attempts to verify --# that the ports its listening on are in fact bound. When using the any address --# "::" it tries both ipv4 and ipv6, and in some environments (e.g. kubernetes) --# ipv6 isn't yet configured / supported and CherryPy throws an uncaught --# exception. --if cherrypy is not None: -- v = StrictVersion(cherrypy.__version__) -- # the issue was fixed in 3.2.3. it's present in 3.2.2 (current version on -- # centos:7) and back to at least 3.0.0. -- if StrictVersion("3.1.2") <= v < StrictVersion("3.2.3"): -- # https://github.com/cherrypy/cherrypy/issues/1100 -- from cherrypy.process import servers -- servers.wait_for_occupied_port = lambda host, port: None -- - # cherrypy likes to sys.exit on error. don't let it take us down too! - def os_exit_noop(*args, **kwargs): - pass diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index abf6ed1361b..ea610dfcc7f 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -93,7 +93,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.7"; + version = "14.2.8"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,12 +101,11 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0qiqhm6hvz299q54k3i4crnb5dhpq6xnn2yqih9pxn9van0dq1ln"; + sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki"; }; patches = [ ./0000-fix-SPDK-build-env.patch - ./0000-dont-check-cherrypy-version.patch ]; nativeBuildInputs = [ @@ -174,7 +173,7 @@ in rec { doCheck = false; # uses pip to install things from the internet meta = { - homepage = https://ceph.com/; + homepage = "https://ceph.com/"; description = "Distributed storage system"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak krav johanot ]; @@ -186,7 +185,7 @@ in rec { ceph-client = runCommand "ceph-client-${version}" { meta = { - homepage = https://ceph.com/; + homepage = "https://ceph.com/"; description = "Tools needed to mount Ceph's RADOS Block Devices"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak johanot krav ]; diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index 6c0a6c28703..c18bbe5a455 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -23,7 +23,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/; + homepage = "http://chunkfs.florz.de/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 533bb2322e7..5beff7bf1c5 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = { - homepage = http://www.brain-dump.org/projects/ciopfs/; + homepage = "http://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; diff --git a/pkgs/tools/filesystems/convoy/default.nix b/pkgs/tools/filesystems/convoy/default.nix index 00ef368ad3d..77d6dca066a 100644 --- a/pkgs/tools/filesystems/convoy/default.nix +++ b/pkgs/tools/filesystems/convoy/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = [lvm2]; meta = with stdenv.lib; { - homepage = https://github.com/rancher/convoy; + homepage = "https://github.com/rancher/convoy"; description = "A Docker volume plugin, managing persistent container volumes."; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 93a70f1f088..8f7f4f1a313 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cryptographic filesystem for the cloud"; - homepage = https://www.cryfs.org; + homepage = "https://www.cryfs.org"; license = licenses.lgpl3; maintainers = with maintainers; [ peterhoeg c0bw3b ]; platforms = with platforms; linux; diff --git a/pkgs/tools/filesystems/curlftpfs/default.nix b/pkgs/tools/filesystems/curlftpfs/default.nix index 5636909093e..a0306693b28 100644 --- a/pkgs/tools/filesystems/curlftpfs/default.nix +++ b/pkgs/tools/filesystems/curlftpfs/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "curlftpfs-0.9.2"; src = fetchurl { - url = mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz; + url = "mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz"; sha256 = "0n397hmv21jsr1j7zx3m21i7ryscdhkdsyqpvvns12q7qwwlgd2f"; }; nativeBuildInputs = [ pkgconfig ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Filesystem for accessing FTP hosts based on FUSE and libcurl"; - homepage = http://curlftpfs.sourceforge.net; + homepage = "http://curlftpfs.sourceforge.net"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 0890db67fe7..3548cf0a3dc 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; meta = { - homepage = http://www.darlinghq.org/; + homepage = "http://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index 366db929f58..e3e4444c6c1 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,5 +1,7 @@ { stdenv , fetchurl +, fetchpatch +, autoreconfHook , neon , procps , substituteAll @@ -14,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "00fqadhmhi2bmdar5a48nicmjcagnmaj9wgsvjr6cffmrz6pcx21"; }; + nativeBuildInputs = [ + autoreconfHook # neon-0.31.patch requires reconfiguration + ]; + buildInputs = [ neon zlib ]; patches = [ @@ -23,6 +29,15 @@ stdenv.mkDerivation rec { src = ./0001-umount_davfs-substitute-ps-command.patch; ps = "${procps}/bin/ps"; }) + + # Fix build with neon 0.31 + # http://savannah.nongnu.org/bugs/?58101 + (fetchpatch { + name = "neon-0.31.patch"; + url = "http://savannah.nongnu.org/bugs/download.php?file_id=48737"; + sha256 = "EtQfcstWkn8AcbZo93midGt076gq20AvGGJyQ3FO/YQ="; + extraPrefix = ""; # empty means add 'a/' and 'b/' + }) ]; configureFlags = [ "--sysconfdir=/etc" ]; @@ -33,7 +48,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = https://savannah.nongnu.org/projects/davfs2; + homepage = "https://savannah.nongnu.org/projects/davfs2"; description = "Mount WebDAV shares like a typical filesystem"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/filesystems/dislocker/default.nix b/pkgs/tools/filesystems/dislocker/default.nix index cf87f9ca98e..10e6e2f9c80 100644 --- a/pkgs/tools/filesystems/dislocker/default.nix +++ b/pkgs/tools/filesystems/dislocker/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Read BitLocker encrypted partitions in Linux"; - homepage = https://github.com/aorimn/dislocker; + homepage = "https://github.com/aorimn/dislocker"; license = licenses.gpl2; maintainers = with maintainers; [ elitak ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/djmount/default.nix b/pkgs/tools/filesystems/djmount/default.nix index e3c8c2944fb..15086d28c98 100644 --- a/pkgs/tools/filesystems/djmount/default.nix +++ b/pkgs/tools/filesystems/djmount/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse]; meta = { - homepage = http://djmount.sourceforge.net/; + 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 ]; diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index 369d2e74f30..5af1580d0a5 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Utilities for creating and checking FAT and VFAT file systems"; - homepage = https://github.com/dosfstools/dosfstools; + homepage = "https://github.com/dosfstools/dosfstools"; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix index d68ad10bd0d..48511b97c04 100644 --- a/pkgs/tools/filesystems/duff/default.nix +++ b/pkgs/tools/filesystems/duff/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { Duff is a Unix command-line utility for quickly finding duplicates in a given set of files. ''; - homepage = https://duff.dreda.org/; + homepage = "https://duff.dreda.org/"; license = licenses.zlib; platforms = platforms.all; }; diff --git a/pkgs/tools/filesystems/duperemove/default.nix b/pkgs/tools/filesystems/duperemove/default.nix index 0950445bd3e..53ebbb2f8d4 100644 --- a/pkgs/tools/filesystems/duperemove/default.nix +++ b/pkgs/tools/filesystems/duperemove/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple tool for finding duplicated extents and submitting them for deduplication"; - homepage = https://github.com/markfasheh/duperemove; + homepage = "https://github.com/markfasheh/duperemove"; license = licenses.gpl2; maintainers = with maintainers; [ bluescreen303 thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index c23e60e79b2..469ed6fdf34 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://e2fsprogs.sourceforge.net/; + homepage = "http://e2fsprogs.sourceforge.net/"; description = "Tools for creating and checking ext2/ext3/ext4 filesystems"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/filesystems/e2tools/default.nix b/pkgs/tools/filesystems/e2tools/default.nix index 14f6afa99f0..9c86ced90f7 100644 --- a/pkgs/tools/filesystems/e2tools/default.nix +++ b/pkgs/tools/filesystems/e2tools/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://home.earthlink.net/~k_sheff/sw/e2tools/; + 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; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 19767b7013a..24aa52e366f 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An encrypted filesystem in user-space via FUSE"; - homepage = https://vgough.github.io/encfs; + homepage = "https://vgough.github.io/encfs"; license = with licenses; [ gpl3 lgpl3 ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/filesystems/ext4magic/default.nix b/pkgs/tools/filesystems/ext4magic/default.nix index 1e1edfab8dd..19e0e4ee63e 100644 --- a/pkgs/tools/filesystems/ext4magic/default.nix +++ b/pkgs/tools/filesystems/ext4magic/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch; + url = "https://sourceforge.net/p/ext4magic/tickets/10/attachment/ext4magic-0.3.2-i_dir_acl.patch"; sha256 = "1accydd8kigid68yir2fbihm3r3x8ws3iyznp25snkx41w6y6x8c"; }) ./glibc-fix.patch @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { It's much more effective and works much better than extundelete. ''; - homepage = http://ext4magic.sourceforge.net/ext4magic_en.html; + homepage = "http://ext4magic.sourceforge.net/ext4magic_en.html"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.rkoe ]; diff --git a/pkgs/tools/filesystems/extundelete/default.nix b/pkgs/tools/filesystems/extundelete/default.nix index b84992e1acb..447f7a656d1 100644 --- a/pkgs/tools/filesystems/extundelete/default.nix +++ b/pkgs/tools/filesystems/extundelete/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Utility that can recover deleted files from an ext3 or ext4 partition"; - homepage = http://extundelete.sourceforge.net/; + homepage = "http://extundelete.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.domenkozar ]; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index c5ec523e247..2ab168a19a5 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ ./f2fs-tools-cross-fix.patch ]; meta = with stdenv.lib; { - homepage = http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/; + homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; description = "Userland tools for the f2fs filesystem"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix index d2887582938..3559579fe80 100644 --- a/pkgs/tools/filesystems/f3/default.nix +++ b/pkgs/tools/filesystems/f3/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Fight Flash Fraud"; - homepage = http://oss.digirati.com.br/f3/; + homepage = "http://oss.digirati.com.br/f3/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ makefu ]; diff --git a/pkgs/tools/filesystems/fatresize/default.nix b/pkgs/tools/filesystems/fatresize/default.nix index 5a60f8c055e..c1d048889c7 100644 --- a/pkgs/tools/filesystems/fatresize/default.nix +++ b/pkgs/tools/filesystems/fatresize/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The FAT16/FAT32 non-destructive resizer"; - homepage = https://sourceforge.net/projects/fatresize; + homepage = "https://sourceforge.net/projects/fatresize"; platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix index aee053ad135..dafe4c85176 100644 --- a/pkgs/tools/filesystems/fatsort/default.nix +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ help2man ]; meta = with stdenv.lib; { - homepage = http://fatsort.sourceforge.net/; + homepage = "http://fatsort.sourceforge.net/"; description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/file-rename/default.nix b/pkgs/tools/filesystems/file-rename/default.nix index 8eeb052b22f..f9b6a941f68 100644 --- a/pkgs/tools/filesystems/file-rename/default.nix +++ b/pkgs/tools/filesystems/file-rename/default.nix @@ -5,7 +5,7 @@ perlPackages.buildPerlPackage { version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz; + url = "mirror://cpan/authors/id/R/RM/RMBARKER/File-Rename-0.20.tar.gz"; sha256 = "1cf6xx2hiy1xalp35fh8g73j67r0w0g66jpcbc6971x9jbm7bvjy"; }; diff --git a/pkgs/tools/filesystems/fsfs/default.nix b/pkgs/tools/filesystems/fsfs/default.nix index 75e5280d391..3e76653dd3e 100644 --- a/pkgs/tools/filesystems/fsfs/default.nix +++ b/pkgs/tools/filesystems/fsfs/default.nix @@ -5,7 +5,7 @@ throw "It still does not build" stdenv.mkDerivation { name = "fsfs-0.1.1"; src = fetchurl { - url = mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz; + url = "mirror://sourceforge/fsfs/fsfs-0.1.1.tar.gz"; sha256 = "05wka9aq182li2r7gxcd8bb3rhpns7ads0k59v7w1jza60l57c74"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://fsfs.sourceforge.net/; + homepage = "http://fsfs.sourceforge.net/"; description = "Secure distributed file system in user space"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 00f89313942..02347944788 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; - maintainers = with maintainers; [ ma9e ]; + maintainers = with maintainers; [ ma9e ] ++ teams.podman.members; platforms = platforms.unix; inherit (src.meta) homepage; }; diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 41c4cc84f96..2d24cb71bbe 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = https://sourceforge.net/projects/fuseiso; + homepage = "https://sourceforge.net/projects/fuseiso"; description = "FUSE module to mount ISO filesystem images"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/filesystems/genext2fs/default.nix b/pkgs/tools/filesystems/genext2fs/default.nix index 0ef85abd2b7..8d0c0325aa9 100644 --- a/pkgs/tools/filesystems/genext2fs/default.nix +++ b/pkgs/tools/filesystems/genext2fs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "genext2fs-1.4.1"; src = fetchurl { - url = mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz; + url = "mirror://sourceforge/genext2fs/genext2fs-1.4.1.tar.gz"; sha256 = "1z7czvsf3ircvz2cw1cf53yifsq29ljxmj15hbgc79l6gbxbnka0"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://genext2fs.sourceforge.net/; + homepage = "http://genext2fs.sourceforge.net/"; description = "A tool to generate ext2 filesystem images without requiring root privileges"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/genimage/default.nix b/pkgs/tools/filesystems/genimage/default.nix index e905222ad45..c3b867fbb60 100644 --- a/pkgs/tools/filesystems/genimage/default.nix +++ b/pkgs/tools/filesystems/genimage/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://git.pengutronix.de/cgit/genimage; + homepage = "https://git.pengutronix.de/cgit/genimage"; description = "Generate filesystem images from directory trees"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/filesystems/genromfs/default.nix b/pkgs/tools/filesystems/genromfs/default.nix index 1e6c73f725a..d9d97a424bd 100644 --- a/pkgs/tools/filesystems/genromfs/default.nix +++ b/pkgs/tools/filesystems/genromfs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://romfs.sourceforge.net/; + homepage = "http://romfs.sourceforge.net/"; description = "Tool for creating romfs file system images"; license = licenses.gpl2; maintainers = with maintainers; [ pxc ]; diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 7c36e37b33f..0f66955360f 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication rec { and any subsequent changes made to the files will be automatically committed to the remote. ''; - homepage = https://github.com/PressLabs/gitfs; + homepage = "https://github.com/PressLabs/gitfs"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.robbinch ]; diff --git a/pkgs/tools/filesystems/gocryptfs/default.nix b/pkgs/tools/filesystems/gocryptfs/default.nix index 8491bf20e8f..70a0aff118d 100644 --- a/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/pkgs/tools/filesystems/gocryptfs/default.nix @@ -43,7 +43,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Encrypted overlay filesystem written in Go"; license = licenses.mit; - homepage = https://nuetzlich.net/gocryptfs/; + homepage = "https://nuetzlich.net/gocryptfs/"; maintainers = with maintainers; [ flokli offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix index f325fc97e32..01b63003d62 100644 --- a/pkgs/tools/filesystems/grive2/default.nix +++ b/pkgs/tools/filesystems/grive2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A console Google Drive client"; - homepage = https://github.com/vitalif/grive2; + homepage = "https://github.com/vitalif/grive2"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/httpfs/default.nix b/pkgs/tools/filesystems/httpfs/default.nix index b0f7981ebb3..d97b05abb6c 100644 --- a/pkgs/tools/filesystems/httpfs/default.nix +++ b/pkgs/tools/filesystems/httpfs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "HTTPFS2, a FUSE-based HTTP file system for Linux"; - homepage = http://httpfs.sourceforge.net/; + homepage = "http://httpfs.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/hubicfuse/default.nix b/pkgs/tools/filesystems/hubicfuse/default.nix index 9b1c2b66e7a..5bb8b4e91e2 100644 --- a/pkgs/tools/filesystems/hubicfuse/default.nix +++ b/pkgs/tools/filesystems/hubicfuse/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/TurboGit/hubicfuse; + homepage = "https://github.com/TurboGit/hubicfuse"; description = "FUSE-based filesystem to access hubic cloud storage"; platforms = platforms.linux; license = licenses.mit; diff --git a/pkgs/tools/filesystems/ifuse/default.nix b/pkgs/tools/filesystems/ifuse/default.nix index aef6087d3f2..5e6025c0348 100644 --- a/pkgs/tools/filesystems/ifuse/default.nix +++ b/pkgs/tools/filesystems/ifuse/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig fuse usbmuxd libimobiledevice ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/ifuse; + homepage = "https://github.com/libimobiledevice/ifuse"; description = "A fuse filesystem implementation to access the contents of iOS devices"; longDescription = '' Mount directories of an iOS device locally using fuse. By default the media diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix index 902d7d7d1a1..fa498263baa 100644 --- a/pkgs/tools/filesystems/irods/common.nix +++ b/pkgs/tools/filesystems/irods/common.nix @@ -47,7 +47,7 @@ with stdenv; important in data management. The development infrastructure supports exhaustive 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; + homepage = "https://irods.org"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.bzizou ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix index 8b899da32c1..954393e4589 100644 --- a/pkgs/tools/filesystems/jfsutils/default.nix +++ b/pkgs/tools/filesystems/jfsutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IBM JFS utilities"; - homepage = http://jfs.sourceforge.net; + homepage = "http://jfs.sourceforge.net"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/jmtpfs/default.nix b/pkgs/tools/filesystems/jmtpfs/default.nix index 58963753a51..56afb8f0f55 100644 --- a/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/pkgs/tools/filesystems/jmtpfs/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A FUSE filesystem for MTP devices like Android phones"; - homepage = https://github.com/JasonFerrara/jmtpfs; + homepage = "https://github.com/JasonFerrara/jmtpfs"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.coconnor ]; diff --git a/pkgs/tools/filesystems/mhddfs/default.nix b/pkgs/tools/filesystems/mhddfs/default.nix index 4d90e189b95..94aa07b1043 100644 --- a/pkgs/tools/filesystems/mhddfs/default.nix +++ b/pkgs/tools/filesystems/mhddfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://mhddfs.uvw.ru/; + 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 ]; diff --git a/pkgs/tools/filesystems/mkspiffs/default.nix b/pkgs/tools/filesystems/mkspiffs/default.nix index 6733b3df45e..086791de787 100644 --- a/pkgs/tools/filesystems/mkspiffs/default.nix +++ b/pkgs/tools/filesystems/mkspiffs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool to build and unpack SPIFFS images"; license = licenses.mit; - homepage = https://github.com/igrr/mkspiffs; + homepage = "https://github.com/igrr/mkspiffs"; maintainers = with maintainers; [ haslersn ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix index fe9f1ae11e6..4a912d3b42c 100644 --- a/pkgs/tools/filesystems/moosefs/default.nix +++ b/pkgs/tools/filesystems/moosefs/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "moosefs"; - version = "3.0.110"; + version = "3.0.112"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "16m3mxmik2ifrv1g9cp68k57w8xwsxacws3sh1ajlba4azj9sf8v"; + sha256 = "04ymwg9r9x9gqjwy9jbjv7zzfgwal0xlfy6z5bwl27m2ys6l5k4a"; }; nativeBuildInputs = [ pkgconfig makeWrapper ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://moosefs.com; + homepage = "https://moosefs.com"; description = "Open Source, Petabyte, Fault-Tolerant, Highly Performing, Scalable Network Distributed File System"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix index b453067eaef..9675f44583a 100644 --- a/pkgs/tools/filesystems/mp3fs/default.nix +++ b/pkgs/tools/filesystems/mp3fs/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { which only understands the MP3 format, or transcode files through simple drag-and-drop in a file browser. ''; - homepage = https://khenriks.github.io/mp3fs/; + homepage = "https://khenriks.github.io/mp3fs/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index b477ad8deac..58bd9340c5b 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.23"; + name = "mtools-4.0.24"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "1qwfxzr964fasxlzhllahk8mzh7c82s808wvly95dsqsflkdp27i"; + sha256 = "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14"; }; patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/mtools/; + homepage = "https://www.gnu.org/software/mtools/"; description = "Utilities to access MS-DOS disks"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/mtpfs/default.nix b/pkgs/tools/filesystems/mtpfs/default.nix index bf048113714..bede0e5fca0 100644 --- a/pkgs/tools/filesystems/mtpfs/default.nix +++ b/pkgs/tools/filesystems/mtpfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/cjd/mtpfs; + homepage = "https://github.com/cjd/mtpfs"; description = "FUSE Filesystem providing access to MTP devices"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix index 0a4207d0715..faa0a1ebfe8 100644 --- a/pkgs/tools/filesystems/netatalk/default.nix +++ b/pkgs/tools/filesystems/netatalk/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec{ meta = { description = "Apple Filing Protocol Server"; - homepage = http://netatalk.sourceforge.net/; + homepage = "http://netatalk.sourceforge.net/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index 003a0e24fb5..b05abd72bac 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -42,7 +42,7 @@ buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://fedoraproject.org/wiki/Blivet; + homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; license = with licenses; [ gpl2Plus lgpl21Plus ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix index b5f3a2f3e1f..3feed238880 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/cryptsetup.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enablePython python; meta = { - homepage = http://code.google.com/p/cryptsetup/; + homepage = "http://code.google.com/p/cryptsetup/"; description = "LUKS for dm-crypt"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix index 804b052b61a..c8c748b4c45 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://sourceware.org/lvm2/; + homepage = "http://sourceware.org/lvm2/"; description = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = stdenv.lib.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 f30bd958cf3..b3b18579334 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Tools for the Linux multipathing driver"; - homepage = http://christophe.varoqui.free.fr/; + homepage = "http://christophe.varoqui.free.fr/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/filesystems/nixpart/0.4/parted.nix b/pkgs/tools/filesystems/nixpart/0.4/parted.nix index 046fe81e64a..2a0ffe326dc 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/parted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/parted.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { which also serves as a sample implementation and script backend. ''; - homepage = https://www.gnu.org/software/parted/; + homepage = "https://www.gnu.org/software/parted/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix index 9d067359c44..0698dcd9ecb 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { ''; meta = { - homepage = http://fedoraproject.org/wiki/Pykickstart; + homepage = "http://fedoraproject.org/wiki/Pykickstart"; description = "Read and write Fedora kickstart files"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix index e0947b01f51..f71e7c3a06d 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { ''; meta = { - homepage = https://fedorahosted.org/pyparted/; + homepage = "https://fedorahosted.org/pyparted/"; description = "Python interface for libparted"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 1d402090355..abe171170d4 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.tuxera.com/community/open-source-ntfs-3g/; + homepage = "https://www.tuxera.com/community/open-source-ntfs-3g/"; description = "FUSE-based NTFS driver with full write support"; maintainers = with maintainers; [ dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/rdfind/default.nix b/pkgs/tools/filesystems/rdfind/default.nix index 424f84ec34f..54cb54b1df4 100644 --- a/pkgs/tools/filesystems/rdfind/default.nix +++ b/pkgs/tools/filesystems/rdfind/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ nettle ]; meta = with stdenv.lib; { - homepage = https://rdfind.pauldreik.se/; + homepage = "https://rdfind.pauldreik.se/"; description = "Removes or hardlinks duplicate files very swiftly"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.wmertens ]; diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index dbc391d0082..896d472b832 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; - homepage = https://sourceforge.net/projects/reiser4/; + homepage = "https://sourceforge.net/projects/reiser4/"; description = "Reiser4 utilities"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/reiserfsprogs/default.nix b/pkgs/tools/filesystems/reiserfsprogs/default.nix index 10962f10a8f..daafdbf231f 100644 --- a/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { inherit version; - homepage = http://www.namesys.com/; + homepage = "http://www.namesys.com/"; description = "ReiserFS utilities"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/relfs/default.nix b/pkgs/tools/filesystems/relfs/default.nix deleted file mode 100644 index c99a95714c0..00000000000 --- a/pkgs/tools/filesystems/relfs/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchcvs, ocaml, fuse, postgresql, pcre -, libuuid, gnome_vfs, pkgconfig, GConf }: - -stdenv.mkDerivation { - name = "relfs-2008.03.05"; - - src = fetchcvs { - cvsRoot = ":pserver:anonymous@relfs.cvs.sourceforge.net:/cvsroot/relfs"; - module = "relfs"; - date = "2008-03-05"; - sha256 = "949f8eff7e74ff2666cccf8a1efbfcce8d54bc41bec6ad6db8c029de7ca832a3"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml fuse postgresql pcre libuuid gnome_vfs GConf ]; - - buildPhase = '' - cd deps - sed -e 's/^CPP/#&/ ; s/^# CPP=gcc/CPP=gcc/' -i Makefile.camlidl - make - cd ../src - sed -e 's/NULL\\|FALSE/0/g' -i Mimetype_lib.c - sed -e 's@/usr/local/@'\$out/'@' -i Makefile - sed -e '/install:/a\\\tmkdir -p '\$out'/share' -i Makefile - make - mkdir -p \$out/bin - echo ' - createuser -A -D \$1 - dropdb relfs_\$1 ; - rm -rf /tmp/relfs-\$1-tmp; - mkdir /tmp/relfs-\$1-tmp; - USER=\$1 relfs -f -s /tmp/relfs-\$1-tmp & - sleep 1 && - kill -15 \''${!}; - rm -rf /tmp/relfs-\$1-tmp ; - psql -d relfs_\$1 <<< \"ALTER DATABASE relfs_\$1 OWNER TO \$1; - ALTER TABLE obj OWNER TO \$1; - ALTER TABLE obj_mimetype OWNER TO \$1; - ALTER TABLE membership OWNER TO \$1;\"' > \$out/bin/relfs_grant; - chmod a+x \$out/bin/relfs_grant; - ''; - - meta = with stdenv.lib; { - description = "A relational filesystem on top of FUSE"; - homepage = http://relfs.sourceforge.net; - license = licenses.gpl2; - maintainers = [ maintainers.raskin ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/tools/filesystems/rmount/default.nix b/pkgs/tools/filesystems/rmount/default.nix index 72172ef5baa..529fc024491 100644 --- a/pkgs/tools/filesystems/rmount/default.nix +++ b/pkgs/tools/filesystems/rmount/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/Luis-Hebendanz/rmount; + homepage = "https://github.com/Luis-Hebendanz/rmount"; description = "Remote mount utility which parses a json file"; license = licenses.mit; maintainers = [ maintainers.luis ]; diff --git a/pkgs/tools/filesystems/romdirfs/default.nix b/pkgs/tools/filesystems/romdirfs/default.nix index 8085eb5f234..96389214c7e 100644 --- a/pkgs/tools/filesystems/romdirfs/default.nix +++ b/pkgs/tools/filesystems/romdirfs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps"; - homepage = https://github.com/mlafeldt/romdirfs; + homepage = "https://github.com/mlafeldt/romdirfs"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ genesis ]; diff --git a/pkgs/tools/filesystems/s3backer/default.nix b/pkgs/tools/filesystems/s3backer/default.nix index 186da6255eb..1906f680535 100644 --- a/pkgs/tools/filesystems/s3backer/default.nix +++ b/pkgs/tools/filesystems/s3backer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/archiecobbs/s3backer; + homepage = "https://github.com/archiecobbs/s3backer"; description = "FUSE-based single file backing store via Amazon S3"; license = licenses.gpl2Plus; platforms = with platforms; linux; diff --git a/pkgs/tools/filesystems/sasquatch/default.nix b/pkgs/tools/filesystems/sasquatch/default.nix index 36ac3630e54..d4c7d9b7667 100644 --- a/pkgs/tools/filesystems/sasquatch/default.nix +++ b/pkgs/tools/filesystems/sasquatch/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = fetchurl { - url = mirror://sourceforge/squashfs/squashfs4.3.tar.gz; + url = "mirror://sourceforge/squashfs/squashfs4.3.tar.gz"; sha256 = "1xpklm0y43nd9i6jw43y2xh5zvlmj9ar2rvknh0bh7kv8c95aq0d"; }; diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index be46abb2694..04c7d7c9d2a 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "smbnetfs"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { url = "mirror://sourceforge/project/smbnetfs/smbnetfs/SMBNetFS-${version}/${pname}-${version}.tar.bz2"; - sha256 = "02iqjnm6pdwc1q38z56akiwdbp0xisr6qwrmxs1lrk5mq7j8x2w4"; + sha256 = "19x9978k90w9a65lrpsphk7swsq8zkws9jc27q4zbndrm0r2snr0"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; inherit version; - homepage = https://sourceforge.net/projects/smbnetfs/; + homepage = "https://sourceforge.net/projects/smbnetfs/"; }; } diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index b5ffdade98f..db9afedad96 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ ]; meta = { - homepage = http://www.snapraid.it/; + homepage = "http://www.snapraid.it/"; description = "A backup program for disk arrays"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.makefu ]; diff --git a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix index bc8ce7b19c5..767c5168ff2 100644 --- a/pkgs/tools/filesystems/squashfs-tools-ng/default.nix +++ b/pkgs/tools/filesystems/squashfs-tools-ng/default.nix @@ -1,21 +1,21 @@ { stdenv, lib, fetchurl, doxygen, graphviz, perl, pkgconfig -, lz4, xz, zlib, zstd +, lz4, lzo, xz, zlib, zstd }: stdenv.mkDerivation rec { pname = "squashfs-tools-ng"; - version = "0.8"; + version = "0.9"; src = fetchurl { url = "https://infraroot.at/pub/squashfs/squashfs-tools-ng-${version}.tar.xz"; - sha256 = "1km18qm9kgmm39aj9yq2aaq99708nmj9cpa9lqf5bp1y617bhh7y"; + sha256 = "1jx6bga0k07cckpv0yk77kwql7rjiicf9wkbadc8yqhp463xn90q"; }; nativeBuildInputs = [ doxygen graphviz pkgconfig perl ]; - buildInputs = [ zlib xz lz4 zstd ]; + buildInputs = [ zlib xz lz4 lzo zstd ]; meta = with lib; { - homepage = https://github.com/AgentD/squashfs-tools-ng; + homepage = "https://github.com/AgentD/squashfs-tools-ng"; license = licenses.gpl3Plus; maintainers = with maintainers; [ qyliss ]; platforms = platforms.unix; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index f02a913bc25..645633a87e1 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; meta = { - homepage = http://squashfs.sourceforge.net/; + homepage = "http://squashfs.sourceforge.net/"; description = "Tool for creating and unpacking squashfs filesystems"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index e828698b0e9..27335a9cf5d 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { description = "FUSE filesystem to mount squashfs archives"; - homepage = https://github.com/vasi/squashfuse; + homepage = "https://github.com/vasi/squashfuse"; maintainers = [ maintainers.genesis ]; platforms = platforms.linux; license = "BSD-2-Clause"; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index ebfb211732e..4ae4ebb6f19 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "svnfs-0.4"; src = fetchurl { - url = http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz; + url = "http://www.jmadden.eu/wp-content/uploads/svnfs/svnfs-0.4.tgz"; sha256 = "1lrzjr0812lrnkkwk60bws9k1hq2iibphm0nhqyv26axdsygkfky"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "FUSE filesystem for accessing Subversion repositories"; - homepage = http://www.jmadden.eu/index.php/svnfs/; + homepage = "http://www.jmadden.eu/index.php/svnfs/"; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index 67e21ac4c2c..c7d11d415a5 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.tmsu.org; + homepage = "http://www.tmsu.org"; description = "A tool for tagging your files using a virtual filesystem"; maintainers = with maintainers; [ pSub ]; license = licenses.gpl3; diff --git a/pkgs/tools/filesystems/u3-tool/default.nix b/pkgs/tools/filesystems/u3-tool/default.nix index 62b4b930139..f18eb9e8227 100644 --- a/pkgs/tools/filesystems/u3-tool/default.nix +++ b/pkgs/tools/filesystems/u3-tool/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for controlling the special features of a 'U3 smart drive' USB Flash disk"; - homepage = https://sourceforge.net/projects/u3-tool/ ; + homepage = "https://sourceforge.net/projects/u3-tool/"; license = licenses.gpl2; platforms = with platforms; linux; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/tools/filesystems/unionfs-fuse/default.nix b/pkgs/tools/filesystems/unionfs-fuse/default.nix index 73272b83989..695e071effc 100644 --- a/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "FUSE UnionFS implementation"; - homepage = https://github.com/rpodgorny/unionfs-fuse; + homepage = "https://github.com/rpodgorny/unionfs-fuse"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 50a50ad18f0..af1caecfd74 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { buildInputs = [fuse glib neon]; meta = with stdenv.lib; { - homepage = http://noedler.de/projekte/wdfs/; + homepage = "http://noedler.de/projekte/wdfs/"; license = licenses.gpl2; description = "User-space filesystem that allows to mount a webdav share"; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index aa28ee62596..b5254a92024 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://xfs.org/; + homepage = "http://xfs.org/"; description = "SGI XFS utilities"; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index b97480d655b..334aa6ad9c6 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://help.yandex.com/disk/cli-clients.xml; + homepage = "https://help.yandex.com/disk/cli-clients.xml"; description = "A free cloud file storage service"; maintainers = with stdenv.lib.maintainers; [ smironov jagajaga ]; platforms = ["i686-linux" "x86_64-linux"]; diff --git a/pkgs/tools/filesystems/zerofree/default.nix b/pkgs/tools/filesystems/zerofree/default.nix index 734c8df9b6a..f9fd8a3c7f3 100644 --- a/pkgs/tools/filesystems/zerofree/default.nix +++ b/pkgs/tools/filesystems/zerofree/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://frippery.org/uml/; + 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; diff --git a/pkgs/tools/graphics/appleseed/default.nix b/pkgs/tools/graphics/appleseed/default.nix index cafe0bb7b11..e9e57595e3d 100644 --- a/pkgs/tools/graphics/appleseed/default.nix +++ b/pkgs/tools/graphics/appleseed/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source, physically-based global illumination rendering engine"; - homepage = https://appleseedhq.net/; + homepage = "https://appleseedhq.net/"; maintainers = with maintainers; [ hodapp ]; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 3f8bdf3ac6b..115a9a3e4a5 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.argyllcms.com; + homepage = "http://www.argyllcms.com"; description = "Color management system (compatible with ICC)"; license = licenses.gpl3; maintainers = []; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index b3b03892fcb..285dd9e7d4e 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -9,14 +9,14 @@ }: stdenv.mkDerivation rec { - version = "2.63"; + version = "2.65"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - sha256 = "1szy0hmh8fx73ngpfn5p934snv148kf1amdnbcjc0n5zb4x9vzck"; + sha256 = "1b40khffrvwm3nd5nx1iybhkc25zs6whrb3wynw7y3i87p3palyz"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 179085e1fd6..48558d02259 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; # Maybe other non-darwin Unix downloadPage = "https://ftp.gnu.org/gnu/barcode/"; updateWalker = true; - homepage = https://www.gnu.org/software/barcode/; + homepage = "https://www.gnu.org/software/barcode/"; license = licenses.gpl3; }; } diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix index 49900401319..b22a2e8970b 100644 --- a/pkgs/tools/graphics/blur-effect/default.nix +++ b/pkgs/tools/graphics/blur-effect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/sonald/blur-effect; + homepage = "https://github.com/sonald/blur-effect"; description = "Off-screen image blurring utility using OpenGL ES 3.0"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index e57f80f738f..3ac49b690d7 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://sourceforge.net/projects/briss/; + homepage = "https://sourceforge.net/projects/briss/"; description = "Java application for cropping PDF files"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 3d48b328934..5213245b7d4 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Multi-language OCR system"; - homepage = https://launchpad.net/cuneiform-linux; + homepage = "https://launchpad.net/cuneiform-linux"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; diff --git a/pkgs/tools/graphics/dcraw/default.nix b/pkgs/tools/graphics/dcraw/default.nix index 11ff4b743dd..f8e78d01712 100644 --- a/pkgs/tools/graphics/dcraw/default.nix +++ b/pkgs/tools/graphics/dcraw/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.dechifro.org/dcraw/; + 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 diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index c8c330d80e5..89a18ae1fe2 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "ditaa-0.11.0"; src = fetchurl { - url = https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar; + url = "https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar"; sha256 = "1acnl7khz8aasg230nbsx9dyf8716scgb5l3679cb2bdzxisl64l"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert ascii art diagrams into proper bitmap graphics"; - homepage = https://github.com/stathissideris/ditaa; + homepage = "https://github.com/stathissideris/ditaa"; license = licenses.lgpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index cb83e02689c..1dc4891d642 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = with stdenv.lib; { - homepage = https://cgit.freedesktop.org/xorg/app/editres/; + homepage = "https://cgit.freedesktop.org/xorg/app/editres/"; description = "A dynamic resource editor for X Toolkit applications"; license = licenses.mit; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 8c46e8154c1..89c861267f0 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://enblend.sourceforge.net/; + homepage = "http://enblend.sourceforge.net/"; description = "Blends away the seams in a panoramic image mosaic using a multiresolution spline"; license = licenses.gpl2; platforms = with platforms; linux; diff --git a/pkgs/tools/graphics/eplot/default.nix b/pkgs/tools/graphics/eplot/default.nix index ff2091fc299..de729e38662 100644 --- a/pkgs/tools/graphics/eplot/default.nix +++ b/pkgs/tools/graphics/eplot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { This package also includes the complementary 'ec' tool (say "extract column"). ''; - homepage = http://liris.cnrs.fr/christian.wolf/software/eplot/; + homepage = "http://liris.cnrs.fr/christian.wolf/software/eplot/"; license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index 2ad52d2de43..aed49158599 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps"; - homepage = http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm; + homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; license = licenses.gpl2; maintainers = [ maintainers.asppsa ]; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 16f33251dd6..4a887688c4f 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -23,7 +23,7 @@ buildPythonApplication { ''; meta = with lib; { - homepage = https://github.com/Roger/escrotum; + homepage = "https://github.com/Roger/escrotum"; description = "Linux screen capture using pygtk, inspired by scrot"; platforms = platforms.linux; maintainers = with maintainers; [ rasendubi ]; diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index 83fec1287a6..68007ec3a6b 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libexif popt libintl ]; meta = with stdenv.lib; { - homepage = https://libexif.github.io; + homepage = "https://libexif.github.io"; description = "A utility to read and manipulate EXIF data in digital photographs"; platforms = platforms.unix; license = licenses.lgpl21; diff --git a/pkgs/tools/graphics/exiftags/default.nix b/pkgs/tools/graphics/exiftags/default.nix index 9ce95154cb0..3ca748aa956 100644 --- a/pkgs/tools/graphics/exiftags/default.nix +++ b/pkgs/tools/graphics/exiftags/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "exiftags-1.01"; src = fetchurl { - url = https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz; + url = "https://johnst.org/sw/exiftags/exiftags-1.01.tar.gz"; sha256 = "194ifl6hybx2a5x8jhlh9i56k3qfc6p2l72z0ii1b7v0bzg48myr"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://johnst.org/sw/exiftags/; + homepage = "http://johnst.org/sw/exiftags/"; description = "Displays EXIF data from JPEG files"; license = stdenv.lib.licenses.free; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index cb697148d04..690c7336b69 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.thregr.org/~wavexx/software/facedetect/; + homepage = "https://www.thregr.org/~wavexx/software/facedetect/"; description = "A simple face detector for batch processing"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/graphics/fast-neural-doodle/default.nix b/pkgs/tools/graphics/fast-neural-doodle/default.nix deleted file mode 100644 index 17e1c710586..00000000000 --- a/pkgs/tools/graphics/fast-neural-doodle/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{stdenv, fetchFromGitHub, fetchurl, torch, torch-hdf5, loadcaffe, bash - , python, numpy, scipy, h5py, scikitlearn, pillow - }: -stdenv.mkDerivation rec { - pname = "fast-neural-doodle"; - version = "0.0pre2016-07-01"; - buildInputs = [ - torch torch-hdf5 python numpy h5py scikitlearn scipy pillow - ]; - - inherit torch loadcaffe bash python; - torch_hdf5 = torch-hdf5; - python_libPrefix = python.libPrefix; - - src = fetchFromGitHub { - owner = "DmitryUlyanov"; - repo = "fast-neural-doodle"; - rev = "00c35a4440d1d58b029d7bdf9bc56743b1a1835f"; - sha256 = "0xhmhxhjm59pfjm2q27g2xfb35hg0vlqkk3sb3llx2qqq2c7jk8m"; - }; - models = [ - (fetchurl { - url = "https://gist.githubusercontent.com/ksimonyan/3785162f95cd2d5fee77/raw/bb2b4fe0a9bb0669211cf3d0bc949dfdda173e9e/VGG_ILSVRC_19_layers_deploy.prototxt"; - sha256 = "09cpz7pyvc8sypg2q5j2i8yqwj1sjdbnmd6skl293p9pv13dmjg7"; - }) - (fetchurl { - url = "https://bethgelab.org/media/uploads/deeptextures/vgg_normalised.caffemodel"; - sha256 = "11qckdvlck7wwl3pan0nawgxm8l2ccddi272i5l8rs9qzm7b23rf"; - }) - (fetchurl { - url = "http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_19_layers.caffemodel"; - sha256 = "0m399x7pl4lnhy435ycsyz8xpzapqmx9n1sz698y2vhcqhkwdd1i"; - }) - ]; - installPhase = '' - mkdir -p "$out"/{doc/fast-neural-doodle,lib/lua/fast_neural_doodle,lib/${python.libPrefix}/fast_neural_doodle,bin} - cp -r data src fast_neural_doodle.lua "$out/lib/lua/fast_neural_doodle/" - for file in $models; do - ln -s "$file" "$out/lib/lua/fast_neural_doodle/data/pretrained/$(basename "$file" | sed -e 's/[^-]*-//')" - done; - cp get_mask_hdf5.py "$out/lib/${python.libPrefix}/fast_neural_doodle" - cp *.md LICENSE "$out/doc/fast-neural-doodle" - - export pythonpath="$PYTHONPATH" - - substituteAll "${./get-mask-hdf5.sh}" "$out/bin/get-mask-hdf5" - substituteAll "${./fast-neural-doodle.sh}" "$out/bin/fast-neural-doodle" - - chmod a+x "$out/bin"/* - - "$out/bin/get-mask-hdf5" --n_colors=4 --style_image data/Renoir/style.png --style_mask data/Renoir/style_mask.png --target_mask data/Renoir/target_mask.png --out_hdf5 masks.hdf5 - - "$out/bin/fast-neural-doodle" -gpu -1 -masks_hdf5 masks.hdf5 -num_iterations 1 - ''; - meta = { - inherit version; - description = ''Faster neural doodle''; - license = stdenv.lib.licenses.mit; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - broken = true; - }; -} diff --git a/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh b/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh deleted file mode 100644 index a089d5a9506..00000000000 --- a/pkgs/tools/graphics/fast-neural-doodle/fast-neural-doodle.sh +++ /dev/null @@ -1,28 +0,0 @@ -#! @bash@/bin/bash - -declare -a args -c=1 -flag= - -for arg in "$@"; do - if test "$arg" = "${arg#-}" && test "$arg" = "${arg#/}" && test -n "$flag"; then - arg="$PWD/$arg" - flag= - elif (test "$arg" != "${arg%_image}" || test "$arg" == "-masks_hdf5") && test "$arg" != "${arg#-}"; then - flag=1 - else - flag= - fi - args[c]="$arg"; - c=$((c+1)); -done - -cd "@out@/lib/lua/fast_neural_doodle" - -export LUA_PATH="$LUA_PATH${LUA_PATH:+;}@loadcaffe@/lua/?/init.lua;@loadcaffe@/lua/?.lua" -export LUA_PATH="$LUA_PATH${LUA_PATH:+;}@torch_hdf5@/lua/?/init.lua;@torch_hdf5@/lua/?.lua" -export LUA_CPATH="$LUA_CPATH${LUA_CPATH:+;}@loadcaffe@/lib/?.so" - -set -x - -@torch@/bin/th fast_neural_doodle.lua "${args[@]}" diff --git a/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh b/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh deleted file mode 100644 index cfff76d141f..00000000000 --- a/pkgs/tools/graphics/fast-neural-doodle/get-mask-hdf5.sh +++ /dev/null @@ -1,5 +0,0 @@ -#! @bash@/bin/bash - -export PYTHONPATH="@pythonpath@" - -@python@/bin/python "@out@/lib/@python_libPrefix@/fast_neural_doodle/get_mask_hdf5.py" "$@" diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/tools/graphics/fbv/default.nix index c7fab171067..561c007ff16 100644 --- a/pkgs/tools/graphics/fbv/default.nix +++ b/pkgs/tools/graphics/fbv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View pictures on a linux framebuffer device"; - homepage = http://s-tech.elsat.net.pl/fbv/; + homepage = "http://s-tech.elsat.net.pl/fbv/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 8f94624febe..ef699b5437a 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -48,7 +48,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "General purpose pipe-oriented plotting tool"; - homepage = https://github.com/dkogan/feedgnuplot/; + homepage = "https://github.com/dkogan/feedgnuplot/"; license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ mnacamura ]; diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 2bce8ec4941..cc387e29412 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Static photo gallery generator"; - homepage = http://www.thregr.org/~wavexx/software/fgallery/; + homepage = "http://www.thregr.org/~wavexx/software/fgallery/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/graphics/fim/default.nix b/pkgs/tools/graphics/fim/default.nix index 3fc82a9c72a..6a3d9a29db3 100644 --- a/pkgs/tools/graphics/fim/default.nix +++ b/pkgs/tools/graphics/fim/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { to be a highly customizable and scriptable for users who are comfortable with software like the VIM text editor or the Mutt mail user agent. ''; - homepage = https://www.nongnu.org/fbi-improved/; + homepage = "https://www.nongnu.org/fbi-improved/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index a6277f58cbd..0f1bf806551 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/pkgs/tools/graphics/flam3/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cosmic recursive fractal flames"; - homepage = https://flam3.com/; + homepage = "https://flam3.com/"; maintainers = [ maintainers.nand0p ]; platforms = platforms.linux; license = licenses.cc-by-nc-sa-20; diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index de02865c36e..82ee194ad12 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Visualization program for exploring high-dimensional data"; - homepage = http://www.ggobi.org/; + homepage = "http://www.ggobi.org/"; license = licenses.cpl10; platforms = platforms.linux; maintainers = [ maintainers.michelk ]; diff --git a/pkgs/tools/graphics/gifsicle/default.nix b/pkgs/tools/graphics/gifsicle/default.nix index 9b3836b9dec..007ba0f9972 100644 --- a/pkgs/tools/graphics/gifsicle/default.nix +++ b/pkgs/tools/graphics/gifsicle/default.nix @@ -24,7 +24,7 @@ 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/; + homepage = "https://www.lcdf.org/gifsicle/"; license = stdenv.lib.licenses.gpl2; platforms = platforms.all; maintainers = with stdenv.lib.maintainers; [ zimbatm ]; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index a68e64c0894..58fcfbfd9ac 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GL Easy Extension Library"; - homepage = https://sourceforge.net/p/glee/glee/; + homepage = "https://sourceforge.net/p/glee/glee/"; maintainers = with maintainers; [ nand0p ]; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 5668e755d01..deea9e10a1a 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "OpenGL (ES) 2.0 benchmark"; - homepage = https://github.com/glmark2/glmark2; + homepage = "https://github.com/glmark2/glmark2"; license = licenses.gpl3Plus; longDescription = '' glmark2 is a benchmark for OpenGL (ES) 2.0. It uses only the subset of diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 0710f47cb57..a1160fd7383 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Test utilities for OpenGL"; - homepage = https://www.mesa3d.org/; + homepage = "https://www.mesa3d.org/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index a8dd35ce7b0..b7650b22080 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -137,7 +137,7 @@ mkDerivation rec { meta = with lib; { description = variants.${variant}.description; - homepage = http://gmic.eu/; + homepage = "http://gmic.eu/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 3f181d12ba0..f4be95556c8 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open and full-featured framework for image processing"; - homepage = http://gmic.eu/; + homepage = "http://gmic.eu/"; license = licenses.cecill20; platforms = platforms.unix; }; diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 0ac1c1a2155..fc1892317fa 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -48,18 +48,22 @@ in (if aquaterm then "--with-aquaterm" else "--without-aquaterm") ]; + CXXFLAGS = lib.optionalString (stdenv.isDarwin && withQt) "-std=c++11"; + postInstall = lib.optionalString withX '' wrapProgram $out/bin/gnuplot \ --prefix PATH : '${gnused}/bin' \ --prefix PATH : '${coreutils}/bin' \ --prefix PATH : '${fontconfig.bin}/bin' \ --run '. ${./set-gdfontpath-from-fontconfig.sh}' + '' + lib.optionalString (stdenv.isDarwin && withQt) '' + wrapQtApp $out/bin/gnuplot ''; enableParallelBuilding = true; meta = with lib; { - homepage = http://www.gnuplot.info/; + homepage = "http://www.gnuplot.info/"; description = "A portable command-line driven graphing utility for many platforms"; platforms = platforms.linux ++ platforms.darwin; license = { @@ -69,7 +73,7 @@ in # be distributed as patches to the released version. Permission to # distribute binaries produced by compiling modified sources is granted, # provided you: ... - url = https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright; + url = "https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright"; }; maintainers = with maintainers; [ lovek323 ]; }; diff --git a/pkgs/tools/graphics/graphviz/base.nix b/pkgs/tools/graphics/graphviz/base.nix index 3b9d8a4cca5..a65f5ce455c 100644 --- a/pkgs/tools/graphics/graphviz/base.nix +++ b/pkgs/tools/graphics/graphviz/base.nix @@ -12,7 +12,7 @@ let # https://gitlab.com/graphviz/graphviz/issues/1367 CVE-2018-10196 fetchpatch { name = "CVE-2018-10196.patch"; - url = https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff; + url = "https://gitlab.com/graphviz/graphviz/uploads/30f8f0b00e357c112ac35fb20241604a/p.diff"; sha256 = "074qx6ch9blrnlilmz7p96fkiz2va84x2fbqdza5k4808rngirc7"; excludes = ["tests/*"]; # we don't run them and they don't apply }; @@ -80,7 +80,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://graphviz.org; + homepage = "https://graphviz.org"; description = "Graph visualization tools"; license = licenses.epl10; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/grim/default.nix b/pkgs/tools/graphics/grim/default.nix index ed7ed5fdef0..ab0418bd0dc 100644 --- a/pkgs/tools/graphics/grim/default.nix +++ b/pkgs/tools/graphics/grim/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Grab images from a Wayland compositor"; - homepage = https://github.com/emersion/grim; + homepage = "https://github.com/emersion/grim"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index 7465ebb7883..ebb50cfad2e 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { to make annotations on the screen. ''; - homepage = https://github.com/bk138/gromit-mpx; + homepage = "https://github.com/bk138/gromit-mpx"; maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/tools/graphics/guff/default.nix index db218a812e6..f03adb7bff0 100644 --- a/pkgs/tools/graphics/guff/default.nix +++ b/pkgs/tools/graphics/guff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A plot device"; - homepage = https://github.com/silentbicycle/guff; + homepage = "https://github.com/silentbicycle/guff"; license = licenses.isc; maintainers = [ maintainers.marsam ]; platforms = platforms.all; diff --git a/pkgs/tools/graphics/icoutils/default.nix b/pkgs/tools/graphics/icoutils/default.nix index b16dbe21985..0689c9cc248 100644 --- a/pkgs/tools/graphics/icoutils/default.nix +++ b/pkgs/tools/graphics/icoutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.nongnu.org/icoutils/; + 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; diff --git a/pkgs/tools/graphics/ifm/default.nix b/pkgs/tools/graphics/ifm/default.nix index c6e8df31dd0..8478395a874 100644 --- a/pkgs/tools/graphics/ifm/default.nix +++ b/pkgs/tools/graphics/ifm/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # ifm-scan.l:16:10: fatal error: ifm-parse.h: No such file or directory meta = with lib; { - homepage = https://bitbucket.org/zondo/ifm; + homepage = "https://bitbucket.org/zondo/ifm"; description = "Interactive fiction mapper"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/imageworsener/default.nix b/pkgs/tools/graphics/imageworsener/default.nix index 7c3d8931700..3eade7ee76b 100644 --- a/pkgs/tools/graphics/imageworsener/default.nix +++ b/pkgs/tools/graphics/imageworsener/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A raster image scaling and processing utility"; - homepage = https://entropymine.com/imageworsener/; + homepage = "https://entropymine.com/imageworsener/"; changelog = "https://github.com/jsummers/${pname}/blob/${version}/changelog.txt"; license = licenses.mit; maintainers = with maintainers; [ emily ]; diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 1099b11176c..c994ee02811 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for easy screencapping and uploading to imgur"; - homepage = https://github.com/jomo/imgur-screenshot/; + homepage = "https://github.com/jomo/imgur-screenshot/"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ lw ]; diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 883453379c4..14761e7763c 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; - homepage = https://github.com/ram-on/imgurbash2; + homepage = "https://github.com/ram-on/imgurbash2"; }; } diff --git a/pkgs/tools/graphics/jbig2enc/default.nix b/pkgs/tools/graphics/jbig2enc/default.nix index 1be5f0120fd..05818bf8dda 100644 --- a/pkgs/tools/graphics/jbig2enc/default.nix +++ b/pkgs/tools/graphics/jbig2enc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jbig2enc-0.28"; src = fetchurl { - url = https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz; + url = "https://github.com/agl/jbig2enc/archive/0.28-dist.tar.gz"; sha256 = "1wc0lmqz4jag3rhhk1xczlqpfv2qqp3fz7wzic2lba3vsbi1rrw3"; }; diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 13df4ede8ec..9f5ffcad8fd 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.sentex.net/~mwandel/jhead/; + homepage = "http://www.sentex.net/~mwandel/jhead/"; description = "Exif Jpeg header manipulation tool"; license = licenses.publicDomain; maintainers = with maintainers; [ rycee ]; diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix index 480ae328cd3..9c0c8bae49b 100644 --- a/pkgs/tools/graphics/kst/default.nix +++ b/pkgs/tools/graphics/kst/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Real-time large-dataset viewing and plotting tool"; - homepage = https://kst-plot.kde.org/; + homepage = "https://kst-plot.kde.org/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.vbgl ]; diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index d1b31f39152..0c56f385983 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "CLI frontend to the poppler-glib libary of PDF tools"; - homepage = https://github.com/TrilbyWhite/Leela; + homepage = "https://github.com/TrilbyWhite/Leela"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.puffnfresh ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/lepton/default.nix b/pkgs/tools/graphics/lepton/default.nix index 2a4f8a310ad..0088422c6a4 100644 --- a/pkgs/tools/graphics/lepton/default.nix +++ b/pkgs/tools/graphics/lepton/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ glibc.static ]; meta = with stdenv.lib; { - homepage = https://github.com/dropbox/lepton; + homepage = "https://github.com/dropbox/lepton"; description = "A tool to losslessly compress JPEGs"; license = licenses.asl20; platforms = [ "x86_64-linux" "x86_64-darwin" ]; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index aed8b0573ba..83178824eab 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { glm freetype ]; meta = with stdenv.lib; { - homepage = https://logstalgia.io/; + homepage = "https://logstalgia.io/"; description = "Website traffic visualization tool"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/graphics/lprof/default.nix b/pkgs/tools/graphics/lprof/default.nix index 42ccc4d5022..9c666462ef7 100644 --- a/pkgs/tools/graphics/lprof/default.nix +++ b/pkgs/tools/graphics/lprof/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz; + url = "mirror://sourceforge/lprof/lprof/lprof-1.11.4/lprof-1.11.4.1.tar.gz"; sha256 = "0q8x24fm5yyvm151xrl3l03p7hvvciqnkbviprfnvlr0lyg9wsrn"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Little CMS ICC profile construction set"; - homepage = https://sourceforge.net/projects/lprof; + homepage = "https://sourceforge.net/projects/lprof"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/graphics/luxcorerender/default.nix b/pkgs/tools/graphics/luxcorerender/default.nix index 6a0db954da6..fc8a98c1993 100644 --- a/pkgs/tools/graphics/luxcorerender/default.nix +++ b/pkgs/tools/graphics/luxcorerender/default.nix @@ -71,7 +71,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Open source, physically based, unbiased rendering engine"; - homepage = https://luxcorerender.org/; + homepage = "https://luxcorerender.org/"; maintainers = with maintainers; [ hodapp ]; license = licenses.asl20; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 613a906a7b4..29f0f224735 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.mcternan.me.uk/mscgen/; + homepage = "http://www.mcternan.me.uk/mscgen/"; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/graphics/neural-style/default.nix b/pkgs/tools/graphics/neural-style/default.nix deleted file mode 100644 index a4706e95cee..00000000000 --- a/pkgs/tools/graphics/neural-style/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{stdenv, fetchFromGitHub, torch, loadcaffe, fetchurl, bash}: -stdenv.mkDerivation rec { - pname = "neural-style"; - version = "0.0pre2016.08.15"; - buildInputs = [torch loadcaffe]; - src = fetchFromGitHub { - owner = "jcjohnson"; - repo = "neural-style"; - rev = "ec5ba3a690d3090428d3b92b0c5d686a311bf432"; - sha256 = "14qzbs9f95izvd0vbbirhymdw9pq2nw0jvhrh7vnyzr99xllwp02"; - }; - models = [ - (fetchurl { - url = "https://gist.githubusercontent.com/ksimonyan/3785162f95cd2d5fee77/raw/bb2b4fe0a9bb0669211cf3d0bc949dfdda173e9e/VGG_ILSVRC_19_layers_deploy.prototxt"; - sha256 = "09cpz7pyvc8sypg2q5j2i8yqwj1sjdbnmd6skl293p9pv13dmjg7"; - }) - (fetchurl { - url = "https://bethgelab.org/media/uploads/deeptextures/vgg_normalised.caffemodel"; - sha256 = "11qckdvlck7wwl3pan0nawgxm8l2ccddi272i5l8rs9qzm7b23rf"; - }) - (fetchurl { - url = "http://www.robots.ox.ac.uk/~vgg/software/very_deep/caffe/VGG_ILSVRC_19_layers.caffemodel"; - sha256 = "0m399x7pl4lnhy435ycsyz8xpzapqmx9n1sz698y2vhcqhkwdd1i"; - }) - ]; - installPhase = '' - mkdir -p "$out"/{bin,lib/lua/neural-style/models,share/doc/neural-style,share/neural-style} - for file in $models; do - ln -s "$file" "$out/lib/lua/neural-style/models/$(basename "$file" | sed -e 's/[^-]*-//')" - done; - cp README* INSTALL* LICEN?E* "$out"/share/doc/neural-style/ - cp neural_style.lua "$out"/lib/lua/neural-style - - substituteAll "${./neural-style.sh}" "$out/bin/neural-style" - chmod a+x "$out/bin/neural-style" - cp "$out/bin/neural-style" . - cp "$out/lib/lua/neural-style/models/"* models/ - - echo "Testing..." - - "$out/bin/neural-style" -style_image examples/inputs/golden_gate.jpg \ - -content_image examples/inputs/golden_gate.jpg -output_image $PWD/test.png \ - -gpu -1 -save_iter 1 -print_iter 1 -num_iterations 1 || true - - cp -f "$out/lib/lua/neural-style/models/"* models/ - - test -e test.png || exit 1 - ''; - inherit torch bash loadcaffe; - meta = { - inherit version; - description = ''A torch implementation of the paper A Neural Algorithm of Artistic Style''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - # Eats a lot of RAM - platforms = ["x86_64-linux"]; - }; -} diff --git a/pkgs/tools/graphics/neural-style/neural-style.sh b/pkgs/tools/graphics/neural-style/neural-style.sh deleted file mode 100644 index 07a4d6dedc0..00000000000 --- a/pkgs/tools/graphics/neural-style/neural-style.sh +++ /dev/null @@ -1,25 +0,0 @@ -#! @bash@/bin/bash - -declare -a args -c=1 -flag= - -for arg in "$@"; do - if test "$arg" = "${arg#-}" && test "$arg" = "${arg#/}" && test -n "$flag"; then - arg="$PWD/$arg" - flag= - elif test "$arg" != "${arg%_image}" && test "$arg" != "${arg#-}"; then - flag=1 - else - flag= - fi - args[c]="$arg"; - c=$((c+1)); -done - -cd "@out@/lib/lua/neural-style" - -export LUA_PATH="$LUA_PATH${LUA_PATH:+;}@loadcaffe@/lua/?/init.lua;@loadcaffe@/lua/?.lua" -export LUA_CPATH="$LUA_CPATH${LUA_CPATH:+;}@loadcaffe@/lib/?.so" - -@torch@/bin/th neural_style.lua "${args[@]}" diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index 65ccfecedd6..68cf812d052 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://niftools.sourceforge.net/wiki/NifSkope; + homepage = "http://niftools.sourceforge.net/wiki/NifSkope"; description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; maintainers = with maintainers; [ eelco ma27 ]; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/optar/default.nix b/pkgs/tools/graphics/optar/default.nix index b831e359e9c..4eee8acb979 100644 --- a/pkgs/tools/graphics/optar/default.nix +++ b/pkgs/tools/graphics/optar/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Optar stands for OPTical ARchiver - it's a codec for encoding data on paper"; - homepage = http://ronja.twibright.com/optar/; + homepage = "http://ronja.twibright.com/optar/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; # possibly others, but only tested on Linux diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index bc849b21117..93c2f2c3502 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { '' else null; meta = with stdenv.lib; { - homepage = http://optipng.sourceforge.net/; + homepage = "http://optipng.sourceforge.net/"; description = "A PNG optimizer"; license = licenses.zlib; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 7326e2427d0..be29136c703 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; meta = with stdenv.lib; { - homepage = https://github.com/shssoichiro/oxipng; + homepage = "https://github.com/shssoichiro/oxipng"; description = "A multithreaded lossless PNG compression optimizer"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index 46eb61d1cf7..b1463544bbd 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF converter to SVG format"; - homepage = http://www.cityinthesky.co.uk/opensource/pdf2svg; + homepage = "http://www.cityinthesky.co.uk/opensource/pdf2svg"; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix index 8733b2c1caa..80f7404bc94 100644 --- a/pkgs/tools/graphics/pdfread/default.nix +++ b/pkgs/tools/graphics/pdfread/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { # But that needs user registration to allow downloading. # This is an evolution from pdfread 1.7 in http://pdfread.sourceforge.net/ # Temporary place: - url = http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip; + url = "http://vicerveza.homeunix.net/~viric/soft/PDFRead-1.8.2-Source-noGUI-noInstaller.zip"; sha256 = "0mzxpnk97f0ww5ds7h4wsval3g4lnrhv6rhspjs7cy4i41gmk8an"; }; @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "PDF/DJVU to ebook format converter"; - homepage = https://www.mobileread.com/forums/showthread.php?t=21906; + homepage = "https://www.mobileread.com/forums/showthread.php?t=21906"; license = licenses.mit; }; } diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 668f73c04f4..051adb0742f 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { patches = [ ./threads.patch ./pfstools.patch ./pfsalign.patch ]; meta = with stdenv.lib; { - homepage = http://pfstools.sourceforge.net/; + homepage = "http://pfstools.sourceforge.net/"; description = "Toolkit for manipulation of HDR images"; platforms = platforms.linux; license = licenses.lgpl2; diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index 6ae45cc8533..88684541fcc 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { # configureFlags = optional static "--enable-static --disable-shared"; meta = { - homepage = http://www.libpgf.org/; + homepage = "http://www.libpgf.org/"; description = "Progressive Graphics Format command line program"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix index d0e67857872..409a91dba0d 100644 --- a/pkgs/tools/graphics/ploticus/default.nix +++ b/pkgs/tools/graphics/ploticus/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { - url = mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz; + url = "mirror://sourceforge/ploticus/ploticus/2.41/pl241src.tar.gz"; sha256 = "1065r0nizjixi9sxxfxrnwg10r458i6fgsd23nrxa200rypvdk7c"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { over colors, styles, options and details.''; license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; - homepage = http://ploticus.sourceforge.net/; + homepage = "http://ploticus.sourceforge.net/"; platforms = with platforms; linux; }; } diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 61e21b1a33d..7292b2ac37b 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { graphics. ''; - homepage = https://www.gnu.org/software/plotutils/; + homepage = "https://www.gnu.org/software/plotutils/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.marcweber ]; diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index f7bd8d520c8..085b6ae4a95 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://pmt.sourceforge.net/pngcrush; + 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; diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index fce1f3f913c..67d3eb15ba1 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng ]; meta = { - homepage = http://pmt.sourceforge.net/pngcrush; + homepage = "http://pmt.sourceforge.net/pngcrush"; description = "A PNG optimizer"; license = stdenv.lib.licenses.free; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/tools/graphics/pngnq/default.nix b/pkgs/tools/graphics/pngnq/default.nix index e01f3ea2acc..ca1edda454e 100644 --- a/pkgs/tools/graphics/pngnq/default.nix +++ b/pkgs/tools/graphics/pngnq/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pngnq.sourceforge.net/; + homepage = "http://pngnq.sourceforge.net/"; description = "A PNG quantizer"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 9d0e1b0ea87..33a62478a4b 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { name = "pngout-20150319"; src = fetchurl { - url = http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz; + url = "http://static.jonof.id.au/dl/kenutils/pngout-20150319-linux.tar.gz"; sha256 = "0iwv941hgs2g7ljpx48fxs24a70m2whrwarkrb77jkfcd309x2h7"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A tool that aggressively optimizes the sizes of PNG images"; license = stdenv.lib.licenses.unfree; - homepage = http://advsys.net/ken/utils.htm; + homepage = "http://advsys.net/ken/utils.htm"; maintainers = [ stdenv.lib.maintainers.sander ]; }; } diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 51be6afd102..2c9e3b272e7 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpng zlib lcms2 ]; meta = with stdenv.lib; { - homepage = https://pngquant.org/; + homepage = "https://pngquant.org/"; description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index ed8fa5ee519..2300c65f24b 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pngtoico-1.0"; src = fetchurl { - url = mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz; + url = "mirror://kernel/software/graphics/pngtoico/pngtoico-1.0.tar.gz"; sha256 = "1xb4aa57sjvgqfp01br3dm72hf7q0gb2ad144s1ifrs09215fgph"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [ libpng ]; meta = { - homepage = https://www.kernel.org/pub/software/graphics/pngtoico/; + 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; diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index ead44897968..94ce3e7f06b 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.povray.org/; + homepage = "http://www.povray.org/"; description = "Persistence of Vision Raytracer"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index ebd265b8a80..ec06088ae52 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Translates PostScript and PDF graphics into other vector formats"; - homepage = https://sourceforge.net/projects/pstoedit/; + homepage = "https://sourceforge.net/projects/pstoedit/"; license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index e7d3b8151a4..745a032b068 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { installFlags = [ "prefix=" "DESTDIR=$(out)" ]; meta = { - homepage = https://github.com/dbohdan/s2png/; + homepage = "https://github.com/dbohdan/s2png/"; description = "Store any data in PNG images"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.dbohdan ]; diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index fd26869d298..14f925a4fd2 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { scanbd can use all sane-backends or some special backends from the (old) scanbuttond project. ''; - homepage = http://scanbd.sourceforge.net/; - downloadPage = https://sourceforge.net/projects/scanbd/; + homepage = "http://scanbd.sourceforge.net/"; + downloadPage = "https://sourceforge.net/projects/scanbd/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 413bc8c52f1..56df615e575 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ giblib xlibsWrapper libXfixes libXcursor ]; meta = with stdenv.lib; { - homepage = https://github.com/resurrecting-open-source-projects/scrot; + homepage = "https://github.com/resurrecting-open-source-projects/scrot"; description = "A command-line screen capture utility"; platforms = platforms.linux; maintainers = with maintainers; [ globin ]; diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index 71bf0160a1e..45f5a6f2c23 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Minilanguage designed to represent the entire contents of a PNG file in an editable form"; - homepage = http://sng.sourceforge.net/; + homepage = "http://sng.sourceforge.net/"; license = licenses.zlib; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/structure-synth/default.nix b/pkgs/tools/graphics/structure-synth/default.nix index 2c586cd3b1f..73dd9c04be9 100644 --- a/pkgs/tools/graphics/structure-synth/default.nix +++ b/pkgs/tools/graphics/structure-synth/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "v1.5"; src = fetchurl { - url = mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip; + url = "mirror://sourceforge/structuresynth/StructureSynth-Source-v1.5.0.zip"; sha256 = "1kiammx46719az6jzrav8yrwz82nk4m72ybj0kpbnvp9wfl3swbb"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Application for generating 3D structures by specifying a design grammar"; - homepage = http://structuresynth.sourceforge.net; + homepage = "http://structuresynth.sourceforge.net"; maintainers = with maintainers; [ hodapp ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/swfdec/default.nix b/pkgs/tools/graphics/swfdec/default.nix index 8a64e25d879..d721d06ad58 100644 --- a/pkgs/tools/graphics/swfdec/default.nix +++ b/pkgs/tools/graphics/swfdec/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl21 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://swfdec.freedesktop.org/wiki/; + homepage = "https://swfdec.freedesktop.org/wiki/"; }; } diff --git a/pkgs/tools/graphics/transfig/default.nix b/pkgs/tools/graphics/transfig/default.nix index db204113226..960e7fd3ba3 100644 --- a/pkgs/tools/graphics/transfig/default.nix +++ b/pkgs/tools/graphics/transfig/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "transfig-3.2.4"; src = fetchurl { - url = ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz; + url = "ftp://ftp.tex.ac.uk/pub/archive/graphics/transfig/transfig.3.2.4.tar.gz"; sha256 = "0429snhp5acbz61pvblwlrwv8nxr6gf12p37f9xxwrkqv4ir7dd4"; }; diff --git a/pkgs/tools/graphics/unpaper/default.nix b/pkgs/tools/graphics/unpaper/default.nix index 44a86e961ec..f3e6f0d8b96 100644 --- a/pkgs/tools/graphics/unpaper/default.nix +++ b/pkgs/tools/graphics/unpaper/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libav libxslt ]; meta = with stdenv.lib; { - homepage = https://www.flameeyes.eu/projects/unpaper; + homepage = "https://www.flameeyes.eu/projects/unpaper"; description = "Post-processing tool for scanned sheets of paper"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index dcb95ecc553..ba35711a6ee 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -2,16 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "0.2.1"; + version = "1.0"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "0p4ibvv0qrflqdc2bi9rjn7yhn01ncxrpqpxmh8cbq67rbvm7jnx"; + sha256 = "1ivhm6js0ylnxwp84jmm2vmnl4iy1cwr3m9imx7lmcl0i3c8b9if"; }; + # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 + doCheck = false; - cargoSha256 = "1wvqln3xr192ml9gfzfv6qdv59g654xyaw15d790sysm82gd0inz"; + cargoSha256 = "15zdnr95a363w4rddv1fbz796m01430gzly5p953m23g2mbxdmp0"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index f61835ac81f..71bcdc2e269 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LunarG Vulkan loader"; - homepage = https://www.lunarg.com; + homepage = "https://www.lunarg.com"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 5537540382b..66c8b1d5cc7 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; - homepage = https://github.com/DeadSix27/waifu2x-converter-cpp; + homepage = "https://github.com/DeadSix27/waifu2x-converter-cpp"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.xzfc ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix index 2aa6abcccfc..ee083c3e301 100644 --- a/pkgs/tools/graphics/wkhtmltopdf/default.nix +++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - homepage = https://wkhtmltopdf.org/; + homepage = "https://wkhtmltopdf.org/"; description = "Tools for rendering web pages to PDF or images"; longDescription = '' wkhtmltopdf and wkhtmltoimage are open source (LGPL) command line tools diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix index 749631999e4..a8b0b406aa4 100644 --- a/pkgs/tools/graphics/xcftools/default.nix +++ b/pkgs/tools/graphics/xcftools/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://henning.makholm.net/software; + homepage = "http://henning.makholm.net/software"; description = "Command-line tools for converting Gimp XCF files"; longDescription = '' A set of fast command-line tools for extracting information from diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix index 1e3da5dddec..f917328460c 100644 --- a/pkgs/tools/graphics/xcur2png/default.nix +++ b/pkgs/tools/graphics/xcur2png/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/eworm-de/xcur2png/releases; + homepage = "https://github.com/eworm-de/xcur2png/releases"; description = "Convert X cursors to PNG images"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/graphics/yafaray-core/default.nix b/pkgs/tools/graphics/yafaray-core/default.nix index 6dd0b206878..0f9edd90d03 100644 --- a/pkgs/tools/graphics/yafaray-core/default.nix +++ b/pkgs/tools/graphics/yafaray-core/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A free, open source raytracer"; - homepage = http://www.yafaray.org; + homepage = "http://www.yafaray.org"; maintainers = with maintainers; [ hodapp ]; license = licenses.lgpl21; platforms = platforms.linux; diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 7610b4e56fb..dc109440274 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ delroth raskin ]; platforms = platforms.unix; license = licenses.lgpl21; - homepage = https://github.com/mchehab/zbar; + homepage = "https://github.com/mchehab/zbar"; }; } diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix index 97bbeb4d2d4..d295a5899c5 100644 --- a/pkgs/tools/graphics/zxing/default.nix +++ b/pkgs/tools/graphics/zxing/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://github.com/zxing/zxing; + homepage = "https://github.com/zxing/zxing"; }; } diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix index 230b2926561..043b4438b3c 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-cloudpinyin/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isFcitxEngine = true; description = "A standalone module for fcitx that uses web API to provide better pinyin result"; - homepage = https://github.com/fcitx/fcitx-cloudpinyin; + homepage = "https://github.com/fcitx/fcitx-cloudpinyin"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix index 9e0ef551d82..02724a94be3 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isFcitxEngine = true; description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin"; - homepage = https://github.com/fcitx/fcitx-libpinyin; + homepage = "https://github.com/fcitx/fcitx-libpinyin"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 9f062036438..f04acb72b47 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -96,7 +96,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isFcitxEngine = true; description = "Fcitx engine for Google japanese input method"; - homepage = https://github.com/google/mozc; + homepage = "https://github.com/google/mozc"; downloadPage = "http://download.fcitx-im.org/fcitx-mozc/"; license = licenses.free; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix index 095be7469cd..1410dcc1f1c 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-rime/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isFcitxEngine = true; - homepage = https://github.com/fcitx/fcitx-rime; - downloadPage = https://download.fcitx-im.org/fcitx-rime/; + homepage = "https://github.com/fcitx/fcitx-rime"; + downloadPage = "https://download.fcitx-im.org/fcitx-rime/"; description = "Rime support for Fcitx"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fcitx/unwrapped.nix b/pkgs/tools/inputmethods/fcitx/unwrapped.nix index 60de9e6910e..99a92a95060 100644 --- a/pkgs/tools/inputmethods/fcitx/unwrapped.nix +++ b/pkgs/tools/inputmethods/fcitx/unwrapped.nix @@ -19,7 +19,7 @@ let sha256 = "1svcb97sq7nrywp5f2ws57cqvlic8j6p811d9ngflplj8xw5sjn4"; }; table = fetchurl { - url = http://download.fcitx-im.org/data/table.tar.gz; + url = "http://download.fcitx-im.org/data/table.tar.gz"; sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; }; pystroke-data = let PY_STROKE_VER="20121124"; in fetchurl { @@ -31,7 +31,7 @@ let sha256 = "011cg7wssssm6hm564cwkrrnck2zj5rxi7p9z5akvhg6gp4nl522"; }; pinyin-data = fetchurl { - url = http://download.fcitx-im.org/data/pinyin.tar.gz; + url = "http://download.fcitx-im.org/data/pinyin.tar.gz"; sha256 = "1qfq5dy4czvd1lvdnxzyaiir9x8b1m46jjny11y0i33m9ar2jf2q"; }; in @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/fcitx/fcitx; + homepage = "https://github.com/fcitx/fcitx"; description = "A Flexible Input Method Framework"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/fusuma/Gemfile.lock b/pkgs/tools/inputmethods/fusuma/Gemfile.lock index c35e7658d63..1ca313c6cd5 100644 --- a/pkgs/tools/inputmethods/fusuma/Gemfile.lock +++ b/pkgs/tools/inputmethods/fusuma/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES fusuma BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix index cfdfa85ad9f..34d918cb7da 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the anthy input method"; - homepage = https://github.com/fujiwarat/ibus-anthy; + homepage = "https://github.com/fujiwarat/ibus-anthy"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix index d5e2f50299e..978ac675581 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "Ibus Hangul engine"; - homepage = https://github.com/choehwanjin/ibus-hangul; + homepage = "https://github.com/choehwanjin/ibus-hangul"; license = licenses.gpl2; maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix index 589ddd09144..0b16b54ad48 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "libkkc (Japanese Kana Kanji input method) engine for ibus"; - homepage = https://github.com/ueno/ibus-kkc; + homepage = "https://github.com/ueno/ibus-kkc"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ vanzef ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index 552d9f5e532..48d082564b7 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { isIbusEngine = true; description = "m17n engine for ibus"; - homepage = https://github.com/ibus/ibus-m17n; + homepage = "https://github.com/ibus/ibus-m17n"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ericsagnes ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index a33eb277926..9b73345d5e8 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix @@ -15,7 +15,7 @@ in clangStdenv.mkDerivation rec { meta = with clangStdenv.lib; { isIbusEngine = true; description = "Japanese input method from Google"; - homepage = https://github.com/google/mozc; + homepage = "https://github.com/google/mozc"; license = licenses.free; platforms = platforms.linux; maintainers = with maintainers; [ gebner ericsagnes ]; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix index b77394f218b..316593990d9 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { isIbusEngine = true; description = "Chinese tables for IBus-Table"; - homepage = https://github.com/definite/ibus-table-chinese; + homepage = "https://github.com/definite/ibus-table-chinese"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ pneumaticat ]; 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 dc11acb4756..cc0d12745b1 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mike-fabian.github.io/ibus-typing-booster/; + homepage = "https://mike-fabian.github.io/ibus-typing-booster/"; license = licenses.gpl3Plus; description = "A typing booster engine for the IBus platform"; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/inputmethods/ibus/ibus-qt.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix index 85fccc46de0..4e6b92f77c5 100644 --- a/pkgs/tools/inputmethods/ibus/ibus-qt.nix +++ b/pkgs/tools/inputmethods/ibus/ibus-qt.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DQT_PLUGINS_DIR=lib/qt4/plugins" ]; meta = with stdenv.lib; { - homepage = https://github.com/ibus/ibus-qt/; + homepage = "https://github.com/ibus/ibus-qt/"; description = "Qt4 interface to the ibus input method"; platforms = platforms.linux; license = licenses.gpl2Plus; diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix index a2f01c7367c..489a24c3a58 100644 --- a/pkgs/tools/inputmethods/keyfuzz/default.nix +++ b/pkgs/tools/inputmethods/keyfuzz/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Manipulate the scancode/keycode translation tables of keyboard drivers."; - homepage = http://0pointer.de/lennart/projects/keyfuzz/; + homepage = "http://0pointer.de/lennart/projects/keyfuzz/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ mboes ]; diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index 2764d2fee72..b816a6898ab 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/bulletmark/libinput-gestures; + homepage = "https://github.com/bulletmark/libinput-gestures"; description = "Gesture mapper for libinput"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/libkkc/default.nix b/pkgs/tools/inputmethods/libkkc/default.nix index 68889d45df0..1e24d5d969f 100644 --- a/pkgs/tools/inputmethods/libkkc/default.nix +++ b/pkgs/tools/inputmethods/libkkc/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Japanese Kana Kanji conversion input method library"; - homepage = https://github.com/ueno/libkkc; + homepage = "https://github.com/ueno/libkkc"; license = licenses.gpl3Plus; maintainers = with maintainers; [ vanzef ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index 8732d1a816d..1abd8460845 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ; meta = { - homepage = https://www.nongnu.org/m17n/; + homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (database)"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index baf57ed9049..f7bff509205 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ m17n_db ]; meta = { - homepage = https://www.nongnu.org/m17n/; + homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (runtime)"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index a69f46e9678..7703de95716 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://www.nongnu.org/m17n/; + homepage = "https://www.nongnu.org/m17n/"; description = "Multilingual text processing library (libotf)"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index b93c59d9789..ef316ec55a0 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "The Easy Hangul XIM"; - homepage = https://github.com/choehwanjin/nabi; + homepage = "https://github.com/choehwanjin/nabi"; license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.linux; diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index 2f8425bd8b5..d760e9d320a 100644 --- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { This package provides a collection of standard kana-to-kanji dictionaries for the SKK Japanese input method. ''; - homepage = https://github.com/skk-dev/dict; + homepage = "https://github.com/skk-dev/dict"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ yuriaisaka ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/inputmethods/skk/skktools/default.nix b/pkgs/tools/inputmethods/skk/skktools/default.nix index 19d871bc77f..8a7423eea1f 100644 --- a/pkgs/tools/inputmethods/skk/skktools/default.nix +++ b/pkgs/tools/inputmethods/skk/skktools/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { (merge, sort etc.) the dictionaries formatted for SKK Japanese input method. ''; - homepage = https://github.com/skk-dev/skktools; + 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; diff --git a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix index afacc302eda..4295e2b3fdd 100644 --- a/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix +++ b/pkgs/tools/inputmethods/tegaki-zinnia-japanese/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Japanese handwriting model for the Zinnia engine"; - homepage = http://tegaki.org/; + homepage = "http://tegaki.org/"; license = licenses.lgpl21; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index c915e812891..6bda390dc4a 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/JoseExposito/touchegg; + homepage = "https://github.com/JoseExposito/touchegg"; description = "Macro binding for touch surfaces"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/inputmethods/triggerhappy/default.nix b/pkgs/tools/inputmethods/triggerhappy/default.nix index a9e106f2c72..22987fe639f 100644 --- a/pkgs/tools/inputmethods/triggerhappy/default.nix +++ b/pkgs/tools/inputmethods/triggerhappy/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { interprets the event data received and executes scripts configured in its configuration. ''; - homepage = https://github.com/wertarbyte/triggerhappy/; + homepage = "https://github.com/wertarbyte/triggerhappy/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau taha ]; diff --git a/pkgs/tools/inputmethods/zinnia/default.nix b/pkgs/tools/inputmethods/zinnia/default.nix index b23e0c369a6..b1516aa56ab 100644 --- a/pkgs/tools/inputmethods/zinnia/default.nix +++ b/pkgs/tools/inputmethods/zinnia/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Online hand recognition system with machine learning"; - homepage = http://taku910.github.io/zinnia/; + homepage = "http://taku910.github.io/zinnia/"; license = licenses.bsd2; platforms = platforms.unix; maintainers = [ maintainers.gebner ]; diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/tools/misc/3llo/Gemfile.lock index 0696ba34165..45a37b5e1ca 100644 --- a/pkgs/tools/misc/3llo/Gemfile.lock +++ b/pkgs/tools/misc/3llo/Gemfile.lock @@ -24,4 +24,4 @@ DEPENDENCIES 3llo (= 0.3.0) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/tools/misc/3llo/default.nix index 82a8d2aaad1..75dc8f772c1 100644 --- a/pkgs/tools/misc/3llo/default.nix +++ b/pkgs/tools/misc/3llo/default.nix @@ -11,7 +11,7 @@ bundlerApp { dontBuild = false; patches = [ (fetchpatch { - url = https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch; + url = "https://github.com/qcam/3llo/commit/7667c67fdc975bac315da027a3c69f49e7c06a2e.patch"; sha256 = "0ahp19igj77x23b2j9zk3znlmm7q7nija7mjgsmgqkgfbz2r1y7v"; }) ]; @@ -25,7 +25,7 @@ bundlerApp { meta = with lib; { description = "Trello interactive CLI on terminal"; license = licenses.mit; - homepage = https://github.com/qcam/3llo; + homepage = "https://github.com/qcam/3llo"; maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 8545d86427a..a0868344d4c 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-D_DARWIN_C_SOURCE"; meta = { - homepage = http://brain-dump.org/projects/abduco; + homepage = "http://brain-dump.org/projects/abduco"; license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/misc/aescrypt/default.nix b/pkgs/tools/misc/aescrypt/default.nix index 75d8d71b895..42941c263e6 100644 --- a/pkgs/tools/misc/aescrypt/default.nix +++ b/pkgs/tools/misc/aescrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; - homepage = https://www.aescrypt.com/; + homepage = "https://www.aescrypt.com/"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 qknight ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix index d0254e9ce9f..6463ed1df28 100644 --- a/pkgs/tools/misc/agedu/default.nix +++ b/pkgs/tools/misc/agedu/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "agedu-${date}.${rev}"; # upstream provides tarballs but it seems they disappear after the next version is released src = fetchgit { - url = https://git.tartarus.org/simon/agedu.git; + url = "https://git.tartarus.org/simon/agedu.git"; inherit rev; sha256 = "0i930izna3s73p2q52qa377ixd14zij5q1n7w3irl7csyy78g0cd"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { agedu uses this information to tell you which files waste disk space when you haven't used them since a long time. ''; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/agedu/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/agedu/"; license = licenses.mit; maintainers = with maintainers; [ symphorien ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 7b869d66d1c..3102dd635ca 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -8,6 +8,7 @@ , gtk2 , gst_all_1 , gnome2 +, gnome-icon-theme , libnotify , libxml2 , libunique @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { gtk2 gst_all_1.gstreamer gnome2.GConf - gnome2.gnome_icon_theme + gnome-icon-theme libnotify libxml2 libunique @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://alarm-clock.pseudoberries.com/; + homepage = "http://alarm-clock.pseudoberries.com/"; description = "A fully-featured alarm clock for your GNOME panel or equivalent"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index 550ab4972d9..155fa8190d9 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = http://micans.org/apparix; + homepage = "http://micans.org/apparix"; description = "Add directory bookmarks, distant listing, and distant editing to the command line"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 55cfa09aa24..c163fdad3a1 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -39,7 +39,7 @@ buildGoPackage { ''; meta = with stdenv.lib; { - homepage = https://www.aptly.info; + homepage = "https://www.aptly.info"; description = "Debian repository management tool"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/argtable/default.nix b/pkgs/tools/misc/argtable/default.nix index c16e4aded0d..867b2eaba5d 100644 --- a/pkgs/tools/misc/argtable/default.nix +++ b/pkgs/tools/misc/argtable/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "3.0.1"; src = fetchgit { - url = https://github.com/argtable/argtable3.git; + url = "https://github.com/argtable/argtable3.git"; rev = "de93cfd85f755250285b337cba053a709a270721"; sha256 = "0fbvk78s3dwryrzgafdra0lb8w7lb873c6xgldl94ps9828x85i3"; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.argtable.org/; + homepage = "https://www.argtable.org/"; description = "A Cross-Platform, Single-File, ANSI C Command-Line Parsing Library"; license = licenses.bsd3; maintainers = with maintainers; [ artuuge ]; diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index d42c666e967..67c324d4aee 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "Terminal session recorder and the best companion of asciinema.org"; - homepage = https://asciinema.org/; + homepage = "https://asciinema.org/"; license = with lib.licenses; [ gpl3 ]; }; } diff --git a/pkgs/tools/misc/autojump/default.nix b/pkgs/tools/misc/autojump/default.nix index 8294e92d13f..85e50038834 100644 --- a/pkgs/tools/misc/autojump/default.nix +++ b/pkgs/tools/misc/autojump/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { Autojump supports tab-completion. ''; - homepage = https://github.com/wting/autojump; + homepage = "https://github.com/wting/autojump"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ domenkozar yurrriq ]; diff --git a/pkgs/tools/misc/automirror/default.nix b/pkgs/tools/misc/automirror/default.nix index 84778fb1c2d..dde9c2d02d3 100644 --- a/pkgs/tools/misc/automirror/default.nix +++ b/pkgs/tools/misc/automirror/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/schlomo/automirror; + homepage = "https://github.com/schlomo/automirror"; description = "Automatic Display Mirror"; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index adf73037af8..c6f664a1008 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -53,7 +53,7 @@ in }; meta = with stdenv.lib; { - homepage = https://github.com/phillipberndt/autorandr/; + homepage = "https://github.com/phillipberndt/autorandr/"; description = "Automatically select a display configuration based on connected devices"; license = licenses.gpl3Plus; maintainers = with maintainers; [ coroa globin ]; diff --git a/pkgs/tools/misc/autorevision/default.nix b/pkgs/tools/misc/autorevision/default.nix index ee07221b755..abaca62c400 100644 --- a/pkgs/tools/misc/autorevision/default.nix +++ b/pkgs/tools/misc/autorevision/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extracts revision metadata from your VCS repository"; - homepage = https://autorevision.github.io/; + homepage = "https://autorevision.github.io/"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/aws-mturk-clt/default.nix b/pkgs/tools/misc/aws-mturk-clt/default.nix index c7829239c41..c5f4b0f5670 100644 --- a/pkgs/tools/misc/aws-mturk-clt/default.nix +++ b/pkgs/tools/misc/aws-mturk-clt/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = https://requester.mturk.com/developer; + homepage = "https://requester.mturk.com/developer"; description = "Command line tools for interacting with the Amazon Mechanical Turk"; license = stdenv.lib.licenses.amazonsl; diff --git a/pkgs/tools/misc/azure-vhd-utils/default.nix b/pkgs/tools/misc/azure-vhd-utils/default.nix index 6f2afc888e8..bfb622ee741 100644 --- a/pkgs/tools/misc/azure-vhd-utils/default.nix +++ b/pkgs/tools/misc/azure-vhd-utils/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/Microsoft/azure-vhd-utils; + homepage = "https://github.com/Microsoft/azure-vhd-utils"; description = "Read, inspect and upload VHD files for Azure"; longDescription = "Go package to read Virtual Hard Disk (VHD) file, a CLI interface to upload local VHD to Azure storage and to inspect a local VHD"; license = licenses.mit; diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix index b4cbc747b1d..5de77aea0e0 100644 --- a/pkgs/tools/misc/bandwidth/default.nix +++ b/pkgs/tools/misc/bandwidth/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://zsmith.co/bandwidth.html; + homepage = "https://zsmith.co/bandwidth.html"; description = "Artificial benchmark for identifying weaknesses in the memory subsystem"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/bashplotlib/default.nix b/pkgs/tools/misc/bashplotlib/default.nix index 14ab790d9c7..3e8ae31835a 100644 --- a/pkgs/tools/misc/bashplotlib/default.nix +++ b/pkgs/tools/misc/bashplotlib/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/glamp/bashplotlib; + homepage = "https://github.com/glamp/bashplotlib"; description = "Plotting in the terminal"; maintainers = with maintainers; [ dtzWill ]; license = licenses.mit; diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix index 111ab254acc..d065732a299 100644 --- a/pkgs/tools/misc/bc/default.nix +++ b/pkgs/tools/misc/bc/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "GNU software calculator"; - homepage = https://www.gnu.org/software/bc/; + homepage = "https://www.gnu.org/software/bc/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/bcunit/default.nix b/pkgs/tools/misc/bcunit/default.nix index 4a440e133fe..203735d79b0 100644 --- a/pkgs/tools/misc/bcunit/default.nix +++ b/pkgs/tools/misc/bcunit/default.nix @@ -1,22 +1,30 @@ -{stdenv, fetchFromGitHub, cmake}: +{ cmake +, fetchFromGitLab +, stdenv +}: + stdenv.mkDerivation rec { - name = "${baseName}-${version}"; - baseName = "bcunit"; - version = "3.0.2"; - buildInputs = [cmake]; - src = fetchFromGitHub { - owner = "BelledonneCommunications"; - repo = baseName; - rev = version; - sha256 = "063yl7kxkix76r49qrj0h1qpz2p538d1yw8aih0x4i47g35k00y7"; + pname = "bcunit"; + # Latest release 3.0.2 is missing some functions needed by bctoolbox. See: + # https://gitlab.linphone.org/BC/public/bcunit/issues/1 + version = "unstable-2019-11-19"; + + buildInputs = [ cmake ]; + src = fetchFromGitLab { + domain = "gitlab.linphone.org"; + owner = "public"; + group = "BC"; + repo = pname; + rev = "3c720fbf67dd3c02b0c7011ed4036982b2c93532"; + sha256 = "1237hpmkls2igp60gdfkbknxpgwvxn1vmv2m41vyl25xw1d3g35w"; }; - meta = { + meta = with stdenv.lib; { inherit version; - description = ''A fork of CUnit test framework''; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + description = "A fork of CUnit test framework"; + homepage = "https://gitlab.linphone.org/BC/public/bcunit"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ raskin jluttine ]; + platforms = platforms.linux; }; } - diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index 07bc5de371f..a29098268f9 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bdf2psf"; - version = "1.194"; + version = "1.195"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "10c0rbhqscizfa063m6mms31i0knh25bxr35s008b6mp5pxr33mc"; + sha256 = "04dsxp6vcy9z9gh41bq970wvdnhkmbdlizsy0dyhsl5axm5i84xz"; }; nativeBuildInputs = [ dpkg ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "BDF to PSF converter"; - homepage = https://packages.debian.org/sid/bdf2psf; + homepage = "https://packages.debian.org/sid/bdf2psf"; longDescription = '' Font converter to generate console fonts from BDF source fonts ''; diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index deb88f70eb5..15154f73a69 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bdf2sfd"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "fcambus"; repo = pname; rev = version; - sha256 = "130kaw2485qhb2171w2i9kpl1lhbkfwdz3j19cy63xk63fhyd8kb"; + sha256 = "02dzvrgwpgbd0wgfnlpiv2qlwvspwl7a0qh8cg363lpnxv8akw9q"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index cc63dab9645..460f20a5f5f 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -52,7 +52,7 @@ in with python.pkgs; buildPythonPackage rec { doCheck = false; meta = { - homepage = https://github.com/bepasty/bepasty-server; + homepage = "https://github.com/bepasty/bepasty-server"; description = "Binary pastebin server"; license = lib.licenses.mit; maintainers = [ lib.maintainers.makefu ]; diff --git a/pkgs/tools/misc/bibtex2html/default.nix b/pkgs/tools/misc/bibtex2html/default.nix index c0339834b64..ddda4ef4445 100644 --- a/pkgs/tools/misc/bibtex2html/default.nix +++ b/pkgs/tools/misc/bibtex2html/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.99"; src = fetchurl { - url = https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz; + url = "https://www.lri.fr/~filliatr/ftp/bibtex2html/bibtex2html-1.99.tar.gz"; sha256 = "07gzrs4lfrkvbn48cgn2gn6c7cx3jsanakkrb2irj0gmjzfxl96j"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of tools for translating from BibTeX to HTML"; - homepage = https://www.lri.fr/~filliatr/bibtex2html/; + homepage = "https://www.lri.fr/~filliatr/bibtex2html/"; license = licenses.gpl2; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.scolobb ]; diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index df7564a4b84..2f90745785a 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for manipulating BibTeX bibliographies"; - homepage = http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html; + homepage = "http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.rycee ]; diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix index d099a8aba9b..bd744bcfb6f 100644 --- a/pkgs/tools/misc/bibutils/default.nix +++ b/pkgs/tools/misc/bibutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bibutils"; - version = "6.8"; + version = "6.10"; src = fetchurl { url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz"; - sha256 = "1n28fjrl7zxjxvcqzmrc9xj8ly6nkxviimxbzamj8dslnkzpzqw1"; + sha256 = "15p4av74ihsg03j854dkdqihpspwnp58p9g1lhx48w8kz91c0ml6"; }; configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Bibliography format interconversion"; longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters."; - homepage = https://sourceforge.net/p/bibutils/home/Bibutils/; + homepage = "https://sourceforge.net/p/bibutils/home/Bibutils/"; license = licenses.gpl2; maintainers = [ maintainers.garrison ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix index 8cc21158e8a..a0e133ec504 100644 --- a/pkgs/tools/misc/birdfont/default.nix +++ b/pkgs/tools/misc/birdfont/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Font editor which can generate fonts in TTF, EOT, SVG and BIRDFONT format"; - homepage = https://birdfont.org; + homepage = "https://birdfont.org"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/misc/birdfont/xmlbird.nix b/pkgs/tools/misc/birdfont/xmlbird.nix index 3d51f282dae..e5ad56376ca 100644 --- a/pkgs/tools/misc/birdfont/xmlbird.nix +++ b/pkgs/tools/misc/birdfont/xmlbird.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "XML parser for Vala and C programs"; - homepage = https://birdfont.org/xmlbird.php; + homepage = "https://birdfont.org/xmlbird.php"; license = licenses.lgpl3; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/misc/blink1-tool/default.nix b/pkgs/tools/misc/blink1-tool/default.nix index 8d587e34af4..5bf38f1b0e7 100644 --- a/pkgs/tools/misc/blink1-tool/default.nix +++ b/pkgs/tools/misc/blink1-tool/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command line client for the blink(1) notification light"; - homepage = https://blink1.thingm.com/; + homepage = "https://blink1.thingm.com/"; license = stdenv.lib.licenses.cc-by-sa-30; maintainers = [ stdenv.lib.maintainers.cransom ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix index 1b860fc1b4d..6e6a9b7c5ab 100644 --- a/pkgs/tools/misc/blsd/default.nix +++ b/pkgs/tools/misc/blsd/default.nix @@ -19,7 +19,7 @@ buildGoPackage { buildInputs = [ libgit2 ]; meta = with stdenv.lib; { - homepage = https://github.com/junegunn/blsd; + homepage = "https://github.com/junegunn/blsd"; description = "List directories in breadth-first order"; license = licenses.mit; maintainers = [ maintainers.magnetophon ]; diff --git a/pkgs/tools/misc/bmap-tools/default.nix b/pkgs/tools/misc/bmap-tools/default.nix index 6b7a51e08f5..8273d60bd59 100644 --- a/pkgs/tools/misc/bmap-tools/default.nix +++ b/pkgs/tools/misc/bmap-tools/default.nix @@ -13,7 +13,7 @@ python2Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "bmap-related tools"; - homepage = https://github.com/intel/bmap-tools; + homepage = "https://github.com/intel/bmap-tools"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/bmon/default.nix b/pkgs/tools/misc/bmon/default.nix index e4664e34b96..d99cce78bbf 100644 --- a/pkgs/tools/misc/bmon/default.nix +++ b/pkgs/tools/misc/bmon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network bandwidth monitor"; - homepage = https://github.com/tgraf/bmon; + homepage = "https://github.com/tgraf/bmon"; # Licensed unter BSD and MIT # - https://github.com/tgraf/bmon/blob/master/LICENSE.BSD # - https://github.com/tgraf/bmon/blob/master/LICENSE.MIT diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix index f86d44c580d..1924968f2d3 100644 --- a/pkgs/tools/misc/bogofilter/default.nix +++ b/pkgs/tools/misc/bogofilter/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = false; # needs "y" tool meta = { - homepage = http://bogofilter.sourceforge.net/; + homepage = "http://bogofilter.sourceforge.net/"; longDescription = '' Bogofilter is a mail filter that classifies mail as spam or ham (non-spam) by a statistical analysis of the message's header and diff --git a/pkgs/tools/misc/bonfire/default.nix b/pkgs/tools/misc/bonfire/default.nix index 12b0ad2abf1..85d54c16736 100644 --- a/pkgs/tools/misc/bonfire/default.nix +++ b/pkgs/tools/misc/bonfire/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ arrow click keyring parsedatetime requests six termcolor ]; meta = with stdenv.lib; { - homepage = https://pypi.python.org/pypi/bonfire; + homepage = "https://pypi.python.org/pypi/bonfire"; description = "CLI Graylog Client with Follow Mode"; license = licenses.bsd3; maintainers = [ maintainers.womfoo ]; diff --git a/pkgs/tools/misc/brltty/default.nix b/pkgs/tools/misc/brltty/default.nix index fa7457b417e..1320f28ede2 100644 --- a/pkgs/tools/misc/brltty/default.nix +++ b/pkgs/tools/misc/brltty/default.nix @@ -6,11 +6,11 @@ assert alsaSupport -> alsaLib != null; assert systemdSupport -> systemd != null; stdenv.mkDerivation rec { - name = "brltty-6.0"; + name = "brltty-6.1"; src = fetchurl { url = "http://brltty.com/archive/${name}.tar.gz"; - sha256 = "0lmp9ab8gp4yv8m3qx4gxns3prrh7kvh8sfcd6vc45h40cgcsjxg"; + sha256 = "0nk54chr7z2w579vyiak9xk2avhnvrx7x2l5sk8nyw2zplchkx9q"; }; nativeBuildInputs = [ pkgconfig python3.pkgs.cython ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { It drives the braille display, and provides complete screen review functionality. Some speech capability has also been incorporated. ''; - homepage = http://www.brltty.com/; + homepage = "http://www.brltty.com/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bramd ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index b7e2fb00a14..5d31570aacd 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.4"; + version = "0.13.5b"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0xd7vsybv6w5llvb85g6bx6r33lr0ki077rwzdvwb9c8w64fvs2h"; + sha256 = "0gcv9w79r9q3rzrdqiq9xgh68ya653sq84vzgf0fb154zmzjkxfv"; }; - cargoSha256 = "16qad0m2vygwrbz40ww0mb0ba5wn2wna1n78bc8nxh60x0qiigi9"; + cargoSha256 = "0534jykfnqs1gfnmijkpcf91ddpbggw7p25h4arci14lgd2wrmgd"; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix index 2b6274c631d..7e827f007eb 100644 --- a/pkgs/tools/misc/brotab/default.nix +++ b/pkgs/tools/misc/brotab/default.nix @@ -1,29 +1,32 @@ { lib, fetchFromGitHub, glibcLocales, python }: python.pkgs.buildPythonApplication rec { - version = "1.1.0"; + version = "1.2.1"; pname = "brotab"; src = fetchFromGitHub { owner = "balta2ar"; repo = pname; rev = version; - sha256 = "17yj5i8p28a7zmixdfa1i4gfc7c2fmdkxlymazasar58dz8m68mw"; + sha256 = "14yz0szwzdjvwkw24rma34y6iiwnw9qzsm89gkglc0xxa6msg6j3"; }; propagatedBuildInputs = with python.pkgs; [ requests flask - requests - pytest psutil + setuptools + ]; + + checkBuildInputs = with python.pkgs; [ + pytest ]; # test_integration.py requires Chrome browser session checkPhase = '' ${python.interpreter} -m unittest brotab/tests/test_{brotab,utils}.py ''; - + meta = with lib; { homepage = "https://github.com/balta2ar/brotab"; description = "Control your browser's tabs from the command line"; diff --git a/pkgs/tools/misc/buildtorrent/default.nix b/pkgs/tools/misc/buildtorrent/default.nix index b86bc38cb26..150371f82b6 100644 --- a/pkgs/tools/misc/buildtorrent/default.nix +++ b/pkgs/tools/misc/buildtorrent/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple commandline torrent creator"; - homepage = http://mathr.co.uk/blog/torrent.html; + homepage = "http://mathr.co.uk/blog/torrent.html"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index e3cc8c938ea..e63ad0e42af 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.2.2"; + version = "1.4.0"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "10in960wzvmb25biifi480dz87c034vwb8mcshclssl7gmzgpzdn"; + sha256 = "0vf658dd9sb2d3yh65c8nals9z0z7rykqqigmxq2h92x2ysjbg6x"; }; nativeBuildInputs = [ autoconf diff --git a/pkgs/tools/misc/chelf/default.nix b/pkgs/tools/misc/chelf/default.nix index f9740f22375..96949dd5da5 100644 --- a/pkgs/tools/misc/chelf/default.nix +++ b/pkgs/tools/misc/chelf/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "change or display the stack size of an ELF binary"; - homepage = https://github.com/Gottox/chelf; + homepage = "https://github.com/Gottox/chelf"; license = licenses.bsd2; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 979a658ac02..beb7c41f906 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -1,22 +1,20 @@ -{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "chezmoi"; - version = "1.7.16"; + version = "1.7.18"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1fkjdpqal0yzm58l146pf5xpbhij9iq79933i9a77v2jihdbjn52"; + sha256 = "12gx78cbs7abizlqhs7y2w6lwlk5d1hhvixj0ki8d1d5vdr747bc"; }; - modSha256 = "0gh314d3mspqmz2z3m05bgsp62mrhb48m4mwhfy5h62fs7aqymr8"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "15b3hik3nzb7xnd6806dqdb36v7z2a0wmvxbrfwvnbigd8zd2y0j"; buildFlagsArray = [ - "-ldflags=-s -w -X github.com/twpayne/chezmoi/cmd.VersionStr=${version}" + "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/tools/misc/cht.sh/default.nix b/pkgs/tools/misc/cht.sh/default.nix index 4d33d957b4d..084d51d2a3a 100644 --- a/pkgs/tools/misc/cht.sh/default.nix +++ b/pkgs/tools/misc/cht.sh/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "CLI client for cheat.sh, a community driven cheat sheet"; license = licenses.mit; maintainers = with maintainers; [ fgaz evanjs ]; - homepage = https://github.com/chubin/cheat.sh; + homepage = "https://github.com/chubin/cheat.sh"; }; } diff --git a/pkgs/tools/misc/ckb-next/default.nix b/pkgs/tools/misc/ckb-next/default.nix index 12c7f91f5ab..8189a07c214 100644 --- a/pkgs/tools/misc/ckb-next/default.nix +++ b/pkgs/tools/misc/ckb-next/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "Driver and configuration tool for Corsair keyboards and mice"; - homepage = https://github.com/ckb-next/ckb-next; + homepage = "https://github.com/ckb-next/ckb-next"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ kierdavis ]; diff --git a/pkgs/tools/misc/clac/default.nix b/pkgs/tools/misc/clac/default.nix index 544379d8d21..8aea37ebddf 100644 --- a/pkgs/tools/misc/clac/default.nix +++ b/pkgs/tools/misc/clac/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.unix; - homepage = https://github.com/soveran/clac; + homepage = "https://github.com/soveran/clac"; }; } diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix index 31c35af8118..2748c0126cd 100644 --- a/pkgs/tools/misc/clasp/default.nix +++ b/pkgs/tools/misc/clasp/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Answer set solver for (extended) normal and disjunctive logic programs"; - homepage = http://potassco.sourceforge.net/; + homepage = "http://potassco.sourceforge.net/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix index d5fd4e97df1..5e5bf4166ff 100644 --- a/pkgs/tools/misc/clex/default.nix +++ b/pkgs/tools/misc/clex/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { to be executed by the shell. There are no built-in commands, CLEX is an add-on to your favorite shell. ''; - homepage = http://www.clex.sk; + homepage = "http://www.clex.sk"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 3153c843025..15eeb8b7b86 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { ''; meta = with lib; { - homepage = https://github.com/yory8/clipman; + homepage = "https://github.com/yory8/clipman"; license = licenses.gpl3; maintainers = with maintainers; [ ma27 ]; description = "A simple clipboard manager for Wayland"; diff --git a/pkgs/tools/misc/clipster/default.nix b/pkgs/tools/misc/clipster/default.nix index 699285f2664..bb14830bf06 100644 --- a/pkgs/tools/misc/clipster/default.nix +++ b/pkgs/tools/misc/clipster/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { - Ability to delete items in clipboard history. ''; license = licenses.agpl3; - homepage = https://github.com/mrichar1/clipster; + homepage = "https://github.com/mrichar1/clipster"; platforms = platforms.linux; maintainers = [ maintainers.magnetophon ]; }; diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index 6d567f6119a..0e598d78a53 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A program that counts lines of source code"; - homepage = https://github.com/AlDanial/cloc; + homepage = "https://github.com/AlDanial/cloc"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ rycee ]; diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 41c80146e68..8897514783a 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = https://projects.kde.org/projects/playground/graphics/colord-kde; + homepage = "https://projects.kde.org/projects/playground/graphics/colord-kde"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ttuegel ]; }; diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index c6dbcfdda02..79d27129173 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "System service to manage, install and generate color profiles to accurately color manage input and output devices"; - homepage = https://www.freedesktop.org/software/colord/; + homepage = "https://www.freedesktop.org/software/colord/"; license = licenses.lgpl2Plus; maintainers = [ maintainers.marcweber ] ++ teams.freedesktop.members; platforms = platforms.linux; diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index f3d7fbd8127..b58e0c6e31e 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Access contacts from the Mac address book from command-line"; - homepage = http://www.gnufoo.org/contacts/contacts.html; + homepage = "http://www.gnufoo.org/contacts/contacts.html"; license = licenses.gpl2; maintainers = with maintainers; [ jwiegley ]; platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1294c6758f4..49edc002bec 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (rec { ''; meta = { - homepage = https://www.gnu.org/software/coreutils/; + homepage = "https://www.gnu.org/software/coreutils/"; description = "The basic file, shell and text manipulation utilities of the GNU operating system"; longDescription = '' diff --git a/pkgs/tools/misc/cowsay/default.nix b/pkgs/tools/misc/cowsay/default.nix index fb44b051b7e..d2a27fa9cb0 100644 --- a/pkgs/tools/misc/cowsay/default.nix +++ b/pkgs/tools/misc/cowsay/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec{ meta = with stdenv.lib; { description = "A program which generates ASCII pictures of a cow with a message"; - homepage = https://en.wikipedia.org/wiki/Cowsay; + homepage = "https://en.wikipedia.org/wiki/Cowsay"; license = licenses.gpl1; platforms = platforms.all; maintainers = [ maintainers.rob ]; diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix index 1978476a12d..13c29d6ab93 100644 --- a/pkgs/tools/misc/cpulimit/default.nix +++ b/pkgs/tools/misc/cpulimit/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://limitcpu.sourceforge.net/; + homepage = "http://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 5792fa4121b..65482fabb11 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchgit { inherit rev; - url = https://github.com/wolf9466/cpuminer-multi.git; + url = "https://github.com/wolf9466/cpuminer-multi.git"; sha256 = "11dg4rra4dgfb9x6q85irn0hrkx2lkwyrdpgdh10pag09s3vhy4v"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Multi-algo CPUMiner"; - homepage = https://github.com/wolf9466/cpuminer-multi; + homepage = "https://github.com/wolf9466/cpuminer-multi"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix index db0ab75d916..99eb6a52ca0 100644 --- a/pkgs/tools/misc/cpuminer/default.nix +++ b/pkgs/tools/misc/cpuminer/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "CFLAGS=-O3" ]; meta = with stdenv.lib; { - homepage = https://github.com/pooler/cpuminer; + homepage = "https://github.com/pooler/cpuminer"; description = "CPU miner for Litecoin and Bitcoin"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/misc/crex/default.nix b/pkgs/tools/misc/crex/default.nix index a00f8d6654f..72e8521fec1 100644 --- a/pkgs/tools/misc/crex/default.nix +++ b/pkgs/tools/misc/crex/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Explore, test, and check regular expressions in the terminal"; - homepage = https://octobanana.com/software/crex; + homepage = "https://octobanana.com/software/crex"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/csv2latex/default.nix b/pkgs/tools/misc/csv2latex/default.nix new file mode 100644 index 00000000000..da222582967 --- /dev/null +++ b/pkgs/tools/misc/csv2latex/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "csv2latex"; + version = "0.22"; + + src = fetchurl { + url = "http://brouits.free.fr/csv2latex/csv2latex-${version}.tar.gz"; + sha256 = "09qih2zx6cvlii1n5phiinvm9xw1l8f4i60b5hg56pymzjhn97vy"; + }; + + installPhase = '' + mkdir -p $out/bin + make PREFIX=$out install + ''; + + meta = with stdenv.lib; { + description = "Command-line CSV to LaTeX file converter"; + homepage = "http://brouits.free.fr/csv2latex/"; + license = licenses.gpl2; + maintainers = [ maintainers.catern ]; + }; +} diff --git a/pkgs/tools/misc/cunit/default.nix b/pkgs/tools/misc/cunit/default.nix index f1930c925ff..305084b900d 100644 --- a/pkgs/tools/misc/cunit/default.nix +++ b/pkgs/tools/misc/cunit/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { with a flexible variety of user interfaces. ''; - homepage = http://cunit.sourceforge.net/; + homepage = "http://cunit.sourceforge.net/"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/dashing/default.nix b/pkgs/tools/misc/dashing/default.nix index f45889e78d8..8d7f16b5bec 100644 --- a/pkgs/tools/misc/dashing/default.nix +++ b/pkgs/tools/misc/dashing/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A Dash Generator Script for Any HTML"; - homepage = https://github.com/technosophos/dashing; + homepage = "https://github.com/technosophos/dashing"; license = licenses.mit; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/dateutils/default.nix b/pkgs/tools/misc/dateutils/default.nix index a441124189c..f56cee49ecf 100644 --- a/pkgs/tools/misc/dateutils/default.nix +++ b/pkgs/tools/misc/dateutils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A bunch of tools that revolve around fiddling with dates and times in the command line"; - homepage = http://www.fresse.org/dateutils/; + homepage = "http://www.fresse.org/dateutils/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.paperdigits ]; diff --git a/pkgs/tools/misc/dbacl/default.nix b/pkgs/tools/misc/dbacl/default.nix index 9107debfd12..a6bc0111ad4 100644 --- a/pkgs/tools/misc/dbacl/default.nix +++ b/pkgs/tools/misc/dbacl/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://dbacl.sourceforge.net/; + homepage = "http://dbacl.sourceforge.net/"; longDescription = "a digramic Bayesian classifier for text recognition."; maintainers = []; license = stdenv.lib.licenses.gpl3; diff --git a/pkgs/tools/misc/dbus-map/default.nix b/pkgs/tools/misc/dbus-map/default.nix index 72687f4bfa4..c311de3a779 100644 --- a/pkgs/tools/misc/dbus-map/default.nix +++ b/pkgs/tools/misc/dbus-map/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = with lib; { description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus"; - homepage = https://github.com/taviso/dbusmap; + homepage = "https://github.com/taviso/dbusmap"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/misc/ddate/default.nix b/pkgs/tools/misc/ddate/default.nix index c602a4c9235..0987fb6d286 100644 --- a/pkgs/tools/misc/ddate/default.nix +++ b/pkgs/tools/misc/ddate/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ cmake ]; meta = { - homepage = https://github.com/bo0ts/ddate; + homepage = "https://github.com/bo0ts/ddate"; description = "Discordian version of the date program"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [kovirobi]; diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 0d5efb2ca22..cfc48af5be5 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program used to control monitor parameters by software"; - homepage = https://github.com/ddccontrol/ddccontrol; + homepage = "https://github.com/ddccontrol/ddccontrol"; license = licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.pakhfn ]; diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix index e3ba0abb8bc..c2eed30a70d 100644 --- a/pkgs/tools/misc/ddcutil/default.nix +++ b/pkgs/tools/misc/ddcutil/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, glib, i2c-tools, udev, libgudev, libusb, libdrm, xorg }: +, glib, i2c-tools, udev, libgudev, libusb1, libdrm, xorg }: stdenv.mkDerivation rec { pname = "ddcutil"; @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ i2c-tools udev libgudev - glib libusb libdrm xorg.libXrandr + glib libusb1 libdrm xorg.libXrandr ]; meta = with stdenv.lib; { - homepage = http://www.ddcutil.com/; + homepage = "http://www.ddcutil.com/"; description = "Query and change Linux monitor settings using DDC/CI and USB"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 74aec9bae6a..f9643fbde79 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { The specific utilities included are: add-shell installkernel ischroot remove-shell run-parts savelog tempfile which ''; - downloadPage = https://packages.debian.org/sid/debianutils; + downloadPage = "https://packages.debian.org/sid/debianutils"; license = with licenses; [ gpl2Plus publicDomain smail ]; maintainers = []; platforms = platforms.all; diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 04b55a6a6b4..2940ff0a573 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [ ]; in stdenv.mkDerivation rec { pname = "debootstrap"; - version = "1.0.119"; + version = "1.0.123"; src = fetchurl { # git clone git://git.debian.org/d-i/debootstrap.git # I'd like to use the source. However it's lacking the lanny script ? (still true?) url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.gz"; - sha256 = "1q5kw5mm5cnm97j0iz8hfbmjrpdc3n3pcw7f9as1n6h0xp0bmgp6"; + sha256 = "0a53dhfwa74vdhqd6kbl7zlm7iic37c6wkdclppf0syxxi3q2njy"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/desktop-file-utils/default.nix b/pkgs/tools/misc/desktop-file-utils/default.nix index 6b47027a5b9..045e199e3ae 100644 --- a/pkgs/tools/misc/desktop-file-utils/default.nix +++ b/pkgs/tools/misc/desktop-file-utils/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; meta = { - homepage = http://www.freedesktop.org/wiki/Software/desktop-file-utils; + homepage = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"; description = "Command line utilities for working with .desktop files"; platforms = platforms.linux ++ platforms.darwin; license = licenses.gpl2; diff --git a/pkgs/tools/misc/detox/default.nix b/pkgs/tools/misc/detox/default.nix index 9ad891fd9bd..85bed63c7f9 100644 --- a/pkgs/tools/misc/detox/default.nix +++ b/pkgs/tools/misc/detox/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "detox-1.2.0"; src = fetchurl { - url = mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz; + url = "mirror://sourceforge/detox/1.2.0/detox-1.2.0.tar.gz"; sha256 = "02cfkf3yhw64xg8mksln8w24gdwgm2x9g3vps7gn6jbjbfd8mh45"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://detox.sourceforge.net/; + homepage = "http://detox.sourceforge.net/"; description = "Utility designed to clean up filenames"; longDescription = '' Detox is a utility designed to clean up filenames. It replaces diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 9273d82455d..0ce0e1be325 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "137"; + version = "138"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "1qa508nlqvz0s0cd6jk5c8m43kqfx1h2mgx50iphy4y0spnyv946"; + sha256 = "171nz5n4dayr7bj04h0x282vdk92kp7lgarnb3x0md91m2i9x997"; }; patches = [ diff --git a/pkgs/tools/misc/ding-libs/default.nix b/pkgs/tools/misc/ding-libs/default.nix index e99e9289b67..deb70d082d9 100644 --- a/pkgs/tools/misc/ding-libs/default.nix +++ b/pkgs/tools/misc/ding-libs/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "'D is not GLib' utility libraries"; - homepage = https://fedorahosted.org/sssd/; + 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 ]; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index c358e24095a..3c7e72f6d73 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -41,7 +41,7 @@ buildGoPackage rec { In short, this little tool allows you to have project-specific environment variables. ''; - homepage = https://direnv.net; + homepage = "https://direnv.net"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix index 10406b8bf03..204b7b4cf8d 100644 --- a/pkgs/tools/misc/diskscan/default.nix +++ b/pkgs/tools/misc/diskscan/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = https://github.com/baruch/diskscan; + homepage = "https://github.com/baruch/diskscan"; description = "Scan HDD/SSD for failed and near failed sectors"; platforms = with platforms; linux; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/misc/diskus/default.nix b/pkgs/tools/misc/diskus/default.nix index e02811e03eb..b3fbc6377ab 100644 --- a/pkgs/tools/misc/diskus/default.nix +++ b/pkgs/tools/misc/diskus/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A minimal, fast alternative to 'du -sh'"; - homepage = https://github.com/sharkdp/diskus; + homepage = "https://github.com/sharkdp/diskus"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.fuerbringer ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/disper/default.nix b/pkgs/tools/misc/disper/default.nix index 167b4a547f8..6ba446d7bc0 100644 --- a/pkgs/tools/misc/disper/default.nix +++ b/pkgs/tools/misc/disper/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "On-the-fly display switch utility"; - homepage = http://willem.engen.nl/projects/disper/; + homepage = "http://willem.engen.nl/projects/disper/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix index efe65683e07..2237d009d43 100644 --- a/pkgs/tools/misc/docbook2mdoc/default.nix +++ b/pkgs/tools/misc/docbook2mdoc/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = "http://mdocml.bsd.lv/"; description = "converter from DocBook V4.x and v5.x XML into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/misc/docker-ls/default.nix b/pkgs/tools/misc/docker-ls/default.nix index c1baf8e82f5..8522256c7d5 100644 --- a/pkgs/tools/misc/docker-ls/default.nix +++ b/pkgs/tools/misc/docker-ls/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { with tags. ''; - homepage = https://github.com/mayflower/docker-ls; + homepage = "https://github.com/mayflower/docker-ls"; maintainers = with maintainers; [ ma27 ]; platforms = docker.meta.platforms; license = licenses.mit; diff --git a/pkgs/tools/misc/docker-sync/Gemfile.lock b/pkgs/tools/misc/docker-sync/Gemfile.lock index ff7aa6b3f9f..4f14b77d0ef 100644 --- a/pkgs/tools/misc/docker-sync/Gemfile.lock +++ b/pkgs/tools/misc/docker-sync/Gemfile.lock @@ -26,4 +26,4 @@ DEPENDENCIES docker-sync! BUNDLED WITH - 1.16.2 + 2.1.4 diff --git a/pkgs/tools/misc/docker-sync/default.nix b/pkgs/tools/misc/docker-sync/default.nix index e75b8347568..48fbaa1e9de 100644 --- a/pkgs/tools/misc/docker-sync/default.nix +++ b/pkgs/tools/misc/docker-sync/default.nix @@ -12,7 +12,7 @@ bundlerApp { meta = with lib; { description = "Run your application at full speed while syncing your code for development"; - homepage = http://docker-sync.io; + homepage = "http://docker-sync.io"; license = licenses.gpl3; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index c8f3dbf8009..0329c1bc4a6 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "docui"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "TUI Client for Docker"; homepage = "https://github.com/skanehira/docui"; diff --git a/pkgs/tools/misc/doitlive/default.nix b/pkgs/tools/misc/doitlive/default.nix index 6edcefb11d5..3c0406a4ea0 100644 --- a/pkgs/tools/misc/doitlive/default.nix +++ b/pkgs/tools/misc/doitlive/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Tool for live presentations in the terminal"; - homepage = https://pypi.python.org/pypi/doitlive; + homepage = "https://pypi.python.org/pypi/doitlive"; license = licenses.mit; maintainers = with maintainers; [ mbode ]; }; diff --git a/pkgs/tools/misc/dpt-rp1-py/default.nix b/pkgs/tools/misc/dpt-rp1-py/default.nix index 88359adc318..69b689fb824 100644 --- a/pkgs/tools/misc/dpt-rp1-py/default.nix +++ b/pkgs/tools/misc/dpt-rp1-py/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { ]; meta = with lib; { - homepage = https://github.com/janten/dpt-rp1-py; + homepage = "https://github.com/janten/dpt-rp1-py"; description = "Python script to manage Sony DPT-RP1 without Digital Paper App"; license = licenses.mit; maintainers = with maintainers; [ mt-caret ]; diff --git a/pkgs/tools/misc/dtach/default.nix b/pkgs/tools/misc/dtach/default.nix index 7d85decbb84..9973eddc7ef 100644 --- a/pkgs/tools/misc/dtach/default.nix +++ b/pkgs/tools/misc/dtach/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://dtach.sourceforge.net/; + homepage = "http://dtach.sourceforge.net/"; description = "A program that emulates the detach feature of screen"; longDescription = '' diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 765c7777f0f..2dea0f179a1 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.3.8"; + version = "2.5.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "0ql74z24qp68m3ivzmxdijafrhpwjgs462chrxd021n9nl7mqhss"; + sha256 = "1r94fcygp9mmg457dkksx3mjdxfddzfzl6n0rmxasiinsz0hak4c"; # 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 = "0c0d9qi7v3s7vf1rzd467w56i9zdh8fqqrmkkk6xxyh5xhkqx0kd"; + cargoSha256 = "15a4hari3my59xvmkll2jlvb1jyf8gg8alp91nvh3bagpajpvdx6"; doCheck = false; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index c5ea2cd46a1..74dd2a34cc4 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { stdenv.lib.optionals (!enableCairo) [ "--disable-x11" "--disable-cairo" ]; meta = with stdenv.lib; { - homepage = http://duc.zevv.nl/; + homepage = "http://duc.zevv.nl/"; description = "Collection of tools for inspecting and visualizing disk usage"; license = licenses.gpl2; diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix index 1b9a6c9bbea..146ab54dd62 100644 --- a/pkgs/tools/misc/dumptorrent/default.nix +++ b/pkgs/tools/misc/dumptorrent/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dump .torrent file information"; - homepage = https://sourceforge.net/projects/dumptorrent/; + homepage = "https://sourceforge.net/projects/dumptorrent/"; license = licenses.gpl2; maintainers = [ maintainers.zohl ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/dupd/default.nix b/pkgs/tools/misc/dupd/default.nix index 06b9f3adac9..4c8f5e2e2b1 100644 --- a/pkgs/tools/misc/dupd/default.nix +++ b/pkgs/tools/misc/dupd/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "CLI utility to find duplicate files"; - homepage = http://www.virkki.com/dupd; + homepage = "http://www.virkki.com/dupd"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index df2e25c7ea3..61af9fac177 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Dynamic virtual terminal manager"; - homepage = http://www.brain-dump.org/projects/dvtm; + homepage = "http://www.brain-dump.org/projects/dvtm"; license = licenses.mit; maintainers = [ maintainers.vrthra ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/edid-decode/default.nix b/pkgs/tools/misc/edid-decode/default.nix index 11a46f620c0..c755f73b118 100644 --- a/pkgs/tools/misc/edid-decode/default.nix +++ b/pkgs/tools/misc/edid-decode/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { meta = { description = "EDID decoder and conformance tester"; - homepage = https://cgit.freedesktop.org/xorg/app/edid-decode/; + homepage = "https://cgit.freedesktop.org/xorg/app/edid-decode/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.chiiruno ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/emv/default.nix b/pkgs/tools/misc/emv/default.nix index 6a5fcfb1217..76ea8ceba0d 100644 --- a/pkgs/tools/misc/emv/default.nix +++ b/pkgs/tools/misc/emv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.i0i0.de/toolchest/emv; + 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; diff --git a/pkgs/tools/misc/ent/default.nix b/pkgs/tools/misc/ent/default.nix index 7e8d04b4209..4ecb8fe488a 100644 --- a/pkgs/tools/misc/ent/default.nix +++ b/pkgs/tools/misc/ent/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Pseudorandom Number Sequence Test Program"; - homepage = http://www.fourmilab.ch/random/; + homepage = "http://www.fourmilab.ch/random/"; platforms = platforms.all; license = licenses.publicDomain; }; diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index 247572a379f..aeb88d0c68b 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://entrproject.org/; + homepage = "http://entrproject.org/"; description = "Run arbitrary commands when files change"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/misc/envdir-go/default.nix b/pkgs/tools/misc/envdir-go/default.nix index db31df982cf..957f5941cb6 100644 --- a/pkgs/tools/misc/envdir-go/default.nix +++ b/pkgs/tools/misc/envdir-go/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = { description = "A go rewrite of envdir"; - homepage = https://github.com/d10n/envdir; + homepage = "https://github.com/d10n/envdir"; maintainers = with stdenv.lib.maintainers; [ edude03 ]; }; } diff --git a/pkgs/tools/misc/envsubst/default.nix b/pkgs/tools/misc/envsubst/default.nix index 9b2153d17cb..af0fa6a76ba 100644 --- a/pkgs/tools/misc/envsubst/default.nix +++ b/pkgs/tools/misc/envsubst/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { meta = with lib; { description = "Environment variables substitution for Go"; - homepage = https://github.com/a8m/envsubst; + homepage = "https://github.com/a8m/envsubst"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ nicknovitski ]; diff --git a/pkgs/tools/misc/eot-utilities/default.nix b/pkgs/tools/misc/eot-utilities/default.nix index 8d65aee9e7a..546ad8d3d7d 100644 --- a/pkgs/tools/misc/eot-utilities/default.nix +++ b/pkgs/tools/misc/eot-utilities/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; meta = { - homepage = http://www.w3.org/Tools/eot-utils/; + 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 ]; diff --git a/pkgs/tools/misc/esptool-ck/default.nix b/pkgs/tools/misc/esptool-ck/default.nix index 52b56f10ea9..a57a042a0c1 100644 --- a/pkgs/tools/misc/esptool-ck/default.nix +++ b/pkgs/tools/misc/esptool-ck/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ESP8266/ESP32 build helper tool"; - homepage = https://github.com/igrr/esptool-ck; + homepage = "https://github.com/igrr/esptool-ck"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 8793685069a..465e30e7615 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "ESP8266 and ESP32 serial bootloader utility"; - homepage = https://github.com/espressif/esptool; + homepage = "https://github.com/espressif/esptool"; license = licenses.gpl2; maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/ethminer/default.nix b/pkgs/tools/misc/ethminer/default.nix index 1ec99f12d82..8eb795c2383 100644 --- a/pkgs/tools/misc/ethminer/default.nix +++ b/pkgs/tools/misc/ethminer/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Ethereum miner with OpenCL, CUDA and stratum support"; - homepage = https://github.com/ethereum-mining/ethminer; + homepage = "https://github.com/ethereum-mining/ethminer"; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index ec1e2c48e64..b1b9956404a 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility for controlling network drivers and hardware"; - homepage = https://www.kernel.org/pub/software/network/ethtool/; + homepage = "https://www.kernel.org/pub/software/network/ethtool/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index dee181d95c2..06b7b0a5200 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -18,14 +18,14 @@ rustPlatform.buildRustPackage rec { patches = [ # to fix the test suite (can be removed as soon as #33 is merged). (fetchpatch { - url = https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch; + url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; }) ]; meta = with stdenv.lib; { description = "A calculator REPL, similar to bc"; - homepage = https://github.com/NerdyPepper/eva; + homepage = "https://github.com/NerdyPepper/eva"; license = licenses.mit; maintainers = with maintainers; [ nrdxp ma27 ]; }; diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index acfbe6bb63c..fd6baadb685 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -55,7 +55,7 @@ buildRustPackage rec { for a directory, or recursing into directories with a tree view. exa is written in Rust, so it’s small, fast, and portable. ''; - homepage = https://the.exa.website; + homepage = "https://the.exa.website"; license = licenses.mit; maintainers = with maintainers; [ ehegnes lilyball globin ]; }; diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index fb685e65a4f..d3a6990a1f8 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -7,8 +7,8 @@ with skawarePackages; buildPackage { pname = "execline"; - version = "2.5.3.0"; - sha256 = "0czdrv9m8mnx94nf28dafij6z03k4mbhbs6hccfaardfd5l5q805"; + version = "2.6.0.0"; + sha256 = "1m6pvawxqaqjr49456vyjyl8dnqwvr19v77sjj7dnglfijwza5al"; description = "A small scripting language, to be used in place of a shell in non-interactive scripts"; @@ -35,15 +35,21 @@ buildPackage { mv examples $doc/share/doc/execline/examples mv $bin/bin/execlineb $bin/bin/.execlineb-wrapped - cc \ + + # A wrapper around execlineb, which provides all execline + # tools on `execlineb`’s PATH. + # It is implemented as a C script, because on non-Linux, + # nested shebang lines are not supported. + # The -lskarnet has to come at the end to support static builds. + $CC \ -O \ -Wall -Wpedantic \ -D "EXECLINEB_PATH()=\"$bin/bin/.execlineb-wrapped\"" \ -D "EXECLINE_BIN_PATH()=\"$bin/bin\"" \ -I "${skalibs.dev}/include" \ -L "${skalibs.lib}/lib" \ - -lskarnet \ -o "$bin/bin/execlineb" \ - ${./execlineb-wrapper.c} + ${./execlineb-wrapper.c} \ + -lskarnet ''; } diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index 9fcff332de6..cbb8c337ff8 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for automating interactive applications"; - homepage = http://expect.sourceforge.net/; + homepage = "http://expect.sourceforge.net/"; license = "Expect"; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/fdupes/default.nix b/pkgs/tools/misc/fdupes/default.nix index af9a7c9a133..731ad86e622 100644 --- a/pkgs/tools/misc/fdupes/default.nix +++ b/pkgs/tools/misc/fdupes/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Such files are found by comparing file sizes and MD5 signatures, followed by a byte-by-byte comparison. ''; - homepage = https://github.com/adrianlopezroche/fdupes; + homepage = "https://github.com/adrianlopezroche/fdupes"; license = licenses.mit; platforms = platforms.all; maintainers = [ maintainers.maggesi ]; diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix index 5d79b26f230..2463ee5a6e9 100644 --- a/pkgs/tools/misc/fffuu/default.nix +++ b/pkgs/tools/misc/fffuu/default.nix @@ -45,7 +45,7 @@ mkDerivation { ]; description = "Fancy Formal Firewall Universal Understander"; - homepage = https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool; + homepage = "https://github.com/diekmann/Iptables_Semantics/tree/master/haskell_tool"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.marsam ]; } diff --git a/pkgs/tools/misc/ffsend/default.nix b/pkgs/tools/misc/ffsend/default.nix index 38619f53715..62c2aa36dc1 100644 --- a/pkgs/tools/misc/ffsend/default.nix +++ b/pkgs/tools/misc/ffsend/default.nix @@ -16,16 +16,16 @@ with rustPlatform; buildRustPackage rec { pname = "ffsend"; - version = "0.2.58"; + version = "0.2.59"; src = fetchFromGitLab { owner = "timvisee"; repo = "ffsend"; rev = "v${version}"; - sha256 = "0yqigqh5vldzmp7wc1mxi5a4bxzm81xycx5h0ghak74vbjibps49"; + sha256 = "14a7mb1a1s74hi124v4jscc72m09zq2bd8xrhq5agz9z27plqm2c"; }; - cargoSha256 = "0m2931fmc8jczjpb08077cpz9klhhf3aq15j2h76sb254qndagzy"; + cargoSha256 = "1945s3ajpy55fzh5wbl7fchqck0fh69shl18lxni9hvg04smq39i"; nativeBuildInputs = [ cmake pkgconfig installShellFiles ]; buildInputs = [ openssl ] @@ -53,7 +53,7 @@ buildRustPackage rec { may be up to 2GB. Others are able to download these files with this tool, or through their web browser. ''; - homepage = https://gitlab.com/timvisee/ffsend; + homepage = "https://gitlab.com/timvisee/ffsend"; license = licenses.gpl3; maintainers = with maintainers; [ lilyball equirosa ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 86434847b4a..7f7fc6f4e08 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { # some tools can be found here ftp://ftp.figlet.org/pub/figlet/util/ src = fetchurl { - url = ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz; + url = "ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz"; sha256 = "0za1ax15x7myjl8jz271ybly8ln9kb9zhm1gf6rdlxzhs07w925z"; }; patches = [ (fetchpatch { - url = https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399; + url = "https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; name = "musl-fix-cplusplus-decls.patch"; sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; }) @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Program for making large letters out of ordinary text"; - homepage = http://www.figlet.org/; + homepage = "http://www.figlet.org/"; license = stdenv.lib.licenses.afl21; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 24a7143d8e1..71e547d8433 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { makeFlags = stdenv.lib.optional stdenv.hostPlatform.isWindows "FILE_COMPILE=file"; meta = with stdenv.lib; { - homepage = https://darwinsys.com/file; + homepage = "https://darwinsys.com/file"; description = "A program that shows the type of files"; license = licenses.bsd2; platforms = platforms.all; diff --git a/pkgs/tools/misc/filebench/default.nix b/pkgs/tools/misc/filebench/default.nix index a16695cf7c3..4cd572ac992 100644 --- a/pkgs/tools/misc/filebench/default.nix +++ b/pkgs/tools/misc/filebench/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "File system and storage benchmark that can generate both micro and macro workloads"; - homepage = https://sourceforge.net/projects/filebench/; + homepage = "https://sourceforge.net/projects/filebench/"; license = licenses.cddl; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/fileschanged/default.nix b/pkgs/tools/misc/fileschanged/default.nix index 6818bb708bb..056943e96d7 100644 --- a/pkgs/tools/misc/fileschanged/default.nix +++ b/pkgs/tools/misc/fileschanged/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://www.nongnu.org/fileschanged/; + homepage = "https://www.nongnu.org/fileschanged/"; description = "A command-line utility that reports when files have been altered"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 2df8ee420fa..1b69b80be70 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.gnu.org/software/findutils/; + homepage = "https://www.gnu.org/software/findutils/"; description = "GNU Find Utilities, the basic directory searching utilities of the GNU operating system"; longDescription = '' diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index ad6ed6acb4c..afca2e3007e 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { meta = with lib; { description = "Powerful yet simple to use screenshot software"; - homepage = https://github.com/lupoDharkael/flameshot; + homepage = "https://github.com/lupoDharkael/flameshot"; maintainers = [ maintainers.scode ]; license = lib.licenses.gpl3; platforms = lib.platforms.linux; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index 3b9e600dcdb..6b190fcf842 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 libusb1 pciutils ]; meta = with lib; { - homepage = http://www.flashrom.org; + homepage = "http://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; license = licenses.gpl2; maintainers = with maintainers; [ funfunctor fpletz ]; diff --git a/pkgs/tools/misc/fltrdr/default.nix b/pkgs/tools/misc/fltrdr/default.nix index 8c2c5adfb5f..8d585324d87 100644 --- a/pkgs/tools/misc/fltrdr/default.nix +++ b/pkgs/tools/misc/fltrdr/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://octobanana.com/software/fltrdr; + homepage = "https://octobanana.com/software/fltrdr"; description = "A TUI text reader for the terminal"; longDescription = '' diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 57909debf79..0933e6eae90 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "07p0cy4y2x45kgimg7rjjk9zknmnnsfxdy2vlz6dzaxrslv6c3x6"; + sha256 = "1xfbghaylzsh48ag4aw77nmzm1cds4nx53m4s1fiy0r31sm8vqwl"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/fluentd/Gemfile.lock b/pkgs/tools/misc/fluentd/Gemfile.lock index e86371aed3b..c3e3cb24e83 100644 --- a/pkgs/tools/misc/fluentd/Gemfile.lock +++ b/pkgs/tools/misc/fluentd/Gemfile.lock @@ -129,4 +129,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/fluentd/default.nix b/pkgs/tools/misc/fluentd/default.nix index 18d03982f37..82ea02aae68 100644 --- a/pkgs/tools/misc/fluentd/default.nix +++ b/pkgs/tools/misc/fluentd/default.nix @@ -10,7 +10,7 @@ bundlerEnv { meta = with lib; { description = "A data collector"; - homepage = https://www.fluentd.org/; + homepage = "https://www.fluentd.org/"; license = licenses.asl20; maintainers = with maintainers; [ offline nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index 635d786da53..67ab7b2d691 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { description = "A font editor"; - homepage = http://fontforge.github.io; + homepage = "http://fontforge.github.io"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.erictapen ]; diff --git a/pkgs/tools/misc/fpp/default.nix b/pkgs/tools/misc/fpp/default.nix index 7f036cb1f90..7f68a14c5aa 100644 --- a/pkgs/tools/misc/fpp/default.nix +++ b/pkgs/tools/misc/fpp/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "CLI program that accepts piped input and presents files for selection"; - homepage = https://facebook.github.io/PathPicker/; + homepage = "https://facebook.github.io/PathPicker/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/fsmark/default.nix b/pkgs/tools/misc/fsmark/default.nix index ac56d948bda..7bfa24e3a08 100644 --- a/pkgs/tools/misc/fsmark/default.nix +++ b/pkgs/tools/misc/fsmark/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Synchronous write workload file system benchmark"; - homepage = https://sourceforge.net/projects/fsmark/; + homepage = "https://sourceforge.net/projects/fsmark/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/fsql/default.nix b/pkgs/tools/misc/fsql/default.nix index 4e7db2dc484..fa64d742865 100644 --- a/pkgs/tools/misc/fsql/default.nix +++ b/pkgs/tools/misc/fsql/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Search through your filesystem with SQL-esque queries"; - homepage = https://github.com/kshvmdn/fsql; + homepage = "https://github.com/kshvmdn/fsql"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 99dcc194d01..bf6c125ac75 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fwup"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "fhunleth"; repo = "fwup"; rev = "v${version}"; - sha256 = "08gscwdq7fwfpk3mf7dfdf64n5ijm5kjb7f5wrzzvpnnqz24xnb0"; + sha256 = "05sjdlh450hk474a44yr6kz9dzx72jfxpi1krxbd0pdizlmfypsg"; }; doCheck = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configurable embedded Linux firmware update creator and runner"; - homepage = https://github.com/fhunleth/fwup; + homepage = "https://github.com/fhunleth/fwup"; license = licenses.asl20; maintainers = [ maintainers.georgewhewell ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/fx_cast/default.nix b/pkgs/tools/misc/fx_cast/default.nix index 5181610a039..ec977d48572 100644 --- a/pkgs/tools/misc/fx_cast/default.nix +++ b/pkgs/tools/misc/fx_cast/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; - homepage = https://hensm.github.io/fx_cast/; + homepage = "https://hensm.github.io/fx_cast/"; license = licenses.mit; maintainers = with maintainers; [ dtzWill ]; }; diff --git a/pkgs/tools/misc/fxlinuxprintutil/default.nix b/pkgs/tools/misc/fxlinuxprintutil/default.nix index 7965b591afb..112f6a9f232 100644 --- a/pkgs/tools/misc/fxlinuxprintutil/default.nix +++ b/pkgs/tools/misc/fxlinuxprintutil/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optional configuration tool for fxlinuxprint"; - homepage = https://onlinesupport.fujixerox.com; + homepage = "https://onlinesupport.fujixerox.com"; license = licenses.unfree; maintainers = with maintainers; [ delan ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d337731888f..d5c75a1e8a7 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.21.0-1"; + version = "0.21.1"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "1d4bwcmjirwkkv0m01sx9rxp01iik57iy54zxhdkkz842pxlr2xv"; + sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw"; }; modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 24daa7fc81f..90042d632b7 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A better fuzzy finder"; - homepage = https://github.com/jhawthorn/fzy; + homepage = "https://github.com/jhawthorn/fzy"; license = licenses.mit; maintainers = with maintainers; [ dywedir ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/gams/default.nix b/pkgs/tools/misc/gams/default.nix index ba0b76026a5..0723735228a 100644 --- a/pkgs/tools/misc/gams/default.nix +++ b/pkgs/tools/misc/gams/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { The General Algebraic Modeling System is a high-level modeling system for mathematical optimization. GAMS is designed for modeling and solving linear, nonlinear, and mixed-integer optimization problems. ''; - homepage = https://www.gams.com/; + homepage = "https://www.gams.com/"; license = licenses.unfree; maintainers = [ maintainers.Scriptkiddi ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/gbdfed/default.nix b/pkgs/tools/misc/gbdfed/default.nix index 9b41dba4e25..e5dc243ede1 100644 --- a/pkgs/tools/misc/gbdfed/default.nix +++ b/pkgs/tools/misc/gbdfed/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { it allows cut and paste operations between fonts and glyphs and editing font properties. The editor works natively with BDF fonts. ''; - homepage = http://sofia.nmsu.edu/~mleisher/Software/gbdfed/; + homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.linquize ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index b18ac109382..153a74f9456 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1hqqwk5hbqgrxfqlcbgk6rv3a71k65psxcqa6hw41y9jymnm3dp3"; + sha256 = "1wjyn3fkc2zgj0xrd73kidrg1d1wqmil278ak36wf87685w4n0b1"; }; dontConfigure = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform benchmark"; - homepage = https://geekbench.com/; + homepage = "https://geekbench.com/"; license = licenses.unfree; maintainers = [ maintainers.michalrus ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix index d6fbb623331..cee93ae2991 100644 --- a/pkgs/tools/misc/geteltorito/default.nix +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Extract the initial/default boot image from a CD image if existent"; - homepage = https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/; + homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/"; maintainers = [ maintainers.Profpatsch ]; license = licenses.gpl2; }; diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index d168c8aaa14..f94d6eeff4e 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; - homepage = http://frodo.looijaard.name/project/getopt; + 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 e5c0997c8e3..d78e7f9439f 100644 --- a/pkgs/tools/misc/gh-ost/default.nix +++ b/pkgs/tools/misc/gh-ost/default.nix @@ -20,7 +20,7 @@ buildGoPackage ({ meta = with stdenv.lib; { description = "Triggerless online schema migration solution for MySQL"; - homepage = https://github.com/github/gh-ost; + homepage = "https://github.com/github/gh-ost"; license = licenses.mit; }; }) diff --git a/pkgs/tools/misc/gibo/default.nix b/pkgs/tools/misc/gibo/default.nix index a8e957ce484..abee4950d87 100644 --- a/pkgs/tools/misc/gibo/default.nix +++ b/pkgs/tools/misc/gibo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/simonwhitaker/gibo; + homepage = "https://github.com/simonwhitaker/gibo"; license = stdenv.lib.licenses.publicDomain; description = "A shell script for easily accessing gitignore boilerplates"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index 771fc354da4..993c20222d8 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Render gifs as ASCII art in your cli"; longDescription = "Takes in a GIF, short video, or a query to the Tenor GIF API and converts it to animated ASCII art."; - homepage = https://github.com/google/gif-for-cli; + homepage = "https://github.com/google/gif-for-cli"; license = licenses.asl20; maintainers = with maintainers; [ Scriptkiddi ]; }; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index 5438f71930d..7a8b16c55e0 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -1,25 +1,25 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: - buildGoPackage rec { - pname = "git-town"; - version = "7.2.0"; +buildGoPackage rec { + pname = "git-town"; + version = "7.3.0"; - goPackagePath = "github.com/Originate/git-town"; + goPackagePath = "github.com/Originate/git-town"; - src = fetchFromGitHub { - owner = "Originate"; - repo = "git-town"; - rev = "v${version}"; - sha256 = "0hr0c6iya34lanfhsg9kj03l4ajalcfxkbn4bgwh0749smhi6mrj"; - }; + src = fetchFromGitHub { + owner = "Originate"; + repo = "git-town"; + rev = "v${version}"; + sha256 = "166g9i79hqga8k5wvs0b84q6rqniizzsd39v37s9w16axgdrm6nb"; + }; - buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; + buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; - meta = with stdenv.lib; { - description = "Generic, high-level git support for git-flow workflows"; - homepage = http://www.git-town.com/; - maintainers = [ maintainers.allonsy ]; - license = licenses.mit; - }; - } + meta = with stdenv.lib; { + description = "Generic, high-level git support for git-flow workflows"; + homepage = "http://www.git-town.com/"; + maintainers = [ maintainers.allonsy ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index 581a1f84fc7..c0e516a15ad 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Cellphone tool"; - homepage = http://www.gnokii.org; + homepage = "http://www.gnokii.org"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; broken = true; # 2018-04-10 diff --git a/pkgs/tools/misc/gnuvd/default.nix b/pkgs/tools/misc/gnuvd/default.nix index 4da5ec2e5d5..0c492962270 100644 --- a/pkgs/tools/misc/gnuvd/default.nix +++ b/pkgs/tools/misc/gnuvd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "gnuvd-1.0.12"; src = fetchurl { - url = https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz ; + url = "https://www.djcbsoftware.nl/code/gnuvd/gnuvd-1.0.12.tar.gz"; sha256 = "0mpy76a0pxy62zjiihlzmvl4752hiwxhfs8rm1v5zgdr78acxyxz"; }; meta = with stdenv.lib; { description = "Command-line dutch dictionary application"; - homepage = https://www.djcbsoftware.nl/code/gnuvd/; + homepage = "https://www.djcbsoftware.nl/code/gnuvd/"; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 0fe9001fcdb..b9fdac6cba3 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -23,7 +23,7 @@ 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; + homepage = "https://goaccess.io"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; maintainers = with stdenv.lib.maintainers; [ ederoyd46 ]; diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index 56462aa3d30..d4daa64facb 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "gotify-cli"; @@ -17,11 +17,9 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { license = licenses.mit; - homepage = https://github.com/gotify/cli; + homepage = "https://github.com/gotify/cli"; description = "A command line interface for pushing messages to gotify/server."; maintainers = with maintainers; [ ma27 ]; }; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 1884cb3ce31..6292fb4a722 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { partitions. GParted enables you to change the partition organization while preserving the partition contents. ''; - homepage = https://gparted.org; + homepage = "https://gparted.org"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 6ded4f28e9d..49ca39c7d06 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "graylog"; - version = "3.2.2"; + version = "3.2.4"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "1n9nwxq0aklihhp0v39klq4za63ks6v5z76dp5821jcv1cbk96g9"; + sha256 = "0m3g68ycb0yvdpiyd6qysgz0ygz9s0kb98g79cdx9rqpb7x0rmd0"; }; dontBuild = true; diff --git a/pkgs/tools/misc/graylog/plugins.nix b/pkgs/tools/misc/graylog/plugins.nix index e7d32dd4b37..1f351b66203 100644 --- a/pkgs/tools/misc/graylog/plugins.nix +++ b/pkgs/tools/misc/graylog/plugins.nix @@ -31,7 +31,7 @@ in { sha256 = "1c48almnjr0b6nvzagnb9yddqbcjs7yhrd5yc5fx9q7w3vxi50zp"; }; meta = { - homepage = https://github.com/cvtienhoven/graylog-plugin-aggregates; + homepage = "https://github.com/cvtienhoven/graylog-plugin-aggregates"; description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; }; }; @@ -44,7 +44,7 @@ in { sha256 = "0hwgpq1j3qk0j1zgap5f1avh2nvkcscgds81x8xr0gamphgps8y2"; }; meta = { - homepage = https://github.com/Graylog2/graylog-plugin-auth-sso; + homepage = "https://github.com/Graylog2/graylog-plugin-auth-sso"; description = "SSO support for Graylog through trusted HTTP headers set by load balancers or authentication proxies"; }; }; @@ -57,7 +57,7 @@ in { sha256 = "0djlyd4w4mrrqfbrs20j1xw0fygqsb81snz437v9bf80avmcyzg1"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-dnsresolver; + homepage = "https://github.com/graylog-labs/graylog-plugin-dnsresolver"; description = "Message filter plugin can be used to do DNS lookups for the source field in Graylog messages"; }; }; @@ -70,7 +70,7 @@ in { sha256 = "1vx62yikd6d3lbwsfiyf9j6kx8drvn4xhffwv27fw5jzhfqr61ji"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-filter-messagesize; + homepage = "https://github.com/graylog-labs/graylog-plugin-filter-messagesize"; description = "Prints out all messages that have an estimated size crossing a configured threshold during processing"; }; }; @@ -83,7 +83,7 @@ in { sha256 = "1jyy0wkjapv3xv5q957xxv2pcnd4n1yivkvkvg6cx7kv1ip75xwc"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-internal-logs; + homepage = "https://github.com/graylog-labs/graylog-plugin-internal-logs"; description = "Graylog plugin to record internal logs of Graylog efficiently instead of sending them over the network"; }; }; @@ -96,7 +96,7 @@ in { sha256 = "0hd66751hp97ddkn29s1cmjmc2h1nrp431bq7d2wq16iyxxlygri"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-ipanonymizer; + homepage = "https://github.com/graylog-labs/graylog-plugin-ipanonymizer"; description = "A graylog-server plugin that replaces the last octet of IP addresses in messages with xxx"; }; }; @@ -109,7 +109,7 @@ in { sha256 = "0zy27q8y0bv7i5nypsfxad4yiw121sbwzd194jsz2w08jhk3skl5"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-jabber; + homepage = "https://github.com/graylog-labs/graylog-plugin-jabber"; description = "Jabber Alarmcallback Plugin for Graylog"; }; }; @@ -122,7 +122,7 @@ in { sha256 = "1v1yzmqp43kxigh3fymdwki7pn21sk2ym3kk4nn4qv4zzkhz59vp"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-metrics; + homepage = "https://github.com/graylog-labs/graylog-plugin-metrics"; description = "An output plugin for integrating Graphite, Ganglia and StatsD with Graylog"; }; }; @@ -135,7 +135,7 @@ in { sha256 = "1hadxyawdz234lal3dq5cy3zppl7ixxviw96iallyav83xyi23i8"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-mongodb-profiler; + homepage = "https://github.com/graylog-labs/graylog-plugin-mongodb-profiler"; description = "Graylog input plugin that reads MongoDB profiler data"; }; }; @@ -148,7 +148,7 @@ in { sha256 = "1g63c6rm5pkz7f0d73wb2lmk4zm430jqnhihbyq112cm4i7ymglh"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-pagerduty; + homepage = "https://github.com/graylog-labs/graylog-plugin-pagerduty"; description = "An alarm callback plugin for integrating PagerDuty into Graylog"; }; }; @@ -161,7 +161,7 @@ in { sha256 = "0dfgh6w293ssagas5y0ixwn0vf54i5iv61r5p2q0rbv2da6xvhbw"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-redis; + homepage = "https://github.com/graylog-labs/graylog-plugin-redis"; description = "Redis plugin for Graylog"; }; }; @@ -174,7 +174,7 @@ in { sha256 = "067p8g94b007gypwyyi8vb6qhwdanpk8ah57abik54vv14jxg94k"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-slack; + homepage = "https://github.com/graylog-labs/graylog-plugin-slack"; description = "Can notify Slack or Mattermost channels about triggered alerts in Graylog (Alarm Callback)"; }; }; @@ -187,7 +187,7 @@ in { sha256 = "1mwqy3fhyy4zdwyrzvbr565xwf96xs9d3l70l0khmrm848xf8wz4"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-spaceweather; + homepage = "https://github.com/graylog-labs/graylog-plugin-spaceweather"; description = "Correlate proton density to the response time of your app and the ion temperature to your exception rate."; }; }; @@ -200,7 +200,7 @@ in { sha256 = "0kwfv1zfj0fmxh9i6413bcsaxrn1vdwrzb6dphvg3dx27wxn1j1a"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-twiliosms; + homepage = "https://github.com/graylog-labs/graylog-plugin-twiliosms"; description = "An alarm callback plugin for integrating the Twilio SMS API into Graylog"; }; }; @@ -213,7 +213,7 @@ in { sha256 = "1pi34swy9nzq35a823zzvqrjhb6wsg302z31vk2y656sw6ljjxyh"; }; meta = { - homepage = https://github.com/graylog-labs/graylog-plugin-twitter; + homepage = "https://github.com/graylog-labs/graylog-plugin-twitter"; description = "Graylog input plugin that reads Twitter messages based on keywords in realtime"; }; }; diff --git a/pkgs/tools/misc/grc/default.nix b/pkgs/tools/misc/grc/default.nix index 828d4e4dab7..1900764604b 100644 --- a/pkgs/tools/misc/grc/default.nix +++ b/pkgs/tools/misc/grc/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Yet another colouriser for beautifying your logfiles or output of commands"; - homepage = http://korpus.juls.savba.sk/~garabik/software/grc.html; + homepage = "http://korpus.juls.savba.sk/~garabik/software/grc.html"; license = licenses.gpl2; maintainers = with maintainers; [ lovek323 AndersonTorres peterhoeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix index 705c1a7e1d6..92f1eb89585 100644 --- a/pkgs/tools/misc/gringo/default.nix +++ b/pkgs/tools/misc/gringo/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; }; - buildInputs = [ bison re2c scons ]; + buildInputs = [ bison re2c scons.py2 ]; patches = [ ./gringo-4.5.4-cmath.patch @@ -51,7 +51,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Converts input programs with first-order variables to equivalent ground programs"; - homepage = http://potassco.sourceforge.net/; + homepage = "http://potassco.sourceforge.net/"; platforms = platforms.all; maintainers = [ maintainers.hakuch ]; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 3eec453824d..a64df866981 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -125,7 +125,7 @@ stdenv.mkDerivation rec { operating system (e.g., GNU). ''; - homepage = https://www.gnu.org/software/grub/; + homepage = "https://www.gnu.org/software/grub/"; license = licenses.gpl3Plus; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index 87e9814d899..e657431429c 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "grub-0.97-73"; src = fetchurl { - url = https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz; + url = "https://alpha.gnu.org/gnu/grub/grub-0.97.tar.gz"; sha256 = "02r6b52r0nsp6ryqfiqchnl7r1d9smm80sqx24494gmx5p8ia7af"; }; @@ -27,7 +27,7 @@ stdenv.mkDerivation { passthru.grubTarget = ""; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/grub; + homepage = "https://www.gnu.org/software/grub"; description = "GRand Unified Bootloader"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 1033a489c76..27676c4745b 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GRUB 2.0 extended with TCG (TPM) support for integrity measured boot process (trusted boot)"; - homepage = https://github.com/Sirrix-AG/TrustedGRUB2; + homepage = "https://github.com/Sirrix-AG/TrustedGRUB2"; license = licenses.gpl3Plus; platforms = platforms.gnu ++ platforms.linux; }; diff --git a/pkgs/tools/misc/grub4dos/default.nix b/pkgs/tools/misc/grub4dos/default.nix index 2dd8688232f..24548b4d209 100644 --- a/pkgs/tools/misc/grub4dos/default.nix +++ b/pkgs/tools/misc/grub4dos/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation { enableParallelBuilding = false; meta = with stdenv.lib; { - homepage = http://grub4dos.chenall.net/; + homepage = "http://grub4dos.chenall.net/"; description = "GRUB for DOS is the dos extension of GRUB"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 78a678f0714..2e85448bde8 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { It allows you to inspect the drive's SMART data to determine its health, as well as run various tests on it. ''; - homepage = https://gsmartcontrol.sourceforge.io/; + homepage = "https://gsmartcontrol.sourceforge.io/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [qknight]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix index cdb6be99253..9c2e65676c2 100644 --- a/pkgs/tools/misc/gti/default.nix +++ b/pkgs/tools/misc/gti/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://r-wos.org/hacks/gti; + homepage = "http://r-wos.org/hacks/gti"; license = licenses.mit; description = "Humorous typo-based git runner; drives a car over the terminal"; maintainers = with maintainers; [ fadenb ]; diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix index 9fe26777110..f5c01c83a48 100644 --- a/pkgs/tools/misc/h5utils/default.nix +++ b/pkgs/tools/misc/h5utils/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; - homepage = https://github.com/stevengj/h5utils; + homepage = "https://github.com/stevengj/h5utils"; license = with licenses; [ mit gpl2 ]; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index 9a3ffe93510..5793382838b 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple app for checking usual checksums - Designed for elementary OS"; - homepage = https://github.com/artemanufrij/hashit; + homepage = "https://github.com/artemanufrij/hashit"; license = licenses.gpl2Plus; maintainers = pantheon.maintainers; platforms = platforms.linux; diff --git a/pkgs/tools/misc/hdaps-gl/default.nix b/pkgs/tools/misc/hdaps-gl/default.nix index af4d4228c2c..d2e4f3bb581 100644 --- a/pkgs/tools/misc/hdaps-gl/default.nix +++ b/pkgs/tools/misc/hdaps-gl/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "GL-based laptop model that rotates in real-time via hdaps"; - homepage = https://sourceforge.net/projects/hdaps/; + homepage = "https://sourceforge.net/projects/hdaps/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.symphorien ]; diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix index 13b69dad971..1f3fbd2381f 100644 --- a/pkgs/tools/misc/hddtemp/default.nix +++ b/pkgs/tools/misc/hddtemp/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "hddtemp-0.3_beta15"; db = fetchurl{ - url = mirror://savannah/hddtemp/hddtemp.db; + url = "mirror://savannah/hddtemp/hddtemp.db"; sha256 = "1fr6qgns6qv7cr40lic5yqwkkc7yjmmgx8j0z6d93csg3smzhhya"; }; src = fetchurl { - url = mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2; + url = "mirror://savannah/hddtemp/hddtemp-0.3-beta15.tar.bz2"; sha256 = "0nzgg4nl8zm9023wp4dg007z6x3ir60rwbcapr9ks2al81c431b1"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool for displaying hard disk temperature"; - homepage = https://savannah.nongnu.org/projects/hddtemp/; + homepage = "https://savannah.nongnu.org/projects/hddtemp/"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index e765e923474..8d694aa88b7 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = { description = "Data model, library, and file format for storing and managing data"; - homepage = https://support.hdfgroup.org/products/hdf4/; + homepage = "https://support.hdfgroup.org/products/hdf4/"; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/misc/hdf5/1_8.nix b/pkgs/tools/misc/hdf5/1_8.nix index d27f6fc01bc..849fa6b9ac3 100644 --- a/pkgs/tools/misc/hdf5/1_8.nix +++ b/pkgs/tools/misc/hdf5/1_8.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { applications for managing, manipulating, viewing, and analyzing data in the HDF5 format. ''; license = stdenv.lib.licenses.free; # BSD-like - homepage = https://www.hdfgroup.org/HDF5/; + homepage = "https://www.hdfgroup.org/HDF5/"; platforms = stdenv.lib.platforms.unix; broken = (gfortran != null) && stdenv.isDarwin; }; diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index b0d69fb98b0..e56108767ab 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { 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 - homepage = https://www.hdfgroup.org/HDF5/; + homepage = "https://www.hdfgroup.org/HDF5/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/hdfjava/default.nix b/pkgs/tools/misc/hdfjava/default.nix index 6087a76e6bd..7ee84399831 100644 --- a/pkgs/tools/misc/hdfjava/default.nix +++ b/pkgs/tools/misc/hdfjava/default.nix @@ -21,7 +21,7 @@ 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 - homepage = https://support.hdfgroup.org/products/java/index.html; + homepage = "https://support.hdfgroup.org/products/java/index.html"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/hdfview/default.nix b/pkgs/tools/misc/hdfview/default.nix index fb6914c01d0..0125bfa7369 100644 --- a/pkgs/tools/misc/hdfview/default.nix +++ b/pkgs/tools/misc/hdfview/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "A visual tool for browsing and editing HDF4 and HDF5 files"; license = stdenv.lib.licenses.free; # BSD-like - homepage = https://support.hdfgroup.org/products/java/index.html; + homepage = "https://support.hdfgroup.org/products/java/index.html"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/hebcal/default.nix b/pkgs/tools/misc/hebcal/default.nix index 8b435fcef56..b953dd290fe 100644 --- a/pkgs/tools/misc/hebcal/default.nix +++ b/pkgs/tools/misc/hebcal/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://hebcal.github.io; + homepage = "https://hebcal.github.io"; description = "A perpetual Jewish Calendar"; longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays."; license = licenses.gpl2; diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix index 26396fee507..bd99fa7024c 100644 --- a/pkgs/tools/misc/heimdall/default.nix +++ b/pkgs/tools/misc/heimdall/default.nix @@ -42,7 +42,7 @@ mkDerivation { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.glassechidna.com.au/products/heimdall/; + homepage = "http://www.glassechidna.com.au/products/heimdall/"; description = "A cross-platform tool suite to flash firmware onto Samsung Galaxy S devices"; license = licenses.mit; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/misc/hexd/default.nix b/pkgs/tools/misc/hexd/default.nix index eabb7838e8a..0c0c56c5271 100644 --- a/pkgs/tools/misc/hexd/default.nix +++ b/pkgs/tools/misc/hexd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Colourful, human-friendly hexdump tool"; - homepage = https://github.com/FireyFly/hexd; + homepage = "https://github.com/FireyFly/hexd"; maintainers = [ maintainers.FireyFly ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hid-listen/default.nix b/pkgs/tools/misc/hid-listen/default.nix index 6bbe4888d1b..afc7c5741fd 100644 --- a/pkgs/tools/misc/hid-listen/default.nix +++ b/pkgs/tools/misc/hid-listen/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool thats prints debugging information from usb HID devices"; - homepage = https://www.pjrc.com/teensy/hid_listen.html; + homepage = "https://www.pjrc.com/teensy/hid_listen.html"; license = licenses.gpl3; maintainers = with maintainers; [ tomsmeets ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/homesick/Gemfile.lock b/pkgs/tools/misc/homesick/Gemfile.lock index 42ab916db3e..accc917e240 100644 --- a/pkgs/tools/misc/homesick/Gemfile.lock +++ b/pkgs/tools/misc/homesick/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES homesick BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix index 00a9bf85650..5cd11bc48d1 100644 --- a/pkgs/tools/misc/homesick/default.nix +++ b/pkgs/tools/misc/homesick/default.nix @@ -20,7 +20,7 @@ bundlerEnv { dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into place with a single command. ''; - homepage = https://github.com/technicalpickles/homesick; + homepage = "https://github.com/technicalpickles/homesick"; license = licenses.mit; maintainers = with maintainers; [ aaronschif nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hostsblock/default.nix b/pkgs/tools/misc/hostsblock/default.nix index a6ed7bf92ff..0346c81c66d 100644 --- a/pkgs/tools/misc/hostsblock/default.nix +++ b/pkgs/tools/misc/hostsblock/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { meta = with lib; { description = "An ad- and malware-blocking script for Linux"; - homepage = http://gaenserich.github.io/hostsblock/; + homepage = "http://gaenserich.github.io/hostsblock/"; license = licenses.gpl3; maintainers = [ maintainers.nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix index 16bc0393f23..6cacbaf0b84 100644 --- a/pkgs/tools/misc/hpl/default.nix +++ b/pkgs/tools/misc/hpl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Portable Implementation of the Linpack Benchmark for Distributed-Memory Computers"; - homepage = http://www.netlib.org/benchmark/hpl/; + homepage = "http://www.netlib.org/benchmark/hpl/"; platforms = platforms.unix; license = licenses.bsdOriginal; maintainers = [ maintainers.markuskowa ]; diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index 615eea5a783..c3ff0fd210f 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -34,4 +34,4 @@ DEPENDENCIES html-proofer BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/misc/html-proofer/default.nix b/pkgs/tools/misc/html-proofer/default.nix index 49881f1b0b4..ba136b06b8a 100644 --- a/pkgs/tools/misc/html-proofer/default.nix +++ b/pkgs/tools/misc/html-proofer/default.nix @@ -10,7 +10,7 @@ bundlerEnv rec { meta = with lib; { description = "A tool to validate HTML files"; - homepage = https://github.com/gjtorikian/html-proofer; + homepage = "https://github.com/gjtorikian/html-proofer"; license = licenses.mit; maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index a66923b03f4..e782d793dab 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -28,7 +28,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "An implementation of blockchain technology, leveraging familiar and proven technologies"; - homepage = https://wiki.hyperledger.org/projects/Fabric; + homepage = "https://wiki.hyperledger.org/projects/Fabric"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index 372eebb59f6..ad9c41d4705 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { manage workspaces defining windows and their layout. The project is inspired by tmuxinator and uses i3-py. ''; - homepage = https://github.com/carlesso/i3minator; + homepage = "https://github.com/carlesso/i3minator"; license = stdenv.lib.licenses.wtfpl; maintainers = with maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/ical2org/default.nix b/pkgs/tools/misc/ical2org/default.nix index 872de2c702b..095336b7df5 100644 --- a/pkgs/tools/misc/ical2org/default.nix +++ b/pkgs/tools/misc/ical2org/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Convert an iCal file to org agenda format, optionally deduplicating entries."; - homepage = https://github.com/rjhorniii/ical2org; + homepage = "https://github.com/rjhorniii/ical2org"; license = licenses.gpl3; maintainers = with maintainers; [ swflint ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/ideviceinstaller/default.nix b/pkgs/tools/misc/ideviceinstaller/default.nix index 98b039e3f8a..4046d775a54 100644 --- a/pkgs/tools/misc/ideviceinstaller/default.nix +++ b/pkgs/tools/misc/ideviceinstaller/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig usbmuxd libimobiledevice libzip ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/ideviceinstaller; + homepage = "https://github.com/libimobiledevice/ideviceinstaller"; description = "List/modify installed apps of iOS devices"; longDescription = '' ideviceinstaller is a tool to interact with the installation_proxy diff --git a/pkgs/tools/misc/idevicerestore/default.nix b/pkgs/tools/misc/idevicerestore/default.nix index ec9d1f52853..5a606411441 100644 --- a/pkgs/tools/misc/idevicerestore/default.nix +++ b/pkgs/tools/misc/idevicerestore/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/idevicerestore; + homepage = "https://github.com/libimobiledevice/idevicerestore"; description = "Restore/upgrade firmware of iOS devices"; longDescription = '' The idevicerestore tool allows to restore firmware files to iOS devices. diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 01995c4939a..9afb9279134 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { contents of certain character strings. ''; - homepage = https://www.gnu.org/software/idutils/; + homepage = "https://www.gnu.org/software/idutils/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/tools/misc/ipbt/default.nix b/pkgs/tools/misc/ipbt/default.nix new file mode 100644 index 00000000000..e523dd198d4 --- /dev/null +++ b/pkgs/tools/misc/ipbt/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, perl, ncurses }: + +stdenv.mkDerivation rec { + version = "20190601.d1519e0"; + pname = "ipbt"; + + src = fetchurl { + url = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/ipbt-${version}.tar.gz"; + sha256 = "1aj8pajdd81vq2qw6vzfm27i0aj8vfz9m7k3sda30pnsrizm06d5"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ ncurses ]; + + meta = with stdenv.lib; { + description = "A high-tech ttyrec player for Unix"; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/ipbt/"; + license = licenses.mit; + maintainers = [ maintainers.tckmn ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 6946010b52a..87b26f223bc 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Network boot firmware"; - homepage = https://ipxe.org/; + homepage = "https://ipxe.org/"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 6b1c0d735ee..094c42b59dd 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { name = "jdiskreport-1.4.1"; src = fetchurl { - url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip; + url = "http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_1.zip"; sha256 = "0d5mzkwsbh9s9b1vyvpaawqc09b0q41l2a7pmwf7386b1fsx6d58"; }; @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.jgoodies.com/freeware/jdiskreport/; + homepage = "http://www.jgoodies.com/freeware/jdiskreport/"; description = "A graphical utility to visualize disk usage"; license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 4bcfd81f71d..3048b4c9396 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Kakoune Language Server Protocol Client"; - homepage = https://github.com/ul/kak-lsp; + homepage = "https://github.com/ul/kak-lsp"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.spacekookie ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/kanshi/default.nix b/pkgs/tools/misc/kanshi/default.nix index d3e0ba029f3..0cb20315f66 100644 --- a/pkgs/tools/misc/kanshi/default.nix +++ b/pkgs/tools/misc/kanshi/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc, wayland }: +{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, scdoc, wayland }: stdenv.mkDerivation rec { pname = "kanshi"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "emersion"; repo = "kanshi"; rev = "v${version}"; - sha256 = "0v50q1s105c2rar6mi1pijm8llsnsp62gv4swd3ddjn5rwallg46"; + sha256 = "0nbpgm8qnn7ljsg9vgs35kl8l4rrk542vdcbx8wrn9r909ld3x92"; }; - nativeBuildInputs = [ meson ninja pkgconfig scdoc ]; + nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ wayland ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/kargo/default.nix b/pkgs/tools/misc/kargo/default.nix index 480c0abc728..bcc19770155 100644 --- a/pkgs/tools/misc/kargo/default.nix +++ b/pkgs/tools/misc/kargo/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python2Packages }: python2Packages.buildPythonApplication rec { - version = "0.4.6"; + version = "0.4.8"; pname = "kargo"; src = fetchurl { url = "mirror://pypi/k/kargo/${pname}-${version}.tar.gz"; - sha256 = "1sm721c3d4scpc1gj2j3qwssr6jjvw6aq3p7ipvhbd9ywmm9dd7b"; + sha256 = "1iq3vrmglag9gpsir03yz7556m0bz99nwb2mf594378cqzbr6db3"; }; doCheck = false; @@ -25,7 +25,7 @@ python2Packages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/kubespray/kargo-cli; + homepage = "https://github.com/kubespray/kargo-cli"; description = "A tool helps to deploy a kubernetes cluster with Ansible."; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix index 0fd1c7c5cd7..53b1763ad6a 100644 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ b/pkgs/tools/misc/kdecoration-viewer/default.nix @@ -20,7 +20,7 @@ mkDerivation { kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview. ''; - homepage = https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/; + homepage = "https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/"; license = licenses.gpl2; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index a7b7da451fb..0a8f10fa85d 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -1,25 +1,23 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ lib, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "kepubify"; - version = "3.1.0"; + version = "3.1.2"; src = fetchFromGitHub { owner = "geek1011"; repo = pname; rev = "v${version}"; - sha256 = "17zhfq1nfdas4k5yzyr82zs3r3mm4n8f907ih1ckx081hy4g7a2p"; + sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; }; - modSha256 = "18q9ywsjc2v1bsmw7307dpd4v5m7v80hbhijkfrkcyqzj34jrq43"; + modSha256 = "0jz8v4rnwm5zbxxp49kv96wm4lack6prwyhcrqwsrm79dr9yjcxf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + excludedPackages = [ "kobotest" ]; - subPackages = [ "." "covergen" "seriesmeta" ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "EPUB to KEPUB converter"; homepage = "https://pgaskin.net/kepubify"; license = licenses.mit; diff --git a/pkgs/tools/misc/kermit/default.nix b/pkgs/tools/misc/kermit/default.nix index d320491756c..f81d9b7266b 100644 --- a/pkgs/tools/misc/kermit/default.nix +++ b/pkgs/tools/misc/kermit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "kermit-9.0.302"; src = fetchurl { - url = ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz; + url = "ftp://ftp.kermitproject.org/kermit/archives/cku302.tar.gz"; sha256 = "0487mh6s99ijqf1pfmbm302pa5i4pzmm8s439hdl1ffs5g8jqpqd"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.kermitproject.org/ck90.html; + homepage = "http://www.kermitproject.org/ck90.html"; description = "Portable Scriptable Network and Serial Communication Software"; license = licenses.bsd3; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/misc/keychain/default.nix b/pkgs/tools/misc/keychain/default.nix index e10b42273be..a65d408fa6b 100644 --- a/pkgs/tools/misc/keychain/default.nix +++ b/pkgs/tools/misc/keychain/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = { description = "Keychain management tool"; - homepage = https://www.funtoo.org/Keychain; + homepage = "https://www.funtoo.org/Keychain"; license = stdenv.lib.licenses.gpl2; # other platforms are untested (AFAIK) platforms = diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index 5e5a7174a14..c6ec5f3103f 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Convert STL files into Gcode"; - homepage = http://www.kisslicer.com; + homepage = "http://www.kisslicer.com"; license = licenses.unfree; maintainers = [ maintainers.cransom ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index d2fb32319bf..37eed61008b 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/nawar/kodi-cli; + 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"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/kt/default.nix b/pkgs/tools/misc/kt/default.nix index c272584e2c0..9664759cf5a 100644 --- a/pkgs/tools/misc/kt/default.nix +++ b/pkgs/tools/misc/kt/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Kafka command line tool"; - homepage = https://github.com/fgeller/kt; + homepage = "https://github.com/fgeller/kt"; maintainers = with maintainers; [ utdemir ]; platforms = with platforms; unix; license = licenses.mit; diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix index c379a0d1abc..1d78210d298 100644 --- a/pkgs/tools/misc/latex2html/default.nix +++ b/pkgs/tools/misc/latex2html/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { commands. ''; - homepage = https://www.ctan.org/pkg/latex2html; + homepage = "https://www.ctan.org/pkg/latex2html"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 6624eb5102d..7a6553461cb 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { + ":${perlldap}/${perl.libPrefix}"; meta = { - homepage = http://www.spinnaker.de/lbdb/; + homepage = "http://www.spinnaker.de/lbdb/"; license = licenses.gpl2; platforms = platforms.all; description = "The Little Brother's Database"; diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 3d2b7c5b214..52e6b0c6a30 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor. ''; - homepage = http://www.lichteblau.com/ldapvi/; + homepage = "http://www.lichteblau.com/ldapvi/"; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/ldmtool/default.nix b/pkgs/tools/misc/ldmtool/default.nix index 2ec68348495..9c9751d35c3 100644 --- a/pkgs/tools/misc/ldmtool/default.nix +++ b/pkgs/tools/misc/ldmtool/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool and library for managing Microsoft Windows Dynamic Disks"; - homepage = https://github.com/mdbooth/libldm; + homepage = "https://github.com/mdbooth/libldm"; maintainers = with maintainers; [ jensbin ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index e98b085c78d..9b1aa0dc590 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = http://www.greenwoodsoftware.com/less/; + homepage = "http://www.greenwoodsoftware.com/less/"; description = "A more advanced file pager than ‘more’"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/misc/lesspipe/default.nix b/pkgs/tools/misc/lesspipe/default.nix index bb99521cc27..231e660f582 100644 --- a/pkgs/tools/misc/lesspipe/default.nix +++ b/pkgs/tools/misc/lesspipe/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { plist and archive formats, perl storable data and gpg encrypted files. This does require additional helper programs being installed. ''; - homepage = https://github.com/wofr06/lesspipe; + homepage = "https://github.com/wofr06/lesspipe"; platforms = platforms.all; license = licenses.gpl2; maintainers = [ maintainers.martijnvermaat ]; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index c2f281ecb17..450b512bdf0 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -37,7 +37,7 @@ buildGoModule rec { the missing features are deliberately omitted since it is better if they are handled by external tools. ''; - homepage = https://godoc.org/github.com/gokcehan/lf; + homepage = "https://godoc.org/github.com/gokcehan/lf"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix index eb3b6aa11e6..bad820c1506 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin client query library"; - homepage = https://github.com/libbitcoin/libbitcoin-client; + homepage = "https://github.com/libbitcoin/libbitcoin-client"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix index d0395ecbd7f..93d8ceed2b4 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-explorer.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin command line tool"; - homepage = https://github.com/libbitcoin/libbitcoin-explorer; + homepage = "https://github.com/libbitcoin/libbitcoin-explorer"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin asymmetric ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix index cb9e2cbf1e8..fc660687ffc 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-network.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin P2P Network Library"; - homepage = https://libbitcoin.org/; + homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix index 2c13927dfad..a5467fdcbd7 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin-protocol.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Bitcoin Blockchain Query Protocol"; - homepage = https://libbitcoin.org/; + homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/pkgs/tools/misc/libbitcoin/libbitcoin.nix index 8009fe563ee..e68635585d0 100644 --- a/pkgs/tools/misc/libbitcoin/libbitcoin.nix +++ b/pkgs/tools/misc/libbitcoin/libbitcoin.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "C++ library for building bitcoin applications"; - homepage = https://libbitcoin.org/; + homepage = "https://libbitcoin.org/"; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ chris-martin ]; diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix index e31112a74d8..b0fe00d44d9 100644 --- a/pkgs/tools/misc/libcpuid/default.nix +++ b/pkgs/tools/misc/libcpuid/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = http://libcpuid.sourceforge.net/; + homepage = "http://libcpuid.sourceforge.net/"; description = "A small C library for x86 CPU detection and feature extraction"; license = licenses.bsd2; maintainers = with maintainers; [ orivej artuuge ]; diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/tools/misc/libgen-cli/default.nix new file mode 100644 index 00000000000..c34e934fba4 --- /dev/null +++ b/pkgs/tools/misc/libgen-cli/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: +buildGoModule rec { + pname = "libgen-cli"; + version = "1.0.5"; + + src = fetchFromGitHub { + owner = "ciehanski"; + repo = pname; + rev = "v${version}"; + sha256 = "1lfsnyzin2dqhwhz6phms6yipli88sqiw55ls18dfv7bvx30sqlp"; + }; + + modSha256 = "1k16zjb7p65g72hr9vsk38jhpsy1yclm7fjgq47qy6jwjd44w1bi"; + + subPackages = [ "." ]; + + meta = with lib; { + homepage = "https://github.com/ciehanski/libgen-cli"; + description = + "A CLI tool used to access the Library Genesis dataset; written in Go"; + longDescription = '' + libgen-cli is a command line interface application which allows users to + quickly query the Library Genesis dataset and download any of its + contents. + ''; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ zaninime ]; + }; +} diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix index bb0f93ba328..f4653f81f3a 100644 --- a/pkgs/tools/misc/lice/default.nix +++ b/pkgs/tools/misc/lice/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "Print license based on selection and user options."; - homepage = https://github.com/licenses/lice; + homepage = "https://github.com/licenses/lice"; license = licenses.bsd3; maintainers = with maintainers; [ swflint ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/linuxquota/default.nix b/pkgs/tools/misc/linuxquota/default.nix index 9bc7c372d93..b6b722379da 100644 --- a/pkgs/tools/misc/linuxquota/default.nix +++ b/pkgs/tools/misc/linuxquota/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to manage kernel-level quotas in Linux"; - homepage = https://sourceforge.net/projects/linuxquota/; + homepage = "https://sourceforge.net/projects/linuxquota/"; license = licenses.gpl2; # With some files being BSD as an exception platforms = platforms.linux; maintainers = [ maintainers.dezgeg ]; diff --git a/pkgs/tools/misc/lnav/default.nix b/pkgs/tools/misc/lnav/default.nix index 90560d32157..aab980d76e7 100644 --- a/pkgs/tools/misc/lnav/default.nix +++ b/pkgs/tools/misc/lnav/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/tstack/lnav; + homepage = "https://github.com/tstack/lnav"; description = "The Logfile Navigator"; longDescription = '' The log file navigator, lnav, is an enhanced log file viewer that takes diff --git a/pkgs/tools/misc/loadlibrary/default.nix b/pkgs/tools/misc/loadlibrary/default.nix index bc52598ff80..d33f6d8610a 100644 --- a/pkgs/tools/misc/loadlibrary/default.nix +++ b/pkgs/tools/misc/loadlibrary/default.nix @@ -22,7 +22,7 @@ stdenv_32bit.mkDerivation rec { ''; meta = with stdenv_32bit.lib; { - homepage = https://github.com/taviso/loadlibrary; + homepage = "https://github.com/taviso/loadlibrary"; description = "Porting Windows Dynamic Link Libraries to Linux"; platforms = platforms.linux; maintainers = [ maintainers.eleanor ]; diff --git a/pkgs/tools/misc/lockfile-progs/default.nix b/pkgs/tools/misc/lockfile-progs/default.nix index e851855834a..e30b36919b7 100644 --- a/pkgs/tools/misc/lockfile-progs/default.nix +++ b/pkgs/tools/misc/lockfile-progs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Programs for locking and unlocking files and mailboxes"; - homepage = http://packages.debian.org/sid/lockfile-progs; + homepage = "http://packages.debian.org/sid/lockfile-progs"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix index c926d220b05..ec8106e922a 100644 --- a/pkgs/tools/misc/logstash/6.x.nix +++ b/pkgs/tools/misc/logstash/6.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; + homepage = "https://www.elastic.co/products/logstash"; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 1bd30733765..e7872b0c406 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; + homepage = "https://www.elastic.co/products/logstash"; license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ wjlroe offline basvandijk ]; diff --git a/pkgs/tools/misc/logstash/contrib.nix b/pkgs/tools/misc/logstash/contrib.nix index b580d559868..d03e031b7ae 100644 --- a/pkgs/tools/misc/logstash/contrib.nix +++ b/pkgs/tools/misc/logstash/contrib.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Community-maintained logstash plugins"; - homepage = https://github.com/elasticsearch/logstash-contrib; + homepage = "https://github.com/elasticsearch/logstash-contrib"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/misc/lolcat/Gemfile.lock b/pkgs/tools/misc/lolcat/Gemfile.lock index ed48cc5921b..e01cf81c61e 100644 --- a/pkgs/tools/misc/lolcat/Gemfile.lock +++ b/pkgs/tools/misc/lolcat/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES lolcat BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/lolcat/default.nix b/pkgs/tools/misc/lolcat/default.nix index 25efcdf3461..f62be23108e 100644 --- a/pkgs/tools/misc/lolcat/default.nix +++ b/pkgs/tools/misc/lolcat/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A rainbow version of cat"; - homepage = https://github.com/busyloop/lolcat; + homepage = "https://github.com/busyloop/lolcat"; license = licenses.bsd3; maintainers = with maintainers; [ StillerHarpo manveru nicknovitski ]; }; diff --git a/pkgs/tools/misc/loop/default.nix b/pkgs/tools/misc/loop/default.nix index 2b5bb1989f4..73907e233ab 100644 --- a/pkgs/tools/misc/loop/default.nix +++ b/pkgs/tools/misc/loop/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage { meta = with stdenv.lib; { description = "UNIX's missing `loop` command"; - homepage = https://github.com/Miserlou/Loop; + homepage = "https://github.com/Miserlou/Loop"; maintainers = with maintainers; [ koral ]; license = licenses.mit; }; diff --git a/pkgs/tools/misc/lrzsz/default.nix b/pkgs/tools/misc/lrzsz/default.nix index 11351790bec..112a14f55f2 100644 --- a/pkgs/tools/misc/lrzsz/default.nix +++ b/pkgs/tools/misc/lrzsz/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--program-transform-name=s/^l//" ]; meta = with stdenv.lib; { - homepage = https://ohse.de/uwe/software/lrzsz.html; + homepage = "https://ohse.de/uwe/software/lrzsz.html"; description = "Communication package providing the XMODEM, YMODEM ZMODEM file transfer protocols"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 24006e5cbd9..6291ad013ea 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -1,31 +1,31 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +}: rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "0fh5rz6slyjzz03bpjcl9gplk36vm7qcc0i0gvhsikwvw0cf3hym"; + sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai"; }; - cargoSha256 = "1z7sg9b7qsjw1hhc7dkvxz8xgf4k8jddr7gbnjr4d2569g97jf3f"; + cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr"; - preFixup = '' - install -Dm644 -t $out/share/zsh/site-functions/ target/release/build/lsd-*/out/_lsd - install -Dm644 -t $out/share/fish/vendor_completions.d/ target/release/build/lsd-*/out/lsd.fish - install -Dm644 -t $out/share/bash-completion/completions/ target/release/build/lsd-*/out/lsd.bash + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion target/release/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; - # Some tests fail, but Travis ensures a proper build - doCheck = false; - meta = with stdenv.lib; { - homepage = https://github.com/Peltoche/lsd; + homepage = "https://github.com/Peltoche/lsd"; description = "The next gen ls command"; license = licenses.asl20; - maintainers = [ maintainers.marsam ]; + maintainers = with maintainers; [ filalex77 marsam ]; }; } diff --git a/pkgs/tools/misc/ltunify/default.nix b/pkgs/tools/misc/ltunify/default.nix index 84a92ec7712..e345f86e021 100644 --- a/pkgs/tools/misc/ltunify/default.nix +++ b/pkgs/tools/misc/ltunify/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool for working with Logitech Unifying receivers and devices"; - homepage = https://lekensteyn.nl/logitech-unifying.html; + homepage = "https://lekensteyn.nl/logitech-unifying.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/makebootfat/default.nix b/pkgs/tools/misc/makebootfat/default.nix index e23e12bcb30..dc66976720d 100644 --- a/pkgs/tools/misc/makebootfat/default.nix +++ b/pkgs/tools/misc/makebootfat/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create bootable USB disks using the FAT filesystem and syslinux"; - homepage = http://advancemame.sourceforge.net/boot-readme.html; + homepage = "http://advancemame.sourceforge.net/boot-readme.html"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 918e8372dcb..f19e5fd5b9d 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isMusl /* iconv binary */ && !stdenv.hostPlatform.isDarwin; meta = with stdenv.lib; { - homepage = http://man-db.nongnu.org; + 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; diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index 828e2358236..82fc1dee00c 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://mandoc.bsd.lv/; + homepage = "https://mandoc.bsd.lv/"; description = "suite of tools compiling mdoc and man"; downloadPage = "http://mandoc.bsd.lv/snapshots/"; license = licenses.bsd3; diff --git a/pkgs/tools/misc/massren/default.nix b/pkgs/tools/misc/massren/default.nix index 6d198a35605..4c9d5a6da8a 100644 --- a/pkgs/tools/misc/massren/default.nix +++ b/pkgs/tools/misc/massren/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with lib; { description = "Easily rename multiple files using your text editor"; license = licenses.mit; - homepage = https://github.com/laurent22/massren; + homepage = "https://github.com/laurent22/massren"; maintainers = with maintainers; [ andrew-d ]; }; } diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index e9ba1c3b5d1..f206c54a003 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0r2zb59rpja9z7q0gsylqaq4vqm5rp57fy56ajjrm6k6z06nq7bv"; meta = with stdenv.lib; { - homepage = https://github.com/cantino/mcfly; + homepage = "https://github.com/cantino/mcfly"; description = "An upgraded ctrl-r for Bash whose history results make sense for what you're working on right now."; license = licenses.mit; maintainers = [ maintainers.melkor333 ]; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index bc520c57a33..9969148e223 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { for the old Unix crypt, except that they are under the GPL and support an ever-wider range of algorithms and modes. ''; - homepage = http://mcrypt.sourceforge.net; + homepage = "http://mcrypt.sourceforge.net"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/tools/misc/mdbtools/default.nix b/pkgs/tools/misc/mdbtools/default.nix index b365086c46d..0a887531fb8 100644 --- a/pkgs/tools/misc/mdbtools/default.nix +++ b/pkgs/tools/misc/mdbtools/default.nix @@ -23,7 +23,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = ".mdb (MS Access) format tools"; - homepage = http://mdbtools.sourceforge.net; + homepage = "http://mdbtools.sourceforge.net"; platforms = platforms.unix; license = with licenses; [ gpl2 lgpl2 ]; }; diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index 71409b1c3a8..9f029ee5ded 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "memtest86-efi"; - version = "8.2"; + version = "8.3"; src = fetchzip { - # TODO: The latest version of memtest86 is actually 8.2, but the + # TODO: We're using the previous version of memtest86 because the # company developing memtest86 has stopped providing a versioned download # link for the latest version: # @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { # binaries that we make sure to version, then we could probably keep up # with the latest versions released by the company. url = "https://www.memtest86.com/downloads/memtest86-${version}-usb.zip"; - sha256 = "1x1wjssr4nnbnfan0pi7ni2dfwnm3288kq584hkfqcyza8xdx03i"; + sha256 = "0aldz7rvnfnzb4h447q10k9c9p5ghwzdyn7f6g5lrxiv5vxf3x96"; stripRoot = false; }; diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix index e382db0b92c..31f645e48ce 100644 --- a/pkgs/tools/misc/mht2htm/default.nix +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert .mht files to .html"; - homepage = http://pgm.bpalanka.com/mht2htm.html; + homepage = "http://pgm.bpalanka.com/mht2htm.html"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index ea596a94213..55cc9717688 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, desktop-file-utils, file, python3Packages }: python3Packages.buildPythonApplication rec { - name = "mimeo-${version}"; + pname = "mimeo"; version = "2019.7"; src = fetchurl { - url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; + url = "https://xyne.archlinux.ca/projects/mimeo/src/${pname}-${version}.tar.xz"; sha256 = "0nzn7qvmpbb17d6q16llnhz1qdmyg718q59ic4gw2rq23cd6q47r"; }; @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Open files by MIME-type or file name using regular expressions"; - homepage = http://xyne.archlinux.ca/projects/mimeo/; + homepage = "http://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 168e1dac3a3..35c04faf459 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Modem control and terminal emulation program"; - homepage = https://salsa.debian.org/minicom-team/minicom; + homepage = "https://salsa.debian.org/minicom-team/minicom"; license = licenses.gpl2; longDescription = '' Minicom is a menu driven communications program. It emulates ANSI diff --git a/pkgs/tools/misc/ministat/default.nix b/pkgs/tools/misc/ministat/default.nix index 7b8b8a82b72..dfc2e2c624e 100644 --- a/pkgs/tools/misc/ministat/default.nix +++ b/pkgs/tools/misc/ministat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple tool for statistical comparison of data sets"; - homepage = https://git.decadent.org.uk/gitweb/?p=ministat.git; + homepage = "https://git.decadent.org.uk/gitweb/?p=ministat.git"; license = licenses.beerware; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/mktorrent/default.nix b/pkgs/tools/misc/mktorrent/default.nix index c88f12c74d1..485c3403cff 100644 --- a/pkgs/tools/misc/mktorrent/default.nix +++ b/pkgs/tools/misc/mktorrent/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; meta = { - homepage = http://mktorrent.sourceforge.net/; + homepage = "http://mktorrent.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; description = "Command line utility to create BitTorrent metainfo files"; maintainers = with stdenv.lib.maintainers; [Profpatsch]; diff --git a/pkgs/tools/misc/mlocate/default.nix b/pkgs/tools/misc/mlocate/default.nix index f8fb253af47..d3f406c5355 100644 --- a/pkgs/tools/misc/mlocate/default.nix +++ b/pkgs/tools/misc/mlocate/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Merging locate is an utility to index and quickly search for files"; - homepage = https://pagure.io/mlocate; + homepage = "https://pagure.io/mlocate"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index a791cbe5d48..e272c56e0ac 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/tj/mmake; + homepage = "https://github.com/tj/mmake"; description = "A small program which wraps make to provide additional functionality"; longDescription = '' Mmake is a small program which wraps make to provide additional diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix index 6129f15c734..48c3b393262 100644 --- a/pkgs/tools/misc/mmv/default.nix +++ b/pkgs/tools/misc/mmv/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://linux.maruhn.com/sec/mmv.html; + 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; diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index 95c87cb35fc..bdc3ac4ddeb 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -81,7 +81,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "The GUI for MongoDB"; - homepage = https://www.mongodb.com/products/compass; + homepage = "https://www.mongodb.com/products/compass"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index dbccbf9b2f6..f216e358d8a 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -52,7 +52,7 @@ in buildGoPackage { ''; meta = { - homepage = https://github.com/mongodb/mongo-tools; + homepage = "https://github.com/mongodb/mongo-tools"; description = "Tools for the MongoDB"; license = lib.licenses.asl20; }; diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix index 44f791e5b8a..92402797d11 100644 --- a/pkgs/tools/misc/moreutils/default.nix +++ b/pkgs/tools/misc/moreutils/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young"; - homepage = https://joeyh.name/code/moreutils/; + homepage = "https://joeyh.name/code/moreutils/"; maintainers = with maintainers; [ koral pSub ]; platforms = platforms.all; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index df84084fc9c..49f9c6bc031 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; - homepage = https://www.musicpd.org/clients/mpdscribble/; + homepage = "https://www.musicpd.org/clients/mpdscribble/"; license = licenses.gpl2; maintainers = [ maintainers.matthiasbeyer ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix index 922592a256d..047cd87308f 100644 --- a/pkgs/tools/misc/mrtg/default.nix +++ b/pkgs/tools/misc/mrtg/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "The Multi Router Traffic Grapher"; - homepage = https://oss.oetiker.ch/mrtg/; + homepage = "https://oss.oetiker.ch/mrtg/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.robberer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix index 0a862834dfb..315dbce7407 100644 --- a/pkgs/tools/misc/ms-sys/default.nix +++ b/pkgs/tools/misc/ms-sys/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A program for writing Microsoft-compatible boot records"; - homepage = http://ms-sys.sourceforge.net/; + homepage = "http://ms-sys.sourceforge.net/"; license = licenses.gpl2Plus; platforms = with platforms; linux; }; diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index f3cd1c6e527..c44934ef45c 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libibmad ]; meta = with stdenv.lib; { - homepage = https://www.openfabrics.org/; + homepage = "https://www.openfabrics.org/"; license = licenses.gpl2; platforms = platforms.linux; broken = true; # 2018-04-11 diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index 6ca0c6e8e08..e0ac18a76b2 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.vanheusden.com/multitail/; + homepage = "http://www.vanheusden.com/multitail/"; description = "tail on Steroids"; maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index c029f38acb2..8940fef2a0d 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "mutagen"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Make remote development work with your local tools"; homepage = "https://mutagen.io/"; changelog = "https://github.com/mutagen-io/mutagen/releases/tag/v${version}"; diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix index 83e6ee5b5ca..829bb7f5be7 100644 --- a/pkgs/tools/misc/mysql2pgsql/default.nix +++ b/pkgs/tools/misc/mysql2pgsql/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "mysql2pgsql-0.0.1a"; src = fetchurl { - url = http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz; + url = "http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz"; sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { description = "Convert MySQL dump files to PostgreSQL-loadable files"; - homepage = http://pgfoundry.org/projects/mysql2pgsql/; + homepage = "http://pgfoundry.org/projects/mysql2pgsql/"; license = stdenv.lib.licenses.bsdOriginal; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix index 9b7453ad1cc..2f7889111b0 100644 --- a/pkgs/tools/misc/mysqltuner/default.nix +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; - homepage = http://mysqltuner.com; + homepage = "http://mysqltuner.com"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/misc/nagstamon/default.nix b/pkgs/tools/misc/nagstamon/default.nix index 525c16b6024..9b063947a44 100644 --- a/pkgs/tools/misc/nagstamon/default.nix +++ b/pkgs/tools/misc/nagstamon/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A status monitor for the desktop"; - homepage = https://nagstamon.ifw-dresden.de/; + homepage = "https://nagstamon.ifw-dresden.de/"; license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; inherit version; diff --git a/pkgs/tools/misc/nbench/default.nix b/pkgs/tools/misc/nbench/default.nix index a1a6347642b..950f3883f8f 100644 --- a/pkgs/tools/misc/nbench/default.nix +++ b/pkgs/tools/misc/nbench/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.math.utah.edu/~mayer/linux/bmark.html; + 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 ]; diff --git a/pkgs/tools/misc/ncdu/default.nix b/pkgs/tools/misc/ncdu/default.nix index f47a43ab5d2..7eddca8ca6d 100644 --- a/pkgs/tools/misc/ncdu/default.nix +++ b/pkgs/tools/misc/ncdu/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Disk usage analyzer with an ncurses interface"; - homepage = https://dev.yorhel.nl/ncdu; + homepage = "https://dev.yorhel.nl/ncdu"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/misc/nginx-config-formatter/default.nix b/pkgs/tools/misc/nginx-config-formatter/default.nix index db60010490e..c9726d7e040 100644 --- a/pkgs/tools/misc/nginx-config-formatter/default.nix +++ b/pkgs/tools/misc/nginx-config-formatter/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation { description = "nginx config file formatter"; maintainers = with maintainers; [ Baughn ]; license = licenses.asl20; - homepage = https://github.com/1connect/nginx-config-formatter; + homepage = "https://github.com/1connect/nginx-config-formatter"; }; } diff --git a/pkgs/tools/misc/noteshrink/default.nix b/pkgs/tools/misc/noteshrink/default.nix index b197e9bc5d2..b934b128870 100644 --- a/pkgs/tools/misc/noteshrink/default.nix +++ b/pkgs/tools/misc/noteshrink/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Convert scans of handwritten notes to beautiful, compact PDFs"; - homepage = https://mzucker.github.io/2016/09/20/noteshrink.html; + homepage = "https://mzucker.github.io/2016/09/20/noteshrink.html"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; }; diff --git a/pkgs/tools/misc/noti/default.nix b/pkgs/tools/misc/noti/default.nix index a6288b32295..ac06b44055c 100644 --- a/pkgs/tools/misc/noti/default.nix +++ b/pkgs/tools/misc/noti/default.nix @@ -32,7 +32,7 @@ buildGoPackage rec { Never sit and wait for some long-running process to finish. Noti can alert you when it's done. You can receive messages on your computer or phone. ''; - homepage = https://github.com/variadico/noti; + homepage = "https://github.com/variadico/noti"; license = licenses.mit; maintainers = with maintainers; [ stites marsam ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index 26517361ae2..a3cf6ad07d5 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -30,7 +30,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A utility for sending notifications, on demand and when commands finish"; - homepage = http://ntfy.rtfd.org/; + homepage = "http://ntfy.rtfd.org/"; license = licenses.gpl3; maintainers = with maintainers; [ jfrankenau kamilchm ]; }; diff --git a/pkgs/tools/misc/nyancat/default.nix b/pkgs/tools/misc/nyancat/default.nix index 47a91915c43..a7b06614785 100644 --- a/pkgs/tools/misc/nyancat/default.nix +++ b/pkgs/tools/misc/nyancat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Nyancat in your terminal, rendered through ANSI escape sequences."; - homepage = https://nyancat.dakko.us; + homepage = "https://nyancat.dakko.us"; license = licenses.ncsa; maintainers = with maintainers; [ midchildan ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/oci-image-tool/default.nix b/pkgs/tools/misc/oci-image-tool/default.nix index 3b45b7b0644..8cac6d1c3f5 100644 --- a/pkgs/tools/misc/oci-image-tool/default.nix +++ b/pkgs/tools/misc/oci-image-tool/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = { description = "A collection of tools for working with the OCI image format specification"; - homepage = https://github.com/opencontainers/image-tools; + homepage = "https://github.com/opencontainers/image-tools"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nzhang-zh ]; }; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index d54302b31d1..00926663a6c 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { dontPatchELF = true; meta = { - homepage = http://ocz.com/ssd-guru; + homepage = "http://ocz.com/ssd-guru"; description = "SSD Management Tool for OCZ disks"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/tools/misc/odyssey/default.nix index 160474f8152..f736184ea50 100644 --- a/pkgs/tools/misc/odyssey/default.nix +++ b/pkgs/tools/misc/odyssey/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Scalable PostgreSQL connection pooler"; - homepage = https://github.com/yandex/odyssey; + homepage = "https://github.com/yandex/odyssey"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 8cc5cd7f6f2..4d65a406e53 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -20,7 +20,7 @@ buildPythonApplication rec { meta = { description = "Command-line tool to create and verify OpenTimestamps proofs"; - homepage = https://github.com/opentimestamps/opentimestamps-client; + homepage = "https://github.com/opentimestamps/opentimestamps-client"; license = lib.licenses.lgpl3; }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 2888b2a1186..3b9623d5ad0 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Time series database with millisecond precision"; - homepage = http://opentsdb.net; + homepage = "http://opentsdb.net"; license = licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = [ maintainers.ocharles ]; diff --git a/pkgs/tools/misc/os-prober/default.nix b/pkgs/tools/misc/os-prober/default.nix index c776144a40d..9b2afed0a9a 100644 --- a/pkgs/tools/misc/os-prober/default.nix +++ b/pkgs/tools/misc/os-prober/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { description = "Utility to detect other OSs on a set of drives"; - homepage = http://packages.debian.org/source/sid/os-prober; + homepage = "http://packages.debian.org/source/sid/os-prober"; license = licenses.gpl2Plus; maintainers = with maintainers; [ symphorien ]; }; diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix index 0b7a7826a97..3e678b1d378 100644 --- a/pkgs/tools/misc/osinfo-db-tools/default.nix +++ b/pkgs/tools/misc/osinfo-db-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for managing the osinfo database"; - homepage = https://libosinfo.org/; + homepage = "https://libosinfo.org/"; license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/otfcc/default.nix b/pkgs/tools/misc/otfcc/default.nix index 4b28a7c45e5..5327d1eaa4a 100644 --- a/pkgs/tools/misc/otfcc/default.nix +++ b/pkgs/tools/misc/otfcc/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optimized OpenType builder and inspector"; - homepage = https://github.com/caryll/otfcc; + homepage = "https://github.com/caryll/otfcc"; license = licenses.asl20; platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ jfrankenau ttuegel ]; diff --git a/pkgs/tools/misc/page/default.nix b/pkgs/tools/misc/page/default.nix new file mode 100644 index 00000000000..07109515c5c --- /dev/null +++ b/pkgs/tools/misc/page/default.nix @@ -0,0 +1,32 @@ +{ lib, rustPlatform, fetchFromGitHub, installShellFiles }: + +rustPlatform.buildRustPackage rec { + pname = "page"; + version = "2.3.4"; + + src = fetchFromGitHub { + owner = "I60R"; + repo = pname; + rev = "v${version}"; + sha256 = "0xcbnl8fbdfdmcbv5d7v830aa3vfhg7nlf768rbrfd5a0970pllh"; + }; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + completions_dir=$(find "target" -name "shell_completions" -type d -printf "%T+\t%p\n" | sort | awk 'NR==1{print $2}') + + installShellCompletion --bash $completions_dir/page.bash + installShellCompletion --fish $completions_dir/page.fish + installShellCompletion --zsh $completions_dir/_page + ''; + + cargoSha256 = "0ckfmqi6jvbvj99vbdp798mmy6gc54254n32br0ri842b04i26qf"; + + meta = with lib; { + description = "Use neovim as pager"; + homepage = "https://github.com/I60R/page"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.s1341 ]; + }; +} diff --git a/pkgs/tools/misc/pal/default.nix b/pkgs/tools/misc/pal/default.nix index 85bad70edc9..c285dc2463b 100644 --- a/pkgs/tools/misc/pal/default.nix +++ b/pkgs/tools/misc/pal/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; meta = { - homepage = http://palcal.sourceforge.net/; + 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]; diff --git a/pkgs/tools/misc/parallel-rust/default.nix b/pkgs/tools/misc/parallel-rust/default.nix deleted file mode 100644 index 213e8c8e378..00000000000 --- a/pkgs/tools/misc/parallel-rust/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: - -rustPlatform.buildRustPackage rec { - pname = "parallel-rust"; - version = "0.11.3"; - - src = fetchFromGitHub { - owner = "mmstick"; - repo = "parallel"; - rev = version; - sha256 = "1bb1m3ckkrxlnw9w24ig70bd1zwyrbaw914q3xz5yv43c0l6pn9c"; - }; - - cargoSha256 = "1r5chjhmy6ivhsvgqf75ph1qxa4x7n20f7rb3b6maqpbsc64km9n"; - - patches = [ ./fix_cargo_lock_version.patch ]; - - meta = with stdenv.lib; { - description = "A command-line CPU load balancer written in Rust"; - homepage = https://github.com/mmstick/parallel; - license = licenses.mit; - maintainers = []; - platforms = platforms.all; - }; -} diff --git a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch b/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch deleted file mode 100644 index 75a1ba35e12..00000000000 --- a/pkgs/tools/misc/parallel-rust/fix_cargo_lock_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index c01308d..dba3927 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1,6 +1,6 @@ - [root] - name = "parallel" --version = "0.11.2" -+version = "0.11.3" - dependencies = [ - "arrayvec 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 77fdbcf8ac3..d55b2cd6f24 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/parallel/"; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ pSub vrthra ]; + maintainers = with maintainers; [ pSub vrthra tomberek ]; }; } diff --git a/pkgs/tools/misc/parallel/wrapper.nix b/pkgs/tools/misc/parallel/wrapper.nix new file mode 100644 index 00000000000..b85dfc56f3d --- /dev/null +++ b/pkgs/tools/misc/parallel/wrapper.nix @@ -0,0 +1,13 @@ +{ parallel, makeWrapper , runCommand +, perlPackages +, extraPerlPackages ? + with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] +}: + +runCommand "parallel-full" { + nativeBuildInputs = [ makeWrapper ]; + } '' + mkdir -p $out/bin + makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ + --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" + '' diff --git a/pkgs/tools/misc/parcellite/default.nix b/pkgs/tools/misc/parcellite/default.nix index 46606e3b43b..97c67f59b08 100644 --- a/pkgs/tools/misc/parcellite/default.nix +++ b/pkgs/tools/misc/parcellite/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight GTK clipboard manager"; - homepage = https://github.com/rickyrockrat/parcellite; + homepage = "https://github.com/rickyrockrat/parcellite"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 0eed491e8a9..808b0382f32 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { which also serves as a sample implementation and script backend. ''; - homepage = https://www.gnu.org/software/parted/; + homepage = "https://www.gnu.org/software/parted/"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix index ab3c4b5a6c4..1b5f7dbdbec 100644 --- a/pkgs/tools/misc/partition-manager/default.nix +++ b/pkgs/tools/misc/partition-manager/default.nix @@ -26,7 +26,7 @@ in mkDerivation rec { meta = with lib; { description = "KDE Partition Manager"; license = licenses.gpl2; - homepage = https://www.kde.org/applications/system/kdepartitionmanager/; + homepage = "https://www.kde.org/applications/system/kdepartitionmanager/"; maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index c2c8e2b8573..a3134f57397 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://launchpad.net/pastebinit; + homepage = "https://launchpad.net/pastebinit"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; diff --git a/pkgs/tools/misc/pazi/default.nix b/pkgs/tools/misc/pazi/default.nix index dd64200e130..cc7e7b043e0 100644 --- a/pkgs/tools/misc/pazi/default.nix +++ b/pkgs/tools/misc/pazi/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "An autojump \"zap to directory\" helper"; - homepage = https://github.com/euank/pazi; + homepage = "https://github.com/euank/pazi"; license = licenses.gpl3; maintainers = with maintainers; [ bbigras ]; }; diff --git a/pkgs/tools/misc/pdf-parser/default.nix b/pkgs/tools/misc/pdf-parser/default.nix new file mode 100644 index 00000000000..3fee457f6f5 --- /dev/null +++ b/pkgs/tools/misc/pdf-parser/default.nix @@ -0,0 +1,34 @@ +{ stdenv, python3Packages, fetchzip }: + +python3Packages.buildPythonApplication { + pname = "pdf-parser"; + version = "0.7.4"; + + src = fetchzip { + url = "https://didierstevens.com/files/software/pdf-parser_V0_7_4.zip"; + sha256 = "1j39yww2yl4cav8xgd4zfl5jchbbkvffnrynkamkzvz9dd5np2mh"; + }; + + format = "other"; + + installPhase = '' + install -Dm555 pdf-parser.py $out/bin/pdf-parser.py + ''; + + preFixup = '' + substituteInPlace $out/bin/pdf-parser.py \ + --replace '/usr/bin/python' '${python3Packages.python}/bin/python' + ''; + + meta = with stdenv.lib; { + description = "Parse a PDF document"; + longDescription = '' + This tool will parse a PDF document to identify the fundamental elements used in the analyzed file. + It will not render a PDF document. + ''; + homepage = "https://blog.didierstevens.com/programs/pdf-tools/"; + license = licenses.publicDomain; + maintainers = [ maintainers.lightdiscord ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/pfetch/default.nix b/pkgs/tools/misc/pfetch/default.nix index 49867331780..bbecf4656e7 100644 --- a/pkgs/tools/misc/pfetch/default.nix +++ b/pkgs/tools/misc/pfetch/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "pfetch"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "pfetch"; rev = version; - sha256 = "0yg9nlrjnm2404ysm2qp1klpq1wlmyih302kzfqchn6l2sibsm4j"; + sha256 = "06z0k1naw3k052p2z7241lx92rp5m07zlr0alx8pdm6mkc3c4v8f"; }; dontBuild = true; @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "A pretty system information tool written in POSIX sh"; - homepage = https://github.com/dylanaraps/pfetch; + homepage = "https://github.com/dylanaraps/pfetch"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ equirosa ]; diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 4f4bd7e754c..ca3318d45c6 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { * View user index statistics. ''; - homepage = http://ptop.projects.postgresql.org/; + homepage = "http://ptop.projects.postgresql.org/"; platforms = platforms.linux; license = licenses.free; # see commands.c }; diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index 9eed1aaffd8..fbd32cf876d 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgcenter"; @@ -13,10 +13,8 @@ buildGoModule rec { modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { - homepage = https://pgcenter.org/; + homepage = "https://pgcenter.org/"; description = "Command-line admin tool for observing and troubleshooting PostgreSQL"; license = licenses.bsd3; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 04e106ca552..b702ffc1703 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pgmetrics"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0h375zk0ik06g0b5vmi00b1wn5q2c0r137f7qf6l8k8p886x41h6"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index dd07fee3405..a66a6688ad4 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = http://docs.phraseapp.com; + homepage = "http://docs.phraseapp.com"; description = "PhraseApp API v2 Command Line Client"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix index 1ad21940368..5dd83c4887b 100644 --- a/pkgs/tools/misc/picocom/default.nix +++ b/pkgs/tools/misc/picocom/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Minimal dumb-terminal emulation program"; - homepage = https://github.com/npat-efault/picocom/; + homepage = "https://github.com/npat-efault/picocom/"; license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 4c7e9d0892c..fe16406256f 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://pipelight.net/; + homepage = "http://pipelight.net/"; license = with stdenv.lib.licenses; [ mpl11 gpl2 lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; maintainers = with stdenv.lib.maintainers; [ skeidel ]; diff --git a/pkgs/tools/misc/pipreqs/default.nix b/pkgs/tools/misc/pipreqs/default.nix index 9925021b3f6..bbd4125c4b0 100644 --- a/pkgs/tools/misc/pipreqs/default.nix +++ b/pkgs/tools/misc/pipreqs/default.nix @@ -17,7 +17,7 @@ python2Packages.buildPythonApplication rec { meta = with lib; { description = "Generate requirements.txt file for any project based on imports"; - homepage = https://github.com/bndr/pipreqs; + homepage = "https://github.com/bndr/pipreqs"; license = licenses.asl20; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix new file mode 100644 index 00000000000..35496ed4766 --- /dev/null +++ b/pkgs/tools/misc/pistol/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +, file +}: + +buildGoModule rec { + pname = "pistol"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "doronbehar"; + repo = pname; + rev = "v${version}"; + sha256 = "0r2nq1zsm9zxl097qnjgr5lk9jm3jjvpgczpvp1nx7dfnahkx2wf"; + }; + + modSha256 = "0l4rjrvgbb4b3abyvyz9ws0mh78pri0cvncwv91dzgbx796a2nn6"; + + subPackages = [ "cmd/pistol" ]; + + buildInputs = [ + file + ]; + + meta = with stdenv.lib; { + description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant"; + homepage = "https://github.com/doronbehar/pistol"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} diff --git a/pkgs/tools/misc/pixd/default.nix b/pkgs/tools/misc/pixd/default.nix index a16333f6e44..a2dc84ed6a9 100644 --- a/pkgs/tools/misc/pixd/default.nix +++ b/pkgs/tools/misc/pixd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Colourful visualization tool for binary files"; - homepage = https://github.com/FireyFly/pixd; + homepage = "https://github.com/FireyFly/pixd"; maintainers = [ maintainers.FireyFly ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index c1db4f9d597..97628da67f7 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "pk2cmd-1.20"; src = fetchurl { - url = https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz; + url = "https://ww1.microchip.com/downloads/en/DeviceDoc/pk2cmdv1.20LinuxMacSource.tar.gz"; sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ libusb makeWrapper ]; meta = { - homepage = https://www.microchip.com/pickit2; + homepage = "https://www.microchip.com/pickit2"; license = stdenv.lib.licenses.unfree; #MicroChip-PK2 description = "Microchip PIC programming software for the PICKit2 programmer"; }; diff --git a/pkgs/tools/misc/pkgdiff/default.nix b/pkgs/tools/misc/pkgdiff/default.nix index 3c9c0f9bfaf..04d0c95b81a 100644 --- a/pkgs/tools/misc/pkgdiff/default.nix +++ b/pkgs/tools/misc/pkgdiff/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for visualizing changes in Linux software packages"; - homepage = https://lvc.github.io/pkgdiff/; + homepage = "https://lvc.github.io/pkgdiff/"; license = licenses.gpl2; maintainers = with maintainers; [ sweber ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 0e9df5350f9..fec1bee160f 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.2"; + version = "1.2020.5"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1wvlhy76h1bxwjj8r48ixypch1bj9m9721rbawayj8v0hpyr1an4"; + sha256 = "1cn1bjah9qvhh3hixa92v804crkgz69mg30k8229a551x3alykhd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/plotinus/default.nix b/pkgs/tools/misc/plotinus/default.nix index 58a6c7c4071..6440ed533f6 100644 --- a/pkgs/tools/misc/plotinus/default.nix +++ b/pkgs/tools/misc/plotinus/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A searchable command palette in every modern GTK application"; - homepage = https://github.com/p-e-w/plotinus; + homepage = "https://github.com/p-e-w/plotinus"; maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; # No COPYING file, but headers in the source code diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix index 5712e02e8ea..75710025126 100644 --- a/pkgs/tools/misc/pod2mdoc/default.nix +++ b/pkgs/tools/misc/pod2mdoc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = "http://mdocml.bsd.lv/"; description = "converter from POD into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix index 0c9d3a0ea79..b00f3099154 100644 --- a/pkgs/tools/misc/profile-cleaner/default.nix +++ b/pkgs/tools/misc/profile-cleaner/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { term "browser" is used loosely since profile-cleaner happily works on some email clients and newsreaders too. ''; - homepage = https://github.com/graysky2/profile-cleaner; + homepage = "https://github.com/graysky2/profile-cleaner"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.devhell ]; diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index 9c07254e587..ae70a82de4f 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { transparent user experience. ''; homepage = "https://github.com/graysky2/profile-sync-daemon"; - downloadPage = https://github.com/graysky2/profile-sync-daemon/releases; + downloadPage = "https://github.com/graysky2/profile-sync-daemon/releases"; license = licenses.mit; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index 3edca413f3a..bbde732aadf 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/Xfennec/progress; + homepage = "https://github.com/Xfennec/progress"; description = "Tool that shows the progress of coreutils programs"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/misc/proxytunnel/default.nix b/pkgs/tools/misc/proxytunnel/default.nix index 335bddd6730..74c04905994 100644 --- a/pkgs/tools/misc/proxytunnel/default.nix +++ b/pkgs/tools/misc/proxytunnel/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "proxytunnel-1.9.0"; src = fetchurl { - url = mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz; + url = "mirror://sourceforge/proxytunnel/proxytunnel-1.9.0.tgz"; sha256 = "1fd644kldsg14czkqjybqh3wrzwsp3dcargqf4fjkpqxv3wbpx9f"; }; @@ -14,7 +14,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; + homepage = "http://proxytunnel.sourceforge.net/download.php"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 4cf98ef8b48..1bd2fc259ee 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "2.6.6"; + version = "2.7.1"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "0l20ysr61y99zxvm8cqsgj7arv4m7h7gqq8lrq65bmh9fxncfpsd"; + sha256 = "1fq8n5naicfv0lsyzfb52c84w40zrsks0x9rrvyyzih4vkhic4vm"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 4e840957ce3..96d1a5fc6a0 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -14,12 +14,12 @@ python3Packages.buildPythonApplication rec { patches = [ # Fix for bibtexparser 1.1.0 (fetchpatch { - url = https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch; + url = "https://github.com/pubs/pubs/pull/185/commits/e58ae98b93b8364a07fd5f5f452ba88ad332c948.patch"; sha256 = "1n7zrk119v395jj8wqg8wlymc9l9pq3v752yy3kam9kflc0aashp"; }) # Fix test broken by PyYAML 5.1 (fetchpatch { - url = https://github.com/pubs/pubs/pull/194/commits/c3cb713ae76528eeeaaeb948fe319a76ab3934d8.patch; + url = "https://github.com/pubs/pubs/pull/194/commits/c3cb713ae76528eeeaaeb948fe319a76ab3934d8.patch"; sha256 = "05as418m7wzs65839bb91b2jrs8l68z8ldcjcd9cn4b9fcgsf3rk"; }) ]; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Command-line bibliography manager"; - homepage = https://github.com/pubs/pubs; + homepage = "https://github.com/pubs/pubs"; license = licenses.lgpl3; maintainers = with maintainers; [ gebner ]; }; diff --git a/pkgs/tools/misc/pv/default.nix b/pkgs/tools/misc/pv/default.nix index 3642653944b..dd64366679c 100644 --- a/pkgs/tools/misc/pv/default.nix +++ b/pkgs/tools/misc/pv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://www.ivarch.com/programs/pv; + 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; [ ]; diff --git a/pkgs/tools/misc/pws/Gemfile.lock b/pkgs/tools/misc/pws/Gemfile.lock index c9cf6a3157c..cad7909e406 100644 --- a/pkgs/tools/misc/pws/Gemfile.lock +++ b/pkgs/tools/misc/pws/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES pws BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/pkgs/tools/misc/pws/default.nix b/pkgs/tools/misc/pws/default.nix index 50952435dd7..0edec63c8c9 100644 --- a/pkgs/tools/misc/pws/default.nix +++ b/pkgs/tools/misc/pws/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line password safe"; - homepage = https://github.com/janlelis/pws; + homepage = "https://github.com/janlelis/pws"; license = licenses.mit; maintainers = with maintainers; [ swistak35 nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix index 3e7e3870959..2b8a2fb02be 100644 --- a/pkgs/tools/misc/qjoypad/default.nix +++ b/pkgs/tools/misc/qjoypad/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { of gaming devices in Linux, and makes the Linux gaming experience just a little bit nicer. ''; - homepage = http://qjoypad.sourceforge.net; + homepage = "http://qjoypad.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index d7598b0c6dd..97793b02557 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Qt5 Configuration Tool"; - homepage = https://www.opendesktop.org/content/show.php?content=168066; + homepage = "https://www.opendesktop.org/content/show.php?content=168066"; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ ralith ]; diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix index 90498767c99..852c46b6d00 100644 --- a/pkgs/tools/misc/radeon-profile/default.nix +++ b/pkgs/tools/misc/radeon-profile/default.nix @@ -24,7 +24,7 @@ mkDerivation rec { meta = with lib; { description = "Application to read current clocks of AMD Radeon cards"; - homepage = https://github.com/marazmista/radeon-profile; + homepage = "https://github.com/marazmista/radeon-profile"; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/misc/rcm/default.nix b/pkgs/tools/misc/rcm/default.nix index 3d97874df7d..570b55c9acf 100644 --- a/pkgs/tools/misc/rcm/default.nix +++ b/pkgs/tools/misc/rcm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Management Suite for Dotfiles"; - homepage = https://github.com/thoughtbot/rcm; + homepage = "https://github.com/thoughtbot/rcm"; license = licenses.bsd3; maintainers = with maintainers; [ malyn ]; platforms = with platforms; unix; diff --git a/pkgs/tools/misc/recoverjpeg/default.nix b/pkgs/tools/misc/recoverjpeg/default.nix index 88aff4f3c08..bf75213acdf 100644 --- a/pkgs/tools/misc/recoverjpeg/default.nix +++ b/pkgs/tools/misc/recoverjpeg/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://rfc1149.net/devel/recoverjpeg.html; + homepage = "https://rfc1149.net/devel/recoverjpeg.html"; description = "Recover lost JPEGs and MOV files on a bogus memory card or disk"; license = licenses.gpl2; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 8d648e293c5..416fa23f453 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { number of named fields. ''; - homepage = https://www.gnu.org/software/recutils/; + homepage = "https://www.gnu.org/software/recutils/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 91d8e472130..46f78ddb093 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -17,7 +17,7 @@ let in stdenv.mkDerivation { name = "remind-3.1.16"; src = fetchurl { - url = https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz; + url = "https://dianne.skoll.ca/projects/remind/download/remind-03.01.16.tar.gz"; sha256 = "14yavwqmimba8rdpwx3wlav9sfb0v5rcd1iyzqrs08wx07a9pdzf"; }; @@ -38,7 +38,7 @@ in stdenv.mkDerivation { ''; meta = { - homepage = https://dianne.skoll.ca/projects/remind/; + 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]; diff --git a/pkgs/tools/misc/renameutils/default.nix b/pkgs/tools/misc/renameutils/default.nix index b5e5d64dda6..73146f09792 100644 --- a/pkgs/tools/misc/renameutils/default.nix +++ b/pkgs/tools/misc/renameutils/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "renameutils-0.12.0"; src = fetchurl { - url = mirror://savannah/renameutils/renameutils-0.12.0.tar.gz; + url = "mirror://savannah/renameutils/renameutils-0.12.0.tar.gz"; sha256 = "18xlkr56jdyajjihcmfqlyyanzyiqqlzbhrm6695mkvw081g1lnb"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ readline ]; meta = { - homepage = https://www.nongnu.org/renameutils/; + 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; diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index d52910b5a84..48e0f7757ae 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/algernon/riemann-c-client; + homepage = "https://github.com/algernon/riemann-c-client"; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/tools/misc/riemann-tools/Gemfile.lock b/pkgs/tools/misc/riemann-tools/Gemfile.lock index 881b8aefcdf..a3e1ea62a8c 100644 --- a/pkgs/tools/misc/riemann-tools/Gemfile.lock +++ b/pkgs/tools/misc/riemann-tools/Gemfile.lock @@ -22,4 +22,4 @@ DEPENDENCIES riemann-tools BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/rig/default.nix b/pkgs/tools/misc/rig/default.nix index 627758e9c5e..7e1d9307a16 100644 --- a/pkgs/tools/misc/rig/default.nix +++ b/pkgs/tools/misc/rig/default.nix @@ -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 diff --git a/pkgs/tools/misc/rkflashtool/default.nix b/pkgs/tools/misc/rkflashtool/default.nix index fb55b15bbd5..94d6ca95748 100644 --- a/pkgs/tools/misc/rkflashtool/default.nix +++ b/pkgs/tools/misc/rkflashtool/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/rkflashtool/; + homepage = "https://sourceforge.net/projects/rkflashtool/"; description = "Tools for flashing Rockchip devices"; platforms = platforms.linux; maintainers = [ maintainers.viric ]; diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index 96df0707153..c19b0f1f9ac 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Readline wrapper for console programs"; - homepage = https://github.com/hanslub42/rlwrap; + homepage = "https://github.com/hanslub42/rlwrap"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ ]; diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix index 408660bf3d9..cbe1f7d407c 100644 --- a/pkgs/tools/misc/rmlint/default.nix +++ b/pkgs/tools/misc/rmlint/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Extremely fast tool to remove duplicates and other lint from your filesystem"; - homepage = https://rmlint.readthedocs.org; + homepage = "https://rmlint.readthedocs.org"; platforms = platforms.linux; license = licenses.gpl3; maintainers = [ maintainers.koral ]; diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix index 232949b7dac..995a8b5eb15 100644 --- a/pkgs/tools/misc/rockbox-utility/default.nix +++ b/pkgs/tools/misc/rockbox-utility/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, libusb1 , qtbase, qttools, makeWrapper, qmake -, withEspeak ? false, espeak ? null }: +, withEspeak ? false, espeak ? null, qt5 }: let inherit (stdenv.lib) getDev; in @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ libusb1 qtbase qttools ] ++ stdenv.lib.optional withEspeak espeak; - nativeBuildInputs = [ makeWrapper pkgconfig qmake ]; + nativeBuildInputs = [ makeWrapper pkgconfig qmake qt5.wrapQtAppsHook ]; postPatch = '' sed -i rbutil/rbutilqt/rbutilqt.pro \ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Open source firmware for mp3 players"; - homepage = https://www.rockbox.org; + homepage = "https://www.rockbox.org"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ goibhniu ]; diff --git a/pkgs/tools/misc/roundup/default.nix b/pkgs/tools/misc/roundup/default.nix index 7eebc194300..8d0c62889f9 100644 --- a/pkgs/tools/misc/roundup/default.nix +++ b/pkgs/tools/misc/roundup/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A unit testing tool for running test plans which are written in any POSIX shell"; - homepage = http://bmizerany.github.io/roundup/; + homepage = "http://bmizerany.github.io/roundup/"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/routino/default.nix b/pkgs/tools/misc/routino/default.nix index d946ed91c72..aad63b66ec4 100644 --- a/pkgs/tools/misc/routino/default.nix +++ b/pkgs/tools/misc/routino/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.routino.org/; + homepage = "http://www.routino.org/"; description = "OpenStreetMap Routing Software"; license = licenses.agpl3; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index 79003ff1ecf..41e59162905 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -83,11 +83,13 @@ stdenv.mkDerivation rec { pcre check python - # libdnf + + # libdnf # vendored unstable branch + # required by vendored libdnf json_c zchunk libmodulemd_1 - utillinux + utillinux # for smartcols.pc sqlite cppunit ]; diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 8365a47830a..10ff6db63f1 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://oss.oetiker.ch/rrdtool/; + homepage = "https://oss.oetiker.ch/rrdtool/"; description = "High performance logging in Round Robin Databases"; license = licenses.gpl2; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/rw/default.nix b/pkgs/tools/misc/rw/default.nix index b6e53e46536..b36eff12a2f 100644 --- a/pkgs/tools/misc/rw/default.nix +++ b/pkgs/tools/misc/rw/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://sortix.org/rw; + homepage = "https://sortix.org/rw"; description = "Block device and byte copying program similar to dd"; longDescription = '' rw is a command line program which copies information between files diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 18813531033..bc32489c588 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.2.1"; - sha256 = "074kizkxjwvmxspxg69fr8r0lbiy61l2n5nzgbfvwvhc6lj34iqy"; + version = "2.2.2.2"; + sha256 = "1k3la37q46n93vjwk9wm9ym4w87z6lqzv43f03qd0vqj9k94mpv3"; 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 acab41e8ff5..67c751a5779 100644 --- a/pkgs/tools/misc/sam-ba/default.nix +++ b/pkgs/tools/misc/sam-ba/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { Atmel SAM-BA software provides an open set of tools for programming the Atmel SAM3, SAM7 and SAM9 ARM-based microcontrollers. ''; - homepage = http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools; + homepage = "http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools"; # License in <source>/doc/readme.txt license = "BSD-like (partly binary-only)"; # according to Buildroot platforms = [ "x86_64-linux" ]; # patchelf fails on i686-linux diff --git a/pkgs/tools/misc/scanmem/default.nix b/pkgs/tools/misc/scanmem/default.nix index 65b7b47256a..58350f7a638 100644 --- a/pkgs/tools/misc/scanmem/default.nix +++ b/pkgs/tools/misc/scanmem/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ./autogen.sh ''; meta = with stdenv.lib; { - homepage = https://github.com/scanmem/scanmem; + homepage = "https://github.com/scanmem/scanmem"; description = "Memory scanner for finding and poking addresses in executing processes"; maintainers = [ maintainers.chattered ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/scfbuild/default.nix b/pkgs/tools/misc/scfbuild/default.nix index 7fbe13fd44e..d604f1a68fe 100644 --- a/pkgs/tools/misc/scfbuild/default.nix +++ b/pkgs/tools/misc/scfbuild/default.nix @@ -33,7 +33,7 @@ buildPythonApplication { meta = with lib; { description = "SVGinOT color font builder"; - homepage = https://github.com/13rac1/scfbuild; + homepage = "https://github.com/13rac1/scfbuild"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; }; diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 136ab4fe341..9bc219289c4 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { - url = https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff; + url = "https://gist.githubusercontent.com/yujinakayama/4608863/raw/76b9f89af5e5a2e97d9a0f36aac989fb56cf1447/gistfile1.diff"; sha256 = "0f9bf83p8zdxaa1pr75jyf5g8xr3r8kv7cyzzbpraa1q4j15ss1p"; stripLen = 1; }); @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/screen/; + homepage = "https://www.gnu.org/software/screen/"; description = "A window manager that multiplexes a physical terminal"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/misc/screenfetch/default.nix b/pkgs/tools/misc/screenfetch/default.nix index d01a3a877f2..3d42ab9374a 100644 --- a/pkgs/tools/misc/screenfetch/default.nix +++ b/pkgs/tools/misc/screenfetch/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { command! This script is very easy to add to and can easily be extended. ''; license = licenses.gpl3; - homepage = https://github.com/KittyKatt/screenFetch; + homepage = "https://github.com/KittyKatt/screenFetch"; maintainers = with maintainers; [ relrod ]; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/sdate/default.nix b/pkgs/tools/misc/sdate/default.nix index 742b25601c0..d9439863dc3 100644 --- a/pkgs/tools/misc/sdate/default.nix +++ b/pkgs/tools/misc/sdate/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoreconfHook ]; meta = { - homepage = https://www.df7cb.de/projects/sdate; + 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 ]; diff --git a/pkgs/tools/misc/sdl-jstest/default.nix b/pkgs/tools/misc/sdl-jstest/default.nix index 0be5b8d1379..bb1bf6b0a37 100644 --- a/pkgs/tools/misc/sdl-jstest/default.nix +++ b/pkgs/tools/misc/sdl-jstest/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkgconfig docbook_xsl git ]; meta = with stdenv.lib; { - homepage = https://github.com/Grumbel/sdl-jstest; + homepage = "https://github.com/Grumbel/sdl-jstest"; description = "Simple SDL joystick test application for the console"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index 71cb3d23beb..a464ea638bd 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, Security }: rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "1.3.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "1s59ra99wcyyqz8gzly4qmcq5rh22c50c75cdi2kyajm7ghgryy9"; + sha256 = "1fjqm4qr85wb0i3vazp0w74izfzvkycdii7dlpdp5zs8jgb35pdh"; }; - cargoSha256 = "1nqzg5jnwvf6wiihi3wwrym3d6g0hsfaxcadhl95r3v4k35fn5qb"; + cargoSha256 = "1n8qh730nhdmpm08mm2ppcl3nkcgm50cyz9q5h6dlzq4bv4rijp4"; + + nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' + installManPage man/man1/shadowenv.1 + installManPage man/man5/shadowlisp.5 + ''; + meta = with stdenv.lib; { homepage = "https://shopify.github.io/shadowenv/"; description = "reversible directory-local environment variable manipulations"; diff --git a/pkgs/tools/misc/shallot/default.nix b/pkgs/tools/misc/shallot/default.nix index ced15038b0c..e8ab6168541 100644 --- a/pkgs/tools/misc/shallot/default.nix +++ b/pkgs/tools/misc/shallot/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { description = "Shallot allows you to create customized .onion addresses for your hidden service"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/katmagic/Shallot; + homepage = "https://github.com/katmagic/Shallot"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/misc/shelldap/default.nix b/pkgs/tools/misc/shelldap/default.nix index 89257c8ffc4..bfa8ea16ed3 100644 --- a/pkgs/tools/misc/shelldap/default.nix +++ b/pkgs/tools/misc/shelldap/default.nix @@ -17,7 +17,7 @@ perlPackages.buildPerlPackage rec { ''; outputs = [ "out" ]; meta = with stdenv.lib; { - homepage = https://bitbucket.org/mahlon/shelldap/; + homepage = "https://bitbucket.org/mahlon/shelldap/"; description = "A handy shell-like interface for browsing LDAP servers and editing their content"; license = with licenses; [ bsd3 ]; maintainers = with maintainers; [ tobiasBora ]; diff --git a/pkgs/tools/misc/shunit2/default.nix b/pkgs/tools/misc/shunit2/default.nix index acfbd48c606..186235be442 100644 --- a/pkgs/tools/misc/shunit2/default.nix +++ b/pkgs/tools/misc/shunit2/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/kward/shunit2; + homepage = "https://github.com/kward/shunit2"; description = "A xUnit based unit test framework for Bourne based shell scripts."; maintainers = with maintainers; [ cdepillabout utdemir ]; license = licenses.asl20; diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix index 055fa9418a9..fafee99db5a 100644 --- a/pkgs/tools/misc/sixpair/default.nix +++ b/pkgs/tools/misc/sixpair/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "sixpair-2007-04-18"; src = fetchurl { - url = http://www.pabr.org/sixlinux/sixpair.c; + url = "http://www.pabr.org/sixlinux/sixpair.c"; sha256 = "1b0a3k7gs544cbji7n29jxlrsscwfx6s1r2sgwdl6hmkc1l9gagr"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { longDescription = '' 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/; + homepage = "http://www.pabr.org/sixlinux/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.tomsmeets ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix index 1472b4ae72f..fca2d35e37c 100644 --- a/pkgs/tools/misc/skim/default.nix +++ b/pkgs/tools/misc/skim/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "skim"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "lotabout"; repo = pname; rev = "v${version}"; - sha256 = "0b0x389khdqyzdb6mwbf31wdfn8xila756hb11l555iwipl271ci"; + sha256 = "0xjb8slrlkrzdqvzmf63lq6rgggrjw3hf9an6h8xf6vizz1vfni0"; }; outputs = [ "out" "vim" ]; - cargoSha256 = "0xcsj8wprp9r6s7r2d2fnbicrc5pfnnx1gxyrq2qkj3rwr1q8ndg"; + cargoSha256 = "14p4ppbl2mak21jvxpbd1b28jaw2629bc8kv7875cdzy3ksxyji3"; - patchPhase = '' + patches = [ + # Fix bash completion. Remove with the next release + (fetchpatch { + url = "https://github.com/lotabout/skim/commit/60ca3484090c2e73a1de396500c73a6ad6e0bde9.patch"; + sha256 = "07nibr13vmxscbwavrckhcbsvxwkpan4a6ml0qfr1ny36xbc6y3p"; + }) + ]; + + postPatch = '' sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/skim.vim ''; diff --git a/pkgs/tools/misc/sl/default.nix b/pkgs/tools/misc/sl/default.nix index 4ef91f6c55a..902617665d8 100644 --- a/pkgs/tools/misc/sl/default.nix +++ b/pkgs/tools/misc/sl/default.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Steam Locomotive runs across your terminal when you type 'sl'"; - homepage = http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html; + homepage = "http://www.tkl.iis.u-tokyo.ac.jp/~toyoda/index_e.html"; license = rec { shortName = "Toyoda Masashi's free software license"; fullName = shortName; - url = https://github.com/eyJhb/sl/blob/master/LICENSE; + url = "https://github.com/eyJhb/sl/blob/master/LICENSE"; }; maintainers = with maintainers; [ eyjhb ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/slsnif/default.nix b/pkgs/tools/misc/slsnif/default.nix index 72363de7653..8078ee51eb2 100644 --- a/pkgs/tools/misc/slsnif/default.nix +++ b/pkgs/tools/misc/slsnif/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "slsnif-0.4.4"; src = fetchurl { - url = mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz; + url = "mirror://sourceforge/slsnif/slsnif-0.4.4.tar.gz"; sha256 = "0gn8c5hj8m3sywpwdgn6w5xl4rzsvg0z7d2w8dxi6p152j5b0pii"; }; meta = { description = "Serial line sniffer"; - homepage = http://slsnif.sourceforge.net/; + homepage = "http://slsnif.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/slurp/default.nix b/pkgs/tools/misc/slurp/default.nix index bc0e86f1b51..dbec2324674 100644 --- a/pkgs/tools/misc/slurp/default.nix +++ b/pkgs/tools/misc/slurp/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Select a region in a Wayland compositor"; - homepage = https://github.com/emersion/slurp; + homepage = "https://github.com/emersion/slurp"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/tools/misc/smc/default.nix b/pkgs/tools/misc/smc/default.nix index f442df399d9..87bda5d78b4 100644 --- a/pkgs/tools/misc/smc/default.nix +++ b/pkgs/tools/misc/smc/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { SMC can also generate GraphViz state diagrams from the input file. ''; - homepage = http://smc.sourceforge.net/; + homepage = "http://smc.sourceforge.net/"; license = licenses.mpl11; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index c6661ee62e4..4d24a1542fa 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses ]; meta = with stdenv.lib; { - homepage = https://github.com/p-gen/smenu; + homepage = "https://github.com/p-gen/smenu"; description = "Terminal selection utility"; longDescription = '' Terminal utility that allows you to use words coming from the standard diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 8b0167917dd..eed9516d096 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool for Linux filesystem snapshot management"; - homepage = http://snapper.io; + homepage = "http://snapper.io"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ tstrobel markuskowa ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 152db99660c..01aec4aabb7 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.38.1"; + version = "0.39.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0qp3y2wcpj1r07v1r2y42zrzkl13j0vlinjx05gfmrmapcls41gi"; + sha256 = "13phic9898wjc4b000nkwhy24yczn3dyhw8pqcaqhyzxdaj3gwmw"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "11492fv2isw2prfcgxq0wrbln1n6xdi9209cifjf25nnw2aq2csn"; + cargoSha256 = "0ds19sjy0fd7psmqkw64scjf3ysi408i7c1qk9zvqkl4ghz8wymg"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index e4e1adf2001..a1e6f57ce3d 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A sophisticated software modeler"; - homepage = http://staruml.io/; + homepage = "http://staruml.io/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; }; diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix index d5eecff7278..d5cd4ef32ef 100644 --- a/pkgs/tools/misc/stow/default.nix +++ b/pkgs/tools/misc/stow/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/stow/; + homepage = "https://www.gnu.org/software/stow/"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/subberthehut/default.nix b/pkgs/tools/misc/subberthehut/default.nix index e54dc3b3f2b..e4fa57e30ac 100644 --- a/pkgs/tools/misc/subberthehut/default.nix +++ b/pkgs/tools/misc/subberthehut/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mus65/subberthehut; + homepage = "https://github.com/mus65/subberthehut"; description = "An OpenSubtitles.org downloader"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/sutils/default.nix b/pkgs/tools/misc/sutils/default.nix index 8d42d2d823f..c94b8f646a9 100644 --- a/pkgs/tools/misc/sutils/default.nix +++ b/pkgs/tools/misc/sutils/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Small command-line utilities"; - homepage = https://github.com/baskerville/sutils; + homepage = "https://github.com/baskerville/sutils"; maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 66ed0a11fd9..8490771ad8d 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/spaam/svtplay-dl; + 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.linux; diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix index 0d1ebd70041..21e6f49df1f 100644 --- a/pkgs/tools/misc/sweep-visualizer/default.nix +++ b/pkgs/tools/misc/sweep-visualizer/default.nix @@ -50,7 +50,7 @@ ''; meta = with stdenv.lib; { - homepage = https://support.scanse.io/hc/en-us/articles/115006008948-Visualizer-Overview; + homepage = "https://support.scanse.io/hc/en-us/articles/115006008948-Visualizer-Overview"; description = "A minimal desktop application for interfacing with the Sweep device"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/misc/t/Gemfile.lock b/pkgs/tools/misc/t/Gemfile.lock index 0aa9ef4e6da..9555e08f971 100644 --- a/pkgs/tools/misc/t/Gemfile.lock +++ b/pkgs/tools/misc/t/Gemfile.lock @@ -62,4 +62,4 @@ DEPENDENCIES twitter (~> 6.1.0) BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/misc/t/default.nix b/pkgs/tools/misc/t/default.nix index aa34b98bbe2..dd0eda67ce5 100644 --- a/pkgs/tools/misc/t/default.nix +++ b/pkgs/tools/misc/t/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "A command-line power tool for Twitter"; - homepage = http://sferik.github.io/t/; + homepage = "http://sferik.github.io/t/"; license = licenses.asl20; maintainers = with maintainers; [ offline manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index 03926b95538..fd4ca5f92d5 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { resources from a Macintosh font file or create a Macintosh Type 1 font file from a PFA or PFB font. ''; - homepage = http://www.lcdf.org/type/; + homepage = "http://www.lcdf.org/type/"; # README from tarball says "BSD-like" and points to non-existing LICENSE # file... license = "Click"; # MIT with extra clause, https://github.com/kohler/t1utils/blob/master/LICENSE diff --git a/pkgs/tools/misc/td/Gemfile.lock b/pkgs/tools/misc/td/Gemfile.lock index 5726611b9af..b777a8b411a 100644 --- a/pkgs/tools/misc/td/Gemfile.lock +++ b/pkgs/tools/misc/td/Gemfile.lock @@ -37,4 +37,4 @@ DEPENDENCIES td BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/tools/misc/td/default.nix b/pkgs/tools/misc/td/default.nix index 437bdb0373f..f4b120d1bc1 100644 --- a/pkgs/tools/misc/td/default.nix +++ b/pkgs/tools/misc/td/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "CLI to manage data on Treasure Data, the Hadoop-based cloud data warehousing."; - homepage = https://github.com/treasure-data/td; + homepage = "https://github.com/treasure-data/td"; license = licenses.asl20; maintainers = with maintainers; [ groodt nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/teamocil/Gemfile.lock b/pkgs/tools/misc/teamocil/Gemfile.lock index 419c2ae49d3..aeca8cadf86 100644 --- a/pkgs/tools/misc/teamocil/Gemfile.lock +++ b/pkgs/tools/misc/teamocil/Gemfile.lock @@ -10,4 +10,4 @@ DEPENDENCIES teamocil BUNDLED WITH - 1.16.3 + 2.1.4 diff --git a/pkgs/tools/misc/teamocil/default.nix b/pkgs/tools/misc/teamocil/default.nix index a5e356edbf4..b1f6c7cdcab 100644 --- a/pkgs/tools/misc/teamocil/default.nix +++ b/pkgs/tools/misc/teamocil/default.nix @@ -9,7 +9,7 @@ bundlerEnv { meta = with lib; { description = "A simple tool used to automatically create windows and panes in tmux with YAML files"; - homepage = https://github.com/remiprev/teamocil; + homepage = "https://github.com/remiprev/teamocil"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ diff --git a/pkgs/tools/misc/tensorman/default.nix b/pkgs/tools/misc/tensorman/default.nix index eca80cbcadf..85091a41b12 100644 --- a/pkgs/tools/misc/tensorman/default.nix +++ b/pkgs/tools/misc/tensorman/default.nix @@ -11,7 +11,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0ywb53snvymmwh10hm6whckz7dwmpqa4rxiggd24y178jdfrm2ns"; }; - buildInputs = [ pkgconfig openssl ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ]; cargoSha256 = "0vckay4jhg02xg68mvh7ys0yjj0p30m6wsjriqc8k24wjsrhiw9k"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/termplay/default.nix b/pkgs/tools/misc/termplay/default.nix index a17994706bb..d60a65214b7 100644 --- a/pkgs/tools/misc/termplay/default.nix +++ b/pkgs/tools/misc/termplay/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Play an image/video in your terminal"; - homepage = https://jd91mzm2.github.io/termplay/; + homepage = "https://jd91mzm2.github.io/termplay/"; license = licenses.mit; maintainers = with maintainers; [ jD91mZM2 ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/termtosvg/default.nix b/pkgs/tools/misc/termtosvg/default.nix index 93b52ad175e..a89ed808c8b 100644 --- a/pkgs/tools/misc/termtosvg/default.nix +++ b/pkgs/tools/misc/termtosvg/default.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ lxml pyte wcwidth ]; meta = with lib; { - homepage = https://nbedos.github.io/termtosvg/; + homepage = "https://nbedos.github.io/termtosvg/"; description = "Record terminal sessions as SVG animations"; license = licenses.bsd3; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index d875b098ab5..d2a8a1d0e87 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { ''; meta = { - homepage = https://github.com/lucy/tewisay; + 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 ]; diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix index abc25db2fa7..6c090c0b4b3 100644 --- a/pkgs/tools/misc/texi2mdoc/default.nix +++ b/pkgs/tools/misc/texi2mdoc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://mdocml.bsd.lv/; + homepage = "http://mdocml.bsd.lv/"; description = "converter from Texinfo into mdoc"; license = licenses.isc; platforms = platforms.all; diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index d67da78a300..b2d31a62911 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { doCheck = false; # The above is only enough for tests to pass outside the sandbox. meta = with stdenv.lib; { - homepage = https://github.com/nvbn/thefuck; + homepage = "https://github.com/nvbn/thefuck"; description = "Magnificent app which corrects your previous console command."; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 0739435084d..0aba67647e0 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/jthornber/thin-provisioning-tools/; + homepage = "https://github.com/jthornber/thin-provisioning-tools/"; description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/misc/thinkpad-scripts/default.nix b/pkgs/tools/misc/thinkpad-scripts/default.nix new file mode 100644 index 00000000000..5b9b9eae7ad --- /dev/null +++ b/pkgs/tools/misc/thinkpad-scripts/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchFromGitHub, python3Packages }: + +buildPythonPackage rec { + pname = "thinkpad-scripts"; + version = "4.12.0"; + + src = fetchFromGitHub { + owner = "martin-ueding"; + repo = "thinkpad-scripts"; + rev = "v${version}"; + sha256 = "08adx8r5pwwazbnfahay42l5f203mmvcn2ipz5hg8myqc9jxm2ky"; + }; + + propagatedBuildInputs = with python3Packages; [ setuptools ]; + + meta = { + description = "Screen rotation, docking and other scripts for ThinkPad® X220 and X230 Tablet"; + homepage = "https://github.com/martin-ueding/thinkpad-scripts"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ dawidsowa ]; + }; +} diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index bb6276f7065..89af4f693d3 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/time/; + homepage = "https://www.gnu.org/software/time/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index 88c3c7cb425..f33520aee0a 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "timidity-2.15.0"; src = fetchurl { - url = mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2; + url = "mirror://sourceforge/timidity/TiMidity++-2.15.0.tar.bz2"; sha256 = "1xf8n6dqzvi6nr2asags12ijbj1lwk1hgl3s27vm2szib8ww07qn"; }; @@ -18,7 +18,7 @@ stdenv.mkDerivation { NIX_LDFLAGS = "-ljack -L${libjack2}/lib"; instruments = fetchurl { - url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz; + url = "http://www.csee.umbc.edu/pub/midia/instruments.tar.gz"; sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/timidity/; + homepage = "https://sourceforge.net/projects/timidity/"; license = licenses.gpl2; description = "A software MIDI renderer"; maintainers = [ maintainers.marcweber ]; diff --git a/pkgs/tools/misc/tio/default.nix b/pkgs/tools/misc/tio/default.nix index 9ee9b977ab2..bab0098ecaa 100644 --- a/pkgs/tools/misc/tio/default.nix +++ b/pkgs/tools/misc/tio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Serial console TTY"; - homepage = https://tio.github.io/; + homepage = "https://tio.github.io/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ yegortimoshenko ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix index d4ff9d8c844..66d763fd304 100644 --- a/pkgs/tools/misc/tldr/default.nix +++ b/pkgs/tools/misc/tldr/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { tldr pages gives common use cases for commands, so you don't need to hunt through a man page for the correct flags. ''; - homepage = http://tldr-pages.github.io; + homepage = "http://tldr-pages.github.io"; license = licenses.mit; maintainers = with maintainers; [ taeer carlosdagos ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix index 86ab2492877..3a125fcdbf7 100644 --- a/pkgs/tools/misc/tmate/default.nix +++ b/pkgs/tools/misc/tmate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://tmate.io/; + homepage = "https://tmate.io/"; description = "Instant Terminal Sharing"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index 006cef6f102..ac20cab2842 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { configureFlags = [ "--with-fuser=${psmisc}/bin/fuser" ]; meta = with stdenv.lib; { - homepage = https://fedorahosted.org/tmpwatch/; + homepage = "https://fedorahosted.org/tmpwatch/"; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; license = licenses.gpl2; maintainers = with maintainers; [ vlstill ]; diff --git a/pkgs/tools/misc/tmux-cssh/default.nix b/pkgs/tools/misc/tmux-cssh/default.nix index f54cd2756eb..c38769f448f 100644 --- a/pkgs/tools/misc/tmux-cssh/default.nix +++ b/pkgs/tools/misc/tmux-cssh/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/dennishafemann/tmux-cssh; + homepage = "https://github.com/dennishafemann/tmux-cssh"; description = "SSH to multiple hosts at the same time using tmux"; longDescription = diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index b7c9150e12d..d19b9cd5dbf 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -39,7 +39,7 @@ buildRubyGem rec { meta = with lib; { description = "Manage complex tmux sessions easily"; - homepage = https://github.com/tmuxinator/tmuxinator; + homepage = "https://github.com/tmuxinator/tmuxinator"; license = licenses.mit; maintainers = with maintainers; [ auntie ericsagnes ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 9ffa89f5919..94cdcf56893 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -29,7 +29,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Manage tmux workspaces from JSON and YAML"; - homepage = https://tmuxp.git-pull.com/; + homepage = "https://tmuxp.git-pull.com/"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index e2d263817ee..4afa1781ac0 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -32,7 +32,7 @@ pythonPackages.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://github.com/0x776b7364/toggle.sg-download; + homepage = "https://github.com/0x776b7364/toggle.sg-download"; description = "Command-line tool to download videos from toggle.sg written in Python"; longDescription = '' toggle.sg requires SilverLight in order to view videos. This tool will diff --git a/pkgs/tools/misc/toilet/default.nix b/pkgs/tools/misc/toilet/default.nix index abc6933a777..c598b37897c 100644 --- a/pkgs/tools/misc/toilet/default.nix +++ b/pkgs/tools/misc/toilet/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Display large colourful characters in text mode"; - homepage = http://caca.zoy.org/wiki/toilet; + homepage = "http://caca.zoy.org/wiki/toilet"; license = licenses.wtfpl; maintainers = with maintainers; [ pSub ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index db1938160b3..39882b4e6e6 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.2.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "02rcgz1sklll0gpxjwb7y3jc6flzr4492qp72blra6a26qpb7vxp"; + sha256 = "0r42hrhd33kkkvii9h4896cmr319q728pdnhhamkhzgilvzxrwrz"; }; - cargoSha256 = "1kd4q2ddm5byf62xj923n140k9x89yf9yswwgsnvkbpvrnpl4mwj"; + cargoSha256 = "041djz3w7qmr19xq4cxgpw0m4qz2368q2wijw5aidvrxqlcz7xg2"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index b863786145c..ea2c07ec97b 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight implementation of some Unix command line utilities"; - homepage = https://landley.net/toybox/; + homepage = "https://landley.net/toybox/"; license = licenses.bsd0; platforms = with platforms; linux ++ darwin ++ freebsd; maintainers = with maintainers; [ hhm ]; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index ac8feaef275..141cceff24d 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -2,9 +2,8 @@ , python3Packages, substituteAll }: python3Packages.buildPythonApplication rec { - name = "trash-cli-${version}"; + pname = "trash-cli"; version = "0.17.1.14"; - namePrefix = ""; src = fetchFromGitHub { owner = "andreafrancia"; @@ -41,7 +40,7 @@ python3Packages.buildPythonApplication rec { checkPhase = "nosetests"; meta = with stdenv.lib; { - homepage = https://github.com/andreafrancia/trash-cli; + homepage = "https://github.com/andreafrancia/trash-cli"; description = "Command line tool for the desktop trash can"; maintainers = [ maintainers.rycee ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/ttf2pt1/default.nix b/pkgs/tools/misc/ttf2pt1/default.nix index 7142d346336..b7888f0884b 100644 --- a/pkgs/tools/misc/ttf2pt1/default.nix +++ b/pkgs/tools/misc/ttf2pt1/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf2pt1-3.4.4"; src = fetchurl { - url = mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz; + url = "mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz"; sha256 = "1l718n4k4widx49xz7qrj4mybzb8q67kp2jw7f47604ips4654mf"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "True Type to Postscript Type 3 converter, fpdf"; - homepage = http://ttf2pt1.sourceforge.net/index.html; + homepage = "http://ttf2pt1.sourceforge.net/index.html"; license = "ttf2pt1"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/misc/ttfautohint/default.nix b/pkgs/tools/misc/ttfautohint/default.nix index f82917239e6..502b829afce 100644 --- a/pkgs/tools/misc/ttfautohint/default.nix +++ b/pkgs/tools/misc/ttfautohint/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { new font where all glyphs are bytecode hinted using the information given by FreeType’s auto-hinting module. ''; - homepage = https://www.freetype.org/ttfautohint; + homepage = "https://www.freetype.org/ttfautohint"; license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause) maintainers = with maintainers; [ goibhniu ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/ttmkfdir/default.nix b/pkgs/tools/misc/ttmkfdir/default.nix index 4a2ab0d3475..d75011ea6f4 100644 --- a/pkgs/tools/misc/ttmkfdir/default.nix +++ b/pkgs/tools/misc/ttmkfdir/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ttf-mkfontdir-3.0.9-6"; src = fetchurl { - url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz; + url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9.orig.tar.gz"; sha256 = "0n6bmmndmp4c1myisvv7cby559gzgvwsw4rfw065a3f92m87jxiq"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { # who knows more about C/C++ .. patches = [ (fetchurl { - url = http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz; + url = "http://mirror.fsf.org/trisquel/pool/main/t/ttmkfdir/ttmkfdir_3.0.9-6.diff.gz"; sha256 = "141kxaf2by8nf87hqyszaxi0n7nnmswr1nh2i5r5bsvxxmaj9633"; }) diff --git a/pkgs/tools/misc/ttwatch/default.nix b/pkgs/tools/misc/ttwatch/default.nix index 5a2d1aaa427..afd5139565c 100644 --- a/pkgs/tools/misc/ttwatch/default.nix +++ b/pkgs/tools/misc/ttwatch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ryanbinns/ttwatch; + homepage = "https://github.com/ryanbinns/ttwatch"; description = "Linux TomTom GPS Watch Utilities"; maintainers = with maintainers; [ dotlambda ]; license = licenses.mit; diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index b261f0ef841..f6a312f0460 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/xorg62/tty-clock; + homepage = "https://github.com/xorg62/tty-clock"; license = licenses.free; description = "Digital clock in ncurses"; platforms = platforms.all; diff --git a/pkgs/tools/misc/ttylog/default.nix b/pkgs/tools/misc/ttylog/default.nix index 70856fba731..55785c7a211 100644 --- a/pkgs/tools/misc/ttylog/default.nix +++ b/pkgs/tools/misc/ttylog/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { - homepage = http://ttylog.sourceforge.net; + homepage = "http://ttylog.sourceforge.net"; description = "Simple serial port logger"; longDescription = '' A serial port logger which can be used to print everything to stdout diff --git a/pkgs/tools/misc/ttyplot/default.nix b/pkgs/tools/misc/ttyplot/default.nix index 45aa9ea5c0b..afa4cb3e155 100644 --- a/pkgs/tools/misc/ttyplot/default.nix +++ b/pkgs/tools/misc/ttyplot/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple general purpose plotting utility for tty with data input from stdin"; - homepage = https://github.com/tenox7/ttyplot; + homepage = "https://github.com/tenox7/ttyplot"; license = licenses.unlicense; maintainers = with maintainers; [ lassulus ]; }; diff --git a/pkgs/tools/misc/ttyrec/default.nix b/pkgs/tools/misc/ttyrec/default.nix index 799e397dace..97049276a32 100644 --- a/pkgs/tools/misc/ttyrec/default.nix +++ b/pkgs/tools/misc/ttyrec/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://0xcc.net/ttyrec/; + homepage = "http://0xcc.net/ttyrec/"; description = "Terminal interaction recorder and player"; license = licenses.bsd3; platforms = platforms.all; diff --git a/pkgs/tools/misc/txr/default.nix b/pkgs/tools/misc/txr/default.nix index a6b851e18ae..ce928f0a378 100644 --- a/pkgs/tools/misc/txr/default.nix +++ b/pkgs/tools/misc/txr/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming language for convenient data munging"; license = licenses.bsd2; - homepage = http://nongnu.org/txr; + homepage = "http://nongnu.org/txr"; maintainers = with stdenv.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 90f9559e6b7..c7d8837f823 100644 --- a/pkgs/tools/misc/txt2man/default.nix +++ b/pkgs/tools/misc/txt2man/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "Convert flat ASCII text to man page format"; - homepage = http://mvertes.free.fr/; + homepage = "http://mvertes.free.fr/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ bjornfor ]; diff --git a/pkgs/tools/misc/txtw/default.nix b/pkgs/tools/misc/txtw/default.nix index ab8256842ae..1cf80007901 100644 --- a/pkgs/tools/misc/txtw/default.nix +++ b/pkgs/tools/misc/txtw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Compute text widths"; - homepage = https://github.com/baskerville/txtw; + homepage = "https://github.com/baskerville/txtw"; maintainers = with maintainers; [ lihop ]; license = licenses.unlicense; platforms = platforms.linux; diff --git a/pkgs/tools/misc/uhubctl/default.nix b/pkgs/tools/misc/uhubctl/default.nix index a6fe1853ae5..0ed5d97ad7b 100644 --- a/pkgs/tools/misc/uhubctl/default.nix +++ b/pkgs/tools/misc/uhubctl/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, libusb +, libusb1 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1cgmwsf68g49k6q4jvz073bpjhg5p73kk1a4kbgkxmvx01gmbcmq"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb1 ]; installFlags = [ "prefix=${placeholder "out"}" ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix index dd9742293ac..923f6e7a3a4 100644 --- a/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/pkgs/tools/misc/ultrastar-creator/default.nix @@ -38,7 +38,7 @@ mkDerivation { meta = with lib; { description = "Ultrastar karaoke song creation tool"; - homepage = https://github.com/UltraStar-Deluxe/UltraStar-Creator; + homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Creator"; license = licenses.gpl2; maintainers = with maintainers; [ Profpatsch ]; }; diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix index 19d126d98f6..64221a92139 100644 --- a/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/pkgs/tools/misc/ultrastar-manager/default.nix @@ -114,7 +114,7 @@ in mkDerivation { meta = with lib; { description = "Ultrastar karaoke song manager"; - homepage = https://github.com/UltraStar-Deluxe/UltraStar-Manager; + homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Manager"; license = licenses.gpl2; maintainers = with maintainers; [ Profpatsch ]; }; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index 2b70848cbb8..25d92905bd8 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { UMLet runs stand-alone or as Eclipse plug-in on Windows, macOS and Linux. ''; - homepage = http://www.umlet.com; + homepage = "http://www.umlet.com"; license = licenses.gpl3; maintainers = with maintainers; [ geistesk ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix index 978a3d541ab..ef8e865e91f 100644 --- a/pkgs/tools/misc/unclutter/default.nix +++ b/pkgs/tools/misc/unclutter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "unclutter-8"; src = fetchurl { - url = https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz; + url = "https://www.ibiblio.org/pub/X11/contrib/utilities/unclutter-8.tar.gz"; sha256 = "33a78949a7dedf2e8669ae7b5b2c72067896497820292c96afaa60bb71d1f2a6"; }; diff --git a/pkgs/tools/misc/unicode/default.nix b/pkgs/tools/misc/unicode/default.nix index 9ace1f137b8..c4ae9cc5e36 100644 --- a/pkgs/tools/misc/unicode/default.nix +++ b/pkgs/tools/misc/unicode/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, python3Packages }: python3Packages.buildPythonApplication rec { - name = "unicode-${version}"; + pname = "unicode"; version = "2.6"; src = fetchFromGitHub { @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { }; ucdtxt = fetchurl { - url = http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt; + url = "http://www.unicode.org/Public/11.0.0/ucd/UnicodeData.txt"; sha256 = "16b0jzvvzarnlxdvs2izd5ia0ipbd87md143dc6lv6xpdqcs75s9"; }; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Display unicode character properties"; - homepage = https://github.com/garabik/unicode; + homepage = "https://github.com/garabik/unicode"; license = licenses.gpl3; maintainers = [ maintainers.woffs ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/units/default.nix b/pkgs/tools/misc/units/default.nix index 8bea94770ba..d62f10daeea 100644 --- a/pkgs/tools/misc/units/default.nix +++ b/pkgs/tools/misc/units/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Unit conversion tool"; - homepage = https://www.gnu.org/software/units/; + homepage = "https://www.gnu.org/software/units/"; license = [ licenses.gpl3Plus ]; platforms = platforms.all; maintainers = [ maintainers.vrthra ]; diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix index b3937175604..1e3378305d9 100644 --- a/pkgs/tools/misc/up/default.nix +++ b/pkgs/tools/misc/up/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; - homepage = https://github.com/akavel/up; + homepage = "https://github.com/akavel/up"; maintainers = with maintainers; [ ma27 ]; license = licenses.asl20; }; diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 865fd4f44f8..67b25eaca82 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = { description = "Enhanced, modern tool for communicating over JTAG with flash chips, CPUs,and many more"; - homepage = http://urjtag.org/; + 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 ]; diff --git a/pkgs/tools/misc/usbmuxd/default.nix b/pkgs/tools/misc/usbmuxd/default.nix index 5935710164c..1c1da7597e7 100644 --- a/pkgs/tools/misc/usbmuxd/default.nix +++ b/pkgs/tools/misc/usbmuxd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/libimobiledevice/usbmuxd; + homepage = "https://github.com/libimobiledevice/usbmuxd"; description = "A socket daemon to multiplex connections from and to iOS devices"; longDescription = '' usbmuxd stands for "USB multiplexing daemon". This daemon is in charge of diff --git a/pkgs/tools/misc/uucp/default.nix b/pkgs/tools/misc/uucp/default.nix index 0fae40a5c96..1516e9dba33 100644 --- a/pkgs/tools/misc/uucp/default.nix +++ b/pkgs/tools/misc/uucp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { just found one of the finest UUCP implementations available. ''; - homepage = https://www.gnu.org/software/uucp/uucp.html; + homepage = "https://www.gnu.org/software/uucp/uucp.html"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/misc/uudeview/default.nix b/pkgs/tools/misc/uudeview/default.nix index 3e8b7d494de..a8495d7767c 100644 --- a/pkgs/tools/misc/uudeview/default.nix +++ b/pkgs/tools/misc/uudeview/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "The Nice and Friendly Decoder"; - homepage = http://www.fpx.de/fp/Software/UUDeview/; + homepage = "http://www.fpx.de/fp/Software/UUDeview/"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ woffs ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 9c58785e84e..f18deb0c83d 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage { [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] ++ lib.optional (prefix != null) [ "PROG_PREFIX=${prefix}" ]; - nativeBuildInputs = [ cmake ]; - buildInputs = [ cargo sphinx ] ++ lib.optional stdenv.isDarwin Security; + nativeBuildInputs = [ cmake cargo sphinx ]; + buildInputs = lib.optional stdenv.isDarwin Security; # empty {build,install}Phase to use defaults of `stdenv.mkDerivation` rather than rust defaults buildPhase = ""; @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage { uutils is an attempt at writing universal (as in cross-platform) CLI utils in Rust. This repo is to aggregate the GNU coreutils rewrites. ''; - homepage = https://github.com/uutils/coreutils; + homepage = "https://github.com/uutils/coreutils"; maintainers = with maintainers; [ ]; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/misc/vcs_query/default.nix b/pkgs/tools/misc/vcs_query/default.nix index a39619f354b..da42b35391b 100644 --- a/pkgs/tools/misc/vcs_query/default.nix +++ b/pkgs/tools/misc/vcs_query/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/mageta/vcs_query; + homepage = "https://github.com/mageta/vcs_query"; description = "eMail query-command to use vCards in mutt and Vim"; license = licenses.mit; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 52eec555b16..ecf87b7c0a5 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -20,7 +20,8 @@ python3Packages.buildPythonApplication rec { inherit src; sourceRoot = "source/rust"; cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; - buildInputs = [ pkgconfig openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; }; propagatedBuildInputs = with python3Packages; [ @@ -65,7 +66,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pimutils/vdirsyncer; + homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; maintainers = with maintainers; [ matthiasbeyer gebner ]; license = licenses.mit; diff --git a/pkgs/tools/misc/vdirsyncer/stable.nix b/pkgs/tools/misc/vdirsyncer/stable.nix index ac950894035..d3fe47001d1 100644 --- a/pkgs/tools/misc/vdirsyncer/stable.nix +++ b/pkgs/tools/misc/vdirsyncer/stable.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { patches = [ # Fixes for hypothesis: https://github.com/pimutils/vdirsyncer/pull/779 (fetchpatch { - url = https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch; + url = "https://github.com/pimutils/vdirsyncer/commit/22ad88a6b18b0979c5d1f1d610c1d2f8f87f4b89.patch"; sha256 = "0dbzj6jlxhdidnm3i21a758z83sdiwzhpd45pbkhycfhgmqmhjpl"; }) ]; @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with lib; { - homepage = https://github.com/pimutils/vdirsyncer; + homepage = "https://github.com/pimutils/vdirsyncer"; description = "Synchronize calendars and contacts"; license = licenses.mit; maintainers = with maintainers; [ loewenheim ]; diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 17e764698d5..c441242885e 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -21,7 +21,8 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "1al8jzjxjhxwb5n1d52pvl59d11g0bdg2dcw8ir2nclya1w68f2w"; - buildInputs = [ openssl pkg-config protobuf rdkafka ] + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl protobuf rdkafka ] ++ stdenv.lib.optional stdenv.isDarwin [ Security libiconv ]; # needed for internal protobuf c wrapper library diff --git a/pkgs/tools/misc/venus/default.nix b/pkgs/tools/misc/venus/default.nix index 534a500c7bc..944b6e4ef64 100644 --- a/pkgs/tools/misc/venus/default.nix +++ b/pkgs/tools/misc/venus/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { feeds published by web sites and aggregates their content together into a single combined feed, latest news first. ''; - homepage = http://intertwingly.net/code/venus/docs/index.html; + homepage = "http://intertwingly.net/code/venus/docs/index.html"; license = stdenv.lib.licenses.psfl; platforms = stdenv.lib.platforms.all; maintainers = []; diff --git a/pkgs/tools/misc/vimer/default.nix b/pkgs/tools/misc/vimer/default.nix index 7f81774aebe..5bef80adcaf 100644 --- a/pkgs/tools/misc/vimer/default.nix +++ b/pkgs/tools/misc/vimer/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/susam/vimer; + homepage = "https://github.com/susam/vimer"; description = '' A convenience wrapper for gvim/mvim --remote(-tab)-silent to open files in an existing instance of GVim or MacVim. diff --git a/pkgs/tools/misc/vimwiki-markdown/default.nix b/pkgs/tools/misc/vimwiki-markdown/default.nix index 241da2acbb4..b85bb087660 100644 --- a/pkgs/tools/misc/vimwiki-markdown/default.nix +++ b/pkgs/tools/misc/vimwiki-markdown/default.nix @@ -6,12 +6,12 @@ }: buildPythonApplication rec { - version = "0.2.0"; + version = "0.3.0"; pname = "vimwiki-markdown"; src = fetchPypi { inherit version pname; - sha256 = "0k7srlglhq4bm85kgd5ismslrk1fk8v16mm41a8k0kmcr9k4vi4a"; + sha256 = "1icfnc623f9pyn59wgb76g0fnsx41s87q69x354qy17gw23bxabx"; }; propagatedBuildInputs= [ @@ -21,7 +21,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Vimwiki markdown plugin"; - homepage = https://github.com/WnP/vimwiki_markdown; + homepage = "https://github.com/WnP/vimwiki_markdown"; license = licenses.mit; maintainers = with maintainers; [ seqizz ]; }; diff --git a/pkgs/tools/misc/vivid/default.nix b/pkgs/tools/misc/vivid/default.nix index 1696a54d0aa..c8831a6fca5 100644 --- a/pkgs/tools/misc/vivid/default.nix +++ b/pkgs/tools/misc/vivid/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A generator for LS_COLORS with support for multiple color themes"; - homepage = https://github.com/sharkdp/vivid; + homepage = "https://github.com/sharkdp/vivid"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = [ maintainers.dtzWill ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/vmtouch/default.nix b/pkgs/tools/misc/vmtouch/default.nix index 6397a093347..0f46d8141f1 100644 --- a/pkgs/tools/misc/vmtouch/default.nix +++ b/pkgs/tools/misc/vmtouch/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { 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/; + homepage = "https://hoytech.com/vmtouch/"; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.garrison ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/misc/void/default.nix b/pkgs/tools/misc/void/default.nix index f71151259c8..f9805531f86 100644 --- a/pkgs/tools/misc/void/default.nix +++ b/pkgs/tools/misc/void/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Terminal-based personal organizer"; - homepage = https://github.com/spacejam/void; + homepage = "https://github.com/spacejam/void"; license = licenses.gpl3; maintainers = with maintainers; [ spacekookie ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/vorbisgain/default.nix b/pkgs/tools/misc/vorbisgain/default.nix index 90b721ad58a..fdb283d4dce 100644 --- a/pkgs/tools/misc/vorbisgain/default.nix +++ b/pkgs/tools/misc/vorbisgain/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sjeng.org/vorbisgain.html; + homepage = "https://sjeng.org/vorbisgain.html"; description = "A utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/wacomtablet/default.nix b/pkgs/tools/misc/wacomtablet/default.nix index d0fbcecf027..aa631d44114 100644 --- a/pkgs/tools/misc/wacomtablet/default.nix +++ b/pkgs/tools/misc/wacomtablet/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { This module implements a GUI for the Wacom Linux Drivers and extends it with profile support to handle different button / pen layouts per profile. ''; - homepage = https://cgit.kde.org/wacomtablet.git/about/; + homepage = "https://cgit.kde.org/wacomtablet.git/about/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.Thra11 ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/misc/wagyu/default.nix b/pkgs/tools/misc/wagyu/default.nix index f21db2c4b4f..8ed952a82ce 100644 --- a/pkgs/tools/misc/wagyu/default.nix +++ b/pkgs/tools/misc/wagyu/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Rust library for generating cryptocurrency wallets"; - homepage = https://github.com/ArgusHQ/wagyu; + homepage = "https://github.com/ArgusHQ/wagyu"; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.offline ]; }; diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index eede909ddce..1c626785483 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Executes commands in response to file modifications"; - homepage = https://github.com/watchexec/watchexec; + homepage = "https://github.com/watchexec/watchexec"; license = with licenses; [ asl20 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/misc/wl-clipboard/default.nix b/pkgs/tools/misc/wl-clipboard/default.nix index 349d910dafc..66a61378557 100644 --- a/pkgs/tools/misc/wl-clipboard/default.nix +++ b/pkgs/tools/misc/wl-clipboard/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command-line copy/paste utilities for Wayland"; - homepage = https://github.com/bugaevc/wl-clipboard; + homepage = "https://github.com/bugaevc/wl-clipboard"; license = licenses.gpl3; maintainers = with maintainers; [ dywedir ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index a61434d2102..4c235b4866f 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create bootable USB disks from Windows ISO images"; - homepage = https://github.com/slacka/WoeUSB; + homepage = "https://github.com/slacka/WoeUSB"; license = licenses.gpl3; maintainers = with maintainers; [ bjornfor gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/woof/default.nix b/pkgs/tools/misc/woof/default.nix index fa3ab747f64..e00634dd53e 100644 --- a/pkgs/tools/misc/woof/default.nix +++ b/pkgs/tools/misc/woof/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.home.unix-ag.org/simon/woof.html; + 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; diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix index e88322f7f75..00cfd27d2e8 100644 --- a/pkgs/tools/misc/wootility/default.nix +++ b/pkgs/tools/misc/wootility/default.nix @@ -2,14 +2,14 @@ let pname = "wootility"; - version = "3.3.3"; + version = "3.4.6"; in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-linux-latest/wootility-${version}.AppImage"; - sha256 = "1qdiacwnvqahqkrhwnblz0jjywn63c6ndl3z450myhx5x55fdcja"; + sha256 = "02ivbgnzr657iqb9hviaylmsym2kki2c84xmqfix3b0awsphn05q"; }; profile = '' @@ -23,7 +23,7 @@ appimageTools.wrapType2 rec { extraInstallCommands = "mv $out/bin/{${name},${pname}}"; meta = with lib; { - homepage = https://wooting.io/wootility; + homepage = "https://wooting.io/wootility"; description = "Wootility is customization and management software for Wooting keyboards."; platforms = [ "x86_64-linux" ]; license = "unknown"; diff --git a/pkgs/tools/misc/wv2/default.nix b/pkgs/tools/misc/wv2/default.nix index b9a8f70ff71..abac98d855f 100644 --- a/pkgs/tools/misc/wv2/default.nix +++ b/pkgs/tools/misc/wv2/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "Excellent MS Word filter lib, used in most Office suites"; license = stdenv.lib.licenses.lgpl2; - homepage = http://wvware.sourceforge.net; + homepage = "http://wvware.sourceforge.net"; }; } diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index 6a5ec867222..e1c4e4fd2fc 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { flashy GUI dialogs. Rather, Wyrd is designed to make you more efficient at editing your reminder files directly. ''; - homepage = http://pessimization.com/software/wyrd/; - downloadPage = http://pessimization.com/software/wyrd/; + homepage = "http://pessimization.com/software/wyrd/"; + downloadPage = "http://pessimization.com/software/wyrd/"; license = licenses.gpl2; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/x11idle/default.nix b/pkgs/tools/misc/x11idle/default.nix index ac13f41ef9f..5e64137cbf6 100644 --- a/pkgs/tools/misc/x11idle/default.nix +++ b/pkgs/tools/misc/x11idle/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { longDescription = '' Idle time passes when the user does not act, i.e. when the user doesn't move the mouse or use the keyboard. ''; - homepage = https://orgmode.org/; + homepage = "https://orgmode.org/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.swflint ]; diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 62e2b31fa15..48045999329 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { inherit version; src = fetchgit { - url = git://projects.qi-hardware.com/xburst-tools.git; + url = "git://projects.qi-hardware.com/xburst-tools.git"; rev = "c71ce8e15db25fe49ce8702917cb17720882e341"; sha256 = "1hzdngs1l5ivvwnxjwzc246am6w1mj1aidcf0awh9yw0crzcjnjr"; }; @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = "Qi tools to access the Ben Nanonote USB_BOOT mode"; license = stdenv.lib.licenses.gpl3; - homepage = http://www.linux-mtd.infradead.org/; + homepage = "http://www.linux-mtd.infradead.org/"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = stdenv.lib.platforms.x86_64; }; diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 69009b86af8..c1a015d3c09 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; - homepage = https://github.com/astrand/xclip; + homepage = "https://github.com/astrand/xclip"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 28268052826..3950e6bee28 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin rycee ]; platforms = with platforms; linux ++ freebsd; license = licenses.free; #TODO BSD on Gentoo, looks like MIT - downloadPage = http://www.jwz.org/xdaliclock/; + downloadPage = "http://www.jwz.org/xdaliclock/"; }; } diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix index 77a2ef763a9..f9928b6f140 100644 --- a/pkgs/tools/misc/xdo/default.nix +++ b/pkgs/tools/misc/xdo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small X utility to perform elementary actions on windows"; - homepage = https://github.com/baskerville/xdo; + homepage = "https://github.com/baskerville/xdo"; maintainers = with maintainers; [ meisternu ]; license = licenses.bsd2; platforms = platforms.linux; diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix index b6801130a45..00f1899f97a 100644 --- a/pkgs/tools/misc/xdxf2slob/default.nix +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Tool to convert XDXF dictionary files to slob format"; - homepage = https://github.com/itkach/xdxf2slob/; + homepage = "https://github.com/itkach/xdxf2slob/"; license = licenses.gpl3; maintainers = [ maintainers.rycee ]; platforms = platforms.all; diff --git a/pkgs/tools/misc/xflux/default.nix b/pkgs/tools/misc/xflux/default.nix index d0f35844695..adc3b87ffa7 100644 --- a/pkgs/tools/misc/xflux/default.nix +++ b/pkgs/tools/misc/xflux/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "xflux-2013-09-01"; src = fetchurl { - url = https://justgetflux.com/linux/xflux64.tgz; + url = "https://justgetflux.com/linux/xflux64.tgz"; sha256 = "cc50158fabaeee58c331f006cc1c08fd2940a126e99d37b76c8e878ef20c2021"; }; @@ -31,7 +31,7 @@ stdenv.mkDerivation { when the sun sets, and then changes it back its colder temperature when the sun rises. ''; - homepage = https://justgetflux.com/; + homepage = "https://justgetflux.com/"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.paholg ]; diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 6a629af61ba..03a458e818d 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { meta = { description = "Better lighting for Linux. Open source GUI for xflux"; - homepage = https://justgetflux.com/linux.html; + 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; diff --git a/pkgs/tools/misc/xfstests/default.nix b/pkgs/tools/misc/xfstests/default.nix index 20405991331..5f6d2bb1278 100644 --- a/pkgs/tools/misc/xfstests/default.nix +++ b/pkgs/tools/misc/xfstests/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Torture test suite for filesystems"; - homepage = https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/; + homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/xiccd/default.nix b/pkgs/tools/misc/xiccd/default.nix index 43a67406970..82759441a46 100644 --- a/pkgs/tools/misc/xiccd/default.nix +++ b/pkgs/tools/misc/xiccd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "X color profile daemon"; - homepage = https://github.com/agalakhov/xiccd; + homepage = "https://github.com/agalakhov/xiccd"; license = licenses.gpl3; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/xmonad-log/default.nix b/pkgs/tools/misc/xmonad-log/default.nix index ad5086f2f59..5dfbcdfad74 100644 --- a/pkgs/tools/misc/xmonad-log/default.nix +++ b/pkgs/tools/misc/xmonad-log/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "xmonad DBus monitoring solution"; - homepage = https://github.com/xintron/xmonad-log; + homepage = "https://github.com/xintron/xmonad-log"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ joko ]; diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index 4c39babc317..aea86eda9cb 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Command-line program for getting and setting the contents of the X selection"; - homepage = http://www.kfish.org/software/xsel; + homepage = "http://www.kfish.org/software/xsel"; license = licenses.mit; maintainers = [ maintainers.cstrahan ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 84cf506fb63..2c24e627b63 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Outputs X window titles"; - homepage = https://github.com/baskerville/xtitle; + homepage = "https://github.com/baskerville/xtitle"; maintainers = [ stdenv.lib.maintainers.meisternu ]; license = "Custom"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index d6adbde5ea9..889ab823a9c 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -4,7 +4,7 @@ let xvfb_run = fetchurl { name = "xvfb-run"; # https://git.archlinux.org/svntogit/packages.git/?h=packages/xorg-server - url = https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/xvfb-run?h=packages/xorg-server&id=9cb733cefa92af3fca608fb051d5251160c9bbff"; sha256 = "1307mz4nr8ga3qz73i8hbcdphky75rq8lrvfk2zm4kmv6pkbk611"; }; in diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index d6b1b423ae2..d00d737c17c 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yad"; - version = "5.0"; + version = "6.0"; src = fetchFromGitHub { owner = "v1cont"; repo = "yad"; rev = "v${version}"; - sha256 = "07rd61hvilsxxrj7lf8c9k0a8glj07s48m7ya8d45030r90g3lvc"; + sha256 = "07myjv0g0iwgclc6q9wkj25myhlc86ahy2lqma8vgv9i3rgy03p7"; }; configureFlags = [ @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/yad-dialog/; + homepage = "https://sourceforge.net/projects/yad-dialog/"; description = "GUI dialog tool for shell scripts"; longDescription = '' Yad (yet another dialog) is a GUI dialog tool for shell scripts. It is a diff --git a/pkgs/tools/misc/yank/default.nix b/pkgs/tools/misc/yank/default.nix index 9fb5399fd72..6111a0f9870 100644 --- a/pkgs/tools/misc/yank/default.nix +++ b/pkgs/tools/misc/yank/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { makeFlags = [ "YANKCMD=${xsel}/bin/xsel" ]; meta = with stdenv.lib; { - homepage = https://github.com/mptre/yank; + homepage = "https://github.com/mptre/yank"; description = "Yank terminal output to clipboard"; longDescription = '' Read input from stdin and display a selection interface that allows a diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index e106c3b8595..d3374302546 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "Downloads videos from Yle (Finnish Broadcasting Company) servers"; - homepage = https://aajanki.github.io/yle-dl/; + homepage = "https://aajanki.github.io/yle-dl/"; license = licenses.gpl3; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/you-get/default.nix b/pkgs/tools/misc/you-get/default.nix index ab1a3e66825..74599dc7d1e 100644 --- a/pkgs/tools/misc/you-get/default.nix +++ b/pkgs/tools/misc/you-get/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "you-get"; - version = "0.4.1410"; + version = "0.4.1432"; # Tests aren't packaged, but they all hit the real network so # probably aren't suitable for a build environment anyway. @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0isjmx1z5w3m2v25sb7fpi7lyd4h8bl9n9691ylvl5w3bxf6ynm9"; + sha256 = "0i3gsl7wk1cn8jw79gnyv58mrrn0hmkvymrd3ic67z2ackp726s2"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/yubico-piv-tool/default.nix b/pkgs/tools/misc/yubico-piv-tool/default.nix index 39150cfed7e..07f186e3322 100644 --- a/pkgs/tools/misc/yubico-piv-tool/default.nix +++ b/pkgs/tools/misc/yubico-piv-tool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-backend=${if withApplePCSC then "macscard" else "pcsc"}" ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubico-piv-tool/; + homepage = "https://developers.yubico.com/yubico-piv-tool/"; description = '' Used for interacting with the Privilege and Identification Card (PIV) application on a YubiKey diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 7fa0e70cd2e..8ebbe75d686 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with lib; { inherit version; description = "Cross-platform application for configuring any YubiKey over all USB interfaces."; - homepage = https://developers.yubico.com/yubikey-manager-qt/; + homepage = "https://developers.yubico.com/yubikey-manager-qt/"; license = licenses.bsd2; maintainers = [ maintainers.cbley ]; platforms = platforms.linux; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index ee555637474..4740b3ac55f 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = https://developers.yubico.com/yubikey-manager; + homepage = "https://developers.yubico.com/yubikey-manager"; description = "Command line tool for configuring any YubiKey over all USB transports."; license = licenses.bsd2; diff --git a/pkgs/tools/misc/yubikey-neo-manager/default.nix b/pkgs/tools/misc/yubikey-neo-manager/default.nix index acc0bac04ff..cb37ae24928 100644 --- a/pkgs/tools/misc/yubikey-neo-manager/default.nix +++ b/pkgs/tools/misc/yubikey-neo-manager/default.nix @@ -19,7 +19,7 @@ python27Packages.buildPythonPackage rec { ]; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubikey-neo-manager; + homepage = "https://developers.yubico.com/yubikey-neo-manager"; description = "Cross platform personalization tool for the YubiKey NEO"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/yubikey-personalization-gui/default.nix b/pkgs/tools/misc/yubikey-personalization-gui/default.nix index 59685aa721a..96e7024f7a7 100644 --- a/pkgs/tools/misc/yubikey-personalization-gui/default.nix +++ b/pkgs/tools/misc/yubikey-personalization-gui/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubikey-personalization-gui; + homepage = "https://developers.yubico.com/yubikey-personalization-gui"; description = "A QT based cross-platform utility designed to facilitate reconfiguration of the Yubikey"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index c20fe68b7b2..41cb53d9d3b 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://developers.yubico.com/yubikey-personalization; + homepage = "https://developers.yubico.com/yubikey-personalization"; description = "A library and command line tool to personalize YubiKeys"; license = licenses.bsd2; platforms = platforms.unix; diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index 9502af65201..a43d41637b1 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, fzf }: +{ lib +, fetchFromGitHub +, rustPlatform +, fzf +}: rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.2.2"; + version = "0.3.1"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "0s6aax6bln9jmmv7kw630mj0l6qpvdx8mdk3a5d9akr9d23zxmr5"; + sha256 = "1sad18d0pxfdy9gvjmixzgdskg1l7djvzp0aipx7pz0lyi6gs23z"; }; buildInputs = [ fzf ]; - cargoSha256 = "1gzpkf7phl5xd666l7pc25917x4qq0kkxk4i9dkz3lvxz3v8ylrz"; + cargoSha256 = "1sx3s1jnfxylbjr3x6v6j8a6zkl7hfyj4alzlyrsw36b1b64pwqm"; - meta = with stdenv.lib; { + meta = with lib; { description = "A fast cd command that learns your habits"; homepage = "https://github.com/ajeetdsouza/zoxide"; license = with licenses; [ mit ]; diff --git a/pkgs/tools/misc/zsh-autoenv/default.nix b/pkgs/tools/misc/zsh-autoenv/default.nix index 4b19331f392..c44837b877d 100644 --- a/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/pkgs/tools/misc/zsh-autoenv/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { It handles "enter" and "leave" events, nesting, and stashing of variables (overwriting and restoring). ''; - homepage = https://github.com/Tarrasch/zsh-autoenv; + homepage = "https://github.com/Tarrasch/zsh-autoenv"; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/tools/misc/zsh-navigation-tools/default.nix b/pkgs/tools/misc/zsh-navigation-tools/default.nix index be64ff47e6b..86dd990cd74 100644 --- a/pkgs/tools/misc/zsh-navigation-tools/default.nix +++ b/pkgs/tools/misc/zsh-navigation-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Curses-based tools for ZSH"; - homepage = https://github.com/psprint/zsh-navigation-tools; + homepage = "https://github.com/psprint/zsh-navigation-tools"; license = licenses.gpl3; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/tools/networking/ahcpd/default.nix b/pkgs/tools/networking/ahcpd/default.nix index 4b03c3cf278..0789b37c65a 100644 --- a/pkgs/tools/networking/ahcpd/default.nix +++ b/pkgs/tools/networking/ahcpd/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/ahcp/; + 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; diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index e1b5f982727..fe07d203607 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wireless encryption cracking tools"; - homepage = http://www.aircrack-ng.org/; + homepage = "http://www.aircrack-ng.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ domenkozar ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/airfield/default.nix b/pkgs/tools/networking/airfield/default.nix index a31bc57904d..d08996eb13f 100644 --- a/pkgs/tools/networking/airfield/default.nix +++ b/pkgs/tools/networking/airfield/default.nix @@ -63,7 +63,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A web-interface for hipache-proxy"; license = licenses.mit; - homepage = https://github.com/emblica/airfield; + homepage = "https://github.com/emblica/airfield"; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/airfield/node-packages.nix b/pkgs/tools/networking/airfield/node-packages.nix index fe93f449b03..9a246fa319b 100644 --- a/pkgs/tools/networking/airfield/node-packages.nix +++ b/pkgs/tools/networking/airfield/node-packages.nix @@ -694,7 +694,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Template engine consolidation library"; - homepage = https://github.com/visionmedia/consolidate.js; + homepage = "https://github.com/visionmedia/consolidate.js"; }; production = true; bypassCache = true; @@ -717,7 +717,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A high performance Redis client."; - homepage = https://github.com/NodeRedis/node-redis; + homepage = "https://github.com/NodeRedis/node-redis"; license = "MIT"; }; production = true; @@ -753,7 +753,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Higher-order functions and common patterns for asynchronous code"; - homepage = https://caolan.github.io/async/; + homepage = "https://caolan.github.io/async/"; license = "MIT"; }; production = true; @@ -826,4 +826,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 348104e9591..93b2aba5dbf 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "amass"; - version = "3.5.1"; + version = "3.5.4"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1lir0j6av5zl1jb3513cf7mlrydgnsvy0chn5ihg1fvbdiv5lww9"; + sha256 = "0sxcyrlgqajmlsicr4j2b8hq2fzw8ai1xsq176bz0f33q9m9wvhf"; }; - modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl"; + modSha256 = "1yjvwkm2zaf017lai5xl088x1z1ifwsbw56dagyf8z9jk9lhkcj7"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/argus-clients/default.nix b/pkgs/tools/networking/argus-clients/default.nix index 08db7b4f58d..a1ff30faff3 100644 --- a/pkgs/tools/networking/argus-clients/default.nix +++ b/pkgs/tools/networking/argus-clients/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Operations, Performance and Security Management. If you need to know what is going on in your network, right now or historically, you will find Argus a useful tool. ''; - homepage = http://qosient.com/argus; + homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/argus/default.nix b/pkgs/tools/networking/argus/default.nix index bb9abccc933..32c6c785fa5 100644 --- a/pkgs/tools/networking/argus/default.nix +++ b/pkgs/tools/networking/argus/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Operations, Performance and Security Management. If you need to know what is going on in your network, right now or historically, you will find Argus a useful tool. ''; - homepage = http://qosient.com/argus; + homepage = "http://qosient.com/argus"; license = licenses.gpl2Plus; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 0b4d77881b4..6c596e77af8 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://aria2.github.io; + homepage = "https://aria2.github.io"; description = "A lightweight, multi-protocol, multi-source, command-line download utility"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/networking/arpoison/default.nix b/pkgs/tools/networking/arpoison/default.nix index cedd8597870..eac2f380d15 100644 --- a/pkgs/tools/networking/arpoison/default.nix +++ b/pkgs/tools/networking/arpoison/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UNIX arp cache update utility"; - homepage = http://www.arpoison.net/; + homepage = "http://www.arpoison.net/"; license = with licenses; [ gpl2 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index bfb1abaeaf2..9d4230524be 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Advanced SSH config - Regex, aliases, gateways, includes and dynamic hosts"; - homepage = https://github.com/moul/advanced-ssh-config; + homepage = "https://github.com/moul/advanced-ssh-config"; license = licenses.mit; maintainers = with maintainers; [ zzamboni ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/networking/asynk/default.nix b/pkgs/tools/networking/asynk/default.nix index 4d069a7e6d7..b37f2133501 100644 --- a/pkgs/tools/networking/asynk/default.nix +++ b/pkgs/tools/networking/asynk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://asynk.io/; + homepage = "http://asynk.io/"; description = "Flexible contacts synchronization program"; license = licenses.agpl3; maintainers = [ ]; diff --git a/pkgs/tools/networking/atinout/default.nix b/pkgs/tools/networking/atinout/default.nix index 16b3ee668da..fcd48564da0 100644 --- a/pkgs/tools/networking/atinout/default.nix +++ b/pkgs/tools/networking/atinout/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://atinout.sourceforge.net; + homepage = "http://atinout.sourceforge.net"; description = "Tool for talking to modems"; platforms = platforms.unix; license = licenses.gpl3; diff --git a/pkgs/tools/networking/autossh/default.nix b/pkgs/tools/networking/autossh/default.nix index 55b464607b1..f89302c4295 100644 --- a/pkgs/tools/networking/autossh/default.nix +++ b/pkgs/tools/networking/autossh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.harding.motd.ca/autossh/; + homepage = "https://www.harding.motd.ca/autossh/"; description = "Automatically restart SSH sessions and tunnels"; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 161148f4627..3f5a7612d16 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "axel"; - version = "2.17.7"; + version = "2.17.8"; src = fetchFromGitHub { owner = "axel-download-accelerator"; repo = pname; rev = "v${version}"; - sha256 = "0z20d2fkf69v35d4pkba95vnk7yq7393kwikmb64y7cjyz4m2ngk"; + sha256 = "05hispf152ywlf7i29cc7alxal8lc7lfzx82r42zncdb9v78pdc8"; }; nativeBuildInputs = [ autoreconfHook pkgconfig autoconf-archive txt2man ]; diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index 5fccd9c0ebc..a2f486717da 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { passthru.tests.babeld = nixosTests.babeld; meta = { - homepage = http://www.pps.univ-paris-diderot.fr/~jch/software/babel/; + 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 ]; diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 1cee7ecdc21..7522b1629cc 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0vg2fkjksjysm5ckdlfswg8w7f52wkh417l7k96hghg9ni4yz575"; + sha256 = "0xcn65j2q2pmbvrd5dkjg8anw1r12vizazr1wz4cinhrpsxx8p1p"; }; - cargoSha256 = "1cyra3mqxpi3m1gqrc5dmjykpsw6swq695dsqirhgb6qxcclxw7p"; + cargoSha256 = "16nkmmkla3dlz40qhy04sknm3p2f5qik0ijczcw5ibg5w1jsydfr"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix index 3c84de29bf1..a6f66ea10fc 100644 --- a/pkgs/tools/networking/bgpdump/default.nix +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib bzip2 ]; meta = { - homepage = https://bitbucket.org/ripencc/bgpdump/; + 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 ]; diff --git a/pkgs/tools/networking/bgpq3/default.nix b/pkgs/tools/networking/bgpq3/default.nix new file mode 100644 index 00000000000..e3d2218b0c9 --- /dev/null +++ b/pkgs/tools/networking/bgpq3/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "bgpq3"; + version = "0.1.35"; + + src = fetchFromGitHub { + owner = "snar"; + repo = pname; + rev = "v${version}"; + sha256 = "0fd5a3krq0i906m0iivgphiqq88cw6c0w1q4n7lmzyq9201mb8wj"; + }; + + # Fix binary install location. Remove with next upstream release. + preInstall = "mkdir -p $out/bin"; + + meta = with stdenv.lib; { + description = "bgp filtering automation tool"; + homepage = "https://github.com/snar/bgpq3"; + license = licenses.bsd2; + maintainers = with maintainers; [ b4dm4n ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/networking/boringtun/default.nix b/pkgs/tools/networking/boringtun/default.nix index 59654501a39..7c322638712 100644 --- a/pkgs/tools/networking/boringtun/default.nix +++ b/pkgs/tools/networking/boringtun/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "boringtun"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = pname; rev = "v${version}"; - sha256 = "1mijy51hd8c4as9g4ivpfxismc9m5m3nhibfvclh3wrlcmp1ha9c"; + sha256 = "0b57c7z87xwrirmq9aa9jswqyj5bavkifmq7a9hgfphcmwcskmdb"; }; - cargoSha256 = "1kbbkbrfjff4yicwanydmcjr2av6s6wrsgafpvbh255vvkd7mr6x"; + cargoSha256 = "0bms93xg75b23ls2hb8dv26y4al4nr67pqcm57rp9d4rbsfafg8c"; buildInputs = stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Userspace WireGuard® implementation in Rust"; - homepage = https://github.com/cloudflare/boringtun; + homepage = "https://github.com/cloudflare/boringtun"; license = licenses.bsd3; maintainers = with maintainers; [ xrelkd marsam ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index 48da63ae855..b70eb080a7a 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/txthinking/brook; + homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; license = with licenses; [ gpl3 ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/bukubrow/default.nix b/pkgs/tools/networking/bukubrow/default.nix index 2c97e1a17dc..944fccb0ec5 100644 --- a/pkgs/tools/networking/bukubrow/default.nix +++ b/pkgs/tools/networking/bukubrow/default.nix @@ -40,7 +40,7 @@ in rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Bukubrow is a WebExtension for Buku, a command-line bookmark manager"; - homepage = https://github.com/SamHH/bukubrow-host; + homepage = "https://github.com/SamHH/bukubrow-host"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/tools/networking/bully/default.nix b/pkgs/tools/networking/bully/default.nix index 46bac3d5b5b..c9512392347 100644 --- a/pkgs/tools/networking/bully/default.nix +++ b/pkgs/tools/networking/bully/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Retrieve WPA/WPA2 passphrase from a WPS enabled access point"; - homepage = https://github.com/aanarchyy/bully; + homepage = "https://github.com/aanarchyy/bully"; maintainers = with maintainers; [ edwtjo ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index ebb46dfed7e..e8caddcbe29 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { initial mapping and analysis of an application's attack surface, through to finding and exploiting security vulnerabilities. ''; - homepage = https://portswigger.net/burp/; + homepage = "https://portswigger.net/burp/"; downloadPage = "https://portswigger.net/burp/freedownload"; license = [ stdenv.lib.licenses.unfree ]; platforms = jre.meta.platforms; diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 8e766cdeeb5..ae3edf7dcea 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A small and simple console-based live network and disk io bandwidth monitor"; - homepage = http://www.gropp.org/?id=projects&sub=bwm-ng; + homepage = "http://www.gropp.org/?id=projects&sub=bwm-ng"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/networking/cadaver/default.nix b/pkgs/tools/networking/cadaver/default.nix index 95012208129..46ebb234fb1 100644 --- a/pkgs/tools/networking/cadaver/default.nix +++ b/pkgs/tools/networking/cadaver/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver; + url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/disable-sslv2.patch?h=packages/cadaver"; name = "disable-sslv2.patch"; sha256 = "1qx65hv584wdarks51yhd3y38g54affkphm5wz27xiz4nhmbssrr"; }) @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command-line WebDAV client"; - homepage = http://www.webdav.org/cadaver; + homepage = "http://www.webdav.org/cadaver"; maintainers = with maintainers; [ ianwookim ]; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; diff --git a/pkgs/tools/networking/carddav-util/default.nix b/pkgs/tools/networking/carddav-util/default.nix index 08014ed1226..c28048a56c0 100644 --- a/pkgs/tools/networking/carddav-util/default.nix +++ b/pkgs/tools/networking/carddav-util/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "carddav-0.1-2014-02-26"; src = fetchgit { - url = git://github.com/ljanyst/carddav-util; + url = "git://github.com/ljanyst/carddav-util"; rev = "53b181faff5f154bcd180467dd04c0ce69405564"; sha256 = "0f0raffdy032wlnxfck6ky60r163nhqfbr311y4ry55l60s4497n"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/ljanyst/carddav-util; + homepage = "https://github.com/ljanyst/carddav-util"; description = "A CardDAV import/export utility"; platforms = platforms.unix; license = licenses.isc; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 5b9ba71f8c9..6156f43b04b 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "cassowary"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/rogerwelin/cassowary"; description = "Modern cross-platform HTTP load-testing tool written in Go"; license = licenses.mit; diff --git a/pkgs/tools/networking/ccnet/default.nix b/pkgs/tools/networking/ccnet/default.nix index 2c78b20138a..48d675ea09b 100644 --- a/pkgs/tools/networking/ccnet/default.nix +++ b/pkgs/tools/networking/ccnet/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-server" ]; meta = with stdenv.lib; { - homepage = https://github.com/haiwen/ccnet; + homepage = "https://github.com/haiwen/ccnet"; description = "A framework for writing networked applications in C"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 2ec16aa430a..0a8ae10eb13 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sets your computer's clock from time servers on the Net"; - homepage = https://chrony.tuxfamily.org/; - repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git; + homepage = "https://chrony.tuxfamily.org/"; + repositories.git = "git://git.tuxfamily.org/gitroot/chrony/chrony.git"; license = licenses.gpl2; platforms = with platforms; linux ++ freebsd ++ openbsd; maintainers = with maintainers; [ fpletz thoughtpolice ]; diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index 10edc92a995..82c9db90432 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -6,11 +6,11 @@ in buildPythonApplication rec { pname = "circus"; - version = "0.15.0"; + version = "0.16.1"; src = fetchPypi { inherit pname version; - sha256 = "d1603cf4c4f620ce6593d3d2a67fad25bf0242183ea24110d8bb1c8079c55d1b"; + sha256 = "0paccmqwgard2l0z7swcc3nwc418l9b4mfaddb4s31bpnqg02z6x"; }; postPatch = '' diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 7dce5dc1044..065a7740032 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/cjdelisle/cjdns; + homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; license = licenses.gpl3; maintainers = with maintainers; [ ehmry ]; diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index 3098b091dc6..c777f487b3d 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://zakalwe.fi/~shd/foss/cksfv/; + homepage = "http://zakalwe.fi/~shd/foss/cksfv/"; description = "A tool for verifying files against a SFV checksum file"; platforms = platforms.all; license = licenses.gpl2; diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index 8e7499caa47..12bfad0c8df 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "clash"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "150zpjchldm1632z6gkydgqhx2a612lpwf5lqngd2if99nas54kk"; + sha256 = "08zwrnpiihlir83fryani8pr972lmj1sjvhjc5pzlw1hks88i9m2"; }; goPackagePath = "github.com/Dreamacro/clash"; - modSha256 = "02bki2iq99lc9iq1mjf9rbxwspalrj7hjlk1h384w3d4s4x4fyxy"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "05i8mzhxzkgcmaa4gazfl8pq3n8mc4prww0ghl6m28cy7a0vsh7f"; buildFlagsArray = [ "-ldflags=" diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index dcda354e4b4..aa61d42d3d0 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { meta = { description = "QT GUI for Connman with system tray icon"; - homepage = https://github.com/andrew-bibb/cmst; + homepage = "https://github.com/andrew-bibb/cmst"; maintainers = [ lib.maintainers.matejc ]; platforms = lib.platforms.linux; license = lib.licenses.mit; diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index 9b8a1f0e790..d05d8e48dc0 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "NTLM/NTLMv2 authenticating HTTP proxy"; - homepage = http://cntlm.sourceforge.net/; + homepage = "http://cntlm.sourceforge.net/"; license = licenses.gpl2; maintainers = [ diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 17923081dfd..2fbd8ddf4a3 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { 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. ''; - homepage = https://bitbucket.org/gotoh/connect/wiki/Home; + 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 ]; diff --git a/pkgs/tools/networking/connman/connman-gtk/default.nix b/pkgs/tools/networking/connman/connman-gtk/default.nix index a3c774a62b1..5de63098185 100644 --- a/pkgs/tools/networking/connman/connman-gtk/default.nix +++ b/pkgs/tools/networking/connman/connman-gtk/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GTK GUI for Connman"; - homepage = https://github.com/jgke/connman-gtk; + homepage = "https://github.com/jgke/connman-gtk"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/networking/connman/connman-ncurses/default.nix b/pkgs/tools/networking/connman/connman-ncurses/default.nix index 140105c2475..7bfb4571e10 100644 --- a/pkgs/tools/networking/connman/connman-ncurses/default.nix +++ b/pkgs/tools/networking/connman/connman-ncurses/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple ncurses UI for connman"; - homepage = https://github.com/eurogiciel-oss/connman-json-client; + homepage = "https://github.com/eurogiciel-oss/connman-json-client"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/networking/connman/connman-notify/default.nix b/pkgs/tools/networking/connman/connman-notify/default.nix index d17729c691d..df72a947489 100644 --- a/pkgs/tools/networking/connman/connman-notify/default.nix +++ b/pkgs/tools/networking/connman/connman-notify/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication { meta = with stdenv.lib; { description = "Desktop notification integration for connman"; - homepage = https://gitlab.com/wavexx/connman-notify; + homepage = "https://gitlab.com/wavexx/connman-notify"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix new file mode 100644 index 00000000000..51219487220 --- /dev/null +++ b/pkgs/tools/networking/connman/connman.nix @@ -0,0 +1,171 @@ +{ stdenv +, fetchurl +, pkgconfig +, file +, glib +# always required runtime dependencies +, dbus +, libmnl +, gnutls +, readline +# configureable options +, firewallType ? "iptables" # or "nftables" +, iptables ? null +, libnftnl ? null # for nftables +, dnsType ? "internal" # or "systemd-resolved" +# optional features which are turned *on* by default +, enableOpenconnect ? true +, openconnect ? null +, enableOpenvpn ? true +, openvpn ? null +, enableVpnc ? true +, vpnc ? true +, enablePolkit ? true +, polkit ? null +, enablePptp ? true +, pptp ? null +, ppp ? null +, enableLoopback ? true +, enableEthernet ? true +, enableWireguard ? true +, enableGadget ? true +, enableWifi ? true +, enableBluetooth ? true +, enableOfono ? true +, enableDundee ? true +, enablePacrunner ? true +, enableNeard ? true +, enableWispr ? true +, enableTools ? true +, enableStats ? true +, enableClient ? true +, enableDatafiles ? true +# optional features which are turned *off* by default +, enableNetworkManager ? false +, enableHh2serialGps ? false +, enableL2tp ? false +, enableIospm ? false +, enableTist ? false +}: + +assert stdenv.lib.asserts.assertOneOf "firewallType" firewallType [ "iptables" "nftables" ]; +assert stdenv.lib.asserts.assertOneOf "dnsType" dnsType [ "internal" "systemd-resolved" ]; + +let inherit (stdenv.lib) optionals; in + +stdenv.mkDerivation rec { + pname = "connman"; + version = "1.38"; + src = fetchurl { + url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; + sha256 = "0awkqigvhwwxiapw0x6yd4whl465ka8a4al0v2pcqy9ggjlsqc6b"; + }; + + buildInputs = [ + glib + dbus + libmnl + gnutls + readline + ]; + + nativeBuildInputs = [ + pkgconfig + file + ] + ++ optionals (enablePolkit) [ polkit ] + ++ optionals (enablePptp) [ pptp ppp ] + ++ optionals (firewallType == "iptables") [ iptables ] + ++ optionals (firewallType == "nftables") [ libnftnl ] + ; + + # fix invalid path to 'file' + postPatch = '' + sed -i "s/\/usr\/bin\/file/file/g" ./configure + ''; + + configureFlags = [ + # directories flags + "--sysconfdir=${placeholder "out"}/etc" + "--localstatedir=/var" + "--with-dbusconfdir=${placeholder "out"}/share" + "--with-dbusdatadir=${placeholder "out"}/share" + "--with-tmpfilesdir=${placeholder "out"}/lib/tmpfiles.d" + "--with-systemdunitdir=${placeholder "out"}/lib/systemd/system" + "--with-dns-backend=${dnsType}" + "--with-firewall=${firewallType}" + # production build flags + "--disable-maintainer-mode" + "--enable-session-policy-local=builtin" + # for building and running tests + # "--enable-tests" # installs the tests, we don't want that + "--enable-tools" + ] + ++ optionals (!enableLoopback) [ "--disable-loopback" ] + ++ optionals (!enableEthernet) [ "--disable-ethernet" ] + ++ optionals (!enableWireguard) [ "--disable-wireguard" ] + ++ optionals (!enableGadget) [ "--disable-gadget" ] + ++ optionals (!enableWifi) [ "--disable-wifi" ] + # enable IWD support for wifi as it doesn't require any new dependencies + # and it's easier for the NixOS module to use only one connman package when + # IWD is requested + ++ optionals (enableWifi) [ "--enable-iwd" ] + ++ optionals (!enableBluetooth) [ "--disable-bluetooth" ] + ++ optionals (!enableOfono) [ "--disable-ofono" ] + ++ optionals (!enableDundee) [ "--disable-dundee" ] + ++ optionals (!enablePacrunner) [ "--disable-pacrunner" ] + ++ optionals (!enableNeard) [ "--disable-neard" ] + ++ optionals (!enableWispr) [ "--disable-wispr" ] + ++ optionals (!enableTools) [ "--disable-tools" ] + ++ optionals (!enableStats) [ "--disable-stats" ] + ++ optionals (!enableClient) [ "--disable-client" ] + ++ optionals (!enableDatafiles) [ "--disable-datafiles" ] + ++ optionals (enableOpenconnect) [ + "--enable-openconnect=builtin" + "--with-openconnect=${openconnect}/sbin/openconnect" + ] + ++ optionals (enableOpenvpn) [ + "--enable-openvpn=builtin" + "--with-openvpn=${openvpn}/sbin/openvpn" + ] + ++ optionals (enableVpnc) [ + "--enable-vpnc=builtin" + "--with-vpnc=${vpnc}/sbin/vpnc" + ] + ++ optionals (enablePolkit) [ + "--enable-polkit" + ] + ++ optionals (enablePptp) [ + "--enable-pptp" + "--with-pptp=${pptp}/sbin/pptp" + ] + ++ optionals (!enableWireguard) [ + "--disable-wireguard" + ] + ++ optionals (enableNetworkManager) [ + "--enable-nmcompat" + ] + ++ optionals (enableHh2serialGps) [ + "--enable-hh2serial-gps" + ] + ++ optionals (enableL2tp) [ + "--enable-l2tp" + ] + ++ optionals (enableIospm) [ + "--enable-iospm" + ] + ++ optionals (enableTist) [ + "--enable-tist" + ] + ; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A daemon for managing internet connections"; + homepage = "https://01.org/connman"; + maintainers = [ maintainers.matejc ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/tools/networking/connman/connman_dmenu/default.nix b/pkgs/tools/networking/connman/connman_dmenu/default.nix index 7096b9b7586..8bc1b47e198 100644 --- a/pkgs/tools/networking/connman/connman_dmenu/default.nix +++ b/pkgs/tools/networking/connman/connman_dmenu/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = { description = "A dmenu wrapper for connmann"; - homepage = https://github.com/march-linux/connman_dmenu; + homepage = "https://github.com/march-linux/connman_dmenu"; license = stdenv.lib.licenses.free; maintainers = [ stdenv.lib.maintainers.magnetophon ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/networking/connman/connmanui/default.nix b/pkgs/tools/networking/connman/connmanui/default.nix index 17e8551fdda..51c97e6cb7e 100644 --- a/pkgs/tools/networking/connman/connmanui/default.nix +++ b/pkgs/tools/networking/connman/connmanui/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A full-featured GTK based trayicon UI for ConnMan"; - homepage = https://github.com/tbursztyka/connman-ui; + homepage = "https://github.com/tbursztyka/connman-ui"; maintainers = [ stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index e58b8362f95..ccceaa30b04 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,61 +1,40 @@ -{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk, - openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, - wpa_supplicant, readline6, pptp, ppp }: +{ callPackage }: -stdenv.mkDerivation rec { - pname = "connman"; - version = "1.37"; - src = fetchurl { - url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "05kfjiqhqfmbbwc4snnyvi5hc4zxanac62f6gcwaf5mvn0z9pqkc"; - }; - - buildInputs = [ openconnect polkit - openvpn vpnc glib dbus iptables gnutls - wpa_supplicant readline6 pptp ppp ]; - - nativeBuildInputs = [ pkgconfig file gawk ]; +{ + # All the defaults + connman = callPackage ./connman.nix { }; - preConfigure = '' - export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant - export PPPD=${ppp}/sbin/pppd - export AWK=${gawk}/bin/gawk - sed -i "s/\/usr\/bin\/file/file/g" ./configure - ''; - - configureFlags = [ - "--sysconfdir=\${out}/etc" - "--localstatedir=/var" - "--with-dbusconfdir=${placeholder "out"}/share" - "--with-dbusdatadir=${placeholder "out"}/share" - "--disable-maintainer-mode" - "--enable-openconnect=builtin" - "--with-openconnect=${openconnect}/sbin/openconnect" - "--enable-openvpn=builtin" - "--with-openvpn=${openvpn}/sbin/openvpn" - "--enable-vpnc=builtin" - "--with-vpnc=${vpnc}/sbin/vpnc" - "--enable-session-policy-local=builtin" - "--enable-client" - "--enable-bluetooth" - "--enable-wifi" - "--enable-polkit" - "--enable-tools" - "--enable-datafiles" - "--enable-pptp" - "--with-pptp=${pptp}/sbin/pptp" - "--enable-iwd" - ]; - - postInstall = '' - cp ./client/connmanctl $out/sbin/connmanctl - ''; + connmanFull = callPackage ./connman.nix { + # TODO: Why is this in `connmanFull` and not the default build? See TODO in + # nixos/modules/services/networking/connman.nix (near the assertions) + enableNetworkManager = true; + enableHh2serialGps = true; + enableL2tp = true; + enableIospm = true; + enableTist = true; + }; - meta = with stdenv.lib; { - description = "A daemon for managing internet connections"; - homepage = https://01.org/connman; - maintainers = [ maintainers.matejc ]; - platforms = platforms.linux; - license = licenses.gpl2; + connmanMinimal = callPackage ./connman.nix { + enableOpenconnect = false; + enableOpenvpn = false; + enableVpnc = false; + vpnc = false; + enablePolkit = false; + enablePptp = false; + enableLoopback = false; + # enableEthernet = false; # If disabled no ethernet connection can be performed + enableWireguard = false; + enableGadget = false; + # enableWifi = false; # If disabled no WiFi connection can be performed + enableBluetooth = false; + enableOfono = false; + enableDundee = false; + enablePacrunner = false; + enableNeard = false; + enableWispr = false; + enableTools = false; + enableStats = false; + enableClient = false; + # enableDatafiles = false; # If disabled, configuration and data files are not installed }; } diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 0cfaddcf06a..96798c1c17e 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "corerad"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0vbbpndqwwz1mc59j7liaayxaj53cs8s3javgj3pvhkn4vp65p7c"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = '' -ldflags= -X github.com/mdlayher/corerad/internal/build.linkTimestamp=1583280117 diff --git a/pkgs/tools/networking/corkscrew/default.nix b/pkgs/tools/networking/corkscrew/default.nix index 9394b123bbe..9cfe65873ac 100644 --- a/pkgs/tools/networking/corkscrew/default.nix +++ b/pkgs/tools/networking/corkscrew/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://agroman.net/corkscrew/; + homepage = "http://agroman.net/corkscrew/"; description = "A tool for tunneling SSH through HTTP proxies"; license = stdenv.lib.licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index d7ab830479e..b4a74b62003 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "croc"; - version = "8.0.4"; + version = "8.0.7"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "0dc6h102jr5dkg6r3xxma51g702dnyd3d6s5rilwv1fivxn3bj43"; + sha256 = "06iwb2wm9wwcwl88rqhwbrky2ab0kbcyzmcv89vw533glknycw04"; }; - modSha256 = "0ng4x9zmwax2vskbcadra4pdkgy1p1prmgkg1bjmh3b8rwsrhr0q"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "1gjigbc9511h3qd12j9ypdnmb5ia4x9f2mk7mxasy9p2xkcfyhpg"; subPackages = [ "." ]; diff --git a/pkgs/tools/networking/curl-unix-socket/default.nix b/pkgs/tools/networking/curl-unix-socket/default.nix index e6f2dec30e6..b25e5dcab0b 100644 --- a/pkgs/tools/networking/curl-unix-socket/default.nix +++ b/pkgs/tools/networking/curl-unix-socket/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Run HTTP requests over UNIX socket"; license = licenses.mit; - homepage = https://github.com/Soulou/curl-unix-socket; + homepage = "https://github.com/Soulou/curl-unix-socket"; maintainers = with maintainers; [offline]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a732ddcb89e..d173b42dfc4 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line tool for transferring files with URL syntax"; - homepage = https://curl.haxx.se/; + homepage = "https://curl.haxx.se/"; maintainers = with maintainers; [ lovek323 ]; license = licenses.curl; platforms = platforms.all; diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index fa1471aa620..179181fc49c 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { meta = with lib; { description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; - homepage = https://curlie.io/; + homepage = "https://curlie.io/"; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; }; diff --git a/pkgs/tools/networking/cutter/default.nix b/pkgs/tools/networking/cutter/default.nix index 28eab7f495a..2430e75430b 100644 --- a/pkgs/tools/networking/cutter/default.nix +++ b/pkgs/tools/networking/cutter/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "TCP/IP Connection cutting on Linux Firewalls and Routers"; - homepage = http://www.digitage.co.uk/digitage/software/linux-security/cutter; + homepage = "http://www.digitage.co.uk/digitage/software/linux-security/cutter"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.offline ]; diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index 6509c9c3106..af15e70aa86 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { - Small. Portable. Single-threaded. Efficient. - Supports IPv6. ''; - homepage = http://unix4lyfe.org/darkstat; + homepage = "http://unix4lyfe.org/darkstat"; license = licenses.gpl2; platforms = with platforms; unix; }; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 9faad377520..9f1eff220c3 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { Davix provides an API and a set of command line tools"; license = licenses.lgpl2Plus; - homepage = http://dmc.web.cern.ch/projects/davix/home; + homepage = "http://dmc.web.cern.ch/projects/davix/home"; maintainers = [ maintainers.adev ]; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/dd-agent/5.nix b/pkgs/tools/networking/dd-agent/5.nix index 98902e9809b..dd206eb8c97 100644 --- a/pkgs/tools/networking/dd-agent/5.nix +++ b/pkgs/tools/networking/dd-agent/5.nix @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { Event collector for the DataDog analysis service -- v5 Python implementation ''; - homepage = https://www.datadoghq.com; + homepage = "https://www.datadoghq.com"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ thoughtpolice domenkozar ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 2253daa2d11..57d7244148d 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -73,7 +73,7 @@ in buildGoPackage rec { Event collector for the DataDog analysis service -- v6 new golang implementation. ''; - homepage = https://www.datadoghq.com; + homepage = "https://www.datadoghq.com"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice domenkozar rvl ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix index 280619a5eca..8f1294eb751 100644 --- a/pkgs/tools/networking/dd-agent/datadog-process-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-process-agent.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Live process collector for the DataDog Agent v6"; - homepage = https://www.datadoghq.com; + homepage = "https://www.datadoghq.com"; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ domenkozar rvl ]; diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix index 6efba72b1dc..375898913c8 100644 --- a/pkgs/tools/networking/ddclient/default.nix +++ b/pkgs/tools/networking/ddclient/default.nix @@ -38,7 +38,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Client for updating dynamic DNS service entries"; - homepage = https://sourceforge.net/p/ddclient/wiki/Home/; + homepage = "https://sourceforge.net/p/ddclient/wiki/Home/"; license = licenses.gpl2Plus; # Mostly since `iproute` is Linux only. platforms = platforms.linux; diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index c45d017e3f5..1a16645cc9b 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A client for the Dynamic Host Configuration Protocol (DHCP)"; - homepage = https://roy.marples.name/projects/dhcpcd; + homepage = "https://roy.marples.name/projects/dhcpcd"; platforms = platforms.linux; license = licenses.bsd2; maintainers = with maintainers; [ eelco fpletz ]; diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix index a7cc90c2b33..f68d68382dd 100644 --- a/pkgs/tools/networking/dhcpdump/default.nix +++ b/pkgs/tools/networking/dhcpdump/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool for visualization of DHCP packets as recorded and output by tcpdump to analyze DHCP server responses"; - homepage = http://www.mavetju.org/unix/dhcpdump-man.php; + homepage = "http://www.mavetju.org/unix/dhcpdump-man.php"; platforms = platforms.linux; license = licenses.bsd2; }; diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index a6cb05b3865..36f81555495 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { privileges are dropped as soon as the program has bound itself to that port. ''; - homepage = http://www.mavetju.org/unix/general.php; + homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/dibbler/default.nix b/pkgs/tools/networking/dibbler/default.nix index 43c9455712d..1849890d23c 100644 --- a/pkgs/tools/networking/dibbler/default.nix +++ b/pkgs/tools/networking/dibbler/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Portable DHCPv6 implementation"; - homepage = http://www.klub.com.pl/dhcpv6/; + homepage = "http://www.klub.com.pl/dhcpv6/"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/tools/networking/dirb/default.nix b/pkgs/tools/networking/dirb/default.nix index fe845f3cae8..1f9516ccacc 100644 --- a/pkgs/tools/networking/dirb/default.nix +++ b/pkgs/tools/networking/dirb/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "A web content scanner"; - homepage = http://dirb.sourceforge.net/; + homepage = "http://dirb.sourceforge.net/"; maintainers = with stdenv.lib.maintainers; [ bennofs ]; license = with stdenv.lib.licenses; [ gpl2 ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/djbdns/default.nix b/pkgs/tools/networking/djbdns/default.nix index 974f8a1f346..ca622a6244f 100644 --- a/pkgs/tools/networking/djbdns/default.nix +++ b/pkgs/tools/networking/djbdns/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A collection of Domain Name System tools"; longDescription = "Includes software for all the fundamental DNS operations: DNS cache: finding addresses of Internet hosts; DNS server: publishing addresses of Internet hosts; and DNS client: talking to a DNS cache."; - homepage = https://cr.yp.to/djbdns.html; + homepage = "https://cr.yp.to/djbdns.html"; license = licenses.publicDomain; maintainers = with maintainers; [ jerith666 ]; }; diff --git a/pkgs/tools/networking/dnscrypt-proxy2/default.nix b/pkgs/tools/networking/dnscrypt-proxy2/default.nix index 089eee332b4..7f16d9478f3 100644 --- a/pkgs/tools/networking/dnscrypt-proxy2/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy2/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "dnscrypt-proxy2"; - version = "2.0.39"; + version = "2.0.42"; goPackagePath = "github.com/jedisct1/dnscrypt-proxy"; @@ -10,14 +10,14 @@ buildGoPackage rec { owner = "jedisct1"; repo = "dnscrypt-proxy"; rev = version; - sha256 = "0fvnp2brmqkwn04v01k53f9djk9ywa1cg26m2frhv4lj0581430y"; + sha256 = "1v4n0pkwcilxm4mnj4fsd4gf8pficjj40jnmfkiwl7ngznjxwkyw"; }; meta = with stdenv.lib; { description = "A tool that provides secure DNS resolution"; license = licenses.isc; - homepage = https://dnscrypt.info/; + homepage = "https://dnscrypt.info/"; maintainers = with maintainers; [ atemu waynr ]; platforms = with platforms; unix; }; diff --git a/pkgs/tools/networking/dnscrypt-wrapper/default.nix b/pkgs/tools/networking/dnscrypt-wrapper/default.nix index 94d52b953d4..5c44734665c 100644 --- a/pkgs/tools/networking/dnscrypt-wrapper/default.nix +++ b/pkgs/tools/networking/dnscrypt-wrapper/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A tool for adding dnscrypt support to any name resolver"; - homepage = https://dnscrypt.info/; + homepage = "https://dnscrypt.info/"; license = licenses.isc; maintainers = with maintainers; [ tstrobel joachifm ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 2a6b776c14d..667eb9feb0c 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; - homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; + homepage = "http://www.thekelleys.org.uk/dnsmasq/doc.html"; license = licenses.gpl2; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ eelco fpletz globin ]; diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 89173e7b427..6f57e981239 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -1,19 +1,17 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "dnsproxy"; - version = "0.23.7"; + version = "0.24.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "1sfl2nyzspqllbklc9wf62wqxs0k3ac7vzqz8kl5h9ch654g542a"; + sha256 = "1jwy2qi99ks6zcas6h1n0zq3b0k47036ayas0mprdips60azw0hg"; }; - modSha256 = "0r5ybr4gpcdsldk12b0d4xiih6ckwnqkfwy89c97prv24v14zysv"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0kba3jay6m9ir1pc7i833p7ylbs610g0lkp8kc3gm47xnxy7j4gz"; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index 207078773b2..705888568d9 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "libpcap application that displays DNS traffic on your network"; - homepage = http://dns.measurement-factory.com/tools/dnstop; + homepage = "http://dns.measurement-factory.com/tools/dnstop"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 5261fdb1896..7109a294543 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Dnstracer 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."; - homepage = http://www.mavetju.org/unix/general.php; + homepage = "http://www.mavetju.org/unix/general.php"; license = licenses.bsd2; maintainers = with maintainers; [ andir ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix index a0f5b5b0842..44101910371 100644 --- a/pkgs/tools/networking/driftnet/default.nix +++ b/pkgs/tools/networking/driftnet/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display"; - homepage = https://github.com/deiv/driftnet; + homepage = "https://github.com/deiv/driftnet"; maintainers = with maintainers; [ offline ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index c51f0a4fdf0..20d2545e508 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib ] ++ lib.optionals enableStatic [ glibc.static zlib.static ]; meta = with stdenv.lib; { - homepage = http://matt.ucc.asn.au/dropbear/dropbear.html; + homepage = "http://matt.ucc.asn.au/dropbear/dropbear.html"; description = "A small footprint implementation of the SSH 2 protocol"; license = licenses.mit; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/networking/dsniff/default.nix b/pkgs/tools/networking/dsniff/default.nix index 256e59628aa..4fe381cdd7a 100644 --- a/pkgs/tools/networking/dsniff/default.nix +++ b/pkgs/tools/networking/dsniff/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation { longDescription = '' dsniff, filesnarf, mailsnarf, msgsnarf, urlsnarf, and webspy passively monitor a network for interesting data (passwords, e-mail, files, etc.). arpspoof, dnsspoof, and macof facilitate the interception of network traffic normally unavailable to an attacker (e.g, due to layer-2 switching). sshmitm and webmitm implement active monkey-in-the-middle attacks against redirected SSH and HTTPS sessions by exploiting weak bindings in ad-hoc PKI. ''; - homepage = https://www.monkey.org/~dugsong/dsniff/; + homepage = "https://www.monkey.org/~dugsong/dsniff/"; license = licenses.bsd3; maintainers = [ maintainers.symphorien ]; # bsd and solaris should work as well diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index 9d6a1712e67..fef2648de7f 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = https://openvpn.net/; + homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 4d374cece3d..90e05e5310b 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = https://openvpn.net/; + homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index d8c60882cd4..b61503b1b3f 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Command line SMTP client"; license = with lib.licenses; [ gpl2 ]; - homepage = https://deanproxy.com/code; + homepage = "https://deanproxy.com/code"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/fakeroute/default.nix b/pkgs/tools/networking/fakeroute/default.nix index d5190331d33..2bfecc389d5 100644 --- a/pkgs/tools/networking/fakeroute/default.nix +++ b/pkgs/tools/networking/fakeroute/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { Makes your machine appear to be anywhere on the internet to any host running a (UDP) unix traceroute ''; - homepage = https://moxie.org/software/fakeroute/; + homepage = "https://moxie.org/software/fakeroute/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix index 43efe2090f2..2bf1d8e5d2c 100644 --- a/pkgs/tools/networking/fastd/default.nix +++ b/pkgs/tools/networking/fastd/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast and Secure Tunneling Daemon"; - homepage = https://projects.universe-factory.net/projects/fastd/wiki; + homepage = "https://projects.universe-factory.net/projects/fastd/wiki"; license = with licenses; [ bsd2 bsd3 ]; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/tools/networking/fdm/default.nix b/pkgs/tools/networking/fdm/default.nix index abb76e633ee..fb125b486d7 100644 --- a/pkgs/tools/networking/fdm/default.nix +++ b/pkgs/tools/networking/fdm/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { description = "Mail fetching and delivery tool - should do the job of getmail and procmail"; maintainers = with maintainers; [ raskin ]; platforms = with platforms; linux; - homepage = https://github.com/nicm/fdm; - downloadPage = https://github.com/nicm/fdm/releases; + homepage = "https://github.com/nicm/fdm"; + downloadPage = "https://github.com/nicm/fdm/releases"; license = licenses.isc; }; } diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 6f1660484e7..dcd3fc6ae99 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { passthru.tests.ferm = nixosTests.ferm; meta = { - homepage = http://ferm.foo-projects.org/; + homepage = "http://ferm.foo-projects.org/"; description = "Tool to maintain complex firewalls"; longDescription = '' ferm is a tool to maintain complex firewalls, without having the trouble to diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index f9e334d8196..bedb97200c1 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "viric.name/soft/filegive"; meta = with stdenv.lib; { - homepage = http://viric.name/cgi-bin/filegive; + homepage = "http://viric.name/cgi-bin/filegive"; description = "Easy p2p file sending program"; license = licenses.agpl3Plus; maintainers = [ maintainers.viric ]; diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index c78a6ad5526..d5e801a6f92 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 = "1.4.2"; + version = "1.4.5"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "0c6jjr1343lqwggvpxdhbjyi1far4f7f3yzq1y0nj1j952j7a36x"; + sha256 = "1p4ddyqg1v27hf19n1ksmfvj5s6z2c8i13syb0anhlyzqy576hwb"; }; - cargoSha256 = "1cyfxfhbc2xhavnkhva1xdcw8vy9i5pqhfbiwn6idpfy6hm1w0bx"; + cargoSha256 = "0mdcj4almwziq1ph3imfdx41a96xq19sbjm7wsm9lxlzhvv256br"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index d2f0ec2ec63..a52088ed231 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = { description = "Network fabric for containers, designed for Kubernetes"; license = licenses.asl20; - homepage = https://github.com/coreos/flannel; + homepage = "https://github.com/coreos/flannel"; maintainers = with maintainers; [johanot offline]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index b5e61bee4df..57f29b275e3 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - homepage = https://savannah.nongnu.org/projects/flvstreamer; + homepage = "https://savannah.nongnu.org/projects/flvstreamer"; maintainers = [ stdenv.lib.maintainers.thammers ]; platforms = with stdenv.lib.platforms; linux ++ darwin; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index 4b5242818b3..6d74cd2c78c 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-ipv6" "--enable-ipv4" ]; meta = with stdenv.lib; { - homepage = http://fping.org/; + homepage = "http://fping.org/"; description = "Send ICMP echo probes to network hosts"; maintainers = with maintainers; [ the-kenny ]; license = licenses.bsd0; diff --git a/pkgs/tools/networking/freebind/default.nix b/pkgs/tools/networking/freebind/default.nix index 0c74f14e174..c1dc3d8fd5f 100644 --- a/pkgs/tools/networking/freebind/default.nix +++ b/pkgs/tools/networking/freebind/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "IPv4 and IPv6 address rate limiting evasion tool"; - homepage = https://github.com/blechschmidt/freebind; + homepage = "https://github.com/blechschmidt/freebind"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 7323c914bfa..f44e2208646 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, fetchFromGitHub, Security }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "frp"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - subPackages = [ "cmd/frpc" "cmd/frps" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast reverse proxy"; longDescription = '' frp is a fast reverse proxy to help you expose a local server behind a diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index 2ea09404e34..b323cde28bc 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Command-line interface to the public Gandi.net API"; - homepage = https://cli.gandi.net/; + homepage = "https://cli.gandi.net/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kampka ]; }; diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index f107e410678..0bf0ebb07b3 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -22,7 +22,7 @@ python2Packages.buildPythonApplication rec { maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ]; platforms = stdenv.lib.platforms.linux; - homepage = http://pyropus.ca/software/getmail/; + homepage = "http://pyropus.ca/software/getmail/"; inherit version; updateWalker = true; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index fb63ee46c9d..f6aa4c061ce 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gftp-2.0.19"; src = fetchurl { - url = https://www.gftp.org/gftp-2.0.19.tar.bz2; + url = "https://www.gftp.org/gftp-2.0.19.tar.bz2"; sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { description = "GTK-based FTP client"; - homepage = http://www.gftp.org; + homepage = "http://www.gftp.org"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/gmrender-resurrect/default.nix b/pkgs/tools/networking/gmrender-resurrect/default.nix index d942dce6a19..fa364dc4eab 100644 --- a/pkgs/tools/networking/gmrender-resurrect/default.nix +++ b/pkgs/tools/networking/gmrender-resurrect/default.nix @@ -30,7 +30,7 @@ in meta = with stdenv.lib; { description = "Resource efficient UPnP/DLNA renderer, optimal for Raspberry Pi, CuBox or a general MediaServer"; - homepage = https://github.com/hzeller/gmrender-resurrect; + homepage = "https://github.com/hzeller/gmrender-resurrect"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ koral ashkitten ]; diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index aab5b77351c..31b91c01c2d 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -25,7 +25,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Backup and restore your gmail account"; - homepage = http://gmvault.org; + homepage = "http://gmvault.org"; license = pkgs.lib.licenses.agpl3Plus; }; } diff --git a/pkgs/tools/networking/gnirehtet/default.nix b/pkgs/tools/networking/gnirehtet/default.nix index 601f70e187a..f739e80be1f 100644 --- a/pkgs/tools/networking/gnirehtet/default.nix +++ b/pkgs/tools/networking/gnirehtet/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage { This relies on adb, make sure you have the required permissions/udev rules. ''; - homepage = https://github.com/Genymobile/gnirehtet; + homepage = "https://github.com/Genymobile/gnirehtet"; license = licenses.asl20; maintainers = with maintainers; [ symphorien ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/goklp/default.nix b/pkgs/tools/networking/goklp/default.nix index c260b47a633..534a809e46a 100644 --- a/pkgs/tools/networking/goklp/default.nix +++ b/pkgs/tools/networking/goklp/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Golang OpenSSH Keys Ldap Provider for AuthorizedKeysCommand"; - homepage = https://github.com/AppliedTrust/goklp; + homepage = "https://github.com/AppliedTrust/goklp"; maintainers = with maintainers; [ disassembler ]; license = licenses.bsd2; }; diff --git a/pkgs/tools/networking/gping/default.nix b/pkgs/tools/networking/gping/default.nix index 85f13f031b4..092f3611abb 100644 --- a/pkgs/tools/networking/gping/default.nix +++ b/pkgs/tools/networking/gping/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Ping, but with a graph"; - homepage = https://github.com/orf/gping; + homepage = "https://github.com/orf/gping"; license = licenses.gpl2; maintainers = with maintainers; [ andrew-d ]; }; diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index de2b3f78798..58e698ed708 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, stdenv, Security }: +{ buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { pname = "grpcui"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; homepage = "https://github.com/fullstorydev/grpcui"; license = licenses.mit; diff --git a/pkgs/tools/networking/grpcurl/default.nix b/pkgs/tools/networking/grpcurl/default.nix index b4c22484163..6a72be9a1e4 100644 --- a/pkgs/tools/networking/grpcurl/default.nix +++ b/pkgs/tools/networking/grpcurl/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { meta = { description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"; - homepage = https://github.com/fullstorydev/grpcurl; + homepage = "https://github.com/fullstorydev/grpcurl"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ knl ]; }; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 830d27fa6ce..21857b0f79f 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of utilities and demos to work with UPnP"; - homepage = https://wiki.gnome.org/Projects/GUPnP; + homepage = "https://wiki.gnome.org/Projects/GUPnP"; license = licenses.gpl2Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/tools/networking/gvpe/default.nix b/pkgs/tools/networking/gvpe/default.nix index ba59870a6b8..3dea0217b60 100644 --- a/pkgs/tools/networking/gvpe/default.nix +++ b/pkgs/tools/networking/gvpe/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A protected multinode virtual network"; - homepage = http://software.schmorp.de/pkg/gvpe.html; + homepage = "http://software.schmorp.de/pkg/gvpe.html"; maintainers = [ maintainers.raskin ]; platforms = with platforms; linux ++ freebsd; license = licenses.gpl2; diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix index ccc598b0692..cea13bca24c 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { the situation that your Internet access is firewalled, but pings are allowed. ''; - homepage = https://code.gerade.org/hans/; + homepage = "https://code.gerade.org/hans/"; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix index 9c7adfce21d..c5aeaaa7bb4 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.1.3"; + version = "2.1.4"; src = fetchurl { url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${pname}-${version}.tar.gz"; - sha256 = "0n8bw3d6gikr8c56ycrvksp1sl0b4yfzp19867cxkl3l0daqwrxv"; + sha256 = "1kcizs5r538chhpwqykdngxyqfi98i03akfjnii721npjvv0y0si"; }; buildInputs = [ openssl zlib ] diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index 69cfa452602..d65d5c9e323 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, fetchFromGitHub, Security }: +{ buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "hey"; @@ -13,9 +13,7 @@ buildGoModule rec { modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; homepage = "https://github.com/rakyll/hey"; license = licenses.asl20; diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index 96fb342e27f..704eaa85cd0 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface"; - homepage = http://br1.einfach.org/tech/horst/; + homepage = "http://br1.einfach.org/tech/horst/"; maintainers = [ maintainers.fpletz ]; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 6e00a6e9afa..1ef02b599e8 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command-line oriented TCP/IP packet assembler/analyzer"; - homepage = http://www.hping.org/; + homepage = "http://www.hping.org/"; license = licenses.gpl2; platforms = platforms.all; broken = stdenv.isDarwin; diff --git a/pkgs/tools/networking/hss/default.nix b/pkgs/tools/networking/hss/default.nix index 913e76c0f4b..77f96113dec 100644 --- a/pkgs/tools/networking/hss/default.nix +++ b/pkgs/tools/networking/hss/default.nix @@ -26,7 +26,7 @@ buildRubyGem rec { description = '' A SSH helper that uses regex and fancy expansion to dynamically manage SSH shortcuts. ''; - homepage = https://github.com/akerl/hss; + homepage = "https://github.com/akerl/hss"; license = licenses.mit; maintainers = with maintainers; [ nixy ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix index 9bb44b70f11..d03b08cf5eb 100644 --- a/pkgs/tools/networking/htpdate/default.nix +++ b/pkgs/tools/networking/htpdate/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility to fetch time and set the system clock over HTTP"; - homepage = http://www.vervest.org/htp/; + homepage = "http://www.vervest.org/htp/"; platforms = platforms.linux; license = licenses.gpl2Plus; }; diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 9ed2f000f32..9c524c0cc09 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "An interactive command-line HTTP client featuring autocomplete and syntax highlighting"; - homepage = https://github.com/eliangcs/http-prompt; + homepage = "https://github.com/eliangcs/http-prompt"; license = licenses.mit; maintainers = with maintainers; [ matthiasbeyer ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/httperf/default.nix b/pkgs/tools/networking/httperf/default.nix index 271be9c2352..50c35fbb33c 100644 --- a/pkgs/tools/networking/httperf/default.nix +++ b/pkgs/tools/networking/httperf/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The httperf HTTP load generator"; - homepage = https://github.com/httperf/httperf; + homepage = "https://github.com/httperf/httperf"; maintainers = with maintainers; [ nand0p ]; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index a0e2b8e01cc..f97d868d7bd 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -87,7 +87,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A command line HTTP client whose goal is to make CLI human-friendly"; - homepage = https://httpie.org/; + homepage = "https://httpie.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ antono relrod schneefux ]; }; diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index e269a38f821..74aff38e1a6 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://vanheusden.com/httping; + homepage = "https://vanheusden.com/httping"; description = "ping with HTTP requests"; longDescription = '' Give httping an url, and it'll show you how long it takes to connect, diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index a7b157d3ebc..f39b061c34d 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/gchaincl/httplab; + homepage = "https://github.com/gchaincl/httplab"; description = "Interactive WebServer"; license = licenses.mit; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index 5d59010ac1e..c4f003f884f 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -12,10 +12,8 @@ rustPlatform.buildRustPackage rec { sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw"; }; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - openssl pkgconfig - ] ++ lib.optionals stdenv.isDarwin [ + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index b3700fb9338..70bbabc35bb 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -17,7 +17,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "curl statistics made simple"; - homepage = https://github.com/reorx/httpstat; + homepage = "https://github.com/reorx/httpstat"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ nequissimus ]; }; diff --git a/pkgs/tools/networking/httptunnel/default.nix b/pkgs/tools/networking/httptunnel/default.nix index df62f90ad0b..e8ed86da3da 100644 --- a/pkgs/tools/networking/httptunnel/default.nix +++ b/pkgs/tools/networking/httptunnel/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Creates a bidirectional virtual data connection tunnelled in HTTP requests"; - homepage = http://www.nocrew.org/software/httptunnel; + homepage = "http://www.nocrew.org/software/httptunnel"; license = licenses.gpl2; maintainers = with maintainers; [ koral ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/hue-cli/Gemfile.lock b/pkgs/tools/networking/hue-cli/Gemfile.lock index 8109cd96ac2..0600d6b7eca 100644 --- a/pkgs/tools/networking/hue-cli/Gemfile.lock +++ b/pkgs/tools/networking/hue-cli/Gemfile.lock @@ -15,4 +15,4 @@ DEPENDENCIES hue-cli BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/networking/hue-cli/default.nix b/pkgs/tools/networking/hue-cli/default.nix index b9b4a8eac9d..f2ea6b37c81 100644 --- a/pkgs/tools/networking/hue-cli/default.nix +++ b/pkgs/tools/networking/hue-cli/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Command line interface for controlling Philips Hue system's lights and bridge"; - homepage = https://github.com/birkirb/hue-cli; + homepage = "https://github.com/birkirb/hue-cli"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ manveru nicknovitski ]; diff --git a/pkgs/tools/networking/hyenae/default.nix b/pkgs/tools/networking/hyenae/default.nix index cbcaee4de78..2ec22f2bab6 100644 --- a/pkgs/tools/networking/hyenae/default.nix +++ b/pkgs/tools/networking/hyenae/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz; + url = "mirror://sourceforge/hyenae/0.36-1/hyenae-0.36-1.tar.gz"; sha256 = "1f3x4yn9a9p4f4wk4l8pv7hxfjc8q7cv20xzf7ky735sq1hj0xcg"; }; @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = ""; - homepage = https://sourceforge.net/projects/hyenae/; + homepage = "https://sourceforge.net/projects/hyenae/"; license = stdenv.lib.licenses.gpl3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 3b968077095..191035f59f2 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://i2pd.website; + homepage = "https://i2pd.website"; description = "Minimal I2P router written in C++"; license = licenses.bsd3; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/tools/networking/ifstat-legacy/default.nix b/pkgs/tools/networking/ifstat-legacy/default.nix index 72aaaa1e170..25b6af5e92f 100644 --- a/pkgs/tools/networking/ifstat-legacy/default.nix +++ b/pkgs/tools/networking/ifstat-legacy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Report network interfaces bandwith just like vmstat/iostat do for other system counters - legacy version"; - homepage = http://gael.roualland.free.fr/ifstat/; + homepage = "http://gael.roualland.free.fr/ifstat/"; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; license = licenses.gpl2; diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index bc6f657f378..66ce35e3a02 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "iftop-1.0pre4"; src = fetchurl { - url = http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz; + url = "http://ex-parrot.com/pdw/iftop/download/iftop-1.0pre4.tar.gz"; sha256 = "15sgkdyijb7vbxpxjavh5qm5nvyii3fqcg9mzvw7fx8s6zmfwczp"; }; @@ -26,7 +26,7 @@ stdenv.mkDerivation { bandwidth usage by pairs of hosts. ''; license = licenses.gpl2Plus; - homepage = http://ex-parrot.com/pdw/iftop/; + homepage = "http://ex-parrot.com/pdw/iftop/"; platforms = platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/imapproxy/default.nix b/pkgs/tools/networking/imapproxy/default.nix index 984b0a2f87e..01480056a2a 100644 --- a/pkgs/tools/networking/imapproxy/default.nix +++ b/pkgs/tools/networking/imapproxy/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "imapproxy-1.2.7"; src = fetchurl { - url = mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2; + url = "mirror://sourceforge/squirrelmail/squirrelmail-imap_proxy-1.2.7.tar.bz2"; sha256 = "0j5fq755sxiz338ia93jrkiy64crv30g37pir5pxfys57q7d92nx"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://imapproxy.org/; + homepage = "http://imapproxy.org/"; description = "It proxies IMAP transactions caching server connections"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index c05928fa34b..aa0980a2514 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.linux-france.org/prj/imapsync/; + homepage = "http://www.linux-france.org/prj/imapsync/"; description = "Mail folder synchronizer between IMAP servers"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 612e3ec0f83..1290ec2bdb1 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { traceroute, uucpd, and whois. ''; - homepage = https://www.gnu.org/software/inetutils/; + homepage = "https://www.gnu.org/software/inetutils/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index c978a330cee..2703ca0fc64 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://code.kryo.se/iodine/; + 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; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index c3304c385e7..205a4e6e701 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { weather, MCC, MNC, mobile brand name, elevation and usage type of any IP address or host name in the IP2Location databases. ''; - homepage = https://www.ip2location.com/free/applications; + homepage = "https://www.ip2location.com/free/applications"; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix index d2dbd235e11..83a6ea4b243 100644 --- a/pkgs/tools/networking/ip2unix/default.nix +++ b/pkgs/tools/networking/ip2unix/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/nixcloud/ip2unix; + homepage = "https://github.com/nixcloud/ip2unix"; description = "Turn IP sockets into Unix domain sockets"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/tools/networking/ipcalc/default.nix b/pkgs/tools/networking/ipcalc/default.nix index 2727175f041..7f118193a3a 100644 --- a/pkgs/tools/networking/ipcalc/default.nix +++ b/pkgs/tools/networking/ipcalc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "Simple IP network calculator"; - homepage = http://jodies.de/ipcalc; + homepage = "http://jodies.de/ipcalc"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 6494b907a3a..f90b74313e5 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/iperf/; + homepage = "https://sourceforge.net/projects/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index bea61b082ec..4506fbb11e3 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://software.es.net/iperf/; + homepage = "http://software.es.net/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = platforms.unix; license = licenses.bsd3; diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index e62d819e1ec..0373b05ede0 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl db cyrus_sasl zlib ]; meta = with stdenv.lib; { - homepage = http://isync.sourceforge.net/; + homepage = "http://isync.sourceforge.net/"; description = "Free IMAP and MailDir mailbox synchronizer"; license = licenses.gpl2Plus; diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 083ec23af56..2d23ff1f1fd 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { by bandwidth they use. ''; - homepage = http://jnettop.kubs.info/; + homepage = "http://jnettop.kubs.info/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index e9f43da981c..0a9ac99e236 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "jwhois-4.0"; src = fetchurl { - url = mirror://gnu/jwhois/jwhois-4.0.tar.gz; + url = "mirror://gnu/jwhois/jwhois-4.0.tar.gz"; sha256 = "0knn7iaj5v0n6jpmldyv2yk4bcy9dn3kywmv63bwc5drh9kvi6zs"; }; @@ -19,7 +19,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/; + homepage = "https://www.gnu.org/software/jwhois/"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/kail/default.nix b/pkgs/tools/networking/kail/default.nix index 931cfa3a74d..e7c9b499675 100644 --- a/pkgs/tools/networking/kail/default.nix +++ b/pkgs/tools/networking/kail/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Kubernetes log viewer"; - homepage = https://github.com/boz/kail; + homepage = "https://github.com/boz/kail"; license = licenses.mit; maintainers = with maintainers; [ offline vdemeester ]; }; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index 3986cadd08a..386a3ae280a 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://kea.isc.org/; + homepage = "https://kea.isc.org/"; description = "High-performance, extensible DHCP server by ISC"; longDescription = '' KEA is a new open source DHCPv4/DHCPv6 server being developed by diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 68d253ef0b8..076953161a3 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://keepalived.org; + homepage = "https://keepalived.org"; description = "Routing software written in C"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 602ada1476a..3bd61a0bd49 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A file transfer program supporting a number of network protocols"; - homepage = https://lftp.tech/; + homepage = "https://lftp.tech/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/networking/libnids/default.nix b/pkgs/tools/networking/libnids/default.nix index ef753127c67..2a93d3c8a59 100644 --- a/pkgs/tools/networking/libnids/default.nix +++ b/pkgs/tools/networking/libnids/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An E-component of Network Intrusion Detection System which emulates the IP stack of Linux 2.0.x"; - homepage = http://libnids.sourceforge.net/; + homepage = "http://libnids.sourceforge.net/"; license = licenses.gpl2; maintainers = [ maintainers.symphorien ]; # probably also bsd and solaris diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 3c361fe48ba..6f94e0c63c5 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -48,7 +48,7 @@ python2Packages.buildPythonApplication rec { meta = { description = "Check websites for broken links"; - homepage = https://linkcheck.github.io/linkchecker/; + homepage = "https://linkcheck.github.io/linkchecker/"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ peterhoeg tweber ]; }; diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 653865b0e91..8462d907a1f 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "802.1ab implementation (LLDP) to help you locate neighbors of all your equipments"; - homepage = https://vincentbernat.github.io/lldpd/; + homepage = "https://vincentbernat.github.io/lldpd/"; license = licenses.isc; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index e8a83d38131..4abe083a0b9 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A hosted VPN service that lets you securely extend LAN-like networks to distributed teams"; - homepage = https://secure.logmein.com/products/hamachi/; + homepage = "https://secure.logmein.com/products/hamachi/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 5d788af1682..56ed33ea36a 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { SECSH working group. ''; - homepage = http://www.lysator.liu.se/~nisse/lsh/; + homepage = "http://www.lysator.liu.se/~nisse/lsh/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ ]; diff --git a/pkgs/tools/networking/maildrop/default.nix b/pkgs/tools/networking/maildrop/default.nix index 44c8b9a9c4d..d0a74fe4b5b 100644 --- a/pkgs/tools/networking/maildrop/default.nix +++ b/pkgs/tools/networking/maildrop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { doCheck = false; # fails with "setlocale: LC_ALL: cannot change locale (en_US.UTF-8)" meta = with stdenv.lib; { - homepage = http://www.courier-mta.org/maildrop/; + homepage = "http://www.courier-mta.org/maildrop/"; description = "Mail filter/mail delivery agent that is used by the Courier Mail Server"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/mailsend/default.nix b/pkgs/tools/networking/mailsend/default.nix index c888f354eae..6b9a0caacb9 100644 --- a/pkgs/tools/networking/mailsend/default.nix +++ b/pkgs/tools/networking/mailsend/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { patches = [ (fetchurl { - url = https://github.com/muquit/mailsend/commit/960df6d7a11eef90128dc2ae660866b27f0e4336.patch; + url = "https://github.com/muquit/mailsend/commit/960df6d7a11eef90128dc2ae660866b27f0e4336.patch"; sha256 = "0vz373zcfl19inflybfjwshcq06rvhx0i5g0f4b021cxfhyb1sm0"; }) ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.bsd3 ; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; - homepage = https://github.com/muquit/mailsend; + 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 3e5300549db..935cadbd7b8 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ orivej vrthra ]; - homepage = https://www.gnu.org/software/mailutils/; + homepage = "https://www.gnu.org/software/mailutils/"; # Some of the dependencies fail to build on {cyg,dar}win. platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/tools/networking/maphosts/Gemfile.lock b/pkgs/tools/networking/maphosts/Gemfile.lock index c456210217e..3e2332f75cc 100644 --- a/pkgs/tools/networking/maphosts/Gemfile.lock +++ b/pkgs/tools/networking/maphosts/Gemfile.lock @@ -16,4 +16,4 @@ DEPENDENCIES maphosts BUNDLED WITH - 1.12.5 + 2.1.4 diff --git a/pkgs/tools/networking/maphosts/default.nix b/pkgs/tools/networking/maphosts/default.nix index dd9886a65ee..8e3d0cf9160 100644 --- a/pkgs/tools/networking/maphosts/default.nix +++ b/pkgs/tools/networking/maphosts/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "Small command line application for keeping your project hostnames in sync with /etc/hosts"; - homepage = https://github.com/mpscholten/maphosts; + homepage = "https://github.com/mpscholten/maphosts"; license = licenses.mit; maintainers = with maintainers; [ mpscholten nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/maxscale/default.nix b/pkgs/tools/networking/maxscale/default.nix index 4288395cdac..b6c1f5a71e3 100644 --- a/pkgs/tools/networking/maxscale/default.nix +++ b/pkgs/tools/networking/maxscale/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ''MaxScale database proxy extends MariaDB Server's high availability''; - homepage = https://mariadb.com/products/technology/maxscale; + homepage = "https://mariadb.com/products/technology/maxscale"; license = licenses.bsl11; platforms = platforms.linux; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/tools/networking/mcrcon/default.nix b/pkgs/tools/networking/mcrcon/default.nix index 469dd4cceb7..4f943f2cec6 100644 --- a/pkgs/tools/networking/mcrcon/default.nix +++ b/pkgs/tools/networking/mcrcon/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/; + homepage = "https://bukkit.org/threads/admin-rcon-mcrcon-remote-connection-client-for-minecraft-servers.70910/"; description = "Minecraft console client with Bukkit coloring support."; longDescription = '' Mcrcon is a powerful Minecraft RCON terminal client with Bukkit coloring support. diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 50875858574..76ce71ac9c8 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line client for Mega.co.nz"; - homepage = https://megatools.megous.com/; + homepage = "https://megatools.megous.com/"; license = licenses.gpl2Plus; maintainers = [ maintainers.viric maintainers.AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/memtier-benchmark/default.nix b/pkgs/tools/networking/memtier-benchmark/default.nix index 075696cfba1..3579002e416 100644 --- a/pkgs/tools/networking/memtier-benchmark/default.nix +++ b/pkgs/tools/networking/memtier-benchmark/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Redis and Memcached traffic generation and benchmarking tool"; - homepage = https://github.com/redislabs/memtier_benchmark; + homepage = "https://github.com/redislabs/memtier_benchmark"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 49cc5710e59..0fbd76855a7 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully compliant with DLNA/UPnP-AV clients. ''; - homepage = https://sourceforge.net/projects/minidlna/; + homepage = "https://sourceforge.net/projects/minidlna/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index b8cf93bc2d3..b3b150d4b83 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "minio-client"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - subPackages = [ "." ]; preBuild = '' @@ -22,7 +20,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/minio/mc; + homepage = "https://github.com/minio/mc"; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; maintainers = with maintainers; [ eelco bachp ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 1277a17f9ba..b5702b9bfad 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { the machine. Software must be patched in order to take advantage of MiniSSDPd, and MiniSSDPd must be started before any other UPnP program. ''; - homepage = http://miniupnp.free.fr/minissdpd.html; - downloadPage = http://miniupnp.free.fr/files/; + homepage = "http://miniupnp.free.fr/minissdpd.html"; + downloadPage = "http://miniupnp.free.fr/files/"; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/miniupnpc/default.nix b/pkgs/tools/networking/miniupnpc/default.nix index ebe6a60291a..41927278ac8 100644 --- a/pkgs/tools/networking/miniupnpc/default.nix +++ b/pkgs/tools/networking/miniupnpc/default.nix @@ -20,7 +20,7 @@ let makeFlags = [ "PREFIX=$(out)" "INSTALLPREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://miniupnp.free.fr/; + homepage = "http://miniupnp.free.fr/"; description = "A client that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = with platforms; linux ++ freebsd ++ darwin; license = licenses.bsd3; diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index f65c0c63370..23f02dde1f4 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://miniupnp.free.fr/; + homepage = "http://miniupnp.free.fr/"; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; license = licenses.bsd3; diff --git a/pkgs/tools/networking/miredo/default.nix b/pkgs/tools/networking/miredo/default.nix index 26f6c2498e1..1982cab6b39 100644 --- a/pkgs/tools/networking/miredo/default.nix +++ b/pkgs/tools/networking/miredo/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Teredo IPv6 Tunneling Daemon"; - homepage = https://www.remlab.net/miredo/; + homepage = "https://www.remlab.net/miredo/"; license = licenses.gpl2; maintainers = [ maintainers.volth ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 53369baa01c..7a623ab69a6 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { # https://github.com/mitmproxy/mitmproxy/issues/3459 # TODO: remove on next update name = "wsproto-0.13.patch"; - url = https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch; + url = "https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch"; sha256 = "1ddxdr7js510kzyq3gyks4k5k1n8zb1i9amxw7wzmi1dcg8kqw9a"; # We strip these bounds anyway excludes = [ "setup.py" ]; @@ -37,7 +37,7 @@ buildPythonPackage rec { # https://github.com/mitmproxy/mitmproxy/issues/3403 # TODO: remove on next update name = "dont-call-fixtures.patch"; - url = https://github.com/mitmproxy/mitmproxy/commit/ce28721458c8cc71de86513a5110676e9763041b.patch; + url = "https://github.com/mitmproxy/mitmproxy/commit/ce28721458c8cc71de86513a5110676e9763041b.patch"; sha256 = "05pljr28lx7l1xgswqr9sz8dnhvc7npzh8xg2p9hignf159kd54d"; # Irrelevant in nixpkgs excludes = [ "setup.py" "setup.cfg" "release/docker/*" ]; @@ -76,7 +76,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Man-in-the-middle proxy"; - homepage = https://mitmproxy.org/; + homepage = "https://mitmproxy.org/"; license = licenses.mit; maintainers = with maintainers; [ fpletz kamilchm ]; }; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 98d2625aade..648fdb9d20e 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { ++ (with perlPackages; [ perl IOTty ]) ++ lib.optional withUtempter libutempter; + enableParallelBuilding = true; + patches = [ ./ssh_path.patch ./utempter_path.patch @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11"; meta = { - homepage = https://mosh.org/; + homepage = "https://mosh.org/"; description = "Mobile shell (ssh replacement)"; longDescription = '' Remote terminal application that allows roaming, supports intermittent diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index 18850fab330..ae5695537af 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { patches = [ # https://github.com/traviscross/mtr/pull/315 (fetchpatch { - url = https://github.com/traviscross/mtr/pull/315.patch?full_index=1; + url = "https://github.com/traviscross/mtr/pull/315.patch?full_index=1"; sha256 = "18qcsj9058snc2qhq6v6gdbqhz021gi5fgw9h7vfczv45gf0qasa"; }) ]; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index cdd954e1975..2e6a401350c 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; - homepage = https://www.djcbsoftware.nl/code/mu/; + homepage = "https://www.djcbsoftware.nl/code/mu/"; platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ antono the-kenny peterhoeg ]; }; diff --git a/pkgs/tools/networking/nat-traverse/default.nix b/pkgs/tools/networking/nat-traverse/default.nix index a4dcfb4a40f..e3bf3391f21 100644 --- a/pkgs/tools/networking/nat-traverse/default.nix +++ b/pkgs/tools/networking/nat-traverse/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { isn't necessary to reconfigure the involved NAT gateways, either. nat-traverse works out-of-the-box. ''; - homepage = https://www.speicherleck.de/iblech/nat-traverse/; + homepage = "https://www.speicherleck.de/iblech/nat-traverse/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.iblech ]; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 9c443696eda..d634c37b123 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lrt -lpthread"; meta = { - homepage = http://nbd.sourceforge.net; + 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 ]; diff --git a/pkgs/tools/networking/ncftp/default.nix b/pkgs/tools/networking/ncftp/default.nix index acd9a0e27f8..98fa6cc29f1 100644 --- a/pkgs/tools/networking/ncftp/default.nix +++ b/pkgs/tools/networking/ncftp/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line FTP (File Transfer Protocol) client"; - homepage = https://www.ncftp.com/ncftp/; + homepage = "https://www.ncftp.com/ncftp/"; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.unix; license = licenses.clArtistic; diff --git a/pkgs/tools/networking/ndisc6/default.nix b/pkgs/tools/networking/ndisc6/default.nix index 43018e401f1..03304df5f79 100644 --- a/pkgs/tools/networking/ndisc6/default.nix +++ b/pkgs/tools/networking/ndisc6/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://www.remlab.net/ndisc6/; + homepage = "https://www.remlab.net/ndisc6/"; description = "A small collection of useful tools for IPv6 networking"; maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/ndjbdns/default.nix b/pkgs/tools/networking/ndjbdns/default.nix index 85de6d13183..3edfe9b7e5d 100644 --- a/pkgs/tools/networking/ndjbdns/default.nix +++ b/pkgs/tools/networking/ndjbdns/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { longDescription = '' Djbdns is a fully‐fledged Domain Name System(DNS), originally written by the eminent author of qmail, Dr. D J Bernstein. ''; - homepage = http://pjp.dgplug.org/ndjbdns/; + homepage = "http://pjp.dgplug.org/ndjbdns/"; license = licenses.gpl2; maintainers = [ maintainers.msackman ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index f78d7129c34..ec94fc97997 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -1,25 +1,23 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "nebula"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "slackhq"; repo = pname; rev = "v${version}"; - sha256 = "0nwagk3q2gkirqrk27fisad2c2p2y1lsvz5phax9v5h51p1y79ia"; + sha256 = "0xrki9w83b4b3l5adq1rxz374f124wf388sdyvy7ngc3b04k7qlb"; }; - modSha256 = "1sy5mnwn9fxjf3y41lm8gsggid2c0y08iw88m9ng8psaf4qid8ij"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0v45ikw0bl00412krg4v6sr9bggvsrvl0h6clihkh4mdfz6kwa47"; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; buildFlagsArray = [ "-ldflags='-X main.Build=${version}'" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; longDescription = '' Nebula is a scalable overlay networking tool with a focus on performance, diff --git a/pkgs/tools/networking/netcat/default.nix b/pkgs/tools/networking/netcat/default.nix index 47ec804e5d4..5c275ee6ab4 100644 --- a/pkgs/tools/networking/netcat/default.nix +++ b/pkgs/tools/networking/netcat/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation { name = "netcat-gnu-0.7.1"; src = fetchurl { - url = mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2; + url = "mirror://sourceforge/netcat/netcat-0.7.1.tar.bz2"; sha256 = "1frjcdkhkpzk0f84hx6hmw5l0ynpmji8vcbaxg8h5k2svyxz0nmm"; }; meta = with stdenv.lib; { description = "Utility which reads and writes data across network connections"; - homepage = http://netcat.sourceforge.net/; + homepage = "http://netcat.sourceforge.net/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix index a85d4d7ad10..7bc6d0e2be7 100644 --- a/pkgs/tools/networking/nethogs/default.nix +++ b/pkgs/tools/networking/nethogs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nethogs"; - version = "0.8.5"; + version = "0.8.6"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; rev = "v${version}"; - sha256 = "13plwblwbnyyi40jaqx471gwhln08wm7f0fxyvj1yh3d81k556yx"; + sha256 = "0sn1sdp86akwlm4r1vmkxjjl50c0xaisk91bbz57z7kcsaphxna9"; }; buildInputs = [ ncurses libpcap ]; diff --git a/pkgs/tools/networking/netkit/tftp/default.nix b/pkgs/tools/networking/netkit/tftp/default.nix index de53cfdd224..847d8cbcf89 100644 --- a/pkgs/tools/networking/netkit/tftp/default.nix +++ b/pkgs/tools/networking/netkit/tftp/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Netkit TFTP client and server"; - homepage = ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/; + 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; diff --git a/pkgs/tools/networking/netmask/default.nix b/pkgs/tools/networking/netmask/default.nix index 864838bdd39..fa36ee5d802 100644 --- a/pkgs/tools/networking/netmask/default.nix +++ b/pkgs/tools/networking/netmask/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/tlby/netmask; + homepage = "https://github.com/tlby/netmask"; description = "An IP address formatting tool "; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/networking/netrw/default.nix b/pkgs/tools/networking/netrw/default.nix index dfd355237dc..f7d73283d48 100644 --- a/pkgs/tools/networking/netrw/default.nix +++ b/pkgs/tools/networking/netrw/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple tool for transporting data over the network"; license = stdenv.lib.licenses.gpl2; - homepage = https://mamuti.net/netrw/index.en.html; + homepage = "https://mamuti.net/netrw/index.en.html"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/netselect/default.nix b/pkgs/tools/networking/netselect/default.nix index c40f43c214f..dfca4c9058e 100644 --- a/pkgs/tools/networking/netselect/default.nix +++ b/pkgs/tools/networking/netselect/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/apenwarr/netselect; + homepage = "https://github.com/apenwarr/netselect"; description = "An ultrafast intelligent parallelizing binary-search implementation of \"ping\""; license = licenses.bsd3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 8da36d72fda..c0c7b6782df 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { to user space and vice versa. The toolkit can be used for network development and analysis, debugging, auditing or network reconnaissance. ''; - homepage = http://netsniff-ng.org/; + homepage = "http://netsniff-ng.org/"; license = licenses.gpl2; platforms = 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 131ec675115..6035e35f634 100644 --- a/pkgs/tools/networking/network-manager/0.9.8/default.nix +++ b/pkgs/tools/networking/network-manager/0.9.8/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://projects.gnome.org/NetworkManager/; + homepage = "http://projects.gnome.org/NetworkManager/"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index bbec39b9502..baf2128153a 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -10,11 +10,11 @@ let pythonForDocs = python3.withPackages (pkgs: with pkgs; [ pygobject3 ]); in stdenv.mkDerivation rec { pname = "network-manager"; - version = "1.22.8"; + version = "1.22.10"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/${stdenv.lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz"; - sha256 = "0kxbgln78lb1cxhd79vbpdbncsb0cppr15fycgqb9df6f8nbj4cm"; + sha256 = "0xyaizyp3yz6x3pladw3nvl3hf4n5g140zx9jnxfp9qvag0wqa9b"; }; outputs = [ "out" "dev" "devdoc" "man" "doc" ]; @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/NetworkManager; + homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace ]; diff --git a/pkgs/tools/networking/network-manager/dmenu/default.nix b/pkgs/tools/networking/network-manager/dmenu/default.nix index 93a169a3fb0..f84ef027f76 100644 --- a/pkgs/tools/networking/network-manager/dmenu/default.nix +++ b/pkgs/tools/networking/network-manager/dmenu/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small script to manage NetworkManager connections with dmenu instead of nm-applet"; - homepage = https://github.com/firecat53/networkmanager-dmenu; + homepage = "https://github.com/firecat53/networkmanager-dmenu"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.jensbin ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/networking/network-manager/l2tp/default.nix b/pkgs/tools/networking/network-manager/l2tp/default.nix index 09fb0c5977b..430462f9199 100644 --- a/pkgs/tools/networking/network-manager/l2tp/default.nix +++ b/pkgs/tools/networking/network-manager/l2tp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/nm-l2tp/network-manager-l2tp; + homepage = "https://github.com/nm-l2tp/network-manager-l2tp"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/pkgs/tools/networking/network-manager/openvpn/default.nix b/pkgs/tools/networking/network-manager/openvpn/default.nix index 13f7eab5cc7..79435a9e5e8 100644 --- a/pkgs/tools/networking/network-manager/openvpn/default.nix +++ b/pkgs/tools/networking/network-manager/openvpn/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkgconfig, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, fetchpatch, libnma }: +, gtk3, withGnome ? true, gnome3, kmod, libnma }: let pname = "NetworkManager-openvpn"; - version = "1.8.10"; + version = "1.8.12"; 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"; - sha256 = "1vri49yff4lj13dnzkpq9nx3a4z1bmbrv807r151plj8m1mwhg5g"; + sha256 = "062kh4zj7jfbwy4zzcwpq2m457bzbpm3l18s0ysnw3mgia3siz8f"; }; patches = [ @@ -17,11 +17,6 @@ in stdenv.mkDerivation { src = ./fix-paths.patch; inherit kmod openvpn; }) - # Don't use etc/dbus-1/system.d - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/merge_requests/13.patch"; - sha256 = "06cvqi28v72dd53fw8ix95mqj885xhwi8qcs2q7hvm5bvnhwn704"; - }) ]; buildInputs = [ openvpn networkmanager ] @@ -30,7 +25,6 @@ in stdenv.mkDerivation { nativeBuildInputs = [ intltool pkgconfig file libxml2 ]; configureFlags = [ - "--without-libnm-glib" "--with-gnome=${if withGnome then "yes" else "no"}" "--localstatedir=/" # needed for the management socket under /run/NetworkManager "--enable-absolute-paths" diff --git a/pkgs/tools/networking/nfdump/default.nix b/pkgs/tools/networking/nfdump/default.nix index 256bb824310..22d84a7f699 100644 --- a/pkgs/tools/networking/nfdump/default.nix +++ b/pkgs/tools/networking/nfdump/default.nix @@ -2,7 +2,7 @@ , autoconf, automake, libtool, pkg-config , bzip2, libpcap, flex, yacc }: -let version = "1.6.19"; in +let version = "1.6.20"; in stdenv.mkDerivation { pname = "nfdump"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { owner = "phaag"; repo = "nfdump"; rev = "v${version}"; - sha256 = "0idhg7pdkv602h0d0dz7msk8gsxz32ingn16dkqbxp4mgfiakp9r"; + sha256 = "06pywhymb92l0kac9djjpvlwrn1c7bxs3wm5yzrlaf815175ar3c"; }; nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ]; diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index ab8da6236cf..60125b515d6 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { null interfaces, and understands BPF filter logic in the same fashion as more common packet sniffing tools, such as tcpdump and snoop. ''; - homepage = https://github.com/jpr5/ngrep/; + homepage = "https://github.com/jpr5/ngrep/"; # <ngrep>/doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. diff --git a/pkgs/tools/networking/ngrok-1/default.nix b/pkgs/tools/networking/ngrok-1/default.nix index 6e6d543c439..82f6ed4760c 100644 --- a/pkgs/tools/networking/ngrok-1/default.nix +++ b/pkgs/tools/networking/ngrok-1/default.nix @@ -30,6 +30,6 @@ buildGoPackage rec { buildFlags = [ "-tags release" ]; meta = { - homepage = https://ngrok.com/; + homepage = "https://ngrok.com/"; }; } diff --git a/pkgs/tools/networking/ngrok-2/default.nix b/pkgs/tools/networking/ngrok-2/default.nix index a0d6171efe2..f17849ef757 100644 --- a/pkgs/tools/networking/ngrok-2/default.nix +++ b/pkgs/tools/networking/ngrok-2/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { longDescription = '' Allows you to expose a web server running on your local machine to the internet. ''; - homepage = https://ngrok.com/; + homepage = "https://ngrok.com/"; license = licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "x86_64-darwin" ]; maintainers = [ maintainers.bobvanderlinden ]; diff --git a/pkgs/tools/networking/noip/default.nix b/pkgs/tools/networking/noip/default.nix index 0ef2ce50867..6503e701377 100644 --- a/pkgs/tools/networking/noip/default.nix +++ b/pkgs/tools/networking/noip/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "noip-2.1.9-1"; src = fetchurl { - url = https://www.noip.com/client/linux/noip-duc-linux.tar.gz; + url = "https://www.noip.com/client/linux/noip-duc-linux.tar.gz"; sha256 = "82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Dynamic DNS daemon for no-ip accounts"; - homepage = http://noip.com/download?page=linux; + homepage = "http://noip.com/download?page=linux"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.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 9f83949e8de..1aaead46f6a 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { domain `.local'. ''; - homepage = http://0pointer.de/lennart/projects/nss-mdns/; + homepage = "http://0pointer.de/lennart/projects/nss-mdns/"; license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix index 569a6d118e7..3ce7638923c 100644 --- a/pkgs/tools/networking/nss-pam-ldapd/default.nix +++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "LDAP identity and authentication for NSS/PAM"; - homepage = https://arthurdejong.org/nss-pam-ldapd/; + homepage = "https://arthurdejong.org/nss-pam-ldapd/"; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 68f80106031..3db5a28f161 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; - homepage = http://www.ntop.org/products/ntop/; + homepage = "http://www.ntop.org/products/ntop/"; license = licenses.gpl3Plus; platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 0ce1c5a0429..d118227c326 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "An implementation of the Network Time Protocol"; license = { # very close to isc and bsd2 - url = https://www.eecis.udel.edu/~mills/ntp/html/copyright.html; + url = "https://www.eecis.udel.edu/~mills/ntp/html/copyright.html"; }; maintainers = with maintainers; [ eelco thoughtpolice ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/nuttcp/default.nix b/pkgs/tools/networking/nuttcp/default.nix index f01d5ccada1..fe3cde5f91a 100644 --- a/pkgs/tools/networking/nuttcp/default.nix +++ b/pkgs/tools/networking/nuttcp/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { and loss percentage (for UDP transfers). ''; license = licenses.gpl2; - homepage = http://nuttcp.net/; + homepage = "http://nuttcp.net/"; maintainers = with maintainers; [ ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix index 5c8f98101ee..d6f8cb21e0b 100644 --- a/pkgs/tools/networking/nylon/default.nix +++ b/pkgs/tools/networking/nylon/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { name = "nylon-1.21"; src = fetchurl { - url = https://monkey.org/~marius/nylon/nylon-1.21.tar.gz; + url = "https://monkey.org/~marius/nylon/nylon-1.21.tar.gz"; sha256 = "34c132b005c025c1a5079aae9210855c80f50dc51dde719298e1113ad73408a4"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { buildInputs = [ libevent ]; meta = with stdenv.lib; { - homepage = http://monkey.org/~marius/nylon; + homepage = "http://monkey.org/~marius/nylon"; description = "Proxy server, supporting SOCKS 4 and 5, as well as a mirror mode"; license = licenses.bsdOriginal; maintainers = with maintainers; [ edwtjo ]; diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/tools/networking/nyx/default.nix index 901187c6abb..6ae81609eec 100644 --- a/pkgs/tools/networking/nyx/default.nix +++ b/pkgs/tools/networking/nyx/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages }: +{ lib, python3Packages }: -with pythonPackages; +with python3Packages; buildPythonApplication rec { pname = "nyx"; @@ -18,7 +18,7 @@ buildPythonApplication rec { meta = with lib; { description = "Command-line monitor for Tor"; - homepage = https://nyx.torproject.org/; + homepage = "https://nyx.torproject.org/"; license = licenses.gpl3; maintainers = with maintainers; [ offline ]; }; diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index b3c77f5b797..c25f19c0350 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://nzbget.net; + homepage = "https://nzbget.net"; license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 93ebdeb0720..02820c0a74f 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, buildGoModule, Security }: +{ lib, fetchgit, buildGoModule }: buildGoModule rec { pname = "obfs4"; @@ -12,12 +12,10 @@ buildGoModule rec { modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "A pluggable transport proxy"; - homepage = https://www.torproject.org/projects/obfsproxy; - repositories.git = https://git.torproject.org/pluggable-transports/obfs4.git; + homepage = "https://www.torproject.org/projects/obfsproxy"; + repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; maintainers = with maintainers; [ phreedom thoughtpolice ]; }; } diff --git a/pkgs/tools/networking/ocproxy/default.nix b/pkgs/tools/networking/ocproxy/default.nix index 729f5b31998..877f15865ac 100644 --- a/pkgs/tools/networking/ocproxy/default.nix +++ b/pkgs/tools/networking/ocproxy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ocproxy is a user-level SOCKS and port forwarding proxy for OpenConnect based on lwIP. ''; - homepage = https://github.com/cernekee/ocproxy; + homepage = "https://github.com/cernekee/ocproxy"; license = licenses.bsd3; maintainers = [ maintainers.joko ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/ocserv/default.nix b/pkgs/tools/networking/ocserv/default.nix index 8d4b340ea2b..dea0d10a277 100644 --- a/pkgs/tools/networking/ocserv/default.nix +++ b/pkgs/tools/networking/ocserv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ nettle gnutls libev protobufc guile geoip libseccomp gperf readline lz4 libgssglue ronn pam ]; meta = with stdenv.lib; { - homepage = https://gitlab.com/openconnect/ocserv; + homepage = "https://gitlab.com/openconnect/ocserv"; license = licenses.gpl2; description = "This program is openconnect VPN server (ocserv), a server for the openconnect VPN client."; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 983ba018473..50a00475457 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -33,7 +33,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; + homepage = "http://offlineimap.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ endocrimes ]; }; diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix index 5cae8a61203..c6b2ffe9e83 100644 --- a/pkgs/tools/networking/ofono/default.nix +++ b/pkgs/tools/networking/ofono/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Infrastructure for building mobile telephony (GSM/UMTS) applications"; - homepage = https://01.org/ofono; + homepage = "https://01.org/ofono"; license = licenses.gpl2; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/olsrd/default.nix b/pkgs/tools/networking/olsrd/default.nix index cff4b7e9713..bc5a0358019 100644 --- a/pkgs/tools/networking/olsrd/default.nix +++ b/pkgs/tools/networking/olsrd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An adhoc wireless mesh routing daemon"; license = stdenv.lib.licenses.bsd3; - homepage = http://olsr.org/; + homepage = "http://olsr.org/"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 1cb8e02130f..2e5695ff452 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; - homepage = https://github.com/OpenAPITools/openapi-generator; + homepage = "https://github.com/OpenAPITools/openapi-generator"; license = licenses.asl20; maintainers = [ maintainers.shou ]; }; diff --git a/pkgs/tools/networking/openapi-generator-cli/unstable.nix b/pkgs/tools/networking/openapi-generator-cli/unstable.nix index 01a0ef2242e..f5d71fb8e85 100644 --- a/pkgs/tools/networking/openapi-generator-cli/unstable.nix +++ b/pkgs/tools/networking/openapi-generator-cli/unstable.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; - homepage = https://github.com/OpenAPITools/openapi-generator; + homepage = "https://github.com/OpenAPITools/openapi-generator"; license = licenses.asl20; maintainers = [ maintainers.shou ]; }; diff --git a/pkgs/tools/networking/openconnect/default.nix b/pkgs/tools/networking/openconnect/default.nix index a926ef1e1dd..101346d31b1 100644 --- a/pkgs/tools/networking/openconnect/default.nix +++ b/pkgs/tools/networking/openconnect/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "VPN Client for Cisco's AnyConnect SSL VPN"; - homepage = http://www.infradead.org/openconnect/; + homepage = "http://www.infradead.org/openconnect/"; license = licenses.lgpl21; maintainers = with maintainers; [ pradeepchhetri tricktron ]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/tools/networking/openconnect_pa/default.nix b/pkgs/tools/networking/openconnect_pa/default.nix index 68d18bff777..2c452847aa3 100644 --- a/pkgs/tools/networking/openconnect_pa/default.nix +++ b/pkgs/tools/networking/openconnect_pa/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "OpenConnect client extended to support Palo Alto Networks' GlobalProtect VPN"; - homepage = https://github.com/dlenski/openconnect/; + homepage = "https://github.com/dlenski/openconnect/"; license = licenses.lgpl21; maintainers = with maintainers; [ chessai ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 548f0e97be9..6e6e8fbf23c 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.12.0"; + version = "1.13.1"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1ndyiw4c2s8m0xds4ff87rdpixhbma5v2g420w3gfc1p7alhqz66"; + sha256 = "1sfqi169xf0wmlpzri9frkgsh99fgjvcpbdkd42vsm10qa1dnpk5"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix index 9cfb24ce95d..7cbba9bfbf6 100644 --- a/pkgs/tools/networking/openntpd/default.nix +++ b/pkgs/tools/networking/openntpd/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://www.openntpd.org/; + homepage = "http://www.openntpd.org/"; license = licenses.bsd3; description = "OpenBSD NTP daemon (Debian port)"; platforms = platforms.all; diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix index a05c8283e76..a80f94d2e9f 100644 --- a/pkgs/tools/networking/openresolv/default.nix +++ b/pkgs/tools/networking/openresolv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "A program to manage /etc/resolv.conf"; - homepage = https://roy.marples.name/projects/openresolv; + homepage = "https://roy.marples.name/projects/openresolv"; license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index dd0151c89da..ad5072342f1 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.openssh.com/; + homepage = "http://www.openssh.com/"; description = "An implementation of the SSH protocol"; license = stdenv.lib.licenses.bsd2; platforms = platforms.unix ++ platforms.windows; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index c8aa2c1f5c5..88ed0599c2c 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A robust and highly flexible tunneling application"; downloadPage = "https://openvpn.net/index.php/open-source/downloads.html"; - homepage = https://openvpn.net/; + homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix index 35b577ac37e..bb06479be30 100644 --- a/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix +++ b/pkgs/tools/networking/openvpn/openvpn-auth-ldap.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "LDAP authentication plugin for OpenVPN"; - homepage = https://github.com/threerings/openvpn-auth-ldap; + homepage = "https://github.com/threerings/openvpn-auth-ldap"; license = [ licenses.asl20 licenses.bsd3 diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index d86934d079b..d73b8e911b9 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "openvpn-learnaddress-19b03c3"; src = fetchgit { - url = https://gist.github.com/4058733.git; + url = "https://gist.github.com/4058733.git"; rev = "19b03c3beb0190df46ea07bf4b68244acb8eae80"; sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Openvpn learn-address script to manage a hosts-like file"; - homepage = https://gist.github.com/offlinehacker/4058733/; + homepage = "https://gist.github.com/offlinehacker/4058733/"; maintainers = [ stdenv.lib.maintainers.offline ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 0f7e8f2c445..76d04e6b685 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; - homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; + homepage = "https://github.com/masterkorp/openvpn-update-resolv-conf/"; maintainers = with maintainers; [ abbradar ]; license = licenses.gpl2; platforms = platforms.unix; diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index ddb3cc8e377..4d18372363b 100644 --- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Helper script for OpenVPN to directly update the DNS settings of a link through systemd-resolved via DBus"; - homepage = https://github.com/jonathanio/update-systemd-resolved; + homepage = "https://github.com/jonathanio/update-systemd-resolved"; maintainers = with maintainers; [ eadwu ]; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/networking/p2p/azureus/default.nix b/pkgs/tools/networking/p2p/azureus/default.nix index 4fcfc251f3f..03737f9af27 100644 --- a/pkgs/tools/networking/p2p/azureus/default.nix +++ b/pkgs/tools/networking/p2p/azureus/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "azureus-2.3.0.6"; builder = ./builder.sh; src = fetchurl { - url = http://tarballs.nixos.org/Azureus2.3.0.6.jar; + url = "http://tarballs.nixos.org/Azureus2.3.0.6.jar"; sha256 = "1hwrh3n0b0jbpsdk15zrs7pw175418phhmg6pn4xi1bvilxq1wrd"; }; # buildInputs = [unzip]; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 70e36cb7ec5..08163bd8a9e 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,37 +1,58 @@ -{ stdenv, fetchurl, fetchpatch, bison, pkgconfig, gettext, desktop-file-utils -, glib, gtk2, libxml2, libbfd, zlib, binutils, gnutls +{ stdenv +, fetchFromGitHub +, fetchpatch +, bison +, pkgconfig +, gettext +, desktop-file-utils +, glib +, gtk2 +, libxml2 +, libbfd +, zlib +, binutils +, gnutls +, enableGui ? true }: stdenv.mkDerivation rec { pname = "gtk-gnutella"; - version = "1.1.14"; + # NOTE: Please remove hardeningDisable on the next release, see: + # https://sourceforge.net/p/gtk-gnutella/bugs/555/#5c19 + version = "1.1.15"; - src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0sljjha4anfz1r1xq1c6qnnkjv62ld56p7xgj4bsi6lqmq1azvii"; + src = fetchFromGitHub { + owner = "gtk-gnutella"; + repo = "gtk-gnutella"; + rev = "v${version}"; + sha256 = "1g7w6ywwp2g4qdgmfqkrl1rldk1b4rx50yb7h75hh15mh6nr159r"; }; - patches = [ - (fetchpatch { - # Avoid namespace conflict with glibc 2.28 'statx' struct / remove after v1.1.14 - url = "https://github.com/gtk-gnutella/gtk-gnutella/commit/e4205a082eb32161e28de81f5cba8095eea8ecc7.patch"; - sha256 = "0ffkw2cw2b2yhydii8jm40vd40p4xl224l8jvhimg02lgs3zfbca"; - }) - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/gtk-gnutella/raw/f30/f/gtk-gnutella-1.1.14-endian.patch"; - sha256 = "19q4lq8msknfz4mkbjdqmmgld16p30j2yx371p8spmr19q5i0sfn"; - }) + nativeBuildInputs = [ + bison + desktop-file-utils + gettext + pkgconfig ]; - - postPatch = '' - substituteInPlace Makefile.SH --replace "@exit 0" "@echo done" - ''; - - nativeBuildInputs = [ bison desktop-file-utils gettext pkgconfig ]; - buildInputs = [ binutils glib gnutls gtk2 libbfd libxml2 zlib ]; + buildInputs = [ + glib + gnutls + libbfd + libxml2 + zlib + ] + ++ + stdenv.lib.optionals (enableGui) [ gtk2 ] + ; configureScript = "./build.sh"; - configureFlags = [ "--configure-only" ]; + configureFlags = [ + "--configure-only" + # See https://sourceforge.net/p/gtk-gnutella/bugs/555/ + "--disable-malloc" + ] + ++ stdenv.lib.optionals (!enableGui) [ "--topless" ] + ; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; @@ -45,6 +66,7 @@ stdenv.mkDerivation rec { description = "A GTK Gnutella client, optimized for speed and scalability"; homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; + maintainers = [ maintainers.doronbehar ]; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 2ca31a6a1e7..b55c673c058 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://rakshasa.github.io/rtorrent/; + homepage = "https://rakshasa.github.io/rtorrent/"; description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index 2a89e419b2e..eccf38f39fd 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.agpl3Plus; - homepage = http://www.seeks-project.info/; + homepage = "http://www.seeks-project.info/"; maintainers = [ stdenv.lib.maintainers.matejc diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index e8a4261ed12..d55a46f609b 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -86,7 +86,7 @@ pythonPackages.buildPythonApplication rec { such a way that it remains available even when some of the peers are unavailable, malfunctioning, or malicious. ''; - homepage = http://tahoe-lafs.org/; + homepage = "http://tahoe-lafs.org/"; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; diff --git a/pkgs/tools/networking/packetdrill/default.nix b/pkgs/tools/networking/packetdrill/default.nix index 623645efc0c..e4322242e0b 100644 --- a/pkgs/tools/networking/packetdrill/default.nix +++ b/pkgs/tools/networking/packetdrill/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { description = "Quick, precise tests for entire TCP/UDP/IPv4/IPv6 network stacks"; - homepage = https://github.com/google/packetdrill; + homepage = "https://github.com/google/packetdrill"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ dmjio cleverca22 ]; diff --git a/pkgs/tools/networking/pacparser/default.nix b/pkgs/tools/networking/pacparser/default.nix index 211256ea72b..2d703730785 100644 --- a/pkgs/tools/networking/pacparser/default.nix +++ b/pkgs/tools/networking/pacparser/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library to parse proxy auto-config (PAC) files"; - homepage = http://pacparser.manugarg.com/; + homepage = "http://pacparser.manugarg.com/"; license = licenses.lgpl3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 29d3230c6d3..ecfe5fa0357 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { - homepage = https://github.com/Parchive/par2cmdline; + homepage = "https://github.com/Parchive/par2cmdline"; description = "PAR 2.0 compatible file verification and repair tool"; longDescription = '' par2cmdline is a program for creating and using PAR2 files to detect diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 663e04db460..94a181eb5ae 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/pfactum/pcapc; + homepage = "https://github.com/pfactum/pcapc"; description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/tools/networking/pcapfix/default.nix b/pkgs/tools/networking/pcapfix/default.nix index 92df5d55524..a700bd54e7a 100644 --- a/pkgs/tools/networking/pcapfix/default.nix +++ b/pkgs/tools/networking/pcapfix/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { postPatch = ''sed -i "s|/usr|$out|" Makefile''; meta = with stdenv.lib; { - homepage = https://f00l.de/pcapfix/; + homepage = "https://f00l.de/pcapfix/"; description = "Repair your broken pcap and pcapng files"; license = licenses.gpl3; maintainers = [ maintainers.ehmry ]; diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix index f5d30fa32a8..d2894271301 100644 --- a/pkgs/tools/networking/pdnsd/default.nix +++ b/pkgs/tools/networking/pdnsd/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pdnsd-1.2.9a-par"; src = fetchurl { - url = http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz; + url = "http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-1.2.9a-par.tar.gz"; sha256 = "0yragv5zk77a1hfkpnsh17vvsw8b14d6mzfng4bb7i58rb83an5v"; }; @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Permanent DNS caching"; - homepage = http://members.home.nl/p.a.rombouts/pdnsd; + homepage = "http://members.home.nl/p.a.rombouts/pdnsd"; license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = with maintainers; [viric]; diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 68aa356261a..9dd1a5581c5 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://github.com/chaos/pdsh; + homepage = "https://github.com/chaos/pdsh"; description = "High-performance, parallel remote shell utility"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/persepolis/default.nix b/pkgs/tools/networking/persepolis/default.nix index 7412bc568a2..63e2af48c1e 100644 --- a/pkgs/tools/networking/persepolis/default.nix +++ b/pkgs/tools/networking/persepolis/default.nix @@ -53,7 +53,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Persepolis Download Manager is a GUI for aria2."; - homepage = https://persepolisdm.github.io/; + homepage = "https://persepolisdm.github.io/"; license = licenses.gpl3; maintainers = [ maintainers.linarcx ]; }; diff --git a/pkgs/tools/networking/philter/default.nix b/pkgs/tools/networking/philter/default.nix index c8b44116846..ee079fe9fdf 100644 --- a/pkgs/tools/networking/philter/default.nix +++ b/pkgs/tools/networking/philter/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mail sorter for Maildirs"; - homepage = http://philter.sourceforge.net; + homepage = "http://philter.sourceforge.net"; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/networking/phodav/default.nix b/pkgs/tools/networking/phodav/default.nix index 617eb0ec40c..c6b479dd250 100644 --- a/pkgs/tools/networking/phodav/default.nix +++ b/pkgs/tools/networking/phodav/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "WebDav server implementation and library using libsoup"; - homepage = https://wiki.gnome.org/phodav; + homepage = "https://wiki.gnome.org/phodav"; license = licenses.lgpl21; maintainers = with maintainers; [ gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/photon/default.nix b/pkgs/tools/networking/photon/default.nix index 8d75ea413ec..22da1320803 100644 --- a/pkgs/tools/networking/photon/default.nix +++ b/pkgs/tools/networking/photon/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "a lightning fast web crawler which extracts URLs, files, intel & endpoints from a target"; - homepage = https://github.com/s0md3v/Photon; + homepage = "https://github.com/s0md3v/Photon"; license = licenses.gpl3; maintainers = with maintainers; [ genesis ]; }; diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index d791f6b91d9..d3fb37705bd 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Measure TCP handshake time"; - homepage = https://github.com/LanetNetwork/pingtcp; + homepage = "https://github.com/LanetNetwork/pingtcp"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/pirate-get/default.nix b/pkgs/tools/networking/pirate-get/default.nix index b92d255b719..bacea663493 100644 --- a/pkgs/tools/networking/pirate-get/default.nix +++ b/pkgs/tools/networking/pirate-get/default.nix @@ -4,20 +4,20 @@ with python3Packages; buildPythonApplication rec { pname = "pirate-get"; - version = "0.3.4"; + version = "0.3.5"; doCheck = false; src = fetchPypi { inherit pname version; - sha256 = "0f82yf3bl9jaywagv4vvwypm57z1x8a8qqn0xhz9np3949df4ysm"; + sha256 = "01jr9c04ic4bfalfdijavzvqzmpkw3hq1glqyc86z3v6zwl8dlp2"; }; propagatedBuildInputs = [ colorama veryprettytable beautifulsoup4 pyperclip ]; meta = with stdenv.lib; { description = "A command line interface for The Pirate Bay"; - homepage = https://github.com/vikstrous/pirate-get; + homepage = "https://github.com/vikstrous/pirate-get"; license = licenses.gpl1; maintainers = with maintainers; [ rnhmjoj ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/pixiewps/default.nix b/pkgs/tools/networking/pixiewps/default.nix index 8bbf589f3b3..98a780a1704 100644 --- a/pkgs/tools/networking/pixiewps/default.nix +++ b/pkgs/tools/networking/pixiewps/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An offline WPS bruteforce utility"; - homepage = https://github.com/wiire/pixiewps; + homepage = "https://github.com/wiire/pixiewps"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.nico202 ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index bdc6e7b67f7..05053b37349 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib ncurses ]; meta = with stdenv.lib; { - homepage = http://www.web-polygraph.org; + homepage = "http://www.web-polygraph.org"; description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; license = licenses.asl20; diff --git a/pkgs/tools/networking/polysh/default.nix b/pkgs/tools/networking/polysh/default.nix index cf963068d1c..34bc908060a 100644 --- a/pkgs/tools/networking/polysh/default.nix +++ b/pkgs/tools/networking/polysh/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { at once. ''; maintainers = [ maintainers.astsmtl ]; - homepage = http://guichaz.free.fr/polysh/; + homepage = "http://guichaz.free.fr/polysh/"; license = licenses.gpl2; }; } diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 1579823450b..f507b582f64 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "0wirmcis67xjwllqhz9lsz1b7dcvl8shvz78lxgybc70j2sv7ih4"; }) (fetchurl { - url = https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch; + url = "https://www.nikhef.nl/~janjust/ppp/ppp-2.4.7-eaptls-mppe-1.102.patch"; sha256 = "04war8l5szql53l36043hvzgfwqp3v76kj8brbz7wlf7vs2mlkia"; }) (fetchpatch { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://ppp.samba.org/; + homepage = "https://ppp.samba.org/"; description = "Point-to-point implementation for Linux and Solaris"; license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix index 6a97abfab59..dfc61d8197c 100644 --- a/pkgs/tools/networking/pptp/default.nix +++ b/pkgs/tools/networking/pptp/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PPTP client for Linux"; - homepage = http://pptpclient.sourceforge.net/; + homepage = "http://pptpclient.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/pptpd/default.nix b/pkgs/tools/networking/pptpd/default.nix index f373f594df8..e6f5f9503d8 100644 --- a/pkgs/tools/networking/pptpd/default.nix +++ b/pkgs/tools/networking/pptpd/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://poptop.sourceforge.net/dox/; + homepage = "http://poptop.sourceforge.net/dox/"; description = "The PPTP Server for Linux"; platforms = platforms.linux; maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/tools/networking/prettyping/default.nix b/pkgs/tools/networking/prettyping/default.nix index fb0508b3c90..43f32ddb9fb 100644 --- a/pkgs/tools/networking/prettyping/default.nix +++ b/pkgs/tools/networking/prettyping/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = https://github.com/denilsonsa/prettyping; + homepage = "https://github.com/denilsonsa/prettyping"; description = "A wrapper around the standard ping tool with the objective of making the output prettier, more colorful, more compact, and easier to read"; license = with licenses; [ mit ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index 848a99f7771..331295ffd1f 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec{ ''; meta = with stdenv.lib; { - homepage = https://www.privoxy.org/; + homepage = "https://www.privoxy.org/"; description = "Non-caching web proxy with advanced filtering capabilities"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/networking/proxychains/default.nix b/pkgs/tools/networking/proxychains/default.nix index 52ef43838c2..6f00c7fc8b7 100644 --- a/pkgs/tools/networking/proxychains/default.nix +++ b/pkgs/tools/networking/proxychains/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Proxifier for SOCKS proxies"; - homepage = http://proxychains.sourceforge.net; + homepage = "http://proxychains.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/networking/pwnat/default.nix b/pkgs/tools/networking/pwnat/default.nix index 9e06a644145..55965173e0e 100644 --- a/pkgs/tools/networking/pwnat/default.nix +++ b/pkgs/tools/networking/pwnat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://samy.pl/pwnat/; + homepage = "http://samy.pl/pwnat/"; description = "ICMP NAT to NAT client-server communication"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with maintainers; [viric]; diff --git a/pkgs/tools/networking/qr-filetransfer/default.nix b/pkgs/tools/networking/qr-filetransfer/default.nix index b95d0facda8..bb62be6d3e2 100644 --- a/pkgs/tools/networking/qr-filetransfer/default.nix +++ b/pkgs/tools/networking/qr-filetransfer/default.nix @@ -16,7 +16,7 @@ buildGoPackage { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/claudiodangelis/qr-filetransfer; + homepage = "https://github.com/claudiodangelis/qr-filetransfer"; description = "Transfer files over wifi by scanning a QR code from your terminal"; longDescription = '' qr-filetransfer binds a web server to the address of your Wi-Fi network diff --git a/pkgs/tools/networking/quickserve/default.nix b/pkgs/tools/networking/quickserve/default.nix index 22589582e3b..8f4876b6ee2 100644 --- a/pkgs/tools/networking/quickserve/default.nix +++ b/pkgs/tools/networking/quickserve/default.nix @@ -3,7 +3,7 @@ let threaded_servers = python3Packages.buildPythonPackage { name = "threaded_servers"; src = fetchzip { - url = https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz; + url = "https://xyne.archlinux.ca/projects/python3-threaded_servers/src/python3-threaded_servers-2018.6.tar.xz"; sha256 = "1irliz90a1dk4lyl7mrfq8qnnrfad9czvbcw1spc13zyai66iyhf"; }; @@ -28,7 +28,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple HTTP server for quickly sharing files."; - homepage = https://xyne.archlinux.ca/projects/quickserve/; + homepage = "https://xyne.archlinux.ca/projects/quickserve/"; license = licenses.gpl2; maintainers = with maintainers; [ lassulus ]; }; diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix index 87071e23a96..0f7a16caa82 100644 --- a/pkgs/tools/networking/quicktun/default.nix +++ b/pkgs/tools/networking/quicktun/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Very simple, yet secure VPN software"; - homepage = http://wiki.ucis.nl/QuickTun; + homepage = "http://wiki.ucis.nl/QuickTun"; maintainers = [ maintainers.fpletz ]; platforms = platforms.unix; license = licenses.bsd2; diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix index 5460bf80a07..ab5ff481ec7 100644 --- a/pkgs/tools/networking/radsecproxy/default.nix +++ b/pkgs/tools/networking/radsecproxy/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://software.nordu.net/radsecproxy/; + homepage = "https://software.nordu.net/radsecproxy/"; description = "A generic RADIUS proxy that supports both UDP and TLS (RadSec) RADIUS transports."; license = licenses.bsd3; maintainers = with maintainers; [ sargon ]; diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 30e706d6673..aef67022f78 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdaemon ]; meta = with stdenv.lib; { - homepage = http://www.litech.org/radvd/; + homepage = "http://www.litech.org/radvd/"; description = "IPv6 Router Advertisement Daemon"; platforms = platforms.linux; license = licenses.bsdOriginal; diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix index f5353db6803..23d0dae086e 100644 --- a/pkgs/tools/networking/ratools/default.nix +++ b/pkgs/tools/networking/ratools/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A fast, dynamic, multi-threading framework for IPv6 Router Advertisements"; - homepage = https://github.com/danrl/ratools; + homepage = "https://github.com/danrl/ratools"; license = licenses.asl20; platforms = platforms.linux; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index 2d239180a93..d347273f50e 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Online and offline brute force attack against WPS"; - homepage = https://github.com/t6x/reaver-wps-fork-t6x; + homepage = "https://github.com/t6x/reaver-wps-fork-t6x"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nico202 volth ]; diff --git a/pkgs/tools/networking/reaver-wps/default.nix b/pkgs/tools/networking/reaver-wps/default.nix index 864a7fb5e61..9f4f2d5bea4 100644 --- a/pkgs/tools/networking/reaver-wps/default.nix +++ b/pkgs/tools/networking/reaver-wps/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Brute force attack against Wifi Protected Setup"; - homepage = https://code.google.com/archive/p/reaver-wps/; + homepage = "https://code.google.com/archive/p/reaver-wps/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ nico202 volth ]; diff --git a/pkgs/tools/networking/redir/default.nix b/pkgs/tools/networking/redir/default.nix index 1a6efb065e2..7f69dacedf3 100644 --- a/pkgs/tools/networking/redir/default.nix +++ b/pkgs/tools/networking/redir/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A TCP port redirector for UNIX"; - homepage = https://github.com/troglobit/redir; + homepage = "https://github.com/troglobit/redir"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/redsocks/default.nix b/pkgs/tools/networking/redsocks/default.nix index 32a30f48ec6..d389221eabb 100644 --- a/pkgs/tools/networking/redsocks/default.nix +++ b/pkgs/tools/networking/redsocks/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Transparent redirector of any TCP connection to proxy"; - homepage = http://darkk.net.ru/redsocks/; + homepage = "http://darkk.net.ru/redsocks/"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.ekleog ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix index ae84d9662aa..0c3c32270b1 100644 --- a/pkgs/tools/networking/ripmime/default.nix +++ b/pkgs/tools/networking/ripmime/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; - homepage = http://www.pldaniels.com/ripmime/; + homepage = "http://www.pldaniels.com/ripmime/"; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix index bdb526c7054..d8476d1d159 100644 --- a/pkgs/tools/networking/rp-pppoe/default.nix +++ b/pkgs/tools/networking/rp-pppoe/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Roaring Penguin Point-to-Point over Ethernet tool"; platforms = platforms.linux; - homepage = https://www.roaringpenguin.com/products/pppoe; + homepage = "https://www.roaringpenguin.com/products/pppoe"; license = licenses.gpl2Plus; }; } diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 31b111f2b83..53f24ddb752 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -1,23 +1,24 @@ -{ stdenv, fetchFromGitHub, python2Packages }: +{ stdenv, buildPythonApplication, fetchFromGitHub, python_magic, dateutil }: -python2Packages.buildPythonApplication rec { +buildPythonApplication rec { pname = "s3cmd"; - version = "2.0.2"; - + version = "2.1.0"; + src = fetchFromGitHub { - owner = "s3tools"; - repo = "s3cmd"; - rev = "v${version}"; - sha256 = "0ninw830309cxga99gjnfghpkywf9kd6yz4wqsq85zni1dv39cdk"; + owner = "s3tools"; + repo = "s3cmd"; + rev = "v${version}"; + sha256 = "0p6mbgai7f0c12pkw4s7d649gj1f8hywj60pscxvj9jsna3iifhs"; }; - propagatedBuildInputs = with python2Packages; [ python_magic dateutil ]; + propagatedBuildInputs = [ python_magic dateutil ]; + + dontUseSetuptoolsCheck = true; meta = with stdenv.lib; { - homepage = http://s3tools.org/; - description = "A command-line tool to manipulate Amazon S3 buckets"; + homepage = "https://s3tools.org/s3cmd"; + description = "Command line tool for managing Amazon S3 and CloudFront services"; license = licenses.gpl2; maintainers = [ maintainers.spwhitt ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/networking/s4cmd/default.nix b/pkgs/tools/networking/s4cmd/default.nix index 8088cc0ec4d..dedbc751179 100644 --- a/pkgs/tools/networking/s4cmd/default.nix +++ b/pkgs/tools/networking/s4cmd/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/bloomreach/s4cmd; + homepage = "https://github.com/bloomreach/s4cmd"; description = "Super S3 command line tool"; license = licenses.asl20; maintainers = [ maintainers.bhipple ]; diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index 66bdcbbba54..739fdc2e2fc 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.1.1"; - sha256 = "0clib10dk3r9rcxv1yfr6gdvqqrx0arzivjpmhz9p8xaif53wpj1"; + version = "2.3.2.0"; + sha256 = "09hyb1xv9glqq0yy7wy8hiwvlr78kwv552pags8ancgamag15di7"; description = "A suite of DNS client programs and libraries for Unix systems"; @@ -28,6 +28,7 @@ buildPackage { rm $(find -type f -mindepth 1 -maxdepth 1 -executable) rm libs6dns.* rm libskadns.* + rm libdcache.* mv doc $doc/share/doc/s6-dns/html ''; diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix index 1551d6da97b..f8c479d5ce2 100644 --- a/pkgs/tools/networking/s6-networking/default.nix +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -20,8 +20,8 @@ assert sslSupportEnabled -> sslLibs ? ${sslSupport}; buildPackage { pname = "s6-networking"; - version = "2.3.1.1"; - sha256 = "127i7ig5wdgjbkjf0py0g96llc6cbxij22ns2j7bwa95figinhcx"; + version = "2.3.1.2"; + sha256 = "1029bgwfmv903y5ji93j75m7p2jgchdxya1khxzb42q2z7yxnlyr"; description = "A suite of small networking utilities for Unix systems"; diff --git a/pkgs/tools/networking/samplicator/default.nix b/pkgs/tools/networking/samplicator/default.nix index d8167b8a48f..0cc446edd9c 100644 --- a/pkgs/tools/networking/samplicator/default.nix +++ b/pkgs/tools/networking/samplicator/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Send copies of (UDP) datagrams to multiple receivers"; - homepage = https://github.com/sleinen/samplicator/; + homepage = "https://github.com/sleinen/samplicator/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index 37d5edaec45..f2ae143e1b9 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "shadowfox"; @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "125mw70jidbp436arhv77201jdp6mpgqa2dzmrpmk55f9bf29sg6"; }; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; buildFlags = [ "--tags" "release" ]; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index c9ff4c7f649..7ad0f1e862d 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes. It is a port of Shadowsocks created by @clowwindy, which is maintained by @madeye and @linusyang. ''; - homepage = https://github.com/shadowsocks/shadowsocks-libev; + homepage = "https://github.com/shadowsocks/shadowsocks-libev"; license = licenses.gpl3Plus; maintainers = [ maintainers.nfjinjing ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 973d0287149..36f6b584959 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with stdenv.lib; { - homepage = https://github.com/shadowsocks/shadowsocks-rust; + homepage = "https://github.com/shadowsocks/shadowsocks-rust"; description = "A Rust port of shadowsocks"; license = licenses.mit; maintainers = [ maintainers.marsam ]; diff --git a/pkgs/tools/networking/shncpd/default.nix b/pkgs/tools/networking/shncpd/default.nix index be861654f65..46c9b22248a 100644 --- a/pkgs/tools/networking/shncpd/default.nix +++ b/pkgs/tools/networking/shncpd/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Simple, stupid and slow HNCP daemon"; - homepage = https://www.irif.univ-paris-diderot.fr/~jch/software/homenet/shncpd.html; + homepage = "https://www.irif.univ-paris-diderot.fr/~jch/software/homenet/shncpd.html"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.fpletz ]; diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix index 8e62aa735a4..67f81b82105 100644 --- a/pkgs/tools/networking/shorewall/default.nix +++ b/pkgs/tools/networking/shorewall/default.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.shorewall.net/; + homepage = "http://www.shorewall.net/"; description = "An IP gateway/firewall configuration tool for GNU/Linux"; longDescription = '' Shorewall is a high-level tool for configuring Netfilter. You describe your diff --git a/pkgs/tools/networking/simpleproxy/default.nix b/pkgs/tools/networking/simpleproxy/default.nix index f94e177a858..7a5bc713fae 100644 --- a/pkgs/tools/networking/simpleproxy/default.nix +++ b/pkgs/tools/networking/simpleproxy/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/vzaliva/simpleproxy; + homepage = "https://github.com/vzaliva/simpleproxy"; description = "A simple TCP proxy"; license = licenses.gpl2; maintainers = [ maintainers.montag451 ]; diff --git a/pkgs/tools/networking/sipcalc/default.nix b/pkgs/tools/networking/sipcalc/default.nix index dff929e9fa1..081f2005330 100644 --- a/pkgs/tools/networking/sipcalc/default.nix +++ b/pkgs/tools/networking/sipcalc/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Advanced console ip subnet calculator"; - homepage = http://www.routemeister.net/projects/sipcalc/; + homepage = "http://www.routemeister.net/projects/sipcalc/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.globin ]; diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix index c1a2451328d..09de1c2e594 100644 --- a/pkgs/tools/networking/sipsak/default.nix +++ b/pkgs/tools/networking/sipsak/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/sipwise/sipsak; + homepage = "https://github.com/sipwise/sipsak"; description = "SIP Swiss army knife"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ sheenobu ]; diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 8632a33e349..1c26dc27b3f 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://code.google.com/archive/p/slimrat/; + homepage = "https://code.google.com/archive/p/slimrat/"; description = "Linux Rapidshare downloader"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index b70bf2952f7..f3bd0a23d58 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, libcap, libseccomp }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config +, glib +, libcap +, libseccomp +, libslirp +}: stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "0.4.4"; + version = "1.0.0"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "1932q80s6187k4fsvgia5iwc9lqsdkxzqqwpw1ksy0mx8wzmwbih"; + sha256 = "152wmccz47anvx5w88qcz8higw80l17jl7i24xfj5574adviqnv2"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libcap libseccomp glib ]; + buildInputs = [ glib libcap libseccomp libslirp ]; enableParallelBuilding = true; @@ -21,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/rootless-containers/slirp4netns"; description = "User-mode networking for unprivileged network namespaces"; license = licenses.gpl2; - maintainers = with maintainers; [ orivej saschagrunert ]; + maintainers = with maintainers; [ orivej ] ++ teams.podman.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/smokeping/default.nix b/pkgs/tools/networking/smokeping/default.nix index 6a816615e9c..80f8b49a0cc 100644 --- a/pkgs/tools/networking/smokeping/default.nix +++ b/pkgs/tools/networking/smokeping/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = { description = "Network latency collector"; - homepage = http://oss.oetiker.ch/smokeping; + homepage = "http://oss.oetiker.ch/smokeping"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.erictapen ]; diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index caca1c829ec..52ad14c1d11 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; meta = { - homepage = https://github.com/SnabbCo/snabbswitch; + homepage = "https://github.com/SnabbCo/snabbswitch"; description = "Simple and fast packet networking toolkit"; longDescription = '' Snabb Switch is a LuaJIT-based toolkit for writing high-speed diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix index 99f0301c7c8..97775a00604 100644 --- a/pkgs/tools/networking/socat/2.x.nix +++ b/pkgs/tools/networking/socat/2.x.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A 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; + homepage = "http://www.dest-unreach.org/socat/"; + repositories.git = "git://repo.or.cz/socat.git"; platforms = platforms.unix; license = licenses.gpl2; maintainers = [ maintainers.eelco ]; diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index ba7aaee63ab..c50b2236c9e 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { meta = { description = "A 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; + 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 ]; diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix index 2b5aa2b7cbf..cadaf021cda 100644 --- a/pkgs/tools/networking/spoofer/default.nix +++ b/pkgs/tools/networking/spoofer/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ optional withGUI qt5.qtbase ; meta = with stdenv.lib; { - homepage = https://www.caida.org/projects/spoofer; + homepage = "https://www.caida.org/projects/spoofer"; description = "Assess and report on deployment of source address validation"; longDescription = '' Spoofer is a new client-server system for Windows, MacOS, and diff --git a/pkgs/tools/networking/srelay/default.nix b/pkgs/tools/networking/srelay/default.nix index b55860a20c1..1e7486dd305 100644 --- a/pkgs/tools/networking/srelay/default.nix +++ b/pkgs/tools/networking/srelay/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { meta = { description = "A SOCKS proxy and relay"; - homepage = http://socks-relay.sourceforge.net/; + homepage = "http://socks-relay.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.bsd3; }; diff --git a/pkgs/tools/networking/ssh-agents/default.nix b/pkgs/tools/networking/ssh-agents/default.nix index b01d373088b..a4e930281a5 100644 --- a/pkgs/tools/networking/ssh-agents/default.nix +++ b/pkgs/tools/networking/ssh-agents/default.nix @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation rec { given name is expected to be a folder under ~/.ssh/name containing the keys to include in the agent. ''; - homepage = https://github.com/kalbasit/ssh-agents; + homepage = "https://github.com/kalbasit/ssh-agents"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/ssh-ident/default.nix b/pkgs/tools/networking/ssh-ident/default.nix index cb07d73a631..d46d6ea1ac2 100644 --- a/pkgs/tools/networking/ssh-ident/default.nix +++ b/pkgs/tools/networking/ssh-ident/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/ccontavalli/ssh-ident; + 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 ]; diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index 3765e6aa08f..7f5644edb52 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://sourceforge.net/projects/sshpass/; + homepage = "https://sourceforge.net/projects/sshpass/"; description = "Non-interactive ssh password auth"; license = licenses.gpl2; maintainers = [ maintainers.madjar ]; diff --git a/pkgs/tools/networking/ssldump/default.nix b/pkgs/tools/networking/ssldump/default.nix index 0081e7d1ddb..2c008cbb36a 100644 --- a/pkgs/tools/networking/ssldump/default.nix +++ b/pkgs/tools/networking/ssldump/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { "--with-openssl-inc=${openssl}/include" ]; meta = { description = "ssldump is an SSLv3/TLS network protocol analyzer"; - homepage = http://ssldump.sourceforge.net; + homepage = "http://ssldump.sourceforge.net"; license = "BSD-style"; maintainers = with stdenv.lib.maintainers; [ aycanirican ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index 81da427a52c..90547eb1364 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "ssmtp-2.64"; src = fetchurl { - url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; + url = "mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2"; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; }; diff --git a/pkgs/tools/networking/sstp/default.nix b/pkgs/tools/networking/sstp/default.nix index de65298d648..4d05b478ab4 100644 --- a/pkgs/tools/networking/sstp/default.nix +++ b/pkgs/tools/networking/sstp/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "SSTP client for Linux"; - homepage = http://sstp-client.sourceforge.net/; + homepage = "http://sstp-client.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ktosiek ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index fb7de5486fb..6ff141e099c 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { meta = { description = "OpenSource IPsec-based VPN Solution"; - homepage = https://www.strongswan.org; + homepage = "https://www.strongswan.org"; license = licenses.gpl2Plus; platforms = platforms.all; }; diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 9960e6f0030..306b1899f76 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Stun server and test client"; - homepage = https://sourceforge.net/projects/stun/; + homepage = "https://sourceforge.net/projects/stun/"; license = licenses.vsl10; maintainers = with maintainers; [ marcweber obadz ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/surfraw/default.nix b/pkgs/tools/networking/surfraw/default.nix index eac73765300..d26bdbbb771 100644 --- a/pkgs/tools/networking/surfraw/default.nix +++ b/pkgs/tools/networking/surfraw/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { 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; + homepage = "https://gitlab.com/surfraw/Surfraw"; maintainers = []; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.publicDomain; diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index 91f15573914..ac4c1e24e3b 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows generation of API client libraries (SDK generation), server stubs and documentation automatically given an OpenAPI Spec"; - homepage = https://github.com/swagger-api/swagger-codegen; + homepage = "https://github.com/swagger-api/swagger-codegen"; license = licenses.asl20; maintainers = [ maintainers.jraygauthier ]; }; diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 515fcee6963..e65bc5e208f 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { checkPhase = "make test"; meta = { - homepage = https://random.zerodogg.org/swec/; + homepage = "https://random.zerodogg.org/swec/"; description = "Simple Web Error Checker (SWEC)"; diff --git a/pkgs/tools/networking/tayga/default.nix b/pkgs/tools/networking/tayga/default.nix index 97bcbdc999e..866d680a02d 100644 --- a/pkgs/tools/networking/tayga/default.nix +++ b/pkgs/tools/networking/tayga/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { It is intended to provide production-quality NAT64 service for networks where dedicated NAT64 hardware would be overkill. ''; - homepage = http://www.litech.org/tayga; + homepage = "http://www.litech.org/tayga"; license = licenses.gpl2; maintainers = [ maintainers."0x4A6F" ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index a74dc7ca1d7..fd7b203fbbf 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Network sniffer"; - homepage = http://www.tcpdump.org/; + homepage = "http://www.tcpdump.org/"; license = "BSD-style"; maintainers = with stdenv.lib.maintainers; [ globin ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 032adbff74f..d6d7b45364a 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A suite of utilities for editing and replaying network traffic"; - homepage = http://tcpreplay.appneta.com/; + homepage = "http://tcpreplay.appneta.com/"; license = with licenses; [ bsd3 gpl3 ]; maintainers = with maintainers; [ eleanor ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/tcptraceroute/default.nix b/pkgs/tools/networking/tcptraceroute/default.nix index 01c832dbcea..6901166e38f 100644 --- a/pkgs/tools/networking/tcptraceroute/default.nix +++ b/pkgs/tools/networking/tcptraceroute/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "A traceroute implementation using TCP packets."; - homepage = https://github.com/mct/tcptraceroute; + homepage = "https://github.com/mct/tcptraceroute"; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 697c33957a3..216a2863f84 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -45,7 +45,7 @@ in pythonPackages.buildPythonPackage rec { doCheck = false; meta = { - homepage = https://www.telepresence.io/; + homepage = "https://www.telepresence.io/"; description = "Local development against a remote Kubernetes or OpenShift cluster"; license = with lib.licenses; [ asl20 ]; maintainers = with lib.maintainers; [ offline ]; diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 91378757af1..43dba8a8740 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoModule, Security }: +{ stdenv, fetchFromGitHub, buildGoModule }: buildGoModule rec { pname = "tendermint"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "1h51zgvjq3bm09yhm54rk8a86cqa1zma3mx6pb0kq7k72xvhpx0a"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; - homepage = https://tendermint.com/; + homepage = "https://tendermint.com/"; license = licenses.asl20; maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index a24ff25ef2b..ea1ef86f979 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli, Security }: +{ stdenv, fetchFromGitHub, makeWrapper, buildGoModule, wireshark-cli }: buildGoModule rec { pname = "termshark"; @@ -12,8 +12,7 @@ buildGoModule rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ wireshark-cli ] - ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = [ wireshark-cli ]; modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; @@ -27,7 +26,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - homepage = https://termshark.io/; + homepage = "https://termshark.io/"; description = "A terminal UI for wireshark-cli, inspired by Wireshark"; license = licenses.mit; maintainers = with maintainers; [ winpat elseym ]; diff --git a/pkgs/tools/networking/tftp-hpa/default.nix b/pkgs/tools/networking/tftp-hpa/default.nix index edd2abdd13e..2d88c9bf07e 100644 --- a/pkgs/tools/networking/tftp-hpa/default.nix +++ b/pkgs/tools/networking/tftp-hpa/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.bsd3; - homepage = https://www.kernel.org/pub/software/network/tftp/; + homepage = "https://www.kernel.org/pub/software/network/tftp/"; }; passthru = { diff --git a/pkgs/tools/networking/tinyproxy/default.nix b/pkgs/tools/networking/tinyproxy/default.nix index f3e6f2f156f..1a476676a25 100644 --- a/pkgs/tools/networking/tinyproxy/default.nix +++ b/pkgs/tools/networking/tinyproxy/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec{ stdenv.lib.optional stdenv.isDarwin "--disable-regexcheck"; meta = with stdenv.lib; { - homepage = https://tinyproxy.github.io/; + homepage = "https://tinyproxy.github.io/"; description = "A light-weight HTTP/HTTPS proxy daemon for POSIX operating systems"; license = licenses.gpl2; platforms = platforms.all; diff --git a/pkgs/tools/networking/tlspool/default.nix b/pkgs/tools/networking/tlspool/default.nix index df199869e60..c91c703f28f 100644 --- a/pkgs/tools/networking/tlspool/default.nix +++ b/pkgs/tools/networking/tlspool/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A supercharged TLS daemon that allows for easy, strong and consistent deployment"; license = licenses.gpl3; - homepage = http://www.tlspool.org; + homepage = "http://www.tlspool.org"; maintainers = with maintainers; [ leenaars qknight ]; }; } diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 6f9ee7355df..1124c2ab557 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -35,7 +35,7 @@ buildRustPackage rec { meta = with stdenv.lib; { description = "A server application to run tox node written in pure Rust"; - homepage = https://github.com/tox-rs/tox-node; + homepage = "https://github.com/tox-rs/tox-node"; license = [ licenses.mit ]; platforms = platforms.linux; maintainers = with maintainers; [ suhr ]; diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index e4faa5e30f4..10e4dc2f1b1 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; - homepage = https://github.com/cleverca22/toxvpn; + homepage = "https://github.com/cleverca22/toxvpn"; license = licenses.gpl3; maintainers = with maintainers; [ cleverca22 obadz toonn ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index 1d3c4190e38..1fe2d25e35d 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.tracebox.org/; + homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix index 8591db4e016..2948a571a38 100644 --- a/pkgs/tools/networking/traceroute/default.nix +++ b/pkgs/tools/networking/traceroute/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://traceroute.sourceforge.net/; + homepage = "http://traceroute.sourceforge.net/"; description = "Tracks the route taken by packets over an IP network"; license = stdenv.lib.licenses.gpl2; maintainers = [ maintainers.koral ]; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 7a4adc14c2d..f97d3c85762 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; license = stdenv.lib.licenses.bsd3; - homepage = https://monkey.org/~marius/pages/?page=trickle; + homepage = "https://monkey.org/~marius/pages/?page=trickle"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 44daa23cd92..5efca2cb7fd 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tridactyl native messaging host application"; - homepage = https://github.com/tridactyl/tridactyl; + homepage = "https://github.com/tridactyl/tridactyl"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ timokau ]; diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index b15b6dcba31..21cbd2dfefb 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tiny web auditor with strong opinions"; - homepage = https://github.com/trailofbits/twa; + homepage = "https://github.com/trailofbits/twa"; license = licenses.mit; maintainers = with maintainers; [ avaq ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/ua/default.nix b/pkgs/tools/networking/ua/default.nix index ddd0bab5d61..9ce7f5df247 100644 --- a/pkgs/tools/networking/ua/default.nix +++ b/pkgs/tools/networking/ua/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { buildInputs = [ glib libxml2 ]; meta = { - homepage = https://github.com/sloonz/ua; + homepage = "https://github.com/sloonz/ua"; license = stdenv.lib.licenses.isc; description = "Universal Aggregator"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/networking/ubridge/default.nix b/pkgs/tools/networking/ubridge/default.nix index a7f0993fed6..c628a2c8a8c 100644 --- a/pkgs/tools/networking/ubridge/default.nix +++ b/pkgs/tools/networking/ubridge/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ubridge"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "GNS3"; repo = "ubridge"; rev = "v${version}"; - sha256 = "1rwhbagac7msd116qymvlfh9qkz9jf0m8nl9xckwv68f57bhhjwl"; + sha256 = "0jg66jhhpv4c9340fsdp64hf9h253i8r81fknxa0gq241ripp3jn"; }; postPatch = '' diff --git a/pkgs/tools/networking/ucspi-tcp/default.nix b/pkgs/tools/networking/ucspi-tcp/default.nix index 8a3b292ad81..72325df8be7 100644 --- a/pkgs/tools/networking/ucspi-tcp/default.nix +++ b/pkgs/tools/networking/ucspi-tcp/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { Interface, using the TCP protocol. UCSPI tools are available for several different networks. ''; - homepage = http://cr.yp.to/ucspi-tcp.html; + homepage = "http://cr.yp.to/ucspi-tcp.html"; license = licenses.publicDomain; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/networking/udptunnel/default.nix b/pkgs/tools/networking/udptunnel/default.nix index 4ee4fa41833..08fb7cd62e0 100644 --- a/pkgs/tools/networking/udptunnel/default.nix +++ b/pkgs/tools/networking/udptunnel/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://code.google.com/archive/p/udptunnel/; + 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]; diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix index 68f457c2a63..a600d6c5341 100644 --- a/pkgs/tools/networking/uget-integrator/default.nix +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Native messaging host to integrate uGet Download Manager with web browsers"; - homepage = https://github.com/ugetdm/uget-integrator; + homepage = "https://github.com/ugetdm/uget-integrator"; license = licenses.gpl3; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 18d9defdd94..c03f68c36e2 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.9.5"; + version = "1.10.0"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "0myv8l886gmlh9nh4j3q5549idxnl51hf9cw20yxfqbwd47l13ca"; + sha256 = "0mg9divpysr42sp0m693a70693dp8025v6c9dv1yabr4g1jlhbqm"; }; # https://github.com/NLnetLabs/unbound/pull/90 @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Validating, recursive, and caching DNS resolver"; license = licenses.bsd3; - homepage = https://www.unbound.net; + homepage = "https://www.unbound.net"; maintainers = with maintainers; [ ehmry fpletz globin ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index c1186204104..939c2299e32 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Python library for Unbound, the validating, recursive, and caching DNS resolver"; license = licenses.bsd3; - homepage = http://www.unbound.net; + homepage = "http://www.unbound.net"; maintainers = with maintainers; [ leenaars ]; platforms = stdenv.lib.platforms.unix; broken = true; diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 3e572a10da0..e7cbaa73cce 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -24,7 +24,7 @@ python3Packages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A tool for monitoring webpages for updates"; - homepage = https://thp.io/2008/urlwatch/; + homepage = "https://thp.io/2008/urlwatch/"; license = licenses.bsd3; maintainers = with maintainers; [ tv ]; }; diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix index 4a8dab9366f..bd38a1cfa2f 100644 --- a/pkgs/tools/networking/uwimap/default.nix +++ b/pkgs/tools/networking/uwimap/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation ({ ''; meta = { - homepage = https://www.washington.edu/imap/; + 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; diff --git a/pkgs/tools/networking/vlan/default.nix b/pkgs/tools/networking/vlan/default.nix index 7a6a37c9112..331a993f3ac 100644 --- a/pkgs/tools/networking/vlan/default.nix +++ b/pkgs/tools/networking/vlan/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "vlan-1.9"; src = fetchurl { - url = mirror://gentoo/distfiles/vlan.1.9.tar.gz; + url = "mirror://gentoo/distfiles/vlan.1.9.tar.gz"; sha256 = "1jjc5f26hj7bk8nkjxsa8znfxcf8pgry2ipnwmj2fr6ky0dhm3rv"; }; diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index 424355e41df..7a52112e65f 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.unix-ag.uni-kl.de/~massar/vpnc/; + 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; diff --git a/pkgs/tools/networking/vtun/default.nix b/pkgs/tools/networking/vtun/default.nix index d2cbb5d8a4e..71d9097a150 100644 --- a/pkgs/tools/networking/vtun/default.nix +++ b/pkgs/tools/networking/vtun/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; patches = [ - (fetchpatch { url = http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch; + (fetchpatch { url = "http://sources.debian.net/data/main/v/vtun/3.0.3-2.2/debian/patches/08-gcc5-inline.patch"; sha256 = "18sys97v2hx6vac5zp3ld7sa6kz4izv3g9dnkm0lflbaxhym2vs1"; }) ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Virtual Tunnels over TCP/IP with traffic shaping, compression and encryption"; - homepage = http://vtun.sourceforge.net/; + homepage = "http://vtun.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index 89177f49ecf..dab52720a02 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = "Ncurses-based monitoring application for wireless network devices"; - homepage = https://github.com/uoaerg/wavemon; + homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin fpletz ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/networking/wbox/default.nix b/pkgs/tools/networking/wbox/default.nix index b1fb6ae8d90..8b10bb599c4 100644 --- a/pkgs/tools/networking/wbox/default.nix +++ b/pkgs/tools/networking/wbox/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A simple HTTP benchmarking tool"; - homepage = http://www.hping.org/wbox/; + homepage = "http://www.hping.org/wbox/"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/networking/webalizer/default.nix b/pkgs/tools/networking/webalizer/default.nix index bd80eae2beb..133aac67bdb 100644 --- a/pkgs/tools/networking/webalizer/default.nix +++ b/pkgs/tools/networking/webalizer/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "webalizer-2.23-05"; src = fetchurl { - url = ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2; + url = "ftp://ftp.mrunix.net/pub/webalizer/webalizer-2.23-05-src.tar.bz2"; sha256 = "0nl88y57a7gawfragj3viiigfkh5sgivfb4n0k89wzcjw278pj5g"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Web server log file analysis program"; - homepage = http://www.webalizer.org; + homepage = "http://www.webalizer.org"; platforms = platforms.unix; license = licenses.gpl2; }; diff --git a/pkgs/tools/networking/weighttp/default.nix b/pkgs/tools/networking/weighttp/default.nix index 8ba47534cfb..efcb8d8cf42 100644 --- a/pkgs/tools/networking/weighttp/default.nix +++ b/pkgs/tools/networking/weighttp/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.4"; src = fetchgit { - url = https://git.lighttpd.net/weighttp.git; + url = "https://git.lighttpd.net/weighttp.git"; rev = "refs/tags/weighttp-${version}"; sha256 = "14yjmdx9p8g8c3zlrx5qid8k156lsagfwhl3ny54162nxjf7kzgr"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { platforms = stdenv.lib.platforms.unix; - homepage = https://redmine.lighttpd.net/projects/weighttp/wiki; + 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 b7486ded4c8..77913c4f32a 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/wget/; + homepage = "https://www.gnu.org/software/wget/"; maintainers = with maintainers; [ fpletz ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 1010c5d9cda..35124ef6719 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { select the appropriate WHOIS server for most queries. ''; - homepage = https://packages.qa.debian.org/w/whois.html; + homepage = "https://packages.qa.debian.org/w/whois.html"; license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; platforms = platforms.unix; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 2f95876c2f3..8cd0b7c55f7 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -103,7 +103,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://wicd.net/; + homepage = "http://wicd.net/"; description = "A wiredless and wired network manager"; longDescription='' A complete network connection manager diff --git a/pkgs/tools/networking/wireguard-go/default.nix b/pkgs/tools/networking/wireguard-go/default.nix index a722a8016bc..1fa8bac33e2 100644 --- a/pkgs/tools/networking/wireguard-go/default.nix +++ b/pkgs/tools/networking/wireguard-go/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Userspace Go implementation of WireGuard"; - homepage = https://git.zx2c4.com/wireguard-go/about/; + homepage = "https://git.zx2c4.com/wireguard-go/about/"; license = licenses.gpl2; maintainers = with maintainers; [ elseym kirelagin yegortimoshenko zx2c4 ]; }; diff --git a/pkgs/tools/networking/wol/default.nix b/pkgs/tools/networking/wol/default.nix index 570d800311e..3ca10e2ecbc 100644 --- a/pkgs/tools/networking/wol/default.nix +++ b/pkgs/tools/networking/wol/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implements Wake On LAN functionality in a small program"; - homepage = https://sourceforge.net/projects/wake-on-lan/; + homepage = "https://sourceforge.net/projects/wake-on-lan/"; license = licenses.gpl2; maintainers = with maintainers; [ makefu ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/wolfebin/default.nix b/pkgs/tools/networking/wolfebin/default.nix index 7eded00db85..52874e89bbe 100644 --- a/pkgs/tools/networking/wolfebin/default.nix +++ b/pkgs/tools/networking/wolfebin/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/thejoshwolfe/wolfebin; + homepage = "https://github.com/thejoshwolfe/wolfebin"; description = "Quick and easy file sharing"; license = licenses.mit; maintainers = [ maintainers.andrewrk ]; diff --git a/pkgs/tools/networking/wrk/default.nix b/pkgs/tools/networking/wrk/default.nix index 98705430c2f..40daeb86194 100644 --- a/pkgs/tools/networking/wrk/default.nix +++ b/pkgs/tools/networking/wrk/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "HTTP benchmarking tool"; - homepage = https://github.com/wg/wrk; + homepage = "https://github.com/wg/wrk"; longDescription = '' wrk is a modern HTTP benchmarking tool capable of generating significant load when run on a single multi-core CPU. It diff --git a/pkgs/tools/networking/wrk2/default.nix b/pkgs/tools/networking/wrk2/default.nix index 7908143bdab..2a5e8e3a5dc 100644 --- a/pkgs/tools/networking/wrk2/default.nix +++ b/pkgs/tools/networking/wrk2/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { description = "Constant throughput, correct latency recording variant of wrk"; - homepage = https://github.com/giltene/wrk2; + homepage = "https://github.com/giltene/wrk2"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/networking/wuzz/default.nix b/pkgs/tools/networking/wuzz/default.nix index e84a97525f1..8db9c07ffc5 100644 --- a/pkgs/tools/networking/wuzz/default.nix +++ b/pkgs/tools/networking/wuzz/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/asciimoo/wuzz; + homepage = "https://github.com/asciimoo/wuzz"; description = "Interactive cli tool for HTTP inspection"; license = licenses.agpl3; maintainers = with maintainers; [ pradeepchhetri ]; diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix index 1b9d5534903..7e1597451b1 100644 --- a/pkgs/tools/networking/x11-ssh-askpass/default.nix +++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; src = fetchurl { - url = http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz; + url = "http://pkgs.fedoraproject.org/repo/pkgs/openssh/x11-ssh-askpass-1.2.4.1.tar.gz/8f2e41f3f7eaa8543a2440454637f3c3/x11-ssh-askpass-1.2.4.1.tar.gz"; sha256 = "620de3c32ae72185a2c9aeaec03af24242b9621964e38eb625afb6cdb30b8c88"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { installTargets = [ "install" "install.man" ]; meta = with stdenv.lib; { - homepage = https://github.com/sigmavirus24/x11-ssh-askpass; + homepage = "https://github.com/sigmavirus24/x11-ssh-askpass"; description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index 01453379022..38a45fd3e6f 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = http://www.xelerance.com/software/xl2tpd/; + homepage = "http://www.xelerance.com/software/xl2tpd/"; description = "Layer 2 Tunnelling Protocol Daemon (RFC 2661)"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/networking/xnbd/default.nix b/pkgs/tools/networking/xnbd/default.nix index a874565684f..79a968f806e 100644 --- a/pkgs/tools/networking/xnbd/default.nix +++ b/pkgs/tools/networking/xnbd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://bitbucket.org/hirofuchi/xnbd; + 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 ]; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 605801b6ab7..91b08015327 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Foundation }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "yggdrasil"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "yggdrasil-network"; repo = "yggdrasil-go"; rev = "v${version}"; - sha256 = "1k3xxarrl33sxik1dqahfllrhd501xqq5q5mcn4y5wi9lwywsy50"; + sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; }; - modSha256 = "057yl3i29kwpd129aa2rb67s5rmz898fi2a7lxv3nfjp7018s9qw"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Foundation ]; + modSha256 = "1ffp7q7kbkm1312sz6xnpc7342iczy9vj3m76lflirr1ljmw0dnb"; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to @@ -29,7 +27,7 @@ buildGoModule rec { -s -w ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; homepage = "https://yggdrasil-network.github.io/"; diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix index a259d892cc1..9b76d033829 100644 --- a/pkgs/tools/networking/yrd/default.nix +++ b/pkgs/tools/networking/yrd/default.nix @@ -22,6 +22,6 @@ in pythonPackages.buildPythonApplication { maintainers = with maintainers; [ akru ]; platforms = platforms.linux; license = licenses.gpl3; - homepage = https://github.com/kpcyrd/yrd; + homepage = "https://github.com/kpcyrd/yrd"; }; } diff --git a/pkgs/tools/networking/zap/default.nix b/pkgs/tools/networking/zap/default.nix index 3acd207df95..2d8902f6909 100644 --- a/pkgs/tools/networking/zap/default.nix +++ b/pkgs/tools/networking/zap/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.owasp.org/index.php/ZAP; + homepage = "https://www.owasp.org/index.php/ZAP"; description = "Java application for web penetration testing"; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 2a3987f490f..666b30d2c8e 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Create flat virtual Ethernet networks of almost unlimited size"; - homepage = https://www.zerotier.com; + homepage = "https://www.zerotier.com"; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; platforms = platforms.all; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index b2016fe9452..720c43ccc2d 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { # Cargo-culted from Arch, returns “out of pty's” without it (fetchurl { name = "fix_use_ptmx_on_arch.patch"; - url = https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67; + url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/fix_use_ptmx_on_arch.patch?h=packages/zssh&id=0a7c92543f9309856d02e31196f06d7c3eaa8b67"; sha256 = "12daw9wpy58ql882zww945wk9cg2adwp8qsr5rvazx0xq0qawgbr"; }) ]; @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { meta = { description = "SSH and Telnet client with ZMODEM file transfer capability"; - homepage = http://zssh.sourceforge.net/; + homepage = "http://zssh.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix new file mode 100644 index 00000000000..dc69d3f030d --- /dev/null +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, openssl, pkgconfig, ronn, rustPlatform }: + +let + blake3-src = fetchFromGitHub { + owner = "BLAKE3-team"; + repo = "BLAKE3"; + rev = "0.3.1"; + sha256 = "0wkxx2w56hsng28p8zpndsy288ix4s5qg6xqjzgjz53fbyk46hda"; + }; + +in rustPlatform.buildRustPackage rec { + pname = "cached-nix-shell"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "xzfc"; + repo = pname; + rev = "v${version}"; + sha256 = "0pzwknpc4qrh9pv5z0xvldql2dkj9ddksvaci86a4f8cnd86p2l6"; + }; + + cargoSha256 = "1n88gcnrfdrk025hb54igc83cn5vlv8n6ndyx1ydmzhd95vhbznf"; + + # The BLAKE3 C library is intended to be built by the project depending on it + # rather than as a standalone library. + # https://github.com/BLAKE3-team/BLAKE3/blob/0.3.1/c/README.md#building + BLAKE3_CSRC = "${blake3-src}/c"; + + nativeBuildInputs = [ ronn ]; + + postBuild = '' + ronn -r cached-nix-shell.1.md + ''; + + postInstall = '' + mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty + cp target/release/build/cached-nix-shell-*/out/trace-nix.so $out/lib + cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh + cp cached-nix-shell.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Instant startup time for nix-shell"; + homepage = "https://github.com/xzfc/cached-nix-shell"; + license = with licenses; [ unlicense /* or */ mit ]; + maintainers = with maintainers; [ xzfc ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index d69b5943123..da8ba3bce8e 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "nix-script"; - version = "2015-09-22"; + version = "2020-03-23"; src = fetchFromGitHub { owner = "bennofs"; repo = "nix-script"; - rev = "83064dc557b642f6748d4f2372b2c88b2a82c4e7"; - sha256 = "0iwclyd2zz8lv012yghfr4696kdnsq6xvc91wv00jpwk2c09xl7a"; + rev = "7706b45429ff22c35bab575734feb2926bf8840b"; + sha256 = "0yiqljamcj9x8z801bwj7r30sskrwv4rm6sdf39j83jqql1fyq7y"; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A shebang for running inside nix-shell."; - homepage = https://github.com/bennofs/nix-script; + homepage = "https://github.com/bennofs/nix-script"; license = licenses.bsd3; maintainers = with maintainers; [ bennofs rnhmjoj ]; platforms = haskellPackages.ghc.meta.platforms; diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 6ea28dbea2b..cdcb274945e 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Generate documentation for Nix functions"; - homepage = https://github.com/tazjin/nixdoc; + homepage = "https://github.com/tazjin/nixdoc"; license = [ licenses.gpl3 ]; maintainers = [ maintainers.tazjin ]; platforms = platforms.unix; diff --git a/pkgs/tools/package-management/apt-dater/default.nix b/pkgs/tools/package-management/apt-dater/default.nix index f161591c8f1..49669cba40a 100644 --- a/pkgs/tools/package-management/apt-dater/default.nix +++ b/pkgs/tools/package-management/apt-dater/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://github.com/DE-IBH/apt-dater; + homepage = "https://github.com/DE-IBH/apt-dater"; description = "Terminal-based remote package update manager"; longDescription = '' Provides an ncurses frontend for managing package updates on a large diff --git a/pkgs/tools/package-management/apt/default.nix b/pkgs/tools/package-management/apt/default.nix index 0438e340b21..b83c49029b3 100644 --- a/pkgs/tools/package-management/apt/default.nix +++ b/pkgs/tools/package-management/apt/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line package management tools used on Debian-based systems"; - homepage = https://salsa.debian.org/apt-team/apt; + homepage = "https://salsa.debian.org/apt-team/apt"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/package-management/bunny/default.nix b/pkgs/tools/package-management/bunny/default.nix index 938a762ba30..33c6249ebd4 100644 --- a/pkgs/tools/package-management/bunny/default.nix +++ b/pkgs/tools/package-management/bunny/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A simple shell script wrapper around multiple package managers"; - homepage = https://gitlab.com/tim241/bunny; + homepage = "https://gitlab.com/tim241/bunny"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ buffet ]; diff --git a/pkgs/tools/package-management/cargo-deps/default.nix b/pkgs/tools/package-management/cargo-deps/default.nix index e648990ccf8..d90d0fe7979 100644 --- a/pkgs/tools/package-management/cargo-deps/default.nix +++ b/pkgs/tools/package-management/cargo-deps/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo subcommand for building dependency graphs of Rust projects"; - homepage = https://github.com/m-cat/cargo-deps; + homepage = "https://github.com/m-cat/cargo-deps"; license = licenses.mit; maintainers = with maintainers; [ arcnmx ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/cargo-edit/default.nix b/pkgs/tools/package-management/cargo-edit/default.nix index 2fdf8a99956..7bcc6c12ee9 100644 --- a/pkgs/tools/package-management/cargo-edit/default.nix +++ b/pkgs/tools/package-management/cargo-edit/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A utility for managing cargo dependencies from the command line"; - homepage = https://github.com/killercup/cargo-edit; + homepage = "https://github.com/killercup/cargo-edit"; license = with licenses; [ asl20 /* or */ mit ]; maintainers = with maintainers; [ gerschtli jb55 filalex77 killercup ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index a87387b3831..41b6d26d02d 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.8"; + version = "0.9.9"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "112yk46yq484zvr8mbj678qsirmyn2ij2h0z359qrhhl7r19icab"; + sha256 = "01yvkfclrynv7gpvdckzbcv03xr28yb4v6333a6nv6gy05p26g3a"; }; - cargoSha256 = "1bjs7lkbamy9za619z31ycqqgrfhvxbgfgpc79ykh4mfwphxzg3n"; + cargoSha256 = "152f2f16d5vlww51aldvh1r2r4kx8ad5d48dc30xsfj669zzw24h"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] diff --git a/pkgs/tools/package-management/cargo-release/default.nix b/pkgs/tools/package-management/cargo-release/default.nix index 145d8aaacc0..69a55bcda91 100644 --- a/pkgs/tools/package-management/cargo-release/default.nix +++ b/pkgs/tools/package-management/cargo-release/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = ''Cargo subcommand "release": everything about releasing a rust crate''; - homepage = https://github.com/sunng87/cargo-release; + homepage = "https://github.com/sunng87/cargo-release"; license = with licenses; [ mit ]; maintainers = with maintainers; [ gerschtli ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/cargo-update/default.nix b/pkgs/tools/package-management/cargo-update/default.nix index c0a1e8edc0f..8dc07d287d2 100644 --- a/pkgs/tools/package-management/cargo-update/default.nix +++ b/pkgs/tools/package-management/cargo-update/default.nix @@ -23,8 +23,8 @@ rustPlatform.buildRustPackage rec { cargoPatches = [ ./0001-Generate-lockfile-for-cargo-update-v3.0.0.patch ]; cargoSha256 = "034v1ql5k3n3rgi3aqszkybvv3vc80v263c9nlwxcwbswsh9jpp1"; - nativeBuildInputs = [ cmake ]; - buildInputs = [ libgit2 libssh2 openssl pkg-config zlib ] + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libgit2 libssh2 openssl zlib ] ++ stdenv.lib.optional stdenv.isDarwin curl; meta = with stdenv.lib; { diff --git a/pkgs/tools/package-management/cde/default.nix b/pkgs/tools/package-management/cde/default.nix index 5354fbb5e5e..ec6ad6eb55a 100644 --- a/pkgs/tools/package-management/cde/default.nix +++ b/pkgs/tools/package-management/cde/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/pgbovine/CDE; + homepage = "https://github.com/pgbovine/CDE"; description = "A packaging tool for building portable packages"; license = licenses.gpl3; maintainers = [ maintainers.rlupton20 ]; diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix index 6605d9de65a..bd23da8efb5 100644 --- a/pkgs/tools/package-management/checkinstall/default.nix +++ b/pkgs/tools/package-management/checkinstall/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "checkinstall-1.6.2"; src = fetchurl { - url = http://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-1.6.2.tar.gz; + url = "http://www.asic-linux.com.mx/~izto/checkinstall/files/source/checkinstall-1.6.2.tar.gz"; sha256 = "1x4kslyvfd6lm6zd1ylbq2pjxrafb77ydfjaqi16sa5qywn1jqfw"; }; @@ -65,7 +65,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://checkinstall.izto.org/; + 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; diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 75c47dda0c4..5fdf6d66362 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "C micro-package manager"; - homepage = https://github.com/clibs/clib; + homepage = "https://github.com/clibs/clib"; license = licenses.mit; maintainers = with maintainers; [ jb55 ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/conda/default.nix b/pkgs/tools/package-management/conda/default.nix index 92d0e254312..325a5c4fa5e 100644 --- a/pkgs/tools/package-management/conda/default.nix +++ b/pkgs/tools/package-management/conda/default.nix @@ -66,7 +66,7 @@ in meta = { description = "Conda is a package manager for Python"; - homepage = https://conda.io/; + homepage = "https://conda.io/"; platforms = lib.platforms.linux; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine bhipple ]; diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix index dd64241fd37..5ede7af10bf 100644 --- a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix +++ b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "DisnixWebService-0.9"; src = fetchurl { - url = https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz; + url = "https://github.com/svanderburg/DisnixWebService/releases/download/DisnixWebService-0.9/DisnixWebService-0.9.tar.gz"; sha256 = "1z7w44bf023c0aqchjfi4mla3qbhsh87mdzx7pqn0sy74cjfgqvl"; }; buildInputs = [ apacheAnt jdk ]; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 2c5bc41e18d..cc6072eb6dc 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "disnix-0.9.1"; src = fetchurl { - url = https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz; + url = "https://github.com/svanderburg/disnix/releases/download/disnix-0.9.1/disnix-0.9.1.tar.gz"; sha256 = "0bidln5xw3raqkvdks9aipis8aaza8asgyapmilnxkkrxgmw7rdf"; }; diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix index 319716c0f3e..709c5454e10 100644 --- a/pkgs/tools/package-management/disnix/disnixos/default.nix +++ b/pkgs/tools/package-management/disnix/disnixos/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "disnixos-0.8"; src = fetchurl { - url = https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz; + url = "https://github.com/svanderburg/disnixos/releases/download/disnixos-0.8/disnixos-0.8.tar.gz"; sha256 = "186blirfx89i8hdp4a0djy4q9qr9wcl0ilwr66hlil0wxqj1sr91"; }; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 7b5d99bef9e..12956590c7b 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -24,7 +24,7 @@ assert enableInfluxDatabase -> influxdb != null; stdenv.mkDerivation { name = "dysnomia-0.9"; src = fetchurl { - url = https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9/dysnomia-0.9.tar.gz; + url = "https://github.com/svanderburg/dysnomia/releases/download/dysnomia-0.9/dysnomia-0.9.tar.gz"; sha256 = "09pk2l3pss48kvm5wvskh842vakbzmjzxzfzyw1nkqnvni130ikl"; }; diff --git a/pkgs/tools/package-management/elm-github-install/Gemfile.lock b/pkgs/tools/package-management/elm-github-install/Gemfile.lock index a551368eade..5b586256278 100644 --- a/pkgs/tools/package-management/elm-github-install/Gemfile.lock +++ b/pkgs/tools/package-management/elm-github-install/Gemfile.lock @@ -36,4 +36,4 @@ DEPENDENCIES elm_install BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/tools/package-management/elm-github-install/default.nix b/pkgs/tools/package-management/elm-github-install/default.nix index 5703a13745b..8da05981daf 100644 --- a/pkgs/tools/package-management/elm-github-install/default.nix +++ b/pkgs/tools/package-management/elm-github-install/default.nix @@ -13,7 +13,7 @@ bundlerEnv rec { meta = with lib; { description = "Install Elm packages from git repositories."; - homepage = https://github.com/gdotdesign/elm-github-install; + homepage = "https://github.com/gdotdesign/elm-github-install"; license = licenses.unfree; maintainers = with maintainers; [ roberth nicknovitski ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 8845c54b571..bb91697ab57 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,22 +2,21 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.12"; + version = "0.2.15"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "1jhv7c68ymwaq9fr586rjbgcaxpkxcr0d3pq7lyhbzihaywz7m6m"; + sha256 = "1h1z18m504kflzv9wcybkgc4xr5w9l9d7qsjri0an57lxv6dpv0f"; }; - cargoSha256 = "1n4k8mnsix3sy6pmqkk7wymknn1mn5dkwa9i90nlb4k2h9y709wj"; + cargoSha256 = "1wfxy4py2xwf1m0i52jq1f9xgzc7v5m55crl0xbp8f0raflksaxk"; meta = with lib; { description = "Mirror installed software on multiple machines"; homepage = "https://github.com/tversteeg/emplace"; license = licenses.agpl3; maintainers = with maintainers; [ filalex77 ]; - platforms = platforms.all; }; } diff --git a/pkgs/tools/package-management/fpm/Gemfile.lock b/pkgs/tools/package-management/fpm/Gemfile.lock index 1045c7b495a..c8bb7d36413 100644 --- a/pkgs/tools/package-management/fpm/Gemfile.lock +++ b/pkgs/tools/package-management/fpm/Gemfile.lock @@ -44,4 +44,4 @@ DEPENDENCIES fpm BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/package-management/fpm/default.nix b/pkgs/tools/package-management/fpm/default.nix index ccb50717acc..4eab1556d95 100644 --- a/pkgs/tools/package-management/fpm/default.nix +++ b/pkgs/tools/package-management/fpm/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Tool to build packages for multiple platforms with ease"; - homepage = https://github.com/jordansissel/fpm; + homepage = "https://github.com/jordansissel/fpm"; license = licenses.mit; maintainers = with maintainers; [ manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 8e8d30e4fcc..791dfe755ee 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A packaging tool built around IPFS"; - homepage = https://github.com/whyrusleeping/gx; + homepage = "https://github.com/whyrusleeping/gx"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 0a0793130d1..652edf95e55 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A tool for importing go packages into gx"; - homepage = https://github.com/whyrusleeping/gx-go; + homepage = "https://github.com/whyrusleeping/gx-go"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 793c7cfae32..8c70a5a4724 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-03-07"; + version = "2020-03-17"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "5c1e7349bbd9b51fe41ea96b67c380feef996b90"; - sha256 = "03lw5pq878zbkkwm5abr01p77radn2zgfyvwlra7fhywbl76l83x"; + rev = "5969551a5cc52f9470b5ff5ca01327bf4bda82c1"; + sha256 = "0f4kz83a1kp3ci8zi5hvp8fp34wi73arpykl4d9vlywdk6w36bnd"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 6afba001e08..54435b76947 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch, Security }: +{ stdenv, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "mynewt-newt"; @@ -13,21 +13,19 @@ buildGoModule rec { patches = [ (fetchpatch { - url = https://github.com/apache/mynewt-newt/commit/6a51e35565323ebe8feb8d1aa6e00960b6ce662e.patch; + url = "https://github.com/apache/mynewt-newt/commit/6a51e35565323ebe8feb8d1aa6e00960b6ce662e.patch"; sha256 = "186yha60jzcjq8r04w12rqqh3cin2w974l77hz2ixhmjzyr56wqv"; }) (fetchpatch { - url = https://github.com/apache/mynewt-newt/commit/7d4ef3fe65a9a83cc58e7bd973654ad235cc68bc.patch; + url = "https://github.com/apache/mynewt-newt/commit/7d4ef3fe65a9a83cc58e7bd973654ad235cc68bc.patch"; sha256 = "01scmq58bfr4c9icqzm79q7a55izflsb3mlx9xn0dv92m3mbprx7"; }) ]; modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - meta = with stdenv.lib; { - homepage = https://mynewt.apache.org/; + homepage = "https://mynewt.apache.org/"; description = "Build and package management tool for embedded development."; longDescription = '' Apache Newt is a smart build and package management tool, diff --git a/pkgs/tools/package-management/niff/default.nix b/pkgs/tools/package-management/niff/default.nix index 8c6a72cf131..9d3736f6faa 100644 --- a/pkgs/tools/package-management/niff/default.nix +++ b/pkgs/tools/package-management/niff/default.nix @@ -27,8 +27,8 @@ in stdenv.mkDerivation { meta = { description = "A program that compares two Nix expressions and determines which attributes changed"; - homepage = https://github.com/FRidh/niff; + homepage = "https://github.com/FRidh/niff"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.fridh ]; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/nix-bundle/default.nix b/pkgs/tools/package-management/nix-bundle/default.nix index b78b3bf07cd..352d1e68b50 100644 --- a/pkgs/tools/package-management/nix-bundle/default.nix +++ b/pkgs/tools/package-management/nix-bundle/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; description = "Create bundles from Nixpkgs attributes"; license = licenses.mit; - homepage = https://github.com/matthewbauer/nix-bundle; + homepage = "https://github.com/matthewbauer/nix-bundle"; }; } diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 6ee7dee33f6..fa1394242d2 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A tool to determine which gc-roots take space in your nix store"; - homepage = https://github.com/symphorien/nix-du; + homepage = "https://github.com/symphorien/nix-du"; license = licenses.lgpl3; maintainers = [ maintainers.symphorien ]; platforms = platforms.unix; diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index da7469ea646..db26f9e0b08 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A files database for nixpkgs"; - homepage = https://github.com/bennofs/nix-index; + homepage = "https://github.com/bennofs/nix-index"; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.bennofs ]; platforms = platforms.all; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 63f948db9db..fccfbe98f78 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/edolstra/nix-serve; + homepage = "https://github.com/edolstra/nix-serve"; description = "A utility for sharing a Nix store as a binary cache"; maintainers = [ maintainers.eelco ]; license = licenses.lgpl21; diff --git a/pkgs/tools/package-management/nix-top/default.nix b/pkgs/tools/package-management/nix-top/default.nix index 1d2cad2e39e..0a003ba6b6b 100644 --- a/pkgs/tools/package-management/nix-top/default.nix +++ b/pkgs/tools/package-management/nix-top/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tracks what nix is building"; - homepage = https://github.com/samueldr/nix-top; + homepage = "https://github.com/samueldr/nix-top"; license = licenses.mit; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/package-management/nix-universal-prefetch/default.nix b/pkgs/tools/package-management/nix-universal-prefetch/default.nix index a4e43f14967..7079904735d 100644 --- a/pkgs/tools/package-management/nix-universal-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-universal-prefetch/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Uses nixpkgs fetchers to figure out hashes"; - homepage = https://github.com/samueldr/nix-universal-prefetch; + homepage = "https://github.com/samueldr/nix-universal-prefetch"; license = licenses.mit; maintainers = with maintainers; [ samueldr ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 29af4a90cb9..96fd1bebdd4 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, callPackage +{ lib, fetchurl, fetchFromGitHub, callPackage , storeDir ? "/nix/store" , stateDir ? "/nix/var" , confDir ? "/etc" @@ -12,6 +12,7 @@ common = { lib, stdenv, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz , bash, coreutils, gzip, gnutar , pkgconfig, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json + , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , jq, libarchive, rustc, cargo , busybox-sandbox-shell , storeDir @@ -20,7 +21,7 @@ common = , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withAWS ? stdenv.isLinux || stdenv.isDarwin, aws-sdk-cpp - , name, suffix ? "", src, includesPerl ? false + , name, suffix ? "", src, crates ? null }: let @@ -29,7 +30,6 @@ common = inherit name src; version = lib.getVersion name; - is20 = lib.versionAtLeast version "2.0pre"; is24 = lib.versionAtLeast version "2.4pre"; isExactly23 = lib.versionAtLeast version "2.3" && lib.versionOlder version "2.4"; @@ -39,21 +39,22 @@ common = nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals (!is20) [ curl perl ] - ++ lib.optionals is24 [ jq ]; + ++ lib.optionals is24 [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook_xsl_ns jq ]; - buildInputs = [ curl openssl sqlite xz bzip2 nlohmann_json ] + buildInputs = + [ curl openssl sqlite xz bzip2 nlohmann_json + brotli boost editline + ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is20 [ brotli boost editline ] ++ lib.optionals is24 [ libarchive rustc cargo ] ++ lib.optional withLibseccomp libseccomp - ++ lib.optional (withAWS && is20) + ++ lib.optional withAWS ((aws-sdk-cpp.override { apis = ["s3" "transfer"]; customMemoryManagement = false; }).overrideDerivation (args: { patches = args.patches or [] ++ [(fetchpatch { - url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch; + url = "https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch"; sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1"; })]; })); @@ -66,7 +67,7 @@ common = preConfigure = # Copy libboost_context so we don't get all of Boost in our closure. # https://github.com/NixOS/nixpkgs/issues/45462 - lib.optionalString is20 '' + '' mkdir -p $out/lib cp -pd ${boost}/lib/{libboost_context*,libboost_thread*,libboost_system*} $out/lib rm -f $out/lib/*.a @@ -75,6 +76,11 @@ common = patchelf --set-rpath $out/lib:${stdenv.cc.cc.lib}/lib $out/lib/libboost_thread.so.* ''} '' + + # Unpack the Rust crates. + lib.optionalString is24 '' + tar xvf ${crates} -C nix-rust/ + mv nix-rust/nix-vendored-crates* nix-rust/vendor + '' + # For Nix-2.3, patch around an issue where the Nix configure step pulls in the # build system's bash and other utilities when cross-compiling lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform && isExactly23) '' @@ -97,12 +103,7 @@ common = "--disable-init-state" "--enable-gc" ] - ++ lib.optionals (!is20) [ - "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" - "--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}" - "--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}" - "BDW_GC_LIBS=\"-lgc -lgccpp\"" - ] ++ lib.optionals (is20 && stdenv.isLinux) [ + ++ lib.optionals stdenv.isLinux [ "--with-sandbox-shell=${sh}/bin/busybox" ] ++ lib.optional ( @@ -135,7 +136,7 @@ common = a package, multi-user package management and easy setup of build environments. ''; - homepage = https://nixos.org/; + homepage = "https://nixos.org/"; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.unix; @@ -143,7 +144,7 @@ common = }; passthru = { - perl-bindings = if includesPerl then nix else stdenv.mkDerivation { + perl-bindings = stdenv.mkDerivation { pname = "nix-perl"; inherit version; @@ -154,8 +155,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 ] - ++ lib.optional is20 boost; + [ perl pkgconfig curl nix libsodium boost autoreconfHook autoconf-archive ]; configureFlags = [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" @@ -174,24 +174,11 @@ in rec { nix = nixStable; - nix1 = callPackage common rec { - name = "nix-1.11.16"; - src = fetchurl { - url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; - }; - - # Nix1 has the perl bindings by default, so no need to build the manually. - includesPerl = true; - - inherit storeDir stateDir confDir boehmgc; - }; - nixStable = callPackage common (rec { - name = "nix-2.3.3"; + name = "nix-2.3.4"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "332fffb8dfc33eab854c136ef162a88cec15b701def71fa63714d160831ba224"; + sha256 = "1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d"; }; inherit storeDir stateDir confDir boehmgc; @@ -201,10 +188,18 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre7250_94c93437"; - src = fetchurl { - url = "https://hydra.nixos.org/build/112193977/download/3/nix-2.4${suffix}.tar.xz"; - sha256 = "f9baf241c9449c1e3e5c9610adbcd2ce9e5fbcab16aff3ba3030d2fad7b34d7b"; + suffix = "pre7346_5e7ccdc9"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "5e7ccdc9e3ddd61dc85e20c898001345bfb497a5"; + sha256 = "10jg0rq92xbigbbri7harn4b75blqaf6rjgq4hhvlnggf2w9iprg"; + }; + + crates = fetchurl { + url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; + sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; }; inherit storeDir stateDir confDir boehmgc; @@ -212,10 +207,18 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200220_4a4521f"; - src = fetchurl { - url = "https://hydra.nixos.org/build/113373394/download/3/nix-2.4${suffix}.tar.xz"; - sha256 = "31fe87c40f40a590bc8f575283725d5f04ecb9aebb6b404f679d77438d75265d"; + suffix = "pre20200403_3473b19"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "nix"; + rev = "3473b1950a90d596a3baa080fdfdb080f55a5cc0"; + sha256 = "1bb7a8a5lzmb3pzq80zxd3s9y3qv757q7032s5wvp75la9wgvmvr"; + }; + + crates = fetchurl { + url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; + sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix index 79400a8e5ea..59d139d2884 100644 --- a/pkgs/tools/package-management/nixops/generic.nix +++ b/pkgs/tools/package-management/nixops/generic.nix @@ -46,7 +46,7 @@ python2Packages.buildPythonApplication { ''; meta = { - homepage = https://github.com/NixOS/nixops; + homepage = "https://github.com/NixOS/nixops"; description = "NixOS cloud provisioning and deployment tool"; maintainers = with lib.maintainers; [ aminechikhaoui eelco rob domenkozar ]; platforms = lib.platforms.unix; diff --git a/pkgs/tools/package-management/nixops/nixops-dns.nix b/pkgs/tools/package-management/nixops/nixops-dns.nix index f63fe868e01..cf633a65ca5 100644 --- a/pkgs/tools/package-management/nixops/nixops-dns.nix +++ b/pkgs/tools/package-management/nixops/nixops-dns.nix @@ -17,7 +17,7 @@ buildGoPackage rec { }; meta = with lib; { - homepage = https://github.com/kamilchm/nixops-dns/; + homepage = "https://github.com/kamilchm/nixops-dns/"; description = "DNS server for resolving NixOps machines"; license = licenses.mit; maintainers = with maintainers; [ kamilchm sorki ]; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 9f54d82d3cd..d8811b2a7e2 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "Review pull-requests on https://github.com/NixOS/nixpkgs"; - homepage = https://github.com/Mic92/nixpkgs-review; + homepage = "https://github.com/Mic92/nixpkgs-review"; license = licenses.mit; maintainers = [ maintainers.mic92 ]; }; diff --git a/pkgs/tools/package-management/nixui/default.nix b/pkgs/tools/package-management/nixui/default.nix index 131a3bb5fdd..12bf229580f 100644 --- a/pkgs/tools/package-management/nixui/default.nix +++ b/pkgs/tools/package-management/nixui/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { ''; meta = { description = "NodeWebkit user interface for Nix"; - homepage = https://github.com/matejc/nixui; + homepage = "https://github.com/matejc/nixui"; license = stdenv.lib.licenses.asl20; maintainers = [ stdenv.lib.maintainers.matejc ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/package-management/nixui/node-packages.nix b/pkgs/tools/package-management/nixui/node-packages.nix index 25eaac8f2b7..f822bdb5333 100644 --- a/pkgs/tools/package-management/nixui/node-packages.nix +++ b/pkgs/tools/package-management/nixui/node-packages.nix @@ -98,11 +98,11 @@ in buildInputs = globalBuildInputs; meta = { description = "nix-env frontend written with Polymer"; - homepage = https://github.com/matejc/nixui; + homepage = "https://github.com/matejc/nixui"; license = "Apache-2.0"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 673fc89e98d..bf98f5400b8 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { ]; meta = { - homepage = https://github.com/madjar/nox; + homepage = "https://github.com/madjar/nox"; description = "Tools to make nix nicer to use"; maintainers = [ lib.maintainers.madjar ]; license = lib.licenses.mit; diff --git a/pkgs/tools/package-management/opkg-utils/default.nix b/pkgs/tools/package-management/opkg-utils/default.nix index 1c97757ff8a..373ebbeb02f 100644 --- a/pkgs/tools/package-management/opkg-utils/default.nix +++ b/pkgs/tools/package-management/opkg-utils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Helper scripts for use with the opkg package manager"; - homepage = http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/; + homepage = "http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/"; license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix index 1aae0290d5a..c097674135c 100644 --- a/pkgs/tools/package-management/opkg/default.nix +++ b/pkgs/tools/package-management/opkg/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A lightweight package management system based upon ipkg"; - homepage = https://git.yoctoproject.org/cgit/cgit.cgi/opkg/; + homepage = "https://git.yoctoproject.org/cgit/cgit.cgi/opkg/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index dc69ae457dc..05877979e9c 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, lib , intltool, glib, pkgconfig, polkit, python3, sqlite , gobject-introspection, vala, gtk-doc, autoreconfHook, autoconf-archive -# TODO: set enableNixBackend to true, as soon as it builds , nix, enableNixBackend ? false, boost , enableCommandNotFound ? false , enableBashCompletion ? false, bash-completion ? null @@ -23,7 +22,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib polkit python3 gobject-introspection ] ++ lib.optional enableSystemd systemd ++ lib.optional enableBashCompletion bash-completion; - propagatedBuildInputs = [ sqlite nix boost ]; + propagatedBuildInputs = + [ sqlite boost ] + ++ lib.optional enableNixBackend nix; nativeBuildInputs = [ vala intltool pkgconfig autoreconfHook autoconf-archive gtk-doc ]; preAutoreconf = '' @@ -66,7 +67,7 @@ stdenv.mkDerivation rec { a common set of abstractions that can be used by standard GUI and text mode package managers. ''; - homepage = http://www.packagekit.org/; + homepage = "http://www.packagekit.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ matthewbauer ]; diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index cdd0c83574a..3ca55ddbbf2 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple library-based package manager"; - homepage = https://www.archlinux.org/pacman/; + homepage = "https://www.archlinux.org/pacman/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ mt-caret ]; diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index c2bdf327124..fe7f41c4d08 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -45,7 +45,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A simple wrapper for running Winetricks commands for Proton-enabled games"; - homepage = https://github.com/Matoking/protontricks; + homepage = "https://github.com/Matoking/protontricks"; license = licenses.gpl3; platforms = with platforms; linux; maintainers = with maintainers; [ metadark ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 05d293b5bf1..fdcf9832e66 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://www.rpm.org/; + homepage = "http://www.rpm.org/"; license = licenses.gpl2; description = "The RPM Package Manager"; maintainers = with maintainers; [ copumpkin ]; diff --git a/pkgs/tools/security/2fa/default.nix b/pkgs/tools/security/2fa/default.nix index c4ba7b67dc7..cf14ec12402 100644 --- a/pkgs/tools/security/2fa/default.nix +++ b/pkgs/tools/security/2fa/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://rsc.io/2fa; + homepage = "https://rsc.io/2fa"; description = "Two-factor authentication on the command line"; platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs ]; diff --git a/pkgs/tools/security/acsccid/default.nix b/pkgs/tools/security/acsccid/default.nix index 80fa0e2dc47..5b79b3db705 100644 --- a/pkgs/tools/security/acsccid/default.nix +++ b/pkgs/tools/security/acsccid/default.nix @@ -1,4 +1,16 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, flex, perl, pkgconfig, pcsclite, libusb, libiconv }: +{ stdenv +, fetchFromGitHub +, autoconf +, automake +, libtool +, gettext +, flex +, perl +, pkgconfig +, pcsclite +, libusb1 +, libiconv +}: stdenv.mkDerivation rec { version = "1.1.8"; @@ -11,11 +23,28 @@ stdenv.mkDerivation rec { sha256 = "12aahrvsk21qgpjwcrr01s742ixs44nmjkvcvqyzhqb307x1rrn3"; }; - doCheck = true; + nativeBuildInputs = [ + pkgconfig + autoconf + automake + libtool + gettext + flex + perl + ]; + + buildInputs = [ + pcsclite + libusb1 + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcsclite libusb autoconf automake libtool gettext flex perl ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + configureFlags = [ + "--enable-usbdropdir=${placeholder "out"}/pcsc/drivers" + ]; + + doCheck = true; postPatch = '' sed -e s_/bin/echo_echo_g -i src/Makefile.am @@ -29,7 +58,6 @@ stdenv.mkDerivation rec { autoheader automake --force-missing --add-missing autoconf - configureFlags="$configureFlags --enable-usbdropdir=$out/pcsc/drivers" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix index b841ccb93d3..3af44763a8a 100644 --- a/pkgs/tools/security/afl/qemu.nix +++ b/pkgs/tools/security/afl/qemu.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { ]; meta = with stdenv.lib; { - homepage = http://www.qemu.org/; + homepage = "http://www.qemu.org/"; description = "Fork of QEMU with AFL instrumentation support"; license = licenses.gpl2Plus; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index 0448faf53b7..bde597ba9f3 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "age"; @@ -18,9 +18,7 @@ buildGoModule rec { sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq"; }; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://age-encryption.org/"; description = "Modern encryption tool with small explicit keys"; license = licenses.bsd3; diff --git a/pkgs/tools/security/aide/default.nix b/pkgs/tools/security/aide/default.nix index ea14d89c45c..116ada633c6 100644 --- a/pkgs/tools/security/aide/default.nix +++ b/pkgs/tools/security/aide/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = http://aide.sourceforge.net/; + homepage = "http://aide.sourceforge.net/"; description = "A file and directory integrity checker"; license = licenses.free; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/apg/default.nix b/pkgs/tools/security/apg/default.nix index db490c7822f..1dcdeae832d 100644 --- a/pkgs/tools/security/apg/default.nix +++ b/pkgs/tools/security/apg/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { * Ability to enforce remote users to use only allowed type of password generation ''; - homepage = http://www.adel.nursat.kz/apg/; + homepage = "http://www.adel.nursat.kz/apg/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = stdenv.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 580cf7585c9..ee5fa924cb6 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 @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/yishilin14/asc-key-to-qr-code-gif; + homepage = "https://github.com/yishilin14/asc-key-to-qr-code-gif"; description = "Convert ASCII-armored PGP keys to animated QR code"; platforms = platforms.linux; maintainers = with maintainers; [ asymmetric ]; diff --git a/pkgs/tools/security/aws-okta/default.nix b/pkgs/tools/security/aws-okta/default.nix index 71732f26934..fe7d5e69f4d 100644 --- a/pkgs/tools/security/aws-okta/default.nix +++ b/pkgs/tools/security/aws-okta/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { license = licenses.mit; maintainers = [maintainers.imalsogreg]; platforms = platforms.all; - homepage = https://github.com/segmentio/aws-okta; + homepage = "https://github.com/segmentio/aws-okta"; downloadPage = "https://github.com/segmentio/aws-okta"; }; } diff --git a/pkgs/tools/security/bash-supergenpass/default.nix b/pkgs/tools/security/bash-supergenpass/default.nix index b745a2c872e..f72c916acf9 100644 --- a/pkgs/tools/security/bash-supergenpass/default.nix +++ b/pkgs/tools/security/bash-supergenpass/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ fgaz ]; - homepage = https://github.com/lanzz/bash-supergenpass; + homepage = "https://github.com/lanzz/bash-supergenpass"; }; } diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index d0cda57e2d0..0560f91b22b 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -1,29 +1,35 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libpcap, libnfnetlink, libnetfilter_queue, libusb1 }: +{ lib +, buildGoModule +, fetchFromGitHub +, pkg-config +, libpcap +, libnfnetlink +, libnetfilter_queue +, libusb1 +}: -buildGoPackage rec { +buildGoModule rec { pname = "bettercap"; - version = "2.26.1"; - - goPackagePath = "github.com/bettercap/bettercap"; + version = "2.27"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "10qsknyzfpzfpm4gp98jwvw6qmkmx23nw88sbnpl2rlr725l560c"; + sha256 = "18hwz9m16pxlb7wp78iqmdi0kimrx3h05fs0zhzm8qhzancq8alf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; + modSha256 = "1qhmrjb3fvw6maxrl7hb3bizrw6szhwx6s2g59p5pj3dz4x8jajn"; - goDeps = ./deps.nix; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A man in the middle tool"; longDescription = '' BetterCAP is a powerful, flexible and portable tool created to perform various types of MITM attacks against a network, manipulate HTTP, HTTPS and TCP traffic in realtime, sniff for credentials and much more. - '' ; - homepage = https://www.bettercap.org/; + ''; + homepage = "https://www.bettercap.org/"; license = with licenses; gpl3; maintainers = with maintainers; [ y0no ]; platforms = platforms.all; diff --git a/pkgs/tools/security/bettercap/deps.nix b/pkgs/tools/security/bettercap/deps.nix deleted file mode 100644 index 12aeb1918c6..00000000000 --- a/pkgs/tools/security/bettercap/deps.nix +++ /dev/null @@ -1,534 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/adrianmo/go-nmea"; - fetch = { - type = "git"; - url = "https://github.com/adrianmo/go-nmea"; - rev = "v1.1.0"; - sha256 = "167iwpwdwfbyghqfrzdfvfpvsmj92x7qqy6sx6yngdw21wd0m44f"; - }; - } - { - goPackagePath = "github.com/antchfx/jsonquery"; - fetch = { - type = "git"; - url = "https://github.com/antchfx/jsonquery"; - rev = "v1.0.0"; - sha256 = "04xk7ib059xzl1y87ah41q7vzl3xp99mq8nyccx8hlsng1nc0haw"; - }; - } - { - goPackagePath = "github.com/antchfx/xpath"; - fetch = { - type = "git"; - url = "https://github.com/antchfx/xpath"; - rev = "v1.1.0"; - sha256 = "0bgin15841q009yxbyqfqk5b2yk2f4a1mswjkgiqxgarmql0mpsy"; - }; - } - { - goPackagePath = "github.com/bettercap/gatt"; - fetch = { - type = "git"; - url = "https://github.com/bettercap/gatt"; - rev = "569d3d9372bb"; - sha256 = "0ncg6wd4wkr12l4bs7vyyrd08imyd5y1vdyp7f9shjq9nzv3rzcz"; - }; - } - { - goPackagePath = "github.com/bettercap/nrf24"; - fetch = { - type = "git"; - url = "https://github.com/bettercap/nrf24"; - rev = "aa37e6d0e0eb"; - sha256 = "1y6ffcj94hk7slajqw3lqpdxzx6iqpj2i2zpsvggg6kfaa1iklnj"; - }; - } - { - goPackagePath = "github.com/bettercap/readline"; - fetch = { - type = "git"; - url = "https://github.com/bettercap/readline"; - rev = "9cec905dd291"; - sha256 = "1lsnyckg2l78hz4la8dhwvjsyff706khw10nxds5afzl4mrih3vn"; - }; - } - { - goPackagePath = "github.com/bettercap/recording"; - fetch = { - type = "git"; - url = "https://github.com/bettercap/recording"; - rev = "3ce1dcf032e3"; - sha256 = "1arh12iz15anyrqr4q496lpd0gx5nf2cwyr5rv17rawqqz8ydg23"; - }; - } - { - goPackagePath = "github.com/chifflier/nfqueue-go"; - fetch = { - type = "git"; - url = "https://github.com/chifflier/nfqueue-go"; - rev = "61ca646babef"; - sha256 = "1i1q2xl86f3s9x3j2ffxprwqhcrkh4w23hh4ib7jksxvaq36v33l"; - }; - } - { - goPackagePath = "github.com/chzyer/logex"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/logex"; - rev = "v1.1.10"; - sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; - }; - } - { - goPackagePath = "github.com/chzyer/test"; - fetch = { - type = "git"; - url = "https://github.com/chzyer/test"; - rev = "a1ea475d72b1"; - sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; - }; - } - { - 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/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "v1.0.0"; - sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; - }; - } - { - goPackagePath = "github.com/elazarl/goproxy"; - fetch = { - type = "git"; - url = "https://github.com/elazarl/goproxy"; - rev = "473e67f1d7d2"; - sha256 = "1xsrdlcgl088phanm81pskym2ry8z1nizvq3lsq0c7cvzb6mrw4p"; - }; - } - { - goPackagePath = "github.com/evilsocket/islazy"; - fetch = { - type = "git"; - url = "https://github.com/evilsocket/islazy"; - rev = "v1.10.4"; - sha256 = "1ayc4di6584yajybh724mcmng069q38j1dpljgi8fhsyhb4sila3"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "e7a84e9525fe"; - sha256 = "1v6vjklq06wqddv46ihajahaj1slv0imgaivlxr8bsx59i90js5q"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "v17.0.0"; - sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "v1.0.0"; - sha256 = "0xl12bqyvmn4xcnf8p9ksj9rmnr7s40pvppsdmy8n9bzw1db0iwz"; - }; - } - { - goPackagePath = "github.com/google/gopacket"; - fetch = { - type = "git"; - url = "https://github.com/google/gopacket"; - rev = "v1.1.17"; - sha256 = "192af5z18nnafn35gdy4wahlx6ggbhlnxzlm1yvxjxawfwnilidn"; - }; - } - { - goPackagePath = "github.com/google/gousb"; - fetch = { - type = "git"; - url = "https://github.com/google/gousb"; - rev = "18f4c1d8a750"; - sha256 = "1i7ffkq395x0v1186j9bhfgy67wlq6s840xkyx8wn87w55yd05rh"; - }; - } - { - goPackagePath = "github.com/google/renameio"; - fetch = { - type = "git"; - url = "https://github.com/google/renameio"; - rev = "v0.1.0"; - sha256 = "1ki2x5a9nrj17sn092d6n4zr29lfg5ydv4xz5cp58z6cw8ip43jx"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "v1.7.3"; - sha256 = "0vr38zdad3zgg7q7nn24knl8axngj7cgmlwa93m17yhsnlvqi531"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "v1.4.1"; - sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; - }; - } - { - goPackagePath = "github.com/hashicorp/mdns"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/mdns"; - rev = "v1.0.1"; - sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j"; - }; - } - { - goPackagePath = "github.com/inconshreveable/go-vhost"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/go-vhost"; - rev = "06d84117953b"; - sha256 = "0wliilsybm7xf5h685a23rsm8bnlhkr332pkdkhf32q16sr1a9rk"; - }; - } - { - goPackagePath = "github.com/jpillora/go-tld"; - fetch = { - type = "git"; - url = "https://github.com/jpillora/go-tld"; - rev = "f16ca3b7b383"; - sha256 = "19v8bj14w0lcvysaw84klf5dg6ka351ixz9r6cd9mksdd80nvzcq"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/kr/binarydist"; - fetch = { - type = "git"; - url = "https://github.com/kr/binarydist"; - rev = "v0.1.0"; - sha256 = "0hz1yqlxmkdib8xsdkkvn4ian4i69jmfapadim9fhj632d6jpi7w"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/malfunkt/iprange"; - fetch = { - type = "git"; - url = "https://github.com/malfunkt/iprange"; - rev = "v0.9.0"; - sha256 = "0gv5w678r74jval675xp0y1hzpf7mm5m9apa1rz9krxc9zd0ycr8"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.1.4"; - sha256 = "1yxcz08kminqr1221zxpibnbzfcgs3fafin0z9zqb3gqvf74jywz"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.10"; - sha256 = "0jf4hwfwd2cpxrlyv0jzcia809q2bjw7y1m3ciaj2s8lj2jqyf6r"; - }; - } - { - goPackagePath = "github.com/mdlayher/dhcp6"; - fetch = { - type = "git"; - url = "https://github.com/mdlayher/dhcp6"; - rev = "2a67805d7d0b"; - sha256 = "0xn7canpik3lrz73dcz4jzapq1bfxpnashvjvnvshcpa2n1lh8yw"; - }; - } - { - goPackagePath = "github.com/mgutz/ansi"; - fetch = { - type = "git"; - url = "https://github.com/mgutz/ansi"; - rev = "9520e82c474b"; - sha256 = "00bz22314j26736w1f0q4jy9d9dfaml17vn890n5zqy3cmvmww1j"; - }; - } - { - goPackagePath = "github.com/mgutz/logxi"; - fetch = { - type = "git"; - url = "https://github.com/mgutz/logxi"; - rev = "aebf8a7d67ab"; - sha256 = "1f8sqibkzz9wfplvvblz9s0xvvmhkd2af8ghcsmjw8818gcrzsqx"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.22"; - sha256 = "1iv9jznakz8f5swiir0z4zilr9ypavnsc0g4zi1r0vad6npy7zfl"; - }; - } - { - 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/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/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "15f95af6e78d"; - sha256 = "07j7l340lmqwpfscwyb8llk3k37flvs20a4a8vzc85f16xyd9npf"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-charset"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-charset"; - rev = "2471d30d28b4"; - sha256 = "1cmkhwkqx1smnsvrr9ah2x5qav0i6vdiq8x4j8j812xspfl69zwx"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "v1.3.0"; - sha256 = "0mcdh1licgnnahwml9y2iq6xy5x9xmjw5frcnds2s3wpjyqrl216"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.3.0"; - sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; - }; - } - { - goPackagePath = "github.com/tarm/serial"; - fetch = { - type = "git"; - url = "https://github.com/tarm/serial"; - rev = "98f6abe2eb07"; - sha256 = "1yj4jiv2f3x3iawxdflrlmdan0k9xsbnccgc9yz658rmif1ag3pb"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "87dc89f01550"; - sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "4bf6d317e70e"; - sha256 = "19lg1ly3j31anx92p0hynic1gjk417wwxphfdrb2cq1c19kj3r17"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "da9a3fd4c582"; - sha256 = "0iavs400534jn7drmdphx0f18vgg060p2r59xw5d85ji1l5rin1l"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "112230192c58"; - sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "727590c5006e"; - sha256 = "0891pfmc73hyr6hrsq1mkk3lasxa8fz4vlnljnzz6yihmhz9ab6a"; - }; - } - { - 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 = "2ca718005c18"; - sha256 = "1nl4cw8vrfigab0hij86vl2mmhfmyim69r7vy5qk2v60g8frvgxg"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "a985d3407aa7"; - sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "788fd7840127"; - sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; - }; - } - { - goPackagePath = "gopkg.in/errgo.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/errgo.v2"; - rev = "v2.1.0"; - sha256 = "065mbihiy7q67wnql0bzl9y1kkvck5ivra68254zbih52jxwrgr2"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "v0.0.0-2019.2.1"; - sha256 = "1frpy4pl9yp6j00mjj2yss3k8hip0cc7b5i5mz61n3dlw0kga9z1"; - }; - } -] diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 71f39eaf2ee..f2abc376cd2 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -16,11 +16,11 @@ let pname = "bitwarden"; version = { - x86_64-linux = "1.17.0"; + x86_64-linux = "1.17.2"; }.${system} or ""; sha256 = { - x86_64-linux = "01azgz1wka32z2jjdnbdyzm8fbrb34ifwirmjbvfw37yia28sd72"; + x86_64-linux = "0v7lrwj3sdypnqayknwg0cg9c2gfsxbjic5wswkfxljy652x8izx"; }.${system} or ""; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index cd71ea99fec..6accefa58a4 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.14"; + version = "1.14.1"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "1ck0l0167kw1i5fjn507g4d18x2krbpk2ks0lnw9vzg0bwnzzwwd"; + sha256 = "10fi5vvckmdbjvlg6mlaqh2dsm33sbkq1z1b6gmz8qjbijc8i7gw"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "0cgk61dmc057p82g0apd4sx6a8vhvcipxikrdb0hds4frhqsr6i8"; + cargoSha256 = "1p8wpndj1aydhcjl15z3xhjf52a0l5rh5cy9qs6w4776crya2jjr"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 0ce9d43f967..43d8d3a9b11 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.12.0e"; + version = "2.13.2"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1jy3c5ywlplrjsy37i90x5s8k0i5n1mn8y0fyl074s807glqaxbf"; + sha256 = "1000iqjr670imm1dlw9r003d8psp5sq0m0p62sjnll7wnycd805r"; }; buildCommand = '' diff --git a/pkgs/tools/security/bmrsa/11.nix b/pkgs/tools/security/bmrsa/11.nix index 47851fbfa05..c7d4c4d0174 100644 --- a/pkgs/tools/security/bmrsa/11.nix +++ b/pkgs/tools/security/bmrsa/11.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "RSA utility"; - homepage = http://bmrsa.sourceforge.net/; + homepage = "http://bmrsa.sourceforge.net/"; license = licenses.gpl1; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index 966383163e6..a02d04e1333 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -46,7 +46,7 @@ buildGoModule rec { meta = with lib; { description = "Browserpass native client app"; - homepage = https://github.com/browserpass/browserpass-native; + homepage = "https://github.com/browserpass/browserpass-native"; license = licenses.isc; platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs infinisil ]; diff --git a/pkgs/tools/security/bundler-audit/Gemfile.lock b/pkgs/tools/security/bundler-audit/Gemfile.lock index 28cbcf5a9a6..107e425bc57 100644 --- a/pkgs/tools/security/bundler-audit/Gemfile.lock +++ b/pkgs/tools/security/bundler-audit/Gemfile.lock @@ -13,4 +13,4 @@ DEPENDENCIES bundler-audit BUNDLED WITH - 1.14.6 + 2.1.4 diff --git a/pkgs/tools/security/bundler-audit/default.nix b/pkgs/tools/security/bundler-audit/default.nix index 3712c129cf6..6bcb341a834 100644 --- a/pkgs/tools/security/bundler-audit/default.nix +++ b/pkgs/tools/security/bundler-audit/default.nix @@ -20,7 +20,7 @@ bundlerEnv rec { - Prints advisory information. - Does not require a network connection. ''; - homepage = https://github.com/rubysec/bundler-audit; + homepage = "https://github.com/rubysec/bundler-audit"; license = licenses.gpl3Plus; maintainers = with maintainers; [ primeos nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index 8d0b3a89a34..b9cffc7f769 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "ccid drivers for pcsclite"; - homepage = https://ccid.apdu.fr/; + homepage = "https://ccid.apdu.fr/"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/ccrypt/default.nix b/pkgs/tools/security/ccrypt/default.nix index 77a15e2f27c..a3210b2a598 100644 --- a/pkgs/tools/security/ccrypt/default.nix +++ b/pkgs/tools/security/ccrypt/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ccrypt-1.11"; src = fetchurl { - url = mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz; + url = "mirror://sourceforge/ccrypt/ccrypt-1.11.tar.gz"; sha256 = "0kx4a5mhmp73ljknl2lcccmw9z3f5y8lqw0ghaymzvln1984g75i"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; meta = { - homepage = http://ccrypt.sourceforge.net/; + 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]; diff --git a/pkgs/tools/security/certmgr/default.nix b/pkgs/tools/security/certmgr/default.nix index 4f48522e613..be3f891cc8b 100644 --- a/pkgs/tools/security/certmgr/default.nix +++ b/pkgs/tools/security/certmgr/default.nix @@ -18,7 +18,7 @@ let inherit patches; meta = with stdenv.lib; { - homepage = https://cfssl.org/; + homepage = "https://cfssl.org/"; description = "Cloudflare's certificate manager"; platforms = platforms.linux; license = licenses.bsd2; diff --git a/pkgs/tools/security/cfssl/default.nix b/pkgs/tools/security/cfssl/default.nix index 8d8497f6cb9..6d4238de700 100644 --- a/pkgs/tools/security/cfssl/default.nix +++ b/pkgs/tools/security/cfssl/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { ]; meta = with stdenv.lib; { - homepage = https://cfssl.org/; + homepage = "https://cfssl.org/"; description = "Cloudflare's PKI and TLS toolkit"; license = licenses.bsd2; maintainers = with maintainers; [ mbrgm ]; diff --git a/pkgs/tools/security/chaps/default.nix b/pkgs/tools/security/chaps/default.nix index c8ee9506968..decc9ba3126 100644 --- a/pkgs/tools/security/chaps/default.nix +++ b/pkgs/tools/security/chaps/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PKCS #11 implementation based on trusted platform module (TPM)"; - homepage = https://www.chromium.org/developers/design-documents/chaps-technical-design; + homepage = "https://www.chromium.org/developers/design-documents/chaps-technical-design"; maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; license = licenses.bsd3; diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 7d745630989..387fa4d750b 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -1,14 +1,14 @@ { stdenv, lib, fetchFromGitHub, pythonPackages, nasm, libelf , kernel ? null, withDriver ? false }: pythonPackages.buildPythonApplication rec { - name = "chipsec-${version}"; - version = "1.4.7"; + pname = "chipsec"; + version = "1.4.9"; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "11qi4m4hqkylf1wd7f921r0p7xg5prpmfkmb7l9nn7sb95zz0sjr"; + sha256 = "1p6w8294w5z2f4jwc22mqaggv5qajvmf9iifv7fl7wdz3wsvskrk"; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ pythonPackages.buildPythonApplication rec { Mac OS X and UEFI shell. ''; license = licenses.gpl2; - homepage = https://github.com/chipsec/chipsec; + homepage = "https://github.com/chipsec/chipsec"; maintainers = with maintainers; [ johnazoidberg ]; platforms = if withDriver then [ "x86_64-linux" ] else platforms.all; }; diff --git a/pkgs/tools/security/chkrootkit/default.nix b/pkgs/tools/security/chkrootkit/default.nix index 1d85ba0b566..864d73aaa97 100644 --- a/pkgs/tools/security/chkrootkit/default.nix +++ b/pkgs/tools/security/chkrootkit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Locally checks for signs of a rootkit"; - homepage = http://www.chkrootkit.org/; + homepage = "http://www.chkrootkit.org/"; license = licenses.bsd2; platforms = with platforms; linux; }; diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix index 5a037090801..0a44c463eb7 100644 --- a/pkgs/tools/security/chntpw/default.nix +++ b/pkgs/tools/security/chntpw/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://pogostick.net/~pnh/ntpasswd/; + 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 ]; license = licenses.gpl2; diff --git a/pkgs/tools/security/chrome-token-signing/default.nix b/pkgs/tools/security/chrome-token-signing/default.nix index 09c62d4b61a..19dd9e9819a 100644 --- a/pkgs/tools/security/chrome-token-signing/default.nix +++ b/pkgs/tools/security/chrome-token-signing/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "chrome-token-signing"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "open-eid"; repo = "chrome-token-signing"; rev = "v${version}"; - sha256 = "1gh4gm0krz8m5vgwkjzg9al82rrrrsikzjh180jy7ha808ib2drw"; + sha256 = "0fqgci4336fbnd944zx9w37d5ky7i27n6wvlp5zv3hj955ldbh7g"; }; buildInputs = [ qmake pcsclite pkgconfig ]; diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 6cb2eaa7d33..e1ea241c7fd 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.clamav.net; + homepage = "https://www.clamav.net"; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom robberer qknight fpletz globin ]; diff --git a/pkgs/tools/security/cowpatty/default.nix b/pkgs/tools/security/cowpatty/default.nix index 0fb9ed58997..7d58de8553b 100644 --- a/pkgs/tools/security/cowpatty/default.nix +++ b/pkgs/tools/security/cowpatty/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Offline dictionary attack against WPA/WPA2 networks"; license = licenses.gpl2; - homepage = https://www.willhackforsushi.com/?page_id=50; + homepage = "https://www.willhackforsushi.com/?page_id=50"; maintainers = with maintainers; [ nico202 ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/crackxls/default.nix b/pkgs/tools/security/crackxls/default.nix index 04b7b5695b5..e861d70f725 100644 --- a/pkgs/tools/security/crackxls/default.nix +++ b/pkgs/tools/security/crackxls/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { version = "0.4"; src = fetchgit { - url = https://github.com/GavinSmith0123/crackxls2003.git; + url = "https://github.com/GavinSmith0123/crackxls2003.git"; rev = "refs/tags/v${version}"; sha256 = "0q5jl7hcds3f0rhly3iy4fhhbyh9cdrfaw7zdrazzf1wswwhyssz"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/GavinSmith0123/crackxls2003/; + homepage = "https://github.com/GavinSmith0123/crackxls2003/"; description = "Used to break the encryption on old Microsoft Excel and Microsoft Word files"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix index 259ee38c68f..b53ead1c852 100644 --- a/pkgs/tools/security/crunch/default.nix +++ b/pkgs/tools/security/crunch/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wordlist generator"; - homepage = https://sourceforge.net/projects/crunch-wordlist/; + homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = platforms.unix; maintainers = with maintainers; [ lethalman lnl7 ]; }; diff --git a/pkgs/tools/security/ctmg/default.nix b/pkgs/tools/security/ctmg/default.nix index 104a615542b..a30523c3bbc 100644 --- a/pkgs/tools/security/ctmg/default.nix +++ b/pkgs/tools/security/ctmg/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An encrypted container manager for Linux using cryptsetup"; - homepage = https://git.zx2c4.com/ctmg/about/; + homepage = "https://git.zx2c4.com/ctmg/about/"; license = licenses.isc; maintainers = with maintainers; [ mrVanDalo ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/tools/security/diceware/default.nix index dcd7e853564..f32d63cfc10 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/tools/security/diceware/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { meta = with lib; { description = "Generates passphrases by concatenating words randomly picked from wordlists"; - homepage = https://github.com/ulif/diceware; + homepage = "https://github.com/ulif/diceware"; license = licenses.gpl3; maintainers = with maintainers; [ asymmetric ]; }; diff --git a/pkgs/tools/security/ecdsatool/default.nix b/pkgs/tools/security/ecdsatool/default.nix index 0e57a5bab88..524f38982cc 100644 --- a/pkgs/tools/security/ecdsatool/default.nix +++ b/pkgs/tools/security/ecdsatool/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Create and manipulate ECC NISTP256 keypairs."; - homepage = https://github.com/kaniini/ecdsatool/; + homepage = "https://github.com/kaniini/ecdsatool/"; license = with licenses; [free]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/ecdsautils/default.nix b/pkgs/tools/security/ecdsautils/default.nix index 13280e3226d..f5ead317f4e 100644 --- a/pkgs/tools/security/ecdsautils/default.nix +++ b/pkgs/tools/security/ecdsautils/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tiny collection of programs used for ECDSA (keygen, sign, verify)"; - homepage = https://github.com/tcatm/ecdsautils/; + homepage = "https://github.com/tcatm/ecdsautils/"; license = with licenses; [ mit bsd2 ]; maintainers = with maintainers; [ andir ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 13ab56aaa9a..cad5bb244f9 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Belgian electronic identity card (eID) middleware"; - homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; + homepage = "http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/"; license = licenses.lgpl3; longDescription = '' Allows user authentication and digital signatures with Belgian ID cards. diff --git a/pkgs/tools/security/enchive/default.nix b/pkgs/tools/security/enchive/default.nix index 7e45ab76ed0..3c7d3144d3b 100644 --- a/pkgs/tools/security/enchive/default.nix +++ b/pkgs/tools/security/enchive/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Encrypted personal archives"; - homepage = https://github.com/skeeto/enchive; + homepage = "https://github.com/skeeto/enchive"; license = stdenv.lib.licenses.unlicense; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.nico202 ]; diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index 01855ee3e5b..b4c2bef2cf4 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - homepage = https://spideroak.com/solutions/encryptr; + homepage = "https://spideroak.com/solutions/encryptr"; description = "Free, private and secure password management tool and e-wallet"; license = licenses.unfree; maintainers = with maintainers; [ guillaumekoenig ]; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 6e61f054122..370282d02d0 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -14,7 +14,7 @@ let data = all_data.${system_map.${stdenv.hostPlatform.system} or (throw "Unsupported platform")}; - baseUrl = http://repo.sinew.in; + baseUrl = "http://repo.sinew.in"; # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ @@ -51,7 +51,7 @@ let meta = { description = "a well known password manager"; - homepage = https://www.enpass.io/; + homepage = "https://www.enpass.io/"; license = lib.licenses.unfree; platforms = [ "x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 39017d09886..6377e829aa6 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -50,7 +50,7 @@ python3.pkgs.buildPythonApplication { ''; meta = with stdenv.lib; { - homepage = https://www.fail2ban.org/; + homepage = "https://www.fail2ban.org/"; description = "A program that scans log files for repeated failing login attempts and bans IP addresses"; license = licenses.gpl2Plus; maintainers = with maintainers; [ eelco lovek323 fpletz ]; diff --git a/pkgs/tools/security/fcrackzip/default.nix b/pkgs/tools/security/fcrackzip/default.nix index d923e81ae82..15510f7b709 100644 --- a/pkgs/tools/security/fcrackzip/default.nix +++ b/pkgs/tools/security/fcrackzip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "zip password cracker, similar to fzc, zipcrack and others"; - homepage = http://oldhome.schmorp.de/marc/fcrackzip.html; + homepage = "http://oldhome.schmorp.de/marc/fcrackzip.html"; license = licenses.gpl2; maintainers = with maintainers; [ nico202 ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/fpm2/default.nix b/pkgs/tools/security/fpm2/default.nix index b6669358f7f..3d082523f6f 100644 --- a/pkgs/tools/security/fpm2/default.nix +++ b/pkgs/tools/security/fpm2/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "FPM2 is GTK2 port from Figaro's Password Manager originally developed by John Conneely, with some new enhancements."; - homepage = https://als.regnet.cz/fpm2/; + homepage = "https://als.regnet.cz/fpm2/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ hce ]; diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 41a00306f69..b119a6ed29f 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://fprint.freedesktop.org/; + homepage = "https://fprint.freedesktop.org/"; description = "D-Bus daemon that offers libfprint functionality over the D-Bus interprocess communication bus"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix index 3fff99a6ce1..12b47694db3 100644 --- a/pkgs/tools/security/fprot/default.nix +++ b/pkgs/tools/security/fprot/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { version = "6.2.1"; src = fetchurl { - url = http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz; + url = "http://files.f-prot.com/files/unix-trial/fp-Linux.x86.32-ws.tar.gz"; sha256 = "0qlsrkanf0inplwv1i6hqbimdg91syf5ggd1vahsm9lhivmnr0v5"; }; @@ -33,10 +33,10 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://www.f-prot.com; + homepage = "http://www.f-prot.com"; description = "A popular proprietary antivirus program"; license = licenses.unfree; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index a9f69c8b96e..0f1c37aa797 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { fwknop stands for the "FireWall KNock OPerator", and implements an authorization scheme called Single Packet Authorization (SPA). ''; - homepage = https://www.cipherdyne.org/fwknop/; + homepage = "https://www.cipherdyne.org/fwknop/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/security/gen-oath-safe/default.nix b/pkgs/tools/security/gen-oath-safe/default.nix index 89900d27bd2..15b8820bfd5 100644 --- a/pkgs/tools/security/gen-oath-safe/default.nix +++ b/pkgs/tools/security/gen-oath-safe/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { --prefix PATH : ${path} ''; meta = with stdenv.lib; { - homepage = https://github.com/mcepl/gen-oath-safe; + homepage = "https://github.com/mcepl/gen-oath-safe"; description = "Script for generating HOTP/TOTP keys (and QR code)"; platforms = platforms.unix; license = licenses.mit; diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix index 63d1bab89d7..e56c9e20fd4 100644 --- a/pkgs/tools/security/gencfsm/default.nix +++ b/pkgs/tools/security/gencfsm/default.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://www.libertyzero.com/GEncfsM/; - downloadPage = https://launchpad.net/gencfsm/; + homepage = "http://www.libertyzero.com/GEncfsM/"; + downloadPage = "https://launchpad.net/gencfsm/"; description = "EncFS manager and mounter with GNOME3 integration"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index b3773725e6e..63fbca8f446 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation { name = "ghidra-9.1"; src = fetchurl { - url = https://ghidra-sre.org/ghidra_9.1_PUBLIC_20191023.zip; + url = "https://ghidra-sre.org/ghidra_9.1_PUBLIC_20191023.zip"; sha256 = "0pl7s59008gvgwz4mxp7rz3xr3vaa12a6s5zvx2yr9jxx3gk1l99"; }; diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index a559039d95a..9f87684cae3 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { description = "GTK/GNOME application to use GnuPG for signing other peoples’ keys"; - homepage = https://wiki.gnome.org/Apps/Keysign; + homepage = "https://wiki.gnome.org/Apps/Keysign"; license = licenses.gpl3Plus; maintainers = gnome3.maintainers; platforms = platforms.linux; diff --git a/pkgs/tools/security/gnu-pw-mgr/default.nix b/pkgs/tools/security/gnu-pw-mgr/default.nix index 940a5b9a053..de5234961d2 100644 --- a/pkgs/tools/security/gnu-pw-mgr/default.nix +++ b/pkgs/tools/security/gnu-pw-mgr/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnulib ]; meta = with lib; { - homepage = https://www.gnu.org/software/gnu-pw-mgr/; + 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; diff --git a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix index bc7cff99dc2..4d6b97c7192 100644 --- a/pkgs/tools/security/gnupg-pkcs11-scd/default.nix +++ b/pkgs/tools/security/gnupg-pkcs11-scd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gnupg-pkcs11 is a project to implement a BSD-licensed smart-card daemon to enable the use of PKCS#11 tokens with GnuPG. ''; - homepage = http://gnupg-pkcs11.sourceforge.net/; + homepage = "http://gnupg-pkcs11.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ lschuermann philandstuff ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/gnupg/1.nix b/pkgs/tools/security/gnupg/1.nix index 3b916378bf5..20ecd7c92fb 100644 --- a/pkgs/tools/security/gnupg/1.nix +++ b/pkgs/tools/security/gnupg/1.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://gnupg.org; + homepage = "https://gnupg.org"; description = "Classic (1.4) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index ef348e38834..ea900160752 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = with stdenv.lib; { - homepage = https://gnupg.org; + homepage = "https://gnupg.org"; description = "Stable (2.0) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 203f50a9c0e..f87e985c95a 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.19"; + version = "2.2.20"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "1h6yx6sdpz3lf9gdppgxqcf73baynr8gflmh43286fkgw3058994"; + sha256 = "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://gnupg.org; + homepage = "https://gnupg.org"; description = "Modern (2.1) release of the GNU Privacy Guard, a GPL OpenPGP implementation"; license = licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index c9348b2f23a..c3426bee965 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -1,7 +1,6 @@ { buildGoModule , fetchFromGitHub -, stdenv -, Security +, lib }: buildGoModule rec { @@ -17,9 +16,7 @@ buildGoModule rec { modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - - meta = with stdenv.lib; { + meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; homepage = "https://github.com/OJ/gobuster"; license = licenses.asl20; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 41a0d6eb7a5..8af24bf7ab5 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -38,7 +38,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; - homepage = https://www.gopass.pw/; + homepage = "https://www.gopass.pw/"; license = licenses.mit; maintainers = with maintainers; [ andir ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/gorilla-bin/default.nix b/pkgs/tools/security/gorilla-bin/default.nix index 1ba650f5af7..975976c6a3c 100644 --- a/pkgs/tools/security/gorilla-bin/default.nix +++ b/pkgs/tools/security/gorilla-bin/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Password Gorilla is a Tk based password manager"; - homepage = https://github.com/zdia/gorilla/wiki; + homepage = "https://github.com/zdia/gorilla/wiki"; maintainers = [ stdenv.lib.maintainers.namore ]; platforms = [ "x86_64-linux" ]; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/security/gpgstats/default.nix b/pkgs/tools/security/gpgstats/default.nix index c3a14f62c76..80153b857c4 100644 --- a/pkgs/tools/security/gpgstats/default.nix +++ b/pkgs/tools/security/gpgstats/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { longDescription = '' GPGstats calculates statistics on the keys in your key-ring. ''; - homepage = http://www.vanheusden.com/gpgstats/; + homepage = "http://www.vanheusden.com/gpgstats/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix index bfac54d2d86..9468ee2843b 100644 --- a/pkgs/tools/security/haka/default.nix +++ b/pkgs/tools/security/haka/default.nix @@ -27,7 +27,7 @@ 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/; + homepage = "http://www.haka-security.org/"; license = stdenv.lib.licenses.mpl20; maintainers = [ stdenv.lib.maintainers.tvestelind ]; platforms = [ "x86_64-linux" "i686-linux" ]; # fails on aarch64 diff --git a/pkgs/tools/security/hash_extender/default.nix b/pkgs/tools/security/hash_extender/default.nix index 30ba2fb3087..6efa780e1cd 100644 --- a/pkgs/tools/security/hash_extender/default.nix +++ b/pkgs/tools/security/hash_extender/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tool to automate hash length extension attacks"; - homepage = https://github.com/iagox86/hash_extender; + homepage = "https://github.com/iagox86/hash_extender"; license = licenses.bsd3; maintainers = with maintainers; [ geistesk ]; }; diff --git a/pkgs/tools/security/hashcash/default.nix b/pkgs/tools/security/hashcash/default.nix index a28822ecd95..bb8fba33e1d 100644 --- a/pkgs/tools/security/hashcash/default.nix +++ b/pkgs/tools/security/hashcash/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Proof-of-work algorithm used as spam and denial-of-service counter measure"; - homepage = http://hashcash.org; + homepage = "http://hashcash.org"; license = licenses.gpl2; maintainers = with maintainers; [ kisonecat ]; }; diff --git a/pkgs/tools/security/hashcat-utils/default.nix b/pkgs/tools/security/hashcat-utils/default.nix index 50508cfc494..7dcfff038a8 100644 --- a/pkgs/tools/security/hashcat-utils/default.nix +++ b/pkgs/tools/security/hashcat-utils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Small utilities that are useful in advanced password cracking"; - homepage = https://github.com/hashcat/hashcat-utils; + homepage = "https://github.com/hashcat/hashcat-utils"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ fadenb ]; diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 72a13c0f259..c1fd84b6452 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast password cracker"; - homepage = https://hashcat.net/hashcat/; + homepage = "https://hashcat.net/hashcat/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ kierdavis zimbatm ]; diff --git a/pkgs/tools/security/haveged/default.nix b/pkgs/tools/security/haveged/default.nix index c47331f1bcb..c676a173092 100644 --- a/pkgs/tools/security/haveged/default.nix +++ b/pkgs/tools/security/haveged/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { of haveged is directed towards improving overall reliability and adaptability while minimizing the barriers to using haveged for other tasks. ''; - homepage = http://www.issihosts.com/haveged/; + homepage = "http://www.issihosts.com/haveged/"; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.domenkozar ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix index 8e70e0def41..84517ce2bd8 100644 --- a/pkgs/tools/security/hcxtools/default.nix +++ b/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "5.3.0"; + version = "6.0.1"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "1pqvxncpcnwxs89imma01ry30bz7cjifm8wz1s80yclkxxf80php"; + sha256 = "0r7pjz89chgb7zl2pqgw3zb1z8cgwp0nxmqvmkv0jn1m9dw3f44f"; }; buildInputs = [ curl openssl zlib ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for capturing wlan traffic and conversion to hashcat and John the Ripper formats"; - homepage = https://github.com/ZerBea/hcxtools; + homepage = "https://github.com/ZerBea/hcxtools"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ dywedir ]; diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index e6c375599a9..910bcc522e7 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/AdRoll/hologram/; + homepage = "https://github.com/AdRoll/hologram/"; description = "Easy, painless AWS credentials on developer laptops."; maintainers = with maintainers; [ nand0p ]; platforms = platforms.all; diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index e2e01fbb921..5e1d460a463 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "IBM's Software TPM 2.0, an implementation of the TCG TPM 2.0 specification"; - homepage = https://sourceforge.net/projects/ibmswtpm2/; + homepage = "https://sourceforge.net/projects/ibmswtpm2/"; platforms = platforms.linux; maintainers = with maintainers; [ delroth ]; license = licenses.bsd3; diff --git a/pkgs/tools/security/ifdnfc/default.nix b/pkgs/tools/security/ifdnfc/default.nix index 5ec66a5b98c..bab6527f415 100644 --- a/pkgs/tools/security/ifdnfc/default.nix +++ b/pkgs/tools/security/ifdnfc/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { Supports the pn533 smart-card reader chip which is for example used in the SCM SCL3711. ''; - homepage = https://github.com/nfc-tools/ifdnfc; + homepage = "https://github.com/nfc-tools/ifdnfc"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ makefu ]; diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 17e02e736dc..f47728b8ba2 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { meta = { description = "John the Ripper password cracker"; license = licenses.gpl2; - homepage = https://github.com/magnumripper/JohnTheRipper/; + homepage = "https://github.com/magnumripper/JohnTheRipper/"; maintainers = with maintainers; [ offline matthewbauer ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 6f2eaf57701..2d8957a9d54 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -32,7 +32,7 @@ buildGoPackage rec { buildFlags = [ "-tags production" ]; meta = with stdenv.lib; { - homepage = https://www.keybase.io/; + homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service."; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ carlsverre np rvolosatovs filalex77 ]; diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 0a5855b2060..9c34d78aee8 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.keybase.io/; + homepage = "https://www.keybase.io/"; description = "The Keybase official GUI"; platforms = platforms.linux; maintainers = with maintainers; [ rvolosatovs puffnfresh np filalex77 ]; diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index ce7663b18cf..9478bb4ca23 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchFromGitHub, python2Packages, hping }: - -python2Packages.buildPythonApplication rec { +let rev = "bf14bbff"; - name = "knockknock-r${rev}"; +in python2Packages.buildPythonApplication rec { + pname = "knockknock-r"; + version = rev; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix index 9d4c590efa1..f56bd59cd9a 100644 --- a/pkgs/tools/security/kpcli/default.nix +++ b/pkgs/tools/security/kpcli/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { Use this program to access and manage your KeePass 1.x or 2.x databases from a Unix-like command line. ''; license = licenses.artistic1; - homepage = http://kpcli.sourceforge.net; + homepage = "http://kpcli.sourceforge.net"; platforms = platforms.all; maintainers = [ maintainers.j-keck ]; }; diff --git a/pkgs/tools/security/krunner-pass/default.nix b/pkgs/tools/security/krunner-pass/default.nix index 57174148160..7904235b86a 100644 --- a/pkgs/tools/security/krunner-pass/default.nix +++ b/pkgs/tools/security/krunner-pass/default.nix @@ -22,7 +22,7 @@ mkDerivation rec { patches = [ (fetchpatch { - url = https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch; + url = "https://github.com/peterhoeg/krunner-pass/commit/be2695f4ae74b0cccec8294defcc92758583d96b.patch"; sha256 = "098dqnal57994p51p2srfzg4lgcd6ybp29h037llr9cdv02hdxvl"; name = "fix_build.patch"; }) @@ -35,7 +35,7 @@ mkDerivation rec { meta = with lib; { description = "Integrates krunner with pass the unix standard password manager (https://www.passwordstore.org/)"; - homepage = https://github.com/akermu/krunner-pass; + homepage = "https://github.com/akermu/krunner-pass"; license = licenses.gpl3; maintainers = with maintainers; [ ysndr ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix index 9356e2f53f9..d03de5f7cfc 100644 --- a/pkgs/tools/security/kwalletcli/default.nix +++ b/pkgs/tools/security/kwalletcli/default.nix @@ -42,7 +42,7 @@ mkDerivation rec { meta = with lib; { description = "Command-Line Interface to the KDE Wallet"; - homepage = https://www.mirbsd.org/kwalletcli.htm; + homepage = "https://www.mirbsd.org/kwalletcli.htm"; license = licenses.miros; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index 76732170079..0d59c34ee9a 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "Stateless password manager"; - homepage = https://lesspass.com; + homepage = "https://lesspass.com"; maintainers = with maintainers; [ jasoncarr ]; license = licenses.gpl3; }; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 248fbe008fc..45d0279099f 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { The package is based on the debian package libacr38u. ''; - homepage = https://www.acs.com.hk; + homepage = "https://www.acs.com.hk"; license = licenses.lgpl2Plus; 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 17861ac2da6..01e9a384792 100644 --- a/pkgs/tools/security/libmodsecurity/default.nix +++ b/pkgs/tools/security/libmodsecurity/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { the ModSecurity SecRules format and apply them to HTTP content provided by your application via Connectors. ''; - homepage = https://modsecurity.org/; + homepage = "https://modsecurity.org/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ izorkin ]; diff --git a/pkgs/tools/security/logkeys/default.nix b/pkgs/tools/security/logkeys/default.nix index f06ce2f246a..f3ea25d7160 100644 --- a/pkgs/tools/security/logkeys/default.nix +++ b/pkgs/tools/security/logkeys/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A GNU/Linux keylogger that works!"; license = licenses.gpl3; - homepage = https://github.com/kernc/logkeys; + homepage = "https://github.com/kernc/logkeys"; maintainers = with maintainers; [mikoim offline]; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix index f6f9e0df655..297d13ef9f9 100644 --- a/pkgs/tools/security/masscan/default.nix +++ b/pkgs/tools/security/masscan/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast scan of the Internet"; - homepage = https://github.com/robertdavidgraham/masscan; + homepage = "https://github.com/robertdavidgraham/masscan"; license = licenses.agpl3; platforms = platforms.unix; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/pkgs/tools/security/mbox/default.nix b/pkgs/tools/security/mbox/default.nix index 1ef282b8b6e..7292ac6785f 100644 --- a/pkgs/tools/security/mbox/default.nix +++ b/pkgs/tools/security/mbox/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Lightweight sandboxing mechanism that any user can use without special privileges"; - homepage = http://pdos.csail.mit.edu/mbox/; + homepage = "http://pdos.csail.mit.edu/mbox/"; maintainers = with maintainers; [ ehmry ]; license = licenses.bsd3; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/tools/security/meo/default.nix b/pkgs/tools/security/meo/default.nix index d10c1659964..54b96917623 100644 --- a/pkgs/tools/security/meo/default.nix +++ b/pkgs/tools/security/meo/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "meo-20121113"; src = fetchhg { - url = http://oss.stamfest.net/hg/meo; + url = "http://oss.stamfest.net/hg/meo"; rev = "b48e5f16cff8"; sha256 = "0ifg7y28s89i9gwda6fyj1jbrykbcvq8bf1m6rxmdcv5afi3arbq"; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://oss.stamfest.net/wordpress/meo-multiple-eyepairs-only; + 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]; diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 2eaf8aa6c71..17d160c8dcb 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -362,4 +362,4 @@ DEPENDENCIES metasploit-framework! BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 31d45c30db7..54da89a99b5 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Metasploit Framework - a collection of exploits"; - homepage = https://github.com/rapid7/metasploit-framework/wiki; + homepage = "https://github.com/rapid7/metasploit-framework/wiki"; platforms = platforms.unix; license = licenses.bsd3; maintainers = [ maintainers.makefu ]; diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix index a23e2917561..59908f2a9ce 100644 --- a/pkgs/tools/security/mfcuk/default.nix +++ b/pkgs/tools/security/mfcuk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "MiFare Classic Universal toolKit"; license = licenses.gpl2; - homepage = https://github.com/nfc-tools/mfcuk; + homepage = "https://github.com/nfc-tools/mfcuk"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/mfoc/default.nix b/pkgs/tools/security/mfoc/default.nix index 1ae18e34353..fb622ad8249 100644 --- a/pkgs/tools/security/mfoc/default.nix +++ b/pkgs/tools/security/mfoc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Mifare Classic Offline Cracker"; license = licenses.gpl2; - homepage = https://github.com/nfc-tools/mfoc; + homepage = "https://github.com/nfc-tools/mfoc"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/minisign/default.nix b/pkgs/tools/security/minisign/default.nix index 15ee2446922..ed226994a31 100644 --- a/pkgs/tools/security/minisign/default.nix +++ b/pkgs/tools/security/minisign/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { necessarily private) file transfer, e.g., of software artefacts. minisign is similar to and compatible with OpenBSD's signify. ''; - homepage = https://jedisct1.github.io/minisign/; + homepage = "https://jedisct1.github.io/minisign/"; license = licenses.isc; maintainers = with maintainers; [ joachifm ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/mkp224o/default.nix b/pkgs/tools/security/mkp224o/default.nix index 7585fdf22e1..5640debf124 100644 --- a/pkgs/tools/security/mkp224o/default.nix +++ b/pkgs/tools/security/mkp224o/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Vanity address generator for tor onion v3 (ed25519) hidden services"; - homepage = http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/; + homepage = "http://cathug2kyi4ilneggumrenayhuhsvrgn6qv2y47bgeet42iivkpynqad.onion/"; license = licenses.cc0; platforms = platforms.linux; maintainers = with maintainers; [ volth ]; diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix index 3d30fef02e2..b88852966ee 100644 --- a/pkgs/tools/security/mkpasswd/default.nix +++ b/pkgs/tools/security/mkpasswd/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = "make install-mkpasswd"; meta = with stdenv.lib; { - homepage = https://packages.qa.debian.org/w/whois.html; + homepage = "https://packages.qa.debian.org/w/whois.html"; description = "Overfeatured front-end to crypt, from the Debian whois package"; license = licenses.gpl2; maintainers = with maintainers; [ cstrahan fpletz ]; diff --git a/pkgs/tools/security/mkrand/default.nix b/pkgs/tools/security/mkrand/default.nix index bb9c932d19e..54934b7111a 100644 --- a/pkgs/tools/security/mkrand/default.nix +++ b/pkgs/tools/security/mkrand/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { meta = { description = "A Digital Random Bit Generator"; longDescription = "MKRAND is a utility for generating random information."; - homepage = https://github.com/mknight-tag/MKRAND/; + homepage = "https://github.com/mknight-tag/MKRAND/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix index 71bdd3af55d..0732adecc45 100644 --- a/pkgs/tools/security/mktemp/default.nix +++ b/pkgs/tools/security/mktemp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz; + url = "ftp://ftp.mktemp.org/pub/mktemp/mktemp-1.7.tar.gz"; sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f"; }; meta = with stdenv.lib; { description = "Simple tool to make temporary file handling in shells scripts safe and simple"; - homepage = https://www.mktemp.org; + homepage = "https://www.mktemp.org"; license = licenses.isc; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index 2a9e41ac0fa..b9b696c17be 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source, cross-platform web application firewall (WAF)"; license = licenses.asl20; - homepage = https://www.modsecurity.org/; + homepage = "https://www.modsecurity.org/"; maintainers = with maintainers; [offline]; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; diff --git a/pkgs/tools/security/monkeysphere/default.nix b/pkgs/tools/security/monkeysphere/default.nix index 1e585136d88..4b1f7569887 100644 --- a/pkgs/tools/security/monkeysphere/default.nix +++ b/pkgs/tools/security/monkeysphere/default.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://web.monkeysphere.info/; + homepage = "http://web.monkeysphere.info/"; description = "Leverage the OpenPGP web of trust for SSH and TLS authentication"; longDescription = '' The Monkeysphere project's goal is to extend OpenPGP's web of diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix index 4cff17ef849..9d25daf29a6 100644 --- a/pkgs/tools/security/mpw/default.nix +++ b/pkgs/tools/security/mpw/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A stateless password management solution"; - homepage = https://masterpasswordapp.com/; + homepage = "https://masterpasswordapp.com/"; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/nasty/default.nix b/pkgs/tools/security/nasty/default.nix index d45861cf50e..7f423860100 100644 --- a/pkgs/tools/security/nasty/default.nix +++ b/pkgs/tools/security/nasty/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { in case you forget or lost it. It is mostly a proof-of-concept: with a different implementation this program could be at least 100x faster. ''; - homepage = http://www.vanheusden.com/nasty/; + homepage = "http://www.vanheusden.com/nasty/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/neopg/default.nix b/pkgs/tools/security/neopg/default.nix index c58772346ee..4f4f660e20f 100644 --- a/pkgs/tools/security/neopg/default.nix +++ b/pkgs/tools/security/neopg/default.nix @@ -7,7 +7,7 @@ , curl , gettext , pkgconfig -, libusb +, libusb1 , gnutls }: stdenv.mkDerivation rec { @@ -22,9 +22,9 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake gettext pkgconfig ]; - buildInputs = [ cmake sqlite botan2 boost curl gettext libusb gnutls ]; + buildInputs = [ sqlite botan2 boost curl libusb1 gnutls ]; doCheck = true; checkTarget = "test"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://neopg.io/; + homepage = "https://neopg.io/"; description = "Modern replacement for GnuPG 2"; license = licenses.gpl3; longDescription = '' diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix index 48df486ef0a..a4936d763b6 100644 --- a/pkgs/tools/security/nitrokey-app/default.nix +++ b/pkgs/tools/security/nitrokey-app/default.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { access the extra functionality of a Nitrokey Storage or Nitrokey Pro. See https://www.nitrokey.com/ for more information. ''; - homepage = https://github.com/Nitrokey/nitrokey-app; - repositories.git = https://github.com/Nitrokey/nitrokey-app.git; + homepage = "https://github.com/Nitrokey/nitrokey-app"; + repositories.git = "https://github.com/Nitrokey/nitrokey-app.git"; license = licenses.gpl3; maintainers = with maintainers; [ kaiha fpletz ]; }; diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index f88c533d71d..bd543154494 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { meta = { description = "A free and open source utility for network discovery and security auditing"; - homepage = http://www.nmap.org; + homepage = "http://www.nmap.org"; license = licenses.gpl2; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice fpletz ]; diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index d1e2ee58e48..4f0b5f2c954 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -58,7 +58,7 @@ buildGoPackage rec { integrity of the received content. ''; license = licenses.asl20; - homepage = https://github.com/theupdateframework/notary; + homepage = "https://github.com/theupdateframework/notary"; maintainers = with maintainers; [ vdemeester ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index f1335a1ad1d..27712e4d42f 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A light-weight process isolation tool, making use of Linux namespaces and seccomp-bpf syscall filters"; - homepage = http://nsjail.com/; + homepage = "http://nsjail.com/"; license = licenses.asl20; maintainers = with maintainers; [ bosu c0bw3b ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/nwipe/default.nix b/pkgs/tools/security/nwipe/default.nix index b2ead19a201..c72ada86761 100644 --- a/pkgs/tools/security/nwipe/default.nix +++ b/pkgs/tools/security/nwipe/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, ncurses, parted, automake, autoconf, pkgconfig }: stdenv.mkDerivation rec { - version = "0.27"; + version = "0.28"; pname = "nwipe"; src = fetchFromGitHub { owner = "martijnvanbrummelen"; repo = "nwipe"; rev = "v${version}"; - sha256 = "1rfqv5nxb20g7rfcmqaxwkbz5v294ak0kfsndncx3m4m1791fw04"; + sha256 = "1aw905lmn1vm6klqn3q7445dwmwbjhcmwnkygpq9rddacgig1gdx"; }; nativeBuildInputs = [ automake autoconf pkgconfig ]; buildInputs = [ ncurses parted ]; diff --git a/pkgs/tools/security/oath-toolkit/default.nix b/pkgs/tools/security/oath-toolkit/default.nix index d462101e92e..22327c6a38f 100644 --- a/pkgs/tools/security/oath-toolkit/default.nix +++ b/pkgs/tools/security/oath-toolkit/default.nix @@ -42,7 +42,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Components for building one-time password authentication systems"; - homepage = https://www.nongnu.org/oath-toolkit/; + homepage = "https://www.nongnu.org/oath-toolkit/"; platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/tools/security/omapd/default.nix b/pkgs/tools/security/omapd/default.nix index baea02402d9..8ed23864ced 100644 --- a/pkgs/tools/security/omapd/default.nix +++ b/pkgs/tools/security/omapd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://code.google.com/archive/p/omapd/; + homepage = "https://code.google.com/archive/p/omapd/"; description = "IF-MAP Server that implements the IF-MAP v1.1 and v2.0 specifications published by the Trusted Computing Group (TCG)"; license = licenses.gpl3; maintainers = [ maintainers.tstrobel ]; diff --git a/pkgs/tools/security/onesixtyone/default.nix b/pkgs/tools/security/onesixtyone/default.nix new file mode 100644 index 00000000000..4eed52b07f0 --- /dev/null +++ b/pkgs/tools/security/onesixtyone/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "onesixtyone"; + version = "unstable-2019-12-26"; + + src = fetchFromGitHub { + owner = "trailofbits"; + repo = "onesixtyone"; + rev = "9ce1dcdad73d45c8694086a4f90d7713be1cbdd7"; + sha256 = "111nxn4pcbx6p9j8cjjxv1j1s7dgf7f4dix8acsmahwbpzinzkg3"; + }; + + buildPhase = '' + $CC -o onesixtyone onesixtyone.c + ''; + + installPhase = '' + install -D onesixtyone $out/bin/onesixtyone + ''; + + meta = with stdenv.lib; { + description = "Fast SNMP Scanner"; + homepage = "https://github.com/trailofbits/onesixtyone"; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.fishi0x01 ]; + }; +} + diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 5a9f1012748..0eb0f7b401e 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://tails.boum.org; + homepage = "https://tails.boum.org"; description = "GTK application to display Tor circuits and streams"; license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; diff --git a/pkgs/tools/security/open-ecard/default.nix b/pkgs/tools/security/open-ecard/default.nix index 98f2e56e749..bac036e6790 100644 --- a/pkgs/tools/security/open-ecard/default.nix +++ b/pkgs/tools/security/open-ecard/default.nix @@ -13,7 +13,7 @@ let sha256 = "0rc862lx3y6sw87r1v5xjmqqpysyr1x6yqhycqmcdrwz0j3wykrr"; }; logo = fetchurl { - url = https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg; + url = "https://raw.githubusercontent.com/ecsec/open-ecard/1.2.3/gui/graphics/src/main/ext/oec_logo_bg-transparent.svg"; sha256 = "0rpmyv10vjx2yfpm03mqliygcww8af2wnrnrppmsazdplksaxkhs"; }; }; @@ -56,7 +56,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Client side implementation of the eCard-API-Framework (BSI TR-03112) and related international standards, such as ISO/IEC 24727"; - homepage = https://www.openecard.org/; + homepage = "https://www.openecard.org/"; license = licenses.gpl3; maintainers = with maintainers; [ sephalon ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/opencryptoki/default.nix b/pkgs/tools/security/opencryptoki/default.nix index 1d506928a52..1eb4aab66b4 100644 --- a/pkgs/tools/security/opencryptoki/default.nix +++ b/pkgs/tools/security/opencryptoki/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PKCS#11 implementation for Linux"; - homepage = https://github.com/opencryptoki/opencryptoki; + homepage = "https://github.com/opencryptoki/opencryptoki"; license = licenses.cpl10; maintainers = [ maintainers.tstrobel ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 315cd1c8c28..103345abf61 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of libraries and utilities to access smart cards"; - homepage = https://github.com/OpenSC/OpenSC/wiki; + homepage = "https://github.com/OpenSC/OpenSC/wiki"; license = licenses.lgpl21Plus; platforms = platforms.all; maintainers = [ maintainers.erictapen ]; diff --git a/pkgs/tools/security/ossec/default.nix b/pkgs/tools/security/ossec/default.nix index 2b52099e70b..285e275a81f 100644 --- a/pkgs/tools/security/ossec/default.nix +++ b/pkgs/tools/security/ossec/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ossec-client-2.6"; src = fetchurl { - url = https://www.ossec.net/files/ossec-hids-2.6.tar.gz; + url = "https://www.ossec.net/files/ossec-hids-2.6.tar.gz"; sha256 = "0k1b59wdv9h50gbyy88qw3cnpdm8hv0nrl0znm92h9a11i5b39ip"; }; @@ -32,7 +32,7 @@ yes meta = { description = "Open source host-based instrusion detection system"; - homepage = https://www.ossec.net; + homepage = "https://www.ossec.net"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/tools/security/pamtester/default.nix index 21f58ef517e..a1055dadc6c 100644 --- a/pkgs/tools/security/pamtester/default.nix +++ b/pkgs/tools/security/pamtester/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utility program to test the PAM facility"; - homepage = http://pamtester.sourceforge.net/; + homepage = "http://pamtester.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 54a8f4de7d7..46dfafa8151 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, pkgs, fetchurl, buildEnv , coreutils, gnused, getopt, git, tree, gnupg, openssl, which, procps -, qrencode , makeWrapper +, qrencode , makeWrapper, pass, symlinkJoin , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin @@ -23,131 +23,136 @@ let env = extensions: let - selected = extensions passExtensions + selected = [ pass ] ++ extensions passExtensions ++ stdenv.lib.optional tombPluginSupport passExtensions.tomb; in buildEnv { name = "pass-extensions-env"; paths = selected; - buildInputs = concatMap (x: x.buildInputs) selected; - }; - - generic = extensionsEnv: extraPassthru: stdenv.mkDerivation rec { - version = "1.7.3"; - pname = "password-store"; + buildInputs = [ makeWrapper ] ++ concatMap (x: x.buildInputs) selected; - src = fetchurl { - url = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz"; - sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"; - }; + postBuild = '' + files=$(find $out/bin/ -type f -exec readlink -f {} \;) + rm $out/bin + mkdir $out/bin - patches = [ ./set-correct-program-name-for-sleep.patch ] - ++ stdenv.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; + for i in $files; do + ln -sf $i $out/bin/$(basename $i) + done - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ extensionsEnv ]; + wrapProgram $out/bin/pass \ + --set SYSTEM_EXTENSION_DIR "$out/lib/password-store/extensions" + ''; + }; +in - installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; +stdenv.mkDerivation rec { + version = "1.7.3"; + pname = "password-store"; - postInstall = '' - # Install Emacs Mode. NOTE: We can't install the necessary - # dependencies (s.el and f.el) here. The user has to do this - # himself. - mkdir -p "$out/share/emacs/site-lisp" - cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - '' + optionalString x11Support '' - cp "contrib/dmenu/passmenu" "$out/bin/" - ''; + src = fetchurl { + url = "https://git.zx2c4.com/password-store/snapshot/${pname}-${version}.tar.xz"; + sha256 = "1x53k5dn3cdmvy8m4fqdld4hji5n676ksl0ql4armkmsds26av1b"; + }; - wrapperPath = with stdenv.lib; makeBinPath ([ - coreutils - getopt - git - gnupg - gnused - tree - which - qrencode - procps - ] ++ optional stdenv.isDarwin openssl - ++ ifEnable x11Support [ dmenu xclip xdotool ] - ++ optional waylandSupport wl-clipboard); - - postFixup = '' - # Link extensions env - rmdir $out/lib/password-store/extensions - ln -s ${extensionsEnv}/lib/password-store/extensions $out/lib/password-store/. - for f in ${extensionsEnv}/share/man/man1/*.1.gz; do - ln -s $f $out/share/man/man1/ - done - - # Fix program name in --help - substituteInPlace $out/bin/pass \ - --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass" - - # Ensure all dependencies are in PATH - wrapProgram $out/bin/pass \ - --prefix PATH : "${wrapperPath}" - '' + stdenv.lib.optionalString x11Support '' - # 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 \ - --prefix PATH : "$out/bin:${wrapperPath}" - ''; + patches = [ + ./set-correct-program-name-for-sleep.patch + ./extension-dir.patch + ] ++ stdenv.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; + + nativeBuildInputs = [ makeWrapper ]; + + installFlags = [ "PREFIX=$(out)" "WITH_ALLCOMP=yes" ]; + + postInstall = '' + # Install Emacs Mode. NOTE: We can't install the necessary + # dependencies (s.el and f.el) here. The user has to do this + # himself. + mkdir -p "$out/share/emacs/site-lisp" + cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" + '' + optionalString x11Support '' + cp "contrib/dmenu/passmenu" "$out/bin/" + ''; + + wrapperPath = with stdenv.lib; makeBinPath ([ + coreutils + getopt + git + gnupg + gnused + tree + which + qrencode + procps + ] ++ optional stdenv.isDarwin openssl + ++ ifEnable x11Support [ dmenu xclip xdotool ] + ++ optional waylandSupport wl-clipboard); + + postFixup = '' + # Fix program name in --help + substituteInPlace $out/bin/pass \ + --replace 'PROGRAM="''${0##*/}"' "PROGRAM=pass" + + # Ensure all dependencies are in PATH + wrapProgram $out/bin/pass \ + --prefix PATH : "${wrapperPath}" + '' + stdenv.lib.optionalString x11Support '' + # 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 \ + --prefix PATH : "$out/bin:${wrapperPath}" + ''; + + # Turn "check" into "installcheck", since we want to test our pass, + # not the one before the fixup. + postPatch = '' + patchShebangs tests + + substituteInPlace src/password-store.sh \ + --replace "@out@" "$out" + + # the turning + sed -i -e 's@^PASS=.*''$@PASS=$out/bin/pass@' \ + -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ + -e '/which gpg/ d' \ + tests/setup.sh + '' + stdenv.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 + rm -f tests/t0020-show-tests.sh + rm -f tests/t0050-mv-tests.sh + rm -f tests/t0100-insert-tests.sh + rm -f tests/t0300-reencryption.sh + rm -f tests/t0400-grep.sh + ''; + + doCheck = false; + + doInstallCheck = true; + installCheckInputs = [ git ]; + installCheckTarget = "test"; + + passthru = { + extensions = passExtensions; + withExtensions = env; + }; - # Turn "check" into "installcheck", since we want to test our pass, - # not the one before the fixup. - postPatch = '' - patchShebangs tests - - # the turning - sed -i -e 's@^PASS=.*''$@PASS=$out/bin/pass@' \ - -e 's@^GPGS=.*''$@GPG=${gnupg}/bin/gpg2@' \ - -e '/which gpg/ d' \ - tests/setup.sh - '' + stdenv.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 - rm -f tests/t0020-show-tests.sh - rm -f tests/t0050-mv-tests.sh - rm -f tests/t0100-insert-tests.sh - rm -f tests/t0300-reencryption.sh - rm -f tests/t0400-grep.sh + meta = with stdenv.lib; { + description = "Stores, retrieves, generates, and synchronizes passwords securely"; + homepage = "https://www.passwordstore.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ma27 ]; + platforms = platforms.unix; + + longDescription = '' + pass is a very simple password store that keeps passwords inside gpg2 + encrypted files inside a simple directory tree residing at + ~/.password-store. The pass utility provides a series of commands for + manipulating the password store, allowing the user to add, remove, edit, + synchronize, generate, and manipulate passwords. ''; - - doCheck = false; - - doInstallCheck = true; - installCheckInputs = [ git ]; - installCheckTarget = "test"; - - passthru = { - extensions = passExtensions; - } // extraPassthru; - - meta = with stdenv.lib; { - description = "Stores, retrieves, generates, and synchronizes passwords securely"; - homepage = https://www.passwordstore.org/; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher globin ]; - platforms = platforms.unix; - - longDescription = '' - pass is a very simple password store that keeps passwords inside gpg2 - encrypted files inside a simple directory tree residing at - ~/.password-store. The pass utility provides a series of commands for - manipulating the password store, allowing the user to add, remove, edit, - synchronize, generate, and manipulate passwords. - ''; - }; }; - -in - -generic (env (_: [])) { - withExtensions = extensions: generic (env extensions) {}; } diff --git a/pkgs/tools/security/pass/extension-dir.patch b/pkgs/tools/security/pass/extension-dir.patch new file mode 100644 index 00000000000..028da31c461 --- /dev/null +++ b/pkgs/tools/security/pass/extension-dir.patch @@ -0,0 +1,32 @@ +diff --git a/Makefile b/Makefile +index eac2291..1b1df0a 100644 +--- a/Makefile ++++ b/Makefile +@@ -46,12 +46,12 @@ install: install-common + @install -v -d "$(DESTDIR)$(LIBDIR)/password-store" && install -m 0644 -v "$(PLATFORMFILE)" "$(DESTDIR)$(LIBDIR)/password-store/platform.sh" + @install -v -d "$(DESTDIR)$(LIBDIR)/password-store/extensions" + @install -v -d "$(DESTDIR)$(BINDIR)/" +- @trap 'rm -f src/.pass' EXIT; sed 's:.*PLATFORM_FUNCTION_FILE.*:source "$(LIBDIR)/password-store/platform.sh":;s:^SYSTEM_EXTENSION_DIR=.*:SYSTEM_EXTENSION_DIR="$(LIBDIR)/password-store/extensions":' src/password-store.sh > src/.pass && \ ++ @trap 'rm -f src/.pass' EXIT; sed 's:.*PLATFORM_FUNCTION_FILE.*:source "$(LIBDIR)/password-store/platform.sh":;' src/password-store.sh > src/.pass && \ + install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v src/.pass "$(DESTDIR)$(BINDIR)/pass" + else + install: install-common + @install -v -d "$(DESTDIR)$(LIBDIR)/password-store/extensions" +- @trap 'rm -f src/.pass' EXIT; sed '/PLATFORM_FUNCTION_FILE/d;s:^SYSTEM_EXTENSION_DIR=.*:SYSTEM_EXTENSION_DIR="$(LIBDIR)/password-store/extensions":' src/password-store.sh > src/.pass && \ ++ @trap 'rm -f src/.pass' EXIT; sed '/PLATFORM_FUNCTION_FILE/d;' src/password-store.sh > src/.pass && \ + install -v -d "$(DESTDIR)$(BINDIR)/" && install -m 0755 -v src/.pass "$(DESTDIR)$(BINDIR)/pass" + endif + +diff --git a/src/password-store.sh b/src/password-store.sh +index 68551a4..2f3b5b7 100755 +--- a/src/password-store.sh ++++ b/src/password-store.sh +@@ -656,7 +656,7 @@ cmd_extension_or_show() { + fi + } + +-SYSTEM_EXTENSION_DIR="" ++SYSTEM_EXTENSION_DIR="${SYSTEM_EXTENSION_DIR:-@out@/lib/password-store/extensions}" + cmd_extension() { + check_sneaky_paths "$1" + local user_extension system_extension extension diff --git a/pkgs/tools/security/pass/extensions/audit.nix b/pkgs/tools/security/pass/extensions/audit.nix deleted file mode 100644 index ca5ca855337..00000000000 --- a/pkgs/tools/security/pass/extensions/audit.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper }: - -let - pythonEnv = pythonPackages.python.withPackages (p: [ p.requests ]); - -in stdenv.mkDerivation rec { - pname = "pass-audit"; - version = "0.1"; - - src = fetchFromGitHub { - owner = "roddhjav"; - repo = "pass-audit"; - rev = "v${version}"; - sha256 = "0v0db8bzpcaa7zqz17syn3c78mgvw4mpg8qg1gh5rmbjsjfxw6sm"; - }; - - nativeBuildInputs = [ makeWrapper ]; - - buildInputs = [ pythonEnv ]; - - patchPhase = '' - sed -i -e "s|/usr/lib|$out/lib|" audit.bash - sed -i -e 's|$0|${pass}/bin/pass|' audit.bash - ''; - - dontBuild = true; - - installFlags = [ "PREFIX=$(out)" ]; - - postFixup = '' - wrapProgram $out/lib/password-store/extensions/audit.bash \ - --prefix PATH : "${pythonEnv}/bin" \ - --run "export PREFIX" - ''; - - meta = with stdenv.lib; { - description = "Pass extension for auditing your password repository."; - homepage = https://github.com/roddhjav/pass-audit; - license = licenses.gpl3Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch b/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch new file mode 100644 index 00000000000..36faf3140cc --- /dev/null +++ b/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch @@ -0,0 +1,175 @@ +From 37c2b4d2940476555aeec20fe1e5e3fa0492a94e Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 15 Mar 2020 19:58:53 +0100 +Subject: [PATCH] Make it possible to run the tests offline + +Helpful when developing without network access, also makes sure that +the test actually depend on the API's data like number of breaches +(which will change in time). +--- + tests/commons.py | 25 +++++++++++++++++++++++++ + tests/test_audit.py | 8 +++++--- + tests/test_pass_audit.py | 10 +++++++++- + tests/test_pwned.py | 8 +++++--- + 4 files changed, 44 insertions(+), 7 deletions(-) + +diff --git a/tests/commons.py b/tests/commons.py +index 13c4cb1..4f1ecd8 100644 +--- a/tests/commons.py ++++ b/tests/commons.py +@@ -56,3 +56,28 @@ class TestPass(TestBase): + for path in self.store.list(root): + data[path] = self.store.show(path) + return data ++ ++ ++def mock_request(*args, **kwargs): ++ class MockResponse: ++ def __init__(self): ++ data = [ ++ "D5EE0CB1A41071812CCED2F1930E6E1A5D2:2", ++ "2DC183F740EE76F27B78EB39C8AD972A757:52579", ++ "CF164D7A51A1FD864B1BF9E1CE8A3EC171B:4", ++ "D0B910E7A3028703C0B30039795E908CEB2:7", ++ "AD6438836DBE526AA231ABDE2D0EEF74D42:3", ++ "EBAB0A7CE978E0194608B572E4F9404AA21:3", ++ "17727EAB0E800E62A776C76381DEFBC4145:120", ++ "5370372AC65308F03F6ED75EC6068C8E1BE:1386", ++ "1E4C9B93F3F0682250B6CF8331B7EE68FD8:3730471", ++ "437FAA5A7FCE15D1DDCB9EAEAEA377667B8:123422", ++ "944C22589AC652B0F47918D58CA0CDCCB63:411" ++ ] ++ ++ self.text = "\r\n".join(data) ++ ++ def raise_for_status(self): ++ pass ++ ++ return MockResponse() +diff --git a/tests/test_audit.py b/tests/test_audit.py +index d8c7a9a..5e0a9cf 100644 +--- a/tests/test_audit.py ++++ b/tests/test_audit.py +@@ -17,12 +17,13 @@ + # + + from .. import pass_audit +-from tests.commons import TestPass +- ++from tests.commons import TestPass, mock_request ++from unittest import mock + + class TestPassAudit(TestPass): + passwords_nb = 7 + ++ @mock.patch('requests.get', mock_request) + def test_password_notpwned(self): + """Testing: pass audit for password not breached with K-anonymity method.""" + data = self._getdata("Password/notpwned") +@@ -30,9 +31,10 @@ class TestPassAudit(TestPass): + breached = audit.password() + self.assertTrue(len(breached) == 0) + ++ @mock.patch('requests.get', mock_request) + def test_password_pwned(self): + """Testing: pass audit for password breached with K-anonymity method.""" +- ref_counts = [51259, 3, 114, 1352, 3645804, 78773, 396] ++ ref_counts = [52579, 3, 120, 1386, 3730471, 123422, 411] + data = self._getdata("Password/pwned") + audit = pass_audit.PassAudit(data) + breached = audit.password() +diff --git a/tests/test_pass_audit.py b/tests/test_pass_audit.py +index 4c10f87..2c949f7 100644 +--- a/tests/test_pass_audit.py ++++ b/tests/test_pass_audit.py +@@ -19,7 +19,8 @@ + import os + + from .. import pass_audit +-from tests.commons import TestPass ++from tests.commons import TestPass, mock_request ++from unittest import mock + + + class TestPassAuditCMD(TestPass): +@@ -47,6 +48,7 @@ class TestPassAuditCMD(TestPass): + cmd = ['--not-an-option', '-q'] + self._passaudit(cmd, 2) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_StoreNotInitialized(self): + """Testing: store not initialized.""" + cmd = ['Password/', '-v'] +@@ -56,6 +58,7 @@ class TestPassAuditCMD(TestPass): + os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), + os.path.join(self.store.prefix, '.gpg-id')) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_InvalidID(self): + """Testing: invalid user ID.""" + os.rename(os.path.join(self.store.prefix, '.gpg-id'), +@@ -66,26 +69,31 @@ class TestPassAuditCMD(TestPass): + os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), + os.path.join(self.store.prefix, '.gpg-id')) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_NotAFile(self): + """Testing: pass audit not_a_file.""" + cmd = ['not_a_file'] + self._passaudit(cmd, 1) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_passwords_notpwned(self): + """Testing: pass audit Password/notpwned.""" + cmd = ['Password/notpwned'] + self._passaudit(cmd) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_passwords_pwned(self): + """Testing: pass audit Password/pwned.""" + cmd = ['Password/pwned'] + self._passaudit(cmd) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_passwords_good(self): + """Testing: pass audit Password/good.""" + cmd = ['Password/good'] + self._passaudit(cmd) + ++ @mock.patch('requests.get', mock_request) + def test_pass_audit_passwords_all(self): + """Testing: pass audit .""" + cmd = [''] +diff --git a/tests/test_pwned.py b/tests/test_pwned.py +index 5ce6bc6..c28939a 100644 +--- a/tests/test_pwned.py ++++ b/tests/test_pwned.py +@@ -17,7 +17,8 @@ + # + + from .. import pass_audit +-from tests.commons import TestPass ++from tests.commons import TestPass, mock_request ++from unittest import mock + + + class TestPwnedAPI(TestPass): +@@ -25,12 +26,13 @@ class TestPwnedAPI(TestPass): + def setUp(self): + self.api = pass_audit.PwnedAPI() + ++ @mock.patch('requests.get', mock_request) + def test_password_range(self): + """Testing: https://api.haveibeenpwned.com/range API.""" + prefix = '21BD1' + Hash = '21BD12DC183F740EE76F27B78EB39C8AD972A757' + hashes, counts = self.api.password_range(prefix) + self.assertIn(Hash, hashes) +- self.assertTrue(counts[hashes.index(Hash)] == 51259) ++ self.assertTrue(counts[hashes.index(Hash)] == 52579) + self.assertTrue(len(hashes) == len(counts)) +- self.assertTrue(len(hashes) == 527) ++ self.assertTrue(len(hashes) == 11) +-- +2.25.0 + diff --git a/pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch b/pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch new file mode 100644 index 00000000000..5703f3c1f65 --- /dev/null +++ b/pkgs/tools/security/pass/extensions/audit/0002-Fix-audit.bash-setup.patch @@ -0,0 +1,28 @@ +From 8f76b32946430737f97f2702afd828b09536afd2 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch <maximilian@mbosch.me> +Date: Sun, 15 Mar 2020 20:10:11 +0100 +Subject: [PATCH 2/2] Fix audit.bash setup + +This sets PASSWORD_STORE_DIR (needed by the python-code) to +PASSWORD_STORE_DIR and properly falls back to `~/.password-store` if +it's not set. +--- + audit.bash | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/audit.bash b/audit.bash +index 7a973dc..c40ff76 100755 +--- a/audit.bash ++++ b/audit.bash +@@ -17,7 +17,7 @@ + # + + cmd_audit() { +- export PASSWORD_STORE_DIR=$PREFIX GIT_DIR PASSWORD_STORE_GPG_OPTS ++ export PASSWORD_STORE_DIR=${PASSWORD_STORE_DIR:-$HOME/.password-store} GIT_DIR PASSWORD_STORE_GPG_OPTS + export X_SELECTION CLIP_TIME PASSWORD_STORE_UMASK GENERATED_LENGTH + export CHARACTER_SET CHARACTER_SET_NO_SYMBOLS EXTENSIONS PASSWORD_STORE_KEY + export PASSWORD_STORE_ENABLE_EXTENSIONS PASSWORD_STORE_SIGNING_KEY +-- +2.25.0 + diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix new file mode 100644 index 00000000000..5f8e0f7b1c6 --- /dev/null +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -0,0 +1,51 @@ +{ stdenv, pass, fetchFromGitHub, pythonPackages, makeWrapper, gnupg }: + +let + pythonEnv = pythonPackages.python.withPackages (p: [ p.requests p.setuptools p.zxcvbn ]); + +in stdenv.mkDerivation rec { + pname = "pass-audit"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "roddhjav"; + repo = "pass-audit"; + rev = "v${version}"; + sha256 = "1mdckw0dwcnv8smp1za96y0zmdnykbkw2606v7mzfnzbz4zjdlwl"; + }; + + patches = [ + ./0001-Make-it-possible-to-run-the-tests-offline.patch + ./0002-Fix-audit.bash-setup.patch + ]; + + postPatch = '' + substituteInPlace audit.bash \ + --replace '/usr/bin/env python3' "${pythonEnv}/bin/python3" + ''; + + outputs = [ "out" "man" ]; + + buildInputs = [ pythonEnv ]; + nativeBuildInputs = [ makeWrapper ]; + + doCheck = true; + checkInputs = [ pythonPackages.green pass gnupg ]; + checkPhase = '' + ${pythonEnv}/bin/python3 setup.py green -q + ''; + + installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; + postInstall = '' + wrapProgram $out/lib/password-store/extensions/audit.bash \ + --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" + ''; + + meta = with stdenv.lib; { + description = "Pass extension for auditing your password repository."; + homepage = "https://github.com/roddhjav/pass-audit"; + license = licenses.gpl3Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ma27 ]; + }; +} diff --git a/pkgs/tools/security/pass/extensions/default.nix b/pkgs/tools/security/pass/extensions/default.nix index 6eb321229e0..1f41a692482 100644 --- a/pkgs/tools/security/pass/extensions/default.nix +++ b/pkgs/tools/security/pass/extensions/default.nix @@ -3,7 +3,7 @@ with pkgs; { - pass-audit = callPackage ./audit.nix { + pass-audit = callPackage ./audit { pythonPackages = python3Packages; }; pass-checkup = callPackage ./checkup.nix {}; diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index 208012e2f88..48db0094db9 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension that generates memorable passwords"; - homepage = https://github.com/congma/pass-genphrase; + homepage = "https://github.com/congma/pass-genphrase"; license = licenses.gpl3; maintainers = with maintainers; [ seqizz ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 90e3105bbd8..c2fc2cff881 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension for importing data from existing password managers"; - homepage = https://github.com/roddhjav/pass-import; + homepage = "https://github.com/roddhjav/pass-import"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/pass/extensions/otp.nix b/pkgs/tools/security/pass/extensions/otp.nix index 4b15c3d6803..835e693c2c5 100644 --- a/pkgs/tools/security/pass/extensions/otp.nix +++ b/pkgs/tools/security/pass/extensions/otp.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pass extension for managing one-time-password (OTP) tokens"; - homepage = https://github.com/tadfisher/pass-otp; + homepage = "https://github.com/tadfisher/pass-otp"; license = licenses.gpl3; maintainers = with maintainers; [ jwiegley tadfisher toonn ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/pass/extensions/tomb.nix b/pkgs/tools/security/pass/extensions/tomb.nix index ccb558c9b85..f5b61207de6 100644 --- a/pkgs/tools/security/pass/extensions/tomb.nix +++ b/pkgs/tools/security/pass/extensions/tomb.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension that keeps the password store encrypted inside a tomb"; - homepage = https://github.com/roddhjav/pass-tomb; + homepage = "https://github.com/roddhjav/pass-tomb"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/pass/extensions/update.nix b/pkgs/tools/security/pass/extensions/update.nix index 86563b7ff42..5bc88d394e7 100644 --- a/pkgs/tools/security/pass/extensions/update.nix +++ b/pkgs/tools/security/pass/extensions/update.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Pass extension that provides an easy flow for updating passwords"; - homepage = https://github.com/roddhjav/pass-update; + homepage = "https://github.com/roddhjav/pass-update"; license = licenses.gpl3Plus; maintainers = with maintainers; [ lovek323 the-kenny fpletz tadfisher ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index b188b411517..7daf42ab6c7 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "A script to make rofi work with password-store"; - homepage = https://github.com/carnager/rofi-pass; + homepage = "https://github.com/carnager/rofi-pass"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/security/passff-host/default.nix b/pkgs/tools/security/passff-host/default.nix index 59f03db0200..0bdb04b7612 100644 --- a/pkgs/tools/security/passff-host/default.nix +++ b/pkgs/tools/security/passff-host/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Host app for the WebExtension PassFF"; - homepage = https://github.com/passff/passff-host; + homepage = "https://github.com/passff/passff-host"; license = licenses.gpl2; maintainers = with maintainers; [ nadrieril ]; }; diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 8aadb685aa8..6683caecbe9 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, pcsclite }: +{ stdenv, fetchurl, pkgconfig, libusb1, pcsclite }: stdenv.mkDerivation rec { pname = "pcsc-cyberjack"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "tools" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb pcsclite ]; + buildInputs = [ libusb1 pcsclite ]; configureFlags = [ "--with-usbdropdir=${placeholder "out"}/pcsc/drivers" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "REINER SCT cyberJack USB chipcard reader user space driver"; - homepage = https://www.reiner-sct.com/; + homepage = "https://www.reiner-sct.com/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ aszlig ]; diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index 0302fc6fc67..b400d628fd7 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "SCM Microsystems SCL011 chipcard reader user space driver"; - homepage = http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630; - downloadPage = https://support.identiv.com/scl010-scl011/; + homepage = "http://www.scm-pc-card.de/index.php?lang=en&page=product&function=show_product&product_id=630"; + downloadPage = "https://support.identiv.com/scl010-scl011/"; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ sephalon ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix index 2141f12151f..4e01a5792dc 100644 --- a/pkgs/tools/security/pcsclite/default.nix +++ b/pkgs/tools/security/pcsclite/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Middleware to access a smart card using SCard API (PC/SC)"; - homepage = https://pcsclite.apdu.fr/; + homepage = "https://pcsclite.apdu.fr/"; license = licenses.bsd3; platforms = with platforms; unix; }; diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix index bf8f014bcfd..9d05304cf2f 100644 --- a/pkgs/tools/security/pdfcrack/default.nix +++ b/pkgs/tools/security/pdfcrack/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = http://pdfcrack.sourceforge.net/; + homepage = "http://pdfcrack.sourceforge.net/"; description = "Small command line driven tool for recovering passwords and content from PDF files"; license = with licenses; [ gpl2 ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index 8bf440d2b07..cd421224fa6 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pgpdump is a PGP packet visualizer which displays the packet format of OpenPGP (RFC 4880) and PGP version 2 (RFC 1991). ''; - homepage = http://www.mew.org/~kazu/proj/pgpdump/en/; + homepage = "http://www.mew.org/~kazu/proj/pgpdump/en/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 87edc914131..e6d07888d1d 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -90,7 +90,7 @@ pinentryMkDerivation rec { passthru = { flavors = enabledFlavors; }; meta = with stdenv.lib; { - homepage = http://gnupg.org/aegypten2/; + homepage = "http://gnupg.org/aegypten2/"; description = "GnuPG’s interface to passphrase input"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/security/pinentry/mac.nix b/pkgs/tools/security/pinentry/mac.nix index 25fa180c48b..1c3b87cd9f0 100644 --- a/pkgs/tools/security/pinentry/mac.nix +++ b/pkgs/tools/security/pinentry/mac.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "Pinentry for GPG on Mac"; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://github.com/GPGTools/pinentry-mac; + homepage = "https://github.com/GPGTools/pinentry-mac"; platforms = stdenv.lib.platforms.darwin; }; } diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index 6d2b5569a0d..f1b4d80a355 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication { buildInputs = [ perl ]; meta = { - homepage = https://www.phildev.net/pius/; + homepage = "https://www.phildev.net/pius/"; description = "PGP Individual UID Signer (PIUS), quickly and easily sign UIDs on a set of PGP keys"; diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix index 2c03183fa96..c6675601231 100644 --- a/pkgs/tools/security/prey/default.nix +++ b/pkgs/tools/security/prey/default.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://preyproject.com; + homepage = "https://preyproject.com"; description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing"; maintainers = with maintainers; [ domenkozar ]; license = licenses.gpl3; diff --git a/pkgs/tools/security/proxmark3/default.nix b/pkgs/tools/security/proxmark3/default.nix index e717558a24d..304ba041b46 100644 --- a/pkgs/tools/security/proxmark3/default.nix +++ b/pkgs/tools/security/proxmark3/default.nix @@ -35,7 +35,7 @@ let meta = with stdenv.lib; { description = "Client for proxmark3, powerful general purpose RFID tool"; - homepage = http://www.proxmark.org; + homepage = "http://www.proxmark.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index 79e8fb071b3..a63e40b744e 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "pwgen-2.08"; src = fetchurl { - url = https://github.com/tytso/pwgen/archive/v2.08.tar.gz; + url = "https://github.com/tytso/pwgen/archive/v2.08.tar.gz"; sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; }; diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index 7a78233dbce..b1d6400f2d0 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { 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; + homepage = "https://gitlab.com/akihe/radamsa"; maintainers = [ stdenv.lib.maintainers.markWot ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix index 68e5df80937..9749d825168 100644 --- a/pkgs/tools/security/rarcrack/default.nix +++ b/pkgs/tools/security/rarcrack/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { This program uses bruteforce algorithm to find correct password. You can specify wich characters will be used in password generations. Warning: Please don't use this program for any illegal things! ''; - homepage = https://github.com/jaredsburrows/Rarcrack; + homepage = "https://github.com/jaredsburrows/Rarcrack"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/ripasso/cursive.nix b/pkgs/tools/security/ripasso/cursive.nix index 70c4ee864b6..c8a55d3f397 100644 --- a/pkgs/tools/security/ripasso/cursive.nix +++ b/pkgs/tools/security/ripasso/cursive.nix @@ -16,9 +16,9 @@ buildRustPackage rec { cargoBuildFlags = [ "-p ripasso-cursive -p ripasso-man" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig gpgme python3 ]; buildInputs = [ - ncurses python3 openssl libgpgerror gpgme xorg.libxcb + ncurses openssl libgpgerror gpgme xorg.libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; preFixup = '' diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index bd289200fe8..16952e6dabb 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = { description = "A random number generator daemon"; - homepage = https://github.com/nhorman/rng-tools; + homepage = "https://github.com/nhorman/rng-tools"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ johnazoidberg c0bw3b ]; diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 811b95d2524..4373abdb9a4 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoModule, fetchFromGitHub, libobjc, Foundation, IOKit }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "saml2aws"; - version = "2.24.0"; + version = "2.25.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "15zxi64s1hgpm3rxk0m7z5363jc7h80g91bfx8vg7nw680lday4w"; + sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc"; }; - modSha256 = "0qxf2i06spjig3ynixh3xmbxpghh222jhfqcg71i4i79x4ycp5wx"; - - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libobjc Foundation IOKit ]; + modSha256 = "1kcj5065yy52p1jy4fad5lsz3y4spqc40k1qsirm53qqixhrhvag"; subPackages = [ "." "cmd/saml2aws" ]; diff --git a/pkgs/tools/security/sbsigntool/default.nix b/pkgs/tools/security/sbsigntool/default.nix index e0e2896f6ff..1a42ddf8bec 100644 --- a/pkgs/tools/security/sbsigntool/default.nix +++ b/pkgs/tools/security/sbsigntool/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Tools for maintaining UEFI signature databases"; - homepage = http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases; + homepage = "http://jk.ozlabs.org/docs/sbkeysync-maintaing-uefi-key-databases"; maintainers = [ maintainers.tstrobel ]; platforms = [ "x86_64-linux" ]; # Broken on i686 license = licenses.gpl3; diff --git a/pkgs/tools/security/scallion/default.nix b/pkgs/tools/security/scallion/default.nix index e419232641b..1395b8e1061 100644 --- a/pkgs/tools/security/scallion/default.nix +++ b/pkgs/tools/security/scallion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl, ocl-icd }: +{ stdenv, fetchFromGitHub, makeWrapper, mono, openssl_1_0_2, ocl-icd }: stdenv.mkDerivation rec { version = "2.1"; @@ -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 ocl-icd ]} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl_1_0_2 ocl-icd ]} \ --add-flags $out/share/scallion.exe ''; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 66313b53649..018bc44b144 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Encryption utility"; - homepage = https://www.tarsnap.com/scrypt.html; + homepage = "https://www.tarsnap.com/scrypt.html"; license = licenses.bsd2; platforms = platforms.all; maintainers = with maintainers; [ thoughtpolice ]; diff --git a/pkgs/tools/security/seccure/default.nix b/pkgs/tools/security/seccure/default.nix index 686ef36f863..e0f01f4f2c4 100644 --- a/pkgs/tools/security/seccure/default.nix +++ b/pkgs/tools/security/seccure/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://point-at-infinity.org/seccure/; + homepage = "http://point-at-infinity.org/seccure/"; description = "Zero-configuration elliptic curve cryptography utility"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.lgpl3; diff --git a/pkgs/tools/security/secp256k1/default.nix b/pkgs/tools/security/secp256k1/default.nix index 7189032454d..b5e92a35454 100644 --- a/pkgs/tools/security/secp256k1/default.nix +++ b/pkgs/tools/security/secp256k1/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { Bitcoin Core. This library is a work in progress and is being used to research best practices. Use at your own risk. ''; - homepage = https://github.com/bitcoin-core/secp256k1; + homepage = "https://github.com/bitcoin-core/secp256k1"; license = with licenses; [ mit ]; maintainers = with maintainers; [ chris-martin ]; platforms = with platforms; unix; diff --git a/pkgs/tools/security/sedutil/default.nix b/pkgs/tools/security/sedutil/default.nix index 9edd9745326..4877a8adfce 100644 --- a/pkgs/tools/security/sedutil/default.nix +++ b/pkgs/tools/security/sedutil/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DTA sedutil Self encrypting drive software"; - homepage = https://www.drivetrust.com; + homepage = "https://www.drivetrust.com"; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index fe0b13bbb97..e6081fbf472 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -9,16 +9,16 @@ assert pythonSupport -> pythonPackages != null; rustPlatform.buildRustPackage rec { pname = "sequoia"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitLab { owner = "sequoia-pgp"; repo = pname; rev = "v${version}"; - sha256 = "1l6isis0ddb0b306z3cv2f5qz2bhw5pmf42shnrxzg7778dnmwhw"; + sha256 = "0iwzi2ylrwz56s77cd4vcf89ig6ipy4w6kp2pfwqvd2d00x54dhk"; }; - cargoSha256 = "0cfi42wx93yc9yib9lpxl6ph991ra39yfhw1lr16z2qzzbzj2b1j"; + cargoSha256 = "0jsmvs6hr9mhapz3a74wpfgkjkq3w10014j3z30bm659mxqrknha"; nativeBuildInputs = [ pkgconfig @@ -28,6 +28,7 @@ rustPlatform.buildRustPackage rec { llvmPackages.libclang llvmPackages.clang ensureNewerSourcesForZipFilesHook + capnproto ] ++ lib.optionals pythonSupport [ pythonPackages.setuptools ] ; @@ -41,9 +42,7 @@ rustPlatform.buildRustPackage rec { openssl sqlite nettle - capnproto - ] - ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] + ] ++ lib.optionals pythonSupport [ pythonPackages.python pythonPackages.cffi ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ] ; diff --git a/pkgs/tools/security/shc/default.nix b/pkgs/tools/security/shc/default.nix index 18814eb7fa8..3705d2c7ed1 100644 --- a/pkgs/tools/security/shc/default.nix +++ b/pkgs/tools/security/shc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://neurobin.org/projects/softwares/unix/shc/; + homepage = "https://neurobin.org/projects/softwares/unix/shc/"; description = "Shell Script Compiler"; platforms = stdenv.lib.platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/security/signify/default.nix b/pkgs/tools/security/signify/default.nix index 22604a3f70b..3ec260a7c0c 100644 --- a/pkgs/tools/security/signify/default.nix +++ b/pkgs/tools/security/signify/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { OpenBSDs signing tool, which uses the Ed25519 public key signature system for fast signing and verification of messages using small public keys. ''; - homepage = https://www.tedunangst.com/flak/post/signify; + homepage = "https://www.tedunangst.com/flak/post/signify"; license = licenses.isc; maintainers = [ maintainers.rlupton20 ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/signing-party/default.nix b/pkgs/tools/security/signing-party/default.nix index ea487fed2a1..91d3ea356df 100644 --- a/pkgs/tools/security/signing-party/default.nix +++ b/pkgs/tools/security/signing-party/default.nix @@ -192,7 +192,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://salsa.debian.org/signing-party-team/signing-party; + homepage = "https://salsa.debian.org/signing-party-team/signing-party"; description = "A collection of several projects relating to OpenPGP"; longDescription = '' This is a collection of several projects relating to OpenPGP. diff --git a/pkgs/tools/security/simple-tpm-pk11/default.nix b/pkgs/tools/security/simple-tpm-pk11/default.nix index 16056f9a59e..2a360b4321c 100644 --- a/pkgs/tools/security/simple-tpm-pk11/default.nix +++ b/pkgs/tools/security/simple-tpm-pk11/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' A simple library for using the TPM chip to secure SSH keys. ''; - homepage = https://github.com/ThomasHabets/simple-tpm-pk11; + homepage = "https://github.com/ThomasHabets/simple-tpm-pk11"; license = licenses.asl20; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/softhsm/default.nix b/pkgs/tools/security/softhsm/default.nix index 94642700c33..5cc7dbac5da 100644 --- a/pkgs/tools/security/softhsm/default.nix +++ b/pkgs/tools/security/softhsm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/var"; meta = with stdenv.lib; { - homepage = https://www.opendnssec.org/softhsm; + homepage = "https://www.opendnssec.org/softhsm"; description = "Cryptographic store accessible through a PKCS #11 interface"; license = licenses.bsd2; maintainers = [ maintainers.leenaars ]; diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index d028b9787db..8aa2e219e7d 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, CoreServices }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "sops"; @@ -13,8 +13,6 @@ buildGoModule rec { modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; - meta = with stdenv.lib; { homepage = "https://github.com/mozilla/sops"; description = "Mozilla sops (Secrets OPerationS) is an editor of encrypted files"; diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 656efbf390c..4d58095c43b 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Spectre & Meltdown vulnerability/mitigation checker for Linux"; - homepage = https://github.com/speed47/spectre-meltdown-checker; + homepage = "https://github.com/speed47/spectre-meltdown-checker"; license = licenses.gpl3; maintainers = with maintainers; [ dotlambda ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix index 9782d00267f..853ad4f280a 100644 --- a/pkgs/tools/security/srm/default.nix +++ b/pkgs/tools/security/srm/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { provide drop in security for users who wish to prevent recovery of deleted information, even if the machine is compromised. ''; - homepage = http://srm.sourceforge.net; + homepage = "http://srm.sourceforge.net"; license = licenses.mit; maintainers = with maintainers; [ edwtjo ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index a196fe9ca47..bad1c9fd16d 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { SSHGuard can read log messages from various input sources. Log messages are parsed, line-by-line, for recognized patterns. If an attack, such as several login failures within a few seconds, is detected, the offending IP is blocked. ''; - homepage = https://sshguard.net; + homepage = "https://sshguard.net"; license = licenses.bsd3; maintainers = with maintainers; [ sargon ]; platforms = with platforms; linux ++ darwin ++ freebsd ++ netbsd ++ openbsd; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 0e0e8c7ad75..4d0ae5e051d 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -2,12 +2,12 @@ , coreutils, iptables, nettools, openssh, procps }: python3Packages.buildPythonApplication rec { - name = "sshuttle-${version}"; + pname = "sshuttle"; version = "0.78.5"; - src = fetchurl { + src = python3Packages.fetchPypi { + inherit pname version; sha256 = "0vp13xwrhx4m6zgsyzvai84lkq9mzkaw47j58dk0ll95kaymk2x8"; - url = "mirror://pypi/s/sshuttle/${name}.tar.gz"; }; patches = [ ./sudo.patch ]; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/sshuttle/sshuttle/; + homepage = "https://github.com/sshuttle/sshuttle/"; description = "Transparent proxy server that works as a poor man's VPN"; longDescription = '' Forward connections over SSH, without requiring administrator access to the diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index 15ac376d72a..68efa7a17d1 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tests SSL/TLS services and discover supported cipher suites"; - homepage = https://github.com/rbsec/sslscan; + homepage = "https://github.com/rbsec/sslscan"; license = licenses.gpl3; maintainers = with maintainers; [ fpletz globin ]; platforms = platforms.all; diff --git a/pkgs/tools/security/ssss/default.nix b/pkgs/tools/security/ssss/default.nix index 157e007c534..bd7de72e6be 100644 --- a/pkgs/tools/security/ssss/default.nix +++ b/pkgs/tools/security/ssss/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "ssss-0.5"; src = fetchurl { - url = http://point-at-infinity.org/ssss/ssss-0.5.tar.gz; + url = "http://point-at-infinity.org/ssss/ssss-0.5.tar.gz"; sha256 = "15grn2fp1x8p92kxkwbmsx8rz16g93y9grl3hfqbh1jn21ama5jx"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Shamir Secret Sharing Scheme"; - homepage = http://point-at-infinity.org/ssss/; + homepage = "http://point-at-infinity.org/ssss/"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index 7a759c3c333..5ac40e0a047 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://steghide.sourceforge.net/; + homepage = "http://steghide.sourceforge.net/"; description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/security/step-cli/default.nix b/pkgs/tools/security/step-cli/default.nix index 0ecd3bc8253..d696b560f6d 100644 --- a/pkgs/tools/security/step-cli/default.nix +++ b/pkgs/tools/security/step-cli/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = with lib; { description = "A zero trust swiss army knife for working with X509, OAuth, JWT, OATH OTP, etc"; - homepage = https://smallstep.com/cli/; + homepage = "https://smallstep.com/cli/"; license = licenses.asl20; maintainers = with maintainers; [ xfix ]; platforms = platforms.linux ++ platforms.darwin; diff --git a/pkgs/tools/security/stoken/default.nix b/pkgs/tools/security/stoken/default.nix index d6375bee649..22dc5e476e7 100644 --- a/pkgs/tools/security/stoken/default.nix +++ b/pkgs/tools/security/stoken/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Software Token for Linux/UNIX"; - homepage = https://github.com/cernekee/stoken; + homepage = "https://github.com/cernekee/stoken"; license = licenses.lgpl21Plus; maintainers = [ ]; platforms = platforms.all; diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 842509888b4..e05374575d2 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "sudo"; - version = "1.8.31"; + version = "1.8.31p1"; src = fetchurl { - url = "ftp://ftp.sudo.ws/pub/sudo/${pname}-${version}.tar.gz"; - sha256 = "0ks5mm9hda5idivncyfpiz4lrd8fv0dpmsl711788k7f7ixdka3y"; + url = "https://www.sudo.ws/dist/${pname}-${version}.tar.gz"; + sha256 = "1n0mdmgcs92af34xxsnsh1arrngymhdmwd9srjgjbk65q7xzsg67"; }; prePatch = '' @@ -72,9 +72,9 @@ stdenv.mkDerivation rec { providing an audit trail of the commands and their arguments. ''; - homepage = https://www.sudo.ws/; + homepage = "https://www.sudo.ws/"; - license = https://www.sudo.ws/sudo/license.html; + license = "https://www.sudo.ws/sudo/license.html"; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 716973a3e2e..73321fd618e 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; patches = [ - (fetchpatch { url = https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch; + (fetchpatch { url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; }) ]; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 062bf40b7d6..38f467fb441 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; - homepage = https://sourceforge.net/projects/tboot/; + homepage = "https://sourceforge.net/projects/tboot/"; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 86a65a06028..a6eb09fd2c5 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://tcpcrypt.org/; + homepage = "http://tcpcrypt.org/"; description = "Fast TCP encryption"; platforms = platforms.all; license = licenses.bsd2; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 0ef45bd5337..215ab63328f 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.torproject.org/"; - repositories.git = https://git.torproject.org/git/tor; + repositories.git = "https://git.torproject.org/git/tor"; description = "Anonymizing overlay network"; longDescription = '' diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 8681d80c2ed..2ce4c9806eb 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation rec { meta = { description = "Wrapper to safely torify applications"; - homepage = https://github.com/dgoulet/torsocks; - repositories.git = https://git.torproject.org/torsocks.git; + 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 ]; diff --git a/pkgs/tools/security/tpm-luks/default.nix b/pkgs/tools/security/tpm-luks/default.nix index 94d833ca746..fc1931fa4ba 100644 --- a/pkgs/tools/security/tpm-luks/default.nix +++ b/pkgs/tools/security/tpm-luks/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "LUKS key storage in TPM NVRAM"; - homepage = https://github.com/shpedoikal/tpm-luks/; + homepage = "https://github.com/shpedoikal/tpm-luks/"; maintainers = [ maintainers.tstrobel ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/security/tpm-quote-tools/default.nix b/pkgs/tools/security/tpm-quote-tools/default.nix index f7526ac7225..a652867a0d0 100644 --- a/pkgs/tools/security/tpm-quote-tools/default.nix +++ b/pkgs/tools/security/tpm-quote-tools/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { for TPM based attestation using the TPM quote mechanism. The manual page for tpm_quote_tools provides a usage overview. ''; - homepage = http://tpmquotetools.sourceforge.net/; + homepage = "http://tpmquotetools.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ ak ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index e546cc5a10f..5e0b4e6d94f 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchurl { - url = https://sources.debian.org/data/main/t/tpm-tools/1.3.9.1-0.1/debian/patches/05-openssl1.1_fix_data_mgmt.patch; + url = "https://sources.debian.org/data/main/t/tpm-tools/1.3.9.1-0.1/debian/patches/05-openssl1.1_fix_data_mgmt.patch"; sha256 = "161yysw4wgy3spsz6p1d0ib0h5pnrqm8bdh1l71c4hz6a6wpcyxj"; }) ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { application enablement of Trusted Computing using a Trusted Platform Module (TPM), similar to a smart card environment. ''; - homepage = https://sourceforge.net/projects/trousers/files/tpm-tools/; + homepage = "https://sourceforge.net/projects/trousers/files/tpm-tools/"; license = licenses.cpl10; maintainers = [ maintainers.ak ]; platforms = platforms.unix; diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index 84dafca4e0c..fbebde2e7bf 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "TPM2 resource manager, accessible via D-Bus"; - homepage = https://github.com/tpm2-software/tpm2-tools; + homepage = "https://github.com/tpm2-software/tpm2-tools"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ lschuermann ]; diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index 9600326cd55..06826173e34 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command line tools that provide access to a TPM 2.0 compatible device"; - homepage = https://github.com/tpm2-software/tpm2-tools; + homepage = "https://github.com/tpm2-software/tpm2-tools"; license = licenses.bsd3; platforms = platforms.linux; maintainers = with maintainers; [ delroth ]; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index a38c011d7a4..2cc702cf6f2 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Trusted computing software stack"; - homepage = http://trousers.sourceforge.net/; + homepage = "http://trousers.sourceforge.net/"; license = licenses.bsd3; maintainers = [ maintainers.ak ]; platforms = platforms.linux; diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 9492f2bb6ea..a0205970366 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -30,7 +30,7 @@ in doCheck = false; meta = { - homepage = https://github.com/dxa4481/truffleHog; + homepage = "https://github.com/dxa4481/truffleHog"; description = "Searches through git repositories for high entropy strings and secrets, digging deep into commit history"; license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ bhipple ]; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index ff4d6f01493..54be477cfe2 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.3.3"; + version = "1.4.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1scwclkpb7v5pcx1afgjqrfgcp0c1bd9gqvwdmjbpfcyxv1f032d"; + sha256 = "13ycg9shara4ycbi79wj28z6nimnsqgisbf35ca3q9w066ac0ja2"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 6e2ab221c42..6b14a834330 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.vaultproject.io; + homepage = "https://www.vaultproject.io"; description = "A tool for managing secrets, this binary includes the UI"; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "aarch64-linux" "i686-darwin" ]; license = licenses.mpl20; diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix index bc8f1ce52c1..8cf904c39c5 100644 --- a/pkgs/tools/security/volatility/default.nix +++ b/pkgs/tools/security/volatility/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ pythonPackages.pycrypto pythonPackages.distorm3 ]; meta = with stdenv.lib; { - homepage = https://www.volatilityfoundation.org/; + homepage = "https://www.volatilityfoundation.org/"; description = "Advanced memory forensics framework"; maintainers = with maintainers; [ bosu ]; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/security/wipe/default.nix b/pkgs/tools/security/wipe/default.nix index 25c7921d34c..6b84803d2c4 100644 --- a/pkgs/tools/security/wipe/default.nix +++ b/pkgs/tools/security/wipe/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Secure file wiping utility"; - homepage = http://wipe.sourceforge.net/; + homepage = "http://wipe.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.abbradar ]; diff --git a/pkgs/tools/security/wpscan/Gemfile.lock b/pkgs/tools/security/wpscan/Gemfile.lock index 7a29a18b7c3..f3ece99b365 100644 --- a/pkgs/tools/security/wpscan/Gemfile.lock +++ b/pkgs/tools/security/wpscan/Gemfile.lock @@ -56,4 +56,4 @@ DEPENDENCIES wpscan BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index e09e1e69408..a470ad11caf 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The pattern matching swiss knife for malware researchers"; - homepage = http://Virustotal.github.io/yara/; + homepage = "http://Virustotal.github.io/yara/"; license = licenses.asl20; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix index f98b4295e9e..ef36b21641b 100644 --- a/pkgs/tools/security/zmap/default.nix +++ b/pkgs/tools/security/zmap/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "man" ]; meta = with stdenv.lib; { - homepage = https://zmap.io/; + homepage = "https://zmap.io/"; license = licenses.asl20; description = "Fast single packet network scanner designed for Internet-wide network surveys"; maintainers = with maintainers; [ ma27 ]; diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index dc2cfe81746..5dab990e22f 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Transparent application input fuzzer."; - homepage = http://caca.zoy.org/wiki/zzuf; + homepage = "http://caca.zoy.org/wiki/zzuf"; license = licenses.wtfpl; platforms = platforms.linux; maintainers = with maintainers; [ lihop ]; diff --git a/pkgs/tools/system/acct/default.nix b/pkgs/tools/system/acct/default.nix index 669c91adf10..dd4eb0d5d2b 100644 --- a/pkgs/tools/system/acct/default.nix +++ b/pkgs/tools/system/acct/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - homepage = https://www.gnu.org/software/acct/; + homepage = "https://www.gnu.org/software/acct/"; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/actkbd/default.nix b/pkgs/tools/system/actkbd/default.nix index 501311e9672..706b3700a41 100644 --- a/pkgs/tools/system/actkbd/default.nix +++ b/pkgs/tools/system/actkbd/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { release events. ''; license = licenses.gpl2; - homepage = http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/; + homepage = "http://users.softlab.ece.ntua.gr/~thkala/projects/actkbd/"; platforms = platforms.linux; }; } diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix index 7e92fc06b2d..9050111fc17 100644 --- a/pkgs/tools/system/amtterm/default.nix +++ b/pkgs/tools/system/amtterm/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Intel AMT® SoL client + tools"; - homepage = https://www.kraxel.org/cgit/amtterm/; + homepage = "https://www.kraxel.org/cgit/amtterm/"; license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix index fded1da861d..278b14cd199 100644 --- a/pkgs/tools/system/at/default.nix +++ b/pkgs/tools/system/at/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = { description = ''The classical Unix `at' job scheduling command''; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://packages.qa.debian.org/at; + homepage = "https://packages.qa.debian.org/at"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/system/augeas/default.nix b/pkgs/tools/system/augeas/default.nix index 08731cd6db2..338b8f8ac45 100644 --- a/pkgs/tools/system/augeas/default.nix +++ b/pkgs/tools/system/augeas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Configuration editing tool"; license = licenses.lgpl2; - homepage = http://augeas.net/; + homepage = "http://augeas.net/"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/awstats/default.nix b/pkgs/tools/system/awstats/default.nix index 6d191f33a64..9da6ac59f3d 100644 --- a/pkgs/tools/system/awstats/default.nix +++ b/pkgs/tools/system/awstats/default.nix @@ -54,7 +54,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Real-time logfile analyzer to get advanced statistics"; - homepage = http://awstats.org; + homepage = "http://awstats.org"; license = licenses.gpl3Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/bar/default.nix b/pkgs/tools/system/bar/default.nix index a295da844af..32945a24bb1 100644 --- a/pkgs/tools/system/bar/default.nix +++ b/pkgs/tools/system/bar/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { description = "Console progress bar"; - homepage = http://clpbar.sourceforge.net/; + homepage = "http://clpbar.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.rdnetto ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/system/chase/default.nix b/pkgs/tools/system/chase/default.nix index 6c48d3341ec..c4396aad9ca 100644 --- a/pkgs/tools/system/chase/default.nix +++ b/pkgs/tools/system/chase/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { longDescription = '' A commandline program that chases symbolic filesystems links to the original file ''; - homepage = https://qa.debian.org/developer.php?login=rotty%40debian.org; + homepage = "https://qa.debian.org/developer.php?login=rotty%40debian.org"; license = licenses.gpl2Plus; maintainers = [ maintainers.polyrod ]; platforms = platforms.all; diff --git a/pkgs/tools/system/clinfo/default.nix b/pkgs/tools/system/clinfo/default.nix index dd6e3d4a84b..c50bfe4a0d0 100644 --- a/pkgs/tools/system/clinfo/default.nix +++ b/pkgs/tools/system/clinfo/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print all known information about all available OpenCL platforms and devices in the system"; - homepage = https://github.com/Oblomov/clinfo; + homepage = "https://github.com/Oblomov/clinfo"; license = licenses.cc0; platforms = platforms.linux; maintainers = with maintainers; [ athas ]; diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/pkgs/tools/system/colorls/Gemfile.lock index 583fd3b1202..ebbcd0fdb03 100644 --- a/pkgs/tools/system/colorls/Gemfile.lock +++ b/pkgs/tools/system/colorls/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES colorls BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/tools/system/colorls/default.nix index 1631b9f7218..4401d841ff6 100644 --- a/pkgs/tools/system/colorls/default.nix +++ b/pkgs/tools/system/colorls/default.nix @@ -10,7 +10,7 @@ bundlerApp { meta = with lib; { description = "Prettified LS"; - homepage = https://github.com/athityakumar/colorls; + homepage = "https://github.com/athityakumar/colorls"; license = with licenses; mit; maintainers = with maintainers; [ lukebfox nicknovitski ]; platforms = ruby.meta.platforms; diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index ad120dd6481..69d5cd6bb73 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/hashicorp/consul-template/; + homepage = "https://github.com/hashicorp/consul-template/"; description = "Generic template rendering and notifications with Consul"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index aa047ca4a68..9cde31205e1 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "cron-4.1"; src = fetchurl { - url = ftp://ftp.isc.org/isc/cron/cron_4.1.shar; + url = "ftp://ftp.isc.org/isc/cron/cron_4.1.shar"; sha256 = "16n3dras4b1jh7g958nz1k54pl9pg5fwb3fvjln8z67varvq6if4"; }; diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index b9ea0c04aa8..4f492def162 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub, Security }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ctop"; @@ -13,11 +13,9 @@ buildGoModule rec { modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Top-like interface for container metrics"; homepage = "https://ctop.sh/"; license = licenses.mit; diff --git a/pkgs/tools/system/daemon/default.nix b/pkgs/tools/system/daemon/default.nix index 76f53b55f3d..fb06247f984 100644 --- a/pkgs/tools/system/daemon/default.nix +++ b/pkgs/tools/system/daemon/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "daemon-0.6.4"; src = fetchurl { - url = http://libslack.org/daemon/download/daemon-0.6.4.tar.gz; + url = "http://libslack.org/daemon/download/daemon-0.6.4.tar.gz"; sha256 = "18aw0f8k3j30xqwv4z03962kdpqd10nf1w9liihylmadlx5fmff4"; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/system/daemonize/default.nix b/pkgs/tools/system/daemonize/default.nix index 205b693dd92..a8685189b61 100644 --- a/pkgs/tools/system/daemonize/default.nix +++ b/pkgs/tools/system/daemonize/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Runs a command as a Unix daemon"; - homepage = http://software.clapper.org/daemonize/; + homepage = "http://software.clapper.org/daemonize/"; license = licenses.bsd3; platforms = with platforms; linux ++ freebsd ++ darwin; }; diff --git a/pkgs/tools/system/das_watchdog/default.nix b/pkgs/tools/system/das_watchdog/default.nix index 29767c879ff..8c1a5657991 100644 --- a/pkgs/tools/system/das_watchdog/default.nix +++ b/pkgs/tools/system/das_watchdog/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://github.com/kmatheussen/das_watchdog; + homepage = "https://github.com/kmatheussen/das_watchdog"; description = "A general watchdog for the linux operating system"; longDescription = '' It should run in the background at all times to ensure a realtime process diff --git a/pkgs/tools/system/datefudge/default.nix b/pkgs/tools/system/datefudge/default.nix index 63aa563bfa0..839e14a20d8 100644 --- a/pkgs/tools/system/datefudge/default.nix +++ b/pkgs/tools/system/datefudge/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { different by pre-loading a small library which modifies the time, gettimeofday and clock_gettime system calls. ''; - homepage = https://packages.qa.debian.org/d/datefudge.html; + homepage = "https://packages.qa.debian.org/d/datefudge.html"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ leenaars ]; diff --git a/pkgs/tools/system/dcfldd/default.nix b/pkgs/tools/system/dcfldd/default.nix index 240cc36f726..9ea7b485b96 100644 --- a/pkgs/tools/system/dcfldd/default.nix +++ b/pkgs/tools/system/dcfldd/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An enhanced version of GNU dd"; - homepage = http://dcfldd.sourceforge.net/; + homepage = "http://dcfldd.sourceforge.net/"; license = licenses.gpl2; diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix index 466232e2bf7..838873b7557 100644 --- a/pkgs/tools/system/ddrescueview/default.nix +++ b/pkgs/tools/system/ddrescueview/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool to graphically examine ddrescue mapfiles"; - homepage = https://sourceforge.net/projects/ddrescueview/; + homepage = "https://sourceforge.net/projects/ddrescueview/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/tools/system/ddrutility/default.nix b/pkgs/tools/system/ddrutility/default.nix index 54bf6fbaf42..bb24076ce7c 100644 --- a/pkgs/tools/system/ddrutility/default.nix +++ b/pkgs/tools/system/ddrutility/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of utilities for hard drive data rescue"; - homepage = https://sourceforge.net/projects/ddrutility/; + homepage = "https://sourceforge.net/projects/ddrutility/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ orivej ]; diff --git a/pkgs/tools/system/dfc/default.nix b/pkgs/tools/system/dfc/default.nix index 8575d971898..415b647befa 100644 --- a/pkgs/tools/system/dfc/default.nix +++ b/pkgs/tools/system/dfc/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake gettext ]; meta = { - homepage = https://projects.gw-computing.net/projects/dfc; + 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]; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix index 3aef366ea06..239544d20a6 100644 --- a/pkgs/tools/system/di/default.nix +++ b/pkgs/tools/system/di/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Disk information utility; displays everything 'df' does and more"; - homepage = https://gentoo.com/di/; + homepage = "https://gentoo.com/di/"; license = licenses.zlib; updateWalker = true; maintainers = with maintainers; [ manveru ]; diff --git a/pkgs/tools/system/dog/default.nix b/pkgs/tools/system/dog/default.nix index 8bb84c562b6..5063e3555bb 100644 --- a/pkgs/tools/system/dog/default.nix +++ b/pkgs/tools/system/dog/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = http://lwn.net/Articles/421072/; + homepage = "http://lwn.net/Articles/421072/"; description = "cat replacement"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qknight ]; diff --git a/pkgs/tools/system/efibootmgr/default.nix b/pkgs/tools/system/efibootmgr/default.nix index a2487324849..3323ac24897 100644 --- a/pkgs/tools/system/efibootmgr/default.nix +++ b/pkgs/tools/system/efibootmgr/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Linux user-space application to modify the Intel Extensible Firmware Interface (EFI) Boot Manager"; - homepage = https://github.com/rhboot/efibootmgr; + homepage = "https://github.com/rhboot/efibootmgr"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/envconsul/default.nix b/pkgs/tools/system/envconsul/default.nix index c2f5556cec6..09175f14609 100644 --- a/pkgs/tools/system/envconsul/default.nix +++ b/pkgs/tools/system/envconsul/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/hashicorp/envconsul/; + homepage = "https://github.com/hashicorp/envconsul/"; description = "Read and set environmental variables for processes from Consul"; platforms = platforms.linux ++ platforms.darwin; license = licenses.mpl20; diff --git a/pkgs/tools/system/evemu/default.nix b/pkgs/tools/system/evemu/default.nix index 1ba2b78e860..02f92a19890 100644 --- a/pkgs/tools/system/evemu/default.nix +++ b/pkgs/tools/system/evemu/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { # We could have downloaded a release tarball from cgit, but it changes hash # each time it is downloaded :/ src = fetchgit { - url = git://git.freedesktop.org/git/evemu; + url = "git://git.freedesktop.org/git/evemu"; rev = "refs/tags/v${version}"; sha256 = "1m38fxwy2s82vb2qm9aqxinws12akmqqq7q66is931lc3awqkbah"; }; @@ -20,8 +20,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Records and replays device descriptions and events to emulate input devices through the kernel's input system"; - homepage = https://www.freedesktop.org/wiki/Evemu/; - repositories.git = git://git.freedesktop.org/git/evemu; + homepage = "https://www.freedesktop.org/wiki/Evemu/"; + repositories.git = "git://git.freedesktop.org/git/evemu"; license = licenses.gpl2; maintainers = [ maintainers.amorsillo ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 89c79be2ce3..d6f7a782824 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.8"; + version = "3.14.9"; src = fetchFromGitHub { - sha256 = "1rq28sg1yqyx2xpbhb8hj18ar5pva2rwz7v3ylg8kq112cnlngyh"; + sha256 = "1c8g4fg8c9x816xx3m33njfn9h6ksl8g4rmc20y39v1y9jn72vxk"; rev = version; repo = pname; owner = "puppetlabs"; diff --git a/pkgs/tools/system/fakechroot/default.nix b/pkgs/tools/system/fakechroot/default.nix index 77ba6689b0d..fc74644ab03 100644 --- a/pkgs/tools/system/fakechroot/default.nix +++ b/pkgs/tools/system/fakechroot/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; meta = with stdenv.lib; { - homepage = https://github.com/dex4er/fakechroot; + homepage = "https://github.com/dex4er/fakechroot"; description = "Give a fake chroot environment through LD_PRELOAD"; license = licenses.lgpl21; maintainers = with maintainers; [offline]; diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix index 934b74dd384..c5765609a27 100644 --- a/pkgs/tools/system/fakeroot/default.nix +++ b/pkgs/tools/system/fakeroot/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = https://salsa.debian.org/clint/fakeroot; + 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]; diff --git a/pkgs/tools/system/fcron/default.nix b/pkgs/tools/system/fcron/default.nix index 3dd84aa8a9c..59daac89bd4 100644 --- a/pkgs/tools/system/fcron/default.nix +++ b/pkgs/tools/system/fcron/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description="A command scheduler with extended capabilities over cron and anacron"; - homepage = http://fcron.free.fr; + homepage = "http://fcron.free.fr"; license = licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 0aea3ced3b5..423b00bd543 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/fdisk/; + homepage = "https://www.gnu.org/software/fdisk/"; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/system/foreman/Gemfile.lock b/pkgs/tools/system/foreman/Gemfile.lock index 8fa9a213ab2..a2a7824f7aa 100644 --- a/pkgs/tools/system/foreman/Gemfile.lock +++ b/pkgs/tools/system/foreman/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES foreman BUNDLED WITH - 1.11.2 + 2.1.4 diff --git a/pkgs/tools/system/foreman/default.nix b/pkgs/tools/system/foreman/default.nix index e97d71f5c84..ce2f2017629 100644 --- a/pkgs/tools/system/foreman/default.nix +++ b/pkgs/tools/system/foreman/default.nix @@ -7,7 +7,7 @@ bundlerEnv { meta = with lib; { description = "Process manager for applications with multiple components"; - homepage = https://github.com/ddollar/foreman; + homepage = "https://github.com/ddollar/foreman"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; platforms = ruby.meta.platforms; diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix index be33f45ca9d..96c54513ef1 100644 --- a/pkgs/tools/system/foremost/default.nix +++ b/pkgs/tools/system/foremost/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { look at the data structures of a given file format allowing for a more reliable and faster recovery. ''; - homepage = http://foremost.sourceforge.net/; + homepage = "http://foremost.sourceforge.net/"; license = licenses.publicDomain; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index b057c80c74e..e51f554ea0f 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { info. ''; - homepage = https://www.gnu.org/software/freeipmi/; + homepage = "https://www.gnu.org/software/freeipmi/"; downloadPage = "https://www.gnu.org/software/freeipmi/download.html"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 4adc8160829..6fdfd6e7190 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lm"; meta = with stdenv.lib; { - homepage = http://gdmap.sourceforge.net; + homepage = "http://gdmap.sourceforge.net"; description = "Recursive rectangle map of disk usage"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/system/gohai/default.nix b/pkgs/tools/system/gohai/default.nix index c0dd2c89d2f..48c68f8d2f2 100644 --- a/pkgs/tools/system/gohai/default.nix +++ b/pkgs/tools/system/gohai/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { license = licenses.mit; maintainers = [ maintainers.tazjin ]; platforms = platforms.unix; - repositories.git = git://github.com/DataDog/gohai.git; + repositories.git = "git://github.com/DataDog/gohai.git"; longDescription = '' Gohai is a tool which collects an inventory of system diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index daf9ce58c91..44ef60c70f3 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -1,21 +1,21 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gotop"; - version = "3.0.0"; - - goPackagePath = "github.com/cjbassi/gotop"; + version = "3.5.0"; src = fetchFromGitHub { - owner = "cjbassi"; + owner = "xxxserxxx"; repo = pname; - rev = version; - sha256 = "1kndj5qjaqgizjakh642fay2i0i1jmfjlk1p01gnjbh2b0yzvj1r"; + rev = "v${version}"; + sha256 = "01a2y2604dh2zfy5f2fxr306id0fbq0df91fpz2m8w7rpaszd6xr"; }; + modSha256 = "1gbpxq2vyshln97gij5y9qsjyf3mkwfqwwhikc0cck3mnwiv87dd"; + meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; - homepage = https://github.com/cjbassi/gotop; + homepage = "https://github.com/xxxserxxx/gotop"; license = licenses.agpl3; maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 72d9d70ed8b..613f63c3f04 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks"; license = licenses.gpl2; - homepage = https://www.rodsbooks.com/gdisk/; + homepage = "https://www.rodsbooks.com/gdisk/"; platforms = platforms.all; }; } diff --git a/pkgs/tools/system/gt5/default.nix b/pkgs/tools/system/gt5/default.nix index ea121b0e43c..61d25f414bb 100644 --- a/pkgs/tools/system/gt5/default.nix +++ b/pkgs/tools/system/gt5/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "A diff-capable 'du' browser"; - homepage = http://gt5.sourceforge.net/; + homepage = "http://gt5.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/system/hardinfo/default.nix b/pkgs/tools/system/hardinfo/default.nix index 6c5019847ff..fd8fb08cf29 100644 --- a/pkgs/tools/system/hardinfo/default.nix +++ b/pkgs/tools/system/hardinfo/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = http://hardinfo.org/; + homepage = "http://hardinfo.org/"; description = "Display information about your hardware and operating system"; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index d1d2b7a3e76..c0c6aa72d3b 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -25,8 +25,8 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Consolidate duplicate files via hardlinks"; - homepage = https://pagure.io/hardlink; - repositories.git = https://src.fedoraproject.org/cgit/rpms/hardlink.git; + homepage = "https://pagure.io/hardlink"; + repositories.git = "https://src.fedoraproject.org/cgit/rpms/hardlink.git"; license = licenses.gpl2Plus; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/hiera-eyaml/Gemfile.lock b/pkgs/tools/system/hiera-eyaml/Gemfile.lock index 259c2e170b0..918df753a38 100644 --- a/pkgs/tools/system/hiera-eyaml/Gemfile.lock +++ b/pkgs/tools/system/hiera-eyaml/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES hiera-eyaml BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/system/hiera-eyaml/default.nix b/pkgs/tools/system/hiera-eyaml/default.nix index 33d97aa7d6b..be6fb1c7462 100644 --- a/pkgs/tools/system/hiera-eyaml/default.nix +++ b/pkgs/tools/system/hiera-eyaml/default.nix @@ -9,7 +9,7 @@ bundlerEnv { meta = with lib; { description = "Per-value asymmetric encryption of sensitive data for Hiera"; - homepage = https://github.com/TomPoulton/hiera-eyaml; + homepage = "https://github.com/TomPoulton/hiera-eyaml"; license = licenses.mit; maintainers = with maintainers; [ benley nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index fcdcc23961b..eb96c3f4613 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -43,7 +43,7 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "A Python clone of Foreman, a tool for managing Procfile-based applications"; license = licenses.mit; - homepage = https://github.com/nickstenning/honcho; + homepage = "https://github.com/nickstenning/honcho"; maintainers = with maintainers; [ benley ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index 1b68273a570..c9adf5377e2 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; - homepage = https://hisham.hm/htop/; + homepage = "https://hisham.hm/htop/"; license = licenses.gpl2Plus; platforms = with platforms; linux ++ freebsd ++ openbsd ++ darwin; maintainers = with maintainers; [ rob relrod ]; diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index 048af14efb1..b8bbe09fcb7 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.68"; + version = "21.69"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "0x63rkyl16918l8yf0azy2lyxaqy8nc6iafid89acvxn32j146rg"; + sha256 = "01lmxyqhx092ahbls7z9gwgmsinlqcv8zb7xvklbwyhzy5c02fxx"; }; patchPhase = '' @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Hardware detection tool from openSUSE"; license = licenses.gpl2; - homepage = https://github.com/openSUSE/hwinfo; + homepage = "https://github.com/openSUSE/hwinfo"; maintainers = with maintainers; [ bobvanderlinden ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/idle3tools/default.nix b/pkgs/tools/system/idle3tools/default.nix index d1631776d39..fa5234d8cbc 100644 --- a/pkgs/tools/system/idle3tools/default.nix +++ b/pkgs/tools/system/idle3tools/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://idle3-tools.sourceforge.net/; + 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]; diff --git a/pkgs/tools/system/illum/default.nix b/pkgs/tools/system/illum/default.nix index 767fccbd388..41fce9b9b91 100644 --- a/pkgs/tools/system/illum/default.nix +++ b/pkgs/tools/system/illum/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://github.com/jmesmon/illum; + 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 ]; diff --git a/pkgs/tools/system/incron/default.nix b/pkgs/tools/system/incron/default.nix index 2afbed2f9bb..4b5709e6227 100644 --- a/pkgs/tools/system/incron/default.nix +++ b/pkgs/tools/system/incron/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A cron-like daemon which handles filesystem events."; - homepage = https://github.com/ar-/incron; + homepage = "https://github.com/ar-/incron"; license = licenses.gpl2; maintainers = [ maintainers.aanderse ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index 6acd41046ce..7b65739c1a8 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; license = licenses.gpl3Plus; - homepage = https://github.com/koct9i/ioping; + homepage = "https://github.com/koct9i/ioping"; }; } diff --git a/pkgs/tools/system/iops/default.nix b/pkgs/tools/system/iops/default.nix index 7e6854afe62..cf34cb115f1 100644 --- a/pkgs/tools/system/iops/default.nix +++ b/pkgs/tools/system/iops/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { Iops lets you measure how many I/O operations per second a storage device can perform. Usefull for determing e.g. the best RAID-setting of your storage device. ''; - homepage = http://www.vanheusden.com/iops/; + homepage = "http://www.vanheusden.com/iops/"; license = licenses.gpl2; maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; # build problems on Darwin diff --git a/pkgs/tools/system/ior/default.nix b/pkgs/tools/system/ior/default.nix index 6217f601121..6015e60afba 100644 --- a/pkgs/tools/system/ior/default.nix +++ b/pkgs/tools/system/ior/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { preConfigure = "./bootstrap"; meta = with stdenv.lib; { - homepage = https://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/; + homepage = "https://www.nersc.gov/users/computational-systems/cori/nersc-8-procurement/trinity-nersc-8-rfp/nersc-8-trinity-benchmarks/ior/"; description = "Parallel file system I/O performance test"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 2b6479198c9..b5da2db67fe 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = with lib; { description = ''Command-line interface to IPMI-enabled devices''; license = licenses.bsd3; - homepage = https://sourceforge.net/projects/ipmitool/; + homepage = "https://sourceforge.net/projects/ipmitool/"; platforms = platforms.unix; maintainers = with maintainers; [ fpletz ]; }; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index e0aaee31217..b41196b85c9 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "journalwatch is a tool to find error messages in the systemd journal."; - homepage = https://github.com/The-Compiler/journalwatch; + homepage = "https://github.com/The-Compiler/journalwatch"; license = licenses.gpl3Plus; maintainers = with maintainers; [ florianjacob ]; }; diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index 3aa0cb242a9..bc2adb22c4f 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { navigational habits by keeping track of the directories you visit. It strives to give you the best directory for the shortest search term. ''; - homepage = https://github.com/gsamokovarov/jump; + homepage = "https://github.com/gsamokovarov/jump"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ sondr3 ]; diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix new file mode 100644 index 00000000000..c1e511fa0c2 --- /dev/null +++ b/pkgs/tools/system/kmon/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform, python3, libxcb }: + +rustPlatform.buildRustPackage rec { + pname = "kmon"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "orhun"; + repo = pname; + rev = "v${version}"; + sha256 = "0kmkcs13cccmjjfbl25bs3m54zcjcs38fiv84q0vy09a4dnx3gn8"; + }; + + cargoSha256 = "0l1yq9k6lyk0ww1nzk93axylgrwipkmmqh9r6fq4a31wjlblrkkb"; + + nativeBuildInputs = [ python3 ]; + + buildInputs = [ libxcb ]; + + postInstall = '' + install -D man/kmon.8 -t $out/share/man/man8/ + ''; + + meta = with stdenv.lib; { + description = "Linux Kernel Manager and Activity Monitor"; + homepage = "https://github.com/orhun/kmon"; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/tools/system/krakenx/default.nix b/pkgs/tools/system/krakenx/default.nix index c6866264a9b..e5b1e3ec1c9 100644 --- a/pkgs/tools/system/krakenx/default.nix +++ b/pkgs/tools/system/krakenx/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Python script to control NZXT cooler Kraken X52/X62/X72"; - homepage = https://github.com/KsenijaS/krakenx; + homepage = "https://github.com/KsenijaS/krakenx"; license = licenses.gpl2; maintainers = [ maintainers.willibutz ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/ledmon/default.nix b/pkgs/tools/system/ledmon/default.nix index ab11fc9e27f..6775a471126 100644 --- a/pkgs/tools/system/ledmon/default.nix +++ b/pkgs/tools/system/ledmon/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/intel/ledmon; + homepage = "https://github.com/intel/ledmon"; description = "Enclosure LED Utilities"; platforms = platforms.linux; license = with licenses; [ gpl2 ]; diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index a12d70315d9..4dcb6afb00f 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -30,7 +30,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A daemon for keeping the system timezone up-to-date based on the current location"; - homepage = https://github.com/Stebalien/localtime; + homepage = "https://github.com/Stebalien/localtime"; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/tools/system/logcheck/default.nix b/pkgs/tools/system/logcheck/default.nix index d51df4f408a..71edfde9a0b 100644 --- a/pkgs/tools/system/logcheck/default.nix +++ b/pkgs/tools/system/logcheck/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { Logcheck helps spot problems and security violations in your logfiles automatically and will send the results to you by e-mail. Logcheck was part of the Abacus Project of security tools, but this version has been rewritten. ''; - homepage = https://salsa.debian.org/debian/logcheck; + homepage = "https://salsa.debian.org/debian/logcheck"; license = licenses.gpl2; maintainers = [ maintainers.bluescreen303 ]; }; diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix index 2ea7b11677e..8d2febbeb8a 100644 --- a/pkgs/tools/system/lr/default.nix +++ b/pkgs/tools/system/lr/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/chneukirchen/lr; + homepage = "https://github.com/chneukirchen/lr"; description = "List files recursively"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 29c20ad8d53..3d1a6ace08e 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://ezix.org/project/wiki/HardwareLiSter; + homepage = "https://ezix.org/project/wiki/HardwareLiSter"; description = "Provide detailed information on the hardware configuration of the machine"; license = licenses.gpl2; maintainers = with maintainers; [ phreedom ]; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 1831041063b..ca515cbdfd8 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { when jobs should be run. Mcron was written by Dale Mellor. ''; - homepage = https://www.gnu.org/software/mcron/; + homepage = "https://www.gnu.org/software/mcron/"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix index ff6ccb534fb..7b065c6cfa8 100644 --- a/pkgs/tools/system/memtester/default.nix +++ b/pkgs/tools/system/memtester/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A userspace utility for testing the memory subsystem for faults"; - homepage = http://pyropus.ca/software/memtester/; + homepage = "http://pyropus.ca/software/memtester/"; license = licenses.gpl2; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index f4238e27248..7cec79ff25e 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://mmonit.com/monit/; + homepage = "http://mmonit.com/monit/"; description = "Monitoring system"; license = stdenv.lib.licenses.agpl3; maintainers = with stdenv.lib.maintainers; [ raskin wmertens ]; diff --git a/pkgs/tools/system/mq-cli/default.nix b/pkgs/tools/system/mq-cli/default.nix index afde8b8f9d2..a29e1630116 100644 --- a/pkgs/tools/system/mq-cli/default.nix +++ b/pkgs/tools/system/mq-cli/default.nix @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ tazjin ]; platforms = platforms.linux; - repositories.git = git://github.com/aprilabank/mq-cli.git; + repositories.git = "git://github.com/aprilabank/mq-cli.git"; }; } diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index c4001e8c50b..3917716605d 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -14,14 +14,14 @@ with stdenv.lib; let go-d-plugin = callPackage ./go.d.plugin.nix {}; in stdenv.mkDerivation rec { - version = "1.20.0"; + version = "1.21.0"; pname = "netdata"; src = fetchFromGitHub { owner = "netdata"; repo = "netdata"; rev = "v${version}"; - sha256 = "0g7iv5w14wndl5iv2q81dppgwq09sm93vpnyq7p49nl7q1dsz1d6"; + sha256 = "08gxwxvg816hj7sxsb8s97ny2562xri9nx0w2zx7xsssp22grawk"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; @@ -36,11 +36,6 @@ in stdenv.mkDerivation rec { patches = [ ./no-files-in-etc-and-var.patch - # part of the next release - (fetchpatch { - url = "https://github.com/netdata/netdata/commit/5c992b7d92cf008ce91627efccf8644732db1f87.patch"; - sha256 = "1nvbmhy5rir4kw77dhx1qr0l0wcspakr7z7ivva1ilz1aml8nbnm"; - }) ]; NIX_CFLAGS_COMPILE = optionalString withDebug "-O1 -ggdb -DNETDATA_INTERNAL_CHECKS=1"; @@ -78,7 +73,7 @@ in stdenv.mkDerivation rec { meta = { description = "Real-time performance monitoring tool"; - homepage = https://my-netdata.io/; + homepage = "https://my-netdata.io/"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 0e1de1bbd8e..9fa272236b8 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -22,7 +22,7 @@ buildGoPackage rec { meta = with lib; { description = "Netdata orchestrator for data collection modules written in go"; - homepage = https://github.com/netdata/go.d.plugin; + homepage = "https://github.com/netdata/go.d.plugin"; license = licenses.gpl3; platforms = platforms.unix; maintainers = [ maintainers.lethalman ]; diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index 89c84c8c9ca..9e6522b2028 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { description = "Unix command line queue utility"; - homepage = https://github.com/chneukirchen/nq; + homepage = "https://github.com/chneukirchen/nq"; license = licenses.publicDomain; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/system/nvtop/default.nix b/pkgs/tools/system/nvtop/default.nix index 0e7a5d4a311..cd9ec7c7082 100644 --- a/pkgs/tools/system/nvtop/default.nix +++ b/pkgs/tools/system/nvtop/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A (h)top like like task monitor for NVIDIA GPUs"; - homepage = https://github.com/Syllo/nvtop; + homepage = "https://github.com/Syllo/nvtop"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ willibutz ]; diff --git a/pkgs/tools/system/opencl-info/default.nix b/pkgs/tools/system/opencl-info/default.nix index d1c3d0ec6c0..a5013a68885 100644 --- a/pkgs/tools/system/opencl-info/default.nix +++ b/pkgs/tools/system/opencl-info/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A tool to dump OpenCL platform/device information"; - homepage = https://github.com/marchv/opencl-info; + homepage = "https://github.com/marchv/opencl-info"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 51cfaf9f333..e76ab496ef9 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8"; meta = with stdenv.lib; { - homepage = http://mj.ucw.cz/pciutils.html; + homepage = "http://mj.ucw.cz/pciutils.html"; description = "A collection of programs for inspecting and manipulating configuration of PCI devices"; license = licenses.gpl2Plus; platforms = platforms.unix; diff --git a/pkgs/tools/system/pcstat/default.nix b/pkgs/tools/system/pcstat/default.nix index 5a1bad1092d..5febbcb6ef6 100644 --- a/pkgs/tools/system/pcstat/default.nix +++ b/pkgs/tools/system/pcstat/default.nix @@ -17,7 +17,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Page Cache stat: get page cache stats for files on Linux."; - homepage = https://github.com/tobert/pcstat; + homepage = "https://github.com/tobert/pcstat"; license = licenses.asl20; maintainers = with maintainers; [ aminechikhaoui ]; }; diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 9a4a2238558..db206fa0b33 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://9fans.github.io/plan9port/; + homepage = "https://9fans.github.io/plan9port/"; description = "Plan 9 from User Space"; longDescription = '' Plan 9 from User Space (aka plan9port) is a port of many Plan 9 programs diff --git a/pkgs/tools/system/procodile/Gemfile.lock b/pkgs/tools/system/procodile/Gemfile.lock index 7989b7bf1f7..f53a07d6657 100644 --- a/pkgs/tools/system/procodile/Gemfile.lock +++ b/pkgs/tools/system/procodile/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES procodile BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/system/procodile/default.nix b/pkgs/tools/system/procodile/default.nix index 3ae80a312ed..2751601b39b 100644 --- a/pkgs/tools/system/procodile/default.nix +++ b/pkgs/tools/system/procodile/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Run processes in the background (and foreground) on Mac & Linux from a Procfile (for production and/or development environments)"; - homepage = https://adam.ac/procodile; + homepage = "https://adam.ac/procodile"; license = with licenses; mit; maintainers = with maintainers; [ ravloony manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 5ff8ff95f8a..06147df093e 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://proot-me.github.io; + homepage = "https://proot-me.github.io"; description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix index bde4429c481..45a33a1adb7 100644 --- a/pkgs/tools/system/ps_mem/default.nix +++ b/pkgs/tools/system/ps_mem/default.nix @@ -15,7 +15,7 @@ in pythonPackages.buildPythonApplication { meta = with stdenv.lib; { description = "A utility to accurately report the in core memory usage for a program"; - homepage = https://github.com/pixelb/ps_mem; + homepage = "https://github.com/pixelb/ps_mem"; license = licenses.lgpl21; maintainers = [ maintainers.gnidorah ]; platforms = platforms.linux; diff --git a/pkgs/tools/system/psensor/default.nix b/pkgs/tools/system/psensor/default.nix index 83d281642bd..49d2747a33e 100644 --- a/pkgs/tools/system/psensor/default.nix +++ b/pkgs/tools/system/psensor/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Graphical hardware monitoring application for Linux"; - homepage = https://wpitchoune.net/psensor/; + homepage = "https://wpitchoune.net/psensor/"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/system/psstop/default.nix b/pkgs/tools/system/psstop/default.nix index 4d413e60c77..3a5ee2b0581 100644 --- a/pkgs/tools/system/psstop/default.nix +++ b/pkgs/tools/system/psstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib ]; meta = with stdenv.lib; { - homepage = https://github.com/clearlinux/psstop; + homepage = "https://github.com/clearlinux/psstop"; description = "Show processes' memory usage by looking into pss"; # upstream summary license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ]; diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/tools/system/r10k/Gemfile.lock index 3ff9b646215..9f55e273ef2 100644 --- a/pkgs/tools/system/r10k/Gemfile.lock +++ b/pkgs/tools/system/r10k/Gemfile.lock @@ -45,4 +45,4 @@ DEPENDENCIES r10k BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix index 56e4e4f94fa..43d67eddf7d 100644 --- a/pkgs/tools/system/r10k/default.nix +++ b/pkgs/tools/system/r10k/default.nix @@ -15,7 +15,7 @@ bundlerApp { meta = with lib; { description = "Puppet environment and module deployment"; - homepage = https://github.com/puppetlabs/r10k; + homepage = "https://github.com/puppetlabs/r10k"; license = licenses.asl20; maintainers = with maintainers; [ zimbatm manveru nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/rofi-systemd/default.nix b/pkgs/tools/system/rofi-systemd/default.nix index 73c1b488155..92c13527c6f 100644 --- a/pkgs/tools/system/rofi-systemd/default.nix +++ b/pkgs/tools/system/rofi-systemd/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { description = "Control your systemd units using rofi"; - homepage = https://github.com/IvanMalison/rofi-systemd; + homepage = "https://github.com/IvanMalison/rofi-systemd"; maintainers = with stdenv.lib.maintainers; [ imalison ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/system/rowhammer-test/default.nix b/pkgs/tools/system/rowhammer-test/default.nix index 64c184a6122..02462584c65 100644 --- a/pkgs/tools/system/rowhammer-test/default.nix +++ b/pkgs/tools/system/rowhammer-test/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Test DRAM for bit flips caused by the rowhammer problem"; - homepage = https://github.com/google/rowhammer-test; + homepage = "https://github.com/google/rowhammer-test"; license = licenses.asl20; maintainers = [ maintainers.viric ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/tools/system/runit/default.nix b/pkgs/tools/system/runit/default.nix index 78306907079..a4319fd5749 100644 --- a/pkgs/tools/system/runit/default.nix +++ b/pkgs/tools/system/runit/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "UNIX init scheme with service supervision"; license = licenses.bsd3; - homepage = http://smarden.org/runit; + homepage = "http://smarden.org/runit"; maintainers = with maintainers; [ joachifm ]; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/s-tui/default.nix b/pkgs/tools/system/s-tui/default.nix index a6816daae33..2875bca4a2a 100644 --- a/pkgs/tools/system/s-tui/default.nix +++ b/pkgs/tools/system/s-tui/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; meta = with stdenv.lib; { - homepage = https://amanusk.github.io/s-tui/; + homepage = "https://amanusk.github.io/s-tui/"; description = "Stress-Terminal UI monitoring tool"; license = licenses.gpl2; maintainers = with maintainers; [ infinisil ]; diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix index 95d4b376d0a..4ddc7fbecc0 100644 --- a/pkgs/tools/system/s6-rc/default.nix +++ b/pkgs/tools/system/s6-rc/default.nix @@ -4,8 +4,8 @@ with skawarePackages; buildPackage { pname = "s6-rc"; - version = "0.5.1.1"; - sha256 = "0lmg517l8inn7bi57q35rjd7b4jmqlmkhrbvs5ybbhinhd12qzi5"; + version = "0.5.1.2"; + sha256 = "18m8jsx3bkj566p6xwwnsvdckk10n8wqnhp0na2k88i295h4rnjp"; description = "A service manager for s6-based systems"; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix index efdf173a22c..3ce97a9d97b 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.0.1"; - sha256 = "0mvcjrz8nlj9p2zclmcv22b4y6bqzd2iz38arhgc989vdvrbmkg0"; + version = "2.9.1.0"; + sha256 = "1xqzl2wnvcmcyhppk7mc10h1ac7fkik3i6gpyliwpf3d5i9mkqh5"; description = "skarnet.org's small & secure supervision software suite"; diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index 571f70e0756..a9fc44e8b40 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tool intended to prevent the accidental deletion of important files"; - homepage = https://launchpad.net/safe-rm; + homepage = "https://launchpad.net/safe-rm"; license = licenses.gpl3; platforms = platforms.all; maintainers = [ maintainers.koral ]; diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix index ce0779c0999..e8db6a2fd39 100644 --- a/pkgs/tools/system/safecopy/default.nix +++ b/pkgs/tools/system/safecopy/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { resets and other helpful low level operations on a number of other device classes. ''; - homepage = http://safecopy.sourceforge.net; + homepage = "http://safecopy.sourceforge.net"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 7c90d41da18..8dbc28d3a31 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A forensic/data recovery tool"; - homepage = https://www.sleuthkit.org/; + homepage = "https://www.sleuthkit.org/"; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.ipl10; diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix index 077e1326f20..034564949c9 100644 --- a/pkgs/tools/system/smartmontools/default.nix +++ b/pkgs/tools/system/smartmontools/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools for monitoring the health of hard drives"; - homepage = https://www.smartmontools.org/; + homepage = "https://www.smartmontools.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ peti Frostman ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/system/socklog/default.nix b/pkgs/tools/system/socklog/default.nix index 9f2cc225747..cf7fbe5e9a1 100644 --- a/pkgs/tools/system/socklog/default.nix +++ b/pkgs/tools/system/socklog/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = { description = "System and kernel logging services"; - homepage = http://smarden.org/socklog/; + homepage = "http://smarden.org/socklog/"; license = licenses.publicDomain; platforms = platforms.unix; maintainers = [ maintainers.joachifm ]; diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix index e3b58a50c92..4324fba87e7 100644 --- a/pkgs/tools/system/storebrowse/default.nix +++ b/pkgs/tools/system/storebrowse/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://viric.name/cgi-bin/storebrowse; + homepage = "http://viric.name/cgi-bin/storebrowse"; license = stdenv.lib.licenses.agpl3Plus; broken = true; }; diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 32bb8f4f454..6645639bcf0 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.02"; + version = "0.11.07"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0vwqv3hq7h4z53ayk2c69zf60ncr0v2g0vxaci1pmxlhiz56y6md"; + sha256 = "1kyxkwn18y4161yyvxw3hd9xlzwlp270sn4gpnzvmr6rwxhr0nvh"; }; postPatch = '' diff --git a/pkgs/tools/system/supervise/default.nix b/pkgs/tools/system/supervise/default.nix index 3834b3762f0..cbf96818f48 100644 --- a/pkgs/tools/system/supervise/default.nix +++ b/pkgs/tools/system/supervise/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://github.com/catern/supervise; + homepage = "https://github.com/catern/supervise"; description = "A minimal unprivileged process supervisor making use of modern Linux features"; platforms = platforms.linux; license = licenses.gpl3; diff --git a/pkgs/tools/system/syslog-ng-incubator/default.nix b/pkgs/tools/system/syslog-ng-incubator/default.nix index 881fda241ed..5d802dbed7e 100644 --- a/pkgs/tools/system/syslog-ng-incubator/default.nix +++ b/pkgs/tools/system/syslog-ng-incubator/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/balabit/syslog-ng-incubator; + homepage = "https://github.com/balabit/syslog-ng-incubator"; description = "A collection of tools and modules for syslog-ng"; license = licenses.gpl2; maintainers = []; diff --git a/pkgs/tools/system/testdisk/default.nix b/pkgs/tools/system/testdisk/default.nix index ad11cd2e3b6..223d1102e0d 100644 --- a/pkgs/tools/system/testdisk/default.nix +++ b/pkgs/tools/system/testdisk/default.nix @@ -44,8 +44,8 @@ assert enableQt -> qwt != null; NIX_CFLAGS_COMPILE="-Wno-unused"; meta = with stdenv.lib; { - homepage = https://www.cgsecurity.org/wiki/Main_Page; - downloadPage = https://www.cgsecurity.org/wiki/TestDisk_Download; + homepage = "https://www.cgsecurity.org/wiki/Main_Page"; + downloadPage = "https://www.cgsecurity.org/wiki/TestDisk_Download"; description = "Testdisk / Photorec - Data recovery utilities"; longDescription = '' TestDisk is a powerful free data recovery software. It was primarily diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 7afa91abf13..560985a94f3 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -27,11 +27,15 @@ stdenv.mkDerivation rec { "--localstatedir=/var" "--with-dbus-sys-dir=${placeholder "out"}/share/dbus-1/system.d" "--with-systemdsystemunitdir=${placeholder "out"}/etc/systemd/system" - ]; + ]; + + postInstall = '' + cp ./data/thermal-conf.xml $out/etc/thermald/ + ''; meta = with stdenv.lib; { description = "Thermal Daemon"; - homepage = https://01.org/linux-thermal-daemon; + homepage = "https://01.org/linux-thermal-daemon"; license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/system/thinkfan/default.nix b/pkgs/tools/system/thinkfan/default.nix index f3b4ab8440e..4edcfb63fe5 100644 --- a/pkgs/tools/system/thinkfan/default.nix +++ b/pkgs/tools/system/thinkfan/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "thinkfan"; - version = "1.0.2"; + version = "1.1"; src = fetchFromGitHub { owner = "vmatare"; repo = "thinkfan"; rev = version; - sha256 = "107vw0962hrwva3wra9n3hxlbfzg82ldc10qssv3dspja88g8psr"; + sha256 = "1fxd1w3z65glw6y04myn7ihgswkx6sqnkky159mik4n96pfrsvr5"; }; cmakeFlags = [ diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix index 02ff7511382..71bb6dfb357 100644 --- a/pkgs/tools/system/throttled/default.nix +++ b/pkgs/tools/system/throttled/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fix for Intel CPU throttling issues"; - homepage = https://github.com/erpalma/throttled; + homepage = "https://github.com/erpalma/throttled"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ michaelpj ]; diff --git a/pkgs/tools/system/tm/default.nix b/pkgs/tools/system/tm/default.nix index cbb1fd88669..390eae4de50 100644 --- a/pkgs/tools/system/tm/default.nix +++ b/pkgs/tools/system/tm/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation { ''; src = fetchurl { - url = http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz; + url = "http://vicerveza.homeunix.net/~viric/soft/tm/tm-0.4.1.tar.gz"; sha256 = "3b389bc03b6964ad5ffa57a344b891fdbcf7c9b2604adda723a863f83657c4a0"; }; meta = with stdenv.lib; { - homepage = http://vicerveza.homeunix.net/~viric/soft/tm; + homepage = "http://vicerveza.homeunix.net/~viric/soft/tm"; description = "Terminal mixer - multiplexer for the i/o of terminal applications"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; diff --git a/pkgs/tools/system/tree/default.nix b/pkgs/tools/system/tree/default.nix index 0163d550217..24d11a9c0ee 100644 --- a/pkgs/tools/system/tree/default.nix +++ b/pkgs/tools/system/tree/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://mama.indstate.edu/users/ice/tree/; + homepage = "http://mama.indstate.edu/users/ice/tree/"; description = "Command to produce a depth indented directory listing"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/system/ts/default.nix b/pkgs/tools/system/ts/default.nix index 79ba7d89304..4046b363811 100644 --- a/pkgs/tools/system/ts/default.nix +++ b/pkgs/tools/system/ts/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = http://vicerveza.homeunix.net/~viric/soft/ts; + homepage = "http://vicerveza.homeunix.net/~viric/soft/ts"; description = "Task spooler - batch queue"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; diff --git a/pkgs/tools/system/undaemonize/default.nix b/pkgs/tools/system/undaemonize/default.nix index 0f33a8d34c3..e82ee18b831 100644 --- a/pkgs/tools/system/undaemonize/default.nix +++ b/pkgs/tools/system/undaemonize/default.nix @@ -13,7 +13,7 @@ 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; + homepage = "https://github.com/nickstenning/undaemonize"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.canndrew ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/system/uptimed/default.nix b/pkgs/tools/system/uptimed/default.nix index 2e856aaf9be..e9224977542 100644 --- a/pkgs/tools/system/uptimed/default.nix +++ b/pkgs/tools/system/uptimed/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { each other. Uptimed comes with a console front-end to parse the records, which can also easily be used to show your records on a web page. ''; - homepage = https://github.com/rpodgorny/uptimed/; + homepage = "https://github.com/rpodgorny/uptimed/"; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/system/vbetool/default.nix b/pkgs/tools/system/vbetool/default.nix index 06ae2862662..dc2ec24e594 100644 --- a/pkgs/tools/system/vbetool/default.nix +++ b/pkgs/tools/system/vbetool/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Video BIOS execution tool"; - homepage = http://www.codon.org.uk/~mjg59/vbetool/; + homepage = "http://www.codon.org.uk/~mjg59/vbetool/"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; license = licenses.gpl2; diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index 12aac2508cb..79a50e43ed8 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/which/; + homepage = "https://www.gnu.org/software/which/"; description = "Shows the full path of (shell) commands"; platforms = platforms.all; license = licenses.gpl3; diff --git a/pkgs/tools/system/wsmancli/default.nix b/pkgs/tools/system/wsmancli/default.nix index da502946781..79fb92d5bb2 100644 --- a/pkgs/tools/system/wsmancli/default.nix +++ b/pkgs/tools/system/wsmancli/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { also has several switches to allow for optional features of the WS-Management specification and Testing. ''; - downloadPage = https://github.com/Openwsman/wsmancli/releases; + downloadPage = "https://github.com/Openwsman/wsmancli/releases"; inherit (openwsman.meta) homepage license maintainers platforms; inherit version; }; diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix index 62423ff594f..2464f624a28 100644 --- a/pkgs/tools/system/xe/default.nix +++ b/pkgs/tools/system/xe/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple xargs and apply replacement"; - homepage = https://github.com/chneukirchen/xe; + homepage = "https://github.com/chneukirchen/xe"; license = licenses.publicDomain; platforms = platforms.all; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/tools/system/yeshup/default.nix b/pkgs/tools/system/yeshup/default.nix index 42060aed295..3242eeaeebc 100644 --- a/pkgs/tools/system/yeshup/default.nix +++ b/pkgs/tools/system/yeshup/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/RhysU/yeshup; + homepage = "https://github.com/RhysU/yeshup"; platforms = platforms.linux; license = licenses.cc-by-sa-30; # From Stackoverflow answer maintainers = with maintainers; [ obadz ]; diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index 7bd97507bea..de1678958db 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; - homepage = https://github.com/cjbassi/ytop; + homepage = "https://github.com/cjbassi/ytop"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; diff --git a/pkgs/tools/system/zenith/cargo-lock.patch b/pkgs/tools/system/zenith/cargo-lock.patch new file mode 100644 index 00000000000..3ab51ad5d4e --- /dev/null +++ b/pkgs/tools/system/zenith/cargo-lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 3f4eec6..2f565c6 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1297,7 +1297,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "zenith" +-version = "0.8.0" ++version = "0.8.1" + dependencies = [ + "battery", + "bincode", diff --git a/pkgs/tools/system/zenith/default.nix b/pkgs/tools/system/zenith/default.nix new file mode 100644 index 00000000000..f59541c2641 --- /dev/null +++ b/pkgs/tools/system/zenith/default.nix @@ -0,0 +1,27 @@ +{ stdenv, rustPlatform, fetchFromGitHub, IOKit }: + +rustPlatform.buildRustPackage rec { + pname = "zenith"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "bvaisvil"; + repo = pname; + rev = version; + sha256 = "12wbx4zhf1rf13g3mw8vcn8aqk9vcza61vi42y6c1pb2km73qw1h"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + cargoSha256 = "1nyci2vjwsyfscsd520d1r5vyazb33hv4mrsysy6amss4jdf2dlq"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; + + meta = with stdenv.lib; { + description = "Sort of like top or htop but with zoom-able charts, network, and disk usage"; + homepage = "https://github.com/bvaisvil/zenith"; + license = licenses.mit; + maintainers = with maintainers; [ bbigras ]; + # doesn't build on aarch64 https://github.com/bvaisvil/zenith/issues/19 + platforms = platforms.x86; + }; +} diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index f423bd7ea1c..39f1b7e5bc2 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { (page number, printing date, file name or supplied header), line numbering, symbol substitution as well as pretty printing for a wide range of programming languages. ''; - homepage = https://www.gnu.org/software/a2ps/; + homepage = "https://www.gnu.org/software/a2ps/"; license = licenses.gpl3Plus; maintainers = [ maintainers.bennofs ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/agrep/default.nix b/pkgs/tools/text/agrep/default.nix index 902067b3d53..c285b892b92 100644 --- a/pkgs/tools/text/agrep/default.nix +++ b/pkgs/tools/text/agrep/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "Approximate grep for fast fuzzy string searching"; - homepage = https://www.tgries.de/agrep/; + homepage = "https://www.tgries.de/agrep/"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 7dc07664fce..a823f37d8d2 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { longDescription = '' aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code. ''; - homepage = https://github.com/theZiz/aha; + homepage = "https://github.com/theZiz/aha"; license = with licenses; [ lgpl2Plus mpl11 ]; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index 70bfaafbcec..e59b8eaa9cd 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A code search-and-replace tool"; - homepage = https://github.com/dalance/amber; + homepage = "https://github.com/dalance/amber"; license = with licenses; [ mit ]; maintainers = [ maintainers.bdesham ]; platforms = platforms.all; diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index b01ce7773e3..94ab5286f8c 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interactive ASCII name and synonym chart"; - homepage = http://www.catb.org/~esr/ascii/; + homepage = "http://www.catb.org/~esr/ascii/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/bcat/Gemfile.lock b/pkgs/tools/text/bcat/Gemfile.lock index 09108977c71..cbff494fe86 100644 --- a/pkgs/tools/text/bcat/Gemfile.lock +++ b/pkgs/tools/text/bcat/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES bcat BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/text/bcat/default.nix b/pkgs/tools/text/bcat/default.nix index e8000f17cde..dffd58de44f 100644 --- a/pkgs/tools/text/bcat/default.nix +++ b/pkgs/tools/text/bcat/default.nix @@ -9,7 +9,7 @@ bundlerApp { meta = with lib; { description = "Pipe to browser utility"; - homepage = http://rtomayko.github.com/bcat/; + homepage = "http://rtomayko.github.com/bcat/"; license = licenses.mit; maintainers = with maintainers; [ jraygauthier nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/boxes/default.nix b/pkgs/tools/text/boxes/default.nix index 8325c6c08f3..b9d54d3a9e7 100644 --- a/pkgs/tools/text/boxes/default.nix +++ b/pkgs/tools/text/boxes/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { Boxes is a command line filter program that draws ASCII art boxes around your input text. ''; - homepage = https://boxes.thomasjensen.com; + homepage = "https://boxes.thomasjensen.com"; license = licenses.gpl2; maintainers = with maintainers; [ waiting-for-dev ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/catdocx/default.nix b/pkgs/tools/text/catdocx/default.nix index adf9d17815b..f24864f754b 100644 --- a/pkgs/tools/text/catdocx/default.nix +++ b/pkgs/tools/text/catdocx/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Extracts plain text from docx files"; - homepage = https://github.com/jncraton/catdocx; + homepage = "https://github.com/jncraton/catdocx"; license = with licenses; [ bsd3 ]; maintainers = [ maintainers.michalrus ]; platforms = platforms.all; diff --git a/pkgs/tools/text/cconv/default.nix b/pkgs/tools/text/cconv/default.nix index 3b80af365f6..8fe400aaab2 100644 --- a/pkgs/tools/text/cconv/default.nix +++ b/pkgs/tools/text/cconv/default.nix @@ -13,7 +13,7 @@ let version = "0.6.3"; in meta = with stdenv.lib; { description = "A iconv based simplified-traditional chinese conversion tool"; - homepage = https://github.com/xiaoyjy/cconv; + homepage = "https://github.com/xiaoyjy/cconv"; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.redfish64 ]; diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 521b4c5b284..7f706cf1376 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "Fast, indexed regexp search over large file trees"; - homepage = https://github.com/google/codesearch; + homepage = "https://github.com/google/codesearch"; license = [ stdenv.lib.licenses.bsd3 ]; maintainers = [ stdenv.lib.maintainers.bennofs ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 46fdf29ad46..1ba1db1f7cb 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Wrapper for 'diff' that produces the same output but with pretty 'syntax' highlighting"; - homepage = https://www.colordiff.org/; + homepage = "https://www.colordiff.org/"; license = licenses.gpl3; platforms = platforms.linux ++ platforms.darwin; }; diff --git a/pkgs/tools/text/convertlit/default.nix b/pkgs/tools/text/convertlit/default.nix index ffc2dc1c4d5..a947ef98a68 100644 --- a/pkgs/tools/text/convertlit/default.nix +++ b/pkgs/tools/text/convertlit/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "convertlit-1.8"; src = fetchzip { - url = http://www.convertlit.com/convertlit18src.zip; + url = "http://www.convertlit.com/convertlit18src.zip"; sha256 = "182nsin7qscgbw2h92m0zadh3h8q410h5cza6v486yjfvla3dxjx"; stripRoot = false; }; @@ -28,7 +28,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://www.convertlit.com/; + 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; diff --git a/pkgs/tools/text/copyright-update/default.nix b/pkgs/tools/text/copyright-update/default.nix index 9a405674dc7..ca815f915db 100644 --- a/pkgs/tools/text/copyright-update/default.nix +++ b/pkgs/tools/text/copyright-update/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { installFlags = [ "INSTALL=install" "prefix=$(out)" ]; meta = with stdenv.lib; { - homepage = https://github.com/jaalto/project--copyright-update; + homepage = "https://github.com/jaalto/project--copyright-update"; description = "Updates the copyright information in a set of files"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index d2c710d10f8..7a0240fc730 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -36,6 +36,6 @@ python3.pkgs.buildPythonApplication rec { description = "A suite of command-line tools for converting to and working with CSV"; maintainers = with maintainers; [ vrthra ]; license = licenses.mit; - homepage = https://github.com/wireservice/csvkit; + homepage = "https://github.com/wireservice/csvkit"; }; } diff --git a/pkgs/tools/text/dadadodo/default.nix b/pkgs/tools/text/dadadodo/default.nix index 5f6b0a8a605..5de8e25e6fb 100644 --- a/pkgs/tools/text/dadadodo/default.nix +++ b/pkgs/tools/text/dadadodo/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Markov chain-based text generator"; - homepage = http://www.jwz.org/dadadodo; + homepage = "http://www.jwz.org/dadadodo"; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; }; diff --git a/pkgs/tools/text/diffr/default.nix b/pkgs/tools/text/diffr/default.nix index 9ddaa3468ff..016cc40977b 100644 --- a/pkgs/tools/text/diffr/default.nix +++ b/pkgs/tools/text/diffr/default.nix @@ -2,26 +2,26 @@ rustPlatform.buildRustPackage rec { pname = "diffr"; - version = "v0.1.2"; - - # diffr's tests expect the diffr binary to be at `$CARGO_MANIFEST_DIR/target/debug/diffr`. - doCheck = false; + version = "v0.1.4"; src = fetchFromGitHub { owner = "mookid"; repo = pname; rev = version; - sha256 = "1fpcyl4kc4djfl6a2jlj56xqra42334vygz8n7614zgjpyxz3zx2"; + sha256 = "18ks5g4bx6iz9hdjxmi6a41ncxpb1hnsscdlddp2gr40k3vgd0pa"; }; - cargoSha256 = "17xgjk8li29b8q8p2bi56klqg0v2q0j6ich438c4p06jrszccx1f"; + cargoSha256 = "09yn02985yv40n9y0ipz0jmj7iqhz7l8hd3ry9ib3fyw9pyklnfa"; - nativeBuildInputs = []; buildInputs = (stdenv.lib.optional stdenv.isDarwin Security); + preCheck = '' + export DIFFR_TESTS_BINARY_PATH=$releaseDir/diffr + ''; + meta = with stdenv.lib; { description = "Yet another diff highlighting tool"; - homepage = https://github.com/mookid/diffr; + homepage = "https://github.com/mookid/diffr"; license = with licenses; [ mit ]; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/pkgs/tools/text/diffstat/default.nix b/pkgs/tools/text/diffstat/default.nix index bf4ff279f8f..bed34e30e79 100644 --- a/pkgs/tools/text/diffstat/default.nix +++ b/pkgs/tools/text/diffstat/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { insertions, deletions, and modifications per-file. It is useful for reviewing large, complex patch files. ''; - homepage = https://invisible-island.net/diffstat/; + homepage = "https://invisible-island.net/diffstat/"; license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index 67f397dbe48..06ecda9ff21 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "gl_cv_func_getopt_gnu=yes"; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/diffutils/diffutils.html; + homepage = "https://www.gnu.org/software/diffutils/diffutils.html"; description = "Commands for showing the differences between files (diff, cmp, etc.)"; license = licenses.gpl3; platforms = platforms.unix; diff --git a/pkgs/tools/text/discount/default.nix b/pkgs/tools/text/discount/default.nix index c1183d4c5a0..5a4dfd5de85 100644 --- a/pkgs/tools/text/discount/default.nix +++ b/pkgs/tools/text/discount/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Implementation of Markdown markup language in C"; - homepage = http://www.pell.portland.or.us/~orc/Code/discount/; + homepage = "http://www.pell.portland.or.us/~orc/Code/discount/"; license = licenses.bsd3; maintainers = with maintainers; [ shell ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/ebook-tools/default.nix b/pkgs/tools/text/ebook-tools/default.nix index 7dcd94e5363..2a6af785692 100644 --- a/pkgs/tools/text/ebook-tools/default.nix +++ b/pkgs/tools/text/ebook-tools/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://ebook-tools.sourceforge.net; + homepage = "http://ebook-tools.sourceforge.net"; description = "Tools and library for dealing with various ebook file formats"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index 24ac649026a..670e052772e 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; - homepage = https://www.gnu.org/software/enscript/; + homepage = "https://www.gnu.org/software/enscript/"; maintainers = [ ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/epubcheck/default.nix b/pkgs/tools/text/epubcheck/default.nix index 4e117ab7a48..914fe006735 100644 --- a/pkgs/tools/text/epubcheck/default.nix +++ b/pkgs/tools/text/epubcheck/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/w3c/epubcheck; + homepage = "https://github.com/w3c/epubcheck"; description = "Validation tool for EPUB"; license = with licenses; [ asl20 bsd3 mpl10 w3c ]; platforms = platforms.all; diff --git a/pkgs/tools/text/esh/default.nix b/pkgs/tools/text/esh/default.nix index 231a16bdc1b..171d90026be 100644 --- a/pkgs/tools/text/esh/default.nix +++ b/pkgs/tools/text/esh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple templating engine based on shell"; - homepage = https://github.com/jirutka/esh; + homepage = "https://github.com/jirutka/esh"; license = licenses.mit; maintainers = with maintainers; [ mnacamura ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ac89b6af32a..ac90b4d7792 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.16.0"; + version = "3.17.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1l76fh23a9wmw47bahd5l1bxyqcy54lahvid373iy9p3586fskis"; + sha256 = "1h7kzlw516w9qk5vcn0rqibxbhvzbmxgnf9l6yjxj30x53ynrvzj"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 0d5a50570f5..58dea610c39 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/gawk/; + homepage = "https://www.gnu.org/software/gawk/"; description = "GNU implementation of the Awk programming language"; longDescription = '' diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix index ebefae06c8c..a4a26e139fb 100644 --- a/pkgs/tools/text/gist/default.nix +++ b/pkgs/tools/text/gist/default.nix @@ -9,7 +9,7 @@ buildRubyGem rec { meta = with lib; { description = "Upload code to https://gist.github.com (or github enterprise)"; - homepage = http://defunkt.io/gist/; + homepage = "http://defunkt.io/gist/"; license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; platforms = ruby.meta.platforms; diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index 6e9ff5170f2..9dec057dfe9 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { longDescription = '' A multi-platform GUI application to browse and search through long or complex log files. It is designed with programmers and system administrators in mind. glogg can be seen as a graphical, interactive combination of grep and less. ''; - homepage = https://glogg.bonnefon.org/; + homepage = "https://glogg.bonnefon.org/"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ c0bw3b ]; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index 7608587e3c2..3f5c4d7d86c 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/grep/; + homepage = "https://www.gnu.org/software/grep/"; description = "GNU implementation of the Unix grep command"; longDescription = '' diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 87a3c72f165..8cca7f15962 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { more original files, producing patched versions. ''; - homepage = https://savannah.gnu.org/projects/patch; + homepage = "https://savannah.gnu.org/projects/patch"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/text/gnused/422.nix b/pkgs/tools/text/gnused/422.nix index 3a9856c3dd3..7ea637dc8c9 100644 --- a/pkgs/tools/text/gnused/422.nix +++ b/pkgs/tools/text/gnused/422.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnused-4.2.2"; src = fetchurl { - url = mirror://gnu/sed/sed-4.2.2.tar.bz2; + url = "mirror://gnu/sed/sed-4.2.2.tar.bz2"; sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7"; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation { outputs = [ "out" "info" ]; meta = { - homepage = https://www.gnu.org/software/sed/; + homepage = "https://www.gnu.org/software/sed/"; description = "GNU sed, a batch stream editor"; longDescription = '' diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 953be5e07d6..d4da6f2c8ce 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; meta = { - homepage = https://www.gnu.org/software/sed/; + homepage = "https://www.gnu.org/software/sed/"; description = "GNU sed, a batch stream editor"; longDescription = '' diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix index 837ec5b7a5f..611507da75c 100644 --- a/pkgs/tools/text/grin/default.nix +++ b/pkgs/tools/text/grin/default.nix @@ -16,7 +16,7 @@ python2Packages.buildPythonApplication rec { buildInputs = with python2Packages; [ nose ]; meta = { - homepage = https://github.com/rkern/grin; + 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 ]; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 391e7543eca..8c98a4aba46 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.gnu.org/software/groff/; + homepage = "https://www.gnu.org/software/groff/"; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index b871ac6ffaa..ff5288f1631 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -13,6 +13,7 @@ , json-glib , gspell , glib +, libdazzle , gtk3 , gtksourceview4 , gnome3 @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "gtranslator"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "05zvpx330h9k7b12p07bhcy47vq66260fmiph2b6h97xpl15rwmj"; + sha256 = "LaodO1m0o171TfCHNFsD4XA+clCB+drFQ1OSKKcVrdM="; }; nativeBuildInputs = [ @@ -42,6 +43,7 @@ stdenv.mkDerivation rec { libxml2 glib gtk3 + libdazzle gtksourceview4 libgda libsoup @@ -64,7 +66,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME translation making program"; - homepage = https://wiki.gnome.org/Apps/Gtranslator; + homepage = "https://wiki.gnome.org/Apps/Gtranslator"; license = licenses.gpl3Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/gucci/default.nix b/pkgs/tools/text/gucci/default.nix index 58f1768bfa1..1667f2e45b5 100644 --- a/pkgs/tools/text/gucci/default.nix +++ b/pkgs/tools/text/gucci/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "A simple CLI templating tool written in golang"; - homepage = https://github.com/noqcks/gucci; + homepage = "https://github.com/noqcks/gucci"; license = licenses.mit; maintainers = [ maintainers.braydenjw ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix index e31db437850..28e1759fea5 100644 --- a/pkgs/tools/text/html-tidy/default.nix +++ b/pkgs/tools/text/html-tidy/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { used to validate and fix HTML data. ''; license = licenses.libpng; # very close to it - the 3 clauses are identical - homepage = http://html-tidy.org; + homepage = "http://html-tidy.org"; platforms = platforms.all; maintainers = with maintainers; [ edwtjo ]; }; diff --git a/pkgs/tools/text/html2text/default.nix b/pkgs/tools/text/html2text/default.nix index 19448475548..7cf276f2da3 100644 --- a/pkgs/tools/text/html2text/default.nix +++ b/pkgs/tools/text/html2text/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "html2text-1.3.2a"; src = fetchurl { - url = http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz; + url = "http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz"; sha256 = "000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392"; }; @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Convert HTML to plain text"; - homepage = http://www.mbayer.de/html2text/; + homepage = "http://www.mbayer.de/html2text/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.eikek ]; diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index 70745266fe5..83fdabb8f46 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "minimalistic but powerful Linux console hex editor"; - homepage = https://yx7.cc/code/; + homepage = "https://yx7.cc/code/"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 79bcf90718b..15739432a19 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec { }; meta = with stdenv.lib; { - homepage = https://www.jefftk.com/icdiff; + homepage = "https://www.jefftk.com/icdiff"; description = "Side-by-side highlighted command line diffs"; maintainers = with maintainers; [ aneeshusa ]; license = licenses.psfl; diff --git a/pkgs/tools/text/invoice2data/default.nix b/pkgs/tools/text/invoice2data/default.nix index 0e2e4cedfc2..78ab971f0c0 100644 --- a/pkgs/tools/text/invoice2data/default.nix +++ b/pkgs/tools/text/invoice2data/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonPackage rec { meta = with stdenv.lib; { description = "Data extractor for PDF invoices"; - homepage = https://github.com/invoice-x/invoice2data; + homepage = "https://github.com/invoice-x/invoice2data"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; diff --git a/pkgs/tools/text/jsawk/default.nix b/pkgs/tools/text/jsawk/default.nix index c7f4002e2d3..4f2ad403e36 100644 --- a/pkgs/tools/text/jsawk/default.nix +++ b/pkgs/tools/text/jsawk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Jsawk is like awk, but for JSON"; - homepage = https://github.com/micha/jsawk; + homepage = "https://github.com/micha/jsawk"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ puffnfresh ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/text/jumanpp/default.nix b/pkgs/tools/text/jumanpp/default.nix index 6be7106f2b9..ecadb4a89d8 100644 --- a/pkgs/tools/text/jumanpp/default.nix +++ b/pkgs/tools/text/jumanpp/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { plausibility of word sequences by using a recurrent neural network language model (RNNLM). ''; - homepage = http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++; + homepage = "http://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++"; license = licenses.asl20; maintainers = with maintainers; [ mt-caret ]; platforms = platforms.all; diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix index d55ed89e633..f41de9baffc 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.1"; + version = "1.8.2"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0vj3rw5w0kry2c1y8gv6hniam417w7k3ydb1dkf5xwr4iprw0xvq"; + sha256 = "0s5vsm1avzv88b6mf2pp20c2sz0srrj52iiqpnwi3p4ihivm8wgv"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; @@ -18,7 +18,7 @@ mkDerivation rec { propagatedBuildInputs = [ kconfig kcrash kinit kparts kiconthemes ]; meta = with lib; { - homepage = http://kdiff3.sourceforge.net/; + homepage = "http://kdiff3.sourceforge.net/"; license = licenses.gpl2Plus; description = "Compares and merges 2 or 3 files or directories"; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock b/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock index f4f16580c0c..b50dc2fdbca 100644 --- a/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock +++ b/pkgs/tools/text/kramdown-rfc2629/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES kramdown-rfc2629 BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix index 621408866e8..b120d43287a 100644 --- a/pkgs/tools/text/kytea/default.nix +++ b/pkgs/tools/text/kytea/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing"; meta = with stdenv.lib; { - homepage = http://www.phontron.com/kytea/; + homepage = "http://www.phontron.com/kytea/"; description = "General toolkit developed for analyzing text"; longDescription = '' diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 8d9e44f1b86..154e099d3dd 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "4.8"; + version = "4.9"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "0xhzrrw52mqsv3n1rr98p8zi84i63gpcd104ahkkhhyzwvy9kprc"; + sha256 = "05jqqamdvi5x35yy9bqw6wf7qagrm1r9488f7cfbbv764zfirz17"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://languagetool.org; + homepage = "https://languagetool.org"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ edwtjo diff --git a/pkgs/tools/text/mairix/default.nix b/pkgs/tools/text/mairix/default.nix index e72824db627..a2ae91e974b 100644 --- a/pkgs/tools/text/mairix/default.nix +++ b/pkgs/tools/text/mairix/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = http://www.rc0.org.uk/mairix; + homepage = "http://www.rc0.org.uk/mairix"; license = stdenv.lib.licenses.gpl2Plus; description = "Program for indexing and searching email messages stored in maildir, MH or mbox"; maintainers = with stdenv.lib.maintainers; [viric]; diff --git a/pkgs/tools/text/markdown-pp/default.nix b/pkgs/tools/text/markdown-pp/default.nix index f479c221b65..eaaa0547964 100644 --- a/pkgs/tools/text/markdown-pp/default.nix +++ b/pkgs/tools/text/markdown-pp/default.nix @@ -3,7 +3,7 @@ with pythonPackages; buildPythonApplication rec { pname = "MarkdownPP"; - version = "1.4"; + version = "1.5.1"; propagatedBuildInputs = [ pillow watchdog ]; checkPhase = '' cd test @@ -13,7 +13,7 @@ buildPythonApplication rec { owner = "jreese"; repo = "markdown-pp"; rev = "v${version}"; - sha256 = "1xmc0cxvvf6jzr7p4f0hm8icysrd44sy2kgff9b99lr1agwkmysq"; + sha256 = "180i5wn9z6vdk2k2bh8345z3g80hj7zf5s2pq0h7k9vaxqpp7avc"; }; meta = with stdenv.lib; { description = "Preprocessor for Markdown files to generate a table of contents and other documentation needs"; diff --git a/pkgs/tools/text/mawk/default.nix b/pkgs/tools/text/mawk/default.nix index 8ad5cd16aaf..204d346082c 100644 --- a/pkgs/tools/text/mawk/default.nix +++ b/pkgs/tools/text/mawk/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Interpreter for the AWK Programming Language"; - homepage = https://invisible-island.net/mawk/mawk.html; + homepage = "https://invisible-island.net/mawk/mawk.html"; license = licenses.gpl2; maintainers = with maintainers; [ ehmry ]; platforms = with platforms; unix; diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 09e0b24ab7f..9ca92a21db1 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "mdbook"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "mdBook"; rev = "v${version}"; - sha256 = "07rpak233mi6ssqbpqsccn66a32jcgl90a5iyl2l5yyxw95rcya0"; + sha256 = "0a5i842aqa5xaii5lfrnks0ldavbhbd3bl4f2d442i1ahbin5b32"; }; - cargoSha256 = "0aanngwx7k86fb11zjx4wx954md446nn8667f2plr6bkqmlpxlkr"; + cargoSha256 = "1qx3447y684b7y18lgk9cc37if2ld42jnmy1kak191q6rjh5ssh7"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index 9bb3d7469ef..a696fd94cdb 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "cat for markdown"; - homepage = https://github.com/lunaryorn/mdcat; + homepage = "https://github.com/lunaryorn/mdcat"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ davidtwco ]; platforms = platforms.all; diff --git a/pkgs/tools/text/mecab/base.nix b/pkgs/tools/text/mecab/base.nix index e97980ef3d2..181eb405cbd 100644 --- a/pkgs/tools/text/mecab/base.nix +++ b/pkgs/tools/text/mecab/base.nix @@ -4,7 +4,7 @@ version = "0.996"; src = fetchurl { - url = https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE; + url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7cENtOXlicTFaRUE"; name = "mecab-0.996.tar.gz"; sha256 = "0ncwlqxl1hdn1x4v4kr2sn1sbbcgnhdphp0lcvk74nqkhdbk4wz0"; }; diff --git a/pkgs/tools/text/mecab/default.nix b/pkgs/tools/text/mecab/default.nix index 0b7e7e86df1..32060a6179a 100644 --- a/pkgs/tools/text/mecab/default.nix +++ b/pkgs/tools/text/mecab/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (mecab-base // { meta = with stdenv.lib; { description = "Japanese morphological analysis system"; - homepage = http://taku910.github.io/mecab/; + homepage = "http://taku910.github.io/mecab/"; license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ auntie ]; diff --git a/pkgs/tools/text/mecab/ipadic.nix b/pkgs/tools/text/mecab/ipadic.nix index 3b011787c7c..026e385e7c2 100644 --- a/pkgs/tools/text/mecab/ipadic.nix +++ b/pkgs/tools/text/mecab/ipadic.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "2.7.0-20070801"; src = fetchurl { - url = https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM; + url = "https://drive.google.com/uc?export=download&id=0B4y35FiV1wh7MWVlSDBCSXZMTXM"; name = "mecab-ipadic-2.7.0-20070801.tar.gz"; sha256 = "08rmkvj0f0x6jq0axrjw2y5nam0mavv6x77dp9v4al0wi1ym4bxn"; }; diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix index 0a9b3777783..f532daf8c44 100644 --- a/pkgs/tools/text/mir-qualia/default.nix +++ b/pkgs/tools/text/mir-qualia/default.nix @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Dynamically enable sections of config files"; - homepage = https://github.com/darkfeline/mir.qualia; + homepage = "https://github.com/darkfeline/mir.qualia"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.srhb ] ; }; diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 6665b377ccf..e86c9f2ad26 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = "liberal"; # a non-copyleft license, see `Copyright' file - homepage = http://www.mesa.nl/pub/mpage/; + homepage = "http://www.mesa.nl/pub/mpage/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix index d4b4902303b..9b431f5b30b 100644 --- a/pkgs/tools/text/multitran/data/default.nix +++ b/pkgs/tools/text/multitran/data/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { name = "multitran-data-0.3"; src = fetchurl { - url = mirror://sourceforge/multitran/multitran-data.tar.bz2; + url = "mirror://sourceforge/multitran/multitran-data.tar.bz2"; sha256 = "9c2ff5027c2fe72b0cdf056311cd7543f447feb02b455982f20d4a3966b7828c"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran data english-russian"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/text/multitran/libbtree/default.nix b/pkgs/tools/text/multitran/libbtree/default.nix index ae4ece899a4..9a7e0fdbd07 100644 --- a/pkgs/tools/text/multitran/libbtree/default.nix +++ b/pkgs/tools/text/multitran/libbtree/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libbtree-0.0.1alpha2"; src = fetchurl { - url = mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2; + url = "mirror://sourceforge/multitran/libbtree-0.0.1alpha2.tar.bz2"; sha256 = "34a584e45058950337ff9342693b6739b52c3ce17e66440526c4bd6f9575802c"; }; patchPhase = '' @@ -11,7 +11,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + 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; diff --git a/pkgs/tools/text/multitran/libfacet/default.nix b/pkgs/tools/text/multitran/libfacet/default.nix index 4470511f616..f359819aa73 100644 --- a/pkgs/tools/text/multitran/libfacet/default.nix +++ b/pkgs/tools/text/multitran/libfacet/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libfacet-0.0.1alpha2"; src = fetchurl { - url = mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2; + url = "mirror://sourceforge/multitran/libfacet-0.0.1alpha2.tar.bz2"; sha256 = "dc53351c4035a3c27dc6c1d0410e808346fbc107e7e7c112ec65c59d0df7a144"; }; @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: enchanced locale facets"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/libmtquery/default.nix b/pkgs/tools/text/multitran/libmtquery/default.nix index baccdfdedba..2c03de6ede8 100644 --- a/pkgs/tools/text/multitran/libmtquery/default.nix +++ b/pkgs/tools/text/multitran/libmtquery/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmtquery-0.0.1alpha3"; src = fetchurl { - url = mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2; + url = "mirror://sourceforge/multitran/libmtquery-0.0.1alpha3.tar.bz2"; sha256 = "e24c7c15772445f1b14871928d84dd03cf93bd88f9d2b2ed1bf0257c2cf2b15e"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: main engine to query translations"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/libmtsupport/default.nix b/pkgs/tools/text/multitran/libmtsupport/default.nix index 9b214e6b502..bc5a77be4fb 100644 --- a/pkgs/tools/text/multitran/libmtsupport/default.nix +++ b/pkgs/tools/text/multitran/libmtsupport/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libmtsupport-0.0.1alpha2"; src = fetchurl { - url = mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2; + url = "mirror://sourceforge/multitran/libmtsupport-0.0.1alpha2.tar.bz2"; sha256 = "481f0f1ec15d7274f1e4eb93e7d060df10a181efd037eeff5e8056d283a9298b"; }; patchPhase = '' @@ -11,7 +11,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + homepage = "http://multitran.sourceforge.net/"; description = "Multitran lib: basic useful functions"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/multitran/mtutils/default.nix b/pkgs/tools/text/multitran/mtutils/default.nix index ca65c567c66..9d701421d11 100644 --- a/pkgs/tools/text/multitran/mtutils/default.nix +++ b/pkgs/tools/text/multitran/mtutils/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "mt-utils-0.0.1alpha3"; src = fetchurl { - url = mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2; + url = "mirror://sourceforge/multitran/mt-utils-0.0.1alpha3.tar.bz2"; sha256 = "e407702c90c5272882386914e1eeca5f6c5039393af9a44538536b94867b0a0e"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://multitran.sourceforge.net/; + 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]; diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index 59cfc86efbf..93fc9dc75de 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://namazu.org/; + homepage = "http://namazu.org/"; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ ]; diff --git a/pkgs/tools/text/nawk/default.nix b/pkgs/tools/text/nawk/default.nix index a746c454435..57f036a47f0 100644 --- a/pkgs/tools/text/nawk/default.nix +++ b/pkgs/tools/text/nawk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { Language", by Al Aho, Brian Kernighan, and Peter Weinberger (Addison-Wesley, 1988, ISBN 0-201-07981-X). ''; - homepage = https://www.cs.princeton.edu/~bwk/btl.mirror/; + homepage = "https://www.cs.princeton.edu/~bwk/btl.mirror/"; license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.konimex ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/text/numdiff/default.nix b/pkgs/tools/text/numdiff/default.nix index f7543dc0f70..6e0c7e75649 100644 --- a/pkgs/tools/text/numdiff/default.nix +++ b/pkgs/tools/text/numdiff/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { line by line and field by field, ignoring small numeric differences or/and different numeric formats ''; - homepage = https://www.nongnu.org/numdiff/; + homepage = "https://www.nongnu.org/numdiff/"; license = licenses.gpl3Plus; maintainers = with maintainers; []; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/tools/text/odt2txt/default.nix b/pkgs/tools/text/odt2txt/default.nix index 69277d0412d..2a64533a459 100644 --- a/pkgs/tools/text/odt2txt/default.nix +++ b/pkgs/tools/text/odt2txt/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple .odt to .txt converter"; - homepage = https://github.com/dstosberg/odt2txt; + homepage = "https://github.com/dstosberg/odt2txt"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/tools/text/papertrail/Gemfile.lock b/pkgs/tools/text/papertrail/Gemfile.lock index 0d1b2a6fbe6..37cd23eab6f 100644 --- a/pkgs/tools/text/papertrail/Gemfile.lock +++ b/pkgs/tools/text/papertrail/Gemfile.lock @@ -14,4 +14,4 @@ DEPENDENCIES papertrail BUNDLED WITH - 1.14.4 + 2.1.4 diff --git a/pkgs/tools/text/papertrail/default.nix b/pkgs/tools/text/papertrail/default.nix index d20727f725a..d635fab74d5 100644 --- a/pkgs/tools/text/papertrail/default.nix +++ b/pkgs/tools/text/papertrail/default.nix @@ -22,7 +22,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Command-line client for Papertrail log management service"; - homepage = https://github.com/papertrail/papertrail-cli/; + homepage = "https://github.com/papertrail/papertrail-cli/"; license = licenses.mit; maintainers = with maintainers; [ nicknovitski ]; platforms = ruby.meta.platforms; diff --git a/pkgs/tools/text/par/default.nix b/pkgs/tools/text/par/default.nix index 88325c38731..54b5e6566e8 100644 --- a/pkgs/tools/text/par/default.nix +++ b/pkgs/tools/text/par/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { version = "1.52"; src = fetchurl { - url = http://www.nicemice.net/par/Par152.tar.gz; + url = "http://www.nicemice.net/par/Par152.tar.gz"; sha256 = "33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { - homepage = http://www.nicemice.net/par/; + homepage = "http://www.nicemice.net/par/"; description = "Paragraph reflow for email"; platforms = platforms.unix; # See https://fedoraproject.org/wiki/Licensing/Par for license details diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix index 9d7ac4b53f0..52961e58c0e 100644 --- a/pkgs/tools/text/patchutils/generic.nix +++ b/pkgs/tools/text/patchutils/generic.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Tools to manipulate patch files"; - homepage = http://cyberelk.net/tim/software/patchutils; + homepage = "http://cyberelk.net/tim/software/patchutils"; license = licenses.gpl2Plus; platforms = platforms.all; executables = [ "combinediff" "dehtmldiff" "editdiff" "espdiff" diff --git a/pkgs/tools/text/peco/default.nix b/pkgs/tools/text/peco/default.nix index 9407e68ed16..c5655cb2a58 100644 --- a/pkgs/tools/text/peco/default.nix +++ b/pkgs/tools/text/peco/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Simplistic interactive filtering tool"; - homepage = https://github.com/peco/peco; + homepage = "https://github.com/peco/peco"; license = licenses.mit; # peco should work on Windows or other POSIX platforms, but the go package # declares only linux and darwin. diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 342377b85ae..53aa9ac7b76 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; meta = with stdenv.lib; { - homepage = https://github.com/monochromegane/the_platinum_searcher; + homepage = "https://github.com/monochromegane/the_platinum_searcher"; description = "A code search tool similar to ack and the_silver_searcher(ag)."; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index a71ef2f06bd..bee2c7a1a8f 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Finds differences in translations between two PO files, or revisions"; - homepage = http://puszcza.gnu.org.ua/software/podiff; + homepage = "http://puszcza.gnu.org.ua/software/podiff"; license = licenses.gpl3Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index e0e7f5d957d..767569e42c2 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Cross-platform gettext catalogs (.po files) editor"; - homepage = https://www.poedit.net/; + homepage = "https://www.poedit.net/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ domenkozar genesis ]; diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix index 5e76e354173..b7134ba7356 100644 --- a/pkgs/tools/text/popfile/default.nix +++ b/pkgs/tools/text/popfile/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "An email classification system that automatically sorts messages and fights spam"; - homepage = http://getpopfile.org; + homepage = "http://getpopfile.org"; license = stdenv.lib.licenses.gpl2; # Should work on macOS, but havent tested it. diff --git a/pkgs/tools/text/proselint/default.nix b/pkgs/tools/text/proselint/default.nix index 27e9c80bc7d..36a68f9406d 100644 --- a/pkgs/tools/text/proselint/default.nix +++ b/pkgs/tools/text/proselint/default.nix @@ -15,7 +15,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "A linter for prose"; - homepage = http://proselint.com; + homepage = "http://proselint.com"; license = licenses.bsd3; maintainers = with maintainers; [ alibabzo ]; }; diff --git a/pkgs/tools/text/qgrep/default.nix b/pkgs/tools/text/qgrep/default.nix index c45398e31a1..30873e89d1b 100644 --- a/pkgs/tools/text/qgrep/default.nix +++ b/pkgs/tools/text/qgrep/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Fast regular expression grep for source code with incremental index updates"; - homepage = https://github.com/zeux/qgrep; + homepage = "https://github.com/zeux/qgrep"; license = licenses.mit; maintainers = [ maintainers.yrashk ]; platforms = platforms.all; diff --git a/pkgs/tools/text/qprint/default.nix b/pkgs/tools/text/qprint/default.nix index 8f998e3a26d..d616d15ad75 100644 --- a/pkgs/tools/text/qprint/default.nix +++ b/pkgs/tools/text/qprint/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://www.fourmilab.ch/webtools/qprint/; + homepage = "http://www.fourmilab.ch/webtools/qprint/"; license = stdenv.lib.licenses.publicDomain; description = "Encode and decode Quoted-Printable files"; maintainers = [ stdenv.lib.maintainers.tv ]; diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix index 9cf9349badb..bb2eeee8a9e 100644 --- a/pkgs/tools/text/qshowdiff/default.nix +++ b/pkgs/tools/text/qshowdiff/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - homepage = http://qshowdiff.danfis.cz/; + homepage = "http://qshowdiff.danfis.cz/"; description = "Colourful diff viewer"; license = stdenv.lib.licenses.gpl3Plus; }; diff --git a/pkgs/tools/text/reckon/Gemfile.lock b/pkgs/tools/text/reckon/Gemfile.lock index 0ede7e2a256..94f0f8f506c 100644 --- a/pkgs/tools/text/reckon/Gemfile.lock +++ b/pkgs/tools/text/reckon/Gemfile.lock @@ -18,4 +18,4 @@ DEPENDENCIES reckon BUNDLED WITH - 1.12.5 + 2.1.4 diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index e1c3d87bdcb..b562c92679b 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = https://github.com/rrthomas/recode; + 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; diff --git a/pkgs/tools/text/replace/default.nix b/pkgs/tools/text/replace/default.nix index 3549e7c1c94..009c3dcd8c5 100644 --- a/pkgs/tools/text/replace/default.nix +++ b/pkgs/tools/text/replace/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "replace-2.24"; src = fetchurl { - url = ftp://hpux.connect.org.uk/hpux/Users/replace-2.24/replace-2.24-src-11.11.tar.gz; + url = "ftp://hpux.connect.org.uk/hpux/Users/replace-2.24/replace-2.24-src-11.11.tar.gz"; sha256 = "1c2nkxx83vmlh1v3ib6r2xqh121gdb1rharwsimcb2h0xwc558dm"; }; @@ -22,7 +22,7 @@ stdenv.mkDerivation { patches = [./malloc.patch]; meta = { - homepage = https://replace.richardlloyd.org.uk/; + homepage = "https://replace.richardlloyd.org.uk/"; description = "A tool to replace verbatim strings"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/text/ripgrep-all/default.nix b/pkgs/tools/text/ripgrep-all/default.nix index 5d02e6225be..dcce9bf3291 100644 --- a/pkgs/tools/text/ripgrep-all/default.nix +++ b/pkgs/tools/text/ripgrep-all/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep-all"; - version = "0.9.3"; + version = "0.9.5"; src = fetchFromGitHub { owner = "phiresky"; repo = pname; - rev = version; - sha256 = "0fxvnd8qflzvqz2181njdhpbr4wdvd1jc6lcw38c3pknk9h3ymq9"; + rev = "v${version}"; + sha256 = "1nl03i36ilhxn5xbcry6pcr7vbl5667m43flpxaa0lf1wijzn5c2"; }; - cargoSha256 = "1ajj1glc9c1scnryyil7qg05gvyn1pk8dl2ivmv5h74vx0x8n0rv"; + cargoSha256 = "0ndyd8qrvljkk6yvpsp0w17iizxb529sh5q2bj790m32x0gz2w8l"; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optional stdenv.isDarwin Security; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec { a multitude of file types. rga wraps the awesome ripgrep and enables it to search in pdf, docx, sqlite, jpg, movie subtitles (mkv, mp4), etc. ''; - homepage = https://github.com/phiresky/ripgrep-all; + homepage = "https://github.com/phiresky/ripgrep-all"; license = with licenses; [ agpl3Plus ]; maintainers = with maintainers; [ zaninime ma27 ]; platforms = platforms.all; diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index d90537bd553..c794b4ba33c 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "ripgrep"; - version = "12.0.0"; + version = "12.0.1"; src = fetchFromGitHub { owner = "BurntSushi"; repo = pname; rev = version; - sha256 = "0n4169l662fvg6r4rcfs8n8f92rxndlaqb7k4x63680mra470dbi"; + sha256 = "1c0v51s05kbg9825n6mvpizhkkgz38wl7hp8f3vzbjfg4i8l8wb0"; }; - cargoSha256 = "01zi9zqdjsgc3im9na511n6w2bmqvm46wryh10fhzc9fnkziqmq3"; + cargoSha256 = "0i8x2xgri8f8mzrlkc8l2yzcgczl35nw4bmwg09d343mjkmk6d8y"; cargoBuildFlags = stdenv.lib.optional withPCRE2 "--features pcre2"; diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix new file mode 100644 index 00000000000..4f70f972b68 --- /dev/null +++ b/pkgs/tools/text/rosie/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, lib +, fetchgit +, libbsd +, readline +}: + +stdenv.mkDerivation rec { + pname = "rosie"; + version = "unstable-2020-01-11"; + src = fetchgit { + url = "https://gitlab.com/rosie-pattern-language/rosie"; + rev = "670e9027563609ba2ea31e14e2621a1302742795"; + sha256 = "0jc512dbn62a1fniknhbp6q0xa1p7xi3hn5v60is8sy9jgi3afxv"; + fetchSubmodules = true; + }; + + postUnpack = '' + # The Makefile calls git to update submodules, unless this file exists + touch ${src.name}/submodules/~~present~~ + ''; + + preConfigure = '' + patchShebangs src/build_info.sh + # Part of the same Makefile target which calls git to update submodules + ln -s src submodules/lua/include + ''; + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp $out/share/vim-plugins $out/share/nvim + mv $out/lib/rosie/extra/extra/emacs/* $out/share/emacs/site-lisp/ + mv $out/lib/rosie/extra/extra/vim $out/share/vim-plugins/rosie + ln -s $out/share/vim-plugins/rosie $out/share/nvim/site + ''; + + makeFlags = [ "DESTDIR=${placeholder "out"}" ]; + + buildInputs = [ libbsd readline ]; + + meta = with lib; { + homepage = "https://rosie-lang.org"; + description = "Tools for searching using parsing expression grammars"; + license = licenses.mit; + maintainers = with maintainers; [ kovirobi ]; + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/tools/text/rst2html5/default.nix b/pkgs/tools/text/rst2html5/default.nix index 83ac2d4d766..d20ce99dd74 100644 --- a/pkgs/tools/text/rst2html5/default.nix +++ b/pkgs/tools/text/rst2html5/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec { [ docutils genshi pygments beautifulsoup4 ]; meta = with stdenv.lib;{ - homepage = https://bitbucket.org/andre_felipe_dias/rst2html5; + homepage = "https://bitbucket.org/andre_felipe_dias/rst2html5"; description = "Converts ReSTructuredText to (X)HTML5"; license = licenses.mit; maintainers = with maintainers; [ AndersonTorres ]; diff --git a/pkgs/tools/text/ruby-zoom/default.nix b/pkgs/tools/text/ruby-zoom/default.nix index c3953840836..965d23d0c44 100644 --- a/pkgs/tools/text/ruby-zoom/default.nix +++ b/pkgs/tools/text/ruby-zoom/default.nix @@ -10,7 +10,7 @@ bundlerEnv { meta = with lib; { description = "Quickly open CLI search results in your favorite editor!"; - homepage = https://gitlab.com/mjwhitta/zoom; + homepage = "https://gitlab.com/mjwhitta/zoom"; license = with licenses; gpl3; maintainers = with maintainers; [ vmandela nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 1b6e4d945d4..a12f07d6da6 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.6.5"; + version = "0.7.2"; src = fetchFromGitHub { owner = "chmln"; repo = pname; - rev = version; - sha256 = "1vxljmd1vh245yhv095i3l44pk915zr2pix4v9r8pz2fynp2nnmj"; + rev = "v${version}"; + sha256 = "15siv3p22v7lj37b74pjsy360qx97d40q2xdzdg2srbi8svjgg27"; }; - cargoSha256 = "0n4c0snmjfyk3z2mbzpqgb6ggyv4nqszdda035g3rzpbavzx9xb5"; + cargoSha256 = "1sa7ki7kyg98l2gcrdzk7182ghm1clyqljjb596mhzh48g8kddn5"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix index 2cc40510121..f4110ed2105 100644 --- a/pkgs/tools/text/sgml/jade/default.nix +++ b/pkgs/tools/text/sgml/jade/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = { description = "James Clark's DSSSL Engine"; license = "custom"; - homepage = http://www.jclark.com/jade/; + homepage = "http://www.jclark.com/jade/"; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ e-user ]; }; diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index cf3b2bad6c9..eee5d005c05 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "An implementation of DSSSL, an ISO standard for formatting SGML (and XML) documents"; license = stdenv.lib.licenses.mit; - homepage = http://openjade.sourceforge.net/; + homepage = "http://openjade.sourceforge.net/"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/text/sgml/opensp/default.nix b/pkgs/tools/text/sgml/opensp/default.nix index ade640dac7a..9880564d969 100644 --- a/pkgs/tools/text/sgml/opensp/default.nix +++ b/pkgs/tools/text/sgml/opensp/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { name = "opensp-1.5.2"; src = fetchurl { - url = mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz; + url = "mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz"; sha256 = "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p"; }; @@ -41,7 +41,7 @@ stdenv.mkDerivation { meta = { description = "A suite of SGML/XML processing tools"; license = stdenv.lib.licenses.mit; - homepage = http://openjade.sourceforge.net/; + homepage = "http://openjade.sourceforge.net/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/shab/default.nix b/pkgs/tools/text/shab/default.nix index 02d2d545122..b5bb98e5f4d 100644 --- a/pkgs/tools/text/shab/default.nix +++ b/pkgs/tools/text/shab/default.nix @@ -41,7 +41,7 @@ let meta = with lib; { description = "The bash templating language"; - homepage = https://github.com/zimbatm/shab; + homepage = "https://github.com/zimbatm/shab"; license = licenses.unlicense; maintainers = with maintainers; [ zimbatm ]; platforms = bash.meta.platforms; diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 265141ad534..71f79724b9c 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,18 +2,20 @@ buildGoModule rec { pname = "shfmt"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1q0gazh87y7sl5sl5m046a83d64aas9xnbg2d1d1h2vwcqdaccp2"; + sha256 = "1k0bq4b4rv6wrh24jvcnpg1mfqrzqhl90zg4zibxzv3zkhjdskzh"; }; - modSha256 = "1ll2cxhgf8hh19wzdykgc81c4yfcp8bzmfaif08nvvb63rhjdb5y"; + modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z"; subPackages = ["cmd/shfmt"]; + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + meta = with lib; { homepage = "https://github.com/mvdan/sh"; description = "A shell parser and formatter"; diff --git a/pkgs/tools/text/shocco/default.nix b/pkgs/tools/text/shocco/default.nix index f657df5b780..65adfc29b95 100644 --- a/pkgs/tools/text/shocco/default.nix +++ b/pkgs/tools/text/shocco/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A quick-and-dirty, literate-programming-style documentation generator for / in POSIX shell"; - homepage = https://rtomayko.github.io/shocco/; + homepage = "https://rtomayko.github.io/shocco/"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ dotlambda ]; diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index c2a4cf22ea6..830810a84c4 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = with lib; { description = "sift is a fast and powerful alternative to grep"; - homepage = https://sift-tool.org; + homepage = "https://sift-tool.org"; maintainers = [ maintainers.carlsverre ]; license = licenses.gpl3; platforms = platforms.all; diff --git a/pkgs/tools/text/silver-searcher/default.nix b/pkgs/tools/text/silver-searcher/default.nix index 2c28f9ea5a5..51003694203 100644 --- a/pkgs/tools/text/silver-searcher/default.nix +++ b/pkgs/tools/text/silver-searcher/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ pcre zlib lzma ]; meta = with stdenv.lib; { - homepage = https://github.com/ggreer/the_silver_searcher/; + homepage = "https://github.com/ggreer/the_silver_searcher/"; description = "A code-searching tool similar to ack, but faster"; maintainers = with maintainers; [ madjar ]; platforms = platforms.all; diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index e273105a14a..d2116ced5e2 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { For example:- "spr`" expands to "Snippet Pixie rules!" ''; - homepage = https://www.snippetpixie.com; + homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ianmjones diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index 8e937fe8518..7052d9e5a44 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Source code renderer with syntax highlighting"; - homepage = https://www.gnu.org/software/src-highlite/; + homepage = "https://www.gnu.org/software/src-highlite/"; license = stdenv.lib.licenses.gpl3Plus; platforms = with stdenv.lib.platforms; linux ++ darwin; longDescription = diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index b7855bc7532..f7796c8a329 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Programming language/shell calculator"; - homepage = https://tkatchev.bitbucket.io/tab/; + homepage = "https://tkatchev.bitbucket.io/tab/"; license = licenses.boost; maintainers = with maintainers; [ mstarzyk ]; platforms = with platforms; linux; diff --git a/pkgs/tools/text/txt2tags/default.nix b/pkgs/tools/text/txt2tags/default.nix index 100124043ed..f70ad1710e2 100644 --- a/pkgs/tools/text/txt2tags/default.nix +++ b/pkgs/tools/text/txt2tags/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = https://txt2tags.org/; + homepage = "https://txt2tags.org/"; description = "A KISS markup language"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ kovirobi ]; diff --git a/pkgs/tools/text/uni2ascii/default.nix b/pkgs/tools/text/uni2ascii/default.nix index ccf17695f6c..d6b1215caf3 100644 --- a/pkgs/tools/text/uni2ascii/default.nix +++ b/pkgs/tools/text/uni2ascii/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl3; - homepage = http://billposer.org/Software/uni2ascii.html; + homepage = "http://billposer.org/Software/uni2ascii.html"; description = "Converts between UTF-8 and many 7-bit ASCII equivalents and back"; longDescription = '' diff --git a/pkgs/tools/text/unoconv/default.nix b/pkgs/tools/text/unoconv/default.nix index 2eaabc4f53d..dc9412d3c0e 100644 --- a/pkgs/tools/text/unoconv/default.nix +++ b/pkgs/tools/text/unoconv/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Convert between any document format supported by LibreOffice/OpenOffice"; - homepage = http://dag.wieers.com/home-made/unoconv/; + homepage = "http://dag.wieers.com/home-made/unoconv/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/unrtf/default.nix b/pkgs/tools/text/unrtf/default.nix index 93611ec5531..752d576701e 100644 --- a/pkgs/tools/text/unrtf/default.nix +++ b/pkgs/tools/text/unrtf/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { UnRTF converts documents in Rich Text Format to other formats, including HTML, LaTeX, and RTF itself. ''; - homepage = https://www.gnu.org/software/unrtf/; + homepage = "https://www.gnu.org/software/unrtf/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ joachifm ]; platforms = platforms.unix; diff --git a/pkgs/tools/text/untex/default.nix b/pkgs/tools/text/untex/default.nix index f9c7e3cdfc6..829c4da3849 100644 --- a/pkgs/tools/text/untex/default.nix +++ b/pkgs/tools/text/untex/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A utility which removes LaTeX commands from input"; - homepage = https://www.ctan.org/pkg/untex; + homepage = "https://www.ctan.org/pkg/untex"; license = licenses.gpl1; maintainers = with maintainers; [ joachifm ]; platforms = platforms.all; diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 001ed1addaa..bec7ba8825d 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { checkInputs = [ which ]; meta = { - homepage = https://www.gnu.org/software/wdiff/; + 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 ]; diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 3360fd4cbe0..9180573541d 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Command-line interface to various pastebins"; - homepage = http://wgetpaste.zlin.dk/; + homepage = "http://wgetpaste.zlin.dk/"; license = stdenv.lib.licenses.publicDomain; maintainers = with stdenv.lib.maintainers; [ qknight domenkozar ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 92ad2e00588..fabfdd85710 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Command line tool to download and extract data from html/xml pages"; - homepage = http://videlibri.sourceforge.net/xidel.html; + homepage = "http://videlibri.sourceforge.net/xidel.html"; # source contains no license info (AFAICS), but sourceforge says GPLv2 license = licenses.gpl2; # more platforms will be supported when we switch to source build diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 704ccede799..4dcaed16bb8 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { highly interactive front-end (basexgui). Apart from two local standalone modes, BaseX offers a client/server architecture. ''; - homepage = http://basex.org/; + homepage = "http://basex.org/"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 7ac624caff1..c42ecfc2441 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities for manipulating HTML and XML files"; - homepage = http://www.w3.org/Tools/HTML-XML-utils/; + homepage = "http://www.w3.org/Tools/HTML-XML-utils/"; license = licenses.w3c; platforms = platforms.all; }; diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index b38c2b3e34d..dcf83c736cc 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { description = "A RELAX NG validator in Java"; # The homepage is www.thaiopensource.com, but it links to googlecode.com # for downloads and call it the "project site". - homepage = https://www.thaiopensource.com/relaxng/trang.html; + homepage = "https://www.thaiopensource.com/relaxng/trang.html"; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/tools/text/xml/rnv/default.nix b/pkgs/tools/text/xml/rnv/default.nix index 21869cef4ee..2bc1b6dddda 100644 --- a/pkgs/tools/text/xml/rnv/default.nix +++ b/pkgs/tools/text/xml/rnv/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Relax NG Compact Syntax validator"; - homepage = http://www.davidashen.net/rnv.html; + homepage = "http://www.davidashen.net/rnv.html"; license = licenses.bsd3; platforms = platforms.all; }; diff --git a/pkgs/tools/text/xml/rxp/default.nix b/pkgs/tools/text/xml/rxp/default.nix index 093f1b0aec7..c0e2ea1c4e2 100644 --- a/pkgs/tools/text/xml/rxp/default.nix +++ b/pkgs/tools/text/xml/rxp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { license = stdenv.lib.licenses.gpl2Plus; description = "A validating XML parser written in C"; - homepage = http://www.cogsci.ed.ac.uk/~richard/rxp.html; + homepage = "http://www.cogsci.ed.ac.uk/~richard/rxp.html"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix index 3be952358b6..8c341855e68 100644 --- a/pkgs/tools/text/xml/xml2/default.nix +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "xml2-0.5"; src = fetchurl { - url = https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz; + url = "https://web.archive.org/web/20160427221603/http://download.ofb.net/gale/xml2-0.5.tar.gz"; sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; }; @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ libxml2 ]; meta = with stdenv.lib; { - homepage = https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2; + homepage = "https://web.archive.org/web/20160515005047/http://dan.egnor.name:80/xml2"; description = "Tools for command line processing of XML, HTML, and CSV"; license = licenses.gpl2Plus; platforms = platforms.all; diff --git a/pkgs/tools/text/xml/xmloscopy/default.nix b/pkgs/tools/text/xml/xmloscopy/default.nix index 5d085e41196..2cd7a580ee3 100644 --- a/pkgs/tools/text/xml/xmloscopy/default.nix +++ b/pkgs/tools/text/xml/xmloscopy/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "wtf is my docbook broken?"; - homepage = https://github.com/grahamc/xmloscopy; + homepage = "https://github.com/grahamc/xmloscopy"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ grahamc ]; diff --git a/pkgs/tools/text/xml/xmlstarlet/default.nix b/pkgs/tools/text/xml/xmlstarlet/default.nix index 4fe6ad6b3dc..7d3471f9561 100644 --- a/pkgs/tools/text/xml/xmlstarlet/default.nix +++ b/pkgs/tools/text/xml/xmlstarlet/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "A command line tool for manipulating and querying XML data"; - homepage = http://xmlstar.sourceforge.net/; + homepage = "http://xmlstar.sourceforge.net/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/text/xml/xpf/default.nix b/pkgs/tools/text/xml/xpf/default.nix index b35053d362b..6999a4a64d0 100644 --- a/pkgs/tools/text/xml/xpf/default.nix +++ b/pkgs/tools/text/xml/xpf/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "xpf-0.2"; src = fetchurl { - url = http://tarballs.nixos.org/xpf-0.2.tar.gz; + url = "http://tarballs.nixos.org/xpf-0.2.tar.gz"; sha256 = "0ljx91w68rnh4871c0xlq2whlmhqz8dr39wcdczfjjpniqz1fmpz"; }; @@ -14,7 +14,7 @@ stdenv.mkDerivation { 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; + homepage = "http://www.cs.uu.nl/wiki/bin/view/Martin/XmlPipesAndFilters"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/text/xsv/default.nix b/pkgs/tools/text/xsv/default.nix index 72a586d2b22..927d0d14be6 100644 --- a/pkgs/tools/text/xsv/default.nix +++ b/pkgs/tools/text/xsv/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "A fast CSV toolkit written in Rust"; - homepage = https://github.com/BurntSushi/xsv; + homepage = "https://github.com/BurntSushi/xsv"; license = with licenses; [ unlicense /* or */ mit ]; maintainers = [ maintainers.jgertm ]; platforms = platforms.all; diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index c8d10a6e269..30cc825c662 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { meta = with stdenv.lib; { description = "Extract urls from text"; - homepage = https://github.com/mvdan/xurls; + homepage = "https://github.com/mvdan/xurls"; maintainers = with maintainers; [ koral ]; platforms = platforms.unix; license = licenses.bsd3; diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix index 95a94cee7c4..b91d24e1137 100644 --- a/pkgs/tools/text/yaml-merge/default.nix +++ b/pkgs/tools/text/yaml-merge/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Merge YAML data files"; - homepage = https://github.com/abbradar/yaml-merge; + homepage = "https://github.com/abbradar/yaml-merge"; license = licenses.bsd2; platforms = platforms.linux; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/text/zimreader/default.nix b/pkgs/tools/text/zimreader/default.nix index 177f9326dd2..0b947ee5db3 100644 --- a/pkgs/tools/text/zimreader/default.nix +++ b/pkgs/tools/text/zimreader/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "A tool to serve ZIM files using HTTP"; - homepage = http://git.wikimedia.org/log/openzim; + homepage = "http://git.wikimedia.org/log/openzim"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.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 27334bf09b4..8362280c2fa 100644 --- a/pkgs/tools/text/zimwriterfs/default.nix +++ b/pkgs/tools/text/zimwriterfs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { description = "A console tool to create ZIM files"; - homepage = http://git.wikimedia.org/log/openzim; + homepage = "http://git.wikimedia.org/log/openzim"; maintainers = with stdenv.lib.maintainers; [ robbinch ]; license = stdenv.lib.licenses.gpl3; platforms = with stdenv.lib.platforms; [ linux ]; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 44c5f6d1f24..136c25f73b1 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -273,7 +273,7 @@ stdenv.mkDerivation rec { the backend output markups (which can be almost any type of SGML/XML markup) can be customized and extended by the user. ''; - homepage = http://www.methods.co.nz/asciidoc/; + homepage = "http://www.methods.co.nz/asciidoc/"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock index 02081e117d6..c928e954875 100644 --- a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock +++ b/pkgs/tools/typesetting/asciidoctor/Gemfile.lock @@ -93,4 +93,4 @@ DEPENDENCIES rouge BUNDLED WITH - 1.17.2 + 2.1.4 diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/tools/typesetting/asciidoctor/default.nix index 20bbe782d91..f875cc26311 100644 --- a/pkgs/tools/typesetting/asciidoctor/default.nix +++ b/pkgs/tools/typesetting/asciidoctor/default.nix @@ -30,7 +30,7 @@ let meta = with lib; { description = "A faster Asciidoc processor written in Ruby"; - homepage = https://asciidoctor.org/; + homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ gpyh nicknovitski ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index 39e7eab34ab..80b99284e49 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { structure of a parsed AsciiDoc document from Java and other JVM languages. ''; - homepage = https://asciidoctor.org/docs/asciidoctorj/; + homepage = "https://asciidoctor.org/docs/asciidoctorj/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ moaxcp ]; diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix index cb667e6b121..4e76fb87a6b 100644 --- a/pkgs/tools/typesetting/djvu2pdf/default.nix +++ b/pkgs/tools/typesetting/djvu2pdf/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { description = "Convert DjVu files to PDF files"; - homepage = https://0x2a.at/s/projects/djvu2pdf; + homepage = "https://0x2a.at/s/projects/djvu2pdf"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; inherit version; diff --git a/pkgs/tools/typesetting/docbook2odf/default.nix b/pkgs/tools/typesetting/docbook2odf/default.nix index 7200909660b..d846d9394b2 100644 --- a/pkgs/tools/typesetting/docbook2odf/default.nix +++ b/pkgs/tools/typesetting/docbook2odf/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { makes it easy to convert DocBook->ODF, ODT, ODS and ODP as all these documents are XML based. ''; - homepage = http://open.comsultia.com/docbook2odf/; + homepage = "http://open.comsultia.com/docbook2odf/"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 5309e4555b4..a36da7a2b6a 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { format. ''; license = licenses.mit; - homepage = http://docbook2x.sourceforge.net/; + homepage = "http://docbook2x.sourceforge.net/"; platforms = platforms.all; }; } diff --git a/pkgs/tools/typesetting/docbookrx/Gemfile.lock b/pkgs/tools/typesetting/docbookrx/Gemfile.lock index e1fbc2c9446..423fac6c30a 100644 --- a/pkgs/tools/typesetting/docbookrx/Gemfile.lock +++ b/pkgs/tools/typesetting/docbookrx/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES nokogiri (~> 1.8.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/typesetting/docbookrx/default.nix b/pkgs/tools/typesetting/docbookrx/default.nix index 484e98fc88c..6bfb0188a3a 100644 --- a/pkgs/tools/typesetting/docbookrx/default.nix +++ b/pkgs/tools/typesetting/docbookrx/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation { meta = with lib; { description = "(An early version of) a DocBook to AsciiDoc converter written in Ruby."; - homepage = https://asciidoctor.org/; + homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index 0b5c79756bd..d5dea2c6dc6 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { This package contains the fop command line tool. ''; - homepage = https://xmlgraphics.apache.org/fop/; + homepage = "https://xmlgraphics.apache.org/fop/"; license = licenses.asl20; platforms = platforms.all; maintainers = with maintainers; [ bjornfor ]; diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix index c214bd3cac7..d969ca8fec6 100644 --- a/pkgs/tools/typesetting/git-latexdiff/default.nix +++ b/pkgs/tools/typesetting/git-latexdiff/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "View diff on LaTeX source files on the generated PDF files"; - homepage = https://gitlab.com/git-latexdiff/git-latexdiff; + homepage = "https://gitlab.com/git-latexdiff/git-latexdiff"; maintainers = [ ]; license = licenses.bsd3; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9 platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/halibut/default.nix b/pkgs/tools/typesetting/halibut/default.nix index f0ed44351a2..d2779df0c94 100644 --- a/pkgs/tools/typesetting/halibut/default.nix +++ b/pkgs/tools/typesetting/halibut/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Documentation production system for software manuals"; - homepage = https://www.chiark.greenend.org.uk/~sgtatham/halibut/; + homepage = "https://www.chiark.greenend.org.uk/~sgtatham/halibut/"; license = licenses.mit; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/tools/typesetting/hevea/default.nix b/pkgs/tools/typesetting/hevea/default.nix index d5ede51ba0c..f3f634eb944 100644 --- a/pkgs/tools/typesetting/hevea/default.nix +++ b/pkgs/tools/typesetting/hevea/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ocamlPackages }: stdenv.mkDerivation rec { - name = "hevea-2.33"; + name = "hevea-2.34"; src = fetchurl { url = "http://pauillac.inria.fr/~maranget/hevea/distri/${name}.tar.gz"; - sha256 = "0115bn6n6hhb08rmj0m508wjcsn1mggiagqly6s941pq811wxymb"; + sha256 = "1pzyszxw90klpcmhjqrjfc8cw6c0gm4w2blim8ydyxb6rq6qml1s"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A quite complete and fast LATEX to HTML translator"; - homepage = http://pauillac.inria.fr/~maranget/hevea/; + homepage = "http://pauillac.inria.fr/~maranget/hevea/"; license = licenses.qpl; maintainers = with maintainers; [ pSub ]; platforms = with platforms; unix; diff --git a/pkgs/tools/typesetting/htmldoc/default.nix b/pkgs/tools/typesetting/htmldoc/default.nix index 7fca57ab9d2..ae6e2e9006e 100644 --- a/pkgs/tools/typesetting/htmldoc/default.nix +++ b/pkgs/tools/typesetting/htmldoc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Converts HTML files to PostScript and PDF"; - homepage = https://michaelrsweet.github.io/htmldoc; + homepage = "https://michaelrsweet.github.io/htmldoc"; license = licenses.gpl2; maintainers = with maintainers; [ shanemikel ]; platforms = with platforms; linux ++ darwin; diff --git a/pkgs/tools/typesetting/kindlegen/default.nix b/pkgs/tools/typesetting/kindlegen/default.nix index ff63ece3417..709e9400534 100644 --- a/pkgs/tools/typesetting/kindlegen/default.nix +++ b/pkgs/tools/typesetting/kindlegen/default.nix @@ -43,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Convert documents to .mobi for use with Amazon Kindle"; - homepage = https://www.amazon.com/gp/feature.html?docId=1000765211; + homepage = "https://www.amazon.com/gp/feature.html?docId=1000765211"; license = licenses.unfree; maintainers = with maintainers; [ peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" "i686-darwin" "x86_64-cygwin" "i686-cygwin" ]; diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock index f47f401367c..c975e23f323 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock +++ b/pkgs/tools/typesetting/kramdown-asciidoc/Gemfile.lock @@ -12,4 +12,4 @@ DEPENDENCIES kramdown-asciidoc BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix index f37be270ddb..3b54eb637d2 100644 --- a/pkgs/tools/typesetting/kramdown-asciidoc/default.nix +++ b/pkgs/tools/typesetting/kramdown-asciidoc/default.nix @@ -27,7 +27,7 @@ let meta = with lib; { description = "A kramdown extension for converting Markdown documents to AsciiDoc."; - homepage = https://asciidoctor.org/; + homepage = "https://asciidoctor.org/"; license = licenses.mit; maintainers = with maintainers; [ ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index 85c0bacf315..d86c4908f21 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # Author's page: http://jeffreykingston.id.au/lout/ # Wiki: https://sourceforge.net/p/lout/wiki/ - homepage = https://savannah.nongnu.org/projects/lout/; + homepage = "https://savannah.nongnu.org/projects/lout/"; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/tools/typesetting/mmark/default.nix b/pkgs/tools/typesetting/mmark/default.nix index 064e75ecbdc..be7d4c95833 100644 --- a/pkgs/tools/typesetting/mmark/default.nix +++ b/pkgs/tools/typesetting/mmark/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { meta = { description = "A powerful markdown processor in Go geared towards the IETF"; - homepage = https://github.com/miekg/mmark; + homepage = "https://github.com/miekg/mmark"; license = with stdenv.lib.licenses; bsd2; maintainers = with stdenv.lib.maintainers; [ yrashk ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/typesetting/multimarkdown/default.nix b/pkgs/tools/typesetting/multimarkdown/default.nix index 4cdbac7d638..5043eb681e8 100644 --- a/pkgs/tools/typesetting/multimarkdown/default.nix +++ b/pkgs/tools/typesetting/multimarkdown/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { glossary entries (LaTeX only) document metadata (e.g. title, author, date, etc.) ''; - homepage = https://fletcherpenney.net/multimarkdown/; + 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 ]; diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix index 9f62671a4fa..4b85a252c13 100644 --- a/pkgs/tools/typesetting/odpdown/default.nix +++ b/pkgs/tools/typesetting/odpdown/default.nix @@ -17,8 +17,8 @@ pythonPackages.buildPythonApplication rec { ]; meta = with stdenv.lib; { - homepage = https://github.com/thorstenb/odpdown; - repositories.git = https://github.com/thorstenb/odpdown.git; + homepage = "https://github.com/thorstenb/odpdown"; + repositories.git = "https://github.com/thorstenb/odpdown.git"; description = "Create nice-looking slides from your favourite text editor"; longDescription = '' Have a tool like pandoc, latex beamer etc, that you can write (or diff --git a/pkgs/tools/typesetting/pdf2odt/default.nix b/pkgs/tools/typesetting/pdf2odt/default.nix index c8e27fb5a6e..879597f91da 100644 --- a/pkgs/tools/typesetting/pdf2odt/default.nix +++ b/pkgs/tools/typesetting/pdf2odt/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "PDF to ODT format converter"; - homepage = https://github.com/gutschke/pdf2odt; + homepage = "https://github.com/gutschke/pdf2odt"; license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ peterhoeg ]; diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix index 20da90961dd..e445cf78d7a 100644 --- a/pkgs/tools/typesetting/pdfgrep/default.nix +++ b/pkgs/tools/typesetting/pdfgrep/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { description = "Commandline utility to search text in PDF files"; - homepage = https://pdfgrep.org/; + homepage = "https://pdfgrep.org/"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [ qknight fpletz ]; platforms = with stdenv.lib.platforms; unix; diff --git a/pkgs/tools/typesetting/pdfsandwich/default.nix b/pkgs/tools/typesetting/pdfsandwich/default.nix index f8b17be01dd..12fcf8a71a2 100644 --- a/pkgs/tools/typesetting/pdfsandwich/default.nix +++ b/pkgs/tools/typesetting/pdfsandwich/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "OCR tool for scanned PDFs"; - homepage = http://www.tobias-elze.de/pdfsandwich/; + homepage = "http://www.tobias-elze.de/pdfsandwich/"; license = licenses.gpl2; maintainers = [ maintainers.rps ]; platforms = platforms.linux; diff --git a/pkgs/tools/typesetting/pdftk/legacy.nix b/pkgs/tools/typesetting/pdftk/legacy.nix index 72f25ef099b..b3edd7d5450 100644 --- a/pkgs/tools/typesetting/pdftk/legacy.nix +++ b/pkgs/tools/typesetting/pdftk/legacy.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { meta = { description = "Simple tool for doing everyday things with PDF documents"; - homepage = https://www.pdflabs.com/tools/pdftk-server/; + 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; diff --git a/pkgs/tools/typesetting/psutils/default.nix b/pkgs/tools/typesetting/psutils/default.nix index 39beab751a7..72c72d1b3ba 100644 --- a/pkgs/tools/typesetting/psutils/default.nix +++ b/pkgs/tools/typesetting/psutils/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Collection of useful utilities for manipulating PS documents"; - homepage = http://knackered.knackered.org/angus/psutils/; + homepage = "http://knackered.knackered.org/angus/psutils/"; license = licenses.bsd3; }; } diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 21d83dd1dd0..a9ac2690b66 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, python3Packages, texinfo }: python3Packages.buildPythonApplication rec { - name = "rubber-${version}"; + pname = "rubber"; version = "1.5.1"; src = fetchurl { - url = "https://launchpad.net/rubber/trunk/${version}/+download/${name}.tar.gz"; + url = "https://launchpad.net/rubber/trunk/${version}/+download/${pname}-${version}.tar.gz"; sha256 = "178dmrp0mza5gqjiqgk6dqs0c10s0c517pk6k9pjbam86vf47a1p"; }; @@ -36,7 +36,7 @@ python3Packages.buildPythonApplication rec { of pdfLaTeX to produce PDF documents. ''; license = licenses.gpl2Plus; - homepage = https://launchpad.net/rubber; + homepage = "https://launchpad.net/rubber"; maintainers = with maintainers; [ ttuegel peterhoeg ]; platforms = platforms.unix; }; diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index c355d7b6d98..7a4b8010f04 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -62,7 +62,7 @@ in ''; meta = with stdenv.lib; { - homepage = https://github.com/gfngfn/SATySFi; + homepage = "https://github.com/gfngfn/SATySFi"; description = "A statically-typed, functional typesetting system"; license = licenses.lgpl3; maintainers = [ maintainers.mt-caret maintainers.marsam ]; diff --git a/pkgs/tools/typesetting/scdoc/default.nix b/pkgs/tools/typesetting/scdoc/default.nix index 6bddf107328..356433bac41 100644 --- a/pkgs/tools/typesetting/scdoc/default.nix +++ b/pkgs/tools/typesetting/scdoc/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { scdoc is a simple man page generator written for POSIX systems written in C99. ''; - homepage = https://git.sr.ht/~sircmpwn/scdoc; + homepage = "https://git.sr.ht/~sircmpwn/scdoc"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/tools/typesetting/skribilo/default.nix b/pkgs/tools/typesetting/skribilo/default.nix index b06b2e25fcc..813a464b770 100644 --- a/pkgs/tools/typesetting/skribilo/default.nix +++ b/pkgs/tools/typesetting/skribilo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { outline mode and from other conventions used in emails, Usenet and text. ''; - homepage = https://www.nongnu.org/skribilo/; + homepage = "https://www.nongnu.org/skribilo/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; diff --git a/pkgs/tools/typesetting/sshlatex/default.nix b/pkgs/tools/typesetting/sshlatex/default.nix index be218cda535..26af2258946 100644 --- a/pkgs/tools/typesetting/sshlatex/default.nix +++ b/pkgs/tools/typesetting/sshlatex/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { thereby preloading the required LaTeX packages, it is also useful in a purely local setting. ''; - homepage = https://github.com/iblech/sshlatex; + homepage = "https://github.com/iblech/sshlatex"; license = stdenv.lib.licenses.gpl3Plus; # actually dual-licensed gpl3Plus | lppl13cplus platforms = stdenv.lib.platforms.all; maintainers = [ maintainers.iblech ]; diff --git a/pkgs/tools/typesetting/tectonic/default.nix b/pkgs/tools/typesetting/tectonic/default.nix index 7e4c7dafefe..f5ac36690fd 100644 --- a/pkgs/tools/typesetting/tectonic/default.nix +++ b/pkgs/tools/typesetting/tectonic/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Modernized, complete, self-contained TeX/LaTeX engine, powered by XeTeX and TeXLive"; - homepage = https://tectonic-typesetting.github.io/; + homepage = "https://tectonic-typesetting.github.io/"; license = with licenses; [ mit ]; maintainers = [ maintainers.lluchs ]; platforms = platforms.all; diff --git a/pkgs/tools/typesetting/ted/default.nix b/pkgs/tools/typesetting/ted/default.nix index a03432b729a..25e9dce242f 100644 --- a/pkgs/tools/typesetting/ted/default.nix +++ b/pkgs/tools/typesetting/ted/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { MS-Word. Additionally, Ted also is an RTF to PostScript and an RTF to Acrobat PDF converter. ''; - homepage = https://nllgg.nl/Ted/; + homepage = "https://nllgg.nl/Ted/"; license = licenses.gpl2; platforms = platforms.all; broken = stdenv.isDarwin; diff --git a/pkgs/tools/typesetting/tex/auctex/default.nix b/pkgs/tools/typesetting/tex/auctex/default.nix index 787f19d91f4..ccb5dcc5190 100644 --- a/pkgs/tools/typesetting/tex/auctex/default.nix +++ b/pkgs/tools/typesetting/tex/auctex/default.nix @@ -29,7 +29,7 @@ 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; + homepage = "https://www.gnu.org/software/auctex"; platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index cc9432f6f22..a145e1a42ff 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -65,7 +65,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/; + homepage = "http://dblatex.sourceforge.net/"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/tools/typesetting/tex/latexrun/default.nix b/pkgs/tools/typesetting/tex/latexrun/default.nix index 6d64b536502..392edfc3a2f 100644 --- a/pkgs/tools/typesetting/tex/latexrun/default.nix +++ b/pkgs/tools/typesetting/tex/latexrun/default.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation { meta = with stdenvNoCC.lib; { description = "A 21st century LaTeX wrapper"; - homepage = https://github.com/aclements/latexrun; + homepage = "https://github.com/aclements/latexrun"; license = licenses.mit; maintainers = [ maintainers.lucus16 ]; platforms = platforms.all; diff --git a/pkgs/tools/typesetting/tex/lkproof/default.nix b/pkgs/tools/typesetting/tex/lkproof/default.nix index db0ec6d9bea..39029635beb 100644 --- a/pkgs/tools/typesetting/tex/lkproof/default.nix +++ b/pkgs/tools/typesetting/tex/lkproof/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "lkproof-3.1"; src = fetchurl { - url = http://mirror.ctan.org/macros/latex/contrib/lkproof.zip; + url = "http://mirror.ctan.org/macros/latex/contrib/lkproof.zip"; sha256 = "1qjkjhpc4rm62qxn18r83zdlwnj1wvnkcpdiqlv7w4bakh0gvjly"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index 9215a1e0ac4..dc13ea33178 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgf-1.18"; src = fetchurl { - url = mirror://sourceforge/pgf/pgf-1.18.tar.gz; + url = "mirror://sourceforge/pgf/pgf-1.18.tar.gz"; sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 56e50e44408..00b92935bab 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgf-2.00"; src = fetchurl { - url = mirror://sourceforge/pgf/pgf-2.00.tar.gz; + url = "mirror://sourceforge/pgf/pgf-2.00.tar.gz"; sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index 0835c7c547d..a9ff54e4c11 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgf-3.00"; src = fetchurl { - url = mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip; + url = "mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip"; sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7"; }; diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index fcdebedb7d8..998f61786db 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "pgfplots-1.5.1"; src = fetchurl { - url = mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip; + url = "mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip"; sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "TeX package to draw plots directly in TeX in two and three dimensions"; - homepage = http://pgfplots.sourceforge.net; + homepage = "http://pgfplots.sourceforge.net"; platforms = platforms.unix; license = licenses.gpl3Plus; }; diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix index ac317fd51dc..021927702ff 100644 --- a/pkgs/tools/typesetting/tex/tetex/default.nix +++ b/pkgs/tools/typesetting/tex/tetex/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation { name = "tetex-3.0"; src = fetchurl { - url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-src-3.0.tar.gz"; sha256 = "16v44465ipd9yyqri9rgxp6rbgs194k4sh1kckvccvdsnnp7w3ww"; }; texmf = fetchurl { - url = http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz; + url = "http://mirrors.ctan.org/obsolete/systems/unix/teTeX/3.0/distrib/tetex-texmf-3.0.tar.gz"; sha256 = "1hj06qvm02a2hx1a67igp45kxlbkczjlg20gr8lbp73l36k8yfvc"; }; @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A full-featured (La)TeX distribution"; - homepage = http://www.tug.org/tetex/; + homepage = "http://www.tug.org/tetex/"; maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; hydraPlatforms = []; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 6054ea5c6e9..fc3c5b32480 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -188,7 +188,7 @@ core = stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Basic binaries for TeX Live"; - homepage = http://www.tug.org/texlive; + homepage = "http://www.tug.org/texlive"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ]; platforms = platforms.all; @@ -383,7 +383,7 @@ pygmentex = python2Packages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://www.ctan.org/pkg/pygmentex; + homepage = "https://www.ctan.org/pkg/pygmentex"; description = "Auxiliary tool for typesetting code listings in LaTeX documents using Pygments"; longDescription = '' PygmenTeX is a Python-based LaTeX package that can be used for diff --git a/pkgs/tools/typesetting/tex/texlive/combine.nix b/pkgs/tools/typesetting/tex/texlive/combine.nix index cb4bc14927d..ee4d0dfe588 100644 --- a/pkgs/tools/typesetting/tex/texlive/combine.nix +++ b/pkgs/tools/typesetting/tex/texlive/combine.nix @@ -153,7 +153,8 @@ in buildEnv { rm "$link" makeWrapper "$target" "$link" \ --prefix PATH : "$out/bin:${perl}/bin" \ - --prefix PERL5LIB : "$PERL5LIB" + --prefix PERL5LIB : "$PERL5LIB" \ + --set-default TEXMFCNF "$TEXMFCNF" # avoid using non-nix shebang in $target by calling interpreter if [[ "$(head -c 2 "$target")" = "#!" ]]; then diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 278e33c383a..52a10711875 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -111,8 +111,8 @@ let # (https://tug.org/historic/). urlPrefixes = args.urlPrefixes or [ # tlnet-final snapshot - http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive - ftp://tug.org/texlive/historic/2019/tlnet-final/archive + "http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2019/tlnet-final/archive" + "ftp://tug.org/texlive/historic/2019/tlnet-final/archive" # Daily snapshots hosted by one of the texlive release managers #https://texlive.info/tlnet-archive/2019/10/19/tlnet/archive diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 0a1f6591b86..3cc99bc1a0e 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -25,7 +25,7 @@ mkDerivation { can be included directly in papers typeset using LaTeX. For preview support the texlive package 'preview' has to be installed. ''; - homepage = https://tikzit.github.io/; + homepage = "https://tikzit.github.io/"; license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.iblech maintainers.mgttlinger ]; diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index b5b03b470cd..f37bfb7c133 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; license = stdenv.lib.licenses.gpl2Plus; - homepage = https://fedorahosted.org/xmlto/; + homepage = "https://fedorahosted.org/xmlto/"; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index a4089636b95..9a19a6789e5 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { This is a maintained fork of the original AtomicParsley. ''; - homepage = https://bitbucket.org/wez/atomicparsley; + homepage = "https://bitbucket.org/wez/atomicparsley"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ pjones ]; diff --git a/pkgs/tools/video/bento4/default.nix b/pkgs/tools/video/bento4/default.nix index 4dea8dba6ed..94a1a5d04f3 100644 --- a/pkgs/tools/video/bento4/default.nix +++ b/pkgs/tools/video/bento4/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Full-featured MP4 format and MPEG DASH library and tools"; - homepage = http://bento4.com; + homepage = "http://bento4.com"; license = licenses.gpl2Plus; maintainers = with maintainers; [ makefu ]; broken = stdenv.isAarch64; diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index 8fe2a70dcb4..9077d34614d 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { AVI type 2, Quicktime DV, a series of JPEG stills or MPEG2-TS. ''; - homepage = http://kinodv.org/; + homepage = "http://kinodv.org/"; license = licenses.gpl2Plus; platforms = platforms.gnu ++ platforms.linux; diff --git a/pkgs/tools/video/flvtool2/default.nix b/pkgs/tools/video/flvtool2/default.nix index 037e07c7228..9a1f9f12103 100644 --- a/pkgs/tools/video/flvtool2/default.nix +++ b/pkgs/tools/video/flvtool2/default.nix @@ -9,7 +9,7 @@ buildRubyGem rec { meta = { broken = true; # depends on ruby 2.2 - homepage = https://github.com/unnu/flvtool2; + homepage = "https://github.com/unnu/flvtool2"; description = "A tool to manipulate Macromedia Flash Video files"; platforms = ruby.meta.platforms; license = lib.licenses.bsd3; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index 3e72d8b8af5..6c74aab9573 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A suite of programs for processing MPEG or MJPEG video"; - homepage = http://mjpeg.sourceforge.net/; + homepage = "http://mjpeg.sourceforge.net/"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; diff --git a/pkgs/tools/video/swfmill/default.nix b/pkgs/tools/video/swfmill/default.nix index 3832f3c3be0..b675c1a57c2 100644 --- a/pkgs/tools/video/swfmill/default.nix +++ b/pkgs/tools/video/swfmill/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "An xml2swf and swf2xml processor with import functionalities"; - homepage = http://swfmill.org; + homepage = "http://swfmill.org"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/video/swftools/default.nix b/pkgs/tools/video/swftools/default.nix index d75405ab309..a37f58937b8 100644 --- a/pkgs/tools/video/swftools/default.nix +++ b/pkgs/tools/video/swftools/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { description = "Collection of SWF manipulation and creation utilities"; - homepage = http://www.swftools.org/about.html; + homepage = "http://www.swftools.org/about.html"; license = licenses.gpl2; maintainers = [ maintainers.koral ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix index c7b76e0cb6e..728b4ff0118 100644 --- a/pkgs/tools/video/untrunc/default.nix +++ b/pkgs/tools/video/untrunc/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video"; license = licenses.gpl2; - homepage = https://github.com/ponchio/untrunc; + homepage = "https://github.com/ponchio/untrunc"; maintainers = [ maintainers.earvstedt ]; }; } diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix index 561c8cf7d78..ed2d872b874 100644 --- a/pkgs/tools/video/vnc2flv/default.nix +++ b/pkgs/tools/video/vnc2flv/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication rec { - name = "vnc2flv-20100207"; - namePrefix = ""; + pname = "vnc2flv"; + version = "20100207"; src = fetchurl { - url = "mirror://pypi/v/vnc2flv/${name}.tar.gz"; + url = "mirror://pypi/v/vnc2flv/${pname}-${version}.tar.gz"; sha256 = "14d4nm8yim0bm0nd3wyj7z4zdsg5zk3d9bhhvwdc36x03r8d0sbq"; }; @@ -14,7 +14,7 @@ pythonPackages.buildPythonApplication rec { meta = { description = "Tool to record VNC sessions to Flash Video"; - homepage = http://www.unixuser.org/~euske/python/vnc2flv/; + homepage = "http://www.unixuser.org/~euske/python/vnc2flv/"; license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix index 857524661bf..98b644a633c 100644 --- a/pkgs/tools/video/vncrec/default.nix +++ b/pkgs/tools/video/vncrec/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "VNC recorder"; - homepage = http://ronja.twibright.com/utils/vncrec/; + homepage = "http://ronja.twibright.com/utils/vncrec/"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/tools/video/yamdi/default.nix b/pkgs/tools/video/yamdi/default.nix index b9b16e4d8ec..28861887ed2 100644 --- a/pkgs/tools/video/yamdi/default.nix +++ b/pkgs/tools/video/yamdi/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Yet Another MetaData Injector for FLV"; - homepage = http://yamdi.sourceforge.net/; + homepage = "http://yamdi.sourceforge.net/"; license = licenses.bsd3; platforms = platforms.all; maintainers = [ maintainers.ryanartecona ]; diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix index a27e006053f..19766fb5ba9 100644 --- a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix +++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "amazon-ecs-cli"; - version = "1.18.0"; + version = "1.18.1"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}"; - sha256 = "1w4n7rkcxpdzg7450s22a80a27g845n61k2bdfhq4c1md7604nyz"; + sha256 = "1q0qsvxwz6mgslwzwslddxxv45v9wmlbbkxgyfz3dfkw6n6d1a2s"; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-darwin-amd64-v${version}"; - sha256 = "011rw4rv2vz6xa4vqfjsf9j6m3rffclv9xh0dgf5ckd07m3fd3sm"; + sha256 = "0hik88z5xm1pw6a3mxa6zpghdv47s6bg56srxv4azjinzdi59s3b"; } else throw "Architecture not supported"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # */ meta = with stdenv.lib; { - homepage = https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI.html; + homepage = "https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI.html"; description = "The Amazon ECS command line interface"; longDescription = "The Amazon Elastic Container Service (Amazon ECS) command line interface (CLI) provides high-level commands to simplify creating, updating, and monitoring clusters and tasks from a local development environment."; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/awless/default.nix b/pkgs/tools/virtualization/awless/default.nix index 57a68b86809..f051fd12ab3 100644 --- a/pkgs/tools/virtualization/awless/default.nix +++ b/pkgs/tools/virtualization/awless/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; meta = with stdenv.lib; { - homepage = https://github.com/wallix/awless/; + homepage = "https://github.com/wallix/awless/"; description = "A Mighty CLI for AWS"; platforms = with platforms; linux ++ darwin; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix index 618a45075c9..57aae0c695f 100644 --- a/pkgs/tools/virtualization/aws/default.nix +++ b/pkgs/tools/virtualization/aws/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "aws-1.75"; src = fetchurl { - url = https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws; + url = "https://raw.github.com/timkay/aws/2f2ff99f9f5111ea708ae6cd14d20e264748e72b/aws"; sha256 = "0d5asv73a58yb1bb1jpsw3c7asd62y86z5fwpg4llhjzkx79maj6"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = https://www.timkay.com/aws/; + 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; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index fabdd535774..aff00519a2d 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -88,7 +88,7 @@ in with localPython.pkgs; buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = https://aws.amazon.com/elasticbeanstalk/; + homepage = "https://aws.amazon.com/elasticbeanstalk/"; description = "A command line interface for Elastic Beanstalk"; maintainers = with maintainers; [ eqyiel ]; license = licenses.asl20; diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 580c2f9a01f..bf932ff1ad4 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -37,7 +37,7 @@ in pythonPackages.buildPythonApplication { doCheck = false; meta = { - homepage = https://cloudinit.readthedocs.org; + homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; maintainers = [ lib.maintainers.madjar lib.maintainers.phile314 ]; platforms = lib.platforms.all; diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 1c7613b4893..2565d9346b0 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -17,7 +17,7 @@ buildPythonApplication rec { meta = with lib; { description = "CLI for Apache CloudStack."; - homepage = https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI; + homepage = "https://cwiki.apache.org/confluence/display/CLOUDSTACK/CloudStack+cloudmonkey+CLI"; license = [ licenses.asl20 ]; maintainers = [ maintainers.womfoo ]; }; diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 910f2822c6f..2aa23f04fe4 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { meta = with lib; { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; - homepage = https://github.com/kubernetes-sigs/cri-tools; + homepage = "https://github.com/kubernetes-sigs/cri-tools"; license = lib.licenses.asl20; maintainers = with maintainers; [ saschagrunert ]; }; diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index e8172066800..f8359e6286c 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = https://aws.amazon.com/developertools/Amazon-EC2/368; + 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; }; diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 86ad36886c9..409b2ba8f41 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351; + 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; }; diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix index cb31a66ea72..3d7b62777aa 100644 --- a/pkgs/tools/virtualization/euca2ools/default.nix +++ b/pkgs/tools/virtualization/euca2ools/default.nix @@ -3,11 +3,11 @@ let inherit (python2Packages) buildPythonApplication boto m2crypto; in buildPythonApplication { - name = "euca2ools-2.1.4"; - namePrefix = ""; + pname = "euca2ools"; + version = "2.1.4"; src = fetchgit { - url = https://github.com/eucalyptus/euca2ools.git; + url = "https://github.com/eucalyptus/euca2ools.git"; rev = "19cb7eac34dd7efe3a56e4841b9692c03458bf3b"; sha256 = "0grsgn5gbvk1hlfa8qx7ppz7iyfyi2pdhxy8njr8lm60w4amfiyq"; }; @@ -15,7 +15,7 @@ in buildPythonApplication { propagatedBuildInputs = [ boto m2crypto ]; meta = { - homepage = https://github.com/eucalyptus/euca2ools; + 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; diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 0daa01f85bb..31ea1cb2a94 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -3,6 +3,7 @@ , curl , json_c , pam +, bashInteractive }: stdenv.mkDerivation rec { @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace compat.h --replace /bin/bash ${stdenv.shell} + substituteInPlace compat.h --replace /bin/bash ${bashInteractive}/bin/bash ''; buildInputs = [ curl.dev pam ]; @@ -43,7 +44,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://github.com/GoogleCloudPlatform/compute-image-packages; + homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; description = "OS Login Guest Environment for Google Compute Engine"; license = licenses.asl20; maintainers = with maintainers; [ adisbladis flokli ]; diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index b53c211d379..1595af84770 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { meta = { description = "A vSphere CLI built on top of govmomi"; - homepage = https://github.com/vmware/govmomi/tree/master/govc; + homepage = "https://github.com/vmware/govmomi/tree/master/govc"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nicknovitski ]; }; diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index d7696be85e4..d739bdb514a 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -35,7 +35,7 @@ perlPackages.buildPerlPackage rec { meta = with stdenv.lib; { description = "Command-line interface to the Linode platform"; - homepage = https://github.com/linode/cli; + homepage = "https://github.com/linode/cli"; license = with licenses; [ artistic2 gpl2 ]; maintainers = with maintainers; [ nixy ]; }; diff --git a/pkgs/tools/virtualization/marathonctl/default.nix b/pkgs/tools/virtualization/marathonctl/default.nix index 10103be2630..c557361f122 100644 --- a/pkgs/tools/virtualization/marathonctl/default.nix +++ b/pkgs/tools/virtualization/marathonctl/default.nix @@ -16,7 +16,7 @@ buildGoPackage { }; meta = with stdenv.lib; { - homepage = https://github.com/shoenig/marathonctl; + homepage = "https://github.com/shoenig/marathonctl"; description = "CLI tool for Marathon"; platforms = platforms.all; license = licenses.mit; diff --git a/pkgs/tools/virtualization/mininet/default.nix b/pkgs/tools/virtualization/mininet/default.nix index 0ee27d36e0a..78ddc8e6dfd 100644 --- a/pkgs/tools/virtualization/mininet/default.nix +++ b/pkgs/tools/virtualization/mininet/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { fullName = "Mininet 2.3.0d6 License"; }; platforms = platforms.linux; - homepage = https://github.com/mininet/mininet; + homepage = "https://github.com/mininet/mininet"; maintainers = with maintainers; [ teto ]; }; } diff --git a/pkgs/tools/virtualization/rootlesskit/default.nix b/pkgs/tools/virtualization/rootlesskit/default.nix index 79dd4e4551a..224e7b33081 100644 --- a/pkgs/tools/virtualization/rootlesskit/default.nix +++ b/pkgs/tools/virtualization/rootlesskit/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { }; meta = with lib; { - homepage = https://github.com/rootless-containers/rootlesskit; + homepage = "https://github.com/rootless-containers/rootlesskit"; description = ''Kind of Linux-native "fake root" utility, made for mainly running Docker and Kubernetes as an unprivileged user''; license = licenses.asl20; maintainers = with maintainers; [ offline ]; diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index 5f4d982d86d..00771b91750 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { meta = with stdenv.lib; { description = "basic user tool to execute simple docker containers in user space without root privileges"; - homepage = https://indigo-dc.gitbooks.io/udocker; + homepage = "https://indigo-dc.gitbooks.io/udocker"; license = licenses.asl20; maintainers = [ maintainers.bzizou ]; platforms = platforms.linux; diff --git a/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/pkgs/tools/virtualization/xe-guest-utilities/default.nix index 4a81e8fe48b..e5c5b0978af 100644 --- a/pkgs/tools/virtualization/xe-guest-utilities/default.nix +++ b/pkgs/tools/virtualization/xe-guest-utilities/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation (rec { version = "6.2.0"; meta = { description = "Citrix XenServer Tools"; - homepage = http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US; + 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 ]; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 66fa444e0e7..b56f921d0c2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -46,6 +46,7 @@ mapAliases ({ asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 at_spi2_core = at-spi2-core; # added 2018-02-25 + avldrums-lv2 = x42-avldrums; # added 2020-03-29 bar-xft = lemonbar-xft; # added 2015-01-16 bashCompletion = bash-completion; # Added 2016-09-28 batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 @@ -113,6 +114,7 @@ mapAliases ({ etcdctl = etcd; # added 2018-04-25 exfat-utils = exfat; # 2015-09-11 facette = throw "facette has been removed."; # added 2020-01-06 + fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # added 2020-03-28 fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H."; ffadoFull = ffado; # added 2018-05-01 firefox-esr-wrapper = firefox-esr; # 2016-01 @@ -219,6 +221,7 @@ mapAliases ({ libcanberra_gtk3 = libcanberra-gtk3; # added 2018-02-25 libcap_manpages = libcap.doc; # added 2016-04-29 libcap_pam = if stdenv.isLinux then libcap.pam else null; # added 2016-04-29 + libcroco = throw "libcroco has been removed as it's no longer used in any derivations."; # added 2020-03-04 libindicate = throw "libindacate has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 libindicate-gtk3 = throw "libindacate-gtk2 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 libindicate-gtk2 = throw "libindacate-gtk3 has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 @@ -246,6 +249,7 @@ mapAliases ({ links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; + loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 lua5_1_sockets = lua51Packages.luasocket; # added 2017-05-02 @@ -292,10 +296,11 @@ mapAliases ({ networkmanager_openconnect = networkmanager-openconnect; # added 2018-02-25 networkmanager_openvpn = networkmanager-openvpn; # added 2018-02-25 networkmanager_vpnc = networkmanager-vpnc; # added 2018-02-25 - nix-review = nixpkgs-review; # added 2019-12-22 + neutral-style = throw "neural-style has been removed, as the upstream project has been abandoned"; # added 2020-03-28 nfsUtils = nfs-utils; # added 2014-12-06 nginxUnstable = nginxMainline; # added 2018-04-25 nilfs_utils = nilfs-utils; # added 2018-04-25 + nix-review = nixpkgs-review; # added 2019-12-22 nmap_graphical = nmap-graphical; # added 2017-01-19 nologin = shadow; # added 2018-04-25 nxproxy = nx-libs; # added 2019-02-15 @@ -317,6 +322,55 @@ mapAliases ({ perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 pgp-tools = signing-party; # added 2017-03-26 pg_tmp = ephemeralpg; # added 2018-01-16 + + php-embed = throw '' + php*-embed has been dropped, you can build the same package by using + something similar with this following snippet: + (php74.override { config.php.embed = true; config.php.apxs2 = false; }) + ''; # added 2020-04-01 + php72-embed = php-embed; # added 2020-04-01 + php73-embed = php-embed; # added 2020-04-01 + php74-embed = php-embed; # added 2020-04-01 + + phpPackages-embed = throw '' + php*Packages-embed has been dropped, you can build the same package by using + something similar with this following snippet: + (php74.override { config.php.embed = true; config.php.apxs2 = false; }).packages + ''; # added 2020-04-01 + php74Packages-embed = phpPackages-embed; + php73Packages-embed = phpPackages-embed; + php72Packages-embed = phpPackages-embed; + + php-unit = throw '' + php*-unit has been dropped, you can build the same package by using + something similar with this following snippet: + (php74.override { + config.php.embed = true; + config.php.apxs2 = false; + config.php.systemd = false; + config.php.phpdbg = false; + config.php.cgi = false; + config.php.fpm = false; }) + ''; # added 2020-04-01 + php72-unit = php-unit; # added 2020-04-01 + php73-unit = php-unit; # added 2020-04-01 + php74-unit = php-unit; # added 2020-04-01 + + phpPackages-unit = throw '' + php*Packages-unit has been dropped, you can build the same package by using + something similar with this following snippet: + (php74.override { + config.php.embed = true; + config.php.apxs2 = false; + config.php.systemd = false; + config.php.phpdbg = false; + config.php.cgi = false; + config.php.fpm = false; }).packages + ''; # added 2020-04-01 + php74Packages-unit = phpPackages-unit; + php73Packages-unit = phpPackages-unit; + php72Packages-unit = phpPackages-unit; + pidgin-with-plugins = pidgin; # added 2016-06 pidginlatex = pidgin-latex; # added 2018-01-08 pidginlatexSF = pidgin-latex; # added 2014-11-02 @@ -421,6 +475,7 @@ mapAliases ({ skrooge2 = skrooge; # added 2017-02-18 skype = skypeforlinux; # added 2017-07-27 skydive = throw "skydive has been removed from nixpkgs (2019-09-10)"; + slack-dark = slack; # added 2020-03-27 slic3r-prusa3d = prusa-slicer; # added 2019-05-21 slurm-llnl = slurm; # renamed July 2017 slurm-llnl-full = slurm-full; # renamed July 2017 @@ -494,10 +549,14 @@ mapAliases ({ tftp_hpa = tftp-hpa; # added 2015-04-03 tomcat85 = tomcat8; # added 2020-03-11 torbrowser = tor-browser-bundle-bin; # added 2017-04-05 - transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; + torch = throw "torch has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + torch-hdf5 = throw "torch-hdf5 has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + torch-repl = throw "torch-repl has been removed, as the upstream project has been abandoned"; # added 2020-03-28 + torchPackages = throw "torchPackages has been removed, as the upstream project has been abandoned"; # added 2020-03-28 trang = jing-trang; # added 2018-04-25 transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 + transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 @@ -509,6 +568,7 @@ mapAliases ({ v4l_utils = v4l-utils; # added 2019-08-07 v8_3_16_14 = throw "removed 2019-11-01: no longer referenced by other packages"; valadoc = throw "deprecated 2019-10-10: valadoc was merged into vala 0.38"; + vamp = { vampSDK = vamp-plugin-sdk; }; # added 2020-03-26 vimbWrapper = vimb; # added 2015-01 vimprobable2 = throw "vimprobable2 has been removed from nixpkgs. It relied on webkitgtk24x that has been removed."; # added 2019-12-05 vimprobable2-unwrapped = vimprobable2; # added 2019-12-05 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c194a3c6e7..b93c167a9e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,9 +161,7 @@ in cm256cc = callPackage ../development/libraries/cm256cc { }; - conftest = callPackage ../development/tools/conftest { - inherit (darwin.apple_sdk.frameworks) Security; - }; + conftest = callPackage ../development/tools/conftest { }; corgi = callPackage ../development/tools/corgi { }; @@ -177,13 +175,9 @@ in hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. - proto-contrib = callPackage ../development/tools/proto-contrib { - inherit (darwin.apple_sdk.frameworks) Security; - }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; - protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; demoit = callPackage ../servers/demoit { }; @@ -191,15 +185,15 @@ in enum4linux = callPackage ../tools/security/enum4linux {}; + onesixtyone = callPackage ../tools/security/onesixtyone {}; + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; dieHook = makeSetupHook {} ../build-support/setup-hooks/die.sh; - archiver = callPackage ../applications/misc/archiver { - inherit (darwin.apple_sdk.frameworks) Security; - }; + archiver = callPackage ../applications/misc/archiver { }; digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; @@ -219,9 +213,7 @@ in docker-sync = callPackage ../tools/misc/docker-sync { }; - docui = callPackage ../tools/misc/docui { - inherit (darwin.apple_sdk.frameworks) Security; - }; + docui = callPackage ../tools/misc/docui { }; dotfiles = callPackage ../applications/misc/dotfiles { }; @@ -298,18 +290,13 @@ in # Version 2.6.0 fails to build with go 1.13 due to nested modules: # go: directory v2/packr2 is outside main module buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; - pet = callPackage ../development/tools/pet { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pet = callPackage ../development/tools/pet { }; run = callPackage ../development/tools/run { }; - mod = callPackage ../development/tools/mod { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mod = callPackage ../development/tools/mod { }; broadlink-cli = callPackage ../tools/misc/broadlink-cli {}; @@ -541,11 +528,11 @@ in ffmpeg = ffmpeg_2; }; + alsaequal = callPackage ../tools/audio/alsaequal { }; + acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act { - inherit (darwin.apple_sdk.frameworks) Security; - }; + act = callPackage ../development/tools/misc/act {}; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -570,9 +557,7 @@ in wxGTK = wxGTK30; } // (config.aegisub or {})); - aerc = callPackage ../applications/networking/mailreaders/aerc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + aerc = callPackage ../applications/networking/mailreaders/aerc { }; aerospike = callPackage ../servers/nosql/aerospike { }; @@ -737,8 +722,6 @@ in avfs = callPackage ../tools/filesystems/avfs { }; - avldrums-lv2 = callPackage ../applications/audio/avldrums-lv2 { }; - aws-iam-authenticator = callPackage ../tools/security/aws-iam-authenticator {}; awscli = callPackage ../tools/admin/awscli { }; @@ -759,27 +742,19 @@ in aws-sam-cli = callPackage ../development/tools/aws-sam-cli { python = python3; }; - aws-vault = callPackage ../tools/admin/aws-vault { - inherit (darwin.apple_sdk.frameworks) Security; - }; + aws-vault = callPackage ../tools/admin/aws-vault { }; - iamy = callPackage ../tools/admin/iamy { - inherit (darwin.apple_sdk.frameworks) Security; - }; + iamy = callPackage ../tools/admin/iamy { }; azure-cli = callPackage ../tools/admin/azure-cli { python = python3; }; - azure-storage-azcopy = callPackage ../development/tools/azcopy { - inherit (darwin.apple_sdk.frameworks) Security; - }; + azure-storage-azcopy = callPackage ../development/tools/azcopy { }; azure-vhd-utils = callPackage ../tools/misc/azure-vhd-utils { }; awless = callPackage ../tools/virtualization/awless { }; - berglas = callPackage ../tools/admin/berglas/default.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + berglas = callPackage ../tools/admin/berglas/default.nix { }; brakeman = callPackage ../development/tools/analysis/brakeman { }; @@ -851,22 +826,16 @@ in calls = callPackage ../applications/networking/calls { }; - certigo = callPackage ../tools/admin/certigo { - inherit (darwin.apple_sdk.frameworks) Security; - }; + certigo = callPackage ../tools/admin/certigo { }; - chezmoi = callPackage ../tools/misc/chezmoi { - inherit (darwin.apple_sdk.frameworks) Security; - }; + chezmoi = callPackage ../tools/misc/chezmoi { }; chipsec = callPackage ../tools/security/chipsec { kernel = null; withDriver = false; }; - clair = callPackage ../tools/admin/clair { - inherit (darwin.apple_sdk.frameworks) Security; - }; + clair = callPackage ../tools/admin/clair { }; cloud-sql-proxy = callPackage ../tools/misc/cloud-sql-proxy { }; @@ -898,9 +867,7 @@ in crc32c = callPackage ../development/libraries/crc32c { }; - cue = callPackage ../development/tools/cue { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cue = callPackage ../development/tools/cue { }; deltachat-electron = callPackage ../applications/networking/instant-messengers/deltachat-electron { }; @@ -925,9 +892,7 @@ in sedutil = callPackage ../tools/security/sedutil { }; - elvish = callPackage ../shells/elvish { - inherit (darwin.apple_sdk.frameworks) Security; - }; + elvish = callPackage ../shells/elvish { }; emplace = callPackage ../tools/package-management/emplace { }; @@ -1143,9 +1108,7 @@ in awstats = callPackage ../tools/system/awstats { }; - awsweeper = callPackage ../tools/admin/awsweeper { - inherit (darwin.apple_sdk.frameworks) Security; - }; + awsweeper = callPackage ../tools/admin/awsweeper { }; axel = callPackage ../tools/networking/axel { libssl = openssl; @@ -1367,7 +1330,7 @@ in }; bsh = fetchurl { - url = http://www.beanshell.org/bsh-2.0b5.jar; + url = "http://www.beanshell.org/bsh-2.0b5.jar"; sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2"; }; @@ -1410,12 +1373,8 @@ in ''; }); - caddy = callPackage ../servers/caddy { - inherit (darwin.apple_sdk.frameworks) Security; - }; - caddy2 = callPackage ../servers/caddy/v2.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + caddy = callPackage ../servers/caddy { }; + caddy2 = callPackage ../servers/caddy/v2.nix { }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { @@ -1467,13 +1426,9 @@ in ccnet = callPackage ../tools/networking/ccnet { }; - cassowary = callPackage ../tools/networking/cassowary { - inherit (darwin.apple_sdk.frameworks) Security; - }; + cassowary = callPackage ../tools/networking/cassowary { }; - croc = callPackage ../tools/networking/croc { - inherit (darwin.apple_sdk.frameworks) Security; - }; + croc = callPackage ../tools/networking/croc { }; cddl = callPackage ../development/tools/cddl { }; @@ -1493,9 +1448,7 @@ in clac = callPackage ../tools/misc/clac {}; - clash = callPackage ../tools/networking/clash { - inherit (darwin.apple_sdk.frameworks) Security; - }; + clash = callPackage ../tools/networking/clash { }; clasp = callPackage ../tools/misc/clasp { }; @@ -1612,6 +1565,8 @@ in csvkit = callPackage ../tools/text/csvkit { }; + csv2latex = callPackage ../tools/misc/csv2latex { }; + csvs-to-sqlite = with python3Packages; toPythonApplication csvs-to-sqlite; cucumber = callPackage ../development/tools/cucumber {}; @@ -1758,9 +1713,7 @@ in eggdrop = callPackage ../tools/networking/eggdrop { }; - eksctl = callPackage ../tools/admin/eksctl { - inherit (darwin.apple_sdk.frameworks) Security; - }; + eksctl = callPackage ../tools/admin/eksctl { }; elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; @@ -1914,9 +1867,7 @@ in gosu = callPackage ../tools/misc/gosu { }; - gotify-cli = callPackage ../tools/misc/gotify-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gotify-cli = callPackage ../tools/misc/gotify-cli { }; gping = callPackage ../tools/networking/gping { }; @@ -2052,6 +2003,8 @@ in metabase = callPackage ../servers/metabase { }; + midicsv = callPackage ../tools/audio/midicsv { }; + mididings = callPackage ../tools/audio/mididings { }; miniserve = callPackage ../tools/misc/miniserve { }; @@ -2144,8 +2097,6 @@ in precice = callPackage ../development/libraries/precice { }; - parallel-rust = callPackage ../tools/misc/parallel-rust { }; - pueue = callPackage ../applications/misc/pueue { }; pixiecore = callPackage ../tools/networking/pixiecore {}; @@ -2446,6 +2397,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon IOKit; }; + cemu = qt5.callPackage ../applications/science/math/cemu { }; + isomd5sum = callPackage ../tools/cd-dvd/isomd5sum { }; mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; @@ -2496,9 +2449,7 @@ in ciopfs = callPackage ../tools/filesystems/ciopfs { }; - circleci-cli = callPackage ../development/tools/misc/circleci-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + circleci-cli = callPackage ../development/tools/misc/circleci-cli { }; circus = callPackage ../tools/networking/circus { }; @@ -2550,7 +2501,11 @@ in conspy = callPackage ../os-specific/linux/conspy {}; - connman = callPackage ../tools/networking/connman { }; + inherit (callPackage ../tools/networking/connman {}) + connman + connmanFull + connmanMinimal + ; connman-gtk = callPackage ../tools/networking/connman/connman-gtk { }; @@ -2669,9 +2624,7 @@ in caps2esc = callPackage ../tools/inputmethods/interception-tools/caps2esc.nix { }; }; - age = callPackage ../tools/security/age { - inherit (darwin.apple_sdk.frameworks) Security; - }; + age = callPackage ../tools/security/age { }; brotli = callPackage ../tools/compression/brotli { }; @@ -2892,13 +2845,13 @@ in dnscrypt-wrapper = callPackage ../tools/networking/dnscrypt-wrapper { }; + dnscontrol = callPackage ../applications/networking/dnscontrol { }; + dnsenum = callPackage ../tools/security/dnsenum { }; dnsmasq = callPackage ../tools/networking/dnsmasq { }; - dnsproxy = callPackage ../tools/networking/dnsproxy { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dnsproxy = callPackage ../tools/networking/dnsproxy { }; dnsperf = callPackage ../tools/networking/dnsperf { }; @@ -3001,13 +2954,9 @@ in driftnet = callPackage ../tools/networking/driftnet {}; - drone = callPackage ../development/tools/continuous-integration/drone { - inherit (darwin.apple_sdk.frameworks) Security; - }; + drone = callPackage ../development/tools/continuous-integration/drone { }; - drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; dropbear = callPackage ../tools/networking/dropbear { }; @@ -3139,6 +3088,8 @@ in volctl = callPackage ../tools/audio/volctl { }; + vorta = python3Packages.callPackage ../applications/backup/vorta { }; + wallutils = callPackage ../tools/graphics/wallutils { }; wev = callPackage ../tools/misc/wev { }; @@ -3311,11 +3262,6 @@ in fakechroot = callPackage ../tools/system/fakechroot { }; - fast-neural-doodle = callPackage ../tools/graphics/fast-neural-doodle { - inherit (python27Packages) numpy scipy h5py scikitlearn python - pillow; - }; - fastpbkdf2 = callPackage ../development/libraries/fastpbkdf2 { }; fanficfare = callPackage ../tools/text/fanficfare { }; @@ -3692,11 +3638,7 @@ in git-crecord = callPackage ../applications/version-management/git-crecord { }; - git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { - # Version 2.8.0 fails with go1.13 - # go: github.com/alexbrainman/sspi@v0.0.0-20180125232955-4729b3d4d858: Get https://proxy.golang.org/github.com/alexbrainman/sspi/@v/v0.0.0-20180125232955-4729b3d4d858.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:32932->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }); + git-lfs = lowPrio (callPackage ../applications/version-management/git-lfs { }); git-lfs1 = callPackage ../applications/version-management/git-lfs/1.nix { }; @@ -3930,7 +3872,6 @@ in grpcui = callPackage ../tools/networking/grpcui { buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ @@ -4157,9 +4098,7 @@ in hexd = callPackage ../tools/misc/hexd { }; pixd = callPackage ../tools/misc/pixd { }; - hey = callPackage ../tools/networking/hey { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hey = callPackage ../tools/networking/hey { }; hhpc = callPackage ../tools/misc/hhpc { }; @@ -4357,12 +4296,9 @@ in # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) # This is fixed in master, but release containing the fix does not exist yet. buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { - inherit (darwin.apple_sdk.frameworks) Security; - }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; ipget = callPackage ../applications/networking/ipget { }; @@ -4582,8 +4518,6 @@ in krop = callPackage ../applications/graphics/krop { }; - elisa = libsForQt5.callPackage ../applications/audio/elisa { }; - kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; kube-router = callPackage ../applications/networking/cluster/kube-router { }; @@ -4606,9 +4540,7 @@ in lefthook = gitAndTools.lefthook; - lego = callPackage ../tools/admin/lego { - inherit (darwin.apple_sdk.frameworks) Security; - }; + lego = callPackage ../tools/admin/lego { }; leocad = callPackage ../applications/graphics/leocad { }; @@ -4628,12 +4560,12 @@ in libcoap = callPackage ../applications/networking/libcoap {}; - libcroco = callPackage ../development/libraries/libcroco { }; - libcryptui = callPackage ../development/libraries/libcryptui { }; libsmi = callPackage ../development/libraries/libsmi { }; + libgen-cli = callPackage ../tools/misc/libgen-cli { }; + licensor = callPackage ../tools/misc/licensor { }; lesspipe = callPackage ../tools/misc/lesspipe { }; @@ -4701,9 +4633,7 @@ in mautrix-telegram = recurseIntoAttrs (callPackage ../servers/mautrix-telegram { }); - mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mautrix-whatsapp = callPackage ../servers/mautrix-whatsapp { }; mcfly = callPackage ../tools/misc/mcfly { inherit (darwin.apple_sdk.frameworks) Security; @@ -4740,9 +4670,7 @@ in motion = callPackage ../applications/video/motion { }; - mtail = callPackage ../servers/monitoring/mtail { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mtail = callPackage ../servers/monitoring/mtail { }; multitail = callPackage ../tools/misc/multitail { }; @@ -4902,6 +4830,8 @@ in libevdev = callPackage ../development/libraries/libevdev { }; + liberio = callPackage ../development/libraries/liberio { }; + libevdevplus = callPackage ../development/libraries/libevdevplus { }; libfann = callPackage ../development/libraries/libfann { }; @@ -4997,7 +4927,8 @@ in inherit (callPackages ../development/libraries/libwebsockets { }) libwebsockets_3_1 libwebsockets_3_2 - libwebsockets; + libwebsockets_4_0; + libwebsockets = libwebsockets_3_2; lidarr = callPackage ../servers/lidarr { }; @@ -5189,9 +5120,7 @@ in minetime = callPackage ../applications/office/minetime { }; - minio-client = callPackage ../tools/networking/minio-client { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + minio-client = callPackage ../tools/networking/minio-client { }; minissdpd = callPackage ../tools/networking/minissdpd { }; @@ -5256,6 +5185,8 @@ in monit = callPackage ../tools/system/monit { }; + monolith = callPackage ../tools/backup/monolith { }; + moreutils = callPackage ../tools/misc/moreutils { docbook-xsl = docbook_xsl; }; @@ -5314,9 +5245,7 @@ in munt = libsForQt5.callPackage ../applications/audio/munt { }; - mutagen = callPackage ../tools/misc/mutagen { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; - }; + mutagen = callPackage ../tools/misc/mutagen { }; mycli = callPackage ../tools/admin/mycli { }; @@ -5354,9 +5283,7 @@ in ndppd = callPackage ../applications/networking/ndppd { }; - nebula = callPackage ../tools/networking/nebula { - inherit (darwin.apple_sdk.frameworks) Security; - }; + nebula = callPackage ../tools/networking/nebula { }; nemiver = callPackage ../development/tools/nemiver { }; @@ -5380,8 +5307,6 @@ in netcdffortran = callPackage ../development/libraries/netcdf-fortran { }; - neural-style = callPackage ../tools/graphics/neural-style {}; - nco = callPackage ../development/libraries/nco { }; ncftp = callPackage ../tools/networking/ncftp { }; @@ -5584,9 +5509,7 @@ in obexd = callPackage ../tools/bluetooth/obexd { }; - obfs4 = callPackage ../tools/networking/obfs4 { - inherit (darwin.apple_sdk.frameworks) Security; - }; + obfs4 = callPackage ../tools/networking/obfs4 { }; oci-image-tool = callPackage ../tools/misc/oci-image-tool { }; @@ -5783,6 +5706,8 @@ in padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { }; + page = callPackage ../tools/misc/page { }; + pagmo2 = callPackage ../development/libraries/pagmo2 { }; pakcs = callPackage ../development/compilers/pakcs { }; @@ -5806,6 +5731,8 @@ in parallel = callPackage ../tools/misc/parallel { }; + parallel-full = callPackage ../tools/misc/parallel/wrapper.nix { }; + parastoo-fonts = callPackage ../data/fonts/parastoo-fonts { }; parcellite = callPackage ../tools/misc/parcellite { }; @@ -5926,13 +5853,9 @@ in pg_top = callPackage ../tools/misc/pg_top { }; - pgcenter = callPackage ../tools/misc/pgcenter { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pgcenter = callPackage ../tools/misc/pgcenter { }; - pgmetrics = callPackage ../tools/misc/pgmetrics { - inherit (darwin.apple_sdk.frameworks) Security; - }; + pgmetrics = callPackage ../tools/misc/pgmetrics { }; pdsh = callPackage ../tools/networking/pdsh { rsh = true; # enable internal rsh implementation @@ -6299,10 +6222,6 @@ in reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; - relfs = callPackage ../tools/filesystems/relfs { - inherit (gnome2) gnome_vfs GConf; - }; - remarkjs = callPackage ../development/web/remarkjs { }; alarm-clock-applet = callPackage ../tools/misc/alarm-clock-applet { }; @@ -6360,6 +6279,8 @@ in rnv = callPackage ../tools/text/xml/rnv { }; + rosie = callPackage ../tools/text/rosie { }; + rounded-mgenplus = callPackage ../data/fonts/rounded-mgenplus { }; roundup = callPackage ../tools/misc/roundup { }; @@ -6438,7 +6359,7 @@ in s3fs = callPackage ../tools/filesystems/s3fs { }; - s3cmd = callPackage ../tools/networking/s3cmd { }; + s3cmd = python3Packages.callPackage ../tools/networking/s3cmd { }; s4cmd = callPackage ../tools/networking/s4cmd { }; @@ -6456,6 +6377,8 @@ in safecopy = callPackage ../tools/system/safecopy { }; + sacd = callPackage ../tools/cd-dvd/sacd { }; + safe = callPackage ../tools/security/safe { }; safe-rm = callPackage ../tools/system/safe-rm { }; @@ -6472,10 +6395,7 @@ in samim-fonts = callPackage ../data/fonts/samim-fonts {}; - saml2aws = callPackage ../tools/security/saml2aws { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation IOKit; - }; + saml2aws = callPackage ../tools/security/saml2aws {}; samplicator = callPackage ../tools/networking/samplicator { }; @@ -6718,6 +6638,8 @@ in soundkonverter = kdeApplications.callPackage ../applications/audio/soundkonverter {}; + sozu = callPackage ../servers/sozu { }; + sparsehash = callPackage ../development/libraries/sparsehash { }; spectre-meltdown-checker = callPackage ../tools/security/spectre-meltdown-checker { }; @@ -6979,6 +6901,8 @@ in thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; + thinkpad-scripts = python3.pkgs.callPackage ../tools/misc/thinkpad-scripts { }; + tiled = libsForQt5.callPackage ../applications/editors/tiled { }; tiledb = callPackage ../development/libraries/tiledb { }; @@ -7153,6 +7077,8 @@ in ttylog = callPackage ../tools/misc/ttylog { }; + ipbt = callPackage ../tools/misc/ipbt { }; + tuir = callPackage ../applications/misc/tuir { }; turses = callPackage ../applications/networking/instant-messengers/turses { }; @@ -7177,10 +7103,6 @@ in ua = callPackage ../tools/networking/ua { }; - uberwriter = callPackage ../applications/editors/uberwriter { - pythonPackages = python3Packages; - }; - ubridge = callPackage ../tools/networking/ubridge { }; ucl = callPackage ../development/libraries/ucl { }; @@ -7776,9 +7698,7 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; - yggdrasil = callPackage ../tools/networking/yggdrasil { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + yggdrasil = callPackage ../tools/networking/yggdrasil { }; # To expose more packages for Yi, override the extraPackages arg. yi = callPackage ../applications/editors/yi/wrapper.nix { }; @@ -7797,6 +7717,10 @@ in zdelta = callPackage ../tools/compression/zdelta { }; + zenith = callPackage ../tools/system/zenith { + inherit (darwin.apple_sdk.frameworks) IOKit; + }; + zerotierone = callPackage ../tools/networking/zerotierone { }; zerofree = callPackage ../tools/filesystems/zerofree { }; @@ -7825,20 +7749,22 @@ in zpaq = callPackage ../tools/archivers/zpaq { }; zpaqd = callPackage ../tools/archivers/zpaq/zpaqd.nix { }; + zplug = callPackage ../shells/zsh/zplug { }; + zsh-autoenv = callPackage ../tools/misc/zsh-autoenv { }; zsh-bd = callPackage ../shells/zsh/zsh-bd { }; zsh-git-prompt = callPackage ../shells/zsh/zsh-git-prompt { }; - zsh-history = callPackage ../shells/zsh/zsh-history { - inherit (darwin.apple_sdk.frameworks) Security; - }; + zsh-history = callPackage ../shells/zsh/zsh-history { }; zsh-history-substring-search = callPackage ../shells/zsh/zsh-history-substring-search { }; zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; + zsh-nix-shell = callPackage ../shells/zsh/zsh-nix-shell { }; + zsh-syntax-highlighting = callPackage ../shells/zsh/zsh-syntax-highlighting { }; zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; @@ -8149,9 +8075,7 @@ in scry = callPackage ../development/tools/scry {}; - dbmate = callPackage ../development/tools/database/dbmate { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dbmate = callPackage ../development/tools/database/dbmate { }; devpi-client = python3Packages.callPackage ../development/tools/devpi-client {}; @@ -8179,9 +8103,11 @@ in }; fasm-bin = callPackage ../development/compilers/fasm/bin.nix { }; - flyctl = callPackage ../development/web/flyctl { - inherit (darwin.apple_sdk.frameworks) Security; - }; + flyctl = callPackage ../development/web/flyctl { }; + + flutterPackages = + recurseIntoAttrs (callPackage ../development/compilers/flutter { }); + flutter = flutterPackages.stable; fpc = callPackage ../development/compilers/fpc { }; @@ -8485,8 +8411,7 @@ in purescript = callPackage ../development/compilers/purescript/purescript { }; - psc-package = haskell.lib.justStaticExecutables - (haskellPackages.callPackage ../development/compilers/purescript/psc-package { }); + psc-package = callPackage ../development/compilers/purescript/psc-package { }; purescript-psa = nodePackages.purescript-psa; @@ -8942,6 +8867,8 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; + acme = callPackage ../development/compilers/acme { }; + nasm = callPackage ../development/compilers/nasm { }; nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; @@ -9002,13 +8929,13 @@ in inherit (darwin) apple_sdk; }; - rust_1_41_0 = callPackage ../development/compilers/rust/1_41_0.nix { + rust_1_42 = callPackage ../development/compilers/rust/1_42.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; }; - rust = rust_1_41_0; + rust = rust_1_42; - rustPackages_1_41_0 = rust_1_41_0.packages.stable; - rustPackages = rustPackages_1_41_0; + rustPackages_1_42 = rust_1_42.packages.stable; + rustPackages = rustPackages_1_42; inherit (rustPackages) cargo clippy rustc rustPlatform; inherit (rust) makeRustPlatform; @@ -9202,6 +9129,7 @@ in vala_0_40 vala_0_44 vala_0_46 + vala_0_48 vala; wcc = callPackage ../development/compilers/wcc { }; @@ -9274,6 +9202,8 @@ in angelscript_2_22 = callPackage ../development/interpreters/angelscript/2.22.nix {}; + babashka = callPackage ../development/interpreters/clojure/babashka.nix { }; + chibi = callPackage ../development/interpreters/chibi { }; ceptre = callPackage ../development/interpreters/ceptre { }; @@ -9352,9 +9282,7 @@ in jmeter = callPackage ../applications/networking/jmeter {}; - joker = callPackage ../development/interpreters/joker { - inherit (darwin.apple_sdk.frameworks) Security; - }; + joker = callPackage ../development/interpreters/joker {}; davmail = callPackage ../applications/networking/davmail {}; @@ -9468,86 +9396,20 @@ in pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; php = php74; - phpPackages = php74Packages; - - php72Packages = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php72; - }); - - php73Packages = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php73; - }); - php74Packages = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php74; - }); - - phpPackages-unit = php74Packages-unit; - - php72Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php72-unit; - }); + phpPackages = php74Packages; + php72Packages = recurseIntoAttrs php72.packages; + php73Packages = recurseIntoAttrs php73.packages; + php74Packages = recurseIntoAttrs php74.packages; - php73Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php73-unit; - }); - - php74Packages-unit = recurseIntoAttrs (callPackage ./php-packages.nix { - php = php74-unit; - }); + phpExtensions = php74Extensions; + php72Extensions = recurseIntoAttrs php72.extensions; + php73Extensions = recurseIntoAttrs php73.extensions; + php74Extensions = recurseIntoAttrs php74.extensions; inherit (callPackages ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) - php74 - php73 - php72; - - php-embed = php74-embed; - - php72-embed = php72.override { - config.php.embed = true; - config.php.apxs2 = false; - }; - - php73-embed = php73.override { - config.php.embed = true; - config.php.apxs2 = false; - }; - - php74-embed = php74.override { - config.php.embed = true; - config.php.apxs2 = false; - }; - - php-unit = php74-unit; - - php72-unit = php72.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; - }; - - php73-unit = php73.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; - }; - - php74-unit = php74.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; - }; + }) php74 php73 php72 php74base php73base php72base; picoc = callPackage ../development/interpreters/picoc {}; @@ -9638,6 +9500,7 @@ in pipenv = callPackage ../development/tools/pipenv {}; pipewire = callPackage ../development/libraries/pipewire {}; + pipewire_0_2 = callPackage ../development/libraries/pipewire/2.nix {}; pyradio = callPackage ../applications/radio/pyradio {}; @@ -9735,6 +9598,7 @@ in stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); spidermonkey_60 = callPackage ../development/interpreters/spidermonkey/60.nix { }; + spidermonkey_68 = callPackage ../development/interpreters/spidermonkey/68.nix { }; spidermonkey = spidermonkey_38; ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; @@ -9962,7 +9826,11 @@ in bam = callPackage ../development/tools/build-managers/bam {}; - bazel = callPackage ../development/tools/build-managers/bazel/bazel-latest { + bazel = bazel_2; + + bazel_0 = bazel_0_26; + + bazel_0_26 = callPackage ../development/tools/build-managers/bazel/bazel_0_26 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk8; @@ -9971,13 +9839,14 @@ in stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }; - bazel_0 = callPackage ../development/tools/build-managers/bazel/bazel_0 { + bazel_0_29 = callPackage ../development/tools/build-managers/bazel/bazel_0_29 { inherit (darwin) cctools; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; buildJdk = jdk8; buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + bazel_self = bazel_0_29; }; bazel_1 = callPackage ../development/tools/build-managers/bazel/bazel_1 { @@ -9987,6 +9856,17 @@ in buildJdkName = "jdk8"; runJdk = jdk11_headless; stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + bazel_self = bazel_1; + }; + + bazel_2 = callPackage ../development/tools/build-managers/bazel/bazel_2 { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; + buildJdk = jdk8; + buildJdkName = "jdk8"; + runJdk = jdk11_headless; + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + bazel_self = bazel_2; }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; @@ -10000,9 +9880,9 @@ in go = go_1_12; }; - bazelisk = callPackage ../development/tools/bazelisk { - inherit (darwin.apple_sdk.frameworks) Security; - }; + bazel-gazelle = callPackage ../development/tools/bazel-gazelle { }; + + bazelisk = callPackage ../development/tools/bazelisk { }; buildBazelPackage = callPackage ../build-support/build-bazel-package { }; @@ -10270,9 +10150,7 @@ in binutils = binutils; }; - dive = callPackage ../development/tools/dive { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dive = callPackage ../development/tools/dive { }; doclifter = callPackage ../development/tools/misc/doclifter { }; @@ -10282,9 +10160,7 @@ in doit = callPackage ../development/tools/build-managers/doit { }; - dolt = callPackage ../servers/sql/dolt { - inherit (darwin.apple_sdk.frameworks) Security; - }; + dolt = callPackage ../servers/sql/dolt { }; dot2tex = pythonPackages.dot2tex; @@ -10303,9 +10179,7 @@ in drush = callPackage ../development/tools/misc/drush { }; - editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { - inherit (darwin.apple_sdk.frameworks) Security; - }; + editorconfig-checker = callPackage ../development/tools/misc/editorconfig-checker { }; editorconfig-core-c = callPackage ../development/tools/misc/editorconfig-core-c { }; @@ -10346,9 +10220,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fly = callPackage ../development/tools/continuous-integration/fly { - inherit (darwin.apple_sdk.frameworks) Security; - }; + fly = callPackage ../development/tools/continuous-integration/fly { }; foreman = callPackage ../tools/system/foreman { }; goreman = callPackage ../tools/system/goreman { }; @@ -10357,9 +10229,7 @@ in frame = callPackage ../development/libraries/frame { }; - frp = callPackage ../tools/networking/frp { - inherit (darwin.apple_sdk.frameworks) Security; - }; + frp = callPackage ../tools/networking/frp { }; fsatrace = callPackage ../development/tools/misc/fsatrace { }; @@ -10428,9 +10298,7 @@ in gocd-server = callPackage ../development/tools/continuous-integration/gocd-server { }; - gotify-server = callPackage ../servers/gotify { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gotify-server = callPackage ../servers/gotify { }; gotty = callPackage ../servers/gotty { }; @@ -10474,9 +10342,7 @@ in halfempty = callPackage ../development/tools/halfempty {}; - hcloud = callPackage ../development/tools/hcloud { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hcloud = callPackage ../development/tools/hcloud { }; help2man = callPackage ../development/tools/misc/help2man { }; @@ -10558,17 +10424,13 @@ in kube-prompt = callPackage ../development/tools/kube-prompt { }; - kubeprompt = callPackage ../development/tools/kubeprompt { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubeprompt = callPackage ../development/tools/kubeprompt { }; kubicorn = callPackage ../development/tools/kubicorn { }; kubie = callPackage ../development/tools/kubie { }; - kustomize = callPackage ../development/tools/kustomize { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kustomize = callPackage ../development/tools/kustomize { }; ktlint = callPackage ../development/tools/ktlint { }; @@ -10625,18 +10487,14 @@ in mdl = callPackage ../development/tools/misc/mdl { }; - minify = callPackage ../development/web/minify { - inherit (darwin.apple_sdk.frameworks) Security; - }; + minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; mk = callPackage ../development/tools/build-managers/mk { }; - mkcert = callPackage ../development/tools/misc/mkcert { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mkcert = callPackage ../development/tools/misc/mkcert { }; mkdocs = callPackage ../development/tools/documentation/mkdocs { }; @@ -10774,6 +10632,8 @@ in qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; + qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; + r10k = callPackage ../tools/system/r10k { }; inherit (callPackages ../development/tools/analysis/radare2 ({ @@ -10816,9 +10676,7 @@ in withPEPatterns = true; }; - reviewdog = callPackage ../development/tools/misc/reviewdog { - inherit (darwin.apple_sdk.frameworks) Security; - }; + reviewdog = callPackage ../development/tools/misc/reviewdog { }; rman = callPackage ../development/tools/misc/rman { }; @@ -10960,9 +10818,7 @@ in teensy-loader-cli = callPackage ../development/tools/misc/teensy-loader-cli { }; - terracognita = callPackage ../development/tools/misc/terracognita { - inherit (darwin.apple_sdk.frameworks) Security; - }; + terracognita = callPackage ../development/tools/misc/terracognita { }; terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; @@ -10983,15 +10839,11 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - tflint = callPackage ../development/tools/analysis/tflint { - inherit (darwin.apple_sdk.frameworks) Security; - }; + tflint = callPackage ../development/tools/analysis/tflint { }; tfsec = callPackage ../development/tools/analysis/tfsec { }; - todoist = callPackage ../applications/misc/todoist { - inherit (darwin.apple_sdk.frameworks) Security; - }; + todoist = callPackage ../applications/misc/todoist { }; todoist-electron = callPackage ../applications/misc/todoist-electron { }; @@ -11272,7 +11124,8 @@ in boost16x = boost169; boost170 = callPackage ../development/libraries/boost/1.70.nix { }; boost171 = callPackage ../development/libraries/boost/1.71.nix { }; - boost17x = boost171; + boost172 = callPackage ../development/libraries/boost/1.72.nix { }; + boost17x = boost172; boost = boost16x; boost_process = callPackage ../development/libraries/boost-process { }; @@ -11331,7 +11184,7 @@ in ogre = ogre1_10; }; - certbot = callPackage ../tools/admin/certbot { }; + certbot = python3Packages.callPackage ../tools/admin/certbot { }; caf = callPackage ../development/libraries/caf {}; @@ -12254,7 +12107,13 @@ in hwloc = callPackage ../development/libraries/hwloc {}; - hydra = callPackage ../development/tools/misc/hydra { }; + inherit (callPackage ../development/tools/misc/hydra { }) + hydra-migration hydra-unstable; + + hydra-flakes = throw '' + Flakes support has been merged into Hydra's master. Please use + `pkgs.hydra-unstable` now. + ''; hydra-cli = callPackage ../development/tools/misc/hydra-cli { }; @@ -12457,9 +12316,7 @@ in ldacbt = callPackage ../development/libraries/ldacbt { }; - ldb = callPackage ../development/libraries/ldb { - python = python2; - }; + ldb = callPackage ../development/libraries/ldb { }; lensfun = callPackage ../development/libraries/lensfun {}; @@ -12550,7 +12407,9 @@ in libblocksruntime = callPackage ../development/libraries/libblocksruntime { }; - libbluray = callPackage ../development/libraries/libbluray { }; + libbluray = callPackage ../development/libraries/libbluray { + inherit (darwin.apple_sdk.frameworks) DiskArbitration; + }; libbs2b = callPackage ../development/libraries/audio/libbs2b { }; @@ -13122,6 +12981,8 @@ in malcontent = callPackage ../development/libraries/malcontent { }; + malcontent-ui = callPackage ../development/libraries/malcontent/ui.nix { }; + libmanette = callPackage ../development/libraries/libmanette { }; libmatchbox = callPackage ../development/libraries/libmatchbox { }; @@ -13457,6 +13318,7 @@ in libversion = callPackage ../development/libraries/libversion { }; libvirt = callPackage ../development/libraries/libvirt { }; + libvirt_5_9_0 = callPackage ../development/libraries/libvirt/5.9.0.nix { }; libvirt-glib = callPackage ../development/libraries/libvirt-glib { }; @@ -13471,6 +13333,7 @@ in libviper = callPackage ../development/libraries/libviper { }; libvpx = callPackage ../development/libraries/libvpx { }; + libvpx_1_8 = callPackage ../development/libraries/libvpx/1_8.nix { }; libvterm = callPackage ../development/libraries/libvterm { }; libvterm-neovim = callPackage ../development/libraries/libvterm-neovim { }; @@ -13588,8 +13451,6 @@ in live555 = callPackage ../development/libraries/live555 { }; - loadcaffe = callPackage ../development/libraries/loadcaffe {}; - log4cpp = callPackage ../development/libraries/log4cpp { }; log4cxx = callPackage ../development/libraries/log4cxx { }; @@ -13829,10 +13690,7 @@ in nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; - ocl-icd-oclhGen = oclh: callPackage ../development/libraries/ocl-icd { opencl-headers = oclh; }; - ocl-icd-oclh_1_2 = ocl-icd-oclhGen opencl-headers_1_2; - ocl-icd-oclh_2_2 = ocl-icd-oclhGen opencl-headers_2_2; - ocl-icd = ocl-icd-oclh_2_2; + ocl-icd = callPackage ../development/libraries/ocl-icd { }; ode = callPackage ../development/libraries/ode { }; @@ -13864,10 +13722,7 @@ in opencascade = callPackage ../development/libraries/opencascade { }; opencascade-occt = callPackage ../development/libraries/opencascade-occt { }; - opencl-headersGen = v: callPackage ../development/libraries/opencl-headers { version = v; }; - opencl-headers_1_2 = opencl-headersGen "12"; - opencl-headers_2_2 = opencl-headersGen "22"; - opencl-headers = opencl-headers_2_2; + opencl-headers = callPackage ../development/libraries/opencl-headers { }; opencl-clhpp = callPackage ../development/libraries/opencl-clhpp { }; @@ -14037,7 +13892,7 @@ in portaudio2014 = portaudio.overrideAttrs (oldAttrs: { src = fetchurl { - url = http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz; + url = "http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz"; sha256 = "0mwddk4qzybaf85wqfhxqlf0c5im9il8z03rd4n127k8y2jj9q4g"; }; }); @@ -14402,9 +14257,7 @@ in rttr = callPackage ../development/libraries/rttr { }; - rubberband = callPackage ../development/libraries/rubberband { - inherit (vamp) vampSDK; - }; + rubberband = callPackage ../development/libraries/rubberband { }; sad = callPackage ../applications/science/logic/sad { }; @@ -14749,9 +14602,7 @@ in tclx = callPackage ../development/libraries/tclx { }; - ntdb = callPackage ../development/libraries/ntdb { - python = python2; - }; + ntdb = callPackage ../development/libraries/ntdb { }; tdb = callPackage ../development/libraries/tdb {}; @@ -14773,9 +14624,7 @@ in termbox = callPackage ../development/libraries/termbox { }; - tevent = callPackage ../development/libraries/tevent { - python = python2; - }; + tevent = callPackage ../development/libraries/tevent { }; tet = callPackage ../development/tools/misc/tet { }; @@ -14824,12 +14673,6 @@ in tokyotyrant = callPackage ../development/libraries/tokyo-tyrant { }; - torch = callPackage ../development/libraries/torch { - openblas = openblasCompat; - }; - - torch-hdf5 = callPackage ../development/libraries/torch-hdf5 {}; - totem-pl-parser = callPackage ../development/libraries/totem-pl-parser { }; tpm2-tss = callPackage ../development/libraries/tpm2-tss { }; @@ -14905,7 +14748,7 @@ in vale = callPackage ../tools/text/vale { }; - vamp = callPackage ../development/libraries/audio/vamp { }; + vamp-plugin-sdk = callPackage ../development/libraries/audio/vamp-plugin-sdk { }; vc = callPackage ../development/libraries/vc { }; @@ -15624,7 +15467,6 @@ in gobetween = callPackage ../servers/gobetween { buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; h2o = callPackage ../servers/http/h2o { }; @@ -15654,9 +15496,7 @@ in theme-spring = callPackage ../servers/icingaweb2/theme-spring { }; }; - imgproxy = callPackage ../servers/imgproxy { - inherit (darwin.apple_sdk.frameworks) Security; - }; + imgproxy = callPackage ../servers/imgproxy { }; ircdHybrid = callPackage ../servers/irc/ircd-hybrid { }; @@ -15695,9 +15535,7 @@ in mattermost = callPackage ../servers/mattermost { }; matterircd = callPackage ../servers/mattermost/matterircd.nix { }; - matterbridge = callPackage ../servers/matterbridge { - inherit (darwin.apple_sdk.frameworks) Security; - }; + matterbridge = callPackage ../servers/matterbridge { }; mattermost-desktop = callPackage ../applications/networking/instant-messengers/mattermost-desktop { }; @@ -15711,9 +15549,7 @@ in micronaut = callPackage ../development/tools/micronaut {}; - minio = callPackage ../servers/minio { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; - }; + minio = callPackage ../servers/minio { }; # Backwards compatibility. mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd; @@ -15762,10 +15598,7 @@ in neard = callPackage ../servers/neard { }; - unit = callPackage ../servers/http/unit { - php72 = php72-unit; - php73 = php73-unit; - }; + unit = callPackage ../servers/http/unit { }; nginx = nginxStable; @@ -15877,7 +15710,9 @@ in libpulseaudio = libpulseaudio-vanilla; - pulseeffects = callPackage ../applications/audio/pulseeffects { }; + pulseeffects = callPackage ../applications/audio/pulseeffects { + boost = boost172; + }; tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; @@ -15898,7 +15733,7 @@ in mariadb = callPackage ../servers/sql/mariadb { # As per mariadb's cmake, "static jemalloc_pic.a can only be used up to jemalloc 4". # https://jira.mariadb.org/browse/MDEV-15034 - jemalloc = jemalloc450.override ({ disableInitExecTls = true; }); + jemalloc450 = jemalloc450.override ({ disableInitExecTls = true; }); inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; }; @@ -16058,9 +15893,7 @@ in prometheus-collectd-exporter = callPackage ../servers/monitoring/prometheus/collectd-exporter.nix { }; prometheus-cups-exporter = callPackage ../servers/monitoring/prometheus/cups-exporter.nix { }; prometheus-consul-exporter = callPackage ../servers/monitoring/prometheus/consul-exporter.nix { }; - prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + prometheus-dnsmasq-exporter = callPackage ../servers/monitoring/prometheus/dnsmasq-exporter.nix { }; prometheus-dovecot-exporter = callPackage ../servers/monitoring/prometheus/dovecot-exporter.nix { }; prometheus-fritzbox-exporter = callPackage ../servers/monitoring/prometheus/fritzbox-exporter.nix { }; prometheus-gitlab-ci-pipelines-exporter = callPackage ../servers/monitoring/prometheus/gitlab-ci-pipelines-exporter.nix { }; @@ -16068,9 +15901,7 @@ in prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; - prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + prometheus-mikrotik-exporter = callPackage ../servers/monitoring/prometheus/mikrotik-exporter.nix { }; prometheus-minio-exporter = callPackage ../servers/monitoring/prometheus/minio-exporter { }; prometheus-mysqld-exporter = callPackage ../servers/monitoring/prometheus/mysqld-exporter.nix { }; prometheus-nextcloud-exporter = callPackage ../servers/monitoring/prometheus/nextcloud-exporter.nix { }; @@ -16092,7 +15923,6 @@ in # Version 1.5.1 fails to build with go 1.13 due to test failure # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { @@ -16209,9 +16039,7 @@ in sensu = callPackage ../servers/monitoring/sensu { }; - inherit (callPackages ../servers/monitoring/sensu-go { - inherit (darwin.apple_sdk.frameworks) Security; - }) + inherit (callPackages ../servers/monitoring/sensu-go { }) sensu-go-agent sensu-go-backend sensu-go-cli; @@ -16259,9 +16087,7 @@ in tailscale = callPackage ../servers/tailscale { }; - thanos = callPackage ../servers/monitoring/thanos { - inherit (darwin.apple_sdk.frameworks) Security; - }; + thanos = callPackage ../servers/monitoring/thanos { }; inherit (callPackages ../servers/http/tomcat { }) tomcat7 @@ -16286,9 +16112,7 @@ in shaarli-material = callPackage ../servers/web-apps/shaarli/material-theme.nix { }; - shiori = callPackage ../servers/web-apps/shiori { - inherit (darwin.apple_sdk.frameworks) Security; - }; + shiori = callPackage ../servers/web-apps/shiori { }; inherit (callPackages ../servers/web-apps/matomo {}) matomo @@ -16301,9 +16125,7 @@ in unifiStable; unifi = unifiStable; - victoriametrics = callPackage ../servers/nosql/victoriametrics { - inherit (darwin.apple_sdk.frameworks) Security; - }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { }; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; @@ -16504,13 +16326,9 @@ in conntrack-tools = callPackage ../os-specific/linux/conntrack-tools { }; - coredns = callPackage ../servers/dns/coredns { - inherit (darwin.apple_sdk.frameworks) Security; - }; + coredns = callPackage ../servers/dns/coredns { }; - corerad = callPackage ../tools/networking/corerad { - inherit (darwin.apple_sdk.frameworks) Security; - }; + corerad = callPackage ../tools/networking/corerad { }; cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; @@ -16581,7 +16399,9 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = callPackage ../os-specific/linux/ffado { }; + ffado = libsForQt5.callPackage ../os-specific/linux/ffado { + inherit (pkgs.linuxPackages) kernel; + }; libffado = ffado; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -16609,6 +16429,8 @@ in gmailieer = callPackage ../applications/networking/gmailieer {}; + gmailctl = callPackage ../applications/networking/gmailctl {}; + gpm = callPackage ../servers/gpm { ncurses = null; # Keep curses disabled for lack of value }; @@ -16862,6 +16684,14 @@ in ]; }; + linux_5_6 = callPackage ../os-specific/linux/kernel/linux-5.6.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17056,7 +16886,7 @@ in zenpower = callPackage ../os-specific/linux/zenpower { }; - inherit (callPackage ../os-specific/linux/zfs { + inherit (callPackages ../os-specific/linux/zfs { configFile = "kernel"; inherit kernel; }) zfsStable zfsUnstable; @@ -17071,7 +16901,7 @@ in linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = linuxPackages_5_5; + linuxPackages_latest = linuxPackages_5_6; linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. @@ -17087,6 +16917,7 @@ in linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_5 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_5); + linuxPackages_5_6 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_6); # When adding to this list: # - Update linuxPackages_latest to the latest version @@ -17323,9 +17154,7 @@ in golint = callPackage ../development/tools/golint { }; - golangci-lint = callPackage ../development/tools/golangci-lint { - inherit (darwin.apple_sdk.frameworks) Security; - }; + golangci-lint = callPackage ../development/tools/golangci-lint { }; gocyclo = callPackage ../development/tools/gocyclo { }; @@ -17339,9 +17168,7 @@ in govendor = callPackage ../development/tools/govendor { }; - go-tools = callPackage ../development/tools/go-tools { - inherit (darwin.apple_sdk.frameworks) Security; - }; + go-tools = callPackage ../development/tools/go-tools { }; gotools = callPackage ../development/tools/gotools { inherit (darwin.apple_sdk.frameworks) Security; @@ -17452,9 +17279,7 @@ in procdump = callPackage ../os-specific/linux/procdump { }; - prototool = callPackage ../development/tools/prototool { - inherit (darwin.apple_sdk.frameworks) Security; - }; + prototool = callPackage ../development/tools/prototool { }; qemu_kvm = lowPrio (qemu.override { hostCpuOnly = true; }); @@ -17531,10 +17356,7 @@ in smem = callPackage ../os-specific/linux/smem { }; - smimesign = callPackage ../os-specific/darwin/smimesign { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Security; - }; + smimesign = callPackage ../os-specific/darwin/smimesign { }; speedometer = callPackage ../os-specific/linux/speedometer { }; @@ -17704,7 +17526,7 @@ in zenmonitor = callPackage ../os-specific/linux/zenmonitor { }; - inherit (callPackage ../os-specific/linux/zfs { + inherit (callPackages ../os-specific/linux/zfs { configFile = "user"; }) zfsStable zfsUnstable; @@ -17870,9 +17692,7 @@ in documentation-highlighter = callPackage ../misc/documentation-highlighter { }; - documize-community = callPackage ../servers/documize-community { - inherit (darwin.apple_sdk.frameworks) Security; - }; + documize-community = callPackage ../servers/documize-community { }; doge = callPackage ../misc/doge { }; @@ -17948,6 +17768,8 @@ in freepats = callPackage ../data/misc/freepats { }; + g15daemon = callPackage ../os-specific/linux/g15daemon {}; + gentium = callPackage ../data/fonts/gentium {}; gentium-book-basic = callPackage ../data/fonts/gentium-book-basic {}; @@ -17963,6 +17785,8 @@ in gnome-breeze = callPackage ../data/themes/gnome-breeze { }; + gnome-icon-theme = callPackage ../data/icons/gnome-icon-theme { }; + go-font = callPackage ../data/fonts/go-font { }; greybird = callPackage ../data/themes/greybird { }; @@ -17975,9 +17799,7 @@ in helvetica-neue-lt-std = callPackage ../data/fonts/helvetica-neue-lt-std { }; - hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hetzner-kube = callPackage ../applications/networking/cluster/hetzner-kube { }; hicolor-icon-theme = callPackage ../data/icons/hicolor-icon-theme { }; @@ -17991,13 +17813,17 @@ in ibm-plex = callPackage ../data/fonts/ibm-plex { }; + iconpack-jade = callPackage ../data/icons/iconpack-jade { }; + iconpack-obsidian = callPackage ../data/icons/iconpack-obsidian { }; inconsolata = callPackage ../data/fonts/inconsolata {}; inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; - inconsolata-nerdfont = callPackage ../data/fonts/inconsolata-nerdfont {}; + inconsolata-nerdfont = nerdfonts.override { + fonts = [ "Inconsolata" ]; + }; input-fonts = callPackage ../data/fonts/input-fonts { }; @@ -18401,7 +18227,9 @@ in terminus_font_ttf = callPackage ../data/fonts/terminus-font-ttf { }; - terminus-nerdfont = callPackage ../data/fonts/terminus-nerdfont { }; + terminus-nerdfont = nerdfonts.override { + fonts = [ "Terminus" ]; + }; termtekst = callPackage ../misc/emulators/termtekst { }; @@ -18515,7 +18343,7 @@ in aacgain = callPackage ../applications/audio/aacgain { }; abcde = callPackage ../applications/audio/abcde { - inherit (pythonPackages) eyeD3; + inherit (python3Packages) eyeD3; }; abiword = callPackage ../applications/office/abiword { }; @@ -18595,22 +18423,21 @@ in appeditor = callPackage ../applications/misc/appeditor { }; + apostrophe = callPackage ../applications/editors/apostrophe { + pythonPackages = python3Packages; + }; + aqemu = libsForQt5.callPackage ../applications/virtualization/aqemu { }; ardour = callPackage ../applications/audio/ardour { inherit (gnome2) libgnomecanvas libgnomecanvasmm; - inherit (vamp) vampSDK; }; arelle = with python3Packages; toPythonApplication arelle; - argo = callPackage ../applications/networking/cluster/argo { - inherit (darwin.apple_sdk.frameworks) Security; - }; + argo = callPackage ../applications/networking/cluster/argo { }; - argocd = callPackage ../applications/networking/cluster/argocd { - inherit (darwin.apple_sdk.frameworks) Security; - }; + argocd = callPackage ../applications/networking/cluster/argocd { }; ario = callPackage ../applications/audio/ario { }; @@ -18654,6 +18481,8 @@ in cadence = qt5.callPackage ../applications/audio/cadence { }; + cheesecutter = callPackage ../applications/audio/cheesecutter { }; + milkytracker = callPackage ../applications/audio/milkytracker { }; schismtracker = callPackage ../applications/audio/schismtracker { }; @@ -18723,11 +18552,6 @@ in bb = callPackage ../applications/misc/bb { }; - beast = callPackage ../applications/audio/beast { - inherit (gnome2) libgnomecanvas libart_lgpl; - guile = guile_1_8; - }; - bevelbar = callPackage ../applications/window-managers/bevelbar { }; bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; @@ -18771,6 +18595,8 @@ in bgpdump = callPackage ../tools/networking/bgpdump { }; + bgpq3 = callPackage ../tools/networking/bgpq3 { }; + blackbox = callPackage ../applications/version-management/blackbox { }; bleachbit = callPackage ../applications/misc/bleachbit { }; @@ -18785,11 +18611,7 @@ in bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; - bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { - gconf = pkgs.gnome2.GConf; - inherit (pkgs.xorg) libX11 libXrender libXtst libXdamage - libXi libXext libXfixes libXcomposite; - }; + bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; blugon = callPackage ../applications/misc/blugon { }; @@ -19006,9 +18828,7 @@ in csdp = callPackage ../applications/science/math/csdp { }; - ctop = callPackage ../tools/system/ctop { - inherit (darwin.apple_sdk.frameworks) Security; - }; + ctop = callPackage ../tools/system/ctop { }; cubicsdr = callPackage ../applications/radio/cubicsdr { wxGTK = wxGTK31; }; @@ -19034,7 +18854,7 @@ in dablin = callPackage ../applications/radio/dablin { }; - darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc865.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); @@ -19200,9 +19020,7 @@ in eaglemode = callPackage ../applications/misc/eaglemode { }; - echoip = callPackage ../servers/echoip { - inherit (darwin.apple_sdk.frameworks) Security; - }; + echoip = callPackage ../servers/echoip { }; eclipses = recurseIntoAttrs (callPackage ../applications/editors/eclipse { jdk = jdk11; @@ -19354,9 +19172,7 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - exercism = callPackage ../applications/misc/exercism { - inherit (darwin.apple_sdk.frameworks) Security; - }; + exercism = callPackage ../applications/misc/exercism { }; go-motion = callPackage ../development/tools/go-motion { }; @@ -19468,9 +19284,7 @@ in geany = callPackage ../applications/editors/geany { }; geany-with-vte = callPackage ../applications/editors/geany/with-vte.nix { }; - geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; + geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; @@ -19511,9 +19325,7 @@ in inherit (darwin) libiconv; }; - gomuks = callPackage ../applications/networking/instant-messengers/gomuks { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gomuks = callPackage ../applications/networking/instant-messengers/gomuks { }; inherit (ocamlPackages) google-drive-ocamlfuse; @@ -19603,9 +19415,7 @@ in sngrep = callPackage ../applications/networking/sniffers/sngrep {}; - termshark = callPackage ../tools/networking/termshark { - inherit (darwin.apple_sdk.frameworks) Security; - }; + termshark = callPackage ../tools/networking/termshark { }; fbida = callPackage ../applications/graphics/fbida { }; @@ -19836,9 +19646,7 @@ in inherit (darwin) IOKit; }; - glow = callPackage ../applications/editors/glow { - inherit (darwin.apple_sdk.frameworks) Security; - }; + glow = callPackage ../applications/editors/glow { }; glowing-bear = callPackage ../applications/networking/irc/glowing-bear { }; @@ -20018,15 +19826,11 @@ in wxGTK = wxGTK30; }; - hugo = callPackage ../applications/misc/hugo { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hugo = callPackage ../applications/misc/hugo { }; hydrogen = callPackage ../applications/audio/hydrogen { }; - hydroxide = callPackage ../applications/networking/hydroxide { - inherit (darwin.apple_sdk.frameworks) Security; - }; + hydroxide = callPackage ../applications/networking/hydroxide { }; hyper = callPackage ../applications/misc/hyper { }; @@ -20046,7 +19850,9 @@ in hyperledger-fabric = callPackage ../tools/misc/hyperledger-fabric { }; - jackline = callPackage ../applications/networking/instant-messengers/jackline { }; + jackline = callPackage ../applications/networking/instant-messengers/jackline { + ocamlPackages = ocaml-ng.ocamlPackages_4_08; + }; leftwm = callPackage ../applications/window-managers/leftwm { }; @@ -20060,8 +19866,6 @@ in }); slack = callPackage ../applications/networking/instant-messengers/slack { }; - slack-theme-black = callPackage ../applications/networking/instant-messengers/slack/dark-theme.nix { }; - slack-dark = pkgs.slack.override { theme = slack-theme-black; }; slack-cli = callPackage ../tools/networking/slack-cli { }; @@ -20095,6 +19899,8 @@ in swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { }; + swaylock-effects = callPackage ../applications/window-managers/sway/lock-effects.nix { }; + waybar = callPackage ../applications/misc/waybar { pulseSupport = config.pulseaudio or false; }; @@ -20319,6 +20125,8 @@ in boost = boost155.override { enablePython = true; }; }; + k3s = callPackage ../applications/networking/cluster/k3s {}; + k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; kail = callPackage ../tools/networking/kail { }; @@ -20338,7 +20146,7 @@ in recurseIntoAttrs (makeOverridable mkApplications attrs); inherit (kdeApplications) - akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b + akonadi akregator ark dolphin dragon elisa ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog keditbookmarks kfind kget kgpg khelpcenter kig kleopatra kmail kmix kmplot kolourpaint kompare konsole yakuake kpkpass kitinerary kontact korganizer krdc krfb ksystemlog ktouch kwalletmanager marble minuet okular spectacle; @@ -20368,9 +20176,7 @@ in kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; - kepubify = callPackage ../tools/misc/kepubify { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kepubify = callPackage ../tools/misc/kepubify { }; kermit = callPackage ../tools/misc/kermit { }; @@ -20404,6 +20210,8 @@ in kiwix = callPackage ../applications/misc/kiwix { }; + klayout = libsForQt5.callPackage ../applications/misc/klayout { }; + kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { @@ -20413,6 +20221,8 @@ in kodestudio = callPackage ../applications/editors/kodestudio { }; + kondo = callPackage ../applications/misc/kondo { }; + konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; kotatogram-desktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; @@ -20431,9 +20241,7 @@ in kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; - kubeval = callPackage ../applications/networking/cluster/kubeval { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubeval = callPackage ../applications/networking/cluster/kubeval { }; kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; @@ -20441,29 +20249,19 @@ in go = buildPackages.go_1_13; }; - kubeseal = callPackage ../applications/networking/cluster/kubeseal { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubeless = callPackage ../applications/networking/cluster/kubeless { }; - k9s = callPackage ../applications/networking/cluster/k9s { - inherit (darwin.apple_sdk.frameworks) Security; - }; + k9s = callPackage ../applications/networking/cluster/k9s { }; - fluxctl = callPackage ../applications/networking/cluster/fluxctl { - inherit (darwin.apple_sdk.frameworks) Security; - }; + fluxctl = callPackage ../applications/networking/cluster/fluxctl { }; - linkerd = callPackage ../applications/networking/cluster/linkerd { - inherit (darwin.apple_sdk.frameworks) Security; - }; + linkerd = callPackage ../applications/networking/cluster/linkerd { }; - kubernetes-helm = callPackage ../applications/networking/cluster/helm { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kubernetes-helm = callPackage ../applications/networking/cluster/helm { }; kubetail = callPackage ../applications/networking/cluster/kubetail { } ; @@ -20503,7 +20301,9 @@ in lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { }; - leo-editor = callPackage ../applications/editors/leo-editor { }; + legit = gitAndTools.legit; + + leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; @@ -20514,7 +20314,6 @@ in libreoffice-args = { inherit (perlPackages) ArchiveZip IOCompress; - inherit (gnome2) GConf ORBit2 gnome_vfs; zip = zip.override { enableNLS = false; }; fontsConf = makeFontsConf { fontDirectories = [ @@ -20557,9 +20356,7 @@ in portaudio = portaudio2014; }; - lingot = callPackage ../applications/audio/lingot { - inherit (gnome2) libglade; - }; + lingot = callPackage ../applications/audio/lingot { }; linuxband = callPackage ../applications/audio/linuxband { }; @@ -20580,9 +20377,11 @@ in libdsk = callPackage ../misc/emulators/libdsk { }; + liblinphone = callPackage ../development/libraries/liblinphone { }; + links2 = callPackage ../applications/networking/browsers/links2 { }; - linphone = callPackage ../applications/networking/instant-messengers/linphone { }; + linphone = libsForQt5.callPackage ../applications/networking/instant-messengers/linphone { }; linuxsampler = callPackage ../applications/audio/linuxsampler { }; @@ -20623,6 +20422,8 @@ in flavour = "git"; }; + lime = callPackage ../development/libraries/lime { }; + luakit = callPackage ../applications/networking/browsers/luakit { inherit (luajitPackages) luafilesystem; }; @@ -20701,6 +20502,8 @@ in canonicaljson; }; + matrix-dl = callPackage ../applications/networking/instant-messengers/matrix-dl { }; + matrix-recorder = callPackage ../applications/networking/instant-messengers/matrix-recorder {}; mblaze = callPackage ../applications/networking/mailreaders/mblaze { }; @@ -20760,9 +20563,7 @@ in minidjvu = callPackage ../applications/graphics/minidjvu { }; minikube = callPackage ../applications/networking/cluster/minikube { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.libs) xpc; - inherit (darwin.apple_sdk.frameworks) vmnet Foundation IOKit; + inherit (darwin.apple_sdk.frameworks) vmnet; }; minishift = callPackage ../applications/networking/cluster/minishift { }; @@ -20775,9 +20576,7 @@ in meh = callPackage ../applications/graphics/meh {}; - mixxx = libsForQt5.callPackage ../applications/audio/mixxx { - inherit (vamp) vampSDK; - }; + mixxx = libsForQt5.callPackage ../applications/audio/mixxx { }; mjpg-streamer = callPackage ../applications/video/mjpg-streamer { }; @@ -20892,6 +20691,10 @@ in rofi-mpd = callPackage ../applications/audio/rofi-mpd { }; + rofi-calc = callPackage ../applications/science/math/rofi-calc { }; + + rofi-emoji = callPackage ../applications/misc/rofi-emoji { }; + ympd = callPackage ../applications/audio/ympd { }; nload = callPackage ../applications/networking/nload { }; @@ -20996,6 +20799,9 @@ in notion = callPackage ../applications/window-managers/notion { }; + nootka = qt5.callPackage ../applications/audio/nootka { }; + nootka-unstable = qt5.callPackage ../applications/audio/nootka/unstable.nix { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { }; openshift = callPackage ../applications/networking/cluster/openshift { @@ -21053,9 +20859,7 @@ in ptex = callPackage ../development/libraries/ptex {}; - qbec = callPackage ../applications/networking/cluster/qbec { - inherit (darwin.apple_sdk.frameworks) Security; - }; + qbec = callPackage ../applications/networking/cluster/qbec { }; rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; @@ -21188,6 +20992,7 @@ in withALSA = stdenv.isLinux; withPulseAudio = config.pulseaudio or stdenv.isLinux; withPortAudio = stdenv.isDarwin; + withMPRIS = stdenv.isLinux; }; ncview = callPackage ../tools/X11/ncview { } ; @@ -21395,7 +21200,7 @@ in pianobar = callPackage ../applications/audio/pianobar { }; - pianobooster = callPackage ../applications/audio/pianobooster { }; + pianobooster = qt5.callPackage ../applications/audio/pianobooster { }; picard = callPackage ../applications/audio/picard { }; @@ -21471,6 +21276,8 @@ in gtksharp = gtk-sharp-2_0; }; + pistol = callPackage ../tools/misc/pistol { }; + plex-media-player = libsForQt512.callPackage ../applications/video/plex-media-player { }; plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; @@ -21553,6 +21360,8 @@ in guiSupport = false; }; + qcad = libsForQt5.callPackage ../applications/misc/qcad { }; + qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { @@ -21594,6 +21403,8 @@ in qmetro = callPackage ../applications/misc/qmetro { }; + qmidiarp = callPackage ../applications/audio/qmidiarp {}; + qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; qmidiroute = callPackage ../applications/audio/qmidiroute { }; @@ -21744,6 +21555,8 @@ in retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; retroshare06 = retroshare; + rgp = libsForQt5.callPackage ../development/tools/rgp { }; + ricochet = libsForQt5.callPackage ../applications/networking/instant-messengers/ricochet { }; ries = callPackage ../applications/science/math/ries { }; @@ -21841,12 +21654,12 @@ in sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { }; - shadowfox = callPackage ../tools/networking/shadowfox { - inherit (darwin.apple_sdk.frameworks) Security; - }; + shadowfox = callPackage ../tools/networking/shadowfox { }; shfmt = callPackage ../tools/text/shfmt { }; + shortwave = callPackage ../applications/audio/shortwave { }; + shotgun = callPackage ../tools/graphics/shotgun {}; shutter = callPackage ../applications/graphics/shutter { }; @@ -21875,9 +21688,7 @@ in sooperlooper = callPackage ../applications/audio/sooperlooper { }; - sops = callPackage ../tools/security/sops { - inherit (darwin.apple_sdk.frameworks) CoreServices; - }; + sops = callPackage ../tools/security/sops { }; sorcer = callPackage ../applications/audio/sorcer { }; @@ -22026,13 +21837,11 @@ in skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { - inherit (pkgs.vamp) vampSDK; - }; + soci = callPackage ../development/libraries/soci { }; - sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { - inherit (pkgs.vamp) vampSDK; - }; + sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; + + sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; soulseekqt = libsForQt5.callPackage ../applications/networking/p2p/soulseekqt { }; @@ -22136,10 +21945,7 @@ in syncplay = python3.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) CoreServices Foundation; - }) + inherit (callPackages ../applications/networking/syncthing { }) syncthing syncthing-cli syncthing-discovery @@ -22226,7 +22032,6 @@ in tendermint = callPackage ../tools/networking/tendermint { buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; @@ -22333,6 +22138,8 @@ in tortoisehg = callPackage ../applications/version-management/tortoisehg { }; + tony = libsForQt5.callPackage ../applications/audio/tony { }; + toot = callPackage ../applications/misc/toot { }; tootle = callPackage ../applications/misc/tootle { }; @@ -22378,6 +22185,8 @@ in tudu = callPackage ../applications/office/tudu { }; + tut = callPackage ../applications/misc/tut { }; + tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; twister = callPackage ../applications/networking/p2p/twister { }; @@ -22458,6 +22267,8 @@ in gtk3 = if stdenv.isDarwin then gtk3-x11 else gtk3; }); + vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; + qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { @@ -22675,7 +22486,7 @@ in chatterino2 = libsForQt5.callPackage ../applications/networking/instant-messengers/chatterino2 {}; - weston = callPackage ../applications/window-managers/weston { }; + weston = callPackage ../applications/window-managers/weston { pipewire = pipewire_0_2; }; whitebox-tools = callPackage ../applications/gis/whitebox-tools { inherit (darwin.apple_sdk.frameworks) Security; @@ -22869,6 +22680,10 @@ in x32edit = callPackage ../applications/audio/midas/x32edit.nix {}; + x42-avldrums = callPackage ../applications/audio/x42-avldrums { }; + + x42-gmsynth = callPackage ../applications/audio/x42-gmsynth { }; + x42-plugins = callPackage ../applications/audio/x42-plugins { }; xannotate = callPackage ../tools/X11/xannotate {}; @@ -22898,6 +22713,8 @@ in kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; }; + kodiGBM = callPackage ../applications/video/kodi { useGbm = true; }; + kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {}); kodi = wrapKodi { @@ -22908,6 +22725,10 @@ in kodi = kodiPlainWayland; }; + kodi-gbm = wrapKodi { + kodi = kodiGBM; + }; + kodi-cli = callPackage ../tools/misc/kodi-cli { }; kodi-retroarch-advanced-launchers = @@ -23167,6 +22988,10 @@ in zim = callPackage ../applications/office/zim { }; + zita-ajbridge = callPackage ../applications/audio/zita-ajbridge { }; + + zita-at1 = callPackage ../applications/audio/zita-at1 { }; + zita-njbridge = callPackage ../applications/audio/zita-njbridge { }; zola = callPackage ../applications/misc/zola { @@ -23237,7 +23062,7 @@ in freicoin = callPackage ../applications/blockchains/freicoin.nix { boost = boost155; }; go-ethereum = callPackage ../applications/blockchains/go-ethereum.nix { inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) CoreServices IOKit; + inherit (darwin.apple_sdk.frameworks) IOKit; }; ledger_agent = with python3Packages; toPythonApplication ledger_agent; @@ -23251,7 +23076,6 @@ in lnd = callPackage ../applications/blockchains/lnd.nix { buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; }; monero = callPackage ../applications/blockchains/monero { @@ -23334,7 +23158,7 @@ in amoeba = callPackage ../games/amoeba { }; amoeba-data = callPackage ../games/amoeba/data.nix { }; - andyetitmoves = if stdenv.isLinux then callPackage ../games/andyetitmoves {} else null; + andyetitmoves = callPackage ../games/andyetitmoves {}; angband = callPackage ../games/angband { }; @@ -23667,6 +23491,14 @@ in ja2-stracciatella = callPackage ../games/ja2-stracciatella { }; + katago = callPackage ../games/katago { }; + + katagoWithCuda = katago.override { + cudaSupport = true; + cudnn = cudnn_cudatoolkit_10_1; + cudatoolkit = cudatoolkit_10_1; + }; + klavaro = callPackage ../games/klavaro {}; kobodeluxe = callPackage ../games/kobodeluxe { }; @@ -23717,7 +23549,7 @@ in multimc = libsForQt5.callPackage ../games/multimc { }; inherit (callPackages ../games/minetest { - inherit (darwin) libiconv; + inherit (darwin) libiconv; inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; }) minetestclient_4 minetestserver_4 @@ -23819,6 +23651,8 @@ in pacvim = callPackage ../games/pacvim { }; + papermc = callPackage ../games/papermc { }; + pentobi = libsForQt5.callPackage ../games/pentobi { }; performous = callPackage ../games/performous { @@ -23930,7 +23764,9 @@ in inherit (callPackage ../games/scummvm/games.nix { }) beneath-a-steel-sky + broken-sword-25 drascula-the-vampire-strikes-back + dreamweb flight-of-the-amazon-queen lure-of-the-temptress; @@ -24170,7 +24006,26 @@ in xmoto = callPackage ../games/xmoto { }; - xonotic = callPackage ../games/xonotic { }; + + inherit (callPackage ../games/xonotic { }) + xonotic-data + xonotic; + + xonotic-glx = (callPackage ../games/xonotic { + withSDL = false; + withGLX = true; + }).xonotic; + + xonotic-dedicated = (callPackage ../games/xonotic { + withSDL = false; + withDedicated = true; + }).xonotic; + + xonotic-sdl = xonotic; + xonotic-sdl-unwrapped = xonotic-sdl.xonotic-unwrapped; + xonotic-glx-unwrapped = xonotic-glx.xonotic-unwrapped; + xonotic-dedicated-unwrapped = xonotic-dedicated.xonotic-unwrapped; + xpilot-ng = callPackage ../games/xpilot { }; bloodspilot-server = callPackage ../games/xpilot/bloodspilot-server.nix {}; @@ -24787,6 +24642,8 @@ in boogie = dotnetPackages.Boogie; + cadical = callPackage ../applications/science/logic/cadical {}; + inherit (callPackage ./coq-packages.nix { inherit (ocaml-ng) ocamlPackages_4_05; }) mkCoqPackages @@ -24981,6 +24838,8 @@ in caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; + fparser = callPackage ../applications/science/electronics/fparser { }; + geda = callPackage ../applications/science/electronics/geda { guile = guile_2_0; }; @@ -25243,9 +25102,7 @@ in ataripp = callPackage ../misc/emulators/atari++ { }; - atlantis = callPackage ../applications/networking/cluster/atlantis { - inherit (darwin.apple_sdk.frameworks) Security; - }; + atlantis = callPackage ../applications/networking/cluster/atlantis { }; auctex = callPackage ../tools/typesetting/tex/auctex { }; @@ -25265,6 +25122,8 @@ in brightnessctl = callPackage ../misc/brightnessctl { }; + cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; + calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; ccemux = callPackage ../misc/emulators/ccemux { }; @@ -25433,9 +25292,7 @@ in binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils; }; - gobuster = callPackage ../tools/security/gobuster { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gobuster = callPackage ../tools/security/gobuster { }; guetzli = callPackage ../applications/graphics/guetzli { }; @@ -25449,9 +25306,7 @@ in stdenv = gcc8Stdenv; }; - helmfile = callPackage ../applications/networking/cluster/helmfile { - inherit (darwin.apple_sdk.frameworks) Security; - }; + helmfile = callPackage ../applications/networking/cluster/helmfile { }; heptio-ark = callPackage ../applications/networking/cluster/heptio-ark { }; @@ -25506,6 +25361,8 @@ in keynav = callPackage ../tools/X11/keynav { }; + kmon = callPackage ../tools/system/kmon { }; + kompose = callPackage ../applications/networking/cluster/kompose { }; kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; @@ -25536,7 +25393,9 @@ in icu = icu58; }; - mame = libsForQt5.callPackage ../misc/emulators/mame { }; + mame = libsForQt5.callPackage ../misc/emulators/mame { + inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; + }; martyr = callPackage ../development/libraries/martyr { }; @@ -25556,9 +25415,7 @@ in musly = callPackage ../applications/audio/musly { }; - mynewt-newt = callPackage ../tools/package-management/mynewt-newt { - inherit (darwin.apple_sdk.frameworks) Security; - }; + mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; @@ -25566,7 +25423,6 @@ in boehmgc = boehmgc.override { enableLargeConfig = true; }; }) nix - nix1 nixStable nixUnstable nixFlakes; @@ -25974,6 +25830,8 @@ in dsseries = callPackage ../applications/graphics/sane/backends/dsseries { }; + sane-airscan = callPackage ../applications/graphics/sane/backends/airscan { }; + mkSaneConfig = callPackage ../applications/graphics/sane/config.nix { }; sane-frontends = callPackage ../applications/graphics/sane/frontends.nix { }; @@ -26025,16 +25883,9 @@ in sqsh = callPackage ../development/tools/sqsh { }; - jx = callPackage ../applications/networking/cluster/jx { - inherit (darwin.apple_sdk.frameworks) Security; - }; + jx = callPackage ../applications/networking/cluster/jx {}; - prow = callPackage ../applications/networking/cluster/prow { - # Version 2019-08-14 fails to build with go 1.13 due to dependencies: - # go: golang.org/x/lint@v0.0.0-20190301231843-5614ed5bae6f used for two different module paths (github.com/golang/lint and golang.org/x/lint) - buildGoModule = buildGo112Module; - inherit (darwin.apple_sdk.frameworks) Security; - }; + prow = callPackage ../applications/networking/cluster/prow { }; inherit (callPackage ../applications/networking/cluster/terraform { # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287 @@ -26051,9 +25902,7 @@ in terraform-full = terraform.full; terraform-providers = recurseIntoAttrs ( - callPackage ../applications/networking/cluster/terraform-providers { - inherit (darwin.apple_sdk.frameworks) Security; - } + callPackage ../applications/networking/cluster/terraform-providers {} ); terraform-docs = callPackage ../applications/networking/cluster/terraform-docs {}; @@ -26173,9 +26022,7 @@ in webfs = callPackage ../servers/http/webfs { }; - websocketd = callPackage ../applications/networking/websocketd { - inherit (darwin.apple_sdk.frameworks) Security; - }; + websocketd = callPackage ../applications/networking/websocketd { }; wikicurses = callPackage ../applications/misc/wikicurses { pythonPackages = python3Packages; @@ -26235,6 +26082,8 @@ in xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xow = callPackage ../misc/drivers/xow { }; + xbps = callPackage ../tools/package-management/xbps { }; xcftools = callPackage ../tools/graphics/xcftools { }; @@ -26324,6 +26173,7 @@ in higan = callPackage ../misc/emulators/higan { inherit (gnome2) gtksourceview; + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; bullet = callPackage ../development/libraries/bullet { @@ -26395,9 +26245,7 @@ in zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { - inherit (darwin.apple_sdk.frameworks) Security; - }; + wtf = callPackage ../applications/misc/wtf { }; zk-shell = callPackage ../applications/misc/zk-shell { }; @@ -26511,6 +26359,8 @@ in bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; + xp-pen-g430 = libsForQt5.callPackage ../misc/drivers/xp-pen-g430 {}; + qmk_firmware = callPackage ../development/misc/qmk_firmware { avrgcc = pkgsCross.avr.buildPackages.gcc; avrbinutils = pkgsCross.avr.buildPackages.binutils; @@ -26563,26 +26413,22 @@ in sieveshell = with python3.pkgs; toPythonApplication managesieve; - gortr = callPackage ../servers/gortr { - inherit (darwin.apple_sdk.frameworks) Security; - }; + gortr = callPackage ../servers/gortr {}; sentencepiece = callPackage ../development/libraries/sentencepiece {}; - kcli = callPackage ../development/tools/kcli { - inherit (darwin.apple_sdk.frameworks) Security; - }; + kcli = callPackage ../development/tools/kcli {}; unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; - go-license-detector = callPackage ../development/tools/misc/go-license-detector { - inherit (darwin.apple_sdk.frameworks) Security; - }; + go-license-detector = callPackage ../development/tools/misc/go-license-detector { }; hashdeep = callPackage ../tools/security/hashdeep { }; + pdf-parser = callPackage ../tools/misc/pdf-parser {}; + fluxboxlauncher = callPackage ../applications/misc/fluxboxlauncher {}; btcdeb = callPackage ../applications/blockchains/btcdeb {}; diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index bc39a477a7a..7d1bcc5bd99 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -137,7 +137,7 @@ in rec { version = "8.10.2"; }; coq_8_11 = callPackage ../applications/science/logic/coq { - version = "8.11.0"; + version = "8.11.1"; }; coqPackages_8_5 = mkCoqPackages coq_8_5; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index 35cbcebb242..3b58e1937b6 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -558,7 +558,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { FSharp.Compiler.Service project. It is intended to be used as a backend service for rich editing or 'intellisense' features for editors. ''; - homepage = https://github.com/fsharp/FSharp.AutoComplete; + homepage = "https://github.com/fsharp/FSharp.AutoComplete"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; @@ -607,13 +607,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { fileProvidedTypes = fetchurl { name = "ProvidedTypes.fs"; - url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/ProvidedTypes.fs; + url = "https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/ProvidedTypes.fs"; sha256 = "1lb056v1xld1rfx6a8p8i2jz8i6qa2r2823n5izsf1qg1qgf2980"; }; fileDebugProvidedTypes = fetchurl { name = "DebugProvidedTypes.fs"; - url = https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/DebugProvidedTypes.fs; + url = "https://raw.githubusercontent.com/fsprojects/FSharp.TypeProviders.StarterPack/877014bfa6244ac382642e113d7cd6c9bc27bc6d/src/DebugProvidedTypes.fs"; sha256 = "1whyrf2jv6fs7kgysn2086v15ggjsd54g1xfs398mp46m0nxp91f"; }; @@ -709,7 +709,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = with stdenv.lib; { description = "A tool to help visualize git revisions and branches"; - homepage = https://github.com/crc8/GitVersionTree; + homepage = "https://github.com/crc8/GitVersionTree"; license = licenses.gpl2; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; @@ -733,7 +733,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono"; - homepage = https://numerics.mathdotnet.com/; + homepage = "https://numerics.mathdotnet.com/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; @@ -763,7 +763,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A generic framework for creating extensible applications"; - homepage = https://www.mono-project.com/Mono.Addins; + homepage = "https://www.mono-project.com/Mono.Addins"; longDescription = '' A generic framework for creating extensible applications, and for creating libraries which extend those applications. @@ -854,7 +854,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A callback-based program option parser for C#"; - homepage = http://www.ndesk.org/Options; + homepage = "http://www.ndesk.org/Options"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; @@ -949,7 +949,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { meta = { description = "A declarative CLI argument/XML configuration parser for F# applications"; - homepage = https://nessos.github.io/UnionArgParser/; + homepage = "https://nessos.github.io/UnionArgParser/"; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ obadz ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2d03b3ed8f4..052b84f269e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -4,7 +4,7 @@ let # These are attributes in compiler and packages that don't support integer-simple. integerSimpleExcludes = [ "ghc822Binary" - "ghc863Binary" + "ghc865Binary" "ghc844" "ghcjs" "ghcjs86" @@ -42,7 +42,7 @@ in { ghc822Binary = callPackage ../development/compilers/ghc/8.2.2-binary.nix { }; - ghc863Binary = callPackage ../development/compilers/ghc/8.6.3-binary.nix { }; + ghc865Binary = callPackage ../development/compilers/ghc/8.6.5-binary.nix { }; ghc844 = callPackage ../development/compilers/ghc/8.4.4.nix { bootPkgs = packages.ghc822Binary; @@ -57,31 +57,31 @@ in { llvmPackages = pkgs.llvmPackages_6; }; ghc881 = callPackage ../development/compilers/ghc/8.8.1.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; ghc883 = callPackage ../development/compilers/ghc/8.8.3.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; ghc8101 = callPackage ../development/compilers/ghc/8.10.1.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc863Binary; + bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; @@ -117,9 +117,9 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc863Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc863Binary; - ghc = bh.compiler.ghc863Binary; + ghc865Binary = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc865Binary; + ghc = bh.compiler.ghc865Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; packageSetConfig = bootstrapPackageSet; }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 7f29d47a993..7cf47c26c6f 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -186,7 +186,7 @@ with self; { meta = with stdenv.lib; { description = "A modular widget library for the awesome window manager"; - homepage = https://github.com/Mic92/vicious; + homepage = "https://github.com/Mic92/vicious"; license = licenses.gpl2; maintainers = with maintainers; [ makefu mic92 ]; platforms = platforms.linux; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 23542e4afe0..6bb243879e9 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -19,7 +19,7 @@ releaseTools.sourceTarball { version = pkgs.lib.fileContents ../../.version; versionSuffix = "pre${ if nixpkgs ? lastModified - then builtins.substring 0 8 nixpkgs.lastModified + then builtins.substring 0 8 (nixpkgs.lastModifiedDate or nixpkgs.lastModified) else toString nixpkgs.revCount}.${nixpkgs.shortRev or "dirty"}"; buildInputs = [ nix.out jq lib-tests pkgs.brotli ]; @@ -107,7 +107,7 @@ releaseTools.sourceTarball { nix-env -f . -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' "''${opts[@]}" >> tmp echo -n '}' >> tmp packages=$out/packages.json.br - jq -c < tmp | brotli -9 > $packages + < tmp sed "s|$(pwd)/||g" | jq -c | brotli -9 > $packages echo "file json-br $packages" >> $out/nix-support/hydra-build-products ''; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 7e12a3db3f7..fd863e428af 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -587,6 +587,8 @@ let ocaml_gettext = callPackage ../development/ocaml-modules/ocaml-gettext { }; + gettext-stub = callPackage ../development/ocaml-modules/ocaml-gettext/stub.nix { }; + ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; ocaml_http = callPackage ../development/ocaml-modules/http { }; @@ -615,6 +617,8 @@ let pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {}; + ocaml-r = callPackage ../development/ocaml-modules/ocaml-r { }; + ocaml-sat-solvers = callPackage ../development/ocaml-modules/ocaml-sat-solvers { }; ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; @@ -1232,5 +1236,5 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_latest = ocamlPackages_4_10; - ocamlPackages = ocamlPackages_4_08; + ocamlPackages = ocamlPackages_4_09; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3bf345762b3..94c5387e0e7 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -90,7 +90,7 @@ let version = "3.3.1"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.3.1.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/ack-v3.3.1.tar.gz"; sha256 = "12fm9zplyqndji52nb3b5d91z22g8gr61r1k153kjq84kw264fxf"; }; @@ -107,7 +107,7 @@ let meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; - homepage = https://beyondgrep.com; + homepage = "https://beyondgrep.com"; license = licenses.artistic2; maintainers = with maintainers; [ lovek323 ]; }; @@ -117,7 +117,7 @@ let pname = "Algorithm-Annotate"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/Algorithm-Annotate-0.10.tar.gz"; sha256 = "1y92k4nqkscfwpriv8q7c90rjfj85lvwq1k96niv2glk8d37dcf9"; }; propagatedBuildInputs = [ AlgorithmDiff ]; @@ -127,7 +127,7 @@ let pname = "Algorithm-C3"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.10.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Algorithm-C3-0.10.tar.gz"; sha256 = "01hlcaxndls86bl92rkd3fvf9pfa3inxqaimv88bxs95803kmkss"; }; meta = { @@ -140,7 +140,7 @@ let pname = "Algorithm-Diff"; version = "1.1903"; src = fetchurl { - url = mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz; + url = "mirror://cpan/authors/id/T/TY/TYEMQ/Algorithm-Diff-1.1903.tar.gz"; sha256 = "0l8pk7ziz72d022hsn4xldhhb9f5649j5cgpjdibch0xng24ms1h"; }; buildInputs = [ pkgs.unzip ]; @@ -150,7 +150,7 @@ let pname = "Algorithm-Merge"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSMITH/Algorithm-Merge-0.08.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSMITH/Algorithm-Merge-0.08.tar.gz"; sha256 = "1kqn13wd0lfjrf6h19b9kgdqqwp7k2d9yfq5i0wvii0xi8jqh1lw"; }; propagatedBuildInputs = [ AlgorithmDiff ]; @@ -160,7 +160,7 @@ let pname = "Alien-Build"; version = "1.98"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.98.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.98.tar.gz"; sha256 = "12w9da57616gmcj69yv7cjv423cj957dm0f84cn2q093g64kjmif"; }; propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny PkgConfig ]; @@ -175,7 +175,7 @@ let pname = "Alien-GMP"; version = "1.14"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.14.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.14.tar.gz"; sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a"; }; propagatedBuildInputs = [ AlienBuild ]; @@ -190,7 +190,7 @@ let pname = "Alien-Libxml2"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.12.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Libxml2-0.12.tar.gz"; sha256 = "0b3dj1510fxldhicijvw390gnh5j1k6rjzcc2jzs9f8nwfkqh6r2"; }; propagatedBuildInputs = [ AlienBuild ]; @@ -205,7 +205,7 @@ let pname = "aliased"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/aliased-0.34.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/aliased-0.34.tar.gz"; sha256 = "1syyqzy462501kn5ma9gl6xbmcahqcn4qpafhsmpz0nd0x2m4l63"; }; buildInputs = [ ModuleBuildTiny ]; @@ -215,7 +215,7 @@ let pname = "asa"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/asa-1.04.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/asa-1.04.tar.gz"; sha256 = "0pk783s1h2f45zbmm6a62yfgy71w4sqh8ppgs4cyxfikwxs3p0z5"; }; meta = { @@ -249,7 +249,7 @@ let pname = "Alien-Tidyp"; version = "1.4.7"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMX/Alien-Tidyp-v1.4.7.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMX/Alien-Tidyp-v1.4.7.tar.gz"; sha256 = "0raapwp4155lqag1kzhsd20z4if10hav9wx4d7mc1xpvf7dcnr5r"; }; @@ -262,7 +262,7 @@ let pname = "Alien-wxWidgets"; version = "0.69"; src = fetchurl { - url = mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz; + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Alien-wxWidgets-0.69.tar.gz"; sha256 = "0jg2dmkzhj03f6b0vmv597yryfw9cclsdn9ynvvlrzzgpd5lw8jk"; }; propagatedBuildInputs = [ pkgs.pkgconfig pkgs.gtk2 pkgs.wxGTK30 ModulePluggable ]; @@ -273,7 +273,7 @@ let pname = "AnyEvent"; version = "7.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.17.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-7.17.tar.gz"; sha256 = "50beea689c098fe4aaeb83806c40b9fe7f946d5769acf99f849f099091a4b985"; }; buildInputs = [ CanaryStability ]; @@ -286,13 +286,13 @@ let pname = "AnyEvent-CacheDNS"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/POTYL/AnyEvent-CacheDNS-0.08.tar.gz; + url = "mirror://cpan/authors/id/P/PO/POTYL/AnyEvent-CacheDNS-0.08.tar.gz"; sha256 = "41c1faf183b61806b55889ceea1237750c1f61b9ce2735fdf33dc05536712dae"; }; propagatedBuildInputs = [ AnyEvent ]; doCheck = false; # does an DNS lookup meta = { - homepage = https://github.com/potyl/perl-AnyEvent-CacheDNS; + homepage = "https://github.com/potyl/perl-AnyEvent-CacheDNS"; description = "Simple DNS resolver with caching"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -302,7 +302,7 @@ let pname = "AnyEvent-FastPing"; version = "2.1"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-FastPing-2.1.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-FastPing-2.1.tar.gz"; sha256 = "0b3ha864nw0qk22ybhzfgz0r0p69iyj01bi500x9hp6kga7ip4p5"; }; propagatedBuildInputs = [ AnyEvent commonsense ]; @@ -314,7 +314,7 @@ let pname = "AnyEvent-HTTP"; version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.24.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/AnyEvent-HTTP-2.24.tar.gz"; sha256 = "0358a542baa45403d81c0a70e43e79c044ddfa1371161d043f002acef63121dd"; }; propagatedBuildInputs = [ AnyEvent commonsense ]; @@ -324,7 +324,7 @@ let pname = "AnyEvent-I3"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.17.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/AnyEvent-I3-0.17.tar.gz"; sha256 = "5382c984c9f138395f29f0c00af81aa0c8f4b765582055c73ede4b13f04a6d63"; }; propagatedBuildInputs = [ AnyEvent JSONXS ]; @@ -338,7 +338,7 @@ let pname = "AnyEvent-RabbitMQ"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.19.tar.gz; + url = "mirror://cpan/authors/id/D/DL/DLAMBLEY/AnyEvent-RabbitMQ-1.19.tar.gz"; sha256 = "a440ec2fa5a4018ad44739baaa9601cc460ad497282e89110ba8e3cf23312f0a"; }; buildInputs = [ TestException ]; @@ -353,7 +353,7 @@ let pname = "Any-Moose"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Any-Moose-0.27.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Any-Moose-0.27.tar.gz"; sha256 = "0dc55mpayrixwx8dwql0vj0jalg4rlb3k64rprc84bl0z8vkx9m8"; }; propagatedBuildInputs = [ Moose Mouse ]; @@ -363,7 +363,7 @@ let pname = "Any-URI-Escape"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Any-URI-Escape-0.01.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/Any-URI-Escape-0.01.tar.gz"; sha256 = "0k4c20bmw32yxksgkc2i44j4vfmzhqcqrq36pv0ab3qhkzn3r0g3"; }; propagatedBuildInputs = [ URI ]; @@ -376,7 +376,7 @@ let pname = "Apache-AuthCookie"; version = "3.28"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.28.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Apache-AuthCookie-3.28.tar.gz"; sha256 = "bcd795a7f654a94ae0a6bd734ba4d8ba1085371fca486229dba49f1c2d62142b"; }; buildInputs = [ ApacheTest ]; @@ -397,7 +397,7 @@ let pname = "Apache-LogFormat-Compiler"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Apache-LogFormat-Compiler-0.36.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Apache-LogFormat-Compiler-0.36.tar.gz"; sha256 = "05xcl7j65vakx7x79jqjikyw0nzf60bc2w6hhc0q5sklxq1ral4l"; }; buildInputs = [ HTTPMessage ModuleBuildTiny TestMockTime TestRequires TryTiny URI ]; @@ -405,7 +405,7 @@ let # We cannot change the timezone on the fly. prePatch = "rm t/04_tz.t"; meta = { - homepage = https://github.com/kazeburo/Apache-LogFormat-Compiler; + homepage = "https://github.com/kazeburo/Apache-LogFormat-Compiler"; description = "Compile a log format string to perl-code"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -415,7 +415,7 @@ let pname = "Apache-Session"; version = "1.93"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Apache-Session-1.93.tar.gz"; sha256 = "8e5a4882ac8ec657d1018d74d3ba37854e2688a41ddd0e1d73955ea59f276e8d"; }; buildInputs = [ TestDeep TestException ]; @@ -429,7 +429,7 @@ let pname = "Apache-Test"; version = "1.42"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.42.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.42.tar.gz"; sha256 = "1sxk7dmpg3ib1dkl58ddh7zffnv5danwba7qxp82k54agmyz1086"; }; doCheck = false; @@ -443,7 +443,7 @@ let pname = "App-CLI"; version = "0.50"; src = fetchurl { - url = mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz; + url = "mirror://cpan/authors/id/P/PT/PTC/App-CLI-0.50.tar.gz"; sha256 = "0ick5agl02rx2pjfxl97d0f9qksy8pjn0asmwm3gn6dm7a1zblsi"; }; propagatedBuildInputs = [ CaptureTiny ClassLoad ]; @@ -454,7 +454,7 @@ let pname = "App-ClusterSSH"; version = "4.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.14.tar.gz; + url = "mirror://cpan/authors/id/D/DU/DUNCS/App-ClusterSSH-4.14.tar.gz"; sha256 = "020p28xl9507blvr8lr7hdxk1cl8jjkz5rkrkh7g538g52sa2cmi"; }; propagatedBuildInputs = [ ExceptionClass Tk X11ProtocolOther XMLSimple ]; @@ -480,13 +480,13 @@ let pname = "App-Cmd"; version = "0.331"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.331.tar.gz"; sha256 = "4a5d3df0006bd278880d01f4957aaa652a8f91fe8f66e93adf70fba0c3ecb680"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ CaptureTiny ClassLoad GetoptLongDescriptive IOTieCombine ModulePluggable StringRewritePrefix ]; meta = { - homepage = https://github.com/rjbs/App-Cmd; + homepage = "https://github.com/rjbs/App-Cmd"; description = "Write command line apps with less suffering"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -496,7 +496,7 @@ let pname = "AppConfig"; version = "1.71"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/AppConfig-1.71.tar.gz"; sha256 = "03vvi3mk4833mx2c6dkm9zhvakf02mb2b7wz9pk9xc7c4mq04xqi"; }; meta = { @@ -509,7 +509,7 @@ let pname = "App-FatPacker"; version = "0.010008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/App-FatPacker-0.010008.tar.gz"; sha256 = "1kzcbpsf1p7ww45d9fl2w0nfn5jj5pz0r0c649c1lrj5r1nv778j"; }; meta = { @@ -522,11 +522,11 @@ let pname = "App-cpanminus"; version = "1.7044"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/App-cpanminus-1.7044.tar.gz"; sha256 = "9b60767fe40752ef7a9d3f13f19060a63389a5c23acc3e9827e19b75500f81f3"; }; meta = { - homepage = https://github.com/miyagawa/cpanminus; + homepage = "https://github.com/miyagawa/cpanminus"; description = "Get, unpack, build and install modules from CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -551,7 +551,7 @@ let pname = "App-perlbrew"; version = "0.88"; src = fetchurl { - url = mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.88.tar.gz; + url = "mirror://cpan/authors/id/G/GU/GUGOD/App-perlbrew-0.88.tar.gz"; sha256 = "08aj77i7bh4nhilz16axp4zfv0zg66za2c4i0rcwfg3qxgxbcrzs"; }; buildInputs = [ pkgs.curl FileWhich IOAll ModuleBuildTiny PathClass TestException TestNoWarnings TestOutput TestSpec TestTempDirTiny ]; @@ -569,7 +569,7 @@ let pname = "Archive-Any-Lite"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Archive-Any-Lite-0.11.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Archive-Any-Lite-0.11.tar.gz"; sha256 = "0w2i50fd81ip674zmnrb15nadw162fdpiw4rampbd94k74jqih8m"; }; propagatedBuildInputs = [ ArchiveZip ]; @@ -584,14 +584,14 @@ let version = "1.0.0"; pname = "App-Sqitch"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.0.0.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/App-Sqitch-v1.0.0.tar.gz"; sha256 = "f46466c1e9ad8bbabf6844fed4f6e534ea475731de61b775ad7c331db1ca9c5c"; }; buildInputs = [ CaptureTiny TestDeep TestDir TestException TestFile TestFileContents TestMockModule TestNoWarnings TestWarn ]; propagatedBuildInputs = [ Clone ConfigGitLike DBI DateTime EncodeLocale HashMerge IOPager IPCRun3 IPCSystemSimple ListMoreUtils PathClass PerlIOutf8_strict StringFormatter StringShellQuote TemplateTiny Throwable TypeTiny URIdb libintl_perl ]; doCheck = false; # Can't find home directory. meta = { - homepage = https://sqitch.org/; + homepage = "https://sqitch.org/"; description = "Sane database change management"; license = stdenv.lib.licenses.mit; }; @@ -601,7 +601,7 @@ let pname = "App-St"; version = "1.1.4"; src = fetchurl { - url = https://github.com/nferraz/st/archive/v1.1.4.tar.gz; + url = "https://github.com/nferraz/st/archive/v1.1.4.tar.gz"; sha256 = "1f4bqm4jiazcxgzzja1i48671za96621k0s3ln87cdacgvv1can0"; }; postInstall = @@ -611,7 +611,7 @@ let meta = { description = "A command that computes simple statistics"; license = stdenv.lib.licenses.mit; - homepage = https://github.com/nferraz/st; + homepage = "https://github.com/nferraz/st"; maintainers = [ maintainers.eelco ]; }; }; @@ -620,7 +620,7 @@ let pname = "Attribute-Params-Validate"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Attribute-Params-Validate-1.21.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Attribute-Params-Validate-1.21.tar.gz"; sha256 = "586b939ceffdb37188b7c461dd1a8f9f35695184c8703b05c35f6d508c8090f5"; }; buildInputs = [ TestFatal ]; @@ -636,7 +636,7 @@ let pname = "Array-Compare"; version = "3.0.3"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.3.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Array-Compare-v3.0.3.tar.gz"; sha256 = "13hn913cj7vswh5yy7gxpmhzrwmwknkc73qn7bhw0x7gx757rav2"; }; @@ -648,7 +648,7 @@ let pname = "Array-Diff"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Array-Diff-0.09.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Array-Diff-0.09.tar.gz"; sha256 = "0xsh8k312spzl90xds075qprcaz4r0b93g1bgi9l3rv1k0p3j1l0"; }; propagatedBuildInputs = [ AlgorithmDiff ClassAccessor ]; @@ -662,13 +662,13 @@ let pname = "Array-FIFO"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/D/DB/DBURKE/Array-FIFO-0.13.tar.gz; + url = "mirror://cpan/authors/id/D/DB/DBURKE/Array-FIFO-0.13.tar.gz"; sha256 = "be2aeb5f5a9af1a96f0033508a569ca93ad19ad15dc7c6b998e6d7bc740c66f7"; }; buildInputs = [ TestDeep TestSpec TestTrap ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { - homepage = https://github.com/dwburke/perl-Array-FIFO; + homepage = "https://github.com/dwburke/perl-Array-FIFO"; description = "A Simple limitable FIFO array, with sum and average methods"; license = stdenv.lib.licenses.artistic2; }; @@ -678,7 +678,7 @@ let pname = "AsyncPing"; version = "2016.1207"; src = fetchurl { - url = mirror://cpan/authors/id/X/XI/XINFWANG/AsyncPing-2016.1207.tar.gz; + url = "mirror://cpan/authors/id/X/XI/XINFWANG/AsyncPing-2016.1207.tar.gz"; sha256 = "0nn9k79gihzr9wfksi03jmdgc2ihsb4952ddz1v70xvsq7z9mgkg"; }; meta = { @@ -691,7 +691,7 @@ let pname = "Archive-Cpio"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.10.tar.gz; + url = "mirror://cpan/authors/id/P/PI/PIXEL/Archive-Cpio-0.10.tar.gz"; sha256 = "246fb31669764e78336b2191134122e07c44f2d82dc4f37d552ab28f8668bed3"; }; meta = { @@ -705,7 +705,7 @@ let pname = "Archive-Extract"; version = "0.86"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.86.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.86.tar.gz"; sha256 = "9acd09cdb8e8cf0b6d08210a3b80342300c89a359855319bf6b00c14c4aab687"; }; meta = { @@ -718,7 +718,7 @@ let pname = "Archive-Tar"; version = "2.32"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.32.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Archive-Tar-2.32.tar.gz"; sha256 = "92783780731ab0c9247adf43e70f4801e8317e3915ea87e38b85c8f734e8fca2"; }; meta = { @@ -731,7 +731,7 @@ let pname = "Archive-Tar-Wrapper"; version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.37.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARFREITAS/Archive-Tar-Wrapper-0.37.tar.gz"; sha256 = "0b1hi3zfnq487kfg514kr595j9w8x6wxddy3zlpqcxgiv90zlv3y"; }; propagatedBuildInputs = [ FileWhich IPCRun LogLog4perl ]; @@ -744,7 +744,7 @@ let pname = "Archive-Zip"; version = "1.67"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.67.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/Archive-Zip-1.67.tar.gz"; sha256 = "0x17b7s5c3bqy9gx7psdqxbzkilylnwwd3c3i68vynbn9hs788my"; }; buildInputs = [ TestMockModule ]; @@ -758,7 +758,7 @@ let pname = "Audio-Scan"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-1.01.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/Audio-Scan-1.01.tar.gz"; sha256 = "0jk3djnk6yf0jsjh8qk3mj8bkx4avp6i4czcpr5xrbf7f41744l3"; }; buildInputs = [ pkgs.zlib TestWarn ]; @@ -774,7 +774,7 @@ let pname = "Authen-DecHpwd"; version = "2.007"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-DecHpwd-2.007.tar.gz"; sha256 = "f43a93bb02b41f7327d92f9e963b69505f67350a52e8f50796f98afc4fb3f177"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -789,7 +789,7 @@ let pname = "Authen-Htpasswd"; version = "0.171"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/Authen-Htpasswd-0.171.tar.gz"; sha256 = "0rw06hwpxg388d26l0jvirczx304f768ijvc20l4b2ll7xzg9ymm"; }; propagatedBuildInputs = [ ClassAccessor CryptPasswdMD5 DigestSHA1 IOLockedFile ]; @@ -803,7 +803,7 @@ let pname = "Authen-ModAuthPubTkt"; version = "0.1.1"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGORDON/Authen-ModAuthPubTkt-0.1.1.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGORDON/Authen-ModAuthPubTkt-0.1.1.tar.gz"; sha256 = "7996e1a42c51216003ccf03c4b5250286b4c55684257971851f5ece9161dc7dd"; }; propagatedBuildInputs = [ pkgs.openssl IPCRun3 ]; @@ -839,7 +839,7 @@ let pname = "Authen-Passphrase"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-Passphrase-0.008.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Authen-Passphrase-0.008.tar.gz"; sha256 = "55db4520617d859d88c0ee54965da815b7226d792b8cdc8debf92073559e0463"; }; propagatedBuildInputs = [ AuthenDecHpwd CryptDES CryptEksblowfish CryptMySQL CryptPasswdMD5 CryptUnixCryptXS DataEntropy DigestMD4 ModuleRuntime ]; @@ -853,7 +853,7 @@ let pname = "Authen-Radius"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.31.tar.gz; + url = "mirror://cpan/authors/id/P/PO/PORTAONE/Authen-Radius-0.31.tar.gz"; sha256 = "bb5191484188ac7d6e281eb199d16c4e09fb0090af7c2187aa275c454c1fc012"; }; buildInputs = [ TestNoWarnings ]; @@ -868,7 +868,7 @@ let pname = "Authen-SASL"; version = "2.16"; src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz; + url = "mirror://cpan/authors/id/G/GB/GBARR/Authen-SASL-2.16.tar.gz"; sha256 = "02afhlrdq5hh5g8b32fa79fqq5i76qzwfqqvfi9zi57h31szl536"; }; propagatedBuildInputs = [ DigestHMAC ]; @@ -915,7 +915,7 @@ let pname = "Authen-Simple"; version = "0.5"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-0.5.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-0.5.tar.gz"; sha256 = "02cddab47f8bf1a1cbd4c9bf8d258f6d05111499c33f8315e7244812f72613aa"; }; propagatedBuildInputs = [ ClassAccessor ClassDataInheritable CryptPasswdMD5 ParamsValidate ]; @@ -929,7 +929,7 @@ let pname = "Authen-Simple-Passwd"; version = "0.6"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Authen-Simple-Passwd-0.6.tar.gz"; sha256 = "1ckl2ry9r5nb1rcn1ik2l5b5pp1i3g4bmllsmzb0zpwy4lvbqmfg"; }; propagatedBuildInputs = [ AuthenSimple ]; @@ -943,7 +943,7 @@ let pname = "autobox"; version = "3.0.1"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/autobox-v3.0.1.tar.gz"; sha256 = "c303b7fccfaa1ff4d4c429ab3f15e5ca2a77554ef8c9fc3b8c62ba859e874c98"; }; propagatedBuildInputs = [ ScopeGuard ]; @@ -958,7 +958,7 @@ let pname = "Autodia"; version = "2.14"; src = fetchurl { - url = mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz; + url = "mirror://cpan/authors/id/T/TE/TEEJAY/Autodia-2.14.tar.gz"; sha256 = "08pl5y18nsvy8ihfzdsbd8rz6a8al09wqfna07zdjfdyib42b0dc"; }; propagatedBuildInputs = [ TemplateToolkit XMLSimple ]; @@ -978,7 +978,7 @@ let which includes C, C++, Java, Perl, Python, and more. ''; - homepage = http://www.aarontrevena.co.uk/opensource/autodia/; + homepage = "http://www.aarontrevena.co.uk/opensource/autodia/"; license = stdenv.lib.licenses.gpl2Plus; }; buildInputs = [ DBI ]; @@ -988,7 +988,7 @@ let pname = "autovivification"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.18.tar.gz; + url = "mirror://cpan/authors/id/V/VP/VPIT/autovivification-0.18.tar.gz"; sha256 = "01giacr2sx6b9bgfz6aqw7ndcnf08j8n6kwhm7880a94hmb9g69d"; }; meta = { @@ -1001,12 +1001,12 @@ let pname = "B-C"; version = "1.57"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.57.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-C-1.57.tar.gz"; sha256 = "1zs9a4gl63icja055kncgyny6xk1nsk6payfbzczkba3sc8sclh4"; }; propagatedBuildInputs = [ BFlags IPCRun Opcodes ]; meta = { - homepage = https://github.com/rurban/perl-compiler; + homepage = "https://github.com/rurban/perl-compiler"; description = "Perl compiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1017,7 +1017,7 @@ let pname = "B-COW"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.002.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/B-COW-0.002.tar.gz"; sha256 = "0z2px2x15vr1y5rxsv7d80kh186ld7a45nbm4lsbs07g8y0p7rzw"; }; meta = { @@ -1030,7 +1030,7 @@ let pname = "B-Flags"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/B-Flags-0.17.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Flags-0.17.tar.gz"; sha256 = "1chhgkaw2h3qniz71dykynggqp0r6b6mi2f4nh4x3ghm2g89gny1"; }; meta = { @@ -1043,7 +1043,7 @@ let version = "0.63"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.63.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/BerkeleyDB-0.63.tar.gz"; sha256 = "1lh2a75cy85hqxlridk862nwzhrp762h74vy27hcbfgb4a6r62by"; }; @@ -1057,7 +1057,7 @@ let pname = "B-Hooks-EndOfScope"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-EndOfScope-0.24.tar.gz"; sha256 = "1imcqxp23yc80a7p0h56sja9glbrh4qyhgzljqd4g9habpz3vah3"; }; propagatedBuildInputs = [ ModuleImplementation SubExporterProgressive ]; @@ -1071,7 +1071,7 @@ let pname = "B-Hooks-OP-Check"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/B-Hooks-OP-Check-0.22.tar.gz"; sha256 = "1kfdv25gn6yik8jrwik4ajp99gi44s6idcvyyrzhiycyynzd3df7"; }; buildInputs = [ ExtUtilsDepends ]; @@ -1085,7 +1085,7 @@ let pname = "bignum"; version = "0.51"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/bignum-0.51.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/bignum-0.51.tar.gz"; sha256 = "8ac0f6efe0b6f24804690e53908bdc5346613667f1c0590d8cf808ec090e9c47"; }; meta = { @@ -1099,7 +1099,7 @@ let pname = "Bit-Vector"; version = "7.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STBEY/Bit-Vector-7.4.tar.gz"; sha256 = "09m96p8c0ipgz42li2ywdgy0vxb57mb5nf59j9gw7yzc3xkslv9w"; }; propagatedBuildInputs = [ CarpClan ]; @@ -1109,7 +1109,7 @@ let pname = "B-Keywords"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.21.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/B-Keywords-1.21.tar.gz"; sha256 = "12481z1z1nyrjlkizzqn4cdmcrfjkc3hvxppqipsf6r5gnffh9as"; }; meta = { @@ -1122,11 +1122,11 @@ let pname = "boolean"; version = "0.46"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/boolean-0.46.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/boolean-0.46.tar.gz"; sha256 = "95c088085c3e83bf680fe6ce16d8264ec26310490f7d1680e416ea7a118f156a"; }; meta = { - homepage = https://github.com/ingydotnet/boolean-pm; + homepage = "https://github.com/ingydotnet/boolean-pm"; description = "Boolean support for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1136,7 +1136,7 @@ let pname = "Boost-Geometry-Utils"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/A/AA/AAR/Boost-Geometry-Utils-0.15.tar.gz; + url = "mirror://cpan/authors/id/A/AA/AAR/Boost-Geometry-Utils-0.15.tar.gz"; sha256 = "1jnihz3029x51a455nxa0jx2z125x38q3vkkggsgdlrvawzxsm00"; }; patches = [ @@ -1151,7 +1151,7 @@ let pname = "BSD-Resource"; version = "1.2911"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHI/BSD-Resource-1.2911.tar.gz"; sha256 = "0g8c7825ng2m0yz5sy6838rvfdl8j3vm29524wjgf66ccfhgn74x"; }; meta = { @@ -1165,7 +1165,7 @@ let pname = "B-Utils"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz"; sha256 = "1spzhmk3z6c4blmra3kn84nq20fira2b3vjg86m0j085lgv56zzr"; }; propagatedBuildInputs = [ TaskWeaken ]; @@ -1180,7 +1180,7 @@ let pname = "Business-Hours"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Business-Hours-0.13.tar.gz"; sha256 = "1hiybixagj3i1hsnfr134jgs9wv4azkwq6kijr9zlkxqzczzw1x8"; }; propagatedBuildInputs = [ SetIntSpan ]; @@ -1193,7 +1193,7 @@ let pname = "Business-ISBN"; version = "3.005"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.005.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-3.005.tar.gz"; sha256 = "0aifzqj3xvxi8x0103ddpb2bagfsz15c71k69vdpcqy582pgnc35"; }; propagatedBuildInputs = [ BusinessISBNData ]; @@ -1207,7 +1207,7 @@ let pname = "Business-ISBN-Data"; version = "20191107"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20191107.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISBN-Data-20191107.tar.gz"; sha256 = "03faqnxx7qxgr2dcdra2iq60ziilpkas2ra41cs8klwky5j4yk44"; }; meta = { @@ -1220,7 +1220,7 @@ let pname = "Business-ISMN"; version = "1.201"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.201.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISMN-1.201.tar.gz"; sha256 = "1cpcfyaz1fl6fnm076jx2jsphw147wj6aszj2yzqrgsncjhk2cja"; }; propagatedBuildInputs = [ TieCycle ]; @@ -1234,7 +1234,7 @@ let pname = "Business-ISSN"; version = "1.003"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Business-ISSN-1.003.tar.gz"; sha256 = "1272456c19937a24bc5f9a0db9dc447043591137719ee4dc955a63be544b99d1"; }; meta = { @@ -1262,7 +1262,7 @@ let pname = "Cache-Cache"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Cache-Cache-1.08.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Cache-Cache-1.08.tar.gz"; sha256 = "1s6i670dc3yb6ngvdk48y6szdk5n1f4icdcjv2vi1l2xp9fzviyj"; }; propagatedBuildInputs = [ DigestSHA1 Error IPCShareLite ]; @@ -1273,7 +1273,7 @@ let pname = "Cache-FastMmap"; version = "1.48"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.48.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROBM/Cache-FastMmap-1.48.tar.gz"; sha256 = "118y5lxwa092zrii7mcwnqypff7424w1dpgfkg8zlnz7h2mmnd9c"; }; }; @@ -1298,7 +1298,7 @@ let version = "1.30"; src = fetchurl { url = - mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.30.tar.gz; + "mirror://cpan/authors/id/D/DO/DORMANDO/Cache-Memcached-1.30.tar.gz"; sha256 = "1aa2mjn5767b13063nnsrwcikrnbspby7j1c5q007bzaq0gcbcri"; }; propagatedBuildInputs = [ StringCRC32 ]; @@ -1308,7 +1308,7 @@ let pname = "Cache-Memcached-Fast"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RAZ/Cache-Memcached-Fast-0.25.tar.gz"; sha256 = "0ijw5hlzas1aprp3s6wzabch426m1d8cvp1wn9qphrn4jj82aakq"; }; meta = { @@ -1321,7 +1321,7 @@ let pname = "Cache"; version = "2.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Cache-2.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Cache-2.11.tar.gz"; sha256 = "14m513f4g02daklmnvdm7vqh3w3ick65wvmvqnmnc4cqfybdilp1"; }; propagatedBuildInputs = [ DBFile FileNFSLock HeapFibonacci IOString TimeDate ]; @@ -1332,7 +1332,7 @@ let pname = "Cache-Simple-TimedExpiry"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/Cache-Simple-TimedExpiry-0.27.tar.gz"; sha256 = "4e78b7e4dd231b5571a48cd0ee1b63953f5e34790c9d020e1595a7c7d0abbe49"; }; meta = { @@ -1345,12 +1345,12 @@ let pname = "Cairo"; version = "1.107"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.107.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-1.107.tar.gz"; sha256 = "0sg1gf1f2pjq7pji0zsv4rbi3bzpsx82z98k7yqxafzrvlkf27ay"; }; buildInputs = [ pkgs.cairo ]; meta = { - homepage = http://gtk2-perl.sourceforge.net/; + homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl interface to the cairo 2D vector graphics library"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -1361,7 +1361,7 @@ let pname = "Cairo-GObject"; version = "1.005"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Cairo-GObject-1.005.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Cairo-GObject-1.005.tar.gz"; sha256 = "0l2wcz77ndmbgvxx34gdm919a3dxh9fixqr47p50n78ysx2692cd"; }; buildInputs = [ pkgs.cairo ]; @@ -1376,7 +1376,7 @@ let pname = "CAM-PDF"; version = "1.60"; src = fetchurl { - url = mirror://cpan/authors/id/C/CD/CDOLAN/CAM-PDF-1.60.tar.gz; + url = "mirror://cpan/authors/id/C/CD/CDOLAN/CAM-PDF-1.60.tar.gz"; sha256 = "12dv5ssf3y7yjz9mrrqnfzx8nf4ydk1qijf5fx59495671zzqsp7"; }; propagatedBuildInputs = [ CryptRC4 TextPDF ]; @@ -1386,7 +1386,7 @@ let pname = "capitalization"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/capitalization-0.03.tar.gz"; sha256 = "0g7fpckydzxsf8mjkfbyj0pv42dzym4hwbizqahnh7wlfbaicdgi"; }; propagatedBuildInputs = [ DevelSymdump ]; @@ -1398,7 +1398,7 @@ let pname = "Canary-Stability"; version = "2013"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2013.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Canary-Stability-2013.tar.gz"; sha256 = "a5c91c62cf95fcb868f60eab5c832908f6905221013fea2bce3ff57046d7b6ea"; }; meta = { @@ -1410,7 +1410,7 @@ let pname = "Captcha-reCaptcha"; version = "0.99"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SUNNYP/Captcha-reCaptcha-0.99.tar.gz; + url = "mirror://cpan/authors/id/S/SU/SUNNYP/Captcha-reCaptcha-0.99.tar.gz"; sha256 = "14j3lk6fhfzda5d3d7z6f373ng3fzxazzwpjyziysrhic1v3b4mq"; }; propagatedBuildInputs = [ HTMLTiny LWP ]; @@ -1420,7 +1420,7 @@ let pname = "Capture-Tiny"; version = "0.48"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.48.tar.gz"; sha256 = "069yrikrrb4vqzc3hrkkfj96apsh7q0hg8lhihq97lxshwz128vc"; }; meta = { @@ -1433,7 +1433,7 @@ let pname = "Carp-Always"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Carp-Always-0.16.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Carp-Always-0.16.tar.gz"; sha256 = "1wb6b0qjga7kvn4p8df6k4g1pl2yzaqiln1713xidh3i454i3alq"; }; meta = { @@ -1447,7 +1447,7 @@ let pname = "Carp-Assert"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Carp-Assert-0.21.tar.gz"; sha256 = "0km5fc6r6whxh6h5yd7g1j0bi96sgk0gkda6cardicrw9qmqwkwj"; }; meta = { @@ -1458,7 +1458,7 @@ let pname = "Carp-Assert-More"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.20.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Carp-Assert-More-1.20.tar.gz"; sha256 = "16jnhdjgfwymrc5fki4xlf1rlziszf9k6q0245g976124k708ac5"; }; propagatedBuildInputs = [ CarpAssert ]; @@ -1472,7 +1472,7 @@ let pname = "Carp-Clan"; version = "6.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Carp-Clan-6.08.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Carp-Clan-6.08.tar.gz"; sha256 = "0237xx3rqa72sr4vdvws9r1m453h5f25bl85mdjmmk128kir4py7"; }; meta = { @@ -1485,12 +1485,12 @@ let pname = "Carton"; version = "1.0.34"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.34.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Carton-v1.0.34.tar.gz"; sha256 = "77d42b92732bcfc18a59d341e56ce476205b1c4d380eab3a07224f5745c23e45"; }; propagatedBuildInputs = [ MenloLegacy PathTiny TryTiny ]; meta = { - homepage = https://github.com/perl-carton/carton; + homepage = "https://github.com/perl-carton/carton"; description = "Perl module dependency manager (aka Bundler for Perl)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1500,7 +1500,7 @@ let pname = "Catalyst-Action-RenderView"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Action-RenderView-0.16.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Action-RenderView-0.16.tar.gz"; sha256 = "8565203950a057d43ecd64e9593715d565c2fbd8b02c91f43c53b2111acd3948"; }; propagatedBuildInputs = [ CatalystRuntime DataVisitor ]; @@ -1515,7 +1515,7 @@ let pname = "Catalyst-Action-REST"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.21.tar.gz; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Action-REST-1.21.tar.gz"; sha256 = "ccf81bba5200d3a0ad6901f923af173a3d4416618aea08a6938baaffdef4cb20"; }; buildInputs = [ TestRequires ]; @@ -1530,7 +1530,7 @@ let pname = "Catalyst-Authentication-Credential-HTTP"; version = "1.018"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Credential-HTTP-1.018.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Credential-HTTP-1.018.tar.gz"; sha256 = "0ad5clfiyllnf37an99n139cxhhxf5g5rh8cxashsjv4xrnq38bg"; }; buildInputs = [ ModuleBuildTiny TestException TestMockObject TestNeeds ]; @@ -1545,7 +1545,7 @@ let pname = "Catalyst-Authentication-Store-Htpasswd"; version = "1.006"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Store-Htpasswd-1.006.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-Authentication-Store-Htpasswd-1.006.tar.gz"; sha256 = "0kw0w2g1qmym896bgnqr1bfhvgb6xja39mv10701ipp8fmi8bzf7"; }; buildInputs = [ ModuleBuildTiny TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -1556,7 +1556,7 @@ let pname = "Catalyst-Authentication-Store-DBIx-Class"; version = "0.1506"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-DBIx-Class-0.1506.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Authentication-Store-DBIx-Class-0.1506.tar.gz"; sha256 = "0i5ja7690fs9nhxcij6lw51j804sm8s06m5mvk1n8pi8jljrymvw"; }; propagatedBuildInputs = [ CatalystModelDBICSchema CatalystPluginAuthentication ]; @@ -1571,7 +1571,7 @@ let pname = "Catalyst-Component-InstancePerContext"; version = "0.001001"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRODITI/Catalyst-Component-InstancePerContext-0.001001.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRODITI/Catalyst-Component-InstancePerContext-0.001001.tar.gz"; sha256 = "7f63f930e1e613f15955c9e6d73873675c50c0a3bc2a61a034733361ed26d271"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -1585,7 +1585,7 @@ let pname = "Catalyst-Controller-HTML-FormFu"; version = "2.04"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.04.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIGELM/Catalyst-Controller-HTML-FormFu-2.04.tar.gz"; sha256 = "f13fb9b3b3b00b35f06abc31614461c8d7346fbe07fb569c71e8d586e5eb5ddc"; }; buildInputs = [ CatalystActionRenderView CatalystPluginSession CatalystPluginSessionStateCookie CatalystPluginSessionStoreFile CatalystViewTT CodeTidyAllPluginPerlAlignMooseAttributes PodCoverageTrustPod PodTidy TemplateToolkit TestCPANMeta TestDifferences TestEOL TestKwalitee TestLongString TestMemoryCycle TestNoTabs TestPAUSEPermissions TestPod TestPodCoverage TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -1601,7 +1601,7 @@ let pname = "Catalyst-Controller-POD"; version = "1.0.0"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLER/Catalyst-Controller-POD-1.0.0.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLER/Catalyst-Controller-POD-1.0.0.tar.gz"; sha256 = "ee2a4bb3ed78baa1464335408f284345b6ba0ef6576ad7bfbd7b656c788a39f9"; }; buildInputs = [ ModuleInstall TestLongString TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -1616,13 +1616,13 @@ let pname = "Catalyst-Devel"; version = "1.39"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Devel-1.39.tar.gz"; sha256 = "bce371ba801c7d79eff3257e0af907cf62f140de968f0d63bf55be37d702a58a"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ CatalystActionRenderView CatalystPluginConfigLoader CatalystPluginStaticSimple ConfigGeneral FileChangeNotify FileCopyRecursive ModuleInstall TemplateToolkit ]; meta = { - homepage = http://wiki.catalystframework.org/wiki/; + homepage = "http://wiki.catalystframework.org/wiki/"; description = "Catalyst Development Tools"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1632,7 +1632,7 @@ let pname = "Catalyst-DispatchType-Regex"; version = "5.90035"; src = fetchurl { - url = mirror://cpan/authors/id/M/MG/MGRIMES/Catalyst-DispatchType-Regex-5.90035.tar.gz; + url = "mirror://cpan/authors/id/M/MG/MGRIMES/Catalyst-DispatchType-Regex-5.90035.tar.gz"; sha256 = "06jq1lmpq88rmp9zik5gqczg234xac0hiyc3l698iif7zsgcyb80"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -1646,7 +1646,7 @@ let pname = "Catalyst-Manual"; version = "5.9010"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9010.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-Manual-5.9010.tar.gz"; sha256 = "1xg2m6d76xl0a76vq0v4yv25458d6df00k5xq1ab2z8mzvwbm4ah"; }; meta = { @@ -1659,7 +1659,7 @@ let pname = "Catalyst-Model-DBIC-Schema"; version = "0.65"; src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBJK/Catalyst-Model-DBIC-Schema-0.65.tar.gz; + url = "mirror://cpan/authors/id/G/GB/GBJK/Catalyst-Model-DBIC-Schema-0.65.tar.gz"; sha256 = "26a911ef5ef7ffc81b6ce65c3156f71fb35083c456ad27e6d82d2dc02493eeea"; }; buildInputs = [ DBDSQLite TestException TestRequires ]; @@ -1674,13 +1674,13 @@ let pname = "Catalyst-Runtime"; version = "5.90126"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90126.tar.gz; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Runtime-5.90126.tar.gz"; sha256 = "66f08334bf8b70049e77c0dcafd741c568e6f1341b2ffbb531a93833638d3986"; }; buildInputs = [ TestFatal TypeTiny ]; propagatedBuildInputs = [ CGISimple CGIStruct ClassC3AdoptNEXT DataDump HTTPBody ModulePluggable MooseXEmulateClassAccessorFast MooseXGetopt MooseXMethodAttributes MooseXRoleWithOverloading PathClass PerlIOutf8_strict PlackMiddlewareFixMissingBodyInRedirect PlackMiddlewareMethodOverride PlackMiddlewareRemoveRedundantBody PlackMiddlewareReverseProxy PlackTestExternalServer SafeIsa StringRewritePrefix TaskWeaken TextSimpleTable TreeSimpleVisitorFactory URIws ]; meta = { - homepage = http://wiki.catalystframework.org/wiki/; + homepage = "http://wiki.catalystframework.org/wiki/"; description = "The Catalyst Framework Runtime"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -1690,7 +1690,7 @@ let pname = "Catalyst-Plugin-AccessLog"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARODLAND/Catalyst-Plugin-AccessLog-1.10.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/Catalyst-Plugin-AccessLog-1.10.tar.gz"; sha256 = "873db8e4e72a994e3e17aeb53d2b837e6d524b4b8b0f3539f262135c88cc2120"; }; propagatedBuildInputs = [ CatalystRuntime DateTime ]; @@ -1704,7 +1704,7 @@ let pname = "Catalyst-Plugin-Authentication"; version = "0.10023"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-0.10023.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authentication-0.10023.tar.gz"; sha256 = "0v6hb4r1wv3djrnqvnjcn3xx1scgqzx8nyjdg9lfc1ybvamrl0rn"; }; buildInputs = [ TestException ]; @@ -1719,7 +1719,7 @@ let pname = "Catalyst-Plugin-Authorization-ACL"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-0.16.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-Authorization-ACL-0.16.tar.gz"; sha256 = "0z4328rr6l9xi45hyv6q9pwwamp0864q6skcp29jrz9f919ycdra"; }; propagatedBuildInputs = [ CatalystRuntime ClassThrowable ]; @@ -1730,7 +1730,7 @@ let pname = "Catalyst-Plugin-Authorization-Roles"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authorization-Roles-0.09.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Authorization-Roles-0.09.tar.gz"; sha256 = "0l83lkwmq0lngwh8b1rv3r719pn8w1gdbyhjqm74rnd0wbjl8h7f"; }; buildInputs = [ TestException ]; @@ -1745,7 +1745,7 @@ let pname = "Catalyst-Plugin-Cache"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-0.12.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Cache-0.12.tar.gz"; sha256 = "1q23aipvrl888h06ldr4mmjbykz0j4rqwipxg1jv094kki2fspr9"; }; buildInputs = [ ClassAccessor TestDeep TestException ]; @@ -1760,7 +1760,7 @@ let pname = "Catalyst-Plugin-Cache-HTTP"; version = "0.001000"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRAF/Catalyst-Plugin-Cache-HTTP-0.001000.tar.gz"; sha256 = "0v5iphbq4csc4r6wkvxnqlh97p8g0yhjky9qqmsdyqczn87agbba"; }; buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst ]; @@ -1775,7 +1775,7 @@ let pname = "Catalyst-Plugin-Captcha"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DI/DIEGOK/Catalyst-Plugin-Captcha-0.04.tar.gz; + url = "mirror://cpan/authors/id/D/DI/DIEGOK/Catalyst-Plugin-Captcha-0.04.tar.gz"; sha256 = "0llyj3v5nx9cx46jdbbvxf1lc9s9cxq5ml22xmx3wkb201r5qgaa"; }; propagatedBuildInputs = [ CatalystPluginSession GDSecurityImage ]; @@ -1788,7 +1788,7 @@ let pname = "Catalyst-Plugin-ConfigLoader"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-ConfigLoader-0.34.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-ConfigLoader-0.34.tar.gz"; sha256 = "19j7p4v7mbx6wrmpvmrnd974apx7hdl2s095ga3b9zcbdrl77h5q"; }; propagatedBuildInputs = [ CatalystRuntime ConfigAny DataVisitor ]; @@ -1798,7 +1798,7 @@ let pname = "Catalyst-Plugin-FormValidator"; version = "0.094"; src = fetchurl { - url = mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-0.094.tar.gz; + url = "mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-0.094.tar.gz"; sha256 = "5834f11bf5c9f4b5d336d65c7ce6639b76ce7bfe7a2875eb048d7ea1c82ce05a"; }; propagatedBuildInputs = [ CatalystRuntime DataFormValidator ]; @@ -1812,7 +1812,7 @@ let pname = "Catalyst-Plugin-FormValidator-Simple"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-Simple-0.15.tar.gz; + url = "mirror://cpan/authors/id/D/DH/DHOSS/Catalyst-Plugin-FormValidator-Simple-0.15.tar.gz"; sha256 = "486c6a0e8f410fd017279f4804ab9e35ba46321d33a0a9721fe1e08a391de7a0"; }; propagatedBuildInputs = [ CatalystPluginFormValidator FormValidatorSimple ]; @@ -1825,7 +1825,7 @@ let pname = "Catalyst-Plugin-Log-Handler"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEPE/Catalyst-Plugin-Log-Handler-0.08.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEPE/Catalyst-Plugin-Log-Handler-0.08.tar.gz"; sha256 = "0db3c3a57b4ee3d789ba5129890e2858913fef00d8185bdc9c5d7fde31e043ef"; }; propagatedBuildInputs = [ ClassAccessor LogHandler MROCompat ]; @@ -1839,7 +1839,7 @@ let pname = "Catalyst-Plugin-Session"; version = "0.41"; src = fetchurl { - url = mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-Session-0.41.tar.gz; + url = "mirror://cpan/authors/id/J/JJ/JJNAPIORK/Catalyst-Plugin-Session-0.41.tar.gz"; sha256 = "0a451997zc2vjx7rvndgx1ldbrpic8sfbddyvncynh0zr8bhlqc5"; }; buildInputs = [ TestDeep TestException TestWWWMechanizePSGI ]; @@ -1854,7 +1854,7 @@ let pname = "Catalyst-Plugin-Session-DynamicExpiry"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-DynamicExpiry-0.04.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-DynamicExpiry-0.04.tar.gz"; sha256 = "7707c56734cdb1512f733dc400fadf6f4c53cb217b58207857824dad6780a079"; }; propagatedBuildInputs = [ CatalystPluginSession ]; @@ -1868,7 +1868,7 @@ let pname = "Catalyst-Plugin-Session-State-Cookie"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/Catalyst-Plugin-Session-State-Cookie-0.17.tar.gz"; sha256 = "1rvxbfnpf9x2pc2zgpazlcgdlr2dijmxgmcs0m5nazs0w6xikssb"; }; propagatedBuildInputs = [ CatalystPluginSession ]; @@ -1878,7 +1878,7 @@ let pname = "Catalyst-Plugin-Session-Store-FastMmap"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-Store-FastMmap-0.16.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-Session-Store-FastMmap-0.16.tar.gz"; sha256 = "0x3j6zv3wr41jlwr6yb2jpmcx019ibyn11y8653ffnwhpzbpzsxs"; }; propagatedBuildInputs = [ CacheFastMmap CatalystPluginSession ]; @@ -1888,7 +1888,7 @@ let pname = "Catalyst-Plugin-Session-Store-File"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Catalyst-Plugin-Session-Store-File-0.18.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Catalyst-Plugin-Session-Store-File-0.18.tar.gz"; sha256 = "54738e3ce76f8be8b66947092d28973c73d79d1ee19b5d92b057552f8ff09b4f"; }; propagatedBuildInputs = [ CacheCache CatalystPluginSession ClassDataInheritable ]; @@ -1902,7 +1902,7 @@ let pname = "Catalyst-Plugin-SmartURI"; version = "0.041"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-SmartURI-0.041.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/Catalyst-Plugin-SmartURI-0.041.tar.gz"; sha256 = "0msz3w2vfdb5w4ixi5llq66xlhm0181gjz9xj8yj0lalk232326b"; }; propagatedBuildInputs = [ CatalystRuntime ClassC3Componentised ]; @@ -1917,7 +1917,7 @@ let pname = "Catalyst-Plugin-StackTrace"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-StackTrace-0.12.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Plugin-StackTrace-0.12.tar.gz"; sha256 = "1b2ksz74cpigxqzf63rddar3vfmnbpwpdcbs11v0ml89pb8ar79j"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -1931,7 +1931,7 @@ let pname = "Catalyst-Plugin-Static-Simple"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.36.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Catalyst-Plugin-Static-Simple-0.36.tar.gz"; sha256 = "0m4l627p2fvzr4i6sgdxhdvsx4wpa6qmaibsbxlg5x5yjs7k7drn"; }; patches = [ ../development/perl-modules/catalyst-plugin-static-simple-etag.patch ]; @@ -1946,7 +1946,7 @@ let pname = "Catalyst-Plugin-StatusMessage"; version = "1.002000"; src = fetchurl { - url = mirror://cpan/authors/id/H/HK/HKCLARK/Catalyst-Plugin-StatusMessage-1.002000.tar.gz; + url = "mirror://cpan/authors/id/H/HK/HKCLARK/Catalyst-Plugin-StatusMessage-1.002000.tar.gz"; sha256 = "649c894ab16f9f48ada8f9cc599a7ecbb8891ab3761ff6fd510520c6de407c1f"; }; propagatedBuildInputs = [ CatalystRuntime strictures ]; @@ -1960,7 +1960,7 @@ let pname = "Catalyst-View-CSV"; version = "1.7"; src = fetchurl { - url = mirror://cpan/authors/id/M/MC/MCB/Catalyst-View-CSV-1.7.tar.gz; + url = "mirror://cpan/authors/id/M/MC/MCB/Catalyst-View-CSV-1.7.tar.gz"; sha256 = "e41326b6099891f244b432921ed10096ac619f32b8c4f8b41633313bd54662db"; }; buildInputs = [ CatalystActionRenderView CatalystModelDBICSchema CatalystPluginConfigLoader CatalystXComponentTraits ConfigGeneral DBDSQLite DBIxClass TestException ]; @@ -1975,7 +1975,7 @@ let pname = "Catalyst-View-Download"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAUDEON/Catalyst-View-Download-0.09.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAUDEON/Catalyst-View-Download-0.09.tar.gz"; sha256 = "1qgq6y9iwfbhbkbgpw9czang2ami6z8jk1zlagrzdisy4igqzkvs"; }; buildInputs = [ CatalystRuntime TestLongString TestSimple13 TestWWWMechanize TestWWWMechanizeCatalyst TextCSV XMLSimple ]; @@ -1988,7 +1988,7 @@ let pname = "Catalyst-View-JSON"; version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Catalyst-View-JSON-0.37.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Catalyst-View-JSON-0.37.tar.gz"; sha256 = "1v4xkzazs743sc7cd1kxkbi99cf00a4dadyyancckcbpi9p3znn5"; }; propagatedBuildInputs = [ CatalystRuntime ]; @@ -2002,7 +2002,7 @@ let pname = "Catalyst-View-TT"; version = "0.44"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Catalyst-View-TT-0.44.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Catalyst-View-TT-0.44.tar.gz"; sha256 = "06d1zg4nbb6kcyjbnyxrkf8z4zlscxr8650d94f7187jygfl8rvh"; }; propagatedBuildInputs = [ CatalystRuntime ClassAccessor TemplateTimer ]; @@ -2016,7 +2016,7 @@ let pname = "CatalystX-Component-Traits"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/CatalystX-Component-Traits-0.19.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/CatalystX-Component-Traits-0.19.tar.gz"; sha256 = "0iq4ci8m6g2c4g01fvdl568y7pjz28f3widk986v3pyhr7ll8j88"; }; propagatedBuildInputs = [ CatalystRuntime MooseXTraitsPluggable ]; @@ -2026,7 +2026,7 @@ let pname = "CatalystX-RoleApplicator"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/H/HD/HDP/CatalystX-RoleApplicator-0.005.tar.gz; + url = "mirror://cpan/authors/id/H/HD/HDP/CatalystX-RoleApplicator-0.005.tar.gz"; sha256 = "0vwaapxn8g5hs2xp63c4dwv9jmapmji4272fakssvgc9frklg3p2"; }; propagatedBuildInputs = [ CatalystRuntime MooseXRelatedClassRoles ]; @@ -2036,7 +2036,7 @@ let pname = "Catalyst-TraitFor-Request-ProxyBase"; version = "0.000005"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-TraitFor-Request-ProxyBase-0.000005.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-TraitFor-Request-ProxyBase-0.000005.tar.gz"; sha256 = "a7bf0faa7e12ca5df625d9f5fc710f11bfd16ba5385837e48d42b3d286c9710a"; }; buildInputs = [ CatalystRuntime CatalystXRoleApplicator HTTPMessage ]; @@ -2051,7 +2051,7 @@ let pname = "CatalystX-Script-Server-Starman"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.03.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABRAXXA/CatalystX-Script-Server-Starman-0.03.tar.gz"; sha256 = "08jvibq4v8xjj0c3cr93h0w8w0c88ajwjn37xjy7ygxl9krlffp6"; }; patches = [ @@ -2070,7 +2070,7 @@ let pname = "CDB_File"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/CDB_File-1.02.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/CDB_File-1.02.tar.gz"; sha256 = "a0ae46916a190dd746be9fb11cda51cfb27dfec0f21e15e1ec2773dadc50c05f"; }; meta = { @@ -2085,7 +2085,7 @@ let pname = "Catmandu"; version = "1.2011"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2011.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NICS/Catmandu-1.2011.tar.gz"; sha256 = "0awl5qhciphnr1ihq66ssd2hzxvh1ddbr016sxb0qhxbzqv77sb9"; }; propagatedBuildInputs = [ AnyURIEscape AppCmd CGIExpand ConfigOnion CpanelJSONXS DataCompare DataUtil IOHandleUtil LWP ListMoreUtils LogAny MIMETypes ModuleInfo MooXAliases ParserMGC PathIteratorRule PathTiny StringCamelCase TextCSV TextHogan Throwable TryTinyByClass URITemplate UUIDTiny YAMLLibYAML namespaceclean ]; @@ -2101,7 +2101,7 @@ let pname = "CDDB_get"; version = "2.28"; src = fetchurl { - url = mirror://cpan/authors/id/F/FO/FONKIE/CDDB_get-2.28.tar.gz; + url = "mirror://cpan/authors/id/F/FO/FONKIE/CDDB_get-2.28.tar.gz"; sha256 = "1jfrwvfasylcafbvb0jjm94ad4v6k99a7rf5i4qwzhg4m0gvmk5x"; }; meta = { @@ -2115,7 +2115,7 @@ let pname = "CGI"; version = "4.45"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.45.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.45.tar.gz"; sha256 = "f6c1513740ee502e947d30131da18a5595dbcd19962d3dd0ff5dedf3cd1ed407"; }; buildInputs = [ TestDeep TestNoWarnings TestWarn ]; @@ -2130,7 +2130,7 @@ let pname = "CGI-Compile"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.24.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/CGI-Compile-0.24.tar.gz"; sha256 = "1zyz35hmflgm9jibi0mkni7n13lg5wwfvkavpzqgyza6kgzp515j"; }; propagatedBuildInputs = [ Filepushd SubName ]; @@ -2146,7 +2146,7 @@ let pname = "CGI-Cookie-XS"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGENT/CGI-Cookie-XS-0.18.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGENT/CGI-Cookie-XS-0.18.tar.gz"; sha256 = "1iixvnm0l1q24vdlnayb4vd8fns2bdlhm6zb7fpi884ppm5cp6a6"; }; }; @@ -2155,13 +2155,13 @@ let pname = "CGI-Emulate-PSGI"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/CGI-Emulate-PSGI-0.23.tar.gz"; sha256 = "dd5b6c353f08fba100dae09904284f7f73f8328d31f6a67b2c136fad728d158b"; }; buildInputs = [ TestRequires ]; propagatedBuildInputs = [ CGI HTTPMessage ]; meta = { - homepage = https://github.com/tokuhirom/p5-cgi-emulate-psgi; + homepage = "https://github.com/tokuhirom/p5-cgi-emulate-psgi"; description = "PSGI adapter for CGI"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -2171,7 +2171,7 @@ let pname = "CGI-Expand"; version = "2.05"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.05.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOWMANBS/CGI-Expand-2.05.tar.gz"; sha256 = "1ad48nd067j5irjampxpw3zvzpg8wpnpan6szkdc5h64wccd30kf"; }; meta = { @@ -2184,7 +2184,7 @@ let pname = "CGI-Fast"; version = "2.15"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.15.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEJO/CGI-Fast-2.15.tar.gz"; sha256 = "e5342df3dc593edfb724c7afe850b1a0ee753f4d733f5193e037b04633dfeece"; }; propagatedBuildInputs = [ CGI FCGI ]; @@ -2198,7 +2198,7 @@ let pname = "CGI-FormBuilder"; version = "3.10"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BIGPRESH/CGI-FormBuilder-3.10.tar.gz"; sha256 = "163ixq9kninqq094z2rnkg9pv3bcmvjphlww4vksfrzhq3h9pjdf"; }; @@ -2209,7 +2209,7 @@ let pname = "CGI-Minimal"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.29.tar.gz; + url = "mirror://cpan/authors/id/S/SN/SNOWHARE/CGI-Minimal-1.29.tar.gz"; sha256 = "36c785ffacf5cdee4f1a7219ca1848b7e1700bdd71cd9116e1f00545ec88475d"; }; meta = { @@ -2222,7 +2222,7 @@ let pname = "CGI-PSGI"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/CGI-PSGI-0.15.tar.gz"; sha256 = "c50dcb10bf8486a9843baed032ad89d879ff2f41c993342dead62f947a598d91"; }; propagatedBuildInputs = [ CGI ]; @@ -2236,7 +2236,7 @@ let pname = "CGI-Session"; version = "4.48"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKSTOS/CGI-Session-4.48.tar.gz"; sha256 = "1xsl2pz1jrh127pq0b01yffnj4mnp9nvkp88h5mndrscq9hn8xa6"; }; propagatedBuildInputs = [ CGI ]; @@ -2246,7 +2246,7 @@ let pname = "CGI-Simple"; version = "1.22"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.22.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/CGI-Simple-1.22.tar.gz"; sha256 = "13c7iwnnavky10ab87pi8jc1kqph03s0rhvj7myn7szhbfisc4gn"; }; propagatedBuildInputs = [ IOStringy ]; @@ -2261,7 +2261,7 @@ let pname = "CGI-Struct"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/F/FU/FULLERMD/CGI-Struct-1.21.tar.gz; + url = "mirror://cpan/authors/id/F/FU/FULLERMD/CGI-Struct-1.21.tar.gz"; sha256 = "d13d8da7fdcd6d906054e4760fc28a718aec91bd3cf067a58927fb7cb1c09d6c"; }; buildInputs = [ TestDeep ]; @@ -2275,7 +2275,7 @@ let pname = "CHI"; version = "0.60"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSWARTZ/CHI-0.60.tar.gz"; sha256 = "c7f1a2b3570a8fede484e933f89ba1729e0abd05935791d146c522dd120ee851"; }; preConfigure = '' @@ -2294,7 +2294,7 @@ let pname = "Chart"; version = "2.4.10"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHARTGRP/Chart-2.4.10.tar.gz"; sha256 = "84bd99a1a0ce72477b15e35881e6120398bb3f553aeeb5e8d72b088520e4f6bf"; }; propagatedBuildInputs = [ GD ]; @@ -2323,7 +2323,7 @@ let pname = "Class-Accessor"; version = "0.51"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.51.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KASEI/Class-Accessor-0.51.tar.gz"; sha256 = "07215zzr4ydf49832vn54i3gf2q5b97lydkv8j56wb2svvjs64mz"; }; meta = { @@ -2335,7 +2335,7 @@ let pname = "Class-Accessor-Chained"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz"; sha256 = "1lilrjy1s0q5hyr0888kf0ifxjyl2iyk4vxil4jsv0sgh39lkgx5"; }; propagatedBuildInputs = [ ClassAccessor ]; @@ -2345,7 +2345,7 @@ let pname = "Class-Accessor-Grouped"; version = "0.10014"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Class-Accessor-Grouped-0.10014.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Class-Accessor-Grouped-0.10014.tar.gz"; sha256 = "35d5b03efc09f67f3a3155c9624126c3e162c8e3ca98ff826db358533a44c4bb"; }; buildInputs = [ TestException ]; @@ -2360,7 +2360,7 @@ let pname = "Class-Accessor-Lite"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Class-Accessor-Lite-0.08.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Class-Accessor-Lite-0.08.tar.gz"; sha256 = "75b3b8ec8efe687677b63f0a10eef966e01f60735c56656ce75cbb44caba335a"; }; meta = { @@ -2373,7 +2373,7 @@ let pname = "Class-Autouse"; version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-2.01.tar.gz; + url = "mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-2.01.tar.gz"; sha256 = "c05b3236c05719d819c20db0fdeb6d0954747e43d7a738294eed7fbcf36ecf1b"; }; meta = { @@ -2386,7 +2386,7 @@ let pname = "Class-Base"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YA/YANICK/Class-Base-0.09.tar.gz; + url = "mirror://cpan/authors/id/Y/YA/YANICK/Class-Base-0.09.tar.gz"; sha256 = "117dmsrb30a09zlrv919fb5h5rg8r4asa24i99k04n2habgbv9g1"; }; propagatedBuildInputs = [ Clone ]; @@ -2396,7 +2396,7 @@ let pname = "Class-C3"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.34.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Class-C3-0.34.tar.gz"; sha256 = "1dcibc31v5jwmi6hsdzi7c5ag1sb4wp3kxkibc889qrdj7jm12sd"; }; propagatedBuildInputs = [ AlgorithmC3 ]; @@ -2410,7 +2410,7 @@ let pname = "Class-C3-Adopt-NEXT"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Class-C3-Adopt-NEXT-0.14.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-C3-Adopt-NEXT-0.14.tar.gz"; sha256 = "1xsbydmiskpa1qbmnf6n39cb83nlb432xgkad9kfhxnvm8jn4rw5"; }; buildInputs = [ ModuleBuildTiny TestException ]; @@ -2425,7 +2425,7 @@ let pname = "Class-C3-Componentised"; version = "1.001002"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Class-C3-Componentised-1.001002.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Class-C3-Componentised-1.001002.tar.gz"; sha256 = "14wn1g45z3b5apqq7dcai5drk01hfyqydsd2m6hsxzhyvi3b2l9h"; }; buildInputs = [ TestException ]; @@ -2439,7 +2439,7 @@ let pname = "Class-Classgen-classgen"; version = "3.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHLUE/Class-Classgen-classgen-3.03.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHLUE/Class-Classgen-classgen-3.03.tar.gz"; sha256 = "9b65d41b991538992e816b32cc4fa9b4a4a0bb3e9c10e7eebeff82658dbbc8f6"; }; }; @@ -2448,7 +2448,7 @@ let pname = "Class-Container"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.13.tar.gz; + url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/Class-Container-0.13.tar.gz"; sha256 = "f5d495b1dfb826d5c0c45d03b4d0e6b6047cbb06cdbf6be15fd4dc902aeeb70b"; }; propagatedBuildInputs = [ ParamsValidate ]; @@ -2462,7 +2462,7 @@ let pname = "Class-Data-Accessor"; version = "0.04004"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLACO/Class-Data-Accessor-0.04004.tar.gz"; sha256 = "0578m3rplk41059rkkjy1009xrmrdivjnv8yxadwwdk1vzidc8n1"; }; }; @@ -2471,7 +2471,7 @@ let pname = "Class-Data-Inheritable"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz; + url = "mirror://cpan/authors/id/T/TM/TMTM/Class-Data-Inheritable-0.08.tar.gz"; sha256 = "0jpi38wy5xh6p1mg2cbyjjw76vgbccqp46685r27w8hmxb7gwrwr"; }; }; @@ -2480,7 +2480,7 @@ let pname = "Class-EHierarchy"; version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/Class-EHierarchy-2.01.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Class-EHierarchy/Class-EHierarchy-2.01.tar.gz"; sha256 = "637ab76beb3832a9b071b999a1b15bf05d297df6a662ccb1a8004f2987308382"; }; meta = { @@ -2494,7 +2494,7 @@ let pname = "Class-Factory"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Class-Factory-1.06.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/Class-Factory-1.06.tar.gz"; sha256 = "c37a2d269eb935f36a23e113480ae0946fa7c12a12781396a1226c8e435f30f5"; }; }; @@ -2503,7 +2503,7 @@ let pname = "Class-Factory-Util"; version = "1.7"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Class-Factory-Util-1.7.tar.gz"; sha256 = "09ifd6v0c94vr20n9yr1dxgcp7hyscqq851szdip7y24bd26nlbc"; }; meta = { @@ -2516,7 +2516,7 @@ let pname = "Class-Gomor"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/G/GO/GOMOR/Class-Gomor-1.03.tar.gz; + url = "mirror://cpan/authors/id/G/GO/GOMOR/Class-Gomor-1.03.tar.gz"; sha256 = "02r0zylv8c5cb34j0w2kmf8hfw6g6bymfif7z65skzz9kkm3rns7"; }; meta = { @@ -2529,7 +2529,7 @@ let pname = "Class-Inspector"; version = "1.36"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.36.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Class-Inspector-1.36.tar.gz"; sha256 = "0kk900bp8iq7bw5jyllfb31gvf93mmp24n4x90j7qs3jlhimsafc"; }; meta = { @@ -2542,7 +2542,7 @@ let pname = "Class-ISA"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Class-ISA-0.36.tar.gz"; sha256 = "0r5r574i6wgxm8zsq4bc34d0dzprrh6h6mpp1nhlks1qk97g65l8"; }; }; @@ -2551,7 +2551,7 @@ let pname = "Class-Iterator"; version = "0.3"; src = fetchurl { - url = mirror://cpan/authors/id/T/TE/TEXMEC/Class-Iterator-0.3.tar.gz; + url = "mirror://cpan/authors/id/T/TE/TEXMEC/Class-Iterator-0.3.tar.gz"; sha256 = "db1ba87ca9107f161fe9c1e9e7e267c0026defc26fe3e73bcad8ab8ffc18ef9d"; }; meta = { @@ -2562,7 +2562,7 @@ let pname = "Class-MakeMethods"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/E/EV/EVO/Class-MakeMethods-1.01.tar.gz; + url = "mirror://cpan/authors/id/E/EV/EVO/Class-MakeMethods-1.01.tar.gz"; sha256 = "0ricb0mn0i06ngfhq5y035yx8i7ahlx83yyqwixqmv6hg4p79b5c"; }; preConfigure = '' @@ -2575,7 +2575,7 @@ let pname = "Class-MethodMaker"; version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.24.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCHWIGON/class-methodmaker/Class-MethodMaker-2.24.tar.gz"; sha256 = "0a03i4k3a33qqwhykhz5k437ld5mag2vq52vvsy03gbynb65ivsy"; }; # Remove unnecessary, non-autoconf, configure script. @@ -2590,7 +2590,7 @@ let pname = "Class-Method-Modifiers"; version = "2.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Method-Modifiers-2.13.tar.gz"; sha256 = "0qzx83mgd71hlc2m1kpw15dqsjzjq7b2cj3sdgg45a0q23vhfn5b"; }; buildInputs = [ TestFatal TestNeeds ]; @@ -2605,7 +2605,7 @@ let pname = "Class-Mix"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Class-Mix-0.006.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Class-Mix-0.006.tar.gz"; sha256 = "8747f643893914f8c44979f1716d0c1ec8a41394796555447944e860f1ff7c0b"; }; propagatedBuildInputs = [ ParamsClassify ]; @@ -2619,7 +2619,7 @@ let pname = "Class-ReturnValue"; version = "0.55"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/Class-ReturnValue-0.55.tar.gz"; sha256 = "ed3836885d78f734ccd7a98550ec422a616df7c31310c1b7b1f6459f5fb0e4bd"; }; propagatedBuildInputs = [ DevelStackTrace ]; @@ -2633,7 +2633,7 @@ let pname = "Class-Singleton"; version = "1.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/Class-Singleton-1.5.tar.gz"; sha256 = "0y7ngrjf551bjgmijp5rsidbkq6c8hb5lmy2jcqq0fify020s8iq"; }; }; @@ -2642,7 +2642,7 @@ let pname = "Class-Throwable"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMX/Class-Throwable-0.13.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMX/Class-Throwable-0.13.tar.gz"; sha256 = "1kmwzdxvp9ca2z44vl0ygkfygdbxqkilzjd8vqhc4vdmvbh136nw"; }; }; @@ -2651,7 +2651,7 @@ let pname = "Class-Tiny"; version = "1.006"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Class-Tiny-1.006.tar.gz"; sha256 = "0knbi1agcfc9d7fca0szvxr6335pb22pc5n648q1vrcba8qvvz1f"; }; meta = { @@ -2665,13 +2665,13 @@ let pname = "Class-Load"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.25.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Load-0.25.tar.gz"; sha256 = "2a48fa779b5297e56156380e8b32637c6c58decb4f4a7f3c7350523e11275f8f"; }; buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ DataOptList PackageStash ]; meta = { - homepage = https://github.com/moose/Class-Load; + homepage = "https://github.com/moose/Class-Load"; description = "A working (require \"Class::Name\") and more"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -2681,13 +2681,13 @@ let pname = "Class-Load-XS"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Class-Load-XS-0.10.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Class-Load-XS-0.10.tar.gz"; sha256 = "5bc22cf536ebfd2564c5bdaf42f0d8a4cee3d1930fc8b44b7d4a42038622add1"; }; buildInputs = [ TestFatal TestNeeds ]; propagatedBuildInputs = [ ClassLoad ]; meta = { - homepage = https://github.com/moose/Class-Load-XS; + homepage = "https://github.com/moose/Class-Load-XS"; description = "XS implementation of parts of Class::Load"; license = stdenv.lib.licenses.artistic2; }; @@ -2697,7 +2697,7 @@ let pname = "Class-Observable"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/C/CW/CWINTERS/Class-Observable-1.04.tar.gz; + url = "mirror://cpan/authors/id/C/CW/CWINTERS/Class-Observable-1.04.tar.gz"; sha256 = "3ef18733a0f03c113f3bcf8ac50476e09ca1fe6234f4aaacaa24dfca95168094"; }; propagatedBuildInputs = [ ClassISA ]; @@ -2707,7 +2707,7 @@ let pname = "Class-Std"; version = "0.013"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Class-Std-0.013.tar.gz"; sha256 = "bcd6d82f6c8af0fe069fced7dd165a4795b0b6e92351c7d4e5a1ab9a14fc35c6"; }; meta = { @@ -2720,7 +2720,7 @@ let pname = "Class-Std-Fast"; version = "0.0.8"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz; + url = "mirror://cpan/authors/id/A/AC/ACID/Class-Std-Fast-v0.0.8.tar.gz"; sha256 = "1057rz95jsr66gam472i4zdv04v7bmzph3m3jwq1hwx3qrikgm0v"; }; propagatedBuildInputs = [ ClassStd ]; @@ -2735,7 +2735,7 @@ let pname = "Class-Unload"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.11.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Class-Unload-0.11.tar.gz"; sha256 = "0pqa98z3ij6a3v9wkmvc8b410kv30y0xxqf0i6if3lp4lx3rgqjj"; }; propagatedBuildInputs = [ ClassInspector ]; @@ -2746,7 +2746,7 @@ let pname = "Class-Virtual"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.08.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/Class-Virtual-0.08.tar.gz"; sha256 = "c6499b42d3b4e5c6488a5e82fbc28698e6c9860165072dddfa6749355a9cfbb2"; }; propagatedBuildInputs = [ CarpAssert ClassDataInheritable ClassISA ]; @@ -2760,7 +2760,7 @@ let pname = "Class-XSAccessor"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Class-XSAccessor-1.19.tar.gz"; sha256 = "1wm6013il899jnm0vn50a7iv9v6r4nqywbqzj0csyf8jbwwnpicr"; }; meta = { @@ -2773,7 +2773,7 @@ let pname = "Clipboard"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.22.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Clipboard-0.22.tar.gz"; sha256 = "9fdb4dfc2e9bc2f3990b5b71649094dfe83aa12172c5a1809cf7e8b3be295ca7"; }; meta = { @@ -2793,7 +2793,7 @@ let pname = "Clone"; version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.43.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Clone-0.43.tar.gz"; sha256 = "1npf5s4b90ds6lv8gn76b2w4bdh0z5ni5zk4skgc2db5d12560lr"; }; meta = { @@ -2807,7 +2807,7 @@ let pname = "Clone-Choose"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz; + url = "mirror://cpan/authors/id/H/HE/HERMES/Clone-Choose-0.010.tar.gz"; sha256 = "0cin2bjn5z8xhm9v4j7pwlkx88jnvz8al0njdjwyvs6fb0glh8sn"; }; buildInputs = [ Clone ClonePP TestWithoutModule ]; @@ -2821,7 +2821,7 @@ let pname = "Clone-PP"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Clone-PP-1.07.tar.gz"; sha256 = "15dkhqvih6rx9dnngfwwljcm9s8afb0nbyl2vdvhd8frnw4y31dz"; }; meta = { @@ -2833,7 +2833,7 @@ let pname = "Code-TidyAll"; version = "0.75"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.75.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Code-TidyAll-0.75.tar.gz"; sha256 = "0gplkyds3zmiqpvw8x8kg3g81jcm58kcxvwg5yk4dm2fdkl77xqf"; }; propagatedBuildInputs = [ CaptureTiny ConfigINI FileWhich Filepushd IPCRun3 IPCSystemSimple ListCompare ListSomeUtils LogAny Moo ScopeGuard SpecioLibraryPathTiny TextDiff TimeDate TimeDurationParse ]; @@ -2848,7 +2848,7 @@ let pname = "Code-TidyAll-Plugin-Perl-AlignMooseAttributes"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSWARTZ/Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSWARTZ/Code-TidyAll-Plugin-Perl-AlignMooseAttributes-0.01.tar.gz"; sha256 = "1r8w5kfm17j1dyrrsjhwww423zzdzhx1i3d3brl32wzhasgf47cd"; }; propagatedBuildInputs = [ CodeTidyAll TextAligner ]; @@ -2862,7 +2862,7 @@ let pname = "common-sense"; version = "3.74"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/common-sense-3.74.tar.gz"; sha256 = "1wxv2s0hbjkrnssvxvsds0k213awg5pgdlrpkr6xkpnimc17s7vp"; }; meta = { @@ -2875,7 +2875,7 @@ let pname = "Compress-Bzip2"; version = "2.26"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Compress-Bzip2-2.26.tar.gz"; sha256 = "5132f0c5f377a54d77ee36d332aa0ece585c22a40f2c31f2619e40262f5c4f0c"; }; meta = { @@ -2888,7 +2888,7 @@ let pname = "Compress-Raw-Bzip2"; version = "2.093"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.093.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-2.093.tar.gz"; sha256 = "1sb6sazwyxaan26laclbkbnr57mkm1yx7c5l6d0045pw3q9q6mi9"; }; @@ -2908,7 +2908,7 @@ let version = "2.093"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.093.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.093.tar.gz"; sha256 = "1x794dz83888c26lmls81rvvnhk3j91cwh407f6p65aazaa73v5m"; }; @@ -2933,7 +2933,7 @@ let pname = "Compress-unLZMA"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Compress-unLZMA-0.05.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Compress-unLZMA-0.05.tar.gz"; sha256 = "1f0pcpcjjj60whqc5sc5jd0dd7z3si4fnp268w4ykmcjini03s2d"; }; }; @@ -2942,7 +2942,7 @@ let pname = "Config-Any"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Config-Any-0.32.tar.gz"; sha256 = "0l31sg7dwh4dwwnql42hp7arkhcm15bhsgfg4i6xvbjzy9f2mnk8"; }; propagatedBuildInputs = [ ModulePluggable ]; @@ -2956,7 +2956,7 @@ let pname = "Config-AutoConf"; version = "0.318"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.318.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.318.tar.gz"; sha256 = "0d5bxsax2x3xy8bgqrbzs0562x7bpglan8m23hjxw0rhxkz31j9k"; }; propagatedBuildInputs = [ CaptureTiny ]; @@ -2970,7 +2970,7 @@ let pname = "Config-General"; version = "2.63"; src = fetchurl { - url = mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz; + url = "mirror://cpan/authors/id/T/TL/TLINDEN/Config-General-2.63.tar.gz"; sha256 = "1bbg3wp0xcpj04cmm86j1x0j5968jqi5s2c87qs7dgmap1vzk6qa"; }; meta = { @@ -2982,7 +2982,7 @@ let pname = "Config-GitLike"; version = "1.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Config-GitLike-1.17.tar.gz"; sha256 = "674a07b814fdcf9d323088d093245bcd066aaee24ec0914cb4decc9a943de54e"; }; buildInputs = [ TestException ]; @@ -2997,11 +2997,11 @@ let pname = "Config-Grammar"; version = "1.13"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.13.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSCHWEI/Config-Grammar-1.13.tar.gz"; sha256 = "a8b3a3a2c9c8c43b92dc401bf2709d6514f15b467fd4f72c48d356335771d6e3"; }; meta = { - homepage = https://github.com/schweikert/Config-Grammar; + homepage = "https://github.com/schweikert/Config-Grammar"; description = "A grammar-based, user-friendly config parser"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3011,12 +3011,12 @@ let pname = "Config-INI"; version = "0.025"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.025.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-INI-0.025.tar.gz"; sha256 = "628bf76d5b91f89dde22d4813ec033026ebf71b772bb61ccda909da00c869732"; }; propagatedBuildInputs = [ MixinLinewise ]; meta = { - homepage = https://github.com/rjbs/Config-INI; + homepage = "https://github.com/rjbs/Config-INI"; description = "Simple .ini-file format"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3026,7 +3026,7 @@ let pname = "Config-Identity"; version = "0.0019"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Config-Identity-0.0019.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Config-Identity-0.0019.tar.gz"; sha256 = "1a0jx12pxwpbnkww4xg4lav8j6ls89hrdimhj4a697k56zdhnli9"; }; propagatedBuildInputs = [ FileHomeDir IPCRun ]; @@ -3042,7 +3042,7 @@ let pname = "Config-IniFiles"; version = "3.000002"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000002.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Config-IniFiles-3.000002.tar.gz"; sha256 = "d92ed6ed2db98d5addf732c96d2a9c15d9f878c7e8b355bb7a5c1668e3f8ba09"; }; propagatedBuildInputs = [ IOStringy ]; @@ -3057,7 +3057,7 @@ let pname = "Config-Merge"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DRTECH/Config-Merge-1.04.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DRTECH/Config-Merge-1.04.tar.gz"; sha256 = "a932477b43ae5fb04a16f071a891da7bd2086c10c680592f2888fa9d9972cccf"; }; buildInputs = [ YAML ]; @@ -3072,7 +3072,7 @@ let pname = "Config-Onion"; version = "1.007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSHEROH/Config-Onion-1.007.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSHEROH/Config-Onion-1.007.tar.gz"; sha256 = "1bx81nakvgj9m7x1q7pnra2cm1rzfdyf7fm2wmlj92qkivvdszrj"; }; propagatedBuildInputs = [ ConfigAny HashMergeSimple Moo ]; @@ -3087,13 +3087,13 @@ let pname = "Config-MVP"; version = "2.200011"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-2.200011.tar.gz"; sha256 = "23c95666fc43c4adaebcc093b1b56091efc2a6aa2d75366a216d18eda96ad716"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ModulePluggable MooseXOneArgNew RoleHasMessage RoleIdentifiable Throwable TieIxHash ]; meta = { - homepage = https://github.com/rjbs/Config-MVP; + homepage = "https://github.com/rjbs/Config-MVP"; description = "Multivalue-property package-oriented configuration"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3103,12 +3103,12 @@ let pname = "Config-MVP-Reader-INI"; version = "2.101463"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101463.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Config-MVP-Reader-INI-2.101463.tar.gz"; sha256 = "0iflnsh0sgihff3ra8sr7awiiscmqvrp1anaskkwksqi6yzidab9"; }; propagatedBuildInputs = [ ConfigINI ConfigMVP ]; meta = { - homepage = https://github.com/rjbs/Config-MVP-Reader-INI; + homepage = "https://github.com/rjbs/Config-MVP-Reader-INI"; description = "An MVP config reader for .ini files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3118,7 +3118,7 @@ let pname = "Config-Simple"; version = "4.58"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.58.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHERZODR/Config-Simple-4.58.tar.gz"; sha256 = "1d7dhvis1i03xlj8z3g5l8mz88kf7dn13zngbjhq94qgdxq9b6fx"; }; meta = { @@ -3130,7 +3130,7 @@ let pname = "Config-Std"; version = "0.903"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.903.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BRICKER/Config-Std-0.903.tar.gz"; sha256 = "b7709ff663bd279d264ab9c2f51e9e9588479a3367a8c4cfc18659c2a11480fe"; }; propagatedBuildInputs = [ ClassStd ]; @@ -3143,7 +3143,7 @@ let pname = "Config-Tiny"; version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.24.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Config-Tiny-2.24.tgz"; sha256 = "0cjj2f0pj9y3cx1lgk2qp6arsnyaacf7kj6v33iqczn59f798r0h"; }; buildInputs = [ TestPod ]; @@ -3153,7 +3153,7 @@ let pname = "Config-Versioned"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Config-Versioned-1.01.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Config-Versioned-1.01.tar.gz"; sha256 = "bc9a4ae3738bd89f86a07bca673627ca3c92ba969737cd6dbc7ab7ad17cd2348"; }; propagatedBuildInputs = [ ConfigStd GitPurePerl ]; @@ -3168,7 +3168,7 @@ let pname = "Connector"; version = "1.28"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.28.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Connector-1.28.tar.gz"; sha256 = "0cd1575bab80e78294aa79809904f40d2f534d99b78e0161454f037625c6bf7d"; }; buildInputs = [ ConfigMerge ConfigStd ConfigVersioned DBDSQLite DBI ProcSafeExec TemplateToolkit YAML ]; @@ -3188,7 +3188,7 @@ let pname = "Const-Fast"; version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Const-Fast-0.014.tar.gz"; sha256 = "1nwlldgrx86yn7y6a53cqgvzm2ircsvxg1addahlcy6510x9a1gq"; }; propagatedBuildInputs = [ SubExporterProgressive ]; @@ -3203,7 +3203,7 @@ let pname = "Convert-ASN1"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz; + url = "mirror://cpan/authors/id/G/GB/GBARR/Convert-ASN1-0.27.tar.gz"; sha256 = "12nmsca6hzgxq57sx7dp8yq6zxqhl41z5a6018877sf5w25ag93l"; }; }; @@ -3228,7 +3228,7 @@ let pname = "Convert-Color"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Convert-Color-0.11.tar.gz"; sha256 = "b41217c72931034ba4417d7a9e1e2999f04580d4e6b31c70993fedccc2440d38"; }; buildInputs = [ TestNumberDelta ]; @@ -3239,11 +3239,24 @@ let }; }; + ConvertUU = buildPerlPackage rec { + pname = "Convert-UU"; + version = "0.5201"; + src = fetchurl { + url = "mirror://cpan/authors/id/A/AN/ANDK/${pname}-${version}.tar.gz"; + sha256 = "92329ce1c32b5952c48e1223db018c8c58ceafef03bfa0fd4817cd89c355a3bd"; + }; + meta = { + description = "Perl module for uuencode and uudecode"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + constantboolean = buildPerlModule { pname = "constant-boolean"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/constant-boolean-0.02.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/constant-boolean-0.02.tar.gz"; sha256 = "1s8gxfg4xqp543aqanv5lbp64vqqyw6ic4x3fm4imkk1h3amjb6d"; }; propagatedBuildInputs = [ SymbolUtil ]; @@ -3253,7 +3266,7 @@ let pname = "curry"; version = "1.001000"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/curry-1.001000.tar.gz"; sha256 = "1m2n3w67cskh8ic6vf6ik0fmap9zma875kr5rhyznr1041wn064b"; }; meta = { @@ -3266,7 +3279,7 @@ let pname = "constant-defer"; version = "6"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRYDE/constant-defer-6.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRYDE/constant-defer-6.tar.gz"; sha256 = "1ykgk0rd05p7kyrdxbv047fj7r0b4ix9ibpkzxp6h8nak0qjc8bv"; }; }; @@ -3275,7 +3288,7 @@ let pname = "Context-Preserve"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.03.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Context-Preserve-0.03.tar.gz"; sha256 = "07zxgmb11bn4zj3w9g1zwbb9iv4jyk5q7hc0nv59knvv5i64m489"; }; buildInputs = [ TestException TestSimple13 ]; @@ -3285,13 +3298,13 @@ let pname = "Cookie-Baker"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.11.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Cookie-Baker-0.11.tar.gz"; sha256 = "59275f474e07c0aa3611e3e684b894e7db913333d8214420be63f12ec18cd7ab"; }; buildInputs = [ ModuleBuildTiny TestTime ]; propagatedBuildInputs = [ URI ]; meta = { - homepage = https://github.com/kazeburo/Cookie-Baker; + homepage = "https://github.com/kazeburo/Cookie-Baker"; description = "Cookie string generator / parser"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3301,7 +3314,7 @@ let pname = "Cookie-XS"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGENT/Cookie-XS-0.11.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGENT/Cookie-XS-0.11.tar.gz"; sha256 = "1616rcn2qn1cwiv3rxb8mq5fmwxpj4gya1lxxxq2w952h03p3fd3"; }; propagatedBuildInputs = [ CGICookieXS ]; @@ -3311,7 +3324,7 @@ let pname = "Coro"; version = "6.55"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.55.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.55.tar.gz"; sha256 = "0c4ams0lqxlh9nwp2l3gd0if35dw0m3774pfl16dmz3hf419rms3"; }; propagatedBuildInputs = [ AnyEvent Guard commonsense ]; @@ -3324,7 +3337,7 @@ let pname = "Corona"; version = "0.1004"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Corona-0.1004.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Corona-0.1004.tar.gz"; sha256 = "0g5gpma3998rn61qfjv5csv2nrdi4sc84ipkb4k6synyhfgd3xgz"; }; propagatedBuildInputs = [ NetServerCoro Plack ]; @@ -3339,14 +3352,14 @@ let pname = "CPAN"; version = "2.27"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-2.27.tar.gz"; sha256 = "b4b1471a2881e2d616f59e723879b4110ae485b79d5962f115119c28cf69e07f"; }; patches = [ (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/andk/cpanpm/pull/133.diff"; + url = "https://github.com/andk/cpanpm/commit/10da44f1757aff6971e3bc4ed38ab115e738c740.diff"; name = "patch-YAML-modules-default-for-LoadBlessed-was-changed-to-false"; - sha256 = "0i8648cwshzzd0b34gyfn68s1vs85d8336ggk2kl99awah1ydsfr"; + sha256 = "0sr2nxkr1cwavpvpxsqcsryfd5fjv4fkxfihd03jzavv5awj79hp"; }) ]; propagatedBuildInputs = [ ArchiveZip CPANChecksums CPANPerlReleases Expect FileHomeDir LWP LogLog4perl ModuleBuild TermReadKey YAML YAMLLibYAML YAMLSyck ]; @@ -3360,7 +3373,7 @@ let pname = "Cpanel-JSON-XS"; version = "4.17"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.17.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Cpanel-JSON-XS-4.17.tar.gz"; sha256 = "fa80ae47caa9beee6db9b12df2c04482e98df1d62041a114ccd82b681a8706fb"; }; meta = { @@ -3373,7 +3386,7 @@ let pname = "CPAN-Changes"; version = "0.400002"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/CPAN-Changes-0.400002.tar.gz"; sha256 = "01eedea90d07468cb58e4a50bfa3bb1d4eeda9073596add1118fc359153abe8d"; }; meta = { @@ -3386,7 +3399,7 @@ let pname = "CPAN-Checksums"; version = "2.12"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDK/CPAN-Checksums-2.12.tar.gz"; sha256 = "0f1dbpp4638jfdfwrywjmz88na5wzw4fdsmm2r7gh1x0s6r0yq4r"; }; propagatedBuildInputs = [ CompressBzip2 DataCompare ModuleSignature ]; @@ -3399,13 +3412,13 @@ let pname = "CPAN-Common-Index"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Common-Index-0.010.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/CPAN-Common-Index-0.010.tar.gz"; sha256 = "c43ddbb22fd42b06118fe6357f53700fbd77f531ba3c427faafbf303cbf4eaf0"; }; buildInputs = [ TestDeep TestFailWarnings TestFatal ]; propagatedBuildInputs = [ CPANDistnameInfo ClassTiny TieHandleOffset URI ]; meta = { - homepage = https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index; + homepage = "https://github.com/Perl-Toolchain-Gang/CPAN-Common-Index"; description = "Common library for searching CPAN modules, authors and distributions"; license = stdenv.lib.licenses.asl20; }; @@ -3415,7 +3428,7 @@ let pname = "CPAN-DistnameInfo"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz; + url = "mirror://cpan/authors/id/G/GB/GBARR/CPAN-DistnameInfo-0.12.tar.gz"; sha256 = "0d94kx596w7k328cvq4y96z1gz12hdhn3z1mklkbrb7fyzlzn91g"; }; meta = { @@ -3428,7 +3441,7 @@ let pname = "CPAN-Meta-Check"; version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/CPAN-Meta-Check-0.014.tar.gz"; sha256 = "07rmdbz1rbnb7w33vswn1wixlyh947sqr93xrvcph1hwzhmmg818"; }; buildInputs = [ TestDeep ]; @@ -3442,11 +3455,11 @@ let pname = "CPAN-Perl-Releases"; version = "5.20200120"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200120.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPAN-Perl-Releases-5.20200120.tar.gz"; sha256 = "0xhn05aiyrdcxhmps0qg9ivr9p7278mjix7719rv2k5kd2nf1jg8"; }; meta = { - homepage = https://github.com/bingos/cpan-perl-releases; + homepage = "https://github.com/bingos/cpan-perl-releases"; description = "Mapping Perl releases on CPAN to the location of the tarballs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3456,12 +3469,12 @@ let pname = "CPANPLUS"; version = "0.9906"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9906.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9906.tar.gz"; sha256 = "0w1gi4w7xriqhh44ssgg2abk5dfxchshqfab4cs3j4ab6p8vf9j5"; }; propagatedBuildInputs = [ ArchiveExtract ModulePluggable ObjectAccessor PackageConstants TermUI ]; meta = { - homepage = https://github.com/jib/cpanplus-devel; + homepage = "https://github.com/jib/cpanplus-devel"; description = "Ameliorated interface to the CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3471,12 +3484,12 @@ let pname = "CPAN-Uploader"; version = "0.103013"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/CPAN-Uploader-0.103013.tar.gz"; sha256 = "07k8ia8gvj9mrz7a2lckgd3vxjsahfr43lgrb85474dkhz94f5pq"; }; propagatedBuildInputs = [ FileHomeDir GetoptLongDescriptive LWPProtocolHttps TermReadKey ]; meta = { - homepage = https://github.com/rjbs/cpan-uploader; + homepage = "https://github.com/rjbs/cpan-uploader"; description = "Upload things to the CPAN"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -3486,7 +3499,7 @@ let pname = "Crypt-Blowfish"; version = "2.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz; + url = "mirror://cpan/authors/id/D/DP/DPARIS/Crypt-Blowfish-2.14.tar.gz"; sha256 = "1cb7g8cyfs9alrfdykxhs8m6azj091fmcycz6p5vkxbbzcgl7cs6"; }; }; @@ -3495,7 +3508,7 @@ let pname = "Crypt-CBC"; version = "2.33"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz; + url = "mirror://cpan/authors/id/L/LD/LDS/Crypt-CBC-2.33.tar.gz"; sha256 = "0ig698lmpjz7fslnznxm0609lvlnvf4f3s370082nzycnqhxww3a"; }; }; @@ -3504,7 +3517,7 @@ let pname = "Crypt-Curve25519"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz; + url = "mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz"; sha256 = "1ir0gfxm8i7r9zyfs2zvil5jgwirl7j6cb9cm1p2kjpfnhyp0j4z"; }; patches = [ @@ -3523,7 +3536,7 @@ let pname = "Crypt-DES"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz; + url = "mirror://cpan/authors/id/D/DP/DPARIS/Crypt-DES-2.07.tar.gz"; sha256 = "1rypxlhpd1jc0c327aghgl9y6ls47drmpvn0a40b4k3vhfsypc9d"; }; }; @@ -3532,7 +3545,7 @@ let pname = "Crypt-DH"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MITHALDU/Crypt-DH-0.07.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MITHALDU/Crypt-DH-0.07.tar.gz"; sha256 = "0pvzlgwpx8fzdy64ki15155vhsj30i9zxmw6i4p7irh17d1g7368"; }; propagatedBuildInputs = [ MathBigIntGMP ]; @@ -3542,7 +3555,7 @@ let pname = "Crypt-DH-GMP"; version = "0.00012"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMAKI/Crypt-DH-GMP-0.00012.tar.gz; + url = "mirror://cpan/authors/id/D/DM/DMAKI/Crypt-DH-GMP-0.00012.tar.gz"; sha256 = "0f5gdprcql4kwzgxl2s6ngcfg1jl45lzcqh7dkv5bkwlwmxa9rsi"; }; buildInputs = [ pkgs.gmp DevelChecklib TestRequires ]; @@ -3567,7 +3580,7 @@ let pname = "Crypt-Eksblowfish"; version = "0.009"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Crypt-Eksblowfish-0.009.tar.gz"; sha256 = "3cc7126d5841107237a9be2dc5c7fbc167cf3c4b4ce34678a8448b850757014c"; }; propagatedBuildInputs = [ ClassMix ]; @@ -3578,7 +3591,7 @@ let pname = "Crypt-IDEA"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz; + url = "mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz"; sha256 = "0690lzlyjqgmnb94dq7dm5n6pgybg10fkpgfycgzr814370pig9k"; }; }; @@ -3587,7 +3600,7 @@ let pname = "Crypt-JWT"; version = "0.025"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.025.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIK/Crypt-JWT-0.025.tar.gz"; sha256 = "2def87936645723de70fcc11cb380b1faddf9c5678832e4fc6116f267987087d"; }; propagatedBuildInputs = [ CryptX JSONMaybeXS ]; @@ -3601,7 +3614,7 @@ let pname = "Crypt-PasswdMD5"; version = "1.40"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Crypt-PasswdMD5-1.40.tgz"; sha256 = "0j0r74f18nk63phddzqbf7wqma2ci4p4bxvrwrxsy0aklbp6lzdp"; }; }; @@ -3610,7 +3623,7 @@ let pname = "Crypt-PKCS10"; version = "2.001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.001.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRSCOTTY/Crypt-PKCS10-2.001.tar.gz"; sha256 = "f7945b76a2d8f4d8ecf627b2eb8ea4f41d001e6a915efe82e71d6b97fea3ffa9"; }; buildInputs = [ pkgs.unzip ModuleBuildTiny ]; @@ -3640,7 +3653,7 @@ let pname = "Crypt-Random-Source"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.14.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Crypt-Random-Source-0.14.tar.gz"; sha256 = "1rpdds3sy5l1fhngnkrsgwsmwd54wpicx3i9ds69blcskwkcwkpc"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; @@ -3669,7 +3682,7 @@ let pname = "Crypt-RC4"; version = "2.02"; src = fetchurl { - url = mirror://cpan/authors/id/S/SI/SIFUKURT/Crypt-RC4-2.02.tar.gz; + url = "mirror://cpan/authors/id/S/SI/SIFUKURT/Crypt-RC4-2.02.tar.gz"; sha256 = "1sp099cws0q225h6j4y68hmfd1lnv5877gihjs40f8n2ddf45i2y"; }; }; @@ -3678,7 +3691,7 @@ let pname = "Crypt-RandPasswd"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.06.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Crypt-RandPasswd-0.06.tar.gz"; sha256 = "0ca8544371wp4vvqsa19lnhl02hczpkbwkgsgm65ziwwim3r1gdi"; }; }; @@ -3687,7 +3700,7 @@ let pname = "Crypt-MySQL"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/I/IK/IKEBE/Crypt-MySQL-0.04.tar.gz; + url = "mirror://cpan/authors/id/I/IK/IKEBE/Crypt-MySQL-0.04.tar.gz"; sha256 = "93ebdfaaefcfe9ab683f0121c85f24475d8197f0bcec46018219e4111434dde3"; }; propagatedBuildInputs = [ DigestSHA1 ]; @@ -3698,7 +3711,7 @@ let pname = "Crypt-Rijndael"; version = "1.14"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Crypt-Rijndael-1.14.tar.gz"; sha256 = "03l5nwq97a8q9na4dpd4m3r7vrwpranx225vw8xm40w7zvgw6lb4"; }; }; @@ -3707,7 +3720,7 @@ let pname = "Crypt-UnixCrypt_XS"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BORISZ/Crypt-UnixCrypt_XS-0.11.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BORISZ/Crypt-UnixCrypt_XS-0.11.tar.gz"; sha256 = "1ajg3x6kwxy4x9p3nw1j36qjxpjvdpi9wkca5gfd86y9q8939sv2"; }; }; @@ -3756,7 +3769,7 @@ let pname = "Crypt-OpenSSL-AES"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz; + url = "mirror://cpan/authors/id/T/TT/TTAR/Crypt-OpenSSL-AES-0.02.tar.gz"; sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; @@ -3771,7 +3784,7 @@ let pname = "Crypt-OpenSSL-Bignum"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMX/Crypt-OpenSSL-Bignum-0.09.tar.gz"; sha256 = "1p22znbajq91lbk2k3yg12ig7hy5b4vy8igxwqkmbm4nhgxp4ki3"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; @@ -3782,7 +3795,7 @@ let pname = "Crypt-OpenSSL-Guess"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz; + url = "mirror://cpan/authors/id/A/AK/AKIYM/Crypt-OpenSSL-Guess-0.11.tar.gz"; sha256 = "0rvi9l4ljcbhwwvspq019nfq2h2v746dk355h2nwnlmqikiihsxa"; }; meta = { @@ -3796,7 +3809,7 @@ let pname = "Crypt-OpenSSL-Random"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.15.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Crypt-OpenSSL-Random-0.15.tar.gz"; sha256 = "1x6ffps8q7mnawmcfq740llzy7i10g3319vap0wiw4d33fm6z1zh"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include"; @@ -3808,7 +3821,7 @@ let pname = "Crypt-OpenSSL-RSA"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz"; sha256 = "4173403ad4cf76732192099f833fbfbf3cd8104e0246b3844187ae384d2c5436"; }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; @@ -3855,7 +3868,7 @@ let pname = "Crypt-Ed25519"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Crypt-Ed25519-1.04.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Crypt-Ed25519-1.04.tar.gz"; sha256 = "1jwh6b8b2ppvzxaljz287zakj4q3ip4zq121i23iwh26wxhlll2q"; }; @@ -3886,7 +3899,7 @@ let pname = "CSS-DOM"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/S/SP/SPROUT/CSS-DOM-0.17.tar.gz; + url = "mirror://cpan/authors/id/S/SP/SPROUT/CSS-DOM-0.17.tar.gz"; sha256 = "09phb6c9czpcp9imq06khm54kspsx6hnvfrjxramx663ygmpifb5"; }; propagatedBuildInputs = [ Clone ]; @@ -3896,7 +3909,7 @@ let pname = "CSS-Minifier-XS"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz; + url = "mirror://cpan/authors/id/G/GT/GTERMARS/CSS-Minifier-XS-0.09.tar.gz"; sha256 = "1myswrmh0sqp5xjpp03x45z8arfmgkjx0srl3r6kjsyzl1zrk9l8"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -3910,7 +3923,7 @@ let pname = "CSS-Squish"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSIBLEY/CSS-Squish-0.10.tar.gz"; sha256 = "65fc0d69acd1fa33d9a4c3b09cce0fbd737d747b1fcc4e9d87ebd91050cbcb4e"; }; buildInputs = [ TestLongString ]; @@ -3939,7 +3952,7 @@ let pname = "Curses-UI"; version = "0.9609"; src = fetchurl { - url = mirror://cpan/authors/id/M/MD/MDXI/Curses-UI-0.9609.tar.gz; + url = "mirror://cpan/authors/id/M/MD/MDXI/Curses-UI-0.9609.tar.gz"; sha256 = "1bqf4h8z70f78nzqq5yj4ahvsbhxxal6bc2g301l9qdn2fjjgf0a"; }; meta = { @@ -3953,7 +3966,7 @@ let pname = "CryptX"; version = "0.066"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIK/CryptX-0.066.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIK/CryptX-0.066.tar.gz"; sha256 = "e7e823ac4db0b452e885b0e0d5adfc8a9c5f688938f1adf3f1d91432b3238335"; }; meta = { @@ -3966,7 +3979,7 @@ let pname = "Cwd-Guard"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Cwd-Guard-0.05.tar.gz"; sha256 = "0xwf4rmii55k3lp19mpbh00mbgby7rxdk2lk84148bjhp6i7rz3s"; }; meta = { @@ -3980,7 +3993,7 @@ let pname = "Data-Clone"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/Data-Clone-0.004.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFUJI/Data-Clone-0.004.tar.gz"; sha256 = "0g1qhi5qyk4fp0pwyaw90vxiyyn8las0i8ghzrnr4srai1wy3r9g"; }; buildInputs = [ TestRequires ]; @@ -3994,7 +4007,7 @@ let pname = "Data-Compare"; version = "1.27"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.27.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Compare-1.27.tar.gz"; sha256 = "1gg8rqbv3x6a1lrpabv6vnlab53zxmpwz2ygad9fcx4gygqj12l1"; }; propagatedBuildInputs = [ Clone FileFindRule ]; @@ -4004,7 +4017,7 @@ let pname = "Data-Dump"; version = "1.23"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Data-Dump-1.23.tar.gz"; sha256 = "0r9ba52b7p8nnn6nw0ygm06lygi8g68piri78jmlqyrqy5gb0lxg"; }; meta = { @@ -4017,7 +4030,7 @@ let pname = "Data-Dumper"; version = "2.173"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.173.tar.gz; + url = "mirror://cpan/authors/id/X/XS/XSAWYERX/Data-Dumper-2.173.tar.gz"; sha256 = "697608b39330988e519131be667ff47168aaaaf99f06bd2095d5b46ad05d76fa"; }; outputs = [ "out" ]; @@ -4030,7 +4043,7 @@ let pname = "Data-Dumper-Concise"; version = "2.023"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Data-Dumper-Concise-2.023.tar.gz"; sha256 = "a6c22f113caf31137590def1b7028a7e718eface3228272d0672c25e035d5853"; }; meta = { @@ -4043,7 +4056,7 @@ let pname = "Data-Entropy"; version = "0.007"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Entropy-0.007.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Entropy-0.007.tar.gz"; sha256 = "2611c4a1a3038594d79ea4ed14d9e15a9af8f77105f51667795fe4f8a53427e4"; }; propagatedBuildInputs = [ CryptRijndael DataFloat HTTPLite ParamsClassify ]; @@ -4053,7 +4066,7 @@ let pname = "Data-Float"; version = "0.013"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Float-0.013.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Float-0.013.tar.gz"; sha256 = "e2b1523d858930b8bbdbd196f08235f5e678b84919ba87712e26313b9c27518a"; }; }; @@ -4062,7 +4075,7 @@ let pname = "Data-FormValidator"; version = "4.88"; src = fetchurl { - url = mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.88.tar.gz; + url = "mirror://cpan/authors/id/D/DF/DFARRELL/Data-FormValidator-4.88.tar.gz"; sha256 = "c1a539f91c92cbcd8a8d83597ec9a7643fcd8ccf5a94e15382c3765289170066"; }; propagatedBuildInputs = [ DateCalc EmailValid FileMMagic ImageSize MIMETypes RegexpCommon ]; @@ -4077,12 +4090,12 @@ let pname = "Data-GUID"; version = "0.049"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.049.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-GUID-0.049.tar.gz"; sha256 = "0yx7d4qwsr9n85gslip0y3mdwr5fkncfbwxz7si2a17x95yl7bxq"; }; propagatedBuildInputs = [ DataUUID SubExporter ]; meta = { - homepage = https://github.com/rjbs/Data-GUID; + homepage = "https://github.com/rjbs/Data-GUID"; description = "Globally unique identifiers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4092,7 +4105,7 @@ let pname = "Data-HexDump"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/F/FT/FTASSIN/Data-HexDump-0.02.tar.gz; + url = "mirror://cpan/authors/id/F/FT/FTASSIN/Data-HexDump-0.02.tar.gz"; sha256 = "1a9d843e7f667c1c6f77c67af5d77e7462ff23b41937cb17454d03535cd9be70"; }; meta = { @@ -4105,7 +4118,7 @@ let pname = "Data-Hexdumper"; version = "3.0001"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Hexdumper-3.0001.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Data-Hexdumper-3.0001.tar.gz"; sha256 = "f9243cbe8affed5045fe4df505726a7a7289471e30c51ac065b3ed6ce0d1a604"; }; meta = { @@ -4118,7 +4131,7 @@ let pname = "Data-Hierarchy"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/Data-Hierarchy-0.34.tar.gz"; sha256 = "1vfrkygdaq0k7006i83jwavg9wgszfcyzbl9b7fp37z2acmyda5k"; }; buildInputs = [ TestException ]; @@ -4128,7 +4141,7 @@ let pname = "Data-ICal"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Data-ICal-0.24.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Data-ICal-0.24.tar.gz"; sha256 = "7331c7c84886c53337c0db823615e0e7134a8f13efd284e5c20726d5bcd52dff"; }; buildInputs = [ TestLongString TestNoWarnings TestWarn ]; @@ -4143,7 +4156,7 @@ let pname = "Data-IEEE754"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/Data-IEEE754-0.02.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/Data-IEEE754-0.02.tar.gz"; sha256 = "07b73dlxd0qmxgkkrpa2xr61y18v3adlf1qgnl9k90kj8q9spx66"; }; buildInputs = [ TestBits ]; @@ -4157,7 +4170,7 @@ let pname = "Data-Integer"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Integer-0.006.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Data-Integer-0.006.tar.gz"; sha256 = "0m53zxhx9sn49yqh7azlpyy9m65g54v8cd2ha98y77337gg7xdv3"; }; }; @@ -4182,12 +4195,12 @@ let pname = "Data-OptList"; version = "0.110"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-OptList-0.110.tar.gz"; sha256 = "1hzmgr2imdg1fc3hmwx0d56fhsdfyrgmgx7jb4jkyiv6575ifq9n"; }; propagatedBuildInputs = [ ParamsUtil SubInstall ]; meta = { - homepage = https://github.com/rjbs/data-optlist; + homepage = "https://github.com/rjbs/data-optlist"; description = "Parse and validate simple name/value option pairs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4197,7 +4210,7 @@ let pname = "Data-Page"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Data-Page-2.03.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Data-Page-2.03.tar.gz"; sha256 = "12rxrr2b11qjk0c437cisw2kfqkafw1awcng09cv6yhzglb55yif"; }; propagatedBuildInputs = [ ClassAccessorChained ]; @@ -4208,7 +4221,7 @@ let pname = "Data-Page-Pageset"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz"; sha256 = "142isi8la383dbjxj7lfgcbmmrpzwckcc4wma6rdl8ryajsipb6f"; }; buildInputs = [ ClassAccessor DataPage TestException ]; @@ -4222,7 +4235,7 @@ let pname = "Data-Password"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RAZINF/Data-Password-1.12.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RAZINF/Data-Password-1.12.tar.gz"; sha256 = "830cde81741ff384385412e16faba55745a54a7cc019dd23d7ed4f05d551a961"; }; }; @@ -4231,13 +4244,13 @@ let pname = "Data-Perl"; version = "0.002011"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Data-Perl-0.002011.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Data-Perl-0.002011.tar.gz"; sha256 = "8d34dbe314cfa2d99bd9aae546bbde94c38bb05b74b07c89bde1673a6f6c55f4"; }; buildInputs = [ TestDeep TestFatal TestOutput ]; propagatedBuildInputs = [ ClassMethodModifiers ListMoreUtils ModuleRuntime RoleTiny strictures ]; meta = { - homepage = https://github.com/mattp-/Data-Perl; + homepage = "https://github.com/mattp-/Data-Perl"; description = "Base classes wrapping fundamental Perl data types"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4247,7 +4260,7 @@ let pname = "Data-Printer"; version = "0.40"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GARU/Data-Printer-0.40.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GARU/Data-Printer-0.40.tar.gz"; sha256 = "0njjh8zp5afc4602jrnmg89icj7gfsil6i955ypcqxc2gl830sb0"; }; propagatedBuildInputs = [ ClonePP FileHomeDir PackageStash SortNaturally ]; @@ -4261,12 +4274,12 @@ let pname = "Data-Section"; version = "0.200007"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-Section-0.200007.tar.gz"; sha256 = "1pmlxca0a8sv2jjwvhwgqavq6iwys6kf457lby4anjp3f1dpx4yd"; }; propagatedBuildInputs = [ MROCompat SubExporter ]; meta = { - homepage = https://github.com/rjbs/data-section; + homepage = "https://github.com/rjbs/data-section"; description = "Read multiple hunks of data out of your DATA section"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4277,7 +4290,7 @@ let pname = "Data-Serializer"; version = "0.60"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEELY/Data-Serializer-0.60.tar.gz"; sha256 = "0ca4s811l7f2bqkx7vnyxbpp4f0qska89g2pvsfb3k0bhhbk0jdk"; }; meta = { @@ -4304,7 +4317,7 @@ let pname = "Data-SpreadPagination"; version = "0.1.2"; src = fetchurl { - url = mirror://cpan/authors/id/K/KN/KNEW/Data-SpreadPagination-0.1.2.tar.gz; + url = "mirror://cpan/authors/id/K/KN/KNEW/Data-SpreadPagination-0.1.2.tar.gz"; sha256 = "74ebfd847132c38cc9e835e14e82c43f1809a95cbc98bb84d1f7ce2e4ef487e3"; }; propagatedBuildInputs = [ DataPage MathRound ]; @@ -4317,7 +4330,7 @@ let pname = "Data-Stream-Bulk"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Data-Stream-Bulk-0.11.tar.gz"; sha256 = "06e08432a6b97705606c925709b99129ad926516e477d58e4461e4b3d9f30917"; }; buildInputs = [ TestRequires ]; @@ -4332,7 +4345,7 @@ let pname = "Data-Structure-Util"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/Data-Structure-Util-0.16.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDYA/Data-Structure-Util-0.16.tar.gz"; sha256 = "9cd42a13e65cb15f3a76296eb9a134da220168ec747c568d331a50ae7a2ddbc6"; }; buildInputs = [ TestPod ]; @@ -4346,7 +4359,7 @@ let pname = "Data-Taxi"; version = "0.96"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/Data-Taxi-0.96.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/Data-Taxi-0.96.tar.gz"; sha256 = "0y4wls4jlwd6prvd77szymddhq9sfj06kaqnk4frlvd0zh83djxb"; }; buildInputs = [ DebugShowStuff ]; @@ -4356,7 +4369,7 @@ let pname = "Data-Uniqid"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz; + url = "mirror://cpan/authors/id/M/MW/MWX/Data-Uniqid-0.12.tar.gz"; sha256 = "b6919ba49b9fe98bfdf3e8accae7b9b7f78dc9e71ebbd0b7fef7a45d99324ccb"; }; }; @@ -4365,7 +4378,7 @@ let pname = "Data-Util"; version = "0.66"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.66.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Data-Util-0.66.tar.gz"; sha256 = "1x662pqjg9p0wcigi7pwf969b2ymk66ncm2vd5dfm5i08pdkjpf3"; }; buildInputs = [ HashUtilFieldHashCompat ModuleBuildXSUtil ScopeGuard TestException ]; @@ -4381,7 +4394,7 @@ let pname = "Data-URIEncode"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHANDOM/Data-URIEncode-0.11.tar.gz; + url = "mirror://cpan/authors/id/R/RH/RHANDOM/Data-URIEncode-0.11.tar.gz"; sha256 = "51c9efbf8423853616eaa24841e4d1996b2db0036900617fb1dbc76c75a1f360"; }; meta = { @@ -4393,7 +4406,7 @@ let pname = "Data-UUID"; version = "1.224"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Data-UUID-1.224.tar.gz"; sha256 = "0z7l3fc710v830n1krgrp7wzfispi5s0h10cyk65xvxv09sw2n69"; }; }; @@ -4402,7 +4415,7 @@ let pname = "Data-UUID-MT"; version = "1.001"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.001.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Data-UUID-MT-1.001.tar.gz"; sha256 = "0bb7qibq1c5lhaihxa1sck9pb744p8c7172jgx5zh4c32ac4nk1h"; }; buildInputs = [ ListAllUtils ]; @@ -4417,7 +4430,7 @@ let pname = "Data-Validate-Domain"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.14.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-Domain-0.14.tar.gz"; sha256 = "4470f253b8d2720a4dd3fa3ae550995417c2269f3be7ff030e01afa04a3a9421"; }; buildInputs = [ Test2Suite ]; @@ -4432,7 +4445,7 @@ let pname = "Data-Validate-IP"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Data-Validate-IP-0.27.tar.gz"; sha256 = "e1aa92235dcb9c6fd9b6c8cda184d1af73537cc77f4f83a0f88207a8bfbfb7d6"; }; buildInputs = [ TestRequires ]; @@ -4447,7 +4460,7 @@ let pname = "Data-Validate-URI"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SO/SONNEN/Data-Validate-URI-0.07.tar.gz; + url = "mirror://cpan/authors/id/S/SO/SONNEN/Data-Validate-URI-0.07.tar.gz"; sha256 = "f06418d2a4603913d1b6ce52b167dd13e787e13bf2be325a065df7d408f79c60"; }; propagatedBuildInputs = [ DataValidateDomain DataValidateIP ]; @@ -4461,7 +4474,7 @@ let pname = "Data-Visitor"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Data-Visitor-0.30.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Data-Visitor-0.30.tar.gz"; sha256 = "0m7d1505af9z2hj5aw020grcmjjlvnkjpvjam457d7k5qfy4m8lf"; }; buildInputs = [ TestRequires ]; @@ -4472,7 +4485,7 @@ let pname = "Date-Calc"; version = "6.4"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STBEY/Date-Calc-6.4.tar.gz"; sha256 = "1barz0jgdaan3jm7ciphs5n3ahwkl42imprs3y8c1dwpwyr3gqbw"; }; propagatedBuildInputs = [ BitVector ]; @@ -4483,7 +4496,7 @@ let pname = "Date-Extract"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Date-Extract-0.06.tar.gz"; sha256 = "bc7658d5c50c3525ec0efcb55236a5de2d5d4fc06fc147fa3929c8f0953cda2b"; }; buildInputs = [ TestMockTime ]; @@ -4494,7 +4507,7 @@ let pname = "Date-Manip"; version = "6.79"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.79.tar.gz; + url = "mirror://cpan/authors/id/S/SB/SBECK/Date-Manip-6.79.tar.gz"; sha256 = "0fllcvsd08wz71wyppyhgb6mingfihhsf5raraildggdwhnc9a3i"; }; # for some reason, parsing /etc/localtime does not work anymore - make sure that the fallback "/bin/date +%Z" will work @@ -4512,7 +4525,7 @@ let pname = "Date-Simple"; version = "3.03"; src = fetchurl { - url = mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz; + url = "mirror://cpan/authors/id/I/IZ/IZUT/Date-Simple-3.03.tar.gz"; sha256 = "29a1926314ce1681a312d6155c29590c771ddacf91b7485873ce449ef209dd04"; }; meta = { @@ -4524,7 +4537,7 @@ let pname = "DateTime"; version = "1.51"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.51.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-1.51.tar.gz"; sha256 = "1ibfq6acz1ih28vl613yygbb3r2d8ykx6di669vajhvswl6xl8ny"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; @@ -4539,7 +4552,7 @@ let pname = "DateTime-Calendar-Julian"; version = "0.102"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.102.tar.gz; + url = "mirror://cpan/authors/id/W/WY/WYANT/DateTime-Calendar-Julian-0.102.tar.gz"; sha256 = "0j95dhma66spjyb04zi6rwy7l33hibnrx02mn0znd9m89aiq52s6"; }; meta = { @@ -4553,7 +4566,7 @@ let pname = "DateTime-Event-ICal"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-ICal-0.13.tar.gz; + url = "mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-ICal-0.13.tar.gz"; sha256 = "1skmykxbrf98ldi72d5s1v6228gfdr5iy4y0gpl0xwswxy247njk"; }; propagatedBuildInputs = [ DateTimeEventRecurrence ]; @@ -4567,7 +4580,7 @@ let pname = "DateTime-Event-Recurrence"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.19.tar.gz; + url = "mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Event-Recurrence-0.19.tar.gz"; sha256 = "f9408789a461107766ca1a232bb3ec1e702eec7ca8167401ea6ec3f4b6d0b5a5"; }; propagatedBuildInputs = [ DateTimeSet ]; @@ -4577,7 +4590,7 @@ let pname = "DateTime-Format-Builder"; version = "0.82"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Builder-0.82.tar.gz"; sha256 = "383faeb22b992c77ca65a5257992dd2f6db91a7db73ea4601c512e1c6c2e1ca3"; }; propagatedBuildInputs = [ DateTimeFormatStrptime ParamsValidate ]; @@ -4591,7 +4604,7 @@ let pname = "DateTime-Format-DateParse"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-DateParse-0.05.tar.gz"; sha256 = "f6eca4c8be66ce9992ee150932f8fcf07809fd3d1664caf200b8a5fd3a7e5ebc"; }; propagatedBuildInputs = [ DateTime TimeDate ]; @@ -4605,7 +4618,7 @@ let pname = "DateTime-Format-Flexible"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.32.tar.gz; + url = "mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.32.tar.gz"; sha256 = "50a7b9feb287bb14b27323a53c2324486181a3ab6cb3f4c7662d42be901ad8ee"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ListMoreUtils ModulePluggable ]; @@ -4620,7 +4633,7 @@ let pname = "DateTime-Format-HTTP"; version = "0.42"; src = fetchurl { - url = mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz; + url = "mirror://cpan/authors/id/C/CK/CKRAS/DateTime-Format-HTTP-0.42.tar.gz"; sha256 = "0h6qqdg1yzqkdxp7hqlp0qa7d1y64nilgimxs79dys2ryjfpcknh"; }; propagatedBuildInputs = [ DateTime HTTPDate ]; @@ -4634,7 +4647,7 @@ let pname = "DateTime-Format-ICal"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-ICal-0.09.tar.gz"; sha256 = "8b09f6539f5e9c0df0e6135031699ed4ef9eef8165fc80aefeecc817ef997c33"; }; propagatedBuildInputs = [ DateTimeEventICal ]; @@ -4648,7 +4661,7 @@ let pname = "DateTime-Format-ISO8601"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHOBLITT/DateTime-Format-ISO8601-0.08.tar.gz"; sha256 = "1syccqd5jlwms8v78ksnf68xijzl97jky5vbwhnyhxi5gvgfx8xk"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -4662,7 +4675,7 @@ let pname = "DateTime-Format-Mail"; version = "0.403"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/DateTime-Format-Mail-0.403.tar.gz"; sha256 = "8df8e35c4477388ff5c7ce8b3e8b6ae4ed30209c7a5051d41737bd14d755fcb0"; }; propagatedBuildInputs = [ DateTime ParamsValidate ]; @@ -4676,7 +4689,7 @@ let pname = "DateTime-Format-Natural"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.08.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCHUBIGER/DateTime-Format-Natural-1.08.tar.gz"; sha256 = "0hfk9cqfy0j49vqllhxfikbkqjhf7jrm6zb9i2bxq2ywm8qnz1rj"; }; buildInputs = [ ModuleUtil TestMockTime ]; @@ -4691,7 +4704,7 @@ let pname = "DateTime-Format-MySQL"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.06.tar.gz; + url = "mirror://cpan/authors/id/X/XM/XMIKEW/DateTime-Format-MySQL-0.06.tar.gz"; sha256 = "07cgz60gxvrv7xqvngyll60pa8cx93h3jyx9kc9wdkn95qbd864q"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -4705,7 +4718,7 @@ let pname = "DateTime-Format-Pg"; version = "0.16013"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16013.tar.gz; + url = "mirror://cpan/authors/id/D/DM/DMAKI/DateTime-Format-Pg-0.16013.tar.gz"; sha256 = "16siw0f3a0ilzv5fnfas5s9n92drjy271yf6qvmmpm0vwnjjx1kz"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -4720,7 +4733,7 @@ let pname = "DateTime-Format-Strptime"; version = "1.76"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.76.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Format-Strptime-1.76.tar.gz"; sha256 = "593c26466ed7a3d2cefe9215f1619666c5116bd3a551e0aa74b64a6353fcb50d"; }; buildInputs = [ TestFatal TestWarnings ]; @@ -4735,7 +4748,7 @@ let pname = "DateTime-Format-SQLite"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFAERBER/DateTime-Format-SQLite-0.11.tar.gz"; sha256 = "cc1f4e0ae1d39b0d4c3dddccfd7423c77c67a70950c4b5ecabf8ca553ab294b4"; }; propagatedBuildInputs = [ DateTimeFormatBuilder ]; @@ -4749,7 +4762,7 @@ let pname = "DateTime-Format-W3CDTF"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz; + url = "mirror://cpan/authors/id/G/GW/GWILLIAMS/DateTime-Format-W3CDTF-0.07.tar.gz"; sha256 = "69a02b661bbf1daa14a4813cb6786eaa66dbdf2743f0b3f458e30234c3a26268"; }; propagatedBuildInputs = [ DateTime ]; @@ -4763,7 +4776,7 @@ let pname = "DateTime-Locale"; version = "1.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.25.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-Locale-1.25.tar.gz"; sha256 = "aa79746bd488b32aa4dbccccd05f1e5505642be013d8064a5d6f8a76a3c45d0b"; }; buildInputs = [ CPANMetaCheck FileShareDirInstall IPCSystemSimple TestFatal TestFileShareDir TestRequires TestWarnings ]; @@ -4778,7 +4791,7 @@ let pname = "DateTime-Set"; version = "0.3900"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3900.tar.gz; + url = "mirror://cpan/authors/id/F/FG/FGLOCK/DateTime-Set-0.3900.tar.gz"; sha256 = "94f41c3924aafde4ef7fa6b58e0595d4038d8ac5ffd62ba111b13c5f4dbc0946"; }; propagatedBuildInputs = [ DateTime ParamsValidate SetInfinite ]; @@ -4792,7 +4805,7 @@ let pname = "DateTime-TimeZone"; version = "2.38"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.38.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/DateTime-TimeZone-2.38.tar.gz"; sha256 = "0e5c99ef22471f4d262ac590ce5ce8177094d7a92f380d8eea6219f5a12dc0cd"; }; buildInputs = [ TestFatal TestRequires ]; @@ -4807,7 +4820,7 @@ let pname = "DateTimeX-Easy"; version = "0.089"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROKR/DateTimeX-Easy-0.089.tar.gz"; sha256 = "17e6d202e7ac6049523048e97bb8f195e3c79208570da1504f4313584e487a79"; }; buildInputs = [ TestMost ]; @@ -4823,7 +4836,7 @@ let pname = "Debug-ShowStuff"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.16.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/Debug-ShowStuff-1.16.tar.gz"; sha256 = "1drcrnji3yrd0s3xb69bxnqa51s19c13w68vhvjad3nvswn5vpd4"; }; propagatedBuildInputs = [ ClassISA DevelStackTrace StringUtil TermReadKey TextTabularDisplay TieIxHash ]; @@ -4837,7 +4850,7 @@ let pname = "Devel-Caller"; version = "2.06"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Devel-Caller-2.06.tar.gz"; sha256 = "1pxpimifzmnjnvf4icclx77myc15ahh0k56sj1djad1855mawwva"; }; propagatedBuildInputs = [ PadWalker ]; @@ -4851,7 +4864,7 @@ let pname = "Devel-CheckBin"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz"; sha256 = "1r735yzgvsxkj4m6ks34xva5m21cfzp9qiis2d4ivv99kjskszqm"; }; meta = { @@ -4865,7 +4878,7 @@ let pname = "Devel-CheckCompiler"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYOHEX/Devel-CheckCompiler-0.07.tar.gz"; sha256 = "1db973a4dbyknjxq608hywil5ai6vplnayshqxrd7m5qnjbpd2vn"; }; buildInputs = [ ModuleBuildTiny ]; @@ -4880,7 +4893,7 @@ let pname = "Devel-CheckLib"; version = "1.14"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.14.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTN/Devel-CheckLib-1.14.tar.gz"; sha256 = "15621qh5gaan1sgmk9y9svl70nm8viw17x5h1kf0zknkk8lmw77j"; }; buildInputs = [ CaptureTiny MockConfig ]; @@ -4890,7 +4903,7 @@ let pname = "Devel-CheckOS"; version = "1.81"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.81.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Devel-CheckOS-1.81.tar.gz"; sha256 = "f3c17b56b79283b62616f938d36c57adc9df06bfaa295ff98be21e9014a23b10"; }; propagatedBuildInputs = [ DataCompare ]; @@ -4914,12 +4927,12 @@ let pname = "Devel-PatchPerl"; version = "1.84"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.84.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Devel-PatchPerl-1.84.tar.gz"; sha256 = "1nlil7mq8vc3lbsr5p3zr7jqaclkr0blhmb8sgkyc7mbvhml9jzp"; }; propagatedBuildInputs = [ Filepushd ModulePluggable ]; meta = { - homepage = https://github.com/bingos/devel-patchperl; + homepage = "https://github.com/bingos/devel-patchperl"; description = "Patch perl source a la Devel::PPPort's buildperl.pl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -4929,7 +4942,7 @@ let pname = "Devel-Refcount"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Devel-Refcount-0.10.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Devel-Refcount-0.10.tar.gz"; sha256 = "0jnaraqkigyinhwz4nqk1ndq7ssjizr98nd1dd183a6icdlx8m5n"; }; buildInputs = [ TestFatal ]; @@ -4943,7 +4956,7 @@ let pname = "Devel-PPPort"; version = "3.56"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.56.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Devel-PPPort-3.56.tar.gz"; sha256 = "628476dbfeb7be92471e48f75fe0d36659b92493669ebd02cf04e3a13429521b"; }; meta = { @@ -4956,7 +4969,7 @@ let pname = "Devel-Trace"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJD/Devel-Trace-0.12.tar.gz; + url = "mirror://cpan/authors/id/M/MJ/MJD/Devel-Trace-0.12.tar.gz"; sha256 = "0s1q1a05gk3xvwqkya3k05vqjk13rvb489g0frprhzpzfvvwl0gm"; }; meta = { @@ -4998,11 +5011,21 @@ let }; }; + DBDCSV = buildPerlPackage { + pname = "DBD-CSV"; + version = "0.54"; + src = fetchurl { + url = "mirror://cpan/authors/id/H/HM/HMBRAND/DBD-CSV-0.54.tgz"; + sha256 = "bc597cd7195e5a023e2b3413d8dc614602b9b3f279f436027881796464d4f0be"; + }; + propagatedBuildInputs = [ DBI TextCSV_XS SQLStatement ModuleRuntime ParamsUtil ]; + }; + DBDMock = buildPerlModule { pname = "DBD-Mock"; version = "1.55"; src = fetchurl { - url = mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.55.tar.gz; + url = "mirror://cpan/authors/id/J/JL/JLCOOPER/DBD-Mock-1.55.tar.gz"; sha256 = "827ca7a363eca8d1d4912decc920eb55ef8e8173e0f756808e2ed304f0dad20c"; }; propagatedBuildInputs = [ DBI ]; @@ -5014,7 +5037,7 @@ let version = "1.64"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.64.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/DBD-SQLite-1.64.tar.gz"; sha256 = "00gz5aw3xrr92lf9nfk0dhmy7a8jzmxhznddd9b0a8w4a1xqzbpl"; }; @@ -5047,7 +5070,7 @@ let version = "4.050"; src = fetchurl { - url = mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz; + url = "mirror://cpan/authors/id/D/DV/DVEEDEN/DBD-mysql-4.050.tar.gz"; sha256 = "0y4djb048i09dk19av7mzfb3khr72vw11p3ayw2p82jsy4gm8j2g"; }; @@ -5064,7 +5087,7 @@ let version = "1.80"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJEVANS/DBD-Oracle-1.80.tar.gz; + url = "mirror://cpan/authors/id/M/MJ/MJEVANS/DBD-Oracle-1.80.tar.gz"; sha256 = "1rza36dywbsaync99ibscpqdp53m0yg2748bbib16gbf4cl2apph"; }; @@ -5083,7 +5106,7 @@ let version = "3.10.3"; src = fetchurl { - url = mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.10.3.tar.gz; + url = "mirror://cpan/authors/id/T/TU/TURNSTEP/DBD-Pg-3.10.3.tar.gz"; sha256 = "0swj2pkga92z15rnq9f0j9s84j5ancgas0ncd4k230bd8advlgn6"; }; @@ -5107,7 +5130,7 @@ let version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.16.tar.gz; + url = "mirror://cpan/authors/id/M/ME/MEWP/DBD-Sybase-1.16.tar.gz"; sha256 = "1k6n261nrrcll9wxn5xwi4ibpavqv1il96687k62mbpznzl2gx37"; }; @@ -5124,7 +5147,7 @@ let version = "1.853"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.853.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/DB_File-1.853.tar.gz"; sha256 = "1y967si45vj0skip1hnhicbv9da29fv6qcfwnsbnvj06n36mkj6h"; }; @@ -5142,7 +5165,7 @@ let pname = "DBI"; version = "1.642"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/DBI-1.642.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TIMB/DBI-1.642.tar.gz"; sha256 = "3f2025023a56286cebd15cb495e36ccd9b456c3cc229bf2ce1f69e9ebfc27f5d"; }; postInstall = stdenv.lib.optionalString (perl ? crossVersion) '' @@ -5184,7 +5207,7 @@ let EOF ''; meta = { - homepage = https://dbi.perl.org/; + homepage = "https://dbi.perl.org/"; description = "Database independent interface for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5211,13 +5234,13 @@ let pname = "DBIx-Class"; version = "0.082841"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082841.tar.gz; + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/DBIx-Class-0.082841.tar.gz"; sha256 = "d705f85825aced299020534349778537524526d64f524217ca362787f683c3bd"; }; buildInputs = [ DBDSQLite TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction ModuleFind PathClass SQLAbstract ScopeGuard SubName namespaceclean ]; meta = { - homepage = https://metacpan.org/pod/DBIx::Class; + homepage = "https://metacpan.org/pod/DBIx::Class"; description = "Extensible and flexible object <-> relational mapper"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5227,13 +5250,13 @@ let pname = "DBIx-Class-Candy"; version = "0.005003"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.005003.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Candy-0.005003.tar.gz"; sha256 = "b8a229a7b15f559095d4561cf8220460128541ba7fc3545ed35869923d46565c"; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ DBIxClass LinguaENInflect SubExporter ]; meta = { - homepage = https://github.com/frioux/DBIx-Class-Candy; + homepage = "https://github.com/frioux/DBIx-Class-Candy"; description = "Sugar for your favorite ORM, DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5243,7 +5266,7 @@ let pname = "DBIx-Class-Cursor-Cached"; version = "1.001004"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001004.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARCANEZ/DBIx-Class-Cursor-Cached-1.001004.tar.gz"; sha256 = "09b2jahn2x12qm4f7qm1jzsxbz7qn1czp6a3fnl5l2i3l4r5421p"; }; buildInputs = [ CacheCache DBDSQLite ]; @@ -5275,7 +5298,7 @@ let pname = "DBIx-Class-HTMLWidget"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDREMAR/DBIx-Class-HTMLWidget-0.16.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDREMAR/DBIx-Class-HTMLWidget-0.16.tar.gz"; sha256 = "05zhniyzl31nq410ywhxm0vmvac53h7ax42hjs9mmpvf45ipahj1"; }; propagatedBuildInputs = [ DBIxClass HTMLWidget ]; @@ -5285,13 +5308,13 @@ let pname = "DBIx-Class-Helpers"; version = "2.034002"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.034002.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Class-Helpers-2.034002.tar.gz"; sha256 = "08ab0eae514653b7f59444a0a19188ef65351889e9aefb19a2ea5a159fe2574b"; }; buildInputs = [ DBDSQLite DateTimeFormatSQLite TestDeep TestFatal TestRoo aliased ]; propagatedBuildInputs = [ CarpClan DBIxClassCandy DBIxIntrospector SafeIsa TextBrew ]; meta = { - homepage = https://github.com/frioux/DBIx-Class-Helpers; + homepage = "https://github.com/frioux/DBIx-Class-Helpers"; description = "Simplify the common case stuff for DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5318,7 +5341,7 @@ let pname = "DBIx-Class-IntrospectableM2M"; version = "0.001002"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-IntrospectableM2M-0.001002.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-IntrospectableM2M-0.001002.tar.gz"; sha256 = "c6baafb4241693fdb34b29ebd906993add364bf31aafa4462f3e062204cc87f0"; }; propagatedBuildInputs = [ DBIxClass ]; @@ -5332,7 +5355,7 @@ let pname = "DBIx-Class-Schema-Loader"; version = "0.07049"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07049.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/DBIx-Class-Schema-Loader-0.07049.tar.gz"; sha256 = "e869cdde1378cfebccf229b0cde58d2746dc6080b75f56d072aa5f1fce76a764"; }; buildInputs = [ DBDSQLite TestDeep TestDifferences TestException TestWarn ]; @@ -5347,7 +5370,7 @@ let pname = "DBIx-Connector"; version = "0.56"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/DBIx-Connector-0.56.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/DBIx-Connector-0.56.tar.gz"; sha256 = "57c08d2c1951486cb95cfb83f518f462a3dbf20d353f3eee4f46af44fa19c359"; }; buildInputs = [ TestMockModule ]; @@ -5362,7 +5385,7 @@ let pname = "DBIx-DBSchema"; version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz; + url = "mirror://cpan/authors/id/I/IV/IVAN/DBIx-DBSchema-0.45.tar.gz"; sha256 = "7a2a978fb6d9feaa3e4b109c71c963b26a008a2d130c5876ecf24c5a72338a1d"; }; propagatedBuildInputs = [ DBI ]; @@ -5372,7 +5395,7 @@ let pname = "DBIx-SearchBuilder"; version = "1.67"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/DBIx-SearchBuilder-1.67.tar.gz"; sha256 = "453179c22a61af573e502c8396f3f28daea03dfdc162094b90f9b3c331d563da"; }; buildInputs = [ DBDSQLite ]; @@ -5387,7 +5410,7 @@ let pname = "DBIx-Simple"; version = "1.37"; src = fetchurl { - url = mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz; + url = "mirror://cpan/authors/id/J/JU/JUERD/DBIx-Simple-1.37.tar.gz"; sha256 = "46d311aa2ce08907401c56119658426dbb044c5a40de73d9a7b79bf50390cae3"; }; propagatedBuildInputs = [ DBI ]; @@ -5400,7 +5423,7 @@ let pname = "Data-Binary"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SN/SNKWATT/Data-Binary-0.01.tar.gz; + url = "mirror://cpan/authors/id/S/SN/SNKWATT/Data-Binary-0.01.tar.gz"; sha256 = "0wwdrgkz4yqpzdmfvid63v5v10b9hwdsg15jvks0hwdc23ga48a8"; }; meta = { @@ -5413,7 +5436,7 @@ let pname = "DBIx-Introspector"; version = "0.001005"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/DBIx-Introspector-0.001005.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/DBIx-Introspector-0.001005.tar.gz"; sha256 = "0fp6h71xv4pgb8l815rs6ad4camzhjqf64s1sf7zmhchqqn4vacn"; }; @@ -5425,7 +5448,7 @@ let pname = "Devel-Cycle"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz; + url = "mirror://cpan/authors/id/L/LD/LDS/Devel-Cycle-1.12.tar.gz"; sha256 = "1hhb77kz3dys8yaik452j22cm3510zald2mpvfyv5clqv326aczx"; }; meta = { @@ -5437,7 +5460,7 @@ let pname = "Devel-Declare"; version = "0.006019"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Devel-Declare-0.006019.tar.gz"; sha256 = "ac719dc289cbf53fbb3b090ccd3a55a9d207f24e09480423c96f7185af131808"; }; buildInputs = [ ExtUtilsDepends TestRequires ]; @@ -5452,7 +5475,7 @@ let pname = "Devel-FindPerl"; version = "0.015"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.015.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Devel-FindPerl-0.015.tar.gz"; sha256 = "1z1xfj3178w632mqddyklk355a19bsgzkilznrng3rvg4bfbfxaj"; }; meta = { @@ -5465,7 +5488,7 @@ let pname = "Devel-GlobalDestruction"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.14.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalDestruction-0.14.tar.gz"; sha256 = "1aslj6myylsvzr0vpqry1cmmvzbmpbdcl4v9zrl18ccik7rabf1l"; }; propagatedBuildInputs = [ SubExporterProgressive ]; @@ -5478,7 +5501,7 @@ let pname = "Devel-GlobalPhase"; version = "0.003003"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Devel-GlobalPhase-0.003003.tar.gz"; sha256 = "1x9jzy3l7gwikj57swzl94qsq03j9na9h1m69azzs7d7ghph58wd"; }; meta = { @@ -5491,7 +5514,7 @@ let pname = "Devel-Hide"; version = "0.0010"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0010.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Devel-Hide-0.0010.tar.gz"; sha256 = "10jyv9nmv513hs75rls5yx2xn82513xnnhjir3dxiwgb1ykfyvvm"; }; }; @@ -5500,12 +5523,12 @@ let pname = "Devel-NYTProf"; version = "6.06"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz"; sha256 = "a14227ca79f1750b92cc7b8b0a5806c92abc4964a21a7fb100bd4907d6c4be55"; }; propagatedBuildInputs = [ FileWhich JSONMaybeXS ]; meta = { - homepage = https://github.com/timbunce/devel-nytprof; + homepage = "https://github.com/timbunce/devel-nytprof"; description = "Powerful fast feature-rich Perl source code profiler"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5516,7 +5539,7 @@ let pname = "Devel-OverloadInfo"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/Devel-OverloadInfo-0.005.tar.gz"; sha256 = "1rx6g8pyhi7lx6z130b7vlf8syzrq92w9ky8mpw4d6bwlkzy5zcb"; }; propagatedBuildInputs = [ MROCompat PackageStash SubIdentify ]; @@ -5531,7 +5554,7 @@ let pname = "Devel-PartialDump"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Devel-PartialDump-0.20.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Devel-PartialDump-0.20.tar.gz"; sha256 = "01yrsdpn9ns9iwwc92bhjn2605b7ys7i3198gjb935lsllzgzw5f"; }; propagatedBuildInputs = [ ClassTiny SubExporter namespaceclean ]; @@ -5542,7 +5565,7 @@ let pname = "Devel-StackTrace"; version = "2.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.04.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Devel-StackTrace-2.04.tar.gz"; sha256 = "cd3c03ed547d3d42c61fa5814c98296139392e7971c092e09a431f2c9f5d6855"; }; meta = { @@ -5555,7 +5578,7 @@ let pname = "Devel-StackTrace-AsHTML"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.15.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Devel-StackTrace-AsHTML-0.15.tar.gz"; sha256 = "0iri5nb2lb76qv5l9z0vjpfrq5j2fyclkd64kh020bvy37idp0v2"; }; propagatedBuildInputs = [ DevelStackTrace ]; @@ -5569,7 +5592,7 @@ let pname = "Devel-Symdump"; version = "2.18"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDK/Devel-Symdump-2.18.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDK/Devel-Symdump-2.18.tar.gz"; sha256 = "826f81a107f5592a2516766ed43beb47e10cc83edc9ea48090b02a36040776c0"; }; meta = { @@ -5582,7 +5605,7 @@ let pname = "Digest-CRC"; version = "0.22.2"; src = fetchurl { - url = mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.22.2.tar.gz; + url = "mirror://cpan/authors/id/O/OL/OLIMAUL/Digest-CRC-0.22.2.tar.gz"; sha256 = "112b50f7fbc6f6baf5d4584ee97f542ced6c9ec03a3147f7902c84b8b26778cb"; }; meta = { @@ -5595,7 +5618,7 @@ let pname = "Digest-HMAC"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Digest-HMAC-1.03.tar.gz"; sha256 = "0naavabbm1c9zgn325ndy66da4insdw9l3mrxwxdfi7i7xnjrirv"; }; meta = { @@ -5608,7 +5631,7 @@ let pname = "Digest-JHash"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Digest-JHash-0.10.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Digest-JHash-0.10.tar.gz"; sha256 = "c746cf0a861a004090263cd54d7728d0c7595a0cf90cbbfd8409b396ee3b0063"; }; meta = { @@ -5621,7 +5644,7 @@ let pname = "Digest-MD4"; version = "1.9"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKEM/DigestMD4/Digest-MD4-1.9.tar.gz"; sha256 = "19ma1hmvgiznq95ngzvm6v4dfxc9zmi69k8iyfcg6w14lfxi0lb6"; }; }; @@ -5630,7 +5653,7 @@ let pname = "Digest-MD5-File"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMUEY/Digest-MD5-File-0.08.tar.gz; + url = "mirror://cpan/authors/id/D/DM/DMUEY/Digest-MD5-File-0.08.tar.gz"; sha256 = "060jzf45dlwysw5wsm7av1wvpl06xgk415kwwpvv89r6wda3md5d"; }; propagatedBuildInputs = [ LWP ]; @@ -5643,7 +5666,7 @@ let pname = "Digest-Perl-MD5"; version = "1.9"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.9.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DELTA/Digest-Perl-MD5-1.9.tar.gz"; sha256 = "7100cba1710f45fb0e907d8b1a7bd8caef35c64acd31d7f225aff5affeecd9b1"; }; meta = { @@ -5656,7 +5679,7 @@ let pname = "Digest-SHA1"; version = "2.13"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Digest-SHA1-2.13.tar.gz"; sha256 = "1k23p5pjk42vvzg8xcn4iwdii47i0qm4awdzgbmz08bl331dmhb8"; }; meta = { @@ -5684,7 +5707,7 @@ let pname = "Dir-Manifest"; version = "0.6.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Dir-Manifest-0.6.1.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Dir-Manifest-0.6.1.tar.gz"; sha256 = "01g54wlvp647zvhn0sxl2pqajly17044qd3pxib8cpixhwk75zw4"; }; propagatedBuildInputs = [ Moo PathTiny ]; @@ -5698,7 +5721,7 @@ let pname = "Dispatch-Class"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAUKE/Dispatch-Class-0.02.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAUKE/Dispatch-Class-0.02.tar.gz"; sha256 = "10k5l4n2mp0hfn9jwn785k211n75y56zwny1zx3bvs7r38xv8kfp"; }; propagatedBuildInputs = [ ExporterTiny ]; @@ -5712,7 +5735,7 @@ let pname = "Dist-CheckConflicts"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Dist-CheckConflicts-0.11.tar.gz"; sha256 = "1i7dr9jpdiy2nijl2p4q5zg2q2s9ckbj2hs4kmnnckf9hsb4p17a"; }; buildInputs = [ TestFatal ]; @@ -5727,13 +5750,13 @@ let pname = "Dist-Zilla"; version = "6.012"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-6.012.tar.gz"; sha256 = "0w1hhvxcdf52ln940f8i37adv2gp7l8ryf2nm6m7haynyrsk0n37"; }; buildInputs = [ CPANMetaCheck TestDeep TestFailWarnings TestFatal TestFileShareDir ]; propagatedBuildInputs = [ AppCmd CPANUploader ConfigMVPReaderINI DateTime FileCopyRecursive FileFindRule FileShareDirInstall Filepushd LogDispatchouli MooseXLazyRequire MooseXSetOnce MooseXTypesPerl PathTiny PerlPrereqScanner PodEventual SoftwareLicense TermEncoding TermUI YAMLTiny ]; meta = { - homepage = http://dzil.org/; + homepage = "http://dzil.org/"; description = "Distribution builder; installer not included!"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5744,7 +5767,7 @@ let pname = "Dist-Zilla-PluginBundle-TestingMania"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.25.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-PluginBundle-TestingMania-0.25.tar.gz"; sha256 = "072rsilh88xnk18ldbr8d0svji72r79sabyird6xc3ql1z0b42sy"; }; buildInputs = [ MooseAutobox TestCPANMeta TestPerlCritic TestVersion ]; @@ -5760,7 +5783,7 @@ let pname = "Dist-Zilla-Plugin-CheckChangeLog"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.05.tar.gz; + url = "mirror://cpan/authors/id/F/FA/FAYLAND/Dist-Zilla-Plugin-CheckChangeLog-0.05.tar.gz"; sha256 = "b0b34d6d70b56f1944d03c5f0dc3b8f6f24474c816d07b657a116c692c2e052a"; }; propagatedBuildInputs = [ DistZilla ]; @@ -5775,12 +5798,12 @@ let pname = "Dist-Zilla-Plugin-MojibakeTests"; version = "0.8"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.8.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYP/Dist-Zilla-Plugin-MojibakeTests-0.8.tar.gz"; sha256 = "f1fff547ea24a8f7a483406a72ed6c4058d746d9dae963725502ddba025ab380"; }; propagatedBuildInputs = [ DistZilla ]; meta = { - homepage = https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests; + homepage = "https://github.com/creaktive/Dist-Zilla-Plugin-MojibakeTests"; description = "Release tests for source encoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5791,12 +5814,12 @@ let pname = "Dist-Zilla-Plugin-PodWeaver"; version = "4.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Dist-Zilla-Plugin-PodWeaver-4.008.tar.gz"; sha256 = "0ff1i26s54z292j8w8vm3gw3p7w1yq35wi8g978c84ia7y1y7n8z"; }; propagatedBuildInputs = [ DistZilla PodElementalPerlMunger PodWeaver ]; meta = { - homepage = https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver; + homepage = "https://github.com/rjbs/Dist-Zilla-Plugin-PodWeaver"; description = "Weave your Pod together from configuration and Dist::Zilla"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5806,13 +5829,13 @@ let pname = "Dist-Zilla-Plugin-ReadmeAnyFromPod"; version = "0.163250"; src = fetchurl { - url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250.tar.gz; + url = "mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeAnyFromPod-0.163250.tar.gz"; sha256 = "d44f2799922f78b2a7961ed89123e11bdd77abfe85ba2040d82b80ad72ed13bc"; }; buildInputs = [ TestDeep TestDifferences TestException TestFatal TestMost TestRequires TestSharedFork TestWarn ]; propagatedBuildInputs = [ DistZillaRoleFileWatcher MooseXHasSugar PodMarkdownGithub ]; meta = { - homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod; + homepage = "https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeAnyFromPod"; description = "Automatically convert POD to a README in any format for Dist::Zilla"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5822,13 +5845,13 @@ let pname = "Dist-Zilla-Plugin-ReadmeMarkdownFromPod"; version = "0.141140"; src = fetchurl { - url = mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140.tar.gz; + url = "mirror://cpan/authors/id/R/RT/RTHOMPSON/Dist-Zilla-Plugin-ReadmeMarkdownFromPod-0.141140.tar.gz"; sha256 = "9caad7b366ea59119ad73cdd99dcdd53f877a515bd0164fc28b339c01739a801"; }; buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; propagatedBuildInputs = [ DistZillaPluginReadmeAnyFromPod ]; meta = { - homepage = https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod; + homepage = "https://github.com/DarwinAwardWinner/Dist-Zilla-Plugin-ReadmeMarkdownFromPod"; description = "Automatically convert POD to a README.mkdn for Dist::Zilla"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5838,7 +5861,7 @@ let pname = "Dist-Zilla-Plugin-Test-CPAN-Changes"; version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Changes-0.012.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Changes-0.012.tar.gz"; sha256 = "215b3a5c3c58c8bab0ea27130441bbdaec737eecc00f0670937f608bdbf64806"; }; buildInputs = [ CPANChanges TestDeep ]; @@ -5853,13 +5876,13 @@ let pname = "Dist-Zilla-Plugin-Test-CPAN-Meta-JSON"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-CPAN-Meta-JSON-0.004.tar.gz"; sha256 = "0a573e1d5640374e6ee4d56d4fb94a3c67d4e75d52b3ddeae70cfa6450e1af22"; }; buildInputs = [ MooseAutobox TestCPANMetaJSON TestDeep ]; propagatedBuildInputs = [ DistZilla ]; meta = { - homepage = http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON; + homepage = "http://p3rl.org/Dist::Zilla::Plugin::Test::CPAN::Meta::JSON"; description = "Release tests for your META.json"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5869,13 +5892,13 @@ let pname = "Dist-Zilla-Plugin-Test-Compile"; version = "2.058"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Compile-2.058.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Compile-2.058.tar.gz"; sha256 = "d0cf93e525f102eca0f7f3967124d2e59d0a212f738ce54c1ddd91dda268d88a"; }; buildInputs = [ CPANMetaCheck ModuleBuildTiny TestDeep TestMinimumVersion TestWarnings ]; propagatedBuildInputs = [ DistZilla ]; meta = { - homepage = https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-Compile; + homepage = "https://github.com/karenetheridge/Dist-Zilla-Plugin-Test-Compile"; description = "Common tests to check syntax of your modules, only using core modules"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5885,7 +5908,7 @@ let pname = "Dist-Zilla-Plugin-Test-DistManifest"; version = "2.000005"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000005.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-DistManifest-2.000005.tar.gz"; sha256 = "4f0af27bb38745d2dec7d941bcf749e6d7fbeaf8e7bcf8a79a1310a9639b0f65"; }; buildInputs = [ TestDeep TestDistManifest TestOutput ]; @@ -5900,7 +5923,7 @@ let pname = "Dist-Zilla-Plugin-Test-EOL"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-EOL-0.19.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-EOL-0.19.tar.gz"; sha256 = "0f23g931azz1k41xdfxw7kayy4snhw4qdr9ysknk5k1cl33mkfd2"; }; buildInputs = [ ModuleBuildTiny TestDeep TestEOL TestWarnings ]; @@ -5915,7 +5938,7 @@ let pname = "Dist-Zilla-Plugin-Test-Kwalitee"; version = "2.12"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.12.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Kwalitee-2.12.tar.gz"; sha256 = "bddbcfcc75e8eb2d2d9c8611552f00cdc1b051f0f00798623b8692ff5030af2f"; }; buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestKwalitee ]; @@ -5930,7 +5953,7 @@ let pname = "Dist-Zilla-Plugin-Test-MinimumVersion"; version = "2.000010"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-MinimumVersion-2.000010.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-MinimumVersion-2.000010.tar.gz"; sha256 = "b8b71f4b64b689f4b647a3a87d6aaaae45a68892d35e36baa976f605736370fb"; }; buildInputs = [ ModuleBuildTiny TestDeep TestMinimumVersion TestOutput ]; @@ -5945,7 +5968,7 @@ let pname = "Dist-Zilla-Plugin-Test-NoTabs"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-NoTabs-0.15.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-NoTabs-0.15.tar.gz"; sha256 = "196hchmn8y591533v3p7kl75nlhpaygbfdiw2iqbnab9j510qq8v"; }; propagatedBuildInputs = [ DistZilla ]; @@ -5961,7 +5984,7 @@ let pname = "Dist-Zilla-Plugin-Test-Perl-Critic"; version = "3.001"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Perl-Critic-3.001.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Perl-Critic-3.001.tar.gz"; sha256 = "9250b59d5dc1ae4c6893ba783bd3f05131b14ff9e91afb4555314f55268a3825"; }; buildInputs = [ ModuleBuildTiny TestDeep TestPerlCritic ]; @@ -5976,13 +5999,13 @@ let pname = "Dist-Zilla-Plugin-Test-Pod-LinkCheck"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.004.tar.gz; + url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/Dist-Zilla-Plugin-Test-Pod-LinkCheck-1.004.tar.gz"; sha256 = "325d236da0940388d2aa86ec5c1326516b4ad45adef8e7a4f83bb91d5ee15490"; }; # buildInputs = [ TestPodLinkCheck ]; propagatedBuildInputs = [ DistZilla ]; meta = { - homepage = https://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck; + homepage = "https://github.com/rwstauner/Dist-Zilla-Plugin-Test-Pod-LinkCheck"; description = "Add release tests for POD links"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -5992,7 +6015,7 @@ let pname = "Dist-Zilla-Plugin-Test-Portability"; version = "2.001000"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001000.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Plugin-Test-Portability-2.001000.tar.gz"; sha256 = "e08ff5bd9e24cf9503055330148913808d91a3dfe320a2bdf8b0fc638719b179"; }; buildInputs = [ ModuleBuildTiny TestDeep TestPortabilityFiles TestWarnings ]; @@ -6007,7 +6030,7 @@ let pname = "Dist-Zilla-Plugin-Test-Synopsis"; version = "2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000007.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-Synopsis-2.000007.tar.gz"; sha256 = "e7d5e2530cd8a5bb5aadf3e1669a653aaa96e32cad7bd6b9caba6b425ceab563"; }; buildInputs = [ TestDeep TestOutput TestSynopsis ]; @@ -6022,7 +6045,7 @@ let pname = "Dist-Zilla-Plugin-Test-UnusedVars"; version = "2.000007"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000007.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOHERTY/Dist-Zilla-Plugin-Test-UnusedVars-2.000007.tar.gz"; sha256 = "ea0199a3a0043213ddc132508b9ed9b131ef717735b8f93d78291191d04b43c2"; }; buildInputs = [ TestDeep TestOutput TestVars ]; @@ -6037,7 +6060,7 @@ let pname = "Dist-Zilla-Plugin-Test-Version"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-Test-Version-1.09.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Dist-Zilla-Plugin-Test-Version-1.09.tar.gz"; sha256 = "7240508731bc1bf6dfad7701ec65450a18ef9245a521ab26ebd6acb39a9ebe17"; }; buildInputs = [ Filechdir TestDeep TestEOL TestNoTabs TestScript TestVersion ]; @@ -6052,7 +6075,7 @@ let pname = "Dist-Zilla-Role-FileWatcher"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-FileWatcher-0.006.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Dist-Zilla-Role-FileWatcher-0.006.tar.gz"; sha256 = "15jfpr257xxp27gz156npgpj7kh2dchzgfmvzivi5bvdb2wl8fpy"; }; propagatedBuildInputs = [ DistZilla SafeIsa ]; @@ -6068,7 +6091,7 @@ let pname = "Dumbbench"; version = "0.111"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Dumbbench-0.111.tar.gz"; sha256 = "1ixjb9y9d0k1vd4mzbi4sgvr99ay4z9jkgychf0r5gbjsskkq7fk"; }; propagatedBuildInputs = [ CaptureTiny ClassXSAccessor DevelCheckOS NumberWithError StatisticsCaseResampling ]; @@ -6083,12 +6106,12 @@ let pname = "Email-Abstract"; version = "3.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.008.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.008.tar.gz"; sha256 = "fc7169acb6c43df7f005e7ef6ad08ee8ca6eb6796b5d1604593c997337cc8240"; }; propagatedBuildInputs = [ EmailSimple MROCompat ModulePluggable ]; meta = { - homepage = https://github.com/rjbs/Email-Abstract; + homepage = "https://github.com/rjbs/Email-Abstract"; description = "Unified interface to mail representations"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6098,7 +6121,7 @@ let pname = "Email-Address"; version = "1.912"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Address-1.912.tar.gz"; sha256 = "1vzr0vx4zsw4zbc9xdffc31wnkc1raqmyfiyws06fbyck197i8qg"; }; meta = { @@ -6111,7 +6134,7 @@ let pname = "Email-Address-List"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Email-Address-List-0.06.tar.gz"; sha256 = "305b94c778011cee70d9f21514d92e985fa9dccbb84c64798f0c1f0b24eb870e"; }; buildInputs = [ JSON ]; @@ -6126,7 +6149,7 @@ let pname = "Email-Address-XS"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz; + url = "mirror://cpan/authors/id/P/PA/PALI/Email-Address-XS-1.04.tar.gz"; sha256 = "0gjrrl81z3sfwavgx5kwjd87gj44mlnbbqsm3dgdv1xllw26spwr"; }; meta = { @@ -6139,11 +6162,11 @@ let pname = "Email-Date-Format"; version = "1.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Date-Format-1.005.tar.gz"; sha256 = "579c617e303b9d874411c7b61b46b59d36f815718625074ae6832e7bb9db5104"; }; meta = { - homepage = https://github.com/rjbs/Email-Date-Format; + homepage = "https://github.com/rjbs/Email-Date-Format"; description = "Produce RFC 2822 date strings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6153,7 +6176,7 @@ let pname = "Email-Reply"; version = "1.204"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Reply-1.204.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Reply-1.204.tar.gz"; sha256 = "ba4fd80ac5017d6d132e0358c786b0ecd1c7adcbeee5c19fb3da2964791a56f0"; }; propagatedBuildInputs = [ EmailAbstract EmailAddress EmailMIME ]; @@ -6167,7 +6190,7 @@ let pname = "Email-MessageID"; version = "1.406"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MessageID-1.406.tar.gz"; sha256 = "1f22sdnfq169qw1l0lg7y74pmiam7j9v95bggjnf3q4mygdmshpc"; }; meta = { @@ -6180,12 +6203,12 @@ let pname = "Email-MIME"; version = "1.946"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.946.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-1.946.tar.gz"; sha256 = "68ee79023165d77bec99a2e12ef89ad4e12501e6c321f6822053dc4f411c337c"; }; propagatedBuildInputs = [ EmailAddressXS EmailMIMEContentType EmailMIMEEncodings EmailMessageID EmailSimple MIMETypes ModuleRuntime ]; meta = { - homepage = https://github.com/rjbs/Email-MIME; + homepage = "https://github.com/rjbs/Email-MIME"; description = "Easy MIME message handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6198,7 +6221,7 @@ let propagatedBuildInputs = [ EmailAbstract EmailMIME ]; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Attachment-Stripper-1.317.tar.gz"; sha256 = "dcb98b09dc3e8f757ec3882a4234548108bb2d12e3cfadf95a26cef381a9e789"; }; meta = { @@ -6211,11 +6234,11 @@ let pname = "Email-MIME-ContentType"; version = "1.022"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.022.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-ContentType-1.022.tar.gz"; sha256 = "9abb7280b0da62a855ae5528b14deb94341a84e721af0a7e5a2adc3534ec5310"; }; meta = { - homepage = https://github.com/rjbs/Email-MIME-ContentType; + homepage = "https://github.com/rjbs/Email-MIME-ContentType"; description = "Parse a MIME Content-Type Header"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6225,12 +6248,12 @@ let pname = "Email-MIME-Encodings"; version = "1.315"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-MIME-Encodings-1.315.tar.gz"; sha256 = "4c71045507b31ec853dd60152b40e33ba3741779c0f49bb143b50cf8d243ab5c"; }; buildInputs = [ CaptureTiny ]; meta = { - homepage = https://github.com/rjbs/Email-MIME-Encodings; + homepage = "https://github.com/rjbs/Email-MIME-Encodings"; description = "A unified interface to MIME encoding and decoding"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6240,12 +6263,12 @@ let pname = "Email-Send"; version = "2.201"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.201.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Send-2.201.tar.gz"; sha256 = "4bbec933558d7cc9b8152bad86dd313de277a21a89b4ea83d84e61587e95dbc6"; }; propagatedBuildInputs = [ EmailAbstract EmailAddress ReturnValue ]; meta = { - homepage = https://github.com/rjbs/Email-Send; + homepage = "https://github.com/rjbs/Email-Send"; description = "Simply Sending Email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6256,12 +6279,12 @@ let pname = "Email-Outlook-Message"; version = "0.919"; src = fetchurl { - url = mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.919.tar.gz; + url = "mirror://cpan/authors/id/M/MV/MVZ/Email-Outlook-Message-0.919.tar.gz"; sha256 = "0fb1gymqa8nlj540dmbb1rhs2b0ln3y9ippbgj0miswcw92iaayb"; }; propagatedBuildInputs = [ EmailMIME EmailSender IOAll IOString OLEStorage_Lite ]; meta = with stdenv.lib; { - homepage = https://www.matijs.net/software/msgconv/; + homepage = "https://www.matijs.net/software/msgconv/"; description = "A .MSG to mbox converter"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = with maintainers; [ peterhoeg ]; @@ -6272,7 +6295,7 @@ let pname = "Email-Sender"; version = "1.300034"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300034.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300034.tar.gz"; sha256 = "05ac38a63b053c7c3846ffa45196e4483a5785941b0bfb615b22b7a4f04c5291"; }; buildInputs = [ CaptureTiny ]; @@ -6285,7 +6308,7 @@ let shortenPerlShebang util/sendmail ''; meta = { - homepage = https://github.com/rjbs/Email-Sender; + homepage = "https://github.com/rjbs/Email-Sender"; description = "A library for sending email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6295,12 +6318,12 @@ let pname = "Email-Simple"; version = "2.216"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Simple-2.216.tar.gz"; sha256 = "d85f63cd1088d11311103676a8cf498fff564a201b538de52cd753b5e5ca8bd4"; }; propagatedBuildInputs = [ EmailDateFormat ]; meta = { - homepage = https://github.com/rjbs/Email-Simple; + homepage = "https://github.com/rjbs/Email-Simple"; description = "Simple parsing of RFC2822 message format and headers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -6310,7 +6333,7 @@ let pname = "Email-Valid"; version = "1.202"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Email-Valid-1.202.tar.gz"; sha256 = "18hkmhddzbd23s6ak64d4j6q8ijykjyp5nxbr2hfcq1acsdhh8fh"; }; propagatedBuildInputs = [ IOCaptureOutput MailTools NetDNS NetDomainTLD ]; @@ -6321,7 +6344,7 @@ let pname = "Email-Valid-Loose"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Valid-Loose-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Email-Valid-Loose-0.05.tar.gz"; sha256 = "e718e76eddee240251c999e139c8cbe6f2cc80192da5af875cbd12fa8ab93a59"; }; propagatedBuildInputs = [ EmailValid ]; @@ -6334,7 +6357,7 @@ let pname = "Encode"; version = "3.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.02.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-3.02.tar.gz"; sha256 = "5865be4951870f62f43722818d076d7724306c75c8f268346b282351cbc820a8"; }; meta = { @@ -6347,7 +6370,7 @@ let pname = "Encode-Detect"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/J/JG/JGMYERS/Encode-Detect-1.01.tar.gz; + url = "mirror://cpan/authors/id/J/JG/JGMYERS/Encode-Detect-1.01.tar.gz"; sha256 = "834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; @@ -6362,7 +6385,7 @@ let pname = "Encode-EUCJPASCII"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEZUMI/Encode-EUCJPASCII-0.03.tar.gz"; sha256 = "f998d34d55fd9c82cf910786a0448d1edfa60bf68e2c2306724ca67c629de861"; }; outputs = [ "out" ]; @@ -6376,7 +6399,7 @@ let pname = "Encode-HanExtra"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz; + url = "mirror://cpan/authors/id/A/AU/AUDREYT/Encode-HanExtra-0.23.tar.gz"; sha256 = "1fd4b06cada70858003af153f94c863b3b95f2e3d03ba18d0451a81d51db443a"; }; meta = { @@ -6389,7 +6412,7 @@ let pname = "Encode-JIS2K"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Encode-JIS2K-0.03.tar.gz"; sha256 = "1ec84d72db39deb4dad6fca95acfcc21033f45a24d347c20f9a1a696896c35cc"; }; outputs = [ "out" ]; @@ -6401,7 +6424,7 @@ let pname = "Encode-Locale"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz"; sha256 = "176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1"; }; preCheck = if stdenv.isCygwin then '' @@ -6419,7 +6442,7 @@ let pname = "Encode-Newlines"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Encode-Newlines-0.05.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Encode-Newlines-0.05.tar.gz"; sha256 = "1gipd3wnma28w5gjbzycfkpi6chksy14lhxkp4hwizf8r351zcrl"; }; meta = { @@ -6433,7 +6456,7 @@ let pname = "enum"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/enum-1.11.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/enum-1.11.tar.gz"; sha256 = "d2f36b5015f1e35f640159867b60bf5d5cd66b56cd5e42d33f531be68e5eee35"; }; meta = { @@ -6445,7 +6468,7 @@ let pname = "Env"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Env-1.04.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Env-1.04.tar.gz"; sha256 = "d94a3d412df246afdc31a2199cbd8ae915167a3f4684f7b7014ce1200251ebb0"; }; meta = { @@ -6458,7 +6481,7 @@ let pname = "Env-Path"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSB/Env-Path-0.19.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSB/Env-Path-0.19.tar.gz"; sha256 = "1qhmj15a66h90pjl2dgnxsb9jj3b1r5mpvnr87cafcl8g69z0jr4"; }; }; @@ -6467,7 +6490,7 @@ let pname = "Env-Sanctify"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Env-Sanctify-1.12.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Env-Sanctify-1.12.tar.gz"; sha256 = "0prj51c9w4k6nrpnpfw6an96953vna74g698kyk78m163ikbbqr0"; }; meta = { @@ -6481,7 +6504,7 @@ let pname = "Error"; version = "0.17029"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17029.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Error-0.17029.tar.gz"; sha256 = "1p3spyarrh8y14d3j9s71xcndjlr70x3f8c3nvaddbij628zf8qs"; }; }; @@ -6490,7 +6513,7 @@ let pname = "EV"; version = "4.32"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.32.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/EV-4.32.tar.gz"; sha256 = "b82a8b89bb9cca475f6242c8621dc2c48f24851ca61558e1bd592b8506752936"; }; buildInputs = [ CanaryStability ]; @@ -6504,7 +6527,7 @@ let pname = "Eval-Closure"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Eval-Closure-0.14.tar.gz"; sha256 = "1bcc47r6zm3hfr6ccsrs72kgwxm3wkk07mgnpsaxi67cypr482ga"; }; buildInputs = [ TestFatal TestRequires ]; @@ -6518,7 +6541,7 @@ let pname = "Exception-Base"; version = "0.2501"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.2501.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.2501.tar.gz"; sha256 = "5723dd78f4ac0b4d262a05ea46af663ea00d8096b2e9c0a43515c210760e1e75"; }; buildInputs = [ TestUnitLite ]; @@ -6532,7 +6555,7 @@ let pname = "Exception-Class"; version = "1.44"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.44.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Exception-Class-1.44.tar.gz"; sha256 = "03gf4cdgrjnljgrlxkvbh2cahsyzn0zsh2zcli7b1lrqn7wgpwrk"; }; propagatedBuildInputs = [ ClassDataInheritable DevelStackTrace ]; @@ -6542,7 +6565,7 @@ let pname = "Exception-Died"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Died-0.06.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Exception-Died-0.06.tar.gz"; sha256 = "1dcajw2m3x5m76fpi3fvy9fjkmfrd171pnx087i5fkgx5ay41i1m"; }; buildInputs = [ TestAssert TestUnitLite ]; @@ -6553,7 +6576,7 @@ let pname = "Exception-Warning"; version = "0.0401"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Exception-Warning-0.0401.tar.gz"; sha256 = "1a6k3sbhkxmz00wrmhv70f9kxjf7fklp1y6mnprfvcdmrsk9qdkv"; }; buildInputs = [ TestAssert TestUnitLite ]; @@ -6564,7 +6587,7 @@ let pname = "Exporter-Declare"; version = "0.114"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.114.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Exporter-Declare-0.114.tar.gz"; sha256 = "4bd70d6ca76f6f6ba7e4c618d4ac93b8593a58f1233ccbe18b10f5f204f1d4e4"; }; buildInputs = [ FennecLite TestException ]; @@ -6580,7 +6603,7 @@ let pname = "Exporter-Lite"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Exporter-Lite-0.08.tar.gz"; sha256 = "1hns15imih8z2h6zv3m1wwmv9fiysacsb52y94v6zf2cmw4kjny0"; }; meta = { @@ -6592,7 +6615,7 @@ let pname = "Exporter-Tiny"; version = "1.002001"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Exporter-Tiny-1.002001.tar.gz"; sha256 = "a82c334c02ce4b0f9ea77c67bf77738f76a9b8aa4bae5c7209d1c76453d3c48d"; }; meta = { @@ -6605,7 +6628,7 @@ let pname = "ExtUtils-CBuilder"; version = "0.280234"; src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280234.tar.gz; + url = "mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-CBuilder-0.280234.tar.gz"; sha256 = "1hzixkg85mys94a2i658pdr28xhzyrisvknsps691d183zm9a06q"; }; meta = { @@ -6619,7 +6642,7 @@ let pname = "Expect"; version = "1.35"; src = fetchurl { - url = mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz; + url = "mirror://cpan/authors/id/J/JA/JACOBY/Expect-1.35.tar.gz"; sha256 = "09d92761421decd495853103379165a99efbf452c720f30277602cf23679fd06"; }; propagatedBuildInputs = [ IOTty ]; @@ -6633,7 +6656,7 @@ let pname = "ExtUtils-CChecker"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.10.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.10.tar.gz"; sha256 = "50bfe76870fc1510f56bae4fa2dce0165d9ac4af4e7320d6b8fda14dfea4be0b"; }; buildInputs = [ TestFatal ]; @@ -6647,7 +6670,7 @@ let pname = "ExtUtils-Config"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Config-0.008.tar.gz"; sha256 = "ae5104f634650dce8a79b7ed13fb59d67a39c213a6776cfdaa3ee749e62f1a8c"; }; meta = { @@ -6660,7 +6683,7 @@ let pname = "ExtUtils-Constant"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz; + url = "mirror://cpan/authors/id/N/NW/NWCLARK/ExtUtils-Constant-0.25.tar.gz"; sha256 = "6933d0e963b62281ef7561068e6aecac8c4ac2b476b2bba09ab0b90fbac9d757"; }; }; @@ -6669,7 +6692,7 @@ let pname = "ExtUtils-CppGuess"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.21.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETJ/ExtUtils-CppGuess-0.21.tar.gz"; sha256 = "0ls1y9bb2nff9djli91s86541r7ajcjp22gqhcdmj7hs69w92qpz"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; @@ -6681,7 +6704,7 @@ let pname = "ExtUtils-Depends"; version = "0.8000"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8000.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-Depends-0.8000.tar.gz"; sha256 = "165y1cjirbq64w39svkz82cb5jjqkjm8f4c0wqi2lk6050hzf3vq"; }; meta = { @@ -6689,11 +6712,25 @@ let }; }; + ExtUtilsF77 = buildPerlPackage rec { + pname = "ExtUtils-F77"; + version = "1.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/K/KG/KGB/${pname}-${version}.tar.gz"; + sha256 = "634715969c1650be815b3f11c151444e8793ebd6b6d92ce8654d56d6f893a6a9"; + }; + buildInputs = [ FileWhich pkgs.gfortran ]; + meta = { + description = "A simple interface to F77 libs"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ExtUtilsHelpers = buildPerlPackage { pname = "ExtUtils-Helpers"; version = "0.026"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-Helpers-0.026.tar.gz"; sha256 = "05ilqcj1rg5izr09dsqmy5di4fvq6ph4k0chxks7qmd4j1kip46y"; }; meta = { @@ -6706,7 +6743,7 @@ let pname = "ExtUtils-Install"; version = "2.14"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.14.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-Install-2.14.tar.gz"; sha256 = "35412305cbae979aac3b6e2c70cb301ae461979a1d848a8a043f74518eb96aea"; }; meta = { @@ -6719,7 +6756,7 @@ let pname = "ExtUtils-InstallPaths"; version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/ExtUtils-InstallPaths-0.012.tar.gz"; sha256 = "1v9lshfhm9ck4p0v77arj5f7haj1mmkqal62lgzzvcds6wq5www4"; }; propagatedBuildInputs = [ ExtUtilsConfig ]; @@ -6733,7 +6770,7 @@ let pname = "ExtUtils-LibBuilder"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz; + url = "mirror://cpan/authors/id/A/AM/AMBS/ExtUtils-LibBuilder-0.08.tar.gz"; sha256 = "1lmmfcjxvsvhn4f3v2lyylgr8dzcf5j7mnd1pkq3jc75dph724f5"; }; perlPreHook = "export LD=$CC"; @@ -6747,7 +6784,7 @@ let pname = "ExtUtils-MakeMaker"; version = "7.44"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.44.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.44.tar.gz"; sha256 = "52a18f8271250faf5f3527499dd2b78d3b4fd3b064408d0cfdda9a3538887188"; }; meta = { @@ -6760,7 +6797,7 @@ let pname = "ExtUtils-MakeMaker-CPANfile"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/ExtUtils-MakeMaker-CPANfile-0.09.tar.gz"; sha256 = "0xg2z100vjhcndwaz9m3mmi90rb8h5pggpvlj1b0i8dhsh3pc1rc"; }; propagatedBuildInputs = [ ModuleCPANfile ]; @@ -6774,7 +6811,7 @@ let pname = "ExtUtils-Manifest"; version = "1.72"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.72.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/ExtUtils-Manifest-1.72.tar.gz"; sha256 = "0pml5pfdk34nj9fa8m4f0qp1rh1yv0d54xagvxzjvvwq9w3q14kr"; }; }; @@ -6783,12 +6820,12 @@ let pname = "ExtUtils-PkgConfig"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz"; sha256 = "bbeaced995d7d8d10cfc51a3a5a66da41ceb2bc04fedcab50e10e6300e801c6e"; }; propagatedBuildInputs = [ pkgs.pkgconfig ]; meta = { - homepage = http://gtk2-perl.sourceforge.net; + homepage = "http://gtk2-perl.sourceforge.net"; description = "Simplistic interface to pkg-config"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -6809,7 +6846,7 @@ let pname = "ExtUtils-Typemap"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemap-1.00.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemap-1.00.tar.gz"; sha256 = "1iqz0xlscg655gnwb2h1wrjj70llblps1zznl29qn1mv5mvibc5i"; }; }; @@ -6818,7 +6855,7 @@ let pname = "ExtUtils-Typemaps-Default"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-Typemaps-Default-1.05.tar.gz"; sha256 = "1phmha0ks95kvzl00r1kgnd5hvg7qb1q9jmzjmw01p5zgs1zbyix"; }; }; @@ -6827,7 +6864,7 @@ let pname = "ExtUtils-XSBuilder"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.28.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.28.tar.gz"; sha256 = "8cced386e3d544c5ec2deb3aed055b72ebcfc2ea9a6c807da87c4245272fe80a"; }; propagatedBuildInputs = [ ParseRecDescent TieIxHash ]; @@ -6837,7 +6874,7 @@ let pname = "ExtUtils-XSpp"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/ExtUtils-XSpp-0.18.tar.gz"; sha256 = "1zx84f93lkymqz7qa4d63gzlnhnkxm5i3gvsrwkvvqr9cxjasxli"; }; buildInputs = [ TestBase TestDifferences ]; @@ -6847,7 +6884,7 @@ let pname = "Fatal-Exception"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Fatal-Exception-0.05.tar.gz"; sha256 = "0kzfwc44vpxla3j637kfmnwmv57g6x4899ijqb4ljamk7whms298"; }; buildInputs = [ ExceptionWarning TestAssert TestUnitLite ]; @@ -6858,7 +6895,7 @@ let pname = "FCGI"; version = "0.79"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.79.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/FCGI-0.79.tar.gz"; sha256 = "1r1lzd74lzzdl2brcanw4n70m37nd8n6gv9clb55m3gv2hdlxylc"; }; postPatch = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -6870,7 +6907,7 @@ let pname = "FCGI-Client"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/FCGI-Client-0.09.tar.gz"; sha256 = "1s11casbv0jmkcl5dk8i2vhfy1nc8rg43d3bg923zassrq4wndym"; }; propagatedBuildInputs = [ Moo TypeTiny ]; @@ -6885,7 +6922,7 @@ let pname = "FCGI-ProcManager"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.28.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/FCGI-ProcManager-0.28.tar.gz"; sha256 = "e1c958c042427a175e051e0008f2025e8ec80613d3c7750597bf8e529b04420e"; }; meta = { @@ -6897,7 +6934,7 @@ let pname = "FFI-CheckLib"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.26.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.26.tar.gz"; sha256 = "0rbzm4cisn4vdj1kc0sa6v8m1b3mjkryi5w14hk1d13zh3q3pqq6"; }; buildInputs = [ Test2Suite ]; @@ -6911,7 +6948,7 @@ let pname = "Fennec-Lite"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Fennec-Lite-0.004.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Fennec-Lite-0.004.tar.gz"; sha256 = "dce28e3932762c2ff92aa52d90405c06e898e81cb7b164ccae8966ae77f1dcab"; }; meta = { @@ -6925,7 +6962,7 @@ let pname = "File-ChangeNotify"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.31.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.31.tar.gz"; sha256 = "192bdb1ce76266c6a694a8e962d039e3adeeb829b6ac1e23f5057f2b506392bd"; }; buildInputs = [ Test2Suite TestRequires TestWithoutModule ]; @@ -6940,7 +6977,7 @@ let pname = "File-chdir"; version = "0.1010"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1010.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/File-chdir-0.1010.tar.gz"; sha256 = "009b8p2fzj4nhl03fpkhrn0rsh7myxqbrf69iqpzd86p1gs23hgg"; }; }; @@ -6949,7 +6986,7 @@ let version = "0.08"; pname = "File-BaseDir"; src = fetchurl { - url = mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz; + url = "mirror://cpan/authors/id/K/KI/KIMRYAN/File-BaseDir-0.08.tar.gz"; sha256 = "c065fcd3e2f22ae769937bcc971b91f80294d5009fac140bfba83bf7d35305e3"; }; configurePhase = '' @@ -6964,7 +7001,7 @@ let pname = "File-BOM"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.16.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTLAW/File-BOM-0.16.tar.gz"; sha256 = "97091a72bb1d3a7b5cac1dfb5372962b6f8055729189d0f3fd2c959c8ff374cf"; }; buildInputs = [ TestException ]; @@ -6979,7 +7016,7 @@ let pname = "File-CheckTree"; version = "4.42"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/File-CheckTree-4.42.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/File-CheckTree-4.42.tar.gz"; sha256 = "66fb417f8ff8a5e5b7ea25606156e70e204861c59fa8c3831925b4dd3f155f8a"; }; meta = { @@ -6992,7 +7029,7 @@ let pname = "File-Copy-Recursive"; version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.45.tar.gz; + url = "mirror://cpan/authors/id/D/DM/DMUEY/File-Copy-Recursive-0.45.tar.gz"; sha256 = "0mqivx4nbzagl3s2kxka72050sfb75xvn25j8a0f6ic3ibvir5yk"; }; buildInputs = [ PathTiny TestDeep TestFatal TestFile TestWarnings ]; @@ -7002,7 +7039,7 @@ let pname = "File-Copy-Recursive-Reduced"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Copy-Recursive-Reduced-0.006.tar.gz"; sha256 = "0b3yf33bahaf4ipfqipn8y5z4296k3vgzzsqbhh5ahwzls9zj676"; }; buildInputs = [ CaptureTiny PathTiny ]; @@ -7017,7 +7054,7 @@ let version = "0.22"; pname = "File-DesktopEntry"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-DesktopEntry-0.22.tar.gz"; sha256 = "169c01e3dae2f629767bec1a9f1cdbd6ec6d713d1501e0b2786e4dd1235635b8"; }; propagatedBuildInputs = [ FileBaseDir URI ]; @@ -7027,7 +7064,7 @@ let pname = "File-Find-Iterator"; version = "0.4"; src = fetchurl { - url = mirror://cpan/authors/id/T/TE/TEXMEC/File-Find-Iterator-0.4.tar.gz; + url = "mirror://cpan/authors/id/T/TE/TEXMEC/File-Find-Iterator-0.4.tar.gz"; sha256 = "a2b87ab9756a2e5bb674adbd39937663ed20c28c716bf5a1095a3ca44d54ab2c"; }; propagatedBuildInputs = [ ClassIterator ]; @@ -7039,7 +7076,7 @@ let pname = "File-Find-Object"; version = "0.3.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-0.3.5.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-0.3.5.tar.gz"; sha256 = "dc4124abe64dc1274e8e8a5e5bf9e17a2a9269debace458115b57469f1e16a91"; }; propagatedBuildInputs = [ ClassXSAccessor ]; @@ -7053,7 +7090,7 @@ let pname = "File-Find-Object-Rule"; version = "0.0312"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0312.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Find-Object-Rule-0.0312.tar.gz"; sha256 = "3e0b6c8dadf6362e65f2310530b1be637ed6aac113399d10c6f9129e734afff9"; }; propagatedBuildInputs = [ FileFindObject NumberCompare TextGlob ]; @@ -7062,7 +7099,7 @@ let tar xf $src */t/sample-data --strip-components=1 ''; meta = { - homepage = https://www.shlomifish.org/open-source/projects/File-Find-Object/; + homepage = "https://www.shlomifish.org/open-source/projects/File-Find-Object/"; description = "Alternative interface to File::Find::Object"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7072,7 +7109,7 @@ let pname = "File-Find-Rule"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/File-Find-Rule-0.34.tar.gz"; sha256 = "1znachnhmi1w5pdqx8dzgfa892jb7x8ivrdy4pzjj7zb6g61cvvy"; }; propagatedBuildInputs = [ NumberCompare TextGlob ]; @@ -7082,7 +7119,7 @@ let pname = "File-Find-Rule-Perl"; version = "1.15"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-Find-Rule-Perl-1.15.tar.gz"; sha256 = "9a48433f86e08ce18e03526e2982de52162eb909d19735460f07eefcaf463ea6"; }; propagatedBuildInputs = [ FileFindRule ParamsUtil ]; @@ -7096,7 +7133,7 @@ let pname = "File-Finder"; version = "0.53"; src = fetchurl { - url = mirror://cpan/authors/id/M/ME/MERLYN/File-Finder-0.53.tar.gz; + url = "mirror://cpan/authors/id/M/ME/MERLYN/File-Finder-0.53.tar.gz"; sha256 = "2ecbc19ac67a9e635c872a807a8d3eaaff5babc054f15a191d47cdfc5f176a74"; }; propagatedBuildInputs = [ TextGlob ]; @@ -7123,12 +7160,12 @@ let pname = "FileHandle-Unget"; version = "0.1634"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1634.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCOPPIT/FileHandle-Unget-0.1634.tar.gz"; sha256 = "380f34ad3ce5e9ec661d4c468bb3392231c162317d4172df378146b42aab1785"; }; buildInputs = [ FileSlurper TestCompile UNIVERSALrequire URI ]; meta = { - homepage = https://github.com/coppit/filehandle-unget/; + homepage = "https://github.com/coppit/filehandle-unget/"; description = "FileHandle which supports multi-byte unget"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ romildo ]; @@ -7139,7 +7176,7 @@ let pname = "File-HomeDir"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/File-HomeDir-1.004.tar.gz"; sha256 = "45f67e2bb5e60a7970d080e8f02079732e5a8dfc0c7c3cbdb29abfb3f9f791ad"; }; propagatedBuildInputs = [ FileWhich ]; @@ -7155,7 +7192,7 @@ let pname = "File-KeePass"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHANDOM/File-KeePass-2.03.tar.gz; + url = "mirror://cpan/authors/id/R/RH/RHANDOM/File-KeePass-2.03.tar.gz"; sha256 = "c30c688027a52ff4f58cd69d6d8ef35472a7cf106d4ce94eb73a796ba7c7ffa7"; }; propagatedBuildInputs = [ CryptRijndael ]; @@ -7165,7 +7202,7 @@ let pname = "File-lchown"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/File-lchown-0.02.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/File-lchown-0.02.tar.gz"; sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; buildInputs = [ ExtUtilsCChecker ]; @@ -7180,7 +7217,7 @@ let pname = "File-LibMagic"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz"; sha256 = "c8a695fac1454f52e18e2e1b624c0647cf117326014023dda69fa3e1a5f33d60"; }; buildInputs = [ pkgs.file TestFatal ]; @@ -7199,7 +7236,7 @@ let pname = "File-Listing"; version = "6.04"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/File-Listing-6.04.tar.gz"; sha256 = "1xcwjlnxaiwwpn41a5yi6nz95ywh3szq5chdxiwj36kqsvy5000y"; }; propagatedBuildInputs = [ HTTPDate ]; @@ -7209,7 +7246,7 @@ let pname = "File-MimeInfo"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.29.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MICHIELB/File-MimeInfo-0.29.tar.gz"; sha256 = "1sh8r6vczyz08zm8vfsjmkg6a165wch54akjdrd1vbifcmwjg5pi"; }; doCheck = false; # Failed test 'desktop file is the right one' @@ -7220,7 +7257,7 @@ let pname = "File-MMagic"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.30.tar.gz; + url = "mirror://cpan/authors/id/K/KN/KNOK/File-MMagic-1.30.tar.gz"; sha256 = "cf0c1b1eb29705c02d97c2913648009c0be42ce93ec24b36c696bf2d4f5ebd7e"; }; meta = { @@ -7233,11 +7270,11 @@ let pname = "File-Modified"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/File-Modified-0.10.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/File-Modified-0.10.tar.gz"; sha256 = "6b50b1aab6ec6998a017f6403c2735b3bc1e1cf46187bd134d7eb6df3fc45144"; }; meta = { - homepage = https://github.com/neilbowers/File-Modified; + homepage = "https://github.com/neilbowers/File-Modified"; description = "Checks intelligently if files have changed"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7247,7 +7284,7 @@ let pname = "File-Next"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.18.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/File-Next-1.18.tar.gz"; sha256 = "1vy2dqpc1nbjrnga08xr2hcxxfzifc5s2lfam5lf3djya0wwn07r"; }; }; @@ -7256,7 +7293,7 @@ let pname = "File-NFSLock"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.29.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBB/File-NFSLock-1.29.tar.gz"; sha256 = "0dzssj15faz9cn1w3xi7jwm64gyjyazapv4bkgglw5l1njcibm31"; }; }; @@ -7265,7 +7302,7 @@ let pname = "File-Path"; version = "2.16"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.16.tar.gz; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/File-Path-2.16.tar.gz"; sha256 = "21f7d69b59c381f459c5f0bf697d512109bd911f12ca33270b70ca9a9ef6fa05"; }; meta = { @@ -7278,7 +7315,7 @@ let pname = "File-Pid"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CW/CWEST/File-Pid-1.01.tar.gz; + url = "mirror://cpan/authors/id/C/CW/CWEST/File-Pid-1.01.tar.gz"; sha256 = "bafeee8fdc96eb06306a0c58bbdb7209b6de45f850e75fdc6b16db576e05e422"; }; propagatedBuildInputs = [ ClassAccessor ]; @@ -7293,7 +7330,7 @@ let pname = "File-pushd"; version = "1.016"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.016.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/File-pushd-1.016.tar.gz"; sha256 = "d73a7f09442983b098260df3df7a832a5f660773a313ca273fa8b56665f97cdc"; }; meta = { @@ -7306,7 +7343,7 @@ let pname = "File-ReadBackwards"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz; + url = "mirror://cpan/authors/id/U/UR/URI/File-ReadBackwards-1.05.tar.gz"; sha256 = "82b261af87507cc3e7e66899c457104ebc8d1c09fb85c53f67c1f90f70f18d6e"; }; meta = { @@ -7319,7 +7356,7 @@ let pname = "File-Remove"; version = "1.58"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.58.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/File-Remove-1.58.tar.gz"; sha256 = "1n6h5w3sp2bs4cfrifdx2z15cfpb4r536179mx1a12xbmj1yrxl1"; }; }; @@ -7328,7 +7365,7 @@ let pname = "File-Share"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/File-Share-0.25.tar.gz"; sha256 = "0w3h800qqcf1sn79h84zngnn788rg2jx4jjb70l44f6419p2b7cf"; }; propagatedBuildInputs = [ FileShareDir ]; @@ -7343,7 +7380,7 @@ let pname = "File-ShareDir"; version = "1.116"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.116.tar.gz"; sha256 = "0a43rfb0a1fpxh4d2dayarkdxw4cx9a2krkk87zmcilcz7yhpnar"; }; propagatedBuildInputs = [ ClassInspector ]; @@ -7358,7 +7395,7 @@ let pname = "File-ShareDir-Install"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-ShareDir-Install-0.13.tar.gz"; sha256 = "1yc0wlkav2l2wr36a53n4mnhsy2zv29z5nm14mygxgjwv7qgvgj5"; }; meta = { @@ -7371,7 +7408,7 @@ let pname = "Filesys-Df"; version = "0.92"; src = fetchurl { - url = mirror://cpan/authors/id/I/IG/IGUTHRIE/Filesys-Df-0.92.tar.gz; + url = "mirror://cpan/authors/id/I/IG/IGUTHRIE/Filesys-Df-0.92.tar.gz"; sha256 = "fe89cbb427e0e05f1cd97c2dd6d3866ac6b21bc7a85734ede159bdc35479552a"; }; meta = { @@ -7384,7 +7421,7 @@ let pname = "Filesys-Notify-Simple"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.14.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Filesys-Notify-Simple-0.14.tar.gz"; sha256 = "192m0l4cnfskdmhgaxk3bm1rvbmzxzwgcdgdb60qdqd59cnp3nhz"; }; meta = { @@ -7398,7 +7435,7 @@ let pname = "Filesys-DiskUsage"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/Filesys-DiskUsage-0.13.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Filesys-DiskUsage-0.13.tar.gz"; sha256 = "fd3e52c6f6241271a281348d1d43c44154c2f61a32543db46aa9e15692d1b713"; }; buildInputs = [ TestWarn ]; @@ -7412,7 +7449,7 @@ let pname = "File-Slurp"; version = "9999.29"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.29.tar.gz; + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/File-Slurp-9999.29.tar.gz"; sha256 = "1iqr7qi6rg45f4xa3fp48b30mnbw30xs9izxa5zf6fd6pgh4fvhf"; }; meta = { @@ -7425,7 +7462,7 @@ let pname = "File-Slurper"; version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz"; sha256 = "4efb2ea416b110a1bda6f8133549cc6ea3676402e3caf7529fce0313250aa578"; }; buildInputs = [ TestWarnings ]; @@ -7439,7 +7476,7 @@ let pname = "File-Slurp-Tiny"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/File-Slurp-Tiny-0.004.tar.gz"; sha256 = "452995beeabf0e923e65fdc627a725dbb12c9e10c00d8018c16d10ba62757f1e"; }; meta = { @@ -7452,7 +7489,7 @@ let pname = "File-Tail"; version = "1.3"; src = fetchurl { - url = mirror://cpan/authors/id/M/MG/MGRABNAR/File-Tail-1.3.tar.gz; + url = "mirror://cpan/authors/id/M/MG/MGRABNAR/File-Tail-1.3.tar.gz"; sha256 = "1ixg6kn4h330xfw3xgvqcbzfc3v2wlzjim9803jflhvfhf0rzl16"; }; meta = { @@ -7466,7 +7503,7 @@ let pname = "File-Temp"; version = "0.2309"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/File-Temp-0.2309.tar.gz"; sha256 = "0pr3wrxrk93wy7dz9gsb1sgl77icrs8rh2mah6wms5cdi2ll5ch1"; }; meta = { @@ -7480,11 +7517,11 @@ let pname = "File-Touch"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/File-Touch-0.11.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/File-Touch-0.11.tar.gz"; sha256 = "e379a5ff89420cf39906e5ceff309b8ce958f99f9c3e57ad52b5002a3982d93c"; }; meta = { - homepage = https://github.com/neilb/File-Touch; + homepage = "https://github.com/neilb/File-Touch"; description = "Update file access and modification times, optionally creating files if needed"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.limeytexan ]; @@ -7495,7 +7532,7 @@ let pname = "File-Type"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMISON/File-Type-0.22.tar.gz"; sha256 = "0hfkaafp6wb0nw19x47wc6wc9mwlw8s2rxiii3ylvzapxxgxjp6k"; }; meta = { @@ -7508,12 +7545,12 @@ let pname = "File-Util"; version = "4.161950"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOMMY/File-Util-4.161950.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOMMY/File-Util-4.161950.tar.gz"; sha256 = "88507b19da580d595b5c25fe6ba75bbd6096b4359e389ead067a216f766c20ee"; }; buildInputs = [ TestNoWarnings ]; meta = { - homepage = https://github.com/tommybutler/file-util/wiki; + homepage = "https://github.com/tommybutler/file-util/wiki"; description = "Easy, versatile, portable file handling"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7523,7 +7560,7 @@ let pname = "File-Which"; version = "1.23"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/File-Which-1.23.tar.gz"; sha256 = "b79dc2244b2d97b6f27167fc3b7799ef61a179040f3abd76ce1e0a3b0bc4e078"; }; meta = { @@ -7537,7 +7574,7 @@ let pname = "File-Zglob"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/File-Zglob-0.11.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/File-Zglob-0.11.tar.gz"; sha256 = "16v61rn0yimpv5kp6b20z2f1c93n5kpsyjvr0gq4w2dc43gfvc8w"; }; meta = { @@ -7550,7 +7587,7 @@ let pname = "Filter"; version = "1.59"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.59.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Filter-1.59.tar.gz"; sha256 = "b4babfad4e0566a9a61199735f6e622a60d3274122752304f18f623412bf4e5a"; }; meta = { @@ -7563,12 +7600,12 @@ let pname = "Finance-Quote"; version = "1.49"; src = fetchurl { - url = mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.49.tar.gz; + url = "mirror://cpan/authors/id/E/EC/ECOCODE/Finance-Quote-1.49.tar.gz"; sha256 = "0lxz9fsm4ld3l900zxh2w91wjygk0ifn4miw6q5k4mm67d2c9nwm"; }; propagatedBuildInputs = [ CGI DateTimeFormatStrptime HTMLTableExtract JSON JSONParse LWPProtocolHttps StringUtil TextTemplate ]; meta = with stdenv.lib; { - homepage = http://finance-quote.sourceforge.net/; + homepage = "http://finance-quote.sourceforge.net/"; description = "Get stock and mutual fund quotes from various exchanges"; license = licenses.gpl2; }; @@ -7592,7 +7629,7 @@ let pname = "Font-AFM"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/Font-AFM-1.20.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/Font-AFM-1.20.tar.gz"; sha256 = "32671166da32596a0f6baacd0c1233825a60acaf25805d79c81a3f18d6088bc1"; }; }; @@ -7601,7 +7638,7 @@ let pname = "Font-TTF"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BH/BHALLISSY/Font-TTF-1.06.tar.gz; + url = "mirror://cpan/authors/id/B/BH/BHALLISSY/Font-TTF-1.06.tar.gz"; sha256 = "4b697d444259759ea02d2c442c9bffe5ffe14c9214084a01f743693a944cc293"; }; meta = { @@ -7615,7 +7652,7 @@ let pname = "Forks-Super"; version = "0.97"; src = fetchurl { - url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.97.tar.gz; + url = "mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.97.tar.gz"; sha256 = "0kias11b4zchxy5x9ns2wwjzvzxlzsbap8sq587z9micw5bl7nrk"; }; doCheck = false; @@ -7630,7 +7667,7 @@ let pname = "FormValidator-Simple"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/L/LY/LYOKATO/FormValidator-Simple-0.29.tar.gz; + url = "mirror://cpan/authors/id/L/LY/LYOKATO/FormValidator-Simple-0.29.tar.gz"; sha256 = "fc3a63dc54b962d74586070176adaf5be869f09b561bb30f5fd32ef531792666"; }; propagatedBuildInputs = [ ClassAccessor ClassDataAccessor DateCalc DateTimeFormatStrptime EmailValidLoose ListMoreUtils TieIxHash UNIVERSALrequire YAML ]; @@ -7645,7 +7682,7 @@ let pname = "FreezeThaw"; version = "0.5001"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILYAZ/modules/FreezeThaw-0.5001.tar.gz"; sha256 = "0h8gakd6b9770n2xhld1hhqghdar3hrq2js4mgiwxy86j4r0hpiw"; }; doCheck = false; @@ -7670,7 +7707,7 @@ let pname = "Future"; version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Future-0.43.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-0.43.tar.gz"; sha256 = "191qvn3jz5pk5zxykwsg1i17s45kc82rfd6kgzsv9nki1c04dzaf"; }; buildInputs = [ TestFatal TestIdentity TestRefcount ]; @@ -7684,7 +7721,7 @@ let pname = "Games-Solitaire-Verify"; version = "0.2202"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2202.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Games-Solitaire-Verify-0.2202.tar.gz"; sha256 = "14fe240613b41c9d3e7cc560eaabd78bd13ded66d2838b738b74f7d1811d9263"; }; buildInputs = [ DirManifest TestDifferences ]; @@ -7699,7 +7736,7 @@ let pname = "GD"; version = "2.71"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/GD-2.71.tar.gz"; sha256 = "1ivskdb4nwy7ky37369hwkfxp11fkp6ri5k7qlf2dmra7f3y86s5"; }; @@ -7715,7 +7752,7 @@ let pname = "GDGraph"; version = "1.54"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RUZ/GDGraph-1.54.tar.gz"; sha256 = "0kzsdc07ycxjainmz0dnsclb15w2j1y7g8b5mcb7vhannq85qvxr"; }; propagatedBuildInputs = [ GDText ]; @@ -7730,7 +7767,7 @@ let pname = "GD-SecurityImage"; version = "1.75"; src = fetchurl { - url = mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.75.tar.gz; + url = "mirror://cpan/authors/id/B/BU/BURAK/GD-SecurityImage-1.75.tar.gz"; sha256 = "19lf1kzdavrkkx3f900jnpynr55d5kjd2sdmwpfir5dsmkcj9pix"; }; propagatedBuildInputs = [ GD ]; @@ -7744,7 +7781,7 @@ let pname = "GDTextUtil"; version = "0.86"; src = fetchurl { - url = mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz; + url = "mirror://cpan/authors/id/M/MV/MVERB/GDTextUtil-0.86.tar.gz"; sha256 = "1g0nc7fz4d672ag7brlrrcz7ibm98x49qs75bq9z957ybkwcnvl8"; }; propagatedBuildInputs = [ GD ]; @@ -7757,7 +7794,7 @@ let pname = "Geo-IP"; version = "1.51"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/Geo-IP-1.51.tar.gz"; sha256 = "1fka8fr7fw6sh3xa9glhs1zjg3s2gfkhi7n7da1l2m2wblqj0c0n"; }; makeMakerFlags = "LIBS=-L${pkgs.geoip}/lib INC=-I${pkgs.geoip}/include"; @@ -7768,7 +7805,7 @@ let pname = "GeoIP2"; version = "2.006002"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/GeoIP2-2.006002.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/GeoIP2-2.006002.tar.gz"; sha256 = "0d4qq0k0pd0xd83iykr0jkyizl499ii6ajwwwl93rgg9xsl44189"; }; propagatedBuildInputs = [ JSONMaybeXS LWPProtocolHttps MaxMindDBReader ParamsValidate Throwable ]; @@ -7783,7 +7820,7 @@ let pname = "Getopt-ArgvFile"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSTENZEL/Getopt-ArgvFile-1.11.tar.gz"; sha256 = "3709aa513ce6fd71d1a55a02e34d2f090017d5350a9bd447005653c9b0835b22"; }; meta = { @@ -7796,7 +7833,7 @@ let pname = "Getopt-Long"; version = "2.51"; src = fetchurl { - url = mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.51.tar.gz; + url = "mirror://cpan/authors/id/J/JV/JV/Getopt-Long-2.51.tar.gz"; sha256 = "0r659i6rkz8zkfgdccbn29zmd4bk9lcdc4y20ng6w2glqaa3pd10"; }; }; @@ -7805,13 +7842,13 @@ let pname = "Getopt-Long-Descriptive"; version = "0.104"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.104.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Getopt-Long-Descriptive-0.104.tar.gz"; sha256 = "878bc1782c5e196a08a52fa252bbfce1aeb0546d073eac164fc6b80b4cea1e28"; }; buildInputs = [ CPANMetaCheck TestFatal TestWarnings ]; propagatedBuildInputs = [ ParamsValidate SubExporter ]; meta = { - homepage = https://github.com/rjbs/Getopt-Long-Descriptive; + homepage = "https://github.com/rjbs/Getopt-Long-Descriptive"; description = "Getopt::Long, but simpler and more powerful"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -7821,7 +7858,7 @@ let pname = "Getopt-Tabular"; version = "0.3"; src = fetchurl { - url = mirror://cpan/authors/id/G/GW/GWARD/Getopt-Tabular-0.3.tar.gz; + url = "mirror://cpan/authors/id/G/GW/GWARD/Getopt-Tabular-0.3.tar.gz"; sha256 = "0xskl9lcj07sdfx5dkma5wvhhgf5xlsq0khgh8kk34dm6dv0dpwv"; }; }; @@ -7830,7 +7867,7 @@ let pname = "Git"; version = "0.42"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSOUTH/Git-0.42.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSOUTH/Git-0.42.tar.gz"; sha256 = "9469a9f398f3a2bf2b0500566ee41d3ff6fae460412a137185767a1cc4783a6d"; }; propagatedBuildInputs = [ Error ]; @@ -7845,7 +7882,7 @@ let pname = "Git-PurePerl"; version = "0.53"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BROQ/Git-PurePerl-0.53.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BROQ/Git-PurePerl-0.53.tar.gz"; sha256 = "987c74366cc4c37ee084050f985fa254359c89c12507f5b8bfc6607de538d5a8"; }; buildInputs = [ Testutf8 ]; @@ -7861,7 +7898,7 @@ let pname = "Git-Repository"; version = "1.324"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.324.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Repository-1.324.tar.gz"; sha256 = "814dfad104a9546349f9e0fd492c86137de827ebc284017a91a5267c120ad4f6"; }; buildInputs = [ TestRequiresGit ]; @@ -7876,7 +7913,7 @@ let pname = "Git-Version-Compare"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/Git-Version-Compare-1.004.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/Git-Version-Compare-1.004.tar.gz"; sha256 = "63e8264ed351cb2371b47852a72366214164b5f3fad9dbd68309c7fc63d06491"; }; buildInputs = [ TestNoWarnings ]; @@ -7890,13 +7927,13 @@ let pname = "Glib"; version = "1.3291"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3291.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-1.3291.tar.gz"; sha256 = "0whz5f87wvzq8zsva85h06mkfqim2ciq845ixlvmafwxggccv0xr"; }; buildInputs = [ pkgs.glib ]; doCheck = false; # tests failing with glib 2.60 https://rt.cpan.org/Public/Bug/Display.html?id=128165 meta = { - homepage = http://gtk2-perl.sourceforge.net/; + homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl wrappers for the GLib utility and Object libraries"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -7907,7 +7944,7 @@ let pname = "Glib-Object-Introspection"; version = "0.048"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.048.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Glib-Object-Introspection-0.048.tar.gz"; sha256 = "01dx5w6r4nl3rgnz7wvgvqfaa48xmzy90p95d5k6315q44610kx6"; }; propagatedBuildInputs = [ pkgs.gobject-introspection Glib ]; @@ -7921,13 +7958,13 @@ let pname = "Gnome2"; version = "1.047"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.047.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-1.047.tar.gz"; sha256 = "ccc85c5dc3c14f915ed1a186d238681d83fef3d17eed1c20001499ff56b6390c"; }; buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Glib Gnome2Canvas Gnome2VFS Gtk2 ]; propagatedBuildInputs = [ pkgs.gnome2.libgnomeui ]; meta = { - homepage = http://gtk2-perl.sourceforge.net; + homepage = "http://gtk2-perl.sourceforge.net"; description = "Perl interface to the 2.x series of the GNOME libraries"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -7937,7 +7974,7 @@ let pname = "Gnome2-Canvas"; version = "1.002"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Canvas-1.002.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Canvas-1.002.tar.gz"; sha256 = "47a34204cd5f3a0ef5c8b9e1c9c96f41740edab7e9abf1d0560fa8666ba1916e"; }; buildInputs = [ pkgs.gnome2.libgnomecanvas ]; @@ -7951,7 +7988,7 @@ let pname = "Gnome2-VFS"; version = "1.083"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.083.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gnome2-VFS-1.083.tar.gz"; sha256 = "eca974669df4e7f21b4fcedb96c8a328422369c68b8c2cd99b9ce9cc5d7a7979"; }; propagatedBuildInputs = [ pkgs.gnome2.gnome_vfs Glib ]; @@ -7965,7 +8002,7 @@ let pname = "Gnome2-Wnck"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSCH/Gnome2-Wnck-0.16.tar.gz"; sha256 = "604a8ece88ac29f132d59b0caac27657ec31371c1606a4698a2160e88ac586e5"; }; buildInputs = [ pkgs.libwnck pkgs.glib pkgs.gtk2 ]; @@ -7980,7 +8017,7 @@ let pname = "GnuPG"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YA/YANICK/GnuPG-0.19.tar.gz; + url = "mirror://cpan/authors/id/Y/YA/YANICK/GnuPG-0.19.tar.gz"; sha256 = "af53f2d3f63297e046676eae14a76296afdd2910e09723b6b113708622b7989b"; }; buildInputs = [ pkgs.gnupg1orig ]; @@ -7991,7 +8028,7 @@ let pname = "GnuPG-Interface"; version = "0.52"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/GnuPG-Interface-0.52.tar.gz"; sha256 = "247a9f5a88bb6745281c00d0f7d5d94e8599a92396849fd9571356dda047fd35"; }; buildInputs = [ pkgs.which pkgs.gnupg1compat ]; @@ -8007,7 +8044,7 @@ let pname = "GoferTransport-http"; version = "1.017"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMB/GoferTransport-http-1.017.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TIMB/GoferTransport-http-1.017.tar.gz"; sha256 = "f73effe3ea7afa1907ce8977c87387abb0d4404f85a724ae2637b29a73154a9b"; }; propagatedBuildInputs = [ DBI LWP mod_perl2 ]; @@ -8021,7 +8058,7 @@ let pname = "Goo-Canvas"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YE/YEWENBIN/Goo-Canvas-0.06.tar.gz; + url = "mirror://cpan/authors/id/Y/YE/YEWENBIN/Goo-Canvas-0.06.tar.gz"; sha256 = "0c588c507eed5e62d12ed1cc1e491c6ff3a1f59c4fb3d435e14214b37ab39251"; }; propagatedBuildInputs = [ pkgs.goocanvas pkgs.gtk2 Gtk2 ]; @@ -8035,7 +8072,7 @@ let pname = "GooCanvas2"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLMAX/GooCanvas2-0.06.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLMAX/GooCanvas2-0.06.tar.gz"; sha256 = "0l1vsvyv9hjxhsxrahq4h64axh7qmk50kiz2spa3s1hr7s3qfk72"; }; buildInputs = [ pkgs.gtk3 ]; @@ -8050,7 +8087,7 @@ let pname = "Google-ProtocolBuffers"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAXJAZMAN/protobuf/Google-ProtocolBuffers-0.12.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/protobuf/Google-ProtocolBuffers-0.12.tar.gz"; sha256 = "0wad56n12h9yhnrq1m1z3jna1ch3mg3mqj41wkfi49ws1g34k15k"; }; propagatedBuildInputs = [ ClassAccessor ParseRecDescent ]; @@ -8066,7 +8103,7 @@ let pname = "Graph"; version = "0.9704"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/Graph-0.9704.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHI/Graph-0.9704.tar.gz"; sha256 = "099a1gca0wj5zs0cffncjqp2mjrdlk9i6325ks89ml72gfq8wpij"; }; }; @@ -8075,7 +8112,7 @@ let pname = "GraphViz"; version = "2.24"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/GraphViz-2.24.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/GraphViz-2.24.tgz"; sha256 = "1bgm4a8kan53r30qiknr4kasvhar1khf7vq064l1inzfrp2glpnr"; }; @@ -8093,14 +8130,14 @@ let pname = "grepmail"; version = "5.3111"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCOPPIT/grepmail-5.3111.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCOPPIT/grepmail-5.3111.tar.gz"; sha256 = "d0984e3f7a1be17ae014575f70c1678151a5bcc9622185dc5a052cb63271a761"; }; buildInputs = [ FileHomeDir FileSlurper TestCompile UNIVERSALrequire URI ]; propagatedBuildInputs = [ MailMboxMessageParser TimeDate ]; outputs = [ "out" ]; meta = { - homepage = https://github.com/coppit/grepmail; + homepage = "https://github.com/coppit/grepmail"; description = "Search mailboxes for mail matching a regular expression"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ romildo ]; @@ -8111,7 +8148,7 @@ let pname = "Growl-GNTP"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-0.21.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTN/Growl-GNTP-0.21.tar.gz"; sha256 = "0gq8ypam6ifp8f3s2mf5d6sw53m7h3ki1zfahh2p41kl8a77yy98"; }; buildInputs = [ ModuleBuildTiny ]; @@ -8122,7 +8159,7 @@ let pname = "GSSAPI"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGROLMS/GSSAPI-0.28.tar.gz"; sha256 = "1mkhwxjjlhr58pd770i9gnf7zy7jj092iv6jfbnb8bvnc5xjr3vx"; }; propagatedBuildInputs = [ pkgs.krb5Full.dev ]; @@ -8138,7 +8175,7 @@ let pname = "Gtk2"; version = "1.24993"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk2-1.24993.tar.gz"; sha256 = "0ry9jfvfgdwzalxcvwsgr7plhk3agx7p40l0fqdf3vrf7ds47i29"; }; buildInputs = [ pkgs.gtk2 ]; @@ -8146,7 +8183,7 @@ let # doCheck = !stdenv.isDarwin; doCheck = false; meta = { - homepage = http://gtk2-perl.sourceforge.net/; + homepage = "http://gtk2-perl.sourceforge.net/"; description = "Perl interface to the 2.x series of the Gimp Toolkit library"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -8157,7 +8194,7 @@ let pname = "Gtk2-GladeXML"; version = "1.007"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSCH/Gtk2-GladeXML-1.007.tar.gz"; sha256 = "50240a2bddbda807c8f8070de941823b7bf3d288a13be6d0d6563320b42c445a"; }; propagatedBuildInputs = [ pkgs.gnome2.libglade pkgs.gtk2 Gtk2 ]; @@ -8171,7 +8208,7 @@ let pname = "Gtk2-TrayIcon"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BORUP/Gtk2-TrayIcon-0.06.tar.gz"; sha256 = "cbb7632b75d7f41554dfe8ee9063dbfd1d8522291077c65d0d82e9ceb5e94ae2"; }; propagatedBuildInputs = [ pkgs.gtk2 Gtk2 ]; @@ -8184,7 +8221,7 @@ let pname = "Gtk2-AppIndicator"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/O/OE/OESTERHOL/Gtk2-AppIndicator-0.15.tar.gz; + 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 ]; @@ -8201,7 +8238,7 @@ let pname = "Gtk2-ImageView"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk2-ImageView-0.05.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Gtk2-ImageView-0.05.tar.gz"; sha256 = "087186c3693acf196451cf59cc8b7f5cf9a7b05abe20d32dcbcba0822953fb80"; }; buildInputs = [ pkgs.gtkimageview pkgs.gtk2 ]; @@ -8220,7 +8257,7 @@ let pname = "Gtk2-Unique"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/POTYL/Gtk2-Unique-0.05.tar.gz; + url = "mirror://cpan/authors/id/P/PO/POTYL/Gtk2-Unique-0.05.tar.gz"; sha256 = "ae8dfb0f6844ddaa2ce7b5b44553419490c8e83c24fd35c431406a58f6be0f4f"; }; propagatedBuildInputs = [ pkgs.libunique pkgs.gtk2 Gtk2 ]; @@ -8234,7 +8271,7 @@ let pname = "Gtk3"; version = "0.036"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.036.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Gtk3-0.036.tar.gz"; sha256 = "1rxzhahrncv58z0n93bzlagxd8swqxiafq4qn4zv9i9jbfql8mwq"; }; propagatedBuildInputs = [ pkgs.gtk3 CairoGObject GlibObjectIntrospection ]; @@ -8248,7 +8285,7 @@ let pname = "Gtk3-SimpleList"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.18.tar.gz; + url = "mirror://cpan/authors/id/T/TV/TVIGNAUD/Gtk3-SimpleList-0.18.tar.gz"; sha256 = "09azmc7miyvw7q21rz8cxw16zbd5i1j5hpakxy376f5vmhqqjyhp"; }; meta = { @@ -8262,7 +8299,7 @@ let pname = "Guard"; version = "1.023"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.023.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.023.tar.gz"; sha256 = "34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc"; }; }; @@ -8271,7 +8308,7 @@ let pname = "Hash-Diff"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOLAV/Hash-Diff-0.010.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOLAV/Hash-Diff-0.010.tar.gz"; sha256 = "1ig0l859gq00k0r9l85274r2lbvwl7wsndcy52c0m3y9isilm6mw"; }; propagatedBuildInputs = [ HashMerge ]; @@ -8289,7 +8326,7 @@ let pname = "Hash-Flatten"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBC/Hash-Flatten-1.19.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBC/Hash-Flatten-1.19.tar.gz"; sha256 = "162b9qgkr19f97w4pic6igyk3zd0sbnrhl3s8530fikciffw9ikh"; }; buildInputs = [ TestAssertions ]; @@ -8300,7 +8337,7 @@ let pname = "Hash-Merge"; version = "0.300"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/Hash-Merge-0.300.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/Hash-Merge-0.300.tar.gz"; sha256 = "0h3wfnpv5d4d3f9xzmwkchay6251nhzngdv3f6xia56mj4hxabs0"; }; propagatedBuildInputs = [ CloneChoose ]; @@ -8314,7 +8351,7 @@ let pname = "Hash-Merge-Simple"; version = "0.051"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROKR/Hash-Merge-Simple-0.051.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROKR/Hash-Merge-Simple-0.051.tar.gz"; sha256 = "1c56327873d2f04d5722777f044863d968910466997740d55a754071c6287b73"; }; buildInputs = [ TestDeep TestDifferences TestException TestMost TestWarn ]; @@ -8329,7 +8366,7 @@ let pname = "Hash-MoreUtils"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/Hash-MoreUtils-0.06.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/Hash-MoreUtils-0.06.tar.gz"; sha256 = "db9a8fb867d50753c380889a5e54075651b5e08c9b3b721cb7220c0883547de8"; }; meta = { @@ -8342,7 +8379,7 @@ let pname = "Hash-MultiValue"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARISTOTLE/Hash-MultiValue-0.16.tar.gz"; sha256 = "1x3k7h542xnigz0b8vsfiq580p5r325wi5b8mxppiqk8mbvis636"; }; meta = { @@ -8355,7 +8392,7 @@ let pname = "Hash-Util-FieldHash-Compat"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.11.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Hash-Util-FieldHash-Compat-0.11.tar.gz"; sha256 = "06vlygjyk7rkkw0di3252mma141w801qn3xk40aa2yskbfklcbk4"; }; }; @@ -8364,7 +8401,7 @@ let pname = "Heap"; version = "0.80"; src = fetchurl { - url = mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz; + url = "mirror://cpan/authors/id/J/JM/JMM/Heap-0.80.tar.gz"; sha256 = "1plv2djbyhvkdcw2ic54rdqb745cwksxckgzvw7ssxiir7rjknnc"; }; }; @@ -8373,12 +8410,12 @@ let pname = "Hook-LexWrap"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.26.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Hook-LexWrap-0.26.tar.gz"; sha256 = "b60bdc5f98f94f9294b06adef82b1d996da192d5f183f9f434b610fd1137ec2d"; }; buildInputs = [ pkgs.unzip ]; meta = { - homepage = https://github.com/chorny/Hook-LexWrap; + homepage = "https://github.com/chorny/Hook-LexWrap"; description = "Lexically scoped subroutine wrappers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8388,7 +8425,7 @@ let pname = "HTML-Clean"; version = "1.4"; src = fetchurl { - url = mirror://cpan/authors/id/A/AZ/AZJADFTRE/HTML-Clean-1.4.tar.gz; + url = "mirror://cpan/authors/id/A/AZ/AZJADFTRE/HTML-Clean-1.4.tar.gz"; sha256 = "01l7g2hr0kjbh1wk7cv03ijmpjlbm1vm661m99mkrz2ilyyllzd6"; }; meta = { @@ -8401,7 +8438,7 @@ let pname = "HTML-Element-Extended"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSISK/HTML-Element-Extended-1.18.tar.gz"; sha256 = "f3ef1af108f27fef15ebec66479f251ce08aa49bd00b0462c9c80c86b4b6b32b"; }; propagatedBuildInputs = [ HTMLTree ]; @@ -8411,13 +8448,13 @@ let pname = "HTML-Escape"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/HTML-Escape-1.10.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/HTML-Escape-1.10.tar.gz"; sha256 = "b1cbac4157ad8dedac6914e1628855e05b8dc885a4007d2e4df8177c6a9b70fb"; }; buildInputs = [ ModuleBuildPluggablePPPort TestRequires ]; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { - homepage = https://github.com/tokuhirom/HTML-Escape; + homepage = "https://github.com/tokuhirom/HTML-Escape"; description = "Extremely fast HTML escaping"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8427,7 +8464,7 @@ let pname = "HTML-FromANSI"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz; + url = "mirror://cpan/authors/id/N/NU/NUFFIN/HTML-FromANSI-2.03.tar.gz"; sha256 = "21776345ed701b2c04c7b09380af943f9984cc7f99624087aea45db5fc09c359"; }; propagatedBuildInputs = [ HTMLParser TermVT102Boundless ]; @@ -8439,7 +8476,7 @@ let pname = "HTML-Form"; version = "6.05"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.05.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTML-Form-6.05.tar.gz"; sha256 = "14i4ldyvdvhdhvfhh9kiq6z853q2f84biq8vcpv1k5w2r80wdiin"; }; propagatedBuildInputs = [ HTMLParser HTTPMessage ]; @@ -8453,7 +8490,7 @@ let pname = "HTML-Formatter"; version = "2.16"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.16.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIGELM/HTML-Formatter-2.16.tar.gz"; sha256 = "cb0a0dd8aa5e8ba9ca214ce451bf4df33aa09c13e907e8d3082ddafeb30151cc"; }; buildInputs = [ FileSlurper TestWarnings ]; @@ -8468,7 +8505,7 @@ let pname = "HTML-FormatText-WithLinks"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz"; sha256 = "7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1"; }; propagatedBuildInputs = [ HTMLFormatter URI ]; @@ -8482,7 +8519,7 @@ let pname = "HTML-FormatText-WithLinks-AndTables"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.07.tar.gz"; sha256 = "809ee2f11705706b33c54312b5c7bee674838f2beaaedaf8cb945e702aae39b6"; }; propagatedBuildInputs = [ HTMLFormatTextWithLinks ]; @@ -8496,7 +8533,7 @@ let pname = "HTML-FormFu"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.07.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFRANKS/HTML-FormFu-2.07.tar.gz"; sha256 = "0cpbcrip95rvihc7i8dywca6lx9ws67ch1hjx6vgnm47g9zh2bsg"; }; buildInputs = [ CGI FileShareDirInstall RegexpAssemble TestException TestMemoryCycle TestRequiresInternet ]; @@ -8511,7 +8548,7 @@ let pname = "HTML-FormFu-MultiForm"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-MultiForm-1.03.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIGELM/HTML-FormFu-MultiForm-1.03.tar.gz"; sha256 = "17qm94hwhn6jyhd2am4gqxq7yrlhv3jv0ayx17df95mqdgbhrw1n"; }; propagatedBuildInputs = [ CryptCBC CryptDES HTMLFormFu ]; @@ -8526,7 +8563,7 @@ let pname = "HTML-FormHandler"; version = "0.40068"; src = fetchurl { - url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40068.tar.gz; + url = "mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40068.tar.gz"; sha256 = "09z8rpb3avdd8984rm6j6gd2igbzjz9rc0ycig654mqjlgfphyzb"; }; # a single test is failing on perl 5.20 @@ -8543,7 +8580,7 @@ let pname = "HTML-Mason"; version = "1.58"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.58.tar.gz"; sha256 = "81dc9b199f0f3b3473c97ba0ebee4b9535cd633d4e9c1ca3818615dc03dff948"; }; buildInputs = [ TestDeep ]; @@ -8558,7 +8595,7 @@ let pname = "HTML-Mason-PSGIHandler"; version = "0.53"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz"; sha256 = "eafd7c7655dfa8261df3446b931a283d30306877b83ac4671c49cff74ea7f00b"; }; buildInputs = [ Plack ]; @@ -8573,7 +8610,7 @@ let pname = "HTML-Parser"; version = "3.72"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz"; sha256 = "12v05ywlnsi9lc17z32k9jxx3sj1viy7y1wpl7n4az76v7hwfa7c"; }; propagatedBuildInputs = [ HTMLTagset ]; @@ -8587,7 +8624,7 @@ let pname = "HTML-TagCloud"; version = "0.38"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBERTSD/HTML-TagCloud-0.38.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROBERTSD/HTML-TagCloud-0.38.tar.gz"; sha256 = "05bhnrwwlwd6cj3cn91zw5r99xddvy142bznid26p1pg5m3rk029"; }; meta = { @@ -8600,7 +8637,7 @@ let pname = "HTML-Quoted"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-Quoted-0.04.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-Quoted-0.04.tar.gz"; sha256 = "8b41f313fdc1812f02f6f6c37d58f212c84fdcf7827f7fd4b030907f39dc650c"; }; propagatedBuildInputs = [ HTMLParser ]; @@ -8614,7 +8651,7 @@ let pname = "HTML-RewriteAttributes"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSIBLEY/HTML-RewriteAttributes-0.05.tar.gz"; sha256 = "1808ec7cdf40d2708575fe6155a88f103b17fec77973a5831c2f24c250e7a58c"; }; propagatedBuildInputs = [ HTMLParser URI ]; @@ -8628,7 +8665,7 @@ let pname = "HTML-Selector-XPath"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.25.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORION/HTML-Selector-XPath-0.25.tar.gz"; sha256 = "1qbad8ayffpx7wj76ip05p6rh9p1lkir6qknpl76zy679ghlsp8s"; }; buildInputs = [ TestBase ]; @@ -8638,7 +8675,7 @@ let pname = "HTML-Scrubber"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.19.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIGELM/HTML-Scrubber-0.19.tar.gz"; sha256 = "1c9b4r9x96a8fbz2zy52fxgq7djp9dq38hiyqra92psnz1w5aa5f"; }; propagatedBuildInputs = [ HTMLParser ]; @@ -8649,7 +8686,7 @@ let pname = "HTML-StripScripts"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-1.06.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-1.06.tar.gz"; sha256 = "222bfb7ec1fdfa465e32da3dc4abed2edc7364bbe19e8e3c513c7d585b0109ad"; }; meta = { @@ -8662,7 +8699,7 @@ let pname = "HTML-StripScripts-Parser"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-Parser-1.03.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DRTECH/HTML-StripScripts-Parser-1.03.tar.gz"; sha256 = "478c1a4e46eb77fa7bce96ba288168f0b98c27f250e00dc6312365081aed3407"; }; propagatedBuildInputs = [ HTMLParser HTMLStripScripts ]; @@ -8676,7 +8713,7 @@ let pname = "HTML-TableExtract"; version = "2.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.13.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.13.tar.gz"; sha256 = "01jimmss3q68a89696wmclvqwb2ybz6xgabpnbp6mm6jcni82z8a"; }; propagatedBuildInputs = [ HTMLElementExtended ]; @@ -8686,7 +8723,7 @@ let pname = "HTML-Tagset"; version = "3.20"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tagset-3.20.tar.gz"; sha256 = "1qh8249wgr4v9vgghq77zh1d2zs176bir223a8gh3k9nksn7vcdd"; }; }; @@ -8695,7 +8732,7 @@ let pname = "HTML-Template"; version = "2.97"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-2.97.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAMTREGAR/HTML-Template-2.97.tar.gz"; sha256 = "17qjw8swj2q4b1ic285pndgrkmvpsqw0j68nhqzpk1daydhsyiv5"; }; propagatedBuildInputs = [ CGI ]; @@ -8706,7 +8743,7 @@ let pname = "HTML-Tidy"; version = "1.60"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tidy-1.60.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/HTML-Tidy-1.60.tar.gz"; sha256 = "1iyp2fd6j75cn1xvcwl2lxr8qpjxssy2360cyqn6g3kzd1fzdyxw"; }; @@ -8721,7 +8758,7 @@ let pname = "HTML-Tiny"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/HTML-Tiny-1.05.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDYA/HTML-Tiny-1.05.tar.gz"; sha256 = "d7cdc9d5985e2e44ceba10b756acf1e0d3a1b3ee3b516e5b54adb850fe79fda3"; }; meta = { @@ -8734,7 +8771,7 @@ let pname = "HTML-TokeParser-Simple"; version = "3.16"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.16.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/HTML-TokeParser-Simple-3.16.tar.gz"; sha256 = "17aa1v62sp8ycxcicwhankmj4brs6nnfclk9z7mf1rird1f164gd"; }; propagatedBuildInputs = [ HTMLParser SubOverride ]; @@ -8744,7 +8781,7 @@ let pname = "HTML-Tree"; version = "5.07"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz; + url = "mirror://cpan/authors/id/K/KE/KENTNL/HTML-Tree-5.07.tar.gz"; sha256 = "1gyvm4qlwm9y6hczkpnrdfl303ggbybr0nqxdjw09hii8yw4sdzh"; }; buildInputs = [ TestFatal ]; @@ -8759,7 +8796,7 @@ let pname = "HTML-TreeBuilder-XPath"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIROD/HTML-TreeBuilder-XPath-0.14.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIROD/HTML-TreeBuilder-XPath-0.14.tar.gz"; sha256 = "1wx4i1scng20n405fp3a4vrwvvq9bvbmg977wnd5j2ja8jrbvsr5"; }; propagatedBuildInputs = [ HTMLTree XMLXPathEngine ]; @@ -8773,7 +8810,7 @@ let pname = "HTML-Widget"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz"; sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy"; }; doCheck = false; @@ -8785,7 +8822,7 @@ let pname = "HTTP-Body"; version = "1.22"; src = fetchurl { - url = mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz; + url = "mirror://cpan/authors/id/G/GE/GETTY/HTTP-Body-1.22.tar.gz"; sha256 = "fc0d2c585b3bd1532d92609965d589e0c87cd380e7cca42fb9ad0a1311227297"; }; buildInputs = [ TestDeep ]; @@ -8800,7 +8837,7 @@ let pname = "HTTP-CookieJar"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.008.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/HTTP-CookieJar-0.008.tar.gz"; sha256 = "0rfw6avcralggs7bf7n86flvhaahxjnqzvpwszp0sk4z4wwy01wm"; }; propagatedBuildInputs = [ HTTPDate ]; @@ -8816,7 +8853,7 @@ let pname = "HTTP-Cookies"; version = "6.08"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.08.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Cookies-6.08.tar.gz"; sha256 = "0ndgqciqqcxyycry0nl0xkg9ci09vxvr81xw0hy0chgbfqsvgss9"; }; propagatedBuildInputs = [ HTTPMessage ]; @@ -8830,7 +8867,7 @@ let pname = "HTTP-Daemon"; version = "6.01"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz"; sha256 = "1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3"; }; propagatedBuildInputs = [ HTTPMessage ]; @@ -8844,7 +8881,7 @@ let pname = "HTTP-Date"; version = "6.05"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.05.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Date-6.05.tar.gz"; sha256 = "0awjdbz7x0jd5pna55dwxhs3k6xp3sw6b2zg3p2yndxxvya64p9n"; }; meta = { @@ -8858,7 +8895,7 @@ let pname = "HTTP-Entity-Parser"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.22.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/HTTP-Entity-Parser-0.22.tar.gz"; sha256 = "1j6nxs0nmx160ip0xw9gb3l19ii8pz9x1ay1y15q7rmllbr1rzlk"; }; propagatedBuildInputs = [ HTTPMultiPartParser HashMultiValue JSONMaybeXS StreamBuffered WWWFormUrlEncoded ]; @@ -8874,7 +8911,7 @@ let pname = "HTTP-DAV"; version = "0.49"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.49.tar.gz; + url = "mirror://cpan/authors/id/C/CO/COSIMO/HTTP-DAV-0.49.tar.gz"; sha256 = "0z4mgb8mc6l5nfsm3ihndjqgpk43q39x1kq9hryy6v8hxkwrscrk"; }; meta = { @@ -8887,7 +8924,7 @@ let pname = "HTTP-HeaderParser-XS"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKSMITH/HTTP-HeaderParser-XS-0.20.tar.gz"; sha256 = "1vs6sw431nnlnbdy6jii9vqlz30ndlfwdpdgm8a1m6fqngzhzq59"; }; meta.broken = stdenv.isi686; # loadable library and perl binaries are mismatched (got handshake key 0x7d40080, needed 0x7dc0080) @@ -8897,13 +8934,13 @@ let pname = "HTTP-Headers-Fast"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/HTTP-Headers-Fast-0.22.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/HTTP-Headers-Fast-0.22.tar.gz"; sha256 = "cc431db68496dd884db4bc0c0b7112c1f4a4f1dc68c4f5a3caa757a1e7481b48"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ HTTPDate ]; meta = { - homepage = https://github.com/tokuhirom/HTTP-Headers-Fast; + homepage = "https://github.com/tokuhirom/HTTP-Headers-Fast"; description = "Faster implementation of HTTP::Headers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8913,7 +8950,7 @@ let pname = "HTTP-Lite"; version = "2.44"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/HTTP-Lite-2.44.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/HTTP-Lite-2.44.tar.gz"; sha256 = "0z77nflj8zdcfg70kc93glq5kmd6qxn2nf7h70x4xhfg25wkvr1q"; }; buildInputs = [ CGI ]; @@ -8923,13 +8960,13 @@ let pname = "HTTP-Message"; version = "6.18"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.18.tar.gz"; sha256 = "d060d170d388b694c58c14f4d13ed908a2807f0e581146cef45726641d809112"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ EncodeLocale HTTPDate IOHTML LWPMediaTypes URI ]; meta = { - homepage = https://github.com/libwww-perl/HTTP-Message; + homepage = "https://github.com/libwww-perl/HTTP-Message"; description = "HTTP style message (base class)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -8939,7 +8976,7 @@ let pname = "HTTP-MultiPartParser"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHANSEN/HTTP-MultiPartParser-0.02.tar.gz"; sha256 = "04hbs0b1lzv2c8dqfcc9qjm5akh25fn40903is36zlalkwaxmpay"; }; buildInputs = [ TestDeep ]; @@ -8953,7 +8990,7 @@ let pname = "HTTP-Negotiate"; version = "6.01"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/HTTP-Negotiate-6.01.tar.gz"; sha256 = "05p053vjs5g91v5cmjnny7a3xzddz5k7vnjw81wfh01ilqg9qwhw"; }; propagatedBuildInputs = [ HTTPMessage ]; @@ -8967,7 +9004,7 @@ let pname = "HTTP-Parser-XS"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/HTTP-Parser-XS-0.17.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/HTTP-Parser-XS-0.17.tar.gz"; sha256 = "02d84xq1mm53c7jl33qyb7v5w4372vydp74z6qj0vc96wcrnhkkr"; }; }; @@ -8976,7 +9013,7 @@ let pname = "HTTP-Proxy"; version = "0.304"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/HTTP-Proxy-0.304.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/HTTP-Proxy-0.304.tar.gz"; sha256 = "b05290534ec73625c21a0565fc35170890dab163843d95331c292c23f504c69d"; }; propagatedBuildInputs = [ LWP ]; @@ -8992,7 +9029,7 @@ let pname = "HTTP-Request-AsCGI"; version = "1.2"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/HTTP-Request-AsCGI-1.2.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/HTTP-Request-AsCGI-1.2.tar.gz"; sha256 = "1smwmiarwcgq7vjdblnb6ldi2x1s5sk5p15p7xvm5byiqq3znnwl"; }; propagatedBuildInputs = [ ClassAccessor HTTPMessage ]; @@ -9002,7 +9039,7 @@ let pname = "HTTP-Response-Encoding"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/HTTP-Response-Encoding-0.06.tar.gz"; sha256 = "1am8lis8107s5npca1xgazdy5sknknzcqyhdmc220s4a4f77n5hh"; }; propagatedBuildInputs = [ HTTPMessage ]; @@ -9016,7 +9053,7 @@ let pname = "HTTP-Server-Simple"; version = "0.52"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/HTTP-Server-Simple-0.52.tar.gz"; sha256 = "0k6bg7k6mjixfzxdkkdrhqvaqmdhjszx0zsk8g0bimiby6j9z4yq"; }; doCheck = false; @@ -9030,7 +9067,7 @@ let pname = "HTTP-Server-Simple-Authen"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-Authen-0.04.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-Authen-0.04.tar.gz"; sha256 = "2dddc8ab9dc8986980151e4ba836a6bbf091f45cf195be1768ebdb4a993ed59b"; }; propagatedBuildInputs = [ AuthenSimple HTTPServerSimple ]; @@ -9043,7 +9080,7 @@ let pname = "HTTP-Server-Simple-Mason"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-0.14.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/HTTP-Server-Simple-Mason-0.14.tar.gz"; sha256 = "b7a49d8e6e55bff0b1f0278d951685466b143243b6f9e59e071f5472ca2a025a"; }; propagatedBuildInputs = [ HTMLMason HTTPServerSimple HookLexWrap ]; @@ -9057,7 +9094,7 @@ let pname = "HTTP-Server-Simple-PSGI"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-PSGI-0.16.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Server-Simple-PSGI-0.16.tar.gz"; sha256 = "1fhx2glycd66m4l4m1gja81ixq8nh4r5g9wjhhkrffq4af2cnz2z"; }; propagatedBuildInputs = [ HTTPServerSimple ]; @@ -9072,12 +9109,12 @@ let pname = "HTTP-Tinyish"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.15.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/HTTP-Tinyish-0.15.tar.gz"; sha256 = "5d65f0ee20a9e4744acdb3ef12edae78c121f53dcbc9cf00867c5725c4513aa5"; }; propagatedBuildInputs = [ FileWhich IPCRun3 ]; meta = { - homepage = https://github.com/miyagawa/HTTP-Tinyish; + homepage = "https://github.com/miyagawa/HTTP-Tinyish"; description = "HTTP::Tiny compatible HTTP client wrappers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9087,7 +9124,7 @@ let pname = "iCal-Parser"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIXED/iCal-Parser-1.21.tar.gz; + url = "mirror://cpan/authors/id/R/RI/RIXED/iCal-Parser-1.21.tar.gz"; sha256 = "0d7939a644a8e67017ec7239d3d9604f3986bb9a4ff80be68fe7299ebfd2270c"; }; propagatedBuildInputs = [ DateTimeFormatICal FreezeThaw IOString TextvFileasData ]; @@ -9100,13 +9137,13 @@ let pname = "Imager"; version = "1.011"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TONYC/Imager-1.011.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TONYC/Imager-1.011.tar.gz"; sha256 = "a3aea2f0c172c2c094baeced4a3bdaa9f54e3e85c97eea2e5f8f994ba2beedfc"; }; buildInputs = [ pkgs.freetype pkgs.fontconfig pkgs.libjpeg pkgs.libpng ]; makeMakerFlags = "--incpath ${pkgs.libjpeg.dev}/include --libpath ${pkgs.libjpeg.out}/lib --incpath ${pkgs.libpng.dev}/include --libpath ${pkgs.libpng.out}/lib"; meta = { - homepage = http://imager.perl.org/; + homepage = "http://imager.perl.org/"; description = "Perl extension for Generating 24 bit Images"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9116,7 +9153,7 @@ let pname = "Image-Info"; version = "1.42"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.42.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SREZIC/Image-Info-1.42.tar.gz"; sha256 = "2bca560c3f71b3c1cd63ac3a974e62f3baeb986b7ffaa026b929081b914a8f4f"; }; propagatedBuildInputs = [ IOStringy ]; @@ -9130,7 +9167,7 @@ let pname = "Image-Sane"; version = "5"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-5.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RATCLIFFE/Image-Sane-5.tar.gz"; sha256 = "229aa0e9f049efa760f3c2f6e61d9d539af43d8f764b50a6e03064b4729a35ff"; }; buildInputs = [ pkgs.sane-backends ExtUtilsDepends ExtUtilsPkgConfig TestRequires TryTiny ]; @@ -9145,7 +9182,7 @@ let pname = "Image-Scale"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/A/AG/AGRUNDMA/Image-Scale-0.14.tar.gz; + url = "mirror://cpan/authors/id/A/AG/AGRUNDMA/Image-Scale-0.14.tar.gz"; sha256 = "f09c5f0663b87738365ac2819e186b909abeb9ed85d83bc15ee76872c947cdf8"; }; buildInputs = [ pkgs.libpng pkgs.libjpeg TestNoWarnings ]; @@ -9161,7 +9198,7 @@ let pname = "Image-Size"; version = "3.300"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJRAY/Image-Size-3.300.tar.gz"; sha256 = "0sq2kwdph55h4adx50fmy86brjkkv8grsw33xrhf1k9icpwb3jak"; }; buildInputs = [ ModuleBuild ]; @@ -9175,7 +9212,7 @@ let pname = "IMAP-Client"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CONTEB/IMAP-Client-0.13.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CONTEB/IMAP-Client-0.13.tar.gz"; sha256 = "15fa4hpw2rqg2iadyz10rnv99hns78wph5qlh3257a3mbfjjyyla"; }; doCheck = false; # nondeterministic @@ -9185,7 +9222,7 @@ let pname = "Importer"; version = "0.025"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.025.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Importer-0.025.tar.gz"; sha256 = "0745138c487d74033d0cbeb36f06595036dc7e688f1a5dbec9cc2fa799e13946"; }; meta = { @@ -9198,7 +9235,7 @@ let pname = "Import-Into"; version = "1.002005"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Import-Into-1.002005.tar.gz"; sha256 = "0rq5kz7c270q33jq6hnrv3xgkvajsc62ilqq7fs40av6zfipg7mx"; }; propagatedBuildInputs = [ ModuleRuntime ]; @@ -9212,7 +9249,7 @@ let pname = "IO"; version = "1.42"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IO-1.42.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/IO-1.42.tar.gz"; sha256 = "eec5cc33a6cddba8b5d2425b60752882add7e4d41b7431a0ea4dcd73cc1f8cca"; }; doCheck = false; @@ -9226,7 +9263,7 @@ let pname = "IO-All"; version = "0.87"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz"; sha256 = "0nsd9knlbd7if2v6zwj4q978axq0w5hk8ymp61z14a821hjivqjl"; }; meta = { @@ -9240,7 +9277,7 @@ let pname = "IO-Async"; version = "0.75"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.75.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/IO-Async-0.75.tar.gz"; sha256 = "1mi6gfbl11rimvzgzyj8kiqf131cg1w9nwxi47fwm9sbs0x6rkjb"; }; propagatedBuildInputs = [ Future StructDumb ]; @@ -9255,7 +9292,7 @@ let pname = "IO-Capture"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REYNOLDS/IO-Capture-0.05.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REYNOLDS/IO-Capture-0.05.tar.gz"; sha256 = "c2c15a254ca74fb8c57d25d7b6cbcaff77a3b4fb5695423f1f80bb423abffea9"; }; meta = { @@ -9267,11 +9304,11 @@ let pname = "IO-CaptureOutput"; version = "1.1105"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1105.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/IO-CaptureOutput-1.1105.tar.gz"; sha256 = "ae99009fca1273800f169ecb82f4ed1cc6c76795f156bee5c0093005d572f487"; }; meta = { - homepage = https://github.com/dagolden/IO-CaptureOutput; + homepage = "https://github.com/dagolden/IO-CaptureOutput"; description = "Capture STDOUT and STDERR from Perl code, subprocesses or XS"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9281,7 +9318,7 @@ let pname = "IO-Compress"; version = "2.093"; src = fetchurl { - url = mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.093.tar.gz; + url = "mirror://cpan/authors/id/P/PM/PMQS/IO-Compress-2.093.tar.gz"; sha256 = "5f8f5d06913f16c16759cc4e06749692208b8947910ffedd2c00a74ed0d60ba2"; }; propagatedBuildInputs = [ CompressRawBzip2 CompressRawZlib ]; @@ -9297,7 +9334,7 @@ let pname = "IO-Digest"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/IO-Digest-0.11.tar.gz"; sha256 = "14kz7z4xw179aya3116wxac29l4y2wmwrba087lya4v2gxdgiz4g"; }; propagatedBuildInputs = [ PerlIOviadynamic ]; @@ -9307,7 +9344,7 @@ let pname = "IO-HTML"; version = "1.001"; src = fetchurl { - url = mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz; + url = "mirror://cpan/authors/id/C/CJ/CJM/IO-HTML-1.001.tar.gz"; sha256 = "ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0"; }; meta = { @@ -9320,7 +9357,7 @@ let pname = "IO-Handle-Util"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/IO-Handle-Util-0.02.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/IO-Handle-Util-0.02.tar.gz"; sha256 = "1vncvsx53iiw1yy3drlk44hzx2pk5cial0h74djf9i6s2flndfcd"; }; propagatedBuildInputs = [ IOString SubExporter asa ]; @@ -9333,7 +9370,7 @@ let pname = "IO-Interactive"; version = "1.022"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/IO-Interactive-1.022.tar.gz"; sha256 = "0ed53b8ae93ae877e98e0d89b7b429e29ccd1ee4c28e952c4ea9aa73d01febdc"; }; meta = { @@ -9346,7 +9383,7 @@ let pname = "IO-LockedFile"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RANI/IO-LockedFile-0.23.tar.gz"; sha256 = "1dgq8zfkaszisdb5hz8jgcl0xc3qpv7bbv562l31xgpiddm7xnxi"; }; }; @@ -9355,7 +9392,7 @@ let pname = "IO-Multiplex"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz"; sha256 = "74d22c44b5ad2e7190e2786e8a17d74bbf4cef89b4d1157ba33598b5a2720dad"; }; }; @@ -9364,7 +9401,7 @@ let version = "1.01"; pname = "IO-Pager"; src = fetchurl { - url = mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.01.tgz; + url = "mirror://cpan/authors/id/J/JP/JPIERCE/IO-Pager-1.01.tgz"; sha256 = "19fslzb11wn8s9hwnwpnwymnw040nmychza2dpbbcqpgnk4k5zpa"; }; propagatedBuildInputs = [ pkgs.more FileWhich TermReadKey ]; # `more` used in tests @@ -9374,7 +9411,7 @@ let pname = "IO-Prompt"; version = "0.997004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997004.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/IO-Prompt-0.997004.tar.gz"; sha256 = "f17bb305ee6ac8b5b203e6d826eb940c4f3f6d6f4bfe719c3b3a225f46f58615"; }; propagatedBuildInputs = [ TermReadKey Want ]; @@ -9388,7 +9425,7 @@ let pname = "IO-SessionData"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/IO-SessionData-1.03.tar.gz"; sha256 = "1p9d77pqy9a8dbgw7h7vmmkg0rlckk19dchd4c8gvcyv7qm73934"; }; outputs = [ "out" "dev" ]; # no "devdoc" @@ -9401,7 +9438,7 @@ let pname = "IO-Socket-INET6"; version = "2.72"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/IO-Socket-INET6-2.72.tar.gz"; sha256 = "1fqypz6qa5rw2d5y2zq7f49frwra0aln13nhq5gi514j2zx21q45"; }; propagatedBuildInputs = [ Socket6 ]; @@ -9412,7 +9449,7 @@ let pname = "IO-Socket-SSL"; version = "2.066"; src = fetchurl { - url = mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz; + url = "mirror://cpan/authors/id/S/SU/SULLR/IO-Socket-SSL-2.066.tar.gz"; sha256 = "0d47064781a545304d5dcea5dfcee3acc2e95a32e1b4884d80505cde8ee6ebcd"; }; propagatedBuildInputs = [ MozillaCA NetSSLeay ]; @@ -9422,7 +9459,7 @@ let --replace "\$openssldir/cert.pem" "/etc/ssl/certs/ca-certificates.crt" ''; meta = { - homepage = https://github.com/noxxi/p5-io-socket-ssl; + homepage = "https://github.com/noxxi/p5-io-socket-ssl"; description = "Nearly transparent SSL encapsulation for IO::Socket::INET"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9433,7 +9470,7 @@ let pname = "IO-Socket-Timeout"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAMS/IO-Socket-Timeout-0.32.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAMS/IO-Socket-Timeout-0.32.tar.gz"; sha256 = "edf915d6cc66bee43503aa6dc2b373366f38eaff701582183dad10cb8adf2972"; }; buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; @@ -9448,7 +9485,7 @@ let pname = "IO-String"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/IO-String-1.08.tar.gz"; sha256 = "2a3f4ad8442d9070780e58ef43722d19d1ee21a803bf7c8206877a10482de5a0"; }; }; @@ -9457,7 +9494,7 @@ let pname = "IO-Stringy"; version = "2.113"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/IO-Stringy-2.113.tar.gz; + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/IO-Stringy-2.113.tar.gz"; sha256 = "0kpycb56l6ilvmdx9swx9wpj1x3vfnqdflfjd6dn6spnz750y8ji"; }; }; @@ -9466,7 +9503,7 @@ let pname = "IO-Tee"; version = "0.65"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.65.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/IO-Tee-0.65.tar.gz"; sha256 = "04hc94fk6qlazrarcznw2d8wiqw289js4za0czw65296kc8csgf6"; }; }; @@ -9475,11 +9512,11 @@ let pname = "IO-TieCombine"; version = "1.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/IO-TieCombine-1.005.tar.gz"; sha256 = "1bv9ampayf4bvyxg4ivy18l8k79jvq55x6gl68b2fg8b62w4sba0"; }; meta = { - homepage = https://github.com/rjbs/io-tiecombine; + homepage = "https://github.com/rjbs/io-tiecombine"; description = "Produce tied (and other) separate but combined variables"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9489,7 +9526,7 @@ let pname = "IO-Tty"; version = "1.14"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.14.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/IO-Tty-1.14.tar.gz"; sha256 = "1dcmxdhrapxvvzlfp6yzz7655f3c6x8jrw0md8ndp2qj27iy9wsi"; }; doCheck = !stdenv.isDarwin; # openpty fails in the sandbox @@ -9499,7 +9536,7 @@ let pname = "IP-Country"; version = "2.28"; src = fetchurl { - url = mirror://cpan/authors/id/N/NW/NWETTERS/IP-Country-2.28.tar.gz; + url = "mirror://cpan/authors/id/N/NW/NWETTERS/IP-Country-2.28.tar.gz"; sha256 = "88db833a5ab22ed06cb53d6f205725e3b5371b254596053738885e91fa105f75"; }; propagatedBuildInputs = [ GeographyCountries ]; @@ -9513,7 +9550,7 @@ let pname = "Geography-Countries"; version = "2009041301"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABIGAIL/Geography-Countries-2009041301.tar.gz"; sha256 = "48c42e40e8281ba7c981743a854c48e6def2d51eb0925ea6c96e25c74497f20f"; }; meta = { @@ -9527,7 +9564,7 @@ let pname = "IPC-Run"; version = "20180523.0"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/IPC-Run-20180523.0.tar.gz"; sha256 = "0bvckcs1629ifqfb68xkapd4a74fd5qbg6z9qs8i6rx4z3nxfl1q"; }; doCheck = false; /* attempts a network connection to localhost */ @@ -9543,7 +9580,7 @@ let pname = "IPC-Run3"; version = "0.048"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/IPC-Run3-0.048.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/IPC-Run3-0.048.tar.gz"; sha256 = "0r9m8q78bg7yycpixd7738jm40yz71p2q7inm766kzsw3g6c709x"; }; }; @@ -9552,7 +9589,7 @@ let pname = "IPC-ShareLite"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDYA/IPC-ShareLite-0.17.tar.gz"; sha256 = "1gz7dbwxrzbzdsjv11kb49jlf9q6lci2va6is0hnavd93nwhdm0l"; }; }; @@ -9561,7 +9598,7 @@ let pname = "IPC-System-Simple"; version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.26.tar.gz; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/IPC-System-Simple-1.26.tar.gz"; sha256 = "57177f21d8e8625bba32ea454f10a1fda16f93c1baf1aa80d106ab1951b465fd"; }; meta = { @@ -9574,7 +9611,7 @@ let pname = "IPC-SysV"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.07.tar.gz; + url = "mirror://cpan/authors/id/M/MH/MHX/IPC-SysV-2.07.tar.gz"; sha256 = "d01a367af771d35e3b11a21366ad6405f8d28e8cbca4c0cf08ab78bf157d052d"; }; meta = { @@ -9624,12 +9661,12 @@ let pname = "Inline"; version = "0.83"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Inline-0.83.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/Inline-0.83.tar.gz"; sha256 = "171a8e5f66faf88fe5ef4de7126267cd8fb2503483432eabc3b88ac7d5be4239"; }; buildInputs = [ TestWarn ]; meta = { - homepage = https://github.com/ingydotnet/inline-pm; + homepage = "https://github.com/ingydotnet/inline-pm"; description = "Write Perl Subroutines in Other Programming Languages"; longDescription = '' The Inline module allows you to put source code from other @@ -9645,7 +9682,7 @@ let pname = "Inline-C"; version = "0.81"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/Inline-C-0.81.tar.gz"; sha256 = "f185258d9050d7f79b4f00f12625cc469c2f700ff62d3e831cb18d80d2c87aac"; }; buildInputs = [ FileCopyRecursive TestWarn YAMLLibYAML ]; @@ -9656,7 +9693,7 @@ let rm -f t/28autowrap.t ''; meta = { - homepage = https://github.com/ingydotnet/inline-c-pm; + homepage = "https://github.com/ingydotnet/inline-c-pm"; description = "C Language Support for Inline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9667,7 +9704,7 @@ let version = "0.66"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.66.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETJ/Inline-Java-0.66.tar.gz"; sha256 = "0j6r6gxdn3wzx36cgcx4znj4ihp5fjl4gzk1623vvwgnwrlf0hy7"; }; @@ -9697,7 +9734,7 @@ let pname = "IPC-Signal"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROSCH/IPC-Signal-1.00.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROSCH/IPC-Signal-1.00.tar.gz"; sha256 = "1l3g0zrcwf2whwjhbpwdcridb7c77mydwxvfykqg1h6hqb4gj8bw"; }; }; @@ -9706,7 +9743,7 @@ let pname = "JavaScript-Minifier-XS"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz; + url = "mirror://cpan/authors/id/G/GT/GTERMARS/JavaScript-Minifier-XS-0.11.tar.gz"; sha256 = "1vlyhckpjbrg2v4dy9szsxxl0q44n0y1xl763mg2y2ym9g5144hm"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -9720,7 +9757,7 @@ let pname = "JavaScript-Value-Escape"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/JavaScript-Value-Escape-0.07.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/JavaScript-Value-Escape-0.07.tar.gz"; sha256 = "1p5365lvnax8kbcfrj169lx05af3i3qi5wg5x9mizqgd10vxmjws"; }; meta = { @@ -9734,7 +9771,7 @@ let pname = "JSON"; version = "4.02"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-4.02.tar.gz"; sha256 = "0z32x2lijij28c9fhmzgxc41i9nw24fyvd2a8ajs5zw9b9sqhjj4"; }; # Do not abort cross-compilation on failure to load native JSON module into host perl @@ -9752,7 +9789,7 @@ let pname = "JSON-Any"; version = "1.39"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/JSON-Any-1.39.tar.gz"; sha256 = "1hspg6khjb38syn59cysnapc1q77qgavfym3fqr6l2kiydf7ajdf"; }; meta = { @@ -9766,7 +9803,7 @@ let pname = "JSON-MaybeXS"; version = "1.004000"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/JSON-MaybeXS-1.004000.tar.gz"; sha256 = "09m1w03as6n0a00pzvaldkhm494yaf5n0g3j2cwwfx24iwpa1gar"; }; meta = { @@ -9779,7 +9816,7 @@ let pname = "JSON-PP"; version = "4.04"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.04.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/JSON-PP-4.04.tar.gz"; sha256 = "0smna2b8h9jlzlbfb64i31vabyqyjs3iwhng0f0byjxrsxb1qcc1"; }; meta = { @@ -9792,7 +9829,7 @@ let pname = "JSON-PP-Compat5006"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-Compat5006-1.09.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-PP-Compat5006-1.09.tar.gz"; sha256 = "197030df52635f9bbe25af10742eea5bd74971473118c11311fcabcb62e3716a"; }; meta = { @@ -9805,7 +9842,7 @@ let pname = "JSON-Parse"; version = "0.55"; src = fetchurl { - url = mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz; + url = "mirror://cpan/authors/id/B/BK/BKB/JSON-Parse-0.55.tar.gz"; sha256 = "0mnjypkiga8zdxr5kbd7sf49pcbn55ivndn01p5ln4amqgdmd66w"; }; meta = { @@ -9835,13 +9872,13 @@ let pname = "JSON-WebToken"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAICRON/JSON-WebToken-0.10.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAICRON/JSON-WebToken-0.10.tar.gz"; sha256 = "77c182a98528f1714d82afc548d5b3b4dc93e67069128bb9b9413f24cf07248b"; }; buildInputs = [ TestMockGuard TestRequires ]; propagatedBuildInputs = [ JSON ModuleRuntime ]; meta = { - homepage = https://github.com/xaicron/p5-JSON-WebToken; + homepage = "https://github.com/xaicron/p5-JSON-WebToken"; description = "JSON Web Token (JWT) implementation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -9851,7 +9888,7 @@ let pname = "JSON-XS"; version = "4.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.02.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/JSON-XS-4.02.tar.gz"; sha256 = "05ngmpc0smlfzgyhyagd5gza8g93r8hik858kmr186h770higbd5"; }; propagatedBuildInputs = [ TypesSerialiser ]; @@ -9862,7 +9899,7 @@ let pname = "JSON-XS-VersionOneAndTwo"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBROCARD/JSON-XS-VersionOneAndTwo-0.31.tar.gz; + url = "mirror://cpan/authors/id/L/LB/LBROCARD/JSON-XS-VersionOneAndTwo-0.31.tar.gz"; sha256 = "e6092c4d961fae777acf7fe99fb3cd6e5b710fec85765a6b90417480e4c94a34"; }; propagatedBuildInputs = [ JSONXS ]; @@ -9875,7 +9912,7 @@ let version = "0.21"; pname = "Object-Realize-Later"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.21.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Object-Realize-Later-0.21.tar.gz"; sha256 = "1nfqssld7pcdw9sj4mkfnh75w51wl14i1h7npj9fld4fri09cywg"; }; }; @@ -9906,7 +9943,7 @@ let pname = "libapreq2"; version = "2.13"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISAAC/libapreq2-2.13.tar.gz"; sha256 = "5731e6833b32d88e4a5c690e45ddf20fcf969ce3da666c5627d775e92da0cf6e"; }; patches = [ @@ -9964,7 +10001,7 @@ let pname = "libintl-perl"; version = "1.31"; src = fetchurl { - url = mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz; + url = "mirror://cpan/authors/id/G/GU/GUIDO/libintl-perl-1.31.tar.gz"; sha256 = "1afandrl44mq9c32r57xr489gkfswdgc97h8x86k98dz1byv3l6a"; }; }; @@ -9973,7 +10010,7 @@ let pname = "libnet"; version = "3.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/libnet-3.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/libnet-3.11.tar.gz"; sha256 = "1lsj3a2vbryh85mbb6yddyb2zjv5vs88fdj5x3v7fp2ndr6ixarg"; }; meta = { @@ -9986,7 +10023,7 @@ let pname = "lib-relative"; version = "1.000"; src = fetchurl { - url = mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz; + url = "mirror://cpan/authors/id/D/DB/DBOOK/lib-relative-1.000.tar.gz"; sha256 = "1mvcdl87d3kyrdx4y6x79k3n5qdd1x5m1hp8lwjxvgfqbw0cgq6z"; }; meta = { @@ -10000,7 +10037,7 @@ let pname = "libxml-perl"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMACLEOD/libxml-perl-0.08.tar.gz"; sha256 = "1jy9af0ljyzj7wakqli0437zb2vrbplqj4xhab7bfj2xgfdhawa5"; }; propagatedBuildInputs = [ XMLParser ]; @@ -10010,12 +10047,12 @@ let pname = "Lingua-EN-FindNumber"; version = "1.32"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.32.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-FindNumber-1.32.tar.gz"; sha256 = "1d176d1c863fb9844bd19d2c2a4e68a0ed73da158f724a89405b90db7e8dbd04"; }; propagatedBuildInputs = [ LinguaENWords2Nums ]; meta = { - homepage = https://github.com/neilbowers/Lingua-EN-FindNumber; + homepage = "https://github.com/neilbowers/Lingua-EN-FindNumber"; description = "Locate (written) numbers in English text"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10025,7 +10062,7 @@ let pname = "Lingua-EN-Inflect"; version = "1.904"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.904.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/Lingua-EN-Inflect-1.904.tar.gz"; sha256 = "54d344884ba9b585680975bbd4049ddbf27bf654446fb00c7e1fc538e08c3173"; }; meta = { @@ -10038,12 +10075,12 @@ let pname = "Lingua-EN-Inflect-Number"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-Inflect-Number-1.12.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-EN-Inflect-Number-1.12.tar.gz"; sha256 = "66fb33838512746f5c597e80264fea66643f7f26570ec2f9205b6135ad67acbf"; }; propagatedBuildInputs = [ LinguaENInflect ]; meta = { - homepage = https://github.com/neilbowers/Lingua-EN-Inflect-Number; + homepage = "https://github.com/neilbowers/Lingua-EN-Inflect-Number"; description = "Force number of words to singular or plural"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10053,7 +10090,7 @@ let pname = "Lingua-EN-Inflect-Phrase"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.20.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Inflect-Phrase-0.20.tar.gz"; sha256 = "55058911a99f1755de3eb449a99ffbeb92d88c01ff5dc60511a24679050ddea8"; }; buildInputs = [ TestNoWarnings ]; @@ -10068,7 +10105,7 @@ let pname = "Lingua-EN-Number-IsOrdinal"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Number-IsOrdinal-0.05.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/Lingua-EN-Number-IsOrdinal-0.05.tar.gz"; sha256 = "28d5695400c0f4e2bd209793cb74f6da2b9257356aacb2947c603425e09618d6"; }; buildInputs = [ TestFatal TryTiny ]; @@ -10083,7 +10120,7 @@ let pname = "Lingua-EN-Tagger"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.31.tar.gz; + url = "mirror://cpan/authors/id/A/AC/ACOBURN/Lingua-EN-Tagger-0.31.tar.gz"; sha256 = "14z9fbl3mf6lxhp0v2apdlxy1fw1y07j4ydrjsh7p3w0wj3qr7ll"; }; propagatedBuildInputs = [ HTMLParser LinguaStem MemoizeExpireLRU ]; @@ -10097,7 +10134,7 @@ let pname = "Lingua-EN-Words2Nums"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JOEY/Lingua-EN-Words2Nums-0.18.tar.gz; + url = "mirror://cpan/authors/id/J/JO/JOEY/Lingua-EN-Words2Nums-0.18.tar.gz"; sha256 = "686556797cd2a4eaa066f19bbf03ab25c06278292c9ead2f187dfd9031ea1d85"; }; meta = { @@ -10109,7 +10146,7 @@ let pname = "Lingua-PT-Stemmer"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-PT-Stemmer-0.02.tar.gz"; sha256 = "17c48sfbgwd2ivlgf59sr6jdhwa3aim8750f8pyzz7xpi8gz0var"; }; meta = { @@ -10123,7 +10160,7 @@ let pname = "Lingua-Stem"; version = "0.84"; src = fetchurl { - url = mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz; + url = "mirror://cpan/authors/id/S/SN/SNOWHARE/Lingua-Stem-0.84.tar.gz"; sha256 = "12avh2mnnc7llmmshrr5bgb473fvydxnlqrqbl2815mf2dp4pxcg"; }; doCheck = false; @@ -10134,7 +10171,7 @@ let pname = "Lingua-Stem-Fr"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz; + url = "mirror://cpan/authors/id/S/SD/SDP/Lingua-Stem-Fr-0.02.tar.gz"; sha256 = "0vyrspwzaqjxm5mqshf4wvwa3938mkajd1918d9ii2l9m2rn8kwx"; }; meta = { @@ -10145,7 +10182,7 @@ let pname = "Lingua-Stem-It"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz; + url = "mirror://cpan/authors/id/A/AC/ACALPINI/Lingua-Stem-It-0.02.tar.gz"; sha256 = "1207r183s5hlh4mfwa6p46vzm0dhvrs2dnss5s41a0gyfkxp7riq"; }; meta = { @@ -10156,7 +10193,7 @@ let pname = "Lingua-Stem-Ru"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Lingua-Stem-Ru-0.04.tar.gz"; sha256 = "0a2jmdz7jn32qj5hyiw5kbv8fvlpmws8i00a6xcbkzb48yvwww0j"; }; meta = { @@ -10170,7 +10207,7 @@ let pname = "Lingua-Stem-Snowball-Da"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz; + url = "mirror://cpan/authors/id/C/CI/CINE/Lingua-Stem-Snowball-Da-1.01.tar.gz"; sha256 = "0mm0m7glm1s6i9f6a78jslw6wh573208arxhq93yriqmw17bwf9f"; }; meta = { @@ -10181,7 +10218,7 @@ let pname = "Lingua-Translit"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.28.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALINKE/Lingua-Translit-0.28.tar.gz"; sha256 = "113f91d8fc2c630437153a49fb7a52b023af8f6278ed96c070b1f60824b8eae1"; }; doCheck = false; @@ -10191,7 +10228,7 @@ let pname = "Linux-ACL"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/N/NA/NAZAROV/Linux-ACL-0.05.tar.gz; + url = "mirror://cpan/authors/id/N/NA/NAZAROV/Linux-ACL-0.05.tar.gz"; sha256 = "312940c1f60f47c4fc93fa0a9d2a626425faa837040c8c2f1ad58ee09f62f371"; }; buildInputs = [ pkgs.acl ]; @@ -10207,11 +10244,11 @@ let pname = "Linux-DesktopFiles"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/T/TR/TRIZEN/Linux-DesktopFiles-0.25.tar.gz; + url = "mirror://cpan/authors/id/T/TR/TRIZEN/Linux-DesktopFiles-0.25.tar.gz"; sha256 = "60377a74fba90fa465200ee1c7430dbdde69d454d85f9ee101c039803a07e5f5"; }; meta = { - homepage = https://github.com/trizen/Linux-DesktopFiles; + homepage = "https://github.com/trizen/Linux-DesktopFiles"; description = "Fast parsing of the Linux desktop files"; license = stdenv.lib.licenses.artistic2; }; @@ -10221,7 +10258,7 @@ let pname = "Linux-Distribution"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Linux-Distribution-0.23.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Linux-Distribution-0.23.tar.gz"; sha256 = "603e27da607b3e872a669d7a66d75982f0969153eab2d4b20c341347b4ebda5f"; }; # The tests fail if the distro it's built on isn't in the supported list. @@ -10237,7 +10274,7 @@ let pname = "Linux-FD"; version = "0.011"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Linux-FD-0.011.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Linux-FD-0.011.tar.gz"; sha256 = "6bb579d47644cb0ed35626ff77e909ae69063073c6ac09aa0614fef00fa37356"; }; buildInputs = [ TestException ]; @@ -10253,7 +10290,7 @@ let pname = "Linux-Inotify2"; version = "2.2"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.2.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Linux-Inotify2-2.2.tar.gz"; sha256 = "0crlxmaa4lsgdjm5p9ib8rdxiy70qj1s68za3q3v57v8ll6s4hfx"; }; propagatedBuildInputs = [ commonsense ]; @@ -10263,7 +10300,7 @@ let pname = "List-AllUtils"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-AllUtils-0.15.tar.gz"; sha256 = "3711fac729321d3aad8356a756fd9272094f227aa048866a3751f9d8ea6cc95d"; }; propagatedBuildInputs = [ ListSomeUtils ListUtilsBy ]; @@ -10277,7 +10314,7 @@ let pname = "List-BinarySearch"; version = "0.25"; src = pkgs.fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.25.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVIDO/List-BinarySearch-0.25.tar.gz"; sha256 = "0ap8y9rsjxg75887klgij90mf459f8dwy0dbx1g06h30pmqk04f8"; }; }; @@ -10286,12 +10323,12 @@ let pname = "List-Compare"; version = "0.53"; src = fetchurl { - url = mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.53.tar.gz; + url = "mirror://cpan/authors/id/J/JK/JKEENAN/List-Compare-0.53.tar.gz"; sha256 = "fdbf4ff67b3135d44475fef7fcac0cd4706407d5720d26dca914860eb10f8550"; }; buildInputs = [ IOCaptureOutput ]; meta = { - homepage = http://thenceforward.net/perl/modules/List-Compare/; + homepage = "http://thenceforward.net/perl/modules/List-Compare/"; description = "Compare elements of two or more lists"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10301,7 +10338,7 @@ let pname = "List-MoreUtils"; version = "0.428"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.428.tar.gz"; sha256 = "713e0945d5f16e62d81d5f3da2b6a7b14a4ce439f6d3a7de74df1fd166476cc2"; }; propagatedBuildInputs = [ ExporterTiny ListMoreUtilsXS ]; @@ -10316,7 +10353,7 @@ let pname = "List-MoreUtils-XS"; version = "0.428"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.428.tar.gz"; sha256 = "0bfndmnkqaaf3gffprak143bzplxd69c368jxgr7rzlx88hyd7wx"; }; preConfigure = '' @@ -10332,7 +10369,7 @@ let pname = "List-SomeUtils"; version = "0.58"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.58.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/List-SomeUtils-0.58.tar.gz"; sha256 = "96eafb359339d22bf2a2de421298847a3c40f6a28b6d44005d0965da86a5469d"; }; buildInputs = [ TestLeakTrace ]; @@ -10347,7 +10384,7 @@ let pname = "List-UtilsBy"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/List-UtilsBy-0.11.tar.gz"; sha256 = "0nkpylkqccxanr8wc7j9wg6jdrizybjjd6p8q3jbh7f29cxz9pgs"; }; }; @@ -10356,7 +10393,7 @@ let pname = "Locale-Codes"; version = "3.62"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.62.tar.gz; + url = "mirror://cpan/authors/id/S/SB/SBECK/Locale-Codes-3.62.tar.gz"; sha256 = "11a6d343e9c321d8ee9eee4479954a4e9c1ff2145187e74fd64952092f9dfab7"; }; meta = { @@ -10371,7 +10408,7 @@ let version = "1.07"; buildInputs = [ pkgs.gettext ]; src = fetchurl { - url = mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz; + url = "mirror://cpan/authors/id/P/PV/PVANDRY/gettext-1.07.tar.gz"; sha256 = "05cwqjxxary11di03gg3fm6j9lbvg1dr2wpr311c1rwp8salg7ch"; }; LANG="C"; @@ -10381,7 +10418,7 @@ let pname = "Locale-MO-File"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.09.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-MO-File-0.09.tar.gz"; sha256 = "0gsaaqimsh5bdhns2v67j1nvb178hx2536lxmr971cwxy31ns0wp"; }; propagatedBuildInputs = [ ConstFast MooXStrictConstructor MooXTypesMooseLike ParamsValidate namespaceautoclean ]; @@ -10396,7 +10433,7 @@ let pname = "Locale-Maketext-Fuzzy"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-0.11.tar.gz; + url = "mirror://cpan/authors/id/A/AU/AUDREYT/Locale-Maketext-Fuzzy-0.11.tar.gz"; sha256 = "3785171ceb78cc7671319a3a6d8ced9b190e097dfcd9b2a9ebc804cd1a282f96"; }; meta = { @@ -10409,7 +10446,7 @@ let pname = "Locale-Maketext-Lexicon"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DRTECH/Locale-Maketext-Lexicon-1.00.tar.gz"; sha256 = "b73f6b04a58d3f0e38ebf2115a4c1532f1a4eef6fac5c6a2a449e4e14c1ddc7c"; }; meta = { @@ -10422,7 +10459,7 @@ let pname = "Locale-Msgfmt"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/A/AZ/AZAWAWI/Locale-Msgfmt-0.15.tar.gz; + url = "mirror://cpan/authors/id/A/AZ/AZAWAWI/Locale-Msgfmt-0.15.tar.gz"; sha256 = "c3276831cbeecf58be02081bcc180bd348daa35da21a7737b7b038a59f643ab4"; }; meta = { @@ -10435,7 +10472,7 @@ let pname = "Locale-PO"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz; + url = "mirror://cpan/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz"; sha256 = "3c994a4b63e6e4e836c6f79a93f51921cab77c90c9753fe0f8b5429220d516b9"; }; propagatedBuildInputs = [ FileSlurp ]; @@ -10448,7 +10485,7 @@ let pname = "Locale-TextDomain-OO"; version = "1.036"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.036.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-1.036.tar.gz"; sha256 = "0f0fajq4k1sgyywsb7qypsf6xa1sxjx4agm8l8z2284nm3hq65xm"; }; propagatedBuildInputs = [ ClassLoad Clone JSON LocaleMOFile LocalePO LocaleTextDomainOOUtil LocaleUtilsPlaceholderBabelFish LocaleUtilsPlaceholderMaketext LocaleUtilsPlaceholderNamed MooXSingleton PathTiny TieSub ]; @@ -10463,7 +10500,7 @@ let pname = "Locale-TextDomain-OO-Util"; version = "4.002"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.002.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-TextDomain-OO-Util-4.002.tar.gz"; sha256 = "1826pl11vr9p7zv7vqs7kcd8y5218086l90dw8lw0xzdcmzs0prw"; }; propagatedBuildInputs = [ namespaceautoclean ]; @@ -10478,7 +10515,7 @@ let pname = "Locale-Utils-PlaceholderBabelFish"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderBabelFish-0.006.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderBabelFish-0.006.tar.gz"; sha256 = "1k54njj8xz19c8bjb0iln1mnfq55j3pvbff7samyrab3k59h071f"; }; propagatedBuildInputs = [ HTMLParser MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; @@ -10493,7 +10530,7 @@ let pname = "Locale-Utils-PlaceholderMaketext"; version = "1.005"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderMaketext-1.005.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderMaketext-1.005.tar.gz"; sha256 = "1srlbp8sfnzhndgh9s4d8bglpzw0vb8gnab9r8r8sggkv15n0a2h"; }; propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; @@ -10508,7 +10545,7 @@ let pname = "Locale-Utils-PlaceholderNamed"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderNamed-1.004.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Locale-Utils-PlaceholderNamed-1.004.tar.gz"; sha256 = "1gd68lm5w5c6ndcilx91rn84zviqyrk3fx92jjx5khxm76i8xmvg"; }; propagatedBuildInputs = [ MooXStrictConstructor MooXTypesMooseLike namespaceautoclean ]; @@ -10523,7 +10560,7 @@ let pname = "local-lib"; version = "2.000024"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/local-lib-2.000024.tar.gz"; sha256 = "01cav7m6qc1x96wna1viiw6n212f94ks7cik4vj1a1lasixr36rf"; }; meta = { @@ -10546,13 +10583,13 @@ let pname = "Log-Any"; version = "1.708"; src = fetchurl { - url = mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.708.tar.gz; + url = "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-1.708.tar.gz"; sha256 = "e1407759dc9462ab096d4ddc89feaac8abb341c5429e38cf6f7b8a996a35ecd9"; }; # Syslog test fails. preCheck = "rm t/syslog.t"; meta = { - homepage = https://github.com/preaction/Log-Any; + homepage = "https://github.com/preaction/Log-Any"; description = "Bringing loggers and listeners together"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10562,7 +10599,7 @@ let pname = "Log-Any-Adapter-Log4perl"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-Adapter-Log4perl-0.09.tar.gz; + url = "mirror://cpan/authors/id/P/PR/PREACTION/Log-Any-Adapter-Log4perl-0.09.tar.gz"; sha256 = "19f1drqnzr6g4xwjm6jk4iaa3zmiax8bzxqch04f4jr12bjd75qi"; }; propagatedBuildInputs = [ LogAny LogLog4perl ]; @@ -10577,13 +10614,13 @@ let pname = "Log-Contextual"; version = "0.008001"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.008001.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.008001.tar.gz"; sha256 = "b93cbcfbb8796d51c836e3b00243cda5630808c152c14eee5f20ca09c9451993"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; meta = { - homepage = https://github.com/frioux/Log-Contextual; + homepage = "https://github.com/frioux/Log-Contextual"; description = "Simple logging interface with a contextual log"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10593,7 +10630,7 @@ let pname = "Log-Dispatch"; version = "2.69"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.69.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Log-Dispatch-2.69.tar.gz"; sha256 = "0xsjb0j3dzs8ym8jbgi29kia4pz5vl8jzkmpxxrhhqjc1h54qqjq"; }; propagatedBuildInputs = [ DevelGlobalDestruction ParamsValidationCompiler Specio namespaceautoclean ]; @@ -10623,7 +10660,7 @@ let pname = "Log-Handler"; version = "0.88"; src = fetchurl { - url = mirror://cpan/authors/id/B/BL/BLOONIX/Log-Handler-0.88.tar.gz; + url = "mirror://cpan/authors/id/B/BL/BLOONIX/Log-Handler-0.88.tar.gz"; sha256 = "45bf540ab2138ed3ff93afc205b0516dc75755b86acdcc5e75c41347833c293d"; }; propagatedBuildInputs = [ ParamsValidate ]; @@ -10637,7 +10674,7 @@ let pname = "Log-Message"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-0.08.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-0.08.tar.gz"; sha256 = "bd697dd62aaf26d118e9f0a0813429deb1c544e4501559879b61fcbdfe99fe46"; }; meta = { @@ -10650,7 +10687,7 @@ let pname = "Log-Message-Simple"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-Simple-0.10.tar.gz"; sha256 = "15nxi935nfrf8dkdrgvcrf2qlai4pbz03yj8sja0n9mcq2jd24ma"; }; propagatedBuildInputs = [ LogMessage ]; @@ -10664,7 +10701,7 @@ let pname = "Log-Trace"; version = "1.070"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBC/Log-Trace-1.070.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBC/Log-Trace-1.070.tar.gz"; sha256 = "1qrnxn9b05cqyw1286djllnj8wzys10754glxx6z5hihxxc85jwy"; }; }; @@ -10673,7 +10710,7 @@ let pname = "MCE"; version = "1.865"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.865.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARIOROY/MCE-1.865.tar.gz"; sha256 = "1fhrc0mig5rzywz3lki0gkpvm9l9693cwaljzwxkprdkxnvk709c"; }; meta = { @@ -10687,11 +10724,11 @@ let pname = "Log-Log4perl"; version = "1.49"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.49.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHILLI/Log-Log4perl-1.49.tar.gz"; sha256 = "b739187f519146cb6bebcfc427c64b1f4138b35c5f4c96f46a21ed4a43872e16"; }; meta = { - homepage = https://mschilli.github.io/log4perl/; + homepage = "https://mschilli.github.io/log4perl/"; description = "Log4j implementation for Perl"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10701,13 +10738,13 @@ let pname = "Log-Dispatch-Array"; version = "1.003"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.003.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatch-Array-1.003.tar.gz"; sha256 = "0dvzp0gsh17jqg02460ndchyapr1haahndq1p9v6mwkv5wf9680c"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ LogDispatch ]; meta = { - homepage = https://github.com/rjbs/log-dispatch-array; + homepage = "https://github.com/rjbs/log-dispatch-array"; description = "Log events to an array (reference)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10717,13 +10754,13 @@ let pname = "Log-Dispatchouli"; version = "2.019"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.019.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Log-Dispatchouli-2.019.tar.gz"; sha256 = "fe8890c553c8f72b8b55633067270862c34db2ab8ff1cf8db0855f0427c23442"; }; buildInputs = [ TestDeep TestFatal ]; propagatedBuildInputs = [ LogDispatchArray StringFlogger SubExporterGlobExporter ]; meta = { - homepage = https://github.com/rjbs/Log-Dispatchouli; + homepage = "https://github.com/rjbs/Log-Dispatchouli"; description = "A simple wrapper around Log::Dispatch"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10751,7 +10788,7 @@ let pname = "Log-LogLite"; version = "0.82"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RANI/Log-LogLite-0.82.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RANI/Log-LogLite-0.82.tar.gz"; sha256 = "0sqsa4750wvhw4cjmxpxqg30i1jjcddadccflisrdb23qn5zn285"; }; propagatedBuildInputs = [ IOLockedFile ]; @@ -10765,7 +10802,7 @@ let pname = "libwww-perl"; version = "6.43"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.43.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/libwww-perl-6.43.tar.gz"; sha256 = "e9849d7ee6fd0e89cc999e63d7612c951afd6aeea6bc721b767870d9df4ac40d"; }; propagatedBuildInputs = [ FileListing HTMLParser HTTPCookies HTTPDaemon HTTPNegotiate NetHTTP TryTiny WWWRobotRules ]; @@ -10785,7 +10822,7 @@ let pname = "LWP-Authen-OAuth"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TIMBRODY/LWP-Authen-OAuth-1.02.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TIMBRODY/LWP-Authen-OAuth-1.02.tar.gz"; sha256 = "e78e0bd7de8002cfb4760073258d555ef55b2c27c07a94b3d8a2166a17fd96bc"; }; propagatedBuildInputs = [ LWP ]; @@ -10799,7 +10836,7 @@ let pname = "LWP-MediaTypes"; version = "6.04"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-6.04.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-MediaTypes-6.04.tar.gz"; sha256 = "1n8rg6csv3dsvymg06cmxipimr6cb1g9r903ghm1qsmiv89cl6wg"; }; meta = { @@ -10813,7 +10850,7 @@ let pname = "LWP-Protocol-connect"; version = "6.09"; src = fetchurl { - url = mirror://cpan/authors/id/B/BE/BENNING/LWP-Protocol-connect-6.09.tar.gz; + url = "mirror://cpan/authors/id/B/BE/BENNING/LWP-Protocol-connect-6.09.tar.gz"; sha256 = "9f252394775e23aa42c3176611e5930638ab528d5190110b4731aa5b0bf35a15"; }; buildInputs = [ TestException ]; @@ -10828,7 +10865,7 @@ let pname = "LWP-Protocol-https"; version = "6.07"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/LWP-Protocol-https-6.07.tar.gz"; sha256 = "1rxrpwylfw1afah0nk96kgkwjbl2p1a7lwx50iipg8c4rx3cjb2j"; }; patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ]; @@ -10845,7 +10882,7 @@ let pname = "LWP-Protocol-http10"; version = "6.03"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-http10-6.03.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-http10-6.03.tar.gz"; sha256 = "1lxq40qfwfai9ryhzhsdnycc4189c8kfl43rf7qq34fmz48skzzk"; }; propagatedBuildInputs = [ LWP ]; @@ -10859,7 +10896,7 @@ let pname = "LWP-UserAgent-DNS-Hosts"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MASAKI/LWP-UserAgent-DNS-Hosts-0.13.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MASAKI/LWP-UserAgent-DNS-Hosts-0.13.tar.gz"; sha256 = "0piwcsb0m1xpzxbakhr9zq45a9hq3rx7s55lrjg66nd4x5n7xs5y"; }; propagatedBuildInputs = [ LWP ScopeGuard ]; @@ -10875,7 +10912,7 @@ let pname = "LWP-UserAgent-Determined"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/LWP-UserAgent-Determined-1.07.tar.gz"; sha256 = "06d8d50e8cd3692a11cb4fb44a2f84e5476a98f0e2e6a4a0dfce9f67e55ddb53"; }; propagatedBuildInputs = [ LWP ]; @@ -10888,7 +10925,7 @@ let pname = "LWP-UserAgent-Mockable"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJEMMESON/LWP-UserAgent-Mockable-1.18.tar.gz; + url = "mirror://cpan/authors/id/M/MJ/MJEMMESON/LWP-UserAgent-Mockable-1.18.tar.gz"; sha256 = "0923ahl22c0gdzrihj7dqnrawia9hmcl462asf4ry8d5wd84z1i5"; }; propagatedBuildInputs = [ HookLexWrap LWP SafeIsa ]; @@ -10903,7 +10940,7 @@ let pname = "LWPx-ParanoidAgent"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-1.12.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAXJAZMAN/lwp/LWPx-ParanoidAgent-1.12.tar.gz"; sha256 = "0gfhw3jbs25yya2dryv8xvyn9myngcfcmsybj7gkq62fnznil16c"; }; doCheck = false; # 3 tests fail, probably because they try to connect to the network @@ -10931,7 +10968,7 @@ let pname = "Mail-AuthenticationResults"; version = "1.20200108"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200108.tar.gz; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-AuthenticationResults-1.20200108.tar.gz"; sha256 = "1j003bzqh7nax604f93k1s70b1im97986p6g58a6ynv92fbnhjq5"; }; buildInputs = [ TestException ]; @@ -10946,7 +10983,7 @@ let version = "1.0.0"; pname = "Mail-Maildir"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEROALTI/Mail-Maildir-100/Mail-Maildir-1.0.0.tar.bz2; + url = "mirror://cpan/authors/id/Z/ZE/ZEROALTI/Mail-Maildir-100/Mail-Maildir-1.0.0.tar.bz2"; sha256 = "1krkqfps6q3ifrhi9450l5gm9199qyfcm6vidllr0dv65kdaqpj4"; }; }; @@ -10955,7 +10992,7 @@ let version = "3.008"; pname = "Mail-Box"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.008.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Box-3.008.tar.gz"; sha256 = "15yjq3ap1ch0k0pqa1zag50rqrjfqzf7cka1w41macxibna506mm"; }; @@ -10968,13 +11005,13 @@ let pname = "Mail-Mbox-MessageParser"; version = "1.5111"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-1.5111.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCOPPIT/Mail-Mbox-MessageParser-1.5111.tar.gz"; sha256 = "5723c0aa9cc10bab9ed1e3bfd9d5c95f7159e71c1a475414eb1af1dee3a46237"; }; buildInputs = [ FileSlurper TestCompile TestPod TestPodCoverage TextDiff UNIVERSALrequire URI ]; propagatedBuildInputs = [ FileHandleUnget ]; meta = { - homepage = https://github.com/coppit/mail-mbox-messageparser; + homepage = "https://github.com/coppit/mail-mbox-messageparser"; description = "A fast and simple mbox folder reader"; license = stdenv.lib.licenses.gpl2; maintainers = with maintainers; [ romildo ]; @@ -10985,7 +11022,7 @@ let pname = "Mail-Message"; version = "3.008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Message-3.008.tar.gz"; sha256 = "1k3d996r2aqqzbv0xx5y88blpy9rp14lhd9vzjc1hjnrl7gij63f"; }; propagatedBuildInputs = [ IOStringy MIMETypes MailTools URI UserIdentity ]; @@ -10999,7 +11036,7 @@ let pname = "Mail-DKIM"; version = "0.58"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.58.tar.gz; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Mail-DKIM-0.58.tar.gz"; sha256 = "0cgkal65qqcy57b21lgij90ba36wl66byw9i76g5yhwaa8ms8hqa"; }; propagatedBuildInputs = [ CryptOpenSSLRSA MailAuthenticationResults MailTools NetDNSResolverMock YAMLLibYAML ]; @@ -11011,7 +11048,7 @@ let pname = "Mail-IMAPClient"; version = "3.42"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLOBBES/Mail-IMAPClient-3.42.tar.gz"; sha256 = "0znf035ikaxyfishv507qq6g691xvbnziqlcwfikkj2l1kan88hw"; }; propagatedBuildInputs = [ ParseRecDescent ]; @@ -11021,7 +11058,7 @@ let pname = "Mail-POP3Client"; version = "2.19"; src = fetchurl { - url = mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz; + url = "mirror://cpan/authors/id/S/SD/SDOWD/Mail-POP3Client-2.19.tar.gz"; sha256 = "1142d6247a93cb86b23ed8835553bb2d227ff8213ee2743e4155bb93f47acb59"; }; meta = { @@ -11034,7 +11071,7 @@ let pname = "Mail-RFC822-Address"; version = "0.3"; src = fetchurl { - url = mirror://cpan/authors/id/P/PD/PDWARREN/Mail-RFC822-Address-0.3.tar.gz; + url = "mirror://cpan/authors/id/P/PD/PDWARREN/Mail-RFC822-Address-0.3.tar.gz"; sha256 = "351ef4104ecb675ecae69008243fae8243d1a7e53c681eeb759e7b781684c8a7"; }; }; @@ -11043,11 +11080,11 @@ let pname = "Mail-Sender"; version = "0.903"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAPOEIRAB/Mail-Sender-0.903.tar.gz; + url = "mirror://cpan/authors/id/C/CA/CAPOEIRAB/Mail-Sender-0.903.tar.gz"; sha256 = "4413eb49f520a8318151811ccb05a8d542973aada20aa503ad32f9ffc98a39bf"; }; meta = { - homepage = https://github.com/Perl-Email-Project/Mail-Sender; + homepage = "https://github.com/Perl-Email-Project/Mail-Sender"; description = "(DEPRECATED) module for sending mails with attachments through an SMTP server"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11100,7 +11137,7 @@ let pname = "MailTools"; version = "2.21"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.21.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/MailTools-2.21.tar.gz"; sha256 = "1js43bp2dnd8n2rv8clsv749166jnyqnc91k4wkkmw5n4rlbvnaa"; }; propagatedBuildInputs = [ TimeDate ]; @@ -11114,7 +11151,7 @@ let pname = "Mail-Transport"; version = "3.004"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.004.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/Mail-Transport-3.004.tar.gz"; sha256 = "049xsjxfn00v5znmrg7vgyafy5wzxxa901hq2g083s0pyq4mlcfg"; }; propagatedBuildInputs = [ MailMessage ]; @@ -11128,7 +11165,7 @@ let pname = "Math-Base85"; version = "0.4"; src = fetchurl { - url = mirror://cpan/authors/id/P/PT/PTC/Math-Base85-0.4.tar.gz; + url = "mirror://cpan/authors/id/P/PT/PTC/Math-Base85-0.4.tar.gz"; sha256 = "03cbp5ls98zcj183wjzlzjcrhbc96mw3p1hagzy1yplj1xh5ia4y"; }; meta = { @@ -11137,11 +11174,20 @@ let }; }; + MathBaseConvert = buildPerlPackage { + pname = "Math-Base-Convert"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MI/MIKER/Math-Base-Convert-0.11.tar.gz"; + sha256 = "8c0971355f24c93b79e77ad54a4570090a1a598fcb9b86f5c17eba42f38b40e0"; + }; + }; + MathLibm = buildPerlPackage { pname = "Math-Libm"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSLEWART/Math-Libm-1.00.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSLEWART/Math-Libm-1.00.tar.gz"; sha256 = "0xn2a950mzzs5q1c4q98ckysn9dz20x7r35g02zvk35chgr0klxz"; }; }; @@ -11150,7 +11196,7 @@ let pname = "Math-Calc-Units"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SF/SFINK/Math-Calc-Units-1.07.tar.gz; + url = "mirror://cpan/authors/id/S/SF/SFINK/Math-Calc-Units-1.07.tar.gz"; sha256 = "13wgbxv2fmigdj0vf7nwkq1y2q07jgfj8wdrpqkywfxv4zdwzqv1"; }; meta = { @@ -11163,7 +11209,7 @@ let pname = "Math-BigInt"; version = "1.999816"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999816.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-1.999816.tar.gz"; sha256 = "95a5a1f636a23f66d400d40bffb0d24ad50df00e6e3c7359c9e645c375f40a89"; }; meta = { @@ -11176,7 +11222,7 @@ let pname = "Math-BigInt-GMP"; version = "1.6007"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6007.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-GMP-1.6007.tar.gz"; sha256 = "07y0akadx2nm1bsp17v12785s3ni1l5qyqkk4q3pxcyc41nmwwjx"; }; buildInputs = [ pkgs.gmp ]; @@ -11190,7 +11236,7 @@ let pname = "Math-BigInt-Lite"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.18.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigInt-Lite-0.18.tar.gz"; sha256 = "1m97jkh26nrji6mjdwhwlq9bcdn8qlw3vimik8bs2hw80syi70j4"; }; propagatedBuildInputs = [ MathBigInt ]; @@ -11203,7 +11249,7 @@ let pname = "Math-BigRat"; version = "0.2614"; src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigRat-0.2614.tar.gz; + url = "mirror://cpan/authors/id/P/PJ/PJACKLAM/Math-BigRat-0.2614.tar.gz"; sha256 = "cea6c20afc6c10a3dc3b62a71df3f842dce13898443bd827242ff3f09f1f3d59"; }; meta = { @@ -11216,7 +11262,7 @@ let pname = "Math-Clipper"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.29.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHELDRAKE/Math-Clipper-1.29.tar.gz"; sha256 = "14vmz1x8hwnlk239dcsh0n39kd7cd7v5g1iikgbyjvc66gqw89sk"; }; nativeBuildInputs = [ pkgs.ld-is-cc-hook ]; @@ -11227,7 +11273,7 @@ let pname = "Math-ConvexHull-MonotoneChain"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Math-ConvexHull-MonotoneChain-0.01.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Math-ConvexHull-MonotoneChain-0.01.tar.gz"; sha256 = "1xcl7cz62ydddji9qzs4xsfxss484jqjlj4iixa4aci611cw92r8"; }; }; @@ -11236,7 +11282,7 @@ let pname = "Math-GMP"; version = "2.20"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.20.tar.gz"; sha256 = "0psmpj3j8cw02b5bzb7qnkd4rcpxm82891rwpdi2hx2jxy0mznhn"; }; buildInputs = [ pkgs.gmp AlienGMP ]; @@ -11252,7 +11298,7 @@ let pname = "Math-Geometry-Voronoi"; version = "1.3"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAMTREGAR/Math-Geometry-Voronoi-1.3.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAMTREGAR/Math-Geometry-Voronoi-1.3.tar.gz"; sha256 = "0b206k2q5cznld45cjhgm0as0clc9hk135ds8qafbkl3k175w1vj"; }; propagatedBuildInputs = [ ClassAccessor ParamsValidate ]; @@ -11262,7 +11308,7 @@ let pname = "Math-Int128"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Math-Int128-0.22.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Math-Int128-0.22.tar.gz"; sha256 = "1g0ra7ldv4fz3kqqg45dlrfavi2abfmlhf0py5ank1jk2x0clc56"; }; propagatedBuildInputs = [ MathInt64 ]; @@ -11277,7 +11323,7 @@ let pname = "Math-Int64"; version = "0.54"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Math-Int64-0.54.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Math-Int64-0.54.tar.gz"; sha256 = "0lfkc0cry65lnsi28gjyz2kvdkanbhhpc0pyrswsczj3k3k53z6w"; }; meta = { @@ -11290,7 +11336,7 @@ let pname = "Math-PlanePath"; version = "127"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-127.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRYDE/Math-PlanePath-127.tar.gz"; sha256 = "1dzywpydigwyr38vz9f4yn7xkkk21vi6lyzjlyqv8iny0y0c7w20"; }; propagatedBuildInputs = [ MathLibm constant-defer ]; @@ -11301,7 +11347,7 @@ let pname = "Math-Random"; version = "0.72"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GROMMEL/Math-Random-0.72.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GROMMEL/Math-Random-0.72.tar.gz"; sha256 = "0k15pk2qx9wrp5xqzhymm1ph4nb314ysrsyr0pjnvn8ii0r241dy"; }; meta = { @@ -11312,7 +11358,7 @@ let pname = "Math-Random-ISAAC"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-1.004.tar.gz; + url = "mirror://cpan/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-1.004.tar.gz"; sha256 = "0z1b3xbb3xz71h25fg6jgsccra7migq7s0vawx2rfzi0pwpz0wr7"; }; buildInputs = [ TestNoWarnings ]; @@ -11326,7 +11372,7 @@ let pname = "Math-Random-MT-Auto"; version = "6.23"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.23.tar.gz; + url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/Math-Random-MT-Auto-6.23.tar.gz"; sha256 = "04v3fxbqg6bs7dpljw64v62jqb10l2xdrln4l3slz5k266nvbg2q"; }; propagatedBuildInputs = [ ObjectInsideOut ]; @@ -11340,7 +11386,7 @@ let pname = "Math-Random-Secure"; version = "0.080001"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Math-Random-Secure-0.080001.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/Math-Random-Secure-0.080001.tar.gz"; sha256 = "0dgbf4ncll4kmgkyb9fsaxn0vf2smc9dmwqzgh3259zc2zla995z"; }; buildInputs = [ ListMoreUtils TestSharedFork TestWarn ]; @@ -11355,7 +11401,7 @@ let pname = "Math-Round"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GROMMEL/Math-Round-0.07.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GROMMEL/Math-Round-0.07.tar.gz"; sha256 = "09wkvqj4hfq9y0fimri967rmhnq90dc2wf20lhlmqjp5hsd359vk"; }; }; @@ -11364,7 +11410,7 @@ let pname = "Math-VecStat"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz; + url = "mirror://cpan/authors/id/A/AS/ASPINELLI/Math-VecStat-0.08.tar.gz"; sha256 = "03bdcl9pn2bc9b50c50nhnr7m9wafylnb3v21zlch98h9c78x6j0"; }; }; @@ -11373,7 +11419,7 @@ let pname = "MaxMind-DB-Common"; version = "0.040001"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Common-0.040001.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Common-0.040001.tar.gz"; sha256 = "1mqvnabskhyvi2f10f602gisfk39ws51ky55lixd0033sd5xzikb"; }; propagatedBuildInputs = [ DataDumperConcise DateTime ListAllUtils MooXStrictConstructor ]; @@ -11387,7 +11433,7 @@ let pname = "MaxMind-DB-Reader"; version = "1.000014"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000014.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-1.000014.tar.gz"; sha256 = "1a9rrvarw3q6378w3sqv632w36a9bsh0r90yfa49lzwnkj7hf81q"; }; propagatedBuildInputs = [ DataIEEE754 DataPrinter DataValidateIP MaxMindDBCommon ]; @@ -11402,7 +11448,7 @@ let pname = "MaxMind-DB-Reader-XS"; version = "1.000008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000008.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Reader-XS-1.000008.tar.gz"; sha256 = "11y71m77y38mi68gw5dqx54z9syvax42x3m9v7mgx35c5z4gpal4"; }; propagatedBuildInputs = [ pkgs.libmaxminddb MathInt128 MaxMindDBReader ]; @@ -11417,7 +11463,7 @@ let pname = "MaxMind-DB-Writer"; version = "0.300003"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Writer-0.300003.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/MaxMind-DB-Writer-0.300003.tar.gz"; sha256 = "0gpbrlmxjl45k0wg5v9ghw415hd0fns9fk8ncxzlfyjzjsxgalxs"; }; propagatedBuildInputs = [ DigestSHA1 MaxMindDBReader MooseXParamsValidate MooseXStrictConstructor NetWorks SerealDecoder SerealEncoder ]; @@ -11433,7 +11479,7 @@ let pname = "Memoize"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz; + url = "mirror://cpan/authors/id/M/MJ/MJD/Memoize-1.03.tgz"; sha256 = "5239cc5f644a50b0de9ffeaa51fa9991eb06ecb1bf4678873e3ab89af9c0daf3"; }; }; @@ -11442,7 +11488,7 @@ let pname = "Memoize-ExpireLRU"; version = "0.56"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Memoize-ExpireLRU-0.56.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Memoize-ExpireLRU-0.56.tar.gz"; sha256 = "1xnp3jqabl4il5kfadlqimbxhzsbm7gpwrgw0m5s5fdsrc0n70zf"; }; meta = { @@ -11456,12 +11502,12 @@ let pname = "Menlo"; version = "1.9019"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-1.9019.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-1.9019.tar.gz"; sha256 = "3b573f68e7b3a36a87c860be258599330fac248b518854dfb5657ac483dca565"; }; propagatedBuildInputs = [ CPANCommonIndex CPANMetaCheck CaptureTiny ExtUtilsHelpers ExtUtilsInstallPaths Filepushd HTTPTinyish ModuleCPANfile ParsePMFile StringShellQuote Win32ShellQuote locallib ]; meta = { - homepage = https://github.com/miyagawa/cpanminus; + homepage = "https://github.com/miyagawa/cpanminus"; description = "A CPAN client"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11471,12 +11517,12 @@ let pname = "Menlo-Legacy"; version = "1.9022"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-Legacy-1.9022.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Menlo-Legacy-1.9022.tar.gz"; sha256 = "a6acac3fee318a804b439de54acbc7c27f0b44cfdad8551bbc9cd45986abc201"; }; propagatedBuildInputs = [ Menlo ]; meta = { - homepage = https://github.com/miyagawa/cpanminus; + homepage = "https://github.com/miyagawa/cpanminus"; description = "Legacy internal and client support for Menlo"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11486,7 +11532,7 @@ let pname = "Meta-Builder"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.004.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Meta-Builder-0.004.tar.gz"; sha256 = "acb499aa7206eb9db21eb85357a74521bfe3bdae4a6416d50a7c75b939cf56fe"; }; buildInputs = [ FennecLite TestException ]; @@ -11500,7 +11546,7 @@ let pname = "Method-Signatures-Simple"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHESA/Method-Signatures-Simple-1.07.tar.gz; + url = "mirror://cpan/authors/id/R/RH/RHESA/Method-Signatures-Simple-1.07.tar.gz"; sha256 = "1p6sf6iyyn73pc89mfr65bzxvbw1ibcsp4j10iv8ik3p353pvkf8"; }; propagatedBuildInputs = [ DevelDeclare ]; @@ -11538,7 +11584,7 @@ let pname = "MIME-Charset"; version = "1.012.2"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEZUMI/MIME-Charset-1.012.2.tar.gz"; sha256 = "878c779c0256c591666bd06c0cde4c0d7820eeeb98fd1183082aee9a1e7b1d13"; }; meta = { @@ -11551,7 +11597,7 @@ let pname = "mime-construct"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROSCH/mime-construct-1.11.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROSCH/mime-construct-1.11.tar.gz"; sha256 = "00wk9950i9q6qwp1vdq9xdddgk54lqd0bhcq2hnijh8xnmhvpmsc"; }; outputs = [ "out" ]; @@ -11578,7 +11624,7 @@ let pname = "MIME-Lite"; version = "3.031"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.031.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MIME-Lite-3.031.tar.gz"; sha256 = "f1235866482b67f00858b3edaa4ff4cf909ef900f1d15d889948bf9c03a591e0"; }; propagatedBuildInputs = [ EmailDateFormat ]; @@ -11592,7 +11638,7 @@ let pname = "MIME-Lite-HTML"; version = "1.24"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALIAN/MIME-Lite-HTML-1.24.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALIAN/MIME-Lite-HTML-1.24.tar.gz"; sha256 = "db603ccbf6653bcd28cfa824d72e511ead019fc8afb9f1854ec872db2d3cd8da"; }; doCheck = false; @@ -11607,7 +11653,7 @@ let pname = "MIME-tools"; version = "5.509"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSKOLL/MIME-tools-5.509.tar.gz"; sha256 = "0wv9rzx5j1wjm01c3dg48qk9wlbm6iyf91j536idk09xj869ymv4"; }; propagatedBuildInputs = [ MailTools ]; @@ -11622,7 +11668,7 @@ let pname = "MIME-Types"; version = "2.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.17.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/MIME-Types-2.17.tar.gz"; sha256 = "1xlg7q6h8zyb8534sy0iqn90py18kilg419q6051bwqz5zadfkp0"; }; meta = { @@ -11635,12 +11681,12 @@ let pname = "Mixin-Linewise"; version = "0.108"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.108.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Mixin-Linewise-0.108.tar.gz"; sha256 = "7df20678474c0973930a472b0c55e3f8e85b7790b68ab18ef618f9c453c8aef2"; }; propagatedBuildInputs = [ PerlIOutf8_strict SubExporter ]; meta = { - homepage = https://github.com/rjbs/mixin-linewise; + homepage = "https://github.com/rjbs/mixin-linewise"; description = "Write your linewise code for handles; this does the rest"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11650,7 +11696,7 @@ let pname = "MLDBM"; version = "2.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/MLDBM-2.05.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/MLDBM-2.05.tar.gz"; sha256 = "586880ed0c20801abbf6734747e13e0203edefece6ebc4f20ddb5059f02a17a2"; }; meta = { @@ -11665,7 +11711,7 @@ let pname = "Mo"; version = "0.40"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/Mo-0.40.tar.gz"; sha256 = "1fff81awg9agfawf3wxx0gpf6vgav8w920rmxsbjg30z75943lli"; }; meta = { @@ -11679,7 +11725,7 @@ let pname = "Mock-Config"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Mock-Config-0.03.tar.gz"; sha256 = "06q0xkg5cwdwafzmb9rkaa305ddv7vli9gpm6n9jnkyaaxbk9f55"; }; meta = { @@ -11693,11 +11739,11 @@ let version = "1.20190727"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Modern-Perl-1.20190727.tar.gz"; sha256 = "2e69d7ab7e4a53153e686c25547ad914e7464d4e5604b8851931a6e63fc51b21"; }; meta = { - homepage = https://github.com/chromatic/Modern-Perl; + homepage = "https://github.com/chromatic/Modern-Perl"; description = "Enable all of the features of Modern Perl with one import"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11707,7 +11753,7 @@ let pname = "Module-Build"; version = "0.4231"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-0.4231.tar.gz"; sha256 = "05xpn8qg814y49vrih16zfr9iiwb7pmdf57ahjnc2h0p5illq3vy"; }; meta = { @@ -11720,7 +11766,7 @@ let pname = "Module-Build-Deprecated"; version = "0.4210"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Deprecated-0.4210.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Deprecated-0.4210.tar.gz"; sha256 = "be089313fc238ee2183473aca8c86b55fb3cf44797312cbe9b892d6362621703"; }; doCheck = false; @@ -11734,12 +11780,12 @@ let pname = "Module-Build-Pluggable"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-0.10.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-0.10.tar.gz"; sha256 = "e5bb2acb117792c984628812acb0fec376cb970caee8ede57535e04d762b0e40"; }; propagatedBuildInputs = [ ClassAccessorLite ClassMethodModifiers DataOptList ]; meta = { - homepage = https://github.com/tokuhirom/Module-Build-Pluggable; + homepage = "https://github.com/tokuhirom/Module-Build-Pluggable"; description = "Module::Build meets plugins"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11750,7 +11796,7 @@ let pname = "Module-Build-Pluggable-PPPort"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-PPPort-0.04.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Module-Build-Pluggable-PPPort-0.04.tar.gz"; sha256 = "44084ba3d8815f343bd391585ac5d8339a4807ce5c0dd84c98db8f310b64c0ea"; }; buildInputs = [ TestRequires TestSharedFork ]; @@ -11765,7 +11811,7 @@ let pname = "Module-Build-Tiny"; version = "0.039"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Module-Build-Tiny-0.039.tar.gz"; sha256 = "7d580ff6ace0cbe555bf36b86dc8ea232581530cbeaaea09bccb57b55797f11c"; }; buildInputs = [ FileShareDir ]; @@ -11780,7 +11826,7 @@ let pname = "Module-Build-WithXSpp"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Module-Build-WithXSpp-0.14.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Module-Build-WithXSpp-0.14.tar.gz"; sha256 = "0d39fjg9c0n820bk3fb50vvlwhdny4hdl69xmlyzql5xzp4cicsk"; }; propagatedBuildInputs = [ ExtUtilsCppGuess ExtUtilsXSpp ]; @@ -11790,7 +11836,7 @@ let pname = "Module-Build-XSUtil"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/H/HI/HIDEAKIO/Module-Build-XSUtil-0.19.tar.gz; + url = "mirror://cpan/authors/id/H/HI/HIDEAKIO/Module-Build-XSUtil-0.19.tar.gz"; sha256 = "004ly9xxjlsbrr2vhxsa1n84z3034gxrzr7z0wl45szd8v1v6qwh"; }; buildInputs = [ CaptureTiny CwdGuard FileCopyRecursiveReduced ]; @@ -11802,11 +11848,26 @@ let }; }; + ModuleCompile = buildPerlPackage rec { + pname = "Module-Compile"; + version = "0.37"; + src = fetchurl { + url = "mirror://cpan/authors/id/I/IN/INGY/${pname}-${version}.tar.gz"; + sha256 = "18e6c4c4d2d5e39c21dde60a64424eed547e1d234ecc73a35278ea08161a8078"; + }; + propagatedBuildInputs = [ CaptureTiny DigestSHA1 ]; + meta = { + homepage = "https://github.com/ingydotnet/module-compile-pm"; + description = "Perl Module Compilation"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ModuleCPANTSAnalyse = buildPerlPackage { pname = "Module-CPANTS-Analyse"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Module-CPANTS-Analyse-1.01.tar.gz"; sha256 = "0jf83v9ylw7s9i2zv0l1v11gafp3k4389asc52r6s6q5s2j0p6dx"; }; propagatedBuildInputs = [ ArchiveAnyLite ArrayDiff CPANDistnameInfo DataBinary FileFindObject PerlPrereqScannerNotQuiteLite SoftwareLicense ]; @@ -11814,7 +11875,7 @@ let meta = { description = "Generate Kwalitee ratings for a distribution"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - homepage = https://cpants.cpanauthors.org; + homepage = "https://cpants.cpanauthors.org"; }; }; @@ -11822,7 +11883,7 @@ let pname = "Module-CPANfile"; version = "1.1004"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1004.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Module-CPANfile-1.1004.tar.gz"; sha256 = "08a9a5mybf0llwlfvk7n0q7az6lrrzgzwc3432mcwbb4k8pbxvw8"; }; meta = { @@ -11837,7 +11898,7 @@ let pname = "Module-ExtractUse"; version = "0.343"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.343.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOMM/Module-ExtractUse-0.343.tar.gz"; sha256 = "00hcggwnqk953s4zbvkcabd5mfidg60hawlqsw6146in91dlclj8"; }; propagatedBuildInputs = [ ParseRecDescent PodStrip ]; @@ -11852,7 +11913,7 @@ let pname = "Module-Find"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.15.tar.gz; + url = "mirror://cpan/authors/id/C/CR/CRENZ/Module-Find-0.15.tar.gz"; sha256 = "0pm8v398rv4sy7sn7zzfbq4szxw6p1q4963ancsi17iyzskq4m2w"; }; meta = { @@ -11865,7 +11926,7 @@ let pname = "Module-Implementation"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Module-Implementation-0.09.tar.gz"; sha256 = "0vfngw4dbryihqhi7g9ks360hyw8wnpy3hpkzyg0q4y2y091lpy1"; }; buildInputs = [ TestFatal TestRequires ]; @@ -11880,7 +11941,7 @@ let pname = "Module-Info"; version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz"; sha256 = "0j143hqxgdkdpj5qssppq72gjr0n73c4f7is6wgrrcchjx905a4f"; }; buildInputs = [ TestPod TestPodCoverage ]; @@ -11895,7 +11956,7 @@ let pname = "Module-Install"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.19.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Install-1.19.tar.gz"; sha256 = "06q12cm97yh4p7qbm0a2p96996ii6ss59qy57z0f7f9svy6sflqs"; }; propagatedBuildInputs = [ FileRemove ModuleBuild ModuleScanDeps YAMLTiny ]; @@ -11909,7 +11970,7 @@ let pname = "Module-Install-AuthorRequires"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Module-Install-AuthorRequires-0.02.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Module-Install-AuthorRequires-0.02.tar.gz"; sha256 = "1v2ciw75dj5y8lh10d1vrhwmjx266gpqavr8m21jlpblgm9j2qyc"; }; propagatedBuildInputs = [ ModuleInstall ]; @@ -11923,7 +11984,7 @@ let pname = "Module-Install-AuthorTests"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Module-Install-AuthorTests-0.002.tar.gz"; sha256 = "121dyggy38316xss06v1zkwx4b59gl7b00c5q99xyzimwqnp49a0"; }; propagatedBuildInputs = [ ModuleInstall ]; @@ -11937,7 +11998,7 @@ let pname = "Module-Manifest"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Manifest-1.09.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Manifest-1.09.tar.gz"; sha256 = "a395f80ff15ea0e66fd6c453844b6787ed4a875a3cd8df9f7e29280250bd539b"; }; buildInputs = [ TestException TestWarn ]; @@ -11952,12 +12013,12 @@ let pname = "Module-Path"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.19.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Module-Path-0.19.tar.gz"; sha256 = "b33179ce4dd73dfcde7d46808804b9ffbb11db0245fe455a7d001747562feaca"; }; buildInputs = [ DevelFindPerl ]; meta = { - homepage = https://github.com/neilbowers/Module-Path; + homepage = "https://github.com/neilbowers/Module-Path"; description = "Get the full path to a locally installed module"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11967,7 +12028,7 @@ let pname = "Module-Pluggable"; version = "5.2"; src = fetchurl { - url = mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz; + url = "mirror://cpan/authors/id/S/SI/SIMONW/Module-Pluggable-5.2.tar.gz"; sha256 = "b3f2ad45e4fd10b3fb90d912d78d8b795ab295480db56dc64e86b9fa75c5a6df"; }; patches = [ @@ -11985,7 +12046,7 @@ let pname = "Module-Pluggable-Fast"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Module-Pluggable-Fast-0.19.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Module-Pluggable-Fast-0.19.tar.gz"; sha256 = "0pq758wlasmh77xyd2xh75m5b2x14s8pnsv63g5356gib1q5gj08"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; @@ -11995,7 +12056,7 @@ let pname = "Module-Refresh"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Module-Refresh-0.17.tar.gz"; sha256 = "6b30a6ceddc6512ab4490c16372ecf309a259f2ca147d622e478ac54e08511c3"; }; buildInputs = [ PathClass ]; @@ -12009,7 +12070,7 @@ let pname = "Module-Runtime"; version = "0.016"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz"; sha256 = "097hy2czwkxlppri32m599ph0xfvfsbf0a5y23a4fdc38v32wc38"; }; meta = { @@ -12022,12 +12083,12 @@ let pname = "Module-Runtime-Conflicts"; version = "0.003"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Module-Runtime-Conflicts-0.003.tar.gz"; sha256 = "707cdc75038c70fe91779b888ac050f128565d3967ba96680e1b1c7cc9733875"; }; propagatedBuildInputs = [ DistCheckConflicts ]; meta = { - homepage = https://github.com/karenetheridge/Module-Runtime-Conflicts; + homepage = "https://github.com/karenetheridge/Module-Runtime-Conflicts"; description = "Provide information on conflicts for Module::Runtime"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12037,7 +12098,7 @@ let pname = "Module-ScanDeps"; version = "1.27"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.27.tar.gz; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.27.tar.gz"; sha256 = "0j6r9r99x5p0i6fv06i44wpsvjxj32amjkiqf6pmqpj80jff2k7f"; }; buildInputs = [ TestRequires ]; @@ -12051,7 +12112,7 @@ let pname = "Module-Signature"; version = "0.83"; src = fetchurl { - url = mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.83.tar.gz; + url = "mirror://cpan/authors/id/A/AU/AUDREYT/Module-Signature-0.83.tar.gz"; sha256 = "3c15f3845a85d2a76a81253be53cb0f716465a3f696eb9c50e92eef34e9601cb"; }; buildInputs = [ IPCRun ]; @@ -12065,7 +12126,7 @@ let pname = "Module-Util"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTLAW/Module-Util-1.09.tar.gz"; sha256 = "6cfbcb6a45064446ec8aa0ee1a7dddc420b54469303344187aef84d2c7f3e2c6"; }; meta = { @@ -12078,7 +12139,7 @@ let pname = "Module-Versions"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THW/Module-Versions-0.02.zip; + url = "mirror://cpan/authors/id/T/TH/THW/Module-Versions-0.02.zip"; sha256 = "0g7qs6vqg91xpwg1cdy91m3kh9m1zbkzyz1qsy453b572xdscf0d"; }; buildInputs = [ pkgs.unzip ]; @@ -12088,7 +12149,7 @@ let pname = "Module-Versions-Report"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JESSE/Module-Versions-Report-1.06.tar.gz"; sha256 = "a3261d0d84b17678d8c4fd55eb0f892f5144d81ca53ea9a38d75d1a00ad9796a"; }; meta = { @@ -12101,7 +12162,7 @@ let pname = "Mojo-DOM58"; version = "2.000"; src = fetchurl { - url = mirror://cpan/authors/id/D/DB/DBOOK/Mojo-DOM58-2.000.tar.gz; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-DOM58-2.000.tar.gz"; sha256 = "1wsy0j6jpd06gc1ay6isyzqh5cdc834g5w0amslqcjgvf4snlk46"; }; meta = { @@ -12115,7 +12176,7 @@ let pname = "mod_perl"; version = "2.0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/mod_perl-2.0.11.tar.gz"; sha256 = "0x3gq4nz96y202cymgrf56n8spm7bffkd1p74dh9q3zrrlc9wana"; }; makeMakerFlags = "MP_AP_DESTDIR=$out"; @@ -12131,11 +12192,11 @@ let pname = "Mojolicious"; version = "8.32"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.32.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.32.tar.gz"; sha256 = "11fyz534syihisl8498655bqq4y8c73a6xhvl1wlq4axdgkm0d2h"; }; meta = { - homepage = https://mojolicious.org; + homepage = "https://mojolicious.org"; description = "Real-time web framework"; license = stdenv.lib.licenses.artistic2; maintainers = [ maintainers.thoughtpolice ]; @@ -12162,7 +12223,7 @@ let pname = "Mojolicious-Plugin-OpenAPI"; version = "2.21"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.21.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHTHORSEN/Mojolicious-Plugin-OpenAPI-2.21.tar.gz"; sha256 = "34b1f42d846c26d8be3a3556dc5a02dd7ab47c5612b41d3caf1ce6bc16101dc2"; }; propagatedBuildInputs = [ JSONValidator ]; @@ -12178,12 +12239,12 @@ let pname = "Mojolicious-Plugin-Status"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.01.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-Plugin-Status-1.01.tar.gz"; sha256 = "08hvwg395sibjjkwc9fg31ngpmzf7z0467p6b0il355xqbwjpdf6"; }; propagatedBuildInputs = [ BSDResource IPCShareLite Mojolicious Sereal ]; meta = { - homepage = https://github.com/mojolicious/mojo-status; + homepage = "https://github.com/mojolicious/mojo-status"; description = "Mojolicious server status plugin"; license = with stdenv.lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; @@ -12210,7 +12271,7 @@ let pname = "Mojo-SQLite"; version = "3.003"; src = fetchurl { - url = mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.003.tar.gz; + url = "mirror://cpan/authors/id/D/DB/DBOOK/Mojo-SQLite-3.003.tar.gz"; sha256 = "d96c00dcf45e2becc8e8181df074853d42616f2a660703455d0e0a2741478092"; }; buildInputs = [ ModuleBuildTiny ]; @@ -12227,7 +12288,7 @@ let pname = "Mojo-mysql"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/T/TE/TEKKI/Mojo-mysql-1.18.tar.gz; + url = "mirror://cpan/authors/id/T/TE/TEKKI/Mojo-mysql-1.18.tar.gz"; sha256 = "cc023f068f1ed158b5788758ea175aabe646b06d2f86049552bd7307457396bd"; }; propagatedBuildInputs = [ DBDmysql Mojolicious SQLAbstract ]; @@ -12243,7 +12304,7 @@ let pname = "Mojo-IOLoop-ForkCall"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.20.tar.gz; + url = "mirror://cpan/authors/id/J/JB/JBERGER/Mojo-IOLoop-ForkCall-0.20.tar.gz"; sha256 = "2b9962244c25a71e4757356fb3e1237cf869e26d1c27215115ba7b057a81f1a6"; }; propagatedBuildInputs = [ IOPipely Mojolicious ]; @@ -12291,7 +12352,7 @@ let pname = "Monitoring-Plugin"; version = "0.40"; src = fetchurl { - url = mirror://cpan/authors/id/N/NI/NIERLEIN/Monitoring-Plugin-0.40.tar.gz; + url = "mirror://cpan/authors/id/N/NI/NIERLEIN/Monitoring-Plugin-0.40.tar.gz"; sha256 = "0vr3wwdn3zs246qwi04bqk8jir6l88j5m59jk97hmfyj4xz6pfpq"; }; propagatedBuildInputs = [ ClassAccessor ConfigTiny MathCalcUnits ParamsValidate ]; @@ -12308,7 +12369,7 @@ let pname = "IO-Pipely"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.005.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCAPUTO/IO-Pipely-0.005.tar.gz"; sha256 = "e33b6cf5cb2b46ee308513f51e623987a50a89901e81bf19701dce35179f2e74"; }; meta = { @@ -12321,7 +12382,7 @@ let pname = "Moo"; version = "2.003006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Moo-2.003006.tar.gz"; sha256 = "bcb2092ab18a45005b5e2e84465ebf3a4999d8e82a43a09f5a94d859ae7f2472"; }; buildInputs = [ TestFatal ]; @@ -12336,7 +12397,7 @@ let pname = "Moose"; version = "2.2012"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2012.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-2.2012.tar.gz"; sha256 = "46bbe47a9d16379c355b3a263214eb69bf0edca6a0ef75499a012236f5153569"; }; buildInputs = [ CPANMetaCheck TestCleanNamespaces TestFatal TestRequires ]; @@ -12345,7 +12406,7 @@ let export LD=$CC ''; meta = { - homepage = http://moose.perl.org/; + homepage = "http://moose.perl.org/"; description = "A postmodern object system for Perl 5"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.eelco ]; @@ -12356,7 +12417,7 @@ let pname = "MooX-HandlesVia"; version = "0.001008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATTP/MooX-HandlesVia-0.001008.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATTP/MooX-HandlesVia-0.001008.tar.gz"; sha256 = "b0946f23b3537763b8a96b8a83afcdaa64fce4b45235e98064845729acccfe8c"; }; buildInputs = [ MooXTypesMooseLike TestException TestFatal ]; @@ -12371,7 +12432,7 @@ let pname = "MooX-Locale-Passthrough"; version = "0.001"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-Passthrough-0.001.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-Passthrough-0.001.tar.gz"; sha256 = "04h5xhqdvydd4xk9ckb6a79chn0ygf915ix55vg1snmba9z841bs"; }; propagatedBuildInputs = [ Moo ]; @@ -12385,7 +12446,7 @@ let pname = "MooX-Locale-TextDomain-OO"; version = "0.001"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-TextDomain-OO-0.001.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Locale-TextDomain-OO-0.001.tar.gz"; sha256 = "0g8pwj45ccqrzvs9cqyhw29nm68vai1vj46ad39rajnqzp7m53jv"; }; propagatedBuildInputs = [ LocaleTextDomainOO MooXLocalePassthrough ]; @@ -12399,7 +12460,7 @@ let pname = "MooX-Options"; version = "4.103"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Options-4.103.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Options-4.103.tar.gz"; sha256 = "0v9j0wxx4f6z6lrmdqf2k084b2c2f2jbvh86pwib0vgjz1sdbyad"; }; propagatedBuildInputs = [ GetoptLongDescriptive MROCompat MooXLocalePassthrough PathClass UnicodeLineBreak strictures ]; @@ -12415,7 +12476,7 @@ let pname = "MooX-Singleton"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/A/AJ/AJGB/MooX-Singleton-1.20.tar.gz; + url = "mirror://cpan/authors/id/A/AJ/AJGB/MooX-Singleton-1.20.tar.gz"; sha256 = "03i1wfag279ldjjkwi9gvpfs8fgi05my47icq5ggi66yzxpn5mzp"; }; propagatedBuildInputs = [ RoleTiny ]; @@ -12430,7 +12491,7 @@ let pname = "MooX-StrictConstructor"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HARTZELL/MooX-StrictConstructor-0.010.tar.gz"; sha256 = "0vvjgz7xbfmf69yav7sxsxmvklqv835xvh7h47w0apxmlkm9fjgr"; }; propagatedBuildInputs = [ Moo strictures ]; @@ -12445,7 +12506,7 @@ let pname = "MooX-Types-MooseLike"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-0.29.tar.gz"; sha256 = "1d6jg9x3p7gm2r0xmbcag374a44gf5pcga2swvxhlhzakfm80dqx"; }; propagatedBuildInputs = [ ModuleRuntime ]; @@ -12456,7 +12517,7 @@ let pname = "MooX-Types-MooseLike-Numeric"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-Numeric-1.03.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MATEU/MooX-Types-MooseLike-Numeric-1.03.tar.gz"; sha256 = "16adeb617b963d010179922c2e4e8762df77c75232e17320b459868c4970c44b"; }; buildInputs = [ Moo TestFatal ]; @@ -12471,7 +12532,7 @@ let pname = "Moose-Autobox"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Moose-Autobox-0.16.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Moose-Autobox-0.16.tar.gz"; sha256 = "0mbhd0p7gf6qdhaylldl0ahq59zghs0vd5n1iqcbfkj8ryj1sh4j"; }; buildInputs = [ ModuleBuildTiny TestException ]; @@ -12486,7 +12547,7 @@ let pname = "MooseX-ABC"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/MooseX-ABC-0.06.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/MooseX-ABC-0.06.tar.gz"; sha256 = "1sky0dpi22wrymmkjmqba4k966zn7vrbpx918wn2nmg48swyrgjf"; }; buildInputs = [ TestFatal ]; @@ -12501,7 +12562,7 @@ let pname = "MooseX-Aliases"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/MooseX-Aliases-0.11.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/MooseX-Aliases-0.11.tar.gz"; sha256 = "0j07zqczjfmng3md6nkha7560i786d0cp3gdmrx49hr64jbhz1f4"; }; buildInputs = [ TestFatal ]; @@ -12512,13 +12573,13 @@ let pname = "MooseX-App-Cmd"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-App-Cmd-0.32.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-App-Cmd-0.32.tar.gz"; sha256 = "2e3bbf7283a4bee72d91d26eb204436030992bbe55cbd35ec33a546f16f973ff"; }; buildInputs = [ ModuleBuildTiny MooseXConfigFromFile TestOutput YAML ]; propagatedBuildInputs = [ AppCmd MooseXGetopt MooseXNonMoose ]; meta = { - homepage = https://github.com/moose/MooseX-App-Cmd; + homepage = "https://github.com/moose/MooseX-App-Cmd"; description = "Mashes up MooseX::Getopt and App::Cmd"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12528,12 +12589,12 @@ let pname = "MooX"; version = "0.101"; src = fetchurl { - url = mirror://cpan/authors/id/G/GE/GETTY/MooX-0.101.tar.gz; + url = "mirror://cpan/authors/id/G/GE/GETTY/MooX-0.101.tar.gz"; sha256 = "2ff91a656e78aae0aca42293829d7a7e5acb9bf22b0401635b2ab6c870de32d5"; }; propagatedBuildInputs = [ DataOptList ImportInto Moo ]; meta = { - homepage = https://github.com/Getty/p5-moox; + homepage = "https://github.com/Getty/p5-moox"; description = "Using Moo and MooX:: packages the most lazy way"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12543,7 +12604,7 @@ let pname = "MooX-Aliases"; version = "0.001006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/MooX-Aliases-0.001006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/MooX-Aliases-0.001006.tar.gz"; sha256 = "0rrqqsm8i6rckzxgzcj2p2s4cfszzddzwbcm04yjcqdcihkk2q01"; }; propagatedBuildInputs = [ Moo strictures ]; @@ -12558,7 +12619,7 @@ let pname = "MooX-Cmd"; version = "0.017"; src = fetchurl { - url = mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-0.017.tar.gz; + url = "mirror://cpan/authors/id/R/RE/REHSACK/MooX-Cmd-0.017.tar.gz"; sha256 = "1xbhmq07v9z371ygkyghva9aryhc22kwbzn5qwkp72c0ma6z4gwl"; }; propagatedBuildInputs = [ ListMoreUtils ModulePluggable Moo PackageStash ParamsUtil RegexpCommon ]; @@ -12573,7 +12634,7 @@ let pname = "MooX-late"; version = "0.016"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.016.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/MooX-late-0.016.tar.gz"; sha256 = "1fb6393e8b77c0ec1e99229bc6f5b9db362eedc172fa940b37defd9bb3415e4e"; }; buildInputs = [ TestFatal TestRequires ]; @@ -12588,7 +12649,7 @@ let pname = "MouseX-SimpleConfig"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz; + url = "mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz"; sha256 = "257f384091d33d340373a6153947039c698dc449d1ef989335644fc3d2da0069"; }; propagatedBuildInputs = [ ConfigAny MouseXConfigFromFile ]; @@ -12602,7 +12663,7 @@ let pname = "Test-UseAllModules"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-UseAllModules-0.17.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-UseAllModules-0.17.tar.gz"; sha256 = "a71f2fe8b96ab8bfc2760aa1d3135ea049a5b20dcb105457b769a1195c7a2509"; }; meta = { @@ -12615,7 +12676,7 @@ let pname = "Test-Valgrind"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/Test-Valgrind-1.19.tar.gz; + url = "mirror://cpan/authors/id/V/VP/VPIT/Test-Valgrind-1.19.tar.gz"; sha256 = "06w1c0ddmmdkhhvv9pxq2nv5i40nbqf4cssfkq38yypfbyhsff0q"; }; propagatedBuildInputs = [ EnvSanctify FileHomeDir PerlDestructLevel XMLTwig ]; @@ -12630,7 +12691,7 @@ let pname = "MouseX-Types-Path-Class"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-Types-Path-Class-0.07.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MASAKI/MouseX-Types-Path-Class-0.07.tar.gz"; sha256 = "228d4b4f3f0ed9547278691d0b7c5fe53d90874a69df709a49703c6af87c09de"; }; buildInputs = [ TestUseAllModules ]; @@ -12645,7 +12706,7 @@ let pname = "MouseX-Types"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz"; sha256 = "77288441fdadd15beeec9a0813ece8aec1542f1d8ceaaec14755b3f316fbcf8b"; }; buildInputs = [ TestException ]; @@ -12660,7 +12721,7 @@ let pname = "MouseX-ConfigFromFile"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-ConfigFromFile-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MASAKI/MouseX-ConfigFromFile-0.05.tar.gz"; sha256 = "921b31cb13fc1f982a602f8e23815b7add23a224257e43790e287504ce879534"; }; buildInputs = [ TestUseAllModules ]; @@ -12675,13 +12736,13 @@ let pname = "MouseX-Getopt"; version = "0.38"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.38.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Getopt-0.38.tar.gz"; sha256 = "de3ea8ef452dd9501ea8c4eda8744b7224602602b04692607edd7d62b79f038f"; }; buildInputs = [ ModuleBuildTiny MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; meta = { - homepage = https://github.com/gfx/mousex-getopt; + homepage = "https://github.com/gfx/mousex-getopt"; description = "A Mouse role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12691,7 +12752,7 @@ let pname = "MooseX-Attribute-Chained"; version = "1.0.3"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOMHUKINS/MooseX-Attribute-Chained-1.0.3.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOMHUKINS/MooseX-Attribute-Chained-1.0.3.tar.gz"; sha256 = "0kjydmkxh8hpkbbmsgd5wrkhgq7w69lgfg6lx4s5g2xpqfkqmqz7"; }; propagatedBuildInputs = [ Moose ]; @@ -12701,7 +12762,7 @@ let pname = "MooseX-AttributeHelpers"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-AttributeHelpers-0.25.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-AttributeHelpers-0.25.tar.gz"; sha256 = "b0c819ec83999b258b248f82059fa5975a0cee365423abbee0efaca5401c5ec6"; }; buildInputs = [ ModuleBuildTiny TestException ]; @@ -12716,7 +12777,7 @@ let pname = "MooseX-Clone"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Clone-0.06.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Clone-0.06.tar.gz"; sha256 = "19wd74dihybnz1lbbsqn0clwxzb6y0aa0i25a8zhajz7p5fq5myb"; }; propagatedBuildInputs = [ DataVisitor HashUtilFieldHashCompat namespaceautoclean ]; @@ -12727,13 +12788,13 @@ let pname = "MooseX-ConfigFromFile"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.14.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-ConfigFromFile-0.14.tar.gz"; sha256 = "9ad343cd9f86d714be9b54b9c68a443d8acc6501b6ad6b15e9ca0130b2e96f08"; }; buildInputs = [ ModuleBuildTiny TestDeep TestFatal TestRequires TestWithoutModule ]; propagatedBuildInputs = [ MooseXTypesPathTiny ]; meta = { - homepage = https://github.com/moose/MooseX-ConfigFromFile; + homepage = "https://github.com/moose/MooseX-ConfigFromFile"; description = "An abstract Moose role for setting attributes from a configfile"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12743,13 +12804,13 @@ let pname = "MooseX-Daemonize"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Daemonize-0.22.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Daemonize-0.22.tar.gz"; sha256 = "8a7fb999dca9b802a85136a10141b2d3378a3ecde0527c1df73d55edb28e59b3"; }; buildInputs = [ DevelCheckOS ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ MooseXGetopt MooseXTypesPathClass ]; meta = { - homepage = https://github.com/moose/MooseX-Daemonize; + homepage = "https://github.com/moose/MooseX-Daemonize"; description = "Role for daemonizing your Moose based application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12759,7 +12820,7 @@ let pname = "MooseX-Emulate-Class-Accessor-Fast"; version = "0.009032"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/MooseX-Emulate-Class-Accessor-Fast-0.009032.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/MooseX-Emulate-Class-Accessor-Fast-0.009032.tar.gz"; sha256 = "153r30nggcyyx7ai15dbnba2h5145f8jdsh6wj54298d3zpvgvl2"; }; buildInputs = [ TestException ]; @@ -12774,13 +12835,13 @@ let pname = "MooseX-Getopt"; version = "0.74"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.74.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Getopt-0.74.tar.gz"; sha256 = "1de0df3b431ebe9f3563bdf4569eacd7e07e865a8397f2a990d0cb57d4cb2c24"; }; buildInputs = [ ModuleBuildTiny MooseXStrictConstructor PathTiny TestDeep TestFatal TestNeeds TestTrap TestWarnings ]; propagatedBuildInputs = [ GetoptLongDescriptive MooseXRoleParameterized ]; meta = { - homepage = https://github.com/moose/MooseX-Getopt; + homepage = "https://github.com/moose/MooseX-Getopt"; description = "A Moose role for processing command line options"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12790,13 +12851,13 @@ let pname = "MooseX-Has-Options"; version = "0.003"; src = fetchurl { - url = mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz; + url = "mirror://cpan/authors/id/P/PS/PSHANGOV/MooseX-Has-Options-0.003.tar.gz"; sha256 = "07c21cf8ed500b272020ff8da19f194728bb414e0012a2f0cc54ef2ef6222a68"; }; buildInputs = [ Moose TestDeep TestDifferences TestException TestMost TestWarn namespaceautoclean ]; propagatedBuildInputs = [ ClassLoad ListMoreUtils StringRewritePrefix ]; meta = { - homepage = https://github.com/pshangov/moosex-has-options; + homepage = "https://github.com/pshangov/moosex-has-options"; description = "Succinct options for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12806,13 +12867,13 @@ let pname = "MooseX-Has-Sugar"; version = "1.000006"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-1.000006.tar.gz; + url = "mirror://cpan/authors/id/K/KE/KENTNL/MooseX-Has-Sugar-1.000006.tar.gz"; sha256 = "efeed3ddb3a8ea18f416d485f3c2b0427145d267e63368c651d488eaa8c28d09"; }; buildInputs = [ TestFatal namespaceclean ]; propagatedBuildInputs = [ SubExporterProgressive ]; meta = { - homepage = https://github.com/kentfredric/MooseX-Has-Sugar; + homepage = "https://github.com/kentfredric/MooseX-Has-Sugar"; description = "Sugar Syntax for moose 'has' fields"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12822,7 +12883,7 @@ let pname = "MooseX-LazyRequire"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.11.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-LazyRequire-0.11.tar.gz"; sha256 = "ef620c1e019daf9cf3f23a943d25a94c91e93ab312bcd63be2e9740ec0b94288"; }; buildInputs = [ ModuleBuildTiny TestFatal ]; @@ -12838,7 +12899,7 @@ let pname = "MooseX-MarkAsMethods"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSRCHBOY/MooseX-MarkAsMethods-0.15.tar.gz; + url = "mirror://cpan/authors/id/R/RS/RSRCHBOY/MooseX-MarkAsMethods-0.15.tar.gz"; sha256 = "1y3yxwcjjajm66pvca54cv9fax7a6dy36xqr92x7vzyhfqrw3v69"; }; propagatedBuildInputs = [ Moose namespaceautoclean ]; @@ -12852,13 +12913,13 @@ let pname = "MooseX-MethodAttributes"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.31.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-MethodAttributes-0.31.tar.gz"; sha256 = "1whd10w7bm3dwaj7gpgw40bci9vvb2zmxs4349ifji91hvinwqck"; }; buildInputs = [ MooseXRoleParameterized TestFatal TestRequires ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { - homepage = https://github.com/karenetheridge/moosex-methodattributes; + homepage = "https://github.com/karenetheridge/moosex-methodattributes"; description = "Code attribute introspection"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12868,7 +12929,7 @@ let pname = "MooseX-NonMoose"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/MooseX-NonMoose-0.26.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/MooseX-NonMoose-0.26.tar.gz"; sha256 = "0zdaiphc45s5xj0ax5mkijf5d8v6w6yccb3zplgj6f30y7n55gnb"; }; buildInputs = [ TestFatal ]; @@ -12883,12 +12944,12 @@ let pname = "MooseX-OneArgNew"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-OneArgNew-0.005.tar.gz"; sha256 = "0gqhqdkwsnxmni0xv43iplplgp6g55khdwc5117j9i569r3wykvy"; }; propagatedBuildInputs = [ MooseXRoleParameterized ]; meta = { - homepage = https://github.com/rjbs/moosex-oneargnew; + homepage = "https://github.com/rjbs/moosex-oneargnew"; description = "Teach ->new to accept single, non-hashref arguments"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12898,7 +12959,7 @@ let pname = "MooseX-RelatedClassRoles"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/H/HD/HDP/MooseX-RelatedClassRoles-0.004.tar.gz; + url = "mirror://cpan/authors/id/H/HD/HDP/MooseX-RelatedClassRoles-0.004.tar.gz"; sha256 = "17vynkf6m5d039qkr4in1c9lflr8hnwp1fgzdwhj4q6jglipmnrh"; }; propagatedBuildInputs = [ MooseXRoleParameterized ]; @@ -12908,7 +12969,7 @@ let pname = "MooseX-Params-Validate"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.21.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Params-Validate-0.21.tar.gz"; sha256 = "1n9ry6gnskkp9ir6s7d5jirn3mh14ydgpmwqz6wcp6d9md358ac8"; }; buildInputs = [ TestFatal ]; @@ -12923,7 +12984,7 @@ let pname = "MooseX-Role-Parameterized"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.11.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-Parameterized-1.11.tar.gz"; sha256 = "17pc5dly7ba0p50p2xcmp7bar8m262jcqgbkgyswl3kzbmn7dzhw"; }; buildInputs = [ CPANMetaCheck ModuleBuildTiny TestFatal TestNeeds ]; @@ -12939,7 +13000,7 @@ let pname = "MooseX-Role-WithOverloading"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.17.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.17.tar.gz"; sha256 = "0rb8k0dp1a55bm2pr6r0vsi5msvjl1dslfidxp1gj80j7zbrbc4j"; }; propagatedBuildInputs = [ Moose aliased namespaceautoclean ]; @@ -12953,13 +13014,13 @@ let pname = "MooseX-Runnable"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Runnable-0.10.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Runnable-0.10.tar.gz"; sha256 = "40d8fd1b5524ae965965a1f144d7a0a0c850594c524402b2319b24d5c4af1199"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 TestTableDriven ]; propagatedBuildInputs = [ ListSomeUtils MooseXTypesPathTiny ]; meta = { - homepage = https://github.com/moose/MooseX-Runnable; + homepage = "https://github.com/moose/MooseX-Runnable"; description = "Tag a class as a runnable application"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -12969,7 +13030,7 @@ let pname = "MooseX-SemiAffordanceAccessor"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-0.10.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-SemiAffordanceAccessor-0.10.tar.gz"; sha256 = "1mdil9ckgmgr78z59p8wfa35ixn5855ndzx14y01dvfxpiv5gf55"; }; propagatedBuildInputs = [ Moose ]; @@ -12979,7 +13040,7 @@ let pname = "MooseX-SetOnce"; version = "0.200002"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-SetOnce-0.200002.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-SetOnce-0.200002.tar.gz"; sha256 = "0ndnl8dj7nh8lvckl6r3jw31d0dmq30qf2pqkgcz0lykzjvhdvfb"; }; buildInputs = [ TestFatal ]; @@ -12990,7 +13051,7 @@ let pname = "MooseX-Singleton"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Singleton-0.30.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Singleton-0.30.tar.gz"; sha256 = "0hb5s1chsgbx2nlb0f112mdh2v1zwww8f4i3gvfvcghx3grv5135"; }; buildInputs = [ ModuleBuildTiny TestFatal TestRequires TestWarnings ]; @@ -13001,7 +13062,7 @@ let pname = "MooseX-StrictConstructor"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.21.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-StrictConstructor-0.21.tar.gz"; sha256 = "c72a5ae9583706ccdec71d401dcb3054013a7536b750df1436613d858ea2920d"; }; buildInputs = [ Moo TestFatal TestNeeds ]; @@ -13016,13 +13077,13 @@ let pname = "MooseX-Traits"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Traits-0.13.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Traits-0.13.tar.gz"; sha256 = "74afe0c4faf4e3b97c57f289437caa60becca34cd5821f489dd4cc9da4fbe29a"; }; buildInputs = [ ModuleBuildTiny MooseXRoleParameterized TestFatal TestRequires TestSimple13 ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { - homepage = https://github.com/moose/MooseX-Traits; + homepage = "https://github.com/moose/MooseX-Traits"; description = "Automatically apply roles at object creation time"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13032,7 +13093,7 @@ let pname = "MooseX-Traits-Pluggable"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/MooseX-Traits-Pluggable-0.12.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/MooseX-Traits-Pluggable-0.12.tar.gz"; sha256 = "1jjqmcidy4kdgp5yffqqwxrsab62mbhbpvnzdy1rpwnb1savg5mb"; }; buildInputs = [ TestException ]; @@ -13043,13 +13104,13 @@ let pname = "MooseX-Types"; version = "0.50"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.50.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.50.tar.gz"; sha256 = "9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08"; }; buildInputs = [ ModuleBuildTiny TestFatal TestRequires ]; propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods namespaceautoclean ]; meta = { - homepage = https://github.com/moose/MooseX-Types; + homepage = "https://github.com/moose/MooseX-Types"; description = "Organise your Moose types in libraries"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13059,13 +13120,13 @@ let pname = "MooseX-Types-Common"; version = "0.001014"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Common-0.001014.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Common-0.001014.tar.gz"; sha256 = "ef93718b6d2f240d50b5c3acb1a74b4c2a191869651470001a82be1f35d0ef0f"; }; buildInputs = [ ModuleBuildTiny TestDeep TestWarnings ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { - homepage = https://github.com/moose/MooseX-Types-Common; + homepage = "https://github.com/moose/MooseX-Types-Common"; description = "A library of commonly used type constraints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13075,13 +13136,13 @@ let pname = "MooseX-Types-DateTime"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-0.13.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-0.13.tar.gz"; sha256 = "b89fa26636f6a17eaa3868b4514340472b68bbdc2161a1d79a22a1bf5b1d39c6"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; propagatedBuildInputs = [ DateTime MooseXTypes ]; meta = { - homepage = https://github.com/moose/MooseX-Types-DateTime; + homepage = "https://github.com/moose/MooseX-Types-DateTime"; description = "DateTime related constraints and coercions for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13091,13 +13152,13 @@ let pname = "MooseX-Types-DateTime-MoreCoercions"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-DateTime-MoreCoercions-0.15.tar.gz"; sha256 = "21bb3a597719888edb6ceaa132418d5cf92ecb92a50cce37b94259a55e0e3796"; }; buildInputs = [ ModuleBuildTiny TestFatal TestSimple13 ]; propagatedBuildInputs = [ DateTimeXEasy MooseXTypesDateTime TimeDurationParse ]; meta = { - homepage = https://github.com/moose/MooseX-Types-DateTime-MoreCoercions; + homepage = "https://github.com/moose/MooseX-Types-DateTime-MoreCoercions"; description = "Extensions to MooseX::Types::DateTime"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13107,13 +13168,13 @@ let pname = "MooseX-Types-LoadableClass"; version = "0.015"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.015.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-LoadableClass-0.015.tar.gz"; sha256 = "e037d3778253dcf92946435715bada0e6449c0a2808fa3ff32a965064d5a3bf4"; }; buildInputs = [ ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ MooseXTypes ]; meta = { - homepage = https://github.com/moose/MooseX-Types-LoadableClass; + homepage = "https://github.com/moose/MooseX-Types-LoadableClass"; description = "ClassName type constraint with coercion to load the class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13123,7 +13184,7 @@ let pname = "MooseX-Types-Path-Class"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Class-0.09.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Class-0.09.tar.gz"; sha256 = "0zpgwzxj6d9k2lbg6v6zd1bcbzjz2h336rm816krbblq6ssvm177"; }; propagatedBuildInputs = [ MooseXTypes PathClass ]; @@ -13138,13 +13199,13 @@ let pname = "MooseX-Types-Path-Tiny"; version = "0.012"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.012.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Path-Tiny-0.012.tar.gz"; sha256 = "19eede02dd654e70f73e34cd7af0063765173bcaefeeff1bdbe21318ecfd9158"; }; buildInputs = [ Filepushd ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ MooseXGetopt MooseXTypesStringlike PathTiny ]; meta = { - homepage = https://github.com/karenetheridge/moosex-types-path-tiny; + homepage = "https://github.com/karenetheridge/moosex-types-path-tiny"; description = "Path::Tiny types and coercions for Moose"; license = stdenv.lib.licenses.asl20; }; @@ -13154,7 +13215,7 @@ let pname = "MooseX-Types-Perl"; version = "0.101343"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/MooseX-Types-Perl-0.101343.tar.gz"; sha256 = "0nijy676q27bvjb8swxrb1j4lq2xq8jbqkaxs1l9q81k7jpvx17h"; }; propagatedBuildInputs = [ MooseXTypes ]; @@ -13168,12 +13229,12 @@ let pname = "MooseX-Types-Stringlike"; version = "0.003"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.003.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/MooseX-Types-Stringlike-0.003.tar.gz"; sha256 = "06fgamdiz0n7cgghb8ycjd5mcidj8w769zs2gws6z6jjbkn4kqrf"; }; propagatedBuildInputs = [ MooseXTypes ]; meta = { - homepage = https://github.com/dagolden/moosex-types-stringlike; + homepage = "https://github.com/dagolden/moosex-types-stringlike"; description = "Moose type constraints for strings or string-like objects"; license = stdenv.lib.licenses.asl20; }; @@ -13183,7 +13244,7 @@ let pname = "MooseX-Types-Structured"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.36.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-Structured-0.36.tar.gz"; sha256 = "0mrxc00sid7526c6brrnjr6288468sszic3wazij71v3z59bdka3"; }; buildInputs = [ DateTime ModuleBuildTiny MooseXTypesDateTime TestFatal TestNeeds ]; @@ -13198,13 +13259,13 @@ let pname = "MooseX-Types-URI"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.08.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-URI-0.08.tar.gz"; sha256 = "d310d20fa361fe2dff758236df87949cc7bf98e5cf3a7c79115365eccde6ccc1"; }; buildInputs = [ ModuleBuildTiny TestSimple13 ]; propagatedBuildInputs = [ MooseXTypesPathClass URIFromHash ]; meta = { - homepage = https://github.com/moose/MooseX-Types-URI; + homepage = "https://github.com/moose/MooseX-Types-URI"; description = "URI related types and coercions for Moose"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13214,7 +13275,7 @@ let pname = "Mouse"; version = "2.5.9"; src = fetchurl { - url = mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.9.tar.gz; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Mouse-v2.5.9.tar.gz"; sha256 = "0wqcnm6xl7fv9r8izc9c43kr83qsr60i7y53hkickcqhxx38vmxr"; }; buildInputs = [ DevelPPPort ModuleBuildXSUtil TestException TestFatal TestLeakTrace TestOutput TestRequires TryTiny ]; @@ -13227,7 +13288,7 @@ let pname = "MouseX-NativeTraits"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-NativeTraits-1.09.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFUJI/MouseX-NativeTraits-1.09.tar.gz"; sha256 = "0pnbchkxfz9fwa8sniyjqp0mz75b3k2fafq9r09znbbh51dbz9gq"; }; buildInputs = [ AnyMoose TestFatal ]; @@ -13242,7 +13303,7 @@ let pname = "Mozilla-CA"; version = "20180117"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABH/Mozilla-CA-20180117.tar.gz"; sha256 = "f2cc9fbe119f756313f321e0d9f1fac0859f8f154ac9d75b1a264c1afdf4e406"; }; @@ -13262,7 +13323,7 @@ let pname = "MRO-Compat"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/MRO-Compat-0.13.tar.gz"; sha256 = "1y547lr6zccf7919vx01v22zsajy528psanhg5aqschrrin3nb4a"; }; meta = { @@ -13275,7 +13336,7 @@ let pname = "MusicBrainz-DiscID"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz; + url = "mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.03.tar.gz"; sha256 = "0fjph2q3yp0aa87gckv3391s47m13wbyylj7jb7vqx7hv0pzj0jh"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -13290,7 +13351,7 @@ let pname = "WebService-MusicBrainz"; version = "1.0.5"; src = fetchurl { - url = mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.5.tar.gz; + url = "mirror://cpan/authors/id/B/BF/BFAIST/WebService-MusicBrainz-1.0.5.tar.gz"; sha256 = "16chs1l58cf000d5kalkyph3p31ci73p1rlyx98mfv10d2cq6fsj"; }; propagatedBuildInputs = [ Mojolicious ]; @@ -13331,13 +13392,13 @@ let pname = "namespace-autoclean"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.29.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/namespace-autoclean-0.29.tar.gz"; sha256 = "45ebd8e64a54a86f88d8e01ae55212967c8aa8fed57e814085def7608ac65804"; }; buildInputs = [ TestNeeds ]; propagatedBuildInputs = [ SubIdentify namespaceclean ]; meta = { - homepage = https://github.com/moose/namespace-autoclean; + homepage = "https://github.com/moose/namespace-autoclean"; description = "Keep imports out of your namespace"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13347,7 +13408,7 @@ let pname = "namespace-clean"; version = "0.27"; src = fetchurl { - url = mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz; + url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/namespace-clean-0.27.tar.gz"; sha256 = "8a10a83c3e183dc78f9e7b7aa4d09b47c11fb4e7d3a33b9a12912fd22e31af9d"; }; propagatedBuildInputs = [ BHooksEndOfScope PackageStash ]; @@ -13361,11 +13422,11 @@ let pname = "Net-Ident"; version = "1.25"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.25.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Net-Ident-1.25.tar.gz"; sha256 = "2e5bd58b01c2a66e8049a2f8d9c93e1b5f6dce53e0ee3a481ce6a6f411f2c8f8"; }; meta = { - homepage = https://github.com/toddr/Net-Ident; + homepage = "https://github.com/toddr/Net-Ident"; description = "Lookup the username on the remote end of a TCP/IP connection"; license = stdenv.lib.licenses.mit; }; @@ -13375,7 +13436,7 @@ let pname = "NetAddr-IP"; version = "4.079"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.079.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKER/NetAddr-IP-4.079.tar.gz"; sha256 = "ec5a82dfb7028bcd28bb3d569f95d87dd4166cc19867f2184ed3a59f6d6ca0e7"; }; meta = { @@ -13388,7 +13449,7 @@ let pname = "Net-Amazon-AWSSign"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/N/NA/NATON/Net-Amazon-AWSSign-0.12.tar.gz; + url = "mirror://cpan/authors/id/N/NA/NATON/Net-Amazon-AWSSign-0.12.tar.gz"; sha256 = "0gpdjz5095hd3y1xhnbv45m6q2shw0c9r7spj1jvb8hy7dmhq10x"; }; propagatedBuildInputs = [ URI ]; @@ -13401,7 +13462,7 @@ let pname = "Net-Amazon-EC2"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MALLEN/Net-Amazon-EC2-0.36.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MALLEN/Net-Amazon-EC2-0.36.tar.gz"; sha256 = "1wbjgmxjzr8mjpwj3mglan9hyh327cz27sfsir0w4rphwy93ca2f"; }; propagatedBuildInputs = [ LWPProtocolHttps Moose ParamsValidate XMLSimple ]; @@ -13416,7 +13477,7 @@ let pname = "Net-Amazon-MechanicalTurk"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MT/MTURK/Net-Amazon-MechanicalTurk-1.02.tar.gz; + url = "mirror://cpan/authors/id/M/MT/MTURK/Net-Amazon-MechanicalTurk-1.02.tar.gz"; sha256 = "13hgggfchhp4m3l2rn3d1v6g6ccwmwf9xiyc9izv5570930mw2cd"; }; patches = @@ -13429,7 +13490,7 @@ let pname = "Net-Amazon-S3"; version = "0.87"; src = fetchurl { - url = mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.87.tar.gz; + url = "mirror://cpan/authors/id/L/LL/LLAP/Net-Amazon-S3-0.87.tar.gz"; sha256 = "77d803477a0c635f311f538e163c5f10e471882c5153398012c93f4284376b8f"; }; buildInputs = [ TestDeep TestException TestLoadAllModules TestMockTime TestWarnings ]; @@ -13444,7 +13505,7 @@ let pname = "Net-Amazon-S3-Policy"; version = "0.1.6"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.6.tar.gz; + url = "mirror://cpan/authors/id/P/PO/POLETTIX/Net-Amazon-S3-Policy-0.1.6.tar.gz"; sha256 = "056rhq6vsdpwi2grbmxj8341qjrz0258civpnhs78j37129nxcfj"; }; propagatedBuildInputs = [ JSON ]; @@ -13458,7 +13519,7 @@ let pname = "Net-Async-Ping"; version = "0.004001"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Net-Async-Ping-0.004001.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABRAXXA/Net-Async-Ping-0.004001.tar.gz"; sha256 = "0nz9i9fp7wp620f4i9z8fip1zhcaz34ckhd00ymksw8cfr8fhmwh"; }; propagatedBuildInputs = [ IOAsync Moo NetFrameLayerIPv6 namespaceclean ]; @@ -13474,7 +13535,7 @@ let pname = "Net-AMQP"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz"; sha256 = "0b2ba7de2cd7ddd5fe102a2e2ae7aeba21eaab1078bf3bfd3c5a722937256380"; }; doCheck = false; # failures on 32bit @@ -13490,7 +13551,7 @@ let pname = "Net-CIDR"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.20.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRSAM/Net-CIDR-0.20.tar.gz"; sha256 = "c75edc6818bb360d71c139169fd64ad65c35fff6d2b9fac7b9f9e6c467f187b5"; }; meta = { @@ -13504,7 +13565,7 @@ let pname = "Net-CIDR-Lite"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOUGW/Net-CIDR-Lite-0.21.tar.gz"; sha256 = "cfa125e8a2aef9259bc3a44e07cbdfb7894b64d22e7c0cee92aee2f5c7915093"; }; meta = { @@ -13516,13 +13577,13 @@ let pname = "Net-CoverArtArchive"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/C/CY/CYCLES/Net-CoverArtArchive-1.02.tar.gz; + url = "mirror://cpan/authors/id/C/CY/CYCLES/Net-CoverArtArchive-1.02.tar.gz"; sha256 = "1lfx8lrjgb3s11fcm243jp5sghngd9svkgmg7xmssmj34q4f49ap"; }; buildInputs = [ FileFindRule ]; propagatedBuildInputs = [ JSONAny LWP Moose namespaceautoclean ]; meta = { - homepage = https://github.com/metabrainz/CoverArtArchive; + homepage = "https://github.com/metabrainz/CoverArtArchive"; description = "Query the coverartarchive.org"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13532,14 +13593,14 @@ let pname = "Net-DBus"; version = "1.2.0"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANBERR/Net-DBus-1.2.0.tar.gz"; sha256 = "e7a1ac9ef4a1235b3fdbd5888f86c347182306467bd79abc9b0756a64b441cbc"; }; nativeBuildInputs = [ pkgs.buildPackages.pkgconfig ]; buildInputs = [ pkgs.dbus TestPod TestPodCoverage ]; propagatedBuildInputs = [ XMLTwig ]; meta = { - homepage = http://www.freedesktop.org/wiki/Software/dbus; + homepage = "http://www.freedesktop.org/wiki/Software/dbus"; description = "Extension for the DBus bindings"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13549,7 +13610,7 @@ let pname = "Net-DNS"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.21.tar.gz; + url = "mirror://cpan/authors/id/N/NL/NLNETLABS/Net-DNS-1.21.tar.gz"; sha256 = "ddefe13b28084ffcc8f10a96b3c13c59449dbf6fc371c006d129630ea0ce767a"; }; propagatedBuildInputs = [ DigestHMAC ]; @@ -13564,7 +13625,7 @@ let pname = "Net-DNS-Resolver-Mock"; version = "1.20171219"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz; + url = "mirror://cpan/authors/id/M/MB/MBRADSHAW/Net-DNS-Resolver-Mock-1.20171219.tar.gz"; sha256 = "0m3rxpkv1b9121srvbqkrgzg4m8mnydiydqv34in1i1ixwrl6jn9"; }; propagatedBuildInputs = [ NetDNS ]; @@ -13578,7 +13639,7 @@ let pname = "Net-Domain-TLD"; version = "1.75"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXP/Net-Domain-TLD-1.75.tar.gz"; sha256 = "4c37f811184d68ac4179d48c10ea31922dd5fca2c1bffcdcd95c5a2a3b4002ee"; }; meta = { @@ -13591,7 +13652,7 @@ let pname = "Net-FastCGI"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHANSEN/Net-FastCGI-0.14.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHANSEN/Net-FastCGI-0.14.tar.gz"; sha256 = "0sjrnlzci21sci5m52zz0x9bf889j67i6vnhrjlypsfm9w5914qi"; }; buildInputs = [ TestException TestHexString ]; @@ -13605,7 +13666,7 @@ let pname = "Net-Frame"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/G/GO/GOMOR/Net-Frame-1.21.tar.gz; + url = "mirror://cpan/authors/id/G/GO/GOMOR/Net-Frame-1.21.tar.gz"; sha256 = "0ffphcw52dgn07k7q02di77zq2zzc0p3vlv2gnphr7v3ifi5gcxw"; }; propagatedBuildInputs = [ BitVector ClassGomor NetIPv6Addr ]; @@ -13620,7 +13681,7 @@ let pname = "Net-Frame-Layer-IPv6"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/G/GO/GOMOR/Net-Frame-Layer-IPv6-1.08.tar.gz; + url = "mirror://cpan/authors/id/G/GO/GOMOR/Net-Frame-Layer-IPv6-1.08.tar.gz"; sha256 = "1mzp778jmjn23990gj0mibhr9mrwmaw85nh7wf25hzzkx0mqabds"; }; propagatedBuildInputs = [ NetFrame ]; @@ -13634,13 +13695,13 @@ let pname = "Net-HTTP"; version = "6.19"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.19.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/Net-HTTP-6.19.tar.gz"; sha256 = "52b76ec13959522cae64d965f15da3d99dcb445eddd85d2ce4e4f4df385b2fc4"; }; propagatedBuildInputs = [ URI ]; __darwinAllowLocalNetworking = true; meta = { - homepage = https://github.com/libwww-perl/Net-HTTP; + homepage = "https://github.com/libwww-perl/Net-HTTP"; description = "Low-level HTTP connection (client)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -13651,7 +13712,7 @@ let pname = "Net-IDN-Encode"; version = "2.500"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.500.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFAERBER/Net-IDN-Encode-2.500.tar.gz"; sha256 = "1aiy7adirk3wpwlczd8sldi9k1dray0jrg1lbcrcw97zwcrkciam"; }; buildInputs = [ TestNoWarnings ]; @@ -13665,7 +13726,7 @@ let pname = "Net-IMAP-Client"; version = "0.9505"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GANGLION/Net-IMAP-Client-0.9505.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GANGLION/Net-IMAP-Client-0.9505.tar.gz"; sha256 = "d3f6a608b85e09a8080a67a9933837aae6f2cd0e8ee39df3380123dc5e3de912"; }; propagatedBuildInputs = [ IOSocketSSL ListMoreUtils ]; @@ -13678,7 +13739,7 @@ let pname = "Net-IP"; version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANU/Net-IP-1.26.tar.gz"; sha256 = "0ffn2xqqbkfi7v303sp5dwgbv36jah3vg8r4nxhxfiv60vric3q4"; }; meta = { @@ -13690,7 +13751,7 @@ let pname = "Net-IPv4Addr"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-0.10.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FRAJULAC/Net-IPv4Addr-0.10.tar.gz"; sha256 = "1zk3591822dg187sgkwjjvg18qmvkn3yib1c34mq8z5i617xwi9q"; }; meta = { @@ -13701,7 +13762,7 @@ let pname = "Net-IPv6Addr"; version = "0.96"; src = fetchurl { - url = mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-0.96.tar.gz; + url = "mirror://cpan/authors/id/B/BK/BKB/Net-IPv6Addr-0.96.tar.gz"; sha256 = "1y6dpv3gafvjcw9c5ldxminykz6aggwqdj6l93h9w2hncz8fa0iv"; }; propagatedBuildInputs = [ MathBase85 MathBigInt NetIPv4Addr ]; @@ -13715,7 +13776,7 @@ let pname = "Net-Netmask"; version = "1.9104"; src = fetchurl { - url = mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-1.9104.tar.gz; + url = "mirror://cpan/authors/id/J/JM/JMASLAK/Net-Netmask-1.9104.tar.gz"; sha256 = "17li2svymz49az35xl6galp4b9qcnb985gzklhikkvkn9da6rz3y"; }; buildInputs = [ Test2Suite TestUseAllModules ]; @@ -13728,7 +13789,7 @@ let pname = "Net-OAuth"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz; + url = "mirror://cpan/authors/id/K/KG/KGRENNAN/Net-OAuth-0.28.tar.gz"; sha256 = "0k4h4a5048h7qgyx25ih64x0l4airx8a6d9gjq08wmxcl2fk3z3v"; }; buildInputs = [ TestWarn ]; @@ -13743,7 +13804,7 @@ let pname = "Net-Patricia"; version = "1.22"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRUBER/Net-Patricia-1.22.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRUBER/Net-Patricia-1.22.tar.gz"; sha256 = "70835a926e1c5a8d0324c72fffee82eeb7ec6c141dee04fd446820b64f71c552"; }; propagatedBuildInputs = [ NetCIDRLite Socket6 ]; @@ -13753,7 +13814,7 @@ let pname = "Net-Ping"; version = "2.72"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.72.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Net-Ping-2.72.tar.gz"; sha256 = "555af602f54229cd81fef7da1a81516800f3155c6dc4d07dc71be1de3253dd6a"; }; meta = { @@ -13765,7 +13826,7 @@ let pname = "Net-DNS-Resolver-Programmable"; version = "0.009"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-0.009.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BIGPRESH/Net-DNS-Resolver-Programmable-0.009.tar.gz"; sha256 = "8080a2ab776629585911af1179bdb7c4dc2bebfd4b5efd77b11d1dac62454bf8"; }; propagatedBuildInputs = [ NetDNS ]; @@ -13779,7 +13840,7 @@ let pname = "Net-Prometheus"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Net-Prometheus-0.07.tar.gz"; sha256 = "1dh498b26wdaip053hw52317jjmb2n2r5209a1zv5yfrlxpblqm7"; }; propagatedBuildInputs = [ RefUtil StructDumb ]; @@ -13794,7 +13855,7 @@ let pname = "Net-SCP"; version = "0.08.reprise"; src = fetchurl { - url = mirror://cpan/authors/id/I/IV/IVAN/Net-SCP-0.08.reprise.tar.gz; + url = "mirror://cpan/authors/id/I/IV/IVAN/Net-SCP-0.08.reprise.tar.gz"; sha256 = "88a9b2df69e769e5855a408b19f61915b82e8fe070ab5cf4d525dd3b8bbe31c1"; }; propagatedBuildInputs = [ pkgs.openssl ]; @@ -13812,7 +13873,7 @@ let pname = "Net-Server"; version = "2.009"; src = fetchurl { - url = mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz; + url = "mirror://cpan/authors/id/R/RH/RHANDOM/Net-Server-2.009.tar.gz"; sha256 = "0gw1k9gcw7habbkxvsfa2gz34brlbwcidk6khgsf1qjm0dbccrw2"; }; doCheck = false; # seems to hang waiting for connections @@ -13825,7 +13886,7 @@ let pname = "Net-SFTP-Foreign"; version = "1.90"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.90.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-SFTP-Foreign-1.90.tar.gz"; sha256 = "d1eafb34f669ab6de675058292778ba2e0e42ecafd59abb1128ba31d62a0419d"; }; propagatedBuildInputs = [ pkgs.openssl ]; @@ -13842,7 +13903,7 @@ let pname = "Net-Server-Coro"; version = "1.3"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Net-Server-Coro-1.3.tar.gz"; sha256 = "11pvfxsi0q37kd17z597wb8r9dv3r96fiagq57kc746k1lmp06hy"; }; propagatedBuildInputs = [ Coro NetServer ]; @@ -13856,7 +13917,7 @@ let pname = "Net-SMTP-SSL"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.04.tar.gz"; sha256 = "001a6dcfahf7kkyirqkc8jd4fh4fkal7n7vm9c4dblqrvmdc8abv"; }; propagatedBuildInputs = [ IOSocketSSL ]; @@ -13866,7 +13927,7 @@ let pname = "Net-SMTP-TLS"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz; + url = "mirror://cpan/authors/id/A/AW/AWESTHOLM/Net-SMTP-TLS-0.12.tar.gz"; sha256 = "19g48kabj22v66jbf69q78xplhi7r1y2kdbddfwh4xy3g9k75rzg"; }; propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; @@ -13876,7 +13937,7 @@ let pname = "Net-SMTP-TLS-ButMaintained"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz; + url = "mirror://cpan/authors/id/F/FA/FAYLAND/Net-SMTP-TLS-ButMaintained-0.24.tar.gz"; sha256 = "0vi5cv7f9i96hgp3q3jpxzn1ysn802kh5xc304f8b7apf67w15bb"; }; propagatedBuildInputs = [ DigestHMAC IOSocketSSL ]; @@ -13911,7 +13972,7 @@ let pname = "Net-SSH"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/I/IV/IVAN/Net-SSH-0.09.tar.gz; + url = "mirror://cpan/authors/id/I/IV/IVAN/Net-SSH-0.09.tar.gz"; sha256 = "7c71c7c3cbe953234dfe25bcc1ad7edb0e1f5a0578601f5523bc6070262a3817"; }; propagatedBuildInputs = [ pkgs.openssl ]; @@ -13928,7 +13989,7 @@ let pname = "Net-SSH-Perl"; version = "2.14"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz"; sha256 = "2b5d1bb13590b5870116704e7f1dce9a9823c4f80ff5461b97bb26a317393017"; }; propagatedBuildInputs = [ CryptCurve25519 CryptIDEA CryptX FileHomeDir MathGMP StringCRC32 ]; @@ -13943,7 +14004,7 @@ let pname = "Net-SSLeay"; version = "1.88"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.88.tar.gz"; sha256 = "1pfgh4h3szcpvqlcimc60pjbk9zwls99x5863sva0wc47i4dl010"; }; buildInputs = [ pkgs.openssl ]; @@ -13965,7 +14026,7 @@ let pname = "Net-Statsd"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/COSIMO/Net-Statsd-0.12.tar.gz; + url = "mirror://cpan/authors/id/C/CO/COSIMO/Net-Statsd-0.12.tar.gz"; sha256 = "63e453603da165bc6d1c4ca0b55eda3d2204f040c59304a47782c5aa7886565c"; }; meta = { @@ -13978,7 +14039,7 @@ let pname = "Net-Telnet"; version = "3.04"; src = fetchurl { - url = mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.04.tar.gz; + url = "mirror://cpan/authors/id/J/JR/JROGERS/Net-Telnet-3.04.tar.gz"; sha256 = "e64d567a4e16295ecba949368e7a6b8b5ae2a16b3ad682121d9b007dc5d2a37a"; }; meta = { @@ -13991,14 +14052,14 @@ let pname = "Net-Twitter-Lite"; version = "0.12008"; src = fetchurl { - url = mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.12008.tar.gz; + url = "mirror://cpan/authors/id/M/MM/MMIMS/Net-Twitter-Lite-0.12008.tar.gz"; sha256 = "13j69a6nqq8mh5b4qk021db55rkfnk1ppwk0rpg68b1z58gvxsmj"; }; buildInputs = [ ModuleBuildTiny TestFatal ]; propagatedBuildInputs = [ JSON LWPProtocolHttps ]; doCheck = false; meta = { - homepage = https://github.com/semifor/Net-Twitter-Lite; + homepage = "https://github.com/semifor/Net-Twitter-Lite"; description = "A perl interface to the Twitter API"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14008,7 +14069,7 @@ let pname = "Net-Whois-IP"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz; + url = "mirror://cpan/authors/id/B/BS/BSCHMITZ/Net-Whois-IP-1.19.tar.gz"; sha256 = "08kj2h9qiyfvv3jfz619xl796j93cslg7d96919mnrnjy6hdz6zh"; }; doCheck = false; @@ -14024,7 +14085,7 @@ let pname = "Net-Works"; version = "0.22"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAXMIND/Net-Works-0.22.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAXMIND/Net-Works-0.22.tar.gz"; sha256 = "1zz91vn1kdxljnlwllf4dzdsm4v6pja5694vf8l4w66azcyv5j8a"; }; propagatedBuildInputs = [ ListAllUtils MathInt128 Moo namespaceautoclean ]; @@ -14039,7 +14100,7 @@ let pname = "Number-Bytes-Human"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Number-Bytes-Human-0.11.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Number-Bytes-Human-0.11.tar.gz"; sha256 = "0b3gprpbcrdwc2gqalpys5m2ngilh5injhww8y0gf3dln14rrisz"; }; }; @@ -14048,7 +14109,7 @@ let pname = "Number-Compare"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Number-Compare-0.03.tar.gz"; sha256 = "09q8i0mxvr7q9vajwlgawsi0hlpc119gnhq4hc933d03x0vkfac3"; }; }; @@ -14057,7 +14118,7 @@ let pname = "Number-Format"; version = "1.75"; src = fetchurl { - url = mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz; + url = "mirror://cpan/authors/id/W/WR/WRW/Number-Format-1.75.tar.gz"; sha256 = "82d659cb16461764fd44d11a9ce9e6a4f5e8767dc1069eb03467c6e55de257f3"; }; meta = { @@ -14070,7 +14131,7 @@ let pname = "Number-Fraction"; version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-2.01.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVECROSS/Number-Fraction-2.01.tar.gz"; sha256 = "1ysv5md4dmz95zc0gy8ivb21nhqxyv8vrc5lr2sgshsjrdqsi185"; }; propagatedBuildInputs = [ Moose ]; @@ -14084,7 +14145,7 @@ let pname = "Number-Misc"; version = "1.2"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/Number-Misc-1.2.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/Number-Misc-1.2.tar.gz"; sha256 = "1n4ivj4ydplanwbxn3jbsfyfcl91ngn2d0addzqrq1hac26bdfbp"; }; meta = { @@ -14097,7 +14158,7 @@ let pname = "Number-WithError"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Number-WithError-1.01.tar.gz"; sha256 = "0m7my372rcj2d3j8xvhqdlhnnvxqabasvpvvhdkyli3qgrra1xnz"; }; propagatedBuildInputs = [ ParamsUtil prefork ]; @@ -14112,7 +14173,7 @@ let pname = "NTLM"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz; + url = "mirror://cpan/authors/id/N/NB/NBEBOUT/NTLM-1.09.tar.gz"; sha256 = "c823e30cda76bc15636e584302c960e2b5eeef9517c2448f7454498893151f85"; }; propagatedBuildInputs = [ DigestHMAC ]; @@ -14126,7 +14187,7 @@ let pname = "Object-Accessor"; version = "0.48"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Object-Accessor-0.48.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Object-Accessor-0.48.tar.gz"; sha256 = "76cb824a27b6b4e560409fcf6fd5b3bfbbd38b72f1f3d37ed0b54bd9c0baeade"; }; meta = { @@ -14139,7 +14200,7 @@ let pname = "Object-InsideOut"; version = "4.05"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.05.tar.gz; + url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/Object-InsideOut-4.05.tar.gz"; sha256 = "1i6aif37ji91nsyncp5d0d3q29clf009sxdn1rz38917hai6rzcx"; }; propagatedBuildInputs = [ ExceptionClass ]; @@ -14153,7 +14214,7 @@ let pname = "Object-Signature"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Object-Signature-1.08.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Object-Signature-1.08.tar.gz"; sha256 = "12k90c19ly93ib1p6sm3k7sbnr2h5dbywkdmnff2ngm99p4m68c4"; }; meta = { @@ -14166,7 +14227,7 @@ let pname = "OLE-Storage_Lite"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.20.tar.gz; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/OLE-Storage_Lite-0.20.tar.gz"; sha256 = "1fpqhhgb8blj4hhs97fsbnbhk29s9yms057a9s9yl20f3hbsc65b"; }; meta = { @@ -14179,7 +14240,7 @@ let pname = "Opcodes"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Opcodes-0.14.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Opcodes-0.14.tar.gz"; sha256 = "7f7365447e4d1c5b87b43091448f0488e67c9f036b26c022a5409cd73d343893"; }; meta = { @@ -14208,7 +14269,7 @@ let pname = "OpenGL"; version = "0.70"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHM/OpenGL-0.70.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHM/OpenGL-0.70.tar.gz"; sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"; }; @@ -14233,7 +14294,7 @@ let pname = "Net-OpenID-Common"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Common-1.20.tar.gz; + url = "mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Common-1.20.tar.gz"; sha256 = "1jdbkp18ka2m4akjp9b0dbw2lqnzgwpq435cnh6hwwa79bbrfkmb"; }; propagatedBuildInputs = [ CryptDHGMP XMLSimple ]; @@ -14243,7 +14304,7 @@ let pname = "Net-OpenID-Consumer"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Consumer-1.18.tar.gz; + url = "mirror://cpan/authors/id/W/WR/WROG/Net-OpenID-Consumer-1.18.tar.gz"; sha256 = "0f2g6sczvbpyjmy14pabmrj0d48hlsndqswrvmqk1161wxpkh70f"; }; propagatedBuildInputs = [ JSON NetOpenIDCommon ]; @@ -14254,7 +14315,7 @@ let pname = "Net-OpenSSH"; version = "0.78"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.78.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.78.tar.gz"; sha256 = "8f10844542a2824389decdb8edec7561d8199dc5f0250e849a0bb56f7aee880c"; }; meta = { @@ -14267,7 +14328,7 @@ let pname = "Net-ZooKeeper"; version = "0.41"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAF/Net-ZooKeeper-0.41.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAF/Net-ZooKeeper-0.41.tar.gz"; sha256 = "91c177f30f82302eaf3173356eef05c21bc82163df752acb469177bd14a72db9"; }; buildInputs = [ pkgs.zookeeper_mt ]; @@ -14277,7 +14338,7 @@ let NIX_CFLAGS_LINK = "-L${pkgs.zookeeper_mt.out}/lib -lzookeeper_mt"; meta = { maintainers = [ maintainers.limeytexan ]; - homepage = https://github.com/mark-5/p5-net-zookeeper; + homepage = "https://github.com/mark-5/p5-net-zookeeper"; license = stdenv.lib.licenses.asl20; }; }; @@ -14286,7 +14347,7 @@ let pname = "Package-Constants"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.06.tar.gz"; sha256 = "0b58be78706ccc4e4bd9bbad41767470427fd7b2cfad749489de101f85bc5df5"; }; meta = { @@ -14299,7 +14360,7 @@ let pname = "Package-DeprecationManager"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Package-DeprecationManager-0.17.tar.gz"; sha256 = "1d743ada482b5c9871d894966e87d4c20edc96931bb949fb2638b000ddd6684b"; }; buildInputs = [ TestFatal TestWarnings ]; @@ -14314,7 +14375,7 @@ let pname = "PatchReader"; version = "0.9.6"; src = fetchurl { - url = mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz; + url = "mirror://cpan/authors/id/T/TM/TMANNERM/PatchReader-0.9.6.tar.gz"; sha256 = "b8de37460347bb5474dc01916ccb31dd2fe0cd92242c4a32d730e8eb087c323c"; }; meta = { @@ -14327,7 +14388,7 @@ let pname = "Package-Stash"; version = "0.38"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-0.38.tar.gz"; sha256 = "c58ee8844df2dda38e3bf66fdf443439aaefaef1a33940edf2055f0afd223a7f"; }; buildInputs = [ TestFatal TestRequires ]; @@ -14342,7 +14403,7 @@ let pname = "Package-Stash-XS"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Package-Stash-XS-0.29.tar.gz"; sha256 = "1akqk10qxwk798qppajqbczwmhy4cs9g0lg961m3vq218slnnryk"; }; buildInputs = [ TestFatal TestRequires ]; @@ -14356,13 +14417,13 @@ let pname = "Pango"; version = "1.227"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAOC/Pango-1.227.tar.gz"; sha256 = "0wdcidnfnb6nm79fzfs39ivawj3x8m98a147fmcxgv1zvwia9c1l"; }; buildInputs = [ pkgs.pango ]; propagatedBuildInputs = [ Cairo Glib ]; meta = { - homepage = http://gtk2-perl.sourceforge.net/; + homepage = "http://gtk2-perl.sourceforge.net/"; description = "Layout and render international text"; license = stdenv.lib.licenses.lgpl21Plus; }; @@ -14372,12 +14433,12 @@ let pname = "Parallel-ForkManager"; version = "2.02"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-2.02.tar.gz; + url = "mirror://cpan/authors/id/Y/YA/YANICK/Parallel-ForkManager-2.02.tar.gz"; sha256 = "c1b2970a8bb666c3de7caac4a8f4dbcc043ab819bbc337692ec7bf27adae4404"; }; buildInputs = [ TestWarn ]; meta = { - homepage = https://github.com/dluxhu/perl-parallel-forkmanager; + homepage = "https://github.com/dluxhu/perl-parallel-forkmanager"; description = "A simple parallel processing fork manager"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14388,7 +14449,7 @@ let pname = "Parallel-Prefork"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Parallel-Prefork-0.18.tar.gz"; sha256 = "f1c1f48f1ae147a58bc88f9cb2f570d6bb15ea4c0d589abd4c3084ddc961596e"; }; buildInputs = [ TestRequires TestSharedFork ]; @@ -14403,7 +14464,7 @@ let pname = "Params-Classify"; version = "0.015"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Params-Classify-0.015.tar.gz"; sha256 = "052r198xyrsv8wz21gijdigz2cgnidsa37nvyfzdiz4rv1fc33ir"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -14413,7 +14474,7 @@ let pname = "Params-Util"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz; + url = "mirror://cpan/authors/id/A/AD/ADAMK/Params-Util-1.07.tar.gz"; sha256 = "0v67sx93yhn7xa0nh9mnbf8mixf54czk6wzrjsp6dzzr5hzyrw9h"; }; meta = { @@ -14426,7 +14487,7 @@ let pname = "Params-Validate"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-Validate-1.29.tar.gz"; sha256 = "49a68dfb430bea028042479111d19068e08095e5a467e320b7ab7bde3d729733"; }; buildInputs = [ TestFatal TestRequires ]; @@ -14442,7 +14503,7 @@ let pname = "Params-ValidationCompiler"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Params-ValidationCompiler-0.30.tar.gz"; sha256 = "1jqn1l4m4i341g14kmjsf3a1kn7vv6z89cix0xjjgr1v70iywnyw"; }; propagatedBuildInputs = [ EvalClosure ExceptionClass ]; @@ -14457,7 +14518,7 @@ let pname = "Paranoid"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/Paranoid-2.07.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Paranoid/Paranoid-2.07.tar.gz"; sha256 = "b55cfd8c6d5f181e218efd012f711a50cd14e4dbc8804650b95477178f43b7fc"; }; patches = [ ../development/perl-modules/Paranoid-blessed-path.patch ]; @@ -14477,7 +14538,7 @@ let pname = "PAR-Dist"; version = "0.49"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz; + url = "mirror://cpan/authors/id/R/RS/RSCHUPP/PAR-Dist-0.49.tar.gz"; sha256 = "078ycyn8pw3rba4k3qwcqrqfcym5c1pivymwa0bvs9sab45j4iwy"; }; meta = { @@ -14489,7 +14550,7 @@ let pname = "PAUSE-Permissions"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/PAUSE-Permissions-0.17.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/PAUSE-Permissions-0.17.tar.gz"; sha256 = "021ink414w4mdk6rd54cc1f23kfqg0zk4njx4ngr0bw3wc6r4kks"; }; propagatedBuildInputs = [ FileHomeDir HTTPDate MooXOptions TimeDurationParse ]; @@ -14505,7 +14566,7 @@ let pname = "parent"; version = "0.237"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORION/parent-0.237.tar.gz"; sha256 = "1bnaadzf51g6zrpq6pvvgds2cc9d4w1vck7sapkd3hb5hmjdk28h"; }; }; @@ -14514,7 +14575,7 @@ let pname = "Parse-DebControl"; version = "2.005"; src = fetchurl { - url = mirror://cpan/authors/id/J/JA/JAYBONCI/Parse-DebControl-2.005.tar.gz; + url = "mirror://cpan/authors/id/J/JA/JAYBONCI/Parse-DebControl-2.005.tar.gz"; sha256 = "0ad78qri4sg9agghqdm83xsjgks94yvffs23kppy7mqjy8gwwjxn"; }; propagatedBuildInputs = [ IOStringy LWP ]; @@ -14527,7 +14588,7 @@ let pname = "Parse-LocalDistribution"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-LocalDistribution-0.19.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-LocalDistribution-0.19.tar.gz"; sha256 = "17p92nj4k3acrqqjnln1j5x8hbra9jkx5hdcybrq37ld9qnc62vb"; }; propagatedBuildInputs = [ ParsePMFile ]; @@ -14542,7 +14603,7 @@ let pname = "Parse-PlainConfig"; version = "3.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/Parse-PlainConfig-3.05.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORLISS/Parse-PlainConfig/Parse-PlainConfig-3.05.tar.gz"; sha256 = "6b78a8552398b0d2d7063505c93b3cfed0432c5b2cf6e00b8e51febf411c1efa"; }; propagatedBuildInputs = [ ClassEHierarchy Paranoid ]; @@ -14557,7 +14618,7 @@ let pname = "Parse-PMFile"; version = "0.42"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.42.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Parse-PMFile-0.42.tar.gz"; sha256 = "0v3k5jslbl29735hs32x9si546v55cyy6sb58aib8vmq684wgxp7"; }; buildInputs = [ ExtUtilsMakeMakerCPANfile ]; @@ -14571,7 +14632,7 @@ let pname = "Parse-RecDescent"; version = "1.967015"; src = fetchurl { - url = mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz; + url = "mirror://cpan/authors/id/J/JT/JTBRAUN/Parse-RecDescent-1.967015.tar.gz"; sha256 = "1943336a4cb54f1788a733f0827c0c55db4310d5eae15e542639c9dd85656e37"; }; meta = { @@ -14584,7 +14645,7 @@ let pname = "Parse-Syslog"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz; + url = "mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz"; sha256 = "659a2145441ef36d9835decaf83da308fcd03f49138cb3d90928e8bfc9f139d9"; }; }; @@ -14593,7 +14654,7 @@ let pname = "Parser-MGC"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.16.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Parser-MGC-0.16.tar.gz"; sha256 = "14bv2fwg59q4s3kv0vf11hh222anlm181ig87cph2f68y32n2i3l"; }; propagatedBuildInputs = [ FileSlurpTiny ]; @@ -14607,7 +14668,7 @@ let pname = "Parser-Yapp"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz; + url = "mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz"; sha256 = "1r8kbyk0qd4ficmabj753kjpq0ib0csk01169w7jxflg62cfj41q"; }; meta = { @@ -14620,7 +14681,7 @@ let pname = "Path-Class"; version = "0.37"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz; + url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/Path-Class-0.37.tar.gz"; sha256 = "1kj8q8dmd8jci94w5arav59nkp0pkxrkliz4n8n6yf02hsa82iv5"; }; meta = { @@ -14633,7 +14694,7 @@ let pname = "Path-Iterator-Rule"; version = "1.014"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.014.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Iterator-Rule-1.014.tar.gz"; sha256 = "19mik0r5v1cmxfxm0h4lwqyj0nmq6jgnvvq96hqcjgylpvc02x1z"; }; propagatedBuildInputs = [ NumberCompare TextGlob TryTiny ]; @@ -14649,7 +14710,7 @@ let pname = "Path-Tiny"; version = "0.112"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.112.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Path-Tiny-0.112.tar.gz"; sha256 = "813df2d140c65f795daefd8eca18e61194ecac7050c5406a069db86dea31cc3a"; }; meta = { @@ -14673,7 +14734,7 @@ let substituteInPlace Cwd.pm --replace '/usr/bin/pwd' '${pkgs.coreutils}/bin/pwd' ''; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.75.tar.gz; + url = "mirror://cpan/authors/id/X/XS/XSAWYERX/PathTools-3.75.tar.gz"; sha256 = "a558503aa6b1f8c727c0073339081a77888606aa701ada1ad62dd9d8c3f945a2"; }; }; @@ -14706,7 +14767,7 @@ let # tests fail; look unfinished doCheck = false; meta = { - homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-perl/; + homepage = "http://ludovic.rousseau.free.fr/softwares/pcsc-perl/"; description = "Communicate with a smart card using PC/SC"; license = stdenv.lib.licenses.gpl2Plus; maintainers = with maintainers; [ abbradar ]; @@ -14717,7 +14778,7 @@ let pname = "PDF-API2"; version = "2.036"; src = fetchurl { - url = mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.036.tar.gz; + url = "mirror://cpan/authors/id/S/SS/SSIMMS/PDF-API2-2.036.tar.gz"; sha256 = "070444e9fef8beb6f115994a6ac89533fe8ba02d5e240a35bb07adcbcb511774"; }; buildInputs = [ TestException TestMemoryCycle ]; @@ -14732,12 +14793,12 @@ let pname = "Pegex"; version = "0.74"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/Pegex-0.74.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/Pegex-0.74.tar.gz"; sha256 = "31f0889695d79a3ab79a6315a8a08baeb1268592bc6596c3feffb424d982dfdf"; }; buildInputs = [ TestPod TieIxHash ]; meta = { - homepage = https://github.com/ingydotnet/pegex-pm; + homepage = "https://github.com/ingydotnet/pegex-pm"; description = "Acmeist PEG Parser Framework"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14750,7 +14811,7 @@ let pname = "perl5lib"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/N/NO/NOBULL/perl5lib-1.02.tar.gz; + url = "mirror://cpan/authors/id/N/NO/NOBULL/perl5lib-1.02.tar.gz"; sha256 = "1b6fgs8wy2a7ff8rr1qdvdghhvlpr1pv760k4i2c8lq1hhjnkf94"; }; }; @@ -14759,7 +14820,7 @@ let pname = "Perl-osnames"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.11.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Perl-osnames-0.11.tar.gz"; sha256 = "fb22a1ed59dc2311f7f1ffca5685d90c0600020467f624f57b4dd3dba5bc659b"; }; meta = { @@ -14772,13 +14833,13 @@ let pname = "Perl-Critic"; version = "1.138"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.138.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Perl-Critic-1.138.tar.gz"; sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82"; }; buildInputs = [ TestDeep ]; propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ]; meta = { - homepage = http://perlcritic.com; + homepage = "http://perlcritic.com"; description = "Critique Perl source code for best-practices"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14788,7 +14849,7 @@ let pname = "Perl-Destruct-Level"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/R/RG/RGARCIA/Perl-Destruct-Level-0.02.tar.gz; + url = "mirror://cpan/authors/id/R/RG/RGARCIA/Perl-Destruct-Level-0.02.tar.gz"; sha256 = "0fyiysrq874ncscgdjg522fs29gvqads6ynyhwxwwq1b545srd20"; }; meta = { @@ -14799,7 +14860,7 @@ let pname = "PerlIO-eol"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.17.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/PerlIO-eol-0.17.tar.gz"; sha256 = "1fayp27vcmypqyzcd4003036h3g5zy6jk1ia25frdca58pzcpk6f"; }; }; @@ -14823,7 +14884,7 @@ let pname = "PerlIO-utf8_strict"; version = "0.007"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz"; sha256 = "83a33f2fe046cb3ad6afc80790635a423e2c7c6854afacc6998cd46951cc81cb"; }; buildInputs = [ TestException ]; @@ -14837,7 +14898,7 @@ let pname = "PerlIO-via-dynamic"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/PerlIO-via-dynamic-0.14.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/PerlIO-via-dynamic-0.14.tar.gz"; sha256 = "0jbb3xpbqzmr625blvnjszd69l3cwxzi7bhmkj5x48dgv3s7mkca"; }; }; @@ -14846,7 +14907,7 @@ let pname = "PerlIO-via-symlink"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/PerlIO-via-symlink-0.05.tar.gz"; sha256 = "0lidddcaz9anddqrpqk4zwm550igv6amdhj86i2jjdka9b1x81s1"; }; @@ -14863,7 +14924,7 @@ let pname = "PerlIO-via-Timeout"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAMS/PerlIO-via-Timeout-0.32.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAMS/PerlIO-via-Timeout-0.32.tar.gz"; sha256 = "9278f9ef668850d913d98fa4c0d7e7d667cff3503391f4a4eae73a246f2e7916"; }; buildInputs = [ ModuleBuildTiny TestSharedFork TestTCP ]; @@ -14877,13 +14938,13 @@ let pname = "perl-ldap"; version = "0.66"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.66.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARSCHAP/perl-ldap-0.66.tar.gz"; sha256 = "09263ce6166e80c98d689d41d09995b813389fd069b784601f6dc57f8e2b4102"; }; buildInputs = [ TextSoundex ]; propagatedBuildInputs = [ ConvertASN1 ]; meta = { - homepage = http://ldap.perl.org/; + homepage = "http://ldap.perl.org/"; description = "LDAP client library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; maintainers = [ maintainers.limeytexan ]; @@ -14894,7 +14955,7 @@ let pname = "PerlMagick"; version = "6.89-1"; src = fetchurl { - url = mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.89-1.tar.gz; + url = "mirror://cpan/authors/id/J/JC/JCRISTY/PerlMagick-6.89-1.tar.gz"; sha256 = "0n9afy1z5bhf9phrbahnkwhgcmijn8jggpbzwrivw1zhliliiy68"; }; buildInputs = [ pkgs.imagemagick ]; @@ -14909,7 +14970,7 @@ let pname = "Perl-Tidy"; version = "20200110"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20200110.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHANCOCK/Perl-Tidy-20200110.tar.gz"; sha256 = "c8c13ab88f42409d419993d488b8dc7cf4a02d5034d3037ca859fb93b18e8086"; }; meta = { @@ -14922,7 +14983,7 @@ let pname = "PHP-Serialization"; version = "0.34"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/PHP-Serialization-0.34.tar.gz"; sha256 = "0yphqsgg7zrar2ywk2j2fnjxmi9rq32yf0p5ln8m9fmfx4kd84mr"; }; meta = { @@ -14934,7 +14995,7 @@ let pname = "PkgConfig"; version = "0.23026"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.23026.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/PkgConfig-0.23026.tar.gz"; sha256 = "56c8ad9015af3799b99a21b8790997723406acf479f35d13fe9bf632db2d5c26"; }; meta = { @@ -14948,13 +15009,13 @@ let pname = "Plack"; version = "1.0047"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0047.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-1.0047.tar.gz"; sha256 = "322c93f5acc0a0f0e11fd4a76188f978bdc14338a9f1df3ae535227017046561"; }; buildInputs = [ AuthenSimplePasswd CGIEmulatePSGI FileShareDirInstall HTTPRequestAsCGI HTTPServerSimplePSGI IOHandleUtil LWP LWPProtocolhttp10 LogDispatchArray MIMETypes TestMockTimeHiRes TestRequires TestSharedFork TestTCP ]; propagatedBuildInputs = [ ApacheLogFormatCompiler CookieBaker DevelStackTraceAsHTML FileShareDir FilesysNotifySimple HTTPEntityParser HTTPHeadersFast HTTPMessage TryTiny ]; meta = { - homepage = https://github.com/plack/Plack; + homepage = "https://github.com/plack/Plack"; description = "Perl Superglue for Web frameworks and Web Servers (PSGI toolkit)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -14964,7 +15025,7 @@ let pname = "Plack-App-Proxy"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEDO/Plack-App-Proxy-0.29.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEDO/Plack-App-Proxy-0.29.tar.gz"; sha256 = "03x6yb6ykz1ms90jp1s0pq19yplf7wswljvhzqkr16jannfrmah4"; }; propagatedBuildInputs = [ AnyEventHTTP LWP Plack ]; @@ -14979,7 +15040,7 @@ let pname = "Plack-Middleware-Auth-Digest"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Auth-Digest-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Auth-Digest-0.05.tar.gz"; sha256 = "1sqm23kfsl3ac4060zcclc3r86x1vxzhsgvgzg6mxk9njj93zgcs"; }; propagatedBuildInputs = [ DigestHMAC Plack ]; @@ -14995,7 +15056,7 @@ let pname = "Plack-Middleware-ConsoleLogger"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ConsoleLogger-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ConsoleLogger-0.05.tar.gz"; sha256 = "1ngvhwdw9ll4cwnvf0i89ppa9pbyiwng6iba04scrqjda353lrsm"; }; propagatedBuildInputs = [ JavaScriptValueEscape Plack ]; @@ -15011,13 +15072,13 @@ let pname = "Plack-Middleware-Debug"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.17.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Debug-0.17.tar.gz"; sha256 = "a30b62f1bb94e641f7b60b5ea5335e140c553b4131ec4003b56db37f47617a26"; }; buildInputs = [ ModuleBuildTiny TestRequires ]; propagatedBuildInputs = [ ClassMethodModifiers DataDump DataDumperConcise Plack TextMicroTemplate ]; meta = { - homepage = https://github.com/miyagawa/Plack-Middleware-Debug; + homepage = "https://github.com/miyagawa/Plack-Middleware-Debug"; description = "Display information about the current request/response"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15027,7 +15088,7 @@ let pname = "Plack-Middleware-Deflater"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/Plack-Middleware-Deflater-0.12.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/Plack-Middleware-Deflater-0.12.tar.gz"; sha256 = "0xf2visi16hgwgyp9q0cjr10ikbn474hjia5mj8mb2scvbkrbni8"; }; propagatedBuildInputs = [ Plack ]; @@ -15042,12 +15103,12 @@ let pname = "Plack-Middleware-FixMissingBodyInRedirect"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-FixMissingBodyInRedirect-0.12.tar.gz; + url = "mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-FixMissingBodyInRedirect-0.12.tar.gz"; sha256 = "6c22d069f5a57ac206d4659b28b8869bb9270640bb955efddd451dcc58cdb391"; }; propagatedBuildInputs = [ HTMLParser Plack ]; meta = { - homepage = https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect; + homepage = "https://github.com/Sweet-kid/Plack-Middleware-FixMissingBodyInRedirect"; description = "Plack::Middleware which sets body for redirect response, if it's not already set"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15057,7 +15118,7 @@ let pname = "Plack-Middleware-Header"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHIBA/Plack-Middleware-Header-0.04.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHIBA/Plack-Middleware-Header-0.04.tar.gz"; sha256 = "0pjxxbnilphn38s3mmv0fmg9q2hm4z02ngp2a1lxblzjfbzvkdjy"; }; propagatedBuildInputs = [ Plack ]; @@ -15071,7 +15132,7 @@ let pname = "Plack-Middleware-MethodOverride"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-MethodOverride-0.20.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-MethodOverride-0.20.tar.gz"; sha256 = "dbfb5a2efb48bfeb01cb3ae1e1c677e155dc7bfe210c7e7f221bae3cb6aab5f1"; }; propagatedBuildInputs = [ Plack ]; @@ -15085,12 +15146,12 @@ let pname = "Plack-Middleware-RemoveRedundantBody"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.09.tar.gz; + url = "mirror://cpan/authors/id/S/SW/SWEETKID/Plack-Middleware-RemoveRedundantBody-0.09.tar.gz"; sha256 = "80d45f93d6b7290b0bd8b3cedd84a37fc501456cc3dec02ec7aad81c0018087e"; }; propagatedBuildInputs = [ Plack ]; meta = { - homepage = https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody; + homepage = "https://github.com/Sweet-kid/Plack-Middleware-RemoveRedundantBody"; description = "Plack::Middleware which sets removes body for HTTP response if it's not required"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15100,7 +15161,7 @@ let pname = "Plack-Middleware-ReverseProxy"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.16.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-ReverseProxy-0.16.tar.gz"; sha256 = "0a512n62pnk5ayj3zdzyj50iy1qi8nwh6ygks2h7nrh7gp9k2jc7"; }; propagatedBuildInputs = [ Plack ]; @@ -15114,7 +15175,7 @@ let pname = "Plack-Middleware-Session"; version = "0.33"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.33.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Plack-Middleware-Session-0.33.tar.gz"; sha256 = "1vm4a66civdzh7xvl5hy5wn1w8j1vndppwyz8ndh9n4as74s5yag"; }; propagatedBuildInputs = [ DigestHMAC Plack ]; @@ -15130,13 +15191,13 @@ let pname = "Plack-Test-ExternalServer"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Plack-Test-ExternalServer-0.02.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Plack-Test-ExternalServer-0.02.tar.gz"; sha256 = "5baf5c57fe0c06412deec9c5abe7952ab8a04f8c47b4bbd8e9e9982268903ed0"; }; buildInputs = [ Plack TestSharedFork TestTCP ]; propagatedBuildInputs = [ LWP ]; meta = { - homepage = https://github.com/perl-catalyst/Plack-Test-ExternalServer; + homepage = "https://github.com/perl-catalyst/Plack-Test-ExternalServer"; description = "Run HTTP tests on external live servers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15186,7 +15247,7 @@ let pname = "POE-Test-Loops"; version = "1.360"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCAPUTO/POE-Test-Loops-1.360.tar.gz"; sha256 = "0yx4wsljfmdzsiv0ni98x6lw975cm82ahngbwqvzv60wx5pwkl5y"; }; meta = { @@ -15200,7 +15261,7 @@ let pname = "PPI"; version = "1.270"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MITHALDU/PPI-1.270.tar.gz"; sha256 = "622a698c781bb85d2bdf7bbfe040fe70d33b79774c9ae01fce2375dc73faf457"; }; buildInputs = [ ClassInspector TestDeep TestNoWarnings TestObject TestSubCalls ]; @@ -15211,7 +15272,7 @@ let preCheck = "rm t/03_document.t"; meta = { - homepage = https://github.com/adamkennedy/PPI; + homepage = "https://github.com/adamkennedy/PPI"; description = "Parse, Analyze and Manipulate Perl (without perl)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15221,7 +15282,7 @@ let pname = "PPIx-QuoteLike"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.008.tar.gz; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-QuoteLike-0.008.tar.gz"; sha256 = "0dzlcddvfzn7s8z1jj12ghsbzf9wm5dq84361v4vx5p6j8zhsaz4"; }; propagatedBuildInputs = [ PPI ]; @@ -15235,7 +15296,7 @@ let pname = "PPIx-Regexp"; version = "0.068"; src = fetchurl { - url = mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.068.tar.gz; + url = "mirror://cpan/authors/id/W/WY/WYANT/PPIx-Regexp-0.068.tar.gz"; sha256 = "b5444b699a3c7ad79506c796559449c6f858dc62deb60e08249f96782636e5f4"; }; propagatedBuildInputs = [ ListMoreUtils PPI ]; @@ -15249,7 +15310,7 @@ let pname = "PPIx-Utilities"; version = "1.001000"; src = fetchurl { - url = mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz; + url = "mirror://cpan/authors/id/E/EL/ELLIOTJS/PPIx-Utilities-1.001000.tar.gz"; sha256 = "03a483386fd6a2c808f09778d44db06b02c3140fb24ba4bf12f851f46d3bcb9b"; }; buildInputs = [ TestDeep ]; @@ -15264,7 +15325,7 @@ let pname = "Proc-Background"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NERDVANA/Proc-Background-1.21.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NERDVANA/Proc-Background-1.21.tar.gz"; sha256 = "91b6a5aeb841b1c313498c78fad08e37d17595702dc6205b5ad38ef69949b7ee"; }; meta = { @@ -15275,7 +15336,7 @@ let pname = "Proc-ProcessTable"; version = "0.59"; src = fetchurl { - url = mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz; + url = "mirror://cpan/authors/id/J/JW/JWB/Proc-ProcessTable-0.59.tar.gz"; sha256 = "f8cc5054d78c35a0ce39fb75430b4ef402e2a99013d2ec37e7997f316594606c"; }; meta = { @@ -15288,7 +15349,7 @@ let pname = "Proc-Find"; version = "0.051"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLANCAR/Proc-Find-0.051.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLANCAR/Proc-Find-0.051.tar.gz"; sha256 = "64d39071ec94d7b66a7cab5a950246f0fff013b5a200a63d1176432987e5a135"; }; propagatedBuildInputs = [ ProcProcessTable ]; @@ -15302,7 +15363,7 @@ let pname = "Proc-SafeExec"; version = "1.5"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BILBO/Proc-SafeExec-1.5.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BILBO/Proc-SafeExec-1.5.tar.gz"; sha256 = "1b4d0908bcac563d34a7e5be61c5da3eee98e4a6c7fa68c2670cc5844b5a2d78"; }; }; @@ -15311,7 +15372,7 @@ let pname = "Proc-Simple"; version = "1.32"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHILLI/Proc-Simple-1.32.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHILLI/Proc-Simple-1.32.tar.gz"; sha256 = "4c8f0a924b19ad78a13da73fe0fb306d32a7b9d10a332c523087fc83a209a8c4"; }; meta = { @@ -15323,7 +15384,7 @@ let pname = "Proc-Wait3"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CT/CTILMES/Proc-Wait3-0.05.tar.gz; + url = "mirror://cpan/authors/id/C/CT/CTILMES/Proc-Wait3-0.05.tar.gz"; sha256 = "1a907f5db6933dc2939bbfeffe19eeae7ed39ef1b97a2bc9b723f2f25f81caf3"; }; meta = { @@ -15336,7 +15397,7 @@ let pname = "Proc-WaitStat"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROSCH/Proc-WaitStat-1.00.tar.gz"; sha256 = "1g3l8jzx06x4l4p0x7fyn4wvg6plfzl420irwwb9v447wzsn6xfh"; }; propagatedBuildInputs = [ IPCSignal ]; @@ -15346,7 +15407,7 @@ let pname = "Protocol-Redis"; version = "1.0011"; src = fetchurl { - url = mirror://cpan/authors/id/U/UN/UNDEF/Protocol-Redis-1.0011.tar.gz; + url = "mirror://cpan/authors/id/U/UN/UNDEF/Protocol-Redis-1.0011.tar.gz"; sha256 = "7ceb6bd80067c904465d4fd1f1715724388c9bdc37c6c2c003a20ce569b7f4e8"; }; meta = { @@ -15377,7 +15438,7 @@ let pname = "Protocol-WebSocket"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/V/VT/VTI/Protocol-WebSocket-0.26.tar.gz; + url = "mirror://cpan/authors/id/V/VT/VTI/Protocol-WebSocket-0.26.tar.gz"; sha256 = "08jmazvrmvp8jn15p2n3c1h3f2cbkr07xjzy197jb8x724vx0dsq"; }; buildInputs = [ ModuleBuildTiny ]; @@ -15388,7 +15449,7 @@ let version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/C/CR/CRUX/Protocol-HTTP2-1.10.tar.gz; + url = "mirror://cpan/authors/id/C/CR/CRUX/Protocol-HTTP2-1.10.tar.gz"; sha256 = "0jm6jq1wszjrrcypyi642m2i8wgni50wdnzh9dzfkyjazdc00sn2"; }; buildInputs = [ AnyEvent ModuleBuildTiny NetSSLeay TestLeakTrace TestSharedFork TestTCP ]; @@ -15398,7 +15459,7 @@ let pname = "PSGI"; version = "1.102"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/PSGI-1.102.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/PSGI-1.102.tar.gz"; sha256 = "0iqzxs8fv63510knm3zr3jr3ky4x7diwd7y24mlshzci81kl8v55"; }; }; @@ -15407,7 +15468,7 @@ let pname = "PadWalker"; version = "2.3"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.3.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROBIN/PadWalker-2.3.tar.gz"; sha256 = "2a6c44fb600861e54568e74081a8d1f121f0060076069ceab34b1ae89d6588cf"; }; }; @@ -15416,7 +15477,7 @@ let pname = "Perl6-Junction"; version = "1.60000"; src = fetchurl { - url = mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz; + url = "mirror://cpan/authors/id/C/CF/CFRANKS/Perl6-Junction-1.60000.tar.gz"; sha256 = "0r3in9pyrm6wfrhcvxbq5w1617x8x5537lxj9hdzks4pa7l7a8yh"; }; }; @@ -15425,13 +15486,13 @@ let pname = "Perl-MinimumVersion"; version = "1.38"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Perl-MinimumVersion-1.38.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Perl-MinimumVersion-1.38.tar.gz"; sha256 = "478b5824791b87fc74c94a892180682bd06ad2cdf34034b1a4b859273927802a"; }; buildInputs = [ TestScript ]; propagatedBuildInputs = [ FileFindRulePerl PerlCritic ]; meta = { - homepage = https://github.com/neilbowers/Perl-MinimumVersion; + homepage = "https://github.com/neilbowers/Perl-MinimumVersion"; description = "Find a minimum required version of perl for Perl code"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15441,12 +15502,12 @@ let pname = "Perl-PrereqScanner"; version = "1.023"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Perl-PrereqScanner-1.023.tar.gz"; sha256 = "280a1c4710390865fb9f310a861a34720b28b4cbe50609c841af5cf2d3a2bced"; }; propagatedBuildInputs = [ GetoptLongDescriptive ListMoreUtils ModulePath Moose PPI StringRewritePrefix namespaceautoclean ]; meta = { - homepage = https://github.com/rjbs/Perl-PrereqScanner; + homepage = "https://github.com/rjbs/Perl-PrereqScanner"; description = "A tool to scan your Perl code for its prerequisites"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15456,7 +15517,7 @@ let pname = "Perl-PrereqScanner-NotQuiteLite"; version = "0.9909"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9909.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Perl-PrereqScanner-NotQuiteLite-0.9909.tar.gz"; sha256 = "09sa86maxrqnxf84wa0cgkcs8p6xvpsv0x5dny3hz0300zgrqmq5"; }; propagatedBuildInputs = [ DataDump ModuleCPANfile ModuleFind RegexpTrie ]; @@ -15471,7 +15532,7 @@ let pname = "Perl-Version"; version = "1.013"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Perl-Version-1.013.tar.gz"; sha256 = "1887414d1c8689d864c840114101e043e99d7dd5b9cca69369a60e821e3ad0f7"; }; propagatedBuildInputs = [ FileSlurpTiny ]; @@ -15485,7 +15546,7 @@ let pname = "Pod-Checker"; version = "1.73"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.73.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Checker-1.73.tar.gz"; sha256 = "7dee443b03d80d0735ec50b6d1caf0209c51ab0a97d64050cfc10e1555cb9305"; }; }; @@ -15494,7 +15555,7 @@ let pname = "Pod-Coverage"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Pod-Coverage-0.23.tar.gz"; sha256 = "01xifj83dv492lxixijmg6va02rf3ydlxly0a9slmx22r6qa1drh"; }; propagatedBuildInputs = [ DevelSymdump ]; @@ -15504,12 +15565,12 @@ let pname = "Pod-Coverage-TrustPod"; version = "0.100005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Coverage-TrustPod-0.100005.tar.gz"; sha256 = "08bk6lfimr2pwi6c92xg5cw1cxmi5fqhls3yasqzpjnd4if86s3c"; }; propagatedBuildInputs = [ PodCoverage PodEventual ]; meta = { - homepage = https://github.com/rjbs/pod-coverage-trustpod; + homepage = "https://github.com/rjbs/pod-coverage-trustpod"; description = "Allow a module's pod to contain Pod::Coverage hints"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15519,13 +15580,13 @@ let pname = "Pod-Elemental"; version = "0.103005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103005.tar.gz"; sha256 = "824336ec18326e3b970e7815922b3921b0a821d2ee0e50b0c5b2bc327f99615e"; }; buildInputs = [ TestDeep TestDifferences ]; propagatedBuildInputs = [ MooseXTypes PodEventual StringRewritePrefix StringTruncate ]; meta = { - homepage = https://github.com/rjbs/Pod-Elemental; + homepage = "https://github.com/rjbs/Pod-Elemental"; description = "Work with nestable Pod elements"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15535,13 +15596,13 @@ let pname = "Pod-Elemental-PerlMunger"; version = "0.200006"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-PerlMunger-0.200006.tar.gz"; sha256 = "09fd3b5d53119437a01dced66b42eafdcd53895b3c32a2b0f781f36fda0f665b"; }; buildInputs = [ TestDifferences ]; propagatedBuildInputs = [ PPI PodElemental ]; meta = { - homepage = https://github.com/rjbs/Pod-Elemental-PerlMunger; + homepage = "https://github.com/rjbs/Pod-Elemental-PerlMunger"; description = "A thing that takes a string of Perl and rewrites its documentation"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15551,7 +15612,7 @@ let pname = "Pod-Eventual"; version = "0.094001"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Eventual-0.094001.tar.gz"; sha256 = "be9fb8910b108e5d1a66f002b659ad22576e88d779b703dff9d15122c3f80834"; }; propagatedBuildInputs = [ MixinLinewise ]; @@ -15566,7 +15627,7 @@ let pname = "Pod-Parser"; version = "1.63"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAREKR/Pod-Parser-1.63.tar.gz"; sha256 = "dbe0b56129975b2f83a02841e8e0ed47be80f060686c66ea37e529d97aa70ccd"; }; meta = { @@ -15579,12 +15640,12 @@ let pname = "Pod-POM"; version = "2.01"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Pod-POM-2.01.tar.gz"; sha256 = "1b50fba9bbdde3ead192beeba0eaddd0c614e3afb1743fa6fff805f57c56f7f4"; }; buildInputs = [ FileSlurper TestDifferences TextDiff ]; meta = { - homepage = https://github.com/neilb/Pod-POM; + homepage = "https://github.com/neilb/Pod-POM"; description = "POD Object Model"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15594,7 +15655,7 @@ let pname = "Pod-POM-View-TOC"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERLER/Pod-POM-View-TOC-0.02.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERLER/Pod-POM-View-TOC-0.02.tar.gz"; sha256 = "ccb42272c7503379cb1131394620ee50276d72844e0e80eb4b007a9d58f87623"; }; propagatedBuildInputs = [ PodPOM ]; @@ -15608,11 +15669,11 @@ let pname = "Pod-LaTeX"; version = "0.61"; src = fetchurl { - url = mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz; + url = "mirror://cpan/authors/id/T/TJ/TJENNESS/Pod-LaTeX-0.61.tar.gz"; sha256 = "15a840ea1c8a76cd3c865fbbf2fec33b03615c0daa50f9c800c54e0cf0659d46"; }; meta = { - homepage = https://github.com/timj/perl-Pod-LaTeX/tree/master; + homepage = "https://github.com/timj/perl-Pod-LaTeX/tree/master"; description = "Convert Pod data to formatted Latex"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15622,7 +15683,7 @@ let pname = "podlators"; version = "4.10"; src = fetchurl { - url = mirror://cpan/authors/id/R/RR/RRA/podlators-4.10.tar.gz; + url = "mirror://cpan/authors/id/R/RR/RRA/podlators-4.10.tar.gz"; sha256 = "008b4j41ijrfyyq5nd3y7pqyww6rg49fjg2c6kmpnqrmgs347qqp"; }; meta = { @@ -15635,12 +15696,12 @@ let pname = "podlinkcheck"; version = "15"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRYDE/podlinkcheck-15.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRYDE/podlinkcheck-15.tar.gz"; sha256 = "4e3bebec1bf82dbf850a94ae26a253644cf5806ec41afc74e43e1710a37321db"; }; propagatedBuildInputs = [ FileFindIterator FileHomeDir IPCRun constant-defer libintl_perl ]; meta = { - homepage = http://user42.tuxfamily.org/podlinkcheck/index.html; + homepage = "http://user42.tuxfamily.org/podlinkcheck/index.html"; description = "Check POD L<> link references"; license = stdenv.lib.licenses.gpl3Plus; }; @@ -15650,7 +15711,7 @@ let pname = "prefork"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/prefork-1.05.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/prefork-1.05.tar.gz"; sha256 = "01ckn45ij3nbrsc0yc4wl4z0wndn36jh6247zbycwa1vlvgvr1vd"; }; meta = { @@ -15663,7 +15724,7 @@ let pname = "Pod-Perldoc"; version = "3.28"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MALLEN/Pod-Perldoc-3.28.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MALLEN/Pod-Perldoc-3.28.tar.gz"; sha256 = "0kf6xwdha8jl0nxv60r2v7xsfnvv6i3gy135xsl40g71p02ychfc"; }; meta = { @@ -15676,7 +15737,7 @@ let pname = "Pod-Plainer"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/R/RM/RMBARKER/Pod-Plainer-1.04.tar.gz; + url = "mirror://cpan/authors/id/R/RM/RMBARKER/Pod-Plainer-1.04.tar.gz"; sha256 = "1bbfbf7d1d4871e5a83bab2137e22d089078206815190eb1d5c1260a3499456f"; }; meta = { @@ -15689,12 +15750,12 @@ let pname = "Pod-Markdown"; version = "3.200"; src = fetchurl { - url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.200.tar.gz; + url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/Pod-Markdown-3.200.tar.gz"; sha256 = "16dffpqwrdhi2s90ff2sgncrpnzqp81ydhl5pd78m725j60p2286"; }; buildInputs = [ TestDifferences ]; meta = { - homepage = https://github.com/rwstauner/Pod-Markdown; + homepage = "https://github.com/rwstauner/Pod-Markdown"; description = "Convert POD to Markdown"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15705,7 +15766,7 @@ let pname = "Pod-Markdown-Github"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MINIMAL/Pod-Markdown-Github-0.04.tar.gz"; sha256 = "04y67c50hpf1vb9cwsza3fbj4rshdqa47vi3zcj4kkjckh02yzmk"; }; propagatedBuildInputs = [ PodMarkdown ]; @@ -15720,7 +15781,7 @@ let pname = "Pod-Simple"; version = "3.40"; src = fetchurl { - url = mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.40.tar.gz; + url = "mirror://cpan/authors/id/K/KH/KHW/Pod-Simple-3.40.tar.gz"; sha256 = "0384k8k18srsdj2a2j10gbvv19lnvynq359y9kb4zn5bv2wqqfh6"; }; }; @@ -15729,7 +15790,7 @@ let pname = "Pod-Spell"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOLMEN/Pod-Spell-1.20.tar.gz"; sha256 = "6383f7bfe22bc0d839a08057a0ce780698b046184aea935be4833d94986dd03c"; }; propagatedBuildInputs = [ ClassTiny FileShareDir LinguaENInflect PathTiny ]; @@ -15740,7 +15801,7 @@ let pname = "Pod-Strip"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOMM/Pod-Strip-1.02.tar.gz"; sha256 = "1zsjfw2cjq1bd3ppl67fdvrx46vj9lina0c3cv9qgk5clzvaq3fq"; }; meta = { @@ -15753,7 +15814,7 @@ let pname = "Pod-Tidy"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHOBLITT/Pod-Tidy-0.10.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHOBLITT/Pod-Tidy-0.10.tar.gz"; sha256 = "1gcxjplgksnc5iggi8dzbkbkcryii5wjhypd7fs3kmbwx91y2vl8"; }; propagatedBuildInputs = [ EncodeNewlines IOString PodWrap TextGlob ]; @@ -15768,13 +15829,13 @@ let pname = "Pod-Weaver"; version = "4.015"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.015.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Pod-Weaver-4.015.tar.gz"; sha256 = "5af25b29a55783e495a9df5ef6293240e2c9ab02764613d79f1ed50b12dec5ae"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; propagatedBuildInputs = [ ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli PodElemental ]; meta = { - homepage = https://github.com/rjbs/Pod-Weaver; + homepage = "https://github.com/rjbs/Pod-Weaver"; description = "Weave together a Pod document from an outline"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15784,7 +15845,7 @@ let pname = "Pod-Wrap"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz; + url = "mirror://cpan/authors/id/N/NU/NUFFIN/Pod-Wrap-0.01.tar.gz"; sha256 = "0qwb5hp26f85xnb3zivf8ccfdplabiyl5sd53c6wgdgvzzicpjjh"; }; meta = { @@ -15796,7 +15857,7 @@ let pname = "Probe-Perl"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/K/KW/KWILLIAMS/Probe-Perl-0.03.tar.gz; + url = "mirror://cpan/authors/id/K/KW/KWILLIAMS/Probe-Perl-0.03.tar.gz"; sha256 = "0c9wiaz0mqqknafr4jdr0g2gdzxnn539182z0icqaqvp5qgd5r6r"; }; }; @@ -15805,13 +15866,13 @@ let pname = "POSIX-strftime-Compiler"; version = "0.42"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.42.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/POSIX-strftime-Compiler-0.42.tar.gz"; sha256 = "26582bdd78b254bcc1c56d0b770fa280e8b8f70957c84dc44572ba4cacb0ac11"; }; # We cannot change timezones on the fly. prePatch = "rm t/04_tzset.t"; meta = { - homepage = https://github.com/kazeburo/POSIX-strftime-Compiler; + homepage = "https://github.com/kazeburo/POSIX-strftime-Compiler"; description = "GNU C library compatible strftime for loggers and servers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15821,12 +15882,12 @@ let pname = "Razor2-Client-Agent"; version = "2.86"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.86.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Razor2-Client-Agent-2.86.tar.gz"; sha256 = "5e062e02ebb65e24b708e7eefa5300c43d6f657bf20d08fec4ca8a0a3b94845f"; }; propagatedBuildInputs = [ DigestSHA1 URI ]; meta = { - homepage = http://razor.sourceforge.net/; + homepage = "http://razor.sourceforge.net/"; description = "Collaborative, content-based spam filtering network agent"; license = stdenv.lib.licenses.mit; }; @@ -15837,12 +15898,12 @@ let pname = "Readonly"; version = "2.05"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SANKO/Readonly-2.05.tar.gz"; sha256 = "4b23542491af010d44a5c7c861244738acc74ababae6b8838d354dfb19462b5e"; }; buildInputs = [ ModuleBuildTiny ]; meta = { - homepage = https://github.com/sanko/readonly; + homepage = "https://github.com/sanko/readonly"; description = "Facility for creating read-only scalars, arrays, hashes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15852,7 +15913,7 @@ let pname = "Readonly-XS"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROODE/Readonly-XS-1.05.tar.gz"; sha256 = "8ae5c4e85299e5c8bddd1b196f2eea38f00709e0dc0cb60454dc9114ae3fff0d"; }; propagatedBuildInputs = [ Readonly ]; @@ -15862,13 +15923,13 @@ let pname = "Redis"; version = "1.995"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAMS/Redis-1.995.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAMS/Redis-1.995.tar.gz"; sha256 = "a0b07b284ff12bb852a3120723f1e63ab279df575d6c52a78f914565a9f0b906"; }; buildInputs = [ IOString ModuleBuildTiny TestDeep TestFatal TestSharedFork TestTCP ]; propagatedBuildInputs = [ IOSocketTimeout TryTiny ]; meta = { - homepage = https://github.com/PerlRedis/perl-redis; + homepage = "https://github.com/PerlRedis/perl-redis"; description = "Perl binding for Redis database"; license = stdenv.lib.licenses.artistic2; }; @@ -15878,7 +15939,7 @@ let pname = "Ref-Util"; version = "0.204"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARC/Ref-Util-0.204.tar.gz"; sha256 = "1q85y5lzgl8wz5qnz3j6mch2fmllr668h54wszaz6i6gp8ysfps1"; }; meta = { @@ -15891,7 +15952,7 @@ let pname = "Regexp-Assemble"; version = "0.38"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Regexp-Assemble-0.38.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Regexp-Assemble-0.38.tgz"; sha256 = "0hp4v8mghmpflq9l9fqrkjg4cw0d3ha2nrmnsnzwjwqvmvwyfsx0"; }; }; @@ -15900,7 +15961,7 @@ let pname = "Regexp-Common"; version = "2017060201"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz"; sha256 = "ee07853aee06f310e040b6bf1a0199a18d81896d3219b9b35c9630d0eb69089b"; }; meta = with stdenv.lib; { @@ -15913,7 +15974,7 @@ let pname = "Regexp-Common-net-CIDR"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Regexp-Common-net-CIDR-0.03.tar.gz"; sha256 = "39606a57aab20d4f4468300f2ec3fa2ab557fcc9cb7880ec7c6e07d80162da33"; }; propagatedBuildInputs = [ RegexpCommon ]; @@ -15926,7 +15987,7 @@ let pname = "Regexp-Grammars"; version = "1.052"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.052.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCONWAY/Regexp-Grammars-1.052.tar.gz"; sha256 = "d552e7aaec956fc9ff0c56602fc95bc5c97ef815a0a8df7f42d1128f39534a62"; }; meta = { @@ -15939,7 +16000,7 @@ let pname = "Regexp-IPv6"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Regexp-IPv6-0.03.tar.gz"; sha256 = "d542d17d75ce93631de8ba2156da0e0b58a755c409cd4a0d27a3873a26712ce2"; }; }; @@ -15948,11 +16009,11 @@ let pname = "Regexp-Parser"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.23.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Regexp-Parser-0.23.tar.gz"; sha256 = "f739dab8df2b06aae5c48f9971251b73704464a32d07d8d025f3c0f869544e89"; }; meta = { - homepage = https://github.com/toddr/Regexp-Parser; + homepage = "https://github.com/toddr/Regexp-Parser"; description = "Base class for parsing regexes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -15962,7 +16023,7 @@ let pname = "Regexp-Trie"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANKOGAI/Regexp-Trie-0.02.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANKOGAI/Regexp-Trie-0.02.tar.gz"; sha256 = "1yn5l6x3xyic9jxw9jggqsbggcv7rc8ggj4zbnlz9hfvv17gjazv"; }; meta = { @@ -15973,7 +16034,7 @@ let pname = "REST-Client"; version = "273"; src = fetchurl { - url = mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz; + url = "mirror://cpan/authors/id/K/KK/KKANE/REST-Client-273.tar.gz"; sha256 = "a8652a2214308faff2c68be5ce64c904dcccc5e86be7f32376c1590869d01844"; }; propagatedBuildInputs = [ LWPProtocolHttps ]; @@ -15987,12 +16048,12 @@ let pname = "REST-Utils"; version = "0.6"; src = fetchurl { - url = mirror://cpan/authors/id/J/JA/JALDHAR/REST-Utils-0.6.tar.gz; + url = "mirror://cpan/authors/id/J/JA/JALDHAR/REST-Utils-0.6.tar.gz"; sha256 = "1zdrf3315rp2b8r9dwwj5h93xky7i33iawf4hzszwcddhzflmsfl"; }; buildInputs = [ TestLongString TestWWWMechanize TestWWWMechanizeCGI ]; meta = { - homepage = https://jaldhar.github.io/REST-Utils/; + homepage = "https://jaldhar.github.io/REST-Utils/"; description = "Utility functions for REST applications"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16002,7 +16063,7 @@ let pname = "RPC-XML"; version = "0.80"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJRAY/RPC-XML-0.80.tar.gz"; sha256 = "1xvy9hs7bqsjnk0663kf7zk2qjg0pzv96n6z2wlc2w5bgal7q3ga"; }; propagatedBuildInputs = [ XMLParser ]; @@ -16013,7 +16074,7 @@ let pname = "Return-Value"; version = "1.666005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Return-Value-1.666005.tar.gz"; sha256 = "1b2hfmdl19zi1z3npzv9wf6dh1g0xd88i70b4233ds9icnln08lf"; }; }; @@ -16022,7 +16083,7 @@ let pname = "Role-Basic"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Role-Basic-0.13.tar.gz"; sha256 = "38a0959ef9f193ff76e72c325a9e9211bc4868689bd0e2b005778f53f8b6f36a"; }; meta = { @@ -16035,7 +16096,7 @@ let pname = "Role-HasMessage"; version = "0.006"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-HasMessage-0.006.tar.gz"; sha256 = "1lylfvarjfy6wy34dfny3032pc6r33mjby5yzzhmxybg8zhdp9pn"; }; propagatedBuildInputs = [ MooseXRoleParameterized StringErrf ]; @@ -16049,7 +16110,7 @@ let pname = "Role-Identifiable"; version = "0.007"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Role-Identifiable-0.007.tar.gz"; sha256 = "1bbkj2wqpbfdw1cbm99vg9d94rvzba19m18xhnylaym0l78lc4sn"; }; propagatedBuildInputs = [ Moose ]; @@ -16063,7 +16124,7 @@ let pname = "Role-Tiny"; version = "2.001004"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.001004.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Role-Tiny-2.001004.tar.gz"; sha256 = "92ba5712850a74102c93c942eb6e7f62f7a4f8f483734ed289d08b324c281687"; }; meta = { @@ -16090,7 +16151,7 @@ let pname = "RSS-Parser-Lite"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/T/TF/TFPBL/RSS-Parser-Lite-0.12.tar.gz; + url = "mirror://cpan/authors/id/T/TF/TFPBL/RSS-Parser-Lite-0.12.tar.gz"; sha256 = "1fcmp4qp7q3xr2mw7clqqwph45icbvgfs2n41gp9zamim2y39p49"; }; propagatedBuildInputs = [ locallib ]; @@ -16101,7 +16162,7 @@ let pname = "RT-Client-REST"; version = "0.56"; src = fetchurl { - url = mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz; + url = "mirror://cpan/authors/id/D/DJ/DJZORT/RT-Client-REST-0.56.tar.gz"; sha256 = "798baccf11eaecbb7d2d27be0b5e4fa9cb80b34cc51cab12eb7b88facf39fd4b"; }; buildInputs = [ CGI HTTPServerSimple TestException ]; @@ -16116,7 +16177,7 @@ let pname = "Safe-Isa"; version = "1.000010"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Safe-Isa-1.000010.tar.gz"; sha256 = "0sm6p1kw98s7j6n92vvxjqf818xggnmjwci34xjmw7gzl2519x47"; }; meta = { @@ -16129,7 +16190,7 @@ let pname = "Scalar-List-Utils"; version = "1.53"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.53.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Scalar-List-Utils-1.53.tar.gz"; sha256 = "bd4086b066fb3b18a0be2e7d9bc100a99aa0f233ad659492340415c7b2bdae99"; }; meta = { @@ -16142,7 +16203,7 @@ let pname = "Scalar-String"; version = "0.003"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Scalar-String-0.003.tar.gz; + url = "mirror://cpan/authors/id/Z/ZE/ZEFRAM/Scalar-String-0.003.tar.gz"; sha256 = "f54a17c9b78713b02cc43adfadf60b49467e7634d31317e8b9e9e97c26d68b52"; }; }; @@ -16151,7 +16212,7 @@ let pname = "SCGI"; version = "0.6"; src = fetchurl { - url = mirror://cpan/authors/id/V/VI/VIPERCODE/SCGI-0.6.tar.gz; + url = "mirror://cpan/authors/id/V/VI/VIPERCODE/SCGI-0.6.tar.gz"; sha256 = "196rj47mh4fq2vlnw595q391zja5v6qg7s3sy0vy8igfyid8rdsq"; }; preConfigure = "export HOME=$(mktemp -d)"; @@ -16161,7 +16222,7 @@ let pname = "Scope-Guard"; version = "0.21"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/Scope-Guard-0.21.tar.gz"; sha256 = "0y6jfzvxiz8h5yfz701shair0ilypq2mvimd7wn8wi2nbkm1p6wc"; }; meta = { @@ -16174,7 +16235,7 @@ let pname = "Scope-Upper"; version = "0.32"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.32.tar.gz; + url = "mirror://cpan/authors/id/V/VP/VPIT/Scope-Upper-0.32.tar.gz"; sha256 = "ccaff3251c092f2af8b5ad840b76655c4bc4ccf504ff7bde233811822a40abcf"; }; meta = { @@ -16227,13 +16288,13 @@ let pname = "Sereal-Decoder"; version = "4.008"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.008.tar.gz; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Decoder-4.008.tar.gz"; sha256 = "1vxgwlya7sj9mb6y278qblrjl2708d0agy7cryyqj7qf08d056rv"; }; buildInputs = [ TestDeep TestDifferences TestLongString TestWarn ]; preBuild = ''ls''; meta = { - homepage = https://github.com/Sereal/Sereal; + homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; license = with stdenv.lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; @@ -16244,12 +16305,12 @@ let pname = "Sereal-Encoder"; version = "4.008"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.008.tar.gz; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-Encoder-4.008.tar.gz"; sha256 = "0vzk6d2h034qks4lby53xrfljsrx4cvkaqi7gz9frba17lvl01rq"; }; buildInputs = [ SerealDecoder TestDeep TestDifferences TestLongString TestWarn ]; meta = { - homepage = https://github.com/Sereal/Sereal; + homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; license = with stdenv.lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; @@ -16260,13 +16321,13 @@ let pname = "Sereal"; version = "4.008"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.008.tar.gz; + url = "mirror://cpan/authors/id/Y/YV/YVES/Sereal-4.008.tar.gz"; sha256 = "1ima428v8mi509crr3b1rnh67ki8vbcd7iignw68mf2iaw5wmb58"; }; buildInputs = [ TestLongString TestWarn ]; propagatedBuildInputs = [ SerealDecoder SerealEncoder ]; meta = { - homepage = https://github.com/Sereal/Sereal; + homepage = "https://github.com/Sereal/Sereal"; description = "Fast, compact, powerful binary deserialization"; license = with stdenv.lib.licenses; [ artistic2 ]; maintainers = [ maintainers.thoughtpolice ]; @@ -16290,12 +16351,12 @@ let pname = "Server-Starter"; version = "0.35"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.35.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Server-Starter-0.35.tar.gz"; sha256 = "676dc0d6cff4648538332c63c32fb88ad09ed868213ea9e62e3f19fad41b9c40"; }; buildInputs = [ TestRequires TestSharedFork TestTCP ]; meta = { - homepage = https://github.com/kazuho/p5-Server-Starter; + homepage = "https://github.com/kazuho/p5-Server-Starter"; description = "A superdaemon for hot-deploying server programs"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16320,7 +16381,7 @@ let pname = "Set-Infinite"; version = "0.65"; src = fetchurl { - url = mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz; + url = "mirror://cpan/authors/id/F/FG/FGLOCK/Set-Infinite-0.65.tar.gz"; sha256 = "07bc880734492de40b4a3a8b5a331762f64e69b4629029fd9a9d357b25b87e1f"; }; meta = { @@ -16332,7 +16393,7 @@ let pname = "Set-IntSpan"; version = "1.19"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz; + url = "mirror://cpan/authors/id/S/SW/SWMCD/Set-IntSpan-1.19.tar.gz"; sha256 = "1l6znd40ylzvfwl02rlqzvakv602rmvwgm2xd768fpgc2fdm9dqi"; }; @@ -16345,7 +16406,7 @@ let pname = "Set-Object"; version = "1.40"; src = fetchurl { - url = mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.40.tar.gz; + url = "mirror://cpan/authors/id/R/RU/RURBAN/Set-Object-1.40.tar.gz"; sha256 = "1c4d8464c13e6d94957cf021ce603c961b08f52db6a9eaf5a5b0d37868cd37b7"; }; meta = { @@ -16358,7 +16419,7 @@ let pname = "Set-Scalar"; version = "1.29"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVIDO/Set-Scalar-1.29.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVIDO/Set-Scalar-1.29.tar.gz"; sha256 = "07aiqkyi1p22drpcyrrmv7f8qq6fhrxh007achy2vryxyck1bp53"; }; meta = { @@ -16385,7 +16446,7 @@ let pname = "SGMLSpm"; version = "1.1"; src = fetchurl { - url = mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz; + url = "mirror://cpan/authors/id/R/RA/RAAB/SGMLSpm-1.1.tar.gz"; sha256 = "1gdjf3mcz2bxir0l9iljxiz6qqqg3a9gg23y5wjg538w552r432m"; }; }; @@ -16394,7 +16455,7 @@ let pname = "Signal-Mask"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Signal-Mask-0.008.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Signal-Mask-0.008.tar.gz"; sha256 = "043d995b6b249d9ebc04c467db31bb7ddc2e55faa08e885bdb050b1f2336b73f"; }; propagatedBuildInputs = [ IPCSignal ]; @@ -16408,7 +16469,7 @@ let pname = "Snowball-Norwegian"; version = "1.2"; src = fetchurl { - url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz; + url = "mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Norwegian-1.2.tar.gz"; sha256 = "0675v45bbsh7vr7kpf36xs2q79g02iq1kmfw22h20xdk4rzqvkqx"; }; meta = { @@ -16421,7 +16482,7 @@ let pname = "Snowball-Swedish"; version = "1.2"; src = fetchurl { - url = mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz; + url = "mirror://cpan/authors/id/A/AS/ASKSH/Snowball-Swedish-1.2.tar.gz"; sha256 = "0agwc12jk5kmabnpsplw3wf4ii5w1zb159cpin44x3srb0sr5apg"; }; meta = { @@ -16434,7 +16495,7 @@ let pname = "SOAP-Lite"; version = "1.27"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.27.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/SOAP-Lite-1.27.tar.gz"; sha256 = "00fkvmnxiy5mr45rj5qmxmflw0xdkw2gihm48iha2i8smdmi0ng3"; }; propagatedBuildInputs = [ ClassInspector IOSessionData LWPProtocolHttps TaskWeaken XMLParser ]; @@ -16449,7 +16510,7 @@ let pname = "Socket6"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.29.tar.gz; + url = "mirror://cpan/authors/id/U/UM/UMEMOTO/Socket6-0.29.tar.gz"; sha256 = "468915fa3a04dcf6574fc957eff495915e24569434970c91ee8e4e1459fc9114"; }; setOutputFlags = false; @@ -16465,13 +16526,13 @@ let pname = "Software-License"; version = "0.103014"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.103014.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Software-License-0.103014.tar.gz"; sha256 = "eb45ea602d75006683789fbba57a01c0a1f7037371de95ea54b91577535d1789"; }; buildInputs = [ TryTiny ]; propagatedBuildInputs = [ DataSection TextTemplate ]; meta = { - homepage = https://github.com/rjbs/Software-License; + homepage = "https://github.com/rjbs/Software-License"; description = "Packages that provide templated software licenses"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16481,7 +16542,7 @@ let pname = "Software-License-CCpack"; version = "1.11"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBYRD/Software-License-CCpack-1.11.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBYRD/Software-License-CCpack-1.11.tar.gz"; sha256 = "1cakbn7am8mhalwas5h33l7c6avdqpg42z478p6rav11pim5qksr"; }; propagatedBuildInputs = [ SoftwareLicense ]; @@ -16497,7 +16558,7 @@ let pname = "Sort-Key"; version = "1.33"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Sort-Key-1.33.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SALVA/Sort-Key-1.33.tar.gz"; sha256 = "1kqs10s2plj6c96srk0j8d7xj8dxk1704r7mck8rqk09mg7lqspd"; }; meta = { @@ -16510,7 +16571,7 @@ let pname = "Sort-Versions"; version = "1.62"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Sort-Versions-1.62.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Sort-Versions-1.62.tar.gz"; sha256 = "1aifzm79ky03gi2lwxyx4mk6yky8x215j0kz4f0jbgkf803k6pxz"; }; }; @@ -16519,7 +16580,7 @@ let pname = "Specio"; version = "0.45"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.45.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.45.tar.gz"; sha256 = "1xk1skzvmqjgk7dqfkcmp6g7fc493cyk2hp94fzpdc43cg78ifg4"; }; propagatedBuildInputs = [ DevelStackTrace EvalClosure MROCompat ModuleRuntime RoleTiny SubQuote TryTiny ]; @@ -16534,7 +16595,7 @@ let pname = "Specio-Library-Path-Tiny"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Specio-Library-Path-Tiny-0.04.tar.gz"; sha256 = "0cyfx8gigsgisdwynjamh8jkpad23sr8v6a98hq285zmibm16s7g"; }; propagatedBuildInputs = [ PathTiny Specio ]; @@ -16549,7 +16610,7 @@ let pname = "Spiffy"; version = "0.46"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/Spiffy-0.46.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/Spiffy-0.46.tar.gz"; sha256 = "18qxshrjh0ibpzjm2314157mxlibh3smyg64nr4mq990hh564n4g"; }; }; @@ -16558,12 +16619,12 @@ let pname = "Spreadsheet-ParseExcel"; version = "0.65"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOUGW/Spreadsheet-ParseExcel-0.65.tar.gz"; sha256 = "6ec4cb429bd58d81640fe12116f435c46f51ff1040c68f09cc8b7681c1675bec"; }; propagatedBuildInputs = [ CryptRC4 DigestPerlMD5 IOStringy OLEStorage_Lite ]; meta = { - homepage = https://github.com/runrig/spreadsheet-parseexcel/; + homepage = "https://github.com/runrig/spreadsheet-parseexcel/"; description = "Read information from an Excel file"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16573,7 +16634,7 @@ let pname = "Spreadsheet-WriteExcel"; version = "2.40"; src = fetchurl { - url = mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz; + url = "mirror://cpan/authors/id/J/JM/JMCNAMARA/Spreadsheet-WriteExcel-2.40.tar.gz"; sha256 = "e356aad6866cf135731268ee0e979a197443c15a04878e9cf3e80d022ad6c07e"; }; propagatedBuildInputs = [ OLEStorage_Lite ParseRecDescent ]; @@ -16587,7 +16648,7 @@ let pname = "SQL-Abstract"; version = "1.86"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.86.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Abstract-1.86.tar.gz"; sha256 = "e7a7f7da5e6fa42f495860e92e9138b8a0964ca7674c95bd6ff1b1ce21aa8cdf"; }; buildInputs = [ TestDeep TestException TestWarn ]; @@ -16602,7 +16663,7 @@ let pname = "SQL-Abstract-Limit"; version = "0.141"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-0.141.tar.gz"; sha256 = "1qqh89kz065mkgyg5pjcgbf8qcpzfk8vf1lgkbwynknadmv87zqg"; }; propagatedBuildInputs = [ DBI SQLAbstract ]; @@ -16613,18 +16674,29 @@ let pname = "SQL-SplitStatement"; version = "1.00020"; src = fetchurl { - url = mirror://cpan/authors/id/E/EM/EMAZEP/SQL-SplitStatement-1.00020.tar.gz; + url = "mirror://cpan/authors/id/E/EM/EMAZEP/SQL-SplitStatement-1.00020.tar.gz"; sha256 = "0bqg45k4c9qkb2ypynlwhpvzsl4ssfagmsalys18s5c79ps30z7p"; }; buildInputs = [ TestException ]; propagatedBuildInputs = [ ClassAccessor ListMoreUtils RegexpCommon SQLTokenizer ]; }; + SQLStatement = buildPerlPackage { + pname = "SQL-Statement"; + version = "1.412"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RE/REHSACK/SQL-Statement-1.412.tar.gz"; + sha256 = "65c870883379c11b53f19ead10aaac241ccc86a90bbab77f6376fe750720e5c8"; + }; + buildInputs = [ TestDeep ]; + propagatedBuildInputs = [ Clone ModuleRuntime ParamsUtil TextSoundex MathBaseConvert ]; + }; + SQLTokenizer = buildPerlPackage { pname = "SQL-Tokenizer"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/I/IZ/IZUT/SQL-Tokenizer-0.24.tar.gz; + url = "mirror://cpan/authors/id/I/IZ/IZUT/SQL-Tokenizer-0.24.tar.gz"; sha256 = "1qa2dfbzdlr5qqdam9yn78z5w3al5r8577x06qan8wv58ay6ka7s"; }; }; @@ -16633,7 +16705,7 @@ let pname = "SQL-Translator"; version = "1.60"; src = fetchurl { - url = mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.60.tar.gz; + url = "mirror://cpan/authors/id/I/IL/ILMARI/SQL-Translator-1.60.tar.gz"; sha256 = "6bb0cb32ca25da69df65e5de71f679f3ca90044064526fa336cabd342f220e87"; }; buildInputs = [ FileShareDirInstall JSONMaybeXS TestDifferences TestException XMLWriter YAML ]; @@ -16648,7 +16720,7 @@ let pname = "Package-Variant"; version = "1.003002"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/Package-Variant-1.003002.tar.gz"; sha256 = "b2ed849d2f4cdd66467512daa3f143266d6df810c5fae9175b252c57bc1536dc"; }; buildInputs = [ TestFatal ]; @@ -16663,7 +16735,7 @@ let pname = "Sort-Naturally"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Sort-Naturally-1.03.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Sort-Naturally-1.03.tar.gz"; sha256 = "eaab1c5c87575a7826089304ab1f8ffa7f18e6cd8b3937623e998e865ec1e746"; }; }; @@ -16672,7 +16744,7 @@ let pname = "Starlet"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.31.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Starlet-0.31.tar.gz"; sha256 = "b9603b8e62880cb4582f6a7939eafec65e6efd3d900f2c7dd342e5f4c68d62d8"; }; buildInputs = [ LWP TestSharedFork TestTCP ]; @@ -16688,14 +16760,19 @@ let pname = "Starman"; version = "0.4015"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4015.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Starman-0.4015.tar.gz"; sha256 = "1y1kn4929k299fbf6sw9lxcsdlq9fvq777p6yrzk591rr9xhkx8h"; }; buildInputs = [ LWP ModuleBuildTiny TestRequires TestTCP ]; + nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin shortenPerlShebang; propagatedBuildInputs = [ DataDump HTTPParserXS NetServer Plack ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + shortenPerlShebang $out/bin/starman + ''; + doCheck = false; # binds to various TCP ports meta = { - homepage = https://github.com/miyagawa/Starman; + homepage = "https://github.com/miyagawa/Starman"; description = "High-performance preforking PSGI/Plack web server"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16705,7 +16782,7 @@ let pname = "Statistics-Basic"; version = "1.6611"; src = fetchurl { - url = mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-1.6611.tar.gz; + url = "mirror://cpan/authors/id/J/JE/JETTERO/Statistics-Basic-1.6611.tar.gz"; sha256 = "1ywl398z42hz9w1k0waf1caa6agz8jzsjlf4rzs1lgpx2mbcwmb8"; }; propagatedBuildInputs = [ NumberFormat ]; @@ -16718,7 +16795,7 @@ let pname = "Statistics-CaseResampling"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/Statistics-CaseResampling-0.15.tar.gz"; sha256 = "11whlh2dl7l6wrrnfmpbsg7ldcn316iccl1aaa4j5lqhdyyl6745"; }; meta = { @@ -16730,7 +16807,7 @@ let pname = "Statistics-Descriptive"; version = "3.0702"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0702.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Statistics-Descriptive-3.0702.tar.gz"; sha256 = "f98a10c625640170cdda408cccc72bdd7f66f8ebe5f59dec1b96185171ef11d0"; }; meta = { @@ -16745,7 +16822,7 @@ let pname = "Statistics-Distributions"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKEK/Statistics-Distributions-1.02.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKEK/Statistics-Distributions-1.02.tar.gz"; sha256 = "1j1kswl98f4i9dn176f9aa3y9bissx2sscga5jm3gjl4pxm3k7zr"; }; }; @@ -16754,7 +16831,7 @@ let pname = "Statistics-TTest"; version = "1.1.0"; src = fetchurl { - url = mirror://cpan/authors/id/Y/YU/YUNFANG/Statistics-TTest-1.1.0.tar.gz; + url = "mirror://cpan/authors/id/Y/YU/YUNFANG/Statistics-TTest-1.1.0.tar.gz"; sha256 = "0rkifgzm4rappiy669dyi6lyxn2sdqaf0bl6gndlfa67b395kndj"; }; propagatedBuildInputs = [ StatisticsDescriptive StatisticsDistributions ]; @@ -16764,7 +16841,7 @@ let pname = "Storable"; version = "3.15"; src = fetchurl { - url = mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.15.tar.gz; + url = "mirror://cpan/authors/id/X/XS/XSAWYERX/Storable-3.15.tar.gz"; sha256 = "fc3dad06cb2e6fc86a2f2abc5b5491d9da328ca3e6b6306559c224521db174da"; }; meta = { @@ -16776,11 +16853,11 @@ let pname = "Stream-Buffered"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.03.tar.gz; + url = "mirror://cpan/authors/id/D/DO/DOY/Stream-Buffered-0.03.tar.gz"; sha256 = "0fs2n9zw6isfkha2kbqrvl9mwg572x1x0jlfaps0qsyynn846bcv"; }; meta = { - homepage = https://plackperl.org; + homepage = "https://plackperl.org"; description = "Temporary buffer to save bytes"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16790,11 +16867,11 @@ let pname = "strictures"; version = "2.000006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/strictures-2.000006.tar.gz"; sha256 = "0mwd9xqz4n8qfpi5h5581lbm33qhf7agww18h063icnilrs7km89"; }; meta = { - homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git; + homepage = "http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git"; description = "Turn on strict and make all warnings fatal"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16804,7 +16881,7 @@ let pname = "String-Approx"; version = "3.28"; src = fetchurl { - url = mirror://cpan/authors/id/J/JH/JHI/String-Approx-3.28.tar.gz; + url = "mirror://cpan/authors/id/J/JH/JHI/String-Approx-3.28.tar.gz"; sha256 = "43201e762d8699cb0ac2c0764a5454bdc2306c0771014d6c8fba821480631342"; }; }; @@ -16813,7 +16890,7 @@ let pname = "String-CamelCase"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/H/HI/HIO/String-CamelCase-0.04.tar.gz; + url = "mirror://cpan/authors/id/H/HI/HIO/String-CamelCase-0.04.tar.gz"; sha256 = "1a8i4yzv586svd0pbxls7642vvmyiwzh4x2xyij8gbnfxsydxhw9"; }; }; @@ -16822,7 +16899,7 @@ let pname = "String-CRC32"; version = "1.8"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.8.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEJO/String-CRC32-1.8.tar.gz"; sha256 = "0vvwlf50vylx1m7nrjphkz309nsl2k2yqyldn3942337kiipjnmn"; }; }; @@ -16831,7 +16908,7 @@ let pname = "String-Errf"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Errf-0.008.tar.gz"; sha256 = "1nyn9s52jgbffrsv0m7rhcx1awjj43n68bfjlap8frdc7mw6y4xf"; }; buildInputs = [ JSONMaybeXS TimeDate ]; @@ -16846,7 +16923,7 @@ let pname = "String-Escape"; version = "2010.002"; src = fetchurl { - url = mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz; + url = "mirror://cpan/authors/id/E/EV/EVO/String-Escape-2010.002.tar.gz"; sha256 = "12ls7f7847i4qcikkp3skwraqvjphjiv2zxfhl5d49326f5myr7x"; }; }; @@ -16855,12 +16932,12 @@ let pname = "String-Flogger"; version = "1.101245"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101245.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101245.tar.gz"; sha256 = "aa03c08e01f802a358c175c6093c02adf9688659a087a8ddefdc3e9cef72640b"; }; propagatedBuildInputs = [ JSONMaybeXS SubExporter ]; meta = { - homepage = https://github.com/rjbs/String-Flogger; + homepage = "https://github.com/rjbs/String-Flogger"; description = "String munging for loggers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -16870,7 +16947,7 @@ let pname = "String-Format"; version = "1.18"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SREZIC/String-Format-1.18.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SREZIC/String-Format-1.18.tar.gz"; sha256 = "0y77frxzjifd4sw0j19cc346ysas1mya84rdxaz279lyin7plhcy"; }; }; @@ -16879,7 +16956,7 @@ let pname = "String-Formatter"; version = "0.102084"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Formatter-0.102084.tar.gz"; sha256 = "0mlwm0rirv46gj4h072q8gdync5zxxsxy8p028gdyrhczl942dc3"; }; propagatedBuildInputs = [ SubExporter ]; @@ -16893,7 +16970,7 @@ let pname = "String-MkPasswd"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.05.tar.gz; + url = "mirror://cpan/authors/id/C/CG/CGRAU/String-MkPasswd-0.05.tar.gz"; sha256 = "15lvcc8c9hp6mg3jx02wd3b85aphn8yl5db62q3pam04c0sgh42k"; }; }; @@ -16902,7 +16979,7 @@ let pname = "String-Random"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.30.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/String-Random-0.30.tar.gz"; sha256 = "06xdpyjc53al0a4ib2lw1m388v41z97hzqbdkd00w3nmjsdrn4w1"; }; }; @@ -16911,7 +16988,7 @@ let pname = "String-RewritePrefix"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.008.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-RewritePrefix-0.008.tar.gz"; sha256 = "1sq8way03gxb990n232y201grnh0jj0xhj7g4b3mz3sfj7b32np4"; }; propagatedBuildInputs = [ SubExporter ]; @@ -16925,7 +17002,7 @@ let pname = "String-ShellQuote"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROSCH/String-ShellQuote-1.04.tar.gz"; sha256 = "0dfxhr6hxc2majkkrm0qbx3qcbykzpphbj2ms93dc86f7183c1p6"; }; doCheck = !stdenv.isDarwin; @@ -16939,7 +17016,7 @@ let pname = "Shell-Command"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Shell-Command-0.06.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Shell-Command-0.06.tar.gz"; sha256 = "1lgc2rb3b5a4lxvbq0cbg08qk0n2i88srxbsz93bwi3razpxxr7k"; }; }; @@ -16948,7 +17025,7 @@ let pname = "String-ToIdentifier-EN"; version = "0.12"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/String-ToIdentifier-EN-0.12.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/String-ToIdentifier-EN-0.12.tar.gz"; sha256 = "12nw7h2yiybhdw0vnnpc7bif8ylhsn6kqf6s39dsrf9h54iq9yrs"; }; propagatedBuildInputs = [ LinguaENInflectPhrase TextUnidecode namespaceclean ]; @@ -16958,7 +17035,7 @@ let pname = "String-Truncate"; version = "1.100602"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/String-Truncate-1.100602.tar.gz"; sha256 = "0vjz4fd4cvcy12gk5bdha7z73ifmfpmk748khha94dhiq3pd98xa"; }; propagatedBuildInputs = [ SubExporter ]; @@ -16972,7 +17049,7 @@ let pname = "String-TT"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/String-TT-0.03.tar.gz"; sha256 = "1asjr79wqcl9wk96afxrm1yhpj8lk9bk8kyz78yi5ypr0h55yq7p"; }; buildInputs = [ TestException TestSimple13 TestTableDriven ]; @@ -16987,7 +17064,7 @@ let pname = "String-Util"; version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/String-Util-1.26.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/String-Util-1.26.tar.gz"; sha256 = "0bgs6fsc0gcj9qa1k98nwjp4xbkl3ckz71rz3qhmav0lgkrr96pl"; }; meta = { @@ -17004,7 +17081,7 @@ let pname = "Struct-Dumb"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Struct-Dumb-0.09.tar.gz"; sha256 = "0g9rziaqxkm00vh30g1yfwzq3b1xl23p8fbm4rszqsp641wr2z9k"; }; buildInputs = [ TestFatal ]; @@ -17018,12 +17095,12 @@ let pname = "Sub-Exporter"; version = "0.987"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-0.987.tar.gz"; sha256 = "1ml3n1ck4ln9qjm2mcgkczj1jb5n1fkscz9c4x23v4db0glb4g2l"; }; propagatedBuildInputs = [ DataOptList ]; meta = { - homepage = https://github.com/rjbs/sub-exporter; + homepage = "https://github.com/rjbs/sub-exporter"; description = "A sophisticated exporter for custom-built routines"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17033,13 +17110,13 @@ let pname = "Sub-Exporter-ForMethods"; version = "0.100052"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100052.tar.gz"; sha256 = "421fbba4f6ffcf13c4335f2c20630d709e6fa659c07545d094dbc5a558ad3006"; }; buildInputs = [ namespaceautoclean ]; propagatedBuildInputs = [ SubExporter SubName ]; meta = { - homepage = https://github.com/rjbs/Sub-Exporter-ForMethods; + homepage = "https://github.com/rjbs/Sub-Exporter-ForMethods"; description = "Helper routines for using Sub::Exporter to build methods"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17049,12 +17126,12 @@ let pname = "Sub-Exporter-GlobExporter"; version = "0.005"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-GlobExporter-0.005.tar.gz"; sha256 = "0qvsvfvfyk69v2ygjnyd5sh3bgbzd6f7k7mgv0zws1yywvpmxi1g"; }; propagatedBuildInputs = [ SubExporter ]; meta = { - homepage = https://github.com/rjbs/sub-exporter-globexporter; + homepage = "https://github.com/rjbs/sub-exporter-globexporter"; description = "Export shared globs with Sub::Exporter collectors"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17064,7 +17141,7 @@ let pname = "Sub-Exporter-Progressive"; version = "0.001013"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001013.tar.gz"; sha256 = "0mn0x8mkh36rrsr58s1pk4srwxh2hbwss7sv630imnk49navfdfm"; }; meta = { @@ -17077,7 +17154,7 @@ let pname = "Sub-Identify"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz; + url = "mirror://cpan/authors/id/R/RG/RGARCIA/Sub-Identify-0.14.tar.gz"; sha256 = "068d272086514dd1e842b6a40b1bedbafee63900e5b08890ef6700039defad6f"; }; meta = { @@ -17090,7 +17167,7 @@ let pname = "Sub-Info"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Sub-Info-0.002.tar.gz"; sha256 = "ea3056d696bdeff21a99d340d5570887d39a8cc47bff23adfc82df6758cdd0ea"; }; propagatedBuildInputs = [ Importer ]; @@ -17104,7 +17181,7 @@ let pname = "Sub-Install"; version = "0.928"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Sub-Install-0.928.tar.gz"; sha256 = "03zgk1yh128gciyx3q77zxzxg9kf8yy2gm46gdxqi24mcykngrb1"; }; meta = { @@ -17117,12 +17194,12 @@ let pname = "Sub-Name"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.26.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.26.tar.gz"; sha256 = "2d2f2d697d516c89547e7c4307f1e79441641cae2c7395e7319b306d390df105"; }; buildInputs = [ BC DevelCheckBin ]; meta = { - homepage = https://github.com/p5sagit/Sub-Name; + homepage = "https://github.com/p5sagit/Sub-Name"; description = "(Re)name a sub"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17132,7 +17209,7 @@ let pname = "Sub-Override"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Sub-Override-0.09.tar.gz"; sha256 = "1d955qn44brkcfif3gi0q2vvvqahny6rax0vr068x5i9yz0ng6lk"; }; buildInputs = [ TestFatal ]; @@ -17142,7 +17219,7 @@ let pname = "Sub-Quote"; version = "2.006006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.006006.tar.gz"; sha256 = "6e4e2af42388fa6d2609e0e82417de7cc6be47223f576592c656c73c7524d89d"; }; buildInputs = [ TestFatal ]; @@ -17156,11 +17233,11 @@ let pname = "Sub-Uplevel"; version = "0.2800"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-0.2800.tar.gz"; sha256 = "14z2xjiw931wizcx3mblmby753jspvfm321d6chs907nh0xzdwxl"; }; meta = { - homepage = https://github.com/dagolden/sub-uplevel; + homepage = "https://github.com/dagolden/sub-uplevel"; description = "Apparently run a function in a higher stack frame"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17170,7 +17247,7 @@ let pname = "SVN-Simple"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.28.tar.gz; + url = "mirror://cpan/authors/id/C/CL/CLKAO/SVN-Simple-0.28.tar.gz"; sha256 = "1ysgi38zx236cxz539k6d6rw5z0vc70rrglsaf5fk6rnwilw2g6n"; }; propagatedBuildInputs = [ (pkgs.subversionClient.override { inherit perl; }) ]; @@ -17180,12 +17257,12 @@ let pname = "Swim"; version = "0.1.48"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/Swim-0.1.48.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/Swim-0.1.48.tar.gz"; sha256 = "a5f72fd2f22917fa2b4acbb2ee2c3d32903d97ee5b0e449b0f387018c77f4f0c"; }; propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ]; meta = { - homepage = https://github.com/ingydotnet/swim-pm; + homepage = "https://github.com/ingydotnet/swim-pm"; description = "See What I Mean?!"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17205,7 +17282,7 @@ let pname = "Symbol-Global-Name"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Symbol-Global-Name-0.05.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Symbol-Global-Name-0.05.tar.gz"; sha256 = "0f7623e9d724760aa64040222da1d82f1188586791329261cc60dad1d60d6a92"; }; meta = { @@ -17218,7 +17295,7 @@ let pname = "Symbol-Util"; version = "0.0203"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Symbol-Util-0.0203.tar.gz"; sha256 = "0cnwwrd5d6i80f33s7n2ak90rh4s53ss7q57wndrpkpr4bfn3djm"; }; }; @@ -17227,12 +17304,12 @@ let pname = "syntax"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHAYLON/syntax-0.004.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHAYLON/syntax-0.004.tar.gz"; sha256 = "fe19b6da8a8f43a5aa2ee571441bc0e339fb156d0081c157a1a24e9812c7d365"; }; propagatedBuildInputs = [ DataOptList namespaceclean ]; meta = { - homepage = https://github.com/phaylon/syntax/wiki; + homepage = "https://github.com/phaylon/syntax/wiki"; description = "Activate syntax extensions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17242,13 +17319,13 @@ let pname = "Syntax-Keyword-Junction"; version = "0.003008"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003008.tar.gz; + url = "mirror://cpan/authors/id/F/FR/FREW/Syntax-Keyword-Junction-0.003008.tar.gz"; sha256 = "8b4975f21b1992a7e6c2df5dcc92b254c61925595eddcdfaf0b1498717aa95ef"; }; buildInputs = [ TestRequires ]; propagatedBuildInputs = [ syntax ]; meta = { - homepage = https://github.com/frioux/Syntax-Keyword-Junction; + homepage = "https://github.com/frioux/Syntax-Keyword-Junction"; description = "Perl6 style Junction operators in Perl5"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17258,7 +17335,7 @@ let pname = "Sys-Mmap"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/S/SW/SWALTERS/Sys-Mmap-0.19.tar.gz; + url = "mirror://cpan/authors/id/S/SW/SWALTERS/Sys-Mmap-0.19.tar.gz"; sha256 = "1yh0170xfw3z7n3lynffcb6axv7wi6zb46cx03crj1cvrhjmwa89"; }; meta = with stdenv.lib; { @@ -17272,7 +17349,7 @@ let pname = "Sys-MemInfo"; version = "0.99"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCRESTO/Sys-MemInfo-0.99.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCRESTO/Sys-MemInfo-0.99.tar.gz"; sha256 = "0786319d3a3a8bae5d727939244bf17e140b714f52734d5e9f627203e4cf3e3b"; }; meta = { @@ -17286,7 +17363,7 @@ let pname = "Sys-CPU"; version = "0.61"; src = fetchurl { - url = mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz; + url = "mirror://cpan/authors/id/M/MZ/MZSANFORD/Sys-CPU-0.61.tar.gz"; sha256 = "1r6976bs86j7zp51m5vh42xlyah951jgdlkimv202413kjvqc2i5"; }; patches = [ @@ -17309,7 +17386,7 @@ let pname = "Sys-Hostname-Long"; version = "1.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCOTT/Sys-Hostname-Long-1.5.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCOTT/Sys-Hostname-Long-1.5.tar.gz"; sha256 = "1jv5n8jv48c1p8svjsigyxndv1ygsq8wgwj9c7ypx1vaf3rns679"; }; doCheck = false; # no `hostname' in stdenv @@ -17319,7 +17396,7 @@ let pname = "Sys-SigAction"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz; + url = "mirror://cpan/authors/id/L/LB/LBAXTER/Sys-SigAction-0.23.tar.gz"; sha256 = "c4ef6c9345534031fcbbe2adc347fc7194d47afc945e7a44fac7e9563095d353"; }; doCheck = !stdenv.isAarch64; # it hangs on Aarch64 @@ -17333,7 +17410,7 @@ let pname = "Sys-Syslog"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.36.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAPER/Sys-Syslog-0.36.tar.gz"; sha256 = "ed42a9e5ba04ad4856cc0cb5d38d289c3c5d3764543ec04efafc4af7e3378df8"; }; meta = { @@ -17346,7 +17423,7 @@ let pname = "System-Command"; version = "1.119"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.119.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/System-Command-1.119.tar.gz"; sha256 = "c8c9fb1e527c52463cab1476500efea70396a0b62bea625d2d6faea994dc46e7"; }; propagatedBuildInputs = [ IPCRun ]; @@ -17358,11 +17435,11 @@ let SysVirt = buildPerlModule rec { pname = "Sys-Virt"; - version = "5.4.0"; + version = "6.2.0"; src = assert version == pkgs.libvirt.version; pkgs.fetchgit { - url = git://libvirt.org/libvirt-perl.git; - rev = "v${version}"; - sha256 = "0csg10mydcif2l0qf16nlphq6ih5378nk6dk1vznf5bspws2ch7a"; + url = "git://libvirt.org/libvirt-perl.git"; + rev = "799b243230163ff4f8dde6293da8a0e31e7c900e"; + sha256 = "1k38d1ycx3ibgfzcr1iym7cvpwvygh6a2i5548m4qjb47vfi12rz"; }; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pkgs.libvirt CPANChanges TestPod TestPodCoverage XMLXPath ]; @@ -17373,7 +17450,7 @@ let pname = "TAP-Parser-SourceHandler-pgTAP"; version = "3.35"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.35.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/TAP-Parser-SourceHandler-pgTAP-3.35.tar.gz"; sha256 = "1655337l1cyd7q62007wrk87q2gbbwfq9xjy1wgx3hyflxpkkvl4"; }; doCheck = !stdenv.isDarwin; @@ -17387,7 +17464,7 @@ let pname = "Task-Catalyst-Tutorial"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Task-Catalyst-Tutorial-0.06.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Task-Catalyst-Tutorial-0.06.tar.gz"; sha256 = "75b1b2d96155647842587146cefd0de30943b85195e8e3eca51e0f0b8642d61e"; }; propagatedBuildInputs = [ CatalystAuthenticationStoreDBIxClass CatalystControllerHTMLFormFu CatalystDevel CatalystManual CatalystPluginAuthorizationACL CatalystPluginAuthorizationRoles CatalystPluginSessionStateCookie CatalystPluginSessionStoreFastMmap CatalystPluginStackTrace CatalystViewTT ]; @@ -17402,7 +17479,7 @@ let pname = "Task-FreecellSolver-Testing"; version = "0.0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Task-FreecellSolver-Testing-v0.0.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Task-FreecellSolver-Testing-v0.0.11.tar.gz"; sha256 = "a2f73c65d0e5676cf4aae213ba4c3f88bf85f084a2165f1e71e3ce5b19023206"; }; buildInputs = [ CodeTidyAll TestDataSplit TestDifferences TestPerlTidy TestRunPluginTrimDisplayedFilenames TestRunValgrind TestTrailingSpace TestTrap ]; @@ -17417,7 +17494,7 @@ let pname = "Task-Plack"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Task-Plack-0.28.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Task-Plack-0.28.tar.gz"; sha256 = "0ajwkyr9nwn11afi6fz6kx4bi7a3p8awjsldmsakz3sl0s42pmbr"; }; propagatedBuildInputs = [ CGICompile CGIEmulatePSGI CGIPSGI Corona FCGI FCGIClient FCGIProcManager HTTPServerSimplePSGI IOHandleUtil NetFastCGI PSGI PlackAppProxy PlackMiddlewareAuthDigest PlackMiddlewareConsoleLogger PlackMiddlewareDebug PlackMiddlewareDeflater PlackMiddlewareHeader PlackMiddlewareReverseProxy PlackMiddlewareSession Starlet Starman Twiggy ]; @@ -17428,12 +17505,12 @@ let pname = "Task-Test-Run-AllPlugins"; version = "0.0105"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Task-Test-Run-AllPlugins-0.0105.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Task-Test-Run-AllPlugins-0.0105.tar.gz"; sha256 = "fd43bd053aa884a5abca851f145a0e29898515dcbfc3512f18cd0d86d28eb0a9"; }; buildInputs = [ TestRun TestRunCmdLine TestRunPluginAlternateInterpreters TestRunPluginBreakOnFailure TestRunPluginColorFileVerdicts TestRunPluginColorSummary TestRunPluginTrimDisplayedFilenames ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Specifications for installing all the Test::Run"; license = stdenv.lib.licenses.mit; }; @@ -17443,7 +17520,7 @@ let pname = "Task-Weaken"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.06.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Task-Weaken-1.06.tar.gz"; sha256 = "1gk6rmnp4x50lzr0vfng41khf0f8yzxlm0pad1j69vxskpdzx0r3"; }; meta = { @@ -17456,12 +17533,12 @@ let pname = "Template-Plugin-Autoformat"; version = "2.77"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KARMAN/Template-Plugin-Autoformat-2.77.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KARMAN/Template-Plugin-Autoformat-2.77.tar.gz"; sha256 = "bddfb4919f0abb2a2be7a9665333e0d4e098032f0e383dbaf04c4d896c7486ed"; }; propagatedBuildInputs = [ TemplateToolkit TextAutoformat ]; meta = { - homepage = https://github.com/karpet/template-plugin-autoformat; + homepage = "https://github.com/karpet/template-plugin-autoformat"; description = "TT plugin for Text::Autoformat"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17471,7 +17548,7 @@ let pname = "Template-Plugin-Class"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Template-Plugin-Class-0.14.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Template-Plugin-Class-0.14.tar.gz"; sha256 = "1hq7jy6zg1iaslsyi05afz0i944y9jnv3nb4krkxjfmzwy5gw106"; }; propagatedBuildInputs = [ TemplateToolkit ]; @@ -17481,7 +17558,7 @@ let pname = "Template-Plugin-IO-All"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/X/XE/XERN/Template-Plugin-IO-All-0.01.tar.gz; + url = "mirror://cpan/authors/id/X/XE/XERN/Template-Plugin-IO-All-0.01.tar.gz"; sha256 = "1f7445422a21932e09bbef935766e0af6b7cceb088e9d8e030cd7a84bcdc5ee4"; }; propagatedBuildInputs = [ IOAll TemplateToolkit ]; @@ -17496,7 +17573,7 @@ let pname = "Template-Plugin-JavaScript"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Template-Plugin-JavaScript-0.02.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Template-Plugin-JavaScript-0.02.tar.gz"; sha256 = "1mqqqs0dhfr6bp1305j9ns05q4pq1n3f561l6p8848k5ml3dh87a"; }; propagatedBuildInputs = [ TemplateToolkit ]; @@ -17506,7 +17583,7 @@ let pname = "Template-Plugin-JSON-Escape"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/N/NA/NANTO/Template-Plugin-JSON-Escape-0.02.tar.gz; + url = "mirror://cpan/authors/id/N/NA/NANTO/Template-Plugin-JSON-Escape-0.02.tar.gz"; sha256 = "051a8b1d3bc601d58fc51e246067d36450cfe970278a0456e8ab61940f13cd86"; }; propagatedBuildInputs = [ JSON TemplateToolkit ]; @@ -17516,7 +17593,7 @@ let pname = "Template-Timer"; version = "1.00"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-1.00.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Template-Timer-1.00.tar.gz"; sha256 = "1d3pbcx1kz73ncg8s8lx3ifwphz838qy0m40gdar7790cnrlqcdp"; }; propagatedBuildInputs = [ TemplateToolkit ]; @@ -17530,7 +17607,7 @@ let pname = "Template-Tiny"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz; + url = "mirror://cpan/authors/id/A/AD/ADAMK/Template-Tiny-1.12.tar.gz"; sha256 = "073e062c630b51dfb725cd6485a329155cb72d5c596e8cb698eb67c4566f0a4a"; }; meta = { @@ -17543,7 +17620,7 @@ let pname = "Template-Toolkit"; version = "3.007"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.007.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/Template-Toolkit-3.007.tar.gz"; sha256 = "1jh953f1v4r494mdvzfqs1ay1bh453dmp10z4qmv0makwarjsnfp"; }; doCheck = !stdenv.isDarwin; @@ -17557,7 +17634,7 @@ let pname = "Template-GD"; version = "2.66"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABW/Template-GD-2.66.tar.gz"; sha256 = "98523c8192f2e8184042e5a2e172bd767ac289dd2e480f35f680dce32160905b"; }; propagatedBuildInputs = [ GD TemplateToolkit ]; @@ -17571,7 +17648,7 @@ let pname = "Term-Encoding"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Term-Encoding-0.03.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Term-Encoding-0.03.tar.gz"; sha256 = "95ba9687d735d25a3cbe64508d7894f009c7fa2a1726c3e786e9e21da2251d0b"; }; meta = { @@ -17584,7 +17661,7 @@ let pname = "Term-ProgressBar"; version = "2.22"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.22.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Term-ProgressBar-2.22.tar.gz"; sha256 = "2642ecca5b0b038c14812bcad3a9611ff7911dc59c9104d220797f837a880c49"; }; buildInputs = [ CaptureTiny TestException TestWarnings ]; @@ -17599,7 +17676,7 @@ let pname = "Term-ProgressBar-Quiet"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/L/LB/LBROCARD/Term-ProgressBar-Quiet-0.31.tar.gz; + url = "mirror://cpan/authors/id/L/LB/LBROCARD/Term-ProgressBar-Quiet-0.31.tar.gz"; sha256 = "25675292f588bc29d32e710cf3667da9a2a1751e139801770a9fdb18cd2184a6"; }; propagatedBuildInputs = [ IOInteractive TermProgressBar ]; @@ -17614,7 +17691,7 @@ let pname = "Term-ProgressBar-Simple"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/E/EV/EVDB/Term-ProgressBar-Simple-0.03.tar.gz; + url = "mirror://cpan/authors/id/E/EV/EVDB/Term-ProgressBar-Simple-0.03.tar.gz"; sha256 = "a20db3c67d5bdfd0c1fab392c6d1c26880a7ee843af602af4f9b53a7043579a6"; }; propagatedBuildInputs = [ TermProgressBarQuiet ]; @@ -17627,7 +17704,7 @@ let pname = "TermReadKey"; version = "2.38"; src = fetchurl { - url = mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.38.tar.gz; + url = "mirror://cpan/authors/id/J/JS/JSTOWE/TermReadKey-2.38.tar.gz"; sha256 = "143jlibah1g14bym7sj3gphvqkpj1w4vn7sqc4vc62jpviw5hr2s"; }; @@ -17651,7 +17728,7 @@ let pname = "Term-ReadLine-Gnu"; version = "1.36"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAYASHI/Term-ReadLine-Gnu-1.36.tar.gz"; sha256 = "9a08f7a4013c9b865541c10dbba1210779eb9128b961250b746d26702bab6925"; }; buildInputs = [ pkgs.readline pkgs.ncurses ]; @@ -17672,7 +17749,7 @@ let doCheck = false; meta = { - homepage = https://sourceforge.net/projects/perl-trg/; + homepage = "https://sourceforge.net/projects/perl-trg/"; description = "Perl extension for the GNU Readline/History Library"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17698,12 +17775,12 @@ let pname = "Term-Shell"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.11.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Term-Shell-0.11.tar.gz"; sha256 = "7a142361f22f2e5fae9d6e39353663e8bdfa6118d1aee82204bd9083ddb04154"; }; propagatedBuildInputs = [ TermReadKey TextAutoformat ]; meta = with stdenv.lib; { - homepage = https://metacpan.org/release/Term-Shell; + homepage = "https://metacpan.org/release/Term-Shell"; description = "A simple command-line shell framework"; license = with licenses; [ artistic1 gpl1Plus ]; }; @@ -17713,7 +17790,7 @@ let pname = "Term-ShellUI"; version = "0.92"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRONSON/Term-ShellUI-0.92.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BRONSON/Term-ShellUI-0.92.tar.gz"; sha256 = "3279c01c76227335eeff09032a40f4b02b285151b3576c04cacd15be05942bdb"; }; }; @@ -17722,7 +17799,7 @@ let pname = "Term-Size-Any"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Any-0.002.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Any-0.002.tar.gz"; sha256 = "64fa5fdb1ae3a823134aaa95aec75354bc17bdd9ca12ba0a7ae34a7e51b3ded2"; }; propagatedBuildInputs = [ DevelHide TermSizePerl ]; @@ -17736,7 +17813,7 @@ let pname = "Term-Size-Perl"; version = "0.031"; src = fetchurl { - url = mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.031.tar.gz; + url = "mirror://cpan/authors/id/F/FE/FERREIRA/Term-Size-Perl-0.031.tar.gz"; sha256 = "ae9a6746cb1b305ddc8f8d8ca46878552b9c1123628971e13a275183822f209e"; }; meta = { @@ -17749,7 +17826,7 @@ let pname = "Term-Table"; version = "0.015"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.015.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Term-Table-0.015.tar.gz"; sha256 = "d8a18b2801f91f0e5d747147ce786964a76f91d18568652908a3dc06a9b948d5"; }; propagatedBuildInputs = [ Importer ]; @@ -17763,7 +17840,7 @@ let pname = "Term-UI"; version = "0.46"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BINGOS/Term-UI-0.46.tar.gz"; sha256 = "19p92za5cx1v7g57pg993amprcvm1az3pp7y9g5b1aplsy06r54i"; }; propagatedBuildInputs = [ LogMessageSimple ]; @@ -17777,7 +17854,7 @@ let pname = "Term-VT102"; version = "0.91"; src = fetchurl { - url = mirror://cpan/authors/id/A/AJ/AJWOOD/Term-VT102-0.91.tar.gz; + url = "mirror://cpan/authors/id/A/AJ/AJWOOD/Term-VT102-0.91.tar.gz"; sha256 = "f954e0310941d45c0fc3eb4a40f5d3a00d68119e277d303a1e6af11ded6fbd94"; }; meta = { @@ -17788,7 +17865,7 @@ let pname = "Term-VT102-Boundless"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/F/FB/FBARRIOS/Term-VT102-Boundless-0.05.tar.gz; + url = "mirror://cpan/authors/id/F/FB/FBARRIOS/Term-VT102-Boundless-0.05.tar.gz"; sha256 = "e1ded85ae3d76b59c03b8697f4a6cb01ae31bd62a9354f5bb7d18f9e927b485f"; }; propagatedBuildInputs = [ TermVT102 ]; @@ -17798,7 +17875,7 @@ let pname = "Term-Animation"; version = "2.6"; src = fetchurl { - url = mirror://cpan/authors/id/K/KB/KBAUCOM/Term-Animation-2.6.tar.gz; + url = "mirror://cpan/authors/id/K/KB/KBAUCOM/Term-Animation-2.6.tar.gz"; sha256 = "7d5c3c2d4f9b657a8b1dce7f5e2cbbe02ada2e97c72f3a0304bf3c99d084b045"; }; propagatedBuildInputs = [ Curses ]; @@ -17812,7 +17889,7 @@ let pname = "Test2-Plugin-NoWarnings"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.08.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test2-Plugin-NoWarnings-0.08.tar.gz"; sha256 = "122rcksn4qg0f99ap9ppmkvk0fvxcqa9jlqmq7wlk3q0ajylr4cy"; }; buildInputs = [ IPCRun3 Test2Suite ]; @@ -17826,7 +17903,7 @@ let pname = "Test2-Suite"; version = "0.000128"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000128.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Suite-0.000128.tar.gz"; sha256 = "f8e4e76900f5fb748d085aa5d18b916e07273e9ca50fb671ab8be1301cfae08c"; }; propagatedBuildInputs = [ ModulePluggable ScopeGuard SubInfo TermTable TestSimple13 ]; @@ -17840,7 +17917,7 @@ let pname = "Test-Abortable"; version = "0.002"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Abortable-0.002.tar.gz"; sha256 = "0v97y31j56f4mxw0vxyjbdprq4951h4wcdh4acnfm63np7wvg44p"; }; propagatedBuildInputs = [ SubExporter ]; @@ -17856,7 +17933,7 @@ let pname = "Test-Assert"; version = "0.0504"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Test-Assert-0.0504.tar.gz"; sha256 = "194bzflmzc0cw5727kznbj1zwzj7gnj7nx1643zk2hshdjlnv8yg"; }; buildInputs = [ ClassInspector TestUnitLite ]; @@ -17867,7 +17944,7 @@ let pname = "Test-Assertions"; version = "1.054"; src = fetchurl { - url = mirror://cpan/authors/id/B/BB/BBC/Test-Assertions-1.054.tar.gz; + url = "mirror://cpan/authors/id/B/BB/BBC/Test-Assertions-1.054.tar.gz"; sha256 = "10026w4r3yv6k3vc6cby7d61mxddlqh0ls6z39c82f17awfy9p7w"; }; propagatedBuildInputs = [ LogTrace ]; @@ -17877,7 +17954,7 @@ let pname = "Test-Aggregate"; version = "0.375"; src = fetchurl { - url = mirror://cpan/authors/id/R/RW/RWSTAUNER/Test-Aggregate-0.375.tar.gz; + url = "mirror://cpan/authors/id/R/RW/RWSTAUNER/Test-Aggregate-0.375.tar.gz"; sha256 = "c6cc0abfd0d4fce85371acca93ec245381841d32b4caa2d6475e4bc8130427d1"; }; buildInputs = [ TestMost TestNoWarnings TestTrap ]; @@ -17893,7 +17970,7 @@ let pname = "Test-Base"; version = "0.89"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.89.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/Test-Base-0.89.tar.gz"; sha256 = "056hibgg3i2b89mwr76vyxi6ayb3hqjqcwicvn3s5lximsma3517"; }; propagatedBuildInputs = [ Spiffy ]; @@ -17904,7 +17981,7 @@ let pname = "Test-Bits"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Test-Bits-0.02.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test-Bits-0.02.tar.gz"; sha256 = "1hqbvqlkj3k9ys4zq3f1fl1y6crni8r0ynan673f49rs91b6z0m9"; }; propagatedBuildInputs = [ ListAllUtils ]; @@ -17919,7 +17996,7 @@ let pname = "Test-CheckDeps"; version = "0.010"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.010.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEONT/Test-CheckDeps-0.010.tar.gz"; sha256 = "1vjinlixxdx6gfcw8y1dw2rla8bfhi8nmgcqr3nffc7kqskcrz36"; }; propagatedBuildInputs = [ CPANMetaCheck ]; @@ -17933,7 +18010,7 @@ let pname = "Test-Class"; version = "0.50"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Class-0.50.tar.gz"; sha256 = "099154ed8caf3ff97c71237fab952264ac1c03d9270737a56071cabe65991350"; }; buildInputs = [ TestException ]; @@ -17948,7 +18025,7 @@ let pname = "Test-Class-Most"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Test-Class-Most-0.08.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Test-Class-Most-0.08.tar.gz"; sha256 = "1zvx9hil0mg0pnb8xfa4m0xgjpvh8s5gnbyprq3xwpdsdgcdwk33"; }; buildInputs = [ TestClass TestDeep TestDifferences TestException TestMost TestWarn ]; @@ -17962,13 +18039,13 @@ let pname = "Test-CleanNamespaces"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.24.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-CleanNamespaces-0.24.tar.gz"; sha256 = "338d5569e8e89a654935f843ec0bc84aaa486fe8dd1898fb9cab3eccecd5327a"; }; buildInputs = [ Filepushd Moo Mouse RoleTiny SubExporter TestDeep TestNeeds TestWarnings namespaceclean ]; propagatedBuildInputs = [ PackageStash SubIdentify ]; meta = { - homepage = https://github.com/karenetheridge/Test-CleanNamespaces; + homepage = "https://github.com/karenetheridge/Test-CleanNamespaces"; description = "Check for uncleaned imports"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -17978,7 +18055,7 @@ let pname = "Test-Cmd"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Test-Cmd-1.09.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Test-Cmd-1.09.tar.gz"; sha256 = "114nfafwfxxn7kig265b7lg0znb5ybvc282sjjwf14g7vpn20cyg"; }; doCheck = false; /* test fails */ @@ -17993,11 +18070,11 @@ let pname = "Test-Command"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DANBOO/Test-Command-0.11.tar.gz"; sha256 = "0cwm3c4d49mdrbm6vgh78b3x8mk730l0zg8i7xb9z8bkx9pzr8r8"; }; meta = { - homepage = https://github.com/danboo/perl-test-command; + homepage = "https://github.com/danboo/perl-test-command"; description = "Test routines for external commands "; license = with stdenv.lib.licenses; [ artistic1 gpl1 ]; }; @@ -18007,7 +18084,7 @@ let pname = "Test-Compile"; version = "2.3.1"; src = fetchurl { - url = mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.3.1.tar.gz; + url = "mirror://cpan/authors/id/E/EG/EGILES/Test-Compile-v2.3.1.tar.gz"; sha256 = "1174cff010011ae43e6462755ccd8a6cf0372ca506705c60586f7b1748ff4ddf"; }; propagatedBuildInputs = [ UNIVERSALrequire ]; @@ -18021,7 +18098,7 @@ let pname = "Test-CPAN-Meta"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz; + url = "mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-0.25.tar.gz"; sha256 = "f55b4f9cf6bc396d0fe8027267685cb2ac4affce897d0967a317fac6db5a8db5"; }; meta = { @@ -18034,7 +18111,7 @@ let pname = "Test-CPAN-Meta-JSON"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-JSON-0.16.tar.gz; + url = "mirror://cpan/authors/id/B/BA/BARBIE/Test-CPAN-Meta-JSON-0.16.tar.gz"; sha256 = "1jg9ka50ixwq083wd4k12rhdjq87w0ihb34gd8jjn7gvvyd51b37"; }; propagatedBuildInputs = [ JSON ]; @@ -18048,7 +18125,7 @@ let pname = "Test-Data-Split"; version = "0.2.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Data-Split-0.2.1.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Data-Split-0.2.1.tar.gz"; sha256 = "9ba0c27a9e23c5dd8ede7611a049180485acc512a63783e1d1843b6569db5ae7"; }; buildInputs = [ TestDifferences ]; @@ -18063,7 +18140,7 @@ let pname = "Test-Deep"; version = "1.128"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Deep-1.128.tar.gz"; sha256 = "0bq9c0vrxbwhhy1pd2ss06fk06jal98j022mnyq6k0msdy1pwbc5"; }; meta = { @@ -18074,7 +18151,7 @@ let pname = "Test-Dir"; version = "1.16"; src = fetchurl { - url = mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.16.tar.gz; + url = "mirror://cpan/authors/id/M/MT/MTHURN/Test-Dir-1.16.tar.gz"; sha256 = "7332b323913eb6a2684d094755196304b2f8606f70eaab913654ca91f273eac2"; }; meta = { @@ -18087,7 +18164,7 @@ let pname = "Test-Differences"; version = "0.67"; src = fetchurl { - url = mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.67.tar.gz; + url = "mirror://cpan/authors/id/D/DC/DCANTRELL/Test-Differences-0.67.tar.gz"; sha256 = "c88dbbb48b934b069284874f33abbaaa438aa31204aa3fa73bfc2f4aeac878da"; }; propagatedBuildInputs = [ CaptureTiny TextDiff ]; @@ -18101,7 +18178,7 @@ let pname = "Test-DistManifest"; version = "1.014"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-DistManifest-1.014.tar.gz"; sha256 = "3d26c20df42628981cbfcfa5b1ca028c6ceadb344c1dcf97a25ad6a88b73d7c5"; }; buildInputs = [ ModuleBuildTiny ]; @@ -18116,7 +18193,7 @@ let pname = "Test-EOL"; version = "2.00"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.00.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-EOL-2.00.tar.gz"; sha256 = "0l3bxpsw0x7j9nclizcp53mnf9wny25dmg2iglfhzgnk0xfpwzwf"; }; meta = { @@ -18129,7 +18206,7 @@ let pname = "Test-Exception"; version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Exception-0.43.tar.gz"; sha256 = "0cxm7s4bg0xpxa6l6996a6iq3brr4j7p4hssnkc6dxv4fzq16sqm"; }; propagatedBuildInputs = [ SubUplevel ]; @@ -18139,7 +18216,7 @@ let pname = "Test-FailWarnings"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-FailWarnings-0.008.tar.gz"; sha256 = "0vx9chcp5x8m0chq574p9fnfckh5gl94j7904rh9v17n568fyd6s"; }; buildInputs = [ CaptureTiny ]; @@ -18153,7 +18230,7 @@ let pname = "Test-Fake-HTTPD"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MASAKI/Test-Fake-HTTPD-0.08.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MASAKI/Test-Fake-HTTPD-0.08.tar.gz"; sha256 = "1jkflkcjzrdvnlxff1xqfhfdcpsmvvjqzayl7hk3whavsxdrf9yh"; }; propagatedBuildInputs = [ HTTPDaemon Plack ]; @@ -18169,12 +18246,12 @@ let pname = "Test-Fatal"; version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Fatal-0.014.tar.gz"; sha256 = "bcdcef5c7b2790a187ebca810b0a08221a63256062cfab3c3b98685d91d1cbb0"; }; propagatedBuildInputs = [ TryTiny ]; meta = { - homepage = https://github.com/rjbs/Test-Fatal; + homepage = "https://github.com/rjbs/Test-Fatal"; description = "Incredibly simple helpers for testing code with exceptions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18184,7 +18261,7 @@ let pname = "Test-File"; version = "1.443"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-File-1.443.tar.gz"; sha256 = "61b4a6ab8f617c8c7b5975164cf619468dc304b6baaaea3527829286fa58bcd5"; }; buildInputs = [ Testutf8 ]; @@ -18198,7 +18275,7 @@ let pname = "Test-File-Contents"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/Test-File-Contents-0.23.tar.gz"; sha256 = "cd6fadfb910b34b4b53991ff231dad99929ca8850abec3ad0e2810c4bd7b1f3d"; }; propagatedBuildInputs = [ TextDiff ]; @@ -18212,13 +18289,13 @@ let pname = "Test-File-ShareDir"; version = "1.001002"; src = fetchurl { - url = mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz; + url = "mirror://cpan/authors/id/K/KE/KENTNL/Test-File-ShareDir-1.001002.tar.gz"; sha256 = "b33647cbb4b2f2fcfbde4f8bb4383d0ac95c2f89c4c5770eb691f1643a337aad"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ ClassTiny FileCopyRecursive FileShareDir PathTiny ScopeGuard ]; meta = { - homepage = https://github.com/kentfredric/Test-File-ShareDir; + homepage = "https://github.com/kentfredric/Test-File-ShareDir"; description = "Create a Fake ShareDir for your modules for testing"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18228,7 +18305,7 @@ let pname = "Test-Filename"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Filename-0.03.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Filename-0.03.tar.gz"; sha256 = "1gpw4mjw68gnby8s4cifvbz6g2923xsc189jkw9d27i8qv20qiba"; }; propagatedBuildInputs = [ PathTiny ]; @@ -18242,7 +18319,7 @@ let pname = "Test-Fork"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Fork-0.02.tar.gz"; sha256 = "0gnh8m81fdrwmzy1fix12grfq7sf7nn0gbf24zlap1gq4kxzpzpw"; }; meta = { @@ -18255,7 +18332,7 @@ let pname = "Test-Harness-Straps"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Harness-Straps-0.30.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/Test-Harness-Straps-0.30.tar.gz"; sha256 = "8b00efaa35723c1a35c8c8f5fa46a99e4bc528dfa520352b54ac418ef6d1cfa8"; }; meta = { @@ -18268,7 +18345,7 @@ let pname = "Test-HexDifferences"; version = "1.001"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Test-HexDifferences-1.001.tar.gz"; sha256 = "18lh6shpfx567gjikrid4hixydgv1hi3mycl20qzq2j2vpn4afd6"; }; propagatedBuildInputs = [ SubExporter TextDiff ]; @@ -18281,7 +18358,7 @@ let pname = "Test-HexString"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Test-HexString-0.03.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-HexString-0.03.tar.gz"; sha256 = "0h1zl2l1ljlcxsn0xvin9dwiymnhyhnfnxgzg3f9899g37f4qk3x"; }; meta = { @@ -18294,7 +18371,7 @@ let pname = "Test-Identity"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Test-Identity-0.01.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-Identity-0.01.tar.gz"; sha256 = "08szivpqfwxnf6cfh0f0rfs4f7xbaxis3bra31l2c5gdk800a0ig"; }; meta = { @@ -18307,7 +18384,7 @@ let pname = "Test-HTTP-Server-Simple"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALEXMV/Test-HTTP-Server-Simple-0.11.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALEXMV/Test-HTTP-Server-Simple-0.11.tar.gz"; sha256 = "85c97ebd4deb805291b17277032da48807228f24f89b1ce2fb3c09f7a896bb78"; }; propagatedBuildInputs = [ HTTPServerSimple ]; @@ -18320,7 +18397,7 @@ let pname = "Test-JSON"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Test-JSON-0.11.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Test-JSON-0.11.tar.gz"; sha256 = "1cyp46w3q7dg89qkw31ik2h2a6mdx6pzdz2lmp8m0a61zjr8mh07"; }; propagatedBuildInputs = [ JSONAny ]; @@ -18331,7 +18408,7 @@ let pname = "Test-Kwalitee"; version = "1.28"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Kwalitee-1.28.tar.gz"; sha256 = "18s3c8qfr3kmmyxmsn5la2zgbdsgpnkmscnl68i7fnavfpfnqlxl"; }; propagatedBuildInputs = [ ModuleCPANTSAnalyse ]; @@ -18347,7 +18424,7 @@ let pname = "Test-LWP-UserAgent"; version = "0.033"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.033.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-LWP-UserAgent-0.033.tar.gz"; sha256 = "03fjjj65fpjr4pv1532kwci1llfbsv4g9an0h7k723yqfx1wgdsb"; }; propagatedBuildInputs = [ LWP SafeIsa namespaceclean ]; @@ -18363,7 +18440,7 @@ let pname = "Test-LeakTrace"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz; + url = "mirror://cpan/authors/id/L/LE/LEEJO/Test-LeakTrace-0.16.tar.gz"; sha256 = "00z4hcjra5nk700f3fgpy8fs036d7ry7glpn8g3wh7jzj7nrw22z"; }; meta = { @@ -18376,7 +18453,7 @@ let pname = "Test-LectroTest"; version = "0.5001"; src = fetchurl { - url = mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz; + url = "mirror://cpan/authors/id/T/TM/TMOERTEL/Test-LectroTest-0.5001.tar.gz"; sha256 = "0dfpkvn06499gczch4gfmdb05fdj82vlqy7cl6hz36l9jl6lyaxc"; }; meta = { @@ -18389,7 +18466,7 @@ let pname = "Test-LoadAllModules"; version = "0.022"; src = fetchurl { - url = mirror://cpan/authors/id/K/KI/KITANO/Test-LoadAllModules-0.022.tar.gz; + url = "mirror://cpan/authors/id/K/KI/KITANO/Test-LoadAllModules-0.022.tar.gz"; sha256 = "1zjwbqk1ns9m8srrhyj3i5zih976i4d2ibflh5s8lr10a1aiz1hv"; }; propagatedBuildInputs = [ ListMoreUtils ModulePluggable ]; @@ -18403,7 +18480,7 @@ let pname = "Test-LongString"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz; + url = "mirror://cpan/authors/id/R/RG/RGARCIA/Test-LongString-0.17.tar.gz"; sha256 = "0kwp7rfr1i2amz4ckigkv13ah7jr30q6l5k4wk0vxl84myg39i5b"; }; }; @@ -18412,7 +18489,7 @@ let pname = "Test-Memory-Cycle"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-Memory-Cycle-1.06.tar.gz"; sha256 = "9d53ddfdc964cd8454cb0da4c695b6a3ae47b45839291c34cb9d8d1cfaab3202"; }; propagatedBuildInputs = [ DevelCycle PadWalker ]; @@ -18425,7 +18502,7 @@ let pname = "Test-Mock-Class"; version = "0.0303"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Mock-Class-0.0303.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Test-Mock-Class-0.0303.tar.gz"; sha256 = "00pkfqcz7b34q1mvx15k46sbxs22zcrvrbv15rnbn2na57z54bnd"; }; buildInputs = [ ClassInspector TestAssert TestUnitLite ]; @@ -18440,12 +18517,12 @@ let pname = "Test-Mock-Guard"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/X/XA/XAICRON/Test-Mock-Guard-0.10.tar.gz; + url = "mirror://cpan/authors/id/X/XA/XAICRON/Test-Mock-Guard-0.10.tar.gz"; sha256 = "7f228a63f8d6ceb92aa784080a13e85073121b2835eca06d794f9709950dbd3d"; }; propagatedBuildInputs = [ ClassLoad ]; meta = { - homepage = https://github.com/zigorou/p5-test-mock-guard; + homepage = "https://github.com/zigorou/p5-test-mock-guard"; description = "Simple mock test library using RAII"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18455,7 +18532,7 @@ let pname = "Test-MockModule"; version = "0.171.0"; src = fetchurl { - url = mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.171.0.tar.gz; + url = "mirror://cpan/authors/id/G/GF/GFRANKS/Test-MockModule-v0.171.0.tar.gz"; sha256 = "1arqgb1773zym5dqlwm6kz48bfrccjhb5bjfsif0vkalwq2gvm7b"; }; propagatedBuildInputs = [ SUPER ]; @@ -18466,7 +18543,7 @@ let pname = "SUPER"; version = "1.20190531"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20190531.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/SUPER-1.20190531.tar.gz"; sha256 = "685d1ee76e7f0e9006942923bf7df8b11c107132992917593dcf7397d417d39a"; }; propagatedBuildInputs = [ SubIdentify ]; @@ -18481,7 +18558,7 @@ let pname = "Test-MockObject"; version = "1.20200122"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20200122.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/Test-MockObject-1.20200122.tar.gz"; sha256 = "2b7f80da87f5a6fe0360d9ee521051053017442c3a26e85db68dfac9f8307623"; }; buildInputs = [ TestException TestWarn ]; @@ -18496,7 +18573,7 @@ let pname = "Test-MockTime"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/D/DD/DDICK/Test-MockTime-0.17.tar.gz; + url = "mirror://cpan/authors/id/D/DD/DDICK/Test-MockTime-0.17.tar.gz"; sha256 = "1y820qsq7yf7r6smy5c6f0mpf2cis2q24vwmpim1svv0n8cf2qrk"; }; }; @@ -18505,7 +18582,7 @@ let pname = "Test-MockTime-HiRes"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz; + url = "mirror://cpan/authors/id/T/TA/TARAO/Test-MockTime-HiRes-0.08.tar.gz"; sha256 = "1hfykcjrls6ywgbd49w29c7apj3nq4wlyx7jzpd2glwmz2pgfjaz"; }; buildInputs = [ AnyEvent ModuleBuildTiny TestClass TestMockTime TestRequires ]; @@ -18520,11 +18597,11 @@ let pname = "Test-Mojibake"; version = "1.3"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYP/Test-Mojibake-1.3.tar.gz"; sha256 = "0cqvbwddgh0pfzmh989gkysi9apqj7dp7jkxfa428db9kgzpbzlg"; }; meta = { - homepage = https://github.com/creaktive/Test-Mojibake; + homepage = "https://github.com/creaktive/Test-Mojibake"; description = "Check your source for encoding misbehavior"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18534,7 +18611,7 @@ let pname = "Test-More-UTF8"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MO/MONS/Test-More-UTF8-0.05.tar.gz"; sha256 = "016fs77lmw8xxrcnapvp6wq4hjwgsdfi3l9ylpxgxkcpdarw9wdr"; }; meta = { @@ -18547,7 +18624,7 @@ let pname = "Test-Most"; version = "0.35"; src = fetchurl { - url = mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz; + url = "mirror://cpan/authors/id/O/OV/OVID/Test-Most-0.35.tar.gz"; sha256 = "0zv5dyzq55r28plffibcr7wd00abap0h2zh4s4p8snaiszsad5wq"; }; propagatedBuildInputs = [ ExceptionClass ]; @@ -18562,7 +18639,7 @@ let pname = "Test-Needs"; version = "0.002006"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002006.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Test-Needs-0.002006.tar.gz"; sha256 = "77f9fff0c96c5e09f34d0416b3533c3319f7cd0bb1f7fe8f8072ad59f433f0e5"; }; meta = { @@ -18575,7 +18652,7 @@ let pname = "Test-NoTabs"; version = "2.02"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.02.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-NoTabs-2.02.tar.gz"; sha256 = "0c306p9qdpa2ycii3c50hml23mwy6bjxpry126g1dw11hyiwcxgv"; }; meta = { @@ -18588,7 +18665,7 @@ let pname = "Test-NoWarnings"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz; + url = "mirror://cpan/authors/id/A/AD/ADAMK/Test-NoWarnings-1.04.tar.gz"; sha256 = "0v385ch0hzz9naqwdw2az3zdqi15gka76pmiwlgsy6diiijmg2k3"; }; meta = { @@ -18601,7 +18678,7 @@ let pname = "Test-Object"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Object-0.08.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Object-0.08.tar.gz"; sha256 = "65278964147837313f4108e55b59676e8a364d6edf01b3dc198aee894ab1d0bb"; }; }; @@ -18610,7 +18687,7 @@ let pname = "Test-Output"; version = "1.031"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Output-1.031.tar.gz"; sha256 = "193y1xjvgc1p9pdgdwps2127knvpz9wc1xh6gmr74y3ihmqz7f7q"; }; propagatedBuildInputs = [ CaptureTiny ]; @@ -18620,7 +18697,7 @@ let pname = "Test-PAUSE-Permissions"; version = "0.07"; src = fetchurl { - url = mirror://cpan/authors/id/S/SK/SKAJI/Test-PAUSE-Permissions-0.07.tar.gz; + url = "mirror://cpan/authors/id/S/SK/SKAJI/Test-PAUSE-Permissions-0.07.tar.gz"; sha256 = "0gh7f67g1y30yggmwj1pq6xgrx3cfjibj2378nl3gilvyaxw2w2m"; }; propagatedBuildInputs = [ ConfigIdentity PAUSEPermissions ParseLocalDistribution ]; @@ -18635,7 +18712,7 @@ let pname = "Test-Perl-Critic"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-Perl-Critic-1.04.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-Perl-Critic-1.04.tar.gz"; sha256 = "28f806b5412c7908b56cf1673084b8b44ce1cb54c9417d784d91428e1a04096e"; }; propagatedBuildInputs = [ MCE PerlCritic ]; @@ -18645,7 +18722,7 @@ let pname = "Test-PerlTidy"; version = "20190402"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20190402.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-PerlTidy-20190402.tar.gz"; sha256 = "e9cb9b23ed62e8c6a47a1e18b55328aa3bfa467e05cd93e7e12b2738dd1e025f"; }; propagatedBuildInputs = [ PathTiny PerlTidy TextDiff ]; @@ -18659,7 +18736,7 @@ let pname = "Test-Pod"; version = "1.52"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.52.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Pod-1.52.tar.gz"; sha256 = "1z75x1pxwp8ajwq9iazlg2c3wd7rdlim08yclpdg32qnc36dpa30"; }; meta = { @@ -18672,7 +18749,7 @@ let pname = "Test-Pod-Coverage"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Test-Pod-Coverage-1.10.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Test-Pod-Coverage-1.10.tar.gz"; sha256 = "1m203mhgfilz7iqc8mxaw4lw02fz391mni3n25sfx7nryylwrja8"; }; propagatedBuildInputs = [ PodCoverage ]; @@ -18682,7 +18759,7 @@ let pname = "Test-Pod-LinkCheck"; version = "0.008"; src = fetchurl { - url = mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-LinkCheck-0.008.tar.gz; + url = "mirror://cpan/authors/id/A/AP/APOCAL/Test-Pod-LinkCheck-0.008.tar.gz"; sha256 = "2bfe771173c38b69eeb089504e3f76511b8e45e6a9e6dac3e616e400ea67bcf0"; }; buildInputs = [ ModuleBuildTiny TestPod ]; @@ -18712,7 +18789,7 @@ let pname = "Test-Portability-Files"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.10.tar.gz; + url = "mirror://cpan/authors/id/A/AB/ABRAXXA/Test-Portability-Files-0.10.tar.gz"; sha256 = "08e4b432492dc1b44b55d5db57952eb76379c7f434ee8f16aca64d491f401a16"; }; meta = { @@ -18725,7 +18802,7 @@ let pname = "Test-Refcount"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PEVANS/Test-Refcount-0.10.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PEVANS/Test-Refcount-0.10.tar.gz"; sha256 = "1chf6zizi7x128l3qm1bdqzwjjqm2j4gzajgghaksisn945c4mq4"; }; meta = { @@ -18738,7 +18815,7 @@ let pname = "Test-Requires"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Test-Requires-0.10.tar.gz"; sha256 = "1d9f481lj12cw1ciil46xq9nq16p6a90nm7yrsalpf8asn8s6s17"; }; meta = { @@ -18751,7 +18828,7 @@ let pname = "Test-Requires-Git"; version = "1.008"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOOK/Test-Requires-Git-1.008.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOOK/Test-Requires-Git-1.008.tar.gz"; sha256 = "70916210970d84d7491451159ab8b67e15251c8c0dae7c3df6c8d88542ea42a6"; }; propagatedBuildInputs = [ GitVersionCompare ]; @@ -18765,7 +18842,7 @@ let pname = "Test-RequiresInternet"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MALLEN/Test-RequiresInternet-0.05.tar.gz"; sha256 = "0gl33vpj9bb78pzyijp884b66sbw6jkh1ci0xki8rmf03hmb79xv"; }; meta = { @@ -18778,7 +18855,7 @@ let pname = "Test-Roo"; version = "1.004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Roo-1.004.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Roo-1.004.tar.gz"; sha256 = "1mnym49j1lj7gzylma5b6nr4vp75rmgz2v71904v01xmxhy9l4i1"; }; @@ -18790,13 +18867,13 @@ let pname = "Test-Routine"; version = "0.027"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.027.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-Routine-0.027.tar.gz"; sha256 = "0n6k310v2py787lkvhzrn8vndws9icdf8mighgl472k0x890xm5s"; }; buildInputs = [ TestAbortable TestFatal ]; propagatedBuildInputs = [ Moose namespaceautoclean ]; meta = { - homepage = https://github.com/rjbs/Test-Routine; + homepage = "https://github.com/rjbs/Test-Routine"; description = "Composable units of assertion"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18806,13 +18883,13 @@ let pname = "Test-Run"; version = "0.0304"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-0.0304.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-0.0304.tar.gz"; sha256 = "f3feaf9c4494c0b3a5294228cab27efe93653b7e0bbd7fbb99b94b65b247f323"; }; buildInputs = [ TestTrap ]; propagatedBuildInputs = [ IPCSystemSimple ListMoreUtils MooseXStrictConstructor TextSprintfNamed UNIVERSALrequire ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Base class to run standard TAP scripts"; license = stdenv.lib.licenses.mit; }; @@ -18822,14 +18899,14 @@ let pname = "Test-Run-CmdLine"; version = "0.0131"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-CmdLine-0.0131.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-CmdLine-0.0131.tar.gz"; sha256 = "cceeeecd3f4b2f1d2929f3ada351c1ade23a8ac73ef0486dc6e9605ebcdaef18"; }; buildInputs = [ TestRun TestTrap ]; propagatedBuildInputs = [ MooseXGetopt UNIVERSALrequire YAMLLibYAML ]; doCheck = !stdenv.isDarwin; meta = { - homepage = http://web-cpan.berlios.de/modules/Test-Run/; + homepage = "http://web-cpan.berlios.de/modules/Test-Run/"; description = "Analyze tests from the command line using Test::Run"; license = stdenv.lib.licenses.mit; }; @@ -18839,13 +18916,13 @@ let pname = "Test-Run-Plugin-AlternateInterpreters"; version = "0.0124"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-AlternateInterpreters-0.0124.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-AlternateInterpreters-0.0124.tar.gz"; sha256 = "eecb3830d350b5d7853322df4f3090af42ff17e9c31075f8d4f69856c968bff3"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; propagatedBuildInputs = [ Moose ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Define different interpreters for different test scripts with Test::Run"; license = stdenv.lib.licenses.mit; }; @@ -18855,13 +18932,13 @@ let pname = "Test-Run-Plugin-BreakOnFailure"; version = "0.0.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-BreakOnFailure-v0.0.5.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-BreakOnFailure-v0.0.5.tar.gz"; sha256 = "e422eb64a2fa6ae59837312e37ab88d68b4945148eb436a3774faed5074f0430"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; propagatedBuildInputs = [ Moose ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Stop processing the entire test suite"; license = stdenv.lib.licenses.mit; }; @@ -18871,7 +18948,7 @@ let pname = "Test-Run-Plugin-ColorFileVerdicts"; version = "0.0124"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorFileVerdicts-0.0124.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorFileVerdicts-0.0124.tar.gz"; sha256 = "0418f03abe241f5a3c2a2ab3dd2679d11eee42c9e1f5b5a6ea80d9e238374302"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap ]; @@ -18879,7 +18956,7 @@ let moreInputs = [ TestTrap ]; # Added because tests were failing without it doCheck=true; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Make the file verdict ('ok', 'NOT OK')"; license = stdenv.lib.licenses.mit; }; @@ -18889,14 +18966,14 @@ let pname = "Test-Run-Plugin-ColorSummary"; version = "0.0202"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorSummary-0.0202.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-ColorSummary-0.0202.tar.gz"; sha256 = "ea4fb6768c4f6645cedf87d9b7c6baf97364ebc6f4171e4dd5f68939fb2bdd3a"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap ]; moreInputs = [ TestTrap ]; # Added because tests were failing without it doCheck=true; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "A Test::Run plugin that"; license = stdenv.lib.licenses.mit; }; @@ -18906,13 +18983,13 @@ let pname = "Test-Run-Plugin-TrimDisplayedFilenames"; version = "0.0125"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-TrimDisplayedFilenames-0.0125.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-Run-Plugin-TrimDisplayedFilenames-0.0125.tar.gz"; sha256 = "2255bc5cb6ab65ee4dfff3bcdf007fb74785ff3bb439a9cef5052c66d80424a5"; }; buildInputs = [ TestRun TestRunCmdLine TestTrap YAMLLibYAML ]; propagatedBuildInputs = [ Moose ]; meta = { - homepage = https://web-cpan.shlomifish.org/modules/Test-Run/; + homepage = "https://web-cpan.shlomifish.org/modules/Test-Run/"; description = "Trim the first components"; license = stdenv.lib.licenses.mit; }; @@ -18922,7 +18999,7 @@ let pname = "Test-RunValgrind"; version = "0.2.1"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.1.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-RunValgrind-0.2.1.tar.gz"; sha256 = "25a4a8bfcefaed7c40d8b8492e8828e798e6c85ca5f34ce4b9993f9899a7b09c"; }; buildInputs = [ TestTrap ]; @@ -18937,7 +19014,7 @@ let pname = "Test-Script"; version = "1.26"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.26.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Script-1.26.tar.gz"; sha256 = "1dvkb8dvidnycd6ws2h2iy262h37fjakflv6z90xrw72xix26hkd"; }; @@ -18950,12 +19027,12 @@ let pname = "Test-SharedFork"; version = "0.35"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-SharedFork-0.35.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-SharedFork-0.35.tar.gz"; sha256 = "17y52j20k1bs9dgf4n6rhh9dn4cfxxbnfn2cfs7pb00fc5jyhci9"; }; buildInputs = [ TestRequires ]; meta = { - homepage = https://github.com/tokuhirom/Test-SharedFork; + homepage = "https://github.com/tokuhirom/Test-SharedFork"; description = "Fork test"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -18965,7 +19042,7 @@ let pname = "Test-Simple"; version = "1.302171"; src = fetchurl { - url = mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302171.tar.gz; + url = "mirror://cpan/authors/id/E/EX/EXODIST/Test-Simple-1.302171.tar.gz"; sha256 = "e27f90d2b2a6bc6ffa7675a072c2f41d5caffd99858dc69b2030940cc138368a"; }; meta = { @@ -18978,7 +19055,7 @@ let pname = "Test-Spec"; version = "0.54"; src = fetchurl { - url = mirror://cpan/authors/id/A/AK/AKZHAN/Test-Spec-0.54.tar.gz; + url = "mirror://cpan/authors/id/A/AK/AKZHAN/Test-Spec-0.54.tar.gz"; sha256 = "1lk5l69bm6yl1zxzz5v6mizzqfinpdhasmi4qjxr1vnwcl9cyc8a"; }; propagatedBuildInputs = [ DevelGlobalPhase PackageStash TieIxHash ]; @@ -18993,7 +19070,7 @@ let pname = "Test-SubCalls"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-SubCalls-1.10.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-SubCalls-1.10.tar.gz"; sha256 = "cbc1e9b35a05e71febc13e5ef547a31c8249899bb6011dbdc9d9ff366ddab6c2"; }; propagatedBuildInputs = [ HookLexWrap ]; @@ -19003,7 +19080,7 @@ let pname = "Test-Synopsis"; version = "0.16"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.16.tar.gz; + url = "mirror://cpan/authors/id/Z/ZO/ZOFFIX/Test-Synopsis-0.16.tar.gz"; sha256 = "09891vnkw9i8v074rswaxbrp6x2d8j8r90gqc306497ppiryq4qv"; }; meta = { @@ -19016,7 +19093,7 @@ let pname = "Test-TableDriven"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/J/JR/JROCKWAY/Test-TableDriven-0.02.tar.gz; + url = "mirror://cpan/authors/id/J/JR/JROCKWAY/Test-TableDriven-0.02.tar.gz"; sha256 = "16l5n6sx3yqdir1rqq21d41znpwzbs8v34gqr93y051arypphn22"; }; meta = { @@ -19029,7 +19106,7 @@ let pname = "Test-TempDir-Tiny"; version = "0.018"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.018.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-TempDir-Tiny-0.018.tar.gz"; sha256 = "10ay3zbihyxn4nbb1f0fmr4szag8iy8pd27v8j6idq6cgzys3dyp"; }; meta = { @@ -19044,7 +19121,7 @@ let pname = "Test-TCP"; version = "2.22"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Test-TCP-2.22.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Test-TCP-2.22.tar.gz"; sha256 = "0mvv9rqwrwlcfh8qrs0s47p85rhlnw15d4gbpyi802bddp0c6lry"; }; meta = { @@ -19058,7 +19135,7 @@ let pname = "Test-Time"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SATOH/Test-Time-0.08.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SATOH/Test-Time-0.08.tar.gz"; sha256 = "b8bc3b074bb2247e8588399c1e55d071f049cf6ce1c8b4192c38cf3c24559548"; }; meta = { @@ -19071,7 +19148,7 @@ let pname = "Test-Toolbox"; version = "0.4"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKO/Test-Toolbox-0.4.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKO/Test-Toolbox-0.4.tar.gz"; sha256 = "1hxx9rhvncvn7wvzhzx4sk00w0xq2scgspfhhyqwjnm1yg3va820"; }; meta = { @@ -19084,7 +19161,7 @@ let pname = "Test-TrailingSpace"; version = "0.0302"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0302.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Test-TrailingSpace-0.0302.tar.gz"; sha256 = "c48a6377d84576512b47652798d9d4bb4467adacf0e6afc3df1f880f2c03b612"; }; propagatedBuildInputs = [ FileFindObjectRule ]; @@ -19098,7 +19175,7 @@ let pname = "Test-Unit-Lite"; version = "0.1202"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz; + url = "mirror://cpan/authors/id/D/DE/DEXTER/Test-Unit-Lite-0.1202.tar.gz"; sha256 = "1a5jym9hjcpdf0rwyn7gwrzsx4xqzwgzx59rgspqlqiif7p2a79m"; }; meta = { @@ -19111,7 +19188,7 @@ let pname = "Test-Warn"; version = "0.36"; src = fetchurl { - url = mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.36.tar.gz; + url = "mirror://cpan/authors/id/B/BI/BIGJ/Test-Warn-0.36.tar.gz"; sha256 = "1nkc7jzxff0w4x9axbpsgxrksqdjnf70rb74q39zikkrsd3a7g7c"; }; propagatedBuildInputs = [ SubUplevel ]; @@ -19125,12 +19202,12 @@ let pname = "Test-Warnings"; version = "0.028"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.028.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Test-Warnings-0.028.tar.gz"; sha256 = "26fda9f8d279e943d27e43a4a3a5cea8a6592cd36e7308695f8dc6602262c0e0"; }; buildInputs = [ CPANMetaCheck PadWalker ]; meta = { - homepage = https://github.com/karenetheridge/Test-Warnings; + homepage = "https://github.com/karenetheridge/Test-Warnings"; description = "Test for warnings and the lack of them"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19140,7 +19217,7 @@ let pname = "Test-Without-Module"; version = "0.20"; src = fetchurl { - url = mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz; + url = "mirror://cpan/authors/id/C/CO/CORION/Test-Without-Module-0.20.tar.gz"; sha256 = "8e9aeb7c32a6c6d0b8a93114db2a8c072721273a9d9a2dd4f9ca86cfd28aa524"; }; meta = { @@ -19153,13 +19230,13 @@ let pname = "Test-WWW-Mechanize"; version = "1.52"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.52.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PETDANCE/Test-WWW-Mechanize-1.52.tar.gz"; sha256 = "1jsywlbxhqw39ij7s8vmgff5vys58vlfaq27072awacnxc65aal4"; }; buildInputs = [ TestLongString ]; propagatedBuildInputs = [ CarpAssertMore HTTPServerSimple WWWMechanize ]; meta = { - homepage = https://github.com/petdance/test-www-mechanize; + homepage = "https://github.com/petdance/test-www-mechanize"; description = "Testing-specific WWW::Mechanize subclass"; license = stdenv.lib.licenses.artistic2; }; @@ -19169,7 +19246,7 @@ let pname = "Test-WWW-Mechanize-Catalyst"; version = "0.62"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTROUT/Test-WWW-Mechanize-Catalyst-0.62.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTROUT/Test-WWW-Mechanize-Catalyst-0.62.tar.gz"; sha256 = "1cdc2q16vs6fb335pzaislz2rx1ph9acaxyp7v5hv9xbwwddwfqq"; }; doCheck = false; # listens on an external port @@ -19185,7 +19262,7 @@ let pname = "Test-WWW-Mechanize-CGI"; version = "0.1"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Test-WWW-Mechanize-CGI-0.1.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Test-WWW-Mechanize-CGI-0.1.tar.gz"; sha256 = "0bwwdk0iai5dlvvfpja971qpgvmf6yq67iag4z4szl9v5sra0xm5"; }; propagatedBuildInputs = [ WWWMechanizeCGI ]; @@ -19196,7 +19273,7 @@ let pname = "Test-WWW-Mechanize-PSGI"; version = "0.39"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/Test-WWW-Mechanize-PSGI-0.39.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/Test-WWW-Mechanize-PSGI-0.39.tar.gz"; sha256 = "0n4rhyyags3cwqb0gb1pr6gccd2x3l190j8gd96lwlvxnjrklss7"; }; buildInputs = [ CGI TestLongString TestWWWMechanize ]; @@ -19211,7 +19288,7 @@ let pname = "Test-XPath"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.19.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/Test-XPath-0.19.tar.gz"; sha256 = "1wy0488yg15kahfafnlmlhppxik7d0z00wxwj9fszrsq2h6crz6y"; }; propagatedBuildInputs = [ XMLLibXML ]; @@ -19221,7 +19298,7 @@ let pname = "Test-YAML"; version = "1.07"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/Test-YAML-1.07.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/Test-YAML-1.07.tar.gz"; sha256 = "0pwrrnwi1qaiy3c5522vy0kzncxc9g02r4b056wqqaa69w1hsc0z"; }; buildInputs = [ TestBase ]; @@ -19231,7 +19308,7 @@ let pname = "Text-Aligner"; version = "0.13"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.13.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Aligner-0.13.tar.gz"; sha256 = "1vry21jrh91l2pkajnrps83bnr1fn6zshbzi80mcrnggrn9iq776"; }; meta = { @@ -19243,7 +19320,7 @@ let pname = "Text-Aspell"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HANK/Text-Aspell-0.09.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HANK/Text-Aspell-0.09.tar.gz"; sha256 = "0r9g31rd55934mp6n45b96g934ck4qns8x9i7qckn9wfy44k5sib"; }; propagatedBuildInputs = [ pkgs.aspell ]; @@ -19256,12 +19333,12 @@ let pname = "Text-Autoformat"; version = "1.75"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.75.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Text-Autoformat-1.75.tar.gz"; sha256 = "9dd4f4ce3daec4b4dbf5b59dac4568a8946aed12c28b4e5988c8e8c602c6b771"; }; propagatedBuildInputs = [ TextReform ]; meta = { - homepage = https://github.com/neilbowers/Text-Autoformat; + homepage = "https://github.com/neilbowers/Text-Autoformat"; description = "Automatic text wrapping and reformatting"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19271,7 +19348,7 @@ let pname = "Text-Balanced"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.03.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHAY/Text-Balanced-2.03.tar.gz"; sha256 = "057753f8f0568b53921f66a60a89c30092b73329bcc61a2c43339ab70c9792c8"; }; meta = { @@ -19285,7 +19362,7 @@ let version = "0.88"; buildInputs = [ CaptureTiny ConfigAutoConf ExtUtilsLibBuilder ]; src = fetchurl { - url = mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz; + url = "mirror://cpan/authors/id/A/AM/AMBS/Text-BibTeX-0.88.tar.gz"; sha256 = "0b7lmjvfmypps1nw6nsdikgaakm0n0g4186glaqazg5xd1p5h55h"; }; perlPreHook = "export LD=$CC"; @@ -19309,7 +19386,7 @@ let pname = "Text-Brew"; version = "0.02"; src = fetchurl { - url = mirror://cpan/authors/id/K/KC/KCIVEY/Text-Brew-0.02.tar.gz; + url = "mirror://cpan/authors/id/K/KC/KCIVEY/Text-Brew-0.02.tar.gz"; sha256 = "0k7nxglbx5pxl693zrj1fsi094sf1a3vqsrn73inzz7r3j28a6xa"; }; }; @@ -19318,7 +19395,7 @@ let pname = "Text-CharWidth"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz; + url = "mirror://cpan/authors/id/K/KU/KUBOTA/Text-CharWidth-0.04.tar.gz"; sha256 = "abded5f4fdd9338e89fd2f1d8271c44989dae5bf50aece41b6179d8e230704f8"; }; }; @@ -19327,7 +19404,7 @@ let pname = "Text-CSV"; version = "2.00"; src = fetchurl { - url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.00.tar.gz; + url = "mirror://cpan/authors/id/I/IS/ISHIGAKI/Text-CSV-2.00.tar.gz"; sha256 = "8ccbd9195805222d995844114d0e595bb24ce188f85284dbf256080311cbb2c2"; }; meta = { @@ -19340,7 +19417,7 @@ let pname = "Text-CSV-Encoded"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/Z/ZA/ZARQUON/Text-CSV-Encoded-0.25.tar.gz; + url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/Text-CSV-Encoded-0.25.tar.gz"; sha256 = "1l5rwlmnpnhjszb200a94lwvkwslsvyxm24ycf37gm8dla1mk2i4"; }; propagatedBuildInputs = [ TextCSV ]; @@ -19354,7 +19431,7 @@ let pname = "Text-CSV_XS"; version = "1.40"; src = fetchurl { - url = mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.40.tgz; + url = "mirror://cpan/authors/id/H/HM/HMBRAND/Text-CSV_XS-1.40.tgz"; sha256 = "6a448ae1f66768fa5dec1cd2fb246bcaaa3f3ea22d555d1fee8d091833073675"; }; meta = { @@ -19367,7 +19444,7 @@ let pname = "Text-Diff"; version = "1.45"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Text-Diff-1.45.tar.gz"; sha256 = "013g13prdghxvrp5754gyc7rmv1syyxrhs33yc5f0lrz3dxs1fp8"; }; propagatedBuildInputs = [ AlgorithmDiff ]; @@ -19381,7 +19458,7 @@ let pname = "Text-Format"; version = "0.61"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Format-0.61.tar.gz"; sha256 = "bb8a3b8ff515c85101baf553a769337f944a05cde81f111ae78aff416bf4ae2b"; }; meta = { @@ -19396,7 +19473,7 @@ let pname = "Text-German"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz; + url = "mirror://cpan/authors/id/U/UL/ULPFR/Text-German-0.06.tar.gz"; sha256 = "1p87pgap99lw0nv62i3ghvsi7yg90lhn8vsa3yqp75rd04clybcj"; }; meta = { @@ -19407,7 +19484,7 @@ let pname = "Text-Glob"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Text-Glob-0.11.tar.gz"; sha256 = "11sj62fynfgwrlgkv5a051cq6yn0pagxqjsz27dxx8phsd4wv706"; }; }; @@ -19416,7 +19493,7 @@ let pname = "Text-Hogan"; version = "2.03"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAORU/Text-Hogan-2.03.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAORU/Text-Hogan-2.03.tar.gz"; sha256 = "0yk1qn457jqknds4g2khlhi5vk2li1njbfwvxy44i665wknj7naq"; }; propagatedBuildInputs = [ Clone RefUtil TextTrim ]; @@ -19431,7 +19508,7 @@ let pname = "Text-Iconv"; version = "1.7"; src = fetchurl { - url = mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz; + url = "mirror://cpan/authors/id/M/MP/MPIOTR/Text-Iconv-1.7.tar.gz"; sha256 = "5b80b7d5e709d34393bcba88971864a17b44a5bf0f9e4bcee383d029e7d2d5c3"; }; }; @@ -19440,7 +19517,7 @@ let pname = "Test-Inter"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.09.tar.gz; + url = "mirror://cpan/authors/id/S/SB/SBECK/Test-Inter-1.09.tar.gz"; sha256 = "1e9f129cc1a001fb95449d385253b38afabf5b466e3b3bd33e4e430f216e177a"; }; meta = { @@ -19468,7 +19545,7 @@ let pname = "Test-Manifest"; version = "2.021"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.021.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Test-Manifest-2.021.tar.gz"; sha256 = "a47aaad71c580e16e6e63d8c037cdddcd919876754beb2c95d9a88682dd332d9"; }; meta = { @@ -19481,7 +19558,7 @@ let pname = "Text-Markdown"; version = "1.000031"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz; + url = "mirror://cpan/authors/id/B/BO/BOBTFISH/Text-Markdown-1.000031.tar.gz"; sha256 = "06y79lla8adkqhrs41xdddqjs81dcrh266b50mfbg37bxkawd4f1"; }; buildInputs = [ ListMoreUtils TestDifferences TestException ]; @@ -19491,12 +19568,12 @@ let pname = "Test-MinimumVersion"; version = "0.101082"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101082.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Test-MinimumVersion-0.101082.tar.gz"; sha256 = "3fba4e8fcf74806259aa639be7d90e70346ad0e0e4b8b619593490e378241970"; }; propagatedBuildInputs = [ PerlMinimumVersion ]; meta = { - homepage = https://github.com/rjbs/Test-MinimumVersion; + homepage = "https://github.com/rjbs/Test-MinimumVersion"; description = "Does your code require newer perl than you think?"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19506,7 +19583,7 @@ let pname = "Text-MicroTemplate"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.24.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZUHO/Text-MicroTemplate-0.24.tar.gz"; sha256 = "1j5ljx7hs4k29732nr5f2m4kssz4rqjw3kknsnhams2yydqix01j"; }; meta = { @@ -19519,11 +19596,11 @@ let pname = "Test-Number-Delta"; version = "1.06"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.tar.gz"; sha256 = "535430919e6fdf6ce55ff76e9892afccba3b7d4160db45f3ac43b0f92ffcd049"; }; meta = { - homepage = https://github.com/dagolden/Test-Number-Delta; + homepage = "https://github.com/dagolden/Test-Number-Delta"; description = "Compare the difference between numbers against a given tolerance"; license = "apache"; }; @@ -19533,7 +19610,7 @@ let pname = "Text-Password-Pronounceable"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz; + url = "mirror://cpan/authors/id/T/TS/TSIBLEY/Text-Password-Pronounceable-0.30.tar.gz"; sha256 = "c186a50256e0bedfafb17e7ce157e7c52f19503bb79e18ebf06255911f6ead1a"; }; meta = { @@ -19559,7 +19636,7 @@ let pname = "Text-PDF"; version = "0.31"; src = fetchurl { - url = mirror://cpan/authors/id/B/BH/BHALLISSY/Text-PDF-0.31.tar.gz; + url = "mirror://cpan/authors/id/B/BH/BHALLISSY/Text-PDF-0.31.tar.gz"; sha256 = "0s5cimfr4wwzgv15k30x83ncg1257jwsvmbmb86lp02rw5g537yz"; }; }; @@ -19568,7 +19645,7 @@ let pname = "Text-Quoted"; version = "2.10"; src = fetchurl { - url = mirror://cpan/authors/id/B/BP/BPS/Text-Quoted-2.10.tar.gz; + url = "mirror://cpan/authors/id/B/BP/BPS/Text-Quoted-2.10.tar.gz"; sha256 = "081bf95ec9220af26cec89161e61bf73f9fbcbfeee1d9af15139e5d7b708f445"; }; propagatedBuildInputs = [ TextAutoformat ]; @@ -19582,7 +19659,7 @@ let pname = "Text-RecordParser"; version = "1.6.5"; src = fetchurl { - url = mirror://cpan/authors/id/K/KC/KCLARK/Text-RecordParser-1.6.5.tar.gz; + url = "mirror://cpan/authors/id/K/KC/KCLARK/Text-RecordParser-1.6.5.tar.gz"; sha256 = "0nn33c058bl957v38xhqig4ld34lifl4arqiilhxky339i0q2fys"; }; @@ -19598,7 +19675,7 @@ let pname = "Text-Reform"; version = "1.20"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Text-Reform-1.20.tar.gz"; sha256 = "a8792dd8c1aac97001032337b36a356be96e2d74c4f039ef9a363b641db4ae61"; }; meta = { @@ -19611,7 +19688,7 @@ let pname = "Text-Roman"; version = "3.5"; src = fetchurl { - url = mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz; + url = "mirror://cpan/authors/id/S/SY/SYP/Text-Roman-3.5.tar.gz"; sha256 = "0sh47svzz0wm993ywfgpn0fvhajl2sj5hcnf5zxjz02in6ihhjnb"; }; meta = { @@ -19624,7 +19701,7 @@ let pname = "Text-SimpleTable"; version = "2.07"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.07.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Text-SimpleTable-2.07.tar.gz"; sha256 = "1v8r8qpzg283p2pqqr8dqrak2bxray1b2jmib0qk75jffqw3yv95"; }; meta = { @@ -19638,7 +19715,7 @@ let pname = "Text-Soundex"; version = "3.05"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Text-Soundex-3.05.tar.gz"; sha256 = "f6dd55b4280b25dea978221839864382560074e1d6933395faee2510c2db60ed"; }; }; @@ -19647,7 +19724,7 @@ let pname = "Text-Sprintf-Named"; version = "0.0403"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Sprintf-Named-0.0403.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Sprintf-Named-0.0403.tar.gz"; sha256 = "8a2f6e52998d1d8adb6ce0f5be85265be2e51ce06cf8ae23b3a0f059ba21b888"; }; buildInputs = [ TestWarn ]; @@ -19661,12 +19738,12 @@ let pname = "Text-Table"; version = "1.133"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/Text-Table-1.133.tar.gz"; sha256 = "04kh5x5inq183rdg221wlqaaqi1ipyj588mxsslik6nhc14f17nd"; }; propagatedBuildInputs = [ TextAligner ]; meta = { - homepage = https://www.shlomifish.org/open-source/projects/docmake/; + homepage = "https://www.shlomifish.org/open-source/projects/docmake/"; description = "Organize Data in Tables"; license = stdenv.lib.licenses.isc; }; @@ -19676,7 +19753,7 @@ let pname = "Text-TabularDisplay"; version = "1.38"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DARREN/Text-TabularDisplay-1.38.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DARREN/Text-TabularDisplay-1.38.tar.gz"; sha256 = "1s46s4pg5mpfllx3icf4vnqz9iadbbdbsr5p7pr6gdjnzbx902gb"; }; }; @@ -19685,7 +19762,7 @@ let pname = "Text-Template"; version = "1.58"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.58.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Text-Template-1.58.tar.gz"; sha256 = "0c465757782c4bfb9b17335307a8286771fd36ea04d259bc454ac63355f2a287"; }; buildInputs = [ TestMoreUTF8 TestWarnings ]; @@ -19695,7 +19772,7 @@ let pname = "Test-Trap"; version = "0.3.4"; src = fetchurl { - url = mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz; + url = "mirror://cpan/authors/id/E/EB/EBHANSSEN/Test-Trap-v0.3.4.tar.gz"; sha256 = "1qjs2080kcc66s4d7499br5lw2qmhr9gxky4xsl6vjdn6dpna10b"; }; propagatedBuildInputs = [ DataDump ]; @@ -19709,14 +19786,14 @@ let pname = "Test-Vars"; version = "0.014"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Test-Vars-0.014.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Test-Vars-0.014.tar.gz"; sha256 = "0qr8q0ksr925ycwbsyxjwgz4p9r7a8vkxpn33vy23zbijwpa3xx7"; }; buildInputs = [ ModuleBuildTiny ]; meta = { - homepage = https://github.com/gfx/p5-Test-Vars; + homepage = "https://github.com/gfx/p5-Test-Vars"; description = "Detects unused variables"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19726,7 +19803,7 @@ let pname = "Test-Version"; version = "2.09"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/Test-Version-2.09.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/Test-Version-2.09.tar.gz"; sha256 = "9ce1dd2897a5f30e1b7f8966ec66f57d8d8f280f605f28c7ca221fa79aca38e0"; }; buildInputs = [ TestException ]; @@ -19741,7 +19818,7 @@ let pname = "Text-Trim"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJT/Text-Trim-1.03.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJT/Text-Trim-1.03.tar.gz"; sha256 = "0ks9afvx9c1b6px98wwzhbyhd2y6hdg7884814fc9pnx8qfzrz50"; }; meta = { @@ -19754,7 +19831,7 @@ let pname = "Text-Unaccent"; version = "1.08"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz; + url = "mirror://cpan/authors/id/L/LD/LDACHARY/Text-Unaccent-1.08.tar.gz"; sha256 = "0avk50kia78kxryh2whmaj5l18q2wvmkdyqyjsf6kwr4kgy6x3i7"; }; # https://rt.cpan.org/Public/Bug/Display.html?id=124815 @@ -19765,7 +19842,7 @@ let pname = "Text-Unidecode"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz; + url = "mirror://cpan/authors/id/S/SB/SBURKE/Text-Unidecode-1.30.tar.gz"; sha256 = "1imii0p6wvhrxsr5z2zhazpx5vl4l4ybf1y2c5hy480xvi6z293c"; }; }; @@ -19774,7 +19851,7 @@ let pname = "Test-utf8"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKF/Test-utf8-1.01.tar.gz"; sha256 = "ef371b1769cd8d36d2d657e8321723d94c8f8d89e7fd7437c6648c5dc6711b7a"; }; meta = { @@ -19788,7 +19865,7 @@ let pname = "Text-NSP"; version = "1.31"; src = fetchurl { - url = mirror://cpan/authors/id/T/TP/TPEDERSE/Text-NSP-1.31.tar.gz; + url = "mirror://cpan/authors/id/T/TP/TPEDERSE/Text-NSP-1.31.tar.gz"; sha256 = "a01201beb29636b3e41ecda2a6cf6522fd265416bd6d994fad02f59fb49cf595"; }; meta = { @@ -19802,7 +19879,7 @@ let pname = "Text-vFile-asData"; version = "0.08"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCLAMP/Text-vFile-asData-0.08.tar.gz"; sha256 = "b291ab5e0f987c5172560a692234711a75e4596d83475f72d01278369532f82a"; }; propagatedBuildInputs = [ ClassAccessorChained ]; @@ -19816,7 +19893,7 @@ let pname = "Text-WikiFormat"; version = "0.81"; src = fetchurl { - url = mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz; + url = "mirror://cpan/authors/id/C/CY/CYCLES/Text-WikiFormat-0.81.tar.gz"; sha256 = "0cxbgx879bsskmnhjzamgsa5862ddixyx4yr77lafmwimnaxjg74"; }; propagatedBuildInputs = [ URI ]; @@ -19826,7 +19903,7 @@ let pname = "Text-WrapI18N"; version = "0.06"; src = fetchurl { - url = mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz; + url = "mirror://cpan/authors/id/K/KU/KUBOTA/Text-WrapI18N-0.06.tar.gz"; sha256 = "4bd29a17f0c2c792d12c1005b3c276f2ab0fae39c00859ae1741d7941846a488"; }; propagatedBuildInputs = [ pkgs.glibc TextCharWidth ]; @@ -19845,7 +19922,7 @@ let pname = "Text-Wrapper"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz; + url = "mirror://cpan/authors/id/C/CJ/CJM/Text-Wrapper-1.05.tar.gz"; sha256 = "64268e15983a9df47e1d9199a491f394e89f542e54afb33f4b78f3f318e09ab9"; }; meta = { @@ -19859,7 +19936,7 @@ let pname = "threads-shared"; version = "1.59"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-shared-1.59.tar.gz; + url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/threads-shared-1.59.tar.gz"; sha256 = "1krz69ks3siz0fhc9waf817nnlmxsgq7rc5rq99xvqg1f1g9iz6i"; }; meta = { @@ -19872,7 +19949,7 @@ let pname = "Thread-Queue"; version = "3.13"; src = fetchurl { - url = mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Queue-3.13.tar.gz; + url = "mirror://cpan/authors/id/J/JD/JDHEDDEN/Thread-Queue-3.13.tar.gz"; sha256 = "1s6wpxy07mr03krkzjr5r02cswsj18dd38aa5f16dfrgvp6xm8vb"; }; meta = { @@ -19885,12 +19962,12 @@ let pname = "Throwable"; version = "0.200013"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200013.tar.gz; + url = "mirror://cpan/authors/id/R/RJ/RJBS/Throwable-0.200013.tar.gz"; sha256 = "184gdcwxqwnkrx5md968v1ny70pq6blzpkihccm3bpdxnpgd11wr"; }; propagatedBuildInputs = [ DevelStackTrace Moo ]; meta = { - homepage = https://github.com/rjbs/Throwable; + homepage = "https://github.com/rjbs/Throwable"; description = "A role for classes that can be thrown"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -19900,7 +19977,7 @@ let pname = "Tie-Cache-LRU"; version = "20150301"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/Tie-Cache-LRU-20150301.tar.gz"; sha256 = "1bf740450d3a6d7c12b48c25f7da5964e44e7cc38b28572cfb76ff22464f4469"; }; propagatedBuildInputs = [ ClassVirtual enum ]; @@ -19914,7 +19991,7 @@ let pname = "Tie-Cache-LRU-Expires"; version = "0.55"; src = fetchurl { - url = mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz; + url = "mirror://cpan/authors/id/O/OE/OESTERHOL/Tie-Cache-LRU-Expires-0.55.tar.gz"; sha256 = "b316d849acd25f24346d55a9950d281fee0746398767c601234122159573eb9a"; }; propagatedBuildInputs = [ TieCacheLRU ]; @@ -19927,7 +20004,7 @@ let pname = "Tie-Cycle"; version = "1.225"; src = fetchurl { - url = mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz; + url = "mirror://cpan/authors/id/B/BD/BDFOY/Tie-Cycle-1.225.tar.gz"; sha256 = "0i9xq2qm50p2ih24265jndp2x8hfq7ap0d88nrlv5yaad4hxhc7k"; }; meta = { @@ -19940,7 +20017,7 @@ let pname = "Tie-File"; version = "1.05"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.05.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/Tie-File-1.05.tar.gz"; sha256 = "8a980b577ff4b10fe11062ed8c774857fa8c9833c5305f2e8bfb3347af63f139"; }; meta = { @@ -19952,7 +20029,7 @@ let pname = "Tie-IxHash"; version = "1.23"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHORNY/Tie-IxHash-1.23.tar.gz"; sha256 = "0mmg9iyh42syal3z1p2pn9airq65yrkfs66cnqs9nz76jy60pfzs"; }; meta = { @@ -19965,11 +20042,11 @@ let pname = "Tie-Handle-Offset"; version = "0.004"; src = fetchurl { - url = mirror://cpan/authors/id/D/DA/DAGOLDEN/Tie-Handle-Offset-0.004.tar.gz; + url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/Tie-Handle-Offset-0.004.tar.gz"; sha256 = "ee9f39055dc695aa244a252f56ffd37f8be07209b337ad387824721206d2a89e"; }; meta = { - homepage = https://github.com/dagolden/tie-handle-offset; + homepage = "https://github.com/dagolden/tie-handle-offset"; description = "Tied handle that hides the beginning of a file"; license = stdenv.lib.licenses.asl20; }; @@ -19979,7 +20056,7 @@ let pname = "Tie-Hash-Indexed"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/M/MH/MHX/Tie-Hash-Indexed-0.05.tar.gz; + url = "mirror://cpan/authors/id/M/MH/MHX/Tie-Hash-Indexed-0.05.tar.gz"; sha256 = "a8862a4763d58a8c785e34b8b18e5db4ce5c3e36b9b5cf565a3088584eab361e"; }; meta = { @@ -19993,7 +20070,7 @@ let pname = "Tie-RefHash"; version = "1.39"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Tie-RefHash-1.39.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/Tie-RefHash-1.39.tar.gz"; sha256 = "b0b80ef571e7dadb726b8214f7352a932a8fa82af29072895aa1aadc89f48bec"; }; }; @@ -20002,7 +20079,7 @@ let pname = "Tie-RegexpHash"; version = "0.17"; src = fetchurl { - url = mirror://cpan/authors/id/A/AL/ALTREUS/Tie-RegexpHash-0.17.tar.gz; + url = "mirror://cpan/authors/id/A/AL/ALTREUS/Tie-RegexpHash-0.17.tar.gz"; sha256 = "0c207850e77efb16618e0aa015507926a3425b34aad5aa6e3e40d83989a085a3"; }; meta = { @@ -20027,7 +20104,7 @@ let pname = "Tie-Sub"; version = "1.001"; src = fetchurl { - url = mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz; + url = "mirror://cpan/authors/id/S/ST/STEFFENW/Tie-Sub-1.001.tar.gz"; sha256 = "1cgiyj85hhw2m4x2iv4zgaj3hzf3fghircpcfqmjndni4r4a0wgg"; }; propagatedBuildInputs = [ ParamsValidate ]; @@ -20042,7 +20119,7 @@ let pname = "Tie-ToObject"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz; + url = "mirror://cpan/authors/id/N/NU/NUFFIN/Tie-ToObject-0.03.tar.gz"; sha256 = "1x1smn1kw383xc5h9wajxk9dlx92bgrbf7gk4abga57y6120s6m3"; }; }; @@ -20051,7 +20128,7 @@ let pname = "TimeDate"; version = "2.31"; src = fetchurl { - url = mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.31.tar.gz; + url = "mirror://cpan/authors/id/A/AT/ATOOMIC/TimeDate-2.31.tar.gz"; sha256 = "10ad6l4ii2iahdpw8h0xqwasc1jblan31h597q3js4j5nbnhywjw"; }; }; @@ -20060,7 +20137,7 @@ let pname = "Time-Duration"; version = "1.21"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.21.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-1.21.tar.gz"; sha256 = "1f59z2svfydxgd1gzrb5k3hl6d432kzmskk7jhv2dyb5hyx0wd7y"; }; meta = { @@ -20073,7 +20150,7 @@ let pname = "Time-Duration-Parse"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.15.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/Time-Duration-Parse-0.15.tar.gz"; sha256 = "10g39bbrxkabbsfq4rv7f5b5x7h3jba08j4pg8gwr0b9iqx19n31"; }; buildInputs = [ TimeDuration ]; @@ -20088,7 +20165,7 @@ let pname = "Time-Local"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.30.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/Time-Local-1.30.tar.gz"; sha256 = "c7744f6b2986b946d3e2cf034df371bee16cdbafe53e945abb1a542c4f8920cb"; }; meta = { @@ -20101,7 +20178,7 @@ let pname = "Time-Out"; version = "0.11"; src = fetchurl { - url = mirror://cpan/authors/id/P/PA/PATL/Time-Out-0.11.tar.gz; + url = "mirror://cpan/authors/id/P/PA/PATL/Time-Out-0.11.tar.gz"; sha256 = "1lhmx1x8j6z1k9vn32bcsw7g44cg22icshnnc37djlnlixlxm5lk"; }; meta = { @@ -20112,7 +20189,7 @@ let pname = "Time-ParseDate"; version = "2015.103"; src = fetchurl { - url = mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz; + url = "mirror://cpan/authors/id/M/MU/MUIR/modules/Time-ParseDate-2015.103.tar.gz"; sha256 = "2c1a06235bf811813caac9eaa9daa71af758667cdf7b082cb59863220fcaeed1"; }; doCheck = false; @@ -20164,7 +20241,7 @@ let meta = { description = "Tools for running a map tile server"; - homepage = https://github.com/openstreetmap/tirex; + homepage = "https://github.com/openstreetmap/tirex"; maintainers = with maintainers; [ jglukasik ]; license = with stdenv.lib.licenses; [ gpl2 ]; }; @@ -20174,7 +20251,7 @@ let pname = "Tk"; version = "804.034"; src = fetchurl { - url = mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.034.tar.gz; + url = "mirror://cpan/authors/id/S/SR/SREZIC/Tk-804.034.tar.gz"; sha256 = "fea6b144c723528a2206c8cd9175844032ee9c14ee37791f0f151e5e5b293fe2"; }; makeMakerFlags = "X11INC=${pkgs.xorg.libX11.dev}/include X11LIB=${pkgs.xorg.libX11.out}/lib"; @@ -20189,7 +20266,7 @@ let pname = "Tree-DAG_Node"; version = "1.31"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.31.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-DAG_Node-1.31.tgz"; sha256 = "016kr76azxzfcpxjkhqp2piyyl6529shjis20mc3g2snfabsd2qw"; }; meta = { @@ -20203,7 +20280,7 @@ let pname = "Tree-Simple"; version = "1.33"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.33.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-1.33.tgz"; sha256 = "1alnwb6c7n4al91m9cyknvcyvdz521lh22dz1hyk4v7c50adffnv"; }; buildInputs = [ TestException ]; @@ -20217,7 +20294,7 @@ let pname = "Tree-Simple-VisitorFactory"; version = "0.15"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.15.tgz; + url = "mirror://cpan/authors/id/R/RS/RSAVAGE/Tree-Simple-VisitorFactory-0.15.tgz"; sha256 = "06y2vazkl307k59hnkp9h5bp3p7711kgmp1qdhb2lgnfwzn84zin"; }; propagatedBuildInputs = [ TreeSimple ]; @@ -20228,7 +20305,7 @@ let pname = "Try-Tiny"; version = "0.30"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz"; sha256 = "da5bd0d5c903519bbf10bb9ba0cb7bcac0563882bcfe4503aee3fb143eddef6b"; }; buildInputs = [ CPANMetaCheck CaptureTiny ]; @@ -20242,7 +20319,7 @@ let pname = "Try-Tiny-ByClass"; version = "0.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MAUKE/Try-Tiny-ByClass-0.01.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MAUKE/Try-Tiny-ByClass-0.01.tar.gz"; sha256 = "0ipif12ix6vnmlyar4gh89libfadbsd9kvqg52f2cpr957slx3h3"; }; propagatedBuildInputs = [ DispatchClass TryTiny ]; @@ -20255,7 +20332,7 @@ let pname = "Twiggy"; version = "0.1025"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIYAGAWA/Twiggy-0.1025.tar.gz"; sha256 = "1a57knbwync7rlzhsz1kdc0sd380xnaccwgiy1qwj5d87abdynnp"; }; propagatedBuildInputs = [ AnyEvent Plack ]; @@ -20271,7 +20348,7 @@ let pname = "Type-Tiny"; version = "1.008005"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.008005.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TOBYINK/Type-Tiny-1.008005.tar.gz"; sha256 = "cc25eb6bd204b586b71e1f6408922b88be3c8183a1e4f99282d885904c776226"; }; propagatedBuildInputs = [ ExporterTiny ]; @@ -20286,7 +20363,7 @@ let pname = "Types-Serialiser"; version = "1.0"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/Types-Serialiser-1.0.tar.gz"; sha256 = "03bk0hm5ys8k7265dkap825ybn2zmzb1hl0kf1jdm8yq95w39lvs"; }; propagatedBuildInputs = [ commonsense ]; @@ -20298,11 +20375,11 @@ let pname = "UNIVERSAL-can"; version = "1.20140328"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz; + url = "mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz"; sha256 = "522da9f274786fe2cba99bc77cc1c81d2161947903d7fad10bd62dfb7f11990f"; }; meta = { - homepage = https://github.com/chromatic/UNIVERSAL-can; + homepage = "https://github.com/chromatic/UNIVERSAL-can"; description = "Work around buggy code calling UNIVERSAL::can() as a function"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20312,11 +20389,11 @@ let pname = "UNIVERSAL-isa"; version = "1.20171012"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/UNIVERSAL-isa-1.20171012.tar.gz"; sha256 = "0avzv9j32aab6l0rd63n92v0pgliz1p4yabxxjfq275hdh1mcsfi"; }; meta = { - homepage = https://github.com/chromatic/UNIVERSAL-isa; + homepage = "https://github.com/chromatic/UNIVERSAL-isa"; description = "Attempt to recover from people calling UNIVERSAL::isa as a function"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20326,7 +20403,7 @@ let pname = "UNIVERSAL-require"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEILB/UNIVERSAL-require-0.18.tar.gz"; sha256 = "b2a736a87967a143dab58c8a110501d5235bcdd2c8b2a3bfffcd3c0bd06b38ed"; }; meta = { @@ -20339,7 +20416,7 @@ let pname = "Unicode-CaseFold"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz; + url = "mirror://cpan/authors/id/A/AR/ARODLAND/Unicode-CaseFold-1.01.tar.gz"; sha256 = "418a212808f9d0b8bb330ac905096d2dd364976753d4c71534dab9836a63194d"; }; perlPreHook = stdenv.lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' @@ -20353,7 +20430,7 @@ let pname = "Unicode-CheckUTF8"; version = "1.03"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRADFITZ/Unicode-CheckUTF8-1.03.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BRADFITZ/Unicode-CheckUTF8-1.03.tar.gz"; sha256 = "97f84daf033eb9b49cd8fe31db221fef035a5c2ee1d757f3122c88cf9762414c"; }; }; @@ -20362,7 +20439,7 @@ let pname = "Unicode-LineBreak"; version = "2019.001"; src = fetchurl { - url = mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2019.001.tar.gz; + url = "mirror://cpan/authors/id/N/NE/NEZUMI/Unicode-LineBreak-2019.001.tar.gz"; sha256 = "12iinva5gqc9g7qzxrvmh45n714z0ad9g7wq2dxwgp6drbj64rs8"; }; propagatedBuildInputs = [ MIMECharset ]; @@ -20376,7 +20453,7 @@ let pname = "Unicode-String"; version = "2.10"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-2.10.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/GAAS/Unicode-String-2.10.tar.gz"; sha256 = "0s4vp8k7ag7z9lsnnkpa9mnch83kxhp9gh7yiapld5a7rq712jl9"; }; }; @@ -20400,7 +20477,7 @@ let pname = "Unix-Getrusage"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz; + url = "mirror://cpan/authors/id/T/TA/TAFFY/Unix-Getrusage-0.03.tar.gz"; sha256 = "76cde1cee2453260b85abbddc27cdc9875f01d2457e176e03dcabf05fb444d12"; }; }; @@ -20409,12 +20486,12 @@ let pname = "URI"; version = "1.76"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/URI-1.76.tar.gz"; sha256 = "b2c98e1d50d6f572483ee538a6f4ccc8d9185f91f0073fd8af7390898254413e"; }; buildInputs = [ TestNeeds ]; meta = { - homepage = https://github.com/libwww-perl/URI; + homepage = "https://github.com/libwww-perl/URI"; description = "Uniform Resource Identifiers (absolute and relative)"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20424,7 +20501,7 @@ let pname = "URI-db"; version = "0.19"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-db-0.19.tar.gz"; sha256 = "c4999deaf451652216032c8e327ff6e6d655539eac379095bb69b0c369efa658"; }; propagatedBuildInputs = [ URINested ]; @@ -20438,7 +20515,7 @@ let pname = "URI-Find"; version = "20160806"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20160806.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSCHWERN/URI-Find-20160806.tar.gz"; sha256 = "1mk3jv8x0mcq3ajrn9garnxd0jc7sw4pkwqi88r5apqvlljs84z2"; }; propagatedBuildInputs = [ URI ]; @@ -20452,7 +20529,7 @@ let pname = "URI-FromHash"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.05.tar.gz; + url = "mirror://cpan/authors/id/D/DR/DROLSKY/URI-FromHash-0.05.tar.gz"; sha256 = "1l3g5ygv83vn9y1zpwjdqq5cs4ip2q058q0gmpcf5wp9rsycbjm7"; }; propagatedBuildInputs = [ ParamsValidate URI ]; @@ -20467,7 +20544,7 @@ let pname = "URI-GoogleChart"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/URI-GoogleChart-1.02.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/URI-GoogleChart-1.02.tar.gz"; sha256 = "00hq5cpsk7sa04n0wg52qhpqf9i2849yyvw2zk83ayh1qqpc50js"; }; propagatedBuildInputs = [ URI ]; @@ -20477,7 +20554,7 @@ let pname = "User-Identity"; version = "0.99"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/User-Identity-0.99.tar.gz"; sha256 = "0c2qwxgpqncm4ya3rb5zz2hgiwwf559j1b1a6llyarf9jy43hfzm"; }; meta = { @@ -20490,7 +20567,7 @@ let pname = "URI-imap"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/C/CW/CWEST/URI-imap-1.01.tar.gz; + url = "mirror://cpan/authors/id/C/CW/CWEST/URI-imap-1.01.tar.gz"; sha256 = "0bdv6mrdijcq46r3lmz801rscs63f8p9qqliy2safd6fds4rj55v"; }; propagatedBuildInputs = [ URI ]; @@ -20500,7 +20577,7 @@ let pname = "URI-Nested"; version = "0.10"; src = fetchurl { - url = mirror://cpan/authors/id/D/DW/DWHEELER/URI-Nested-0.10.tar.gz; + url = "mirror://cpan/authors/id/D/DW/DWHEELER/URI-Nested-0.10.tar.gz"; sha256 = "e1971339a65fbac63ab87142d4b59d3d259d51417753c77cb58ea31a8233efaf"; }; propagatedBuildInputs = [ URI ]; @@ -20514,7 +20591,7 @@ let pname = "URI-SmartURI"; version = "0.032"; src = fetchurl { - url = mirror://cpan/authors/id/R/RK/RKITOVER/URI-SmartURI-0.032.tar.gz; + url = "mirror://cpan/authors/id/R/RK/RKITOVER/URI-SmartURI-0.032.tar.gz"; sha256 = "0b2grkmkbnp37q85wj7jpj5zr93vdbisgxlls2vl5q928rwln5zb"; }; propagatedBuildInputs = [ ClassC3Componentised FileFindRule ListMoreUtils Moose URI namespaceclean ]; @@ -20529,7 +20606,7 @@ let pname = "URI-Template"; version = "0.24"; src = fetchurl { - url = mirror://cpan/authors/id/B/BR/BRICAS/URI-Template-0.24.tar.gz; + url = "mirror://cpan/authors/id/B/BR/BRICAS/URI-Template-0.24.tar.gz"; sha256 = "1phibcmam2hklrddzj79l43va1gcqpyszbw21ynxq53ynmhjvbk8"; }; propagatedBuildInputs = [ URI ]; @@ -20543,7 +20620,7 @@ let pname = "URI-ws"; version = "0.03"; src = fetchurl { - url = mirror://cpan/authors/id/P/PL/PLICEASE/URI-ws-0.03.tar.gz; + url = "mirror://cpan/authors/id/P/PL/PLICEASE/URI-ws-0.03.tar.gz"; sha256 = "6e6b0e4172acb6a53c222639c000608c2dd61d50848647482ac8600d50e541ef"; }; propagatedBuildInputs = [ URI ]; @@ -20558,7 +20635,7 @@ let pname = "UUID-Tiny"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/C/CA/CAUGUSTIN/UUID-Tiny-1.04.tar.gz; + url = "mirror://cpan/authors/id/C/CA/CAUGUSTIN/UUID-Tiny-1.04.tar.gz"; sha256 = "6dcd92604d64e96cc6c188194ae16a9d3a46556224f77b6f3d1d1312b68f9a3d"; }; meta = { @@ -20571,7 +20648,7 @@ let pname = "Variable-Magic"; version = "0.62"; src = fetchurl { - url = mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz; + url = "mirror://cpan/authors/id/V/VP/VPIT/Variable-Magic-0.62.tar.gz"; sha256 = "3f9a18517e33f006a9c2fc4f43f01b54abfe6ff2eae7322424f31069296b615c"; }; meta = { @@ -20584,7 +20661,7 @@ let pname = "version"; version = "0.9924"; src = fetchurl { - url = mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9924.tar.gz; + url = "mirror://cpan/authors/id/J/JP/JPEACOCK/version-0.9924.tar.gz"; sha256 = "81e4485ff3faf9b7813584d57b557f4b34e73b6c2eb696394f6deefacf5ca65b"; }; meta = { @@ -20612,7 +20689,7 @@ let pname = "VM-EC2"; version = "1.28"; src = fetchurl { - url = mirror://cpan/authors/id/L/LD/LDS/VM-EC2-1.28.tar.gz; + url = "mirror://cpan/authors/id/L/LD/LDS/VM-EC2-1.28.tar.gz"; sha256 = "b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd"; }; propagatedBuildInputs = [ AnyEventCacheDNS AnyEventHTTP JSON StringApprox XMLSimple ]; @@ -20626,7 +20703,7 @@ let pname = "VM-EC2-Security-CredentialCache"; version = "0.25"; src = fetchurl { - url = mirror://cpan/authors/id/R/RC/RCONOVER/VM-EC2-Security-CredentialCache-0.25.tar.gz; + url = "mirror://cpan/authors/id/R/RC/RCONOVER/VM-EC2-Security-CredentialCache-0.25.tar.gz"; sha256 = "fc7e9c152ff2b721ccb221ac40089934775cf58366aedb5cc1693609f840937b"; }; propagatedBuildInputs = [ DateTimeFormatISO8601 VMEC2 ]; @@ -20640,13 +20717,13 @@ let pname = "W3C-LinkChecker"; version = "4.81"; src = fetchurl { - url = mirror://cpan/authors/id/S/SC/SCOP/W3C-LinkChecker-4.81.tar.gz; + url = "mirror://cpan/authors/id/S/SC/SCOP/W3C-LinkChecker-4.81.tar.gz"; sha256 = "6239f61b20d91dce7b21e4d4f626ab93a8f1e2f207da5015590d508cf6c66a65"; }; outputs = [ "out" ]; propagatedBuildInputs = [ CGI CSSDOM ConfigGeneral LWP NetIP TermReadKey ]; meta = { - homepage = https://validator.w3.org/checklink; + homepage = "https://validator.w3.org/checklink"; description = "A tool to check links and anchors in Web pages or full Web sites"; license = stdenv.lib.licenses.w3c; }; @@ -20656,7 +20733,7 @@ let pname = "WWW-Curl"; version = "4.17"; src = fetchurl { - url = mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz; + url = "mirror://cpan/authors/id/S/SZ/SZBALINT/WWW-Curl-4.17.tar.gz"; sha256 = "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj"; }; patches = [ ../development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch ]; @@ -20675,7 +20752,7 @@ let pname = "WWW-Form-UrlEncoded"; version = "0.26"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.26.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAZEBURO/WWW-Form-UrlEncoded-0.26.tar.gz"; sha256 = "1x4h5m5fkwaa0gbn6zp9mjrhr3r989w8wyrjxiii3dqm3xghnj60"; }; meta = { @@ -20689,7 +20766,7 @@ let pname = "WWW-Mechanize"; version = "1.95"; src = fetchurl { - url = mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.95.tar.gz; + url = "mirror://cpan/authors/id/O/OA/OALDERS/WWW-Mechanize-1.95.tar.gz"; sha256 = "1w121x0xsn1bm699ncanyxqv3njqam3zzjkq8p54bqmzpikn5crs"; }; propagatedBuildInputs = [ HTMLForm HTMLTree LWP ]; @@ -20706,7 +20783,7 @@ let pname = "WWW-Mechanize-CGI"; version = "0.3"; src = fetchurl { - url = mirror://cpan/authors/id/M/MR/MRAMBERG/WWW-Mechanize-CGI-0.3.tar.gz; + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/WWW-Mechanize-CGI-0.3.tar.gz"; sha256 = "046jm18liq7rwkdawdh9520cnalkfrk26yqryp7xgw71y65lvq61"; }; propagatedBuildInputs = [ HTTPRequestAsCGI WWWMechanize ]; @@ -20720,7 +20797,7 @@ let pname = "WWW-RobotRules"; version = "6.02"; src = fetchurl { - url = mirror://cpan/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz; + url = "mirror://cpan/authors/id/G/GA/GAAS/WWW-RobotRules-6.02.tar.gz"; sha256 = "07m50dp5n5jxv3m93i55qvnd67a6g7cvbvlik115kmc8lbkh5da6"; }; propagatedBuildInputs = [ URI ]; @@ -20736,7 +20813,7 @@ let pname = "Want"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/R/RO/ROBIN/Want-0.29.tar.gz; + url = "mirror://cpan/authors/id/R/RO/ROBIN/Want-0.29.tar.gz"; sha256 = "1xsjylbxxcbkjazqms49ipi94j1hd2ykdikk29cq7dscil5p9r5l"; }; }; @@ -20745,7 +20822,7 @@ let pname = "Win32-ShellQuote"; version = "0.003001"; src = fetchurl { - url = mirror://cpan/authors/id/H/HA/HAARG/Win32-ShellQuote-0.003001.tar.gz; + url = "mirror://cpan/authors/id/H/HA/HAARG/Win32-ShellQuote-0.003001.tar.gz"; sha256 = "aa74b0e3dc2d41cd63f62f853e521ffd76b8d823479a2619e22edb4049b4c0dc"; }; meta = { @@ -20758,13 +20835,13 @@ let pname = "Workflow"; version = "1.48"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.48.tar.gz; + url = "mirror://cpan/authors/id/J/JO/JONASBN/Workflow-1.48.tar.gz"; sha256 = "0bz6gil9mygh5ikh8mf86ids9xb1dbgx9hqc1g68qn9ffsyb012f"; }; buildInputs = [ DBDMock ListMoreUtils PodCoverageTrustPod TestException TestKwalitee TestPod TestPodCoverage ]; propagatedBuildInputs = [ ClassAccessor ClassFactory ClassObservable DBI DataUUID DateTimeFormatStrptime FileSlurp LogDispatch LogLog4perl XMLSimple ]; meta = { - homepage = https://github.com/jonasbn/perl-workflow; + homepage = "https://github.com/jonasbn/perl-workflow"; description = "Simple, flexible system to implement workflows"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -20774,7 +20851,7 @@ let pname = "Wx"; version = "0.9932"; src = fetchurl { - url = mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz; + url = "mirror://cpan/authors/id/M/MD/MDOOTSON/Wx-0.9932.tar.gz"; sha256 = "0w0vcpk8bmklh16c0z1vxgipnmvdw7cckcmay7k7cihgb99vdz8w"; }; propagatedBuildInputs = [ AlienWxWidgets ]; @@ -20788,7 +20865,7 @@ let pname = "Wx-GLCanvas"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/M/MB/MBARBON/Wx-GLCanvas-0.09.tar.gz; + url = "mirror://cpan/authors/id/M/MB/MBARBON/Wx-GLCanvas-0.09.tar.gz"; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; propagatedBuildInputs = [ pkgs.libGLU Wx ]; @@ -20799,7 +20876,7 @@ let pname = "X11-IdleTime"; version = "0.09"; src = fetchurl { - url = mirror://cpan/authors/id/A/AW/AWENDT/X11-IdleTime-0.09.tar.gz; + url = "mirror://cpan/authors/id/A/AW/AWENDT/X11-IdleTime-0.09.tar.gz"; sha256 = "0j27cb9yy9ymni8cbiyxplbg086b8lv6b330nwqyx0briq3xrzfq"; }; buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; @@ -20814,7 +20891,7 @@ let pname = "X11-Protocol"; version = "0.56"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz; + url = "mirror://cpan/authors/id/S/SM/SMCCAM/X11-Protocol-0.56.tar.gz"; sha256 = "1dq89bh6fqv7l5mbffqcismcljpq5f869bx7g8lg698zgindv5ny"; }; buildInputs = [ pkgs.xlibsWrapper ]; @@ -20826,7 +20903,7 @@ let pname = "X11-Protocol-Other"; version = "31"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRYDE/X11-Protocol-Other-31.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRYDE/X11-Protocol-Other-31.tar.gz"; sha256 = "1x3kvic52jgp2mvd5wzrqrprqi82cdk8l4075v8b33ksvj9mjqiw"; }; propagatedBuildInputs = [ X11Protocol ]; @@ -20842,7 +20919,7 @@ let pname = "X11-GUITest"; version = "0.28"; src = fetchurl { - url = mirror://cpan/authors/id/C/CT/CTRONDLP/X11-GUITest-0.28.tar.gz; + url = "mirror://cpan/authors/id/C/CT/CTRONDLP/X11-GUITest-0.28.tar.gz"; sha256 = "0jznws68skdzkhgkgcgjlj40qdyh9i75r7fw8bqzy406f19xxvnw"; }; buildInputs = [ pkgs.xlibsWrapper pkgs.xorg.libXtst pkgs.xorg.libXi ]; @@ -20854,7 +20931,7 @@ let pname = "X11-XCB"; version = "0.18"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSTPLBG/X11-XCB-0.18.tar.gz"; sha256 = "1cjpghw7cnackw20lbd7yzm222kz5bnrwz52f8ay24d1f4pwrnxf"; }; AUTOMATED_TESTING = false; @@ -20872,7 +20949,7 @@ let pname = "XML-Descent"; version = "1.04"; src = fetchurl { - url = mirror://cpan/authors/id/A/AN/ANDYA/XML-Descent-1.04.tar.gz; + url = "mirror://cpan/authors/id/A/AN/ANDYA/XML-Descent-1.04.tar.gz"; sha256 = "0l5xmw2hd95ypppz3lyvp4sn02ccsikzjwacli3ydxfdz1bbh4d7"; }; buildInputs = [ TestDifferences ]; @@ -20887,7 +20964,7 @@ let pname = "XML-DOM"; version = "1.46"; src = fetchurl { - url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz; + url = "mirror://cpan/authors/id/T/TJ/TJMATHER/XML-DOM-1.46.tar.gz"; sha256 = "0phpkc4li43m2g44hdcvyxzy9pymqwlqhh5hwp2xc0cv8l5lp8lb"; }; propagatedBuildInputs = [ XMLRegExp libxml_perl ]; @@ -20897,7 +20974,7 @@ let pname = "XML-FeedPP"; version = "0.95"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/XML-FeedPP-0.95.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/XML-FeedPP-0.95.tar.gz"; sha256 = "1x5806xwmbqxr1dkdhalb6d7n31s3ya776klkai7c2x6y6drbhwh"; }; propagatedBuildInputs = [ XMLTreePP ]; @@ -20911,7 +20988,7 @@ let pname = "XML-Filter-BufferText"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz; + url = "mirror://cpan/authors/id/R/RB/RBERJON/XML-Filter-BufferText-1.01.tar.gz"; sha256 = "8fd2126d3beec554df852919f4739e689202cbba6a17506e9b66ea165841a75c"; }; doCheck = false; @@ -20921,7 +20998,7 @@ let pname = "XML-Filter-XInclude"; version = "1.0"; src = fetchurl { - url = mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Filter-XInclude-1.0.tar.gz; + url = "mirror://cpan/authors/id/M/MS/MSERGEANT/XML-Filter-XInclude-1.0.tar.gz"; sha256 = "98746f3c1f6f049491fec203d455bb8f8c9c6e250f041904dda5d78e21187f93"; }; doCheck = false; @@ -20931,7 +21008,7 @@ let pname = "XML-Grove"; version = "0.46alpha"; src = fetchurl { - url = mirror://cpan/authors/id/K/KM/KMACLEOD/XML-Grove-0.46alpha.tar.gz; + url = "mirror://cpan/authors/id/K/KM/KMACLEOD/XML-Grove-0.46alpha.tar.gz"; sha256 = "05yis1ms7cgwjh57k57whrmalb3ha0bjr9hyvh7cnadcyiynvdpw"; }; buildInputs = [ pkgs.libxml2 ]; @@ -20948,7 +21025,7 @@ let pname = "XML-Handler-YAWriter"; version = "0.23"; src = fetchurl { - url = mirror://cpan/authors/id/K/KR/KRAEHE/XML-Handler-YAWriter-0.23.tar.gz; + url = "mirror://cpan/authors/id/K/KR/KRAEHE/XML-Handler-YAWriter-0.23.tar.gz"; sha256 = "11d45a1sz862va9rry3p2m77pwvq3kpsvgwhc5ramh9mbszbnk77"; }; propagatedBuildInputs = [ libxml_perl ]; @@ -20961,7 +21038,7 @@ let pname = "XML-LibXML"; version = "2.0202"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0202.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0202.tar.gz"; sha256 = "1bp2d5jpfmp35f2giwqx60q2rmzq469szkxzfcqkd742x72h4ayc"; }; SKIP_SAX_INSTALL = 1; @@ -20973,7 +21050,7 @@ let pname = "XML-LibXML-Simple"; version = "1.01"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-1.01.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MARKOV/XML-LibXML-Simple-1.01.tar.gz"; sha256 = "cd98c8104b70d7672bfa26b4513b78adf2b4b9220e586aa8beb1a508500365a6"; }; propagatedBuildInputs = [ XMLLibXML ]; @@ -20987,7 +21064,7 @@ let pname = "XML-LibXSLT"; version = "1.99"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXSLT-1.99.tar.gz; + 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 ]; @@ -20998,7 +21075,7 @@ let pname = "XML-Mini"; version = "1.38"; src = fetchurl { - url = mirror://cpan/authors/id/P/PD/PDEEGAN/XML-Mini-1.38.tar.gz; + url = "mirror://cpan/authors/id/P/PD/PDEEGAN/XML-Mini-1.38.tar.gz"; sha256 = "af803d38036a3184e124a682e5466f1bc107f48a89ef35b0c7647e11a073fe2d"; }; meta = { @@ -21010,7 +21087,7 @@ let pname = "XML-NamespaceSupport"; version = "1.12"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERIGRIN/XML-NamespaceSupport-1.12.tar.gz"; sha256 = "1vz5pbi4lm5fhq2slrs2hlp6bnk29863abgjlcx43l4dky2rbsa7"; }; }; @@ -21019,7 +21096,7 @@ let pname = "XML-Parser"; version = "2.44"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz"; sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; }; patchPhase = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' @@ -21035,7 +21112,7 @@ let pname = "XML-Parser-Lite"; version = "0.722"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.722.tar.gz; + url = "mirror://cpan/authors/id/P/PH/PHRED/XML-Parser-Lite-0.722.tar.gz"; sha256 = "1vk3jwh1kfcsmc5kvxzqdnb1cllvf0yf27fg0ra0w6jkw4ks143g"; }; buildInputs = [ TestRequires ]; @@ -21049,7 +21126,7 @@ let pname = "XML-XPath"; version = "1.44"; src = fetchurl { - url = mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.44.tar.gz; + url = "mirror://cpan/authors/id/M/MA/MANWAR/XML-XPath-1.44.tar.gz"; sha256 = "1cc9110705165dc09dd09974dd7c0b6709c9351d6b6b1cef5a711055f891dd0f"; }; buildInputs = [ PathTiny ]; @@ -21064,7 +21141,7 @@ let pname = "XML-XPathEngine"; version = "0.14"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIROD/XML-XPathEngine-0.14.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIROD/XML-XPathEngine-0.14.tar.gz"; sha256 = "0r72na14bmsxfd16s9nlza155amqww0k8wsa9x2a3sqbpp5ppznj"; }; meta = { @@ -21076,7 +21153,7 @@ let pname = "XML-RegExp"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz; + url = "mirror://cpan/authors/id/T/TJ/TJMATHER/XML-RegExp-0.04.tar.gz"; sha256 = "0m7wj00a2kik7wj0azhs1zagwazqh3hlz4255n75q21nc04r06fz"; }; }; @@ -21085,12 +21162,12 @@ let pname = "XML-RSS"; version = "1.61"; src = fetchurl { - url = mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.61.tar.gz; + url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-RSS-1.61.tar.gz"; sha256 = "fa6fe7ce5d31800a2bd414ef39da48c7f2b26b073a3c1f0d677bda26e840c90d"; }; propagatedBuildInputs = [ DateTimeFormatMail DateTimeFormatW3CDTF XMLParser ]; meta = { - homepage = http://perl-rss.sourceforge.net/; + homepage = "http://perl-rss.sourceforge.net/"; description = "Creates and updates RSS files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -21100,7 +21177,7 @@ let pname = "XML-SAX"; version = "1.02"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.02.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-1.02.tar.gz"; sha256 = "0am13vnv8qsjafr5ljakwnkhlwpk15sga02z8mxsg9is0j3w61j5"; }; propagatedBuildInputs = [ XMLNamespaceSupport XMLSAXBase ]; @@ -21113,12 +21190,12 @@ let pname = "XML-SAX-Base"; version = "1.09"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-SAX-Base-1.09.tar.gz"; sha256 = "66cb355ba4ef47c10ca738bd35999723644386ac853abbeb5132841f5e8a2ad0"; }; meta = { description = "Base class for SAX Drivers and Filters"; - homepage = https://github.com/grantm/XML-SAX-Base; + homepage = "https://github.com/grantm/XML-SAX-Base"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -21127,7 +21204,7 @@ let pname = "XML-SAX-Expat"; version = "0.51"; src = fetchurl { - url = mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz; + url = "mirror://cpan/authors/id/B/BJ/BJOERN/XML-SAX-Expat-0.51.tar.gz"; sha256 = "0gy8h2bvvvlxychwsb99ikdh5cqpk6sqc073jk2b4zffs09n40ac"; }; propagatedBuildInputs = [ XMLParser XMLSAX ]; @@ -21143,12 +21220,12 @@ let pname = "XML-SAX-Writer"; version = "0.57"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SAX-Writer-0.57.tar.gz"; sha256 = "3d61d07ef43b0126f5b4de4f415a256fa859fa88dc4fdabaad70b7be7c682cf0"; }; propagatedBuildInputs = [ XMLFilterBufferText XMLNamespaceSupport XMLSAXBase ]; meta = { - homepage = https://github.com/perigrin/xml-sax-writer; + homepage = "https://github.com/perigrin/xml-sax-writer"; description = "SAX2 XML Writer"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -21158,7 +21235,7 @@ let pname = "XML-SemanticDiff"; version = "1.0007"; src = fetchurl { - url = mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SemanticDiff-1.0007.tar.gz; + url = "mirror://cpan/authors/id/P/PE/PERIGRIN/XML-SemanticDiff-1.0007.tar.gz"; sha256 = "1xd00821y795fy2rag8aizb5wsbbzfxgmdf9qwpvdxn3pgpyzz85"; }; propagatedBuildInputs = [ XMLParser ]; @@ -21168,7 +21245,7 @@ let pname = "XML-Simple"; version = "2.25"; src = fetchurl { - url = mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz; + url = "mirror://cpan/authors/id/G/GR/GRANTM/XML-Simple-2.25.tar.gz"; sha256 = "1y6vh328zrh085d40852v4ij2l4g0amxykswxd1nfhd2pspds7sk"; }; propagatedBuildInputs = [ XMLSAXExpat ]; @@ -21178,7 +21255,7 @@ let pname = "XML-TokeParser"; version = "0.05"; src = fetchurl { - url = mirror://cpan/authors/id/P/PO/PODMASTER/XML-TokeParser-0.05.tar.gz; + url = "mirror://cpan/authors/id/P/PO/PODMASTER/XML-TokeParser-0.05.tar.gz"; sha256 = "1hnpwb3lh6cbgwvjjgqzcp6jm4mp612qn6ili38adc9nhkwv8fc5"; }; propagatedBuildInputs = [ XMLParser ]; @@ -21192,7 +21269,7 @@ let pname = "XML-TreePP"; version = "0.43"; src = fetchurl { - url = mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz; + url = "mirror://cpan/authors/id/K/KA/KAWASAKI/XML-TreePP-0.43.tar.gz"; sha256 = "7fbe2d6430860059894aeeebf75d4cacf1bf8d7b75294eb87d8e1502f81bd760"; }; propagatedBuildInputs = [ LWP ]; @@ -21206,7 +21283,7 @@ let pname = "XML-Twig"; version = "3.52"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIROD/XML-Twig-3.52.tar.gz"; sha256 = "1bc0hrz4jp6199hi29sdxmb9gyy45whla9hd19yqfasgq8k5ixzy"; }; postInstall = '' @@ -21221,7 +21298,7 @@ let pname = "XML-Validator-Schema"; version = "1.10"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz; + url = "mirror://cpan/authors/id/S/SA/SAMTREGAR/XML-Validator-Schema-1.10.tar.gz"; sha256 = "6142679580150a891f7d32232b5e31e2b4e5e53e8a6fa9cbeecb5c23814f1422"; }; propagatedBuildInputs = [ TreeDAGNode XMLFilterBufferText XMLSAX ]; @@ -21234,7 +21311,7 @@ let pname = "XML-Writer"; version = "0.625"; src = fetchurl { - url = mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz; + url = "mirror://cpan/authors/id/J/JO/JOSEPHW/XML-Writer-0.625.tar.gz"; sha256 = "1gjzs570i67ywbv967g8ylb5sg59clwmyrl2yix3jl70dhn55070"; }; }; @@ -21243,7 +21320,7 @@ let pname = "XS-Object-Magic"; version = "0.04"; src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz; + url = "mirror://cpan/authors/id/F/FL/FLORA/XS-Object-Magic-0.04.tar.gz"; sha256 = "03fghj7hq0fiicmfdxhmzfm4mzv7s097pgkd32ji7jnljvhm9six"; }; buildInputs = [ ExtUtilsDepends TestFatal ]; @@ -21257,7 +21334,7 @@ let pname = "XXX"; version = "0.35"; src = fetchurl { - url = mirror://cpan/authors/id/I/IN/INGY/XXX-0.35.tar.gz; + url = "mirror://cpan/authors/id/I/IN/INGY/XXX-0.35.tar.gz"; sha256 = "1azk2h3d2vxc84zpa34gr0dvhvf5qkwbaidy3ks0gkkx9463crm6"; }; propagatedBuildInputs = [ YAMLPP ]; @@ -21272,7 +21349,7 @@ let pname = "YAML"; version = "1.30"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-1.30.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-1.30.tar.gz"; sha256 = "1kbrfksjg4k4vmx1i337m5n69m00m0m5bgsh61c15bzzrgbacc2h"; }; @@ -21289,7 +21366,7 @@ let pname = "YAML-Syck"; version = "1.32"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.32.tar.gz; + url = "mirror://cpan/authors/id/T/TO/TODDR/YAML-Syck-1.32.tar.gz"; sha256 = "1fz9r9vvsmjkzvcbznxw65b319vkmwzd0ck09q9nwip00gn907fv"; }; meta = { @@ -21302,7 +21379,7 @@ let pname = "YAML-Tiny"; version = "1.73"; src = fetchurl { - url = mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz; + url = "mirror://cpan/authors/id/E/ET/ETHER/YAML-Tiny-1.73.tar.gz"; sha256 = "0i3p4nz8ysrsrs6vlzc6gkjcfpcaf05xjc7lwbjkw7lg5shmycdw"; }; }; @@ -21311,7 +21388,7 @@ let pname = "YAML-LibYAML"; version = "0.81"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.81.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-LibYAML-0.81.tar.gz"; sha256 = "1rwmy4kywaa0hypy329gb8wbqdk01bv4179bbnjbg66kzl5ndpvh"; }; }; @@ -21320,7 +21397,7 @@ let pname = "YAML-PP"; version = "0.018"; src = fetchurl { - url = mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.018.tar.gz; + url = "mirror://cpan/authors/id/T/TI/TINITA/YAML-PP-0.018.tar.gz"; sha256 = "1s957svv1z4sz62s53n5ym3c0liafs2gl8r0m7xq9qgcb9dyvblx"; }; buildInputs = [ TestDeep TestWarn ]; @@ -21334,13 +21411,13 @@ let pname = "WebService-Linode"; version = "0.29"; src = fetchurl { - url = mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.29.tar.gz; + url = "mirror://cpan/authors/id/M/MI/MIKEGRB/WebService-Linode-0.29.tar.gz"; sha256 = "103aab245304f08e9e87ac7bc884ddb44a630de6bac077dc921f716d71154922"; }; buildInputs = [ ModuleBuildTiny ]; propagatedBuildInputs = [ JSON LWPProtocolHttps ]; meta = { - homepage = https://github.com/mikegrb/WebService-Linode; + homepage = "https://github.com/mikegrb/WebService-Linode"; description = "Perl Interface to the Linode.com API"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index cc830fa3498..65b16414412 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,704 +1,731 @@ -{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c -, bzip2, curl, libxml2, openssl, gmp5, icu, oniguruma, libsodium, html-tidy -, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl, uwimap -, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng, freetype -, libffi, freetds, postgresql, sqlite, recode, net-snmp, unixODBC }: +{ stdenv, lib, pkgs, fetchgit, php, phpWithExtensions, autoconf, pkgconfig, re2c +, gettext, bzip2, curl, libxml2, openssl, gmp, icu, oniguruma, libsodium +, html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl +, uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng +, freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit +, readline, rsync +}: let - self = with self; { - buildPecl = import ../build-support/build-pecl.nix { - inherit php; - inherit (pkgs) stdenv autoreconfHook fetchurl re2c; - }; + buildPecl = import ../build-support/build-pecl.nix { + inherit php lib; + inherit (pkgs) stdenv autoreconfHook fetchurl re2c; + }; - # Wrap mkDerivation to prepend pname with "php-" to make names consistent - # with how buildPecl does it and make the file easier to overview. - mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { - pname = "php-${pname}"; - }); + # Wrap mkDerivation to prepend pname with "php-" to make names consistent + # with how buildPecl does it and make the file easier to overview. + mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // { + pname = "php-${pname}"; + }); isPhp73 = pkgs.lib.versionAtLeast php.version "7.3"; isPhp74 = pkgs.lib.versionAtLeast php.version "7.4"; - apcu = buildPecl { - version = "5.1.18"; - pname = "apcu"; - - sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl"; - - buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; - doCheck = true; - checkTarget = "test"; - checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; - makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; - }; - - apcu_bc = buildPecl { - version = "1.0.5"; - pname = "apcu_bc"; + pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; +in +{ + inherit buildPecl; - sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; + # This is a set of interactive tools based on PHP. + packages = { + box = mkDerivation rec { + version = "2.7.5"; + pname = "box"; - buildInputs = [ apcu (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; - }; + src = pkgs.fetchurl { + url = "https://github.com/box-project/box2/releases/download/${version}/box-${version}.phar"; + sha256 = "1zmxdadrv0i2l8cz7xb38gnfmfyljpsaz2nnkjzqzksdmncbgd18"; + }; - ast = buildPecl { - version = "1.0.5"; - pname = "ast"; - - sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; - }; + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; - box = mkDerivation rec { - version = "2.7.5"; - pname = "box"; - - src = pkgs.fetchurl { - url = "https://github.com/box-project/box2/releases/download/${version}/box-${version}.phar"; - sha256 = "1zmxdadrv0i2l8cz7xb38gnfmfyljpsaz2nnkjzqzksdmncbgd18"; - }; - - phases = [ "installPhase" ]; - buildInputs = [ pkgs.makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - install -D $src $out/libexec/box/box.phar - makeWrapper ${php}/bin/php $out/bin/box \ - --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" - ''; + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/box/box.phar + makeWrapper ${phpWithExtensions}/bin/php $out/bin/box \ + --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" + ''; - meta = with pkgs.lib; { - description = "An application for building and managing Phars"; - license = licenses.mit; - homepage = https://box-project.github.io/box2/; - maintainers = with maintainers; [ jtojnar ]; + meta = with pkgs.lib; { + description = "An application for building and managing Phars"; + license = licenses.mit; + homepage = "https://box-project.github.io/box2/"; + maintainers = with maintainers; [ jtojnar ]; + }; }; - }; - composer = mkDerivation rec { - version = "1.9.3"; - pname = "composer"; + composer = mkDerivation rec { + version = "1.9.3"; + pname = "composer"; - src = pkgs.fetchurl { - url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "VRZVwvyB9BBlCPQrvEsk6r00sCKxO8Hn2WQr9IPQp9Q="; - }; + src = pkgs.fetchurl { + url = "https://getcomposer.org/download/${version}/composer.phar"; + sha256 = "VRZVwvyB9BBlCPQrvEsk6r00sCKxO8Hn2WQr9IPQp9Q="; + }; - dontUnpack = true; + dontUnpack = true; - nativeBuildInputs = [ pkgs.makeWrapper ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; - installPhase = '' - mkdir -p $out/bin - install -D $src $out/libexec/composer/composer.phar - makeWrapper ${php}/bin/php $out/bin/composer \ - --add-flags "$out/libexec/composer/composer.phar" \ - --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} - ''; + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/composer/composer.phar + makeWrapper ${phpWithExtensions}/bin/php $out/bin/composer \ + --add-flags "$out/libexec/composer/composer.phar" \ + --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} + ''; - meta = with pkgs.lib; { - description = "Dependency Manager for PHP"; - license = licenses.mit; - homepage = https://getcomposer.org/; - maintainers = with maintainers; [ globin offline ]; + meta = with pkgs.lib; { + description = "Dependency Manager for PHP"; + license = licenses.mit; + homepage = "https://getcomposer.org/"; + maintainers = with maintainers; [ globin offline ]; + }; }; - }; - - couchbase = buildPecl rec { - version = "2.6.1"; - pname = "couchbase"; - - buildInputs = [ pkgs.libcouchbase pkgs.zlib igbinary pcs ]; - - src = pkgs.fetchFromGitHub { - owner = "couchbase"; - repo = "php-couchbase"; - rev = "v${version}"; - sha256 = "0jdzgcvab1vpxai23brmmvizjjq2d2dik9aklz6bzspfb512qjd6"; - }; - - configureFlags = [ "--with-couchbase" ]; - - patches = [ - (pkgs.writeText "php-couchbase.patch" '' - --- a/config.m4 - +++ b/config.m4 - @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then - LIBCOUCHBASE_DIR=$PHP_COUCHBASE - else - AC_MSG_CHECKING(for libcouchbase in default path) - - for i in /usr/local /usr; do - + for i in ${pkgs.libcouchbase}; do - if test -r $i/include/libcouchbase/couchbase.h; then - LIBCOUCHBASE_DIR=$i - AC_MSG_RESULT(found in $i) - @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \ - igbinary_inc_path="$phpincludedir" - elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then - igbinary_inc_path="$phpincludedir" - + elif test -f "${igbinary.dev}/include/ext/igbinary/igbinary.h"; then - + igbinary_inc_path="${igbinary.dev}/include" - fi - if test "$igbinary_inc_path" = ""; then - AC_MSG_WARN([Cannot find igbinary.h]) - '') - ]; - meta.broken = isPhp74; # Build error - }; + php-cs-fixer = mkDerivation rec { + version = "2.16.1"; + pname = "php-cs-fixer"; - event = buildPecl { - version = "2.5.3"; - pname = "event"; + src = pkgs.fetchurl { + url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; + sha256 = "1dq1nhy666zg6d4fkfsjwhj1vwh1ncap2c9ljplxv98a9mm6fk68"; + }; - sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; - configureFlags = [ - "--with-event-libevent-dir=${pkgs.libevent.dev}" - "--with-event-core" - "--with-event-extra" - "--with-event-pthreads" - ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ openssl libevent ]; - - meta = with pkgs.lib; { - description = '' - This is an extension to efficiently schedule I/O, time and signal based - events using the best I/O notification mechanism available for specific platform. + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar + makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \ + --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" ''; - license = licenses.php301; - homepage = "https://bitbucket.org/osmanov/pecl-event/"; - }; - }; - - igbinary = buildPecl { - version = "3.0.1"; - pname = "igbinary"; - sha256 = "1w8jmf1qpggdvq0ndfi86n7i7cqgh1s8q6hys2lijvi37rzn0nar"; + meta = with pkgs.lib; { + description = "A tool to automatically fix PHP coding standards issues"; + license = licenses.mit; + homepage = "http://cs.sensiolabs.org/"; + maintainers = with maintainers; [ jtojnar ]; + }; + }; - configureFlags = [ "--enable-igbinary" ]; - makeFlags = [ "phpincludedir=$(dev)/include" ]; - outputs = [ "out" "dev" ]; - }; + php-parallel-lint = mkDerivation rec { + version = "1.0.0"; + pname = "php-parallel-lint"; + + src = pkgs.fetchFromGitHub { + owner = "JakubOnderka"; + repo = "PHP-Parallel-Lint"; + rev = "v${version}"; + sha256 = "16nv8yyk2z3l213dg067l6di4pigg5rd8yswr5xgd18jwbys2vnw"; + }; + + buildInputs = [ + pkgs.makeWrapper + php.packages.composer + php.packages.box + ]; + + buildPhase = '' + composer dump-autoload + box build + ''; - imagick = buildPecl { - version = "3.4.4"; - pname = "imagick"; + installPhase = '' + mkdir -p $out/bin + install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar + makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \ + --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" + ''; - sha256 = "0xvhaqny1v796ywx83w7jyjyd0nrxkxf34w9zi8qc8aw8qbammcd"; + meta = with pkgs.lib; { + description = "This tool check syntax of PHP files faster than serial check with fancier output"; + license = licenses.bsd2; + homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint"; + maintainers = with maintainers; [ jtojnar ]; + }; + }; - configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; - }; + phpcbf = mkDerivation rec { + version = "3.5.3"; + pname = "phpcbf"; - mailparse = buildPecl { - version = "3.0.3"; - pname = "mailparse"; + src = pkgs.fetchurl { + url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; + sha256 = "1mrsf9p6p64pyqyylnlxb2b7cirdfccch83g7yhfnka3znffq86v"; + }; - sha256 = "00nk14jbdbln93mx3ag691avc11ff94hkadrcv5pn51c6ihsxbmz"; - }; + phases = [ "installPhase" ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; - maxminddb = buildPecl rec { - pname = "maxminddb"; - version = "1.6.0"; + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phpcbf/phpcbf.phar + makeWrapper ${php}/bin/php $out/bin/phpcbf \ + --add-flags "$out/libexec/phpcbf/phpcbf.phar" + ''; - src = pkgs.fetchFromGitHub { - owner = "maxmind"; - repo = "MaxMind-DB-Reader-php"; - rev = "v${version}"; - sha256 = "0sa943ij9pgz55aik93lllb8lh063bvr66ibn77p3y3p41vdiabz"; + meta = with pkgs.lib; { + description = "PHP coding standard beautifier and fixer"; + license = licenses.bsd3; + homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; + maintainers = with maintainers; [ cmcdragonkai etu ]; + }; }; - buildInputs = [ pkgs.libmaxminddb ]; - sourceRoot = "source/ext"; + phpcs = mkDerivation rec { + version = "3.5.3"; + pname = "phpcs"; - meta = with pkgs.lib; { - description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; - license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ]; - }; - }; + src = pkgs.fetchurl { + url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; + sha256 = "0y4nhsifj4pdmf5g1nnm4951yjgiqswyz7wmjxx6kqiqc7chlkml"; + }; - memcached = buildPecl rec { - version = "3.1.5"; - pname = "memcached"; + phases = [ "installPhase" ]; + buildInputs = [ pkgs.makeWrapper ]; - src = fetchgit { - url = "https://github.com/php-memcached-dev/php-memcached"; - rev = "v${version}"; - sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380"; - }; + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phpcs/phpcs.phar + makeWrapper ${php}/bin/php $out/bin/phpcs \ + --add-flags "$out/libexec/phpcs/phpcs.phar" + ''; - configureFlags = [ - "--with-zlib-dir=${pkgs.zlib.dev}" - "--with-libmemcached-dir=${pkgs.libmemcached}" - ]; + meta = with pkgs.lib; { + description = "PHP coding standard tool"; + license = licenses.bsd3; + homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; + maintainers = with maintainers; [ javaguirre etu ]; + }; + }; - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ cyrus_sasl zlib ]; - }; + phpstan = mkDerivation rec { + version = "0.12.14"; + pname = "phpstan"; - mongodb = buildPecl { - pname = "mongodb"; - version = "1.6.1"; - - sha256 = "1j1w4n33347j9kwvxwsrix3gvjbiqcn1s5v59pp64s536cci8q0m"; - - nativeBuildInputs = [ pkgs.pkgconfig ]; - buildInputs = with pkgs; [ - cyrus_sasl - icu - openssl - snappy - zlib - (if isPhp73 then pcre2 else pcre) - ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; - }; + src = pkgs.fetchurl { + url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; + sha256 = "JAq1/+bVhTgKRR7oFusqZ/yBOYewaOM38ZoiCjirsTg="; + }; - oci8 = buildPecl { - version = "2.2.0"; - pname = "oci8"; + phases = [ "installPhase" ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; - sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; - buildInputs = [ pkgs.oracle-instantclient ]; - configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/phpstan/phpstan.phar + makeWrapper ${php}/bin/php $out/bin/phpstan \ + --add-flags "$out/libexec/phpstan/phpstan.phar" + ''; - postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; - }; + meta = with pkgs.lib; { + description = "PHP Static Analysis Tool"; + longDescription = '' + PHPStan focuses on finding errors in your code without actually running + it. It catches whole classes of bugs even before you write tests for the + code. It moves PHP closer to compiled languages in the sense that the + correctness of each line of the code can be checked before you run the + actual line. + ''; + license = licenses.mit; + homepage = "https://github.com/phpstan/phpstan"; + maintainers = with maintainers; [ etu ]; + }; + }; - pcov = buildPecl { - version = "1.0.6"; - pname = "pcov"; + psalm = mkDerivation rec { + version = "3.9.3"; + pname = "psalm"; - sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; + src = pkgs.fetchurl { + url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; + sha256 = "KHm2n06y/yxN5B2rCVxT5ja7HxkyxAMsjZ5HLb3xr4M="; + }; - buildInputs = [ (if isPhp73 then pkgs.pcre2 else pkgs.pcre) ]; - }; + phases = [ "installPhase" ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; - pcs = buildPecl { - version = "1.3.3"; - pname = "pcs"; + installPhase = '' + mkdir -p $out/bin + install -D $src $out/libexec/psalm/psalm.phar + makeWrapper ${php}/bin/php $out/bin/psalm \ + --add-flags "$out/libexec/psalm/psalm.phar" + ''; - sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; + meta = with pkgs.lib; { + description = "A static analysis tool for finding errors in PHP applications"; + license = licenses.mit; + homepage = "https://github.com/vimeo/psalm"; + }; + }; - meta.broken = isPhp74; # Build error - }; + psysh = mkDerivation rec { + version = "0.9.12"; + pname = "psysh"; - pdo_oci = buildPecl rec { - inherit (php) src version; + src = pkgs.fetchurl { + url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; + sha256 = "0bzmc94li481xk81gv460ipq9zl03skbnq8m3rnw34i2c04hxczc"; + }; - pname = "pdo_oci"; - sourceRoot = "php-${version}/ext/pdo_oci"; + phases = [ "installPhase" ]; + nativeBuildInputs = [ pkgs.makeWrapper ]; - buildInputs = [ pkgs.oracle-instantclient ]; - configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; + installPhase = '' + mkdir -p $out/bin + tar -xzf $src -C $out/bin + chmod +x $out/bin/psysh + wrapProgram $out/bin/psysh + ''; - postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; + meta = with pkgs.lib; { + description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; + license = licenses.mit; + homepage = "https://psysh.org/"; + maintainers = with maintainers; [ caugner ]; + }; + }; }; - pdo_sqlsrv = buildPecl { - version = "5.8.0"; - pname = "pdo_sqlsrv"; - sha256 = "0z4vbyd851b4jr6p69l2ylk91iihndsm2qjb429pxcv8g6dqzqll"; - buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - }; + # This is a set of PHP extensions meant to be used in php.buildEnv + # or php.withExtensions to extend the functionality of the PHP + # interpreter. + extensions = { + apcu = buildPecl { + version = "5.1.18"; + pname = "apcu"; - php-cs-fixer = mkDerivation rec { - version = "2.16.1"; - pname = "php-cs-fixer"; + sha256 = "0ayykd4hfvdzk7qnr5k6yq5scwf6rb2i05xscfv76q5dmkkynvfl"; - src = pkgs.fetchurl { - url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1dq1nhy666zg6d4fkfsjwhj1vwh1ncap2c9ljplxv98a9mm6fk68"; + buildInputs = [ pcre' ]; + doCheck = true; + checkTarget = "test"; + checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; + makeFlags = [ "phpincludedir=$(dev)/include" ]; + outputs = [ "out" "dev" ]; }; - phases = [ "installPhase" ]; - buildInputs = [ pkgs.makeWrapper ]; + apcu_bc = buildPecl { + version = "1.0.5"; + pname = "apcu_bc"; - installPhase = '' - mkdir -p $out/bin - install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar - makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \ - --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar" - ''; + sha256 = "0ma00syhk2ps9k9p02jz7rii6x3i2p986il23703zz5npd6y9n20"; - meta = with pkgs.lib; { - description = "A tool to automatically fix PHP coding standards issues"; - license = licenses.mit; - homepage = http://cs.sensiolabs.org/; - maintainers = with maintainers; [ jtojnar ]; + buildInputs = [ + php.extensions.apcu + pcre' + ]; }; - }; - php-parallel-lint = mkDerivation rec { - version = "1.0.0"; - pname = "php-parallel-lint"; + ast = buildPecl { + version = "1.0.5"; + pname = "ast"; - src = pkgs.fetchFromGitHub { - owner = "JakubOnderka"; - repo = "PHP-Parallel-Lint"; - rev = "v${version}"; - sha256 = "16nv8yyk2z3l213dg067l6di4pigg5rd8yswr5xgd18jwbys2vnw"; + sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; }; - buildInputs = [ pkgs.makeWrapper composer box ]; + couchbase = buildPecl rec { + version = "2.6.1"; + pname = "couchbase"; + + buildInputs = [ + pkgs.libcouchbase + pkgs.zlib + php.extensions.igbinary + php.extensions.pcs + ]; + + src = pkgs.fetchFromGitHub { + owner = "couchbase"; + repo = "php-couchbase"; + rev = "v${version}"; + sha256 = "0jdzgcvab1vpxai23brmmvizjjq2d2dik9aklz6bzspfb512qjd6"; + }; + + configureFlags = [ "--with-couchbase" ]; + internalDeps = [ php.extensions.json ]; + patches = [ + (pkgs.writeText "php-couchbase.patch" '' + --- a/config.m4 + +++ b/config.m4 + @@ -9,7 +9,7 @@ if test "$PHP_COUCHBASE" != "no"; then + LIBCOUCHBASE_DIR=$PHP_COUCHBASE + else + AC_MSG_CHECKING(for libcouchbase in default path) + - for i in /usr/local /usr; do + + for i in ${pkgs.libcouchbase}; do + if test -r $i/include/libcouchbase/couchbase.h; then + LIBCOUCHBASE_DIR=$i + AC_MSG_RESULT(found in $i) + @@ -154,6 +154,8 @@ COUCHBASE_FILES=" \ + igbinary_inc_path="$phpincludedir" + elif test -f "$phpincludedir/ext/igbinary/igbinary.h"; then + igbinary_inc_path="$phpincludedir" + + elif test -f "${php.extensions.igbinary.dev}/include/ext/igbinary/igbinary.h"; then + + igbinary_inc_path="${php.extensions.igbinary.dev}/include" + fi + if test "$igbinary_inc_path" = ""; then + AC_MSG_WARN([Cannot find igbinary.h]) + '') + ]; + + meta.broken = isPhp74; # Build error + }; - buildPhase = '' - composer dump-autoload - box build - ''; + event = buildPecl { + version = "2.5.3"; + pname = "event"; - installPhase = '' - mkdir -p $out/bin - install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar - makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \ - --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar" - ''; - - meta = with pkgs.lib; { - description = "This tool check syntax of PHP files faster than serial check with fancier output"; - license = licenses.bsd2; - homepage = https://github.com/JakubOnderka/PHP-Parallel-Lint; - maintainers = with maintainers; [ jtojnar ]; - }; - }; + sha256 = "12liry5ldvgwp1v1a6zgfq8w6iyyxmsdj4c71bp157nnf58cb8hb"; - php_excel = buildPecl rec { - version = "1.0.2"; - pname = "php_excel"; - phpVersion = "php7"; + configureFlags = [ + "--with-event-libevent-dir=${pkgs.libevent.dev}" + "--with-event-core" + "--with-event-extra" + "--with-event-pthreads" + ]; - buildInputs = [ pkgs.libxl ]; + postPhpize = '' + substituteInPlace configure --replace 'as_fn_error $? "Couldn'\'''t find $phpincludedir/sockets/php_sockets.h. Please check if sockets extension installed" "$LINENO" 5' \ + ':' + ''; - src = pkgs.fetchurl { - url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz"; - sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ openssl libevent ]; + internalDeps = [ php.extensions.sockets ]; + + meta = with pkgs.lib; { + description = '' + This is an extension to efficiently schedule I/O, time and signal based + events using the best I/O notification mechanism available for specific platform. + ''; + license = licenses.php301; + homepage = "https://bitbucket.org/osmanov/pecl-event/"; + }; }; - configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; - meta.broken = true; - }; + igbinary = buildPecl { + version = "3.0.1"; + pname = "igbinary"; - phpcbf = mkDerivation rec { - version = "3.5.3"; - pname = "phpcbf"; + sha256 = "1w8jmf1qpggdvq0ndfi86n7i7cqgh1s8q6hys2lijvi37rzn0nar"; - src = pkgs.fetchurl { - url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "1mrsf9p6p64pyqyylnlxb2b7cirdfccch83g7yhfnka3znffq86v"; + configureFlags = [ "--enable-igbinary" ]; + makeFlags = [ "phpincludedir=$(dev)/include" ]; + outputs = [ "out" "dev" ]; }; - phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + imagick = buildPecl { + version = "3.4.4"; + pname = "imagick"; - installPhase = '' - mkdir -p $out/bin - install -D $src $out/libexec/phpcbf/phpcbf.phar - makeWrapper ${php}/bin/php $out/bin/phpcbf \ - --add-flags "$out/libexec/phpcbf/phpcbf.phar" - ''; + sha256 = "0xvhaqny1v796ywx83w7jyjyd0nrxkxf34w9zi8qc8aw8qbammcd"; - meta = with pkgs.lib; { - description = "PHP coding standard beautifier and fixer"; - license = licenses.bsd3; - homepage = https://squizlabs.github.io/PHP_CodeSniffer/; - maintainers = with maintainers; [ cmcdragonkai etu ]; + configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = [ pcre' ]; }; - }; - phpcs = mkDerivation rec { - version = "3.5.3"; - pname = "phpcs"; + mailparse = buildPecl { + version = "3.0.3"; + pname = "mailparse"; + sha256 = "00nk14jbdbln93mx3ag691avc11ff94hkadrcv5pn51c6ihsxbmz"; - src = pkgs.fetchurl { - url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "0y4nhsifj4pdmf5g1nnm4951yjgiqswyz7wmjxx6kqiqc7chlkml"; + internalDeps = [ php.extensions.mbstring ]; + postConfigure = '' + echo "#define HAVE_MBSTRING 1" >> config.h + ''; }; - phases = [ "installPhase" ]; - buildInputs = [ pkgs.makeWrapper ]; - - installPhase = '' - mkdir -p $out/bin - install -D $src $out/libexec/phpcs/phpcs.phar - makeWrapper ${php}/bin/php $out/bin/phpcs \ - --add-flags "$out/libexec/phpcs/phpcs.phar" - ''; - - meta = with pkgs.lib; { - description = "PHP coding standard tool"; - license = licenses.bsd3; - homepage = https://squizlabs.github.io/PHP_CodeSniffer/; - maintainers = with maintainers; [ javaguirre etu ]; + maxminddb = buildPecl rec { + pname = "maxminddb"; + version = "1.6.0"; + + src = pkgs.fetchFromGitHub { + owner = "maxmind"; + repo = "MaxMind-DB-Reader-php"; + rev = "v${version}"; + sha256 = "0sa943ij9pgz55aik93lllb8lh063bvr66ibn77p3y3p41vdiabz"; + }; + + buildInputs = [ pkgs.libmaxminddb ]; + sourceRoot = "source/ext"; + + meta = with pkgs.lib; { + description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ ajs124 das_j ]; + }; }; - }; - phpstan = mkDerivation rec { - version = "0.12.14"; - pname = "phpstan"; + memcached = buildPecl rec { + version = "3.1.5"; + pname = "memcached"; + + src = fetchgit { + url = "https://github.com/php-memcached-dev/php-memcached"; + rev = "v${version}"; + sha256 = "01mbh2m3kfbdvih3c8g3g9h4vdd80r0i9g2z8b3lx3mi8mmcj380"; + }; + + internalDeps = [ + php.extensions.session + ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + php.extensions.hash + ]; + + configureFlags = [ + "--with-zlib-dir=${pkgs.zlib.dev}" + "--with-libmemcached-dir=${pkgs.libmemcached}" + ]; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ cyrus_sasl zlib ]; + }; - src = pkgs.fetchurl { - url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "JAq1/+bVhTgKRR7oFusqZ/yBOYewaOM38ZoiCjirsTg="; + mongodb = buildPecl { + pname = "mongodb"; + version = "1.6.1"; + + sha256 = "1j1w4n33347j9kwvxwsrix3gvjbiqcn1s5v59pp64s536cci8q0m"; + + nativeBuildInputs = [ pkgs.pkgconfig ]; + buildInputs = with pkgs; [ + cyrus_sasl + icu + openssl + snappy + zlib + pcre' + ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; }; - phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + oci8 = buildPecl { + version = "2.2.0"; + pname = "oci8"; - installPhase = '' - mkdir -p $out/bin - install -D $src $out/libexec/phpstan/phpstan.phar - makeWrapper ${php}/bin/php $out/bin/phpstan \ - --add-flags "$out/libexec/phpstan/phpstan.phar" - ''; + sha256 = "0jhivxj1nkkza4h23z33y7xhffii60d7dr51h1czjk10qywl7pyd"; + buildInputs = [ pkgs.oracle-instantclient ]; + configureFlags = [ "--with-oci8=shared,instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; - meta = with pkgs.lib; { - description = "PHP Static Analysis Tool"; - longDescription = '' - PHPStan focuses on finding errors in your code without actually running - it. It catches whole classes of bugs even before you write tests for the - code. It moves PHP closer to compiled languages in the sense that the - correctness of each line of the code can be checked before you run the - actual line. + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; - license = licenses.mit; - homepage = "https://github.com/phpstan/phpstan"; - maintainers = with maintainers; [ etu ]; }; - }; - pinba = if isPhp73 then pinba73 else pinba7; + pcov = buildPecl { + version = "1.0.6"; + pname = "pcov"; - pinba7 = assert !isPhp73; buildPecl { - version = "1.1.1"; - pname = "pinba"; + sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; - src = pkgs.fetchFromGitHub { - owner = "tony2001"; - repo = "pinba_extension"; - rev = "RELEASE_1_1_1"; - sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5"; + buildInputs = [ pcre' ]; }; - meta = with pkgs.lib; { - description = "PHP extension for Pinba"; - longDescription = '' - Pinba is a MySQL storage engine that acts as a realtime monitoring and - statistics server for PHP using MySQL as a read-only interface. - ''; - homepage = "http://pinba.org/"; - }; - }; + pcs = buildPecl { + version = "1.3.3"; + pname = "pcs"; - pinba73 = assert isPhp73; buildPecl { - version = "1.1.2-dev"; - pname = "pinba"; + sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; - src = pkgs.fetchFromGitHub { - owner = "tony2001"; - repo = "pinba_extension"; - rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; - sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; + meta.broken = isPhp74; # Build error }; - meta = with pkgs.lib; { - description = "PHP extension for Pinba"; - longDescription = '' - Pinba is a MySQL storage engine that acts as a realtime monitoring and - statistics server for PHP using MySQL as a read-only interface. - ''; - homepage = "http://pinba.org/"; - }; - }; + pdo_oci = buildPecl rec { + inherit (php) src version; - protobuf = buildPecl { - version = "3.11.2"; - pname = "protobuf"; + pname = "pdo_oci"; + sourceRoot = "php-${version}/ext/pdo_oci"; - sha256 = "0bhdykdyk58ywqj940zb7jyvrlgdr6hdb4s8kn79fz3p0i79l9hz"; + buildInputs = [ pkgs.oracle-instantclient ]; + configureFlags = [ "--with-pdo-oci=instantclient,${pkgs.oracle-instantclient.lib}/lib" ]; - buildInputs = with pkgs; [ (if isPhp73 then pcre2 else pcre) ]; + internalDeps = [ php.extensions.pdo ]; - meta = with pkgs.lib; { - description = '' - Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. - ''; - license = licenses.bsd3; - homepage = "https://developers.google.com/protocol-buffers/"; + postPatch = '' + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; }; - }; - psalm = mkDerivation rec { - version = "3.9.3"; - pname = "psalm"; + pdo_sqlsrv = buildPecl { + version = "5.8.0"; + pname = "pdo_sqlsrv"; - src = pkgs.fetchurl { - url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "KHm2n06y/yxN5B2rCVxT5ja7HxkyxAMsjZ5HLb3xr4M="; - }; + sha256 = "0z4vbyd851b4jr6p69l2ylk91iihndsm2qjb429pxcv8g6dqzqll"; - phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + internalDeps = [ php.extensions.pdo ]; - installPhase = '' - mkdir -p $out/bin - install -D $src $out/libexec/psalm/psalm.phar - makeWrapper ${php}/bin/php $out/bin/psalm \ - --add-flags "$out/libexec/psalm/psalm.phar" - ''; - - meta = with pkgs.lib; { - description = "A static analysis tool for finding errors in PHP applications"; - license = licenses.mit; - homepage = https://github.com/vimeo/psalm; + buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; }; - }; - - psysh = mkDerivation rec { - version = "0.9.12"; - pname = "psysh"; - src = pkgs.fetchurl { - url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "0bzmc94li481xk81gv460ipq9zl03skbnq8m3rnw34i2c04hxczc"; - }; + php_excel = buildPecl rec { + version = "1.0.2"; + pname = "php_excel"; + phpVersion = "php7"; - phases = [ "installPhase" ]; - nativeBuildInputs = [ pkgs.makeWrapper ]; + buildInputs = [ pkgs.libxl ]; - installPhase = '' - mkdir -p $out/bin - tar -xzf $src -C $out/bin - chmod +x $out/bin/psysh - wrapProgram $out/bin/psysh - ''; + src = pkgs.fetchurl { + url = "https://github.com/iliaal/php_excel/releases/download/Excel-1.0.2-PHP7/excel-${version}-${phpVersion}.tgz"; + sha256 = "0dpvih9gpiyh1ml22zi7hi6kslkilzby00z1p8x248idylldzs2n"; + }; - meta = with pkgs.lib; { - description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; - license = licenses.mit; - homepage = https://psysh.org/; - maintainers = with maintainers; [ caugner ]; + configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; }; - }; - pthreads = if isPhp73 then pthreads32-dev else pthreads32; + pinba = let + version = if isPhp73 then "1.1.2-dev" else "1.1.1"; + src = pkgs.fetchFromGitHub ({ + owner = "tony2001"; + repo = "pinba_extension"; + } // (if (isPhp73) then { + rev = "edbc313f1b4fb8407bf7d5acf63fbb0359c7fb2e"; + sha256 = "02sljqm6griw8ccqavl23f7w1hp2zflcv24lpf00k6pyrn9cwx80"; + } else { + rev = "RELEASE_1_1_1"; + sha256 = "1kdp7vav0y315695vhm3xifgsh6h6y6pny70xw3iai461n58khj5"; + })); + in buildPecl { + pname = "pinba"; + inherit version src; + + meta = with pkgs.lib; { + description = "PHP extension for Pinba"; + longDescription = '' + Pinba is a MySQL storage engine that acts as a realtime monitoring and + statistics server for PHP using MySQL as a read-only interface. + ''; + homepage = "http://pinba.org/"; + }; + }; - pthreads32 = assert (pkgs.config.php.zts or false); assert !isPhp73; buildPecl rec { - version = "3.2.0"; - pname = "pthreads"; + protobuf = buildPecl { + version = "3.11.2"; + pname = "protobuf"; - src = pkgs.fetchFromGitHub { - owner = "krakjoe"; - repo = "pthreads"; - rev = "v${version}"; - sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; - }; + sha256 = "0bhdykdyk58ywqj940zb7jyvrlgdr6hdb4s8kn79fz3p0i79l9hz"; - buildInputs = with pkgs; [ pcre.dev ]; - }; + buildInputs = with pkgs; [ pcre' ]; - pthreads32-dev = assert (pkgs.config.php.zts or false); assert isPhp73; buildPecl { - version = "3.2.0-dev"; - pname = "pthreads"; + meta = with pkgs.lib; { + description = '' + Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. + ''; + license = licenses.bsd3; + homepage = "https://developers.google.com/protocol-buffers/"; + }; + }; - src = pkgs.fetchFromGitHub { - owner = "krakjoe"; - repo = "pthreads"; - rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; - sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; + pthreads = let + version = "3.2.0"; + src = pkgs.fetchFromGitHub ({ + owner = "krakjoe"; + repo = "pthreads"; + } // (if (isPhp73) then { + rev = "4d1c2483ceb459ea4284db4eb06646d5715e7154"; + sha256 = "07kdxypy0bgggrfav2h1ccbv67lllbvpa3s3zsaqci0gq4fyi830"; + } else { + rev = "v3.2.0"; + sha256 = "17hypm75d4w7lvz96jb7s0s87018yzmmap0l125d5fd7abnhzfvv"; + })); + in buildPecl { + pname = "pthreads"; + inherit version src; + + buildInputs = [ pcre'.dev ]; + + meta.broken = isPhp74; }; - buildInputs = with pkgs; [ pcre2.dev ]; - }; + redis = buildPecl { + version = "5.1.1"; + pname = "redis"; - redis = buildPecl { - version = "5.1.1"; - pname = "redis"; + sha256 = "1041zv91fkda73w4c3pj6zdvwjgb3q7mxg6mwnq9gisl80mrs732"; - sha256 = "1041zv91fkda73w4c3pj6zdvwjgb3q7mxg6mwnq9gisl80mrs732"; - }; + internalDeps = with php.extensions; [ + json + session + ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ + hash ]; + }; - sqlsrv = buildPecl { - version = "5.8.0"; - pname = "sqlsrv"; + sqlsrv = buildPecl { + version = "5.8.0"; + pname = "sqlsrv"; - sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; + sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; - buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - }; + buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + }; - v8 = buildPecl { - version = "0.2.2"; - pname = "v8"; + v8 = buildPecl { + version = "0.2.2"; + pname = "v8"; - sha256 = "103nys7zkpi1hifqp9miyl0m1mn07xqshw3sapyz365nb35g5q71"; + sha256 = "103nys7zkpi1hifqp9miyl0m1mn07xqshw3sapyz365nb35g5q71"; - buildInputs = [ pkgs.v8_6_x ]; - configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; - meta.broken = true; - }; + buildInputs = [ pkgs.v8_6_x ]; + configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; + meta.broken = true; + }; - v8js = assert !isPhp73; buildPecl { - version = "2.1.0"; - pname = "v8js"; + v8js = buildPecl { + version = "2.1.0"; + pname = "v8js"; - sha256 = "0g63dyhhicngbgqg34wl91nm3556vzdgkq19gy52gvmqj47rj6rg"; + sha256 = "0g63dyhhicngbgqg34wl91nm3556vzdgkq19gy52gvmqj47rj6rg"; - buildInputs = [ pkgs.v8_6_x ]; - configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; - meta.broken = true; - }; + buildInputs = [ pkgs.v8_6_x ]; + configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; + meta.broken = true; + }; - xdebug = buildPecl { - version = "2.8.1"; - pname = "xdebug"; + xdebug = buildPecl { + version = "2.8.1"; + pname = "xdebug"; - sha256 = "080mwr7m72rf0jsig5074dgq2n86hhs7rdbfg6yvnm959sby72w3"; + sha256 = "080mwr7m72rf0jsig5074dgq2n86hhs7rdbfg6yvnm959sby72w3"; - doCheck = true; - checkTarget = "test"; + doCheck = true; + checkTarget = "test"; - zendExtension = true; - }; + zendExtension = true; + }; - yaml = buildPecl { - version = "2.0.4"; - pname = "yaml"; + yaml = buildPecl { + version = "2.0.4"; + pname = "yaml"; - sha256 = "1036zhc5yskdfymyk8jhwc34kvkvsn5kaf50336153v4dqwb11lp"; + sha256 = "1036zhc5yskdfymyk8jhwc34kvkvsn5kaf50336153v4dqwb11lp"; - configureFlags = [ - "--with-yaml=${pkgs.libyaml}" - ]; + configureFlags = [ + "--with-yaml=${pkgs.libyaml}" + ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - }; + nativeBuildInputs = [ pkgs.pkgconfig ]; + }; - zmq = assert !isPhp73; buildPecl { - version = "1.1.3"; - pname = "zmq"; + zmq = buildPecl { + version = "1.1.3"; + pname = "zmq"; - sha256 = "1kj487vllqj9720vlhfsmv32hs2dy2agp6176mav6ldx31c3g4n4"; + sha256 = "1kj487vllqj9720vlhfsmv32hs2dy2agp6176mav6ldx31c3g4n4"; - configureFlags = [ - "--with-zmq=${pkgs.zeromq}" - ]; + configureFlags = [ + "--with-zmq=${pkgs.zeromq}" + ]; - nativeBuildInputs = [ pkgs.pkgconfig ]; - }; + nativeBuildInputs = [ pkgs.pkgconfig ]; - exts = let + meta.broken = isPhp73; + }; + } // (let # Function to build a single php extension based on the php version. # # Name passed is the name of the extension and is automatically used @@ -709,39 +736,67 @@ let mkExtension = { name , configureFlags ? [ "--enable-${name}" ] + , internalDeps ? [] + , postPhpize ? "" , buildInputs ? [] , zendExtension ? false + , doCheck ? true , ... - }: stdenv.mkDerivation { - pname = "php-ext-${name}"; + }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { + pname = "php-${name}"; + extensionName = name; inherit (php) version src; sourceRoot = "php-${php.version}/ext/${name}"; enableParallelBuilding = true; nativeBuildInputs = [ php autoconf pkgconfig re2c ]; - inherit configureFlags buildInputs zendExtension; - - preConfigure = "phpize"; - + inherit configureFlags internalDeps buildInputs + zendExtension doCheck; + + preConfigure = '' + nullglobRestore=$(shopt -p nullglob) + shopt -u nullglob # To make ?-globbing work + + # Some extensions have a config0.m4 or config9.m4 + if [ -f config?.m4 ]; then + mv config?.m4 config.m4 + fi + + $nullglobRestore + phpize + ${postPhpize} + ${lib.concatMapStringsSep "\n" + (dep: "mkdir -p ext; ln -s ${dep.dev}/include ext/${dep.extensionName}") + internalDeps} + ''; + checkPhase = "echo n | make test"; + outputs = [ "out" "dev" ]; installPhase = '' mkdir -p $out/lib/php/extensions - cp modules/${name}.so $out/lib/php/extensions/ext-${name}.so + cp modules/${name}.so $out/lib/php/extensions/${name}.so + mkdir -p $dev/include + ${rsync}/bin/rsync -r --filter="+ */" \ + --filter="+ *.h" \ + --filter="- *" \ + --prune-empty-dirs \ + . $dev/include/ ''; - }; + }); # This list contains build instructions for different modules that one may # want to build. # # These will be passed as arguments to mkExtension above. - extensionData = let - pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre; - in [ + extensionData = [ { name = "bcmath"; } { name = "bz2"; buildInputs = [ bzip2 ]; configureFlags = [ "--with-bz2=${bzip2.dev}" ]; } { name = "calendar"; } { name = "ctype"; } - { name = "curl"; buildInputs = [ curl ]; configureFlags = [ "--with-curl=${curl.dev}" ]; } + { name = "curl"; + buildInputs = [ curl ]; + configureFlags = [ "--with-curl=${curl.dev}" ]; + doCheck = false; } { name = "dba"; } { name = "dom"; buildInputs = [ libxml2 ]; @@ -752,8 +807,9 @@ let buildInputs = [ enchant1 ]; configureFlags = [ "--with-enchant=${enchant1}" ]; # enchant1 doesn't build on darwin. - enable = (!stdenv.isDarwin); } - { name = "exif"; } + enable = (!stdenv.isDarwin); + doCheck = false; } + { name = "exif"; doCheck = false; } { name = "ffi"; buildInputs = [ libffi ]; enable = lib.versionAtLeast php.version "7.4"; } { name = "fileinfo"; buildInputs = [ pcre' ]; } { name = "filter"; buildInputs = [ pcre' ]; } @@ -765,6 +821,7 @@ let "--with-external-gd=${gd.dev}" "--enable-gd-jis-conv" ]; + doCheck = false; enable = lib.versionAtLeast php.version "7.4"; } { name = "gd"; buildInputs = [ zlib gd libXpm ]; @@ -778,21 +835,22 @@ let "--with-zlib-dir=${zlib.dev}" "--enable-gd-jis-conv" ]; + doCheck = false; enable = lib.versionOlder php.version "7.4"; } - ## gettext (7.2, 7.3, 7.4) -- configure: error: Cannot locate header file libintl.h - #{ name = "gettext"; - # buildInputs = [ gettext ]; - # configureFlags = "--with-gettext=${gettext}"; } + { name = "gettext"; + buildInputs = [ gettext ]; + postPhpize = ''substituteInPlace configure --replace 'as_fn_error $? "Cannot locate header file libintl.h" "$LINENO" 5' ':' ''; + configureFlags = "--with-gettext=${gettext}"; } { name = "gmp"; - buildInputs = [ gmp5 ]; - configureFlags = [ "--with-gmp=${gmp5.dev}" ]; - # gmp5 doesn't build on darwin. - enable = (!stdenv.isDarwin); } + buildInputs = [ gmp ]; + configureFlags = [ "--with-gmp=${gmp.dev}" ]; } { name = "hash"; enable = lib.versionOlder php.version "7.4"; } - { name = "iconv"; configureFlags = if stdenv.isDarwin then + { name = "iconv"; + configureFlags = if stdenv.isDarwin then [ "--with-iconv=${libiconv}" ] else - [ "--with-iconv" ]; } + [ "--with-iconv" ]; + doCheck = false; } { name = "imap"; buildInputs = [ uwimap openssl pam pcre' ]; configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ]; @@ -808,36 +866,110 @@ let "LDAP_DIR=${openldap.dev}" "LDAP_INCDIR=${openldap.dev}/include" "LDAP_LIBDIR=${openldap.out}/lib" - ] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}"; } - { name = "mbstring"; buildInputs = [ oniguruma ]; } - { name = "mysqli"; configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; } + ] ++ lib.optional stdenv.isLinux "--with-ldap-sasl=${cyrus_sasl.dev}"; + doCheck = false; } + { name = "mbstring"; buildInputs = [ oniguruma ]; doCheck = false; } + { name = "mysqli"; + internalDeps = [ php.extensions.mysqlnd ]; + configureFlags = [ "--with-mysqli=mysqlnd" "--with-mysql-sock=/run/mysqld/mysqld.sock" ]; + doCheck = false; } + { name = "mysqlnd"; + buildInputs = [ zlib openssl ]; + # The configure script doesn't correctly add library link + # flags, so we add them to the variable used by the Makefile + # when linking. + MYSQLND_SHARED_LIBADD = "-lssl -lcrypto -lz"; + # The configure script builds a config.h which is never + # included. Let's include it in the main header file + # included by all .c-files. + patches = [ + (pkgs.writeText "mysqlnd_config.patch" '' + --- a/mysqlnd.h + +++ b/mysqlnd.h + @@ -1,3 +1,6 @@ + +#ifdef HAVE_CONFIG_H + +#include "config.h" + +#endif + /* + +----------------------------------------------------------------------+ + | Copyright (c) The PHP Group | + '') + ]; + postPhpize = lib.optionalString (lib.versionOlder php.version "7.4") '' + substituteInPlace configure --replace '$OPENSSL_LIBDIR' '${openssl}/lib' \ + --replace '$OPENSSL_INCDIR' '${openssl.dev}/include' + ''; } # oci8 (7.4, 7.3, 7.2) # odbc (7.4, 7.3, 7.2) - { name = "opcache"; buildInputs = [ pcre' ]; zendExtension = true; } + { name = "opcache"; + buildInputs = [ pcre' ]; + # HAVE_OPCACHE_FILE_CACHE is defined in config.h, which is + # included from ZendAccelerator.h, but ZendAccelerator.h is + # included after the ifdef... + patches = lib.optional (lib.versionOlder php.version "7.4") [ + (pkgs.writeText "zend_file_cache_config.patch" '' + --- a/zend_file_cache.c + +++ b/zend_file_cache.c + @@ -27,9 +27,9 @@ + #include "ext/standard/md5.h" + #endif + + +#include "ZendAccelerator.h" + #ifdef HAVE_OPCACHE_FILE_CACHE + + -#include "ZendAccelerator.h" + #include "zend_file_cache.h" + #include "zend_shared_alloc.h" + #include "zend_accelerator_util_funcs.h" + '') ]; + zendExtension = true; + doCheck = !(lib.versionOlder php.version "7.4"); } + { name = "openssl"; + buildInputs = [ openssl ]; + configureFlags = [ "--with-openssl" ]; + doCheck = false; } { name = "pcntl"; } - { name = "pdo"; } + { name = "pdo"; doCheck = false; } { name = "pdo_dblib"; + internalDeps = [ php.extensions.pdo ]; configureFlags = [ "--with-pdo-dblib=${freetds}" ]; # Doesn't seem to work on darwin. - enable = (!stdenv.isDarwin); } + enable = (!stdenv.isDarwin); + doCheck = false; } # pdo_firebird (7.4, 7.3, 7.2) - { name = "pdo_mysql"; configureFlags = [ "--with-pdo-mysql=mysqlnd" ]; } + { name = "pdo_mysql"; + internalDeps = with php.extensions; [ pdo mysqlnd ]; + configureFlags = [ "--with-pdo-mysql=mysqlnd" ]; + doCheck = false; } # pdo_oci (7.4, 7.3, 7.2) - { name = "pdo_odbc"; configureFlags = [ "--with-pdo-odbc=unixODBC,${unixODBC}" ]; } - { name = "pdo_pgsql"; configureFlags = [ "--with-pdo-pgsql=${postgresql}" ]; } - { name = "pdo_sqlite"; buildInputs = [ sqlite ]; configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ]; } - { name = "pgsql"; buildInputs = [ pcre' ]; configureFlags = [ "--with-pgsql=${postgresql}" ]; } - { name = "phar"; buildInputs = [ pcre' openssl ]; } - { name = "posix"; } + { name = "pdo_odbc"; + internalDeps = [ php.extensions.pdo ]; + configureFlags = [ "--with-pdo-odbc=unixODBC,${unixODBC}" ]; + doCheck = false; } + { name = "pdo_pgsql"; + internalDeps = [ php.extensions.pdo ]; + configureFlags = [ "--with-pdo-pgsql=${postgresql}" ]; + doCheck = false; } + { name = "pdo_sqlite"; + internalDeps = [ php.extensions.pdo ]; + buildInputs = [ sqlite ]; + configureFlags = [ "--with-pdo-sqlite=${sqlite.dev}" ]; + doCheck = false; } + { name = "pgsql"; + buildInputs = [ pcre' ]; + configureFlags = [ "--with-pgsql=${postgresql}" ]; + doCheck = false; } + { name = "posix"; doCheck = false; } { name = "pspell"; configureFlags = [ "--with-pspell=${aspell}" ]; } - ## readline (7.4, 7.3, 7.2) -- configure: error: Please reinstall libedit - I cannot find readline.h - #{ name = "readline"; - # buildInputs = [ libedit readline ]; - # configureFlags = [ "--with-readline=${readline.dev}" ]; } - { name = "recode"; - configureFlags = [ "--with-recode=${recode}" ]; - # Removed in php 7.4. - enable = lib.versionOlder php.version "7.4"; } + { name = "readline"; + buildInputs = [ libedit readline ]; + configureFlags = [ "--with-readline=${readline.dev}" ]; + postPhpize = lib.optionalString (lib.versionOlder php.version "7.4") '' + substituteInPlace configure --replace 'as_fn_error $? "Please reinstall libedit - I cannot find readline.h" "$LINENO" 5' ':' + ''; + doCheck = false; + } + # recode (7.3, 7.2) { name = "session"; } { name = "shmop"; } { name = "simplexml"; @@ -849,21 +981,25 @@ let buildInputs = [ net-snmp openssl ]; configureFlags = [ "--with-snmp" ]; # net-snmp doesn't build on darwin. - enable = (!stdenv.isDarwin); } + enable = (!stdenv.isDarwin); + doCheck = false; } { name = "soap"; buildInputs = [ libxml2 ]; configureFlags = [ "--enable-soap" ] # Required to build on darwin. - ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } - { name = "sockets"; } + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; + doCheck = false; } + { name = "sockets"; doCheck = false; } { name = "sodium"; buildInputs = [ libsodium ]; } + { name = "sqlite3"; buildInputs = [ sqlite ]; } { name = "sysvmsg"; } { name = "sysvsem"; } { name = "sysvshm"; } - { name = "tidy"; configureFlags = [ "--with-tidy=${html-tidy}" ]; } + { name = "tidy"; configureFlags = [ "--with-tidy=${html-tidy}" ]; doCheck = false; } { name = "tokenizer"; } { name = "wddx"; buildInputs = [ libxml2 ]; + internalDeps = [ php.extensions.session ]; configureFlags = [ "--enable-wddx" "--with-libxml-dir=${libxml2.dev}" ]; # Removed in php 7.4. enable = lib.versionOlder php.version "7.4"; } @@ -871,7 +1007,8 @@ let buildInputs = [ libxml2 ]; configureFlags = [ "--enable-xml" ] # Required to build on darwin. - ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; + doCheck = false; } { name = "xmlreader"; buildInputs = [ libxml2 ]; configureFlags = [ "--enable-xmlreader CFLAGS=-I../.." ] @@ -887,12 +1024,21 @@ let configureFlags = [ "--enable-xmlwriter" ] # Required to build on darwin. ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-libxml-dir=${libxml2.dev}" ]; } - { name = "xsl"; buildInputs = [ libxslt libxml2 ]; configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } + { name = "xsl"; + buildInputs = [ libxslt libxml2 ]; + doCheck = !(lib.versionOlder php.version "7.4"); + configureFlags = [ "--with-xsl=${libxslt.dev}" ]; } { name = "zend_test"; } - { name = "zip"; buildInputs = [ libzip pcre' ]; + { name = "zip"; + buildInputs = [ libzip pcre' ]; configureFlags = [ "--with-zip" ] ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ] - ++ lib.optional (lib.versionOlder php.version "7.3") [ "--with-libzip" ]; } + ++ lib.optional (lib.versionOlder php.version "7.3") [ "--with-libzip" ]; + doCheck = false; } + { name = "zlib"; + buildInputs = [ zlib ]; + configureFlags = [ "--with-zlib" ] + ++ lib.optional (lib.versionOlder php.version "7.4") [ "--with-zlib-dir=${zlib.dev}" ]; } ]; # Convert the list of attrs: @@ -909,5 +1055,5 @@ let }) (builtins.filter (i: i.enable or true) extensionData); # Produce the final attribute set of all extensions defined. - in builtins.listToAttrs namedExtensions; -}; in self + in builtins.listToAttrs namedExtensions); +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8d3505a1686..e16cc830fc2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -108,7 +108,22 @@ in { inherit buildSetupcfg; inherit (callPackage ../development/interpreters/python/hooks { }) - eggUnpackHook eggBuildHook eggInstallHook flitBuildHook pipBuildHook pipInstallHook pytestCheckHook pythonCatchConflictsHook pythonImportsCheckHook pythonRemoveBinBytecodeHook pythonRemoveTestsDirHook setuptoolsBuildHook setuptoolsCheckHook venvShellHook wheelUnpackHook; + eggUnpackHook + eggBuildHook + eggInstallHook + flitBuildHook + pipBuildHook + pipInstallHook + pytestCheckHook + pythonCatchConflictsHook + pythonImportsCheckHook + pythonNamespacesHook + pythonRemoveBinBytecodeHook + pythonRemoveTestsDirHook + setuptoolsBuildHook + setuptoolsCheckHook + venvShellHook + wheelUnpackHook; # helpers @@ -505,10 +520,14 @@ in { boltons = callPackage ../development/python-modules/boltons { }; + bravia-tv = callPackage ../development/python-modules/bravia-tv { }; + braintree = callPackage ../development/python-modules/braintree { }; breezy = callPackage ../development/python-modules/breezy { }; + ciso8601 = callPackage ../development/python-modules/ciso8601 { }; + deepdiff = callPackage ../development/python-modules/deepdiff { }; django-sesame = callPackage ../development/python-modules/django-sesame { }; @@ -619,6 +638,8 @@ in { diofant = callPackage ../development/python-modules/diofant { }; + dipy = callPackage ../development/python-modules/dipy { }; + docrep = callPackage ../development/python-modules/docrep { }; dominate = callPackage ../development/python-modules/dominate { }; @@ -637,6 +658,8 @@ in { exchangelib = callPackage ../development/python-modules/exchangelib { }; + dcmstack = callPackage ../development/python-modules/dcmstack { }; + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; @@ -900,6 +923,10 @@ in { mpi = pkgs.openmpi; }; + python-baseconv = callPackage ../development/python-modules/python-baseconv { }; + + pycognito = callPackage ../development/python-modules/pycognito { }; + python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; msal = callPackage ../development/python-modules/msal { }; @@ -1187,6 +1214,8 @@ in { pymsgbox = callPackage ../development/python-modules/pymsgbox { }; + pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; + pynisher = callPackage ../development/python-modules/pynisher { }; pyparser = callPackage ../development/python-modules/pyparser { }; @@ -1624,6 +1653,8 @@ in { alabaster = callPackage ../development/python-modules/alabaster {}; + alarmdecoder = callPackage ../development/python-modules/alarmdecoder {}; + alembic = callPackage ../development/python-modules/alembic {}; allpairspy = callPackage ../development/python-modules/allpairspy { }; @@ -2248,6 +2279,11 @@ in { eth-utils = callPackage ../development/python-modules/eth-utils { }; + gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { + pythonSupport = true; + pythonPackages = self; + })); + impacket = callPackage ../development/python-modules/impacket { }; jsonlines = callPackage ../development/python-modules/jsonlines { }; @@ -2399,8 +2435,6 @@ in { pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; - pytest-faulthandler = callPackage ../development/python-modules/pytest-faulthandler { }; - pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; pytest-forked = callPackage ../development/python-modules/pytest-forked { }; @@ -2521,6 +2555,7 @@ in { libfdt = toPythonModule (pkgs.dtc.override { inherit python; + pythonSupport = true; }); libtmux = callPackage ../development/python-modules/libtmux { }; @@ -2629,6 +2664,8 @@ in { urllib3 = callPackage ../development/python-modules/urllib3 {}; + varint = callPackage ../development/python-modules/varint {}; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; dropbox = callPackage ../development/python-modules/dropbox {}; @@ -2944,6 +2981,24 @@ in { latexcodec = callPackage ../development/python-modules/latexcodec {}; + libmodulemd = pipe pkgs.libmodulemd [ + toPythonModule + + (p: p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; + # The package always builds python3 bindings + broken = (super.meta.broken or false) || !isPy3k; + }; + })) + + (p: p.override { + python3 = python; + }) + + (p: p.py) + ]; + libselinux = pipe pkgs.libselinux [ toPythonModule @@ -3066,6 +3121,10 @@ in { oyaml = callPackage ../development/python-modules/oyaml { }; + pam = callPackage ../development/python-modules/pam { + inherit (pkgs) pam; + }; + pamela = callPackage ../development/python-modules/pamela { }; paperspace = callPackage ../development/python-modules/paperspace { }; @@ -3287,6 +3346,8 @@ in { rethinkdb = callPackage ../development/python-modules/rethinkdb { }; + roku = callPackage ../development/python-modules/roku { }; + roman = callPackage ../development/python-modules/roman { }; rotate-backups = callPackage ../tools/backup/rotate-backups { }; @@ -3622,6 +3683,8 @@ in { flask-restplus = callPackage ../development/python-modules/flask-restplus { }; + flask-reverse-proxy-fix = callPackage ../development/python-modules/flask-reverse-proxy-fix { }; + flask_script = callPackage ../development/python-modules/flask-script { }; flask-silk = callPackage ../development/python-modules/flask-silk { }; @@ -3943,6 +4006,8 @@ in { colored = callPackage ../development/python-modules/colored { }; + xdg = callPackage ../development/python-modules/xdg { }; + xdis = callPackage ../development/python-modules/xdis { }; xnd = callPackage ../development/python-modules/xnd { }; @@ -4005,6 +4070,10 @@ in { ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; + ipyvue = callPackage ../development/python-modules/ipyvue { }; + + ipyvuetify = callPackage ../development/python-modules/ipyvuetify { }; + ipywidgets = callPackage ../development/python-modules/ipywidgets { }; ipaddr = callPackage ../development/python-modules/ipaddr { }; @@ -4504,6 +4573,12 @@ in { nevow = callPackage ../development/python-modules/nevow { }; + nghttp2 = (toPythonModule (pkgs.nghttp2.override { + inherit (self) python cython setuptools; + inherit (pkgs) ncurses; + enablePython = true; + })).python; + nibabel = callPackage ../development/python-modules/nibabel {}; nidaqmx = callPackage ../development/python-modules/nidaqmx { }; @@ -4561,7 +4636,9 @@ in { notify2 = callPackage ../development/python-modules/notify2 {}; - notmuch = callPackage ../development/python-modules/notmuch { }; + notmuch = callPackage ../development/python-modules/notmuch { + inherit (pkgs) notmuch; + }; emoji = callPackage ../development/python-modules/emoji { }; @@ -5825,6 +5902,8 @@ in { user-agents = callPackage ../development/python-modules/user-agents { }; + variants = callPackage ../development/python-modules/variants { }; + verboselogs = callPackage ../development/python-modules/verboselogs { }; vega_datasets = callPackage ../development/python-modules/vega_datasets { }; @@ -6142,7 +6221,9 @@ in { subdownloader = callPackage ../development/python-modules/subdownloader { }; - subunit = callPackage ../development/python-modules/subunit { }; + subunit = callPackage ../development/python-modules/subunit { + inherit (pkgs) subunit pkg-config cppunit check; + }; sure = callPackage ../development/python-modules/sure { }; @@ -6411,6 +6492,8 @@ in { graph_nets = callPackage ../development/python-modules/graph_nets { }; + graspy = callPackage ../development/python-modules/graspy { }; + influxgraph = callPackage ../development/python-modules/influxgraph { }; pyspotify = callPackage ../development/python-modules/pyspotify { }; @@ -6429,9 +6512,12 @@ in { inherit (pkgs) libversion pkgconfig; }; - libvirt = callPackage ../development/python-modules/libvirt { + libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; - }; + }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { + inherit (pkgs) pkgconfig; + libvirt = pkgs.libvirt_5_9_0; + }); rpdb = callPackage ../development/python-modules/rpdb { }; @@ -6702,21 +6788,49 @@ in { zerobin = callPackage ../development/python-modules/zerobin { }; - tensorflow-estimator = callPackage ../development/python-modules/tensorflow-estimator { }; - tensorflow-estimator_1_15_1 = callPackage ../development/python-modules/tensorflow-estimator/1_15_1.nix { }; + tensorflow-estimator = self.tensorflow-estimator_1; + + tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; + + tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; - tensorflow-tensorboard = callPackage ../development/python-modules/tensorflow-tensorboard { }; + tensorflow-tensorboard = self.tensorflow-tensorboard_1; + + tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; + + tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; - tensorflow-bin = callPackage ../development/python-modules/tensorflow/bin.nix { + tensorflow-bin = self.tensorflow-bin_1; + + tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/bin.nix { cudaSupport = pkgs.config.cudaSupport or false; inherit (pkgs.linuxPackages) nvidia_x11; cudatoolkit = pkgs.cudatoolkit_10; cudnn = pkgs.cudnn_cudatoolkit_10; }; - tensorflow-build = callPackage ../development/python-modules/tensorflow { + tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/2/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; + }; + + tensorflow-build = self.tensorflow-build_1; + + tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; + nccl = pkgs.nccl_cudatoolkit_10; + openssl = pkgs.openssl_1_1; + inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; + }; + + tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 { cudaSupport = pkgs.config.cudaSupport or false; inherit (pkgs.linuxPackages) nvidia_x11; cudatoolkit = pkgs.cudatoolkit_10; @@ -6726,7 +6840,9 @@ in { inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; }; - tensorflow = self.tensorflow-build; + tensorflow = self.tensorflow_1; + tensorflow_1 = self.tensorflow-build_1; + tensorflow_2 = self.tensorflow-build_2; tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; @@ -6782,6 +6898,8 @@ in { callPackage ../development/python-modules/more-itertools/2.7.nix { } else callPackage ../development/python-modules/more-itertools { }; + morphys = callPackage ../development/python-modules/morphys { }; + jaraco_functools = callPackage ../development/python-modules/jaraco_functools { }; jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; @@ -6987,6 +7105,8 @@ in { pyemd = callPackage ../development/python-modules/pyemd { }; + openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + pulp = callPackage ../development/python-modules/pulp { }; behave = callPackage ../development/python-modules/behave { }; @@ -7044,14 +7164,20 @@ in { gast = callPackage ../development/python-modules/gast { }; - IBMQuantumExperience = callPackage ../development/python-modules/ibmquantumexperience { }; - ibis = callPackage ../development/python-modules/ibis { }; ibis-framework = callPackage ../development/python-modules/ibis-framework { }; qiskit = callPackage ../development/python-modules/qiskit { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; + + qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; + + qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; + + qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; qasm2image = callPackage ../development/python-modules/qasm2image { }; diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index 0de1db7d99b..c7db64b99f6 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -266,6 +266,13 @@ in { ) super.ocaml-ng; python27 = super.python27.override { static = true; }; + python35 = super.python35.override { static = true; }; + python36 = super.python36.override { static = true; }; + python37 = super.python37.override { static = true; }; + python38 = super.python38.override { static = true; }; + python39 = super.python39.override { static = true; }; + python3Minimal = super.python3Minimal.override { static = true; }; + libev = super.libev.override { static = true; }; } |